Author: tchemit Date: 2013-09-24 08:54:44 +0200 (Tue, 24 Sep 2013) New Revision: 2937 Url: http://chorem.org/projects/jtimer/repository/revisions/2937 Log: fixes #946: Updates mavenpom to 4.1 fixes #947: Migrates to nuiton-config Modified: trunk/pom.xml trunk/src/main/java/org/chorem/jtimer/JTimerActions.java trunk/src/main/java/org/chorem/jtimer/JTimerConfig.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-24 06:54:02 UTC (rev 2936) +++ trunk/pom.xml 2013-09-24 06:54:44 UTC (rev 2937) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.11</version> + <version>4.1</version> </parent> <groupId>org.chorem</groupId> @@ -34,7 +34,7 @@ <email>chatellier@codelutin.com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Développeur</role> </roles> @@ -42,10 +42,10 @@ <developer> <name>Tony Chemit</name> <id>tchemit</id> - <email>chemit@codelutin.com</email> + <email>chemit at codelutin dot com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Développeur</role> </roles> @@ -99,6 +99,9 @@ target/${project.artifactId}-${project.version}-src.zip, </redmine.releaseFiles> + <!-- Post Release configuration --> + <skipPostRelease>false</skipPostRelease> + </properties> <build> @@ -182,7 +185,7 @@ <plugin> <artifactId>maven-changelog-plugin</artifactId> - <version>2.2</version> + <version>${changelogPluginVersion}</version> <configuration> <type>range</type> <range>365</range> @@ -192,7 +195,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> - <version>2.5.2</version> + <version>${coberturaPluginVersion}</version> </plugin> <!-- TODO Use this when jnlp will be ok --> @@ -207,8 +210,8 @@ <dependencies> <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>2.6.12</version> + <artifactId>nuiton-config</artifactId> + <version>3.0-alpha-1</version> <scope>compile</scope> <exclusions> <exclusion> Modified: trunk/src/main/java/org/chorem/jtimer/JTimerActions.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/JTimerActions.java 2013-09-24 06:54:02 UTC (rev 2936) +++ trunk/src/main/java/org/chorem/jtimer/JTimerActions.java 2013-09-24 06:54:44 UTC (rev 2937) @@ -26,8 +26,8 @@ package org.chorem.jtimer; import org.chorem.jtimer.JTimerConfig.JTimerAction; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.ApplicationConfig.Action.Step; +import org.nuiton.config.ApplicationConfig; +import org.nuiton.config.ApplicationConfig.Action.Step; /** * JTimer actions class run from command line. Modified: trunk/src/main/java/org/chorem/jtimer/JTimerConfig.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/JTimerConfig.java 2013-09-24 06:54:02 UTC (rev 2936) +++ trunk/src/main/java/org/chorem/jtimer/JTimerConfig.java 2013-09-24 06:54:44 UTC (rev 2937) @@ -25,8 +25,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.ArgumentsParserException; +import org.nuiton.config.ApplicationConfig; +import org.nuiton.config.ArgumentsParserException; /** * JTimer configuration.