This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit df5fe08ea1c66506b760b37f1ce96e1fb127a3c2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Jul 11 17:42:52 2014 +0200 use new Version object from nuiton-utils --- .../java/org/chorem/pollen/services/config/PollenServiceConfig.java | 4 ++-- .../org/chorem/pollen/services/config/PollenServiceConfigOption.java | 2 +- pom.xml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java b/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java index 5834964..bf52f86 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java @@ -37,7 +37,7 @@ import org.chorem.pollen.persistence.entity.VoteVisibility; import org.chorem.pollen.services.PollenTechnicalException; import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ArgumentsParserException; -import org.nuiton.util.Version; +import org.nuiton.util.version.Version; import java.io.File; import java.util.List; @@ -227,6 +227,6 @@ public class PollenServiceConfig { } public Version getVersion() { - return applicationConfig.getOptionAsVersion(PollenServiceConfigOption.APPLICATION_VERSION.key); + return applicationConfig.getOption(Version.class, PollenServiceConfigOption.APPLICATION_VERSION.key); } } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java b/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java index 3193322..a3c2208 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java @@ -29,7 +29,7 @@ import org.chorem.pollen.persistence.entity.PollType; import org.chorem.pollen.persistence.entity.ResultVisibility; import org.chorem.pollen.persistence.entity.VoteVisibility; import org.nuiton.config.ConfigOptionDef; -import org.nuiton.util.Version; +import org.nuiton.util.version.Version; import java.io.File; diff --git a/pom.xml b/pom.xml index 828fae2..cdead1e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0.8</version> + <version>5.0.9</version> </parent> <groupId>org.chorem</groupId> @@ -167,7 +167,7 @@ <topiaVersion>3.0-SNAPSHOT</topiaVersion> <nuitonWebVersion>1.17-SNAPSHOT</nuitonWebVersion> - <nuitonUtilsVersion>3.0-rc-3</nuitonUtilsVersion> + <nuitonUtilsVersion>3.0-SNAPSHOT</nuitonUtilsVersion> <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion> <nuitonCsvVersion>3.0-alpha-3</nuitonCsvVersion> <nuitonValidatorVersion>3.0-alpha-1</nuitonValidatorVersion> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.