Merge remote-tracking branch 'origin/master'

mjpt777 · mjpt777 · commit c2fb2c44c7aa · 2023-09-29T13:42:07.000+01:00
diff --git 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
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ subprojects {`
`202`	`202`	`options.docEncoding = 'UTF-8'`
`203`	`203`	`options.charSet = 'UTF-8'`
`204`	`204`	`options.links("https://www.javadoc.io/doc/org.agrona/agrona/${agronaVersion}/")`
`205`		`- if (buildJavaVersion >= 19) { // early access JavaDoc location is different`
	`205`	`+ if (buildJavaVersion > 21) { // early access JavaDoc location is different`
`206`	`206`	`options.links("https://download.java.net/java/early_access/jdk${buildJavaVersion}/docs/api/")`
`207`	`207`	`}`
`208`	`208`	`else if (buildJavaVersion >= 11) {`