Adding the retrotranslated jars into the proper assemblies

WW-2379


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@604847 13f79535-47bb-0310-9956-ffa450edef68

assembly/pom.xml

@@ -229,6 +229,20 @@
         </dependency>
 
         <!-- 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>

assembly/src/main/assembly/all.xml

@@ -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>

assembly/src/main/assembly/lib-jdk14.xml

@@ -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">

assembly/src/main/assembly/lib.xml

@@ -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>