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 e5e2f49 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new c571621 ajout d'une migration 4.0 pour que la base soit sur la version final 4.0 (refs #7196) new 20ec57e fixes #7196: Ajout d'une migration de base pour être en 4.0 Merge branch 'feature/7196' into develop The 2 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 20ec57eb9a810a0971103821e185f7cff280466d Merge: e5e2f49 c571621 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jun 8 13:14:00 2015 +0200 fixes #7196: Ajout d'une migration de base pour être en 4.0 Merge branch 'feature/7196' into develop commit c571621c3d1ba89f78cb11dc99fccd98d1e277a6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jun 8 13:06:45 2015 +0200 ajout d'une migration 4.0 pour que la base soit sur la version final 4.0 (refs #7196) Summary of changes: .../main/java/fr/ird/converter/FloatConverter.java | 2 +- .../java/fr/ird/converter/FloatConverterTest.java | 2 +- .../migration/AbstractDataSourceMigration.java | 3 +- ...java => DataSourceMigrationForVersion_4_0.java} | 40 ++++++---------------- .../DataSourceMigrationForVersion_4_0_RC4.java | 5 --- .../DataSourceMigrationForVersion_4_0_RC7.java | 5 --- .../main/java/fr/ird/type/CoordinateHelper.java | 2 +- .../src/main/resources/db/4.0/empty-H2.sql | 2 ++ .../src/main/resources/db/4.0/empty-PG.sql | 2 ++ .../src/main/xmi/observe-common.properties | 2 +- .../src/main/xmi/observe-longline.properties | 2 +- .../src/main/xmi/observe-seine.properties | 2 +- 12 files changed, 22 insertions(+), 47 deletions(-) copy observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/{DataSourceMigrationForVersion_3_12.java => DataSourceMigrationForVersion_4_0.java} (52%) create mode 100644 observe-entities/src/main/resources/db/4.0/empty-H2.sql create mode 100644 observe-entities/src/main/resources/db/4.0/empty-PG.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.