Browse Source

Merge branch '6.2.x'

# Conflicts:
#	framework-platform/framework-platform.gradle
#	spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java
pull/35608/head
Juergen Hoeller 5 months ago
parent
commit
fef5627329
  1. 18
      framework-platform/framework-platform.gradle
  2. 1
      spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java
  3. 1
      spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypesScanner.java

18
framework-platform/framework-platform.gradle

@ -14,23 +14,23 @@ dependencies { @@ -14,23 +14,23 @@ dependencies {
api(platform("io.rsocket:rsocket-bom:1.1.5"))
api(platform("org.apache.groovy:groovy-bom:5.0.1"))
api(platform("org.apache.logging.log4j:log4j-bom:2.25.1"))
api(platform("org.assertj:assertj-bom:3.27.5"))
api(platform("org.assertj:assertj-bom:3.27.6"))
api(platform("org.eclipse.jetty:jetty-bom:12.1.1"))
api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.1"))
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.0"))
api(platform("org.mockito:mockito-bom:5.19.0"))
api(platform("org.mockito:mockito-bom:5.20.0"))
api(platform("tools.jackson:jackson-bom:3.0.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")
@ -52,7 +52,7 @@ dependencies { @@ -52,7 +52,7 @@ 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.vavr:vavr:0.10.4")
api("jakarta.activation:jakarta.activation-api:2.1.3")
@ -111,7 +111,7 @@ dependencies { @@ -111,7 +111,7 @@ 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.0.11")
api("org.eclipse.jetty:jetty-reactive-httpclient:4.0.12")
api("org.eclipse.persistence:org.eclipse.persistence.jpa:5.0.0-B10")
api("org.eclipse:yasson:3.0.4")
api("org.ehcache:ehcache:3.10.8")
@ -124,7 +124,7 @@ dependencies { @@ -124,7 +124,7 @@ dependencies {
api("org.hibernate.orm:hibernate-core:7.1.2.Final")
api("org.hibernate.validator:hibernate-validator:9.0.1.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.jboss.logging:jboss-logging:3.6.1.Final")
api("org.jruby:jruby:10.0.2.0")
@ -135,8 +135,8 @@ dependencies { @@ -135,8 +135,8 @@ dependencies {
api("org.python:jython-standalone:2.7.4")
api("org.quartz-scheduler:quartz:2.3.2")
api("org.reactivestreams:reactive-streams:1.0.4")
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:2.0-rc1")
api("org.testng:testng:7.11.0")
api("org.webjars:underscorejs:1.8.3")

1
spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java

@ -90,7 +90,6 @@ import org.springframework.util.ClassUtils; @@ -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";

1
spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypesScanner.java

@ -54,7 +54,6 @@ import org.springframework.util.ResourceUtils; @@ -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";

Loading…
Cancel
Save