branch develop updated (1e77e2f -> 6d5fb45)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 1e77e2f [jgitflow-maven-plugin]updating poms for 4.6.2-SNAPSHOT development new ad4fd8e [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 88d8920 [jgitflow-maven-plugin]updating poms for branch'release/4.6.1' with non-snapshot versions new 653a36d [jgitflow-maven-plugin]merging 'release/4.6.1' into 'master' new 9086d4a [jgitflow-maven-plugin]merging 'master' into 'develop' new 6d5fb45 [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 6d5fb45154093347e2f57b80db6735161b9791ad Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 6 16:59:35 2017 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 9086d4a308648aa07765fe67cef4eb882defe160 Merge: ad4fd8e 653a36d Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 6 16:59:33 2017 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit ad4fd8eae7d7be2184af97c6f7e5a44570eb2395 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 6 16:59:33 2017 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 653a36dcc6bdf14ccd5a0f8f709e28ca41dbccb3 Merge: e1525fb 88d8920 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 6 16:59:31 2017 +0100 [jgitflow-maven-plugin]merging 'release/4.6.1' into 'master' commit 88d892060a41f6b78f5535c9ea0a994f03d78d2d Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 6 16:55:58 2017 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.6.1' 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 https://gitlab.nuiton.org/codelutin/tutti.git commit 88d892060a41f6b78f5535c9ea0a994f03d78d2d Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 6 16:55:58 2017 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.6.1' with non-snapshot versions --- pom.xml | 2 +- tutti-caliper/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 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 547a2fd..1fd587b 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6.1-SNAPSHOT</version> + <version>4.6.1</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-caliper/pom.xml b/tutti-caliper/pom.xml index ed04ba4..19cecf5 100644 --- a/tutti-caliper/pom.xml +++ b/tutti-caliper/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6.1-SNAPSHOT</version> + <version>4.6.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 2fbbd05..63c4e47 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.6.1-SNAPSHOT</version> + <version>4.6.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 07ed61f..658ddc5 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.6.1-SNAPSHOT</version> + <version>4.6.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 2ceec35..c0d364c 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.6.1-SNAPSHOT</version> + <version>4.6.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 1c622f5..4690b25 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.6.1-SNAPSHOT</version> + <version>4.6.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 709bdb3..cf659ae 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.6.1-SNAPSHOT</version> + <version>4.6.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 61956b9..8129a7c 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.6.1-SNAPSHOT</version> + <version>4.6.1</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 https://gitlab.nuiton.org/codelutin/tutti.git commit 653a36dcc6bdf14ccd5a0f8f709e28ca41dbccb3 Merge: e1525fb 88d8920 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 6 16:59:31 2017 +0100 [jgitflow-maven-plugin]merging 'release/4.6.1' into 'master' pom.xml | 4 +- .../AllegroCampagne-Specifications.odt | Bin 1206634 -> 1189485 bytes .../AllegroCampagne-Specifications.pdf | Bin 2146280 -> 2088026 bytes tutti-caliper/pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../catches/ValidateCruiseOperationsService.java | 7 +- .../GenericFormatExportOperationContext.java | 26 ++ .../importactions/ImportCatchAction.java | 3 + .../service/sampling/CruiseSamplingCache.java | 57 +-- .../IndividualObservationSamplingCacheRequest.java | 29 +- .../IndividualObservationSamplingStatus.java | 65 ++-- .../FishingOperation-validate-error-validation.xml | 27 -- ...ishingOperation-validate-warning-validation.xml | 27 ++ tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- tutti-ui-swing/src/main/help/fr/config.html | 27 +- .../src/main/help/fr/editFishingOperation.html | 405 +++++---------------- tutti-ui-swing/src/main/help/fr/editProtocol.html | 36 +- .../src/main/help/fr/editSampleCategory.html | 4 +- tutti-ui-swing/src/main/help/fr/faq.html | 64 +--- tutti-ui-swing/src/main/help/fr/menu.html | 6 +- tutti-ui-swing/src/main/help/fr/navbar.js | 4 +- tutti-ui-swing/src/main/help/fr/validation.html | 4 +- .../create/CreateSpeciesBatchUIHandler.java | 5 +- .../frequency/IndividualObservationUICache.java | 79 +++- .../frequency/SpeciesFrequencyUIHandler.java | 7 +- .../referential/ManageTemporaryReferentialUI.jcss | 8 +- 30 files changed, 414 insertions(+), 494 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 https://gitlab.nuiton.org/codelutin/tutti.git commit ad4fd8eae7d7be2184af97c6f7e5a44570eb2395 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 6 16:59:33 2017 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- tutti-caliper/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 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 0c4e9c0..1fd587b 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6.2-SNAPSHOT</version> + <version>4.6.1</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-caliper/pom.xml b/tutti-caliper/pom.xml index caaaba2..19cecf5 100644 --- a/tutti-caliper/pom.xml +++ b/tutti-caliper/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6.2-SNAPSHOT</version> + <version>4.6.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 44b7786..63c4e47 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.6.2-SNAPSHOT</version> + <version>4.6.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 5b78ca3..658ddc5 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.6.2-SNAPSHOT</version> + <version>4.6.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 610858d..c0d364c 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.6.2-SNAPSHOT</version> + <version>4.6.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index d5c3b57..4690b25 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.6.2-SNAPSHOT</version> + <version>4.6.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 5359098..cf659ae 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.6.2-SNAPSHOT</version> + <version>4.6.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 06f6c59..8129a7c 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.6.2-SNAPSHOT</version> + <version>4.6.1</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 https://gitlab.nuiton.org/codelutin/tutti.git commit 9086d4a308648aa07765fe67cef4eb882defe160 Merge: ad4fd8e 653a36d Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 6 16:59:33 2017 +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 tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 6d5fb45154093347e2f57b80db6735161b9791ad Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 6 16:59:35 2017 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- tutti-caliper/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 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 1fd587b..0c4e9c0 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6.1</version> + <version>4.6.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-caliper/pom.xml b/tutti-caliper/pom.xml index 19cecf5..caaaba2 100644 --- a/tutti-caliper/pom.xml +++ b/tutti-caliper/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6.1</version> + <version>4.6.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 63c4e47..44b7786 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.6.1</version> + <version>4.6.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 658ddc5..5b78ca3 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.6.1</version> + <version>4.6.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index c0d364c..610858d 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.6.1</version> + <version>4.6.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 4690b25..d5c3b57 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.6.1</version> + <version>4.6.2-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 cf659ae..5359098 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.6.1</version> + <version>4.6.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 8129a7c..06f6c59 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.6.1</version> + <version>4.6.2-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