syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [3/4] syncope git commit: [SYNCOPE-1084] Switch from DBCP2 to HikariCP
Date Wed, 17 May 2017 13:02:35 GMT
[SYNCOPE-1084] Switch from DBCP2 to HikariCP


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

Branch: refs/heads/2_0_X
Commit: a002e792840172831c18724b3fe5edf1fb88b86d
Parents: 558111a
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Tue May 9 12:12:39 2017 +0200
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Wed May 17 14:59:59 2017 +0200

----------------------------------------------------------------------
 core/logic/pom.xml                              |  5 ----
 core/persistence-jpa/pom.xml                    |  4 +--
 .../main/resources/domains/Master.properties    |  3 +-
 .../src/main/resources/domains/MasterDomain.xml | 29 +++++---------------
 .../test/resources/domains/Master.properties    |  3 +-
 .../src/test/resources/domains/TwoDomain.xml    | 29 +++++---------------
 deb/core/LICENSE                                |  5 ++++
 deb/core/NOTICE                                 |  4 +++
 .../resources/jboss/domains/MasterDomain.xml    | 29 +++++---------------
 .../main/resources/jboss/domains/TwoDomain.xml  | 29 +++++---------------
 .../src/main/resources/log4j2.xml               |  8 ++++--
 .../resources/mariadb/domains/Master.properties |  3 +-
 .../resources/mysql/domains/Master.properties   |  3 +-
 .../resources/oracle/domains/Master.properties  |  3 +-
 .../postgres/domains/Master.properties          |  3 +-
 .../sqlserver/domains/Master.properties         |  3 +-
 pom.xml                                         |  8 +++---
 standalone/LICENSE                              |  5 ++++
 standalone/NOTICE                               |  4 +++
 19 files changed, 65 insertions(+), 115 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/a002e792/core/logic/pom.xml
----------------------------------------------------------------------
diff --git a/core/logic/pom.xml b/core/logic/pom.xml
index cac3540..7baa863 100644
--- a/core/logic/pom.xml
+++ b/core/logic/pom.xml
@@ -44,11 +44,6 @@ under the License.
     </dependency>
 
     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-dbcp2</artifactId>
-    </dependency>
-
-    <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
     </dependency>

http://git-wip-us.apache.org/repos/asf/syncope/blob/a002e792/core/persistence-jpa/pom.xml
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/pom.xml b/core/persistence-jpa/pom.xml
index 87d0efe..23d33c7 100644
--- a/core/persistence-jpa/pom.xml
+++ b/core/persistence-jpa/pom.xml
@@ -61,8 +61,8 @@ under the License.
     </dependency>
     
     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-dbcp2</artifactId>
+      <groupId>com.zaxxer</groupId>
+      <artifactId>HikariCP-java7</artifactId>
     </dependency>
       
     <dependency>

http://git-wip-us.apache.org/repos/asf/syncope/blob/a002e792/core/persistence-jpa/src/main/resources/domains/Master.properties
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/resources/domains/Master.properties b/core/persistence-jpa/src/main/resources/domains/Master.properties
index 177e988..385e4ea 100644
--- a/core/persistence-jpa/src/main/resources/domains/Master.properties
+++ b/core/persistence-jpa/src/main/resources/domains/Master.properties
@@ -22,7 +22,6 @@ Master.password=syncope
 Master.databasePlatform=org.apache.openjpa.jdbc.sql.PostgresDictionary
 Master.orm=META-INF/spring-orm.xml
 
-# note: other connection pool settings can also be configured here, see DataSource definition
-Master.pool.validationQuery=SELECT 1
+# note: other connection pool settings can also be configured here, see MasterDomain.xml
 
 Master.audit.sql=audit.sql

http://git-wip-us.apache.org/repos/asf/syncope/blob/a002e792/core/persistence-jpa/src/main/resources/domains/MasterDomain.xml
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/resources/domains/MasterDomain.xml b/core/persistence-jpa/src/main/resources/domains/MasterDomain.xml
index b5363e4..722b32c 100644
--- a/core/persistence-jpa/src/main/resources/domains/MasterDomain.xml
+++ b/core/persistence-jpa/src/main/resources/domains/MasterDomain.xml
@@ -48,33 +48,18 @@ under the License.
     <property name="defaultObject" ref="localMasterDataSource"/>
   </bean>
 
-  <bean id="localMasterDataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
+  <bean id="localMasterDataSource" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
     <property name="driverClassName" value="${Master.driverClassName}"/>
-    <property name="url" value="${Master.url}"/>
+    <property name="jdbcUrl" value="${Master.url}"/>
     <property name="username" value="${Master.username}"/>
     <property name="password" value="${Master.password}"/>
     <!-- connection pool configuration - transaction isolation, default READ_COMMITTED
(see SYNCOPE-202) -->
-    <property name="defaultTransactionIsolation">
-      <util:constant static-field="${Master.pool.defaultTransactionIsolation:java.sql.Connection.TRANSACTION_READ_COMMITTED}"/>
+    <property name="transactionIsolation">
+      <util:constant static-field="${Master.pool.transactionIsolation:java.sql.Connection.TRANSACTION_READ_COMMITTED}"/>
     </property>
-    <!-- connection pool configuration - default values taken from BasicDataSource default
values -->
-    <property name="initialSize" value="${Master.pool.initialSize:0}"/>
-    <property name="maxTotal" value="${Master.pool.maxActive:8}"/>
-    <property name="maxIdle" value="${Master.pool.maxIdle:8}"/>
-    <property name="minIdle" value="${Master.pool.minIdle:0}"/>
-    <property name="maxWaitMillis" value="${Master.pool.maxWait:-1}"/>
-    <property name="validationQuery" value="${Master.pool.validationQuery}"/>
-    <property name="validationQueryTimeout" value="${Master.pool.validationQueryTimeout:-1}"/>
-    <property name="testOnBorrow" value="${Master.pool.testOnBorrow:true}"/>
-    <property name="testOnReturn" value="${Master.pool.testOnReturn:false}"/>
-    <property name="testWhileIdle" value="${Master.pool.testWhileIdle:false}"/>
-    <property name="timeBetweenEvictionRunsMillis" value="${Master.pool.timeBetweenEvictionRunsMillis:-1}"/>
-    <property name="numTestsPerEvictionRun" value="${Master.pool.numTestsPerEvictionRun:3}"/>
-    <property name="minEvictableIdleTimeMillis" value="${Master.pool.minEvictableIdleTimeMillis:1800000}"/>
-    <property name="removeAbandonedOnBorrow" value="${Master.pool.removeAbandoned:false}"/>
-    <property name="removeAbandonedOnMaintenance" value="${Master.pool.removeAbandoned:false}"/>
-    <property name="removeAbandonedTimeout" value="${Master.pool.removeAbandonedTimeout:300}"/>
-    <property name="logAbandoned" value="${Master.pool.logAbandoned:false}"/>
+    <!-- connection pool configuration - default values taken from HikariConfig default
values -->
+    <property name="maximumPoolSize" value="${Master.pool.maxActive:8}"/>
+    <property name="minimumIdle" value="${Master.pool.minIdle:0}"/>
   </bean>
   
   <bean class="org.springframework.jdbc.datasource.init.DataSourceInitializer">

http://git-wip-us.apache.org/repos/asf/syncope/blob/a002e792/core/persistence-jpa/src/test/resources/domains/Master.properties
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/test/resources/domains/Master.properties b/core/persistence-jpa/src/test/resources/domains/Master.properties
index 40a3852..a4f9aff 100644
--- a/core/persistence-jpa/src/test/resources/domains/Master.properties
+++ b/core/persistence-jpa/src/test/resources/domains/Master.properties
@@ -22,7 +22,6 @@ Master.password=
 Master.databasePlatform=org.apache.openjpa.jdbc.sql.H2Dictionary
 Master.orm=META-INF/spring-orm.xml
 
-# note: other connection pool settings can also be configured here, see DataSource definition
-Master.pool.validationQuery=SELECT 1
+# note: other connection pool settings can also be configured here, see MasterDomain.xml
 
 Master.audit.sql=audit.sql

http://git-wip-us.apache.org/repos/asf/syncope/blob/a002e792/core/persistence-jpa/src/test/resources/domains/TwoDomain.xml
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/test/resources/domains/TwoDomain.xml b/core/persistence-jpa/src/test/resources/domains/TwoDomain.xml
index 46e1c79..2b987ad 100644
--- a/core/persistence-jpa/src/test/resources/domains/TwoDomain.xml
+++ b/core/persistence-jpa/src/test/resources/domains/TwoDomain.xml
@@ -48,33 +48,18 @@ under the License.
     <property name="defaultObject" ref="localTwoDataSource"/>
   </bean>
 
-  <bean id="localTwoDataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
+  <bean id="localTwoDataSource" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
     <property name="driverClassName" value="${Two.driverClassName}"/>
-    <property name="url" value="${Two.url}"/>
+    <property name="jdbcUrl" value="${Two.url}"/>
     <property name="username" value="${Two.username}"/>
     <property name="password" value="${Two.password}"/>
     <!-- connection pool configuration - transaction isolation, default READ_COMMITTED
(see SYNCOPE-202) -->
-    <property name="defaultTransactionIsolation">
-      <util:constant static-field="${Two.pool.defaultTransactionIsolation:java.sql.Connection.TRANSACTION_READ_COMMITTED}"/>
+    <property name="transactionIsolation">
+      <util:constant static-field="${Two.pool.transactionIsolation:java.sql.Connection.TRANSACTION_READ_COMMITTED}"/>
     </property>
-    <!-- connection pool configuration - default values taken from BasicDataSource default
values -->
-    <property name="initialSize" value="${Two.pool.initialSize:0}"/>
-    <property name="maxTotal" value="${Two.pool.maxActive:8}"/>
-    <property name="maxIdle" value="${Two.pool.maxIdle:8}"/>
-    <property name="minIdle" value="${Two.pool.minIdle:0}"/>
-    <property name="maxWaitMillis" value="${Two.pool.maxWait:-1}"/>
-    <!--<property name="validationQuery" value="${Two.pool.validationQuery}"/>-->
-    <property name="validationQueryTimeout" value="${Two.pool.validationQueryTimeout:-1}"/>
-    <property name="testOnBorrow" value="${Two.pool.testOnBorrow:true}"/>
-    <property name="testOnReturn" value="${Two.pool.testOnReturn:false}"/>
-    <property name="testWhileIdle" value="${Two.pool.testWhileIdle:false}"/>
-    <property name="timeBetweenEvictionRunsMillis" value="${Two.pool.timeBetweenEvictionRunsMillis:-1}"/>
-    <property name="numTestsPerEvictionRun" value="${Two.pool.numTestsPerEvictionRun:3}"/>
-    <property name="minEvictableIdleTimeMillis" value="${Two.pool.minEvictableIdleTimeMillis:1800000}"/>
-    <property name="removeAbandonedOnBorrow" value="${Two.pool.removeAbandoned:false}"/>
-    <property name="removeAbandonedOnMaintenance" value="${Two.pool.removeAbandoned:false}"/>
-    <property name="removeAbandonedTimeout" value="${Two.pool.removeAbandonedTimeout:300}"/>
-    <property name="logAbandoned" value="${Two.pool.logAbandoned:false}"/>
+    <!-- connection pool configuration - default values taken from HikariConfig default
values -->
+    <property name="maximumPoolSize" value="${Master.pool.maxActive:8}"/>
+    <property name="minimumIdle" value="${Master.pool.minIdle:0}"/>
   </bean>
   
   <bean class="org.springframework.jdbc.datasource.init.DataSourceInitializer">

http://git-wip-us.apache.org/repos/asf/syncope/blob/a002e792/deb/core/LICENSE
----------------------------------------------------------------------
diff --git a/deb/core/LICENSE b/deb/core/LICENSE
index fa991b5..28544b5 100644
--- a/deb/core/LICENSE
+++ b/deb/core/LICENSE
@@ -614,6 +614,11 @@ of liability.
 
 ==
 
+For HikariCP (http://brettwooldridge.github.io/HikariCP/):
+This is licensed under the AL 2.0, see above.
+
+==
+
 For highlight.js (http://highlightjs.org/):
 This is licensed under the BSD license:
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/a002e792/deb/core/NOTICE
----------------------------------------------------------------------
diff --git a/deb/core/NOTICE b/deb/core/NOTICE
index 69c892d..b3f0bd3 100644
--- a/deb/core/NOTICE
+++ b/deb/core/NOTICE
@@ -31,6 +31,10 @@ Copyright (c) 2013-2016 The JAXB project.
 
 ==
 
+This product includes software developed by the HikariCP project.
+
+==
+
 This product includes the Javascript syntax highlighter.
 Copyright (c) 2006, Ivan Sagalaev
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/a002e792/fit/core-reference/src/main/resources/jboss/domains/MasterDomain.xml
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/resources/jboss/domains/MasterDomain.xml b/fit/core-reference/src/main/resources/jboss/domains/MasterDomain.xml
index e1393aa..12abefe 100644
--- a/fit/core-reference/src/main/resources/jboss/domains/MasterDomain.xml
+++ b/fit/core-reference/src/main/resources/jboss/domains/MasterDomain.xml
@@ -48,33 +48,18 @@ under the License.
     <property name="defaultObject" ref="localMasterDataSource"/>
   </bean>
 
-  <bean id="localMasterDataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
+  <bean id="localMasterDataSource" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
     <property name="driverClassName" value="${Master.driverClassName}"/>
-    <property name="url" value="${Master.url}"/>
+    <property name="jdbcUrl" value="${Master.url}"/>
     <property name="username" value="${Master.username}"/>
     <property name="password" value="${Master.password}"/>
     <!-- connection pool configuration - transaction isolation, default READ_COMMITTED
(see SYNCOPE-202) -->
-    <property name="defaultTransactionIsolation">
-      <util:constant static-field="${Master.pool.defaultTransactionIsolation:java.sql.Connection.TRANSACTION_READ_COMMITTED}"/>
+    <property name="transactionIsolation">
+      <util:constant static-field="${Master.pool.transactionIsolation:java.sql.Connection.TRANSACTION_READ_COMMITTED}"/>
     </property>
-    <!-- connection pool configuration - default values taken from BasicDataSource default
values -->
-    <property name="initialSize" value="${Master.pool.initialSize:0}"/>
-    <property name="maxTotal" value="${Master.pool.maxActive:8}"/>
-    <property name="maxIdle" value="${Master.pool.maxIdle:8}"/>
-    <property name="minIdle" value="${Master.pool.minIdle:0}"/>
-    <property name="maxWaitMillis" value="${Master.pool.maxWait:-1}"/>
-    <property name="validationQuery" value="${Master.pool.validationQuery}"/>
-    <property name="validationQueryTimeout" value="${Master.pool.validationQueryTimeout:-1}"/>
-    <property name="testOnBorrow" value="${Master.pool.testOnBorrow:true}"/>
-    <property name="testOnReturn" value="${Master.pool.testOnReturn:false}"/>
-    <property name="testWhileIdle" value="${Master.pool.testWhileIdle:false}"/>
-    <property name="timeBetweenEvictionRunsMillis" value="${Master.pool.timeBetweenEvictionRunsMillis:-1}"/>
-    <property name="numTestsPerEvictionRun" value="${Master.pool.numTestsPerEvictionRun:3}"/>
-    <property name="minEvictableIdleTimeMillis" value="${Master.pool.minEvictableIdleTimeMillis:1800000}"/>
-    <property name="removeAbandonedOnBorrow" value="${Master.pool.removeAbandoned:false}"/>
-    <property name="removeAbandonedOnMaintenance" value="${Master.pool.removeAbandoned:false}"/>
-    <property name="removeAbandonedTimeout" value="${Master.pool.removeAbandonedTimeout:300}"/>
-    <property name="logAbandoned" value="${Master.pool.logAbandoned:false}"/>
+    <!-- connection pool configuration - default values taken from HikariConfig default
values -->
+    <property name="maximumPoolSize" value="${Master.pool.maxActive:8}"/>
+    <property name="minimumIdle" value="${Master.pool.minIdle:0}"/>
   </bean>
   
   <bean class="org.springframework.jdbc.datasource.init.DataSourceInitializer">

http://git-wip-us.apache.org/repos/asf/syncope/blob/a002e792/fit/core-reference/src/main/resources/jboss/domains/TwoDomain.xml
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/resources/jboss/domains/TwoDomain.xml b/fit/core-reference/src/main/resources/jboss/domains/TwoDomain.xml
index 8243347..b259d0f 100644
--- a/fit/core-reference/src/main/resources/jboss/domains/TwoDomain.xml
+++ b/fit/core-reference/src/main/resources/jboss/domains/TwoDomain.xml
@@ -48,33 +48,18 @@ under the License.
     <property name="defaultObject" ref="localTwoDataSource"/>
   </bean>
 
-  <bean id="localTwoDataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
+  <bean id="localTwoDataSource" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
     <property name="driverClassName" value="${Two.driverClassName}"/>
-    <property name="url" value="${Two.url}"/>
+    <property name="jdbcUrl" value="${Two.url}"/>
     <property name="username" value="${Two.username}"/>
     <property name="password" value="${Two.password}"/>
     <!-- connection pool configuration - transaction isolation, default READ_COMMITTED
(see SYNCOPE-202) -->
-    <property name="defaultTransactionIsolation">
-      <util:constant static-field="${Two.pool.defaultTransactionIsolation:java.sql.Connection.TRANSACTION_READ_COMMITTED}"/>
+    <property name="transactionIsolation">
+      <util:constant static-field="${Two.pool.transactionIsolation:java.sql.Connection.TRANSACTION_READ_COMMITTED}"/>
     </property>
-    <!-- connection pool configuration - default values taken from BasicDataSource default
values -->
-    <property name="initialSize" value="${Two.pool.initialSize:0}"/>
-    <property name="maxTotal" value="${Two.pool.maxActive:8}"/>
-    <property name="maxIdle" value="${Two.pool.maxIdle:8}"/>
-    <property name="minIdle" value="${Two.pool.minIdle:0}"/>
-    <property name="maxWaitMillis" value="${Two.pool.maxWait:-1}"/>
-    <property name="validationQuery" value="${Two.pool.validationQuery}"/>
-    <property name="validationQueryTimeout" value="${Two.pool.validationQueryTimeout:-1}"/>
-    <property name="testOnBorrow" value="${Two.pool.testOnBorrow:true}"/>
-    <property name="testOnReturn" value="${Two.pool.testOnReturn:false}"/>
-    <property name="testWhileIdle" value="${Two.pool.testWhileIdle:false}"/>
-    <property name="timeBetweenEvictionRunsMillis" value="${Two.pool.timeBetweenEvictionRunsMillis:-1}"/>
-    <property name="numTestsPerEvictionRun" value="${Two.pool.numTestsPerEvictionRun:3}"/>
-    <property name="minEvictableIdleTimeMillis" value="${Two.pool.minEvictableIdleTimeMillis:1800000}"/>
-    <property name="removeAbandonedOnBorrow" value="${Two.pool.removeAbandoned:false}"/>
-    <property name="removeAbandonedOnMaintenance" value="${Two.pool.removeAbandoned:false}"/>
-    <property name="removeAbandonedTimeout" value="${Two.pool.removeAbandonedTimeout:300}"/>
-    <property name="logAbandoned" value="${Two.pool.logAbandoned:false}"/>
+    <!-- connection pool configuration - default values taken from HikariConfig default
values -->
+    <property name="maximumPoolSize" value="${Master.pool.maxActive:8}"/>
+    <property name="minimumIdle" value="${Master.pool.minIdle:0}"/>
   </bean>
   
   <bean class="org.springframework.jdbc.datasource.init.DataSourceInitializer">

http://git-wip-us.apache.org/repos/asf/syncope/blob/a002e792/fit/core-reference/src/main/resources/log4j2.xml
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/resources/log4j2.xml b/fit/core-reference/src/main/resources/log4j2.xml
index f484c35..4c9684f 100644
--- a/fit/core-reference/src/main/resources/log4j2.xml
+++ b/fit/core-reference/src/main/resources/log4j2.xml
@@ -176,7 +176,7 @@ under the License.
       <appender-ref ref="mainFile"/>
       <appender-ref ref="main"/>
     </asyncLogger>
-    <asyncLogger name="org.elasticsearch" additivity="false" level="ERROR">
+    <asyncLogger name="org.elasticsearch" additivity="false" level="INFO">
       <appender-ref ref="mainFile"/>
       <appender-ref ref="main"/>
     </asyncLogger>
@@ -184,7 +184,11 @@ under the License.
       <appender-ref ref="mainFile"/>
       <appender-ref ref="main"/>
     </asyncLogger>
-
+    <asyncLogger name="com.zaxxer.hikari" additivity="false" level="ERROR">
+      <appender-ref ref="mainFile"/>
+      <appender-ref ref="main"/>
+    </asyncLogger>
+    
     <root level="INFO">
       <appender-ref ref="mainFile"/>
       <appender-ref ref="main"/>

http://git-wip-us.apache.org/repos/asf/syncope/blob/a002e792/fit/core-reference/src/main/resources/mariadb/domains/Master.properties
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/resources/mariadb/domains/Master.properties b/fit/core-reference/src/main/resources/mariadb/domains/Master.properties
index 39e519a..16dc344 100644
--- a/fit/core-reference/src/main/resources/mariadb/domains/Master.properties
+++ b/fit/core-reference/src/main/resources/mariadb/domains/Master.properties
@@ -22,7 +22,6 @@ Master.password=syncope
 Master.databasePlatform=org.apache.openjpa.jdbc.sql.MariaDBDictionary
 Master.orm=META-INF/spring-orm.xml
 
-# note: other connection pool settings can also be configured here, see DataSource definition
-Master.pool.validationQuery=SELECT 1
+# note: other connection pool settings can also be configured here, see MasterDomain.xml
 
 Master.audit.sql=audit.sql

http://git-wip-us.apache.org/repos/asf/syncope/blob/a002e792/fit/core-reference/src/main/resources/mysql/domains/Master.properties
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/resources/mysql/domains/Master.properties b/fit/core-reference/src/main/resources/mysql/domains/Master.properties
index 978b5f8..f104b1a 100644
--- a/fit/core-reference/src/main/resources/mysql/domains/Master.properties
+++ b/fit/core-reference/src/main/resources/mysql/domains/Master.properties
@@ -22,7 +22,6 @@ Master.password=syncope
 Master.databasePlatform=org.apache.openjpa.jdbc.sql.MySQLDictionary(blobTypeName=LONGBLOB)
 Master.orm=META-INF/spring-orm.xml
 
-# note: other connection pool settings can also be configured here, see DataSource definition
-Master.pool.validationQuery=SELECT 1
+# note: other connection pool settings can also be configured here, see MasterDomain.xml
 
 Master.audit.sql=audit.sql

http://git-wip-us.apache.org/repos/asf/syncope/blob/a002e792/fit/core-reference/src/main/resources/oracle/domains/Master.properties
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/resources/oracle/domains/Master.properties b/fit/core-reference/src/main/resources/oracle/domains/Master.properties
index 3623c2d..db28b21 100644
--- a/fit/core-reference/src/main/resources/oracle/domains/Master.properties
+++ b/fit/core-reference/src/main/resources/oracle/domains/Master.properties
@@ -22,7 +22,6 @@ Master.password=syncope
 Master.databasePlatform=org.apache.openjpa.jdbc.sql.OracleDictionary
 Master.orm=META-INF/spring-orm-oracle.xml
 
-# note: other connection pool settings can also be configured here, see DataSource definition
-Master.pool.validationQuery=SELECT 1 FROM DUAL
+# note: other connection pool settings can also be configured here, see MasterDomain.xml
 
 Master.audit.sql=audit_oracle.sql

http://git-wip-us.apache.org/repos/asf/syncope/blob/a002e792/fit/core-reference/src/main/resources/postgres/domains/Master.properties
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/resources/postgres/domains/Master.properties b/fit/core-reference/src/main/resources/postgres/domains/Master.properties
index 177e988..385e4ea 100644
--- a/fit/core-reference/src/main/resources/postgres/domains/Master.properties
+++ b/fit/core-reference/src/main/resources/postgres/domains/Master.properties
@@ -22,7 +22,6 @@ Master.password=syncope
 Master.databasePlatform=org.apache.openjpa.jdbc.sql.PostgresDictionary
 Master.orm=META-INF/spring-orm.xml
 
-# note: other connection pool settings can also be configured here, see DataSource definition
-Master.pool.validationQuery=SELECT 1
+# note: other connection pool settings can also be configured here, see MasterDomain.xml
 
 Master.audit.sql=audit.sql

http://git-wip-us.apache.org/repos/asf/syncope/blob/a002e792/fit/core-reference/src/main/resources/sqlserver/domains/Master.properties
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/resources/sqlserver/domains/Master.properties b/fit/core-reference/src/main/resources/sqlserver/domains/Master.properties
index ce96a3e..c7b3254 100644
--- a/fit/core-reference/src/main/resources/sqlserver/domains/Master.properties
+++ b/fit/core-reference/src/main/resources/sqlserver/domains/Master.properties
@@ -22,7 +22,6 @@ Master.password=syncope
 Master.databasePlatform=org.apache.openjpa.jdbc.sql.SQLServerDictionary
 Master.orm=META-INF/spring-orm-sqlserver.xml
 
-# note: other connection pool settings can also be configured here, see DataSource definition
-Master.pool.validationQuery=SELECT 1
+# note: other connection pool settings can also be configured here, see MasterDomain.xml
 
 Master.audit.sql=audit_sqlserver.sql

http://git-wip-us.apache.org/repos/asf/syncope/blob/a002e792/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 667d8b0..825031b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -361,7 +361,7 @@ under the License.
     <spring-security.version>4.2.2.RELEASE</spring-security.version>
 
     <openjpa.version>2.4.2</openjpa.version>
-    <commons-dbcp.version>2.1.1</commons-dbcp.version>
+    <hikaricp.version>2.4.11</hikaricp.version>
     <bval.version>1.1.2</bval.version>
 
     <jasypt.version>1.9.2</jasypt.version>
@@ -754,9 +754,9 @@ under the License.
       </dependency>
 
       <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-dbcp2</artifactId>
-        <version>${commons-dbcp.version}</version>
+        <groupId>com.zaxxer</groupId>
+        <artifactId>HikariCP-java7</artifactId>
+        <version>${hikaricp.version}</version>
       </dependency>
 
       <dependency>

http://git-wip-us.apache.org/repos/asf/syncope/blob/a002e792/standalone/LICENSE
----------------------------------------------------------------------
diff --git a/standalone/LICENSE b/standalone/LICENSE
index 81bf093..326f757 100644
--- a/standalone/LICENSE
+++ b/standalone/LICENSE
@@ -887,6 +887,11 @@ of liability.
 
 ==
 
+For HikariCP (http://brettwooldridge.github.io/HikariCP/):
+This is licensed under the AL 2.0, see above.
+
+==
+
 For Font Awesome (http://fontawesome.io/):
 This is licensed under the MIT license, see above.
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/a002e792/standalone/NOTICE
----------------------------------------------------------------------
diff --git a/standalone/NOTICE b/standalone/NOTICE
index 025bdde..375498a 100644
--- a/standalone/NOTICE
+++ b/standalone/NOTICE
@@ -71,6 +71,10 @@ Copyright (c) 2013-2016 The JAXB project.
 
 ==
 
+This product includes software developed by the HikariCP project.
+
+==
+
 This product includes the Javascript syntax highlighter.
 Copyright (c) 2006, Ivan Sagalaev
 


Mime
View raw message