Author: markt
Date: Thu Oct 16 19:46:19 2014
New Revision: 1632425

URL: http://svn.apache.org/r1632425
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.

Modified:
    tomcat/trunk/build.xml
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1632425&r1=1632424&r2=1632425&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Oct 16 19:46:19 2014
@@ -1099,6 +1099,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/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1632425&r1=1632424&r2=1632425&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct 16 19:46:19 2014
@@ -235,6 +235,10 @@
         <bug>57005</bug>: Fix javadoc errors when building with Java 8. Patch
         provided by Pierre Viret. (markt)
       </fix>
+      <fix>
+        <bug>57079</bug>: Use Tomcat version number for jdbc-pool module when
+        building and shipping the module as part of Tomcat. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Other">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to