You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@gump.apache.org by ni...@apache.org on 2004/05/04 15:21:49 UTC
cvs commit: gump/project avalon-phoenix.xml
niclas 2004/05/04 06:21:48
Modified: project avalon-phoenix.xml
Log:
MX4J version 2.0 seems to be picked up, which Phoenix shouldn't compile against. The build.xml has been updated to pick up the MX4J 1.1.1 as part of the renamed 'get-dependencies-for-gump' target.
Revision Changes Path
1.62 +12 -9 gump/project/avalon-phoenix.xml
Index: avalon-phoenix.xml
===================================================================
RCS file: /home/cvs/gump/project/avalon-phoenix.xml,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- avalon-phoenix.xml 14 Apr 2004 08:31:37 -0000 1.61
+++ avalon-phoenix.xml 4 May 2004 13:21:48 -0000 1.62
@@ -24,7 +24,7 @@
<cvs repository="avalon"/>
<project name="avalon-phoenix-dependencies">
- <ant target="get-spice-dependencies" />
+ <ant target="get-dependencies-for-gump" />
<depend project="ant"/>
<depend project="xml-xerces"/>
<home nested="lib/repo"/>
@@ -38,6 +38,10 @@
id="spice-classman"/>
<jar name="spice-classman/spice-classman-1.0/lib/excalibur-extension-1.0a.jar"
id="excalibur-extension"/>
+ <jar name="mx4j/mx4j-1.1.1/lib/mx4j-jmx.jar"
+ id="mx4j.jar"/>
+ <jar name="mx4j/mx4j-1.1.1/lib/mx4j-tools.jar"
+ id="mx4j-tools.jar"/>
</project>
<project name="avalon-phoenix">
@@ -60,8 +64,15 @@
<depend project="excalibur-instrument" runtime="true"/>
<depend project="phoenix-excalibur-monitor" runtime="true"/>
<depend project="ant" runtime="true"/>
+<!--
+ This must be version 1.1.1, and not the 2.0 that gets used.
+
<depend project="mx4j" runtime="true"/>
+<<<<<<< avalon-phoenix.xml
+-->
+=======
<depend project="mx4j-tools" runtime="true"/>
+>>>>>>> 1.61
<depend project="xml-xalan2"/>
<depend project="phoenix-qdox" runtime="true"/>
<option project="jakarta-servletapi-4" runtime="true"/>
@@ -82,14 +93,6 @@
<license name="LICENSE.txt"/>
<javadoc nested="target/javadocs" module="avalon"/>
-<!--
- <nag>
- <regexp pattern="/Missing prereq/i"
- from="Gump Integration Build <dev@avalon.apache.org>"
- to="dev@avalon.apache.org"
- subject="PRE-REQ FAILED for avalon-phoenix"/>
- </nag>
- -->
<nag from="Gump Integration Build <dev@avalon.apache.org>"
to="dev@avalon.apache.org"/>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@gump.apache.org
For additional commands, e-mail: general-help@gump.apache.org
Re: cvs commit: gump/project avalon-phoenix.xml
Posted by Niclas Hedhman <ni...@hedhman.org>.
On Tuesday 04 May 2004 21:50, Stefan Bodewig wrote:
> Niclas,
>
> there are conflict markers left in the file.
oops....
--
+---------//-------------------+
| http://www.bali.ac |
| http://niclas.hedhman.org |
+------//----------------------+
---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@gump.apache.org
For additional commands, e-mail: general-help@gump.apache.org
Re: cvs commit: gump/project avalon-phoenix.xml
Posted by Stefan Bodewig <bo...@apache.org>.
Niclas,
there are conflict markers left in the file.
Stefan
---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@gump.apache.org
For additional commands, e-mail: general-help@gump.apache.org