From ae4160e13133a9e0ae2d1d477d387e4cf511aa5a Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sun, 30 Aug 2020 12:15:45 +0200 Subject: [PATCH 1/2] Avoid direct use of non-exported XStream CompositeClassLoader class Closes gh-25662 --- .../org/springframework/oxm/xstream/XStreamMarshaller.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java index 090ae9f167f..881529d211b 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java @@ -47,7 +47,6 @@ import com.thoughtworks.xstream.converters.SingleValueConverter; import com.thoughtworks.xstream.converters.reflection.ReflectionProvider; import com.thoughtworks.xstream.core.ClassLoaderReference; import com.thoughtworks.xstream.core.DefaultConverterLookup; -import com.thoughtworks.xstream.core.util.CompositeClassLoader; import com.thoughtworks.xstream.io.HierarchicalStreamDriver; import com.thoughtworks.xstream.io.HierarchicalStreamReader; import com.thoughtworks.xstream.io.HierarchicalStreamWriter; @@ -186,7 +185,8 @@ public class XStreamMarshaller extends AbstractMarshaller implements BeanClassLo @Nullable private Class[] supportedClasses; - private ClassLoader beanClassLoader = new CompositeClassLoader(); + @Nullable + private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader(); private final SingletonSupplier xstream = SingletonSupplier.of(this::buildXStream); From 97d84d9ab814438f190914652f6745cc2b07bd45 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sun, 30 Aug 2020 12:16:14 +0200 Subject: [PATCH 2/2] Upgrade to AssertJ 3.17.1 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 52586f08f98..e160245f6c4 100644 --- a/build.gradle +++ b/build.gradle @@ -179,7 +179,7 @@ configure(allprojects) { project -> dependency "org.testng:testng:6.14.3" dependency "org.hamcrest:hamcrest:2.1" dependency "org.awaitility:awaitility:3.1.6" - dependency "org.assertj:assertj-core:3.16.1" + dependency "org.assertj:assertj-core:3.17.1" dependencySet(group: 'org.xmlunit', version: '2.6.2') { entry 'xmlunit-assertj' entry('xmlunit-matchers') {