Require JDK 9 for compilation #28071
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -56,7 +56,8 @@ import java.time.ZonedDateTime | |
| */ | ||
| class BuildPlugin implements Plugin<Project> { | ||
|
|
||
| static final JavaVersion minimumRuntimeVersion = JavaVersion.VERSION_1_8 | ||
| static final JavaVersion minimumCompilerVersion = JavaVersion.VERSION_1_9 | ||
|
|
||
| @Override | ||
| void apply(Project project) { | ||
|
|
@@ -93,20 +94,26 @@ class BuildPlugin implements Plugin<Project> { | |
| /** Performs checks on the build environment and prints information about the build environment. */ | ||
| static void globalBuildInfo(Project project) { | ||
| if (project.rootProject.ext.has('buildChecksDone') == false) { | ||
| String compilerJavaHome = findCompilerJavaHome() | ||
| String runtimeJavaHome = findRuntimeJavaHome(compilerJavaHome) | ||
| File gradleJavaHome = Jvm.current().javaHome | ||
| String javaVendor = System.getProperty('java.vendor') | ||
| String javaVersion = System.getProperty('java.version') | ||
| String gradleJavaVersionDetails = "${javaVendor} ${javaVersion}" + | ||
| " [${System.getProperty('java.vm.name')} ${System.getProperty('java.vm.version')}]" | ||
|
|
||
| String compilerJavaVersionDetails = gradleJavaVersionDetails | ||
| JavaVersion compilerJavaVersionEnum = JavaVersion.current() | ||
| if (new File(compilerJavaHome).canonicalPath != gradleJavaHome.canonicalPath) { | ||
| compilerJavaVersionDetails = findJavaVersionDetails(project, compilerJavaHome) | ||
| compilerJavaVersionEnum = JavaVersion.toVersion(findJavaSpecificationVersion(project, compilerJavaHome)) | ||
| } | ||
|
|
||
| String runtimeJavaVersionDetails = gradleJavaVersionDetails | ||
| JavaVersion runtimeJavaVersionEnum = JavaVersion.current() | ||
| if (new File(runtimeJavaHome).canonicalPath != gradleJavaHome.canonicalPath) { | ||
| runtimeJavaVersionDetails = findJavaVersionDetails(project, runtimeJavaHome) | ||
| runtimeJavaVersionEnum = JavaVersion.toVersion(findJavaSpecificationVersion(project, runtimeJavaHome)) | ||
| } | ||
|
|
||
| // Build debugging info | ||
|
|
@@ -115,11 +122,13 @@ class BuildPlugin implements Plugin<Project> { | |
| println '=======================================' | ||
| println " Gradle Version : ${project.gradle.gradleVersion}" | ||
| println " OS Info : ${System.getProperty('os.name')} ${System.getProperty('os.version')} (${System.getProperty('os.arch')})" | ||
| if (gradleJavaVersionDetails != compilerJavaVersionDetails || gradleJavaVersionDetails != runtimeJavaVersionDetails) { | ||
| println " JDK Version (gradle) : ${gradleJavaVersionDetails}" | ||
| println " JAVA_HOME (gradle) : ${gradleJavaHome}" | ||
| println " JDK Version (compile) : ${compilerJavaVersionDetails}" | ||
| println " JAVA_HOME (compile) : ${compilerJavaHome}" | ||
| println " JDK Version (runtime) : ${runtimeJavaVersionDetails}" | ||
| println " JAVA_HOME (runtime) : ${runtimeJavaHome}" | ||
| } else { | ||
| println " JDK Version : ${gradleJavaVersionDetails}" | ||
| println " JAVA_HOME : ${gradleJavaHome}" | ||
|
|
@@ -135,54 +144,47 @@ class BuildPlugin implements Plugin<Project> { | |
| } | ||
|
|
||
| // enforce Java version | ||
| if (compilerJavaVersionEnum < minimumCompilerVersion) { | ||
| throw new GradleException("Java ${minimumCompilerVersion} or above is required to build Elasticsearch") | ||
| } | ||
|
|
||
| if (runtimeJavaVersionEnum < minimumRuntimeVersion) { | ||
| throw new GradleException("Java ${minimumRuntimeVersion} or above is required to run Elasticsearch") | ||
| } | ||
|
|
||
| project.rootProject.ext.compilerJavaHome = compilerJavaHome | ||
| project.rootProject.ext.runtimeJavaHome = runtimeJavaHome | ||
| project.rootProject.ext.compilerJavaVersion = compilerJavaVersionEnum | ||
| project.rootProject.ext.runtimeJavaVersion = runtimeJavaVersionEnum | ||
| project.rootProject.ext.buildChecksDone = true | ||
| } | ||
| project.targetCompatibility = minimumRuntimeVersion | ||
| project.sourceCompatibility = minimumRuntimeVersion | ||
| // set java home for each project, so they dont have to find it in the root project | ||
| project.ext.compilerJavaHome = project.rootProject.ext.compilerJavaHome | ||
| project.ext.runtimeJavaHome = project.rootProject.ext.runtimeJavaHome | ||
| project.ext.compilerJavaVersion = project.rootProject.ext.compilerJavaVersion | ||
| project.ext.runtimeJavaVersion = project.rootProject.ext.runtimeJavaVersion | ||
| } | ||
|
|
||
| private static String findCompilerJavaHome() { | ||
| final String javaHome = System.getenv('JAVA_HOME') | ||
| if (javaHome == null) { | ||
| if (System.getProperty("idea.active") != null || System.getProperty("eclipse.launcher") != null) { | ||
| // IntelliJ does not set JAVA_HOME, so we use the JDK that Gradle was run with | ||
| return Jvm.current().javaHome | ||
| } else { | ||
| throw new GradleException("JAVA_HOME must be set to build Elasticsearch") | ||
| } | ||
| } | ||
| return javaHome | ||
| } | ||
|
|
||
| private static String findRuntimeJavaHome(final String compilerJavaHome) { | ||
| assert compilerJavaHome != null | ||
| return System.getenv('RUNTIME_JAVA_HOME') ?: compilerJavaHome | ||
| } | ||
|
|
||
| /** Finds printable java version of the given JAVA_HOME */ | ||
| private static String findJavaVersionDetails(Project project, String javaHome) { | ||
| String versionInfoScript = 'print(' + | ||
|
|
@@ -412,7 +414,7 @@ class BuildPlugin implements Plugin<Project> { | |
|
|
||
| /** Adds compiler settings to the project */ | ||
| static void configureCompile(Project project) { | ||
| if (project.compilerJavaVersion < JavaVersion.VERSION_1_10) { | ||
| project.ext.compactProfile = 'compact3' | ||
| } else { | ||
| project.ext.compactProfile = 'full' | ||
|
|
@@ -422,7 +424,7 @@ class BuildPlugin implements Plugin<Project> { | |
| File gradleJavaHome = Jvm.current().javaHome | ||
| // we fork because compiling lots of different classes in a shared jvm can eventually trigger GC overhead limitations | ||
| options.fork = true | ||
| options.forkOptions.javaHome = new File(project.compilerJavaHome) | ||
| options.forkOptions.memoryMaximumSize = "1g" | ||
| if (project.targetCompatibility >= JavaVersion.VERSION_1_8) { | ||
| // compile with compact 3 profile by default | ||
|
|
@@ -447,22 +449,17 @@ class BuildPlugin implements Plugin<Project> { | |
|
|
||
| options.encoding = 'UTF-8' | ||
| options.incremental = true | ||
| options.compilerArgs << '--release' << project.targetCompatibility.majorVersion | ||
|
There was a problem hiding this comment. Can you add a comment to this line linking the relevant gradle issue for adding builtin support for this: gradle/gradle#2510 |
||
| } | ||
| } | ||
| } | ||
|
|
||
| static void configureJavadoc(Project project) { | ||
| project.tasks.withType(Javadoc) { | ||
| executable = new File(project.compilerJavaHome, 'bin/javadoc') | ||
| } | ||
| configureJavadocJar(project) | ||
| if (project.compilerJavaVersion == JavaVersion.VERSION_1_10) { | ||
| project.tasks.withType(Javadoc) { it.enabled = false } | ||
| project.tasks.getByName('javadocJar').each { it.enabled = false } | ||
| } | ||
|
|
@@ -508,7 +505,7 @@ class BuildPlugin implements Plugin<Project> { | |
| 'X-Compile-Lucene-Version': VersionProperties.lucene, | ||
| 'X-Compile-Elasticsearch-Snapshot': isSnapshot, | ||
| 'Build-Date': ZonedDateTime.now(ZoneOffset.UTC), | ||
| 'Build-Java-Version': project.compilerJavaVersion) | ||
| if (jarTask.manifest.attributes.containsKey('Change') == false) { | ||
| logger.warn('Building without git revision id.') | ||
| jarTask.manifest.attributes('Change': 'Unknown') | ||
|
|
@@ -545,7 +542,7 @@ class BuildPlugin implements Plugin<Project> { | |
| /** Returns a closure of common configuration shared by unit and integration tests. */ | ||
| static Closure commonTestConfig(Project project) { | ||
| return { | ||
| jvm "${project.runtimeJavaHome}/bin/java" | ||
| parallelism System.getProperty('tests.jvms', 'auto') | ||
| ifNoTests 'fail' | ||
| onNonEmptyWorkDirectory 'wipe' | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why was this exception changed to an assertion? Is it moved somewhere else I'm missing?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am glad that you caught this. This was inadvertent, it arose in a refactoring I did in 95475f9 which refactored two basically identical methods from an earlier version of this pull request (
findCompilerJavaHomeandfindRuntimeJavaHome) into one (findJavaHome). Before the refactoring, the second method did not need such a line because by the time it had executed the first one would have already thrown that exception (hence theassert false). When I refactored, I must have based by work onfindRuntimeJavaHomeinadvertently losing this exception. I have pushed: bcee920.