svn commit: r477323 - /gump/metadata/project/jakarta-velocity.xml

[he...@apache.org]

Author: henning
Date: Mon Nov 20 12:43:45 2006
New Revision: 477323

URL: http://svn.apache.org/viewvc?view=rev&rev=477323
Log:
Uh, that bugger was a mess. Fix the various dependencies; who again
thought that we need BCEL??? Also prepared the step from
jakarta-velocity to TLP. Let's see tonight whether that still
works. If not, a lot of projects will notice... ;-)

Yeah, I will keep an eye on it.

Modified:
    gump/metadata/project/jakarta-velocity.xml

Modified: gump/metadata/project/jakarta-velocity.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/jakarta-velocity.xml?view=diff&rev=477323&r1=477322&r2=477323
==============================================================================
--- gump/metadata/project/jakarta-velocity.xml (original)
+++ gump/metadata/project/jakarta-velocity.xml Mon Nov 20 12:43:45 2006
@@ -15,37 +15,49 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<module name="jakarta-velocity">
 
+<module name="jakarta-velocity">
   <url href="http://jakarta.apache.org/velocity/index.html"/>
 
   <description>
-    Template engine
+    Velocity Templating engine
   </description>
 
   <svn repository="jakarta-svn" dir="velocity/engine/trunk"/>
 
   <project name="jakarta-velocity">
+    <depend project="velocity-engine" inherit="jars"/>
+  </project>
+
+  <project name="velocity-engine">
     <package>org.apache.velocity</package>
 
     <ant basedir="build" target="package">
-      <depend property="log.jar" project="excalibur-logkit" runtime="true"/>
-      <depend property="oro.jar" project="jakarta-oro"/>
       <property name="version" value="@@DATE@@"/>
       <property name="deprecation" value="true"/>
+
+      <!-- gump provides our dependencies. No need to download them. -->
+      <property name="velocity.skip.download" value="true"/>
     </ant>
 
+    <!-- Because Velocity contains ant tasks. Do we really need inherit? -->
     <depend project="ant" inherit="runtime"/>
-    <depend project="xml-apis"/>
-    <depend project="xml-xerces"/>
-    <depend project="jakarta-servletapi"/>
-    <depend project="jdom" runtime="true"/>
-    <depend project="werken.xpath"/>
-    <depend project="junit" runtime="true"/>
-    <depend project="logging-log4j"/>
-    <depend project="packaged-bcel"/>
-    <depend project="commons-collections" runtime="true"/>
-    <depend project="commons-lang"/>
+
+    <!-- This is the absolute minimum set of dependencies for building Velocity -->
+    <depend project="excalibur-logkit" />
+    <depend project="commons-collections" />
+    <depend project="commons-lang" />
+    <depend project="logging-log4j" />
+    <depend project="jdom" />
+    <depend project="jakarta-oro" />
+    <depend project="jakarta-servletapi-4" />
+    <depend project="werken.xpath" />
+
+    <!-- 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="antlr" />
 
     <!-- Ant task compiled and used in this build -->
     <work nested="bin/classes"/>
@@ -57,13 +69,28 @@
     <javadoc nested="bin/apidocs"/>
     <nag to="dev@velocity.apache.org"
          from="Velocity Gump &lt;dev@velocity.apache.org&gt;"
-         subject="Build Failure - Velocity"/>
+         subject="Build Failure - Velocity Engine"/>
   </project>
 
   <project name="jakarta-velocity-test">
-    <ant basedir="build" target="test"/>
+    <depend project="velocity-test" inherit="jars"/>
+  </project>
+
+  <project name="velocity-test">
+    <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="velocity.skip.download" value="true"/>
+    </ant>
+
     <depend project="jakarta-velocity" inherit="hard"/>
-    <depend project="antlr" ids="antlr"/>
+
+    <!-- Our test dependencies. -->
+    <depend project="hsqldb" />
+    <depend project="junit3" />
+
     <work nested="bin/test-classes"/>
 
     <!-- Needed for test-cpload -->
@@ -77,7 +104,7 @@
 
     <nag to="dev@velocity.apache.org"
          from="Velocity Gump &lt;dev@velocity.apache.org&gt;"
-         subject="Test Failure - Velocity"/>
+         subject="Test Failure - Velocity Engine"/>
   </project>
 
 </module>