Skip to content

Commit fef5627

Browse files
committed
Merge branch '6.2.x'
# Conflicts: # framework-platform/framework-platform.gradle # spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java
2 parents b727dbb + 9f678ce commit fef5627

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

framework-platform/framework-platform.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@ dependencies {
1414
api(platform("io.rsocket:rsocket-bom:1.1.5"))
1515
api(platform("org.apache.groovy:groovy-bom:5.0.1"))
1616
api(platform("org.apache.logging.log4j:log4j-bom:2.25.1"))
17-
api(platform("org.assertj:assertj-bom:3.27.5"))
17+
api(platform("org.assertj:assertj-bom:3.27.6"))
1818
api(platform("org.eclipse.jetty:jetty-bom:12.1.1"))
1919
api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.1"))
2020
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2"))
2121
api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.9.0"))
2222
api(platform("org.junit:junit-bom:6.0.0"))
23-
api(platform("org.mockito:mockito-bom:5.19.0"))
23+
api(platform("org.mockito:mockito-bom:5.20.0"))
2424
api(platform("tools.jackson:jackson-bom:3.0.0"))
2525

2626
constraints {
27-
api("com.fasterxml:aalto-xml:1.3.3")
27+
api("com.fasterxml:aalto-xml:1.3.4")
2828
api("com.fasterxml.woodstox:woodstox-core:6.7.0")
2929
api("com.github.ben-manes.caffeine:caffeine:3.2.2")
3030
api("com.github.librepdf:openpdf:1.3.43")
3131
api("com.google.code.findbugs:findbugs:3.0.1")
3232
api("com.google.code.findbugs:jsr305:3.0.2")
33-
api("com.google.code.gson:gson:2.13.1")
33+
api("com.google.code.gson:gson:2.13.2")
3434
api("com.google.protobuf:protobuf-java-util:4.32.1")
3535
api("com.h2database:h2:2.3.232")
3636
api("com.jayway.jsonpath:json-path:2.9.0")
@@ -52,7 +52,7 @@ dependencies {
5252
api("io.r2dbc:r2dbc-h2:1.0.0.RELEASE")
5353
api("io.r2dbc:r2dbc-spi-test:1.0.0.RELEASE")
5454
api("io.r2dbc:r2dbc-spi:1.0.0.RELEASE")
55-
api("io.reactivex.rxjava3:rxjava:3.1.11")
55+
api("io.reactivex.rxjava3:rxjava:3.1.12")
5656
api("io.smallrye.reactive:mutiny:1.10.0")
5757
api("io.vavr:vavr:0.10.4")
5858
api("jakarta.activation:jakarta.activation-api:2.1.3")
@@ -111,7 +111,7 @@ dependencies {
111111
api("org.dom4j:dom4j:2.2.0")
112112
api("org.easymock:easymock:5.6.0")
113113
api("org.eclipse.angus:angus-mail:2.0.3")
114-
api("org.eclipse.jetty:jetty-reactive-httpclient:4.0.11")
114+
api("org.eclipse.jetty:jetty-reactive-httpclient:4.0.12")
115115
api("org.eclipse.persistence:org.eclipse.persistence.jpa:5.0.0-B10")
116116
api("org.eclipse:yasson:3.0.4")
117117
api("org.ehcache:ehcache:3.10.8")
@@ -124,7 +124,7 @@ dependencies {
124124
api("org.hibernate.orm:hibernate-core:7.1.2.Final")
125125
api("org.hibernate.validator:hibernate-validator:9.0.1.Final")
126126
api("org.hsqldb:hsqldb:2.7.4")
127-
api("org.htmlunit:htmlunit:4.16.0")
127+
api("org.htmlunit:htmlunit:4.17.0")
128128
api("org.javamoney:moneta:1.4.4")
129129
api("org.jboss.logging:jboss-logging:3.6.1.Final")
130130
api("org.jruby:jruby:10.0.2.0")
@@ -135,8 +135,8 @@ dependencies {
135135
api("org.python:jython-standalone:2.7.4")
136136
api("org.quartz-scheduler:quartz:2.3.2")
137137
api("org.reactivestreams:reactive-streams:1.0.4")
138-
api("org.seleniumhq.selenium:htmlunit3-driver:4.35.0")
139-
api("org.seleniumhq.selenium:selenium-java:4.35.0")
138+
api("org.seleniumhq.selenium:htmlunit3-driver:4.36.1")
139+
api("org.seleniumhq.selenium:selenium-java:4.36.0")
140140
api("org.skyscreamer:jsonassert:2.0-rc1")
141141
api("org.testng:testng:7.11.0")
142142
api("org.webjars:underscorejs:1.8.3")

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@
9090
* @see ScannedGenericBeanDefinition
9191
* @see CandidateComponentsIndex
9292
*/
93-
@SuppressWarnings("removal") // components index
9493
public class ClassPathScanningCandidateComponentProvider implements EnvironmentCapable, ResourceLoaderAware {
9594

9695
static final String DEFAULT_RESOURCE_PATTERN = "**/*.class";

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
* @author Stephane Nicoll
5555
* @since 6.0
5656
*/
57-
@SuppressWarnings("removal") // components index
5857
public final class PersistenceManagedTypesScanner {
5958

6059
private static final String CLASS_RESOURCE_PATTERN = "/**/*.class";

0 commit comments

Comments
 (0)