Revert "CI: Enable jdk21 builds (#2702)"

This reverts commit 5d9a29a.
apple · Sep 21, 2023 · 1e9f151 · 1e9f151
1 parent 5d9a29a
commit 1e9f151
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 12 deletions.
diff --git a/.github/workflows/ci-prb-reports.yml b/.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, 21 ]
+        java: [ 8, 11, 17, 20 ]
         os: [ ubuntu-latest ]
     steps:
       - name: Download Artifacts

diff --git a/.github/workflows/ci-prb.yml b/.github/workflows/ci-prb.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [ 8, 11, 17, 21 ]
+        java: [ 8, 11, 17, 20 ]
         os: [ ubuntu-latest ]
     steps:
       - name: Checkout Code

diff --git a/.github/workflows/ci-prq-reports.yml b/.github/workflows/ci-prq-reports.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 8, 11, 17, 21 ]
+        java: [ 8, 11, 17, 20 ]
     steps:
       - name: Download Artifacts
         uses: dawidd6/action-download-artifact@268677152d06ba59fcec7a7f0b5d961b6ccd7e1e

diff --git a/.github/workflows/ci-prq.yml b/.github/workflows/ci-prq.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 8, 11, 17, 21 ]
+        java: [ 8, 11, 17, 20 ]
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4

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

diff --git a/gradle.properties b/gradle.properties
@@ -72,8 +72,7 @@ junit5Version=5.9.3
 testngVersion=7.5
 assertJCoreVersion=3.24.2
 hamcrestVersion=2.2
-# mockito version is overridden for <jdk11 in build.gradle
-mockitoCoreVersion=5.5.0
+mockitoCoreVersion=4.11.0
 spotbugsPluginVersion=5.0.13
 
 apacheDirectoryServerVersion=1.5.7

diff --git a/...nal/src/main/groovy/io/servicetalk/gradle/plugin/internal/ServiceTalkLibraryPlugin.groovy b/...nal/src/main/groovy/io/servicetalk/gradle/plugin/internal/ServiceTalkLibraryPlugin.groovy
@@ -280,8 +280,6 @@ 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 {