Author: ningjiang
Date: Fri Feb 26 06:48:48 2010
New Revision: 916588

URL: http://svn.apache.org/viewvc?rev=916588&view=rev
Log:
CAMEL-2501 upgraded common-dbcp version to 1.3

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=916588&r1=916587&r2=916588&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Fri Feb 26 06:48:48 2010
@@ -44,7 +44,7 @@
     <commons-logging-api-version>1.1</commons-logging-api-version>
     <commons-collections-version>3.2.1</commons-collections-version>
     <commons-pool-version>1.5.4</commons-pool-version>
-    <commons-dbcp-version>1.2.2</commons-dbcp-version>
+    <commons-dbcp-version>1.3</commons-dbcp-version>
     <cxf-version>2.2.6</cxf-version>
     <derby-version>10.4.2.0</derby-version>
     <dozer-version>5.2.0</dozer-version>

Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=916588&r1=916587&r2=916588&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Fri Feb 26 06:48:48 2010
@@ -44,7 +44,6 @@
       <dozer-bundle-version>5.2.0_1</dozer-bundle-version>
       <cglib-version>2.1_3_4</cglib-version>
       
<commons-beanutils-bundle-version>1.7.0_3</commons-beanutils-bundle-version>
-      <commons-dbcp-bundle-version>1.2.2_5</commons-dbcp-bundle-version>
       <commons-csv-version>1.0-r706899_3</commons-csv-version>
       <commons-codec-bundle-version>1.3_2</commons-codec-bundle-version>
       
<commons-httpclient-bundle-version>3.1_4</commons-httpclient-bundle-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=916588&r1=916587&r2=916588&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml 
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Fri 
Feb 26 06:48:48 2010
@@ -154,7 +154,7 @@
     
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
     <bundle>mvn:org.springframework/spring-jdbc/${spring-version}</bundle>
     <bundle>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
-    
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle>
+    <bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp-version}</bundle>
     <bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
     
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
     
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}</bundle>
@@ -231,7 +231,7 @@
     <feature version='${pom.version}'>camel-spring-osgi</feature>
     <bundle>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
     
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
-    
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle>
+    <bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp-version}</bundle>
     
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache-bundle-version}</bundle>
     
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}</bundle>
    
     
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version}</bundle>
@@ -277,7 +277,7 @@
     <bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
     
<bundle>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
     <bundle>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
-    
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle>
+    <bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp-version}</bundle>
     
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
     
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp-bundle-version}</bundle>
     
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
@@ -350,9 +350,10 @@
     <bundle>mvn:org.apache.camel/camel-protobuf/${pom.version}</bundle>
   </feature>
   <feature name='camel-quartz' version='${pom.version}'>
-    <bundle>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
-    
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle>
     
<bundle>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
+    <bundle>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
+    <bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp-version}</bundle>
+    
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
     
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
     
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz-bundle-version}</bundle>
     <feature version='${pom.version}'>camel-core</feature>


Reply via email to