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/13 00:00:03 UTC
svn commit: r421433 - in /geronimo/sandbox/svkmerge/m2migration: bootstrap
pom.xml
Author: jdillon
Date: Wed Jul 12 15:00:03 2006
New Revision: 421433
URL: http://svn.apache.org/viewvc?rev=421433&view=rev
Log:
Enable m2-assemblies; adding hack to co and build patched maven-assembly-plugin to bootstrap
Modified:
geronimo/sandbox/svkmerge/m2migration/bootstrap
geronimo/sandbox/svkmerge/m2migration/pom.xml
Modified: geronimo/sandbox/svkmerge/m2migration/bootstrap
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/bootstrap?rev=421433&r1=421432&r2=421433&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/bootstrap (original)
+++ geronimo/sandbox/svkmerge/m2migration/bootstrap Wed Jul 12 15:00:03 2006
@@ -56,6 +56,30 @@
}
##
+## NOTE: Need to apply patch to apply http://jira.codehaus.org/browse/MASSEMBLY-45
+##
+m2assemblyplugin() {
+ echo "Building Patched maven-assembly-plugin..."
+
+ rm -rf thirdparty
+ mkdir -p thirdparty
+ (
+ cd thirdparty
+ svn co http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin
+
+ cd maven-assembly-plugin
+ wget http://issues.apache.org/jira/secure/attachment/12336456/maven-assembly-plugin.patch
+ patch -p0 < maven-assembly-plugin.patch
+
+ 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() {
@@ -117,6 +141,7 @@
begin && (
clean
+ m2assemblyplugin && \
genesis && \
stage "bootstrap" && \
thirdparty && \
Modified: geronimo/sandbox/svkmerge/m2migration/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/pom.xml?rev=421433&r1=421432&r2=421433&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/pom.xml Wed Jul 12 15:00:03 2006
@@ -846,9 +846,7 @@
<module>m2-plugins</module>
<module>applications</module>
<module>configs</module>
- <!--
- <module>assemblies</module>
- -->
+ <module>m2-assemblies</module>
</modules>
</profile>