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 0f6d16ba9db44c583a617e8ec4f12cdba8354f61 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Sat Nov 14 09:27:48 2015 +0100 Update postgresql --- .../entities/migration/PollenMigrationCallbackV1_1.java | 11 ++++++----- .../entities/migration/PollenMigrationCallbackV1_2.java | 11 ++++++----- .../entities/migration/PollenMigrationCallbackV1_3.java | 2 +- pom.xml | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java index 16986bf..ec1c02a 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java @@ -22,18 +22,18 @@ */ package org.chorem.pollen.entities.migration; +import java.util.Arrays; +import java.util.List; + import org.hibernate.dialect.Dialect; import org.hibernate.dialect.H2Dialect; -import org.hibernate.dialect.PostgreSQLDialect; +import org.hibernate.dialect.PostgreSQL81Dialect; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; import org.nuiton.util.version.Version; import org.nuiton.util.version.Versions; -import java.util.Arrays; -import java.util.List; - /** * Migration for version {@code 1.1}. * @@ -60,7 +60,8 @@ public class PollenMigrationCallbackV1_1 extends TopiaMigrationCallbackByClassNG String[] sqls = null; // Script de migration - if (dialect instanceof PostgreSQLDialect) { + // PostgreSQL81Dialect must match PostgreSQLDialect and PostgreSQL9Dialect + if (dialect instanceof PostgreSQL81Dialect) { sqls = new String[]{ "alter table useraccount rename langage to language;", "alter table pollaccount add accountid varchar;", diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java index 175ff7e..a8e2e70 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java @@ -22,18 +22,18 @@ */ package org.chorem.pollen.entities.migration; +import java.util.Arrays; +import java.util.List; + import org.hibernate.dialect.Dialect; import org.hibernate.dialect.H2Dialect; -import org.hibernate.dialect.PostgreSQLDialect; +import org.hibernate.dialect.PostgreSQL81Dialect; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; import org.nuiton.util.version.Version; import org.nuiton.util.version.Versions; -import java.util.Arrays; -import java.util.List; - /** * Migration for version {@code 1.2}. * @@ -59,7 +59,8 @@ public class PollenMigrationCallbackV1_2 extends TopiaMigrationCallbackByClassNG String[] sqls = null; - if (dialect instanceof PostgreSQLDialect) { + // PostgreSQL81Dialect must match PostgreSQLDialect and PostgreSQL9Dialect + if (dialect instanceof PostgreSQL81Dialect) { sqls = new String[]{ "alter table poll add endchoicedate timestamp without time zone;"}; } else if (dialect instanceof H2Dialect) { diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java index 43a0f23..edc5443 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java @@ -236,7 +236,7 @@ public class PollenMigrationCallbackV1_3 extends TopiaMigrationCallbackByClassNG // build the new mapping between old id associated to new enum ordinal Map<String, Integer> result = Maps.newHashMap(); - for (Enum choiceType : enums) { + for (Enum<E> choiceType : enums) { // find it in existing mapping String name = choiceType.name(); diff --git a/pom.xml b/pom.xml index 315835f..1939c54 100644 --- a/pom.xml +++ b/pom.xml @@ -161,7 +161,7 @@ <nuitonUtilsVersion>3.0-rc-8</nuitonUtilsVersion> <h2Version>1.3.176</h2Version> - <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> + <postgresqlVersion>9.4-1205-jdbc41</postgresqlVersion> <struts2Version>2.3.15.3</struts2Version> <jqueryPluginVersion>3.5.0</jqueryPluginVersion> <shiroVersion>1.2.4</shiroVersion> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.