Skip to content

Commit f205d57

Browse files
committed
Upgrade to XStream 1.4.18.
Closes #2152
1 parent f215f9d commit f205d57

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<awaitility>4.0.2</awaitility>
2121
<jta>1.1</jta>
2222
<beanutils>1.9.2</beanutils>
23-
<xstream>1.4.17</xstream>
23+
<xstream>1.4.18</xstream>
2424
<pool>2.9.0</pool>
2525
<lettuce>6.1.4.RELEASE</lettuce>
2626
<jedis>3.6.3</jedis>

src/test/java/org/springframework/data/redis/test/XstreamOxmSerializerSingleton.java

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
import org.springframework.data.redis.serializer.OxmSerializer;
1919
import org.springframework.oxm.xstream.XStreamMarshaller;
2020

21+
import com.thoughtworks.xstream.security.AnyTypePermission;
22+
2123
/**
2224
* @author Mark Paluch
2325
*/
@@ -31,6 +33,7 @@ private XstreamOxmSerializerSingleton() {
3133

3234
// XStream serializer
3335
XStreamMarshaller xstream = new XStreamMarshaller();
36+
xstream.getXStream().addPermission(AnyTypePermission.ANY);
3437
try {
3538
xstream.afterPropertiesSet();
3639
} catch (Exception ex) {

0 commit comments

Comments
 (0)