branch develop updated (2eb0f53 -> 0e8f6c5)
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 2eb0f53 [jgitflow-maven-plugin]updating poms for 4.3-SNAPSHOT development new de00a08 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 64002f5 Add missing license header new a412c8a [jgitflow-maven-plugin]updating poms for branch'release/4.2' with non-snapshot versions new b203959 [jgitflow-maven-plugin]merging 'release/4.2' into 'master' new 31d91de [jgitflow-maven-plugin]merging 'master' into 'develop' new 0e8f6c5 [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 0e8f6c58d4ae0b80ac5ce72b60e759fca563968a Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 5 19:46:40 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 31d91de0b963af7d63251072c1f1fdfbe0c2616a Merge: de00a08 b203959 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 5 19:46:40 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit de00a0834d92aa08036be4b8e0e281a0b899df9c Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 5 19:46:39 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit b203959793d9ee025dd9a216b97d3c393bceb4cb Merge: 6a1d158 a412c8a Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 5 19:46:36 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.2' into 'master' commit a412c8a4239ef2d2c50c5bd14a0751a679446410 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 5 19:42:50 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.2' with non-snapshot versions commit 64002f5ae9cc57c275e66e3e8091c8f6dad059c0 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 5 19:42:40 2016 +0100 Add missing license header Summary of changes: .../entities/data/FishingOperationBean.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 64002f5ae9cc57c275e66e3e8091c8f6dad059c0 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 5 19:42:40 2016 +0100 Add missing license header --- .../entities/data/FishingOperationBean.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperationBean.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperationBean.java index e0a3627..4585788 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperationBean.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperationBean.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.entities.data; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * 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 + * 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.util.Numbers; public class FishingOperationBean extends AbstractFishingOperationBean { -- 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 b203959793d9ee025dd9a216b97d3c393bceb4cb Merge: 6a1d158 a412c8a Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 5 19:46:36 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.2' into 'master' pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../tutti/persistence/TuttiPersistenceImpl.java | 4 ++ .../entities/data/FishingOperationBean.java | 52 ++++++++++++++++++++++ .../entities/protocol/TuttiProtocols.java | 4 ++ .../main/java/fr/ifremer/tutti/util/Numbers.java | 20 +++++++++ tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../tutti/service/csv/CommentParserFormatter.java | 2 +- ...enericFormatReferentialSpeciesImportResult.java | 38 +++++++--------- .../ImportReferentialSpeciesAction.java | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../content/home/actions/ImportProtocolAction.java | 3 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 24 +++++----- 16 files changed, 121 insertions(+), 42 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 de00a0834d92aa08036be4b8e0e281a0b899df9c Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 5 19:46:39 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 f7c7fd1..c4bbca7 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.3-SNAPSHOT</version> + <version>4.2</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 3156dbd..12df8ab 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.3-SNAPSHOT</version> + <version>4.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 40fdcfe..c13e5b5 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.3-SNAPSHOT</version> + <version>4.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index bf6d29b..dc0e151 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.3-SNAPSHOT</version> + <version>4.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 2e5d508..ab74af8 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.3-SNAPSHOT</version> + <version>4.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 d969e87..5af178e 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.3-SNAPSHOT</version> + <version>4.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index e26f64e..9802504 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.3-SNAPSHOT</version> + <version>4.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 in repository tutti. See http://git.codelutin.com/tutti.git commit 31d91de0b963af7d63251072c1f1fdfbe0c2616a Merge: de00a08 b203959 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 5 19:46:40 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' .../entities/data/FishingOperationBean.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 0e8f6c58d4ae0b80ac5ce72b60e759fca563968a Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 5 19:46:40 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 c4bbca7..f7c7fd1 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2</version> + <version>4.3-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 12df8ab..3156dbd 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</version> + <version>4.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index c13e5b5..40fdcfe 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</version> + <version>4.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index dc0e151..bf6d29b 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</version> + <version>4.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index ab74af8..2e5d508 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</version> + <version>4.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 5af178e..d969e87 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</version> + <version>4.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 9802504..e26f64e 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</version> + <version>4.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