[tutti] branch develop updated (41496d5 -> 1f6edaa)
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 41496d5 refs #5916: [EXPORT GENERIQUE] mélange code RUBIN code CAMPAGNE new e2384eb [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 3f30959 [jgitflow-maven-plugin]updating poms for branch '3.7.6' with snapshot versions new 3a4eff9 [jgitflow-maven-plugin]updating poms for branch'release/3.7.6' with non-snapshot versions new d84fadc fix release 3.7.6 (missing header) new d5677cb Merge branch 'release/3.7.6' new c0c1dc7 Merge branch 'master' into develop new 1f6edaa [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 1f6edaaf9a9b01f05e82780b39f4d7aeed717ae0 Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 7 09:14:47 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit c0c1dc774772956cc3cb5d986abe7474947fd8aa Merge: e2384eb d5677cb Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 7 09:14:46 2014 +0200 Merge branch 'master' into develop commit e2384eba0efa84e21931d132acf0eb69f16d847e Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 7 09:14:46 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit d5677cb30bf07743e503ec310d517d14835be7e4 Merge: 1bea001 d84fadc Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 7 09:14:44 2014 +0200 Merge branch 'release/3.7.6' commit d84fadc2445d7cb9f6c5205838ced263a3a9793d Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 7 09:13:35 2014 +0200 fix release 3.7.6 (missing header) commit 3a4eff95ec56161d79d170b6176489a2ba44f8b2 Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 7 09:07:59 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.7.6' with non-snapshot versions Summary of changes: .../multipost/MultiPostImportServiceTest.java | 24 ++++++++++++++++++++++ 1 file changed, 24 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 3a4eff95ec56161d79d170b6176489a2ba44f8b2 Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 7 09:07:59 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.7.6' with non-snapshot versions --- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 4a8ba53..876e94b 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.6-SNAPSHOT</version> + <version>3.7.6</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index e0ccd6e..2207b3f 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.6-SNAPSHOT</version> + <version>3.7.6</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 306656b..3e43940 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.6-SNAPSHOT</version> + <version>3.7.6</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index c1105fa..47b54e0 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.6-SNAPSHOT</version> + <version>3.7.6</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 22b6828..bca6de1 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>3.7.6-SNAPSHOT</version> + <version>3.7.6</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 d84fadc2445d7cb9f6c5205838ced263a3a9793d Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 7 09:13:35 2014 +0200 fix release 3.7.6 (missing header) --- .../multipost/MultiPostImportServiceTest.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportServiceTest.java index 0494bc2..26cc5e4 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportServiceTest.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.catches.multipost; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.CatchBatchs; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -- 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 d5677cb30bf07743e503ec310d517d14835be7e4 Merge: 1bea001 d84fadc Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 7 09:14:44 2014 +0200 Merge branch 'release/3.7.6' pom.xml | 2 +- src/site/rst/referential.rst | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../tutti/persistence/TuttiPersistenceImpl.java | 7 +- .../src/main/resources/queries-failsafe.hbm.xml | 2 +- tutti-service/pom.xml | 2 +- .../tutti/service/bigfin/BigfinDataRow.java | 6 +- .../tutti/service/bigfin/BigfinDataRowModel.java | 2 +- .../tutti/service/bigfin/BigfinImportService.java | 97 +++++---- .../catches/multipost/MultiPostExportService.java | 31 ++- .../catches/multipost/MultiPostImportService.java | 36 ++-- .../export/pdf/CatchesPdfExportService.java | 9 + .../resources/i18n/tutti-service_en_GB.properties | 1 + .../resources/i18n/tutti-service_fr_FR.properties | 1 + .../multipost/MultiPostImportServiceTest.java | 222 +++++++++++++++++++++ tutti-ui-swing/pom.xml | 2 +- 17 files changed, 332 insertions(+), 94 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 e2384eba0efa84e21931d132acf0eb69f16d847e Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 7 09:14:46 2014 +0200 [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-service/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 37ba771..876e94b 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8-SNAPSHOT</version> + <version>3.7.6</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 599d56f..2207b3f 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8-SNAPSHOT</version> + <version>3.7.6</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 21e61cb..3e43940 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8-SNAPSHOT</version> + <version>3.7.6</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 3724bf6..47b54e0 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8-SNAPSHOT</version> + <version>3.7.6</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 9a0bb8d..bca6de1 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>3.8-SNAPSHOT</version> + <version>3.7.6</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 c0c1dc774772956cc3cb5d986abe7474947fd8aa Merge: e2384eb d5677cb Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 7 09:14:46 2014 +0200 Merge branch 'master' into develop .../multipost/MultiPostImportServiceTest.java | 24 ++++++++++++++++++++++ 1 file changed, 24 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 1f6edaaf9a9b01f05e82780b39f4d7aeed717ae0 Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 7 09:14:47 2014 +0200 [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-service/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 876e94b..37ba771 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.6</version> + <version>3.8-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 2207b3f..599d56f 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.6</version> + <version>3.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 3e43940..21e61cb 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.6</version> + <version>3.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 47b54e0..3724bf6 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.6</version> + <version>3.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index bca6de1..9a0bb8d 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>3.7.6</version> + <version>3.8-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