branch develop updated (29c4f6e -> 13e580b)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 29c4f6e [jgitflow-maven-plugin]updating poms for 4.0.1-SNAPSHOT development new 332c7d0 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 659ca6f [jgitflow-maven-plugin]updating poms for branch '4.0' with snapshot versions new 93c030e [jgitflow-maven-plugin]updating poms for branch'release/4.0' with non-snapshot versions new 968dc7e Merge branch 'release/4.0' new ce459b7 Merge branch 'master' into develop new 13e580b [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 13e580bcca90b91d2afd089579d47d66c7dde034 Author: Maven Release <maven-release@codelutin.com> Date: Fri May 1 15:38:00 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit ce459b7befb90a18658c7701a5e2d7e21bbb778a Merge: 332c7d0 968dc7e Author: Maven Release <maven-release@codelutin.com> Date: Fri May 1 15:37:56 2015 +0000 Merge branch 'master' into develop commit 332c7d048655393d94e34c9748d374ceaa684750 Author: Maven Release <maven-release@codelutin.com> Date: Fri May 1 15:37:53 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 968dc7e940354ba6f074812e7a5d18395836834a Merge: 3998c48 93c030e Author: Maven Release <maven-release@codelutin.com> Date: Fri May 1 15:37:47 2015 +0000 Merge branch 'release/4.0' commit 93c030ecbc7a448382f417f601ae6b1050c77a9e Author: Maven Release <maven-release@codelutin.com> Date: Fri May 1 15:29:20 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0' 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 tutti. See http://git.codelutin.com/tutti.git commit 93c030ecbc7a448382f417f601ae6b1050c77a9e Author: Maven Release <maven-release@codelutin.com> Date: Fri May 1 15:29:20 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0' with non-snapshot versions --- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 4caaccb..3996383 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-SNAPSHOT</version> + <version>4.0</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index a0bf9bd..ab4a7e0 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-SNAPSHOT</version> + <version>4.0</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 3873b30..c5dcbcf 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-SNAPSHOT</version> + <version>4.0</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index b6000dc..18961a4 100644 --- a/tutti-report-generator/pom.xml +++ b/tutti-report-generator/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-SNAPSHOT</version> + <version>4.0</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index d6d468a..625ac4f 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-SNAPSHOT</version> + <version>4.0</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index a61a3f9..ffa1bc9 100644 --- a/tutti-ui-swing-updater/pom.xml +++ b/tutti-ui-swing-updater/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-SNAPSHOT</version> + <version>4.0</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 432d086..8ed02f6 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-SNAPSHOT</version> + <version>4.0</version> </parent> <groupId>fr.ifremer.tutti</groupId> -- 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 tutti. See http://git.codelutin.com/tutti.git commit 968dc7e940354ba6f074812e7a5d18395836834a Merge: 3998c48 93c030e Author: Maven Release <maven-release@codelutin.com> Date: Fri May 1 15:37:47 2015 +0000 Merge branch 'release/4.0' pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../FishingOperationPersistenceServiceImpl.java | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../tutti/service/bigfin/BigfinImportService.java | 15 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- tutti-ui-swing/src/main/assembly/help.xml | 8 + .../filtered-resources/tutti-help-fr.properties | 58 +- .../src/main/help/export/accidentalCatch.csv | 6 - tutti-ui-swing/src/main/help/export/catch.csv | 9 - .../src/main/help/export/exportCruise-example.zip | Bin 4327 -> 0 bytes .../src/main/help/export/gearCaracteristics.csv | 1 - .../src/main/help/export/genericFormat-example.zip | Bin 0 -> 75501 bytes .../src/main/help/export/individualObservation.csv | 12 - .../src/main/help/export/marineLitter.csv | 2 - tutti-ui-swing/src/main/help/export/operation.csv | 2 - tutti-ui-swing/src/main/help/export/parameter.csv | 19 - tutti-ui-swing/src/main/help/export/species.csv | 5 - tutti-ui-swing/src/main/help/export/survey.csv | 2 - tutti-ui-swing/src/main/help/fr/genericFormat.html | 602 ++++++--------------- tutti-ui-swing/src/main/help/fr/index.html | 6 +- tutti-ui-swing/src/main/help/fr/menu.html | 28 +- tutti-ui-swing/src/main/help/fr/navbar.js | 6 +- tutti-ui-swing/src/main/help/fr/selectCruise.html | 8 - .../operation/catches/EditCatchesSvgHandler.java | 2 +- .../actions/ExportAllCaracteristicAction.java | 2 +- .../actions/ExportProtocolBenthosAction.java | 2 +- .../actions/ExportProtocolCaracteristicAction.java | 2 +- .../actions/ExportProtocolSpeciesAction.java | 2 +- .../protocol/actions/ExportPupitriAction.java | 2 +- .../actions/ImportProtocolBenthosAction.java | 2 +- .../actions/ImportProtocolCaracteristicAction.java | 2 +- .../actions/ImportProtocolSpeciesAction.java | 2 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 6 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 69 +-- 38 files changed, 315 insertions(+), 583 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 tutti. See http://git.codelutin.com/tutti.git commit 332c7d048655393d94e34c9748d374ceaa684750 Author: Maven Release <maven-release@codelutin.com> Date: Fri May 1 15:37:53 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index d4f77e4..3996383 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0.1-SNAPSHOT</version> + <version>4.0</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 9801dec..ab4a7e0 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0.1-SNAPSHOT</version> + <version>4.0</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index cf01be3..c5dcbcf 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0.1-SNAPSHOT</version> + <version>4.0</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 1516cf5..18961a4 100644 --- a/tutti-report-generator/pom.xml +++ b/tutti-report-generator/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0.1-SNAPSHOT</version> + <version>4.0</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 2218ef9..625ac4f 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0.1-SNAPSHOT</version> + <version>4.0</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 880a446..ffa1bc9 100644 --- a/tutti-ui-swing-updater/pom.xml +++ b/tutti-ui-swing-updater/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0.1-SNAPSHOT</version> + <version>4.0</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 16862d5..8ed02f6 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0.1-SNAPSHOT</version> + <version>4.0</version> </parent> <groupId>fr.ifremer.tutti</groupId> -- 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 tutti. See http://git.codelutin.com/tutti.git commit ce459b7befb90a18658c7701a5e2d7e21bbb778a Merge: 332c7d0 968dc7e Author: Maven Release <maven-release@codelutin.com> Date: Fri May 1 15:37:56 2015 +0000 Merge branch '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 tutti. See http://git.codelutin.com/tutti.git commit 13e580bcca90b91d2afd089579d47d66c7dde034 Author: Maven Release <maven-release@codelutin.com> Date: Fri May 1 15:38:00 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 3996383..d4f77e4 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0</version> + <version>4.0.1-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index ab4a7e0..9801dec 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0</version> + <version>4.0.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index c5dcbcf..cf01be3 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0</version> + <version>4.0.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 18961a4..1516cf5 100644 --- a/tutti-report-generator/pom.xml +++ b/tutti-report-generator/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0</version> + <version>4.0.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 625ac4f..2218ef9 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0</version> + <version>4.0.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index ffa1bc9..880a446 100644 --- a/tutti-ui-swing-updater/pom.xml +++ b/tutti-ui-swing-updater/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0</version> + <version>4.0.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 8ed02f6..16862d5 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0</version> + <version>4.0.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm