[jboss-cvs] JBossAS SVN: r95901 - in branches/Branch_5_x: varia and 1 other directory.

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

Author: pgier
Date: 2009-11-02 00:05:43 -0500 (Mon, 02 Nov 2009)
New Revision: 95901

Modified:
   branches/Branch_5_x/pom.xml
   branches/Branch_5_x/varia/pom.xml
Log:
[JBAS-7416] jboss-packaging-maven-plugin needs to be present for every execution otherwise only the first assembly plugin classpath will take effect.  Related to Maven bug MNG-1323.

Modified: branches/Branch_5_x/pom.xml
===================================================================
--- branches/Branch_5_x/pom.xml	2009-11-02 04:57:42 UTC (rev 95900)
+++ branches/Branch_5_x/pom.xml	2009-11-02 05:05:43 UTC (rev 95901)
@@ -74,6 +74,13 @@
               </manifestEntries>
             </archive>
           </configuration>
+          <dependencies>
+            <dependency>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>jboss-packaging-maven-plugin</artifactId>
+              <version>2.1</version>
+            </dependency>
+          </dependencies>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
@@ -107,7 +114,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>jboss-packaging-maven-plugin</artifactId>
-        <version>2.0-beta-1</version>
+        <version>2.1</version>
         <extensions>true</extensions>
       </plugin>
     </plugins>

Modified: branches/Branch_5_x/varia/pom.xml
===================================================================
--- branches/Branch_5_x/varia/pom.xml	2009-11-02 04:57:42 UTC (rev 95900)
+++ branches/Branch_5_x/varia/pom.xml	2009-11-02 05:05:43 UTC (rev 95901)
@@ -70,13 +70,6 @@
             </configuration>
           </execution>
         </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>jboss-packaging-maven-plugin</artifactId>
-            <version>2.1</version>
-          </dependency>
-        </dependencies>
       </plugin>
       
     </plugins>