branch develop updated (0c58872 -> 6143050)
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 0c58872 [jgitflow-maven-plugin]updating poms for 4.5.4-SNAPSHOT development new 546a076 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 1dfe227 [jgitflow-maven-plugin]updating poms for branch'release/4.5.3' with non-snapshot versions new 01fea46 [jgitflow-maven-plugin]merging 'release/4.5.3' into 'master' new b2c3fbb [jgitflow-maven-plugin]merging 'master' into 'develop' new 6143050 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 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 6143050439ed4b8cf73b29eadce949b0bfc40faa Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 9 09:01:39 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit b2c3fbbda37da147ab489af916051f0e1ac72a5d Merge: 546a076 01fea46 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 9 09:01:38 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 546a07650fb444edf806ca54a45fdc4b25684820 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 9 09:01:38 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 01fea46660bf56bb1a3288e111d4f4ff7547bb8f Merge: 8e50a84 1dfe227 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 9 09:01:35 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.5.3' into 'master' commit 1dfe22771aa04994ed81b608faebcb86c7abb22a Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 9 08:55:22 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.5.3' with non-snapshot versions Summary of changes: -- 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 https://gitlab.nuiton.org/codelutin/tutti.git commit 1dfe22771aa04994ed81b608faebcb86c7abb22a Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 9 08:55:22 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.5.3' 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 42222e2..504b4d2 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.5.3-SNAPSHOT</version> + <version>4.5.3</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-caliper/pom.xml b/tutti-caliper/pom.xml index dd43088..fa4d185 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.3-SNAPSHOT</version> + <version>4.5.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index f58b0bb..ede18a1 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.3-SNAPSHOT</version> + <version>4.5.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 1e0e028..1d95e1d 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.3-SNAPSHOT</version> + <version>4.5.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index c6d6a46..b663551 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.3-SNAPSHOT</version> + <version>4.5.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index b0941ff..a1205ae 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.3-SNAPSHOT</version> + <version>4.5.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 02b5f70..dcadb2a 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.3-SNAPSHOT</version> + <version>4.5.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index fda8bbf..dc88efc 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.3-SNAPSHOT</version> + <version>4.5.3</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 https://gitlab.nuiton.org/codelutin/tutti.git commit 01fea46660bf56bb1a3288e111d4f4ff7547bb8f Merge: 8e50a84 1dfe227 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 9 09:01:35 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.5.3' into 'master' pom.xml | 2 +- tutti-caliper/pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../entities/referential/CaracteristicBean.java | 27 ++++++++++++++++ .../src/main/xmi/tutti-persistence.zargo | Bin 59750 -> 59923 bytes tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../tutti/service/bigfin/BigfinImportService.java | 25 ++++++++------- .../catches/multipost/MultiPostImportService.java | 14 ++++----- .../tutti/service/cruise/CruiseCacheLoader.java | 7 +++-- .../service/sampling/CruiseSamplingCache.java | 29 +++++++++++++++--- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../species/frequency/SpeciesFrequencyUIModel.java | 34 ++++++++++++++------- 15 files changed, 106 insertions(+), 46 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 https://gitlab.nuiton.org/codelutin/tutti.git commit 546a07650fb444edf806ca54a45fdc4b25684820 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 9 09:01:38 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 1ba3376..504b4d2 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.5.4-SNAPSHOT</version> + <version>4.5.3</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-caliper/pom.xml b/tutti-caliper/pom.xml index 851b442..fa4d185 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.4-SNAPSHOT</version> + <version>4.5.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 1935bc7..ede18a1 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.4-SNAPSHOT</version> + <version>4.5.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 9c35b61..1d95e1d 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.4-SNAPSHOT</version> + <version>4.5.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 2963333..b663551 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.4-SNAPSHOT</version> + <version>4.5.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 81e3faf..a1205ae 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.4-SNAPSHOT</version> + <version>4.5.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 3287175..dcadb2a 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.4-SNAPSHOT</version> + <version>4.5.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index fa2faff..dc88efc 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.4-SNAPSHOT</version> + <version>4.5.3</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 https://gitlab.nuiton.org/codelutin/tutti.git commit b2c3fbbda37da147ab489af916051f0e1ac72a5d Merge: 546a076 01fea46 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 9 09:01:38 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' -- 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 https://gitlab.nuiton.org/codelutin/tutti.git commit 6143050439ed4b8cf73b29eadce949b0bfc40faa Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 9 09:01:39 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 504b4d2..1ba3376 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.5.3</version> + <version>4.5.4-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-caliper/pom.xml b/tutti-caliper/pom.xml index fa4d185..851b442 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.3</version> + <version>4.5.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index ede18a1..1935bc7 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.3</version> + <version>4.5.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 1d95e1d..9c35b61 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.3</version> + <version>4.5.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index b663551..2963333 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.3</version> + <version>4.5.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index a1205ae..81e3faf 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.3</version> + <version>4.5.4-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 dcadb2a..3287175 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.3</version> + <version>4.5.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index dc88efc..fa2faff 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.3</version> + <version>4.5.4-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