Author: davsclaus
Date: Sun Aug 7 10:17:41 2011
New Revision: 1154681
URL: http://svn.apache.org/viewvc?rev=1154681&view=rev
Log:
CAMEL-4308: Upgraded to use dbcp 1.4 in features.xml. Thanks to Freeman for the
patch.
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=1154681&r1=1154680&r2=1154681&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Sun Aug 7 10:17:41 2011
@@ -48,7 +48,7 @@
<commons-codec>1.4</commons-codec>
<commons-collections-version>3.2.1</commons-collections-version>
<commons-csv>1.0-r706899_3</commons-csv>
- <commons-dbcp-version>1.3</commons-dbcp-version>
+ <commons-dbcp-version>1.4</commons-dbcp-version>
<commons-exec-version>1.0.1</commons-exec-version>
<commons-io-version>1.3.2</commons-io-version>
<commons-lang-version>2.6</commons-lang-version>
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1154681&r1=1154680&r2=1154681&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Sun Aug 7 10:17:41 2011
@@ -56,6 +56,7 @@
<commons-net-version>2.2</commons-net-version>
<commons-math-version>2.2</commons-math-version>
<commons-pool-bundle-version>1.5.4_1</commons-pool-bundle-version>
+ <commons-dbcp-bundle-version>1.4_1</commons-dbcp-bundle-version>
<dom4j-bundle-version>1.6.1_2</dom4j-bundle-version>
<dozer-bundle-version>5.3.1</dozer-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=1154681&r1=1154680&r2=1154681&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Sun
Aug 7 10:17:41 2011
@@ -211,7 +211,7 @@
<bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
<bundle
dependency="true">mvn:org.springframework/spring-jdbc/${spring-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-dbcp/commons-dbcp/${commons-dbcp-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>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}</bundle>
@@ -358,7 +358,7 @@
<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:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
- <bundle
dependency="true">mvn:commons-dbcp/commons-dbcp/${commons-dbcp-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>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version}</bundle>
@@ -425,7 +425,7 @@
<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-dbcp/commons-dbcp/${commons-dbcp-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>
<bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
@@ -490,7 +490,7 @@
<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:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
- <bundle
dependency="true">mvn:commons-dbcp/commons-dbcp/${commons-dbcp-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>
<bundle
dependency="true">mvn:org.mybatis/mybatis/${mybatis-version}</bundle>
<bundle>mvn:org.apache.camel/camel-mybatis/${pom.version}</bundle>
@@ -527,7 +527,7 @@
<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-dbcp/commons-dbcp/${commons-dbcp-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>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz-bundle-version}</bundle>
