From 411055f4338524ee283f8477da5c494ecd7f0543 Mon Sep 17 00:00:00 2001
From: Mahmoud Ben Hassine <mbenhassine@vmware.com>
Date: Wed, 24 Nov 2021 11:09:02 +0100
Subject: [PATCH] Update dependencies

---
 pom.xml                                       | 48 +++++++++----------
 .../item/xml/XStreamUnmarshallingTests.java   |  7 ++-
 .../src/main/resources/jobs/iosample/xml.xml  |  9 ++++
 3 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0b125207e..9f1b4cbaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
 		<spring-framework.version>6.0.0-SNAPSHOT</spring-framework.version>
 		<spring-retry.version>1.3.1</spring-retry.version>
 		<spring-integration.version>6.0.0-SNAPSHOT</spring-integration.version>
-		<micrometer.version>1.7.4-SNAPSHOT</micrometer.version>
+		<micrometer.version>1.8.1-SNAPSHOT</micrometer.version>
 		<jackson.version>2.13.0</jackson.version>
 
 		<!-- optional production dependencies -->
@@ -67,7 +67,7 @@
 		<spring-amqp.version>3.0.0-SNAPSHOT</spring-amqp.version>
 		<spring-ldap.version>2.3.5.BUILD-SNAPSHOT</spring-ldap.version>
 		<avro.version>1.9.2</avro.version>
-		<gson.version>2.8.6</gson.version>
+		<gson.version>2.8.9</gson.version>
 		<hibernate-core-jakarta.version>5.6.1.Final</hibernate-core-jakarta.version>
 		<jakarta.annotation-api.version>2.0.0</jakarta.annotation-api.version>
 		<jakarta.mail-api.version>2.0.1</jakarta.mail-api.version>
@@ -76,25 +76,25 @@
 		<jakarta.validation-api.version>3.0.0</jakarta.validation-api.version>
 		<jakarta.persistence-api.version>3.0.0</jakarta.persistence-api.version>
 		<neo4j-ogm-core.version>3.2.21</neo4j-ogm-core.version>
-		<mongodb-driver-sync.version>4.2.3</mongodb-driver-sync.version>
-		<xstream.version>1.4.16</xstream.version>
-		<junit-jupiter.version>5.7.1</junit-jupiter.version>
+		<mongodb-driver-sync.version>4.4.0</mongodb-driver-sync.version>
+		<xstream.version>1.4.18</xstream.version>
+		<junit-jupiter.version>5.8.1</junit-jupiter.version>
 
 		<!-- test dependencies -->
 		<junit.version>4.13.2</junit.version>
 		<hamcrest.version>2.2</hamcrest.version>
-		<assertj.version>3.19.0</assertj.version>
-		<mockito.version>3.9.0</mockito.version>
-		<xmlunit.version>2.8.2</xmlunit.version>
-		<commons-io.version>2.8.0</commons-io.version>
-		<commons-dbcp2.version>2.8.0</commons-dbcp2.version>
-		<slf4j.version>1.7.30</slf4j.version>
-		<hsqldb.version>2.5.2</hsqldb.version>
+		<assertj.version>3.21.0</assertj.version>
+		<mockito.version>4.1.0</mockito.version>
+		<xmlunit.version>2.8.3</xmlunit.version>
+		<commons-io.version>2.11.0</commons-io.version>
+		<commons-dbcp2.version>2.9.0</commons-dbcp2.version>
+		<slf4j.version>1.7.32</slf4j.version>
+		<hsqldb.version>2.6.1</hsqldb.version>
 		<h2.version>1.4.200</h2.version>
-		<sqlite.version>3.34.0</sqlite.version>
+		<sqlite.version>3.36.0.3</sqlite.version>
 		<derby.version>10.14.2.0</derby.version>
 		<artemis.version>2.19.0</artemis.version>
-		<jaxb-core.version>3.0.0</jaxb-core.version>
+		<jaxb-core.version>3.0.2</jaxb-core.version>
 		<log4j.version>2.14.1</log4j.version>
 		<hibernate-validator.version>7.0.1.Final</hibernate-validator.version>
 		<jakarta.el-api.version>4.0.0</jakarta.el-api.version>
@@ -102,22 +102,22 @@
 		<jakarta.inject-api.version>2.0.0</jakarta.inject-api.version>
 		<jakarta.xml.bind-api.version>3.0.1</jakarta.xml.bind-api.version>
 		<jakarta.mail.version>2.0.1</jakarta.mail.version>
-		<woodstox-core.version>6.2.5</woodstox-core.version>
-		<aspectj.version>1.9.6</aspectj.version>
-		<mysql-connector-java.version>8.0.23</mysql-connector-java.version>
-		<postgresql.version>42.2.22</postgresql.version>
+		<woodstox-core.version>6.2.7</woodstox-core.version>
+		<aspectj.version>1.9.7</aspectj.version>
+		<mysql-connector-java.version>8.0.27</mysql-connector-java.version>
+		<postgresql.version>42.3.1</postgresql.version>
 		<db2.version>11.5.6.0</db2.version>
 		<oracle.version>21.1.0.0</oracle.version>
 		<sqlserver.version>9.2.1.jre8</sqlserver.version>
 		<jtds.version>1.3.1</jtds.version>
-		<testcontainers.version>1.15.3</testcontainers.version>
+		<testcontainers.version>1.16.2</testcontainers.version>
 		<com.ibm.jbatch-tck-spi.version>1.0</com.ibm.jbatch-tck-spi.version>
 		<jsonassert.version>1.5.0</jsonassert.version>
 
 		<!-- samples dependencies -->
 		<spring-rabbit.version>3.0.0-SNAPSHOT</spring-rabbit.version>
 		<quartz.version>2.3.2</quartz.version>
-		<prometheus_pushgateway.version>0.10.0</prometheus_pushgateway.version>
+		<prometheus_pushgateway.version>0.11.0</prometheus_pushgateway.version>
 		<groovy.version>2.5.14</groovy.version>
 
 		<!-- documentation dependencies -->
@@ -129,17 +129,17 @@
 		<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
 		<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
 		<maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
-		<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
+		<maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
 		<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
 		<jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
 		<flatten-maven-plugin.version>1.2.7</flatten-maven-plugin.version>
 		<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
 		<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
-		<asciidoctor-maven-plugin.version>2.1.0</asciidoctor-maven-plugin.version>
+		<asciidoctor-maven-plugin.version>2.2.1</asciidoctor-maven-plugin.version>
 		<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
-		<maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
+		<maven-dependency-plugin.version>3.2.0</maven-dependency-plugin.version>
 		<maven-site-plugin.version>3.9.1</maven-site-plugin.version>
-		<maven-project-info-reports-plugin.version>3.1.1</maven-project-info-reports-plugin.version>
+		<maven-project-info-reports-plugin.version>3.1.2</maven-project-info-reports-plugin.version>
 		<maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
 		<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
 	</properties>
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/XStreamUnmarshallingTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/XStreamUnmarshallingTests.java
index 90b4e2a3b..f4bf30dc7 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/XStreamUnmarshallingTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/XStreamUnmarshallingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 the original author or authors.
+ * Copyright 2010-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,10 @@ import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.thoughtworks.xstream.security.ArrayTypePermission;
+import com.thoughtworks.xstream.security.ExplicitTypePermission;
+import com.thoughtworks.xstream.security.WildcardTypePermission;
+
 import org.springframework.batch.item.xml.domain.Trade;
 import org.springframework.oxm.Unmarshaller;
 import org.springframework.oxm.xstream.XStreamMarshaller;
@@ -38,6 +42,7 @@ public class XStreamUnmarshallingTests extends AbstractStaxEventReaderItemReader
 		unmarshaller.addAlias("customer", String.class);
 		unmarshaller.addAlias("price", BigDecimal.class);*/
 		unmarshaller.setAliases(aliasesMap);
+		unmarshaller.setTypePermissions(new ExplicitTypePermission(new String[]{"org.springframework.batch.item.xml.domain.Trade"}));
 		return unmarshaller;
 	}
 
diff --git a/spring-batch-samples/src/main/resources/jobs/iosample/xml.xml b/spring-batch-samples/src/main/resources/jobs/iosample/xml.xml
index b89f05b50..41a5f00c3 100644
--- a/spring-batch-samples/src/main/resources/jobs/iosample/xml.xml
+++ b/spring-batch-samples/src/main/resources/jobs/iosample/xml.xml
@@ -28,6 +28,15 @@
 				<entry key="name" value="java.lang.String" />
 			</util:map>
 		</property>
+		<property name="typePermissions">
+			<bean class="com.thoughtworks.xstream.security.ExplicitTypePermission">
+				<constructor-arg>
+					<util:list>
+						<value>org.springframework.batch.sample.domain.trade.CustomerCredit</value>
+					</util:list>
+				</constructor-arg>
+			</bean>
+		</property>
 	</bean>
 
 	<bean id="outputResource" class="org.springframework.core.io.FileSystemResource">