From bda27dd5e15ff528dfac145b21c53dfe1890edb1 Mon Sep 17 00:00:00 2001
From: Antonio Petrelli <apetrelli@apache.org>
Date: Sun, 13 Jan 2008 23:06:33 +0000
Subject: [PATCH] WW-2379 Added the XWork retrotranslated artifact to the jdk14
 distribution.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@611671 13f79535-47bb-0310-9956-ffa450edef68
---
 assembly/pom.xml                         | 3 ++-
 assembly/src/main/assembly/lib-jdk14.xml | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/assembly/pom.xml b/assembly/pom.xml
index 3f22ff4e6..af307ddb5 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -247,8 +247,9 @@
             <groupId>com.opensymphony</groupId>
             <artifactId>xwork</artifactId>
             <version>2.1.1-SNAPSHOT</version>
-            <scope>runtime</scope>
+            <type>jar</type>
             <classifier>jdk14</classifier>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
diff --git a/assembly/src/main/assembly/lib-jdk14.xml b/assembly/src/main/assembly/lib-jdk14.xml
index 9cdd2bfa9..c307c3e81 100644
--- a/assembly/src/main/assembly/lib-jdk14.xml
+++ b/assembly/src/main/assembly/lib-jdk14.xml
@@ -32,11 +32,13 @@
         <include>backport-util-concurrent:backport-util-concurrent</include>
       </includes>
     </dependencySet>
-    <dependencySet useTransitiveFiltering="true">
+    <dependencySet>
+      <useTransitiveFiltering>true</useTransitiveFiltering>
       <outputDirectory>jdk14</outputDirectory>
       <outputFileNameMapping>${artifactId}-${version}-jdk14.${extension}</outputFileNameMapping>
       <includes>
         <include>org.apache.struts:*:jar:jdk14</include>
+        <include>com.opensymphony:xwork:jar:jdk14</include>
       </includes>
     </dependencySet>
   </dependencySets>