From 889e6db56203cbb642bc6ad3a927dbc46f8cf594 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Thu, 14 Jul 2016 20:14:11 +0200
Subject: [PATCH] Updates assemblies

---
 assembly/src/main/assembly/all.xml     | 29 --------------------------
 assembly/src/main/assembly/apps.xml    |  7 -------
 assembly/src/main/assembly/lib.xml     |  7 -------
 assembly/src/main/assembly/min-lib.xml |  7 +++++--
 assembly/src/main/assembly/src.xml     | 16 --------------
 5 files changed, 5 insertions(+), 61 deletions(-)

diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml
index ef9e68286..8a0503087 100644
--- a/assembly/src/main/assembly/all.xml
+++ b/assembly/src/main/assembly/all.xml
@@ -79,13 +79,6 @@
         <include>SITEMESH-LICENSE.txt</include>
       </includes>
     </fileSet>
-    <fileSet>
-      <directory>../plugins/struts1/src/main/resources</directory>
-      <outputDirectory></outputDirectory>
-      <includes>
-        <include>ANTLR-LICENSE.txt</include>
-      </includes>
-    </fileSet>
     <fileSet>
       <directory>../plugins/oval/src/main/resources</directory>
       <outputDirectory></outputDirectory>
@@ -102,12 +95,6 @@
       </includes>
     </fileSet>
 
-    <!-- Include the XWork Javadoc in the assembly -->
-    <fileSet>
-      <directory>../xwork-core/target/apidocs</directory>
-      <outputDirectory>docs/xwork-apidocs</outputDirectory>
-    </fileSet>
-
       <!-- Include the Struts 2 core Javadoc in the assembly -->
       <fileSet>
         <directory>../core/target/site</directory>
@@ -256,14 +243,6 @@
         <include>src/</include>
       </includes>
     </fileSet>
-    <fileSet>
-      <directory>../apps/portlet</directory>
-      <outputDirectory>src/apps/portlet</outputDirectory>
-      <includes>
-        <include>pom.xml</include>
-        <include>src/</include>
-      </includes>
-    </fileSet>
     <fileSet>
       <directory>../apps/showcase</directory>
       <outputDirectory>src/apps/showcase</outputDirectory>
@@ -296,14 +275,6 @@
         <include>src/</include>
       </includes>
     </fileSet>
-    <fileSet>
-      <directory>../xwork-core</directory>
-      <outputDirectory>src/xwork-core</outputDirectory>
-      <includes>
-        <include>pom.xml</include>
-        <include>src/</include>
-      </includes>
-    </fileSet>
     <fileSet>
       <directory>../plugins</directory>
       <outputDirectory>src/plugins</outputDirectory>
diff --git a/assembly/src/main/assembly/apps.xml b/assembly/src/main/assembly/apps.xml
index 0e09196e8..37ec61afd 100644
--- a/assembly/src/main/assembly/apps.xml
+++ b/assembly/src/main/assembly/apps.xml
@@ -75,12 +75,5 @@
         <include>SITEMESH-LICENSE.txt</include>
       </includes>
     </fileSet>
-    <fileSet>
-      <directory>../plugins/struts1/src/main/resources</directory>
-      <outputDirectory></outputDirectory>
-      <includes>
-        <include>ANTLR-LICENSE.txt</include>
-      </includes>
-    </fileSet>
   </fileSets>
 </assembly>
diff --git a/assembly/src/main/assembly/lib.xml b/assembly/src/main/assembly/lib.xml
index a19e2abb0..7aa42ddf1 100644
--- a/assembly/src/main/assembly/lib.xml
+++ b/assembly/src/main/assembly/lib.xml
@@ -79,13 +79,6 @@
         <include>SITEMESH-LICENSE.txt</include>
       </includes>
     </fileSet>
-    <fileSet>
-      <directory>../plugins/struts1/src/main/resources</directory>
-      <outputDirectory></outputDirectory>
-      <includes>
-        <include>ANTLR-LICENSE.txt</include>
-      </includes>
-    </fileSet>
     <fileSet>
       <directory>../plugins/oval/src/main/resources</directory>
       <outputDirectory></outputDirectory>
diff --git a/assembly/src/main/assembly/min-lib.xml b/assembly/src/main/assembly/min-lib.xml
index ec1417da4..10a18ff6d 100644
--- a/assembly/src/main/assembly/min-lib.xml
+++ b/assembly/src/main/assembly/min-lib.xml
@@ -38,11 +38,14 @@
         <include>org.apache.struts:struts2-core</include>
         <include>org.freemarker:freemarker</include>
         <include>org.apache.commons:commons-lang3</include>
+        <include>org.apache.logging.log4j:log4j-api</include>
         <include>ognl:ognl</include>
-        <include>javassist:javassist</include>
+        <include>org.ow2.asm:asm</include>
+        <include>org.ow2.asm:asm-tree</include>
+        <include>org.ow2.asm:asm-commons</include>
+        <include>org.javassist:javassist</include>
         <include>commons-fileupload:commons-fileupload</include>
         <include>commons-io:commons-io</include>
-        <include>commons-logging:commons-logging</include>
       </includes>
     </dependencySet>
   </dependencySets>
diff --git a/assembly/src/main/assembly/src.xml b/assembly/src/main/assembly/src.xml
index e36840c8f..c520129ee 100644
--- a/assembly/src/main/assembly/src.xml
+++ b/assembly/src/main/assembly/src.xml
@@ -66,14 +66,6 @@
           <include>src/</include>
         </includes>
       </fileSet>
-      <fileSet>
-        <directory>../apps/portlet</directory>
-        <outputDirectory>src/apps/portlet</outputDirectory>
-        <includes>
-          <include>pom.xml</include>
-          <include>src/</include>
-        </includes>
-      </fileSet>
       <fileSet>
         <directory>../apps/showcase</directory>
         <outputDirectory>src/apps/showcase</outputDirectory>
@@ -106,14 +98,6 @@
           <include>src/</include>
         </includes>
       </fileSet>
-      <fileSet>
-        <directory>../xwork-core</directory>
-        <outputDirectory>src/xwork-core</outputDirectory>
-        <includes>
-          <include>pom.xml</include>
-          <include>src/</include>
-        </includes>
-      </fileSet>
       <fileSet>
         <directory>../plugins</directory>
         <outputDirectory>src/plugins</outputDirectory>