Merge pull request #30187 from quarkusio/dependabot/maven/com.thought…

…works.xstream-xstream-1.4.20 Bump xstream from 1.4.19 to 1.4.20
quarkusio · Jan 5, 2023 · 41d8133 · 41d8133
2 parents 87b1bc7 + b5234a3
commit 41d8133
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 56 deletions.
diff --git a/test-framework/junit5/pom.xml b/test-framework/junit5/pom.xml
@@ -52,7 +52,7 @@
             <groupId>com.thoughtworks.xstream</groupId>
             <artifactId>xstream</artifactId>
             <!-- Avoid adding this to the BOM -->
-            <version>1.4.19</version>
+            <version>1.4.20</version>
         </dependency>
 
         <dependency>

diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/internal/OptionalConverter.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/internal/OptionalConverter.java
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/internal/XStreamDeepClone.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/internal/XStreamDeepClone.java
@@ -1,6 +1,5 @@
 package io.quarkus.test.junit.internal;
 
-import java.util.Optional;
 import java.util.function.Supplier;
 
 import com.thoughtworks.xstream.XStream;
@@ -18,12 +17,10 @@ class XStreamDeepClone implements DeepClone {
             XStream result = new XStream();
             result.allowTypesByRegExp(new String[] { ".*" });
             result.setClassLoader(classLoader);
-            result.allowTypes(new Class[] { Optional.class });
             result.registerConverter(new CustomListConverter(result.getMapper()));
             result.registerConverter(new CustomSetConverter(result.getMapper()));
             result.registerConverter(new CustomMapConverter(result.getMapper()));
             result.registerConverter(new CustomMapEntryConverter(result.getMapper()));
-            result.registerConverter(new OptionalConverter(result.getMapper()));
 
             return result;
         };