You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by bo...@apache.org on 2005/04/28 12:08:27 UTC
cvs commit: gump/project cargo.xml jakarta-cactus.xml
bodewig 2005/04/28 03:08:27
Modified: project cargo.xml jakarta-cactus.xml
Log:
Try a Maven multi-project build of cargo, no idea how to predict the jar names
Revision Changes Path
1.2 +7 -13 gump/project/cargo.xml
Index: cargo.xml
===================================================================
RCS file: /home/cvs/gump/project/cargo.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cargo.xml 27 Apr 2005 15:26:16 -0000 1.1
+++ cargo.xml 28 Apr 2005 10:08:27 -0000 1.2
@@ -24,22 +24,16 @@
<svn repository="cargo" dir="trunk"/>
- <project name="cargo-core">
- <maven goal="jar" basedir="core">
- <property name="maven.final.name" value="cargo-core-@@DATE@@"/>
+ <project name="cargo">
+ <maven>
+ <property name="maven.jar.xercesImpl" project="xml-xerces"
+ reference="jarpath"/>
+ <property name="maven.jar.org.mortbay.jetty" project="jetty"
+ reference="jarpath" id="jetty"/>
</maven>
<depend project="ant"/>
- <depend project="jetty"/>
+ <depend project="jetty" ids="jetty"/>
<depend project="xml-xerces"/>
- <jar name="core/target/cargo-core-@@DATE@@.jar" />
- </project>
-
- <project name="cargo-ant">
- <maven goal="jar" basedir="ant">
- <property name="maven.final.name" value="cargo-ant-@@DATE@@"/>
- </maven>
- <depend project="ant"/>
- <depend project="cargo-core"/>
<jar name="ant/target/cargo-ant-@@DATE@@.jar" />
</project>
</module>
1.63 +2 -4 gump/project/jakarta-cactus.xml
Index: jakarta-cactus.xml
===================================================================
RCS file: /home/cvs/gump/project/jakarta-cactus.xml,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- jakarta-cactus.xml 27 Apr 2005 15:26:16 -0000 1.62
+++ jakarta-cactus.xml 28 Apr 2005 10:08:27 -0000 1.63
@@ -162,8 +162,7 @@
</ant>
<depend project="ant" inherit="runtime"/>
- <depend project="cargo-ant"/>
- <depend project="cargo-core"/>
+ <depend project="cargo"/>
<depend project="xml-xerces"/>
<depend project="xalan"/>
<option project="checkstyle" inherit="runtime"/>
@@ -214,8 +213,7 @@
</ant>
<depend project="ant" inherit="runtime"/>
- <depend project="cargo-ant"/>
- <depend project="cargo-core"/>
+ <depend project="cargo"/>
<depend project="xml-xerces"/>
<depend project="xalan"/>
<option project="checkstyle" inherit="runtime"/>