branch develop updated (abf7f1e -> 1ff0952)
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 abf7f1e [jgitflow-maven-plugin]updating poms for 4.0.2-SNAPSHOT development new ac3f152 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 6f787de ajout du document de specs dans la release complete et sur le site adds e1c2560 nettoyage du site technique (tout ce qui est dans les spécs n'ont plus rien à faire ici) new 551cc84 add missing license headers new 09eb96d [jgitflow-maven-plugin]updating poms for branch'release/4.0.1' with non-snapshot versions new d69a3c6 Merge branch 'release/4.0.1' new 4a47295 Merge branch 'master' into develop new 1ff0952 [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 1ff0952cb011a79686a1e8f9b881f073c04b4feb Author: Maven Release <maven-release@codelutin.com> Date: Tue May 5 19:20:52 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 4a47295cf2660188d4999bebe5ae9c1cfc8ccc68 Merge: ac3f152 d69a3c6 Author: Maven Release <maven-release@codelutin.com> Date: Tue May 5 19:20:51 2015 +0000 Merge branch 'master' into develop commit ac3f152cb8f18df361d915d154ac4573105bd8df Author: Maven Release <maven-release@codelutin.com> Date: Tue May 5 19:20:50 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit d69a3c6ee7df1baf2ffb36f05d865dd808152ad3 Merge: e1c2560 09eb96d Author: Maven Release <maven-release@codelutin.com> Date: Tue May 5 19:20:38 2015 +0000 Merge branch 'release/4.0.1' commit 09eb96d89cd431fe27022aa55957e85677711f16 Author: Maven Release <maven-release@codelutin.com> Date: Tue May 5 19:12:39 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0.1' with non-snapshot versions commit 551cc84798f5bfa693f6d0a3159d8e9ecb16a403 Author: Maven Release <maven-release@codelutin.com> Date: Tue May 5 19:12:24 2015 +0000 add missing license headers Summary of changes: .../FrequencyWeigthNullValueException.java | 24 ++++++++++++++++++++++ .../MissingBatchNumberForFrequencyException.java | 24 ++++++++++++++++++++++ 2 files changed, 48 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 551cc84798f5bfa693f6d0a3159d8e9ecb16a403 Author: Maven Release <maven-release@codelutin.com> Date: Tue May 5 19:12:24 2015 +0000 add missing license headers --- .../FrequencyWeigthNullValueException.java | 24 ++++++++++++++++++++++ .../MissingBatchNumberForFrequencyException.java | 24 ++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/FrequencyWeigthNullValueException.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/FrequencyWeigthNullValueException.java index 46af817..8b6680c 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/FrequencyWeigthNullValueException.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/FrequencyWeigthNullValueException.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat.consumer; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.FishingOperation; import static org.nuiton.i18n.I18n.t; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/MissingBatchNumberForFrequencyException.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/MissingBatchNumberForFrequencyException.java index 4856ce5..575eb52 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/MissingBatchNumberForFrequencyException.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/MissingBatchNumberForFrequencyException.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.genericformat.consumer; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.FishingOperation; import static org.nuiton.i18n.I18n.t; -- 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 09eb96d89cd431fe27022aa55957e85677711f16 Author: Maven Release <maven-release@codelutin.com> Date: Tue May 5 19:12:39 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0.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 4cb0abd..075e711 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0.1-SNAPSHOT</version> + <version>4.0.1</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 9801dec..f22baf8 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.1-SNAPSHOT</version> + <version>4.0.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index cf01be3..a153e56 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.1-SNAPSHOT</version> + <version>4.0.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 1516cf5..7342720 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.1-SNAPSHOT</version> + <version>4.0.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 2218ef9..b19eb23 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.1-SNAPSHOT</version> + <version>4.0.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 880a446..1b62e81 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.1-SNAPSHOT</version> + <version>4.0.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 16862d5..70d885f 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.1-SNAPSHOT</version> + <version>4.0.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 d69a3c6ee7df1baf2ffb36f05d865dd808152ad3 Merge: e1c2560 09eb96d Author: Maven Release <maven-release@codelutin.com> Date: Tue May 5 19:20:38 2015 +0000 Merge branch 'release/4.0.1' pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../i18n/tutti-persistence_fr_FR.properties | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../consumer/CsvConsumerForCatch.java | 19 ++++++++ .../FrequencyWeigthNullValueException.java | 55 ++++++++++++++++++++++ .../MissingBatchNumberForFrequencyException.java | 55 ++++++++++++++++++++++ .../consumer/CsvConsumerForTemporarySpecies.java | 10 +++- .../resources/i18n/tutti-service_en_GB.properties | 3 ++ .../resources/i18n/tutti-service_fr_FR.properties | 3 ++ tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 14 files changed, 151 insertions(+), 10 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 ac3f152cb8f18df361d915d154ac4573105bd8df Author: Maven Release <maven-release@codelutin.com> Date: Tue May 5 19:20: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 fa4f619..075e711 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0.2-SNAPSHOT</version> + <version>4.0.1</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index d12f727..f22baf8 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.2-SNAPSHOT</version> + <version>4.0.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index a26ca9f..a153e56 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.2-SNAPSHOT</version> + <version>4.0.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index e81e72c..7342720 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.2-SNAPSHOT</version> + <version>4.0.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index a08de58..b19eb23 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.2-SNAPSHOT</version> + <version>4.0.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 13ef018..1b62e81 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.2-SNAPSHOT</version> + <version>4.0.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index ea7dd0a..70d885f 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.2-SNAPSHOT</version> + <version>4.0.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 4a47295cf2660188d4999bebe5ae9c1cfc8ccc68 Merge: ac3f152 d69a3c6 Author: Maven Release <maven-release@codelutin.com> Date: Tue May 5 19:20:51 2015 +0000 Merge branch 'master' into develop .../FrequencyWeigthNullValueException.java | 24 ++++++++++++++++++++++ .../MissingBatchNumberForFrequencyException.java | 24 ++++++++++++++++++++++ 2 files changed, 48 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 1ff0952cb011a79686a1e8f9b881f073c04b4feb Author: Maven Release <maven-release@codelutin.com> Date: Tue May 5 19:20:52 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 075e711..fa4f619 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0.1</version> + <version>4.0.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index f22baf8..d12f727 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.1</version> + <version>4.0.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index a153e56..a26ca9f 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.1</version> + <version>4.0.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 7342720..e81e72c 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.1</version> + <version>4.0.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index b19eb23..a08de58 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.1</version> + <version>4.0.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 1b62e81..13ef018 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.1</version> + <version>4.0.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 70d885f..ea7dd0a 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.1</version> + <version>4.0.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