Author: mattsicker
Date: Tue Aug 2 19:43:42 2016
New Revision: 1754999
URL: http://svn.apache.org/viewvc?rev=1754999&view=rev
Log:
[DBCP-454] Fix osgi import-header instruction
Modified:
commons/proper/dbcp/trunk/pom.xml
commons/proper/dbcp/trunk/src/changes/changes.xml
Modified: commons/proper/dbcp/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/pom.xml?rev=1754999&r1=1754998&r2=1754999&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/pom.xml (original)
+++ commons/proper/dbcp/trunk/pom.xml Tue Aug 2 19:43:42 2016
@@ -239,8 +239,8 @@
<commons.checkstyle.version>2.11</commons.checkstyle.version>
<!-- Constant for Commons Pool version (used in multiple places) -->
<commons.pool.version>2.4.2</commons.pool.version>
- <!-- See DBCP-445 -->
-
<commons.osgi.import>*,javax.transaction;version="1.1.0",javax.transaction.xa;version="1.1.0";partial=true;mandatory:=partial</commons.osgi.import>
+ <!-- See DBCP-445 and DBCP-454 -->
+
<commons.osgi.import>javax.transaction;version="1.1.0",javax.transaction.xa;version="1.1.0";partial=true;mandatory:=partial,*</commons.osgi.import>
<!-- Temporary fix to support Java 8 -->
<commons.jacoco.version>0.7.4.201502262128</commons.jacoco.version>
Modified: commons/proper/dbcp/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/changes/changes.xml?rev=1754999&r1=1754998&r2=1754999&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/changes/changes.xml (original)
+++ commons/proper/dbcp/trunk/src/changes/changes.xml Tue Aug 2 19:43:42 2016
@@ -62,7 +62,10 @@ The <action> type attribute can be add,u
<body>
<release version="2.2" date="TBD" description=
"This is a minor release, including bug fixes and enhancements.">
- <action dev="psteitz" tyoe="fix" issue="DBCP-452">
+ <action dev="mattsicker" type="fix" issue="DBCP-454" due-to="Philipp
Marx, Matt Sicker">
+ OSGi declarations contain multiple import headers for
javax.transaction.
+ </action>
+ <action dev="psteitz" type="fix" issue="DBCP-452">
Add jmxName to properties set by BasicDataSourceFactory. This
enables container-managed pools created from JNDI Resource
definitions to enable JMX by supplying a valid root JMX name.
