You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/07/14 23:26:58 UTC

svn commit: r422055 - /geronimo/sandbox/svkmerge/m2migration/m2-assemblies/pom.xml

Author: jdillon
Date: Fri Jul 14 14:26:58 2006
New Revision: 422055

URL: http://svn.apache.org/viewvc?rev=422055&view=rev
Log:
Drop custom 2.2-SNAPSHOT bits, use assembly 2.1

Modified:
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/pom.xml

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/pom.xml?rev=422055&r1=422054&r2=422055&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/pom.xml Fri Jul 14 14:26:58 2006
@@ -86,33 +86,16 @@
         <PlanTomcatWebBuilderDefaultNamespace>http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0</PlanTomcatWebBuilderDefaultNamespace>
     </properties>
     
-    <build>
-        <pluginManagement>
-            <plugins>
-                <!--
-                
-                NOTE: Need to use custom SNAPSHOT until these issues are resolved:
-                      
-                      http://jira.codehaus.org/browse/MASSEMBLY-45
-                      http://jira.codehaus.org/browse/MASSEMBLY-127
-                -->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.2-SNAPSHOT</version>
-                    <configuration>
-                        <tarLongFileMode>gnu</tarLongFileMode>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-    
     <modules>
       <module>geronimo-jetty-j2ee</module>
+      <!--
+      
+      TODO: Refactor assembly to use dependency + antrun and assembly 2.1
+      
       <module>geronimo-jetty-minimal</module>
       <module>geronimo-tomcat-j2ee</module>
       <module>geronimo-tomcat-minimal</module>
+      -->
     </modules>
     
 </project>