brett 2005/03/31 20:44:33
Modified: . m2-bootstrap-all.bat m2-bootstrap-all.sh
maven-mboot2/src/main/java MBoot.java
maven-plugins pom.xml
Log:
remove non-essential plugins from mboot. Still in the bootstrap, as some are
required for integration tests.
Revision Changes Path
1.7 +5 -0 maven-components/m2-bootstrap-all.bat
Index: m2-bootstrap-all.bat
===================================================================
RCS file: /home/cvs/maven-components/m2-bootstrap-all.bat,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- m2-bootstrap-all.bat 9 Jan 2005 22:38:43 -0000 1.6
+++ m2-bootstrap-all.bat 1 Apr 2005 04:44:33 -0000 1.7
@@ -113,6 +113,11 @@
%MAVEN_JAVA_EXE% %MAVEN_CMD_LINE_ARGS% %MAVEN_OPTS% -jar mboot.jar
+echo Rebuilding maven2 plugins
+cd maven-plugins
+m2 install
+cd ..
+
echo Running integration tests
cd maven-core-it
call maven-core-it
1.6 +11 -0 maven-components/m2-bootstrap-all.sh
Index: m2-bootstrap-all.sh
===================================================================
RCS file: /home/cvs/maven-components/m2-bootstrap-all.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- m2-bootstrap-all.sh 9 Jan 2005 22:38:43 -0000 1.5
+++ m2-bootstrap-all.sh 1 Apr 2005 04:44:33 -0000 1.6
@@ -32,6 +32,17 @@
ret=$?; if [ $ret != 0 ]; then exit $ret; fi
(
+ echo
"-----------------------------------------------------------------------"
+ echo " Rebuilding maven2 plugins ... "
+ echo
"-----------------------------------------------------------------------"
+
+ cd maven-plugins
+ m2 install
+ ret=$?; if [ $ret != 0 ]; then exit $ret; fi
+)
+ret=$?; if [ $ret != 0 ]; then exit $ret; fi
+
+(
cd ./maven-core-it
echo
echo "Running maven-core integration tests ..."
1.78 +13 -18 maven-components/maven-mboot2/src/main/java/MBoot.java
Index: MBoot.java
===================================================================
RCS file: /home/cvs/maven-components/maven-mboot2/src/main/java/MBoot.java,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- MBoot.java 31 Mar 2005 11:27:16 -0000 1.77
+++ MBoot.java 1 Apr 2005 04:44:33 -0000 1.78
@@ -82,12 +82,10 @@
"maven-plugin-tools/maven-plugin-tools-pluggy",
"maven-plugin-tools/maven-plugin-tools-marmalade", "maven-core-it-verifier"};
- String[] pluginBuilds = new
String[]{"maven-plugins/maven-assemble-plugin",
"maven-plugins/maven-clean-plugin",
-
"maven-plugins/maven-compiler-plugin", "maven-plugins/maven-deploy-plugin",
- "maven-plugins/maven-ejb-plugin",
"maven-plugins/maven-idea-plugin",
-
"maven-plugins/maven-install-plugin", "maven-plugins/maven-jar-plugin",
-
"maven-plugins/maven-plugin-plugin", "maven-plugins/maven-resources-plugin",
-
"maven-plugins/maven-surefire-plugin", "maven-plugins/maven-war-plugin"};
+ String[] pluginBuilds = new String[]{"maven-plugins/maven-clean-plugin",
"maven-plugins/maven-compiler-plugin",
+ "maven-plugins/maven-idea-plugin",
"maven-plugins/maven-install-plugin",
+ "maven-plugins/maven-jar-plugin",
"maven-plugins/maven-plugin-plugin",
+
"maven-plugins/maven-resources-plugin", "maven-plugins/maven-surefire-plugin"};
private static final Map MODELLO_TARGET_VERSIONS;
@@ -686,10 +684,9 @@
File f = new File( repoLocal, dependency );
if ( !f.exists() )
{
- throw new FileNotFoundException( "Missing dependency: " +
dependency +
- ( !online
- ? "; run again online"
- : "; there was a problem
downloading it earlier" ) );
+ throw new FileNotFoundException( "Missing dependency: " +
dependency + ( !online
+
? "; run again online"
+
: "; there was a problem downloading it earlier" ) );
}
cl.addURL( f.toURL() );
@@ -706,10 +703,9 @@
File f = new File( repoLocal, dependency );
if ( !f.exists() )
{
- throw new FileNotFoundException( "Missing dependency: " +
dependency +
- ( !online
- ? "; run again online"
- : "; there was a problem
downloading it earlier" ) );
+ throw new FileNotFoundException( "Missing dependency: " +
dependency + ( !online
+
? "; run again online"
+
: "; there was a problem downloading it earlier" ) );
}
cl.addURL( f.toURL() );
@@ -741,10 +737,9 @@
File f = new File( repoLocal, dependency );
if ( !f.exists() )
{
- throw new FileNotFoundException( "Missing dependency: " +
dependency +
- ( !online
- ? "; run again online"
- : "; there was a problem
downloading it earlier" ) );
+ throw new FileNotFoundException( "Missing dependency: " +
dependency + ( !online
+
? "; run again online"
+
: "; there was a problem downloading it earlier" ) );
}
modelloClassLoader.addURL( f.toURL() );
1.19 +3 -0 maven-components/maven-plugins/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-plugins/pom.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- pom.xml 29 Mar 2005 21:36:47 -0000 1.18
+++ pom.xml 1 Apr 2005 04:44:33 -0000 1.19
@@ -67,11 +67,14 @@
</repository>
</distributionManagement>
<modules>
+<!--
<module>maven-assemble-plugin</module>
+-->
<module>maven-clean-plugin</module>
<module>maven-compiler-plugin</module>
<module>maven-deploy-plugin</module>
<module>maven-ejb-plugin</module>
+ <module>maven-idea-plugin</module>
<module>maven-install-plugin</module>
<module>maven-jar-plugin</module>
<module>maven-plugin-plugin</module>
