From 86642d29e504fde4153008092ae0b5f2e93c4b64 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Wed, 3 Oct 2018 08:59:00 -0400 Subject: [PATCH] Require JDK 11 for compilation (#34103) Now that JDK 11 is GA, we would switch our 6.x and master branches to the JDK 11 compiler. This commit makes this change, as well as removes JDK 10 from the CI configuration. --- .ci/java-versions.properties | 2 +- .ci/matrix-build-javas.yml | 1 - .ci/matrix-runtime-javas.yml | 1 - buildSrc/src/main/resources/minimumCompilerVersion | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.ci/java-versions.properties b/.ci/java-versions.properties index a0713ce128e..9202be97bd9 100644 --- a/.ci/java-versions.properties +++ b/.ci/java-versions.properties @@ -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=java10 +ES_BUILD_JAVA=java11 ES_RUNTIME_JAVA=java8 diff --git a/.ci/matrix-build-javas.yml b/.ci/matrix-build-javas.yml index bbb61b8eb6d..debb074fce1 100644 --- a/.ci/matrix-build-javas.yml +++ b/.ci/matrix-build-javas.yml @@ -6,5 +6,4 @@ # or 'openjdk' followed by the major release number. ES_BUILD_JAVA: - - java10 - java11 diff --git a/.ci/matrix-runtime-javas.yml b/.ci/matrix-runtime-javas.yml index ca7db3b5513..8025ac237db 100644 --- a/.ci/matrix-runtime-javas.yml +++ b/.ci/matrix-runtime-javas.yml @@ -8,5 +8,4 @@ ES_RUNTIME_JAVA: - java8 - java8fips - - java10 - java11 diff --git a/buildSrc/src/main/resources/minimumCompilerVersion b/buildSrc/src/main/resources/minimumCompilerVersion index 578c71bd558..b8162070734 100644 --- a/buildSrc/src/main/resources/minimumCompilerVersion +++ b/buildSrc/src/main/resources/minimumCompilerVersion @@ -1 +1 @@ -1.10 \ No newline at end of file +1.11 \ No newline at end of file