branch develop-4.4.x updated (1d458f9 -> b164fdb)
This is an automated email from the git hooks/post-receive script. New change to branch develop-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git from 1d458f9 [jgitflow-maven-plugin]updating poms for 4.4.4-SNAPSHOT development new 240b140 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new b082bb7 [jgitflow-maven-plugin]updating poms for branch'release/4.4.3' with non-snapshot versions new e8bc144 Use java 8 new 363c8fe [jgitflow-maven-plugin]merging 'release/4.4.3' into 'master-4.4.x' new b359f82 [jgitflow-maven-plugin]merging 'master-4.4.x' into 'develop-4.4.x' new b164fdb [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 b164fdb46a6f4bc4e43bc1c3fc750b181187c1f7 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 22 17:04:37 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit b359f82f5e232738f558c3d3466ebce2de569fba Merge: 240b140 363c8fe Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 22 17:04:36 2016 +0100 [jgitflow-maven-plugin]merging 'master-4.4.x' into 'develop-4.4.x' commit 240b140d57d866f35204a3d86640f86923e32e09 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 22 17:04:36 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 363c8fe42786707efcfc4b011adff299001ff886 Merge: f160653 e8bc144 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 22 17:04:34 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.4.3' into 'master-4.4.x' commit e8bc144ef387ef9bb8a54a4cd273de43c66bcb48 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 22 17:01:36 2016 +0100 Use java 8 commit b082bb741c815547626c3226caa8c358261958ae Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 22 16:52:23 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.4.3' with non-snapshot versions Summary of changes: pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 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-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git commit b082bb741c815547626c3226caa8c358261958ae Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 22 16:52:23 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.4.3' 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 d46973c..bc0e871 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.4.3-SNAPSHOT</version> + <version>4.4.3</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index f13f581..9b31b13 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.4.3-SNAPSHOT</version> + <version>4.4.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index eb20a05..558e589 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.4.3-SNAPSHOT</version> + <version>4.4.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 3b701f5..1e0bc91 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.4.3-SNAPSHOT</version> + <version>4.4.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 359f587..c040dc0 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.4.3-SNAPSHOT</version> + <version>4.4.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 4bae221..cf2d3d5 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.4.3-SNAPSHOT</version> + <version>4.4.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 8a9f8a1..f16e12d 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.4.3-SNAPSHOT</version> + <version>4.4.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-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git commit e8bc144ef387ef9bb8a54a4cd273de43c66bcb48 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 22 17:01:36 2016 +0100 Use java 8 --- pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bc0e871..eea46c6 100644 --- a/pom.xml +++ b/pom.xml @@ -160,7 +160,9 @@ <jgitflow.developBranchName>develop-4.4.x</jgitflow.developBranchName> <jgitflow.masterBranchName>master-4.4.x</jgitflow.masterBranchName> - + <javaVersion>1.8</javaVersion> + <signatureArtifactId>java18</signatureArtifactId> + <signatureVersion>1.0</signatureVersion> </properties> <repositories> -- 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-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git commit 363c8fe42786707efcfc4b011adff299001ff886 Merge: f160653 e8bc144 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 22 17:04:34 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.4.3' into 'master-4.4.x' pom.xml | 6 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../tutti/service/genericformat/csv/CatchRow.java | 7 ++ .../producer/CsvProducerForCatch.java | 34 ++++-- .../GenericFormatExportServiceAno7992Test.java | 131 +++++++++++++++++++++ .../resources/genericFormat/ano7992.tuttiProtocol | 22 ++++ tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../operation/EditFishingOperationUIHandler.java | 2 +- .../operation/EditFishingOperationUIModel.java | 20 +++- 13 files changed, 208 insertions(+), 26 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-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git commit 240b140d57d866f35204a3d86640f86923e32e09 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 22 17:04:36 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 ce3e240..bc0e871 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.4.4-SNAPSHOT</version> + <version>4.4.3</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 0a367a8..9b31b13 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.4.4-SNAPSHOT</version> + <version>4.4.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index f5efcd5..558e589 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.4.4-SNAPSHOT</version> + <version>4.4.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 379987f..1e0bc91 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.4.4-SNAPSHOT</version> + <version>4.4.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 7d5f36e..c040dc0 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.4.4-SNAPSHOT</version> + <version>4.4.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 6f81a76..cf2d3d5 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.4.4-SNAPSHOT</version> + <version>4.4.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 55673fd..f16e12d 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.4.4-SNAPSHOT</version> + <version>4.4.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-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git commit b359f82f5e232738f558c3d3466ebce2de569fba Merge: 240b140 363c8fe Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 22 17:04:36 2016 +0100 [jgitflow-maven-plugin]merging 'master-4.4.x' into 'develop-4.4.x' pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 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-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git commit b164fdb46a6f4bc4e43bc1c3fc750b181187c1f7 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 22 17:04:37 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 eea46c6..d80bbd5 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.4.3</version> + <version>4.4.4-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 9b31b13..0a367a8 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.4.3</version> + <version>4.4.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 558e589..f5efcd5 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.4.3</version> + <version>4.4.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 1e0bc91..379987f 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.4.3</version> + <version>4.4.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index c040dc0..7d5f36e 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.4.3</version> + <version>4.4.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 cf2d3d5..6f81a76 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.4.3</version> + <version>4.4.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index f16e12d..55673fd 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.4.3</version> + <version>4.4.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