branch develop updated (eb5d1aa -> acde695)
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 eb5d1aa Handle duplication on elementary cell (refs #2246) new 4f6c5de [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds b7df710 [jgitflow-maven-plugin]updating poms for 4.0-alpha-6 branch with snapshot versions new 50565e6 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-6' with non-snapshot versions new 311cdf9 [jgitflow-maven-plugin]merging 'release/4.0-alpha-6' into 'master' new db707d7 [jgitflow-maven-plugin]merging 'master' into 'develop' new acde695 [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 acde695bc68d5805d1196f388456b9278f28e4a8 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 30 18:27:05 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit db707d7965e70159f44a1374d89aa44163c31392 Merge: 4f6c5de 311cdf9 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 30 18:27:04 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 4f6c5de53fb8b9e0bf73eab1b5898d7fc727f34d Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 30 18:27:04 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 311cdf9b040f42780e68c9202886817a717751c0 Merge: d15d38e 50565e6 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 30 18:27:01 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.0-alpha-6' into 'master' commit 50565e6b6d0265043fce47a9756a8e1a938ea2bd Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 30 18:23:47 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-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 50565e6b6d0265043fce47a9756a8e1a938ea2bd Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 30 18:23:47 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-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 a28f4e7..9ef63a4 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-6-SNAPSHOT</version> + <version>4.0-alpha-6</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index fbb0e70..cf46957 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-6-SNAPSHOT</version> + <version>4.0-alpha-6</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 594ab6d..b886136 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-6-SNAPSHOT</version> + <version>4.0-alpha-6</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 2886df1..fd9f0e2 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-alpha-6-SNAPSHOT</version> + <version>4.0-alpha-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 311cdf9b040f42780e68c9202886817a717751c0 Merge: d15d38e 50565e6 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 30 18:27:01 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.0-alpha-6' into 'master' echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- .../actions/VoyageAcousticsImportAction.java | 61 +++------------------ .../importdata/csv/VoyageAcousticImportRow.java | 19 +++++-- .../strategy/AcousticRemoveDataStrategy.java | 4 +- .../import-data/acoustic/movies_small.csv.gz | Bin 7963 -> 7963 bytes echobase-ui/pom.xml | 2 +- .../resources/i18n/echobase-ui_en_GB.properties | 2 +- .../resources/i18n/echobase-ui_fr_FR.properties | 2 +- .../src/main/webapp/WEB-INF/includes/footer.jsp | 2 +- pom.xml | 2 +- 11 files changed, 31 insertions(+), 67 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 4f6c5de53fb8b9e0bf73eab1b5898d7fc727f34d Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 30 18:27:04 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..9ef63a4 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-6</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 28473a7..cf46957 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-6</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index af02dfb..b886136 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-6</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index a32d2be..fd9f0e2 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-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 db707d7965e70159f44a1374d89aa44163c31392 Merge: 4f6c5de 311cdf9 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 30 18:27:04 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 acde695bc68d5805d1196f388456b9278f28e4a8 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 30 18:27:05 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 9ef63a4..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-6</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 cf46957..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-6</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 b886136..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-6</version> + <version>4.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index fd9f0e2..a32d2be 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-alpha-6</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