honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Jason Tedor 2018-10-19 15:11:48 -04:00 committed by GitHub
parent 630d5514a5
commit 48ab6d7c92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
View File

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

2
modules/reindex/build.gradle
View File

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