From 48ab6d7c92180285f5777ebd157463163c5600f9 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Fri, 19 Oct 2018 15:11:48 -0400 Subject: [PATCH] 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. --- .../src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy | 2 +- modules/reindex/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy index 0553f939595..6a82f90bb0e 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy @@ -119,7 +119,7 @@ class BuildPlugin implements Plugin { File gradleJavaHome = Jvm.current().javaHome final Map 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())); } diff --git a/modules/reindex/build.gradle b/modules/reindex/build.gradle index 8870e21858d..ae4cf417049 100644 --- a/modules/reindex/build.gradle +++ b/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,