From c54b64bf8a0f1e5ca72ad3c61d944d717bd6144c Mon Sep 17 00:00:00 2001
From: "Donald J. Brown" <mrdon@apache.org>
Date: Mon, 17 Dec 2007 12:03:58 +0000
Subject: [PATCH] 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                         | 14 ++++++++++++++
 assembly/src/main/assembly/all.xml       |  2 ++
 assembly/src/main/assembly/lib-jdk14.xml |  2 +-
 assembly/src/main/assembly/lib.xml       |  2 ++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/assembly/pom.xml b/assembly/pom.xml
index 1620e6951..3f22ff4e6 100644
--- a/assembly/pom.xml
+++ b/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>
diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml
index c3e11ad1c..2df8faf1b 100644
--- a/assembly/src/main/assembly/all.xml
+++ b/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>
diff --git a/assembly/src/main/assembly/lib-jdk14.xml b/assembly/src/main/assembly/lib-jdk14.xml
index 31faf4feb..615a81fae 100644
--- a/assembly/src/main/assembly/lib-jdk14.xml
+++ b/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">
diff --git a/assembly/src/main/assembly/lib.xml b/assembly/src/main/assembly/lib.xml
index 30114ff13..e6f7f6d5c 100644
--- a/assembly/src/main/assembly/lib.xml
+++ b/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>