branch develop updated (3286daf -> 6c0822a)
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 3286daf Merge branch 'feature/7944' into 'develop' new 8385cdd [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds a1fc26f [jgitflow-maven-plugin]updating poms for 4.4-rc3 branch with snapshot versions new 9f0d29a [jgitflow-maven-plugin]updating poms for branch'release/4.4-rc3' with non-snapshot versions new ab52755 [jgitflow-maven-plugin]merging 'release/4.4-rc3' into 'master' new 24a97b1 [jgitflow-maven-plugin]merging 'master' into 'develop' new 6c0822a [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 6c0822a8b50b72a2e4ea9272d895898907afa939 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 26 18:02:27 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 24a97b11f579adb12a5fd8ed709d13c67a574cc4 Merge: 8385cdd ab52755 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 26 18:02:26 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 8385cdd1f4b6526d971cad38d5aa180b3d771c00 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 26 18:02:26 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit ab5275590a943ebdaecf079495fd01892084ef38 Merge: ef0be51 9f0d29a Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 26 18:02:19 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.4-rc3' into 'master' commit 9f0d29aeae235a5faa4d2cd26924ce79ab331e23 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 26 17:59:23 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.4-rc3' 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 9f0d29aeae235a5faa4d2cd26924ce79ab331e23 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 26 17:59:23 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.4-rc3' 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 d84fb29..55199c6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.4-rc3-SNAPSHOT</version> + <version>4.4-rc3</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index b19eda6..ea55231 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-rc3-SNAPSHOT</version> + <version>4.4-rc3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 23022c1..4a09e73 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-rc3-SNAPSHOT</version> + <version>4.4-rc3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 1be11fd..ef2f5d6 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-rc3-SNAPSHOT</version> + <version>4.4-rc3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 4935249..d3b0244 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-rc3-SNAPSHOT</version> + <version>4.4-rc3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 11833e4..a73c48a 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-rc3-SNAPSHOT</version> + <version>4.4-rc3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index eb49420..f4b2a97 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-rc3-SNAPSHOT</version> + <version>4.4-rc3</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 ab5275590a943ebdaecf079495fd01892084ef38 Merge: ef0be51 9f0d29a Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 26 18:02:19 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.4-rc3' into 'master' pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- .../java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java | 6 ++++++ 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 +- .../content/operation/catches/EditCatchesUIHandler.java | 2 ++ .../catches/species/frequency/SpeciesFrequencyUIHandler.java | 2 +- .../tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jaxx | 12 ++++++------ .../tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jcss | 9 ++++++++- .../main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java | 7 +++++++ 13 files changed, 37 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 8385cdd1f4b6526d971cad38d5aa180b3d771c00 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 26 18:02:26 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 8036275..55199c6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.4-SNAPSHOT</version> + <version>4.4-rc3</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index a28c3ed..ea55231 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-SNAPSHOT</version> + <version>4.4-rc3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 65c9349..4a09e73 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-SNAPSHOT</version> + <version>4.4-rc3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 9b4bc23..ef2f5d6 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-SNAPSHOT</version> + <version>4.4-rc3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 12cb7ea..d3b0244 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-SNAPSHOT</version> + <version>4.4-rc3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 0588e83..a73c48a 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-SNAPSHOT</version> + <version>4.4-rc3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 8b65dec..f4b2a97 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-SNAPSHOT</version> + <version>4.4-rc3</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 24a97b11f579adb12a5fd8ed709d13c67a574cc4 Merge: 8385cdd ab52755 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 26 18:02:26 2016 +0100 [jgitflow-maven-plugin]merging '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 6c0822a8b50b72a2e4ea9272d895898907afa939 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 26 18:02:27 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 55199c6..8036275 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.4-rc3</version> + <version>4.4-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index ea55231..a28c3ed 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-rc3</version> + <version>4.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 4a09e73..65c9349 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-rc3</version> + <version>4.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index ef2f5d6..9b4bc23 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-rc3</version> + <version>4.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index d3b0244..12cb7ea 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-rc3</version> + <version>4.4-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 a73c48a..0588e83 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-rc3</version> + <version>4.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index f4b2a97..8b65dec 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-rc3</version> + <version>4.4-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