Repository: struts Updated Branches: refs/heads/master ee562666a -> 7a06fe47e
WW-4567 Cleans up poms Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/7a06fe47 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/7a06fe47 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/7a06fe47 Branch: refs/heads/master Commit: 7a06fe47e123337f04b348fae319919eb5d48953 Parents: ee56266 Author: Lukasz Lenart <[email protected]> Authored: Thu Nov 12 20:45:21 2015 +0100 Committer: Lukasz Lenart <[email protected]> Committed: Thu Nov 12 20:45:21 2015 +0100 ---------------------------------------------------------------------- apps/portlet/pom.xml | 4 ---- core/pom.xml | 14 ++++++++++---- plugins/bean-validation/pom.xml | 1 - pom.xml | 13 +++++++++++-- 4 files changed, 21 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/7a06fe47/apps/portlet/pom.xml ---------------------------------------------------------------------- diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml index 12ddb68..cbaf4a8 100644 --- a/apps/portlet/pom.xml +++ b/apps/portlet/pom.xml @@ -133,10 +133,6 @@ <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> <!-- Logging --> <dependency> http://git-wip-us.apache.org/repos/asf/struts/blob/7a06fe47/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 2f78ca7..91cc5eb 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -337,9 +337,9 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>test</scope> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <optional>true</optional> </dependency> <dependency> @@ -350,6 +350,12 @@ </dependency> <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>mockobjects</groupId> <artifactId>mockobjects-jdk1.3</artifactId> <scope>test</scope> @@ -403,7 +409,7 @@ </dependency> <!-- These jars have to be in the compile scope in order to work with apt plugin - (struts-annotations) and javadoc (the rest to process xwork sources). Marking + (struts-annotations) and javadoc (the rest to process xwork sources). Marking them optional to exclude them from transitive dependency resolution --> <dependency> http://git-wip-us.apache.org/repos/asf/struts/blob/7a06fe47/plugins/bean-validation/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/bean-validation/pom.xml b/plugins/bean-validation/pom.xml index e719642..b7318ef 100644 --- a/plugins/bean-validation/pom.xml +++ b/plugins/bean-validation/pom.xml @@ -47,7 +47,6 @@ <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.9.2</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/struts/blob/7a06fe47/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9750ef3..5b33c88 100644 --- a/pom.xml +++ b/pom.xml @@ -191,7 +191,11 @@ <artifactId>maven-bundle-plugin</artifactId> <version>2.1.0</version> </plugin> - + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.10</version> + </plugin> </plugins> </pluginManagement> <plugins> @@ -671,9 +675,14 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-jci-fam</artifactId> - <version>1.0</version> + <version>1.1</version> <optional>true</optional> </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.9.2</version> + </dependency> <!-- Mocks for unit testing (by Spring) --> <dependency>
