Author: kkolinko
Date: Tue Oct 21 22:51:35 2014
New Revision: 1633478
URL: http://svn.apache.org/r1633478
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57079
Use Tomcat version number for jdbc-pool module when building and shipping the
module as part of Tomcat.
It is backport of r1632425 from tomcat/trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1632425
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1633478&r1=1633477&r2=1633478&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Tue Oct 21 22:51:35 2014
@@ -1021,6 +1021,9 @@
<property name="tomcat.pool" value="${tomcat.pool}" />
<property name="tomcat.juli.jar" value="${tomcat-juli.jar}" />
<property name="skip.download" value="set"/>
+ <property name="version" value="${version}"/>
+ <property name="version.major" value="${version.major}"/>
+ <property name="version.major.minor" value="${version.major.minor}"/>
</ant>
<copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
</target>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1633478&r1=1633477&r2=1633478&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Oct 21 22:51:35 2014
@@ -170,6 +170,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="jdbc-pool">
+ <changelog>
+ <fix>
+ <bug>57079</bug>: Use Tomcat version number for jdbc-pool module when
+ building and shipping the module as part of Tomcat. (markt/kkolinko)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<update>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
