Skip to content

Commit 1ec7303

Browse files
ben-manesben-manes
committed
various updates and modernizations
1 parent d49327c commit 1ec7303

File tree

98 files changed

+385
-405
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+385
-405
lines changed

‎.github/actions/run-gradle/action.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ runs:
3838
- name: Set up JDK ${{ steps.gradle_toolchain.outputs.version }}
3939
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
4040
with:
41-
java-version: ${{ steps.gradle_toolchain.outputs.version }}
41+
java-version: |
42+
24
43+
${{ steps.gradle_toolchain.outputs.version }}
4244
distribution: temurin
4345
- name: Prepare JDK toolchain
4446
id: java_toolchain

‎.github/workflows/actionlint.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
persist-credentials: false
2323
- name: Run actionlint
24-
uses: reviewdog/action-actionlint@db58217885f9a6570da9c71be4e40ec33fe44a1f # v1.65.0
24+
uses: reviewdog/action-actionlint@a5524e1c19e62881d79c1f1b9b6f09f16356e281 # v1.65.2
2525
env:
2626
SHELLCHECK_OPTS: -e SC2001 -e SC2035 -e SC2046 -e SC2061 -e SC2086 -e SC2156
2727
with:
@@ -50,13 +50,13 @@ jobs:
5050
with:
5151
persist-credentials: false
5252
- name: Install uv
53-
uses: astral-sh/setup-uv@f94ec6bedd8674c4426838e6b50417d36b6ab231 # v5.3.1
53+
uses: astral-sh/setup-uv@22695119d769bdb6f7032ad67b9bca0ef8c4a174 # v5.4.0
5454
- name: Run zizmor
5555
env:
5656
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5757
run: uvx zizmor --pedantic --format sarif . > results.sarif
5858
- name: Upload SARIF file for GitHub Advanced Security Dashboard
59-
uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
59+
uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
6060
with:
6161
sarif_file: results.sarif
6262
category: zizmor

‎.github/workflows/analysis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
permissions:
5050
contents: read
5151
env:
52-
JAVA_VERSION: 23
52+
JAVA_VERSION: 24
5353
steps:
5454
- name: Harden Runner
5555
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
@@ -73,7 +73,7 @@ jobs:
7373
permissions:
7474
contents: read
7575
env:
76-
JAVA_VERSION: 23
76+
JAVA_VERSION: 24
7777
steps:
7878
- name: Harden Runner
7979
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0

‎.github/workflows/build.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
contents: read
5050
strategy:
5151
matrix:
52-
java: [ 11, 23, 25, GraalVM ]
52+
java: [ 11, 24, 25, GraalVM ]
5353
env:
5454
JAVA_VERSION: ${{ matrix.java }}
5555
steps:
@@ -120,7 +120,7 @@ jobs:
120120
- simulator:check
121121
- jcache:check
122122
- guava:check
123-
java: [ 11, 23 ]
123+
java: [ 11, 24 ]
124124
include:
125125
- suite: caffeine:weakKeysAndStrongValuesStatsSyncGuavaSlowTest
126126
java: 11
@@ -202,7 +202,7 @@ jobs:
202202
find . -path */jacoco/*.exec -o -path */results/*.xml
203203
| tar czf $ARTIFACT_NAME.tar.gz --files-from -
204204
- name: Upload test results
205-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
205+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
206206
if: always() && (env.JAVA_VERSION == env.PUBLISH_JDK)
207207
with:
208208
retention-days: 1
@@ -247,7 +247,7 @@ jobs:
247247
fetch-depth: 0
248248
persist-credentials: false
249249
- name: Download Tests Results
250-
uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
250+
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
251251
- name: Decompress
252252
run: find . -type f -name '*.tar.gz' -exec sh -c 'tar -zxf {} --one-top-level' \;
253253
- name: Combine Jacoco Reports
@@ -310,7 +310,7 @@ jobs:
310310
${{ env.ALLOWED_ENDPOINTS }}
311311
badgen.net:443
312312
- name: Download Tests
313-
uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
313+
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
314314
- name: Decompress
315315
run: find . -type f -name '*.tar.gz' -exec sh -c 'tar -zxf {} --one-top-level' \;
316316
- name: Publish Test Results

‎.github/workflows/codacy.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
if: steps.check_files.outputs.files_exists == 'true'
5050
run: jq -c '.runs |= unique_by({tool, invocations, results})' < results.sarif > codacy.sarif
5151
- name: Upload result to GitHub Code Scanning
52-
uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
52+
uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
5353
if: steps.check_files.outputs.files_exists == 'true'
5454
continue-on-error: true
5555
with:

‎.github/workflows/codeql.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ jobs:
5858
java: ${{ env.JAVA_VERSION }}
5959
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
6060
- name: Initialize CodeQL (Actions)
61-
uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
61+
uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
6262
if: ${{ matrix.language == 'actions' }}
6363
with:
6464
languages: actions
6565
dependency-caching: true
6666
- name: Initialize CodeQL (Java)
67-
uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
67+
uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
6868
if: ${{ matrix.language == 'java' }}
6969
with:
7070
queries: >
@@ -82,6 +82,6 @@ jobs:
8282
config: |
8383
threat-models: local
8484
- name: Autobuild
85-
uses: github/codeql-action/autobuild@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
85+
uses: github/codeql-action/autobuild@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
8686
- name: Perform CodeQL Analysis
87-
uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
87+
uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13

‎.github/workflows/dependency-check.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
env:
1010
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
11-
JAVA_VERSION: 23
11+
JAVA_VERSION: 24
1212

1313
jobs:
1414
dependency-check:
@@ -64,7 +64,7 @@ jobs:
6464
with:
6565
files: build/reports/dependency-check-report.sarif
6666
- name: Upload result to GitHub Code Scanning
67-
uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
67+
uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
6868
if: steps.check_files.outputs.files_exists == 'true'
6969
with:
7070
sarif_file: build/reports/dependency-check-report.sarif

‎.github/workflows/dependency-submission-pr-retrieve.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
env:
99
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
10-
JAVA_VERSION: 23
10+
JAVA_VERSION: 24
1111

1212
jobs:
1313
submit-dependency-graph:

‎.github/workflows/devskim.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ jobs:
3333
- name: Run DevSkim scanner
3434
uses: microsoft/DevSkim-Action@a6b6966a33b497cd3ae2ebc406edf8f4cc2feec6 # v1.0.15
3535
- name: Upload DevSkim scan results to GitHub Security tab
36-
uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
36+
uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
3737
with:
3838
sarif_file: devskim-results.sarif

‎.github/workflows/qodana.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,6 @@ jobs:
7272
upload-result: true
7373
github-token: ${{ secrets.GITHUB_TOKEN }}
7474
- name: Upload SARIF file for GitHub Advanced Security Dashboard
75-
uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
75+
uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
7676
with:
7777
sarif_file: ${{ runner.temp }}/qodana/results/qodana.sarif.json

‎.github/workflows/scorecards-analysis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ jobs:
5151
results_file: results.sarif
5252
repo_token: ${{ secrets.SCORECARD_READ_TOKEN }}
5353
- name: Upload artifact
54-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
54+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
5555
with:
5656
name: SARIF file
5757
path: results.sarif
5858
retention-days: 5
5959
- name: Upload to code-scanning
60-
uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
60+
uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
6161
with:
6262
sarif_file: results.sarif

‎.github/workflows/semgrep.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
with:
3535
files: results.sarif
3636
- name: Upload SARIF file for GitHub Advanced Security Dashboard
37-
uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
37+
uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
3838
if: steps.check_files.outputs.files_exists == 'true'
3939
continue-on-error: true
4040
with:

‎.github/workflows/snyk.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
with:
4545
files: snyk.sarif
4646
- name: Upload result to GitHub Code Scanning
47-
uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
47+
uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
4848
if: steps.check_files.outputs.files_exists == 'true'
4949
with:
5050
sarif_file: snyk.sarif

‎.github/workflows/spelling.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
persist-credentials: false
2323
- name: Misspell
24-
uses: reviewdog/action-misspell@18ffb61effb93b47e332f185216be7e49592e7e1 # v1.26.1
24+
uses: reviewdog/action-misspell@9daa94af4357dddb6fd3775de806bc0a8e98d3e4 # v1.26.3
2525
with:
2626
reporter: github-check
2727
github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -42,4 +42,4 @@ jobs:
4242
with:
4343
persist-credentials: false
4444
- name: Typos
45-
uses: crate-ci/typos@8951ef9cb569c860bc8f3f18070fbfaf65cdb349 # v1.30.0
45+
uses: crate-ci/typos@d08e4083f112e684fb88f6babd9ae60a1f1cd84f # v1.30.3

‎.github/workflows/trivy.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
with:
2929
persist-credentials: false
3030
- name: Run Trivy vulnerability scanner
31-
uses: aquasecurity/trivy-action@18f2510ee396bbf400402947b394f2dd8c87dbb0 # v0.29.0
31+
uses: aquasecurity/trivy-action@6c175e9c4083a92bbca2f9724c8a5e33bc2d97a5 # v0.30.0
3232
continue-on-error: true
3333
with:
3434
scan-type: fs
@@ -40,7 +40,7 @@ jobs:
4040
with:
4141
files: results.sarif
4242
- name: Upload result to GitHub Code Scanning
43-
uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
43+
uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
4444
if: steps.check_files.outputs.files_exists == 'true'
4545
with:
4646
sarif_file: results.sarif

‎caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/node/Finalize.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
*
2929
* @author [email protected] (Ben Manes)
3030
*/
31-
public class Finalize implements NodeRule {
31+
public final class Finalize implements NodeRule {
3232

3333
@Override
3434
public boolean applies(NodeContext context) {

‎caffeine/src/jmh/java/com/github/benmanes/caffeine/FactoryBenchmark.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
/**
3030
* This benchmark can be run by optionally specifying the target jvm in the command.
3131
* <p>
32-
* <pre>{@code
33-
* ./gradlew jmh -PincludePattern=FactoryBenchmark --rerun
34-
* }</pre>
32+
* {@snippet :
33+
* ./gradlew jmh -PincludePattern=FactoryBenchmark --rerun
34+
* }
3535
*
3636
* @author [email protected] (Ben Manes)
3737
*/

‎caffeine/src/jmh/java/com/github/benmanes/caffeine/cache/BuilderBenchmark.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@
3030

3131
/**
3232
* <p>
33-
* <pre>{@code
34-
* ./gradlew jmh -PincludePattern=BuilderBenchmark --rerun
35-
* }</pre>
33+
* {@snippet :
34+
* ./gradlew jmh -PincludePattern=BuilderBenchmark --rerun
35+
* }
3636
*
3737
* @author [email protected] (Ben Manes)
3838
*/
3939
@State(Scope.Benchmark)
40-
@SuppressWarnings("MemberName")
40+
@SuppressWarnings({"MemberName", "StatementSwitchToExpressionSwitch"})
4141
public class BuilderBenchmark {
4242
@Param BuilderType type;
4343
Supplier<?> builder;

‎caffeine/src/jmh/java/com/github/benmanes/caffeine/cache/EvictionBenchmark.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
* A benchmark that evaluates the eviction performance of a cache. The cache is pre-populated for
2828
* a 100% eviction rate to mimic worst case behavior.
2929
* <p>
30-
* <pre>{@code
31-
* ./gradlew jmh -PincludePattern=EvictionBenchmark --rerun
32-
* }</pre>
30+
* {@snippet :
31+
* ./gradlew jmh -PincludePattern=EvictionBenchmark --rerun
32+
* }
3333
*
3434
* @author [email protected] (Ben Manes)
3535
*/

‎caffeine/src/jmh/java/com/github/benmanes/caffeine/cache/FrequencySketchBenchmark.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
import site.ycsb.generator.ScrambledZipfianGenerator;
2929

3030
/**
31-
* <pre>{@code
32-
* ./gradlew jmh -PincludePattern=FrequencySketchBenchmark --rerun
33-
* }</pre>
31+
* {@snippet :
32+
* ./gradlew jmh -PincludePattern=FrequencySketchBenchmark --rerun
33+
* }
3434
*
3535
* @author [email protected] (Ben Manes)
3636
*/

‎caffeine/src/jmh/java/com/github/benmanes/caffeine/cache/GetPutBenchmark.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
* A benchmark that evaluates the read/write performance of a cache. The cache is pre-populated for
3636
* a 100% hit rate and a Zipf distribution of keys is used to mimic application usage patterns.
3737
* <p>
38-
* <pre>{@code
39-
* // JAVA_VERSION=?? for an alternative jdk
40-
* ./gradlew jmh -PincludePattern=GetPutBenchmark --rerun
41-
* }</pre>
38+
* {@snippet :
39+
* // JAVA_VERSION=?? for an alternative jdk
40+
* ./gradlew jmh -PincludePattern=GetPutBenchmark --rerun
41+
* }
4242
*
4343
* @author [email protected] (Ben Manes)
4444
*/

‎caffeine/src/jmh/java/com/github/benmanes/caffeine/cache/PutRemoveBenchmark.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
* relatively rare compared to reads. Thus, this benchmark is only for diagnosing performance
4141
* concerns and should not be used to compare implementations.
4242
* <p>
43-
* <pre>{@code
44-
* ./gradlew jmh -PincludePattern=PutRemoveBenchmark --rerun
45-
* }</pre>
43+
* {@snippet :
44+
* ./gradlew jmh -PincludePattern=PutRemoveBenchmark --rerun
45+
* }
4646
*
4747
* @author [email protected] (Ben Manes)
4848
*/

‎caffeine/src/jmh/java/com/github/benmanes/caffeine/cache/TimerWheelBenchmark.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import org.openjdk.jmh.annotations.State;
2727

2828
/**
29-
* <pre>{@code
30-
* ./gradlew jmh -PincludePattern=TimerWheelBenchmark --rerun
31-
* }</pre>
29+
* {@snippet :
30+
* ./gradlew jmh -PincludePattern=TimerWheelBenchmark --rerun
31+
* }
3232
*
3333
* @author [email protected] (Ben Manes)
3434
*/

0 commit comments

Comments
 (0)