branch develop-4.4.x updated (4e86308 -> b02f421)
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 4e86308 [jgitflow-maven-plugin]updating poms for 4.4.5-SNAPSHOT development new 18211db [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 77a0a86 [jgitflow-maven-plugin]updating poms for branch'release/4.4.4' with non-snapshot versions new ee08be8 [jgitflow-maven-plugin]merging 'release/4.4.4' into 'master-4.4.x' new b0e2e37 [jgitflow-maven-plugin]merging 'master-4.4.x' into 'develop-4.4.x' new b02f421 [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 b02f4218011405159c9bce87369bc84013c4fbb1 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 25 14:48:02 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit b0e2e37184987964b529488ab9d4427403c33ea9 Merge: 18211db ee08be8 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 25 14:48:01 2016 +0100 [jgitflow-maven-plugin]merging 'master-4.4.x' into 'develop-4.4.x' commit 18211db2d2b8a45a7c86ccc055e5d3364b09d1d9 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 25 14:48:01 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit ee08be8e23deb8e4ba19cf8748678cf7b7d416e2 Merge: 363c8fe 77a0a86 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 25 14:47:53 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.4.4' into 'master-4.4.x' commit 77a0a86865f96f1eb13c8ddf9bc84c722f8c6064 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 25 14:44:14 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.4.4' 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-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git commit 77a0a86865f96f1eb13c8ddf9bc84c722f8c6064 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 25 14:44:14 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.4.4' 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 782db7b..55b4b9a 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.4</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 0a367a8..d4c152d 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.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index f5efcd5..2bf5c24 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.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 379987f..709e63f 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.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 7d5f36e..0c6f0db 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.4</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..c5e5282 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.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 55673fd..12b1f73 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.4</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 ee08be8e23deb8e4ba19cf8748678cf7b7d416e2 Merge: 363c8fe 77a0a86 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 25 14:47:53 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.4.4' into 'master-4.4.x' README.txt => README.md | 0 pom.xml | 11 +- .../README.txt => tutti-ichtyometer/README.md | 0 tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/{README.txt => README.md} | 0 tutti-persistence/pom.xml | 2 +- .../README.txt => tutti-report-generator/README.md | 0 tutti-report-generator/pom.xml | 2 +- tutti-service/{README.txt => README.md} | 0 tutti-service/pom.xml | 2 +- .../tutti/service/genericformat/csv/CatchRow.java | 14 ++ .../producer/CsvProducerForCatch.java | 39 ++++ .../GenericFormatExportServiceAno7992Test.java | 84 +++++++- .../resources/genericFormat/ano7992.tuttiProtocol | 227 +++++++++++++++++++++ .../README.txt => tutti-ui-swing-updater/README.md | 0 tutti-ui-swing-updater/pom.xml | 2 +- .../README.txt => tutti-ui-swing/README.md | 0 tutti-ui-swing/pom.xml | 2 +- 18 files changed, 371 insertions(+), 16 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 18211db2d2b8a45a7c86ccc055e5d3364b09d1d9 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 25 14:48:01 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 b475ee3..55b4b9a 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.4.5-SNAPSHOT</version> + <version>4.4.4</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 68e045d..d4c152d 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.5-SNAPSHOT</version> + <version>4.4.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index c392ae7..2bf5c24 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.5-SNAPSHOT</version> + <version>4.4.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 8023750..709e63f 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.5-SNAPSHOT</version> + <version>4.4.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 7c9bdf7..0c6f0db 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.5-SNAPSHOT</version> + <version>4.4.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index fcbd7f8..c5e5282 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.5-SNAPSHOT</version> + <version>4.4.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 539b2d8..12b1f73 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.5-SNAPSHOT</version> + <version>4.4.4</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 b0e2e37184987964b529488ab9d4427403c33ea9 Merge: 18211db ee08be8 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 25 14:48:01 2016 +0100 [jgitflow-maven-plugin]merging 'master-4.4.x' into 'develop-4.4.x' -- 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 b02f4218011405159c9bce87369bc84013c4fbb1 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 25 14:48:02 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 55b4b9a..b475ee3 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.4.4</version> + <version>4.4.5-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index d4c152d..68e045d 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</version> + <version>4.4.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 2bf5c24..c392ae7 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</version> + <version>4.4.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 709e63f..8023750 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</version> + <version>4.4.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 0c6f0db..7c9bdf7 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</version> + <version>4.4.5-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 c5e5282..fcbd7f8 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</version> + <version>4.4.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 12b1f73..539b2d8 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</version> + <version>4.4.5-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