branch develop updated (fb294ac -> adcd234)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from fb294ac On corrige un contrôle de validation qui ne devrait être fait que sous Scléro et pas sous ObsMer on ObsVente (termine #6811) new 466251f [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds a6814d6 [jgitflow-maven-plugin]updating poms for branch '5.1.1' with snapshot versions new 7656b67 [jgitflow-maven-plugin]updating poms for branch'release/5.1.1' with non-snapshot versions new 60b1e18 Merge branch 'release/5.1.1' new eb81788 Merge branch 'master' into develop new adcd234 [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 adcd234698e433f189091b72fe0af002ed9f6a87 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 12 15:32:17 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit eb817883fac860b3434a53891a11f85143c3f50e Merge: 466251f 60b1e18 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 12 15:32:17 2015 +0000 Merge branch 'master' into develop commit 466251fa6dccde13451c4240a66a59994b0c035e Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 12 15:32:17 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 60b1e18426844fe4163790e9c2a145ca7a3a2890 Merge: fbfdd18 7656b67 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 12 15:32:16 2015 +0000 Merge branch 'release/5.1.1' commit 7656b6707160157edc7fef2e172fd7c8990db349 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 12 15:29:46 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/5.1.1' 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 wao. See http://git.codelutin.com/wao.git commit 7656b6707160157edc7fef2e172fd7c8990db349 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 12 15:29:46 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/5.1.1' with non-snapshot versions --- pom.xml | 2 +- wao-persistence/pom.xml | 2 +- wao-services/pom.xml | 2 +- wao-web/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index cebb124..451a006 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.1.1-SNAPSHOT</version> + <version>5.1.1</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index a44a368..9c582a6 100644 --- a/wao-persistence/pom.xml +++ b/wao-persistence/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.1.1-SNAPSHOT</version> + <version>5.1.1</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index 21e2386..f32e911 100644 --- a/wao-services/pom.xml +++ b/wao-services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.1.1-SNAPSHOT</version> + <version>5.1.1</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index 2d1806f..925340e 100644 --- a/wao-web/pom.xml +++ b/wao-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.1.1-SNAPSHOT</version> + <version>5.1.1</version> </parent> <artifactId>wao-web</artifactId> -- 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 wao. See http://git.codelutin.com/wao.git commit 60b1e18426844fe4163790e9c2a145ca7a3a2890 Merge: fbfdd18 7656b67 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 12 15:32:16 2015 +0000 Merge branch 'release/5.1.1' pom.xml | 2 +- wao-persistence/pom.xml | 2 +- wao-services/pom.xml | 2 +- .../java/fr/ifremer/wao/services/service/ContactsService.java | 10 ++++++---- wao-web/pom.xml | 2 +- 5 files changed, 10 insertions(+), 8 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 wao. See http://git.codelutin.com/wao.git commit 466251fa6dccde13451c4240a66a59994b0c035e Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 12 15:32:17 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- wao-persistence/pom.xml | 2 +- wao-services/pom.xml | 2 +- wao-web/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index c5f094e..451a006 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.2-SNAPSHOT</version> + <version>5.1.1</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index 13feffe..9c582a6 100644 --- a/wao-persistence/pom.xml +++ b/wao-persistence/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.2-SNAPSHOT</version> + <version>5.1.1</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index 222b945..f32e911 100644 --- a/wao-services/pom.xml +++ b/wao-services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.2-SNAPSHOT</version> + <version>5.1.1</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index 9a3a345..925340e 100644 --- a/wao-web/pom.xml +++ b/wao-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.2-SNAPSHOT</version> + <version>5.1.1</version> </parent> <artifactId>wao-web</artifactId> -- 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 wao. See http://git.codelutin.com/wao.git commit eb817883fac860b3434a53891a11f85143c3f50e Merge: 466251f 60b1e18 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 12 15:32:17 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 wao. See http://git.codelutin.com/wao.git commit adcd234698e433f189091b72fe0af002ed9f6a87 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 12 15:32:17 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- wao-persistence/pom.xml | 2 +- wao-services/pom.xml | 2 +- wao-web/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 451a006..c5f094e 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.1.1</version> + <version>5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index 9c582a6..13feffe 100644 --- a/wao-persistence/pom.xml +++ b/wao-persistence/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.1.1</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index f32e911..222b945 100644 --- a/wao-services/pom.xml +++ b/wao-services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.1.1</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index 925340e..9a3a345 100644 --- a/wao-web/pom.xml +++ b/wao-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.1.1</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>wao-web</artifactId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm