Browse Source

Switch old reindex tests to use use JDK 8 (#34646)

This commit switches the old reindex tests to use JDK 8. This enables us
to not require that JDK 7 be installed, easing the burden on developers.
Jason Tedor 7 years ago
parent
commit
48ab6d7c92

+ 1 - 1
buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy

@@ -119,7 +119,7 @@ class BuildPlugin implements Plugin<Project> {
             File gradleJavaHome = Jvm.current().javaHome
 
             final Map<Integer, String> javaVersions = [:]
-            for (int version = 7; version <= Integer.parseInt(minimumCompilerVersion.majorVersion); version++) {
+            for (int version = 8; version <= Integer.parseInt(minimumCompilerVersion.majorVersion); version++) {
                 if(System.getenv(getJavaHomeEnvVarName(version.toString())) != null) {
                     javaVersions.put(version, findJavaHome(version.toString()));
                 }

+ 1 - 1
modules/reindex/build.gradle

@@ -116,7 +116,7 @@ if (Os.isFamily(Os.FAMILY_WINDOWS)) {
       dependsOn unzip
       executable = new File(project.runtimeJavaHome, 'bin/java')
       env 'CLASSPATH', "${ -> project.configurations.oldesFixture.asPath }"
-      env 'JAVA_HOME', getJavaHome(it, 7)
+      env 'JAVA_HOME', getJavaHome(it, 8)
       args 'oldes.OldElasticsearch',
            baseDir,
            unzip.temporaryDir,