branch develop updated (6e567b4 -> 721d056)
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 6e567b4 Fix scm section new e3b55cb [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds c958e82 [jgitflow-maven-plugin]updating poms for 4.2-rc-1 branch with snapshot versions new b955064 Ajout des en-têtes de license new 283c386 [jgitflow-maven-plugin]updating poms for branch'release/4.2-rc-1' with non-snapshot versions new 771ce24 [jgitflow-maven-plugin]merging 'release/4.2-rc-1' into 'master' new ea33131 [jgitflow-maven-plugin]merging 'master' into 'develop' new 721d056 [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 721d056f7187873515130ce5a7fd8b272a83eaf7 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 10:21:23 2015 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit ea33131ea417d24e8126472911ad9370b3495814 Merge: e3b55cb 771ce24 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 10:21:22 2015 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit e3b55cbd59094c809c770e1434d2d1a2decd4bda Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 10:21:21 2015 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 771ce248c673278e5d1c60d9c5ba18c23659c285 Merge: 9492cfe 283c386 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 10:21:18 2015 +0100 [jgitflow-maven-plugin]merging 'release/4.2-rc-1' into 'master' commit 283c386c832dba92a6cf12f4a52d5d4887fde4eb Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 10:18:03 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.2-rc-1' with non-snapshot versions commit b9550649fe15f974f80ccf8697559a908aa1b66b Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 10:17:50 2015 +0100 Ajout des en-têtes de license Summary of changes: .../referential/synchro/ReferentialUpdateTask.java | 24 ++++++++++++++++++++++ ...aceReferenceTaxonReferentialUpdateTaskImpl.java | 24 ++++++++++++++++++++++ .../TuttiReferentialSynchroServiceImpl.java | 24 ++++++++++++++++++++++ 3 files changed, 72 insertions(+) -- 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 283c386c832dba92a6cf12f4a52d5d4887fde4eb Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 10:18:03 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.2-rc-1' 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 102f8d8..3333263 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2-rc-1-SNAPSHOT</version> + <version>4.2-rc-1</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index dc137a0..764f427 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-rc-1-SNAPSHOT</version> + <version>4.2-rc-1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index f4dc876..7a2bbf0 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-rc-1-SNAPSHOT</version> + <version>4.2-rc-1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index b0b3ffd..ea21f65 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-rc-1-SNAPSHOT</version> + <version>4.2-rc-1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index fad11c4..26dc4e7 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-rc-1-SNAPSHOT</version> + <version>4.2-rc-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 545e8ec..22ad095 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-rc-1-SNAPSHOT</version> + <version>4.2-rc-1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 006489c..08fb794 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-rc-1-SNAPSHOT</version> + <version>4.2-rc-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 http://git.codelutin.com/tutti.git commit 771ce248c673278e5d1c60d9c5ba18c23659c285 Merge: 9492cfe 283c386 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 10:21:18 2015 +0100 [jgitflow-maven-plugin]merging 'release/4.2-rc-1' into 'master' pom.xml | 53 +++++--- .../AllegroCampagne-Specifications.odt | Bin 841456 -> 982028 bytes .../AllegroCampagne-Specifications.pdf | Bin 1494390 -> 1776041 bytes src/site/site_fr.xml | 17 ++- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/README.txt | 4 +- tutti-persistence/pom.xml | 8 +- .../service/TuttiPersistenceServiceLocator.java | 2 +- .../referential/synchro/ReferentialUpdateTask.java | 43 +++---- ...aceReferenceTaxonReferentialUpdateTaskImpl.java | 100 +++++++++++++++ .../TuttiReferentialSynchroServiceImpl.java | 140 +++++++++++++++++++++ .../main/java/fr/ifremer/tutti/util/Weights.java | 8 ++ ...rvice.referential.synchro.ReferentialUpdateTask | 1 + .../src/main/resources/queries-failsafe.hbm.xml | 27 +++- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../service/catches/WeightComputingService.java | 7 +- .../genericformat/GenericFormatExportService.java | 15 +-- .../TuttiReferentialSynchronizeService.java | 4 +- .../resources/i18n/tutti-service_fr_FR.properties | 4 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 22 +++- .../content/home/actions/EditCatchesAction.java | 11 +- .../content/operation/EditFishingOperationUI.css | 7 +- .../operation/FishingOperationsUIHandler.java | 26 ++-- .../CreateBenthosBatchAndContinueAction.java | 3 +- .../SelectSpeciesForBenthosBatchAction.java | 20 ++- .../CreateSpeciesBatchAndContinueAction.java | 2 +- .../SelectSpeciesForSpeciesBatchAction.java | 19 ++- .../fr/ifremer/tutti/ui/swing/util/TuttiUI.java | 7 +- .../ui/swing/util/actions/SimpleActionSupport.java | 28 ++++- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- 32 files changed, 480 insertions(+), 108 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 e3b55cbd59094c809c770e1434d2d1a2decd4bda Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 10:21:21 2015 +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 91dce83..3333263 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2-SNAPSHOT</version> + <version>4.2-rc-1</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 3ed48a6..764f427 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-SNAPSHOT</version> + <version>4.2-rc-1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index d3f912b..7a2bbf0 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-SNAPSHOT</version> + <version>4.2-rc-1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 8be9374..ea21f65 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-SNAPSHOT</version> + <version>4.2-rc-1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 7fc7490..26dc4e7 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-SNAPSHOT</version> + <version>4.2-rc-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 cb0bac3..22ad095 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-SNAPSHOT</version> + <version>4.2-rc-1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 604319c..08fb794 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-SNAPSHOT</version> + <version>4.2-rc-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 http://git.codelutin.com/tutti.git commit ea33131ea417d24e8126472911ad9370b3495814 Merge: e3b55cb 771ce24 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 10:21:22 2015 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' .../referential/synchro/ReferentialUpdateTask.java | 24 ++++++++++++++++++++++ ...aceReferenceTaxonReferentialUpdateTaskImpl.java | 24 ++++++++++++++++++++++ .../TuttiReferentialSynchroServiceImpl.java | 24 ++++++++++++++++++++++ 3 files changed, 72 insertions(+) -- 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 721d056f7187873515130ce5a7fd8b272a83eaf7 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 10:21:23 2015 +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 3333263..91dce83 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2-rc-1</version> + <version>4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 764f427..3ed48a6 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-rc-1</version> + <version>4.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 7a2bbf0..d3f912b 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-rc-1</version> + <version>4.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index ea21f65..8be9374 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-rc-1</version> + <version>4.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 26dc4e7..7fc7490 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-rc-1</version> + <version>4.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 22ad095..cb0bac3 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-rc-1</version> + <version>4.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 08fb794..604319c 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-rc-1</version> + <version>4.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