[tutti] branch develop updated (19d2a4c -> 2f7ebe2)
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 19d2a4c fixes #5729: [PROTOCOLE] erreur creation protocole new 837e161 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 76af615 [jgitflow-maven-plugin]updating poms for branch '3.7.2' with snapshot versions new 034ca45 [jgitflow-maven-plugin]updating poms for branch'release/3.7.2' with non-snapshot versions new 121d594 Merge branch 'release/3.7.2' new edc4144 Merge branch 'master' into develop new 2f7ebe2 [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 2f7ebe26949b570130e00cdff331ea40ccb90328 Author: Maven Release <maven-release@codelutin.com> Date: Tue Sep 2 13:02:11 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit edc4144dbd4fc834970dfd1a37a35b6e458df33b Merge: 837e161 121d594 Author: Maven Release <maven-release@codelutin.com> Date: Tue Sep 2 13:02:10 2014 +0200 Merge branch 'master' into develop commit 837e161a552289c24fc1390b298ff7c728b84442 Author: Maven Release <maven-release@codelutin.com> Date: Tue Sep 2 13:02:10 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 121d594ec81b1bb71aa88cc81f9a606165e26cf2 Merge: f1f6671 034ca45 Author: Maven Release <maven-release@codelutin.com> Date: Tue Sep 2 13:02:07 2014 +0200 Merge branch 'release/3.7.2' commit 034ca45d19ebd76bb83e4e375297c297867a79c3 Author: Maven Release <maven-release@codelutin.com> Date: Tue Sep 2 12:56:07 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.7.2' 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 034ca45d19ebd76bb83e4e375297c297867a79c3 Author: Maven Release <maven-release@codelutin.com> Date: Tue Sep 2 12:56:07 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.7.2' 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 e26af16..05f43cb 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.2-SNAPSHOT</version> + <version>3.7.2</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 3383683..b9f94a4 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.2-SNAPSHOT</version> + <version>3.7.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index d589c3a..b8adb52 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.2-SNAPSHOT</version> + <version>3.7.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index a6c334f..4cb9664 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.2-SNAPSHOT</version> + <version>3.7.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index ce34a63..662e18b 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.2-SNAPSHOT</version> + <version>3.7.2</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 121d594ec81b1bb71aa88cc81f9a606165e26cf2 Merge: f1f6671 034ca45 Author: Maven Release <maven-release@codelutin.com> Date: Tue Sep 2 13:02:07 2014 +0200 Merge branch 'release/3.7.2' pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- tutti-ui-swing/src/main/filtered-resources/tutti.config | 1 - .../fr/ifremer/tutti/ui/swing/action/AbstractTuttiAction.java | 3 +-- .../tutti/ui/swing/content/protocol/EditProtocolUIHandler.java | 7 ++----- .../fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.jaxx | 5 ++++- .../tutti/ui/swing/util/species/SelectSpeciesUIHandler.java | 9 ++++++++- 10 files changed, 20 insertions(+), 15 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 837e161a552289c24fc1390b298ff7c728b84442 Author: Maven Release <maven-release@codelutin.com> Date: Tue Sep 2 13:02:10 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 032cff7..05f43cb 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.2</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 599d56f..b9f94a4 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.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 21e61cb..b8adb52 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.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 3724bf6..4cb9664 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.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 9a0bb8d..662e18b 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.2</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 edc4144dbd4fc834970dfd1a37a35b6e458df33b Merge: 837e161 121d594 Author: Maven Release <maven-release@codelutin.com> Date: Tue Sep 2 13:02:10 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 2f7ebe26949b570130e00cdff331ea40ccb90328 Author: Maven Release <maven-release@codelutin.com> Date: Tue Sep 2 13:02:11 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 05f43cb..032cff7 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.2</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 b9f94a4..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.2</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 b8adb52..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.2</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 4cb9664..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.2</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 662e18b..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.2</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