diff --git a/caffeine/src/test/java/com/github/benmanes/caffeine/openjdk/concurrent/concurrenthashmap/MapCheck.java b/caffeine/src/test/java/com/github/benmanes/caffeine/openjdk/concurrent/concurrenthashmap/MapCheck.java index addf93cdc6..1ec74ac071 100644 --- a/caffeine/src/test/java/com/github/benmanes/caffeine/openjdk/concurrent/concurrenthashmap/MapCheck.java +++ b/caffeine/src/test/java/com/github/benmanes/caffeine/openjdk/concurrent/concurrenthashmap/MapCheck.java @@ -32,6 +32,8 @@ */ package com.github.benmanes.caffeine.openjdk.concurrent.concurrenthashmap; +import static com.google.common.truth.Truth.assertWithMessage; + import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.FileInputStream; @@ -49,7 +51,9 @@ import java.util.concurrent.ThreadLocalRandom; import java.util.function.Supplier; +import org.testng.ITestResult; import org.testng.annotations.Test; +import org.testng.util.RetryAnalyzerCount; import com.github.benmanes.caffeine.cache.Caffeine; @@ -77,15 +81,25 @@ static void reallyAssert(boolean b) { } } - @Test + public static final class Retries extends RetryAnalyzerCount { + public Retries() { + setCount(3); + } + @Override public boolean retryMethod(ITestResult result) { + return !result.isSuccess(); + } + } + + @Test(retryAnalyzer = Retries.class) public void bounded() { test(() -> Caffeine.newBuilder() .expireAfterWrite(Duration.ofNanos(Long.MAX_VALUE)) .maximumSize(Long.MAX_VALUE) + .executor(Runnable::run) .build().asMap()); } - @Test + @Test(retryAnalyzer = Retries.class) public void unbounded() { test(() -> Caffeine.newBuilder().build().asMap()); } @@ -183,7 +197,7 @@ static void t1(String nm, int n, Map s, Object[] key, int expect) { } } timer.finish(); - reallyAssert(sum == expect * iters); + assertWithMessage("%s", s).that(sum).isEqualTo(expect * iters); } static void t2(String nm, int n, Map s, Object[] key, int expect) { @@ -195,7 +209,7 @@ static void t2(String nm, int n, Map s, Object[] key, int expect) { } } timer.finish(); - reallyAssert(sum == expect); + assertWithMessage("%s", s).that(sum).isEqualTo(expect); } static void t3(String nm, int n, Map s, Object[] key, int expect) { @@ -207,7 +221,7 @@ static void t3(String nm, int n, Map s, Object[] key, int expect) { } } timer.finish(); - reallyAssert(sum == expect); + assertWithMessage("%s", s).that(sum).isEqualTo(expect); } static void t4(String nm, int n, Map s, Object[] key, int expect) { @@ -219,7 +233,7 @@ static void t4(String nm, int n, Map s, Object[] key, int expect) { } } timer.finish(); - reallyAssert(sum == expect); + assertWithMessage("%s", s).that(sum).isEqualTo(expect); } static void t5(String nm, int n, Map s, Object[] key, int expect) { @@ -231,7 +245,7 @@ static void t5(String nm, int n, Map s, Object[] key, int expect) { } } timer.finish(); - reallyAssert(sum == expect); + assertWithMessage("%s", s).that(sum).isEqualTo(expect); } static void t6(String nm, int n, Map s, Object[] k1, Object[] k2) { @@ -246,7 +260,7 @@ static void t6(String nm, int n, Map s, Object[] k1, Object[] k2) { } } timer.finish(); - reallyAssert(sum == n); + assertWithMessage("%s", s).that(sum).isEqualTo(n); } static void t7(String nm, int n, Map s, Object[] k1, Object[] k2) { @@ -261,7 +275,7 @@ static void t7(String nm, int n, Map s, Object[] k1, Object[] k2) { } } timer.finish(); - reallyAssert(sum == n); + assertWithMessage("%s", s).that(sum).isEqualTo(n); } static void t8(String nm, int n, Map s, Object[] key, int expect) { @@ -273,7 +287,7 @@ static void t8(String nm, int n, Map s, Object[] key, int expect) { } } timer.finish(); - reallyAssert(sum == expect); + assertWithMessage("%s", s).that(sum).isEqualTo(expect); } @@ -288,7 +302,7 @@ static void t9(Map s) { } } timer.finish(); - reallyAssert(sum != 0); + assertWithMessage("%s", s).that(sum).isNotEqualTo(0); } @@ -302,7 +316,7 @@ static void ktest(Map s, int size, Object[] key) { } } timer.finish(); - reallyAssert(sum == size); + assertWithMessage("%s", s).that(sum).isEqualTo(size); } @@ -315,7 +329,7 @@ static void ittest1(Map s, int size) { } } timer.finish(); - reallyAssert(sum == size); + assertWithMessage("%s", s).that(sum).isEqualTo(size); } static void ittest2(Map s, int size) { @@ -327,7 +341,7 @@ static void ittest2(Map s, int size) { } } timer.finish(); - reallyAssert(sum == size); + assertWithMessage("%s", s).that(sum).isEqualTo(size); } static void ittest3(Map s, int size) { int sum = 0; @@ -338,12 +352,12 @@ static void ittest3(Map s, int size) { } } timer.finish(); - reallyAssert(sum == size); + assertWithMessage("%s", s).that(sum).isEqualTo(size); } static void ittest4(Map s, int size, int pos) { IdentityHashMap seen = new IdentityHashMap(size); - reallyAssert(s.size() == size); + assertWithMessage("%s", s).that(s).hasSize(size); int sum = 0; timer.start("Iter XEntry ", size); Iterator it = s.entrySet().iterator(); @@ -358,9 +372,9 @@ static void ittest4(Map s, int size, int pos) { ++sum; } } - reallyAssert(s.containsKey(k)); + assertWithMessage("%s", s).that(s).containsKey(k); it.remove(); - reallyAssert(!s.containsKey(k)); + assertWithMessage("%s", s).that(s).doesNotContainKey(k); while (it.hasNext()) { Map.Entry x = (Map.Entry)(it.next()); Object k2 = x.getKey(); @@ -370,12 +384,12 @@ static void ittest4(Map s, int size, int pos) { } } - reallyAssert(s.size() == size-1); + assertWithMessage("%s", s).that(s).hasSize(size-1); s.put(k, v); - reallyAssert(seen.size() == size); + assertWithMessage("%s", s).that(seen).hasSize(size); timer.finish(); - reallyAssert(sum == size); - reallyAssert(s.size() == size); + assertWithMessage("%s", s).that(sum).isEqualTo(size); + assertWithMessage("%s", s).that(s).hasSize(size); } @@ -397,7 +411,7 @@ static void entest1(Hashtable ht, int size) { } } timer.finish(); - reallyAssert(sum == size); + assertWithMessage("%s", ht).that(sum).isEqualTo(size); } static void entest2(Hashtable ht, int size) { @@ -409,7 +423,7 @@ static void entest2(Hashtable ht, int size) { } } timer.finish(); - reallyAssert(sum == size); + assertWithMessage("%s", ht).that(sum).isEqualTo(size); } @@ -424,7 +438,7 @@ static void entest3(Hashtable ht, int size) { } } timer.finish(); - reallyAssert(sum == size); + assertWithMessage("%s", ht).that(sum).isEqualTo(size); } static void entest4(Hashtable ht, int size) { @@ -437,7 +451,7 @@ static void entest4(Hashtable ht, int size) { } } timer.finish(); - reallyAssert(sum == size); + assertWithMessage("%s", ht).that(sum).isEqualTo(size); } static void entest(Map s, int size) { @@ -484,14 +498,14 @@ static void dtest(Supplier supplier, Map s, int size, Object[] key) { timer.finish(); timer.start("Iter Equals ", size * 2); - boolean eqt = s2.equals(s) && s.equals(s2); - reallyAssert(eqt); + assertWithMessage("%s", s).that(s).isEqualTo(s2); + assertWithMessage("%s", s).that(s2).isEqualTo(s); timer.finish(); timer.start("Iter HashCode ", size * 2); int shc = s.hashCode(); int s2hc = s2.hashCode(); - reallyAssert(shc == s2hc); + assertWithMessage("%s", s).that(shc).isEqualTo(s2hc); timer.finish(); timer.start("Put (present) ", size); @@ -508,21 +522,21 @@ static void dtest(Supplier supplier, Map s, int size, Object[] key) { } } timer.finish(); - reallyAssert(sum == size); + assertWithMessage("%s", s).that(sum).isEqualTo(size); t6("Get ", size, s2, key, absent); Object hold = s2.get(key[size-1]); s2.put(key[size-1], absent[0]); timer.start("Iter Equals ", size * 2); - eqt = s2.equals(s) && s.equals(s2); - reallyAssert(!eqt); + assertWithMessage("%s", s).that(s).isNotEqualTo(s2); + assertWithMessage("%s", s).that(s2).isNotEqualTo(s); timer.finish(); timer.start("Iter HashCode ", size * 2); int s1h = s.hashCode(); int s2h = s2.hashCode(); - reallyAssert(s1h != s2h); + assertWithMessage("%s", s).that(s1h).isNotEqualTo(s2h); timer.finish(); s2.put(key[size-1], hold); @@ -534,12 +548,13 @@ static void dtest(Supplier supplier, Map s, int size, Object[] key) { } timer.finish(); - reallyAssert(s.isEmpty()); + assertWithMessage("%s", s).that(s).isEmpty(); timer.start("Clear ", size); s2.clear(); timer.finish(); - reallyAssert(s2.isEmpty() && s.isEmpty()); + assertWithMessage("%s", s).that(s).isEmpty(); + assertWithMessage("%s", s).that(s2).isEmpty(); } static void stest(Map s, int size) throws Exception { @@ -571,7 +586,7 @@ static void stest(Map s, int size) throws Exception { if (s instanceof IdentityHashMap) { return; } - reallyAssert(s.equals(m)); + assertWithMessage("%s", s).that(s).isEqualTo(m); } diff --git a/examples/coalescing-bulkloader-reactor/gradle/gradle-daemon-jvm.properties b/examples/coalescing-bulkloader-reactor/gradle/gradle-daemon-jvm.properties index 63e5bbdf48..eecab2ddb4 100644 --- a/examples/coalescing-bulkloader-reactor/gradle/gradle-daemon-jvm.properties +++ b/examples/coalescing-bulkloader-reactor/gradle/gradle-daemon-jvm.properties @@ -1,2 +1,12 @@ #This file is generated by updateDaemonJvm +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e2d97f28068cf05b0467aa8e97b19f69/redirect +toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/a41f952f4496c2309be30fd168c6c117/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e2d97f28068cf05b0467aa8e97b19f69/redirect +toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/a41f952f4496c2309be30fd168c6c117/redirect +toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e7806cd9471741d622398825f14d2da6/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/0402cc5012ae8124ea0ad01bd29342ef/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e2d97f28068cf05b0467aa8e97b19f69/redirect +toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/a41f952f4496c2309be30fd168c6c117/redirect +toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/86ea5d26c5757681ffe78d87258b45ec/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/ea8232621e1368089cec8b12816df5e3/redirect toolchainVersion=21 diff --git a/examples/coalescing-bulkloader-reactor/gradle/libs.versions.toml b/examples/coalescing-bulkloader-reactor/gradle/libs.versions.toml index fb02951dab..d0fb149536 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.2.0" -junit = "5.12.0-RC1" -reactor = "3.7.2" +junit = "5.12.0-RC2" +reactor = "3.7.3" truth = "1.4.4" versions = "0.52.0" diff --git a/examples/coalescing-bulkloader-reactor/gradle/wrapper/gradle-wrapper.properties b/examples/coalescing-bulkloader-reactor/gradle/wrapper/gradle-wrapper.properties index 304dce7831..9a5d406e89 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.12.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-rc-1-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 7def714a6b..4aae217a62 100644 --- a/examples/graal-native/gradle/libs.versions.toml +++ b/examples/graal-native/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] caffeine = "3.2.0" graal = "0.10.5" -junit = "5.12.0-RC1" +junit = "5.12.0-RC2" truth = "1.4.4" versions = "0.52.0" diff --git a/examples/graal-native/gradle/wrapper/gradle-wrapper.properties b/examples/graal-native/gradle/wrapper/gradle-wrapper.properties index 304dce7831..9a5d406e89 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.12.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-rc-1-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/examples/hibernate/gradle/gradle-daemon-jvm.properties b/examples/hibernate/gradle/gradle-daemon-jvm.properties index 63e5bbdf48..eecab2ddb4 100644 --- a/examples/hibernate/gradle/gradle-daemon-jvm.properties +++ b/examples/hibernate/gradle/gradle-daemon-jvm.properties @@ -1,2 +1,12 @@ #This file is generated by updateDaemonJvm +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e2d97f28068cf05b0467aa8e97b19f69/redirect +toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/a41f952f4496c2309be30fd168c6c117/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e2d97f28068cf05b0467aa8e97b19f69/redirect +toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/a41f952f4496c2309be30fd168c6c117/redirect +toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e7806cd9471741d622398825f14d2da6/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/0402cc5012ae8124ea0ad01bd29342ef/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e2d97f28068cf05b0467aa8e97b19f69/redirect +toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/a41f952f4496c2309be30fd168c6c117/redirect +toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/86ea5d26c5757681ffe78d87258b45ec/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/ea8232621e1368089cec8b12816df5e3/redirect toolchainVersion=21 diff --git a/examples/hibernate/gradle/libs.versions.toml b/examples/hibernate/gradle/libs.versions.toml index 86ad4c92a7..d8593cb9ba 100644 --- a/examples/hibernate/gradle/libs.versions.toml +++ b/examples/hibernate/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] caffeine = "3.2.0" h2 = "2.3.232" -hibernate = "7.0.0.Beta3" -junit = "5.12.0-RC1" +hibernate = "7.0.0.Beta4" +junit = "5.12.0-RC2" log4j2 = "3.0.0-beta2" truth = "1.4.4" versions = "0.52.0" diff --git a/examples/hibernate/gradle/wrapper/gradle-wrapper.properties b/examples/hibernate/gradle/wrapper/gradle-wrapper.properties index 304dce7831..9a5d406e89 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.12.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-rc-1-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/examples/indexable/gradle/gradle-daemon-jvm.properties b/examples/indexable/gradle/gradle-daemon-jvm.properties index 63e5bbdf48..eecab2ddb4 100644 --- a/examples/indexable/gradle/gradle-daemon-jvm.properties +++ b/examples/indexable/gradle/gradle-daemon-jvm.properties @@ -1,2 +1,12 @@ #This file is generated by updateDaemonJvm +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e2d97f28068cf05b0467aa8e97b19f69/redirect +toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/a41f952f4496c2309be30fd168c6c117/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e2d97f28068cf05b0467aa8e97b19f69/redirect +toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/a41f952f4496c2309be30fd168c6c117/redirect +toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e7806cd9471741d622398825f14d2da6/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/0402cc5012ae8124ea0ad01bd29342ef/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e2d97f28068cf05b0467aa8e97b19f69/redirect +toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/a41f952f4496c2309be30fd168c6c117/redirect +toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/86ea5d26c5757681ffe78d87258b45ec/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/ea8232621e1368089cec8b12816df5e3/redirect toolchainVersion=21 diff --git a/examples/indexable/gradle/libs.versions.toml b/examples/indexable/gradle/libs.versions.toml index eba279efa5..2424aa969e 100644 --- a/examples/indexable/gradle/libs.versions.toml +++ b/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-RC1" +junit-jupiter = "5.12.0-RC2" truth = "1.4.4" versions = "0.52.0" diff --git a/examples/indexable/gradle/wrapper/gradle-wrapper.properties b/examples/indexable/gradle/wrapper/gradle-wrapper.properties index 304dce7831..9a5d406e89 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.12.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-rc-1-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/examples/resilience-failsafe/gradle/gradle-daemon-jvm.properties b/examples/resilience-failsafe/gradle/gradle-daemon-jvm.properties index 63e5bbdf48..eecab2ddb4 100644 --- a/examples/resilience-failsafe/gradle/gradle-daemon-jvm.properties +++ b/examples/resilience-failsafe/gradle/gradle-daemon-jvm.properties @@ -1,2 +1,12 @@ #This file is generated by updateDaemonJvm +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e2d97f28068cf05b0467aa8e97b19f69/redirect +toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/a41f952f4496c2309be30fd168c6c117/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e2d97f28068cf05b0467aa8e97b19f69/redirect +toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/a41f952f4496c2309be30fd168c6c117/redirect +toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e7806cd9471741d622398825f14d2da6/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/0402cc5012ae8124ea0ad01bd29342ef/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e2d97f28068cf05b0467aa8e97b19f69/redirect +toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/a41f952f4496c2309be30fd168c6c117/redirect +toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/86ea5d26c5757681ffe78d87258b45ec/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/ea8232621e1368089cec8b12816df5e3/redirect toolchainVersion=21 diff --git a/examples/resilience-failsafe/gradle/libs.versions.toml b/examples/resilience-failsafe/gradle/libs.versions.toml index 20765dbe78..117cd810df 100644 --- a/examples/resilience-failsafe/gradle/libs.versions.toml +++ b/examples/resilience-failsafe/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] caffeine = "3.2.0" failsafe = "3.3.2" -junit = "5.12.0-RC1" +junit = "5.12.0-RC2" truth = "1.4.4" versions = "0.52.0" diff --git a/examples/resilience-failsafe/gradle/wrapper/gradle-wrapper.properties b/examples/resilience-failsafe/gradle/wrapper/gradle-wrapper.properties index 304dce7831..9a5d406e89 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.12.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-rc-1-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/examples/write-behind-rxjava/gradle/gradle-daemon-jvm.properties b/examples/write-behind-rxjava/gradle/gradle-daemon-jvm.properties index 63e5bbdf48..eecab2ddb4 100644 --- a/examples/write-behind-rxjava/gradle/gradle-daemon-jvm.properties +++ b/examples/write-behind-rxjava/gradle/gradle-daemon-jvm.properties @@ -1,2 +1,12 @@ #This file is generated by updateDaemonJvm +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e2d97f28068cf05b0467aa8e97b19f69/redirect +toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/a41f952f4496c2309be30fd168c6c117/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e2d97f28068cf05b0467aa8e97b19f69/redirect +toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/a41f952f4496c2309be30fd168c6c117/redirect +toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e7806cd9471741d622398825f14d2da6/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/0402cc5012ae8124ea0ad01bd29342ef/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e2d97f28068cf05b0467aa8e97b19f69/redirect +toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/a41f952f4496c2309be30fd168c6c117/redirect +toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/86ea5d26c5757681ffe78d87258b45ec/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/ea8232621e1368089cec8b12816df5e3/redirect toolchainVersion=21 diff --git a/examples/write-behind-rxjava/gradle/libs.versions.toml b/examples/write-behind-rxjava/gradle/libs.versions.toml index f483b58895..86f6ef3c39 100644 --- a/examples/write-behind-rxjava/gradle/libs.versions.toml +++ b/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-RC1" +junit = "5.12.0-RC2" rxjava = "3.1.10" versions = "0.52.0" diff --git a/examples/write-behind-rxjava/gradle/wrapper/gradle-wrapper.properties b/examples/write-behind-rxjava/gradle/wrapper/gradle-wrapper.properties index 304dce7831..9a5d406e89 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.12.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-rc-1-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties index 63e5bbdf48..eecab2ddb4 100644 --- a/gradle/gradle-daemon-jvm.properties +++ b/gradle/gradle-daemon-jvm.properties @@ -1,2 +1,12 @@ #This file is generated by updateDaemonJvm +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e2d97f28068cf05b0467aa8e97b19f69/redirect +toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/a41f952f4496c2309be30fd168c6c117/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e2d97f28068cf05b0467aa8e97b19f69/redirect +toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/a41f952f4496c2309be30fd168c6c117/redirect +toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e7806cd9471741d622398825f14d2da6/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/0402cc5012ae8124ea0ad01bd29342ef/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e2d97f28068cf05b0467aa8e97b19f69/redirect +toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/a41f952f4496c2309be30fd168c6c117/redirect +toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/86ea5d26c5757681ffe78d87258b45ec/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/ea8232621e1368089cec8b12816df5e3/redirect toolchainVersion=21 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d46942deee..d14eef0142 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -62,7 +62,7 @@ json-bind = "1.0" jsoup = "1.18.3" junit-testng = "1.0.5" junit4 = "4.13.2" -junit5 = "5.12.0-RC1" +junit5 = "5.12.0-RC2" jvm-dependency-conflict-resolution = "2.1.2" kotlin = "2.1.10" lincheck = "2.35" @@ -87,7 +87,7 @@ sigstore = "1.2.0" sonarqube = "6.0.1.5171" spotbugs = "4.9.1" spotbugs-contrib = "7.6.9" -spotbugs-plugin = "6.1.3" +spotbugs-plugin = "6.1.4" stream = "2.9.8" tcache = "2.0.1" testng = "7.10.2" @@ -97,7 +97,7 @@ versions = "0.52.0" xz = "1.10" ycsb = "0.17.0" zero-allocation-hashing = "0.27ea0" -zstd = "1.5.6-9" +zstd = "1.5.6-10" [libraries] asm-bom = { module = "org.ow2.asm:asm-bom", version.ref = "asm" } diff --git a/gradle/plugins/gradle/gradle-daemon-jvm.properties b/gradle/plugins/gradle/gradle-daemon-jvm.properties index 63e5bbdf48..eecab2ddb4 100644 --- a/gradle/plugins/gradle/gradle-daemon-jvm.properties +++ b/gradle/plugins/gradle/gradle-daemon-jvm.properties @@ -1,2 +1,12 @@ #This file is generated by updateDaemonJvm +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e2d97f28068cf05b0467aa8e97b19f69/redirect +toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/a41f952f4496c2309be30fd168c6c117/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e2d97f28068cf05b0467aa8e97b19f69/redirect +toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/a41f952f4496c2309be30fd168c6c117/redirect +toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e7806cd9471741d622398825f14d2da6/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/0402cc5012ae8124ea0ad01bd29342ef/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e2d97f28068cf05b0467aa8e97b19f69/redirect +toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/a41f952f4496c2309be30fd168c6c117/redirect +toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/86ea5d26c5757681ffe78d87258b45ec/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/ea8232621e1368089cec8b12816df5e3/redirect toolchainVersion=21 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 304dce7831..9a5d406e89 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.12.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-rc-1-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME