diff --git a/activemq-camel/pom.xml b/activemq-camel/pom.xml
index 5ed94ff850..c1b8d0b417 100755
--- a/activemq-camel/pom.xml
+++ b/activemq-camel/pom.xml
@@ -135,17 +135,10 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.openejb</groupId>
-      <artifactId>openejb-core</artifactId>
-      <version>3.1</version>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-dbcp2</artifactId>
       <optional>true</optional>
       <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.activemq</groupId>
-          <artifactId>activemq-core</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.objectweb.howl</groupId>
diff --git a/activemq-camel/src/test/java/org/apache/activemq/camel/JmsJdbcXARollbackTest.java b/activemq-camel/src/test/java/org/apache/activemq/camel/JmsJdbcXARollbackTest.java
index 16bc006d95..15fe65f6bb 100644
--- a/activemq-camel/src/test/java/org/apache/activemq/camel/JmsJdbcXARollbackTest.java
+++ b/activemq-camel/src/test/java/org/apache/activemq/camel/JmsJdbcXARollbackTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.util.Wait;
 import org.apache.camel.Exchange;
 import org.apache.camel.component.jms.JmsMessage;
 import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/activemq-camel/src/test/java/org/apache/activemq/camel/JmsJdbcXATest.java b/activemq-camel/src/test/java/org/apache/activemq/camel/JmsJdbcXATest.java
index 8481ca6b9a..16c8a1ebf3 100644
--- a/activemq-camel/src/test/java/org/apache/activemq/camel/JmsJdbcXATest.java
+++ b/activemq-camel/src/test/java/org/apache/activemq/camel/JmsJdbcXATest.java
@@ -34,7 +34,7 @@ import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.TransactionId;
 import org.apache.activemq.util.Wait;
 import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
diff --git a/activemq-camel/src/test/resources/org/apache/activemq/camel/jmsXajdbc.xml b/activemq-camel/src/test/resources/org/apache/activemq/camel/jmsXajdbc.xml
index 1c58a142eb..394fad21a4 100644
--- a/activemq-camel/src/test/resources/org/apache/activemq/camel/jmsXajdbc.xml
+++ b/activemq-camel/src/test/resources/org/apache/activemq/camel/jmsXajdbc.xml
@@ -78,16 +78,12 @@
         <property name="cacheLevel" value="0"/>
     </bean>
 
-    <!-- openejb provides geronimo NamedXAResources wrapper around commons dbcp such that they have an identity in the howl log -->
-    <bean id="geronimoXAResourceWrapper"
-          class="org.apache.openejb.resource.GeronimoTransactionManagerFactory.GeronimoXAResourceWrapper"/>
-    <bean id="managedDataSourceWithRecovery" class="org.apache.openejb.resource.jdbc.ManagedDataSourceWithRecovery">
-        <constructor-arg>
-            <ref bean="geronimoXAResourceWrapper"></ref>
-        </constructor-arg>
-        <property name="jdbcDriver" value="org.apache.derby.jdbc.EmbeddedDriver"/>
-        <property name="jdbcUrl" value="jdbc:derby:target/XatestDs;create=true"/>
-        <property name="transactionManager" ref="jenckTransactionManager"/>
+    <bean id="managedDataSourceWithRecovery" class="org.apache.commons.dbcp2.managed.BasicManagedDataSource" destroy-method="close">
+        <property name="driverClassName" value="org.apache.derby.jdbc.EmbeddedDriver" />
+        <property name="url" value="jdbc:derby:target/XatestDs;create=true" />
+        <property name="username" value="user" />
+        <property name="password" value="secret" />
+        <property name="transactionManager" ref="jenckTransactionManager" />
     </bean>
 
     <bean id="required" class="org.apache.camel.spring.spi.SpringTransactionPolicy">
diff --git a/activemq-camel/src/test/resources/org/apache/activemq/camel/jmsXajdbcRollback.xml b/activemq-camel/src/test/resources/org/apache/activemq/camel/jmsXajdbcRollback.xml
index f5b43061c6..70b0c7a17a 100644
--- a/activemq-camel/src/test/resources/org/apache/activemq/camel/jmsXajdbcRollback.xml
+++ b/activemq-camel/src/test/resources/org/apache/activemq/camel/jmsXajdbcRollback.xml
@@ -78,16 +78,12 @@
         <property name="cacheLevel" value="0"/>
     </bean>
 
-    <!-- openejb provides geronimo NamedXAResources wrapper around commons dbcp such that they have an identity in the howl log -->
-    <bean id="geronimoXAResourceWrapper"
-          class="org.apache.openejb.resource.GeronimoTransactionManagerFactory.GeronimoXAResourceWrapper"/>
-    <bean id="managedDataSourceWithRecovery" class="org.apache.openejb.resource.jdbc.ManagedDataSourceWithRecovery">
-        <constructor-arg>
-            <ref bean="geronimoXAResourceWrapper"></ref>
-        </constructor-arg>
-        <property name="jdbcDriver" value="org.apache.derby.jdbc.EmbeddedDriver"/>
-        <property name="jdbcUrl" value="jdbc:derby:target/XatestDs;create=true"/>
-        <property name="transactionManager" ref="jenckTransactionManager"/>
+    <bean id="managedDataSourceWithRecovery" class="org.apache.commons.dbcp2.managed.BasicManagedDataSource" destroy-method="close">
+        <property name="driverClassName" value="org.apache.derby.jdbc.EmbeddedDriver" />
+        <property name="url" value="jdbc:derby:target/XatestDs;create=true" />
+        <property name="username" value="user" />
+        <property name="password" value="secret" />
+        <property name="transactionManager" ref="jenckTransactionManager" />
     </bean>
 
     <bean id="required" class="org.apache.camel.spring.spi.SpringTransactionPolicy">
diff --git a/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/activemq.xml b/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/activemq.xml
index 908b0cf2ee..b4954975b3 100644
--- a/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/activemq.xml
+++ b/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/activemq.xml
@@ -87,7 +87,7 @@
   
   <!-- MySql DataSource Sample Setup -->
   <!-- 
-  <bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+  <bean id="mysql-ds" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
     <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
     <property name="url" value="jdbc:mysql://localhost/activemq"/>
     <property name="username" value="activemq"/>
diff --git a/activemq-unit-tests/src/test/resources/org/apache/activemq/xbean/activemq.xml b/activemq-unit-tests/src/test/resources/org/apache/activemq/xbean/activemq.xml
index 9884523485..aadfa15dd2 100644
--- a/activemq-unit-tests/src/test/resources/org/apache/activemq/xbean/activemq.xml
+++ b/activemq-unit-tests/src/test/resources/org/apache/activemq/xbean/activemq.xml
@@ -53,7 +53,7 @@
 
   <!-- MySql DataSource Sample Setup -->
   <!-- 
-  <bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+  <bean id="mysql-ds" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
     <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
     <property name="url" value="jdbc:mysql://localhost/activemq?relaxAutoCommit=true"/>
     <property name="username" value="activemq"/>
diff --git a/assembly/src/release/examples/conf/activemq-demo.xml b/assembly/src/release/examples/conf/activemq-demo.xml
index ce89f9c5d2..13524dbb64 100644
--- a/assembly/src/release/examples/conf/activemq-demo.xml
+++ b/assembly/src/release/examples/conf/activemq-demo.xml
@@ -261,24 +261,24 @@
 
     <!-- MySql DataSource Sample Setup -->
     <!--
-    <bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+    <bean id="mysql-ds" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
       <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
       <property name="url" value="jdbc:mysql://localhost/activemq?relaxAutoCommit=true"/>
       <property name="username" value="activemq"/>
       <property name="password" value="activemq"/>
-      <property name="maxActive" value="200"/>
+      <property name="maxTotal" value="200"/>
       <property name="poolPreparedStatements" value="true"/>
     </bean>
     -->
 
     <!-- Oracle DataSource Sample Setup -->
     <!--
-    <bean id="oracle-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+    <bean id="oracle-ds" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
       <property name="driverClassName" value="oracle.jdbc.driver.OracleDriver"/>
       <property name="url" value="jdbc:oracle:thin:@localhost:1521:AMQDB"/>
       <property name="username" value="scott"/>
       <property name="password" value="tiger"/>
-      <property name="maxActive" value="200"/>
+      <property name="maxTotal" value="200"/>
       <property name="poolPreparedStatements" value="true"/>
     </bean>
     -->
@@ -291,4 +291,4 @@
     </bean>
     -->
 
-</beans>
\ No newline at end of file
+</beans>
diff --git a/assembly/src/release/examples/conf/activemq-jdbc.xml b/assembly/src/release/examples/conf/activemq-jdbc.xml
index 026341f87c..aac9ba9bb9 100644
--- a/assembly/src/release/examples/conf/activemq-jdbc.xml
+++ b/assembly/src/release/examples/conf/activemq-jdbc.xml
@@ -77,26 +77,26 @@
 
   <!-- MySql DataSource Sample Setup -->
   <!--
-  <bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+  <bean id="mysql-ds" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
     <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
     <property name="url" value="jdbc:mysql://localhost/activemq?relaxAutoCommit=true"/>
     <property name="username" value="activemq"/>
     <property name="password" value="activemq"/>
-    <property name="maxActive" value="200"/>
+    <property name="maxTotal" value="200"/>
     <property name="poolPreparedStatements" value="true"/>
   </bean>
   -->
 
   <!-- Oracle DataSource Sample Setup -->
   <!--
-  <bean id="oracle-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+  <bean id="oracle-ds" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
     <property name="driverClassName" value="oracle.jdbc.driver.OracleDriver"/>
     <property name="url" value="jdbc:oracle:thin:@localhost:1521:AMQDB"/>
     <property name="username" value="scott"/>
     <property name="password" value="tiger"/>
-    <property name="maxActive" value="200"/>
+    <property name="maxTotal" value="200"/>
     <property name="poolPreparedStatements" value="true"/>
   </bean>
   -->
 
-</beans>
\ No newline at end of file
+</beans>