branch develop updated (b9ddad8 -> a944bc0)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from b9ddad8 [jgitflow-maven-plugin]updating poms for 4.0-RC6-SNAPSHOT development new 6bfdf41 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 5a92fb4 [jgitflow-maven-plugin]updating poms for branch '4.0-RC5' with snapshot versions new 4bb0f4b [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC5' with non-snapshot versions new 0b35bd6 Merge branch 'release/4.0-RC5' new 824419d Merge branch 'master' into develop new a944bc0 [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 a944bc0ab284877db65cfcf2a1d87a6c094ad84f Author: Maven Release <maven-release@codelutin.com> Date: Mon May 11 12:50:38 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 824419dca04a1199762c6bf3fcb9064b4289bb3b Merge: 6bfdf41 0b35bd6 Author: Maven Release <maven-release@codelutin.com> Date: Mon May 11 12:50:37 2015 +0000 Merge branch 'master' into develop commit 6bfdf410c3108a84aac8ef7262ce983d5363d02f Author: Maven Release <maven-release@codelutin.com> Date: Mon May 11 12:50:36 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 0b35bd6e8c419a8feb1cbbc91127ba5ba82c426f Merge: a725e55 4bb0f4b Author: Maven Release <maven-release@codelutin.com> Date: Mon May 11 12:50:29 2015 +0000 Merge branch 'release/4.0-RC5' commit 4bb0f4bec0c638fc5cca022ef486df1f189b8ca3 Author: Maven Release <maven-release@codelutin.com> Date: Mon May 11 12:42:11 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC5' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 4bb0f4bec0c638fc5cca022ef486df1f189b8ca3 Author: Maven Release <maven-release@codelutin.com> Date: Mon May 11 12:42:11 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC5' with non-snapshot versions --- observe-business/pom.xml | 2 +- observe-entities/pom.xml | 2 +- observe-swing/pom.xml | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/observe-business/pom.xml b/observe-business/pom.xml index 4366577..3ddb54a 100644 --- a/observe-business/pom.xml +++ b/observe-business/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC5-SNAPSHOT</version> + <version>4.0-RC5</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index d1c8ede..dff4488 100644 --- a/observe-entities/pom.xml +++ b/observe-entities/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC5-SNAPSHOT</version> + <version>4.0-RC5</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index 6ec3c9f..80183d2 100644 --- a/observe-swing/pom.xml +++ b/observe-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC5-SNAPSHOT</version> + <version>4.0-RC5</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index 73d3203..27ad254 100644 --- a/observe-validation/pom.xml +++ b/observe-validation/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC5-SNAPSHOT</version> + <version>4.0-RC5</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index f0fdbf7..a283434 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC5-SNAPSHOT</version> + <version>4.0-RC5</version> <packaging>pom</packaging> <name>ObServe</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 0b35bd6e8c419a8feb1cbbc91127ba5ba82c426f Merge: a725e55 4bb0f4b Author: Maven Release <maven-release@codelutin.com> Date: Mon May 11 12:50:29 2015 +0000 Merge branch 'release/4.0-RC5' observe-business/pom.xml | 3 +- .../main/java/fr/ird/observe/DecoratorService.java | 1 + .../i18n/observe-business_en_GB.properties | 1 + .../i18n/observe-business_es_ES.properties | 1 + .../i18n/observe-business_fr_FR.properties | 1 + observe-entities/pom.xml | 3 +- observe-swing/pom.xml | 41 +++++++++++----------- .../content/impl/longline/BasketsTableModel.java | 1 + .../LonglineDetailCompositionUIHandler.java | 34 +++++++++++++----- ...onglineDetailCompositionUIValidationHelper.java | 22 ------------ .../open/impl/longline/TripLonglineUIHandler.java | 1 + .../open/impl/seine/TripSeineUIHandler.java | 1 + .../fr/ird/observe/ui/util/tripMap/TripMapUI.css | 6 ++++ .../fr/ird/observe/ui/util/tripMap/TripMapUI.jaxx | 5 ++- .../observe/ui/util/tripMap/TripMapUIHandler.java | 27 ++++++++++---- .../resources/i18n/observe-swing_en_GB.properties | 6 +--- .../resources/i18n/observe-swing_es_ES.properties | 6 +--- .../resources/i18n/observe-swing_fr_FR.properties | 4 +-- ...glineDetailCompositionValidatorServiceTest.java | 4 +-- observe-validation/pom.xml | 2 +- .../seine/SetSeine-n1-create-error-validation.xml | 2 +- .../i18n/observe-validation_fr_FR.properties | 2 +- pom.xml | 9 +++-- 23 files changed, 98 insertions(+), 85 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 6bfdf410c3108a84aac8ef7262ce983d5363d02f Author: Maven Release <maven-release@codelutin.com> Date: Mon May 11 12:50:36 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- observe-business/pom.xml | 2 +- observe-entities/pom.xml | 2 +- observe-swing/pom.xml | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/observe-business/pom.xml b/observe-business/pom.xml index 0bda356..3ddb54a 100644 --- a/observe-business/pom.xml +++ b/observe-business/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC6-SNAPSHOT</version> + <version>4.0-RC5</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index ac7805d..dff4488 100644 --- a/observe-entities/pom.xml +++ b/observe-entities/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC6-SNAPSHOT</version> + <version>4.0-RC5</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index 29a7d4f..80183d2 100644 --- a/observe-swing/pom.xml +++ b/observe-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC6-SNAPSHOT</version> + <version>4.0-RC5</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index d9e537f..27ad254 100644 --- a/observe-validation/pom.xml +++ b/observe-validation/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC6-SNAPSHOT</version> + <version>4.0-RC5</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index 7f62d85..a283434 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC6-SNAPSHOT</version> + <version>4.0-RC5</version> <packaging>pom</packaging> <name>ObServe</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 824419dca04a1199762c6bf3fcb9064b4289bb3b Merge: 6bfdf41 0b35bd6 Author: Maven Release <maven-release@codelutin.com> Date: Mon May 11 12:50:37 2015 +0000 Merge branch 'master' into develop -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit a944bc0ab284877db65cfcf2a1d87a6c094ad84f Author: Maven Release <maven-release@codelutin.com> Date: Mon May 11 12:50:38 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- observe-business/pom.xml | 2 +- observe-entities/pom.xml | 2 +- observe-swing/pom.xml | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/observe-business/pom.xml b/observe-business/pom.xml index 3ddb54a..0bda356 100644 --- a/observe-business/pom.xml +++ b/observe-business/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC5</version> + <version>4.0-RC6-SNAPSHOT</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index dff4488..ac7805d 100644 --- a/observe-entities/pom.xml +++ b/observe-entities/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC5</version> + <version>4.0-RC6-SNAPSHOT</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index 80183d2..29a7d4f 100644 --- a/observe-swing/pom.xml +++ b/observe-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC5</version> + <version>4.0-RC6-SNAPSHOT</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index 27ad254..d9e537f 100644 --- a/observe-validation/pom.xml +++ b/observe-validation/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC5</version> + <version>4.0-RC6-SNAPSHOT</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index a283434..7f62d85 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC5</version> + <version>4.0-RC6-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm