branch develop updated (f220f88 -> 41557b7)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coser. See http://git.codelutin.com/coser.git from f220f88 fix jnlp configuration new 705e705 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds fab93e0 [jgitflow-maven-plugin]updating poms for branch '1.5.4' with snapshot versions new 11d6053 [jgitflow-maven-plugin]updating poms for branch'release/1.5.4' with non-snapshot versions new cf6a3b4 Merge branch 'release/1.5.4' new a263d9e Merge branch 'master' into develop new 41557b7 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 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 41557b7c6f2fd8f401c017a8bfd2bff28bda0fce Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 9 09:01:52 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit a263d9eecaaf24fc3abda0e20872c6b10d996e96 Merge: 705e705 cf6a3b4 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 9 09:01:52 2015 +0000 Merge branch 'master' into develop commit 705e7054bae38c5d6902b34f437ad8e565aabc0e Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 9 09:01:52 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit cf6a3b4de7af1da1baa49164f715bfaaf523e3b3 Merge: da66251 11d6053 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 9 09:01:50 2015 +0000 Merge branch 'release/1.5.4' commit 11d6053d09cf89d89881f82347eadd0b00731a13 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 9 08:58:52 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/1.5.4' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coser. See http://git.codelutin.com/coser.git commit 11d6053d09cf89d89881f82347eadd0b00731a13 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 9 08:58:52 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/1.5.4' with non-snapshot versions --- coser-business/pom.xml | 2 +- coser-ui/pom.xml | 2 +- coser-web/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coser-business/pom.xml b/coser-business/pom.xml index 117bc47..d611cc0 100644 --- a/coser-business/pom.xml +++ b/coser-business/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.5.4</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-ui/pom.xml b/coser-ui/pom.xml index ee62457..2169af7 100644 --- a/coser-ui/pom.xml +++ b/coser-ui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.5.4</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-web/pom.xml b/coser-web/pom.xml index 248bd9c..dc53a60 100644 --- a/coser-web/pom.xml +++ b/coser-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.5.4</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/pom.xml b/pom.xml index 0cc6ad7..1f43dce 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.5.4</version> <packaging>pom</packaging> <name>Coser</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coser. See http://git.codelutin.com/coser.git commit cf6a3b4de7af1da1baa49164f715bfaaf523e3b3 Merge: da66251 11d6053 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 9 09:01:50 2015 +0000 Merge branch 'release/1.5.4' coser-business/pom.xml | 2 +- coser-ui/pom.xml | 30 ++++++++++++++++++------------ coser-ui/src/site/site_en.xml | 2 +- coser-ui/src/site/site_fr.xml | 2 +- coser-web/pom.xml | 2 +- pom.xml | 2 +- src/site/en/rst/devel/textupdate.rst | 2 ++ src/site/rst/devel/textupdate.rst | 2 ++ 8 files changed, 27 insertions(+), 17 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coser. See http://git.codelutin.com/coser.git commit 705e7054bae38c5d6902b34f437ad8e565aabc0e Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 9 09:01:52 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- coser-business/pom.xml | 2 +- coser-ui/pom.xml | 2 +- coser-web/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coser-business/pom.xml b/coser-business/pom.xml index 8a0163c..d611cc0 100644 --- a/coser-business/pom.xml +++ b/coser-business/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.4</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-ui/pom.xml b/coser-ui/pom.xml index e12f2ad..2169af7 100644 --- a/coser-ui/pom.xml +++ b/coser-ui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.4</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-web/pom.xml b/coser-web/pom.xml index adfec90..dc53a60 100644 --- a/coser-web/pom.xml +++ b/coser-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.4</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/pom.xml b/pom.xml index f2bbeba..1f43dce 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.4</version> <packaging>pom</packaging> <name>Coser</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coser. See http://git.codelutin.com/coser.git commit a263d9eecaaf24fc3abda0e20872c6b10d996e96 Merge: 705e705 cf6a3b4 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 9 09:01:52 2015 +0000 Merge branch 'master' into develop -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coser. See http://git.codelutin.com/coser.git commit 41557b7c6f2fd8f401c017a8bfd2bff28bda0fce Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 9 09:01:52 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- coser-business/pom.xml | 2 +- coser-ui/pom.xml | 2 +- coser-web/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coser-business/pom.xml b/coser-business/pom.xml index d611cc0..8a0163c 100644 --- a/coser-business/pom.xml +++ b/coser-business/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.4</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-ui/pom.xml b/coser-ui/pom.xml index 2169af7..e12f2ad 100644 --- a/coser-ui/pom.xml +++ b/coser-ui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.4</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-web/pom.xml b/coser-web/pom.xml index dc53a60..adfec90 100644 --- a/coser-web/pom.xml +++ b/coser-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.4</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/pom.xml b/pom.xml index 1f43dce..f2bbeba 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.4</version> + <version>1.6-SNAPSHOT</version> <packaging>pom</packaging> <name>Coser</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm