[tutti] branch develop updated (06a4028 -> 8e16161)
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 06a4028 fix test new 8397cc1 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 7df8624 [jgitflow-maven-plugin]updating poms for branch '3.7.7' with snapshot versions new 7b0a58c [jgitflow-maven-plugin]updating poms for branch'release/3.7.7' with non-snapshot versions new 27f1241 Merge branch 'release/3.7.7' new d2861d7 Merge branch 'master' into develop new 8e16161 [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 8e161618d97c1a2c756739a867414c174e4a2730 Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 9 13:26:33 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit d2861d7b45806eb8982fc6df7fa47dd18572e250 Merge: 8397cc1 27f1241 Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 9 13:26:32 2014 +0200 Merge branch 'master' into develop commit 8397cc1ffae33686ee1db539e24e6de43cf2179f Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 9 13:26:32 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 27f1241c76907b3bc5e333c8ab0923eb91618ce4 Merge: d5677cb 7b0a58c Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 9 13:26:30 2014 +0200 Merge branch 'release/3.7.7' commit 7b0a58ca81241da320c63ac5a34024194e4794cb Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 9 13:22:08 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.7.7' 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 http://git.codelutin.com/tutti.git commit 7b0a58ca81241da320c63ac5a34024194e4794cb Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 9 13:22:08 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.7.7' with non-snapshot versions --- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index df48c57..cb27a88 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.7-SNAPSHOT</version> + <version>3.7.7</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index e5e810d..d4d27ed 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.7-SNAPSHOT</version> + <version>3.7.7</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 4e34d60..9ad2f8e 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.7-SNAPSHOT</version> + <version>3.7.7</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index f66b1d0..ad48557 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.7-SNAPSHOT</version> + <version>3.7.7</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 103ac4d..5f00270 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>3.7.7-SNAPSHOT</version> + <version>3.7.7</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 27f1241c76907b3bc5e333c8ab0923eb91618ce4 Merge: d5677cb 7b0a58c Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 9 13:26:30 2014 +0200 Merge branch 'release/3.7.7' pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../service/BenthosBatchPersistenceServiceImpl.java | 14 +++++++------- tutti-service/pom.xml | 2 +- .../main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java | 6 +----- .../tutti/service/catches/WeightComputingServiceTest.java | 12 ++++++++++++ tutti-ui-swing/pom.xml | 2 +- .../fr/ifremer/tutti/ui/swing/action/ShowAboutAction.java | 6 ++++-- .../tutti/ui/swing/content/home/SelectCruiseUIHandler.java | 1 + .../main/resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- 11 files changed, 31 insertions(+), 20 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 8397cc1ffae33686ee1db539e24e6de43cf2179f Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 9 13:26:32 2014 +0200 [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-service/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 37ba771..cb27a88 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8-SNAPSHOT</version> + <version>3.7.7</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 599d56f..d4d27ed 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8-SNAPSHOT</version> + <version>3.7.7</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 21e61cb..9ad2f8e 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8-SNAPSHOT</version> + <version>3.7.7</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 3724bf6..ad48557 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8-SNAPSHOT</version> + <version>3.7.7</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 9a0bb8d..5f00270 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>3.8-SNAPSHOT</version> + <version>3.7.7</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 d2861d7b45806eb8982fc6df7fa47dd18572e250 Merge: 8397cc1 27f1241 Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 9 13:26:32 2014 +0200 Merge branch '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 http://git.codelutin.com/tutti.git commit 8e161618d97c1a2c756739a867414c174e4a2730 Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 9 13:26:33 2014 +0200 [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-service/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index cb27a88..37ba771 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.7</version> + <version>3.8-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index d4d27ed..599d56f 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.7</version> + <version>3.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 9ad2f8e..21e61cb 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.7</version> + <version>3.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index ad48557..3724bf6 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.7</version> + <version>3.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 5f00270..9a0bb8d 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>3.7.7</version> + <version>3.8-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