[Observe-commits] [Git][ultreiaio/ird-observe][develop] 2 commits: update pom

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 489f0113 by Tony Chemit at 2023-11-13T10:09:00+01:00 update pom - - - - - 1aca8fce by Tony Chemit at 2023-11-13T10:27:06+01:00 Erreur migration 9.1 vers 9.2 de la base centrale AZTI - Closes #2801 - - - - - 2 changed files: - core/persistence/migration/src/main/resources/db/migration/v9/9.2/13_issue-2787-common.sql - pom.xml Changes: ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.2/13_issue-2787-common.sql ===================================== @@ -23,30 +23,50 @@ INSERT INTO common.GearCharacteristic (TOPIAID, TOPIAVERSION, TOPIACREATEDATE, LASTUPDATEDATE, CODE, URI, HOMEID, NEEDCOMMENT, STATUS, LABEL1, LABEL2, LABEL3, LABEL4, LABEL5, LABEL6, LABEL7, LABEL8, UNIT, GEARCHARACTERISTICTYPE) VALUES ('fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '27', null, null, false, 1, 'Electric power', 'Puissance électrique', 'Energia electrica', null, null, null, null, null, 'kW', 'fr.ird.referential.common.GearCharacteristicType#1239832686123#0.3'); -- add characteristic (4, 5, 15 and 27) to gear 2 +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.1' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.1' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.1' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.1' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'; INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ( 'fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ( 'fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ( 'fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); -- add characteristic (4, 5, 15 and 27) to gear 3 +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.2' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.2' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.2' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.2' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'; INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); -- add characteristic (4, 5, 15 and 27) to gear 4 +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.3' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.3' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.3' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.3' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'; INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); -- add characteristic (4, 5, 15 and 27) to gear 5 +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.4' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.4' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.4' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.4' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'; INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); --- INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); -- add characteristic (4, 5, 15 and 27) to gear 6 +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.5' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.5' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.5' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.5' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'; INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.5', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.5', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.5', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2023.45</version> + <version>2023.47</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> @@ -547,7 +547,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-text</artifactId> - <version>1.10.0</version> + <version>${lib.version.commons-text}</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8af50c621b21654c6f252ad74... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8af50c621b21654c6f252ad74... You're receiving this email because of your account on gitlab.com.