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

Commits:

2 changed files:

Changes:

  • core/persistence/migration/src/main/resources/db/migration/v9/9.2/13_issue-2787-common.sql
    ... ... @@ -23,30 +23,50 @@
    23 23 
     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');
    24 24
    25 25 
     -- add characteristic (4, 5, 15 and 27) to gear 2
    26 
    +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';
    27 
    +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';
    28 
    +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';
    29 
    +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';
    26 30 
     INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4');
    27 31 
     INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ( 'fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5');
    28 32 
     INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ( 'fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1');
    29 33 
     INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ( 'fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027');
    30 34
    31 35 
     -- add characteristic (4, 5, 15 and 27) to gear 3
    36 
    +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';
    37 
    +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';
    38 
    +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';
    39 
    +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';
    32 40 
     INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4');
    33 41 
     INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5');
    34 42 
     INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1');
    35 43 
     INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027');
    36 44
    37 45 
     -- add characteristic (4, 5, 15 and 27) to gear 4
    46 
    +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';
    47 
    +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';
    48 
    +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';
    49 
    +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';
    38 50 
     INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4');
    39 51 
     INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5');
    40 52 
     INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1');
    41 53 
     INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027');
    42 54
    43 55 
     -- add characteristic (4, 5, 15 and 27) to gear 5
    56 
    +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';
    57 
    +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';
    58 
    +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';
    59 
    +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';
    44 60 
     INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4');
    45 61 
     INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5');
    46 
    --- INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1');
    62 
    +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1');
    47 63 
     INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027');
    48 64
    49 65 
     -- add characteristic (4, 5, 15 and 27) to gear 6
    66 
    +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';
    67 
    +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';
    68 
    +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';
    69 
    +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';
    50 70 
     INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.5', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4');
    51 71 
     INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.5', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5');
    52 72 
     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 @@
    23 23 
       <parent>
    24 24 
         <groupId>io.ultreia.maven</groupId>
    25 25 
         <artifactId>pom</artifactId>
    26 
    -  <version>2023.45</version>
    26 
    +  <version>2023.47</version>
    27 27 
       </parent>
    28 28 
       <groupId>fr.ird.observe</groupId>
    29 29 
       <artifactId>ird-observe</artifactId>
    ... ... @@ -547,7 +547,7 @@
    547 547 
           <dependency>
    548 548 
             <groupId>org.apache.commons</groupId>
    549 549 
             <artifactId>commons-text</artifactId>
    550 
    -        <version>1.10.0</version>
    550 
    +        <version>${lib.version.commons-text}</version>
    551 551 
           </dependency>
    552 552 
           <dependency>
    553 553 
             <groupId>org.apache.httpcomponents</groupId>

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. Manage all notifications · Help