Merge branch 'master' into dependabot/gradle/com.gradle.common-custom…

…-user-data-gradle-plugin-1.12.2
ben-manes · Feb 24, 2024 · 536b3c1 · 536b3c1
2 parents f9192f1 + d5da8dc
commit 536b3c1
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 18 deletions.
diff --git a/.github/actions/run-gradle/action.yml b/.github/actions/run-gradle/action.yml
@@ -45,7 +45,7 @@ runs:
         website: jdk.java.net
         version: latest
     - name: Set up GraalVM
-      uses: graalvm/setup-graalvm@d72e3dbf5f44eb0b78c4f8ec61a262d8bf9b94af # v1
+      uses: graalvm/setup-graalvm@5c3001733f88c5e6475916e448f865429d2c154e # v1
       if: inputs.java == 'GraalVM'
       with:
         distribution: 'graalvm'

diff --git a/.github/workflows/gitleaks.yml b/.github/workflows/gitleaks.yml
@@ -27,6 +27,6 @@ jobs:
         with:
           fetch-depth: 0
       - name: Run gitleaks
-        uses: gitleaks/gitleaks-action@cb7149a9b57195b609c63e8518d2c6056677d2d0 # v2.3.3
+        uses: gitleaks/gitleaks-action@e6dab246340401bf53eec993b8f05aebe80ac636 # v2.3.4
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/caffeine/src/test/java/com/github/benmanes/caffeine/lincheck/AbstractLincheckCacheTest.java b/caffeine/src/test/java/com/github/benmanes/caffeine/lincheck/AbstractLincheckCacheTest.java
@@ -43,7 +43,7 @@ public abstract class AbstractLincheckCacheTest {
   private final LoadingCache<Integer, Integer> cache;
 
   public AbstractLincheckCacheTest(Caffeine<Object, Object> builder) {
-    cache = builder.build(key -> -key);
+    cache = builder.executor(Runnable::run).build(key -> -key);
   }
 
   /**

diff --git a/caffeine/src/test/java/com/github/benmanes/caffeine/lincheck/CaffeineLincheckTest.java b/caffeine/src/test/java/com/github/benmanes/caffeine/lincheck/CaffeineLincheckTest.java
@@ -36,10 +36,8 @@ public Object[] factory() {
   }
 
   public static final class BoundedLincheckTest extends AbstractLincheckCacheTest {
-
     public BoundedLincheckTest() {
       super(Caffeine.newBuilder()
-          .executor(Runnable::run)
           .maximumSize(Long.MAX_VALUE)
           .expireAfterWrite(Duration.ofNanos(Long.MAX_VALUE)));
     }

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.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-1-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

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.12.1"
+  id("com.gradle.common-custom-user-data-gradle-plugin") version "1.12.2"
   id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 

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.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-1-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

diff --git a/examples/graal-native/settings.gradle.kts b/examples/graal-native/settings.gradle.kts
@@ -6,7 +6,7 @@ pluginManagement {
 }
 plugins {
   id("com.gradle.enterprise") version "3.16.2"
-  id("com.gradle.common-custom-user-data-gradle-plugin") version "1.12.1"
+  id("com.gradle.common-custom-user-data-gradle-plugin") version "1.12.2"
   id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 

diff --git a/examples/hibernate/gradle/libs.versions.toml b/examples/hibernate/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ caffeine = "3.1.8"
 h2 = "2.2.224"
 hibernate = "6.4.4.Final"
 junit = "5.10.2"
-log4j2 = "3.0.0-beta1"
+log4j2 = "3.0.0-beta2"
 slf4j = "2.0.7"
 truth = "1.4.1"
 versions = "0.51.0"

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.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-1-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

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.12.1"
+  id("com.gradle.common-custom-user-data-gradle-plugin") version "1.12.2"
   id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 

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.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-1-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

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.12.1"
+  id("com.gradle.common-custom-user-data-gradle-plugin") version "1.12.2"
   id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 

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.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-1-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

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.12.1"
+  id("com.gradle.common-custom-user-data-gradle-plugin") version "1.12.2"
   id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 

diff --git a/gradle/plugins/src/main/kotlin/lifecycle/dependency-versions-caffeine-conventions.gradle.kts b/gradle/plugins/src/main/kotlin/lifecycle/dependency-versions-caffeine-conventions.gradle.kts
@@ -8,7 +8,8 @@ tasks.named<DependencyUpdatesTask>("dependencyUpdates").configure {
   resolutionStrategy {
     componentSelection {
       all {
-        val stable = listOf("javax.json.bind", "org.jetbrains.kotlin", "org.osgi")
+        val stable = setOf("com.hazelcast", "javax.json.bind",
+            "org.jetbrains.kotlin", "org.osgi", "org.slf4j")
         if ((candidate.group in stable) && isNonStable(candidate.version)) {
           reject("Release candidate")
         } else if ((candidate.module == "commons-io") && candidate.version.startsWith("2003")) {

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.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-1-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME