From c47aa823dc8442e8682e346eba98865b8949b1cf Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20M=C3=BCller?= <a.mueller@bgbm.org>
Date: Wed, 1 Jul 2020 22:54:09 +0200
Subject: [PATCH] Upgrade xstream from 1.4.7 to 1.4.12

---
 cdmlib-remote-webapp/pom.xml | 9 +++++++++
 cdmlib-remote/pom.xml        | 9 +++++++++
 pom.xml                      | 7 ++++++-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/cdmlib-remote-webapp/pom.xml b/cdmlib-remote-webapp/pom.xml
index 485f3e85b5..6e8b445541 100755
--- a/cdmlib-remote-webapp/pom.xml
+++ b/cdmlib-remote-webapp/pom.xml
@@ -171,8 +171,17 @@
 
     <!-- XmlView -->
     <dependency>
+      <!-- this is also offered by cdmlib-remote. Can it be removed? -->
       <groupId>com.thoughtworks.xstream</groupId>
       <artifactId>xstream</artifactId>
+      <exclusions>
+        <!-- https://stackoverflow.com/questions/17077922/maven-xpp3-versus-xpp3-min -->
+        <!-- But maybe we can exclude xpp3 instead, not sure if it is directly needed or only for xstream -->
+        <exclusion>
+            <groupId>xpp3</groupId>
+            <artifactId>xpp3_min</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>xpp3</groupId>
diff --git a/cdmlib-remote/pom.xml b/cdmlib-remote/pom.xml
index 4ef03b54ac..ff539b2d36 100644
--- a/cdmlib-remote/pom.xml
+++ b/cdmlib-remote/pom.xml
@@ -127,7 +127,16 @@
     <dependency>
       <groupId>com.thoughtworks.xstream</groupId>
       <artifactId>xstream</artifactId>
+      <exclusions>
+        <!-- https://stackoverflow.com/questions/17077922/maven-xpp3-versus-xpp3-min -->
+        <!-- But maybe we can exclude xpp3 instead, not sure if it is directly needed or only for xstream -->
+        <exclusion>
+            <groupId>xpp3</groupId>
+            <artifactId>xpp3_min</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
+    
     <dependency>
       <groupId>xpp3</groupId>
       <artifactId>xpp3</artifactId>
diff --git a/pom.xml b/pom.xml
index 160ef0da24..c013308e4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1240,7 +1240,12 @@
       <dependency>
         <groupId>com.thoughtworks.xstream</groupId>
         <artifactId>xstream</artifactId>
-        <version>1.4.7</version>
+        <version>1.4.12</version>
+      </dependency>
+      <dependency>
+      <groupId>xmlpull</groupId>
+        <artifactId>xmlpull</artifactId>
+        <version>1.1.3.1</version>
       </dependency>
       <dependency>
         <groupId>xpp3</groupId>
-- 
2.34.1