dependency updates

.github/workflows/actionlint.yml

@@ -56,7 +56,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: uvx zizmor --pedantic --format sarif . > results.sarif
       - name: Upload SARIF file for GitHub Advanced Security Dashboard
-        uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
+        uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
         with:
           sarif_file: results.sarif
           category: zizmor

.github/workflows/codacy.yml

@@ -49,7 +49,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@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
+        uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
         if: steps.check_files.outputs.files_exists == 'true'
         continue-on-error: true
         with:

.github/workflows/codeql.yml

@@ -58,13 +58,13 @@ jobs:
           java: ${{ env.JAVA_VERSION }}
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
       - name: Initialize CodeQL (Actions)
-        uses: github/codeql-action/init@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
+        uses: github/codeql-action/init@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
         if: ${{ matrix.language == 'actions' }}
         with:
           languages: actions
           dependency-caching: true
       - name: Initialize CodeQL (Java)
-        uses: github/codeql-action/init@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
+        uses: github/codeql-action/init@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
         if: ${{ matrix.language == 'java' }}
         with:
           queries: >
@@ -82,6 +82,6 @@ jobs:
           config: |
             threat-models: local
       - name: Autobuild
-        uses: github/codeql-action/autobuild@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
+        uses: github/codeql-action/autobuild@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
+        uses: github/codeql-action/analyze@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9

.github/workflows/dependency-check.yml

@@ -64,7 +64,7 @@ jobs:
         with:
           files: build/reports/dependency-check-report.sarif
       - name: Upload result to GitHub Code Scanning
-        uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
+        uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
         if: steps.check_files.outputs.files_exists == 'true'
         with:
           sarif_file: build/reports/dependency-check-report.sarif

.github/workflows/devskim.yml

@@ -33,6 +33,6 @@ jobs:
       - name: Run DevSkim scanner
         uses: microsoft/DevSkim-Action@a6b6966a33b497cd3ae2ebc406edf8f4cc2feec6 # v1.0.15
       - name: Upload DevSkim scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
+        uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
         with:
           sarif_file: devskim-results.sarif

.github/workflows/qodana.yml

@@ -72,6 +72,6 @@ jobs:
           upload-result: true
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Upload SARIF file for GitHub Advanced Security Dashboard
-        uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
+        uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
         with:
           sarif_file: ${{ runner.temp }}/qodana/results/qodana.sarif.json

.github/workflows/scorecards-analysis.yml

@@ -57,6 +57,6 @@ jobs:
           path: results.sarif
           retention-days: 5
       - name: Upload to code-scanning
-        uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
+        uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
         with:
           sarif_file: results.sarif

.github/workflows/semgrep.yml

@@ -34,7 +34,7 @@ jobs:
         with:
           files: results.sarif
       - name: Upload SARIF file for GitHub Advanced Security Dashboard
-        uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
+        uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
         if: steps.check_files.outputs.files_exists == 'true'
         continue-on-error: true
         with:

.github/workflows/snyk.yml

@@ -44,7 +44,7 @@ jobs:
         with:
           files: snyk.sarif
       - name: Upload result to GitHub Code Scanning
-        uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
+        uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
         if: steps.check_files.outputs.files_exists == 'true'
         with:
           sarif_file: snyk.sarif

.github/workflows/trivy.yml

@@ -40,7 +40,7 @@ jobs:
         with:
           files: results.sarif
       - name: Upload result to GitHub Code Scanning
-        uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
+        uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
         if: steps.check_files.outputs.files_exists == 'true'
         with:
             sarif_file: results.sarif

caffeine/src/test/java/com/github/benmanes/caffeine/cache/buffer/FastFlowBuffer.java

@@ -57,7 +57,7 @@ public int offer(E e) {
 
   @Override
   @SuppressWarnings("unchecked")
-  public void drainTo(Consumer<E> consumer) {
+  protected void drainTo(Consumer<E> consumer) {
     long head = readCounter;
     long tail = writeCounterOpaque();
     long size = (tail - head);

caffeine/src/test/java/com/github/benmanes/caffeine/cache/buffer/ManyToOneBuffer.java

@@ -51,7 +51,7 @@ public int offer(E e) {
 
   @Override
   @SuppressWarnings("unchecked")
-  public void drainTo(Consumer<E> consumer) {
+  protected void drainTo(Consumer<E> consumer) {
     long head = readCounter;
     long tail = writeCounterOpaque();
     long size = (tail - head);

caffeine/src/test/java/com/github/benmanes/caffeine/cache/buffer/ManyToOneSpacedBuffer.java

@@ -56,7 +56,7 @@ public int offer(E e) {
 
   @Override
   @SuppressWarnings("unchecked")
-  public void drainTo(Consumer<E> consumer) {
+  protected void drainTo(Consumer<E> consumer) {
     long head = readCounter;
     long tail = writeCounterOpaque();
     long size = (tail - head);

caffeine/src/test/java/com/github/benmanes/caffeine/cache/buffer/MpmcArrayBuffer.java

@@ -36,7 +36,7 @@ public int offer(E e) {
   }
 
   @Override
-  public void drainTo(Consumer<E> consumer) {
+  protected void drainTo(Consumer<E> consumer) {
     reads += queue.drain(consumer);
   }
 

caffeine/src/test/java/com/github/benmanes/caffeine/cache/buffer/MpscArrayBuffer.java

@@ -36,7 +36,7 @@ public int offer(E e) {
   }
 
   @Override
-  public void drainTo(Consumer<E> consumer) {
+  protected void drainTo(Consumer<E> consumer) {
     reads += queue.drain(consumer);
   }
 

caffeine/src/test/java/com/github/benmanes/caffeine/cache/buffer/MpscCompoundBuffer.java

@@ -36,7 +36,7 @@ public int offer(E e) {
   }
 
   @Override
-  public void drainTo(Consumer<E> consumer) {
+  protected void drainTo(Consumer<E> consumer) {
     reads += queue.drain(consumer);
   }
 

caffeine/src/test/java/com/github/benmanes/caffeine/cache/buffer/TicketBuffer.java

@@ -68,7 +68,7 @@ public int offer(E e) {
   }
 
   @Override
-  public void drainTo(Consumer<E> consumer) {
+  protected void drainTo(Consumer<E> consumer) {
     for (int i = 0; i < BUFFER_SIZE; i++) {
       int index = (int) (readCounter & BUFFER_MASK);
       AtomicReference<Object> slot = buffer[index];

examples/coalescing-bulkloader-reactor/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 caffeine = "3.2.0"
-junit = "5.12.0-M1"
+junit = "5.12.0-RC1"
 reactor = "3.7.2"
 truth = "1.4.4"
 versions = "0.52.0"

examples/graal-native/gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 caffeine = "3.2.0"
-graal = "0.10.4"
-junit = "5.12.0-M1"
+graal = "0.10.5"
+junit = "5.12.0-RC1"
 truth = "1.4.4"
 versions = "0.52.0"
 

examples/hibernate/gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 caffeine = "3.2.0"
 h2 = "2.3.232"
 hibernate = "7.0.0.Beta3"
-junit = "5.12.0-M1"
+junit = "5.12.0-RC1"
 log4j2 = "3.0.0-beta2"
 truth = "1.4.4"
 versions = "0.52.0"

examples/indexable/gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 caffeine = "3.2.0"
 guava = "33.4.0-jre"
-junit-jupiter = "5.12.0-M1"
+junit-jupiter = "5.12.0-RC1"
 truth = "1.4.4"
 versions = "0.52.0"
 

examples/resilience-failsafe/gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 caffeine = "3.2.0"
 failsafe = "3.3.2"
-junit = "5.12.0-M1"
+junit = "5.12.0-RC1"
 truth = "1.4.4"
 versions = "0.52.0"
 

examples/write-behind-rxjava/gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 awaitility = "4.2.2"
 caffeine = "3.2.0"
-junit = "5.12.0-M1"
+junit = "5.12.0-RC1"
 rxjava = "3.1.10"
 versions = "0.52.0"
 

gradle/config/spotbugs/exclude.xml

@@ -187,7 +187,10 @@
     <Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE"/>
   </Match>
   <Match>
-    <Class name="com.github.benmanes.caffeine.cache.LocalCacheFactory"/>
+    <Or>
+      <Class name="com.github.benmanes.caffeine.cache.LocalCacheFactory"/>
+      <Class name="com.github.benmanes.caffeine.cache.LocalCacheFactory$MethodHandleBasedFactory"/>
+    </Or>
     <Method name="newInstance"/>
     <Bug pattern="THROWS_METHOD_THROWS_CLAUSE_THROWABLE"/>
   </Match>
@@ -371,6 +374,10 @@
     </Or>
     <Bug pattern="RV_RETURN_VALUE_IGNORED"/>
   </Match>
+  <Match>
+    <Class name="com.github.benmanes.caffeine.jcache.CacheProxy"/>
+    <Bug pattern="AT_STALE_THREAD_WRITE_OF_PRIMITIVE"/>
+  </Match>
   <Match>
     <Class name="com.github.benmanes.caffeine.jcache.CacheProxy$EntryIterator"/>
     <Method name="remove"/>
@@ -705,4 +712,8 @@
     <Class name="com.github.benmanes.caffeine.guava.CaffeinatedGuavaTest"/>
     <Bug pattern="UTAO_JUNIT_ASSERTION_ODDITIES_NO_ASSERT"/>
   </Match>
+  <Match>
+    <Class name="com.github.benmanes.caffeine.cache.buffer.TicketBuffer"/>
+    <Bug pattern="AT_NONATOMIC_OPERATIONS_ON_SHARED_VARIABLE"/>
+  </Match>
 </FindBugsFilter>

gradle/libs.versions.toml

@@ -8,7 +8,7 @@ bouncycastle-jdk18on = "1.80"
 cache2k = "2.6.1.Final"
 caffeine = "3.2.0"
 checkstyle = "10.21.2"
-coherence = "24.09.2"
+coherence = "24.09.3"
 commons-collections4 = "4.5.0-M3"
 commons-compress = "1.27.1"
 commons-io = "2.18.0"
@@ -62,10 +62,10 @@ json-bind = "1.0"
 jsoup = "1.18.3"
 junit-testng = "1.0.5"
 junit4 = "4.13.2"
-junit5 = "5.12.0-M1"
+junit5 = "5.12.0-RC1"
 jvm-dependency-conflict-resolution = "2.1.2"
 kotlin = "2.1.10"
-lincheck = "2.34"
+lincheck = "2.35"
 mockito = "5.15.2"
 nexus-publish = "2.0.0"
 nullaway = "0.12.3"
@@ -85,7 +85,7 @@ slf4j-test = "3.0.1"
 snakeyaml = "2.3"
 sigstore = "1.2.0"
 sonarqube = "6.0.1.5171"
-spotbugs = "4.9.0"
+spotbugs = "4.9.1"
 spotbugs-contrib = "7.6.9"
 spotbugs-plugin = "6.1.3"
 stream = "2.9.8"

jcache/src/main/java/com/github/benmanes/caffeine/jcache/CacheProxy.java

@@ -370,7 +370,7 @@ protected PutResult<V> putNoCopyOrAwait(K key, V value, boolean publishToWriter)
         statistics.recordEvictions(1L);
         expirable = null;
       }
-      @Var long expireTimeMillis = getWriteexpireTimeMillis((expirable == null));
+      @Var long expireTimeMillis = getWriteExpireTimeMillis((expirable == null));
       if ((expirable != null) && (expireTimeMillis == Long.MIN_VALUE)) {
         expireTimeMillis = expirable.getExpireTimeMillis();
       }
@@ -497,7 +497,7 @@ private boolean putIfAbsentNoAwait(K key, V value, boolean publishToWriter) {
 
       absent[0] = true;
       V copy = copyOf(value);
-      long expireTimeMillis = getWriteexpireTimeMillis(/* created= */ true);
+      long expireTimeMillis = getWriteExpireTimeMillis(/* created= */ true);
       if (expireTimeMillis == 0) {
         // The TCK asserts that a create is not published in
         // CacheExpiryTest.expire_whenCreated_CreatedExpiryPolicy()
@@ -652,7 +652,7 @@ public boolean replace(K key, V oldValue, V newValue) {
       if (oldValue.equals(expirable.get())) {
         publishToCacheWriter(writer::write, () -> new EntryProxy<>(key, expirable.get()));
         dispatcher.publishUpdated(this, key, expirable.get(), copyOf(newValue));
-        @Var long expireTimeMillis = getWriteexpireTimeMillis(/* created= */ false);
+        @Var long expireTimeMillis = getWriteExpireTimeMillis(/* created= */ false);
         if (expireTimeMillis == Long.MIN_VALUE) {
           expireTimeMillis = expirable.getExpireTimeMillis();
         }
@@ -746,7 +746,7 @@ private V replaceNoCopyOrAwait(K key, V value) {
       }
 
       publishToCacheWriter(writer::write, () -> new EntryProxy<>(key, value));
-      @Var long expireTimeMillis = getWriteexpireTimeMillis(/* created= */ false);
+      @Var long expireTimeMillis = getWriteExpireTimeMillis(/* created= */ false);
       if (expireTimeMillis == Long.MIN_VALUE) {
         expireTimeMillis = expirable.getExpireTimeMillis();
       }
@@ -891,13 +891,13 @@ public <C extends Configuration<K, V>> C getConfiguration(Class<C> clazz) {
       case LOADED:
         statistics.recordPuts(1L);
         dispatcher.publishCreated(this, entry.getKey(), entry.getValue());
-        return new Expirable<>(entry.getValue(), getWriteexpireTimeMillis(/* created= */ true));
+        return new Expirable<>(entry.getValue(), getWriteExpireTimeMillis(/* created= */ true));
       case UPDATED: {
         statistics.recordPuts(1L);
         publishToCacheWriter(writer::write, () -> entry);
         requireNonNull(expirable, "Expected a previous value but was null");
         dispatcher.publishUpdated(this, entry.getKey(), expirable.get(), entry.getValue());
-        @Var long expireTimeMillis = getWriteexpireTimeMillis(/* created= */ false);
+        @Var long expireTimeMillis = getWriteExpireTimeMillis(/* created= */ false);
         if (expireTimeMillis == Long.MIN_VALUE) {
           expireTimeMillis = expirable.getExpireTimeMillis();
         }
@@ -1197,7 +1197,7 @@ protected final void setAccessExpireTime(K key,
    * @return the time when the entry will expire, zero if it should expire immediately,
    *         Long.MIN_VALUE if it should not be changed, or Long.MAX_VALUE if eternal
    */
-  protected final long getWriteexpireTimeMillis(boolean created) {
+  protected final long getWriteExpireTimeMillis(boolean created) {
     try {
       Duration duration = created ? expiry.getExpiryForCreation() : expiry.getExpiryForUpdate();
       if (duration == null) {

jcache/src/test/java/com/github/benmanes/caffeine/jcache/CacheProxyTest.java

@@ -156,7 +156,7 @@ public void setAccessExpireTime_exception() {
   @Test
   public void getWriteExpireTime_exception() {
     when(expiry.getExpiryForCreation()).thenThrow(IllegalStateException.class);
-    long time = jcache.getWriteexpireTimeMillis(true);
+    long time = jcache.getWriteExpireTimeMillis(true);
     assertThat(time).isEqualTo(Long.MIN_VALUE);
   }