Tag 8.0.3
git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_3@1565729 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build.properties.default b/build.properties.default
index da86799..9546d27 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -153,7 +153,7 @@
#commons-dbcp.home=${base.path}/commons-dbcp-${commons-dbcp.version}-src
#commons-dbcp-src.loc.1=${base-commons.loc.1}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
#commons-dbcp-src.loc.2=${base-commons.loc.2}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
-commons-dbcp.version=2.0-20140205.233744-168
+commons-dbcp.version=2.0-20140207.151643-170
commons-dbcp.home=${base.path}/commons-dbcp2-2.0-SNAPSHOT-src
commons-dbcp-src.loc.1=https://repository.apache.org/content/repositories/snapshots/org/apache/commons/commons-dbcp2/2.0-SNAPSHOT/commons-dbcp2-${commons-dbcp.version}-src.tar.gz
commons-dbcp-src.loc.2=https://repository.apache.org/content/repositories/snapshots/org/apache/commons/commons-dbcp2/2.0-SNAPSHOT/commons-dbcp2-${commons-dbcp.version}-src.tar.gz
diff --git a/build.xml b/build.xml
index 743c836..2c09933 100644
--- a/build.xml
+++ b/build.xml
@@ -2737,6 +2737,11 @@
<exclude name="**/managed/**" />
</fileset>
</copy>
+ <copy todir="${tomcat-dbcp.home}/src/java">
+ <fileset dir="${commons-dbcp.home}/src/main/resources">
+ <include name="**/*.properties" />
+ </fileset>
+ </copy>
<!-- Package rename to avoid clashes with the same classes in webapps -->
<replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons"
@@ -2782,6 +2787,11 @@
<include name="**" />
<classpath path="${tomcat.classes}" />
</javac>
+ <copy todir="${tomcat-dbcp.home}/classes">
+ <fileset dir="${tomcat-dbcp.home}/src/java">
+ <include name="**/*.properties" />
+ </fileset>
+ </copy>
<jarIt jarfile="${tomcat-dbcp.jar}"
filesDir="${tomcat-dbcp.home}/classes"
filesId="files.tomcat-dbcp" />
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4d1ab80..24dce9a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -50,6 +50,12 @@
<fix>
Fix build of Apache Commons DBCP2 classes. (kkolinko)
</fix>
+ <update>
+ Update Commons DBCP 2 to snapshot 170 dated 07 Feb 2014. This enables
+ DBCP to work with a SecurityManager such that only DBCP needs to be
+ granted the necessary permissions to communicate with the database.
+ (markt)
+ </update>
</changelog>
</subsection>
</section>
