Author: tchemit Date: 2013-09-13 15:10:21 +0200 (Fri, 13 Sep 2013) New Revision: 3854 Url: http://chorem.org/projects/pollen/repository/revisions/3854 Log: update dependencies + use new nuiton-config api Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenServiceListener.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java trunk/pom.xml Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenServiceListener.java =================================================================== --- trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenServiceListener.java 2013-08-09 10:06:50 UTC (rev 3853) +++ trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenServiceListener.java 2013-09-13 13:10:21 UTC (rev 3854) @@ -24,7 +24,6 @@ */ import org.apache.commons.beanutils.Converter; -import org.apache.commons.lang3.ClassUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.services.PollenServiceContext; Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java 2013-08-09 10:06:50 UTC (rev 3853) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java 2013-09-13 13:10:21 UTC (rev 3854) @@ -31,8 +31,8 @@ import org.chorem.pollen.persistence.entity.PollType; import org.chorem.pollen.persistence.entity.VoteVisibility; import org.chorem.pollen.services.PollenTechnicalException; -import org.nuiton.util.config.ApplicationConfig; -import org.nuiton.util.config.ArgumentsParserException; +import org.nuiton.config.ApplicationConfig; +import org.nuiton.config.ArgumentsParserException; import java.util.List; import java.util.Map; Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java 2013-08-09 10:06:50 UTC (rev 3853) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java 2013-09-13 13:10:21 UTC (rev 3854) @@ -26,7 +26,7 @@ import org.chorem.pollen.persistence.entity.CommentVisibility; import org.chorem.pollen.persistence.entity.PollType; import org.chorem.pollen.persistence.entity.VoteVisibility; -import org.nuiton.util.config.ConfigOptionDef; +import org.nuiton.config.ConfigOptionDef; import static org.nuiton.i18n.I18n.n_; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-09 10:06:50 UTC (rev 3853) +++ trunk/pom.xml 2013-09-13 13:10:21 UTC (rev 3854) @@ -159,15 +159,18 @@ <projectId>pollen</projectId> <!-- customized versions --> - <nuitonJpaVersion>1.0-SNAPSHOT</nuitonJpaVersion> + <nuitonJpaVersion>1.0-rc-1</nuitonJpaVersion> <webmotionVersion>2.4-SNAPSHOT</webmotionVersion> - <eugenePluginVersion>2.6.4-SNAPSHOT</eugenePluginVersion> + <eugenePluginVersion>2.7</eugenePluginVersion> <nuitonI18nVersion>2.5.1</nuitonI18nVersion> <nuitonWebVersion>1.13</nuitonWebVersion> - <nuitonUtilsVersion>2.6.13-SNAPSHOT</nuitonUtilsVersion> - <h2Version>1.3.172</h2Version> + <nuitonUtilsVersion>2.7.1</nuitonUtilsVersion> + <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion> + <nuitonCsvVersion>3.0-alpha-1</nuitonCsvVersion> + <nuitonValidatorVersion>3.0-alpha-1</nuitonValidatorVersion> + <h2Version>1.3.173</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <shiroVersion>1.2.2</shiroVersion> <slf4jVersion>1.7.5</slf4jVersion> @@ -318,19 +321,19 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>${nuitonConfigVersion}</version> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-csv</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>${nuitonCsvVersion}</version> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>${nuitonValidatorVersion}</version> </dependency> <dependency>