Author: violetagg
Date: Fri Jun 28 13:20:58 2013
New Revision: 1497765
URL: http://svn.apache.org/r1497765
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55031
Merged revision 1497754 from tomcat/trunk:
Fixed Export-Package header and the "uses" directives.
Import org.apache.juli.logging package with no version so that any version of a
bundle that provides it can be used.
Patch provided by Martin Lichtin.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/modules/jdbc-pool/resources/MANIFEST.MF
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1497754
Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/resources/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/resources/MANIFEST.MF?rev=1497765&r1=1497764&r2=1497765&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/modules/jdbc-pool/resources/MANIFEST.MF (original)
+++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/resources/MANIFEST.MF Fri Jun 28
13:20:58 2013
@@ -1,12 +1,13 @@
Manifest-Version: 1.0
-Export-Package:
- org.apache.tomcat.jdbc.pool;version="@VERSION@";
- uses:="javax.management,javax.naming,javax.naming.spi,javax.sql,
- org.apache.tomcat.jdbc.pool.jmx",
- org.apache.tomcat.jdbc.pool.interceptor;version="@VERSION@";
- uses:="javax.management.openmbean,org.apache.tomcat.jdbc.pool",
- org.apache.tomcat.jdbc.pool.jmx;version="@VERSION@";
- uses:="javax.management,org.apache.tomcat.jdbc.pool"
+Export-Package: org.apache.tomcat.jdbc.naming;uses:="javax.naming,org.ap
+ ache.juli.logging,javax.naming.spi";version="@VERSION@",org.apache.tomc
+ at.jdbc.pool;uses:="org.apache.juli.logging,javax.sql,org.apache.tomcat
+ .jdbc.pool.jmx,javax.management,javax.naming,javax.naming.spi,org.apach
+ e.tomcat.jdbc.pool.interceptor";version="@VERSION@",org.apache.tomcat.j
+ dbc.pool.interceptor;uses:="org.apache.tomcat.jdbc.pool,org.apache.juli
+ .logging,javax.management.openmbean,javax.management";version="@VERSION@
+ ",org.apache.tomcat.jdbc.pool.jmx;uses:="org.apache.tomcat.jdbc.pool,or
+ g.apache.juli.logging,javax.management";version="@VERSION@"
Ant-Version: Apache Ant 1.7.0
Bundle-Vendor: Apache Software Foundation
Bundle-Version: @VERSION@
@@ -20,4 +21,4 @@ Import-Package:
javax.naming;version="0",
javax.naming.spi;version="0",
javax.sql;version="0",
- org.apache.juli.logging;version="[6.0.18, 7.1.0)"
+ org.apache.juli.logging;version="0"
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=1497765&r1=1497764&r2=1497765&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Jun 28 13:20:58 2013
@@ -156,6 +156,17 @@
</add>
</changelog>
</subsection>
+ <subsection name="jdbc-pool">
+ <changelog>
+ <fix>
+ <bug>55031</bug>: Fixed <code>Export-Package</code> header and
+ <code>uses</code> directives in MANIFEST.MF. Change the version for
+ package <code>org.apache.juli.logging</code> to "0" in
+ <code>Import-Package</code> header. Thus any version of that package
+ can be used. Patch provided by Martin Lichtin. (violetagg)
+ </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
