From 8ccdd8d7f73ed3f747d91264d8251f1e7369661f Mon Sep 17 00:00:00 2001 From: Ben Manes Date: Sat, 13 Apr 2024 23:56:22 -0700 Subject: [PATCH] dependency upgrades --- .github/actions/run-gradle/action.yml | 2 +- .github/dependabot.yml | 18 +++++------ .github/workflows/analysis.yml | 2 +- .github/workflows/benchmarks.yml | 2 +- .github/workflows/build.yml | 2 +- .github/workflows/codeql.yml | 2 +- .github/workflows/dependency-check.yml | 2 +- .../dependency-submission-pr-retreive.yml | 4 +-- .../dependency-submission-pr-submit.yml | 4 +-- .github/workflows/dependency-submission.yml | 4 +-- .github/workflows/examples.yml | 2 +- .../workflows/gradle-wrapper-validation.yml | 2 +- .github/workflows/qodana.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/snyk.yml | 2 +- .github/workflows/spelling.yml | 2 +- caffeine/build.gradle.kts | 21 ++++++++++-- .../gradle/libs.versions.toml | 2 +- .../settings.gradle.kts | 6 ++-- examples/graal-native/settings.gradle.kts | 6 ++-- examples/hibernate/gradle/libs.versions.toml | 2 +- examples/hibernate/settings.gradle.kts | 6 ++-- .../resilience-failsafe/settings.gradle.kts | 6 ++-- .../write-behind-rxjava/settings.gradle.kts | 6 ++-- gradle/config/spotbugs/exclude.xml | 15 +++++++++ gradle/develocity.gradle | 28 ++++++++++++++++ gradle/gradle-enterprise.gradle | 32 ------------------- gradle/libs.versions.toml | 28 ++++++++-------- gradle/plugins/settings.gradle.kts | 6 ++-- .../benmanes/caffeine/jcache/CacheProxy.java | 4 +-- settings.gradle.kts | 6 ++-- 31 files changed, 128 insertions(+), 100 deletions(-) create mode 100644 gradle/develocity.gradle delete mode 100644 gradle/gradle-enterprise.gradle diff --git a/.github/actions/run-gradle/action.yml b/.github/actions/run-gradle/action.yml index ab785d77b8..d6ba991d77 100644 --- 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 index 7ac2d542e5..b189ca958d 100644 --- 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 index 7de3598ad5..4b9a3fb62d 100644 --- 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 index 971a0cb3d9..f1e881bbcb 100644 --- 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 index 21e176eb12..dc731faae7 100644 --- 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 index e0d3e9f6ff..d0390c1b67 100644 --- 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 index 5bcb448454..faaebac59e 100644 --- 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 index 993c80659a..fb8e814d8c 100644 --- 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 index c52a405210..6fcdccbc2e 100644 --- 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 index a4ab2d01ae..e4fd57dc66 100644 --- 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 index 482792f0ed..8a8048d4b0 100644 --- 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 index 1021bf9257..082aef2434 100644 --- 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 index 0bddd46089..e705a6da04 100644 --- 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 index b6c1dfc850..61fd1fa8ab 100644 --- 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 index bacb95421a..56904297c2 100644 --- 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 index d5ca33cd6d..9cbb000164 100644 --- 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 index 3796d58143..55ef7c0432 100644 --- 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() + .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 index 6a6e141f29..b286e206eb 100644 --- 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 index 843f5d26e4..59f2e287ef 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.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 index 95870a71c7..8dad06008c 100644 --- 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 index 93caf90634..62feaa346b 100644 --- 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 index d9ad68d6ac..8a9e1c181e 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.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 index 77503a5617..e77767b779 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.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 index 4243f07100..2ef0776bd0 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.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 index 462ee2e2e4..d71ede8ee4 100644 --- a/gradle/config/spotbugs/exclude.xml +++ b/gradle/config/spotbugs/exclude.xml @@ -131,6 +131,11 @@ + + + + + @@ -441,6 +446,11 @@ + + + + + @@ -463,6 +473,11 @@ + + + + + diff --git a/gradle/develocity.gradle b/gradle/develocity.gradle new file mode 100644 index 0000000000..0d1346c4f9 --- /dev/null +++ b/gradle/develocity.gradle @@ -0,0 +1,28 @@ +develocity { + if (!gradle.startParameter.isBuildScan()) { + server = 'https://caffeine.gradle-enterprise.cloud/' + buildScan.publishing.onlyIf { it.authenticated } + } + buildScan { + if (System.env.CI) { + uploadInBackground = false + } else { + obfuscation.ipAddresses { [] } + } + if (System.env.GITHUB_ACTIONS) { + obfuscation.username { 'github' } + } + + termsOfUseUrl = 'https://gradle.com/terms-of-service' + termsOfUseAgree = 'yes' + } +} + +buildCache { + remote(develocity.buildCache) { + // Check access key presence to avoid build cache errors on PR builds when not present + push = System.env.CI && System.env.DEVELOCITY_ACCESS_KEY + enabled = true + } + local.enabled = true +} diff --git a/gradle/gradle-enterprise.gradle b/gradle/gradle-enterprise.gradle deleted file mode 100644 index cd8cac96ea..0000000000 --- a/gradle/gradle-enterprise.gradle +++ /dev/null @@ -1,32 +0,0 @@ -gradleEnterprise { - if (!gradle.startParameter.isBuildScan()) { - server = 'https://caffeine.gradle-enterprise.cloud/' - buildScan.publishIfAuthenticated() - } - buildScan { - capture.taskInputFiles = true - - if (System.env.CI) { - uploadInBackground = false - publishAlways() - } else { - obfuscation.ipAddresses { [] } - } - if (System.env.GITHUB_ACTIONS) { - obfuscation.username { 'github' } - } - - termsOfServiceAgree = 'yes' - termsOfServiceUrl = 'https://gradle.com/terms-of-service' - } -} - -buildCache { - local.enabled = true - remote(gradleEnterprise.buildCache) { - enabled = true - def accessKey = System.env.GRADLE_ENTERPRISE_ACCESS_KEY - // Check cache password presence to avoid build cache errors on PR builds when not present - push = System.env.CI && accessKey - } -} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7018f32222..64ed40c55c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,15 +5,15 @@ awaitility = "4.2.1" bcel = "6.8.2" bnd = "7.0.0" bouncycastle-jdk15on = "1.70" -bouncycastle-jdk18on = "1.77" +bouncycastle-jdk18on = "1.78" cache2k = "2.6.1.Final" caffeine = "3.1.8" checker-framework = "3.42.0" -checkstyle = "10.14.2" +checkstyle = "10.15.0" coherence = "22.06.2" commons-collections4 = "4.4" commons-compress = "1.26.1" -commons-io = "2.16.0" +commons-io = "2.16.1" commons-lang3 = "3.14.0" commons-math3 = "3.6.1" commons-text = "1.11.0" @@ -34,17 +34,17 @@ felix-scr = "2.2.10" findsecbugs = "1.13.0" flip-tables = "1.1.1" forbidden-apis = "3.7" -google-java-format = "1.21.0" +google-java-format = "1.22.0" guava = "33.1.0-jre" guice = "6.0.0" h2 = "2.2.224" hamcrest = "2.2" -hazelcast = "5.3.6" +hazelcast = "5.3.7" httpclient = "4.5.14" idea = "1.1.8" -jackrabbit = "1.60.0" +jackrabbit = "1.62.0" jackson = "2.17.0" -jacoco = "0.8.11" +jacoco = "0.8.12" jakarta-inject = "2.0.1" jamm = "0.4.0" java-object-layout = "0.17" @@ -65,9 +65,9 @@ junit-testng = "1.0.5" junit4 = "4.13.2" junit5 = "5.10.2" kotlin = "1.9.23" -lincheck = "2.27" +lincheck = "2.29" mockito = "5.11.0" -nexus-publish = "2.0.0-rc-2" +nexus-publish = "2.0.0" nullaway-core = "0.10.25" nullaway-plugin = "2.0.0" okhttp-bom = "4.12.0" @@ -80,23 +80,23 @@ pax-url = "2.6.14" picocli = "4.7.5" pmd = "7.0.0" protobuf = "4.26.1" -slf4j = "2.0.12" +slf4j = "2.0.13" slf4j-test = "3.0.1" snakeyaml = "2.2" sonarqube = "5.0.0.4638" spotbugs-contrib = "7.6.4" -spotbugs-core = "4.8.3" -spotbugs-plugin = "6.0.9" +spotbugs-core = "4.8.4" +spotbugs-plugin = "6.0.12" stream = "2.9.8" tcache = "2.0.1" -testng = "7.9.0" +testng = "7.10.1" truth = "1.4.2" univocity-parsers = "2.9.1" versions = "0.51.0" xz = "1.9" ycsb = "0.17.0" zero-allocation-hashing = "0.16" -zstd = "1.5.6-1" +zstd = "1.5.6-2" [libraries] asm-bom = { module = "org.ow2.asm:asm-bom", version.ref = "asm" } diff --git a/gradle/plugins/settings.gradle.kts b/gradle/plugins/settings.gradle.kts index b21ba8ce43..323e54a0c7 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.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,4 +16,4 @@ dependencyResolutionManagement { } } -apply(from = "../gradle-enterprise.gradle") +apply(from = "../develocity.gradle") diff --git a/jcache/src/main/java/com/github/benmanes/caffeine/jcache/CacheProxy.java b/jcache/src/main/java/com/github/benmanes/caffeine/jcache/CacheProxy.java index 07c0241115..8f8d70860a 100644 --- a/jcache/src/main/java/com/github/benmanes/caffeine/jcache/CacheProxy.java +++ b/jcache/src/main/java/com/github/benmanes/caffeine/jcache/CacheProxy.java @@ -848,9 +848,9 @@ public > C getConfiguration(Class clazz) { try { cache.asMap().compute(copyOf(key), remappingFunction); dispatcher.awaitSynchronous(); - } catch (Throwable thr) { + } catch (Throwable t) { dispatcher.ignoreSynchronous(); - throw thr; + throw t; } @SuppressWarnings("unchecked") diff --git a/settings.gradle.kts b/settings.gradle.kts index 526161557b..3c8a63a337 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,8 +2,8 @@ pluginManagement { includeBuild("gradle/plugins") } 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" } @@ -13,7 +13,7 @@ dependencyResolutionManagement { } } -apply(from = "$rootDir/gradle/gradle-enterprise.gradle") +apply(from = "$rootDir/gradle/develocity.gradle") rootProject.name = "caffeine" include("caffeine", "guava", "jcache", "simulator")