branch develop updated (9ad1b97 -> 234d0d1)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from 9ad1b97 Fix a translation internal-test #6711 new b68dc45 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds aea0341 [jgitflow-maven-plugin]updating poms for branch '1.0-RC-2' with snapshot versions new 56888a8 [jgitflow-maven-plugin]updating poms for branch'release/1.0-RC-2' with non-snapshot versions new 6a9bfde Merge branch 'release/1.0-RC-2' new 35eca6d Merge branch 'master' into develop new 234d0d1 [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 234d0d164bb4aecd8913d1958f5e8935c6f2e838 Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 25 18:20:44 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 35eca6d8486bf05a11633b65fe830e8727ee8210 Merge: b68dc45 6a9bfde Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 25 18:20:44 2015 +0000 Merge branch 'master' into develop commit b68dc4597c1dfbbf5b986bf5b82fe04ab2077202 Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 25 18:20:44 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 6a9bfdeb45120a54da43271163fb6b768a8d88f3 Merge: 2339bbf 56888a8 Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 25 18:20:43 2015 +0000 Merge branch 'release/1.0-RC-2' commit 56888a8c98e1783c997e1b1a6aaddd56e04058ea Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 25 18:19:25 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/1.0-RC-2' 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.codelutin.com/coselmar.git commit 56888a8c98e1783c997e1b1a6aaddd56e04058ea Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 25 18:19:25 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/1.0-RC-2' 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 3c57487..6e10c47 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-RC-2-SNAPSHOT</version> + <version>1.0-RC-2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index f77d2b6..1b2d3d1 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-RC-2-SNAPSHOT</version> + <version>1.0-RC-2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 625bc53..1dbd67b 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-RC-2-SNAPSHOT</version> + <version>1.0-RC-2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index d476315..a09eeab 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-RC-2-SNAPSHOT</version> + <version>1.0-RC-2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 1606d6d..6f943c2 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-RC-2-SNAPSHOT</version> + <version>1.0-RC-2</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.codelutin.com/coselmar.git commit 6a9bfdeb45120a54da43271163fb6b768a8d88f3 Merge: 2339bbf 56888a8 Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 25 18:20:43 2015 +0000 Merge branch 'release/1.0-RC-2' coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- .../java/fr/ifremer/coselmar/converter/BeanEntityConverter.java | 6 ++++++ .../coselmar/services/indexation/DocumentsIndexationService.java | 4 ++-- .../java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java | 6 +++++- coselmar-ui/pom.xml | 2 +- coselmar-ui/src/main/webapp/i18n/fr.js | 2 +- pom.xml | 2 +- 9 files changed, 19 insertions(+), 9 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.codelutin.com/coselmar.git commit b68dc4597c1dfbbf5b986bf5b82fe04ab2077202 Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 25 18:20:44 2015 +0000 [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 f5f9174..6e10c47 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0-RC-2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 477abe6..1b2d3d1 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0-RC-2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 4ed8325..1dbd67b 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0-RC-2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index e52c52e..a09eeab 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0-RC-2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 49a7d8c..6f943c2 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0-RC-2</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.codelutin.com/coselmar.git commit 35eca6d8486bf05a11633b65fe830e8727ee8210 Merge: b68dc45 6a9bfde Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 25 18:20:44 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 coselmar. See http://git.codelutin.com/coselmar.git commit 234d0d164bb4aecd8913d1958f5e8935c6f2e838 Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 25 18:20:44 2015 +0000 [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 6e10c47..f5f9174 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-RC-2</version> + <version>1.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 1b2d3d1..477abe6 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-RC-2</version> + <version>1.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 1dbd67b..4ed8325 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-RC-2</version> + <version>1.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index a09eeab..e52c52e 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-RC-2</version> + <version>1.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 6f943c2..49a7d8c 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0-RC-2</version> + <version>1.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