You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by jo...@apache.org on 2019/02/09 14:04:18 UTC
[struts] branch master updated (c58e492 -> 75d2525)
This is an automated email from the ASF dual-hosted git repository.
jogep pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git.
from c58e492 Merge pull request #330 from aleksandr-m/feature/java8_date
new 67d40ce Add maven enforce plugin with rule to avoid dependency convergence issues
new 75d2525 Solve some dependency convergence issues reported by maven enforce plugin
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
apps/rest-showcase/pom.xml | 16 +++++++++++-----
apps/showcase/pom.xml | 9 +--------
plugins/jasperreports/pom.xml | 12 ++++++++----
plugins/osgi/pom.xml | 17 +++++++++++++++++
pom.xml | 18 ++++++++++++++++++
5 files changed, 55 insertions(+), 17 deletions(-)
[struts] 02/02: Solve some dependency convergence issues reported
by maven enforce plugin
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jogep pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 75d252554b7fd08e14bb7d4416dc403df8b7de1e
Author: Johannes Geppert <jo...@apache.org>
AuthorDate: Sat Feb 9 15:04:22 2019 +0100
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 810cd31..2bf65a1 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 9e9cce2..a3c8341 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 72804ed..8a9762d 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 cbe48f0..9162538 100644
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@ -33,16 +33,33 @@
<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>
</dependency>
<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>
[struts] 01/02: Add maven enforce plugin with rule to avoid
dependency convergence issues
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jogep pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 67d40ce12adc334b070f086be970f3c176fdfb32
Author: Johannes Geppert <jo...@apache.org>
AuthorDate: Sat Feb 9 15:03:46 2019 +0100
Add maven enforce plugin with rule to avoid dependency convergence issues
https://issues.apache.org/jira/browse/WW-5018
---
pom.xml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/pom.xml b/pom.xml
index 28f2ce6..b010cc8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -389,6 +389,24 @@
<skipRuntimeScope>true</skipRuntimeScope>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.0.0-M2</version>
+ <executions>
+ <execution>
+ <id>enforce</id>
+ <configuration>
+ <rules>
+ <dependencyConvergence />
+ </rules>
+ </configuration>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>