8:31 a.m.
Author: pete.muir(a)jboss.org
Date: 2008-09-04 09:31:35 -0400 (Thu, 04 Sep 2008)
New Revision: 8906
Modified:
trunk/build/core.pom.xml
trunk/build/root.pom.xml
trunk/build/ui.pom.xml
Log:
Clean up commons-* dependencies
Modified: trunk/build/core.pom.xml
===================================================================
--- trunk/build/core.pom.xml 2008-09-04 13:24:07 UTC (rev 8905)
+++ trunk/build/core.pom.xml 2008-09-04 13:31:35 UTC (rev 8906)
@@ -25,6 +25,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
+ <optional>true</optional>
</dependency>
Modified: trunk/build/root.pom.xml
===================================================================
--- trunk/build/root.pom.xml 2008-09-04 13:24:07 UTC (rev 8905)
+++ trunk/build/root.pom.xml 2008-09-04 13:31:35 UTC (rev 8906)
@@ -431,7 +431,13 @@
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
- <version>1.7-brew</version>
+ <version>1.7</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -439,6 +445,31 @@
<artifactId>commons-collections</artifactId>
<version>3.2</version>
</dependency>
+
+ <!-- Should be 1.0.5.GA-jboss, to be in sync with AS but doesn't exist in
Maven -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>javax.persistence</groupId>
@@ -525,20 +556,7 @@
<version>3.8.0.GA</version>
</dependency>
- <!-- Should be 1.0.5.GA-jboss, to be in sync with AS but doesn't exist in
Maven -->
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
- <exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
<version>1.0</version>
Modified: trunk/build/ui.pom.xml
===================================================================
--- trunk/build/ui.pom.xml 2008-09-04 13:24:07 UTC (rev 8905)
+++ trunk/build/ui.pom.xml 2008-09-04 13:31:35 UTC (rev 8906)
@@ -104,17 +104,19 @@
<optional>true</optional>
</dependency>
- <!-- Maven's "nearest" dependency resolution doesn't take into
account parent dependency management! -->
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
+ <!-- Maven's "nearest" dependency resolution doesn't take into
account parent dependency management! -->
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <optional>true</optional>
+ </dependency>
- <!-- Maven's "nearest" dependency resolution doesn't take into
account parent dependency management! -->
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- </dependency>
+ <!-- Maven's "nearest" dependency resolution doesn't take into
account parent dependency management! -->
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>javax.faces</groupId>