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 c4e11be [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 983f525 fix migration 4.0-RC6 (refs #7145) adds c7d5e9f fixes #7145: Echec de la mise à jour de la version 4.0 RC5 vers RC6 en base locale Merge branch 'feature/7145' into develop adds 36d60b8 fix pg migration (refs #7145) adds 05417d3 fix third parties adds 77e045e updates librairies (refs #7147) adds 82c74b6 update more librairies (refs #7147) adds 90d271a fixes #7147: Mise à jour librairies Merge branch 'feature/7147' into develop adds f7c7a24 Merge branch 'feature/7146' into develop adds f312098 reajout de certaines migrations de la 4.0-RC3 (refs 7153) adds 92d3049 fixes #7153: [PS] Après migration, la senne de toutes les marées anciennes devrait être marquée comme "utilisée pendant la marée" Merge branch 'feature/7153' into develop adds 3eb11b3 ajout de la value stack (refs #7155) adds 392ec1c ajout dans le context de validation des entités du modèle LL (refs #7155) adds 5cbfd5e fix class cast exception (refs #7155) adds 08eb4dc fixes #7155: [PS/LL] La fonction Action/Valider les données plante Merge branch 'feature/7155' into develop adds c89f5a5 refs #7148 : modification des requêtes pour les tableaux de synthèse adds 8de82a1 refs #7154 : modification du rendu de la légende adds 33becda refs #7154 : ajout des dates sur les activités de palangre adds c3acac6 refs #7154 : ajout de ligne pour les activités autre que les opérations de pèche adds ce0400b Merge branch 'feature/7154' into develop adds ca6e021 [jgitflow-maven-plugin]updating poms for 4.0-RC7 branch with snapshot versions adds 5edbf2d Fix release 4.0-RC7 adds ba30d9c [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC7' with non-snapshot versions adds 2cb4558 [jgitflow-maven-plugin]merging 'release/4.0-RC7' into 'master' No new revisions were added by this update. Summary of changes: observe-business/pom.xml | 2 +- .../src/main/filters/observe-reports.properties | 1663 ++++++-------------- .../ird/observe/validation/ObserveValidator.java | 12 +- .../validation/ValidationMessageDetector.java | 32 +- observe-entities/pom.xml | 5 +- .../entities/longline/TripLonglineDAOImpl.java | 37 +- .../migration/AbstractDataSourceMigration.java | 4 +- .../entities/migration/H2DataSourceMigration.java | 46 + .../entities/migration/PGDataSourceMigration.java | 88 ++ .../DataSourceMigrationForVersion_4_0_RC6.java | 22 +- ... => DataSourceMigrationForVersion_4_0_RC7.java} | 30 +- .../db/4.0-RC6/fix-gearUseFeatures-topiaIds-H2.sql | 2 +- .../db/4.0-RC6/fix-gearUseFeatures-topiaIds-PG.sql | 2 +- .../rename-unknown-longliner-H2.sql | 0 .../rename-unknown-longliner-PG.sql | 0 .../update-senne-gear-usedInTrip-H2.sql | 0 .../update-senne-gear-usedInTrip-PG.sql | 0 observe-swing/pom.xml | 2 +- observe-swing/src/license/THIRD-PARTY.properties | 6 +- .../observe/ui/admin/report/ReportUIHandler.java | 5 + .../ui/admin/validate/ValidateUIHandler.java | 3 +- .../observe/ui/util/tripMap/ObserveMapPane.java | 33 +- .../ui/util/tripMap/ObserveMapPaneLegendItem.java | 7 +- .../ui/util/tripMap/TripMapContentBuilder.java | 103 +- observe-swing/src/main/map/style.xml | 143 +- observe-validation/pom.xml | 2 +- pom.xml | 22 +- 27 files changed, 991 insertions(+), 1280 deletions(-) copy observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/{DataSourceMigrationForVersion_4_0_RC4.java => DataSourceMigrationForVersion_4_0_RC7.java} (75%) copy observe-entities/src/main/resources/db/{4.0-RC3 => 4.0-RC7}/rename-unknown-longliner-H2.sql (100%) copy observe-entities/src/main/resources/db/{4.0-RC3 => 4.0-RC7}/rename-unknown-longliner-PG.sql (100%) copy observe-entities/src/main/resources/db/{4.0-RC3 => 4.0-RC7}/update-senne-gear-usedInTrip-H2.sql (100%) copy observe-entities/src/main/resources/db/{4.0-RC3 => 4.0-RC7}/update-senne-gear-usedInTrip-PG.sql (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.