branch develop updated (9c5df671 -> 52a37f0c)
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 9c5df671 [jgitflow-maven-plugin]updating poms for 4.0.15-SNAPSHOT development new 07383576 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new f2878178 [jgitflow-maven-plugin]updating poms for branch'release/4.0.14' with non-snapshot versions new 90365d28 [jgitflow-maven-plugin]merging 'release/4.0.14' into 'master' new 8d335e3c [jgitflow-maven-plugin]merging 'master' into 'develop' new 52a37f0c [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 52a37f0ce06263b2c2ec4bdd894000d6b4040544 Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 20 11:24:30 2018 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 8d335e3c2169954e8a0abc46237c64f7d9a2f23e Merge: 07383576 90365d28 Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 20 11:24:15 2018 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 073835765c5bdfcacb5b667e1bfe1d2d326947b0 Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 20 11:24:13 2018 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 90365d28b6cb705572ce74d34a7062d943276006 Merge: be377dde f2878178 Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 20 11:23:59 2018 +0100 [jgitflow-maven-plugin]merging 'release/4.0.14' into 'master' commit f28781781fe8fac9586b9d761e778fecedef696b Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 20 11:19:53 2018 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.0.14' 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 f28781781fe8fac9586b9d761e778fecedef696b Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 20 11:19:53 2018 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.0.14' 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 fdcd786e..63999e7d 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.14-SNAPSHOT</version> + <version>4.0.14</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 667bf44a..c697e1b1 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.14-SNAPSHOT</version> + <version>4.0.14</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 0ccf3860..c6c87aa4 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.14-SNAPSHOT</version> + <version>4.0.14</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 97a6e21e..f874af6b 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.14-SNAPSHOT</version> + <version>4.0.14</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 90365d28b6cb705572ce74d34a7062d943276006 Merge: be377dde f2878178 Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 20 11:23:59 2018 +0100 [jgitflow-maven-plugin]merging 'release/4.0.14' into 'master' echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- .../service/atlantos/xml/XmlAccousticExport.java | 20 ++++--- .../service/atlantos/xml/XmlBioticExport.java | 64 +++++++++++++++++----- .../VoyageCatchesSubSampleImportAction.java | 2 +- .../strategy/CommonAllRemoveDataStrategy.java | 37 +++++++++++++ echobase-ui/pom.xml | 2 +- pom.xml | 4 +- 8 files changed, 106 insertions(+), 27 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 073835765c5bdfcacb5b667e1bfe1d2d326947b0 Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 20 11:24:13 2018 +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 2c851c8e..63999e7d 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.15-SNAPSHOT</version> + <version>4.0.14</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index d451264e..c697e1b1 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.15-SNAPSHOT</version> + <version>4.0.14</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index e66bca32..c6c87aa4 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.15-SNAPSHOT</version> + <version>4.0.14</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 6cecf81d..f874af6b 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.15-SNAPSHOT</version> + <version>4.0.14</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 8d335e3c2169954e8a0abc46237c64f7d9a2f23e Merge: 07383576 90365d28 Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 20 11:24:15 2018 +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 52a37f0ce06263b2c2ec4bdd894000d6b4040544 Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 20 11:24:30 2018 +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 63999e7d..2c851c8e 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.14</version> + <version>4.0.15-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index c697e1b1..d451264e 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.14</version> + <version>4.0.15-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index c6c87aa4..e66bca32 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.14</version> + <version>4.0.15-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index f874af6b..6cecf81d 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.14</version> + <version>4.0.15-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