Skip to content

Commit fa97fd4

Browse files
committed
Switch old reindex tests to use use JDK 8 (elastic#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.
1 parent a51975b commit fa97fd4

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ class BuildPlugin implements Plugin<Project> {
119119
File gradleJavaHome = Jvm.current().javaHome
120120

121121
final Map<Integer, String> javaVersions = [:]
122-
for (int version = 7; version <= Integer.parseInt(minimumCompilerVersion.majorVersion); version++) {
122+
for (int version = 8; version <= Integer.parseInt(minimumCompilerVersion.majorVersion); version++) {
123123
if(System.getenv(getJavaHomeEnvVarName(version.toString())) != null) {
124124
javaVersions.put(version, findJavaHome(version.toString()));
125125
}

modules/reindex/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ if (Os.isFamily(Os.FAMILY_WINDOWS)) {
116116
dependsOn unzip
117117
executable = new File(project.runtimeJavaHome, 'bin/java')
118118
env 'CLASSPATH', "${ -> project.configurations.oldesFixture.asPath }"
119-
env 'JAVA_HOME', getJavaHome(it, 7)
119+
env 'JAVA_HOME', getJavaHome(it, 8)
120120
args 'oldes.OldElasticsearch',
121121
baseDir,
122122
unzip.temporaryDir,

0 commit comments

Comments
 (0)