From 34554352fc233a5a4c92a35f75e5bf4e290a8d42 Mon Sep 17 00:00:00 2001 From: kwoyke Date: Sun, 17 Oct 2021 08:39:39 +0200 Subject: [PATCH] BAEL-5214: Upgrade xstream and jettison versions (#11332) --- xstream/pom.xml | 4 ++-- .../com/baeldung/initializer/SimpleXstreamInitializer.java | 6 +++++- .../test/java/com/baeldung/rce/XStreamBasicsUnitTest.java | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/xstream/pom.xml b/xstream/pom.xml index c4104d29c4..682b830dd8 100644 --- a/xstream/pom.xml +++ b/xstream/pom.xml @@ -30,8 +30,8 @@ - 1.4.10 - 1.3.8 + 1.4.18 + 1.4.1 \ No newline at end of file diff --git a/xstream/src/main/java/com/baeldung/initializer/SimpleXstreamInitializer.java b/xstream/src/main/java/com/baeldung/initializer/SimpleXstreamInitializer.java index 27b8cc84f3..c631726eb3 100644 --- a/xstream/src/main/java/com/baeldung/initializer/SimpleXstreamInitializer.java +++ b/xstream/src/main/java/com/baeldung/initializer/SimpleXstreamInitializer.java @@ -7,7 +7,11 @@ import com.thoughtworks.xstream.io.json.JsonHierarchicalStreamDriver; public class SimpleXstreamInitializer { public XStream getXstreamInstance() { - return new XStream(); + XStream xstream = new XStream(); + xstream.allowTypesByWildcard(new String[]{ + "com.baeldung.**" + }); + return xstream; } public XStream getXstreamJettisonMappedInstance() { diff --git a/xstream/src/test/java/com/baeldung/rce/XStreamBasicsUnitTest.java b/xstream/src/test/java/com/baeldung/rce/XStreamBasicsUnitTest.java index d762813b22..6a9e3c6782 100644 --- a/xstream/src/test/java/com/baeldung/rce/XStreamBasicsUnitTest.java +++ b/xstream/src/test/java/com/baeldung/rce/XStreamBasicsUnitTest.java @@ -21,6 +21,7 @@ public final class XStreamBasicsUnitTest { public void before() { xstream = new XStream(); xstream.alias("person", Person.class); + xstream.allowTypes(new Class[] { Person.class }); } @Test