branch develop updated (260dd19 -> 1c9d999)
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 260dd19 Add forgotten columns (refs #8370) new 73d35e8 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 3eb5830 [jgitflow-maven-plugin]updating poms for 4.0-alpha-5 branch with snapshot versions new 1180b01 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-5' with non-snapshot versions new d15d38e [jgitflow-maven-plugin]merging 'release/4.0-alpha-5' into 'master' new 33941c3 [jgitflow-maven-plugin]merging 'master' into 'develop' new 1c9d999 [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 1c9d99908323fd89527aa7f6b96cef416312a051 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jun 29 19:18:56 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 33941c31a7fa19a37d8a9b16d57c8174474d7981 Merge: 73d35e8 d15d38e Author: Maven Release <maven-release@codelutin.com> Date: Wed Jun 29 19:18:55 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 73d35e83647bc80ac7a1e4615416504def59d541 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jun 29 19:18:55 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit d15d38e6caee4b43b05dcbd3a1d6616ed1dcebdd Merge: b5e9529 1180b01 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jun 29 19:18:51 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.0-alpha-5' into 'master' commit 1180b016d5f83a6c225a78030396a6d0ce9105f9 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jun 29 19:15:21 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-5' 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 1180b016d5f83a6c225a78030396a6d0ce9105f9 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jun 29 19:15:21 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-5' 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 7380027..f1bedc1 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-alpha-5-SNAPSHOT</version> + <version>4.0-alpha-5</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index e987a6f..6c8e6ed 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-alpha-5-SNAPSHOT</version> + <version>4.0-alpha-5</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index f19af15..3ddc76d 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-alpha-5-SNAPSHOT</version> + <version>4.0-alpha-5</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 87b4e01..918de33 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-alpha-5-SNAPSHOT</version> + <version>4.0-alpha-5</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 d15d38e6caee4b43b05dcbd3a1d6616ed1dcebdd Merge: b5e9529 1180b01 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jun 29 19:18:51 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.0-alpha-5' into 'master' echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- .../actions/VoyageAcousticsImportAction.java | 25 ++++++++++++++------- .../importdata/VoyageAcousticImportServiceIT.java | 2 +- .../import-data/acoustic/movies_small.csv.gz | Bin 6972 -> 7963 bytes echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 7 files changed, 22 insertions(+), 13 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 73d35e83647bc80ac7a1e4615416504def59d541 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jun 29 19:18:55 2016 +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 4e85f0c..f1bedc1 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-SNAPSHOT</version> + <version>4.0-alpha-5</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 28473a7..6c8e6ed 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-SNAPSHOT</version> + <version>4.0-alpha-5</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index af02dfb..3ddc76d 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-SNAPSHOT</version> + <version>4.0-alpha-5</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index a32d2be..918de33 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-SNAPSHOT</version> + <version>4.0-alpha-5</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 33941c31a7fa19a37d8a9b16d57c8174474d7981 Merge: 73d35e8 d15d38e Author: Maven Release <maven-release@codelutin.com> Date: Wed Jun 29 19:18:55 2016 +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 1c9d99908323fd89527aa7f6b96cef416312a051 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jun 29 19:18:56 2016 +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 f1bedc1..4e85f0c 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-alpha-5</version> + <version>4.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 6c8e6ed..28473a7 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-alpha-5</version> + <version>4.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 3ddc76d..af02dfb 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-alpha-5</version> + <version>4.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 918de33..a32d2be 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-alpha-5</version> + <version>4.0-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