branch develop updated (07e5ff5 -> 877fac9)
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 07e5ff5 [jgitflow-maven-plugin]updating poms for 4.0-RC3-SNAPSHOT development new 5bce408 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new d1af030 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC2' with non-snapshot versions new 6cca7a9 Merge branch 'release/4.0-RC2' new 2b463bb Merge branch 'master' into develop new 877fac9 [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 877fac95655f6fdb07fd48b88eecb017a0c35002 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 14 13:45:51 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 2b463bbc6723c0736a82509f3923dcee35c0f74f Merge: 5bce408 6cca7a9 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 14 13:45:50 2015 +0000 Merge branch 'master' into develop commit 5bce408bc0823ca0d7258df000c8517f3c5293ab Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 14 13:45:50 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 6cca7a9fcd1a10de979289dd32258396ced405bd Merge: ec86284 d1af030 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 14 13:45:43 2015 +0000 Merge branch 'release/4.0-RC2' commit d1af030004e5a9c1aca246af063219b4f41c55cf Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 14 13:39:34 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC2' 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 d1af030004e5a9c1aca246af063219b4f41c55cf Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 14 13:39:34 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC2' 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 b8bb9df..14363de 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-RC2-SNAPSHOT</version> + <version>4.0-RC2</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 6e7bae1..87ea6e5 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-RC2-SNAPSHOT</version> + <version>4.0-RC2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 9ec9a37..7db406b 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-RC2-SNAPSHOT</version> + <version>4.0-RC2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index d6fc696..4543d7d 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-RC2-SNAPSHOT</version> + <version>4.0-RC2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index d020dd7..15a1b96 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-RC2-SNAPSHOT</version> + <version>4.0-RC2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 2287152..441ff7d 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-RC2-SNAPSHOT</version> + <version>4.0-RC2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 22e47cd..b68320d 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-RC2-SNAPSHOT</version> + <version>4.0-RC2</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 6cca7a9fcd1a10de979289dd32258396ced405bd Merge: ec86284 d1af030 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 14 13:45:43 2015 +0000 Merge branch 'release/4.0-RC2' pom.xml | 2 +- src/site/rst/dbversions.rst | 2 ++ tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 5 +++ .../fr/ifremer/tutti/TuttiConfigurationOption.java | 7 ++++ .../i18n/tutti-persistence_en_GB.properties | 1 + .../i18n/tutti-persistence_fr_FR.properties | 1 + tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../fr/ifremer/tutti/service/csv/CsvComsumer.java | 4 +-- .../genericformat/GenericFormatCsvFileResult.java | 17 +++++++++- .../GenericFormatImportConfiguration.java | 13 ++++++++ .../genericformat/GenericFormatImportRequest.java | 4 +++ .../consumer/CsvConsumerForCatch.java | 4 +++ .../service/genericformat/csv/CatchModel.java | 12 ++++--- .../tutti/service/genericformat/csv/CatchRow.java | 38 ++++++++-------------- .../genericformat/csv/ExportSampleCategory.java | 14 +++++++- .../importactions/ImportActionSupport.java | 13 ++++++++ .../ValidateAccidentalCatchAction.java | 11 ++++++- .../importactions/ValidateCatchAction.java | 11 ++++++- .../ValidateGearCaracteristicAction.java | 11 ++++++- .../ValidateIndividualObservationAction.java | 11 ++++++- .../importactions/ValidateMarineLitterAction.java | 11 ++++++- .../importactions/ValidateOperationAction.java | 11 ++++++- .../importactions/ValidateParameterAction.java | 11 ++++++- .../importactions/ValidateSurveyAction.java | 11 ++++++- .../producer/CsvProducerForCatch.java | 10 +++--- .../ftl/genericFormatValidateReport_fr.ftl | 3 ++ tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 8 +++-- .../swing/content/config/TuttiConfigUIHandler.java | 3 ++ .../genericformat/GenericFormatImportUI.css | 7 +++- .../genericformat/GenericFormatImportUI.jaxx | 30 ++++++++--------- .../genericformat/GenericFormatImportUIModel.java | 7 ++-- .../actions/GenericFormatValidateAction.java | 3 +- .../genericformat/tree/DataSelectTreeModel.java | 10 +++--- .../tree/ImportDataSelectTreeCellRenderer.java | 2 +- .../ui/swing/util/AbstractTuttiUIHandler.java | 8 ++++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 42 files changed, 249 insertions(+), 81 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 5bce408bc0823ca0d7258df000c8517f3c5293ab Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 14 13:45:50 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 9b02a05..14363de 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-RC3-SNAPSHOT</version> + <version>4.0-RC2</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 4688400..87ea6e5 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-RC3-SNAPSHOT</version> + <version>4.0-RC2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index ddfea11..7db406b 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-RC3-SNAPSHOT</version> + <version>4.0-RC2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 0249d78..4543d7d 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-RC3-SNAPSHOT</version> + <version>4.0-RC2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 3615d1e..15a1b96 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-RC3-SNAPSHOT</version> + <version>4.0-RC2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 96bd157..441ff7d 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-RC3-SNAPSHOT</version> + <version>4.0-RC2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 873c440..b68320d 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-RC3-SNAPSHOT</version> + <version>4.0-RC2</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 2b463bbc6723c0736a82509f3923dcee35c0f74f Merge: 5bce408 6cca7a9 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 14 13:45:50 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 877fac95655f6fdb07fd48b88eecb017a0c35002 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 14 13:45:51 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 14363de..9b02a05 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-RC2</version> + <version>4.0-RC3-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 87ea6e5..4688400 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-RC2</version> + <version>4.0-RC3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 7db406b..ddfea11 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-RC2</version> + <version>4.0-RC3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 4543d7d..0249d78 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-RC2</version> + <version>4.0-RC3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 15a1b96..3615d1e 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-RC2</version> + <version>4.0-RC3-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 441ff7d..96bd157 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-RC2</version> + <version>4.0-RC3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index b68320d..873c440 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-RC2</version> + <version>4.0-RC3-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