diff --git a/jooq/pom.xml b/jooq/pom.xml
index e93ab56ed..2675a3184 100644
--- a/jooq/pom.xml
+++ b/jooq/pom.xml
@@ -94,6 +94,11 @@
             <artifactId>hsqldb</artifactId>
             <version>${hsqldb-version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-dbcp2</artifactId>
+            <version>${commons-dbcp2-version}</version>
+        </dependency>
 
         <!-- for testing -->
         <dependency>
diff --git a/jooq/src/main/resources/META-INF/spring/jooq-spring.xml b/jooq/src/main/resources/META-INF/spring/jooq-spring.xml
index 5e2212209..9e33755a7 100644
--- a/jooq/src/main/resources/META-INF/spring/jooq-spring.xml
+++ b/jooq/src/main/resources/META-INF/spring/jooq-spring.xml
@@ -26,10 +26,10 @@
     <context:property-placeholder location="classpath:config.properties"
                                   xmlns:context="http://www.springframework.org/schema/context"/>
 
-    <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="url" value="${db.url}"/>
         <property name="driverClassName" value="${db.driver}"/>
-        <property name="maxActive" value="${db.pool.maxActive}" />
+        <property name="maxTotal" value="${db.pool.maxTotal}" />
         <property name="maxIdle" value="${db.pool.maxIdle}" />
         <property name="username" value="${db.username}"/>
         <property name="password" value="${db.password}"/>
diff --git a/jooq/src/main/resources/config.properties b/jooq/src/main/resources/config.properties
index c470cc569..d6130ac11 100644
--- a/jooq/src/main/resources/config.properties
+++ b/jooq/src/main/resources/config.properties
@@ -17,7 +17,7 @@
 #Database Configuration
 db.driver=org.hsqldb.jdbcDriver
 db.url=jdbc:hsqldb:file:${basedir}/target/db;shutdown=true
-db.pool.maxActive=50
+db.pool.maxTotal=50
 db.pool.maxIdle=20
 db.username=sa
 db.password=