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 25ac3bb [jgitflow-maven-plugin]updating poms for 4.0-RC5-SNAPSHOT development new dfbe35c [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 6d853ed fix replicate test adds f3d5761 add license header adds 487128b optimize dependencies adds 7d7be03 add license headers adds 2c3ed45 optimize dependencies new 2e94d4d [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC4' with non-snapshot versions new a725e55 Merge branch 'release/4.0-RC4' new 423fd3b Merge branch 'master' into develop new 63d2ef6 [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 63d2ef6dfc4a041fbb9e7f53a8c9e677f0fd7b9c Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 23 18:06:31 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 423fd3bb1776155dfbcfdda90ac22a3ada322671 Merge: dfbe35c a725e55 Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 23 18:06:30 2015 +0000 Merge branch 'master' into develop commit dfbe35c53c6cb356efcedb86b5bb6a2d8493c713 Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 23 18:06:29 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit a725e55f56f947207f115de5f1b653f150b5b888 Merge: 9973bd8 2e94d4d Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 23 18:06:25 2015 +0000 Merge branch 'release/4.0-RC4' commit 2e94d4d8803a444f9be6a34b172b0d5ad9bf850d Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 23 18:00:19 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC4' with non-snapshot versions Summary of changes: .../its/replication/AbstractReplicateDataTest.java | 2 + .../its/replication/H2ReplicateDataTest.java | 22 +++++++++++ .../DataSourceMigrationForVersion_4_0_RC4.java | 22 +++++++++++ .../java/fr/ird/observe/tripMap/TripMapPoint.java | 22 +++++++++++ .../fr/ird/observe/tripMap/TripMapPointType.java | 22 +++++++++++ .../main/resources/db/4.0-RC4/add-gear-data-H2.sql | 21 +++++++++++ .../main/resources/db/4.0-RC4/add-gear-data-PG.sql | 21 +++++++++++ observe-swing/pom.xml | 18 +++++++-- observe-swing/src/main/assembly/map.xml | 21 +++++++++++ .../observe/ui/util/tripMap/ObserveMapPane.java | 22 +++++++++++ .../ui/util/tripMap/ObserveMapPaneLegendItem.java | 22 +++++++++++ .../util/tripMap/ObserverMapPanLegendDrawer.java | 22 +++++++++++ .../fr/ird/observe/ui/util/tripMap/TripMapUI.css | 21 +++++++++++ .../fr/ird/observe/ui/util/tripMap/TripMapUI.jaxx | 21 +++++++++++ .../observe/ui/util/tripMap/TripMapUIHandler.java | 22 +++++++++++ .../map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml | 21 +++++++++++ observe-swing/src/main/map/style.xml | 21 +++++++++++ ...FeaturesLongline-n1-update-error-validation.xml | 22 +++++++++++ pom.xml | 43 +++++++++++++++++++--- 19 files changed, 399 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.