This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 7de707e6a6054e0f7e4212d2fc47c87e081bb9eb Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 23 13:23:01 2014 +0200 use nuiton-updater, nuiton-utils snapshot + fix some deprecated codes --- pom.xml | 4 ++-- .../tutti/persistence/service/TechnicalPersistenceServiceImpl.java | 6 +++--- .../java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java | 6 +++--- .../tutti/persistence/config/TuttiPersistenceConfigTest.java | 2 +- .../src/test/java/fr/ifremer/tutti/service/AbstractServiceTest.java | 3 +-- .../src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 2 +- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 868e287..85cde34 100644 --- a/pom.xml +++ b/pom.xml @@ -227,7 +227,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>3.0-rc-5</version> + <version>3.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.nuiton</groupId> @@ -242,7 +242,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-updater</artifactId> - <version>3.0-alpha-2</version> + <version>3.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.nuiton</groupId> 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 2e0807b..831819c 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 @@ -31,7 +31,7 @@ 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.VersionUtil; +import org.nuiton.util.version.VersionBuilder; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -87,13 +87,13 @@ public class TechnicalPersistenceServiceImpl extends AbstractPersistenceService } version = null; } - return version == null ? null : VersionUtil.valueOf(version.toString()); + return version == null ? null : VersionBuilder.create(version.toString()).build(); } @Override public Version getApplicationVersion() { fr.ifremer.adagio.core.dao.technical.Version version = databaseSchemaDao.getSchemaVersionIfUpdate(); - return VersionUtil.valueOf(version.toString()); + return VersionBuilder.create(version.toString()).build(); } @Override diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java index e5bff5a..1a372ba 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java @@ -54,7 +54,7 @@ import fr.ifremer.tutti.persistence.service.ReferentialPersistenceService; import fr.ifremer.tutti.persistence.service.TuttiPersistenceServiceLocator; import org.junit.Assert; import org.nuiton.util.version.Version; -import org.nuiton.util.version.VersionUtil; +import org.nuiton.util.version.VersionBuilder; import java.io.Serializable; import java.util.Calendar; @@ -71,11 +71,11 @@ import java.util.List; public class DatabaseFixtures { public Version lastAdagioSchemaVersion() { - return VersionUtil.valueOf("3.5.0"); + return VersionBuilder.create("3.5.0").build(); } public Version currentAdagioSchemaVersion() { - return VersionUtil.valueOf("3.2.1.01"); + return VersionBuilder.create("3.2.1.01").build(); } public String programCode() { diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigTest.java index 45ea4f1..98e159c 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigTest.java @@ -35,7 +35,7 @@ import org.junit.rules.TestName; import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ArgumentsParserException; import org.nuiton.util.FileUtil; -import org.nuiton.util.converter.ConverterUtil; +import org.nuiton.converter.ConverterUtil; import java.io.File; diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/AbstractServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/AbstractServiceTest.java index 1c25b43..223d6d9 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/AbstractServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/AbstractServiceTest.java @@ -24,7 +24,6 @@ package fr.ifremer.tutti.service; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.TuttiConfigurationOption; -import fr.ifremer.tutti.persistence.RessourceClassLoader; import org.apache.commons.io.FileUtils; import org.junit.After; import org.junit.Before; @@ -32,7 +31,7 @@ import org.junit.Rule; import org.junit.rules.TestName; import org.nuiton.config.ApplicationConfig; import org.nuiton.util.FileUtil; -import org.nuiton.util.converter.ConverterUtil; +import org.nuiton.converter.ConverterUtil; import java.io.File; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java index 2f81d08..9e89567 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java @@ -79,7 +79,7 @@ import org.nuiton.jaxx.application.swing.action.ApplicationActionEngine; import org.nuiton.jaxx.application.swing.action.ApplicationActionFactory; import org.nuiton.jaxx.application.swing.action.ApplicationActionUI; import org.nuiton.jaxx.application.swing.util.ApplicationErrorHelper; -import org.nuiton.util.converter.ConverterUtil; +import org.nuiton.converter.ConverterUtil; import javax.swing.JOptionPane; import java.awt.Color; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.