From af74f7805009595133b32a4865c5c2ed4da92a9c Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Sat, 25 May 2013 07:06:47 +0000
Subject: [PATCH] WW-4070 Cleans up assemblies and removes unused assembly
 definition

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

diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml
index 28e5b16ce..43622e19f 100644
--- a/assembly/src/main/assembly/all.xml
+++ b/assembly/src/main/assembly/all.xml
@@ -31,10 +31,8 @@
       <outputDirectory>lib</outputDirectory>
       <scope>runtime</scope>
       <excludes>
-        <exclude>net.sf.retrotranslator:retrotranslator-runtime</exclude>
-        <exclude>backport-util-concurrent:backport-util-concurrent</exclude>
         <exclude>junit:junit</exclude>
-        <exclude>*:jdk14</exclude>
+        <exclude>org.testng:testng</exclude>
       </excludes>
     </dependencySet>
   </dependencySets>
diff --git a/assembly/src/main/assembly/lib-jdk14.xml b/assembly/src/main/assembly/lib-jdk14.xml
deleted file mode 100644
index 5213a6128..000000000
--- a/assembly/src/main/assembly/lib-jdk14.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<!--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-
-<assembly>
-  <id>lib-jdk14</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <dependencySets>
-    <dependencySet useTransitiveFiltering="true">
-      <outputDirectory>jdk14</outputDirectory>
-      <outputFileNameMapping>${artifactId}-${version}.${extension}</outputFileNameMapping>
-      <includes>
-        <include>net.sf.retrotranslator:retrotranslator-runtime</include>
-        <include>backport-util-concurrent:backport-util-concurrent</include>
-      </includes>
-    </dependencySet>
-    <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>
-  <fileSets>
-    <fileSet>
-        <directory>src/main/resources/backport</directory>
-        <outputDirectory></outputDirectory>
-      <includes>
-        <include>*LICENSE*</include>
-        <include>NOTICE*</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>
diff --git a/assembly/src/main/assembly/lib.xml b/assembly/src/main/assembly/lib.xml
index 5b204a37b..cae5e22f3 100644
--- a/assembly/src/main/assembly/lib.xml
+++ b/assembly/src/main/assembly/lib.xml
@@ -31,10 +31,8 @@
       <outputDirectory>lib</outputDirectory>
       <scope>runtime</scope>
       <excludes>
-        <exclude>net.sf.retrotranslator:retrotranslator-runtime</exclude>
-        <exclude>backport-util-concurrent:backport-util-concurrent</exclude>
         <exclude>junit:junit</exclude>
-        <exclude>*:jdk14</exclude>
+        <exclude>org.testng:testng</exclude>
       </excludes>
     </dependencySet>
   </dependencySets>