Author: cmueller
Date: Mon Nov 28 21:18:31 2011
New Revision: 1207615
URL: http://svn.apache.org/viewvc?rev=1207615&view=rev
Log:
CAMEL-4623: Upgrade commons-pool:commons-pool 1.5.4 -> 1.5.6
Modified:
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1207615&r1=1207614&r2=1207615&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Mon Nov 28 21:18:31 2011
@@ -55,7 +55,7 @@
<commons-lang-version>2.6</commons-lang-version>
<commons-logging-version>1.1.1</commons-logging-version>
<commons-net-version>2.2</commons-net-version>
- <commons-pool-version>1.5.4</commons-pool-version>
+ <commons-pool-version>1.5.6</commons-pool-version>
<concurrentlinkedhashmap.version>1.2</concurrentlinkedhashmap.version>
<cxf-version>2.5.0</cxf-version>
<cxf-xjc-utils-version>2.4.0</cxf-xjc-utils-version>
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1207615&r1=1207614&r2=1207615&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Mon Nov 28 21:18:31 2011
@@ -55,7 +55,6 @@
<commons-jxpath-version>1.3</commons-jxpath-version>
<commons-net-version>2.2</commons-net-version>
<commons-math-version>2.2</commons-math-version>
- <commons-pool-bundle-version>1.5.4_3</commons-pool-bundle-version>
<commons-dbcp-bundle-version>1.4_1</commons-dbcp-bundle-version>
<dom4j-bundle-version>1.6.1_4</dom4j-bundle-version>
<el-api-1.0-version>1.0.1</el-api-1.0-version>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1207615&r1=1207614&r2=1207615&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Mon
Nov 28 21:18:31 2011
@@ -113,7 +113,7 @@
<feature name='camel-jms' version='${pom.version}' resolver='(obr)'
start-level='50'>
<feature version="[3,4)">spring</feature>
<bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}</bundle>
+ <bundle
dependency="true">mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
<bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
<feature version="[3,4)">spring-jms</feature>
<feature version='${pom.version}'>camel-core</feature>
@@ -172,7 +172,7 @@
<feature version="[3,4)">spring-web</feature>
<bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
<feature version="[3,4)">spring-jdbc</feature>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}</bundle>
+ <bundle
dependency="true">mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle>
<bundle
dependency="true">mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
@@ -317,7 +317,7 @@
</feature>
<feature name='camel-ibatis' version='${pom.version}' resolver='(obr)'
start-level='50'>
<feature version='${pom.version}'>camel-core</feature>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}</bundle>
+ <bundle
dependency="true">mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
<bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache-bundle-version}</bundle>
@@ -393,7 +393,7 @@
<feature version="[3,4)">spring-jdbc</feature>
<bundle
dependency="true">mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle
dependency="true">mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}</bundle>
+ <bundle
dependency="true">mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp-bundle-version}</bundle>
@@ -460,7 +460,7 @@
</feature>
<feature name='camel-mybatis' version='${pom.version}' resolver='(obr)'
start-level='50'>
<feature version='${pom.version}'>camel-core</feature>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}</bundle>
+ <bundle
dependency="true">mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
<bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}</bundle>
@@ -498,7 +498,7 @@
</feature>
<feature name='camel-quartz' version='${pom.version}' resolver='(obr)'
start-level='50'>
<bundle
dependency="true">mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}</bundle>
+ <bundle
dependency="true">mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle>
<bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
