diff --git a/pom.xml b/pom.xml
index 0b125207e..9f1b4cbaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
6.0.0-SNAPSHOT
1.3.1
6.0.0-SNAPSHOT
- 1.7.4-SNAPSHOT
+ 1.8.1-SNAPSHOT
2.13.0
@@ -67,7 +67,7 @@
3.0.0-SNAPSHOT
2.3.5.BUILD-SNAPSHOT
1.9.2
- 2.8.6
+ 2.8.9
5.6.1.Final
2.0.0
2.0.1
@@ -76,25 +76,25 @@
3.0.0
3.0.0
3.2.21
- 4.2.3
- 1.4.16
- 5.7.1
+ 4.4.0
+ 1.4.18
+ 5.8.1
4.13.2
2.2
- 3.19.0
- 3.9.0
- 2.8.2
- 2.8.0
- 2.8.0
- 1.7.30
- 2.5.2
+ 3.21.0
+ 4.1.0
+ 2.8.3
+ 2.11.0
+ 2.9.0
+ 1.7.32
+ 2.6.1
1.4.200
- 3.34.0
+ 3.36.0.3
10.14.2.0
2.19.0
- 3.0.0
+ 3.0.2
2.14.1
7.0.1.Final
4.0.0
@@ -102,22 +102,22 @@
2.0.0
3.0.1
2.0.1
- 6.2.5
- 1.9.6
- 8.0.23
- 42.2.22
+ 6.2.7
+ 1.9.7
+ 8.0.27
+ 42.3.1
11.5.6.0
21.1.0.0
9.2.1.jre8
1.3.1
- 1.15.3
+ 1.16.2
1.0
1.5.0
3.0.0-SNAPSHOT
2.3.2
- 0.10.0
+ 0.11.0
2.5.14
@@ -129,17 +129,17 @@
3.8.1
2.22.2
2.22.2
- 3.2.0
+ 3.3.1
3.2.1
0.8.7
1.2.7
1.6
2.8.2
- 2.1.0
+ 2.2.1
3.3.0
- 3.1.2
+ 3.2.0
3.9.1
- 3.1.1
+ 3.1.2
3.2.0
3.2.0
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 @@
+
+
+
+
+ org.springframework.batch.sample.domain.trade.CustomerCredit
+
+
+
+