November 2020 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] 2 commits: Fix MigrateTestsDatabases script (test module has been moved to tests directory)
by Tony CHEMIT 01 Nov '20

01 Nov '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0283f885 by Tony Chemit at 2020-11-01T14:39:27+01:00 Fix MigrateTestsDatabases script (test module has been moved to tests directory) - - - - - 194525be by Tony Chemit at 2020-11-01T15:21:10+01:00 [LL][Logbooks] table ll_landing.datasource à compléter - Closes #1627 [LL][Logbookd] Renommer table compagnies - Closes #1628 [LL][Logbooks] Ajout d'un champ - Closes #1629 [LL][Logbook] landingpart.landing devrait être une FK - Closes #1632 [LL][Logbook] ll_landing.landingpart contient 3 champs certainement en trop - Closes #1633 - - - - - 30 changed files: - client/configuration/src/main/i18n/templates/about_en_GB.ftl - client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingPartUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/referential/landing/CompagniesUI.jaxx → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/referential/landing/CompanyUI.jaxx - models/dto/src/main/i18n/getters/eugene.getter - models/dto/src/main/java/fr/ird/observe/dto/decoration/init/ReferentialLlLandingModelDecoratorInitializer.java - models/dto/src/main/models/Observe-13-referential-ll-landing.model - models/dto/src/main/models/Observe-32-data-ll-landing.model - models/persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_8_0.java - models/persistence/src/main/models/Observe-13-referential-ll-landing.model - models/persistence/src/main/models/Observe-32-data-ll-landing.model - − models/persistence/src/main/resources/db/migration/8.0/09_add_compagnies-common.sql - − models/persistence/src/main/resources/db/migration/8.0/12_add_conservation-common.sql - − models/persistence/src/main/resources/db/migration/8.0/14_add_data_source-common.sql - models/persistence/src/main/resources/db/migration/8.0/90_ll_landing_create-common.sql - models/persistence/src/main/resources/db/migration/8.0/90_ll_landing_fill-common.sql - models/persistence/src/main/resources/db/migration/8.0/90_ll_landing_finalize-common.sql - models/persistence/src/test/java/fr/ird/observe/entities/spi/DeleteTest.java - models/persistence/src/test/resources/fixtures/persistence/count-referential-longline.properties - models/persistence/src/test/resources/fixtures/persistence/entity-replication-order-referential.list - models/persistence/src/test/resources/fixtures/persistence/entity-tables-count-referential.properties - models/persistence/src/test/resources/fixtures/persistence/entity-tables-selector-referential.properties - services/i18n/src/main/i18n/translations/services_en_GB.properties - services/i18n/src/main/i18n/translations/services_es_ES.properties - services/i18n/src/main/i18n/translations/services_fr_FR.properties - services/local-impl/src/test/java/fr/ird/observe/services/local/service/sql/MigrateTestsDatabases.java - services/local-impl/src/test/resources/fixtures/validate-service-referential.properties - services/validation/src/main/i18n/getters/validation-fields.getter - tests/test/src/main/filtered-resources/observetest.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/22153a67d6d755b0fd136d5d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/22153a67d6d755b0fd136d5d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe :: Pom
by Tony CHEMIT 01 Nov '20

01 Nov '20

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 79941a52 by 166231 at 2020-11-01T12:14:13+00:00 Site checkin for project ObServe :: Pom - - - - - 3 changed files: - administration-web.html - architecture-logicielle.html - + css/apache-maven-fluido-1.8.min.css The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/79941a52ce0b4b41e72ae33d1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/79941a52ce0b4b41e72ae33d1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/7.7.0
by Tony CHEMIT 01 Nov '20

01 Nov '20

Tony CHEMIT deleted branch release/7.7.0 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v7.7.0
by Tony CHEMIT 01 Nov '20

01 Nov '20

Tony CHEMIT pushed new tag v7.7.0 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/v7.7.0 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][release/7.7.0] [jgitflow-maven-plugin]updating poms for branch'release/7.7.0' with non-snapshot versions[skip ci]
by Tony CHEMIT 01 Nov '20

01 Nov '20

Tony CHEMIT pushed to branch release/7.7.0 at ultreiaio / ird-observe Commits: 5a459340 by Tony Chemit at 2020-11-01T12:14:54+01:00 [jgitflow-maven-plugin]updating poms for branch'release/7.7.0' with non-snapshot versions[skip ci] - - - - - 22 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - common-dto/pom.xml - common-persistence/pom.xml - common-service/pom.xml - common-validation/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - templates/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <artifactId>client-runner</artifactId> ===================================== common-dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-persistence/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-service/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-validation/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -29,7 +29,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <artifactId>server-configuration</artifactId> @@ -118,7 +118,7 @@ <dependency> <groupId>fr.ird.observe</groupId> <artifactId>services</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> <scope>compile</scope> </dependency> ===================================== server-core/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <artifactId>services</artifactId> ===================================== templates/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== test/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== validation/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.0</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/5a459340e978361dd7d8127a1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/5a459340e978361dd7d8127a1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master-7.x] 9 commits: [jgitflow-maven-plugin]updating poms for 7.6.6-SNAPSHOT development[skip ci]
by Tony CHEMIT 01 Nov '20

01 Nov '20

Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe Commits: 77ed3cc9 by Tony Chemit at 2020-08-10T13:45:06+02:00 [jgitflow-maven-plugin]updating poms for 7.6.6-SNAPSHOT development[skip ci] - - - - - 78f26675 by Tony Chemit at 2020-08-10T13:52:35+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - eb5e9b93 by Tony Chemit at 2020-08-10T13:52:35+02:00 [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - 63f7e0ff by Tony Chemit at 2020-08-10T13:52:35+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 2c66a979 by Tony Chemit at 2020-11-01T11:42:18+01:00 [LL] Perte des données saisies "catchhealthstatus" et "discardhealthstatus" dans table "catch" depuis le passage à 7.6.2 - Closes #1624 - - - - - 9fb9dbdf by Tony Chemit at 2020-11-01T11:42:18+01:00 [PS] Champ "type de mensuration" ne se met pas à jour - Closes #1631 - - - - - bb53107e by Tony Chemit at 2020-11-01T11:42:18+01:00 Move to version 7.7.0 - - - - - 5a459340 by Tony Chemit at 2020-11-01T12:14:54+01:00 [jgitflow-maven-plugin]updating poms for branch'release/7.7.0' with non-snapshot versions[skip ci] - - - - - 2d6e7e53 by Tony Chemit at 2020-11-01T12:21:24+01:00 [jgitflow-maven-plugin]merging 'release/7.7.0' into 'master-7.x' - - - - - 30 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java - client-runner/pom.xml - common-dto/pom.xml - common-persistence/pom.xml - common-service/pom.xml - common-validation/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - persistence/src/main/resources/db/migration/7.4/03_rename_referential-H2.sql - persistence/src/main/resources/db/migration/7.4/03_rename_referential-PG.sql - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - templates/pom.xml - test/pom.xml - test/src/main/resources/db/7.6/dataForTestLongline.sql.gz - test/src/main/resources/db/7.6/dataForTestSeine.sql.gz - test/src/main/resources/db/7.6/empty_h2.sql.gz - test/src/main/resources/db/7.6/empty_pg.sql.gz - test/src/main/resources/db/7.6/referentiel.sql.gz - toolbox-maven-plugin/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <artifactId>client-core</artifactId> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java ===================================== @@ -103,13 +103,20 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS @Override protected void onSpeciesChanged(SpeciesReference species) { - - Optional<SizeMeasureTypeReference> oldSizeMeasureType = Optional.ofNullable(getTableEditBean()).map(NonTargetLengthDto::getSizeMeasureType); - Optional<SizeMeasureTypeReference> sizeMeasureType = getSpeciesDefaultSizeMeasureType(species); - log.debug("Default size measure " + sizeMeasureType.orElse(null)); - getUi().getModel().setDefaultSizeMeasureType(sizeMeasureType.orElse(null)); + log.debug("On species changed to : " + species); + SizeMeasureTypeReference oldSizeMeasureType = getTableEditBean().getSizeMeasureType(); + Optional<SizeMeasureTypeReference> defaultSizeMeasureType = getSpeciesDefaultSizeMeasureType(species); + log.debug("Old size measure " + oldSizeMeasureType); + log.debug("Default size measure " + defaultSizeMeasureType.orElse(null)); + getUi().getModel().setDefaultSizeMeasureType(defaultSizeMeasureType.orElse(null)); resetDefaultSizeMeasureType(); - oldSizeMeasureType.ifPresent(sizeMeasureTypeReference -> getTableEditBean().setSizeMeasureType(sizeMeasureTypeReference)); + if (getTableModel().isCreate()) { + log.debug("On create mode, always use default size measure"); + oldSizeMeasureType = null; + } + SizeMeasureTypeReference newSizeMeasureType = oldSizeMeasureType == null ? defaultSizeMeasureType.orElse(null) : oldSizeMeasureType; + log.debug("New size measure " + newSizeMeasureType); + getTableEditBean().setSizeMeasureType(newSizeMeasureType); } @Override ===================================== client-runner/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <artifactId>client-runner</artifactId> ===================================== common-dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-persistence/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-service/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-validation/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <artifactId>persistence</artifactId> ===================================== persistence/src/main/resources/db/migration/7.4/03_rename_referential-H2.sql ===================================== @@ -29,7 +29,7 @@ INSERT INTO observe_longline.StomachFullness(topiaId, topiaVersion, topiaCreateD ALTER TABLE observe_longline.Catch ADD COLUMN discardHealthStatus VARCHAR(255); ALTER TABLE observe_longline.Catch ADD COLUMN catchHealthStatus VARCHAR(255); ALTER TABLE observe_longline.Catch ADD COLUMN stomachFullness VARCHAR(255); -UPDATE observe_longline.Catch SET discardHealthStatus = REPLACE(discardHealthStatus, 'Healthness','HealthStatus'), catchHealthStatus = REPLACE(catchHealthStatus, 'Healthness','HealthStatus'), stomachFullness = REPLACE(stomachFullness, 'StomacFullness','StomachFullness'); +UPDATE observe_longline.Catch SET discardHealthStatus = REPLACE(discardHealthness, 'Healthness', 'HealthStatus'), catchHealthStatus = REPLACE(catchHealthness, 'Healthness', 'HealthStatus'), stomachFullness = REPLACE(stomacFullness, 'StomacFullness','StomachFullness'); ALTER TABLE observe_longline.Catch DROP COLUMN discardHealthness; ALTER TABLE observe_longline.Catch DROP COLUMN catchHealthness; ALTER TABLE observe_longline.Catch DROP COLUMN stomacFullness; ===================================== persistence/src/main/resources/db/migration/7.4/03_rename_referential-PG.sql ===================================== @@ -28,7 +28,7 @@ INSERT INTO observe_longline.StomachFullness(topiaId, topiaVersion, topiaCreateD ALTER TABLE observe_longline.Catch ADD COLUMN discardHealthStatus VARCHAR(255); ALTER TABLE observe_longline.Catch ADD COLUMN catchHealthStatus VARCHAR(255); ALTER TABLE observe_longline.Catch ADD COLUMN stomachFullness VARCHAR(255); -UPDATE observe_longline.Catch SET discardHealthStatus = REPLACE(discardHealthStatus, 'Healthness','HealthStatus'), catchHealthStatus = REPLACE(catchHealthStatus, 'Healthness','HealthStatus'), stomachFullness = REPLACE(stomachFullness, 'StomacFullness','StomachFullness'); +UPDATE observe_longline.Catch SET discardHealthStatus = REPLACE(discardHealthness, 'Healthness', 'HealthStatus'), catchHealthStatus = REPLACE(catchHealthness, 'Healthness', 'HealthStatus'), stomachFullness = REPLACE(stomacFullness, 'StomacFullness','StomachFullness'); ALTER TABLE observe_longline.Catch DROP COLUMN discardHealthness CASCADE; ALTER TABLE observe_longline.Catch DROP COLUMN catchHealthness CASCADE; ALTER TABLE observe_longline.Catch DROP COLUMN stomacFullness CASCADE; ===================================== pom.xml ===================================== @@ -29,7 +29,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <artifactId>server-configuration</artifactId> @@ -118,7 +118,7 @@ <dependency> <groupId>fr.ird.observe</groupId> <artifactId>services</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> <scope>compile</scope> </dependency> ===================================== server-core/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <artifactId>services</artifactId> ===================================== templates/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== test/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <artifactId>test</artifactId> ===================================== test/src/main/resources/db/7.6/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.6/dataForTestLongline.sql.gz and b/test/src/main/resources/db/7.6/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/7.6/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.6/dataForTestSeine.sql.gz and b/test/src/main/resources/db/7.6/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/7.6/empty_h2.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.6/empty_h2.sql.gz and b/test/src/main/resources/db/7.6/empty_h2.sql.gz differ ===================================== test/src/main/resources/db/7.6/empty_pg.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.6/empty_pg.sql.gz and b/test/src/main/resources/db/7.6/empty_pg.sql.gz differ ===================================== test/src/main/resources/db/7.6/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.6/referentiel.sql.gz and b/test/src/main/resources/db/7.6/referentiel.sql.gz differ ===================================== toolbox-maven-plugin/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== validation/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.5</version> + <version>7.7.0</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/911301d2995d86c9de57098d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/911301d2995d86c9de57098d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/7.7.0' with non-snapshot versions[skip ci]
by Tony CHEMIT 01 Nov '20

01 Nov '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 5a459340 by Tony Chemit at 2020-11-01T12:14:54+01:00 [jgitflow-maven-plugin]updating poms for branch'release/7.7.0' with non-snapshot versions[skip ci] - - - - - 2d6e7e53 by Tony Chemit at 2020-11-01T12:21:24+01:00 [jgitflow-maven-plugin]merging 'release/7.7.0' into 'master-7.x' - - - - - 27d45c8c by Tony Chemit at 2020-11-01T12:21:26+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - faa83a49 by Tony Chemit at 2020-11-01T12:21:26+01:00 [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - 0d91ce44 by Tony Chemit at 2020-11-01T12:21:27+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/94bf9cb6bddb5780d6af4302… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/94bf9cb6bddb5780d6af4302… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [jgitflow-maven-plugin]updating poms for 7.7.1-SNAPSHOT development[skip ci]
by Tony CHEMIT 01 Nov '20

01 Nov '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 94bf9cb6 by Tony Chemit at 2020-11-01T12:11:17+01:00 [jgitflow-maven-plugin]updating poms for 7.7.1-SNAPSHOT development[skip ci] - - - - - 22 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - common-dto/pom.xml - common-persistence/pom.xml - common-service/pom.xml - common-validation/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - templates/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <artifactId>client-runner</artifactId> ===================================== common-dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-persistence/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-service/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-validation/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -29,7 +29,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> @@ -118,7 +118,7 @@ <dependency> <groupId>fr.ird.observe</groupId> <artifactId>services</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> <scope>compile</scope> </dependency> ===================================== server-core/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== templates/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== test/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== validation/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.7.0-SNAPSHOT</version> + <version>7.7.1-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/94bf9cb6bddb5780d6af4302c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/94bf9cb6bddb5780d6af4302c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/7.7.0
by Tony CHEMIT 01 Nov '20

01 Nov '20

Tony CHEMIT pushed new branch release/7.7.0 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/release/7.7.0 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Review client datasource editor layout (more and more stuff generated in ui)
by Tony CHEMIT 01 Nov '20

01 Nov '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: dc6747db by Tony Chemit at 2020-10-29T12:06:33+01:00 Review client datasource editor layout (more and more stuff generated in ui) - - - - - ba03132f by Tony Chemit at 2020-10-30T20:53:34+01:00 Continue storm on ui - - - - - 86de5d9c by Tony Chemit at 2020-10-31T21:17:42+01:00 Introduce new spi module to put to the spi stuff used to generate so much things. - - - - - 22153a67 by Tony Chemit at 2020-11-01T12:07:27+01:00 update changelog for version 7.7.0 - - - - - 30 changed files: - CHANGELOG.md - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminActionModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIBodyContent.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/AdminTabUIActionSupport.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/actions/SelectData.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/export/ExportModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/export/actions/Prepare.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/ActivityLlPairingModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/DataSelectionTreePane.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/DataSelectionTreePaneHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/actions/DataSelectionTreePaneActionSupport.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/actions/DataSourceInformation.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/actions/RegisterCopy.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/actions/RegisterDelete.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/ObsoleteReferentialReferenceListCellRenderer.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/SynchronizeModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/actions/SynchroUIActionSupport.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/daf444f8477fdfe54eae90ee… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/daf444f8477fdfe54eae90ee… You're receiving this email because of your account on gitlab.com.

1 0