dependency upgrades

ben-manes · Apr 14, 2024 · 25f9218 · 25f9218
1 parent 56a16c8
commit 25f9218
Show file tree

Hide file tree

Showing 31 changed files with 127 additions and 99 deletions.
diff --git a/.github/actions/run-gradle/action.yml b/.github/actions/run-gradle/action.yml
@@ -73,7 +73,7 @@ runs:
         distribution: temurin
     - name: Setup Gradle
       id: setup-gradle
-      uses: gradle/actions/setup-gradle@1168cd3d07c1876a65e1724114de42ccbdfa7b78 # v3.2.1
+      uses: gradle/actions/setup-gradle@6cec5d49d4d6d4bb982fbed7047db31ea6d38f11 # v3.3.0
       env:
         JAVA_HOME: ${{ steps.setup-gradle-jdk.outputs.path }}
         ORG_GRADLE_PROJECT_org.gradle.java.installations.auto-download: 'false'

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -3,36 +3,36 @@ updates:
   - package-ecosystem: github-actions
     directory: /
     schedule:
-      interval: daily
+      interval: monthly
   - package-ecosystem: github-actions
     directory: /.github/actions/run-gradle
     schedule:
-      interval: daily
+      interval: monthly
   - package-ecosystem: gradle
     directory: /
     schedule:
-      interval: daily
+      interval: monthly
   - package-ecosystem: gradle
     directory: gradle/plugins
     schedule:
-      interval: daily
+      interval: monthly
   - package-ecosystem: gradle
     directory: examples/coalescing-bulkloader-reactor
     schedule:
-      interval: daily
+      interval: monthly
   - package-ecosystem: gradle
     directory: examples/write-behind-rxjava
     schedule:
-      interval: daily
+      interval: monthly
   - package-ecosystem: gradle
     directory: examples/hibernate
     schedule:
-      interval: daily
+      interval: monthly
   - package-ecosystem: gradle
     directory: examples/resilience-failsafe
     schedule:
-      interval: daily
+      interval: monthly
   - package-ecosystem: gradle
     directory: examples/graal-native
     schedule:
-      interval: daily
+      interval: monthly
diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
@@ -3,7 +3,7 @@ permissions: read-all
 on: [ push, pull_request ]
 
 env:
-  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
   ALLOWED_ENDPOINTS: >
     api.adoptium.net:443
     api.github.com:443

diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -3,7 +3,7 @@ permissions: read-all
 on: [ push, pull_request ]
 
 env:
-  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
   PUBLISH_JDK: 21
 
 jobs:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,7 +6,7 @@ on:
 permissions: read-all
 
 env:
-  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
   ALLOWED_ENDPOINTS: >
     *.actions.githubusercontent.com:443
     api.adoptium.net:443

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -21,7 +21,7 @@ permissions:
   security-events: write
 
 env:
-  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
   JAVA_VERSION: 21
 
 jobs:

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

diff --git a/.github/workflows/dependency-submission-pr-retreive.yml b/.github/workflows/dependency-submission-pr-retreive.yml
@@ -6,7 +6,7 @@ on:
     types: [completed]
 
 env:
-  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
   JAVA_VERSION: 22
 
 jobs:
@@ -35,6 +35,6 @@ jobs:
             repo1.maven.org:443
             services.gradle.org:443
       - name: Retrieve and submit dependency graph
-        uses: gradle/actions/dependency-submission@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
+        uses: gradle/actions/dependency-submission@6cec5d49d4d6d4bb982fbed7047db31ea6d38f11 # v3.3.0
         with:
           dependency-graph: download-and-submit
diff --git a/.github/workflows/dependency-submission-pr-submit.yml b/.github/workflows/dependency-submission-pr-submit.yml
@@ -3,7 +3,7 @@ permissions: read-all
 on: [ pull_request ]
 
 env:
-  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
   JAVA_VERSION: 21
 
 jobs:
@@ -38,7 +38,7 @@ jobs:
           java-version: ${{ env.JAVA_VERSION }}
           distribution: temurin
       - name: Submit Dependency Graph
-        uses: gradle/actions/dependency-submission@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
+        uses: gradle/actions/dependency-submission@6cec5d49d4d6d4bb982fbed7047db31ea6d38f11 # v3.3.0
         with:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
           dependency-graph: generate-and-upload
diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml
@@ -3,7 +3,7 @@ permissions: read-all
 on: [ push ]
 
 env:
-  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
   JAVA_VERSION: 21
 
 jobs:
@@ -38,6 +38,6 @@ jobs:
           java-version: ${{ env.JAVA_VERSION }}
           distribution: temurin
       - name: Submit Dependency Graph
-        uses: gradle/actions/dependency-submission@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
+        uses: gradle/actions/dependency-submission@6cec5d49d4d6d4bb982fbed7047db31ea6d38f11 # v3.3.0
         with:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -3,7 +3,7 @@ permissions: read-all
 on: [ push, pull_request ]
 
 env:
-  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
   JAVA_VERSION: 21
 
 jobs:

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
@@ -18,4 +18,4 @@ jobs:
             github.com:443
             services.gradle.org:443
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
-      - uses: gradle/wrapper-validation-action@b5418f5a58f5fd2eb486dd7efb368fe7be7eae45 # v2.1.3
+      - uses: gradle/actions/wrapper-validation@6cec5d49d4d6d4bb982fbed7047db31ea6d38f11 # v3.3.0
diff --git a/.github/workflows/qodana.yml b/.github/workflows/qodana.yml
@@ -3,7 +3,7 @@ permissions: read-all
 on: [ push, pull_request ]
 
 env:
-  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
   JAVA_VERSION: 11
 
 jobs:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,7 +5,7 @@ on:
 permissions: read-all
 
 env:
-  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
   JAVA_VERSION: 11
 
 jobs:

diff --git a/.github/workflows/snyk.yml b/.github/workflows/snyk.yml
@@ -5,7 +5,7 @@ on:
 permissions: read-all
 
 env:
-  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 
 jobs:
   snyk:

diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml
@@ -34,4 +34,4 @@ jobs:
             objects.githubusercontent.com:443
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
       - name: Typos
-        uses: crate-ci/typos@bcafd462cb07ef7ba57e34abf458fe20767e808b # v1.19.0
+        uses: crate-ci/typos@efad85b292e13df995ff2476013baaa5f1c30459 # v1.20.8
diff --git a/caffeine/build.gradle.kts b/caffeine/build.gradle.kts
@@ -3,6 +3,8 @@ import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApis
 import kotlin.math.max
 import net.ltgt.gradle.errorprone.errorprone
 import org.gradle.api.tasks.PathSensitivity.RELATIVE
+import org.gradle.plugins.ide.eclipse.model.Classpath as EclipseClasspath
+import org.gradle.plugins.ide.eclipse.model.Library
 
 plugins {
   id("java-library-caffeine-conventions")
@@ -21,6 +23,7 @@ sourceSets {
 
 val compileJavaPoetJava by tasks.existing
 val javaAgent: Configuration by configurations.creating
+val collections4Sources: Configuration by configurations.creating
 var javaPoetImplementation: Configuration = configurations["javaPoetImplementation"]
 
 dependencies {
@@ -45,6 +48,11 @@ dependencies {
       classifier = "tests"
     }
   }
+  collections4Sources(libs.commons.collections4) {
+    artifact {
+      classifier = "test-sources"
+    }
+  }
   testImplementation(sourceSets["codeGen"].output)
   testImplementation(libs.eclipse.collections.testutils)
 
@@ -288,8 +296,17 @@ for (scenario in Scenario.all()) {
   }
 }
 
-eclipse {
-  classpath.plusConfigurations.add(configurations["javaPoetCompileClasspath"])
+eclipse.classpath {
+  plusConfigurations.add(configurations["javaPoetCompileClasspath"])
+
+  file.whenMerged {
+    if (this is EclipseClasspath) {
+      val regex = ".*collections4.*-tests.jar".toRegex()
+      entries.filterIsInstance<Library>()
+        .filter { regex.matches(it.path) }
+        .forEach { it.sourcePath = fileReference(file(collections4Sources.asPath)) }
+    }
+  }
 }
 
 idea.module {

diff --git a/examples/coalescing-bulkloader-reactor/gradle/libs.versions.toml b/examples/coalescing-bulkloader-reactor/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 caffeine = "3.1.8"
 junit = "5.10.2"
-reactor = "3.6.4"
+reactor = "3.6.5"
 truth = "1.4.2"
 versions = "0.51.0"
 

diff --git a/examples/coalescing-bulkloader-reactor/settings.gradle.kts b/examples/coalescing-bulkloader-reactor/settings.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-  id("com.gradle.enterprise") version "3.16.2"
-  id("com.gradle.common-custom-user-data-gradle-plugin") version "1.13"
+  id("com.gradle.develocity") version "3.17.1"
+  id("com.gradle.common-custom-user-data-gradle-plugin") version "2.0"
   id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 
@@ -10,6 +10,6 @@ dependencyResolutionManagement {
   }
 }
 
-apply(from = "../../gradle/gradle-enterprise.gradle")
+apply(from = "../../gradle/develocity.gradle")
 
 rootProject.name = "coalescing-bulkloader-reactor"
diff --git a/examples/graal-native/settings.gradle.kts b/examples/graal-native/settings.gradle.kts
@@ -5,8 +5,8 @@ pluginManagement {
   }
 }
 plugins {
-  id("com.gradle.enterprise") version "3.16.2"
-  id("com.gradle.common-custom-user-data-gradle-plugin") version "1.13"
+  id("com.gradle.develocity") version "3.17.1"
+  id("com.gradle.common-custom-user-data-gradle-plugin") version "2.0"
   id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 
@@ -16,6 +16,6 @@ dependencyResolutionManagement {
   }
 }
 
-apply(from = "../../gradle/gradle-enterprise.gradle")
+apply(from = "../../gradle/develocity.gradle")
 
 rootProject.name = "graal-native"
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.5.0.CR1"
+hibernate = "6.5.0.CR2"
 junit = "5.10.2"
 log4j2 = "3.0.0-beta2"
 slf4j = "2.0.7"

diff --git a/examples/hibernate/settings.gradle.kts b/examples/hibernate/settings.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-  id("com.gradle.enterprise") version "3.16.2"
-  id("com.gradle.common-custom-user-data-gradle-plugin") version "1.13"
+  id("com.gradle.develocity") version "3.17.1"
+  id("com.gradle.common-custom-user-data-gradle-plugin") version "2.0"
   id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 
@@ -10,6 +10,6 @@ dependencyResolutionManagement {
   }
 }
 
-apply(from = "../../gradle/gradle-enterprise.gradle")
+apply(from = "../../gradle/develocity.gradle")
 
 rootProject.name = "hibernate"
diff --git a/examples/resilience-failsafe/settings.gradle.kts b/examples/resilience-failsafe/settings.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-  id("com.gradle.enterprise") version "3.16.2"
-  id("com.gradle.common-custom-user-data-gradle-plugin") version "1.13"
+  id("com.gradle.develocity") version "3.17.1"
+  id("com.gradle.common-custom-user-data-gradle-plugin") version "2.0"
   id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 
@@ -10,6 +10,6 @@ dependencyResolutionManagement {
   }
 }
 
-apply(from = "../../gradle/gradle-enterprise.gradle")
+apply(from = "../../gradle/develocity.gradle")
 
 rootProject.name = "resilience-failsafe"
diff --git a/examples/write-behind-rxjava/settings.gradle.kts b/examples/write-behind-rxjava/settings.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-  id("com.gradle.enterprise") version "3.16.2"
-  id("com.gradle.common-custom-user-data-gradle-plugin") version "1.13"
+  id("com.gradle.develocity") version "3.17.1"
+  id("com.gradle.common-custom-user-data-gradle-plugin") version "2.0"
   id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 
@@ -10,6 +10,6 @@ dependencyResolutionManagement {
   }
 }
 
-apply(from = "../../gradle/gradle-enterprise.gradle")
+apply(from = "../../gradle/develocity.gradle")
 
 rootProject.name = "writebehind-rxjava"
diff --git a/gradle/config/spotbugs/exclude.xml b/gradle/config/spotbugs/exclude.xml
@@ -131,6 +131,11 @@
     </Or>
     <Bug pattern="NP_NULL_ON_SOME_PATH, NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE"/>
   </Match>
+  <Match>
+    <Class name="com.github.benmanes.caffeine.cache.stats.CacheStats"/>
+    <Method name="empty"/>
+    <Bug pattern="SING_SINGLETON_GETTER_NOT_SYNCHRONIZED"/>
+  </Match>
   <Match>
     <Class name="com.github.benmanes.caffeine.cache.stats.CacheStats"/>
     <Or>
@@ -441,6 +446,11 @@
     <Method name="~print.*"/>
     <Bug pattern="UPM_UNCALLED_PRIVATE_METHOD"/>
   </Match>
+  <Match>
+    <Class name="com.github.benmanes.caffeine.cache.simulator.policy.AccessEvent"/>
+    <Method name="equals"/>
+    <Bug pattern="FE_FLOATING_POINT_EQUALITY"/>
+  </Match>
   <Match>
     <Class name="com.github.benmanes.caffeine.cache.simulator.policy.AccessEvent$PenaltiesAccessEvent"/>
     <Bug pattern="EQ_DOESNT_OVERRIDE_EQUALS"/>
@@ -463,6 +473,11 @@
     <Method name="equals"/>
     <Bug pattern="FE_FLOATING_POINT_EQUALITY"/>
   </Match>
+  <Match>
+    <Class name="com.github.benmanes.caffeine.cache.simulator.policy.sketch.climbing.HillClimber$Adaptation"/>
+    <Method name="hold"/>
+    <Bug pattern="SING_SINGLETON_GETTER_NOT_SYNCHRONIZED"/>
+  </Match>
   <Match>
     <Class name="com.github.benmanes.caffeine.cache.simulator.report.TextReporter"/>
     <Method name="print"/>