This is an automated email from the git hooks/post-receive script. New commit to branch feature/use_topia_3.4 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 6735fffd661028802407cfdc50970b77da3a2a2c Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 9 14:06:45 2018 +0100 Utilise ToPIA 3.4 en SNAPSHOT (utilise Hikari par défaut) --- pollen-persistence/pom.xml | 11 ----------- .../src/main/resources/log4j.properties | 2 -- .../src/main/resources/pollen-rest-api.properties | 4 ---- .../test/resources/pollen-rest-api-test.properties | 4 ---- pom.xml | 23 +++------------------- 5 files changed, 3 insertions(+), 41 deletions(-) diff --git a/pollen-persistence/pom.xml b/pollen-persistence/pom.xml index 69e68cd7..152bbe90 100644 --- a/pollen-persistence/pom.xml +++ b/pollen-persistence/pom.xml @@ -74,17 +74,6 @@ </dependency> <dependency> - <groupId>com.zaxxer</groupId> - <artifactId>HikariCP</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-hikaricp</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> diff --git a/pollen-rest-api/src/main/resources/log4j.properties b/pollen-rest-api/src/main/resources/log4j.properties index 6ebf2fd7..5169a3ea 100644 --- a/pollen-rest-api/src/main/resources/log4j.properties +++ b/pollen-rest-api/src/main/resources/log4j.properties @@ -24,5 +24,3 @@ log4j.appender.console.layout=org.apache.log4j.PatternLayout log4j.appender.console.layout.ConversionPattern=%d %5p [%t] (%F:%L) {%X{session}:%X{user}:%X{permission}} %m%n log4j.logger.org.chorem.pollen=INFO log4j.logger.org.debux=INFO -log4j.logger.org.hibernate.orm.deprecation=ERROR -log4j.logger.com.zaxxer.hikari.HikariDataSource=ERROR 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 fc964804..b0c56279 100644 --- a/pollen-rest-api/src/main/resources/pollen-rest-api.properties +++ b/pollen-rest-api/src/main/resources/pollen-rest-api.properties @@ -26,9 +26,5 @@ hibernate.connection.driver_class=org.h2.Driver #hibernate.hbm2ddl.auto=update pollen.version=${project.version} pollen.buildDate=${maven.build.timestamp} -hibernate.connection.provider_class=org.hibernate.hikaricp.internal.HikariCPConnectionProvider -hibernate.hikari.minimumIdle=2 -hibernate.hikari.maximumPoolSize=20 -hibernate.hikari.autoCommit=false topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.ShortTopiaIdFactory topia.service.migration=org.chorem.pollen.persistence.PollenFlywayServiceImpl diff --git a/pollen-rest-api/src/test/resources/pollen-rest-api-test.properties b/pollen-rest-api/src/test/resources/pollen-rest-api-test.properties index 86cc571e..e759ab41 100644 --- a/pollen-rest-api/src/test/resources/pollen-rest-api-test.properties +++ b/pollen-rest-api/src/test/resources/pollen-rest-api-test.properties @@ -26,10 +26,6 @@ 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 topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.ShortTopiaIdFactory topia.service.migration=org.chorem.pollen.persistence.PollenFlywayServiceImpl pollen.devMode=true diff --git a/pom.xml b/pom.xml index 9c89b8f1..8dff90a9 100644 --- a/pom.xml +++ b/pom.xml @@ -179,8 +179,8 @@ <nuitonI18nVersion>3.6.2</nuitonI18nVersion> <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion> - <topiaVersion>3.2</topiaVersion> - <flywayVersion>4.0.3</flywayVersion> + <topiaVersion>3.4-SNAPSHOT</topiaVersion> + <flywayVersion>5.0.0</flywayVersion> <nuitonWebVersion>1.19</nuitonWebVersion> <nuitonUtilsVersion>3.0-rc-17</nuitonUtilsVersion> @@ -195,7 +195,7 @@ <jettyVersion>9.0.3.v20130506</jettyVersion> <tomcatEmbedVersion>7.0.50</tomcatEmbedVersion> <!--tomcatEmbedVersion>8.0.5</tomcatEmbedVersion--> - <hibernateVersion>5.1.3.Final</hibernateVersion> + <hibernateVersion>5.2.10.Final</hibernateVersion> <seleniumVersion>2.33.0</seleniumVersion> <httpCommonsHttpclientVersion>4.5.2</httpCommonsHttpclientVersion> @@ -348,23 +348,6 @@ </dependency> <dependency> - <groupId>com.zaxxer</groupId> - <artifactId>HikariCP</artifactId> - <version>2.5.1</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-hikaricp</artifactId> - <version>${hibernateVersion}</version> - <exclusions> - <exclusion> - <groupId>com.zaxxer</groupId> - <artifactId>HikariCP-java6</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> <groupId>com.esotericsoftware.yamlbeans</groupId> <artifactId>yamlbeans</artifactId> <version>1.11</version> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.