branch develop updated (ea75524 -> f70d492)
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 ea75524 fixes #5738: [TECH] faire en sorte que les messages d'erreur reste DEVANT afin de pouvoir les consulter new fe01bd3 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds a2aa7fa [jgitflow-maven-plugin]updating poms for branch '3.11.1' with snapshot versions new 0f44572 [jgitflow-maven-plugin]updating poms for branch'release/3.11.1' with non-snapshot versions new 8d28cba Merge branch 'release/3.11.1' new 4edf861 Merge branch 'master' into develop new f70d492 [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 f70d492bd03825b1c4cea1048f282ce3222d39f0 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 5 17:01:24 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 4edf861fde8231b6a16a6c612f0615519fab1e93 Merge: fe01bd3 8d28cba Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 5 17:01:23 2015 +0000 Merge branch 'master' into develop commit fe01bd379d80db70b95d3664ff73bb253ce2c7d5 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 5 17:01:23 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 8d28cbafd0530ec1919a8485d1ef99493fcf34ff Merge: f48e786 0f44572 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 5 17:01:21 2015 +0000 Merge branch 'release/3.11.1' commit 0f44572edaa95fdec356c25efc10441c6a5d5610 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 5 16:56:27 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/3.11.1' 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 0f44572edaa95fdec356c25efc10441c6a5d5610 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 5 16:56:27 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/3.11.1' 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 10be8a2..23bf0d6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.11.1-SNAPSHOT</version> + <version>3.11.1</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 4c1283f..f072323 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.11.1-SNAPSHOT</version> + <version>3.11.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 01031e1..d812f93 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.11.1-SNAPSHOT</version> + <version>3.11.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index b6f40b9..04f34b8 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.11.1-SNAPSHOT</version> + <version>3.11.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 02a3b70..f3788e5 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.11.1-SNAPSHOT</version> + <version>3.11.1</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 8d28cbafd0530ec1919a8485d1ef99493fcf34ff Merge: f48e786 0f44572 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 5 17:01:21 2015 +0000 Merge branch 'release/3.11.1' pom.xml | 4 ++-- src/site/resources/allegro_about.png | Bin 0 -> 99605 bytes src/site/site_fr.xml | 1 + tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../operationimport/ImportFromColumnFileModel.java | 4 +--- tutti-ui-swing/pom.xml | 2 +- .../CreateIndividualObservationBatchUIHandler.java | 6 +++--- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 ++-- .../src/main/resources/icons/allegro_about.png | Bin 7671 -> 99605 bytes 11 files changed, 13 insertions(+), 14 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 fe01bd379d80db70b95d3664ff73bb253ce2c7d5 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 5 17:01:23 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-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 9a7da7d..23bf0d6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.12-SNAPSHOT</version> + <version>3.11.1</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 6eb5c7b..f072323 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.12-SNAPSHOT</version> + <version>3.11.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index bc852c7..d812f93 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.12-SNAPSHOT</version> + <version>3.11.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index b8e3c02..04f34b8 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.12-SNAPSHOT</version> + <version>3.11.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index b9df966..f3788e5 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.12-SNAPSHOT</version> + <version>3.11.1</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 4edf861fde8231b6a16a6c612f0615519fab1e93 Merge: fe01bd3 8d28cba Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 5 17:01:23 2015 +0000 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 f70d492bd03825b1c4cea1048f282ce3222d39f0 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 5 17:01:24 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-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 23bf0d6..9a7da7d 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.11.1</version> + <version>3.12-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index f072323..6eb5c7b 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.11.1</version> + <version>3.12-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index d812f93..bc852c7 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.11.1</version> + <version>3.12-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 04f34b8..b8e3c02 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.11.1</version> + <version>3.12-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index f3788e5..b9df966 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.11.1</version> + <version>3.12-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