branch develop updated (d55670e -> d9b926e)
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 d55670e Fixes #8065 Merge branch 'feature/8065' into develop new 20fcb78 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds ce98818 [jgitflow-maven-plugin]updating poms for 4.5-alpha-3 branch with snapshot versions new 2297f20 Fix m-source-p configuration new 9713d49 [jgitflow-maven-plugin]updating poms for branch'release/4.5-alpha-3' with non-snapshot versions new 307bb66 [jgitflow-maven-plugin]merging 'release/4.5-alpha-3' into 'master' new 2e32317 [jgitflow-maven-plugin]merging 'master' into 'develop' new d9b926e [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 d9b926ec09e1c4c90bce83dc3b45edfe8ac492d4 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 7 20:32:20 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 2e32317dd37f406ca45202eef70eaa93be9a0366 Merge: 20fcb78 307bb66 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 7 20:32:19 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 20fcb78737d94120ccce4c4618831bffda1a7b8b Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 7 20:32:19 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 307bb66054034e71d3720dc18b30b4d5780f43fa Merge: 837d5f8 9713d49 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 7 20:32:16 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.5-alpha-3' into 'master' commit 9713d49cc4725f8cf26fcef3b18c54e2efd37f41 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 7 20:25:54 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.5-alpha-3' with non-snapshot versions commit 2297f200070453b0d8e867fb53622424677a3e0d Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 7 20:25:43 2016 +0100 Fix m-source-p configuration Summary of changes: pom.xml | 1 + 1 file changed, 1 insertion(+) -- 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 2297f200070453b0d8e867fb53622424677a3e0d Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 7 20:25:43 2016 +0100 Fix m-source-p configuration --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 093fe65..dfd8d75 100644 --- a/pom.xml +++ b/pom.xml @@ -160,6 +160,7 @@ <!-- Where are deployed software components --> <distroUrl>https://nexus.nuiton.org/nexus/content/repositories/other-releases</distroUrl> + <maven.source.skip>true</maven.source.skip> </properties> <repositories> -- 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 9713d49cc4725f8cf26fcef3b18c54e2efd37f41 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 7 20:25:54 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.5-alpha-3' 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 dfd8d75..401b4c0 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.5-alpha-3-SNAPSHOT</version> + <version>4.5-alpha-3</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 00673ea..c06493b 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-alpha-3-SNAPSHOT</version> + <version>4.5-alpha-3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index bc9a9bd..f9712a5 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-alpha-3-SNAPSHOT</version> + <version>4.5-alpha-3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index b314c89..b47ecab 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-alpha-3-SNAPSHOT</version> + <version>4.5-alpha-3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 995487b..d8693a5 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-alpha-3-SNAPSHOT</version> + <version>4.5-alpha-3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index dd13356..551c2d0 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-alpha-3-SNAPSHOT</version> + <version>4.5-alpha-3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 7e5217f..50fc5e5 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-alpha-3-SNAPSHOT</version> + <version>4.5-alpha-3</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 307bb66054034e71d3720dc18b30b4d5780f43fa Merge: 837d5f8 9713d49 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 7 20:32:16 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.5-alpha-3' into 'master' pom.xml | 12 +- src/site/site_fr.xml | 4 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../persistence/entities/CaracteristicMap.java | 5 + 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/EditCatchesUI.jaxx | 6 - .../operation/catches/EditCatchesUIHandler.java | 6 - .../IndividualObservationBatchRowModel.java | 9 + .../IndividualObservationBatchTableModel.java | 6 +- .../catches/species/SpeciesBatchUIHandler.java | 48 +++++- .../species/frequency/SpeciesFrequencyUI.jaxx | 22 ++- .../species/frequency/SpeciesFrequencyUI.jcss | 7 +- .../frequency/SpeciesFrequencyUIHandler.java | 187 +++++++++++++-------- .../species/frequency/SpeciesFrequencyUIModel.java | 50 ++++-- .../frequency/actions/RemoveObservationAction.java | 4 - .../swing/util/attachment/AttachmentItemModel.java | 7 + .../util/attachment/AttachmentModelAware.java | 6 + .../attachment/actions/AddAttachmentAction.java | 6 +- .../attachment/actions/OpenAttachmentAction.java | 9 +- .../attachment/actions/RemoveAttachmentAction.java | 5 +- .../attachment/actions/SaveAttachmentAction.java | 6 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 3 + 26 files changed, 293 insertions(+), 127 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 20fcb78737d94120ccce4c4618831bffda1a7b8b Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 7 20:32:19 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 39806a2..f531b94 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.5-alpha-3</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 13eb09f..c06493b 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.5-alpha-3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 304969a..f9712a5 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.5-alpha-3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index fa737a7..b47ecab 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.5-alpha-3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 95a7f93..d8693a5 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.5-alpha-3</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..551c2d0 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.5-alpha-3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index a9d5671..50fc5e5 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.5-alpha-3</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 2e32317dd37f406ca45202eef70eaa93be9a0366 Merge: 20fcb78 307bb66 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 7 20:32:19 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' pom.xml | 1 + 1 file changed, 1 insertion(+) -- 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 d9b926ec09e1c4c90bce83dc3b45edfe8ac492d4 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 7 20:32:20 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 401b4c0..1f59bad 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.5-alpha-3</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 c06493b..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.5-alpha-3</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 f9712a5..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.5-alpha-3</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 b47ecab..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.5-alpha-3</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 d8693a5..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.5-alpha-3</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 551c2d0..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.5-alpha-3</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 50fc5e5..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.5-alpha-3</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