From fa5ebbc1a85c6216aaea9033d40cdf51c32cb599 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 17 Sep 2025 17:37:36 +0200 Subject: [PATCH] Upgrade to Hibernate 7.1.1, Groovy 5.0.1, Commons Pool 2.12.1, SnakeYAML 2.5, Protobuf 4.32.1, ActiveMQ 5.17.7 and Artemis 2.42, EasyMock 5.6, AssertJ 3.27.4, XMLUnit 2.10.4, Dom4J 2.2 Includes downgrade to Log4J 2.25.1 from 3.0.0 beta (for Spring Framework 7.0 RC1) --- framework-platform/framework-platform.gradle | 32 +++++++++---------- .../aop/target/CommonsPool2TargetSource.java | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index 56061d0e40f..4c2c444a0b5 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -12,9 +12,9 @@ dependencies { api(platform("io.netty:netty-bom:4.2.6.Final")) api(platform("io.projectreactor:reactor-bom:2025.0.0-M7")) api(platform("io.rsocket:rsocket-bom:1.1.5")) - api(platform("org.apache.groovy:groovy-bom:5.0.0-rc-1")) - api(platform("org.apache.logging.log4j:log4j-bom:3.0.0-beta3")) - api(platform("org.assertj:assertj-bom:3.27.3")) + 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.4")) 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")) @@ -31,7 +31,7 @@ dependencies { 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.protobuf:protobuf-java-util:4.32.0") + 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") api("com.networknt:json-schema-validator:1.5.3") @@ -85,12 +85,12 @@ dependencies { api("junit:junit:4.13.2") api("net.sf.jopt-simple:jopt-simple:5.0.4") api("org.apache-extras.beanshell:bsh:2.0b6") - api("org.apache.activemq:activemq-broker:5.17.6") - api("org.apache.activemq:activemq-kahadb-store:5.17.6") - api("org.apache.activemq:activemq-stomp:5.17.6") - api("org.apache.activemq:artemis-jakarta-client:2.31.2") - api("org.apache.activemq:artemis-junit-5:2.31.2") - api("org.apache.commons:commons-pool2:2.9.0") + api("org.apache.activemq:activemq-broker:5.17.7") + api("org.apache.activemq:activemq-kahadb-store:5.17.7") + api("org.apache.activemq:activemq-stomp:5.17.7") + api("org.apache.activemq:artemis-jakarta-client:2.42.0") + api("org.apache.activemq:artemis-junit-5:2.42.0") + api("org.apache.commons:commons-pool2:2.12.1") api("org.apache.derby:derby:10.16.1.1") api("org.apache.derby:derbyclient:10.16.1.1") api("org.apache.derby:derbytools:10.16.1.1") @@ -108,8 +108,8 @@ dependencies { api("org.bouncycastle:bcpkix-jdk18on:1.72") api("org.codehaus.jettison:jettison:1.5.4") api("org.crac:crac:1.4.0") - api("org.dom4j:dom4j:2.1.4") - api("org.easymock:easymock:5.5.0") + 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.persistence:org.eclipse.persistence.jpa:5.0.0-B10") @@ -121,7 +121,7 @@ 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.1.0.Final") + api("org.hibernate.orm:hibernate-core:7.1.1.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") @@ -141,8 +141,8 @@ dependencies { api("org.testng:testng:7.11.0") api("org.webjars:underscorejs:1.8.3") api("org.webjars:webjars-locator-lite:1.1.0") - api("org.xmlunit:xmlunit-assertj:2.10.3") - api("org.xmlunit:xmlunit-matchers:2.10.3") - api("org.yaml:snakeyaml:2.4") + api("org.xmlunit:xmlunit-assertj:2.10.4") + api("org.xmlunit:xmlunit-matchers:2.10.4") + api("org.yaml:snakeyaml:2.5") } } diff --git a/spring-aop/src/main/java/org/springframework/aop/target/CommonsPool2TargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/CommonsPool2TargetSource.java index 9db40a72954..6d4b8b0d93e 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/CommonsPool2TargetSource.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/CommonsPool2TargetSource.java @@ -63,7 +63,7 @@ import org.springframework.util.Assert; * @see #setTimeBetweenEvictionRunsMillis * @see #setMinEvictableIdleTimeMillis */ -@SuppressWarnings({"rawtypes", "unchecked", "serial"}) +@SuppressWarnings({"rawtypes", "unchecked", "serial", "deprecation"}) public class CommonsPool2TargetSource extends AbstractPoolingTargetSource implements PooledObjectFactory { private int maxIdle = GenericObjectPoolConfig.DEFAULT_MAX_IDLE;