branch develop updated (92f1e1e -> 6b9dc5e)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 92f1e1e Make a bundled war with rest api server inside new 6b9dc5e replace c3p0 by HikariCP The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 6b9dc5e4e96f8d97fead575ff81a002ec4e925ab Author: Tony CHEMIT <dev@tchemit.fr> Date: Wed Jan 4 15:23:39 2017 +0100 replace c3p0 by HikariCP Summary of changes: pollen-persistence/pom.xml | 7 ++++++- .../src/main/resources/pollen-rest-api.properties | 4 ++++ pom.xml | 24 ++++++++++++++++++++-- 3 files changed, 32 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 6b9dc5e4e96f8d97fead575ff81a002ec4e925ab Author: Tony CHEMIT <dev@tchemit.fr> Date: Wed Jan 4 15:23:39 2017 +0100 replace c3p0 by HikariCP --- pollen-persistence/pom.xml | 7 ++++++- .../src/main/resources/pollen-rest-api.properties | 4 ++++ pom.xml | 24 ++++++++++++++++++++-- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/pollen-persistence/pom.xml b/pollen-persistence/pom.xml index 1c859c0..ac5707e 100644 --- a/pollen-persistence/pom.xml +++ b/pollen-persistence/pom.xml @@ -64,8 +64,13 @@ </dependency> <dependency> + <groupId>com.zaxxer</groupId> + <artifactId>HikariCP</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>org.hibernate</groupId> - <artifactId>hibernate-c3p0</artifactId> + <artifactId>hibernate-hikaricp</artifactId> </dependency> <dependency> diff --git a/pollen-rest-api/src/main/resources/pollen-rest-api.properties b/pollen-rest-api/src/main/resources/pollen-rest-api.properties index f3f7bcc..66f7e5d 100644 --- a/pollen-rest-api/src/main/resources/pollen-rest-api.properties +++ b/pollen-rest-api/src/main/resources/pollen-rest-api.properties @@ -25,3 +25,7 @@ hibernate.connection.password=sa hibernate.connection.driver_class=org.h2.Driver #hibernate.hbm2ddl.auto=update pollen.version=${project.version} +hibernate.connection.provider_class=org.hibernate.hikaricp.internal.HikariCPConnectionProvider +hibernate.hikari.minimumIdle=2 +hibernate.hikari.maximumPoolSize=20 +hibernate.hikari.autoCommit=false diff --git a/pom.xml b/pom.xml index f7c8b0d..ed918c7 100644 --- a/pom.xml +++ b/pom.xml @@ -296,6 +296,16 @@ <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> <version>${topiaVersion}</version> + <exclusions> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-ehcache</artifactId> + </exclusion> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-c3p0</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.nuiton.topia</groupId> @@ -317,10 +327,20 @@ </dependency> <dependency> + <groupId>com.zaxxer</groupId> + <artifactId>HikariCP</artifactId> + <version>2.5.1</version> + </dependency> + <dependency> <groupId>org.hibernate</groupId> - <artifactId>hibernate-c3p0</artifactId> + <artifactId>hibernate-hikaricp</artifactId> <version>${hibernateVersion}</version> - <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>com.zaxxer</groupId> + <artifactId>HikariCP-java6</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm