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 b509d93 [jgitflow-maven-plugin]merging 'release/4.0.1.1' into 'master' adds b90ab90 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds b64117e [jgitflow-maven-plugin]merging 'master' into 'develop' adds 168a446 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 8981463 Utilisation codelutinpom 3 + branche develop-4.x adds 99cbe33 Modification du log sur la modification des coordonnées (See #7431) adds ef40be9 Ajout d'une migration 4.0.2 en déplaçant le code posant problème pour PG en 4.0.2 (See #7467) adds c0e748a Ajout base de test pour la 4.0.2 (See #7467) adds 7625df3 La migration 4.0->4.0.1.1 plante sur PostgreSQL 8 (termine #7467) Merge branch 'feature/7467' into develop-4.x adds dfa66c8 [jgitflow-maven-plugin]updating poms for branch'release/4.0.2' with non-snapshot versions adds ea46753 [jgitflow-maven-plugin]merging 'release/4.0.2' into 'master' No new revisions were added by this update. Summary of changes: observe-business/pom.xml | 2 +- .../src/test/resources/db/4.0.2/referentiel.sql.gz | Bin 0 -> 138257 bytes observe-entities/pom.xml | 2 +- .../migration/AbstractDataSourceMigration.java | 4 ++- .../DataSourceMigrationForVersion_4_0_1.java | 13 ++++++-- ...va => DataSourceMigrationForVersion_4_0_2.java} | 37 +++++++++++---------- .../observe/entities/seine/ActivitySeineImpl.java | 2 +- .../resources/db/4.0.1/remove-gender-column-PG.sql | 22 ------------ .../remove-gender-column-PG.sql} | 2 +- .../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 +- observe-validation/pom.xml | 2 +- pom.xml | 10 ++---- 15 files changed, 44 insertions(+), 60 deletions(-) create mode 100644 observe-business/src/test/resources/db/4.0.2/referentiel.sql.gz copy observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/{DataSourceMigrationForVersion_4_0.java => DataSourceMigrationForVersion_4_0_2.java} (65%) delete mode 100644 observe-entities/src/main/resources/db/4.0.1/remove-gender-column-PG.sql copy observe-entities/src/main/resources/db/{3.11/add-activity-ersId-H2.sql => 4.0.2/remove-gender-column-PG.sql} (91%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.