gump-commits mailing list archives

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

URL: http://svn.apache.org/viewvc?rev=998831&view=rev
Log:
Texen is mavenized as well

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

Modified: gump/metadata/project/velocity-anakia.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/velocity-anakia.xml?rev=998831&r1=998830&r2=998831&view=diff
==============================================================================
--- gump/metadata/project/velocity-anakia.xml (original)
+++ gump/metadata/project/velocity-anakia.xml Mon Sep 20 08:57:09 2010
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-<module name="velocity-anakia">
+<module name="velocity-anakia" groupId="org.apache.velocity">
   <url href="http://velocity.apache.org/anakia/"/>
 
   <description>
@@ -33,8 +33,8 @@
       <property name="skipTests" value="true"/>
     </mvn>
 
-    <!-- Because Anakia contains ant tasks. Do we really need inherit? -->
-    <option project="ant" inherit="runtime"/>
+    <!-- Because Anakia contains ant tasks. -->
+    <option project="ant"/>
 
     <!-- This is the absolute minimum set of dependencies for building Anakia  -->
     <option project="commons-collections" />
@@ -43,7 +43,7 @@
     <option project="logging-log4j-12" />
     <option project="velocity-engine" />
 
-    <jar name="target/velocity-anakia-*[0-9T].jar" id="anakia"/>
+    <jar name="target/velocity-anakia-*[0-9T].jar"/>
     <license name="LICENSE"/>
     <!--nag to="dev@velocity.apache.org"
          from="Velocity Gump &lt;dev@velocity.apache.org&gt;"
@@ -51,9 +51,9 @@
   </project>
 
   <project name="velocity-anakia-test">
-
-    <depend project="velocity-anakia" inherit="hard"/>
+    <depend project="velocity-anakia"/>
     <mvn separateLocalRepository="velocity" goal="test"/>
+    <report nested="target/surefire-reports"/>
 
     <!--nag to="dev@velocity.apache.org"
          from="Velocity Gump &lt;dev@velocity.apache.org&gt;"

Modified: gump/metadata/project/velocity-texen.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/velocity-texen.xml?rev=998831&r1=998830&r2=998831&view=diff
==============================================================================
--- gump/metadata/project/velocity-texen.xml (original)
+++ gump/metadata/project/velocity-texen.xml Mon Sep 20 08:57:09 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!--
- Licensed to the Apache Software Foundation (ASF) under one or more
+  Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
   this work for additional information regarding copyright ownership.
   The ASF licenses this file to You under the Apache License, Version 2.0
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-<module name="velocity-texen" groupId="org.apache.texen">
+<module name="velocity-texen" groupId="org.apache.velocity">
   <url href="http://velocity.apache.org/texen/"/>
 
   <description>
@@ -28,69 +28,37 @@
   <project name="velocity-texen">
     <package>org.apache.texen</package>
 
-    <ant basedir="build" target="package">
-      <property name="version" value="@@DATE@@"/>
-      <property name="deprecation" value="true"/>
-
-      <!-- gump provides our dependencies. No need to download them. -->
-      <property name="skip.jar.loading" value="true"/>
-
-    </ant>
-
-    <!-- Because Texen contains ant tasks. Do we really need inherit? -->
-    <depend project="ant" inherit="runtime"/>
-
-    <!-- This is the absolute minimum set of dependencies for building Texen  -->
-    <depend project="commons-collections" />
-    <depend project="commons-lang" />
-    <depend project="logging-log4j-12" />
-    <depend project="jdom" />
-    <depend project="werken.xpath" />
-    <depend project="velocity-engine" />
-    <depend project="velocity-anakia"/>
-
-    <!-- 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...
-    -->
+    <depend project="velocity-master"/>
+    <mvn separateLocalRepository="velocity" goal="install">
+      <property name="skipTests" value="true"/>
+    </mvn>
+
+    <!-- Because Texen contains ant tasks. -->
+    <option project="ant"/>
+
+    <!-- This is the absolute minimum set of optionencies for building Texen  -->
+    <option project="commons-collections" />
+    <option project="commons-lang" />
+    <option project="jdom" />
+    <option project="logging-log4j-12" />
+    <option project="velocity-anakia"/>
+    <option project="velocity-engine" />
 
-    <!-- pull in only the antlr main jar itself -->
-    <depend project="antlr" ids="antlr" />
-
-    <!-- Ant task compiled and used in this build -->
-    <work nested="bin/classes"/>
-
-    <home nested="bin"/>
-    <jar name="texen-@@DATE@@.jar" id="texen"/>
+    <jar name="texen-@@DATE@@.jar"/>
     <license name="LICENSE"/>
-    <nag to="dev@velocity.apache.org"
+    <!--nag to="dev@velocity.apache.org"
          from="Velocity Gump &lt;dev@velocity.apache.org&gt;"
-         subject="Build Failure - Texen"/>
+         subject="Build Failure - Texen"/-->
   </project>
 
   <project name="velocity-texen-test">
-    <ant basedir="build" target="test">
-      <property name="version" value="@@DATE@@"/>
-      <!-- Don't care about deprecation for the tests -->
-      <property name="deprecation" value="false"/>
-
-      <!-- gump provides our dependencies. No need to download them. -->
-      <property name="skip.jar.loading" value="true"/>
-
-    </ant>
-
-    <depend project="velocity-texen" inherit="hard"/>
-
-    <!-- Our test dependencies. -->
-    <depend project="junit3" />
-
-    <work nested="bin/test-classes"/>
-    <work nested="bin/test"/>
-    <work nested="bin/test/texen-classpath.jar"/>
+    <depend project="velocity-texen"/>
+    <mvn separateLocalRepository="velocity" goal="test"/>
+    <report nested="target/surefire-reports"/>
 
-    <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 Texen"/>
+         subject="Test Failure - Velocity Texen"/-->
   </project>
 
 </module>



Mime
View raw message