From c2d027dce519b8b1a8190aa611608c2f2c580896 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 24 Feb 2024 12:18:39 -0800 Subject: [PATCH 1/3] Bump graalvm/setup-graalvm in /.github/actions/run-gradle (#1547) Bumps [graalvm/setup-graalvm](https://github.com/graalvm/setup-graalvm) from 1.1.7 to 1.1.8. - [Release notes](https://github.com/graalvm/setup-graalvm/releases) - [Commits](https://github.com/graalvm/setup-graalvm/compare/d72e3dbf5f44eb0b78c4f8ec61a262d8bf9b94af...5c3001733f88c5e6475916e448f865429d2c154e) --- updated-dependencies: - dependency-name: graalvm/setup-graalvm dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/actions/run-gradle/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/run-gradle/action.yml b/.github/actions/run-gradle/action.yml index 605674c220..1e19a54102 100644 --- 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' From d7a3c29b1903edd253ba2914299cc845b93c6541 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 24 Feb 2024 12:19:11 -0800 Subject: [PATCH 2/3] Bump gitleaks/gitleaks-action from 2.3.3 to 2.3.4 (#1538) Bumps [gitleaks/gitleaks-action](https://github.com/gitleaks/gitleaks-action) from 2.3.3 to 2.3.4. - [Release notes](https://github.com/gitleaks/gitleaks-action/releases) - [Commits](https://github.com/gitleaks/gitleaks-action/compare/cb7149a9b57195b609c63e8518d2c6056677d2d0...e6dab246340401bf53eec993b8f05aebe80ac636) --- updated-dependencies: - dependency-name: gitleaks/gitleaks-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/gitleaks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gitleaks.yml b/.github/workflows/gitleaks.yml index 5f799f9bc6..6da727bf49 100644 --- 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 }} From d5da8dcfb3028b8822339794bf7f3a8f2cdb1a45 Mon Sep 17 00:00:00 2001 From: Ben Manes Date: Sat, 24 Feb 2024 12:39:00 -0800 Subject: [PATCH 3/3] upgrade to Gradle 8.7 --- .../benmanes/caffeine/lincheck/AbstractLincheckCacheTest.java | 2 +- .../benmanes/caffeine/lincheck/CaffeineLincheckTest.java | 2 -- .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/coalescing-bulkloader-reactor/settings.gradle.kts | 2 +- examples/graal-native/gradle/wrapper/gradle-wrapper.properties | 2 +- examples/graal-native/settings.gradle.kts | 2 +- examples/hibernate/gradle/libs.versions.toml | 2 +- examples/hibernate/gradle/wrapper/gradle-wrapper.properties | 2 +- examples/hibernate/settings.gradle.kts | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/resilience-failsafe/settings.gradle.kts | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/write-behind-rxjava/settings.gradle.kts | 2 +- gradle/plugins/settings.gradle.kts | 2 +- .../dependency-versions-caffeine-conventions.gradle.kts | 3 ++- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle.kts | 2 +- 17 files changed, 17 insertions(+), 18 deletions(-) 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 index 760afeddc1..2fe7020f3a 100644 --- 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 cache; public AbstractLincheckCacheTest(Caffeine 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 index c4aebb7598..96d50ec146 100644 --- 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 index 585fc97886..16d75bc11a 100644 --- 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 index ab5ae257ca..b1cc352d64 100644 --- 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 index 585fc97886..16d75bc11a 100644 --- 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 index 2b48a13894..00118180db 100644 --- 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 index e8b878ab0b..1fe8f9d5d1 100644 --- 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 index 585fc97886..16d75bc11a 100644 --- 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 index 949ad3d912..aae65aa36b 100644 --- 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 index 585fc97886..16d75bc11a 100644 --- 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 index 9937bf1e89..b6991a1d51 100644 --- 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 index 585fc97886..16d75bc11a 100644 --- 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 index e0163ac6b0..c6da452a62 100644 --- 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/settings.gradle.kts b/gradle/plugins/settings.gradle.kts index fb7929bd4a..eabade7fd9 100644 --- a/gradle/plugins/settings.gradle.kts +++ b/gradle/plugins/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 index 818012ee24..b4a328addc 100644 --- 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("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 index 585fc97886..16d75bc11a 100644 --- 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 diff --git a/settings.gradle.kts b/settings.gradle.kts index b1076b8805..8b0c1b4c67 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -3,7 +3,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" }