build upgrades

ben-manes · Mar 23, 2024 · 7dcc4a4 · 7dcc4a4
1 parent 2760df1
commit 7dcc4a4
Show file tree

Hide file tree

Showing 22 changed files with 35 additions and 100 deletions.
diff --git a/.github/actions/run-gradle/action.yml b/.github/actions/run-gradle/action.yml
@@ -2,17 +2,18 @@ name: Run Gradle
 description: Sets up Gradle JDKs and runs Gradle
 inputs:
   arguments:
-    required: true
+    default: ''
+    required: false
     description: Gradle arguments
   java:
     required: true
     description: The JDK version
   early-access:
-    default: '22'
+    default: '23'
     required: false
     description: The early access release
   graal:
-    default: '17'
+    default: '21'
     required: false
     description: The GraalVM version
   token:
@@ -89,6 +90,7 @@ runs:
       shell: bash
       run: sleep 10
     - name: Run ${{ inputs.arguments }}
+      if: inputs.arguments != ''
       env:
         JAVA_HOME: ${{ steps.setup-gradle-jdk.outputs.path }}
         ORG_GRADLE_PROJECT_org.gradle.java.installations.auto-download: 'false'

diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
@@ -23,7 +23,7 @@ jobs:
   forbiddenApis:
     runs-on: ubuntu-latest
     env:
-      JAVA_VERSION: 21
+      JAVA_VERSION: 22
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
@@ -41,7 +41,7 @@ jobs:
   pmd:
     runs-on: ubuntu-latest
     env:
-      JAVA_VERSION: 21
+      JAVA_VERSION: 22
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
@@ -59,7 +59,7 @@ jobs:
   spotbugs:
     runs-on: ubuntu-latest
     env:
-      JAVA_VERSION: 21
+      JAVA_VERSION: 22
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0

diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 11, 21, 22, GraalVM ]
+        java: [ 11, 21, 23, GraalVM ]
     env:
       JAVA_VERSION: ${{ matrix.java }}
     steps:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -39,7 +39,7 @@ env:
     schemastore.org:443
     www.graalvm.org:443
   PUBLISH_JDK: 11
-  EA_JDK: 22
+  EA_JDK: 23
 
 jobs:
   compile:
@@ -48,7 +48,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 11, 21, 22, GraalVM ]
+        java: [ 11, 22, 23, GraalVM ]
     env:
       JAVA_VERSION: ${{ matrix.java }}
     steps:
@@ -118,7 +118,7 @@ jobs:
           - simulator:check
           - jcache:check
           - guava:check
-        java: [ 11, 21 ]
+        java: [ 11, 22 ]
         include:
           - suite: caffeine:weakKeysAndStrongValuesStatsSyncGuavaSlowTest
             java: 11

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -22,7 +22,7 @@ permissions:
 
 env:
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-  JAVA_VERSION: 17
+  JAVA_VERSION: 21
 
 jobs:
   analyze:
@@ -51,27 +51,11 @@ jobs:
             services.gradle.org:443
       - name: Checkout repository
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
-      - name: Set up JDK ${{ env.JAVA_VERSION }}
-        uses: Wandalen/wretry.action@1a10d4835a1506f513ad8e7488aeb474ab20055c # v1.4.10
-        timeout-minutes: 5
-        with:
-          action: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
-          with: |
-            distribution: temurin
-            java-version: ${{ env.JAVA_VERSION }}
-          attempt_limit: 3
-          attempt_delay: 2000
       - name: Setup Gradle
-        uses: Wandalen/wretry.action@1a10d4835a1506f513ad8e7488aeb474ab20055c # v1.4.10
-        timeout-minutes: 5
+        uses: ./.github/actions/run-gradle
         with:
-          action: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
-          with: |
-            add-job-summary: never
-            cache-read-only: false
-            gradle-home-cache-cleanup: true
-          attempt_limit: 3
-          attempt_delay: 2000
+          java: ${{ env.JAVA_VERSION }}
+          token: ${{ secrets.GITHUB_TOKEN }}
       - name: Initialize CodeQL
         uses: github/codeql-action/init@3ab4101902695724f9365a384f86c1074d94e18c # v3.24.7
         with:

diff --git a/.github/workflows/dependency-check.yml b/.github/workflows/dependency-check.yml
@@ -8,7 +8,7 @@ permissions: read-all
 
 env:
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-  JAVA_VERSION: 21
+  JAVA_VERSION: 22
 
 jobs:
   dependency-check:

diff --git a/.github/workflows/dependency-submission-pr-retreive.yml b/.github/workflows/dependency-submission-pr-retreive.yml
@@ -7,7 +7,6 @@ on:
 
 env:
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-  JAVA_VERSION: 21
 
 jobs:
   submit-dependency-graph:

diff --git a/.github/workflows/dependency-submission-pr-submit.yml b/.github/workflows/dependency-submission-pr-submit.yml
@@ -4,7 +4,6 @@ on: [ pull_request ]
 
 env:
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-  JAVA_VERSION: 21
 
 jobs:
   dependency-submission:
@@ -32,17 +31,6 @@ jobs:
             repo1.maven.org:443
             services.gradle.org:443
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
-      - name: Set up JDK ${{ env.JAVA_VERSION }}
-        uses: Wandalen/wretry.action@1a10d4835a1506f513ad8e7488aeb474ab20055c # v1.4.10
-        timeout-minutes: 5
-        with:
-          action: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
-          with: |
-            cache: gradle
-            distribution: temurin
-            java-version: ${{ env.JAVA_VERSION }}
-          attempt_limit: 3
-          attempt_delay: 2000
       - name: Submit Dependency Graph
         uses: gradle/actions/dependency-submission@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
         with:

diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml
@@ -4,7 +4,6 @@ on: [ push ]
 
 env:
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-  JAVA_VERSION: 21
 
 jobs:
   dependency-submission:
@@ -32,17 +31,6 @@ jobs:
             repo1.maven.org:443
             services.gradle.org:443
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
-      - name: Set up JDK ${{ env.JAVA_VERSION }}
-        uses: Wandalen/wretry.action@1a10d4835a1506f513ad8e7488aeb474ab20055c # v1.4.10
-        timeout-minutes: 5
-        with:
-          action: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
-          with: |
-            cache: gradle
-            distribution: temurin
-            java-version: ${{ env.JAVA_VERSION }}
-          attempt_limit: 3
-          attempt_delay: 2000
       - name: Submit Dependency Graph
         uses: gradle/actions/dependency-submission@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
         with:

diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -4,7 +4,7 @@ on: [ push, pull_request ]
 
 env:
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-  JAVA_VERSION: 21
+  JAVA_VERSION: 22
 
 jobs:
   examples:
@@ -32,36 +32,11 @@ jobs:
             repo1.maven.org:443
             services.gradle.org:443
             www.graalvm.org:443
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
-      - name: Set up JDK ${{ env.JAVA_VERSION }}
-        uses: Wandalen/wretry.action@1a10d4835a1506f513ad8e7488aeb474ab20055c # v1.4.10
-        timeout-minutes: 5
-        with:
-          action: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
-          with: |
-            distribution: temurin
-            java-version: ${{ env.JAVA_VERSION }}
-          attempt_limit: 3
-          attempt_delay: 2000
       - name: Setup Gradle
-        uses: Wandalen/wretry.action@1a10d4835a1506f513ad8e7488aeb474ab20055c # v1.4.10
-        timeout-minutes: 5
-        with:
-          action: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
-          with: |
-            add-job-summary: never
-            cache-read-only: false
-            gradle-home-cache-cleanup: true
-            gradle-home-cache-strict-match: true
-          attempt_limit: 3
-          attempt_delay: 2000
-      - name: Setup Maven
-        uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
+        uses: ./.github/actions/run-gradle
         with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ env.JAVA_VERSION }}-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
+          java: ${{ env.JAVA_VERSION }}
+          token: ${{ secrets.GITHUB_TOKEN }}
       - name: Simulator
         run: >
           ./gradlew simulator:run

diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml
@@ -29,6 +29,7 @@ jobs:
             api.osv.dev:443
             api.securityscorecards.dev:443
             bestpractices.coreinfrastructure.org:443
+            bestpractices.dev:443
             fulcio.sigstore.dev:443
             github.com:443
             oss-fuzz-build-logs.storage.googleapis.com:443

diff --git a/examples/coalescing-bulkloader-reactor/gradle/wrapper/gradle-wrapper.properties b/examples/coalescing-bulkloader-reactor/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

diff --git a/examples/graal-native/gradle/wrapper/gradle-wrapper.properties b/examples/graal-native/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

diff --git a/examples/hibernate/build.gradle.kts b/examples/hibernate/build.gradle.kts
@@ -26,7 +26,7 @@ testing.suites {
 }
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(
-  System.getenv("JAVA_VERSION")?.toIntOrNull() ?: 11)
+  System.getenv("JAVA_VERSION")?.toIntOrNull() ?: 17)
 
 tasks.withType<JavaCompile>().configureEach {
   javaCompiler = javaToolchains.compilerFor {

diff --git a/examples/hibernate/gradle/libs.versions.toml b/examples/hibernate/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 caffeine = "3.1.8"
 h2 = "2.2.224"
-hibernate = "6.4.4.Final"
+hibernate = "6.5.0.CR1"
 junit = "5.10.2"
 log4j2 = "3.0.0-beta2"
 slf4j = "2.0.7"

diff --git a/examples/hibernate/gradle/wrapper/gradle-wrapper.properties b/examples/hibernate/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

diff --git a/examples/resilience-failsafe/gradle/wrapper/gradle-wrapper.properties b/examples/resilience-failsafe/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

diff --git a/examples/write-behind-rxjava/gradle/libs.versions.toml b/examples/write-behind-rxjava/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-awaitility = "4.2.0"
+awaitility = "4.2.1"
 caffeine = "3.1.8"
 junit = "5.10.2"
 rxjava = "3.1.8"

diff --git a/examples/write-behind-rxjava/gradle/wrapper/gradle-wrapper.properties b/examples/write-behind-rxjava/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradle/config/pmd/rulesSets.xml b/gradle/config/pmd/rulesSets.xml
@@ -40,6 +40,7 @@
     <exclude name="ShortClassName"/>
     <exclude name="ShortMethodName"/>
     <exclude name="ConfusingTernary"/>
+    <exclude name="UseExplicitTypes"/>
     <exclude name="UnnecessaryReturn"/>
     <exclude name="UseDiamondOperator"/>
     <exclude name="UselessParentheses"/>
@@ -79,10 +80,8 @@
     <exclude name="ExcessiveImports"/>
     <exclude name="CognitiveComplexity"/>
     <exclude name="CyclomaticComplexity"/>
-    <exclude name="ExcessiveClassLength"/>
     <exclude name="ExcessivePublicCount"/>
     <exclude name="LoosePackageCoupling"/>
-    <exclude name="ExcessiveMethodLength"/>
     <exclude name="CouplingBetweenObjects"/>
     <exclude name="AvoidRethrowingException"/>
     <exclude name="AbstractClassWithoutAnyMethod"/>
@@ -99,7 +98,6 @@
 
   <rule ref="category/java/errorprone.xml">
     <exclude name="DontImportSun"/>
-    <exclude name="EmptyWhileStmt"/>
     <exclude name="NullAssignment"/>
     <exclude name="AssignmentInOperand"/>
     <exclude name="UseProperClassLoader"/>

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ bouncycastle-jdk18on = "1.77"
 cache2k = "2.6.1.Final"
 caffeine = "3.1.8"
 checker-framework = "3.42.0"
-checkstyle = "10.14.1"
+checkstyle = "10.14.2"
 coherence = "22.06.2"
 commons-collections4 = "4.4"
 commons-compress = "1.26.1"
@@ -77,15 +77,15 @@ osgi-promise = "1.3.0"
 pax-exam = "4.13.5"
 pax-url = "2.6.14"
 picocli = "4.7.5"
-pmd = "7.0.0-rc4"
+pmd = "7.0.0"
 protobuf = "4.26.0"
 slf4j = "2.0.12"
 slf4j-test = "3.0.1"
 snakeyaml = "2.2"
 sonarqube = "4.4.1.3373"
 spotbugs-contrib = "7.6.4"
 spotbugs-core = "4.8.3"
-spotbugs-plugin = "6.0.8"
+spotbugs-plugin = "6.0.9"
 stream = "2.9.8"
 tcache = "2.0.1"
 testng = "7.9.0"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,6 @@ on: @@
     env:
       GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-      JAVA_VERSION: 21
     jobs:
       submit-dependency-graph:
@@ Expand Down @@