Skip to content

Commit e4b9044

Browse files
authored
Require JDK 13 for compilation (elastic#50004)
We have a long history of advancing the required compiler to the newest JDK. JDK 13 has been with us for awhile, but we were blocked from upgrading since Gradle was not compatible with JDK 13. With the advancement in our project to Gradle 6 which supports JDK 13, we can now advance our minimum compiler version. This commit updates the minimum compiler version to JDK 13.
1 parent 4745b77 commit e4b9044

File tree

8 files changed

+10
-12
lines changed

8 files changed

+10
-12
lines changed

.ci/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
JAVA_HOME=${JAVA_HOME:-$HOME/.java/openjdk12}
3+
JAVA_HOME=${JAVA_HOME:-$HOME/.java/openjdk13}
44
RUNTIME_JAVA_HOME=${RUNTIME_JAVA_HOME:-$HOME/.java/openjdk11}
55

66
JAVA7_HOME=$HOME/.java/java7

.ci/java-versions.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# build and test Elasticsearch for this branch. Valid Java versions
55
# are 'java' or 'openjdk' followed by the major release number.
66

7-
ES_BUILD_JAVA=openjdk12
7+
ES_BUILD_JAVA=openjdk13
88
ES_RUNTIME_JAVA=openjdk11
99
GRADLE_TASK=build
1010

.ci/matrix-build-javas.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
# or 'openjdk' followed by the major release number.
77

88
ES_BUILD_JAVA:
9-
- openjdk12
9+
- openjdk13

.ci/matrix-runtime-javas.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,8 @@
77

88
ES_RUNTIME_JAVA:
99
- java11
10-
- java12
11-
- openjdk12
1210
- openjdk13
1311
- openjdk14
1412
- zulu11
15-
- zulu12
1613
- corretto11
1714
- adoptopenjdk11

.ci/packer_cache.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@ export JAVA_HOME="${HOME}"/.java/${ES_BUILD_JAVA}
2121
export JAVA8_HOME="${HOME}"/.java/java8
2222
export JAVA11_HOME="${HOME}"/.java/java11
2323
export JAVA12_HOME="${HOME}"/.java/openjdk12
24+
export JAVA13_HOME="${HOME}"/.java/openjdk13
2425
./gradlew --parallel clean --scan -Porg.elasticsearch.acceptScanTOS=true -s resolveAllDependencies
2526

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,16 +92,16 @@ Contributing to the Elasticsearch codebase
9292

9393
**Repository:** [https://github.com/elastic/elasticsearch](https://github.com/elastic/elasticsearch)
9494

95-
JDK 12 is required to build Elasticsearch. You must have a JDK 12 installation
95+
JDK 13 is required to build Elasticsearch. You must have a JDK 13 installation
9696
with the environment variable `JAVA_HOME` referencing the path to Java home for
97-
your JDK 12 installation. By default, tests use the same runtime as `JAVA_HOME`.
97+
your JDK 13 installation. By default, tests use the same runtime as `JAVA_HOME`.
9898
However, since Elasticsearch supports JDK 11, the build supports compiling with
99-
JDK 12 and testing on a JDK 11 runtime; to do this, set `RUNTIME_JAVA_HOME`
99+
JDK 13 and testing on a JDK 11 runtime; to do this, set `RUNTIME_JAVA_HOME`
100100
pointing to the Java home of a JDK 11 installation. Note that this mechanism can
101101
be used to test against other JDKs as well, this is not only limited to JDK 11.
102102

103103
> Note: It is also required to have `JAVA8_HOME`, `JAVA9_HOME`, `JAVA10_HOME`
104-
and `JAVA11_HOME` available so that the tests can pass.
104+
and `JAVA11_HOME`, and `JAVA12_HOME` available so that the tests can pass.
105105

106106
> Warning: do not use `sdkman` for Java installations which do not have proper
107107
`jrunscript` for jdk distributions.

buildSrc/src/main/groovy/org/elasticsearch/gradle/test/DistroTestPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public class DistroTestPlugin implements Plugin<Project> {
7575

7676
private static final String SYSTEM_JDK_VERSION = "11.0.2+9";
7777
private static final String SYSTEM_JDK_VENDOR = "openjdk";
78-
private static final String GRADLE_JDK_VERSION = "12.0.1+12@69cfe15208a647278a19ef0990eea691";
78+
private static final String GRADLE_JDK_VERSION = "13.0.1+9@cec27d702aa74d5a8630c65ae61e4305";
7979
private static final String GRADLE_JDK_VENDOR = "openjdk";
8080

8181
// all distributions used by distro tests. this is temporary until tests are per distribution
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
12
1+
13

0 commit comments

Comments
 (0)