struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [53/53] struts git commit: Updates assemblies
Date Fri, 15 Jul 2016 07:19:36 GMT
Updates assemblies


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/889e6db5
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/889e6db5
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/889e6db5

Branch: refs/heads/master
Commit: 889e6db56203cbb642bc6ad3a927dbc46f8cf594
Parents: d948a85
Author: Lukasz Lenart <lukaszlenart@apache.org>
Authored: Thu Jul 14 20:14:11 2016 +0200
Committer: Lukasz Lenart <lukaszlenart@apache.org>
Committed: Thu Jul 14 20:14:11 2016 +0200

----------------------------------------------------------------------
 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(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/889e6db5/assembly/src/main/assembly/all.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml
index ef9e682..8a05030 100644
--- a/assembly/src/main/assembly/all.xml
+++ b/assembly/src/main/assembly/all.xml
@@ -80,13 +80,6 @@
       </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>
       <includes>
@@ -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>
@@ -257,14 +244,6 @@
       </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>
       <includes>
@@ -297,14 +276,6 @@
       </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>
       <excludes>

http://git-wip-us.apache.org/repos/asf/struts/blob/889e6db5/assembly/src/main/assembly/apps.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/assembly/apps.xml b/assembly/src/main/assembly/apps.xml
index 0e09196..37ec61a 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>

http://git-wip-us.apache.org/repos/asf/struts/blob/889e6db5/assembly/src/main/assembly/lib.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/assembly/lib.xml b/assembly/src/main/assembly/lib.xml
index a19e2ab..7aa42dd 100644
--- a/assembly/src/main/assembly/lib.xml
+++ b/assembly/src/main/assembly/lib.xml
@@ -80,13 +80,6 @@
       </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>
       <includes>

http://git-wip-us.apache.org/repos/asf/struts/blob/889e6db5/assembly/src/main/assembly/min-lib.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/assembly/min-lib.xml b/assembly/src/main/assembly/min-lib.xml
index ec1417d..10a18ff 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>

http://git-wip-us.apache.org/repos/asf/struts/blob/889e6db5/assembly/src/main/assembly/src.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/assembly/src.xml b/assembly/src/main/assembly/src.xml
index e36840c..c520129 100644
--- a/assembly/src/main/assembly/src.xml
+++ b/assembly/src/main/assembly/src.xml
@@ -67,14 +67,6 @@
         </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>
         <includes>
@@ -107,14 +99,6 @@
         </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>
         <excludes>


Mime
View raw message