Tony CHEMIT pushed to branch release/7.6.13 at ultreiaio / ird-observe

Commits:

23 changed files:

Changes:

  • client-configuration/pom.xml
    ... ... @@ -24,7 +24,7 @@
    24 24
       <parent>
    
    25 25
         <groupId>fr.ird.observe</groupId>
    
    26 26
         <artifactId>ird-observe</artifactId>
    
    27
    -    <version>7.6.13-SNAPSHOT</version>
    
    27
    +    <version>7.6.13</version>
    
    28 28
       </parent>
    
    29 29
     
    
    30 30
       <artifactId>client-configuration</artifactId>
    

  • client-core/pom.xml
    ... ... @@ -24,7 +24,7 @@
    24 24
       <parent>
    
    25 25
         <groupId>fr.ird.observe</groupId>
    
    26 26
         <artifactId>ird-observe</artifactId>
    
    27
    -    <version>7.6.13-SNAPSHOT</version>
    
    27
    +    <version>7.6.13</version>
    
    28 28
       </parent>
    
    29 29
     
    
    30 30
       <artifactId>client-core</artifactId>
    

  • client-runner/pom.xml
    ... ... @@ -24,7 +24,7 @@
    24 24
       <parent>
    
    25 25
         <groupId>fr.ird.observe</groupId>
    
    26 26
         <artifactId>ird-observe</artifactId>
    
    27
    -    <version>7.6.13-SNAPSHOT</version>
    
    27
    +    <version>7.6.13</version>
    
    28 28
       </parent>
    
    29 29
     
    
    30 30
       <artifactId>client-runner</artifactId>
    

  • common-dto/pom.xml
    ... ... @@ -25,7 +25,7 @@
    25 25
       <parent>
    
    26 26
         <groupId>fr.ird.observe</groupId>
    
    27 27
         <artifactId>ird-observe</artifactId>
    
    28
    -    <version>7.6.13-SNAPSHOT</version>
    
    28
    +    <version>7.6.13</version>
    
    29 29
       </parent>
    
    30 30
     
    
    31 31
       <groupId>fr.ird.observe.toolkit</groupId>
    

  • common-persistence/pom.xml
    ... ... @@ -25,7 +25,7 @@
    25 25
       <parent>
    
    26 26
         <groupId>fr.ird.observe</groupId>
    
    27 27
         <artifactId>ird-observe</artifactId>
    
    28
    -    <version>7.6.13-SNAPSHOT</version>
    
    28
    +    <version>7.6.13</version>
    
    29 29
       </parent>
    
    30 30
     
    
    31 31
       <groupId>fr.ird.observe.toolkit</groupId>
    

  • common-service/pom.xml
    ... ... @@ -25,7 +25,7 @@
    25 25
       <parent>
    
    26 26
         <groupId>fr.ird.observe</groupId>
    
    27 27
         <artifactId>ird-observe</artifactId>
    
    28
    -    <version>7.6.13-SNAPSHOT</version>
    
    28
    +    <version>7.6.13</version>
    
    29 29
       </parent>
    
    30 30
     
    
    31 31
       <groupId>fr.ird.observe.toolkit</groupId>
    

  • common-validation/pom.xml
    ... ... @@ -25,7 +25,7 @@
    25 25
       <parent>
    
    26 26
         <groupId>fr.ird.observe</groupId>
    
    27 27
         <artifactId>ird-observe</artifactId>
    
    28
    -    <version>7.6.13-SNAPSHOT</version>
    
    28
    +    <version>7.6.13</version>
    
    29 29
       </parent>
    
    30 30
     
    
    31 31
       <groupId>fr.ird.observe.toolkit</groupId>
    

  • common-validation/src/main/java/fr/ird/observe/validation/validators/QuadrantFieldDtoValidator.java
    ... ... @@ -49,7 +49,7 @@ public class QuadrantFieldDtoValidator extends FieldValidatorSupport {
    49 49
                 throw new ValidationException("No parameter 'fieldName' filled");
    
    50 50
             }
    
    51 51
     
    
    52
    -        ReferentialDtoReference ocean = (ReferentialDtoReference) getFieldValue(this.ocean, object);
    
    52
    +        ReferentialDtoReference<?,?> ocean = (ReferentialDtoReference<?, ?>) getFieldValue(this.ocean, object);
    
    53 53
             if (ocean == null) {
    
    54 54
                 throw new ValidationException("could not find ocean named: " + this.ocean);
    
    55 55
             }
    
    ... ... @@ -59,13 +59,13 @@ public class QuadrantFieldDtoValidator extends FieldValidatorSupport {
    59 59
                 return;
    
    60 60
             }
    
    61 61
     
    
    62
    -        int code = ocean.get(ReferentialDtoReference.PROPERTY_CODE);
    
    62
    +        String code = ocean.get(ReferentialDtoReference.PROPERTY_CODE);
    
    63 63
             boolean valid;
    
    64 64
             switch (code) {
    
    65
    -            case 1: // Atlantic
    
    65
    +            case "1": // Atlantic
    
    66 66
                     valid= quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4;
    
    67 67
                     break;
    
    68
    -            case 2: // Indian
    
    68
    +            case "2": // Indian
    
    69 69
                     valid = quadrant == 1 || quadrant == 2;
    
    70 70
                     break;
    
    71 71
                 default:
    

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

  • observe-i18n/pom.xml
    ... ... @@ -24,7 +24,7 @@
    24 24
       <parent>
    
    25 25
         <groupId>fr.ird.observe</groupId>
    
    26 26
         <artifactId>ird-observe</artifactId>
    
    27
    -    <version>7.6.13-SNAPSHOT</version>
    
    27
    +    <version>7.6.13</version>
    
    28 28
       </parent>
    
    29 29
     
    
    30 30
       <artifactId>observe-i18n</artifactId>
    

  • observe/pom.xml
    ... ... @@ -24,7 +24,7 @@
    24 24
       <parent>
    
    25 25
         <groupId>fr.ird.observe</groupId>
    
    26 26
         <artifactId>ird-observe</artifactId>
    
    27
    -    <version>7.6.13-SNAPSHOT</version>
    
    27
    +    <version>7.6.13</version>
    
    28 28
       </parent>
    
    29 29
     
    
    30 30
       <artifactId>observe</artifactId>
    

  • persistence/pom.xml
    ... ... @@ -24,7 +24,7 @@
    24 24
       <parent>
    
    25 25
         <groupId>fr.ird.observe</groupId>
    
    26 26
         <artifactId>ird-observe</artifactId>
    
    27
    -    <version>7.6.13-SNAPSHOT</version>
    
    27
    +    <version>7.6.13</version>
    
    28 28
       </parent>
    
    29 29
     
    
    30 30
       <artifactId>persistence</artifactId>
    

  • pom.xml
    ... ... @@ -29,7 +29,7 @@
    29 29
     
    
    30 30
       <groupId>fr.ird.observe</groupId>
    
    31 31
       <artifactId>ird-observe</artifactId>
    
    32
    -  <version>7.6.13-SNAPSHOT</version>
    
    32
    +  <version>7.6.13</version>
    
    33 33
       <packaging>pom</packaging>
    
    34 34
     
    
    35 35
       <name>ObServe :: Pom</name>
    

  • server-configuration/pom.xml
    ... ... @@ -24,7 +24,7 @@
    24 24
       <parent>
    
    25 25
         <groupId>fr.ird.observe</groupId>
    
    26 26
         <artifactId>ird-observe</artifactId>
    
    27
    -    <version>7.6.13-SNAPSHOT</version>
    
    27
    +    <version>7.6.13</version>
    
    28 28
       </parent>
    
    29 29
     
    
    30 30
       <artifactId>server-configuration</artifactId>
    
    ... ... @@ -118,7 +118,7 @@
    118 118
         <dependency>
    
    119 119
           <groupId>fr.ird.observe</groupId>
    
    120 120
           <artifactId>services</artifactId>
    
    121
    -      <version>7.6.13-SNAPSHOT</version>
    
    121
    +      <version>7.6.13</version>
    
    122 122
           <scope>compile</scope>
    
    123 123
         </dependency>
    
    124 124
     
    

  • server-core/pom.xml
    ... ... @@ -25,7 +25,7 @@
    25 25
       <parent>
    
    26 26
         <groupId>fr.ird.observe</groupId>
    
    27 27
         <artifactId>ird-observe</artifactId>
    
    28
    -    <version>7.6.13-SNAPSHOT</version>
    
    28
    +    <version>7.6.13</version>
    
    29 29
       </parent>
    
    30 30
     
    
    31 31
       <artifactId>server-core</artifactId>
    

  • server-runner/pom.xml
    ... ... @@ -25,7 +25,7 @@
    25 25
       <parent>
    
    26 26
         <groupId>fr.ird.observe</groupId>
    
    27 27
         <artifactId>ird-observe</artifactId>
    
    28
    -    <version>7.6.13-SNAPSHOT</version>
    
    28
    +    <version>7.6.13</version>
    
    29 29
       </parent>
    
    30 30
     
    
    31 31
       <artifactId>server-runner</artifactId>
    

  • services-client/pom.xml
    ... ... @@ -25,7 +25,7 @@
    25 25
       <parent>
    
    26 26
         <groupId>fr.ird.observe</groupId>
    
    27 27
         <artifactId>ird-observe</artifactId>
    
    28
    -    <version>7.6.13-SNAPSHOT</version>
    
    28
    +    <version>7.6.13</version>
    
    29 29
       </parent>
    
    30 30
     
    
    31 31
       <artifactId>services-client</artifactId>
    

  • services-local/pom.xml
    ... ... @@ -25,7 +25,7 @@
    25 25
       <parent>
    
    26 26
         <groupId>fr.ird.observe</groupId>
    
    27 27
         <artifactId>ird-observe</artifactId>
    
    28
    -    <version>7.6.13-SNAPSHOT</version>
    
    28
    +    <version>7.6.13</version>
    
    29 29
       </parent>
    
    30 30
     
    
    31 31
       <artifactId>services-local</artifactId>
    

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

  • templates/pom.xml
    ... ... @@ -24,7 +24,7 @@
    24 24
       <parent>
    
    25 25
         <groupId>fr.ird.observe</groupId>
    
    26 26
         <artifactId>ird-observe</artifactId>
    
    27
    -    <version>7.6.13-SNAPSHOT</version>
    
    27
    +    <version>7.6.13</version>
    
    28 28
       </parent>
    
    29 29
     
    
    30 30
       <groupId>fr.ird.observe.toolkit</groupId>
    

  • test/pom.xml
    ... ... @@ -24,7 +24,7 @@
    24 24
       <parent>
    
    25 25
         <groupId>fr.ird.observe</groupId>
    
    26 26
         <artifactId>ird-observe</artifactId>
    
    27
    -    <version>7.6.13-SNAPSHOT</version>
    
    27
    +    <version>7.6.13</version>
    
    28 28
       </parent>
    
    29 29
     
    
    30 30
       <artifactId>test</artifactId>
    

  • toolbox-maven-plugin/pom.xml
    ... ... @@ -24,7 +24,7 @@
    24 24
       <parent>
    
    25 25
         <groupId>fr.ird.observe</groupId>
    
    26 26
         <artifactId>ird-observe</artifactId>
    
    27
    -    <version>7.6.13-SNAPSHOT</version>
    
    27
    +    <version>7.6.13</version>
    
    28 28
       </parent>
    
    29 29
     
    
    30 30
       <groupId>fr.ird.observe.toolkit</groupId>
    

  • validation/pom.xml
    ... ... @@ -24,7 +24,7 @@
    24 24
       <parent>
    
    25 25
         <groupId>fr.ird.observe</groupId>
    
    26 26
         <artifactId>ird-observe</artifactId>
    
    27
    -    <version>7.6.13-SNAPSHOT</version>
    
    27
    +    <version>7.6.13</version>
    
    28 28
       </parent>
    
    29 29
     
    
    30 30
       <artifactId>validation</artifactId>