2 files changed, 5 insertions, 5 deletions
diff --git a/server/sonar-server/build.gradle b/server/sonar-server/build.gradle
index 1efcb4d3026..19d0f661aa4 100644
--- a/server/sonar-server/build.gradle
+++ b/server/sonar-server/build.gradle
@@ -32,13 +32,13 @@ dependencies {
   compile 'com.google.protobuf:protobuf-java'
   compile 'com.googlecode.java-diff-utils:diffutils'
   compile 'com.hazelcast:hazelcast-client'
-  compile 'commons-dbcp:commons-dbcp'
   compile 'commons-dbutils:commons-dbutils'
   compile 'io.jsonwebtoken:jjwt'
   compile 'javax.xml.bind:jaxb-api'
   compile 'org.apache.httpcomponents:httpclient'
   compile 'org.apache.logging.log4j:log4j-api'
   compile 'org.apache.tomcat.embed:tomcat-embed-core'
+  compile 'org.apache.commons:commons-dbcp2'
   compile 'org.elasticsearch.client:transport'
   compile 'org.picocontainer:picocontainer'
   compile 'org.slf4j:jul-to-slf4j'
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/DbConnectionSection.java b/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/DbConnectionSection.java
index 6f2d05eb11b..5a37f672929 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/DbConnectionSection.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/DbConnectionSection.java
@@ -19,7 +19,7 @@
  */
 package org.sonar.server.platform.monitoring;
 
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
 import org.sonar.api.SonarQubeSide;
 import org.sonar.api.SonarRuntime;
 import org.sonar.db.DbClient;
@@ -60,7 +60,7 @@ public class DbConnectionSection extends BaseSectionMBean implements DbConnectio
 
   @Override
   public int getPoolMaxActiveConnections() {
-    return commonsDbcp().getMaxActive();
+    return commonsDbcp().getMaxTotal();
   }
 
   @Override
@@ -85,12 +85,12 @@ public class DbConnectionSection extends BaseSectionMBean implements DbConnectio
 
   @Override
   public long getPoolMaxWaitMillis() {
-    return commonsDbcp().getMaxWait();
+    return commonsDbcp().getMaxWaitMillis();
   }
 
   @Override
   public boolean getPoolRemoveAbandoned() {
-    return commonsDbcp().getRemoveAbandoned();
+    return commonsDbcp().getRemoveAbandonedOnBorrow();
   }
 
   @Override