This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 218eba6fae1e98a065ca166be5ec7c3202717c10 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Fri Nov 13 21:00:13 2015 +0100 Update hibernate --- pollen-persistence/pom.xml | 5 +++++ pollen-persistence/src/test/resources/db.properties | 8 +++++++- pollen-services/pom.xml | 4 ++++ pollen-services/src/test/resources/pollen-fake.properties | 8 +++++++- pollen-ui-struts2/src/test/resources/pollen-it.properties | 8 +++++++- pom.xml | 10 ++++++++-- 6 files changed, 38 insertions(+), 5 deletions(-) diff --git a/pollen-persistence/pom.xml b/pollen-persistence/pom.xml index eacf3e9..e473e34 100644 --- a/pollen-persistence/pom.xml +++ b/pollen-persistence/pom.xml @@ -64,6 +64,11 @@ <artifactId>hibernate-core</artifactId> </dependency> <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-c3p0</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> </dependency> diff --git a/pollen-persistence/src/test/resources/db.properties b/pollen-persistence/src/test/resources/db.properties index 6d65c2a..e5d8eeb 100644 --- a/pollen-persistence/src/test/resources/db.properties +++ b/pollen-persistence/src/test/resources/db.properties @@ -4,7 +4,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2009 - 2012 CodeLutin +# Copyright (C) 2009 - 2015 CodeLutin # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by @@ -26,3 +26,9 @@ hibernate.dialect=org.hibernate.dialect.H2Dialect hibernate.connection.username=sa hibernate.connection.password=sa hibernate.connection.driver_class=org.h2.Driver + +hibernate.c3p0.min_size=5 +hibernate.c3p0.max_size=20 +hibernate.c3p0.timeout=300 +hibernate.c3p0.max_statements=50 +hibernate.c3p0.idle_test_period=3000 diff --git a/pollen-services/pom.xml b/pollen-services/pom.xml index d231676..6676f02 100644 --- a/pollen-services/pom.xml +++ b/pollen-services/pom.xml @@ -67,6 +67,10 @@ <artifactId>hibernate-core</artifactId> </dependency> <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-c3p0</artifactId> + </dependency> + <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> </dependency> diff --git a/pollen-services/src/test/resources/pollen-fake.properties b/pollen-services/src/test/resources/pollen-fake.properties index d2673a8..40601fe 100644 --- a/pollen-services/src/test/resources/pollen-fake.properties +++ b/pollen-services/src/test/resources/pollen-fake.properties @@ -4,7 +4,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit +# Copyright (C) 2009 - 2015 CodeLutin, Tony Chemit # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by @@ -28,6 +28,12 @@ hibernate.connection.username=sa hibernate.connection.password= hibernate.connection.driver_class=org.h2.Driver +hibernate.c3p0.min_size=5 +hibernate.c3p0.max_size=20 +hibernate.c3p0.timeout=300 +hibernate.c3p0.max_statements=50 +hibernate.c3p0.idle_test_period=300 + # Migration configuration topia.service.migration=org.nuiton.topia.migration.TopiaMigrationEngine topia.service.migration.callback=org.chorem.pollen.entities.migration.PollenMigrationCallback diff --git a/pollen-ui-struts2/src/test/resources/pollen-it.properties b/pollen-ui-struts2/src/test/resources/pollen-it.properties index a9c0ee5..42c5ec6 100644 --- a/pollen-ui-struts2/src/test/resources/pollen-it.properties +++ b/pollen-ui-struts2/src/test/resources/pollen-it.properties @@ -4,7 +4,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2009 - 2012 CodeLutin +# Copyright (C) 2009 - 2015 CodeLutin # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by @@ -36,6 +36,12 @@ hibernate.connection.url=jdbc:h2:file:${pollen.dataDirectory}/db/pollendb hibernate.show_sql=false hibernate.hbm2ddl.auto=update +hibernate.c3p0.min_size=5 +hibernate.c3p0.max_size=20 +hibernate.c3p0.timeout=300 +hibernate.c3p0.max_statements=50 +hibernate.c3p0.idle_test_period=300 + # Database migration configuration topia.service.migration=org.nuiton.topia.migration.TopiaMigrationEngine topia.service.migration.callback=org.chorem.pollen.entities.migration.PollenMigrationCallback diff --git a/pom.xml b/pom.xml index 64e59d3..e8dd0aa 100644 --- a/pom.xml +++ b/pom.xml @@ -167,8 +167,8 @@ <shiroVersion>1.2.4</shiroVersion> <slf4jVersion>1.7.13</slf4jVersion> <jettyVersion>8.1.11.v20130520</jettyVersion> - <jettyPluginVersion>${jettyVersion}</jettyPluginVersion> - <hibernateVersion>4.2.1.Final</hibernateVersion> + <!--jettyVersion>${jettyPluginVersion}</jettyVersion--> + <hibernateVersion>4.2.21.Final</hibernateVersion> <seleniumVersion>2.48.2</seleniumVersion> <mockitoVersion>1.9.5</mockitoVersion> @@ -277,6 +277,12 @@ <artifactId>hibernate-core</artifactId> <version>${hibernateVersion}</version> </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-c3p0</artifactId> + <version>${hibernateVersion}</version> + </dependency> <dependency> <groupId>postgresql</groupId> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.