Author: kkolinko
Date: Wed Jun 24 12:43:39 2009
New Revision: 787999
URL: http://svn.apache.org/viewvc?rev=787999&view=rev
Log:
Fix download task check for commons-pool and commons-dbcp.
Without this patch the 'ant download' call does not download
the updated commons-pool or commons-dbcp version,
like the recent update of commons-pool 1.4 -> 1.5.1,
unless you run 'ant clean-depend' or delete existing ${tomcat-dbcp.jar} file
before that.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 24 12:43:39 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77
7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,784453,784602,784614,785688,785768,785859,786468,786667,787627,787770
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77
7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,784453,784602,784614,785688,785768,785859,786468,786667,787627,787770
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=787999&r1=787998&r2=787999&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jun 24 12:43:39 2009
@@ -98,11 +98,6 @@
+1: fhanik
-1:
-* Fix download task dependency for commons-pool and commons-dbcp.
- http://svn.apache.org/viewvc?rev=783762&view=rev
- +1: kkolinko, markt, fhanik
- -1:
-
* Make diagnosing broken requests a little easier.
http://people.apache.org/~markt/patches/2009-06-23-parameters-v2.patch
+1: markt, fhanik, kkolinko
Modified: tomcat/tc6.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=787999&r1=787998&r2=787999&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Wed Jun 24 12:43:39 2009
@@ -670,11 +670,11 @@
<!-- Build Tomcat DBCP bundle -->
<antcall target="downloadgz">
<param name="sourcefile" value="${commons-pool-src.loc}"/>
- <param name="destfile" value="${tomcat-dbcp.jar}" />
+ <param name="destfile" value="${commons-pool.home}/build.xml" />
</antcall>
<antcall target="downloadgz">
<param name="sourcefile" value="${commons-dbcp-src.loc}"/>
- <param name="destfile" value="${tomcat-dbcp.jar}" />
+ <param name="destfile" value="${commons-dbcp.home}/build.xml" />
</antcall>
<mkdir dir="${tomcat-dbcp.home}"/>
<antcall target="build-tomcat-dbcp">
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=787999&r1=787998&r2=787999&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jun 24 12:43:39 2009
@@ -157,6 +157,10 @@
Remove references to unused commons-collections from the build scripts.
(markt)
</update>
+ <fix>
+ Fix download task check for commons-pool and commons-dbcp in the
+ build scripts. (kkolinko)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
