diff --git a/.github/workflows/actionlint.yml b/.github/workflows/actionlint.yml index 0894ebd208..2afa1356fc 100644 --- a/.github/workflows/actionlint.yml +++ b/.github/workflows/actionlint.yml @@ -16,7 +16,7 @@ jobs: github.com:443 - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: actionlint - uses: reviewdog/action-actionlint@afad3b6ab835e5611bda8c8193377e2d5c21413d # v1.51.0 + uses: reviewdog/action-actionlint@d99f1ceaf59e7db022a790dc308ccccb68dda71a # v1.53.0 env: SHELLCHECK_OPTS: -e SC2001 -e SC2035 -e SC2046 -e SC2061 -e SC2086 -e SC2156 with: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 23f9033072..34ffd89273 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -195,7 +195,7 @@ jobs: find . -path */jacoco/*.exec -o -path */results/*.xml | tar czf ${{ env.ARTIFACT_NAME }}.tar.gz --files-from - - name: Upload test results - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 + uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4 if: always() && (env.JAVA_VERSION == env.PUBLISH_JDK) with: retention-days: 1 @@ -235,7 +235,7 @@ jobs: with: fetch-depth: 0 - name: Download Tests Results - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7 + uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 - name: Decompress run: find . -type f -name '*.tar.gz' -exec sh -c 'tar -zxf {} --one-top-level' \; - name: Combine Jacoco Reports @@ -287,11 +287,11 @@ jobs: ${{ env.ALLOWED_ENDPOINTS }} badgen.net:443 - name: Download Tests - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7 + uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 - name: Decompress run: find . -type f -name '*.tar.gz' -exec sh -c 'tar -zxf {} --one-top-level' \; - name: Publish Test Results - uses: EnricoMi/publish-unit-test-result-action@30eadd5010312f995f0d3b3cff7fe2984f69409e # v2.16.1 + uses: EnricoMi/publish-unit-test-result-action@567cc7f8dcea3eba5da355f6ebc95663310d8a07 # v2.17.0 continue-on-error: true id: test-results with: diff --git a/.github/workflows/codacy.yml b/.github/workflows/codacy.yml index b172d63d53..e8b8eb1015 100644 --- a/.github/workflows/codacy.yml +++ b/.github/workflows/codacy.yml @@ -31,7 +31,7 @@ jobs: - name: Checkout code uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Run Codacy Analysis - uses: codacy/codacy-analysis-cli-action@master + uses: codacy/codacy-analysis-cli-action@97bf5df3c09e75f5bcd72695998f96ebd701846e # v4.4.5 continue-on-error: true with: format: sarif @@ -47,7 +47,7 @@ jobs: if: steps.check_files.outputs.files_exists == 'true' run: jq -c '.runs |= unique_by({tool, invocations, results})' < results.sarif > codacy.sarif - name: Upload result to GitHub Code Scanning - uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 + uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12 if: steps.check_files.outputs.files_exists == 'true' continue-on-error: true with: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index bcbde24d3c..04cdb2df5f 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -57,10 +57,10 @@ jobs: java: ${{ env.JAVA_VERSION }} token: ${{ secrets.GITHUB_TOKEN }} - name: Initialize CodeQL - uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 + uses: github/codeql-action/init@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12 with: languages: java - name: Autobuild - uses: github/codeql-action/autobuild@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 + uses: github/codeql-action/autobuild@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 + uses: github/codeql-action/analyze@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12 diff --git a/.github/workflows/dependency-check.yml b/.github/workflows/dependency-check.yml index d019ccf158..0b9308ead4 100644 --- a/.github/workflows/dependency-check.yml +++ b/.github/workflows/dependency-check.yml @@ -60,7 +60,7 @@ jobs: with: files: build/reports/dependency-check-report.sarif - name: Upload result to GitHub Code Scanning - uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 + uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12 if: steps.check_files.outputs.files_exists == 'true' with: sarif_file: build/reports/dependency-check-report.sarif diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 2230950fff..74ccf9f7e1 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -21,7 +21,7 @@ jobs: - name: Checkout Repository uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Dependency Review - uses: actions/dependency-review-action@72eb03d02c7872a771aacd928f3123ac62ad6d3a # v4.3.3 + uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # v4.3.4 with: license-check: false comment-summary-in-pr: on-failure diff --git a/.github/workflows/devskim.yml b/.github/workflows/devskim.yml index e7ce45b769..6bbc9f8ee2 100644 --- a/.github/workflows/devskim.yml +++ b/.github/workflows/devskim.yml @@ -31,6 +31,6 @@ jobs: - name: Run DevSkim scanner uses: microsoft/DevSkim-Action@914fa647b406c387000300b2f09bb28691be2b6d # v1.0.14 - name: Upload DevSkim scan results to GitHub Security tab - uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 + uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12 with: sarif_file: devskim-results.sarif diff --git a/.github/workflows/qodana.yml b/.github/workflows/qodana.yml index 47d7e377a5..19e1790f98 100644 --- a/.github/workflows/qodana.yml +++ b/.github/workflows/qodana.yml @@ -68,6 +68,6 @@ jobs: with: upload-result: true - name: Upload SARIF file for GitHub Advanced Security Dashboard - uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 + uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12 with: sarif_file: ${{ runner.temp }}/qodana/results/qodana.sarif.json diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 8f7ce1827d..14ec958818 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -51,12 +51,12 @@ jobs: results_file: results.sarif repo_token: ${{ secrets.SCORECARD_READ_TOKEN }} - name: Upload artifact - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 + uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4 with: name: SARIF file path: results.sarif retention-days: 5 - name: Upload to code-scanning - uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 + uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12 with: sarif_file: results.sarif diff --git a/.github/workflows/semgrep.yml b/.github/workflows/semgrep.yml index 4411543c5c..d2d80492ed 100644 --- a/.github/workflows/semgrep.yml +++ b/.github/workflows/semgrep.yml @@ -34,7 +34,7 @@ jobs: if: steps.check_files.outputs.files_exists == 'true' run: jq -c '.runs[0].tool.driver.rules |= unique_by(.id)' < results.sarif > semgrep.sarif - name: Upload SARIF file for GitHub Advanced Security Dashboard - uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 + uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12 if: steps.check_files.outputs.files_exists == 'true' continue-on-error: true with: diff --git a/.github/workflows/snyk.yml b/.github/workflows/snyk.yml index 869c2fe39c..d1ab9b7943 100644 --- a/.github/workflows/snyk.yml +++ b/.github/workflows/snyk.yml @@ -42,7 +42,7 @@ jobs: with: files: snyk.sarif - name: Upload result to GitHub Code Scanning - uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 + uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12 if: steps.check_files.outputs.files_exists == 'true' with: sarif_file: snyk.sarif diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml index e9cab89831..28b1de6dc4 100644 --- a/.github/workflows/spelling.yml +++ b/.github/workflows/spelling.yml @@ -16,7 +16,7 @@ jobs: github.com:443 - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Misspell - uses: reviewdog/action-misspell@30433ca7be17888deb78a32521706fb65defbf3f # v1.21.0 + uses: reviewdog/action-misspell@278e1b3c7dd09d2827fa080919a40db73ccafe24 # v1.22.0 with: reporter: github-check github_token: ${{ secrets.GITHUB_TOKEN }} @@ -34,4 +34,4 @@ jobs: objects.githubusercontent.com:443 - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Typos - uses: crate-ci/typos@c16dc8f5b4a7ad6211464ecf136c69c851e8e83c # v1.22.9 + uses: crate-ci/typos@320b5781474d4470a36b7f0626b131e99850e9d2 # v1.23.2 diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml index d737056c44..d221a037f7 100644 --- a/.github/workflows/trivy.yml +++ b/.github/workflows/trivy.yml @@ -23,12 +23,12 @@ jobs: pkg-containers.githubusercontent.com:443 - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Run Trivy vulnerability scanner - uses: aquasecurity/trivy-action@7c2007bcb556501da015201bcba5aa14069b74e2 # v0.23.0 + uses: aquasecurity/trivy-action@6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8 # v0.24.0 with: scan-type: fs format: sarif output: trivy-results.sarif - name: Upload Trivy scan results to GitHub Security tab - uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 + uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12 with: sarif_file: trivy-results.sarif diff --git a/caffeine/build.gradle.kts b/caffeine/build.gradle.kts index 1e032ec78e..aa617a1eeb 100644 --- a/caffeine/build.gradle.kts +++ b/caffeine/build.gradle.kts @@ -24,7 +24,7 @@ sourceSets { val compileJavaPoetJava by tasks.existing val javaAgent: Configuration by configurations.creating val collections4Sources: Configuration by configurations.creating -var javaPoetImplementation: Configuration = configurations["javaPoetImplementation"] +val javaPoetImplementation: Configuration = configurations["javaPoetImplementation"] dependencies { api(libs.checker.annotations) @@ -39,7 +39,6 @@ dependencies { testImplementation(libs.jctools) testImplementation(libs.fastutil) testImplementation(libs.lincheck) - testImplementation(libs.guava.testlib) testImplementation(libs.commons.lang3) testImplementation(libs.bundles.slf4j.test) testImplementation(libs.commons.collections4) diff --git a/examples/coalescing-bulkloader-reactor/gradle/libs.versions.toml b/examples/coalescing-bulkloader-reactor/gradle/libs.versions.toml index 59b413a8aa..138dc73719 100644 --- a/examples/coalescing-bulkloader-reactor/gradle/libs.versions.toml +++ b/examples/coalescing-bulkloader-reactor/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] caffeine = "3.1.8" junit = "5.11.0-M2" -reactor = "3.6.7" -truth = "1.4.3" +reactor = "3.6.8" +truth = "1.4.4" versions = "0.51.0" [libraries] diff --git a/examples/coalescing-bulkloader-reactor/gradle/wrapper/gradle-wrapper.properties b/examples/coalescing-bulkloader-reactor/gradle/wrapper/gradle-wrapper.properties index e021a95878..0af00fb146 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.9-rc-1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/examples/graal-native/gradle/libs.versions.toml b/examples/graal-native/gradle/libs.versions.toml index 86d7356c16..43c74b3cbc 100644 --- a/examples/graal-native/gradle/libs.versions.toml +++ b/examples/graal-native/gradle/libs.versions.toml @@ -2,7 +2,7 @@ caffeine = "3.1.8" graal = "0.10.2" junit = "5.11.0-M2" -truth = "1.4.3" +truth = "1.4.4" versions = "0.51.0" [libraries] diff --git a/examples/graal-native/gradle/wrapper/gradle-wrapper.properties b/examples/graal-native/gradle/wrapper/gradle-wrapper.properties index e021a95878..0af00fb146 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.9-rc-1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/examples/hibernate/gradle/libs.versions.toml b/examples/hibernate/gradle/libs.versions.toml index b100c2580f..9298a0a88c 100644 --- a/examples/hibernate/gradle/libs.versions.toml +++ b/examples/hibernate/gradle/libs.versions.toml @@ -5,7 +5,7 @@ hibernate = "6.5.2.Final" junit = "5.11.0-M2" log4j2 = "3.0.0-beta2" slf4j = "2.0.7" -truth = "1.4.3" +truth = "1.4.4" versions = "0.51.0" [libraries] diff --git a/examples/hibernate/gradle/wrapper/gradle-wrapper.properties b/examples/hibernate/gradle/wrapper/gradle-wrapper.properties index e021a95878..0af00fb146 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.9-rc-1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/examples/indexable/gradle.properties b/examples/indexable/gradle.properties new file mode 100644 index 0000000000..560b0f9c22 --- /dev/null +++ b/examples/indexable/gradle.properties @@ -0,0 +1,5 @@ +org.gradle.configuration-cache=true +org.gradle.configureondemand=true +org.gradle.parallel=true +org.gradle.caching=true +org.gradle.daemon=true diff --git a/examples/indexable/gradle/libs.versions.toml b/examples/indexable/gradle/libs.versions.toml index 4f6e6e0138..54029919f2 100644 --- a/examples/indexable/gradle/libs.versions.toml +++ b/examples/indexable/gradle/libs.versions.toml @@ -2,7 +2,7 @@ caffeine = "3.1.8" guava = "33.2.1-jre" junit-jupiter = "5.11.0-M2" -truth = "1.4.3" +truth = "1.4.4" versions = "0.51.0" [libraries] diff --git a/examples/indexable/gradle/wrapper/gradle-wrapper.properties b/examples/indexable/gradle/wrapper/gradle-wrapper.properties index e021a95878..0af00fb146 100644 --- a/examples/indexable/gradle/wrapper/gradle-wrapper.properties +++ b/examples/indexable/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,4 @@ -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-rc-1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/examples/resilience-failsafe/gradle/libs.versions.toml b/examples/resilience-failsafe/gradle/libs.versions.toml index 30fa3b18e0..92c11eb802 100644 --- a/examples/resilience-failsafe/gradle/libs.versions.toml +++ b/examples/resilience-failsafe/gradle/libs.versions.toml @@ -2,7 +2,7 @@ caffeine = "3.1.8" failsafe = "3.3.2" junit = "5.11.0-M2" -truth = "1.4.3" +truth = "1.4.4" versions = "0.51.0" [libraries] diff --git a/examples/resilience-failsafe/gradle/wrapper/gradle-wrapper.properties b/examples/resilience-failsafe/gradle/wrapper/gradle-wrapper.properties index e021a95878..0af00fb146 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.9-rc-1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/examples/write-behind-rxjava/gradle/wrapper/gradle-wrapper.properties b/examples/write-behind-rxjava/gradle/wrapper/gradle-wrapper.properties index e021a95878..0af00fb146 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.9-rc-1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ad8bc3499a..6dcf131488 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -19,7 +19,7 @@ commons-text = "1.12.0" concurrentlinkedhashmap = "1.4.2" config = "1.4.3" coveralls = "2.12.2" -dependency-check = "10.0.1" +dependency-check = "10.0.2" eclipse-collections = "12.0.0.M3" ehcache3 = "3.10.8" errorprone = "2.28.0" @@ -41,8 +41,8 @@ hamcrest = "2.2" hazelcast = "5.3.7" httpclient = "4.5.14" idea = "1.1.8" -jackrabbit = "1.64.0" -jackson = "2.17.1" +jackrabbit = "1.66.0" +jackson = "2.17.2" jacoco = "0.8.12" jakarta-inject = "2.0.1" jamm = "0.4.0" @@ -59,7 +59,7 @@ jmh-plugin = "0.7.2" jmh-report = "0.9.6" joor = "0.9.15" json-bind = "1.0" -jsoup = "1.17.2" +jsoup = "1.18.1" junit-testng = "1.0.5" junit4 = "4.13.2" junit5 = "5.11.0-M2" @@ -86,11 +86,11 @@ snakeyaml = "2.2" sonarqube = "5.1.0.4882" spotbugs = "4.8.6" spotbugs-contrib = "7.6.4" -spotbugs-plugin = "6.0.18" +spotbugs-plugin = "6.0.19" stream = "2.9.8" tcache = "2.0.1" testng = "7.10.2" -truth = "1.4.3" +truth = "1.4.4" univocity-parsers = "2.9.1" versions = "0.51.0" xz = "1.9" diff --git a/gradle/plugins/build.gradle.kts b/gradle/plugins/build.gradle.kts index 152739bd86..8a39a8399a 100644 --- a/gradle/plugins/build.gradle.kts +++ b/gradle/plugins/build.gradle.kts @@ -61,7 +61,7 @@ tasks.withType { componentSelection { val ignoredGroups = listOf("com.beust", "org.apache.logging.log4j", "org.jetbrains.kotlin", "org.gradle.kotlin.kotlin-dsl") - val stable = setOf("com.fasterxml.jackson", "com.squareup.okhttp3") + val stable = setOf("com.fasterxml.jackson", "com.google.protobuf", "com.squareup.okhttp3") val isNonStable = "^[0-9,.v-]+(-r)?$".toRegex() all { if ((candidate.group in ignoredGroups) && (candidate.version != currentVersion)) { diff --git a/gradle/plugins/src/main/kotlin/analyze/jmh.caffeine.gradle.kts b/gradle/plugins/src/main/kotlin/analyze/jmh.caffeine.gradle.kts index 3c9d3aa522..546fa54299 100644 --- a/gradle/plugins/src/main/kotlin/analyze/jmh.caffeine.gradle.kts +++ b/gradle/plugins/src/main/kotlin/analyze/jmh.caffeine.gradle.kts @@ -13,7 +13,7 @@ plugins { } configurations.jmh { - extendsFrom(configurations.testImplementation.get()) + extendsFrom(configurations["testImplementation"]) exclude(module = "jazzer-junit") exclude(module = "slf4j-test") } @@ -95,7 +95,7 @@ tasks.named("jmhReport").configure { } idea.module { - scopes["PROVIDED"]!!["plus"]!!.add(configurations.jmh.get()) + scopes["PROVIDED"]!!["plus"]!!.add(configurations["jmh"]) } eclipse.classpath.file.whenMerged { diff --git a/gradle/plugins/src/main/kotlin/lifecycle/java-library.caffeine.gradle.kts b/gradle/plugins/src/main/kotlin/lifecycle/java-library.caffeine.gradle.kts index 296a126110..55f34a132d 100644 --- a/gradle/plugins/src/main/kotlin/lifecycle/java-library.caffeine.gradle.kts +++ b/gradle/plugins/src/main/kotlin/lifecycle/java-library.caffeine.gradle.kts @@ -31,9 +31,8 @@ tasks.withType().configureEach { languageVersion = maxOf(javaVersion, JavaLanguageVersion.of(17)) } - options.compilerArgs.add("-Xlint:all,-auxiliaryclass,-exports,-processing," - + "-removal,-requires-automatic,-requires-transitive-automatic") - options.compilerArgs.addAll(listOf("-Xmaxerrs", "500", "-Xmaxwarns", "500")) + options.compilerArgs.addAll(listOf( "-Xlint:all", "-Xlint:-auxiliaryclass", "-Xlint:-classfile", + "-Xlint:-exports", "-Xlint:-processing", "-Xlint:-removal", "-Xlint:-requires-automatic")) if (javaVersion.canCompileOrRun(21)) { options.compilerArgs.add("-proc:full") } diff --git a/gradle/plugins/src/main/kotlin/lifecycle/testing.caffeine.gradle.kts b/gradle/plugins/src/main/kotlin/lifecycle/testing.caffeine.gradle.kts index 1afd0b0509..3b99a858d4 100644 --- a/gradle/plugins/src/main/kotlin/lifecycle/testing.caffeine.gradle.kts +++ b/gradle/plugins/src/main/kotlin/lifecycle/testing.caffeine.gradle.kts @@ -15,6 +15,7 @@ dependencies { testImplementation(libs.hamcrest) testImplementation(libs.awaitility) testImplementation(libs.bundles.junit) + testImplementation(libs.guava.testlib) testImplementation(libs.bundles.osgi.test.compile) testImplementation(platform(libs.asm.bom)) diff --git a/gradle/plugins/src/main/kotlin/lifecycle/versions.caffeine.gradle.kts b/gradle/plugins/src/main/kotlin/lifecycle/versions.caffeine.gradle.kts index 3252b7f6b8..b46ff6efe3 100644 --- a/gradle/plugins/src/main/kotlin/lifecycle/versions.caffeine.gradle.kts +++ b/gradle/plugins/src/main/kotlin/lifecycle/versions.caffeine.gradle.kts @@ -11,8 +11,8 @@ tasks.named("dependencyUpdates").configure { componentSelection { all { val ignoredGroups = listOf("com.beust", "org.apache.logging.log4j") - val stable = setOf("com.hazelcast", "javax.json.bind", - "org.jetbrains.kotlin", "org.osgi", "org.slf4j") + val stable = setOf("com.google.protobuf", "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/plugins/src/main/kotlin/quality/jacoco.caffeine.gradle.kts b/gradle/plugins/src/main/kotlin/quality/jacoco.caffeine.gradle.kts index c542afd0e0..fb0acc154e 100644 --- a/gradle/plugins/src/main/kotlin/quality/jacoco.caffeine.gradle.kts +++ b/gradle/plugins/src/main/kotlin/quality/jacoco.caffeine.gradle.kts @@ -22,10 +22,10 @@ tasks.withType().configureEach { } tasks.withType().configureEach { - if (environment["JDK_EA"] == "true") { + if (System.getenv("JDK_EA") == "true") { systemProperty("net.bytebuddy.experimental", true) configure { - enabled = false + isEnabled = false } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e021a95878..0af00fb146 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.9-rc-1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/guava/build.gradle.kts b/guava/build.gradle.kts index 3fdc654bb5..041157345c 100644 --- a/guava/build.gradle.kts +++ b/guava/build.gradle.kts @@ -10,14 +10,9 @@ dependencies { api(libs.guava) testImplementation(libs.jctools) - testImplementation(libs.guava.testlib) testImplementation(libs.bundles.slf4j.nop) } -tasks.named("compileJava").configure { - modularity.inferModulePath = true -} - tasks.withType().configureEach { useJUnitPlatform() diff --git a/jcache/build.gradle.kts b/jcache/build.gradle.kts index f96d674c99..fb21c40ff2 100644 --- a/jcache/build.gradle.kts +++ b/jcache/build.gradle.kts @@ -30,9 +30,7 @@ dependencies { api(libs.jcache) api(libs.config) - testImplementation(libs.guava) testImplementation(libs.jcache.guice) - testImplementation(libs.guava.testlib) testImplementation(libs.bundles.slf4j.nop) testImplementation(files(testResourcesJar)) testImplementation(libs.jcache.tck) @@ -76,10 +74,6 @@ val unzipJCacheJavaDoc by tasks.registering(Copy::class) { into(layout.buildDirectory.dir("jcache-docs")) } -tasks.named("compileJava").configure { - modularity.inferModulePath = true -} - tasks.jar { bundle.bnd(mapOf( "Automatic-Module-Name" to "com.github.benmanes.caffeine.jcache", diff --git a/simulator/build.gradle.kts b/simulator/build.gradle.kts index 2de719c0ce..c6ef03959b 100644 --- a/simulator/build.gradle.kts +++ b/simulator/build.gradle.kts @@ -55,7 +55,6 @@ tasks.withType().configureEach { disableWarningsInGeneratedCode = true nullaway.disable() } - modularity.inferModulePath = true } tasks.withType().configureEach { @@ -77,19 +76,10 @@ tasks.withType().configureEach { tasks.named("run").configure { description = "Runs a single simulation and generates a report" } - -tasks.register("simulate") { - description = "Runs multiple simulations and generates an aggregate report" - mainClass = "com.github.benmanes.caffeine.cache.simulator.Simulate" -} - -tasks.register("rewrite") { - description = "Rewrite traces into the format used by other simulators" - mainClass = "com.github.benmanes.caffeine.cache.simulator.parser.Rewriter" -} +tasks.register("simulate") +tasks.register("rewrite") tasks.withType().configureEach { - group = group ?: "Application" dependsOn(tasks.processResources, tasks.compileJava) classpath(sourceSets["main"].runtimeClasspath) systemProperties(caffeineSystemProperties()) @@ -117,6 +107,12 @@ abstract class Simulate @Inject constructor( @OutputDirectory val reportDir = File(projectLayout.buildDirectory.get().asFile, "/reports/$name") + init { + group = "Application" + mainClass = "com.github.benmanes.caffeine.cache.simulator.Simulate" + description = "Runs multiple simulations and generates an aggregate report" + } + @TaskAction override fun exec() { if (maximumSize.isNotEmpty()) { @@ -140,6 +136,12 @@ abstract class Rewrite : JavaExec() { @Input @Option(option = "outputFormat", description = "The output format") var outputFormat: String = "" + init { + group = "Application" + description = "Rewrite traces into the format used by other simulators" + mainClass = "com.github.benmanes.caffeine.cache.simulator.parser.Rewriter" + } + @TaskAction override fun exec() { if (inputFiles.isNotEmpty()) {