Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe

Commits:

26 changed files:

Changes:

  • application-swing-configuration/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26
       <parent>
    
    27 27
         <groupId>fr.ird.observe</groupId>
    
    28 28
         <artifactId>pom</artifactId>
    
    29
    -    <version>5.3.4-SNAPSHOT</version>
    
    29
    +    <version>5.3.3-SNAPSHOT</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <artifactId>application-swing-configuration</artifactId>
    

  • application-swing-decoration/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26
       <parent>
    
    27 27
         <groupId>fr.ird.observe</groupId>
    
    28 28
         <artifactId>pom</artifactId>
    
    29
    -    <version>5.3.4-SNAPSHOT</version>
    
    29
    +    <version>5.3.3-SNAPSHOT</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <artifactId>application-swing-decoration</artifactId>
    

  • application-swing-validation/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26
       <parent>
    
    27 27
         <groupId>fr.ird.observe</groupId>
    
    28 28
         <artifactId>pom</artifactId>
    
    29
    -    <version>5.3.4-SNAPSHOT</version>
    
    29
    +    <version>5.3.3-SNAPSHOT</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <artifactId>application-swing-validation</artifactId>
    

  • application-swing-validators/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26
       <parent>
    
    27 27
         <groupId>fr.ird.observe</groupId>
    
    28 28
         <artifactId>pom</artifactId>
    
    29
    -    <version>5.3.4-SNAPSHOT</version>
    
    29
    +    <version>5.3.3-SNAPSHOT</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <artifactId>application-swing-validators</artifactId>
    

  • application-swing/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26
       <parent>
    
    27 27
         <groupId>fr.ird.observe</groupId>
    
    28 28
         <artifactId>pom</artifactId>
    
    29
    -    <version>5.3.4-SNAPSHOT</version>
    
    29
    +    <version>5.3.3-SNAPSHOT</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <artifactId>application-swing</artifactId>
    

  • application-web-configuration/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26
       <parent>
    
    27 27
         <groupId>fr.ird.observe</groupId>
    
    28 28
         <artifactId>pom</artifactId>
    
    29
    -    <version>5.3.4-SNAPSHOT</version>
    
    29
    +    <version>5.3.3-SNAPSHOT</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <artifactId>application-web-configuration</artifactId>
    

  • application-web/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27
       <parent>
    
    28 28
         <groupId>fr.ird.observe</groupId>
    
    29 29
         <artifactId>pom</artifactId>
    
    30
    -    <version>5.3.4-SNAPSHOT</version>
    
    30
    +    <version>5.3.3-SNAPSHOT</version>
    
    31 31
       </parent>
    
    32 32
     
    
    33 33
       <artifactId>application-web</artifactId>
    

  • entities-migration/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27
       <parent>
    
    28 28
         <groupId>fr.ird.observe</groupId>
    
    29 29
         <artifactId>pom</artifactId>
    
    30
    -    <version>5.3.4-SNAPSHOT</version>
    
    30
    +    <version>5.3.3-SNAPSHOT</version>
    
    31 31
       </parent>
    
    32 32
     
    
    33 33
       <artifactId>entities-migration</artifactId>
    

  • entities/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27
       <parent>
    
    28 28
         <groupId>fr.ird.observe</groupId>
    
    29 29
         <artifactId>pom</artifactId>
    
    30
    -    <version>5.3.4-SNAPSHOT</version>
    
    30
    +    <version>5.3.3-SNAPSHOT</version>
    
    31 31
       </parent>
    
    32 32
     
    
    33 33
       <artifactId>entities</artifactId>
    

  • observe/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26
       <parent>
    
    27 27
         <groupId>fr.ird.observe</groupId>
    
    28 28
         <artifactId>pom</artifactId>
    
    29
    -    <version>5.3.4-SNAPSHOT</version>
    
    29
    +    <version>5.3.3-SNAPSHOT</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <artifactId>observe</artifactId>
    

  • pom.xml
    ... ... @@ -32,7 +32,7 @@
    32 32
     
    
    33 33
       <groupId>fr.ird.observe</groupId>
    
    34 34
       <artifactId>pom</artifactId>
    
    35
    -  <version>5.3.4-SNAPSHOT</version>
    
    35
    +  <version>5.3.3-SNAPSHOT</version>
    
    36 36
       <packaging>pom</packaging>
    
    37 37
     
    
    38 38
       <name>ObServe</name>
    

  • services-configuration-rest/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27
       <parent>
    
    28 28
         <groupId>fr.ird.observe</groupId>
    
    29 29
         <artifactId>pom</artifactId>
    
    30
    -    <version>5.3.4-SNAPSHOT</version>
    
    30
    +    <version>5.3.3-SNAPSHOT</version>
    
    31 31
       </parent>
    
    32 32
     
    
    33 33
       <artifactId>services-configuration-rest</artifactId>
    

  • services-configuration-topia/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27
       <parent>
    
    28 28
         <groupId>fr.ird.observe</groupId>
    
    29 29
         <artifactId>pom</artifactId>
    
    30
    -    <version>5.3.4-SNAPSHOT</version>
    
    30
    +    <version>5.3.3-SNAPSHOT</version>
    
    31 31
       </parent>
    
    32 32
     
    
    33 33
       <artifactId>services-configuration-topia</artifactId>
    

  • services-configuration/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27
       <parent>
    
    28 28
         <groupId>fr.ird.observe</groupId>
    
    29 29
         <artifactId>pom</artifactId>
    
    30
    -    <version>5.3.4-SNAPSHOT</version>
    
    30
    +    <version>5.3.3-SNAPSHOT</version>
    
    31 31
       </parent>
    
    32 32
     
    
    33 33
       <artifactId>services-configuration</artifactId>
    

  • services-dto/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27
       <parent>
    
    28 28
         <groupId>fr.ird.observe</groupId>
    
    29 29
         <artifactId>pom</artifactId>
    
    30
    -    <version>5.3.4-SNAPSHOT</version>
    
    30
    +    <version>5.3.3-SNAPSHOT</version>
    
    31 31
       </parent>
    
    32 32
     
    
    33 33
       <artifactId>services-dto</artifactId>
    

  • services-rest/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27
       <parent>
    
    28 28
         <groupId>fr.ird.observe</groupId>
    
    29 29
         <artifactId>pom</artifactId>
    
    30
    -    <version>5.3.4-SNAPSHOT</version>
    
    30
    +    <version>5.3.3-SNAPSHOT</version>
    
    31 31
       </parent>
    
    32 32
     
    
    33 33
       <artifactId>services-rest</artifactId>
    

  • services-runner/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27
       <parent>
    
    28 28
         <groupId>fr.ird.observe</groupId>
    
    29 29
         <artifactId>pom</artifactId>
    
    30
    -    <version>5.3.4-SNAPSHOT</version>
    
    30
    +    <version>5.3.3-SNAPSHOT</version>
    
    31 31
       </parent>
    
    32 32
     
    
    33 33
       <artifactId>services-runner</artifactId>
    

  • services-topia-validation/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27
       <parent>
    
    28 28
         <groupId>fr.ird.observe</groupId>
    
    29 29
         <artifactId>pom</artifactId>
    
    30
    -    <version>5.3.4-SNAPSHOT</version>
    
    30
    +    <version>5.3.3-SNAPSHOT</version>
    
    31 31
       </parent>
    
    32 32
     
    
    33 33
       <artifactId>services-topia-validation</artifactId>
    

  • services-topia-validators/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26
       <parent>
    
    27 27
         <groupId>fr.ird.observe</groupId>
    
    28 28
         <artifactId>pom</artifactId>
    
    29
    -    <version>5.3.4-SNAPSHOT</version>
    
    29
    +    <version>5.3.3-SNAPSHOT</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <artifactId>services-topia-validators</artifactId>
    

  • services-topia/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27
       <parent>
    
    28 28
         <groupId>fr.ird.observe</groupId>
    
    29 29
         <artifactId>pom</artifactId>
    
    30
    -    <version>5.3.4-SNAPSHOT</version>
    
    30
    +    <version>5.3.3-SNAPSHOT</version>
    
    31 31
       </parent>
    
    32 32
     
    
    33 33
       <artifactId>services-topia</artifactId>
    

  • services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java
    ... ... @@ -23,9 +23,9 @@ package fr.ird.observe.services.topia.service.actions.synchro.referential.legacy
    23 23
      */
    
    24 24
     
    
    25 25
     import fr.ird.observe.ObserveEntityEnum;
    
    26
    -import fr.ird.observe.entities.referentiel.Gear;
    
    27
    -import fr.ird.observe.entities.referentiel.GearCaracteristic;
    
    28 26
     import fr.ird.observe.entities.referentiel.ObserveReferentialEntity;
    
    27
    +import fr.ird.observe.services.dto.referential.GearCaracteristicDto;
    
    28
    +import fr.ird.observe.services.dto.referential.GearDto;
    
    29 29
     import fr.ird.observe.services.dto.referential.OceanDto;
    
    30 30
     import fr.ird.observe.services.dto.referential.ReferentialDto;
    
    31 31
     import fr.ird.observe.services.dto.referential.ReferentialReference;
    
    ... ... @@ -161,12 +161,12 @@ public class UnidirectionalReferentialSynchronizeLocalServiceTopia extends Obser
    161 161
                         // also remove ocean_species association
    
    162 162
                         result.add(sqlStatementGenerator.generateAssociationSql("ocean_species","ocean", id));
    
    163 163
                     }
    
    164
    -                if (Gear.class.equals(request.getReferentialName())) {
    
    164
    +                if (GearDto.class.equals(request.getReferentialName())) {
    
    165 165
     
    
    166 166
                         // also remove gear_gearcaracteristic association
    
    167 167
                         result.add(sqlStatementGenerator.generateAssociationSql("gear_gearcaracteristic","gear", id));
    
    168 168
                     }
    
    169
    -                if (GearCaracteristic.class.equals(request.getReferentialName())) {
    
    169
    +                if (GearCaracteristicDto.class.equals(request.getReferentialName())) {
    
    170 170
     
    
    171 171
                         // also remove gear_gearcaracteristic association
    
    172 172
                         result.add(sqlStatementGenerator.generateAssociationSql("gear_gearcaracteristic","gearcaracteristic", id));
    

  • services/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27
       <parent>
    
    28 28
         <groupId>fr.ird.observe</groupId>
    
    29 29
         <artifactId>pom</artifactId>
    
    30
    -    <version>5.3.4-SNAPSHOT</version>
    
    30
    +    <version>5.3.3-SNAPSHOT</version>
    
    31 31
       </parent>
    
    32 32
     
    
    33 33
       <artifactId>services</artifactId>
    

  • test/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26
       <parent>
    
    27 27
         <groupId>fr.ird.observe</groupId>
    
    28 28
         <artifactId>pom</artifactId>
    
    29
    -    <version>5.3.4-SNAPSHOT</version>
    
    29
    +    <version>5.3.3-SNAPSHOT</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <artifactId>test</artifactId>
    

  • toolbox-maven-plugin/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27
       <parent>
    
    28 28
         <groupId>fr.ird.observe</groupId>
    
    29 29
         <artifactId>pom</artifactId>
    
    30
    -    <version>5.3.4-SNAPSHOT</version>
    
    30
    +    <version>5.3.3-SNAPSHOT</version>
    
    31 31
       </parent>
    
    32 32
     
    
    33 33
       <artifactId>toolbox-maven-plugin</artifactId>
    

  • topia-extension/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27
       <parent>
    
    28 28
         <groupId>fr.ird.observe</groupId>
    
    29 29
         <artifactId>pom</artifactId>
    
    30
    -    <version>5.3.4-SNAPSHOT</version>
    
    30
    +    <version>5.3.3-SNAPSHOT</version>
    
    31 31
       </parent>
    
    32 32
     
    
    33 33
       <artifactId>topia-extension</artifactId>
    

  • topia-templates-extension/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27
       <parent>
    
    28 28
         <groupId>fr.ird.observe</groupId>
    
    29 29
         <artifactId>pom</artifactId>
    
    30
    -    <version>5.3.4-SNAPSHOT</version>
    
    30
    +    <version>5.3.3-SNAPSHOT</version>
    
    31 31
       </parent>
    
    32 32
     
    
    33 33
       <artifactId>topia-templates-extension</artifactId>