gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1855667 - /gump/metadata/project/tomcat-tc7.xml
Date Sat, 16 Mar 2019 19:22:55 GMT
Author: markt
Date: Sat Mar 16 19:22:55 2019
New Revision: 1855667

URL: http://svn.apache.org/viewvc?rev=1855667&view=rev
Log:
tomcat-dbcp is now part fo the main tc7.0.x build

Modified:
    gump/metadata/project/tomcat-tc7.xml

Modified: gump/metadata/project/tomcat-tc7.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-tc7.xml?rev=1855667&r1=1855666&r2=1855667&view=diff
==============================================================================
--- gump/metadata/project/tomcat-tc7.xml (original)
+++ gump/metadata/project/tomcat-tc7.xml Sat Mar 16 19:22:55 2019
@@ -25,32 +25,21 @@
   </description>
   <url href="http://tomcat.apache.org/index.html"/>
 
-  <git repository="asf-gitbox" dir="/tomcat.git" branch="7.0.x"/>
 
   <project name="tomcat-tc7.0.x">
     <package>org.apache.catalina</package>
     <ant>
       <depend property="jdt.jar" project="eclipse" id="jdtcore" />
-      <depend property="tomcat-dbcp.jar" project="tomcat-tc7.0.x-dbcp" id="tomcat-dbcp"
/>
-      <property name="tomcat-dbcp-src.jar" project="tomcat-tc7.0.x-dbcp"
-              id="tomcat-dbcp-src" reference="jarpath" />
       <depend property="commons-daemon.jar" project="commons-daemon" 
               id="commons-daemon" />
       <property name="junit.jar" project="junit" reference="jarpath" id="junit" />
-      <property name="commons-pool.home" project="commons-pool"
-         path="." />
-      <property name="commons-dbcp.home" project="commons-dbcp"
-         path="." />
-      <property name="tomcat-dbcp.home" project="tomcat-tc7.0.x-dbcp"
-         reference="home" />
       <property name="base.path" path="tomcat-build-libs"/>
     </ant>
 
     <depend project="ant" inherit="runtime" />
     <option project="junit" />
     <!-- These option elements make both *-validate projects to run before
-      this project. Their result is not used here, so noclasspath.
-      The *-dbcp project is also built before this one, see above. -->
+      this project. Their result is not used here, so noclasspath. -->
     <option project="tomcat-tc7.0.x-validate"><noclasspath/></option>
     <option project="tomcat-tc7.0.x-validate-eoln"><noclasspath/></option>
     <work nested="output/classes" />
@@ -72,45 +61,17 @@
     <jar name="lib/catalina-ha.jar" id="catalina-ha" />
     <jar name="lib/tomcat-api.jar" id="tomcat-api" />
     <jar name="lib/tomcat-util.jar" id="tomcat-util" />
+    <jar name="lib/tomcat-dbcp.jar" id="tomcat-dbcp" />
     <jar name="lib/websocket-api.jar" id="websocket-api" />
     <jar name="lib/tomcat7-websocket.jar" id="tomcat7-websocket" />
     <nag to="dev@tomcat.apache.org"
          from="Bill Barker &lt;billbarker@apache.org&gt;" />
   </project>
 
-  <project name="tomcat-tc7.0.x-dbcp">
-    <package>org.apache.tomcat.dbcp</package>
-    <mkdir dir="tomcat-deps" />
-    <ant target="build-tomcat-dbcp" >
-      <property name="commons-pool.home" project="commons-pool"
-         path="." />
-      <property name="commons-dbcp.home" project="commons-dbcp"
-         path="." />
-      <property name="tomcat-dbcp.home" project="tomcat-tc7.0.x-dbcp"
-         reference="home" />
-      <property name="tomcat-dbcp.jar" project="tomcat-tc7.0.x-dbcp"
-         id="tomcat-dbcp" reference="jarpath"  />
-      <property name="base.path" path="tomcat-build-libs"/>
-    </ant>
-
-    <depend project="ant" inherit="runtime"/>
-    <depend project="jta" />
-    <home nested="tomcat-deps" />
-    <jar name="tomcat-dbcp-@@DATE@@.jar" id="tomcat-dbcp"/>
-    <jar name="tomcat-dbcp-src.jar"  id="tomcat-dbcp-src" />
-    <license name="LICENSE" />
-
-    <nag to="dev@tomcat.apache.org"
-         from="Bill Barker &lt;billbarker@apache.org&gt;" />
-  </project>
-
  <project name="tomcat-tc7.0.x-test-bio">
    <package>org.apache.catalina</package>
    <ant target="test">
       <depend property="jdt.jar" project="eclipse" id="jdtcore" />
-      <depend property="tomcat-dbcp.jar" project="tomcat-tc7.0.x-dbcp" id="tomcat-dbcp"
/>
-      <property name="tomcat-dbcp-src.jar" project="tomcat-tc7.0.x-dbcp"
-            id="tomcat-dbcp-src" reference="jarpath" />
       <depend property="commons-daemon.jar" project="commons-daemon" 
               id="commons-daemon" />
       <depend property="junit.jar" project="junit" id="junit"/>
@@ -118,12 +79,6 @@
       <depend property="cglib.jar" project="cglib" id="cglib" />
       <depend property="objenesis.jar" project="objenesis" id="objenesis" />
       <depend property="easymock.jar" project="easymock3" id="easymock" />
-      <property name="commons-pool.home" project="commons-pool"
-                path="." />
-      <property name="commons-dbcp.home" project="commons-dbcp"
-                path="." />
-      <property name="tomcat-dbcp.home" project="tomcat-tc7.0.x-dbcp"
-         reference="home" />
       <property name="examples.sources.skip" value="true" />
       <property name="test.temp" value="output/test-tmp-BIO" />
       <property name="test.reports" value="output/logs-BIO" />
@@ -156,9 +111,6 @@
    <package>org.apache.catalina</package>
    <ant target="test">
       <depend property="jdt.jar" project="eclipse" id="jdtcore" />
-      <depend property="tomcat-dbcp.jar" project="tomcat-tc7.0.x-dbcp" id="tomcat-dbcp"
/>
-      <property name="tomcat-dbcp-src.jar" project="tomcat-tc7.0.x-dbcp"
-            id="tomcat-dbcp-src" reference="jarpath" />
       <depend property="commons-daemon.jar" project="commons-daemon" 
               id="commons-daemon" />
       <depend property="junit.jar" project="junit" id="junit"/>
@@ -166,12 +118,6 @@
       <depend property="cglib.jar" project="cglib" id="cglib" />
       <depend property="objenesis.jar" project="objenesis" id="objenesis" />
       <depend property="easymock.jar" project="easymock3" id="easymock" />
-      <property name="commons-pool.home" project="commons-pool"
-                path="." />
-      <property name="commons-dbcp.home" project="commons-dbcp"
-                path="." />
-      <property name="tomcat-dbcp.home" project="tomcat-tc7.0.x-dbcp"
-         reference="home" />
       <property name="examples.sources.skip" value="true" />
       <property name="test.temp" value="output/test-tmp-NIO" />
       <property name="test.reports" value="output/logs-NIO" />
@@ -204,9 +150,6 @@
    <package>org.apache.catalina</package>
    <ant target="test">
       <depend property="jdt.jar" project="eclipse" id="jdtcore" />
-      <depend property="tomcat-dbcp.jar" project="tomcat-tc7.0.x-dbcp" id="tomcat-dbcp"
/>
-      <property name="tomcat-dbcp-src.jar" project="tomcat-tc7.0.x-dbcp"
-            id="tomcat-dbcp-src" reference="jarpath" />
       <depend property="commons-daemon.jar" project="commons-daemon" 
               id="commons-daemon" />
       <depend property="junit.jar" project="junit" id="junit"/>
@@ -214,12 +157,6 @@
       <depend property="cglib.jar" project="cglib" id="cglib" />
       <depend property="objenesis.jar" project="objenesis" id="objenesis" />
       <depend property="easymock.jar" project="easymock3" id="easymock" />
-      <property name="commons-pool.home" project="commons-pool"
-                path="." />
-      <property name="commons-dbcp.home" project="commons-dbcp"
-                path="." />
-      <property name="tomcat-dbcp.home" project="tomcat-tc7.0.x-dbcp"
-         reference="home" />
       <property name="examples.sources.skip" value="true" />
       <property name="test.temp" value="output/test-tmp-APR" />
       <property name="test.reports" value="output/logs-APR" />



Mime
View raw message