You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by ws...@apache.org on 2006/04/08 01:25:20 UTC

svn commit: r392450 - in /struts/action/trunk: assembly/pom.xml assembly/src/main/assembly/src.xml pom.xml src/

Author: wsmoak
Date: Fri Apr  7 16:25:18 2006
New Revision: 392450

URL: http://svn.apache.org/viewcvs?rev=392450&view=rev
Log:
Specify a version number for maven-assembly-plugin to keep Wendy from using snapshots. :)
Drop the assemble-src profile.
Move src.xml into assembly, but comment it out as <modules> (and multiple descriptors) won't work until v2.1 of the plugin is released.

Added:
    struts/action/trunk/assembly/src/main/assembly/src.xml
      - copied, changed from r392374, struts/action/trunk/src/main/assembly/src.xml
Removed:
    struts/action/trunk/src/
Modified:
    struts/action/trunk/assembly/pom.xml
    struts/action/trunk/pom.xml

Modified: struts/action/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/assembly/pom.xml?rev=392450&r1=392449&r2=392450&view=diff
==============================================================================
--- struts/action/trunk/assembly/pom.xml (original)
+++ struts/action/trunk/assembly/pom.xml Fri Apr  7 16:25:18 2006
@@ -154,9 +154,12 @@
 
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.0-beta-1</version>
+        <version>2.0.1</version>
         <configuration>
-          <descriptor>src/main/assembly/dep.xml</descriptor>
+          <descriptors>
+            <descriptor>src/main/assembly/dep.xml</descriptor>
+            <!-- descriptor>src/main/assembly/src.xml</descriptor -->
+          </descriptors>
           <finalName>struts-action-${version}</finalName>
           <outputDirectory>target/assembly/out</outputDirectory>
           <workDirectory>target/assembly/work</workDirectory>

Copied: struts/action/trunk/assembly/src/main/assembly/src.xml (from r392374, struts/action/trunk/src/main/assembly/src.xml)
URL: http://svn.apache.org/viewcvs/struts/action/trunk/assembly/src/main/assembly/src.xml?p2=struts/action/trunk/assembly/src/main/assembly/src.xml&p1=struts/action/trunk/src/main/assembly/src.xml&r1=392374&r2=392450&rev=392450&view=diff
==============================================================================
--- struts/action/trunk/src/main/assembly/src.xml (original)
+++ struts/action/trunk/assembly/src/main/assembly/src.xml Fri Apr  7 16:25:18 2006
@@ -13,7 +13,6 @@
     </fileSet>
   </fileSets-->
   <modules>
-    <module>.</module>
     <module>apps</module>
     <module>core</module>
     <module>el</module>

Modified: struts/action/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/pom.xml?rev=392450&r1=392449&r2=392450&view=diff
==============================================================================
--- struts/action/trunk/pom.xml (original)
+++ struts/action/trunk/pom.xml Fri Apr  7 16:25:18 2006
@@ -266,25 +266,6 @@
         </developer>
       </developers>
 
-      <profiles>
-         <profile>
-            <id>assemble-src</id>
-            <build>
-              <plugins>
-                <plugin>
-                  <artifactId>maven-assembly-plugin</artifactId>
-                  <configuration>
-                     <descriptor>src/main/assembly/src.xml</descriptor>
-                     <finalName>struts-action-${version}</finalName>
-                     <outputDirectory>target/assembly/out</outputDirectory>
-                     <workDirectory>target/assembly/work</workDirectory>
-                  </configuration>
-                </plugin>
-              </plugins>
-            </build>
-         </profile>
-      </profiles>
-
     <modules>
         <module>core</module>
         <module>el</module>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org