Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump minimum compiler version to Java 16 #71989

Merged
merged 9 commits into from
May 25, 2021
Merged

Bump minimum compiler version to Java 16 #71989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5429b9d
Bump minimum compiler version to Java 16
mark-vieira Apr 20, 2021
49eccec
Allow illegal access since loads of dependencies do it
mark-vieira Apr 20, 2021
ad1c80c
Merge branch 'master' into minimum-compile-java-16
elasticmachine Apr 22, 2021
6e31b58
Merge remote-tracking branch 'origin/master' into minimum-compile-jav…
mark-vieira Apr 27, 2021
e2bdaa8
Merge remote-tracking branch 'mark-vieira/minimum-compile-java-16' in…
mark-vieira Apr 27, 2021
bcfcab8
Merge branch 'master' into minimum-compile-java-16
elasticmachine Apr 30, 2021
228dc1f
Merge branch 'master' into minimum-compile-java-16
elasticmachine May 10, 2021
af3ceed
Merge remote-tracking branch 'origin/master' into minimum-compile-jav…
mark-vieira May 25, 2021
809bc7d
Merge remote-tracking branch 'mark-vieira/minimum-compile-java-16' in…
mark-vieira May 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/java-versions.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
# build and test Elasticsearch for this branch. Valid Java versions
# are 'java' or 'openjdk' followed by the major release number.

ES_BUILD_JAVA=openjdk15
ES_BUILD_JAVA=openjdk16
ES_RUNTIME_JAVA=openjdk11
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/org/elasticsearch/gradle/internal/info/GlobalBuildInfoPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ private static void throwInvalidJavaHomeException(String description, File javaH

private static void assertMinimumCompilerVersion(JavaVersion minimumCompilerVersion) {
JavaVersion currentVersion = Jvm.current().getJavaVersion();
if (minimumCompilerVersion.compareTo(currentVersion) > 0) {
if (System.getProperty("idea.active", "false").equals("true") == false && minimumCompilerVersion.compareTo(currentVersion) > 0) {
throw new GradleException(
"Project requires Java version of " + minimumCompilerVersion + " or newer but Gradle JAVA_HOME is " + currentVersion
);
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/resources/minimumCompilerVersion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
15
16