branch develop updated (46b0e37 -> 44ea8af)
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 46b0e37 Supprime la conf de base par défault du module rest new 9415723 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 9b65bbd [jgitflow-maven-plugin]updating poms for branch '1.0.1' with snapshot versions new 64f417a [jgitflow-maven-plugin]updating poms for branch'release/1.0.1' with non-snapshot versions new 2a426c4 Merge branch 'release/1.0.1' new 2c8fbe1 Merge branch 'master' into develop new 44ea8af [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 44ea8afa32513a1960ab0ad305b6eb1c2d55fe7b Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 16 10:47:09 2015 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 2c8fbe1828f06f7ef6aff001c75a68f7247e4fcc Merge: 9415723 2a426c4 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 16 10:47:09 2015 +0100 Merge branch 'master' into develop commit 941572395f6d1914228077f22190303e2c9d4e84 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 16 10:47:09 2015 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 2a426c45afc283b004d8434a74cdead371980ef2 Merge: e901d3b 64f417a Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 16 10:47:08 2015 +0100 Merge branch 'release/1.0.1' commit 64f417acd9b347c12d5dbad5448e8394cf78e193 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 16 10:45:31 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.0.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 coselmar. See http://git.codelutin.com/coselmar.git commit 64f417acd9b347c12d5dbad5448e8394cf78e193 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 16 10:45:31 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.0.1' 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 bd5e41b..8e79710 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.1-SNAPSHOT</version> + <version>1.0.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index be21e38..c6be02c 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.1-SNAPSHOT</version> + <version>1.0.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index f522209..5fd4e96 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.1-SNAPSHOT</version> + <version>1.0.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 905d180..a5bd668 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.1-SNAPSHOT</version> + <version>1.0.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 8fb401b..44f256c 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</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 2a426c45afc283b004d8434a74cdead371980ef2 Merge: e901d3b 64f417a Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 16 10:47:08 2015 +0100 Merge branch 'release/1.0.1' coselmar-bundle/pom.xml | 2 +- coselmar-bundle/src/main/webapp/WEB-INF/web.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-rest/src/main/resources/coselmar-services.properties | 8 -------- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 7 files changed, 6 insertions(+), 14 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 941572395f6d1914228077f22190303e2c9d4e84 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 16 10:47:09 2015 +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 e13c774..8e79710 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.1-SNAPSHOT</version> + <version>1.0.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index adb35b0..c6be02c 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.1-SNAPSHOT</version> + <version>1.0.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index bd084cb..5fd4e96 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.1-SNAPSHOT</version> + <version>1.0.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 39622e7..a5bd668 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.1-SNAPSHOT</version> + <version>1.0.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 93ea329..44f256c 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.0.1</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 2c8fbe1828f06f7ef6aff001c75a68f7247e4fcc Merge: 9415723 2a426c4 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 16 10:47:09 2015 +0100 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 44ea8afa32513a1960ab0ad305b6eb1c2d55fe7b Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 16 10:47:09 2015 +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 8e79710..e13c774 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.1</version> + <version>1.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index c6be02c..adb35b0 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.1</version> + <version>1.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 5fd4e96..bd084cb 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.1</version> + <version>1.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index a5bd668..39622e7 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.1</version> + <version>1.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 44f256c..93ea329 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0.1</version> + <version>1.1-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