CVS: jcontainer/loom project.properties,1.5,1.6 continuous-integration.sh,1.26,1.27 maven.xml,1.13,1.14
Peter Donald <pdonald-yCVjj/[email protected]> Sun, 2 Nov 2003 23:13:29 -0600
| Newsgroups | gmane.comp.java.jcontainer.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/jcontainer/jcontainer/loom
In directory hogshead.codehaus.org:/tmp/cvs-serv19763
Modified Files:
project.properties continuous-integration.sh maven.xml
Log Message:
Rework reactor so that plugins are rebuilt before the engine component as the plugin is now used by engine (to generate test data)
Index: project.properties
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/project.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- project.properties 1 Nov 2003 13:48:35 -0000 1.5
+++ project.properties 3 Nov 2003 05:13:27 -0000 1.6
@@ -1,6 +1,6 @@
maven.remote.group=jcontainer
maven.repo.remote = http://ibiblio.org/maven/,http://spice.sf.net/maven/,http://dist.codehaus.org
# Loom include items are: components, plugins, distribution, demos
-loom.build.include=components,plugins,distribution,demos
-loom.clean.include=components,plugins,distribution,demos
-loom.deploy.include=components,plugins,distribution
+loom.build.include=plugins,components,distribution,demos
+loom.clean.include=components,distribution,demos,plugins
+loom.deploy.include=plugins,components,distribution
Index: continuous-integration.sh
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/continuous-integration.sh,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- continuous-integration.sh 26 Sep 2003 04:56:35 -0000 1.26
+++ continuous-integration.sh 3 Nov 2003 05:13:27 -0000 1.27
@@ -25,6 +25,8 @@
# Delete compiled local copies to start fresh each time
rm -Rf ~/.maven/repository/$mavenRepo/jars
+rm -Rf ~/.maven/repository/$mavenRepo/plugins
+rm -Rf ~/.maven/plugins/maven-sar-plugin-i*
# Compile and test
rm -f $logfile
Index: maven.xml
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/maven.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- maven.xml 1 Nov 2003 13:47:06 -0000 1.13
+++ maven.xml 3 Nov 2003 05:13:27 -0000 1.14
@@ -28,8 +28,7 @@
<echo message="Build components"/>
<maven:reactor
basedir="${basedir}"
- includes="*/project.xml"
- excludes="demos/*/project.xml,distribution/project.xml,integration-test/project.xml,plugins/project.xml,site/project.xml"
+ includes="engine/project.xml,launcher/project.xml"
goals="clean:clean,build"
banner="Building"
ignoreFailures="false"/>