[JAVA-31656] Upgrade spring-oxm & spring-batch-core (#16045)

apache-httpclient4/pom.xml

@@ -82,7 +82,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-oxm</artifactId>
-            <version>${spring.version}</version>
+            <version>${spring-oxm.version}</version>
         </dependency>
         <!-- marshalling -->
         <dependency>
@@ -233,6 +233,7 @@
     </profiles>
 
     <properties>
+        <spring-oxm.version>6.1.4</spring-oxm.version>
         <!-- util -->
         <commons-codec.version>1.16.0</commons-codec.version>
         <httpasyncclient.version>4.1.5</httpasyncclient.version>

persistence-modules/spring-data-jpa-query/pom.xml

@@ -34,11 +34,13 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-oxm</artifactId>
+            <version>${spring-oxm.version}</version>
         </dependency>
     </dependencies>
 
     <properties>
         <datasource-proxy.version>1.4.1</datasource-proxy.version>
+        <spring-oxm.version>6.1.4</spring-oxm.version>
     </properties>
 
 </project>

persistence-modules/spring-data-jpa-repo/pom.xml

@@ -41,6 +41,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-oxm</artifactId>
+            <version>${spring-oxm.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -74,4 +75,8 @@
         </plugins>
     </build>
 
+    <properties>
+        <spring-oxm.version>6.1.4</spring-oxm.version>
+    </properties>
+
 </project>

spring-batch/pom.xml

@@ -35,6 +35,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-oxm</artifactId>
+            <version>${spring-oxm.version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>commons-logging</artifactId>
@@ -69,8 +70,13 @@
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.batch</groupId>
+            <artifactId>spring-batch-core</artifactId>
+            <version>${spring-batch-core.version}</version>
+        </dependency>
     </dependencies>
-    
+
     <properties>
         <opencsv.version>5.8</opencsv.version>
         <jakarta.xml.bind-api>4.0.0</jakarta.xml.bind-api>
@@ -78,6 +84,8 @@
         <jackson-datatype.version>2.16.0</jackson-datatype.version>
         <http-client.version>4.5.14</http-client.version>
         <jettison.version>1.5.3</jettison.version>
+        <spring-oxm.version>6.1.4</spring-oxm.version>
+        <spring-batch-core.version>5.1.1</spring-batch-core.version>
         <start-class>com.baeldung.batchtesting.SpringBatchApplication</start-class>
         <spring-boot.version>3.2.2</spring-boot.version>
         <junit-jupiter.version>5.10.2</junit-jupiter.version>

spring-boot-rest/pom.xml

@@ -35,6 +35,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-oxm</artifactId>
+            <version>${spring-oxm.version}</version>
         </dependency>
         <dependency>
             <groupId>com.thoughtworks.xstream</groupId>
@@ -165,5 +166,6 @@
         <modelmapper.version>3.2.0</modelmapper.version>
         <rest-assured.version>3.3.0</rest-assured.version>
         <jaxb-runtime.version>4.0.1</jaxb-runtime.version>
+        <spring-oxm.version>6.1.4</spring-oxm.version>
     </properties>
 </project>

spring-security-modules/spring-security-web-digest-auth/pom.xml

@@ -82,7 +82,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-oxm</artifactId>
-            <version>${spring.version}</version>
+            <version>${spring-oxm.version}</version>
         </dependency>
         <!-- web -->
         <dependency>
@@ -172,6 +172,7 @@
     <properties>
         <!-- Spring -->
         <org.springframework.security.version>6.1.5</org.springframework.security.version>
+        <spring-oxm.version>6.1.4</spring-oxm.version>
         <!-- util -->
         <httpcore5.version>5.2.4</httpcore5.version>
         <httpclient5.version>5.3</httpclient5.version>

spring-security-modules/spring-security-web-rest-basic-auth/pom.xml

@@ -75,6 +75,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-oxm</artifactId>
+            <version>${spring-oxm.version}</version>
         </dependency>
         <!-- marshalling -->
         <dependency>
@@ -213,6 +214,7 @@
 
     <properties>
         <jaxb-api.version>2.3.1</jaxb-api.version>
+        <spring-oxm.version>6.1.4</spring-oxm.version>
         <!-- http -->
         <httpcore.version>4.4.11</httpcore.version>
         <httpclient.version>4.5.8</httpclient.version>

spring-security-modules/spring-security-web-rest-custom/pom.xml

@@ -73,6 +73,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-oxm</artifactId>
+            <version>${spring-oxm.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
@@ -172,6 +173,7 @@
     <properties>
         <commons-logging.version>1.2</commons-logging.version>
         <jaxb-api.version>2.3.1</jaxb-api.version>
+        <spring-oxm.version>6.1.4</spring-oxm.version>
         <!-- Maven plugins -->
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
     </properties>

spring-web-modules/spring-rest-http/pom.xml

@@ -31,6 +31,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-oxm</artifactId>
+            <version>${spring-oxm.version}</version>
         </dependency>
         <dependency>
             <groupId>com.thoughtworks.xstream</groupId>
@@ -85,6 +86,7 @@
         <xstream.version>1.4.9</xstream.version>
         <jsonpatch.version>1.12</jsonpatch.version>
         <httpclient5.version>5.2.1</httpclient5.version>
+        <spring-oxm.version>6.1.4</spring-oxm.version>
     </properties>
 
 </project>

spring-web-modules/spring-rest-simple/pom.xml

@@ -56,6 +56,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-oxm</artifactId>
+            <version>${spring-oxm.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-fileupload</groupId>
@@ -273,6 +274,7 @@
         <protobuf-java.version>3.1.0</protobuf-java.version>
         <xstream.version>1.4.9</xstream.version>
         <jayway-rest-assured.version>2.9.0</jayway-rest-assured.version>
+        <spring-oxm.version>6.1.4</spring-oxm.version>
         <!-- Maven plugins -->
         <cargo-maven2-plugin.version>1.6.0</cargo-maven2-plugin.version>
         <findbugs-maven-plugin.version>3.0.4</findbugs-maven-plugin.version>