branch develop-4.2.x updated (58687e9 -> 767a790)
This is an automated email from the git hooks/post-receive script. New change to branch develop-4.2.x in repository tutti. See http://git.codelutin.com/tutti.git from 58687e9 [jgitflow-maven-plugin]updating poms for 4.2.3-SNAPSHOT development new a017603 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 91f4267 fix build new defede7 [jgitflow-maven-plugin]updating poms for branch'release/4.2.2' with non-snapshot versions new 2bb268d [jgitflow-maven-plugin]merging 'release/4.2.2' into 'master-4.2.x' new 17b3e20 [jgitflow-maven-plugin]merging 'master-4.2.x' into 'develop-4.2.x' new 767a790 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 767a790e3dfbaf5b3f0c8dbbd183df3e6960b06e Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 18 16:05:28 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 17b3e2072a4c19ed30b6f0cfdbc022467e6e5ab2 Merge: a017603 2bb268d Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 18 16:05:27 2016 +0100 [jgitflow-maven-plugin]merging 'master-4.2.x' into 'develop-4.2.x' commit a01760382044db24af9a4f2ddbd848016cf7ce75 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 18 16:05:27 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 2bb268daf804632ee7f468d51a9b7924f3e24a02 Merge: f5125de defede7 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 18 16:05:21 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.2.2' into 'master-4.2.x' commit defede783b14f809a35ddf621d24703f680a38ed Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 18 16:02:21 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.2.2' with non-snapshot versions commit 91f4267762a6a4762c3936658185c495ec776677 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 18 15:56:02 2016 +0100 fix build Summary of changes: tutti-service/pom.xml | 8 ++++++++ .../src/main/filtered-resources/tutti-help-fr.properties | 5 +++-- 2 files changed, 11 insertions(+), 2 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-4.2.x in repository tutti. See http://git.codelutin.com/tutti.git commit 91f4267762a6a4762c3936658185c495ec776677 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 18 15:56:02 2016 +0100 fix build --- tutti-service/pom.xml | 8 ++++++++ .../src/main/filtered-resources/tutti-help-fr.properties | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 023a993..5c1b53f 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -85,6 +85,14 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-converter</artifactId> + </dependency> <!-- Guava --> <dependency> diff --git a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties index 4b45b20..baf47ba 100644 --- a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties +++ b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties @@ -4,7 +4,7 @@ # $Id:$ # $HeadURL:$ # %% -# Copyright (C) 2012 - 2015 Ifremer +# Copyright (C) 2012 - 2016 Ifremer # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as @@ -22,7 +22,7 @@ # #L% ### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Wed Dec 23 19:23:27 CET 2015 +#Mon Jan 18 15:44:46 CET 2016 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions @@ -370,6 +370,7 @@ tutti.genericFormatImport.action.showReport.help=genericFormat.html\#generic_for tutti.genericFormatImport.action.unfoldAll.help=genericFormat.html\#generic_format_import_actions tutti.genericFormatImport.action.unselectAll.help=genericFormat.html\#generic_format_import_actions tutti.genericFormatImport.action.validate.help=genericFormat.html\#generic_format_import_actions +tutti.genericFormatImport.field.authorizeObsoleteReferentials.help= tutti.genericFormatImport.field.checkWeights.help=genericFormat.html\#generic_format_import_fields tutti.genericFormatImport.field.cleanWeights.help=genericFormat.html\#generic_format_import_fields tutti.genericFormatImport.field.importAccidentalCatch.help=genericFormat.html\#generic_format_import_fields -- 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-4.2.x in repository tutti. See http://git.codelutin.com/tutti.git commit defede783b14f809a35ddf621d24703f680a38ed Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 18 16:02:21 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.2.2' 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 a38424a..b64a93a 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2.2-SNAPSHOT</version> + <version>4.2.2</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 4608589..edb98d3 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.2.2-SNAPSHOT</version> + <version>4.2.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 18ab49a..db2fe21 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.2.2-SNAPSHOT</version> + <version>4.2.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 0a61514..77b6b9f 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.2.2-SNAPSHOT</version> + <version>4.2.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 5c1b53f..1dfed7a 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.2.2-SNAPSHOT</version> + <version>4.2.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 466e1d7..0a1b27b 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.2.2-SNAPSHOT</version> + <version>4.2.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 92216e8..6d6e4a0 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.2.2-SNAPSHOT</version> + <version>4.2.2</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-4.2.x in repository tutti. See http://git.codelutin.com/tutti.git commit 2bb268daf804632ee7f468d51a9b7924f3e24a02 Merge: f5125de defede7 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 18 16:05:21 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.2.2' into 'master-4.2.x' pom.xml | 14 +++++++++++--- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 6 +++++- .../src/main/java/fr/ifremer/tutti/TuttiConfiguration.java | 2 +- .../java/fr/ifremer/tutti/TuttiConfigurationOption.java | 2 +- .../fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java | 2 +- .../tutti/persistence/TuttiPersistenceNoDbImpl.java | 2 +- .../persistence/service/TechnicalPersistenceService.java | 2 +- .../service/TechnicalPersistenceServiceImpl.java | 8 ++++---- .../persistence/service/UpdateSchemaContextSupport.java | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 12 ++++++++---- .../java/fr/ifremer/tutti/service/PersistenceService.java | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 6 +++++- .../src/main/filtered-resources/tutti-help-fr.properties | 5 +++-- .../tutti/ui/swing/content/db/DbManagerUIHandler.java | 2 +- .../tutti/ui/swing/content/db/actions/ImportDbAction.java | 2 +- .../tutti/ui/swing/content/db/actions/OpenDbAction.java | 2 +- .../tutti/ui/swing/update/module/TuttiModuleUpdater.java | 4 ++-- 20 files changed, 51 insertions(+), 30 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-4.2.x in repository tutti. See http://git.codelutin.com/tutti.git commit a01760382044db24af9a4f2ddbd848016cf7ce75 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 18 16:05:27 2016 +0100 [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 6aa278b..b64a93a 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2.3-SNAPSHOT</version> + <version>4.2.2</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index de8ecf4..edb98d3 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.2.3-SNAPSHOT</version> + <version>4.2.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index f17d7bd..db2fe21 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.2.3-SNAPSHOT</version> + <version>4.2.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 6ce4cdd..77b6b9f 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.2.3-SNAPSHOT</version> + <version>4.2.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 7e166fc..87d1c4c 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.2.3-SNAPSHOT</version> + <version>4.2.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index ecb46a1..0a1b27b 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.2.3-SNAPSHOT</version> + <version>4.2.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index c25a233..6d6e4a0 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.2.3-SNAPSHOT</version> + <version>4.2.2</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-4.2.x in repository tutti. See http://git.codelutin.com/tutti.git commit 17b3e2072a4c19ed30b6f0cfdbc022467e6e5ab2 Merge: a017603 2bb268d Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 18 16:05:27 2016 +0100 [jgitflow-maven-plugin]merging 'master-4.2.x' into 'develop-4.2.x' tutti-service/pom.xml | 8 ++++++++ .../src/main/filtered-resources/tutti-help-fr.properties | 5 +++-- 2 files changed, 11 insertions(+), 2 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-4.2.x in repository tutti. See http://git.codelutin.com/tutti.git commit 767a790e3dfbaf5b3f0c8dbbd183df3e6960b06e Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 18 16:05:28 2016 +0100 [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 b64a93a..6aa278b 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2.2</version> + <version>4.2.3-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index edb98d3..de8ecf4 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.2.2</version> + <version>4.2.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index db2fe21..f17d7bd 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.2.2</version> + <version>4.2.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 77b6b9f..6ce4cdd 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.2.2</version> + <version>4.2.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 1dfed7a..321ff03 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.2.2</version> + <version>4.2.3-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 0a1b27b..ecb46a1 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.2.2</version> + <version>4.2.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 6d6e4a0..c25a233 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.2.2</version> + <version>4.2.3-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