branch develop updated (dc2cce0 -> be04f4d)
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 dc2cce0 [jgitflow-maven-plugin]updating poms for 4.0.6-SNAPSHOT development new 8bed51a [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 7148576 [jgitflow-maven-plugin]updating poms for branch'release/4.0.5' with non-snapshot versions new 9658664 [jgitflow-maven-plugin]merging 'release/4.0.5' into 'master' new bbc98e8 [jgitflow-maven-plugin]merging 'master' into 'develop' new be04f4d [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 be04f4dbe538ae0a15878d5c6ddb2630ed480a49 Author: Maven Release <maven-release@codelutin.com> Date: Wed Nov 23 16:34:20 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit bbc98e81f82a1647682d5f1317d8144518cafd70 Merge: 8bed51a 9658664 Author: Maven Release <maven-release@codelutin.com> Date: Wed Nov 23 16:34:20 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 8bed51ae32d74eac02bcfd1152d42c801794dda7 Author: Maven Release <maven-release@codelutin.com> Date: Wed Nov 23 16:34:19 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 9658664fea6032a097323f601ed38aaffa4ea4aa Merge: 3ce9034 7148576 Author: Maven Release <maven-release@codelutin.com> Date: Wed Nov 23 16:34:11 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.0.5' into 'master' commit 7148576cfeff94a2e81715d20717eb66988f2e09 Author: Maven Release <maven-release@codelutin.com> Date: Wed Nov 23 16:31:24 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.0.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 7148576cfeff94a2e81715d20717eb66988f2e09 Author: Maven Release <maven-release@codelutin.com> Date: Wed Nov 23 16:31:24 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.0.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 9ff7939..4f046ff 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.5-SNAPSHOT</version> + <version>4.0.5</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 9c2434c..137ea39 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.5-SNAPSHOT</version> + <version>4.0.5</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 2cc9ee2..a244eb8 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.5-SNAPSHOT</version> + <version>4.0.5</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index c25807f..6604248 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.5-SNAPSHOT</version> + <version>4.0.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 9658664fea6032a097323f601ed38aaffa4ea4aa Merge: 3ce9034 7148576 Author: Maven Release <maven-release@codelutin.com> Date: Wed Nov 23 16:34:11 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.0.5' into 'master' echobase-domain/pom.xml | 2 +- .../i18n/echobase-domain_fr_FR.properties | 8 ++-- echobase-services/pom.xml | 2 +- .../service/atlantos/ExportAtlantosService.java | 2 +- .../service/atlantos/xml/XmlAccousticExport.java | 4 +- .../service/atlantos/xml/XmlBioticExport.java | 10 ++--- .../VoyageCatchesBiometrySampleImportAction.java | 50 ++++++++++++---------- .../i18n/echobase-services_fr_FR.properties | 2 +- echobase-ui/pom.xml | 2 +- .../ui/actions/exportAtlantos/Configure.java | 2 +- .../resources/i18n/echobase-ui_en_GB.properties | 22 +++++----- .../resources/i18n/echobase-ui_fr_FR.properties | 22 +++++----- pom.xml | 2 +- src/site/en/rst/importData.rst | 10 +++++ src/site/rst/importData.rst | 10 +++++ src/site/rst/install.rst.vm | 3 ++ 16 files changed, 90 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 8bed51ae32d74eac02bcfd1152d42c801794dda7 Author: Maven Release <maven-release@codelutin.com> Date: Wed Nov 23 16:34:19 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 75f6efc..4f046ff 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.5</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 39457c6..137ea39 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.5</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index af41fa6..a244eb8 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.5</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 9a3a30a..6604248 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.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 bbc98e81f82a1647682d5f1317d8144518cafd70 Merge: 8bed51a 9658664 Author: Maven Release <maven-release@codelutin.com> Date: Wed Nov 23 16:34:20 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 be04f4dbe538ae0a15878d5c6ddb2630ed480a49 Author: Maven Release <maven-release@codelutin.com> Date: Wed Nov 23 16:34:20 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 4f046ff..75f6efc 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.5</version> + <version>4.0.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 137ea39..39457c6 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.5</version> + <version>4.0.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index a244eb8..af41fa6 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.5</version> + <version>4.0.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 6604248..9a3a30a 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.5</version> + <version>4.0.6-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