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 24669c3905e53380702aff7b59be39c52d28cceb Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Sat Nov 14 09:22:54 2015 +0100 Update topia, eugene, hibernate (4.3) --- pollen-persistence/pom.xml | 1 + pollen-persistence/src/main/xmi/pollen.properties | 3 +-- .../chorem/pollen/entities/migration/PollenMigrationCallback.java | 8 ++++---- .../pollen/entities/migration/PollenMigrationCallbackV1_1.java | 8 ++++---- .../pollen/entities/migration/PollenMigrationCallbackV1_2.java | 8 ++++---- .../pollen/entities/migration/PollenMigrationCallbackV1_3.java | 6 +++--- .../pollen/entities/migration/PollenMigrationCallbackV1_3_1.java | 8 ++++---- .../pollen/entities/migration/PollenMigrationCallbackV1_4.java | 8 ++++---- .../pollen/entities/migration/PollenMigrationCallbackV1_4_5.java | 8 ++++---- .../pollen/entities/migration/PollenMigrationCallbackV1_5.java | 8 ++++---- pom.xml | 6 +++--- 11 files changed, 36 insertions(+), 36 deletions(-) diff --git a/pollen-persistence/pom.xml b/pollen-persistence/pom.xml index b30d03d..b56ab8c 100644 --- a/pollen-persistence/pom.xml +++ b/pollen-persistence/pom.xml @@ -120,6 +120,7 @@ org.nuiton.topia.generator.TopiaMetaTransformer, org.nuiton.topia.generator.BinderHelperTransformer </templates> + <failIfUnsafe>false</failIfUnsafe> </configuration> <goals> <goal>generate</goal> diff --git a/pollen-persistence/src/main/xmi/pollen.properties b/pollen-persistence/src/main/xmi/pollen.properties index 0bec073..d4ed772 100644 --- a/pollen-persistence/src/main/xmi/pollen.properties +++ b/pollen-persistence/src/main/xmi/pollen.properties @@ -25,10 +25,9 @@ model.tagvalue.notGenerateToString=true model.tagvalue.constantPrefix=PROPERTY_ model.tagvalue.java.lang.String=text model.tagvalue.version=1.5 -model.tagvalue.doNotGenerateBooleanGetMethods=true model.tagvalue.indexForeignKeys=true -org.chorem.pollen.business.persistence.Poll.attribute.choice.stereotype=indexed +org.chorem.pollen.business.persistence.Poll.attribute.choice.stereotype=indexedCollection org.chorem.pollen.business.persistence.Poll.attribute.vote.stereotype=ordered org.chorem.pollen.business.persistence.Poll.attribute.vote.tagvalue.orderBy=topiaCreateDate diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java index 79e6523..2116b8e 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java @@ -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 @@ -24,8 +24,8 @@ package org.chorem.pollen.entities.migration; import org.chorem.pollen.entities.PollenDAOHelper; import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; -import org.nuiton.util.Version; -import org.nuiton.util.VersionUtil; +import org.nuiton.util.version.Version; +import org.nuiton.util.version.Versions; import java.util.List; @@ -43,7 +43,7 @@ public class PollenMigrationCallback extends TopiaMigrationCallbackByClassNG { @Override public Version getApplicationVersion() { - return VersionUtil.valueOf(PollenDAOHelper.getModelVersion()); + return Versions.valueOf(PollenDAOHelper.getModelVersion()); } @Override 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 6dd5ddd..16986bf 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 @@ -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,8 +28,8 @@ import org.hibernate.dialect.PostgreSQLDialect; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; -import org.nuiton.util.Version; -import org.nuiton.util.VersionUtil; +import org.nuiton.util.version.Version; +import org.nuiton.util.version.Versions; import java.util.Arrays; import java.util.List; @@ -44,7 +44,7 @@ public class PollenMigrationCallbackV1_1 extends TopiaMigrationCallbackByClassNG @Override public Version getVersion() { - return VersionUtil.valueOf("1.1"); + return Versions.valueOf("1.1"); } @Override 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 48e304b..175ff7e 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 @@ -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,8 +28,8 @@ import org.hibernate.dialect.PostgreSQLDialect; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; -import org.nuiton.util.Version; -import org.nuiton.util.VersionUtil; +import org.nuiton.util.version.Version; +import org.nuiton.util.version.Versions; import java.util.Arrays; import java.util.List; @@ -44,7 +44,7 @@ public class PollenMigrationCallbackV1_2 extends TopiaMigrationCallbackByClassNG @Override public Version getVersion() { - return VersionUtil.valueOf("1.2"); + return Versions.valueOf("1.2"); } @Override 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 d2aa507..43a0f23 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 @@ -32,8 +32,8 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.framework.TopiaSQLQuery; import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; -import org.nuiton.util.Version; -import org.nuiton.util.VersionUtil; +import org.nuiton.util.version.Version; +import org.nuiton.util.version.Versions; import java.sql.Connection; import java.sql.PreparedStatement; @@ -52,7 +52,7 @@ public class PollenMigrationCallbackV1_3 extends TopiaMigrationCallbackByClassNG @Override public Version getVersion() { - return VersionUtil.valueOf("1.3"); + return Versions.valueOf("1.3"); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3_1.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3_1.java index 9461626..c50cdc0 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3_1.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3_1.java @@ -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 @@ -26,8 +26,8 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.framework.TopiaSQLQuery; import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; -import org.nuiton.util.Version; -import org.nuiton.util.VersionUtil; +import org.nuiton.util.version.Version; +import org.nuiton.util.version.Versions; import java.sql.Connection; import java.sql.PreparedStatement; @@ -45,7 +45,7 @@ public class PollenMigrationCallbackV1_3_1 extends TopiaMigrationCallbackByClass @Override public Version getVersion() { - return VersionUtil.valueOf("1.3.1"); + return Versions.valueOf("1.3.1"); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java index d844dee..27ad9f1 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java @@ -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 @@ -43,8 +43,8 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.framework.TopiaSQLQuery; import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; -import org.nuiton.util.Version; -import org.nuiton.util.VersionUtil; +import org.nuiton.util.version.Version; +import org.nuiton.util.version.Versions; import java.io.File; import java.io.IOException; @@ -69,7 +69,7 @@ public class PollenMigrationCallbackV1_4 extends TopiaMigrationCallbackByClassNG @Override public Version getVersion() { - return VersionUtil.valueOf("1.4"); + return Versions.valueOf("1.4"); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4_5.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4_5.java index a8c7950..16d94f3 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4_5.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4_5.java @@ -5,7 +5,7 @@ package org.chorem.pollen.entities.migration; * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012 CodeLutin, Tony Chemit + * Copyright (C) 2012 - 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 @@ -26,8 +26,8 @@ import org.chorem.pollen.business.persistence.Poll; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; -import org.nuiton.util.Version; -import org.nuiton.util.VersionUtil; +import org.nuiton.util.version.Version; +import org.nuiton.util.version.Versions; import java.util.List; @@ -41,7 +41,7 @@ public class PollenMigrationCallbackV1_4_5 extends TopiaMigrationCallbackByClass @Override public Version getVersion() { - return VersionUtil.valueOf("1.4.5"); + return Versions.valueOf("1.4.5"); } @Override diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_5.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_5.java index c54750d..83c1fbd 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_5.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_5.java @@ -6,7 +6,7 @@ package org.chorem.pollen.entities.migration; * $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 @@ -45,8 +45,8 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.framework.TopiaSQLQuery; import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; -import org.nuiton.util.Version; -import org.nuiton.util.VersionUtil; +import org.nuiton.util.version.Version; +import org.nuiton.util.version.Versions; import java.sql.Connection; import java.sql.PreparedStatement; @@ -71,7 +71,7 @@ public class PollenMigrationCallbackV1_5 extends TopiaMigrationCallbackByClassNG @Override public Version getVersion() { - return VersionUtil.valueOf("1.5"); + return Versions.valueOf("1.5"); } @Override diff --git a/pom.xml b/pom.xml index 2dd3bb5..315835f 100644 --- a/pom.xml +++ b/pom.xml @@ -154,8 +154,8 @@ <projectId>pollen</projectId> <!-- customized versions --> - <topiaVersion>2.8</topiaVersion> - <eugenePluginVersion>2.6.3</eugenePluginVersion> + <topiaVersion>2.11</topiaVersion> + <eugenePluginVersion>3.0-alpha-1</eugenePluginVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonWebVersion>1.18-SNAPSHOT</nuitonWebVersion> <nuitonUtilsVersion>3.0-rc-8</nuitonUtilsVersion> @@ -168,7 +168,7 @@ <slf4jVersion>1.7.13</slf4jVersion> <jettyVersion>9.3.6.v20151106</jettyVersion> <jettyPluginVersion>9.3.6.v20151106</jettyPluginVersion> - <hibernateVersion>4.2.21.Final</hibernateVersion> + <hibernateVersion>4.3.11.Final</hibernateVersion> <seleniumVersion>2.48.2</seleniumVersion> <mockitoVersion>1.10.19</mockitoVersion> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.