Author: cmueller
Date: Mon Nov 28 21:28:50 2011
New Revision: 1207625
URL: http://svn.apache.org/viewvc?rev=1207625&view=rev
Log:
CAMEL-4623: Upgrade commons-pool:commons-pool 1.5.4 -> 1.5.6
Modified:
camel/branches/camel-2.8.x/parent/pom.xml
camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/branches/camel-2.8.x/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/parent/pom.xml?rev=1207625&r1=1207624&r2=1207625&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/parent/pom.xml (original)
+++ camel/branches/camel-2.8.x/parent/pom.xml Mon Nov 28 21:28:50 2011
@@ -54,7 +54,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>
<!-- When updating cxf-version, may need to change CXF version range in
platforms/karaf/features/src/main/resources/features.xml -->
Modified: camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml?rev=1207625&r1=1207624&r2=1207625&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml Mon Nov 28
21:28:50 2011
@@ -55,7 +55,6 @@
<commons-net-version>2.2</commons-net-version>
<commons-management-version>1.0</commons-management-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/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml?rev=1207625&r1=1207624&r2=1207625&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
(original)
+++
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Mon Nov 28 21:28:50 2011
@@ -165,7 +165,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>
@@ -311,7 +311,7 @@
</feature>
<feature name='camel-ibatis' version='${pom.version}' resolver='(obr)'
start-level='50'>
<feature version='${pom.version}'>camel-spring</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>
@@ -379,7 +379,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>
@@ -442,7 +442,7 @@
</feature>
<feature name='camel-mybatis' version='${pom.version}' resolver='(obr)'
start-level='50'>
<feature version='${pom.version}'>camel-spring</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>
@@ -480,7 +480,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>
