CI: Enable jdk21 builds

This reverts commit a2704b9.

.github/workflows/ci-prb-reports.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       # Matrix should be coordinated with ci-prb.yml.
       matrix:
-        java: [ 8, 11, 17, 20 ]
+        java: [ 8, 11, 17, 21 ]
         os: [ ubuntu-latest ]
     steps:
       - name: Download Artifacts

.github/workflows/ci-prb.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [ 8, 11, 17, 20 ]
+        java: [ 8, 11, 17, 21 ]
         os: [ ubuntu-latest ]
     steps:
       - name: Checkout Code

.github/workflows/ci-prq-reports.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 8, 11, 17, 20 ]
+        java: [ 8, 11, 17, 21 ]
     steps:
       - name: Download Artifacts
         uses: dawidd6/action-download-artifact@268677152d06ba59fcec7a7f0b5d961b6ccd7e1e

.github/workflows/ci-prq.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 8, 11, 17, 20 ]
+        java: [ 8, 11, 17, 21 ]
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4

build.gradle

@@ -41,6 +41,10 @@ task validateLocalDocSite(type: Exec) {
 quality.dependsOn validateLocalDocSite
 
 subprojects {
+  // mockito 5 only supports jdk11+
+  if (JavaVersion.current() < JavaVersion.VERSION_11) {
+    project.setProperty("mockitoCoreVersion", mockitoCorePreJdk11Version)
+  }
   // Used by ci-release.yaml to determine which modules need to be built/released with JDK11.
   task printJavaTargetCompatibility {
     doLast {

gradle.properties

@@ -72,7 +72,9 @@ junit5Version=5.9.3
 testngVersion=7.5
 assertJCoreVersion=3.24.2
 hamcrestVersion=2.2
-mockitoCoreVersion=4.11.0
+mockitoCoreVersion=5.5.0
+# mockito version is overridden for <jdk11 due to incompatibilities with newer bytebuddy and class format
+mockitoCorePreJdk11Version=4.11.0
 spotbugsPluginVersion=5.0.13
 
 apacheDirectoryServerVersion=1.5.7

servicetalk-gradle-plugin-internal/src/main/groovy/io/servicetalk/gradle/plugin/internal/ServiceTalkLibraryPlugin.groovy

@@ -280,6 +280,8 @@ final class ServiceTalkLibraryPlugin extends ServiceTalkCorePlugin {
           xml.enabled = project.ext.isCiBuild
           html.enabled = !project.ext.isCiBuild
         }
+        // https://github.com/spotbugs/spotbugs/issues/2567
+        enabled = JavaVersion.current() < JavaVersion.VERSION_21
       }
 
       tasks.withType(SpotBugsTask).all {