branch develop-4.2.x updated (35f7249 -> e2c8a1d)
This is an automated email from the git hooks/post-receive script. New change to branch develop-4.2.x in repository tutti. See http://git.codelutin.com/tutti.git from 35f7249 ajout de la conf des branches new 924f4a1 Use next snapshot version + use nuiton-version library new e2c8a1d Migrate o.n.u.v.Version to o.n.v.Version 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 e2c8a1dc781e74f7a17fc877d03fd46a4ea5c8e9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jan 18 12:17:57 2016 +0100 Migrate o.n.u.v.Version to o.n.v.Version commit 924f4a1278e3ea1ea80697db11be9bcac09d3429 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jan 18 12:17:34 2016 +0100 Use next snapshot version + use nuiton-version library Summary of changes: pom.xml | 11 ++++++++--- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 6 +++++- .../src/main/java/fr/ifremer/tutti/TuttiConfiguration.java | 2 +- .../main/java/fr/ifremer/tutti/TuttiConfigurationOption.java | 2 +- .../fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java | 2 +- .../ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java | 2 +- .../persistence/service/TechnicalPersistenceService.java | 2 +- .../persistence/service/TechnicalPersistenceServiceImpl.java | 8 ++++---- .../persistence/service/UpdateSchemaContextSupport.java | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 12 ++++-------- .../java/fr/ifremer/tutti/service/PersistenceService.java | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 6 +++++- .../tutti/ui/swing/content/db/DbManagerUIHandler.java | 2 +- .../tutti/ui/swing/content/db/actions/ImportDbAction.java | 2 +- .../tutti/ui/swing/content/db/actions/OpenDbAction.java | 2 +- .../tutti/ui/swing/update/module/TuttiModuleUpdater.java | 4 ++-- 19 files changed, 41 insertions(+), 32 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.2.x in repository tutti. See http://git.codelutin.com/tutti.git commit 924f4a1278e3ea1ea80697db11be9bcac09d3429 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jan 18 12:17:34 2016 +0100 Use next snapshot version + use nuiton-version library --- pom.xml | 11 ++++++++--- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 6 +++++- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 12 ++++-------- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 6 +++++- 7 files changed, 25 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 00d30b9..07d307c 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2.1</version> + <version>4.2.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> @@ -125,7 +125,7 @@ <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonValidatorVersion>3.0</nuitonValidatorVersion> <eugenePluginVersion>2.14</eugenePluginVersion> - <jaxxVersion>2.27</jaxxVersion> + <jaxxVersion>2.29-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <slf4jVersion>1.7.13</slf4jVersion> <!-- Can't use now adagio previous to 3.9.1 after this version --> @@ -236,7 +236,12 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>3.0-rc-2</version> + <version>3.0-rc-3</version> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-version</artifactId> + <version>1.0-rc-1</version> </dependency> <dependency> <groupId>org.nuiton</groupId> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 0c5a9d3..4608589 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2.1</version> + <version>4.2.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 2f1eab7..18ab49a 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2.1</version> + <version>4.2.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> @@ -88,6 +88,10 @@ <!-- Nuiton --> <dependency> <groupId>org.nuiton</groupId> + <artifactId>nuiton-version</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> <dependency> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 85ebdcd..0a61514 100644 --- a/tutti-report-generator/pom.xml +++ b/tutti-report-generator/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2.1</version> + <version>4.2.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 61bfc9e..023a993 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2.1</version> + <version>4.2.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> @@ -63,15 +63,15 @@ <!-- Nuiton --> <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> + <artifactId>nuiton-version</artifactId> </dependency> <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-decorator</artifactId> + <artifactId>nuiton-utils</artifactId> </dependency> <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-config</artifactId> + <artifactId>nuiton-decorator</artifactId> </dependency> <dependency> <groupId>org.nuiton.i18n</groupId> @@ -85,10 +85,6 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-converter</artifactId> - </dependency> <!-- Guava --> <dependency> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index e9c9370..466e1d7 100644 --- a/tutti-ui-swing-updater/pom.xml +++ b/tutti-ui-swing-updater/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2.1</version> + <version>4.2.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 341a4ba..92216e8 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2.1</version> + <version>4.2.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> @@ -131,6 +131,10 @@ <!-- Nuiton --> <dependency> <groupId>org.nuiton</groupId> + <artifactId>nuiton-version</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> <dependency> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.2.x in repository tutti. See http://git.codelutin.com/tutti.git commit e2c8a1dc781e74f7a17fc877d03fd46a4ea5c8e9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jan 18 12:17:57 2016 +0100 Migrate o.n.u.v.Version to o.n.v.Version --- .../src/main/java/fr/ifremer/tutti/TuttiConfiguration.java | 2 +- .../src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java | 2 +- .../java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java | 2 +- .../fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java | 2 +- .../tutti/persistence/service/TechnicalPersistenceService.java | 2 +- .../persistence/service/TechnicalPersistenceServiceImpl.java | 8 ++++---- .../tutti/persistence/service/UpdateSchemaContextSupport.java | 2 +- .../main/java/fr/ifremer/tutti/service/PersistenceService.java | 2 +- .../fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java | 2 +- .../ifremer/tutti/ui/swing/content/db/actions/ImportDbAction.java | 2 +- .../ifremer/tutti/ui/swing/content/db/actions/OpenDbAction.java | 2 +- .../ifremer/tutti/ui/swing/update/module/TuttiModuleUpdater.java | 4 ++-- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java index 4dcd244..905245c 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java @@ -40,7 +40,7 @@ import org.nuiton.config.ConfigOptionDef; import org.nuiton.jaxx.application.ApplicationConfiguration; import org.nuiton.jaxx.application.ApplicationIOUtil; import org.nuiton.jaxx.application.ApplicationTechnicalException; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import javax.swing.KeyStroke; import java.awt.Color; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java index 1beeb5b..7b406a8 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java @@ -28,7 +28,7 @@ import fr.ifremer.tutti.type.WeightUnit; import org.hibernate.dialect.HSQLDialect; import org.hsqldb.jdbcDriver; import org.nuiton.config.ConfigOptionDef; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import javax.swing.KeyStroke; import java.awt.Color; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java index cdb649b..ff86ba7 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java @@ -84,7 +84,7 @@ import fr.ifremer.tutti.util.Jdbcs; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import javax.annotation.Resource; import java.io.File; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java index 2012d08..b97cca9 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java @@ -51,7 +51,7 @@ import fr.ifremer.tutti.persistence.entities.referential.TuttiReferentialEntity; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.persistence.model.ProgramDataModel; import fr.ifremer.tutti.persistence.service.UpdateSchemaContextSupport; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import java.io.File; import java.io.IOException; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TechnicalPersistenceService.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TechnicalPersistenceService.java index 341db16..6ae89dc 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TechnicalPersistenceService.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TechnicalPersistenceService.java @@ -24,7 +24,7 @@ package fr.ifremer.tutti.persistence.service; import fr.ifremer.tutti.persistence.TuttiPersistenceServiceImplementor; import fr.ifremer.tutti.persistence.entities.referential.TuttiReferentialEntity; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import org.springframework.transaction.annotation.Transactional; import java.util.concurrent.Callable; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TechnicalPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TechnicalPersistenceServiceImpl.java index d0989ee..fff1b5f 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TechnicalPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TechnicalPersistenceServiceImpl.java @@ -34,8 +34,8 @@ import fr.ifremer.tutti.persistence.entities.referential.TuttiReferentialEntity; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.ApplicationTechnicalException; -import org.nuiton.util.version.Version; -import org.nuiton.util.version.Versions; +import org.nuiton.version.Version; +import org.nuiton.version.Versions; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -79,7 +79,7 @@ public class TechnicalPersistenceServiceImpl extends AbstractPersistenceService public Version getSchemaVersion() { Version version; try { - version = databaseSchemaDao.getSchemaVersion(); + version = Versions.valueOf(databaseSchemaDao.getSchemaVersion().getVersion()); } catch (VersionNotFoundException e) { if (log.isErrorEnabled()) { log.error("Could not find db version", e); @@ -91,7 +91,7 @@ public class TechnicalPersistenceServiceImpl extends AbstractPersistenceService @Override public Version getSchemaVersionIfUpdate() { - Version version = databaseSchemaDao.getSchemaVersionIfUpdate(); + Version version = Versions.valueOf(databaseSchemaDao.getSchemaVersionIfUpdate().getVersion()); return Versions.valueOf(version.toString()); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/UpdateSchemaContextSupport.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/UpdateSchemaContextSupport.java index 2131132..f734012 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/UpdateSchemaContextSupport.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/UpdateSchemaContextSupport.java @@ -26,7 +26,7 @@ package fr.ifremer.tutti.persistence.service; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; /** * Created on 1/12/15. diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java index b3b66aa..75cfb3b 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java @@ -80,7 +80,7 @@ import org.apache.commons.vfs2.FileType; import org.nuiton.jaxx.application.ApplicationBusinessException; import org.nuiton.jaxx.application.ApplicationIOUtil; import org.nuiton.util.TimeLog; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import java.io.File; import java.io.IOException; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java index ea1e567..67be62a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java @@ -32,7 +32,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.updater.ApplicationInfo; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import javax.swing.JComponent; import javax.swing.SwingUtilities; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/actions/ImportDbAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/actions/ImportDbAction.java index d175cfb..457baee 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/actions/ImportDbAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/actions/ImportDbAction.java @@ -34,7 +34,7 @@ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.ApplicationBusinessException; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import javax.swing.JOptionPane; import java.io.File; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/actions/OpenDbAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/actions/OpenDbAction.java index 56c1d35..d4d864a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/actions/OpenDbAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/actions/OpenDbAction.java @@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.ApplicationBusinessException; import org.nuiton.jaxx.application.swing.action.ApplicationUIAction; import org.nuiton.updater.ApplicationInfo; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import javax.swing.JOptionPane; import java.io.File; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/update/module/TuttiModuleUpdater.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/update/module/TuttiModuleUpdater.java index e877ef8..b232189 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/update/module/TuttiModuleUpdater.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/update/module/TuttiModuleUpdater.java @@ -32,8 +32,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.ApplicationIOUtil; import org.nuiton.updater.ApplicationInfo; -import org.nuiton.util.version.Version; -import org.nuiton.util.version.Versions; +import org.nuiton.version.Version; +import org.nuiton.version.Versions; import java.io.File; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm