[tutti] branch develop updated (d3a0103 -> 58c36f6)
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 d3a0103 fixes #5720: [CAPTURE] dans tableau espèce, clic droit ... new 270a5b4 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 18a6ca2 [jgitflow-maven-plugin]updating poms for branch '3.7.1' with snapshot versions new 4c02253 [jgitflow-maven-plugin]updating poms for branch'release/3.7.1' with non-snapshot versions new e956af5 optimize dependencies new f1f6671 Merge branch 'release/3.7.1' new b9ee912 Merge branch 'master' into develop new 58c36f6 [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 58c36f694d6d5050c1ac15fa451cc8a38c4b8718 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 1 16:38:39 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit b9ee912b3d7847b40f07bfb53ad32a1978ce3914 Merge: 270a5b4 f1f6671 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 1 16:38:38 2014 +0200 Merge branch 'master' into develop commit 270a5b4a329d1c830dd249dcaf05e0784d97348d Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 1 16:38:38 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit f1f6671017c6bba83eb0a9b2d0ee820938a64129 Merge: fec7edc e956af5 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 1 16:38:35 2014 +0200 Merge branch 'release/3.7.1' commit e956af5c8d1c2927170a50c3933fb51261189109 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 1 16:33:47 2014 +0200 optimize dependencies commit 4c022535b501e5f83e8bf26fa83bc84e0621e346 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 1 16:27:43 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.7.1' with non-snapshot versions Summary of changes: tutti-ui-swing/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) -- 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 e956af5c8d1c2927170a50c3933fb51261189109 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 1 16:33:47 2014 +0200 optimize dependencies --- tutti-ui-swing/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index ce6e513..4261609 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -150,6 +150,10 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-converter</artifactId> </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + </dependency> <!-- Guava --> <dependency> -- 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 f1f6671017c6bba83eb0a9b2d0ee820938a64129 Merge: fec7edc e956af5 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 1 16:38:35 2014 +0200 Merge branch 'release/3.7.1' pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../service/psionimport/PsionImportModel.java | 42 +++++++++------------- .../resources/i18n/tutti-service_fr_FR.properties | 2 +- tutti-ui-swing/pom.xml | 6 +++- .../ui/swing/TuttiApplicationUpdaterCallBack.java | 17 +++++++++ .../tutti/ui/swing/action/AbstractTuttiAction.java | 18 ++++++++++ .../ui/swing/action/RenameBenthosBatchAction.java | 8 ++--- .../ui/swing/action/RenameSpeciesBatchAction.java | 8 ++--- .../ui/swing/action/SelectOtherBenthosAction.java | 4 +-- .../ui/swing/action/SelectOtherSpeciesAction.java | 3 +- .../action/SelectSpeciesForBenthosBatchAction.java | 3 +- ...SpeciesForIndividualObservationBatchAction.java | 3 +- .../action/SelectSpeciesForSpeciesBatchAction.java | 3 +- .../create/CreateAccidentalBatchUIHandler.java | 18 +--------- .../catches/benthos/BenthosBatchUIHandler.java | 11 ------ .../create/CreateBenthosBatchUIHandler.java | 12 ------- .../CreateIndividualObservationBatchUIHandler.java | 16 +-------- .../create/CreateMarineLitterBatchUIHandler.java | 19 +--------- .../catches/species/SpeciesBatchUIHandler.java | 14 -------- .../create/CreateSpeciesBatchUIHandler.java | 12 ------- .../content/protocol/EditProtocolUIHandler.java | 5 +++ .../swing/util/species/SelectSpeciesUIHandler.java | 11 +++++- 25 files changed, 93 insertions(+), 150 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 270a5b4a329d1c830dd249dcaf05e0784d97348d Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 1 16:38:38 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..5ee5922 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.1</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 599d56f..3318255 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.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 21e61cb..2aa32cf 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.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 3724bf6..03f3aba 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.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index e173798..ce6e513 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.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 b9ee912b3d7847b40f07bfb53ad32a1978ce3914 Merge: 270a5b4 f1f6671 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 1 16:38:38 2014 +0200 Merge branch 'master' into develop tutti-ui-swing/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) -- 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 58c36f694d6d5050c1ac15fa451cc8a38c4b8718 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 1 16:38:39 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 5ee5922..032cff7 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.1</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 3318255..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.1</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 2aa32cf..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.1</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 03f3aba..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.1</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 4261609..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.1</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