Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe

Commits:

• 870e6d69
  by Tony CHEMIT at 2018-10-14T14:27:34Z

  Revoir le rapport utilisation des dcp - Closes #1082
  

• 5ee3d3e9
  by Tony CHEMIT at 2018-10-14T14:27:37Z

  Realign database model version to 7.0
  

• 56484c2a
  by Tony CHEMIT at 2018-10-14T14:28:12Z

  update pom
  

30 changed files:

• persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_5.java → persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_3.java
• persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_1.java → persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_4.java
• persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_2.java → persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_5.java
• persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_3.java → persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_6.java
• persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java
• persistence/src/main/resources/db/migration/7.0/01_fill_non_target_sample_size_measure_type-common.sql → persistence/src/main/resources/db/migration/6.3/01_fill_non_target_sample_size_measure_type-common.sql
• persistence/src/main/resources/db/migration/7.0/02_add_data_quality-common.sql → persistence/src/main/resources/db/migration/6.3/02_add_data_quality-common.sql
• persistence/src/main/resources/db/migration/7.0/03_add_order_on_seine_catches-common.sql → persistence/src/main/resources/db/migration/6.3/03_add_order_on_seine_catches-common.sql
• persistence/src/main/resources/db/migration/7.0/04_add_order_on_seine_samples-common.sql → persistence/src/main/resources/db/migration/6.3/04_add_order_on_seine_samples-common.sql
• persistence/src/main/resources/db/migration/7.1/01_add_non_target_catch_release_status-H2.sql → persistence/src/main/resources/db/migration/6.4/01_add_non_target_catch_release_status-H2.sql
• persistence/src/main/resources/db/migration/7.1/01_add_non_target_catch_release_status-PG.sql → persistence/src/main/resources/db/migration/6.4/01_add_non_target_catch_release_status-PG.sql
• persistence/src/main/resources/db/migration/7.2/02_add_non_target_catch_release_conformity-H2.sql → persistence/src/main/resources/db/migration/6.5/02_add_non_target_catch_release_conformity-H2.sql
• persistence/src/main/resources/db/migration/7.2/02_add_non_target_catch_release_conformity-PG.sql → persistence/src/main/resources/db/migration/6.5/02_add_non_target_catch_release_conformity-PG.sql
• persistence/src/main/resources/db/migration/7.2/03_add_non_target_catch_releasing_time-H2.sql → persistence/src/main/resources/db/migration/6.5/03_add_non_target_catch_releasing_time-H2.sql
• persistence/src/main/resources/db/migration/7.2/03_add_non_target_catch_releasing_time-PG.sql → persistence/src/main/resources/db/migration/6.5/03_add_non_target_catch_releasing_time-PG.sql
• persistence/src/main/resources/db/migration/7.2/04_update_non_target_catch_release_status-common.sql → persistence/src/main/resources/db/migration/6.5/04_update_non_target_catch_release_status-common.sql
• persistence/src/main/resources/db/migration/7.2/05_remove_species_group_release_mode_value-common.sql → persistence/src/main/resources/db/migration/6.5/05_remove_species_group_release_mode_value-common.sql
• persistence/src/main/resources/db/migration/7.2/06_fix_species_group_release_mode_for_cetaceans-common.sql → persistence/src/main/resources/db/migration/6.5/06_fix_species_group_release_mode_for_cetaceans-common.sql
• persistence/src/main/resources/db/migration/7.2/07_update_observed_system-common.sql → persistence/src/main/resources/db/migration/6.5/07_update_observed_system-common.sql
• persistence/src/main/resources/db/migration/7.3/01_remove_one_size_measure_type-common.sql → persistence/src/main/resources/db/migration/6.6/01_remove_one_size_measure_type-common.sql
• persistence/src/main/resources/db/migration/7.3/02_add_length_length_parameter_fields-common.sql → persistence/src/main/resources/db/migration/6.6/02_add_length_length_parameter_fields-common.sql
• persistence/src/main/resources/db/migration/7.5/01_add_speciesRelease-common.sql → persistence/src/main/resources/db/migration/7.0/01_add_speciesRelease-common.sql
• pom.xml
• services-local/src/test/java/fr/ird/observe/services/local/service/actions/report/ReportDcpUsageTest.java
• services/src/main/resources/observe-reports.properties
• − test/src/main/resources/db/6.901/dataForTestLongline.sql.gz
• − test/src/main/resources/db/6.901/dataForTestSeine.sql.gz
• − test/src/main/resources/db/6.901/empty_h2.sql.gz
• − test/src/main/resources/db/6.901/empty_pg.sql.gz
• − test/src/main/resources/db/6.901/referentiel.sql.gz

The diff was not included because it is too large.