This is an automated email from the git hooks/post-receive script. New change to branch master in repository observe. See http://git.codelutin.com/observe.git from ccdba94 [jgitflow-maven-plugin]merging 'release/4.0-RC8' into 'master' adds 2bf759b [jgitflow-maven-plugin]updating poms for 4.0-SNAPSHOT development adds 23cc685 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds e5a26e3 [jgitflow-maven-plugin]merging 'master' into 'develop' adds e5e2f49 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds c571621 ajout d'une migration 4.0 pour que la base soit sur la version final 4.0 (refs #7196) adds 20ec57e fixes #7196: Ajout d'une migration de base pour être en 4.0 Merge branch 'feature/7196' into develop adds 8cd3e94 refs #7045 : la verification que la position du curseur est trop réstricive. adds c74669b refs #7045 : la verification que la position du curseur est trop réstricive. adds 402c795 fixes #7045: [ObserveLL] Schéma de palangre (composition détaillée) : problème de clic droit sous Windows (empêche la suppression de paniers ou avancons) Merge branch 'feature/7045' into develop adds 47706bc fixes #7177 : correction des libellé de la légendes adds 166a59d fixes #7177: Erreur de légende pour la cartographie des marées ObserveLL Merge branch 'feature/7177' into develop adds bf12662 ajout de la base referentiel pour la version 4.0 adds 154d3f2 add missing license headers adds 8c98388 [jgitflow-maven-plugin]updating poms for branch'release/4.0' with non-snapshot versions adds 2ee467e [jgitflow-maven-plugin]merging 'release/4.0' into 'master' No new revisions were added by this update. Summary of changes: observe-business/pom.xml | 2 +- .../main/java/fr/ird/converter/FloatConverter.java | 2 +- .../java/fr/ird/converter/FloatConverterTest.java | 2 +- .../src/test/resources/db/4.0/referentiel.sql.gz | Bin 0 -> 138262 bytes observe-entities/pom.xml | 2 +- .../migration/AbstractDataSourceMigration.java | 3 ++- ...12.java => DataSourceMigrationForVersion_4_0.java} | 18 ++++++++++-------- .../DataSourceMigrationForVersion_4_0_RC4.java | 5 ----- .../DataSourceMigrationForVersion_4_0_RC7.java | 5 ----- .../src/main/java/fr/ird/type/CoordinateHelper.java | 2 +- .../empty-H2.sql} | 3 ++- .../empty-PG.sql} | 3 ++- .../resources/i18n/observe-entities_fr_FR.properties | 8 ++++---- .../src/main/xmi/observe-common.properties | 2 +- .../src/main/xmi/observe-longline.properties | 2 +- .../src/main/xmi/observe-seine.properties | 2 +- observe-swing/pom.xml | 2 +- .../ui/tree/ObserveNavigationTreeShowPopupAction.java | 9 +-------- .../AutotSelectRowAndShowPopupActionSupport.java | 7 +------ .../resources/i18n/observe-swing_fr_FR.properties | 4 ++-- observe-validation/pom.xml | 2 +- pom.xml | 2 +- 22 files changed, 35 insertions(+), 52 deletions(-) create mode 100644 observe-business/src/test/resources/db/4.0/referentiel.sql.gz copy observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/{DataSourceMigrationForVersion_3_12.java => DataSourceMigrationForVersion_4_0.java} (82%) copy observe-entities/src/main/resources/db/{3.14/remove-targetlength-discarded-field-H2.sql => 4.0/empty-H2.sql} (92%) copy observe-entities/src/main/resources/db/{3.14/remove-targetlength-discarded-field-H2.sql => 4.0/empty-PG.sql} (92%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.