gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1000831 - in /gump/metadata: profile/gump.xml project/velocity-engine2.xml project/velocity-tools.xml
Date Fri, 24 Sep 2010 12:20:41 GMT
Author: bodewig
Date: Fri Sep 24 12:20:41 2010
New Revision: 1000831

URL: http://svn.apache.org/viewvc?rev=1000831&view=rev
Log:
try building the Velocity 2.x branch

Added:
    gump/metadata/project/velocity-engine2.xml
      - copied, changed from r1000741, gump/metadata/project/velocity-engine.xml
Modified:
    gump/metadata/profile/gump.xml
    gump/metadata/project/velocity-tools.xml

Modified: gump/metadata/profile/gump.xml
URL: http://svn.apache.org/viewvc/gump/metadata/profile/gump.xml?rev=1000831&r1=1000830&r2=1000831&view=diff
==============================================================================
--- gump/metadata/profile/gump.xml (original)
+++ gump/metadata/profile/gump.xml Fri Sep 24 12:20:41 2010
@@ -234,6 +234,7 @@
   <module href="project/velocity-anakia.xml"/>
   <module href="project/velocity-dvsl.xml"/>
   <module href="project/velocity-engine.xml"/>
+  <module href="project/velocity-engine2.xml"/>
   <module href="project/velocity-maven.xml"/>
   <module href="project/velocity-texen.xml"/>
   <module href="project/velocity-tools.xml"/>

Copied: gump/metadata/project/velocity-engine2.xml (from r1000741, gump/metadata/project/velocity-engine.xml)
URL: http://svn.apache.org/viewvc/gump/metadata/project/velocity-engine2.xml?p2=gump/metadata/project/velocity-engine2.xml&p1=gump/metadata/project/velocity-engine.xml&r1=1000741&r2=1000831&rev=1000831&view=diff
==============================================================================
--- gump/metadata/project/velocity-engine.xml (original)
+++ gump/metadata/project/velocity-engine2.xml Fri Sep 24 12:20:41 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,130 +16,31 @@
   limitations under the License.
 -->
 
-<module name="velocity-engine" groupId="velocity">
+<module name="velocity-engine2" groupId="gump.velocity">
   <url href="http://velocity.apache.org/"/>
 
   <description>
     Velocity Templating engine
   </description>
 
-  <svn repository="asf" dir="velocity/engine/trunk"/>
+  <svn repository="asf" dir="velocity/branches/2.0_Exp"/>
 
-  <project name="velocity-engine">
+  <project name="velocity-engine2">
     <package>org.apache.velocity</package>
 
-    <ant basedir="build" target="package" >
-      <property name="version" value="@@DATE@@"/>
-      <property name="deprecation" value="true"/>
-
-      <!-- velocity build.xml wants to force to build under JDK 1.4 -->
-      <property name="correct-java-version" value="true"/>
-      <!-- gump provides our dependencies. No need to download them. -->
-      <property name="skip.jar.loading" value="true"/>
-
-      <!-- But for building the dep jar, we must unpack collections, lang and oro.
-           Let's pass in the version of the newly built jars for that. You find the
-           properties to override in build.properties 
-       -->
-      <property name="jar.commons-collections.version" value="3.3-SNAPSHOT"/>
-      <property name="jar.commons-lang.version" value="2.6-SNAPSHOT"/>
-      <property name="jar.oro.version" value="2.0.8"/>
-      <property name="jar.oro.name" value="oro"/>
-
-      <property name="jar.commons-collections.dir" project="commons-collections"
-                path="target" />
-      <property name="jar.commons-lang.dir" project="commons-lang"
-                path="target" />
-      <property name="jar.oro.dir" project="oro" reference="home"/>
-    </ant>
-
-    <!-- Because Velocity contains ant tasks. Do we really need inherit? -->
-    <depend project="ant" inherit="runtime"/>
-
-    <!-- This is the absolute minimum set of dependencies for building Velocity -->
-    <depend project="avalon-logkit" />
-    <depend project="commons-collections" />
-    <depend project="commons-lang" />
-    <depend project="logging-log4j-12" />
-    <depend project="jdom" />
-    <depend project="jakarta-servletapi-4" />
-    <depend project="oro" />
-    <depend project="werken.xpath" />
-
-    <depend project="commons-logging"/>
-
-    <!-- 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" />
-
-    <!-- Ant task compiled and used in this build -->
-    <work nested="bin/classes"/>
-
-    <home nested="bin"/>
-    <jar name="velocity-@@DATE@@.jar" id="velocity"/>
-    <jar name="velocity-@@DATE@@-dep.jar" id="velocity-dep"/>
-    <license name="LICENSE"/>
-    <nag to="dev@velocity.apache.org"
-         from="Velocity Gump &lt;dev@velocity.apache.org&gt;"
-         subject="Build Failure - Velocity Engine"/>
-  </project>
+    <depend project="velocity-master"/>
+    <mvn separateLocalRepository="velocity" goal="install"/>
 
-  <project name="velocity-engine-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"/>
-
-      <!-- But for building the dep jar, we must unpack collections, lang and oro.
-           Let's pass in the version of the newly built jars for that. You find the
-           properties to override in build.properties 
-       -->
-      <property name="jar.commons-collections.version" value="3.3-SNAPSHOT"/>
-      <property name="jar.commons-lang.version" value="2.5"/>
-      <property name="jar.oro.version" value="2.0.8"/>
-      <property name="jar.oro.name" value="oro"/>
-
-      <property name="jar.commons-collections.dir" project="commons-collections"
-                path="target" />
-      <property name="jar.commons-lang.dir" project="commons-lang"
-                path="target" />
-      <property name="jar.oro.dir" project="oro" reference="home"/>
-    </ant>
-
-    <depend project="velocity-engine" inherit="hard"/>
-
-    <!-- Our test dependencies. -->
-    <depend project="packaged-hsqldb" />
-    <depend project="junit3" />
-
-    <work nested="test"/>
-    <work nested="bin/test-classes"/>
-
-    <!-- Needed for test-cpload -->
-    <work nested="test/cpload/test1.jar"/>
-
-    <!-- Needed for test-texen-classpath -->
-    <work nested="test/texen-classpath/test.jar"/>
-
-    <!-- Needed for test-multiloader -->
-    <work nested="test/multiloader/test1.jar"/>
-
-    <nag to="dev@velocity.apache.org"
-         from="Velocity Gump &lt;dev@velocity.apache.org&gt;"
-         subject="Test Failure - Velocity Engine"/>
-  </project>
+    <option project="ant" inherit="runtime"/>
+    <option project="commons-collections" />
+    <option project="commons-io" />
+    <option project="commons-lang" />
+    <option project="commons-logging" />
+    <option project="junit" />
+    <option project="logging-log4j-12" />
 
-  <project name="org.apache.velocity.velocity-engine"
-           groupId="org.apache.velocity">
-    <depend project="velocity-engine"/>
-    <jar name="bin/velocity-@@DATE@@.jar" id="velocity"/>
-    <jar name="bin/velocity-@@DATE@@-dep.jar" id="velocity-dep"/>
+    <license name="LICENSE"/>
+    <!--nag to="dev@velocity.apache.org"
+         from="Velocity Gump &lt;dev@velocity.apache.org&gt;"-->
   </project>
 </module>

Modified: gump/metadata/project/velocity-tools.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/velocity-tools.xml?rev=1000831&r1=1000830&r2=1000831&view=diff
==============================================================================
--- gump/metadata/project/velocity-tools.xml (original)
+++ gump/metadata/project/velocity-tools.xml Fri Sep 24 12:20:41 2010
@@ -31,7 +31,7 @@
 
   <project name="velocity-tools-generic">
     <depend project="velocity-master"/>
-    <mvn separateLocalRepository="velocity"
+    <mvn separateLocalRepository="velocity" goal="install"
          basedir="velocity-tools-generic"/>
     <option project="commons-beanutils"/>
     <option project="commons-digester"/>
@@ -43,7 +43,7 @@
 
   <project name="velocity-tools-view">
     <depend project="velocity-master"/>
-    <mvn separateLocalRepository="velocity"
+    <mvn separateLocalRepository="velocity" goal="install"
          basedir="velocity-tools-view"/>
     <option project="junit"/>
     <option project="velocity-tools-generic"/>
@@ -66,10 +66,11 @@
     <option project="commons-lang"/>
     <option project="commons-logging"/>
     <option project="commons-validator"/>
-    <option project="dom4j" inherit="runtime"/>
+    <option project="dom4j"/>
     <option project="jaxen"/>
-    <option project="velocity-dvsl" inherit="runtime"/>
-    <option project="velocity-engine" inherit="runtime"/>
+    <option project="velocity-dvsl"/>
+    <option project="velocity-engine"/>
+    <option project="velocity-engine2"/>
 
     <option project="velocity-tools-generic"/>
     <option project="velocity-tools-view"/>



Mime
View raw message