CAMEL-11634 : clean up dbcp 1 dependencies and move it (where possible) to dbcp 
2


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/175769e2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/175769e2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/175769e2

Branch: refs/heads/master
Commit: 175769e27f158025ca56ce256915c9d49c26a078
Parents: 1233fd1
Author: Andrea Tarocchi <ataro...@redhat.com>
Authored: Fri Aug 4 16:58:23 2017 +0200
Committer: Andrea Cosentino <anco...@gmail.com>
Committed: Sat Aug 5 09:16:55 2017 +0200

----------------------------------------------------------------------
 components/camel-jpa/pom.xml                    |  7 +----
 components/camel-quartz/pom.xml                 | 12 ++++----
 .../SpringQuartzConsumerClusteredAppOne.xml     |  2 +-
 .../SpringQuartzConsumerClusteredAppTwo.xml     |  2 +-
 ...StoreRestartAppChangeCronExpressionTest1.xml |  2 +-
 ...StoreRestartAppChangeCronExpressionTest2.xml |  2 +-
 ...StoreRestartAppChangeCronExpressionTest3.xml |  2 +-
 ...sistentStoreRestartAppChangeOptionsTest1.xml |  2 +-
 ...sistentStoreRestartAppChangeOptionsTest2.xml |  2 +-
 .../quartz/SpringQuartzClusteredAppOne.xml      |  2 +-
 .../quartz/SpringQuartzClusteredAppTwo.xml      |  2 +-
 components/camel-quartz2/pom.xml                |  8 +++---
 .../SpringQuartzConsumerClusteredAppOne.xml     |  2 +-
 .../SpringQuartzConsumerClusteredAppTwo.xml     |  2 +-
 ...ingQuartzConsumerRecoveryClusteredAppOne.xml |  4 +--
 ...ingQuartzConsumerRecoveryClusteredAppTwo.xml |  2 +-
 ...StoreRestartAppChangeCronExpressionTest1.xml |  2 +-
 ...StoreRestartAppChangeCronExpressionTest2.xml |  2 +-
 ...StoreRestartAppChangeCronExpressionTest3.xml |  2 +-
 ...sistentStoreRestartAppChangeOptionsTest1.xml |  2 +-
 ...sistentStoreRestartAppChangeOptionsTest2.xml |  2 +-
 .../quartz2/SpringQuartzClusteredAppOne.xml     |  2 +-
 .../quartz2/SpringQuartzClusteredAppTwo.xml     |  2 +-
 examples/camel-example-bam/pom.xml              |  4 +--
 .../resources/META-INF/spring/camel-context.xml |  2 +-
 examples/camel-example-jdbc/pom.xml             |  6 +---
 examples/camel-example-mybatis/pom.xml          |  6 +---
 examples/camel-example-sql-blueprint/README.md  | 25 +++++------------
 examples/camel-example-sql-blueprint/pom.xml    | 29 ++++++++++++++++++--
 .../OSGI-INF/blueprint/camel-context.xml        |  2 +-
 .../src/main/resources/features.xml             | 10 +++----
 examples/camel-example-sql/pom.xml              |  6 ++--
 .../resources/META-INF/spring/camel-context.xml |  2 +-
 .../src/main/resources/features.xml             |  4 +--
 .../src/main/resources/features.xml             |  7 ++---
 parent/pom.xml                                  |  6 ++++
 .../features/src/main/resources/features.xml    |  9 ------
 .../pom.xml                                     |  1 +
 38 files changed, 92 insertions(+), 96 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/components/camel-jpa/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml
index 6a08296..b134ae7 100644
--- a/components/camel-jpa/pom.xml
+++ b/components/camel-jpa/pom.xml
@@ -69,7 +69,7 @@
       <artifactId>geronimo-jpa_2.1_spec</artifactId>
       <scope>provided</scope>
     </dependency>
-    
+
     <!-- test dependencies -->
     <dependency>
       <groupId>org.apache.camel</groupId>
@@ -87,11 +87,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/components/camel-quartz/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-quartz/pom.xml b/components/camel-quartz/pom.xml
index c6dd5c8..d1dfc16 100644
--- a/components/camel-quartz/pom.xml
+++ b/components/camel-quartz/pom.xml
@@ -65,7 +65,7 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
-    </dependency>       
+    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>
@@ -87,13 +87,13 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-dbcp2</artifactId>
       <scope>test</scope>
     </dependency>
-    
-    <!-- Need to override the default dependency verson of Spring -->
-    
+
+    <!-- Need to override the default dependency version of Spring -->
+
 
     <!-- for persistent test -->
     <dependency>

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzConsumerClusteredAppOne.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzConsumerClusteredAppOne.xml
 
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzConsumerClusteredAppOne.xml
index ec7b7ea..aee3c0c 100644
--- 
a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzConsumerClusteredAppOne.xml
+++ 
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzConsumerClusteredAppOne.xml
@@ -25,7 +25,7 @@
        http://www.springframework.org/schema/jdbc 
http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd";>
 
-  <bean id="quartzDataSource" class="org.apache.commons.dbcp.BasicDataSource">
+  <bean id="quartzDataSource" class="org.apache.commons.dbcp2.BasicDataSource">
     <property name="driverClassName" 
value="org.apache.derby.jdbc.EmbeddedDriver" />
     <!-- refer the embedded database we setup inside 
SpringQuartzConsumerClusteredAppDatabase.xml -->
     <property name="url" value="jdbc:derby:memory:quartz-db" />

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzConsumerClusteredAppTwo.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzConsumerClusteredAppTwo.xml
 
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzConsumerClusteredAppTwo.xml
index b141757..ce92c43 100644
--- 
a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzConsumerClusteredAppTwo.xml
+++ 
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzConsumerClusteredAppTwo.xml
@@ -25,7 +25,7 @@
        http://www.springframework.org/schema/jdbc 
http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd";>
 
-  <bean id="quartzDataSource" class="org.apache.commons.dbcp.BasicDataSource">
+  <bean id="quartzDataSource" class="org.apache.commons.dbcp2.BasicDataSource">
     <property name="driverClassName" 
value="org.apache.derby.jdbc.EmbeddedDriver" />
     <!-- refer the embedded database we setup inside 
SpringQuartzConsumerClusteredAppDatabase.xml -->
     <property name="url" value="jdbc:derby:memory:quartz-db" />

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml
 
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml
index b9f3aa9..22c7a1d 100644
--- 
a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml
+++ 
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml
@@ -25,7 +25,7 @@
        http://www.springframework.org/schema/jdbc 
http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd";>
 
-  <bean id="quartzDataSource" class="org.apache.commons.dbcp.BasicDataSource">
+  <bean id="quartzDataSource" class="org.apache.commons.dbcp2.BasicDataSource">
     <property name="driverClassName" 
value="org.apache.derby.jdbc.EmbeddedDriver" />
     <!-- refer the embedded database we setup inside 
SpringQuartzConsumerClusteredAppDatabase.xml -->
     <property name="url" value="jdbc:derby:memory:quartz-db" />

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest2.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest2.xml
 
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest2.xml
index fc6b76a..f4bc022 100644
--- 
a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest2.xml
+++ 
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest2.xml
@@ -25,7 +25,7 @@
        http://www.springframework.org/schema/jdbc 
http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd";>
 
-  <bean id="quartzDataSource" class="org.apache.commons.dbcp.BasicDataSource">
+  <bean id="quartzDataSource" class="org.apache.commons.dbcp2.BasicDataSource">
     <property name="driverClassName" 
value="org.apache.derby.jdbc.EmbeddedDriver" />
     <!-- refer the embedded database we setup inside 
SpringQuartzConsumerClusteredAppDatabase.xml -->
     <property name="url" value="jdbc:derby:memory:quartz-db" />

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest3.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest3.xml
 
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest3.xml
index d9b53fb..c39ece0 100644
--- 
a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest3.xml
+++ 
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest3.xml
@@ -25,7 +25,7 @@
        http://www.springframework.org/schema/jdbc 
http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd";>
 
-  <bean id="quartzDataSource" class="org.apache.commons.dbcp.BasicDataSource">
+  <bean id="quartzDataSource" class="org.apache.commons.dbcp2.BasicDataSource">
     <property name="driverClassName" 
value="org.apache.derby.jdbc.EmbeddedDriver" />
     <!-- refer the embedded database we setup inside 
SpringQuartzConsumerClusteredAppDatabase.xml -->
     <property name="url" value="jdbc:derby:memory:quartz-db" />

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest1.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest1.xml
 
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest1.xml
index 5a7fd85..aabba79 100644
--- 
a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest1.xml
+++ 
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest1.xml
@@ -25,7 +25,7 @@
        http://www.springframework.org/schema/jdbc 
http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd";>
 
-  <bean id="quartzDataSource" class="org.apache.commons.dbcp.BasicDataSource">
+  <bean id="quartzDataSource" class="org.apache.commons.dbcp2.BasicDataSource">
     <property name="driverClassName" 
value="org.apache.derby.jdbc.EmbeddedDriver" />
     <!-- refer the embedded database we setup inside 
SpringQuartzConsumerClusteredAppDatabase.xml -->
     <property name="url" value="jdbc:derby:memory:quartz-db" />

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml
 
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml
index 68c058b..8158f49 100644
--- 
a/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml
+++ 
b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml
@@ -25,7 +25,7 @@
        http://www.springframework.org/schema/jdbc 
http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd";>
 
-  <bean id="quartzDataSource" class="org.apache.commons.dbcp.BasicDataSource">
+  <bean id="quartzDataSource" class="org.apache.commons.dbcp2.BasicDataSource">
     <property name="driverClassName" 
value="org.apache.derby.jdbc.EmbeddedDriver" />
     <!-- refer the embedded database we setup inside 
SpringQuartzConsumerClusteredAppDatabase.xml -->
     <property name="url" value="jdbc:derby:memory:quartz-db" />

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppOne.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppOne.xml
 
b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppOne.xml
index e81e4a9..5710252 100644
--- 
a/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppOne.xml
+++ 
b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppOne.xml
@@ -25,7 +25,7 @@
        http://www.springframework.org/schema/jdbc 
http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd";>
 
-  <bean id="quartzDataSource" class="org.apache.commons.dbcp.BasicDataSource">
+  <bean id="quartzDataSource" class="org.apache.commons.dbcp2.BasicDataSource">
     <property name="driverClassName" 
value="org.apache.derby.jdbc.EmbeddedDriver" />
     <!-- refer the embedded database we setup inside 
SpringQuartzClusteredAppDatabase.xml -->
     <property name="url" value="jdbc:derby:memory:quartz-db" />

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppTwo.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppTwo.xml
 
b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppTwo.xml
index c1edd81..ebe9cfe 100644
--- 
a/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppTwo.xml
+++ 
b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz/SpringQuartzClusteredAppTwo.xml
@@ -25,7 +25,7 @@
        http://www.springframework.org/schema/jdbc 
http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd";>
 
-  <bean id="quartzDataSource" class="org.apache.commons.dbcp.BasicDataSource">
+  <bean id="quartzDataSource" class="org.apache.commons.dbcp2.BasicDataSource">
     <property name="driverClassName" 
value="org.apache.derby.jdbc.EmbeddedDriver" />
     <!-- refer the embedded database we setup inside 
SpringQuartzClusteredAppDatabase.xml -->
     <property name="url" value="jdbc:derby:memory:quartz-db" />

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/components/camel-quartz2/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-quartz2/pom.xml b/components/camel-quartz2/pom.xml
index 5e553e6..ce0266d 100644
--- a/components/camel-quartz2/pom.xml
+++ b/components/camel-quartz2/pom.xml
@@ -74,7 +74,7 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
-    </dependency>   
+    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>
@@ -92,12 +92,12 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-test-spring</artifactId>            
+      <artifactId>camel-test-spring</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-dbcp2</artifactId>
       <scope>test</scope>
     </dependency>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppOne.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppOne.xml
 
b/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppOne.xml
index 08c50e2..5cc84e0 100644
--- 
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppOne.xml
+++ 
b/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppOne.xml
@@ -25,7 +25,7 @@
        http://www.springframework.org/schema/jdbc 
http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd";>
 
-  <bean id="quartzDataSource" class="org.apache.commons.dbcp.BasicDataSource">
+  <bean id="quartzDataSource" class="org.apache.commons.dbcp2.BasicDataSource">
     <property name="driverClassName" 
value="org.apache.derby.jdbc.EmbeddedDriver" />
     <!-- refer the embedded database we setup inside 
SpringQuartzConsumerClusteredAppDatabase.xml -->
     <property name="url" value="jdbc:derby:memory:quartz-db" />

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppTwo.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppTwo.xml
 
b/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppTwo.xml
index d0b6c03..9fa4792 100644
--- 
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppTwo.xml
+++ 
b/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppTwo.xml
@@ -25,7 +25,7 @@
        http://www.springframework.org/schema/jdbc 
http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd";>
 
-  <bean id="quartzDataSource" class="org.apache.commons.dbcp.BasicDataSource">
+  <bean id="quartzDataSource" class="org.apache.commons.dbcp2.BasicDataSource">
     <property name="driverClassName" 
value="org.apache.derby.jdbc.EmbeddedDriver" />
     <!-- refer the embedded database we setup inside 
SpringQuartzConsumerClusteredAppDatabase.xml -->
     <property name="url" value="jdbc:derby:memory:quartz-db" />

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppOne.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppOne.xml
 
b/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppOne.xml
index 35447e8..a313a40 100644
--- 
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppOne.xml
+++ 
b/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppOne.xml
@@ -25,7 +25,7 @@
        http://www.springframework.org/schema/jdbc 
http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd";>
 
-  <bean id="quartzDataSource" class="org.apache.commons.dbcp.BasicDataSource">
+  <bean id="quartzDataSource" class="org.apache.commons.dbcp2.BasicDataSource">
     <property name="driverClassName" 
value="org.apache.derby.jdbc.EmbeddedDriver" />
     <!-- refer the embedded database we setup inside 
SpringQuartzConsumerClusteredAppDatabase.xml -->
     <property name="url" value="jdbc:derby:memory:quartz-db" />
@@ -60,7 +60,7 @@
       </props>
     </property>
   </bean>
-  
+
   <bean id="myProcessor" 
class="org.apache.camel.component.quartz2.SpringQuartzConsumerTwoAppsClusteredRecoveryTest$MyProcessor"
 />
 
   <camelContext id="camelContext" shutdownEager="false" 
xmlns="http://camel.apache.org/schema/spring";>

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppTwo.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppTwo.xml
 
b/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppTwo.xml
index 3ce0a74..42e16a8 100644
--- 
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppTwo.xml
+++ 
b/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppTwo.xml
@@ -25,7 +25,7 @@
        http://www.springframework.org/schema/jdbc 
http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd";>
 
-  <bean id="quartzDataSource" class="org.apache.commons.dbcp.BasicDataSource">
+  <bean id="quartzDataSource" class="org.apache.commons.dbcp2.BasicDataSource">
     <property name="driverClassName" 
value="org.apache.derby.jdbc.EmbeddedDriver" />
     <!-- refer the embedded database we setup inside 
SpringQuartzConsumerClusteredAppDatabase.xml -->
     <property name="url" value="jdbc:derby:memory:quartz-db" />

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml
 
b/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml
index bb89759..42f13cc 100644
--- 
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml
+++ 
b/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml
@@ -25,7 +25,7 @@
        http://www.springframework.org/schema/jdbc 
http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd";>
 
-  <bean id="quartzDataSource" class="org.apache.commons.dbcp.BasicDataSource">
+  <bean id="quartzDataSource" class="org.apache.commons.dbcp2.BasicDataSource">
     <property name="driverClassName" 
value="org.apache.derby.jdbc.EmbeddedDriver" />
     <!-- refer the embedded database we setup inside 
SpringQuartzConsumerClusteredAppDatabase.xml -->
     <property name="url" value="jdbc:derby:memory:quartz-db" />

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest2.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest2.xml
 
b/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest2.xml
index 9186bae..16ff9bb 100644
--- 
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest2.xml
+++ 
b/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest2.xml
@@ -25,7 +25,7 @@
        http://www.springframework.org/schema/jdbc 
http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd";>
 
-  <bean id="quartzDataSource" class="org.apache.commons.dbcp.BasicDataSource">
+  <bean id="quartzDataSource" class="org.apache.commons.dbcp2.BasicDataSource">
     <property name="driverClassName" 
value="org.apache.derby.jdbc.EmbeddedDriver" />
     <!-- refer the embedded database we setup inside 
SpringQuartzConsumerClusteredAppDatabase.xml -->
     <property name="url" value="jdbc:derby:memory:quartz-db" />

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest3.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest3.xml
 
b/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest3.xml
index 5e24711..07e6488 100644
--- 
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest3.xml
+++ 
b/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest3.xml
@@ -25,7 +25,7 @@
        http://www.springframework.org/schema/jdbc 
http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd";>
 
-  <bean id="quartzDataSource" class="org.apache.commons.dbcp.BasicDataSource">
+  <bean id="quartzDataSource" class="org.apache.commons.dbcp2.BasicDataSource">
     <property name="driverClassName" 
value="org.apache.derby.jdbc.EmbeddedDriver" />
     <!-- refer the embedded database we setup inside 
SpringQuartzConsumerClusteredAppDatabase.xml -->
     <property name="url" value="jdbc:derby:memory:quartz-db" />

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest1.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest1.xml
 
b/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest1.xml
index b9d749d..b7da3be 100644
--- 
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest1.xml
+++ 
b/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest1.xml
@@ -25,7 +25,7 @@
        http://www.springframework.org/schema/jdbc 
http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd";>
 
-  <bean id="quartzDataSource" class="org.apache.commons.dbcp.BasicDataSource">
+  <bean id="quartzDataSource" class="org.apache.commons.dbcp2.BasicDataSource">
     <property name="driverClassName" 
value="org.apache.derby.jdbc.EmbeddedDriver" />
     <!-- refer the embedded database we setup inside 
SpringQuartzConsumerClusteredAppDatabase.xml -->
     <property name="url" value="jdbc:derby:memory:quartz-db" />

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml
 
b/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml
index d5f678d..e6c1aa3 100644
--- 
a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml
+++ 
b/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml
@@ -25,7 +25,7 @@
        http://www.springframework.org/schema/jdbc 
http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd";>
 
-  <bean id="quartzDataSource" class="org.apache.commons.dbcp.BasicDataSource">
+  <bean id="quartzDataSource" class="org.apache.commons.dbcp2.BasicDataSource">
     <property name="driverClassName" 
value="org.apache.derby.jdbc.EmbeddedDriver" />
     <!-- refer the embedded database we setup inside 
SpringQuartzConsumerClusteredAppDatabase.xml -->
     <property name="url" value="jdbc:derby:memory:quartz-db" />

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppOne.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppOne.xml
 
b/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppOne.xml
index 17a2b36..e6ac1e6 100644
--- 
a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppOne.xml
+++ 
b/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppOne.xml
@@ -25,7 +25,7 @@
        http://www.springframework.org/schema/jdbc 
http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd";>
 
-  <bean id="quartzDataSource" class="org.apache.commons.dbcp.BasicDataSource">
+  <bean id="quartzDataSource" class="org.apache.commons.dbcp2.BasicDataSource">
     <property name="driverClassName" 
value="org.apache.derby.jdbc.EmbeddedDriver" />
     <!-- refer the embedded database we setup inside 
SpringQuartzClusteredAppDatabase.xml -->
     <property name="url" value="jdbc:derby:memory:quartz-db" />

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppTwo.xml
----------------------------------------------------------------------
diff --git 
a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppTwo.xml
 
b/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppTwo.xml
index 6a3a2fb..ff82210 100644
--- 
a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppTwo.xml
+++ 
b/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppTwo.xml
@@ -25,7 +25,7 @@
        http://www.springframework.org/schema/jdbc 
http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
        http://camel.apache.org/schema/spring 
http://camel.apache.org/schema/spring/camel-spring.xsd";>
 
-  <bean id="quartzDataSource" class="org.apache.commons.dbcp.BasicDataSource">
+  <bean id="quartzDataSource" class="org.apache.commons.dbcp2.BasicDataSource">
     <property name="driverClassName" 
value="org.apache.derby.jdbc.EmbeddedDriver" />
     <!-- refer the embedded database we setup inside 
SpringQuartzClusteredAppDatabase.xml -->
     <property name="url" value="jdbc:derby:memory:quartz-db" />

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/examples/camel-example-bam/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-bam/pom.xml 
b/examples/camel-example-bam/pom.xml
index 40898e0..db6a5b9 100644
--- a/examples/camel-example-bam/pom.xml
+++ b/examples/camel-example-bam/pom.xml
@@ -92,8 +92,8 @@
       <artifactId>geronimo-jta_1.1_spec</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-dbcp2</artifactId>
     </dependency>
 
     <!-- testing -->

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/examples/camel-example-bam/src/main/resources/META-INF/spring/camel-context.xml
----------------------------------------------------------------------
diff --git 
a/examples/camel-example-bam/src/main/resources/META-INF/spring/camel-context.xml
 
b/examples/camel-example-bam/src/main/resources/META-INF/spring/camel-context.xml
index 0511694..96bf38b 100644
--- 
a/examples/camel-example-bam/src/main/resources/META-INF/spring/camel-context.xml
+++ 
b/examples/camel-example-bam/src/main/resources/META-INF/spring/camel-context.xml
@@ -54,7 +54,7 @@
   </bean>
 
   <!--  DataSource Definition -->
-  <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" 
destroy-method="close">
+  <bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource" 
destroy-method="close">
     <property name="driverClassName" 
value="org.apache.derby.jdbc.EmbeddedDriver"/>
     <property name="url" value="jdbc:derby:target/test/database;create=true"/>
   </bean>

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/examples/camel-example-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-jdbc/pom.xml 
b/examples/camel-example-jdbc/pom.xml
index 7bceb58..716405e 100644
--- a/examples/camel-example-jdbc/pom.xml
+++ b/examples/camel-example-jdbc/pom.xml
@@ -62,11 +62,7 @@
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
-    </dependency>
-    
+
     <!-- logging -->
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/examples/camel-example-mybatis/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-mybatis/pom.xml 
b/examples/camel-example-mybatis/pom.xml
index ad58055..fb54f27 100644
--- a/examples/camel-example-mybatis/pom.xml
+++ b/examples/camel-example-mybatis/pom.xml
@@ -36,7 +36,7 @@
   <properties>
     <category>Database</category>
     <title>MyBatis</title>
-    
+
     
<camel.osgi.export.pkg>org.apache.camel.example.mybatis.*</camel.osgi.export.pkg>
   </properties>
 
@@ -57,10 +57,6 @@
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
-    </dependency>
 
   </dependencies>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/examples/camel-example-sql-blueprint/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-sql-blueprint/README.md 
b/examples/camel-example-sql-blueprint/README.md
index 826c360..f093b7f 100644
--- a/examples/camel-example-sql-blueprint/README.md
+++ b/examples/camel-example-sql-blueprint/README.md
@@ -27,30 +27,19 @@ as well the CamelContext. You can see this in the following 
file:
 In the src/main/resources/OSGI-INF/blueprint/camel-context.xml
 
 ### Run with Karaf
-You will need to compile this example first:
+You will need to install this example first to your local maven repository 
with:
 
-       mvn compile
+       mvn install
 
-To install Apache Camel in Karaf you type in the shell (we use version 
${project.version}):
+Then you can install this example from the shell using this example's 
`features.xml`
+for easy provisioning:
 
        feature:repo-add camel ${project.version}
        feature:install camel
+  feature:repo-add 
mvn:org.apache.camel.example/camel-example-sql-blueprint/${version}/xml/features
+  feature:install camel-example-sql-blueprint
 
-First you need to install the following features in Karaf/ServiceMix with:
-
-       feature:install camel-sql
-
-Then you need to install JDBC connection pool and the Derby Database:
-
-       install -s mvn:commons-pool/commons-pool/1.6
-       install -s 
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/1.4_3
-       install -s mvn:org.apache.derby/derby/10.10.1.1
-
-Then you can install the Camel example:
-
-       install -s 
mvn:org.apache.camel/camel-example-sql-blueprint/${project.version}
-
-And you can see the application running by tailing the logs
+And you can see the application running by tailing the logs:
 
        log:tail
 

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/examples/camel-example-sql-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-sql-blueprint/pom.xml 
b/examples/camel-example-sql-blueprint/pom.xml
index 5dabe72..43e5b80 100644
--- a/examples/camel-example-sql-blueprint/pom.xml
+++ b/examples/camel-example-sql-blueprint/pom.xml
@@ -40,6 +40,7 @@
     
<camel.osgi.export.pkg>org.apache.camel.example.sql.*</camel.osgi.export.pkg>
     <!-- dynamic import for the Derby JDBC driver -->
     <camel.osgi.dynamic>*</camel.osgi.dynamic>
+    <camel.osgi.import>org.apache.derby.jdbc,*</camel.osgi.import>
   </properties>
 
   <dependencies>
@@ -60,10 +61,10 @@
       <artifactId>derby</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-dbcp2</artifactId>
     </dependency>
-    
+
     <!-- logging -->
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
@@ -91,6 +92,28 @@
         <artifactId>camel-maven-plugin</artifactId>
         <version>${project.version}</version>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-artifacts</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attach-artifact</goal>
+            </goals>
+            <configuration>
+              <artifacts>
+                <artifact>
+                  <file>target/classes/features.xml</file>
+                  <type>xml</type>
+                  <classifier>features</classifier>
+                </artifact>
+              </artifacts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/examples/camel-example-sql-blueprint/src/main/resources/OSGI-INF/blueprint/camel-context.xml
----------------------------------------------------------------------
diff --git 
a/examples/camel-example-sql-blueprint/src/main/resources/OSGI-INF/blueprint/camel-context.xml
 
b/examples/camel-example-sql-blueprint/src/main/resources/OSGI-INF/blueprint/camel-context.xml
index 25111b2..ebc3a45 100644
--- 
a/examples/camel-example-sql-blueprint/src/main/resources/OSGI-INF/blueprint/camel-context.xml
+++ 
b/examples/camel-example-sql-blueprint/src/main/resources/OSGI-INF/blueprint/camel-context.xml
@@ -27,7 +27,7 @@
 
   <!-- START SNIPPET: e1 -->
   <!-- this is the JDBC data source which uses an in-memory only Apache Derby 
database -->
-  <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" 
destroy-method="close">
+  <bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource" 
destroy-method="close">
     <property name="driverClassName" 
value="org.apache.derby.jdbc.EmbeddedDriver"/>
     <property name="url" value="jdbc:derby:memory:orders;create=true"/>
     <property name="username" value=""/>

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/examples/camel-example-sql-blueprint/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git 
a/examples/camel-example-sql-blueprint/src/main/resources/features.xml 
b/examples/camel-example-sql-blueprint/src/main/resources/features.xml
index a1a3ddb..cd3cc7b 100644
--- a/examples/camel-example-sql-blueprint/src/main/resources/features.xml
+++ b/examples/camel-example-sql-blueprint/src/main/resources/features.xml
@@ -20,14 +20,14 @@
 <features>
     
<repository>mvn:org.apache.camel.karaf/apache-camel/${project.version}/xml/features</repository>
 
-    <feature name="camel-example-sql" version="${project.version}">
+    <feature name="camel-example-sql-blueprint" version="${project.version}">
         <feature version="${project.version}">camel</feature>
         <feature version="${project.version}">camel-blueprint</feature>
         <feature version="${project.version}">camel-sql</feature>
         <bundle>mvn:org.apache.derby/derby/${derby-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.camel/camel-example-sql-blueprint/${project.version}</bundle>
+        
<bundle>mvn:org.apache.commons/commons-pool2/${commons-pool2-version}</bundle>
+        
<bundle>wrap:mvn:org.apache.commons/commons-dbcp2/2.1.1$overwrite=merge&amp;DynamicImport-Package=*</bundle>
+        
<bundle>mvn:org.apache.camel.example/camel-example-sql-blueprint/${project.version}</bundle>
     </feature>
 
-</features>
\ No newline at end of file
+</features>

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/examples/camel-example-sql/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-sql/pom.xml 
b/examples/camel-example-sql/pom.xml
index a25a68f..1b797bd 100644
--- a/examples/camel-example-sql/pom.xml
+++ b/examples/camel-example-sql/pom.xml
@@ -60,10 +60,10 @@
       <artifactId>derby</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-dbcp2</artifactId>
     </dependency>
-    
+
     <!-- logging -->
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/examples/camel-example-sql/src/main/resources/META-INF/spring/camel-context.xml
----------------------------------------------------------------------
diff --git 
a/examples/camel-example-sql/src/main/resources/META-INF/spring/camel-context.xml
 
b/examples/camel-example-sql/src/main/resources/META-INF/spring/camel-context.xml
index 5a774d2..f78fd24 100644
--- 
a/examples/camel-example-sql/src/main/resources/META-INF/spring/camel-context.xml
+++ 
b/examples/camel-example-sql/src/main/resources/META-INF/spring/camel-context.xml
@@ -25,7 +25,7 @@
 
   <!-- START SNIPPET: e1 -->
   <!-- this is the JDBC data source which uses an in-memory only Apache Derby 
database -->
-  <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" 
destroy-method="close">
+  <bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource" 
destroy-method="close">
     <property name="driverClassName" 
value="org.apache.derby.jdbc.EmbeddedDriver"/>
     <property name="url" value="jdbc:derby:memory:orders;create=true"/>
     <property name="username" value=""/>

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/examples/camel-example-sql/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-sql/src/main/resources/features.xml 
b/examples/camel-example-sql/src/main/resources/features.xml
index 5b908b4..bd6d54b 100644
--- a/examples/camel-example-sql/src/main/resources/features.xml
+++ b/examples/camel-example-sql/src/main/resources/features.xml
@@ -26,8 +26,8 @@
         <feature version="${project.version}">camel-sql</feature>
         <bundle>mvn:org.apache.derby/derby/${derby-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.commons/commons-dbcp2/${commons-dbcp2-version}</bundle>
         
<bundle>mvn:org.apache.camel/camel-example-sql/${project.version}</bundle>
     </feature>
 
-</features>
\ No newline at end of file
+</features>

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/examples/camel-example-tracer/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-tracer/src/main/resources/features.xml 
b/examples/camel-example-tracer/src/main/resources/features.xml
index 1326050..68bf3e3 100644
--- a/examples/camel-example-tracer/src/main/resources/features.xml
+++ b/examples/camel-example-tracer/src/main/resources/features.xml
@@ -22,7 +22,6 @@
 
     <feature name="jpa-hibernate" version="${project.version}">
         
<bundle>mvn:org.apache.geronimo.specs/geronimo-jpa_2.1_spec/${geronimo-jpa-spec-version}</bundle>
-        
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/1.2.2_5</bundle>
         <bundle>mvn:org.springframework/spring-jdbc/${spring-version}</bundle>
         
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/1.6.1_2</bundle>
         <bundle>mvn:org.antlr/com.springsource.antlr/2.7.7</bundle>
@@ -36,12 +35,12 @@
         <bundle>mvn:org.springframework/spring-orm/${spring-version}</bundle>
     </feature>
 
-
     <feature name="camel-example-tracer" version="${project.version}">
         <feature version="${project.version}">camel</feature>
         <feature version="${project.version}">camel-jpa</feature>
         <feature version="${project.version}">camel-stream</feature>
-        
<bundle>mvn:org.apache.camel/camel-example-tracer/${project.version}</bundle>
+        <feature version="${project.version}">camel-spring</feature>
+        
<bundle>mvn:org.apache.camel.example/camel-example-tracer/${project.version}</bundle>
     </feature>
 
-</features>
\ No newline at end of file
+</features>

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 1a744f4..7d7af2b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -145,6 +145,7 @@
     <commons-cli-version>1.3.1</commons-cli-version>
     <commons-daemon-version>1.0.15</commons-daemon-version>
     <commons-dbcp-version>1.4</commons-dbcp-version>
+    <commons-dbcp2-version>2.1.1</commons-dbcp2-version>
     <commons-digester-1x-version>1.8.1</commons-digester-1x-version>
     <commons-digester-version>2.1</commons-digester-version>
     <commons-exec-version>1.3</commons-exec-version>
@@ -4430,6 +4431,11 @@
         <version>${commons-dbcp-version}</version>
       </dependency>
       <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-dbcp2</artifactId>
+        <version>${commons-dbcp2-version}</version>
+      </dependency>
+      <dependency>
         <groupId>commons-pool</groupId>
         <artifactId>commons-pool</artifactId>
         <version>${commons-pool-version}</version>

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index a5220f8..92251a2 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -191,14 +191,9 @@
     <feature version='${spring-version-range}'>spring-tx</feature>
     <feature version='${spring-version-range}'>spring-web</feature>
     <bundle 
dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
-    <bundle 
dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
-    <bundle 
dependency='true'>mvn:commons-dbcp/commons-dbcp/${commons-dbcp-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.geronimo.specs/geronimo-jpa_2.1_spec/${geronimo-jpa-spec-version}</bundle>
-    <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-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.ibatis-sqlmap/${ibatis-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-bam/${project.version}</bundle>
   </feature>
   <feature name='camel-base64' version='${project.version}' resolver='(obr)' 
start-level='50'>
@@ -1155,8 +1150,6 @@
     <bundle 
dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
     <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:commons-pool/commons-pool/${commons-pool-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.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>
@@ -1549,8 +1542,6 @@
     <bundle>mvn:org.apache.camel/camel-protobuf/${project.version}</bundle>
   </feature>
   <feature name='camel-quartz' version='${project.version}' resolver='(obr)' 
start-level='50'>
-    <bundle 
dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
-    <bundle 
dependency='true'>mvn:commons-dbcp/commons-dbcp/${commons-dbcp-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.quartz/${quartz-bundle-version}</bundle>
     <feature version='${project.version}'>camel-core</feature>

http://git-wip-us.apache.org/repos/asf/camel/blob/175769e2/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml
----------------------------------------------------------------------
diff --git 
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml
 
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml
index d20b9ab..a948cc8 100644
--- 
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml
+++ 
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml
@@ -230,6 +230,7 @@
               <exclude>commons-codec:*</exclude>
               <exclude>commons-collections:*</exclude>
               <exclude>commons-dbcp:*</exclude>
+              <exclude>org.apache.commons:commons-dbcp2</exclude>
               <exclude>commons-pool:*</exclude>
 
               <exclude>com.github.ben-manes.caffeine:caffeine</exclude>

Reply via email to