branch develop updated (dcc7be1 -> df43230)
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 dcc7be1 [jgitflow-maven-plugin]updating poms for 4.0.4-SNAPSHOT development new 2404ea5 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new cc3bf4a [jgitflow-maven-plugin]updating poms for branch'release/4.0.3' with non-snapshot versions new ee34b5c [jgitflow-maven-plugin]merging 'release/4.0.3' into 'master' new e75d107 [jgitflow-maven-plugin]merging 'master' into 'develop' new df43230 [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 df43230c55940010e20082967faf4474c9f12341 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 8 19:50:09 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit e75d107bb9047ee9d06831478b4204a7a1461c94 Merge: 2404ea5 ee34b5c Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 8 19:50:08 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 2404ea5340fa3d8e4a5debc2b02f61272429c6af Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 8 19:50:07 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit ee34b5c989aad015478fd3a34ef181a112f5ead2 Merge: 66253ff cc3bf4a Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 8 19:49:59 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.0.3' into 'master' commit cc3bf4a8c5d865ee3bf22b712f25b9311c2135f2 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 8 19:44:14 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.0.3' 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 cc3bf4a8c5d865ee3bf22b712f25b9311c2135f2 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 8 19:44:14 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.0.3' 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 c8c2ba3..6dc952a 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.3-SNAPSHOT</version> + <version>4.0.3</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index aa79fff..12b4412 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.3-SNAPSHOT</version> + <version>4.0.3</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 40a58ef..2b258a8 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.3-SNAPSHOT</version> + <version>4.0.3</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 9e4375b..ad4fc7a 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.3-SNAPSHOT</version> + <version>4.0.3</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 ee34b5c989aad015478fd3a34ef181a112f5ead2 Merge: 66253ff cc3bf4a Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 8 19:49:59 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.0.3' into 'master' echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- .../services/service/UserDbPersistenceService.java | 7 ++ .../VoyageResultsMapFishCellImportAction.java | 117 +++++++++++---------- ...hotypeAndSpeciesCategoryAndLengthImportRow.java | 2 +- .../csv/VoyageResultsMapFishCellImportRow.java | 7 +- .../csv/VoyageResultsRegionCellImportRow.java | 25 +++-- echobase-services/src/main/resources/actual | 99 ----------------- echobase-services/src/main/resources/expected | 99 ----------------- ...chotypeAndSpeciesCategoryAndLength_small.csv.gz | Bin 2605 -> 2601 bytes .../import-data/result/map/mapsFish.csv.gz | Bin 3387 -> 3377 bytes .../import-data/result/region/regionResults.csv.gz | Bin 13249 -> 13099 bytes .../import-data/result/region/regions.csv.gz | Bin 4440 -> 4413 bytes echobase-ui/pom.xml | 2 +- pom.xml | 2 +- src/site/en/rst/importData.rst | 6 +- src/site/rst/importData.rst | 6 +- 17 files changed, 97 insertions(+), 279 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 2404ea5340fa3d8e4a5debc2b02f61272429c6af Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 8 19:50:07 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 21cd6e8..6dc952a 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.4-SNAPSHOT</version> + <version>4.0.3</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index f8bfa14..12b4412 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.4-SNAPSHOT</version> + <version>4.0.3</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 83578fb..2b258a8 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.4-SNAPSHOT</version> + <version>4.0.3</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 93440d7..ad4fc7a 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.4-SNAPSHOT</version> + <version>4.0.3</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 e75d107bb9047ee9d06831478b4204a7a1461c94 Merge: 2404ea5 ee34b5c Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 8 19:50:08 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 df43230c55940010e20082967faf4474c9f12341 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 8 19:50:09 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 6dc952a..21cd6e8 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.3</version> + <version>4.0.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 12b4412..f8bfa14 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.3</version> + <version>4.0.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 2b258a8..83578fb 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.3</version> + <version>4.0.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index ad4fc7a..93440d7 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.3</version> + <version>4.0.4-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