Author: markt
Date: Tue May 18 17:11:59 2010
New Revision: 945760
URL: http://svn.apache.org/viewvc?rev=945760&view=rev
Log:
Update to Commons DBCP 1.3
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/build/build.properties.default
tomcat/tc5.5.x/trunk/build/build.xml
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=945760&r1=945759&r2=945760&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue May 18 17:11:59 2010
@@ -115,8 +115,3 @@ PATCHES PROPOSED TO BACKPORT:
-0: markt - Consensus was for disabled in 5.5.x
http://svn.apache.org/viewvc?view=revision&revision=749019
-1:
-
-* Update to DBCP 1.3
- http://people.apache.org/~markt/patches/2010-05-06-dbcp13-tc5.patch
- +1: markt, kkolinko, kfujino
- -1:
\ No newline at end of file
Modified: tomcat/tc5.5.x/trunk/build/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/build.properties.default?rev=945760&r1=945759&r2=945760&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/build/build.properties.default (original)
+++ tomcat/tc5.5.x/trunk/build/build.properties.default Tue May 18 17:11:59 2010
@@ -158,14 +158,15 @@ tomcat-native.dll=${base-tomcat.loc}/tom
# ----- Commons DBCP, version 1.1 or later -----
-commons-dbcp.version=1.2.2
-commons-dbcp.home=${base.path}/commons-dbcp-1.2.2-src
-commons-dbcp-src.loc=${base-commons.loc}/dbcp/source/commons-dbcp-1.2.2-src.tar.gz
+commons-dbcp.version=1.3
+commons-dbcp.home=${base.path}/commons-dbcp-${commons-dbcp.version}-src
+commons-dbcp-src.loc=${base-commons.loc}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
# ----- Commons Pool, version 1.1 or later -----
-commons-pool.home=${base.path}/commons-pool-1.5.4-src
-commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.5.4-src.tar.gz
+commons-pool.version=1.5.4
+commons-pool.home=${base.path}/commons-pool-${commons-pool.version}-src
+commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz
# ----- Commons Collections, version 2.0 or later -----
Modified: tomcat/tc5.5.x/trunk/build/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/build.xml?rev=945760&r1=945759&r2=945760&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/build/build.xml (original)
+++ tomcat/tc5.5.x/trunk/build/build.xml Tue May 18 17:11:59 2010
@@ -754,6 +754,7 @@
<fileset dir="${commons-dbcp.home}">
<include name="**/*.java" />
<exclude name="**/test/**" />
+ <exclude name="**/managed/**" />
</fileset>
</copy>
<!-- <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons"
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=945760&r1=945759&r2=945760&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Tue May 18
17:11:59 2010
@@ -46,6 +46,9 @@
<update>
Update to NSIS 2.46. (kkolinko)
</update>
+ <update>
+ Update to Apache Commons DBCP 1.3. (markt)
+ </update>
<fix>
<bug>49236</bug>: Do not use indexing when packing Tomcat JARs.
(kkolinko)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
