branch develop updated (20d36a60 -> c022a770)
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 20d36a60 [jgitflow-maven-plugin]updating poms for 4.0.16-SNAPSHOT development new 5ea7a6b6 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 67d34950 [jgitflow-maven-plugin]updating poms for branch'release/4.0.15' with non-snapshot versions new 242f86d5 [jgitflow-maven-plugin]merging 'release/4.0.15' into 'master' new 5266e664 [jgitflow-maven-plugin]merging 'master' into 'develop' new c022a770 [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 c022a770a31fbb311dbfaeddbc9911dd86305b83 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 26 17:26:59 2018 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 5266e664b7db355705280175ef3b303b3b61cd6c Merge: 5ea7a6b6 242f86d5 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 26 17:26:59 2018 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 5ea7a6b621b501e48bd1a8eaca6479765939965f Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 26 17:26:58 2018 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 242f86d5aac8d363a57c49ed08bf9d9bd152e9b9 Merge: 90365d28 67d34950 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 26 17:26:56 2018 +0200 [jgitflow-maven-plugin]merging 'release/4.0.15' into 'master' commit 67d3495042c7c08699a79093638edba50aa8a2e7 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 26 17:23:39 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.0.15' 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 67d3495042c7c08699a79093638edba50aa8a2e7 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 26 17:23:39 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.0.15' 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 2c851c8e..1112461f 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.15</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index d451264e..d489e2c2 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.15</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index e66bca32..0f23e747 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.15</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 6cecf81d..404a2f04 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.15</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 242f86d5aac8d363a57c49ed08bf9d9bd152e9b9 Merge: 90365d28 67d34950 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 26 17:26:56 2018 +0200 [jgitflow-maven-plugin]merging 'release/4.0.15' into 'master' echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- .../echobase/services/service/atlantos/xml/XmlBioticExport.java | 5 +++-- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 7 insertions(+), 6 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 5ea7a6b621b501e48bd1a8eaca6479765939965f Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 26 17:26:58 2018 +0200 [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 3e0576f3..1112461f 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.16-SNAPSHOT</version> + <version>4.0.15</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 4bd2ee3e..d489e2c2 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.16-SNAPSHOT</version> + <version>4.0.15</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index a3d98ac4..0f23e747 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.16-SNAPSHOT</version> + <version>4.0.15</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index a581a1a3..404a2f04 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.16-SNAPSHOT</version> + <version>4.0.15</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 5266e664b7db355705280175ef3b303b3b61cd6c Merge: 5ea7a6b6 242f86d5 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 26 17:26:59 2018 +0200 [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 c022a770a31fbb311dbfaeddbc9911dd86305b83 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 26 17:26:59 2018 +0200 [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 1112461f..3e0576f3 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</version> + <version>4.0.16-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index d489e2c2..4bd2ee3e 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</version> + <version>4.0.16-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 0f23e747..a3d98ac4 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</version> + <version>4.0.16-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 404a2f04..a581a1a3 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.15</version> + <version>4.0.16-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