Merge pull request #3414 from jamezp/RESTEASY-3287

[RESTEASY-3287] Upgrade Spring to 5.3.25
resteasy · Feb 3, 2023 · e3041ff · e3041ff
2 parents 23517ad + 5592a6d
commit e3041ff
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -24,6 +24,7 @@
         <dep.arquillian-bom.version>1.4.1.Final</dep.arquillian-bom.version>
         <version.org.jboss.arquillian.container.arquillian-weld-embedded>2.0.0.Final</version.org.jboss.arquillian.container.arquillian-weld-embedded>
         <version.org.jboss.resteasy.checkstyle>1.0.0.Final</version.org.jboss.resteasy.checkstyle>
+        <version.org.springframework>5.3.25</version.org.springframework>
         <version.org.wildfly.wildfly-arquillian-container-managed>2.2.0.Final</version.org.wildfly.wildfly-arquillian-container-managed>
         <version.org.wildfly.wildfly-arquillian-container-remote>2.2.0.Final</version.org.wildfly.wildfly-arquillian-container-remote>
 

diff --git a/resteasy-dependencies-bom/pom.xml b/resteasy-dependencies-bom/pom.xml
@@ -103,7 +103,7 @@
         <version.org.hibernate.validator>6.2.0.Final</version.org.hibernate.validator>
         <version.org.jboss.marshalling.jboss-marshalling>2.0.6.Final</version.org.jboss.marshalling.jboss-marshalling>
         <version.rest-assured>3.3.0</version.rest-assured>
-        <version.org.springframework>5.3.18</version.org.springframework>
+        <version.org.springframework>5.3.25</version.org.springframework>
         <version.io.projectreactor>2020.0.8</version.io.projectreactor>
 
         <version.asyncutil>0.1.0</version.asyncutil>

diff --git a/testsuite/arquillian-utils/src/main/java/org/jboss/resteasy/utils/TestUtilSpring.java b/testsuite/arquillian-utils/src/main/java/org/jboss/resteasy/utils/TestUtilSpring.java
@@ -13,7 +13,7 @@
 public class TestUtilSpring {
 
 
-   private static final String defaultSpringVersion = "5.3.18";
+   private static final String defaultSpringVersion = "5.3.25";
    //protected static Logger logger;
 
    /**

diff --git a/testsuite/integration-tests-spring-web/pom.xml b/testsuite/integration-tests-spring-web/pom.xml
@@ -16,7 +16,6 @@
     <name>RESTEasy Main testsuite: Spring Web integration tests</name>
 
     <properties>
-        <version.org.springframework>5.3.7</version.org.springframework>
         <version.org.aspectj>1.7.3</version.org.aspectj>
         <version.aopalliance>1.0</version.aopalliance>
     </properties>

diff --git a/testsuite/integration-tests-spring/pom.xml b/testsuite/integration-tests-spring/pom.xml
@@ -16,7 +16,6 @@
     <name>RESTEasy Main testsuite: Spring integration tests</name>
 
     <properties>
-        <version.org.springframework>5.3.7</version.org.springframework>
         <version.org.aspectj>1.7.3</version.org.aspectj>
         <version.aopalliance>1.0</version.aopalliance>
     </properties>