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 4b094f092f43c977b28d26686ec5f6dd298fef10 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Jan 10 16:21:24 2016 +0100 Utilisation de nuiton-version et on passe en snpshot --- observe-application-swing/pom.xml | 4 ++++ .../observe/configuration/ObserveSwingApplicationConfig.java | 4 ++-- .../configuration/ObserveSwingApplicationConfigOption.java | 2 +- .../main/java/fr/ird/observe/db/ObserveSwingDataSource.java | 2 +- .../java/fr/ird/observe/ui/storage/ObstunaAdminAction.java | 4 ++-- .../main/java/fr/ird/observe/ui/storage/StorageUIHandler.java | 2 +- .../main/java/fr/ird/observe/ui/storage/StorageUIModel.java | 2 +- observe-application-web/pom.xml | 2 +- .../observe/application/web/ObserveWebApplicationContext.java | 2 +- .../web/configuration/ObserveWebApplicationConfiguration.java | 2 +- .../ObserveWebApplicationConfigurationOption.java | 2 +- .../application/web/controller/v1/PingServiceController.java | 2 +- .../web/security/ObserveWebSecurityApplicationContext.java | 2 +- .../src/main/java/fr/ird/observe/IObserveConfig.java | 2 +- .../src/main/java/fr/ird/observe/db/DataSource.java | 2 +- .../main/java/fr/ird/observe/db/impl/AbstractDataSource.java | 2 +- .../main/java/fr/ird/observe/db/impl/PGDataSourceConfig.java | 4 ++-- .../src/main/java/fr/ird/observe/util/Scripts.java | 2 +- .../src/test/java/fr/ird/observe/db/DBTestHelper.java | 4 ++-- .../java/fr/ird/observe/db/impl/H2DataSourceConfigTest.java | 2 +- .../fr/ird/observe/its/migration/AbstractMigrationTest.java | 2 +- .../fr/ird/observe/its/migration/H2DataSourceMigrationIT.java | 2 +- .../fr/ird/observe/its/migration/PGDataSourceMigrationIT.java | 2 +- .../its/migration/h2ToLast/AbstractH2MigrationToLastIT.java | 2 +- observe-entities/pom.xml | 4 ++++ .../entities/migration/AbstractDataSourceMigration.java | 4 ++-- .../entities/migration/AbstractObserveMigrationCallBack.java | 2 +- .../migration/ObserveMigrationCallBackForVersionResolver.java | 2 +- .../ObserveMigrationCallBackForVersionResolverTest.java | 2 +- observe-services-api/pom.xml | 4 ++++ .../observe/services/service/BabModelVersionException.java | 2 +- .../java/fr/ird/observe/services/service/PingService.java | 2 +- observe-services-configuration-api/pom.xml | 2 +- .../configuration/ObserveDataSourceConfiguration.java | 2 +- .../services/configuration/ObserveDataSourceConnection.java | 2 +- .../configuration/ObserveDataSourceConnectionSupport.java | 2 +- .../services/configuration/ObserveDataSourceInformation.java | 2 +- observe-services-configuration-rest/pom.xml | 2 +- .../configuration/ObserveDataSourceConfigurationRest.java | 2 +- .../configuration/ObserveDataSourceConnectionRest.java | 2 +- observe-services-configuration-topia/pom.xml | 2 +- .../ObserveDataSourceConfigurationTopiaSupport.java | 2 +- .../configuration/ObserveDataSourceConnectionTopia.java | 2 +- observe-services-model/pom.xml | 4 ++++ .../ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java | 2 +- .../java/fr/ird/observe/services/dto/gson/VersionAdapter.java | 4 ++-- observe-services-rest/pom.xml | 4 ++++ .../test/java/fr/ird/observe/services/TestClassResource.java | 2 +- .../test/java/fr/ird/observe/services/TestMethodResource.java | 2 +- observe-services-runner/pom.xml | 2 +- .../services/ObserveDataSourceConfigurationMainFactory.java | 2 +- observe-services-topia/pom.xml | 4 ++++ .../main/java/fr/ird/observe/services/ObserveJdbcHelper.java | 4 ++-- .../ird/observe/services/service/DataSourceServiceTopia.java | 2 +- .../fr/ird/observe/services/ApplicationContextResource.java | 4 ++-- .../test/java/fr/ird/observe/services/DataSourceResource.java | 4 ++-- .../services/ObserveDataSourceConnectionTopiaTaiste.java | 2 +- observe-test-data/pom.xml | 11 +++++++++-- .../src/main/java/fr/ird/observe/test/TestHelper.java | 4 ++-- pom.xml | 10 ++++++++-- src/site/site_fr.xml | 3 ++- 61 files changed, 105 insertions(+), 67 deletions(-) diff --git a/observe-application-swing/pom.xml b/observe-application-swing/pom.xml index 46bb239..a7886b5 100644 --- a/observe-application-swing/pom.xml +++ b/observe-application-swing/pom.xml @@ -206,6 +206,10 @@ <artifactId>nuiton-utils</artifactId> </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-version</artifactId> + </dependency> + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfig.java b/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfig.java index fb3c09d..74df74c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfig.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfig.java @@ -41,8 +41,8 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ApplicationConfigHelper; import org.nuiton.config.ApplicationConfigProvider; -import org.nuiton.util.version.Version; -import org.nuiton.util.version.Versions; +import org.nuiton.version.Version; +import org.nuiton.version.Versions; import javax.swing.JOptionPane; import java.awt.Color; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigOption.java b/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigOption.java index b2f5ae0..356dcd2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigOption.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigOption.java @@ -28,7 +28,7 @@ import fr.ird.observe.db.constants.DbMode; import fr.ird.observe.services.ObserveSpeciesListConfiguration; import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ConfigOptionDef; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import java.awt.Color; import java.io.File; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java b/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java index d8bdc53..eaa11af 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java @@ -36,7 +36,7 @@ import fr.ird.observe.services.service.SqlScriptProducerService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.beans.AbstractSerializableBean; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import javax.swing.JOptionPane; import javax.swing.event.EventListenerList; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/ObstunaAdminAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/ObstunaAdminAction.java index 12f6a20..6cf05e4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/ObstunaAdminAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/ObstunaAdminAction.java @@ -41,8 +41,8 @@ import fr.ird.observe.ui.storage.tabs.DataSelectionModel; import jaxx.runtime.JAXXContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.version.Version; -import org.nuiton.util.version.Versions; +import org.nuiton.version.Version; +import org.nuiton.version.Versions; import java.awt.Window; import java.util.Set; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java index 1c8769d..4856d7a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java @@ -64,7 +64,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; 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.swing.JTabbedPane; import java.awt.Component; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java index 1a11126..43b776c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java @@ -59,7 +59,7 @@ import org.apache.commons.io.IOUtils; 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 java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; diff --git a/observe-application-web/pom.xml b/observe-application-web/pom.xml index 827cb54..18fd36d 100644 --- a/observe-application-web/pom.xml +++ b/observe-application-web/pom.xml @@ -99,7 +99,7 @@ <!-- Nuiton --> <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> + <artifactId>nuiton-version</artifactId> </dependency> <dependency> <groupId>org.nuiton</groupId> diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContext.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContext.java index 912e808..230be19 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContext.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContext.java @@ -41,7 +41,7 @@ import fr.ird.observe.services.ObserveServiceInitializer; import fr.ird.observe.services.ObserveServiceMainFactory; import fr.ird.observe.services.dto.gson.ObserveDtoGsonSupplier; import org.debux.webmotion.server.call.HttpContext; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import javax.servlet.ServletContext; import java.io.Closeable; diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java index 624debf..933a4af 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java @@ -33,7 +33,7 @@ import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ApplicationConfigHelper; import org.nuiton.config.ApplicationConfigProvider; import org.nuiton.config.ArgumentsParserException; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import java.io.BufferedReader; import java.io.File; diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfigurationOption.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfigurationOption.java index 63deb06..3205f03 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfigurationOption.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfigurationOption.java @@ -26,7 +26,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import org.apache.commons.lang3.NotImplementedException; import org.nuiton.config.ConfigOptionDef; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import java.io.File; import java.net.URL; diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java index 8654907..8ab1add 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java @@ -25,7 +25,7 @@ package fr.ird.observe.application.web.controller.v1; import fr.ird.observe.application.web.configuration.ObserveWebApplicationConfiguration; import fr.ird.observe.application.web.controller.ObserveWebMotionController; import fr.ird.observe.services.service.PingService; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; /** * Created on 06/09/15. diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java index 39c89f6..bf57c8b 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java @@ -43,7 +43,7 @@ import fr.ird.observe.services.security.UserLoginNotFoundException; import fr.ird.observe.services.security.UserPasswordNotFoundException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import java.io.Closeable; import java.util.Objects; diff --git a/observe-business/src/main/java/fr/ird/observe/IObserveConfig.java b/observe-business/src/main/java/fr/ird/observe/IObserveConfig.java index 6cc673b..e60c742 100644 --- a/observe-business/src/main/java/fr/ird/observe/IObserveConfig.java +++ b/observe-business/src/main/java/fr/ird/observe/IObserveConfig.java @@ -26,7 +26,7 @@ import fr.ird.observe.db.constants.DbMode; import fr.ird.observe.db.impl.H2DataSourceConfig; import fr.ird.observe.db.impl.PGDataSourceConfig; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import java.beans.PropertyChangeListener; import java.io.File; diff --git a/observe-business/src/main/java/fr/ird/observe/db/DataSource.java b/observe-business/src/main/java/fr/ird/observe/db/DataSource.java index b82ba72..35fa269 100644 --- a/observe-business/src/main/java/fr/ird/observe/db/DataSource.java +++ b/observe-business/src/main/java/fr/ird/observe/db/DataSource.java @@ -31,7 +31,7 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.framework.TopiaService; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import java.io.File; import java.util.List; diff --git a/observe-business/src/main/java/fr/ird/observe/db/impl/AbstractDataSource.java b/observe-business/src/main/java/fr/ird/observe/db/impl/AbstractDataSource.java index c729bb3..051b6ce 100644 --- a/observe-business/src/main/java/fr/ird/observe/db/impl/AbstractDataSource.java +++ b/observe-business/src/main/java/fr/ird/observe/db/impl/AbstractDataSource.java @@ -63,7 +63,7 @@ import org.nuiton.topia.migration.mappings.TMSVersion; import org.nuiton.topia.migration.mappings.TMSVersionDAO; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import javax.management.MBeanServer; import javax.management.MXBean; diff --git a/observe-business/src/main/java/fr/ird/observe/db/impl/PGDataSourceConfig.java b/observe-business/src/main/java/fr/ird/observe/db/impl/PGDataSourceConfig.java index 134f57d..d065164 100644 --- a/observe-business/src/main/java/fr/ird/observe/db/impl/PGDataSourceConfig.java +++ b/observe-business/src/main/java/fr/ird/observe/db/impl/PGDataSourceConfig.java @@ -31,8 +31,8 @@ import fr.ird.observe.db.constants.DataPolicy; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.version.Version; -import org.nuiton.util.version.Versions; +import org.nuiton.version.Version; +import org.nuiton.version.Versions; import java.sql.Connection; import java.sql.DriverManager; diff --git a/observe-business/src/main/java/fr/ird/observe/util/Scripts.java b/observe-business/src/main/java/fr/ird/observe/util/Scripts.java index 8d620da..385e309 100644 --- a/observe-business/src/main/java/fr/ird/observe/util/Scripts.java +++ b/observe-business/src/main/java/fr/ird/observe/util/Scripts.java @@ -24,7 +24,7 @@ package fr.ird.observe.util; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import java.io.BufferedReader; import java.io.IOException; diff --git a/observe-business/src/test/java/fr/ird/observe/db/DBTestHelper.java b/observe-business/src/test/java/fr/ird/observe/db/DBTestHelper.java index 88024c1..9c90d4f 100644 --- a/observe-business/src/test/java/fr/ird/observe/db/DBTestHelper.java +++ b/observe-business/src/test/java/fr/ird/observe/db/DBTestHelper.java @@ -44,8 +44,8 @@ import org.junit.Assume; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaException; -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; import java.io.IOException; diff --git a/observe-business/src/test/java/fr/ird/observe/db/impl/H2DataSourceConfigTest.java b/observe-business/src/test/java/fr/ird/observe/db/impl/H2DataSourceConfigTest.java index 8f55d22..de22265 100644 --- a/observe-business/src/test/java/fr/ird/observe/db/impl/H2DataSourceConfigTest.java +++ b/observe-business/src/test/java/fr/ird/observe/db/impl/H2DataSourceConfigTest.java @@ -32,7 +32,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.i18n.I18n; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import java.io.File; import java.net.URL; diff --git a/observe-business/src/test/java/fr/ird/observe/its/migration/AbstractMigrationTest.java b/observe-business/src/test/java/fr/ird/observe/its/migration/AbstractMigrationTest.java index 64ec624..85d60ad 100644 --- a/observe-business/src/test/java/fr/ird/observe/its/migration/AbstractMigrationTest.java +++ b/observe-business/src/test/java/fr/ird/observe/its/migration/AbstractMigrationTest.java @@ -30,7 +30,7 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.test.TestHelper; import org.junit.After; import org.junit.Before; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; public abstract class AbstractMigrationTest<C extends DataSourceConfig, S extends DataSource> { diff --git a/observe-business/src/test/java/fr/ird/observe/its/migration/H2DataSourceMigrationIT.java b/observe-business/src/test/java/fr/ird/observe/its/migration/H2DataSourceMigrationIT.java index 793f752..790b3a3 100644 --- a/observe-business/src/test/java/fr/ird/observe/its/migration/H2DataSourceMigrationIT.java +++ b/observe-business/src/test/java/fr/ird/observe/its/migration/H2DataSourceMigrationIT.java @@ -43,7 +43,7 @@ import org.junit.Test; import org.nuiton.csv.Import; import org.nuiton.csv.ValueParser; import org.nuiton.csv.ext.AbstractImportModel; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import java.io.File; import java.io.IOException; diff --git a/observe-business/src/test/java/fr/ird/observe/its/migration/PGDataSourceMigrationIT.java b/observe-business/src/test/java/fr/ird/observe/its/migration/PGDataSourceMigrationIT.java index 990aeff..a5a2fc8 100644 --- a/observe-business/src/test/java/fr/ird/observe/its/migration/PGDataSourceMigrationIT.java +++ b/observe-business/src/test/java/fr/ird/observe/its/migration/PGDataSourceMigrationIT.java @@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFactory; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; public class PGDataSourceMigrationIT extends AbstractDataSourceMigrationTest<PGDataSourceConfig, PGDataSource> { diff --git a/observe-business/src/test/java/fr/ird/observe/its/migration/h2ToLast/AbstractH2MigrationToLastIT.java b/observe-business/src/test/java/fr/ird/observe/its/migration/h2ToLast/AbstractH2MigrationToLastIT.java index bd5313a..e090cc9 100644 --- a/observe-business/src/test/java/fr/ird/observe/its/migration/h2ToLast/AbstractH2MigrationToLastIT.java +++ b/observe-business/src/test/java/fr/ird/observe/its/migration/h2ToLast/AbstractH2MigrationToLastIT.java @@ -32,7 +32,7 @@ import org.junit.Assert; import org.junit.Assume; import org.junit.Before; import org.junit.Test; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import java.io.File; import java.net.URL; diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index e7f2c13..f1a7e1f 100644 --- a/observe-entities/pom.xml +++ b/observe-entities/pom.xml @@ -51,6 +51,10 @@ <artifactId>nuiton-utils</artifactId> </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-version</artifactId> + </dependency> + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java index 63e3d12..7f5840c 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java @@ -26,8 +26,8 @@ import fr.ird.observe.ObserveTopiaApplicationContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; -import org.nuiton.util.version.Version; -import org.nuiton.util.version.Versions; +import org.nuiton.version.Version; +import org.nuiton.version.Versions; import java.util.List; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java index 99752bf..8ea1205 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java @@ -31,7 +31,7 @@ import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import org.nuiton.topia.persistence.support.TopiaSqlWork; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import java.io.IOException; import java.io.InputStream; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolver.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolver.java index 696fde3..634a220 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolver.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolver.java @@ -25,7 +25,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import java.lang.reflect.Modifier; diff --git a/observe-entities/src/test/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolverTest.java b/observe-entities/src/test/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolverTest.java index ffd1672..9a20b47 100644 --- a/observe-entities/src/test/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolverTest.java +++ b/observe-entities/src/test/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolverTest.java @@ -24,7 +24,7 @@ package fr.ird.observe.entities.migration; import org.junit.Assert; import org.junit.Test; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; /** * Test de le résolveur de classe de migration par version diff --git a/observe-services-api/pom.xml b/observe-services-api/pom.xml index 00fc0db..caa513d 100644 --- a/observe-services-api/pom.xml +++ b/observe-services-api/pom.xml @@ -32,6 +32,10 @@ <!-- nuiton dependencies --> <dependency> <groupId>org.nuiton</groupId> + <artifactId>nuiton-version</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> <dependency> diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/BabModelVersionException.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/BabModelVersionException.java index ebb50d3..a7a8538 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/BabModelVersionException.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/BabModelVersionException.java @@ -1,6 +1,6 @@ package fr.ird.observe.services.service; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/PingService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/PingService.java index 56028ba..e6c3c65 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/PingService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/PingService.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.service; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.spi.NoDataAccess; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; /** * Created on 06/09/15. diff --git a/observe-services-configuration-api/pom.xml b/observe-services-configuration-api/pom.xml index eae3ae5..372c433 100644 --- a/observe-services-configuration-api/pom.xml +++ b/observe-services-configuration-api/pom.xml @@ -27,7 +27,7 @@ <!-- Nuiton --> <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> + <artifactId>nuiton-version</artifactId> </dependency> <!-- Logging --> diff --git a/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfiguration.java b/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfiguration.java index 7a78397..8c94d80 100644 --- a/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfiguration.java +++ b/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfiguration.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.configuration; * #L% */ -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import java.io.Serializable; diff --git a/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnection.java b/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnection.java index a9db404..61f738d 100644 --- a/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnection.java +++ b/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnection.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.configuration; * #L% */ -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import java.io.Serializable; diff --git a/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionSupport.java b/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionSupport.java index d63e56f..5763036 100644 --- a/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionSupport.java +++ b/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionSupport.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.configuration; */ import com.google.common.base.MoreObjects; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import java.util.Objects; diff --git a/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceInformation.java b/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceInformation.java index 91b7651..04e1ed1 100644 --- a/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceInformation.java +++ b/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceInformation.java @@ -1,7 +1,7 @@ package fr.ird.observe.services.configuration; import com.google.common.collect.ImmutableList; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com diff --git a/observe-services-configuration-rest/pom.xml b/observe-services-configuration-rest/pom.xml index e50756e..feed008 100644 --- a/observe-services-configuration-rest/pom.xml +++ b/observe-services-configuration-rest/pom.xml @@ -34,7 +34,7 @@ <!-- Nuiton --> <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> + <artifactId>nuiton-version</artifactId> </dependency> </dependencies> diff --git a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java index 5782816..00849c6 100644 --- a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java +++ b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.configuration; import com.google.common.base.MoreObjects; import com.google.common.base.Optional; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import java.net.URL; diff --git a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionRest.java b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionRest.java index f91e7f4..5f7052c 100644 --- a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionRest.java +++ b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionRest.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.configuration; * #L% */ -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import java.net.URL; diff --git a/observe-services-configuration-topia/pom.xml b/observe-services-configuration-topia/pom.xml index 53510e1..65c6b0b 100644 --- a/observe-services-configuration-topia/pom.xml +++ b/observe-services-configuration-topia/pom.xml @@ -33,7 +33,7 @@ <!-- Nuiton --> <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> + <artifactId>nuiton-version</artifactId> </dependency> </dependencies> diff --git a/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaSupport.java b/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaSupport.java index 042923a..51e0ad4 100644 --- a/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaSupport.java +++ b/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaSupport.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.configuration; * #L% */ -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; /** * Created on 19/08/15. diff --git a/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionTopia.java b/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionTopia.java index 204164b..7d195a5 100644 --- a/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionTopia.java +++ b/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionTopia.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.configuration; * #L% */ -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; /** * Created on 04/09/15. diff --git a/observe-services-model/pom.xml b/observe-services-model/pom.xml index 5ccc0e5..ea5b419 100644 --- a/observe-services-model/pom.xml +++ b/observe-services-model/pom.xml @@ -49,6 +49,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/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java index 413475a..f385d6b 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java @@ -37,7 +37,7 @@ import fr.ird.observe.services.dto.gson.reference.ReferentialReferenceAdapter; import fr.ird.observe.services.dto.gson.reference.ReferentialReferenceSetAdapter; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import java.sql.Timestamp; import java.util.Date; diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/VersionAdapter.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/VersionAdapter.java index 7ee9d9d..c399b95 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/VersionAdapter.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/VersionAdapter.java @@ -6,8 +6,8 @@ import com.google.gson.JsonElement; import com.google.gson.JsonParseException; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; -import org.nuiton.util.version.Version; -import org.nuiton.util.version.Versions; +import org.nuiton.version.Version; +import org.nuiton.version.Versions; import java.lang.reflect.Type; diff --git a/observe-services-rest/pom.xml b/observe-services-rest/pom.xml index 2a77712..d350869 100644 --- a/observe-services-rest/pom.xml +++ b/observe-services-rest/pom.xml @@ -91,6 +91,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/observe-services-rest/src/test/java/fr/ird/observe/services/TestClassResource.java b/observe-services-rest/src/test/java/fr/ird/observe/services/TestClassResource.java index 4a56d89..cbb9cf4 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/TestClassResource.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/TestClassResource.java @@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFactory; import org.junit.rules.TestRule; import org.junit.runner.Description; import org.junit.runners.model.Statement; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import java.io.File; import java.io.IOException; diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java b/observe-services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java index c98f7a7..998390b 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java @@ -31,7 +31,7 @@ import org.junit.Assume; import org.junit.rules.TestRule; import org.junit.runner.Description; import org.junit.runners.model.Statement; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import java.io.File; import java.nio.file.Files; diff --git a/observe-services-runner/pom.xml b/observe-services-runner/pom.xml index aa5d1b5..ae389b1 100644 --- a/observe-services-runner/pom.xml +++ b/observe-services-runner/pom.xml @@ -55,7 +55,7 @@ <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> + <artifactId>nuiton-version</artifactId> </dependency> <!-- commons dependencies --> diff --git a/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveDataSourceConfigurationMainFactory.java b/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveDataSourceConfigurationMainFactory.java index faaf3dd..848c05c 100644 --- a/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveDataSourceConfigurationMainFactory.java +++ b/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveDataSourceConfigurationMainFactory.java @@ -25,7 +25,7 @@ package fr.ird.observe.services; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaPG; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import java.io.File; import java.net.URL; diff --git a/observe-services-topia/pom.xml b/observe-services-topia/pom.xml index 5897f41..7c3d99d 100644 --- a/observe-services-topia/pom.xml +++ b/observe-services-topia/pom.xml @@ -80,6 +80,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/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveJdbcHelper.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveJdbcHelper.java index 2d53f50..8f7a423 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveJdbcHelper.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveJdbcHelper.java @@ -9,8 +9,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.jdbc.JdbcConfiguration; import org.nuiton.topia.persistence.jdbc.JdbcHelper; -import org.nuiton.util.version.Version; -import org.nuiton.util.version.Versions; +import org.nuiton.version.Version; +import org.nuiton.version.Versions; import java.sql.Connection; import java.sql.DatabaseMetaData; diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java index 8005550..9dcd5b2 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java @@ -48,7 +48,7 @@ import fr.ird.observe.services.dto.ObserveDbUserDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.jdbc.JdbcHelper; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import java.io.File; import java.util.Set; diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java b/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java index 580378e..dd32d40 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java @@ -43,8 +43,8 @@ import org.junit.rules.TestRule; import org.junit.runner.Description; import org.junit.runners.model.Statement; import org.nuiton.topia.persistence.TopiaException; -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; import java.io.IOException; diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java b/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java index c24c43f..a9f3321 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java @@ -49,8 +49,8 @@ import org.junit.runners.model.Statement; import org.nuiton.topia.persistence.TopiaDao; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaPersistenceContext; -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; import java.io.IOException; diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/ObserveDataSourceConnectionTopiaTaiste.java b/observe-services-topia/src/test/java/fr/ird/observe/services/ObserveDataSourceConnectionTopiaTaiste.java index 10368c3..40d718d 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/ObserveDataSourceConnectionTopiaTaiste.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/ObserveDataSourceConnectionTopiaTaiste.java @@ -1,7 +1,7 @@ package fr.ird.observe.services; import fr.ird.observe.services.configuration.ObserveDataSourceConnectionTopia; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com diff --git a/observe-test-data/pom.xml b/observe-test-data/pom.xml index f4e3f7f..54109d2 100644 --- a/observe-test-data/pom.xml +++ b/observe-test-data/pom.xml @@ -48,13 +48,20 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> <!-- Nuiton --> <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> + <artifactId>nuiton-version</artifactId> </dependency> - <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> diff --git a/observe-test-data/src/main/java/fr/ird/observe/test/TestHelper.java b/observe-test-data/src/main/java/fr/ird/observe/test/TestHelper.java index cc1054b..e5fd474 100644 --- a/observe-test-data/src/main/java/fr/ird/observe/test/TestHelper.java +++ b/observe-test-data/src/main/java/fr/ird/observe/test/TestHelper.java @@ -31,8 +31,8 @@ import org.junit.Assert; import org.nuiton.topia.persistence.TopiaApplicationContext; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaPersistenceContext; -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; import java.io.IOException; diff --git a/pom.xml b/pom.xml index a168972..d16ab98 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ <eugenePluginVersion>3.0-SNAPSHOT</eugenePluginVersion> <topiaVersion>3.1-SNAPSHOT</topiaVersion> - <jaxxVersion>2.27</jaxxVersion> + <jaxxVersion>2.28-SNAPSHOT</jaxxVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonValidatorVersion>3.0</nuitonValidatorVersion> @@ -284,6 +284,12 @@ </dependency> <dependency> <groupId>org.nuiton</groupId> + <artifactId>nuiton-version</artifactId> + <version>1.0-SNAPSHOT</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> <artifactId>nuiton-converter</artifactId> <version>1.0</version> <scope>compile</scope> @@ -291,7 +297,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-csv</artifactId> - <version>3.0-rc-5</version> + <version>3.0-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml index 5f202a7..9a8a791 100644 --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -91,7 +91,8 @@ <div id='mavenProjectProperties' locale='fr' projectId='${project.projectId}' version='${project.siteDeployClassifier}' - sourcesType='${project.siteSourcesType}'/> + sourcesType='${project.siteSourcesType}' + scmwebeditor_vmFiles=",index,"/> </footer> </body> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.