You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2008/12/09 21:31:42 UTC
svn commit: r724871 - in /geronimo/server/trunk:
assemblies/geronimo-boilerplate/pom.xml
assemblies/geronimo-boilerplate/src/main/assembly/boilerplate.xml
buildsupport/car-maven-plugin/pom.xml pom.xml
Author: dwoods
Date: Tue Dec 9 12:31:42 2008
New Revision: 724871
URL: http://svn.apache.org/viewvc?rev=724871&view=rev
Log:
remove duplicate xpp3/xpp3 depend and only include xpp3_min
Modified:
geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml
geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/assembly/boilerplate.xml
geronimo/server/trunk/buildsupport/car-maven-plugin/pom.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml?rev=724871&r1=724870&r2=724871&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml Tue Dec 9 12:31:42 2008
@@ -89,7 +89,7 @@
<dependency>
<groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
+ <artifactId>xpp3_min</artifactId>
</dependency>
<dependency>
Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/assembly/boilerplate.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/assembly/boilerplate.xml?rev=724871&r1=724870&r2=724871&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/assembly/boilerplate.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/assembly/boilerplate.xml Tue Dec 9 12:31:42 2008
@@ -59,7 +59,7 @@
<include>org.slf4j:slf4j-log4j12</include>
<include>org.slf4j:jcl-over-slf4j</include>
<include>log4j:log4j</include>
- <include>xpp3:xpp3</include>
+ <include>xpp3:xpp3_min</include>
<include>org.apache.xbean:xbean-reflect</include>
<include>com.thoughtworks.xstream:xstream</include>
<include>org.apache.geronimo.framework:geronimo-cli</include>
Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/pom.xml?rev=724871&r1=724870&r2=724871&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/pom.xml Tue Dec 9 12:31:42 2008
@@ -156,7 +156,7 @@
<dependency>
<groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
+ <artifactId>xpp3_min</artifactId>
</dependency>
<dependency>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=724871&r1=724870&r2=724871&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Dec 9 12:31:42 2008
@@ -780,7 +780,7 @@
<dependency>
<groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
+ <artifactId>xpp3_min</artifactId>
<version>1.1.4c</version>
</dependency>