branch develop-2.x updated (76e2b90 -> 1115fbe)
This is an automated email from the git hooks/post-receive script. New change to branch develop-2.x in repository jaxx. See http://git.nuiton.org/jaxx.git from 76e2b90 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 1115fbe Use nuiton-version (Fixes #3866) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 1115fbe700dda57fa5d3415afcedeeb1f596d935 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Jan 10 16:00:20 2016 +0100 Use nuiton-version (Fixes #3866) Summary of changes: jaxx-application-api/pom.xml | 4 ++++ .../org/nuiton/jaxx/application/ApplicationConfiguration.java | 2 +- jaxx-demo/pom.xml | 5 +++++ jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java | 4 ++-- pom.xml | 9 +++++++-- 5 files changed, 19 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-2.x in repository jaxx. See http://git.nuiton.org/jaxx.git commit 1115fbe700dda57fa5d3415afcedeeb1f596d935 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Jan 10 16:00:20 2016 +0100 Use nuiton-version (Fixes #3866) --- jaxx-application-api/pom.xml | 4 ++++ .../org/nuiton/jaxx/application/ApplicationConfiguration.java | 2 +- jaxx-demo/pom.xml | 5 +++++ jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java | 4 ++-- pom.xml | 9 +++++++-- 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/jaxx-application-api/pom.xml b/jaxx-application-api/pom.xml index 947fa7e..38c41a5 100644 --- a/jaxx-application-api/pom.xml +++ b/jaxx-application-api/pom.xml @@ -67,6 +67,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/jaxx-application-api/src/main/java/org/nuiton/jaxx/application/ApplicationConfiguration.java b/jaxx-application-api/src/main/java/org/nuiton/jaxx/application/ApplicationConfiguration.java index a43ce9b..3cc0709 100644 --- a/jaxx-application-api/src/main/java/org/nuiton/jaxx/application/ApplicationConfiguration.java +++ b/jaxx-application-api/src/main/java/org/nuiton/jaxx/application/ApplicationConfiguration.java @@ -25,7 +25,7 @@ package org.nuiton.jaxx.application; import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ApplicationConfigHelper; import org.nuiton.config.ApplicationConfigProvider; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import javax.swing.KeyStroke; import java.util.Set; diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index f2fad2c..7651139 100644 --- a/jaxx-demo/pom.xml +++ b/jaxx-demo/pom.xml @@ -119,6 +119,11 @@ </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/jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java b/jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java index 4aed261..780f6f3 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java +++ b/jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java @@ -31,8 +31,8 @@ import org.jdesktop.beans.AbstractBean; import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ArgumentsParserException; import org.nuiton.config.ConfigOptionDef; -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.KeyStroke; import java.awt.Color; diff --git a/pom.xml b/pom.xml index ff607c0..c9d6bdc 100644 --- a/pom.xml +++ b/pom.xml @@ -251,14 +251,19 @@ <!-- lutin dependencies --> <dependency> <groupId>org.nuiton</groupId> + <artifactId>nuiton-version</artifactId> + <version>1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>3.0-rc-10</version> + <version>3.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>3.0-rc-2</version> + <version>3.0-SNAPSHOT</version> </dependency> <dependency> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm