Author: mrdon
Date: Mon Dec 17 04:03:58 2007
New Revision: 604847
URL: http://svn.apache.org/viewvc?rev=604847&view=rev
Log:
Adding the retrotranslated jars into the proper assemblies
WW-2379
Modified:
struts/struts2/trunk/assembly/pom.xml
struts/struts2/trunk/assembly/src/main/assembly/all.xml
struts/struts2/trunk/assembly/src/main/assembly/lib-jdk14.xml
struts/struts2/trunk/assembly/src/main/assembly/lib.xml
Modified: struts/struts2/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?rev=604847&r1=604846&r2=604847&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/pom.xml (original)
+++ struts/struts2/trunk/assembly/pom.xml Mon Dec 17 04:03:58 2007
@@ -230,6 +230,20 @@
<!-- Backported JDK 1.4 jars -->
<dependency>
+ <groupId>net.sf.retrotranslator</groupId>
+ <artifactId>retrotranslator-runtime</artifactId>
+ <version>1.2.1</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>3.0</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
<groupId>com.opensymphony</groupId>
<artifactId>xwork</artifactId>
<version>2.1.1-SNAPSHOT</version>
Modified: struts/struts2/trunk/assembly/src/main/assembly/all.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/all.xml?rev=604847&r1=604846&r2=604847&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/all.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/all.xml Mon Dec 17 04:03:58
2007
@@ -28,6 +28,8 @@
<outputDirectory>lib</outputDirectory>
<scope>runtime</scope>
<excludes>
+ <exclude>net.sf.retrotranslator:retrotranslator-runtime</exclude>
+ <exclude>backport-util-concurrent:backport-util-concurrent</exclude>
<exclude>*:jdk14</exclude>
</excludes>
</dependencySet>
Modified: struts/struts2/trunk/assembly/src/main/assembly/lib-jdk14.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/lib-jdk14.xml?rev=604847&r1=604846&r2=604847&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/lib-jdk14.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/lib-jdk14.xml Mon Dec 17
04:03:58 2007
@@ -28,8 +28,8 @@
<outputDirectory>jdk14</outputDirectory>
<outputFileNameMapping>${artifactId}-${version}.${extension}</outputFileNameMapping>
<excludes>
+ <exclude>com.opensymphony:xwork:jar:default</exclude>
<exclude>org.apache.struts:*:jar</exclude>
- <exclude>*xwork*</exclude>
</excludes>
</dependencySet>
<dependencySet useTransitiveFiltering="true">
Modified: struts/struts2/trunk/assembly/src/main/assembly/lib.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/lib.xml?rev=604847&r1=604846&r2=604847&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/lib.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/lib.xml Mon Dec 17 04:03:58
2007
@@ -28,6 +28,8 @@
<outputDirectory>lib</outputDirectory>
<scope>runtime</scope>
<excludes>
+ <exclude>net.sf.retrotranslator:retrotranslator-runtime</exclude>
+ <exclude>backport-util-concurrent:backport-util-concurrent</exclude>
<exclude>*:jdk14</exclude>
</excludes>
</dependencySet>
