branch develop updated (ac2b6ec -> a56df78)

newer
annotated tag tutti-4.5.1 created...

older
branch master updated (275156c ->...

codelutin.com scm

11 May 2016 11 May '16

4:46 p.m.

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from ac2b6ec [jgitflow-maven-plugin]updating poms for 4.5.2-SNAPSHOT development new f2ce96f [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 42f8073 Add missing license headers new 76d5dd7 [jgitflow-maven-plugin]updating poms for branch'release/4.5.1' with non-snapshot versions new c2ece40 [jgitflow-maven-plugin]merging 'release/4.5.1' into 'master' new cd0b653 [jgitflow-maven-plugin]merging 'master' into 'develop' new a56df78 [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 a56df78ac9e5b2acc533b862fc127fa2322b80ec Author: Maven Release <maven-release@codelutin.com> Date: Wed May 11 18:46:04 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit cd0b6538c5ef3bdfa06c0570cc528d0020e7e128 Merge: f2ce96f c2ece40 Author: Maven Release <maven-release@codelutin.com> Date: Wed May 11 18:46:03 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit f2ce96f1c0970127832777ea09e555bf0d27744e Author: Maven Release <maven-release@codelutin.com> Date: Wed May 11 18:46:03 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit c2ece40cda7139382a2e9829a1c9100e2988a407 Merge: 275156c 76d5dd7 Author: Maven Release <maven-release@codelutin.com> Date: Wed May 11 18:46:01 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.5.1' into 'master' commit 76d5dd719cb34f62f8052041248c956761038cf9 Author: Maven Release <maven-release@codelutin.com> Date: Wed May 11 18:43:16 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.5.1' with non-snapshot versions commit 42f8073b8142acb9c0c89a9e8e018d15cbdffd38 Author: Maven Release <maven-release@codelutin.com> Date: Wed May 11 18:43:09 2016 +0200 Add missing license headers Summary of changes: .../ProtocolCaracteristicsImportExportService.java | 24 ++++++++++++++++++++++ ...tocolCaracteristicsImportExportServiceTest.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>.

Show replies by date

codelutin.com scm

11 May 11 May

4:46 p.m.

New subject: 01/06: Add missing license headers

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 42f8073b8142acb9c0c89a9e8e018d15cbdffd38 Author: Maven Release <maven-release@codelutin.com> Date: Wed May 11 18:43:09 2016 +0200 Add missing license headers --- .../ProtocolCaracteristicsImportExportService.java | 24 ++++++++++++++++++++++ ...tocolCaracteristicsImportExportServiceTest.java | 24 ++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolCaracteristicsImportExportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolCaracteristicsImportExportService.java index 0152f9f..52325d9 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolCaracteristicsImportExportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolCaracteristicsImportExportService.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.protocol; +/* + * #%L + * Tutti :: Service + * $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 com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.io.Files; diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolCaracteristicsImportExportServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolCaracteristicsImportExportServiceTest.java index 17d3c0e..b727a17 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolCaracteristicsImportExportServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolCaracteristicsImportExportServiceTest.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.protocol; +/* + * #%L + * Tutti :: Service + * $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 com.google.common.base.Charsets; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

codelutin.com scm

4:46 p.m.

New subject: 02/06: [jgitflow-maven-plugin]updating poms for branch'release/4.5.1' with non-snapshot versions

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 76d5dd719cb34f62f8052041248c956761038cf9 Author: Maven Release <maven-release@codelutin.com> Date: Wed May 11 18:43:16 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.5.1' with non-snapshot versions --- pom.xml | 2 +- tutti-caliper/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 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index c84a0d4..9ae456e 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.5.1-SNAPSHOT</version> + <version>4.5.1</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-caliper/pom.xml b/tutti-caliper/pom.xml index b056213..0dd599f 100644 --- a/tutti-caliper/pom.xml +++ b/tutti-caliper/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.5.1-SNAPSHOT</version> + <version>4.5.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 9f83c99..790484b 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.5.1-SNAPSHOT</version> + <version>4.5.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 6f4925d..9fd4c24 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.5.1-SNAPSHOT</version> + <version>4.5.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 85813ae..8f910dd 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.5.1-SNAPSHOT</version> + <version>4.5.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index ad30c0a..229bb0c 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.5.1-SNAPSHOT</version> + <version>4.5.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 adf4bbf..750d29d 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.5.1-SNAPSHOT</version> + <version>4.5.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 288f446..6709f4c 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.5.1-SNAPSHOT</version> + <version>4.5.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>.

codelutin.com scm

4:46 p.m.

New subject: 03/06: [jgitflow-maven-plugin]merging 'release/4.5.1' into 'master'

codelutin.com scm

4:46 p.m.

New subject: 04/06: [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit f2ce96f1c0970127832777ea09e555bf0d27744e Author: Maven Release <maven-release@codelutin.com> Date: Wed May 11 18:46:03 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- tutti-caliper/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 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index ddab84f..9ae456e 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.5.2-SNAPSHOT</version> + <version>4.5.1</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-caliper/pom.xml b/tutti-caliper/pom.xml index adbf0fa..0dd599f 100644 --- a/tutti-caliper/pom.xml +++ b/tutti-caliper/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.5.2-SNAPSHOT</version> + <version>4.5.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index f2c8084..790484b 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.5.2-SNAPSHOT</version> + <version>4.5.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 04adccc..9fd4c24 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.5.2-SNAPSHOT</version> + <version>4.5.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 331666b..8f910dd 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.5.2-SNAPSHOT</version> + <version>4.5.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 06cb956..229bb0c 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.5.2-SNAPSHOT</version> + <version>4.5.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 9a4d7a4..750d29d 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.5.2-SNAPSHOT</version> + <version>4.5.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 735dff9..6709f4c 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.5.2-SNAPSHOT</version> + <version>4.5.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>.

codelutin.com scm

4:46 p.m.

New subject: 05/06: [jgitflow-maven-plugin]merging 'master' into 'develop'

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit cd0b6538c5ef3bdfa06c0570cc528d0020e7e128 Merge: f2ce96f c2ece40 Author: Maven Release <maven-release@codelutin.com> Date: Wed May 11 18:46:03 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' .../ProtocolCaracteristicsImportExportService.java | 24 ++++++++++++++++++++++ ...tocolCaracteristicsImportExportServiceTest.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>.

codelutin.com scm

4:46 p.m.

New subject: 06/06: [jgitflow-maven-plugin]Updating develop poms back to pre merge state

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit a56df78ac9e5b2acc533b862fc127fa2322b80ec Author: Maven Release <maven-release@codelutin.com> Date: Wed May 11 18:46:04 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- tutti-caliper/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 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 9ae456e..ddab84f 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.5.1</version> + <version>4.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-caliper/pom.xml b/tutti-caliper/pom.xml index 0dd599f..adbf0fa 100644 --- a/tutti-caliper/pom.xml +++ b/tutti-caliper/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.5.1</version> + <version>4.5.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 790484b..f2c8084 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.5.1</version> + <version>4.5.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 9fd4c24..04adccc 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.5.1</version> + <version>4.5.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 8f910dd..331666b 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.5.1</version> + <version>4.5.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 229bb0c..06cb956 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.5.1</version> + <version>4.5.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 750d29d..9a4d7a4 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.5.1</version> + <version>4.5.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 6709f4c..735dff9 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.5.1</version> + <version>4.5.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>.

3687

Age (days ago)

3687

Last active (days ago)

List overview

Download

6 comments

1 participants

participants (1)

codelutin.com scm