gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1292380 - in /gump/metadata: profile/gump.xml project/ant-1.8.x.xml
Date Wed, 22 Feb 2012 16:27:44 GMT
Author: bodewig
Date: Wed Feb 22 16:27:43 2012
New Revision: 1292380

URL: http://svn.apache.org/viewvc?rev=1292380&view=rev
Log:
add a build for the 1.8.x branch of Ant

Added:
    gump/metadata/project/ant-1.8.x.xml
      - copied, changed from r1292376, gump/metadata/project/ant.xml
Modified:
    gump/metadata/profile/gump.xml

Modified: gump/metadata/profile/gump.xml
URL: http://svn.apache.org/viewvc/gump/metadata/profile/gump.xml?rev=1292380&r1=1292379&r2=1292380&view=diff
==============================================================================
--- gump/metadata/profile/gump.xml (original)
+++ gump/metadata/profile/gump.xml Wed Feb 22 16:27:43 2012
@@ -25,6 +25,7 @@
 <!-- Apache.Ant -->
 
   <module href="project/ant.xml"/>
+  <module href="project/ant-1.8.x.xml"/>
   <module href="project/ant-antlibs.xml"/>
   <module href="project/ant-antlibs-sandbox.xml"/>
   <module href="project/ivy.xml"/>  

Copied: gump/metadata/project/ant-1.8.x.xml (from r1292376, gump/metadata/project/ant.xml)
URL: http://svn.apache.org/viewvc/gump/metadata/project/ant-1.8.x.xml?p2=gump/metadata/project/ant-1.8.x.xml&p1=gump/metadata/project/ant.xml&r1=1292376&r2=1292380&rev=1292380&view=diff
==============================================================================
--- gump/metadata/project/ant.xml (original)
+++ gump/metadata/project/ant-1.8.x.xml Wed Feb 22 16:27:43 2012
@@ -15,28 +15,24 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<module name="ant">
+<module name="ant-1.8.x" groupId="ant-1.8.x">
 
   <url  href="http://ant.apache.org/index.html"/>
   <description>
-    Java based build tool
+    Java based build tool, Java 1.4 compatible 1.8.x branch
   </description>
 
-  <svn repository="asf" dir="ant/core/trunk"/>
+  <svn repository="asf" dir="ant/core/branches/ANT_18_BRANCH"/>
 
-  <project name="jakarta-ant">
-    <depend project="ant" inherit="jars"/>
-  </project>
-
-  <project name="ant">
+  <project name="ant-1.8.x">
     <package>org.apache.tools.ant</package>
 
     <ant target="dist-lite">
-      <property name="ant.home" reference="home" project="ant"/>
+      <property name="ant.home" reference="home" project="ant-1.8.x"/>
       <property name="optional.jars.whenmanifestonly" value="create"/>
     </ant>
 
-    <depend project="bootstrap-ant"/>
+    <depend project="bootstrap-ant-1.8.x"/>
     <depend project="xml-xerces"/>
     <depend project="xml-apis"/>
     <option project="xalan" ids="xalan-unbundled"/>
@@ -64,26 +60,13 @@
          to="notifications@ant.apache.org"/>
   </project>
 
-  <!-- Ant 1.7+ is available under groupId org.apache.ant -->
-  <project name="org.apache.ant" groupId="org.apache.ant">
-    <depend project="ant"/>
-    <jar name="dist/lib/ant.jar" id="ant"/>
-    <jar name="dist/lib/ant-launcher.jar" id="ant-launcher"/>
-    <jar name="dist/lib/ant-apache-resolver.jar" id="ant-apache-resolver"/>
-    <jar name="dist/lib/ant-apache-xalan2.jar" id="ant-apache-xalan2"/>
-    <jar name="dist/lib/ant-jmf.jar" id="ant-jmf"/>
-    <jar name="dist/lib/ant-junit.jar" id="ant-junit"/>
-    <jar name="dist/lib/ant-swing.jar" id="ant-swing"/>
-    <license name="LICENSE"/>
-  </project>
-
-  <project name="dist-ant">
+  <project name="dist-ant-1.8.x">
     <ant target="distribution">
       <property name="chmod.fail" value="false"/>
       <property name="optional.jars.whenmanifestonly" value="create"/>
     </ant>
 
-    <depend project="ant" inherit="runtime"/>
+    <depend project="ant-1.8.x" inherit="runtime"/>
     <depend project="xml-xerces"/>
     <depend project="xml-apis"/>
     <option project="xalan" ids="xalan-unbundled"/>
@@ -106,10 +89,6 @@
     <option project="oro" runtime="true"/>
 
     <home nested="build"/>
-    <!-- since we are now running the compile-tests target, the work element is necessary

-         so that the test classes which reference optional tasks compiled in this step  
-         can be built.
-         we have had problems with ssh, oro, jakarta-regexp dependent classes -->
     <work nested="build/classes"/>
 
     <jar name="lib/ant.jar" id="ant"/>
@@ -138,54 +117,13 @@
          to="notifications@ant.apache.org"/>
   </project>
 
-  <!-- Ant 1.7+ is available under groupId org.apache.ant -->
-  <project name="org.apache.dist-ant" groupId="org.apache.ant">
-    <depend project="dist-ant"/>
-    <jar name="build/lib/ant.jar" id="ant"/>
-    <jar name="build/lib/ant-launcher.jar" id="ant-launcher"/>
-    <jar name="build/lib/ant-antlr.jar" id="ant-antlr"/>
-    <jar name="build/lib/ant-apache-bcel.jar" id="ant-apache-bcel"/>
-    <jar name="build/lib/ant-apache-bsf.jar" id="ant-apache-bsf"/>
-    <jar name="build/lib/ant-apache-log4j.jar" id="ant-apache-log4j"/>
-    <jar name="build/lib/ant-apache-oro.jar" id="ant-apache-oro"/>
-    <jar name="build/lib/ant-apache-regexp.jar" id="jakarta-regexp"/>
-    <jar name="build/lib/ant-apache-resolver.jar" id="ant-apache-resolver"/>
-    <jar name="build/lib/ant-apache-xalan2.jar" id="ant-apache-xalan2"/>
-    <jar name="build/lib/ant-commons-logging.jar" id="ant-commons-logging"/>
-    <jar name="build/lib/ant-commons-net.jar" id="ant-commons-net"/>
-    <jar name="build/lib/ant-jai.jar" id="ant-jai"/>
-    <jar name="build/lib/ant-javamail.jar" id="ant-javamail"/>
-    <jar name="build/lib/ant-jdepend.jar" id="ant-jdepend"/>
-    <jar name="build/lib/ant-jmf.jar" id="ant-jmf"/>
-    <jar name="build/lib/ant-jsch.jar" id="ant-jsch"/>
-    <jar name="build/lib/ant-junit.jar" id="ant-junit"/>
-    <jar name="build/lib/ant-junit4.jar" id="ant-junit4"/>
-    <jar name="build/lib/ant-swing.jar" id="ant-swing"/>
-    <license name="LICENSE"/>
-  </project>
-
-  <project name="ant-testutil" groupId="org.apache.ant">
-    <ant target="test-jar"/>
-
-    <depend project="ant"/>
-    <depend project="junit"/>
-    <depend project="xml-xerces"/>
-    <depend project="xml-apis"/>
-
-    <home nested="build/lib"/>
-    <jar name="ant-testutil.jar" id="ant-testutil"/>
-
-    <nag from="Gump Integration Build &lt;bodewig@apache.org&gt;"
-         to="notifications@ant.apache.org"/>
-  </project>
-
-  <project name="test-ant">
+  <project name="test-ant-1.8.x">
     <ant target="run-tests">
       <property name="test.haltonfailure" value="false"/>
       <property name="ant.home" reference="home" project="ant"/>
     </ant>
 
-    <depend project="dist-ant" inherit="runtime"/>
+    <depend project="dist-ant-1.8.x" inherit="runtime"/>
     <depend project="antunit"/>
     <depend project="junit"/>
     <depend project="xml-xerces"/>
@@ -222,58 +160,9 @@
          subject="Test Failure - Ant"/>
   </project>
 
-  <!--
-       This project runs Ant's tests against whatever JAXP implementation
-       is present in the VM.  It means the tests will fail on JDK 1.3-
-       because there is no XML parser around.
-
-       The primary purpose is to find hidden Xerces/Xalan dependencies
-       in Ant.
-  -->
-  <project name="test-ant-no-xerces">
-    <ant target="run-tests">
-      <property name="test.haltonfailure" value="false"/>
-      <property name="ant.home" reference="home" project="ant"/>
-    </ant>
-
-    <depend project="dist-ant" inherit="runtime"/>
-    <depend project="antunit"/>
-    <depend project="junit"/>
-    
-    <option project="jakarta-tomcat-4.0" ids="jasper-compiler jasper-runtime"/>
-    <option project="xml-commons-which"/>
-    <option project="rhino"/>
-    <option project="bsh"/>
-    <option project="commons-codec"/>
-
-    <work nested="build/testcases"/>
-    <work nested="src/tests/junit"/>
-    <work nested="src/etc/testcases"/>
-    <work nested="src/etc/testcases/taskdefs/optional/out"/>
-    <work nested="src/tests/antunit/filters"/>
-    <work nested="src/tests/antunit/taskdefs/importtests"/>
-    <work nested="src/tests/antunit/filters/foo"/>
-    <work nested="src/tests/antunit/taskdefs/foo"/>
-    
-    <work nested="/tmp/testinput/build"/>
-    <work nested="/tmp/testoutput"/>
-    <work nested="/tmp/test.jar"/>
-    <work nested="/tmp/test1.jar"/>
-    <work nested="/tmp/test2.jar"/>
-    <work nested="/tmp/test3.jar"/>
-    <work nested="/tmp/test4.jar"/>
-    <work nested="/tmp/test5.jar"/>
-    <work nested="/tmp/resources"/>
-    
-    <nag from="Gump Integration Build &lt;bodewig@apache.org&gt;"
-         to="notifications@ant.apache.org"
-         subject="Test Failure - Ant"/>
-  </project>
-
-  <project name="bootstrap-ant">
+  <project name="bootstrap-ant-1.8.x">
     <script name="bootstrap"/>
 
-    <depend project="ant-1.6.5-pom"/>
     <option project="jaxp"/>
 
     <home nested="bootstrap"/>



Mime
View raw message