branch develop updated (98595e5 -> 833a487)
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 98595e5 [jgitflow-maven-plugin]updating poms for 4.5-SNAPSHOT development new 17ca764 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 6f5ed66 on reste sur java 7 le temps que maven-release l'est :( new 867dfc2 [jgitflow-maven-plugin]updating poms for branch'release/4.4' with non-snapshot versions new 1c18a9e [jgitflow-maven-plugin]merging 'release/4.4' into 'master' new 517f70b [jgitflow-maven-plugin]merging 'master' into 'develop' new 833a487 [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 833a48714f1577032a6d7227ef258ba006e1331f Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 3 22:49:03 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 517f70b790c7378c119bc8d08b4bd7f2f589cb9e Merge: 17ca764 1c18a9e Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 3 22:49:01 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 17ca764c1099848b76bbd489e76724c307967aa6 Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 3 22:49:00 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 1c18a9eb17d67252270b5603d3a717522c82bbd5 Merge: ab52755 867dfc2 Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 3 22:48:55 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.4' into 'master' commit 867dfc2d73f2e8dfd9eae28725d2223af8994923 Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 3 22:32:25 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.4' with non-snapshot versions Summary of changes: .../src/main/resources/i18n/tutti-service_fr_FR.properties | 2 +- .../main/java/fr/ifremer/tutti/ui/swing/util/SoundEngine.java | 4 ++-- .../main/java/fr/ifremer/tutti/ui/swing/util/SoundUtil.java | 10 +++++----- .../src/test/java/fr/ifremer/tutti/ui/swing/SoundUtilTest.java | 5 +++-- 4 files changed, 11 insertions(+), 10 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 867dfc2d73f2e8dfd9eae28725d2223af8994923 Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 3 22:32:25 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.4' 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 8036275..15a8014 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</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index a28c3ed..1f7c5cc 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</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 65c9349..acf7e3a 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</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 9b4bc23..204b388 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</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 12cb7ea..0b25a99 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</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..de15dd5 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</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 8b65dec..ae714fe 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</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 1c18a9eb17d67252270b5603d3a717522c82bbd5 Merge: ab52755 867dfc2 Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 3 22:48:55 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.4' into 'master' pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 10 ++++++-- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 7 ++++++ .../tutti/persistence/entities/protocol/Rtps.java | 2 +- .../i18n/tutti-persistence_en_GB.properties | 1 + .../i18n/tutti-persistence_fr_FR.properties | 1 + .../src/main/xmi/tutti-persistence.zargo | Bin 59339 -> 59366 bytes tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/protocol/SpeciesRow.java | 12 +++++----- .../tutti/service/pupitri/PupitriImportResult.java | 26 ++++++++++++++++++--- .../resources/i18n/tutti-service_en_GB.properties | 1 + .../resources/i18n/tutti-service_fr_FR.properties | 1 + .../pupitri/PupitriImportServiceEvo6592Test.java | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../swing/content/config/TuttiConfigUIHandler.java | 4 ++++ .../species/actions/ImportPupitriAction.java | 2 +- .../ui/swing/content/protocol/rtp/RtpEditorUI.jcss | 3 ++- .../content/protocol/rtp/RtpEditorUIModel.java | 13 ++++++----- .../protocol/rtp/actions/CopyMaleRtpAction.java | 2 +- .../ifremer/tutti/ui/swing/util/SoundEngine.java | 12 +++++++--- .../fr/ifremer/tutti/ui/swing/util/SoundUtil.java | 15 +++++++----- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 ++- .../fr/ifremer/tutti/ui/swing/SoundUtilTest.java | 8 +++++-- 28 files changed, 99 insertions(+), 41 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 17ca764c1099848b76bbd489e76724c307967aa6 Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 3 22:49:00 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 5f8c184..15a8014 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.5-SNAPSHOT</version> + <version>4.4</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 13eb09f..1f7c5cc 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.5-SNAPSHOT</version> + <version>4.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 304969a..acf7e3a 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.5-SNAPSHOT</version> + <version>4.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index fa737a7..204b388 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.5-SNAPSHOT</version> + <version>4.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 95a7f93..0b25a99 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.5-SNAPSHOT</version> + <version>4.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index fe3098a..de15dd5 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.5-SNAPSHOT</version> + <version>4.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index a9d5671..ae714fe 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.5-SNAPSHOT</version> + <version>4.4</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 517f70b790c7378c119bc8d08b4bd7f2f589cb9e Merge: 17ca764 1c18a9e Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 3 22:49:01 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' .../src/main/resources/i18n/tutti-service_fr_FR.properties | 2 +- .../main/java/fr/ifremer/tutti/ui/swing/util/SoundEngine.java | 4 ++-- .../main/java/fr/ifremer/tutti/ui/swing/util/SoundUtil.java | 10 +++++----- .../src/test/java/fr/ifremer/tutti/ui/swing/SoundUtilTest.java | 5 +++-- 4 files changed, 11 insertions(+), 10 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 833a48714f1577032a6d7227ef258ba006e1331f Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 3 22:49:03 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 15a8014..5f8c184 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.4</version> + <version>4.5-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 1f7c5cc..13eb09f 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</version> + <version>4.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index acf7e3a..304969a 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</version> + <version>4.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 204b388..fa737a7 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</version> + <version>4.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 0b25a99..95a7f93 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</version> + <version>4.5-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 de15dd5..fe3098a 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</version> + <version>4.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index ae714fe..a9d5671 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</version> + <version>4.5-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