From 1c9a0d9cd4d436902e33d49fe93e58d7d4824fa2 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Fri, 28 Mar 2014 17:47:50 +0100
Subject: [PATCH] [#3159] Replace BoneCP with Apache DBCP

---
 jOOQ-examples/jOOQ-spring-example/pom.xml             |  6 +++---
 .../src/main/resources/jooq-spring.xml                | 11 +++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/jOOQ-examples/jOOQ-spring-example/pom.xml b/jOOQ-examples/jOOQ-spring-example/pom.xml
index 42b59d9c9a..f6d5232eb4 100644
--- a/jOOQ-examples/jOOQ-spring-example/pom.xml
+++ b/jOOQ-examples/jOOQ-spring-example/pom.xml
@@ -31,9 +31,9 @@
             <version>${org.jooq.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.jolbox</groupId>
-            <artifactId>bonecp</artifactId>
-            <version>0.8.0.RELEASE</version>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-dbcp2</artifactId>
+            <version>2.0</version>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
diff --git a/jOOQ-examples/jOOQ-spring-example/src/main/resources/jooq-spring.xml b/jOOQ-examples/jOOQ-spring-example/src/main/resources/jooq-spring.xml
index 794bef0e15..6e9ec30b61 100644
--- a/jOOQ-examples/jOOQ-spring-example/src/main/resources/jooq-spring.xml
+++ b/jOOQ-examples/jOOQ-spring-example/src/main/resources/jooq-spring.xml
@@ -10,12 +10,11 @@
     <!-- This is needed if you want to use the @Transactional annotation -->
     <tx:annotation-driven transaction-manager="transactionManager"/>
 
-    <bean id="dataSource" class="com.jolbox.bonecp.BoneCPDataSource" destroy-method="close">
-        <!-- These properties are replaced by Maven "resources" -->
-        <property name="driverClass" value="${db.driver}"/>
-        <property name="jdbcUrl" value="${db.url}"/>
-        <property name="username" value="${db.username}"/>
-        <property name="password" value="${db.password}"/>
+    <bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close" >
+       <property name="url" value="${db.url}" />
+       <property name="driverClassName" value="${db.driver}" />
+       <property name="username" value="${db.username}" />
+       <property name="password" value="${db.password}" />
     </bean>
 
     <!-- Configure Spring's transaction manager to use a DataSource -->