Author: [email protected]
Date: Tue Jun 28 15:28:08 2011
New Revision: 1200

Log:
AMDATU-380 final tweaks to get NOTICE/LICENSE files included in artifacts

Modified:
   trunk/amdatu-core/config-filebased/pom.xml
   trunk/amdatu-libraries/pom.xml
   trunk/amdatu-release/src/main/assembly/bin-component.xml
   trunk/amdatu-release/src/main/assembly/war-component.xml
   trunk/amdatu-web/pom.xml

Modified: trunk/amdatu-core/config-filebased/pom.xml
==============================================================================
--- trunk/amdatu-core/config-filebased/pom.xml  (original)
+++ trunk/amdatu-core/config-filebased/pom.xml  Tue Jun 28 15:28:08 2011
@@ -37,6 +37,14 @@
           <include>conf/*.*</include>
         </includes>
       </resource>
+      <resource>
+        <directory>.</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE*</include>
+          <include>NOTICE*</include>
+        </includes>
+      </resource>
     </resources>
 
     <plugins>

Modified: trunk/amdatu-libraries/pom.xml
==============================================================================
--- trunk/amdatu-libraries/pom.xml      (original)
+++ trunk/amdatu-libraries/pom.xml      Tue Jun 28 15:28:08 2011
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.amdatu</groupId>
     <artifactId>amdatu</artifactId>
-    <version>2</version>
+    <version>4-SNAPSHOT</version>
     <relativePath>../amdatu-parent/pom.xml</relativePath>
   </parent>
   <groupId>org.amdatu.libraries</groupId>

Modified: trunk/amdatu-release/src/main/assembly/bin-component.xml
==============================================================================
--- trunk/amdatu-release/src/main/assembly/bin-component.xml    (original)
+++ trunk/amdatu-release/src/main/assembly/bin-component.xml    Tue Jun 28 
15:28:08 2011
@@ -21,6 +21,15 @@
   </dependencySets>
   <fileSets>
     <fileSet>
+      <directory></directory>
+      <outputDirectory></outputDirectory>
+      <filtered>false</filtered>
+      <includes>
+        <include>LICENSE</include>
+        <include>NOTICE</include>
+      </includes>
+    </fileSet>
+    <fileSet>
       <directory>src/main/resources/bin</directory>
       <outputDirectory></outputDirectory>
       <filtered>true</filtered>

Modified: trunk/amdatu-release/src/main/assembly/war-component.xml
==============================================================================
--- trunk/amdatu-release/src/main/assembly/war-component.xml    (original)
+++ trunk/amdatu-release/src/main/assembly/war-component.xml    Tue Jun 28 
15:28:08 2011
@@ -33,6 +33,15 @@
   </dependencySets>
   <fileSets>
     <fileSet>
+      <directory></directory>
+      <outputDirectory>META-INF</outputDirectory>
+      <filtered>false</filtered>
+      <includes>
+        <include>LICENSE</include>
+        <include>NOTICE</include>
+      </includes>
+    </fileSet>
+    <fileSet>
       <directory>src/main/webapp</directory>
       <outputDirectory>WEB-INF</outputDirectory>
       <filtered>true</filtered>

Modified: trunk/amdatu-web/pom.xml
==============================================================================
--- trunk/amdatu-web/pom.xml    (original)
+++ trunk/amdatu-web/pom.xml    Tue Jun 28 15:28:08 2011
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.amdatu</groupId>
     <artifactId>amdatu</artifactId>
-    <version>3-SNAPSHOT</version>
+    <version>4-SNAPSHOT</version>
     <relativePath>../amdatu-parent/pom.xml</relativePath>
   </parent>
   <groupId>org.amdatu.web</groupId>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits

Reply via email to