This is an automated email from the git hooks/post-receive script. New change to branch develop in repository topia. See http://git.nuiton.org/topia.git from 575ab86 Merge branch 'feature/3858_javadoc_jdk8' into 'develop' new c90f4df Use nuiton-version API in migration service (See #3864) new 996819b Fixes #3864 Merge branch 'feature/3864_use_nuiton_version' into develop The 2 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 996819b6094770ed628e0d07f87ff9bc28bb921e Merge: 575ab86 c90f4df Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Jan 10 15:17:02 2016 +0100 Fixes #3864 Merge branch 'feature/3864_use_nuiton_version' into develop commit c90f4df06575979dd5112f9697e76fd189ca0823 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Jan 10 15:16:59 2016 +0100 Use nuiton-version API in migration service (See #3864) Summary of changes: pom.xml | 6 ++++++ topia-service-migration/pom.xml | 4 ++++ .../topia/migration/AbstractTopiaMigrationCallback.java | 6 +++--- .../topia/migration/TopiaMigrationCallbackByClass.java | 2 +- .../topia/migration/TopiaMigrationCallbackByClassNG.java | 4 ++-- .../topia/migration/TopiaMigrationCallbackByMethod.java | 2 +- .../org/nuiton/topia/migration/TopiaMigrationEngine.java | 6 +++--- .../org/nuiton/topia/migration/mappings/TMSVersion.java | 4 ++-- .../nuiton/topia/migration/mappings/TMSVersionDAO.java | 2 +- .../topia/migration/mappings/TMSVersionHibernateDao.java | 16 ++++++++-------- .../migration/TestMigrationCallbackAddB71NameColumn.java | 8 ++++---- .../TestMigrationCallbackCreateWhateverTable.java | 4 ++-- .../topia/migration/TestMigrationCallbackDoNothing.java | 4 ++-- 13 files changed, 39 insertions(+), 29 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See http://git.nuiton.org/topia.git commit c90f4df06575979dd5112f9697e76fd189ca0823 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Jan 10 15:16:59 2016 +0100 Use nuiton-version API in migration service (See #3864) --- pom.xml | 6 ++++++ topia-service-migration/pom.xml | 4 ++++ .../topia/migration/AbstractTopiaMigrationCallback.java | 6 +++--- .../topia/migration/TopiaMigrationCallbackByClass.java | 2 +- .../topia/migration/TopiaMigrationCallbackByClassNG.java | 4 ++-- .../topia/migration/TopiaMigrationCallbackByMethod.java | 2 +- .../org/nuiton/topia/migration/TopiaMigrationEngine.java | 6 +++--- .../org/nuiton/topia/migration/mappings/TMSVersion.java | 4 ++-- .../nuiton/topia/migration/mappings/TMSVersionDAO.java | 2 +- .../topia/migration/mappings/TMSVersionHibernateDao.java | 16 ++++++++-------- .../migration/TestMigrationCallbackAddB71NameColumn.java | 8 ++++---- .../TestMigrationCallbackCreateWhateverTable.java | 4 ++-- .../topia/migration/TestMigrationCallbackDoNothing.java | 4 ++-- 13 files changed, 39 insertions(+), 29 deletions(-) diff --git a/pom.xml b/pom.xml index b2a0128..0ae5a9b 100644 --- a/pom.xml +++ b/pom.xml @@ -302,6 +302,12 @@ </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-version</artifactId> + <version>1.0-SNAPSHOT</version> + </dependency> + + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> <version>${hibernateVersion}</version> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index 6db6fb5..f30c7ba 100644 --- a/topia-service-migration/pom.xml +++ b/topia-service-migration/pom.xml @@ -66,6 +66,10 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-version</artifactId> + </dependency> <dependency> <groupId>org.apache.commons</groupId> diff --git a/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java b/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java index 3e8000e..a74ec25 100644 --- a/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java +++ b/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java @@ -24,8 +24,6 @@ package org.nuiton.topia.migration; * #L% */ -import java.util.List; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.Session; @@ -37,7 +35,9 @@ import org.nuiton.topia.persistence.internal.support.HibernateTopiaSqlSupport; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import org.nuiton.topia.persistence.util.TopiaUtil; import org.nuiton.util.StringUtil; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; + +import java.util.List; /** * Abstract migration callback. diff --git a/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClass.java b/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClass.java index 4c9bc2d..d43a4a4 100644 --- a/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClass.java +++ b/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClass.java @@ -27,7 +27,7 @@ package org.nuiton.topia.migration; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import org.nuiton.util.ObjectUtil; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import java.util.ArrayList; import java.util.Arrays; diff --git a/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClassNG.java b/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClassNG.java index b53b639..d97315e 100644 --- a/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClassNG.java +++ b/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClassNG.java @@ -28,8 +28,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.support.TopiaSqlSupport; -import org.nuiton.util.version.Version; -import org.nuiton.util.version.VersionComparator; +import org.nuiton.version.Version; +import org.nuiton.version.VersionComparator; import java.util.ArrayList; import java.util.List; diff --git a/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByMethod.java b/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByMethod.java index da7f697..d19c24c 100644 --- a/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByMethod.java +++ b/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByMethod.java @@ -28,7 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaPersistenceContext; import org.nuiton.topia.persistence.support.TopiaSqlSupport; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import java.lang.reflect.Method; diff --git a/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java b/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java index 65c3cf3..f457a49 100644 --- a/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java +++ b/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java @@ -41,9 +41,9 @@ import org.nuiton.topia.persistence.TopiaMigrationServiceException; import org.nuiton.topia.persistence.internal.AbstractTopiaApplicationContext; import org.nuiton.topia.persistence.internal.HibernateProvider; import org.nuiton.topia.persistence.util.TopiaUtil; -import org.nuiton.util.version.Version; -import org.nuiton.util.version.VersionBuilder; -import org.nuiton.util.version.VersionComparator; +import org.nuiton.version.Version; +import org.nuiton.version.VersionBuilder; +import org.nuiton.version.VersionComparator; import java.util.ArrayList; import java.util.Arrays; diff --git a/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersion.java b/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersion.java index 5fb1702..6583687 100644 --- a/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersion.java +++ b/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersion.java @@ -25,8 +25,8 @@ package org.nuiton.topia.migration.mappings; */ import org.apache.commons.lang3.StringUtils; -import org.nuiton.util.version.Version; -import org.nuiton.util.version.VersionBuilder; +import org.nuiton.version.Version; +import org.nuiton.version.VersionBuilder; import java.io.Serializable; diff --git a/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java b/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java index 2161e01..75f10ce 100644 --- a/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java +++ b/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java @@ -28,7 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.support.TopiaHibernateSupport; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; /** * TMSVersion DAO helper. diff --git a/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionHibernateDao.java b/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionHibernateDao.java index 41045e9..bd3f10b 100644 --- a/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionHibernateDao.java +++ b/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionHibernateDao.java @@ -24,12 +24,6 @@ package org.nuiton.topia.migration.mappings; * #L% */ -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.List; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.Criteria; @@ -40,8 +34,14 @@ import org.hibernate.jdbc.Work; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.util.TopiaUtil; -import org.nuiton.util.version.Version; -import org.nuiton.util.version.VersionBuilder; +import org.nuiton.version.Version; +import org.nuiton.version.VersionBuilder; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.List; /** * TMSVersion DAO helper. diff --git a/topia-service-migration/src/test/java/org/nuiton/topia/migration/TestMigrationCallbackAddB71NameColumn.java b/topia-service-migration/src/test/java/org/nuiton/topia/migration/TestMigrationCallbackAddB71NameColumn.java index 2b84b0b..04c11d0 100644 --- a/topia-service-migration/src/test/java/org/nuiton/topia/migration/TestMigrationCallbackAddB71NameColumn.java +++ b/topia-service-migration/src/test/java/org/nuiton/topia/migration/TestMigrationCallbackAddB71NameColumn.java @@ -24,11 +24,11 @@ package org.nuiton.topia.migration; * #L% */ -import java.util.List; - import org.nuiton.topia.persistence.support.TopiaSqlSupport; -import org.nuiton.util.version.Version; -import org.nuiton.util.version.VersionBuilder; +import org.nuiton.version.Version; +import org.nuiton.version.VersionBuilder; + +import java.util.List; /** * @author Arnaud Thimel (Code Lutin) diff --git a/topia-service-migration/src/test/java/org/nuiton/topia/migration/TestMigrationCallbackCreateWhateverTable.java b/topia-service-migration/src/test/java/org/nuiton/topia/migration/TestMigrationCallbackCreateWhateverTable.java index 5cc639a..b6ce253 100644 --- a/topia-service-migration/src/test/java/org/nuiton/topia/migration/TestMigrationCallbackCreateWhateverTable.java +++ b/topia-service-migration/src/test/java/org/nuiton/topia/migration/TestMigrationCallbackCreateWhateverTable.java @@ -27,8 +27,8 @@ package org.nuiton.topia.migration; import java.util.List; import org.nuiton.topia.persistence.support.TopiaSqlSupport; -import org.nuiton.util.version.Version; -import org.nuiton.util.version.VersionBuilder; +import org.nuiton.version.Version; +import org.nuiton.version.VersionBuilder; /** * @author Arnaud Thimel (Code Lutin) diff --git a/topia-service-migration/src/test/java/org/nuiton/topia/migration/TestMigrationCallbackDoNothing.java b/topia-service-migration/src/test/java/org/nuiton/topia/migration/TestMigrationCallbackDoNothing.java index 4aa0457..00d0ba9 100644 --- a/topia-service-migration/src/test/java/org/nuiton/topia/migration/TestMigrationCallbackDoNothing.java +++ b/topia-service-migration/src/test/java/org/nuiton/topia/migration/TestMigrationCallbackDoNothing.java @@ -27,8 +27,8 @@ package org.nuiton.topia.migration; import java.util.List; import org.nuiton.topia.persistence.support.TopiaSqlSupport; -import org.nuiton.util.version.Version; -import org.nuiton.util.version.VersionBuilder; +import org.nuiton.version.Version; +import org.nuiton.version.VersionBuilder; /** * @author Arnaud Thimel (Code Lutin) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See http://git.nuiton.org/topia.git commit 996819b6094770ed628e0d07f87ff9bc28bb921e Merge: 575ab86 c90f4df Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Jan 10 15:17:02 2016 +0100 Fixes #3864 Merge branch 'feature/3864_use_nuiton_version' into develop pom.xml | 6 ++++++ topia-service-migration/pom.xml | 4 ++++ .../topia/migration/AbstractTopiaMigrationCallback.java | 6 +++--- .../topia/migration/TopiaMigrationCallbackByClass.java | 2 +- .../topia/migration/TopiaMigrationCallbackByClassNG.java | 4 ++-- .../topia/migration/TopiaMigrationCallbackByMethod.java | 2 +- .../org/nuiton/topia/migration/TopiaMigrationEngine.java | 6 +++--- .../org/nuiton/topia/migration/mappings/TMSVersion.java | 4 ++-- .../nuiton/topia/migration/mappings/TMSVersionDAO.java | 2 +- .../topia/migration/mappings/TMSVersionHibernateDao.java | 16 ++++++++-------- .../migration/TestMigrationCallbackAddB71NameColumn.java | 8 ++++---- .../TestMigrationCallbackCreateWhateverTable.java | 4 ++-- .../topia/migration/TestMigrationCallbackDoNothing.java | 4 ++-- 13 files changed, 39 insertions(+), 29 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm