From 75d252554b7fd08e14bb7d4416dc403df8b7de1e Mon Sep 17 00:00:00 2001
From: Johannes Geppert <jogep@apache.org>
Date: Sat, 9 Feb 2019 15:04:22 +0100
Subject: [PATCH] Solve some dependency convergence issues reported by maven
 enforce plugin

https://issues.apache.org/jira/browse/WW-5018
---
 apps/rest-showcase/pom.xml    | 16 +++++++++++-----
 apps/showcase/pom.xml         |  9 +--------
 plugins/jasperreports/pom.xml | 12 ++++++++----
 plugins/osgi/pom.xml          | 17 +++++++++++++++++
 4 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index 810cd31fc..2bf65a13a 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -73,26 +73,32 @@
         <dependency>
             <groupId>net.sourceforge.jwebunit</groupId>
             <artifactId>jwebunit-core</artifactId>
-            <version>1.4.1</version>
+            <version>3.3</version>
             <scope>test</scope>
         </dependency>
+
         <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-            <version>3.1</version>
+            <groupId>net.sourceforge.htmlunit</groupId>
+            <artifactId>htmlunit</artifactId>
+            <version>2.27</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>net.sourceforge.jwebunit</groupId>
             <artifactId>jwebunit-htmlunit-plugin</artifactId>
-            <version>1.4.1</version>
+            <version>3.3</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
                     <groupId>xom</groupId>
                     <artifactId>xom</artifactId>
                 </exclusion>
+                <!-- not necessary to compile and it force dependency convergence issues -->
+                <exclusion>
+                    <groupId>net.sourceforge.htmlunit</groupId>
+                    <artifactId>htmlunit</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 9e9cce20e..a3c83414d 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -141,13 +141,6 @@
             <artifactId>commons-fileupload</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-            <version>3.1</version>
-            <scope>test</scope>
-        </dependency>
-
        <dependency>
            <groupId>junit</groupId>
            <artifactId>junit</artifactId>
@@ -157,7 +150,7 @@
        <dependency>
             <groupId>net.sourceforge.htmlunit</groupId>
             <artifactId>htmlunit</artifactId>
-            <version>2.24</version>
+            <version>2.27</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index 72804ed58..8a9762db8 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -39,13 +39,17 @@
         <dependency>
             <groupId>net.sf.jasperreports</groupId>
             <artifactId>jasperreports</artifactId>
-            <version>6.0.3</version>
+            <version>6.7.0</version>
             <scope>provided</scope>
             <exclusions>
-                <!-- This is currently not found in Maven central, yet not needed at compile time -->
+                <!-- not necessary to compile and it force dependency convergence issues -->
                 <exclusion>
-                    <groupId>org.olap4j</groupId>
-                    <artifactId>olap4j</artifactId>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-databind</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-annotation</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
index cbe48f067..91625388c 100644
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@ -32,6 +32,11 @@
     <name>Struts 2 OSGi Plugin</name>
 
     <dependencies>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <version>4.3.1</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.main</artifactId>
@@ -39,10 +44,22 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.shell</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.osgi</groupId>
+                    <artifactId>org.osgi.core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.shell.tui</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.osgi</groupId>
+                    <artifactId>org.osgi.core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>