gump-general mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject cvs commit: gump/project avalon-phoenix.xml
Date Tue, 04 May 2004 14:17:16 GMT
niclas      2004/05/04 07:17:16

  Modified:    project  avalon-phoenix.xml
  Log:
  Conflicts markers accidentally committed...
  
  Revision  Changes    Path
  1.63      +1 -28     gump/project/avalon-phoenix.xml
  
  Index: avalon-phoenix.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/avalon-phoenix.xml,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- avalon-phoenix.xml	4 May 2004 13:21:48 -0000	1.62
  +++ avalon-phoenix.xml	4 May 2004 14:17:16 -0000	1.63
  @@ -68,11 +68,8 @@
     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"/>
  @@ -123,14 +120,6 @@
           <home nested="examples/demo"/>
           <work nested="examples/demo/target/classes"/>
   
  -<!--
  -        <nag>
  -            <regexp pattern="/Missing prereq/i"
  -                from="Gump Integration Build &lt;dev@avalon.apache.org&gt;"
  -                to="dev@avalon.apache.org"
  -                subject="PRE-REQ FAILED for phoenix-example-demo"/>
  -        </nag>
  --->
           <nag from="Gump Integration Build &lt;dev@avalon.apache.org&gt;"
               to="dev@avalon.apache.org"/>
       </project>
  @@ -152,14 +141,6 @@
   
           <jar name="target/lib/pdk-@@DATE@@.sar"/>
   
  -<!--
  -        <nag>
  -            <regexp pattern="/Missing prereq/i"
  -                from="Gump Integration Build &lt;dev@avalon.apache.org&gt;"
  -                to="dev@avalon.apache.org"
  -                subject="PRE-REQ FAILED for phoenix-example-pdk"/>
  -        </nag>
  --->
           <nag from="Gump Integration Build &lt;dev@avalon.apache.org&gt;"
                   to="dev@avalon.apache.org"/>
       </project>
  @@ -183,14 +164,6 @@
   
           <jar name="target/lib/avalon-testserver.sar"/>
   
  -<!--
  -        <nag>
  -            <regexp pattern="/Missing prereq/i"
  -                from="Gump Integration Build &lt;dev@avalon.apache.org&gt;"
  -                to="dev@avalon.apache.org"
  -                subject="PRE-REQ FAILED for phoenix-example-testserver"/>
  -        </nag>
  --->
           <nag from="Gump Integration Build &lt;dev@avalon.apache.org&gt;"
               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


Mime
View raw message