branch develop-3.x updated (872de0a -> 953d002)
This is an automated email from the git hooks/post-receive script. New change to branch develop-3.x in repository tutti. See http://git.codelutin.com/tutti.git from 872de0a [jgitflow-maven-plugin]updating poms for 3.13.13-SNAPSHOT development new 797321c [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 9682094 [jgitflow-maven-plugin]updating poms for branch'release/3.13.12' with non-snapshot versions new 9087285 Merge branch 'release/3.13.12' into master-3.x new d6e69c6 Merge branch 'master-3.x' into develop-3.x new 953d002 [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 953d002afdbb20e4f97c48a80e22ded345298510 Author: Maven Release <maven-release@codelutin.com> Date: Fri May 1 11:34:41 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit d6e69c6f665ef45c9ccaf3631f753d2ada81dc64 Merge: 797321c 9087285 Author: Maven Release <maven-release@codelutin.com> Date: Fri May 1 11:34:40 2015 +0000 Merge branch 'master-3.x' into develop-3.x commit 797321ca1227b8724c262901d734adb4086dd176 Author: Maven Release <maven-release@codelutin.com> Date: Fri May 1 11:34:39 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 9087285110de75ebdcac02ccae545e98bfa06b50 Merge: 99d2135 9682094 Author: Maven Release <maven-release@codelutin.com> Date: Fri May 1 11:34:34 2015 +0000 Merge branch 'release/3.13.12' into master-3.x commit 9682094cee1aca9b2d3fafa0155339413679a6f4 Author: Maven Release <maven-release@codelutin.com> Date: Fri May 1 11:25:00 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/3.13.12' 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-3.x in repository tutti. See http://git.codelutin.com/tutti.git commit 9682094cee1aca9b2d3fafa0155339413679a6f4 Author: Maven Release <maven-release@codelutin.com> Date: Fri May 1 11:25:00 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/3.13.12' 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 6d252b8..eda0449 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.13.12-SNAPSHOT</version> + <version>3.13.12</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 0a7bd88..29c1bc2 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.13.12-SNAPSHOT</version> + <version>3.13.12</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index b62e8ba..3b76ded 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.13.12-SNAPSHOT</version> + <version>3.13.12</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 27646b7..ecbd582 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>3.13.12-SNAPSHOT</version> + <version>3.13.12</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 76c336f..9ae7666 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.13.12-SNAPSHOT</version> + <version>3.13.12</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index b27054f..b2cb397 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>3.13.12-SNAPSHOT</version> + <version>3.13.12</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 55a73be..13910eb 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.13.12-SNAPSHOT</version> + <version>3.13.12</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-3.x in repository tutti. See http://git.codelutin.com/tutti.git commit 9087285110de75ebdcac02ccae545e98bfa06b50 Merge: 99d2135 9682094 Author: Maven Release <maven-release@codelutin.com> Date: Fri May 1 11:34:34 2015 +0000 Merge branch 'release/3.13.12' into master-3.x 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/service/bigfin/BigfinImportService.java | 15 ++++- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../swing/action/ExportAllCaracteristicAction.java | 2 +- .../swing/action/ExportProtocolBenthosAction.java | 2 +- .../action/ExportProtocolCaracteristicAction.java | 2 +- .../swing/action/ExportProtocolSpeciesAction.java | 2 +- .../tutti/ui/swing/action/ExportPupitriAction.java | 2 +- .../swing/action/ImportProtocolBenthosAction.java | 2 +- .../action/ImportProtocolCaracteristicAction.java | 2 +- .../swing/action/ImportProtocolSpeciesAction.java | 2 +- .../operation/catches/EditCatchesSvgHandler.java | 2 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 6 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 69 +++++++++++----------- 19 files changed, 72 insertions(+), 50 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-3.x in repository tutti. See http://git.codelutin.com/tutti.git commit 797321ca1227b8724c262901d734adb4086dd176 Author: Maven Release <maven-release@codelutin.com> Date: Fri May 1 11:34:39 2015 +0000 [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 dcbefaa..eda0449 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.13.13-SNAPSHOT</version> + <version>3.13.12</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 80a0c81..29c1bc2 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.13.13-SNAPSHOT</version> + <version>3.13.12</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 2a2e5d0..3b76ded 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.13.13-SNAPSHOT</version> + <version>3.13.12</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 6daa6df..ecbd582 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>3.13.13-SNAPSHOT</version> + <version>3.13.12</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 118ad81..9ae7666 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.13.13-SNAPSHOT</version> + <version>3.13.12</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index a95f383..b2cb397 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>3.13.13-SNAPSHOT</version> + <version>3.13.12</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index f0b6744..13910eb 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.13.13-SNAPSHOT</version> + <version>3.13.12</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-3.x in repository tutti. See http://git.codelutin.com/tutti.git commit d6e69c6f665ef45c9ccaf3631f753d2ada81dc64 Merge: 797321c 9087285 Author: Maven Release <maven-release@codelutin.com> Date: Fri May 1 11:34:40 2015 +0000 Merge branch 'master-3.x' into develop-3.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-3.x in repository tutti. See http://git.codelutin.com/tutti.git commit 953d002afdbb20e4f97c48a80e22ded345298510 Author: Maven Release <maven-release@codelutin.com> Date: Fri May 1 11:34:41 2015 +0000 [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 eda0449..dcbefaa 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.13.12</version> + <version>3.13.13-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 29c1bc2..80a0c81 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.13.12</version> + <version>3.13.13-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 3b76ded..2a2e5d0 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.13.12</version> + <version>3.13.13-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index ecbd582..6daa6df 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>3.13.12</version> + <version>3.13.13-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 9ae7666..118ad81 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.13.12</version> + <version>3.13.13-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 b2cb397..a95f383 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>3.13.12</version> + <version>3.13.13-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 13910eb..f0b6744 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.13.12</version> + <version>3.13.13-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