geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r422057 - /geronimo/sandbox/svkmerge/m2migration/bootstrap
Date Fri, 14 Jul 2006 21:28:46 GMT
Author: jdillon
Date: Fri Jul 14 14:28:45 2006
New Revision: 422057

URL: http://svn.apache.org/viewvc?rev=422057&view=rev
Log:
Do not need custom/patched assembly plugin anymore

Modified:
    geronimo/sandbox/svkmerge/m2migration/bootstrap

Modified: geronimo/sandbox/svkmerge/m2migration/bootstrap
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/bootstrap?rev=422057&r1=422056&r2=422057&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/bootstrap (original)
+++ geronimo/sandbox/svkmerge/m2migration/bootstrap Fri Jul 14 14:28:45 2006
@@ -59,35 +59,6 @@
 }
 
 ##
-## NOTE: Need to apply patch to apply http://jira.codehaus.org/browse/MASSEMBLY-45
-##
-m2assemblyplugin() {
-    echo "Building Patched maven-assembly-plugin..."
-    
-    (
-        cd "$DIRNAME/thirdparty"
-        
-        svn co http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin
-        
-        cd maven-assembly-plugin
-        
-        # Apply mappers patch
-        wget http://issues.apache.org/jira/secure/attachment/12336456/maven-assembly-plugin.patch
-        patch -p0 < maven-assembly-plugin.patch
-        
-        # Apply files/file/fileMode patch
-        wget http://jira.codehaus.org/secure/attachment/21493/MASSEMBLY-127.diff
-        patch -p0 < MASSEMBLY-127.diff
-        
-        mvn install -Dmaven.test.skip=true
-        
-        if [ "$?" != "0" ]; then
-            die "Bootstrap failed building Genesis"
-        fi
-    )
-}
-
-##
 ## NOTE: Genesis add here until a release can be made to the offcial location
 ##
 genesis() {
@@ -133,7 +104,6 @@
     
     begin && (
         clean
-        m2assemblyplugin && \
         genesis && \
         stage "bootstrap" && \
         openejb2 && \



Mime
View raw message