branch develop updated (ac50735 -> d3e60d7)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from ac50735 [jgitflow-maven-plugin]updating poms for 4.0.7-SNAPSHOT development new 72dc48b [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new d9d05c5 [jgitflow-maven-plugin]updating poms for branch'release/4.0.6' with non-snapshot versions new d27b820 [jgitflow-maven-plugin]merging 'release/4.0.6' into 'master' new 76c93a8 [jgitflow-maven-plugin]merging 'master' into 'develop' new d3e60d7 [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 d3e60d7a416956223c66583728be898620785a05 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 28 15:14:58 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 76c93a8734a7cc81b66deed9744efc1990b14d76 Merge: 72dc48b d27b820 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 28 15:14:57 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 72dc48ba88008c14948702d3686d1f8dd74c1c55 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 28 15:14:56 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit d27b8200cedf84a83d22938339fdd7b57cf26b5c Merge: 9658664 d9d05c5 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 28 15:14:49 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.0.6' into 'master' commit d9d05c51ba6a7f9778c153d7daee105b15ad0da0 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 28 14:54:51 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.0.6' 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit d9d05c51ba6a7f9778c153d7daee105b15ad0da0 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 28 14:54:51 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.0.6' with non-snapshot versions --- echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index 75f6efc..bdd5751 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.6-SNAPSHOT</version> + <version>4.0.6</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 39457c6..a4f3166 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.6-SNAPSHOT</version> + <version>4.0.6</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index af41fa6..db69abc 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.6-SNAPSHOT</version> + <version>4.0.6</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 9a3a30a..6a62c3a 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.6-SNAPSHOT</version> + <version>4.0.6</version> <modules> <module>echobase-domain</module> -- 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit d27b8200cedf84a83d22938339fdd7b57cf26b5c Merge: 9658664 d9d05c5 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 28 15:14:49 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.0.6' into 'master' echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- .../service/atlantos/xml/XmlAccousticExport.java | 119 +++++++++++---------- .../service/atlantos/xml/XmlBioticExport.java | 4 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 68 insertions(+), 63 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 72dc48ba88008c14948702d3686d1f8dd74c1c55 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 28 15:14:56 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index d1f25e6..bdd5751 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.7-SNAPSHOT</version> + <version>4.0.6</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 9f60a00..a4f3166 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.7-SNAPSHOT</version> + <version>4.0.6</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 43f5469..db69abc 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.7-SNAPSHOT</version> + <version>4.0.6</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 18daaaa..6a62c3a 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.7-SNAPSHOT</version> + <version>4.0.6</version> <modules> <module>echobase-domain</module> -- 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 76c93a8734a7cc81b66deed9744efc1990b14d76 Merge: 72dc48b d27b820 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 28 15:14:57 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit d3e60d7a416956223c66583728be898620785a05 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 28 15:14:58 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index bdd5751..d1f25e6 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.6</version> + <version>4.0.7-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index a4f3166..9f60a00 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.6</version> + <version>4.0.7-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index db69abc..43f5469 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.6</version> + <version>4.0.7-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 6a62c3a..18daaaa 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.6</version> + <version>4.0.7-SNAPSHOT</version> <modules> <module>echobase-domain</module> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm