branch develop updated (98579c8 -> a3a3539)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.forge.codelutin.com/coselmar.git from 98579c8 fixes #8058 fix health page new f5c80ee [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 66edb15 [jgitflow-maven-plugin]updating poms for 2.0-RC3 branch with snapshot versions new aa93fc1 [jgitflow-maven-plugin]updating poms for branch'release/2.0-RC3' with non-snapshot versions new 1c51dfe [jgitflow-maven-plugin]merging 'release/2.0-RC3' into 'master' new fdea9d1 [jgitflow-maven-plugin]merging 'master' into 'develop' new a3a3539 [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 a3a353925bc82c9eda790794cef23c00b2757c75 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 3 11:58:11 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit fdea9d197346af2572d27318af1a7bb7640a0a1a Merge: f5c80ee 1c51dfe Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 3 11:58:09 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit f5c80eef184d01088fb024ceb77095a9cd7c0ea1 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 3 11:58:05 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 1c51dfeedd5080deccc4eb2cf412956c4be8333a Merge: 5451851 aa93fc1 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 3 11:57:55 2016 +0100 [jgitflow-maven-plugin]merging 'release/2.0-RC3' into 'master' commit aa93fc1882926bd678308cf99a269648b9a8e142 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 3 11:56:28 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.0-RC3' 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 coselmar. See http://git.forge.codelutin.com/coselmar.git commit aa93fc1882926bd678308cf99a269648b9a8e142 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 3 11:56:28 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.0-RC3' with non-snapshot versions --- coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index 241ad64..bad920d 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-RC3-SNAPSHOT</version> + <version>2.0-RC3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 61916c2..7f1a2ce 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-RC3-SNAPSHOT</version> + <version>2.0-RC3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 856837f..6bb100b 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-RC3-SNAPSHOT</version> + <version>2.0-RC3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index e6e0d64..b44f9ae 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-RC3-SNAPSHOT</version> + <version>2.0-RC3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 238dbf4..8120252 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-RC3-SNAPSHOT</version> + <version>2.0-RC3</version> <packaging>pom</packaging> <name>Coselmar</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 coselmar. See http://git.forge.codelutin.com/coselmar.git commit 1c51dfeedd5080deccc4eb2cf412956c4be8333a Merge: 5451851 aa93fc1 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 3 11:57:55 2016 +0100 [jgitflow-maven-plugin]merging 'release/2.0-RC3' into 'master' coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 8 +++++++- coselmar-ui/pom.xml | 2 +- coselmar-ui/src/main/webapp/js/coselmar-health.js | 2 +- pom.xml | 2 +- 6 files changed, 12 insertions(+), 6 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 coselmar. See http://git.forge.codelutin.com/coselmar.git commit f5c80eef184d01088fb024ceb77095a9cd7c0ea1 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 3 11:58:05 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index e95d64f..bad920d 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-RC3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 3fb133f..7f1a2ce 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-RC3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 9df1b2c..6bb100b 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-RC3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index dc630a4..b44f9ae 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-RC3</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 2c943ca..8120252 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-RC3</version> <packaging>pom</packaging> <name>Coselmar</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 coselmar. See http://git.forge.codelutin.com/coselmar.git commit fdea9d197346af2572d27318af1a7bb7640a0a1a Merge: f5c80ee 1c51dfe Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 3 11:58:09 2016 +0100 [jgitflow-maven-plugin]merging '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 coselmar. See http://git.forge.codelutin.com/coselmar.git commit a3a353925bc82c9eda790794cef23c00b2757c75 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 3 11:58:11 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index bad920d..e95d64f 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-RC3</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 7f1a2ce..3fb133f 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-RC3</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 6bb100b..9df1b2c 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-RC3</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index b44f9ae..dc630a4 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-RC3</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 8120252..2c943ca 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-RC3</version> + <version>2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Coselmar</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm