From 83efe8cff4f8e5ccb7d89a6022206965d0866b7e Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sat, 11 Oct 2025 15:10:42 +0200 Subject: [PATCH 1/3] Remove deprecation on CandidateComponentsIndex(Loader) See gh-35472 --- .../annotation/ClassPathScanningCandidateComponentProvider.java | 1 - .../orm/jpa/persistenceunit/PersistenceManagedTypesScanner.java | 1 - 2 files changed, 2 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java b/spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java index 832b4a18153..eb87833e9a0 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java @@ -90,7 +90,6 @@ import org.springframework.util.ClassUtils; * @see ScannedGenericBeanDefinition * @see CandidateComponentsIndex */ -@SuppressWarnings("removal") // components index public class ClassPathScanningCandidateComponentProvider implements EnvironmentCapable, ResourceLoaderAware { static final String DEFAULT_RESOURCE_PATTERN = "**/*.class"; diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypesScanner.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypesScanner.java index 9d84564da28..1c621dfa263 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypesScanner.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypesScanner.java @@ -54,7 +54,6 @@ import org.springframework.util.ResourceUtils; * @author Stephane Nicoll * @since 6.0 */ -@SuppressWarnings("removal") // components index public final class PersistenceManagedTypesScanner { private static final String CLASS_RESOURCE_PATTERN = "/**/*.class"; From 467a484df6ff6035df69e81eeee5b4d91f15f8dd Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sat, 11 Oct 2025 15:11:16 +0200 Subject: [PATCH 2/3] Polishing See gh-35460 --- .../springframework/core/task/SyncTaskExecutor.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java index a56f7bd922a..a0c47048da5 100644 --- a/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java +++ b/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java @@ -22,9 +22,7 @@ import org.springframework.util.Assert; /** * {@link TaskExecutor} implementation that executes each task synchronously - * in the calling thread. - * - *

Mainly intended for testing scenarios. + * in the calling thread. Mainly intended for testing scenarios. * *

Execution in the calling thread does have the advantage of participating * in its thread context, for example the thread context class loader or the @@ -40,13 +38,13 @@ import org.springframework.util.Assert; public class SyncTaskExecutor implements TaskExecutor, Serializable { /** - * Executes the given {@code task} synchronously, through direct - * invocation of it's {@link Runnable#run() run()} method. - * @throws IllegalArgumentException if the given {@code task} is {@code null} + * Execute the given {@code task} synchronously, through direct + * invocation of its {@link Runnable#run() run()} method. + * @throws RuntimeException if propagated from the given {@code Runnable} */ @Override public void execute(Runnable task) { - Assert.notNull(task, "Runnable must not be null"); + Assert.notNull(task, "Task must not be null"); task.run(); } From 9f678ce6989809d1733b0d9f1cc46e6430063d71 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sat, 11 Oct 2025 15:12:21 +0200 Subject: [PATCH 3/3] Upgrade to Jetty 12.0.28, Undertow 2.3.20, RxJava 3.1.12, Aalto 1.3.4, Gson 2.13.2, Selenium 4.36, HtmlUnit 4.17, Mockito 5.20, AssertJ 3.27.6 --- framework-platform/framework-platform.gradle | 28 ++++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index d5e603a33a0..cf682ee2a16 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -15,22 +15,22 @@ dependencies { api(platform("io.rsocket:rsocket-bom:1.1.5")) api(platform("org.apache.groovy:groovy-bom:4.0.28")) api(platform("org.apache.logging.log4j:log4j-bom:2.21.1")) - api(platform("org.assertj:assertj-bom:3.27.5")) - api(platform("org.eclipse.jetty:jetty-bom:12.0.26")) - api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.26")) + api(platform("org.assertj:assertj-bom:3.27.6")) + api(platform("org.eclipse.jetty:jetty-bom:12.0.28")) + api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.28")) api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1")) api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3")) api(platform("org.junit:junit-bom:5.14.0")) - api(platform("org.mockito:mockito-bom:5.19.0")) + api(platform("org.mockito:mockito-bom:5.20.0")) constraints { - api("com.fasterxml:aalto-xml:1.3.3") + 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.2") 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.1") + api("com.google.code.gson:gson:2.13.2") api("com.google.protobuf:protobuf-java-util:4.32.1") api("com.h2database:h2:2.3.232") api("com.jayway.jsonpath:json-path:2.9.0") @@ -53,11 +53,11 @@ dependencies { api("io.r2dbc:r2dbc-h2:1.0.0.RELEASE") api("io.r2dbc:r2dbc-spi-test:1.0.0.RELEASE") api("io.r2dbc:r2dbc-spi:1.0.0.RELEASE") - api("io.reactivex.rxjava3:rxjava:3.1.11") + api("io.reactivex.rxjava3:rxjava:3.1.12") api("io.smallrye.reactive:mutiny:1.10.0") - api("io.undertow:undertow-core:2.3.19.Final") - api("io.undertow:undertow-servlet:2.3.19.Final") - api("io.undertow:undertow-websockets-jsr:2.3.19.Final") + api("io.undertow:undertow-core:2.3.20.Final") + api("io.undertow:undertow-servlet:2.3.20.Final") + api("io.undertow:undertow-websockets-jsr:2.3.20.Final") api("io.vavr:vavr:0.10.4") api("jakarta.activation:jakarta.activation-api:2.0.1") api("jakarta.annotation:jakarta.annotation-api:2.0.0") @@ -115,7 +115,7 @@ dependencies { api("org.crac:crac:1.4.0") api("org.dom4j:dom4j:2.2.0") api("org.easymock:easymock:5.6.0") - api("org.eclipse.jetty:jetty-reactive-httpclient:4.0.11") + api("org.eclipse.jetty:jetty-reactive-httpclient:4.0.12") api("org.eclipse.persistence:org.eclipse.persistence.jpa:3.0.4") api("org.eclipse:yasson:2.0.4") api("org.ehcache:ehcache:3.10.8") @@ -129,7 +129,7 @@ dependencies { api("org.hibernate:hibernate-core-jakarta:5.6.15.Final") api("org.hibernate:hibernate-validator:7.0.5.Final") api("org.hsqldb:hsqldb:2.7.4") - api("org.htmlunit:htmlunit:4.16.0") + api("org.htmlunit:htmlunit:4.17.0") api("org.javamoney:moneta:1.4.4") api("org.jruby:jruby:9.4.13.0") api("org.junit.support:testng-engine:1.0.5") @@ -137,8 +137,8 @@ dependencies { api("org.ogce:xpp3:1.1.6") api("org.python:jython-standalone:2.7.4") api("org.quartz-scheduler:quartz:2.3.2") - api("org.seleniumhq.selenium:htmlunit3-driver:4.35.0") - api("org.seleniumhq.selenium:selenium-java:4.35.0") + api("org.seleniumhq.selenium:htmlunit3-driver:4.36.1") + api("org.seleniumhq.selenium:selenium-java:4.36.0") api("org.skyscreamer:jsonassert:1.5.3") api("org.slf4j:slf4j-api:2.0.17") api("org.testng:testng:7.11.0")