gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r998768 - in /gump/metadata/project: velocity-anakia.xml velocity-dvsl.xml
Date Mon, 20 Sep 2010 03:44:09 GMT
Author: bodewig
Date: Mon Sep 20 03:44:09 2010
New Revision: 998768

URL: http://svn.apache.org/viewvc?rev=998768&view=rev
Log:
make dependencies optional, remove depencies on packaged projects now that the projects build
with mvn

Modified:
    gump/metadata/project/velocity-anakia.xml
    gump/metadata/project/velocity-dvsl.xml

Modified: gump/metadata/project/velocity-anakia.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/velocity-anakia.xml?rev=998768&r1=998767&r2=998768&view=diff
==============================================================================
--- gump/metadata/project/velocity-anakia.xml (original)
+++ gump/metadata/project/velocity-anakia.xml Mon Sep 20 03:44:09 2010
@@ -29,26 +29,19 @@
     <package>org.apache.anakia</package>
 
     <depend project="velocity-master"/>
-    <mvn separateLocalRepository="velocity"/>
+    <mvn separateLocalRepository="velocity" goal="install">
+      <property name="skipTests" value="true"/>
+    </mvn>
 
     <!-- Because Anakia contains ant tasks. Do we really need inherit? -->
-    <depend project="ant" inherit="runtime"/>
+    <option project="ant" inherit="runtime"/>
 
     <!-- This is the absolute minimum set of dependencies for building Anakia  -->
-    <depend project="commons-collections" />
-    <depend project="commons-lang" />
-    <depend project="logging-log4j-12" />
-    <depend project="jdom" />
-    <depend project="werken.xpath" />
-    <depend project="velocity-engine" />
-
-    <!-- These are declared dependencies that we download but don't actually need 
-         for building (but for packaging, running tasks etc. We still depend on them
-         to notice any possible breakages...
-    -->
-
-    <!-- pull in only the antlr main jar itself -->
-    <depend project="antlr" ids="antlr" />
+    <option project="commons-collections" />
+    <option project="commons-lang" />
+    <option project="jdom" />
+    <option project="logging-log4j-12" />
+    <option project="velocity-engine" />
 
     <jar name="anakia-@@DATE@@.jar" id="anakia"/>
     <license name="LICENSE"/>
@@ -57,18 +50,14 @@
          subject="Build Failure - Anakia"/-->
   </project>
 
-  <!--project name="velocity-anakia-test">
+  <project name="velocity-anakia-test">
 
     <depend project="velocity-anakia" inherit="hard"/>
+    <mvn separateLocalRepository="velocity" goal="test"/>
 
-    <!- - Our test dependencies. - ->
-    <depend project="junit3" />
-
-    <work nested="bin/test-classes"/>
-
-    <nag to="dev@velocity.apache.org"
+    <!--nag to="dev@velocity.apache.org"
          from="Velocity Gump &lt;dev@velocity.apache.org&gt;"
-         subject="Test Failure - Velocity Anakia"/>
-  </project-->
+         subject="Test Failure - Velocity Anakia"/-->
+  </project>
 
 </module>

Modified: gump/metadata/project/velocity-dvsl.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/velocity-dvsl.xml?rev=998768&r1=998767&r2=998768&view=diff
==============================================================================
--- gump/metadata/project/velocity-dvsl.xml (original)
+++ gump/metadata/project/velocity-dvsl.xml Mon Sep 20 03:44:09 2010
@@ -30,12 +30,11 @@
     <depend project="velocity-master"/>
     <mvn separateLocalRepository="velocity"/>
 
-    <depend project="ant" inherit="runtime"/>
-    <depend project="xml-apis"/>
-    <depend project="xml-xerces"/>
-    <depend project="velocity-engine" id="velocity" runtime="true"/>
-    <depend project="dom4j" runtime="true"/>
-    <depend project="packaged-jaxen" runtime="true"/>
+    <option project="ant" inherit="runtime"/>
+    <option project="dom4j" runtime="true"/>
+    <option project="velocity-engine" id="velocity" runtime="true"/>
+    <option project="xml-apis"/>
+    <option project="xml-xerces"/>
     <jar name="dist/velocity-dvsl-@@DATE@@.jar" id="velocity-dvsl"/>
     <!--nag to="dev@velocity.apache.org"
          from="Velocity Gump &lt;dev@velocity.apache.org&gt;"/-->



Mime
View raw message