From 0dcf92266164ecc1e8428a07feda8f4351d576f6 Mon Sep 17 00:00:00 2001 From: Dmitry Vyazelenko <696855+vyazelenko@users.noreply.github.com> Date: Wed, 20 Sep 2023 12:46:13 +0200 Subject: [PATCH 1/2] [CI] Use JDK 21 GA and drop JDK 11. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e89e54c17..d6a6ef95e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: strategy: fail-fast: false matrix: - java: [ '8', '11', '17', '21-ea' ] + java: [ '8', '17', '21' ] os: [ 'ubuntu-22.04', 'windows-latest' ] steps: - name: Checkout code From 510d3e8929ef72cb71b5258afdada16f6f08d486 Mon Sep 17 00:00:00 2001 From: Dmitry Vyazelenko <696855+vyazelenko@users.noreply.github.com> Date: Wed, 20 Sep 2023 13:03:01 +0200 Subject: [PATCH 2/2] [Java] Fix javadoc link for JDK 21 GA. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b0015d32a..2761b537e 100644 --- a/build.gradle +++ b/build.gradle @@ -202,7 +202,7 @@ subprojects { options.docEncoding = 'UTF-8' options.charSet = 'UTF-8' options.links("https://www.javadoc.io/doc/org.agrona/agrona/${agronaVersion}/") - if (buildJavaVersion >= 19) { // early access JavaDoc location is different + if (buildJavaVersion > 21) { // early access JavaDoc location is different options.links("https://download.java.net/java/early_access/jdk${buildJavaVersion}/docs/api/") } else if (buildJavaVersion >= 11) {