[jboss-svn-commits] JBoss Common SVN: r3702 - in shrinkwrap/trunk: build and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: ALRubinger
Date: 2009-11-14 16:44:40 -0500 (Sat, 14 Nov 2009)
New Revision: 3702

Added:
   shrinkwrap/trunk/README.txt
   shrinkwrap/trunk/dist.xml
Removed:
   shrinkwrap/trunk/assembly/
Modified:
   shrinkwrap/trunk/build/pom.xml
   shrinkwrap/trunk/pom.xml
Log:
[SHRINKWRAP-77] Create a distribution for releases.  Effectively removes the "assembly" component, as this is now done in the aggregator POM.  Running "mvn clean site install" does the trick.

Added: shrinkwrap/trunk/README.txt
===================================================================
--- shrinkwrap/trunk/README.txt	                        (rev 0)
+++ shrinkwrap/trunk/README.txt	2009-11-14 21:44:40 UTC (rev 3702)
@@ -0,0 +1,18 @@
+==================================
+|| ShrinkWrap - Skip the Build! ||
+==================================
+
+Shrinkwrap provides a simple mechanism to assemble archives 
+like JARs, WARs, and EARs using a declarative API.
+
+All project information can be found
+linked from our project home:
+
+http://jboss.org/shrinkwrap
+
+This distribution contains:
+
+* lib - All binary libraries - api, spi, and impl-base
+* src - The sources aggregated for each module
+* apidocs - JavaDoc for the API Package
+* README - This file 

Modified: shrinkwrap/trunk/build/pom.xml
===================================================================
--- shrinkwrap/trunk/build/pom.xml	2009-11-14 19:19:50 UTC (rev 3701)
+++ shrinkwrap/trunk/build/pom.xml	2009-11-14 21:44:40 UTC (rev 3702)
@@ -122,10 +122,11 @@
         <configuration>
           <rules>
             <requireMavenVersion>
-              <version>[2.0.9,2.2.1)</version>
+              <version>[2.2.0,)</version>
               <!--
-                Cannot support 2.0.8 due to
-                http://jira.codehaus.org/browse/MNG-3606
+                Must be more that 2.2 to support
+                Assembly "includeModuleDirectory":
+                http://maven.apache.org/plugins/maven-assembly-plugin/assembly.html
               -->
             </requireMavenVersion>
             <requireJavaVersion>
@@ -138,7 +139,6 @@
           </rules>
         </configuration>
       </plugin>
-
     </plugins>
 
   </build>

Added: shrinkwrap/trunk/dist.xml
===================================================================
--- shrinkwrap/trunk/dist.xml	                        (rev 0)
+++ shrinkwrap/trunk/dist.xml	2009-11-14 21:44:40 UTC (rev 3702)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+  <!--
+  vi:ts=2:sw=2:expandtab:
+-->
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  <id>dist</id>
+  <formats>
+    <format>zip</format>
+    <format>tar.gz</format>
+    <format>tar.bz2</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+
+  <!-- All module dependencies -->
+  <moduleSets>
+    <moduleSet>
+      <sources>
+        <fileSets>
+          <fileSet>
+            <includes>
+              <include>src/main/**</include>
+            </includes>
+          </fileSet>
+        </fileSets>
+        <includeModuleDirectory>false</includeModuleDirectory>
+      </sources>
+      <binaries>
+        <outputDirectory>lib</outputDirectory>
+        <unpack>false</unpack>
+        <outputFileNameMapping>${module.artifactId}-${module.version}${dashClassifier?}.${module.extension}</outputFileNameMapping>
+        <includeDependencies>false</includeDependencies>
+      </binaries>
+    </moduleSet>
+
+  </moduleSets>
+
+  <!-- Pure file dependencies -->
+  <fileSets>
+  
+    <!-- Javadocs -->
+    <fileSet>
+      <includes>
+        <include>**</include>
+      </includes>
+      <outputDirectory>apidocs</outputDirectory>
+      <directory>api/target/site/apidocs</directory>
+    </fileSet>
+    
+    <!-- README -->
+    <fileSet>
+      <includes>
+        <include>README.txt</include>
+      </includes>
+    </fileSet>
+      
+
+  </fileSets>
+
+
+</assembly>

Modified: shrinkwrap/trunk/pom.xml
===================================================================
--- shrinkwrap/trunk/pom.xml	2009-11-14 19:19:50 UTC (rev 3701)
+++ shrinkwrap/trunk/pom.xml	2009-11-14 21:44:40 UTC (rev 3702)
@@ -15,6 +15,43 @@
   <!-- Model Information -->
   <modelVersion>4.0.0</modelVersion>
 
+  <!-- Plugin Configuration -->
+  <build>
+    <plugins>
+      <!-- Deploy -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <!-- Don't include this aggregator in the deployment -->
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      
+            <!-- Assembly Plugin -->
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <descriptors>
+            <descriptor>dist.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <inherited>false</inherited>
+      </plugin>
+      
+      
+    </plugins>
+  </build>
+
   <!-- Artifact Information  -->
   <groupId>org.jboss.shrinkwrap</groupId>
   <artifactId>shrinkwrap-parent</artifactId>
@@ -27,7 +64,6 @@
   <!-- Aggregate Modules -->
   <modules>
     <module>api</module>
-    <module>assembly</module>
     <module>build</module>
     <module>impl-base</module>
     <module>spi</module>