From 97e9ddb2d75f282ee01093df0a370ec258b0478c Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 6 Jul 2026 11:57:27 +0200 Subject: [PATCH 1/2] Add constant for default timeout value Closes gh-36983 --- .../org/springframework/core/retry/RetryPolicy.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/retry/RetryPolicy.java b/spring-core/src/main/java/org/springframework/core/retry/RetryPolicy.java index 374e02dfb47..d166899d854 100644 --- a/spring-core/src/main/java/org/springframework/core/retry/RetryPolicy.java +++ b/spring-core/src/main/java/org/springframework/core/retry/RetryPolicy.java @@ -67,7 +67,7 @@ public interface RetryPolicy { * @see Builder#timeout(Duration) */ default Duration getTimeout() { - return Duration.ZERO; + return Builder.DEFAULT_TIMEOUT; } /** @@ -157,6 +157,11 @@ public interface RetryPolicy { */ public static final long DEFAULT_DELAY = 1000; + /** + * The default {@linkplain #multiplier(double) multiplier}: {@value}. + */ + public static final double DEFAULT_MULTIPLIER = 1.0; + /** * The default {@linkplain #maxDelay(Duration) max delay}: {@value} ms. * @see Long#MAX_VALUE @@ -164,9 +169,11 @@ public interface RetryPolicy { public static final long DEFAULT_MAX_DELAY = Long.MAX_VALUE; /** - * The default {@linkplain #multiplier(double) multiplier}: {@value}. + * The default {@linkplain #timeout(Duration) timeout}: {@value}. + * @since 7.0.9 + * @see Duration#ZERO */ - public static final double DEFAULT_MULTIPLIER = 1.0; + public static final Duration DEFAULT_TIMEOUT = Duration.ZERO; private @Nullable BackOff backOff; From c08e5e9c1cb49542f7562e83a1bfca811ab78d8b Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 6 Jul 2026 12:30:41 +0200 Subject: [PATCH 2/2] Upgrade to Log4J 2.26.1, Groovy 5.0.7, Tomcat 11.0.23, Jetty 12.1.10, EclipseLink 5.0.1, Hibernate ORM 7.2.22, Hibernate Validator 9.1.2, Caffeine 3.2.4, Protobuf 4.35.1, Checkstyle 13.7 --- .../build/CheckstyleConventions.java | 2 +- framework-platform/framework-platform.gradle | 28 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java b/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java index 2779baf7487..9df1ac25a65 100644 --- a/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java +++ b/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java @@ -50,7 +50,7 @@ public class CheckstyleConventions { project.getPlugins().apply(CheckstylePlugin.class); project.getTasks().withType(Checkstyle.class).forEach(checkstyle -> checkstyle.getMaxHeapSize().set("1g")); CheckstyleExtension checkstyle = project.getExtensions().getByType(CheckstyleExtension.class); - checkstyle.setToolVersion("13.4.2"); + checkstyle.setToolVersion("13.7.0"); checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle")); String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion(); DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies(); diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index d8300a80a3c..1bffa565ea1 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -12,11 +12,11 @@ dependencies { api(platform("io.netty:netty-bom:4.2.15.Final")) api(platform("io.projectreactor:reactor-bom:2025.0.6")) api(platform("io.rsocket:rsocket-bom:1.1.5")) - api(platform("org.apache.groovy:groovy-bom:5.0.6")) - api(platform("org.apache.logging.log4j:log4j-bom:2.26.0")) + api(platform("org.apache.groovy:groovy-bom:5.0.7")) + api(platform("org.apache.logging.log4j:log4j-bom:2.26.1")) api(platform("org.assertj:assertj-bom:3.27.7")) - api(platform("org.eclipse.jetty:jetty-bom:12.1.9")) - api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.9")) + api(platform("org.eclipse.jetty:jetty-bom:12.1.10")) + api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.10")) api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2")) api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.9.0")) api(platform("org.junit:junit-bom:6.0.3")) @@ -26,12 +26,12 @@ dependencies { constraints { api("com.fasterxml:aalto-xml:1.3.4") api("com.fasterxml.woodstox:woodstox-core:6.7.0") - api("com.github.ben-manes.caffeine:caffeine:3.2.3") + api("com.github.ben-manes.caffeine:caffeine:3.2.4") api("com.github.librepdf:openpdf:1.3.43") api("com.google.code.findbugs:findbugs:3.0.1") api("com.google.code.findbugs:jsr305:3.0.2") api("com.google.code.gson:gson:2.13.2") - api("com.google.protobuf:protobuf-java-util:4.34.1") + api("com.google.protobuf:protobuf-java-util:4.35.1") api("com.h2database:h2:2.4.240") api("com.jayway.jsonpath:json-path:2.10.0") api("com.networknt:json-schema-validator:1.5.3") @@ -96,10 +96,10 @@ dependencies { api("org.apache.httpcomponents.client5:httpclient5:5.6") api("org.apache.httpcomponents.core5:httpcore5-reactive:5.4.2") api("org.apache.poi:poi-ooxml:5.5.1") - api("org.apache.tomcat.embed:tomcat-embed-core:11.0.22") - api("org.apache.tomcat.embed:tomcat-embed-websocket:11.0.22") - api("org.apache.tomcat:tomcat-util:11.0.22") - api("org.apache.tomcat:tomcat-websocket:11.0.22") + api("org.apache.tomcat.embed:tomcat-embed-core:11.0.23") + api("org.apache.tomcat.embed:tomcat-embed-websocket:11.0.23") + api("org.apache.tomcat:tomcat-util:11.0.23") + api("org.apache.tomcat:tomcat-websocket:11.0.23") api("org.aspectj:aspectjrt:1.9.25") api("org.aspectj:aspectjtools:1.9.25") api("org.aspectj:aspectjweaver:1.9.25") @@ -110,8 +110,8 @@ dependencies { api("org.dom4j:dom4j:2.2.0") api("org.easymock:easymock:5.6.0") api("org.eclipse.angus:angus-mail:2.0.3") - api("org.eclipse.jetty:jetty-reactive-httpclient:4.1.4") - api("org.eclipse.persistence:org.eclipse.persistence.jpa:5.0.0") + api("org.eclipse.jetty:jetty-reactive-httpclient:4.1.5") + api("org.eclipse.persistence:org.eclipse.persistence.jpa:5.0.1") api("org.eclipse:yasson:3.0.4") api("org.ehcache:ehcache:3.10.8") api("org.ehcache:jcache:1.0.1") @@ -120,8 +120,8 @@ dependencies { api("org.glassfish:jakarta.el:4.0.2") api("org.graalvm.sdk:graal-sdk:22.3.1") api("org.hamcrest:hamcrest:3.0") - api("org.hibernate.orm:hibernate-core:7.2.17.Final") - api("org.hibernate.validator:hibernate-validator:9.1.0.Final") + api("org.hibernate.orm:hibernate-core:7.2.22.Final") + api("org.hibernate.validator:hibernate-validator:9.1.2.Final") api("org.hsqldb:hsqldb:2.7.4") api("org.htmlunit:htmlunit:4.21.0") api("org.javamoney:moneta:1.4.4")