Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-05 22:56:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Solve some dependency convergence issues reported by maven enforce plugin

Browse Source 
https://issues.apache.org/jira/browse/WW-5018
This commit is contained in:
Johannes Geppert
2019-02-09 15:04:22 +01:00
parent 67d40ce12a
commit 75d252554b
4 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/rest-showcase/pom.xml
+11 -5
View File
@@ -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>
apps/showcase/pom.xml
+1 -8
View File
@@ -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>
plugins/jasperreports/pom.xml
+8 -4
View File
@@ -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>
plugins/osgi/pom.xml
+17
View File
@@ -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>