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

Commits:

13 changed files:

Changes:

  • client-configuration/pom.xml
    ... ... @@ -20,14 +20,13 @@
    20 20
       <http://www.gnu.org/licenses/gpl-3.0.html>.
    
    21 21
       #L%
    
    22 22
       -->
    
    23
    -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
    
    24
    -         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    
    23
    +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    
    25 24
       <modelVersion>4.0.0</modelVersion>
    
    26 25
     
    
    27 26
       <parent>
    
    28 27
         <groupId>fr.ird.observe</groupId>
    
    29 28
         <artifactId>ird-observe</artifactId>
    
    30
    -    <version>7.0-RC-18-SNAPSHOT</version>
    
    29
    +    <version>7.0-RC-19-SNAPSHOT</version>
    
    31 30
       </parent>
    
    32 31
     
    
    33 32
       <artifactId>client-configuration</artifactId>
    

  • client/pom.xml
    ... ... @@ -20,14 +20,13 @@
    20 20
       <http://www.gnu.org/licenses/gpl-3.0.html>.
    
    21 21
       #L%
    
    22 22
       -->
    
    23
    -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
    
    24
    -         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    
    23
    +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    
    25 24
       <modelVersion>4.0.0</modelVersion>
    
    26 25
     
    
    27 26
       <parent>
    
    28 27
         <groupId>fr.ird.observe</groupId>
    
    29 28
         <artifactId>ird-observe</artifactId>
    
    30
    -    <version>7.0-RC-18-SNAPSHOT</version>
    
    29
    +    <version>7.0-RC-19-SNAPSHOT</version>
    
    31 30
       </parent>
    
    32 31
     
    
    33 32
       <artifactId>client</artifactId>
    
    ... ... @@ -901,7 +900,7 @@
    901 900
                 <phase>generate-resources</phase>
    
    902 901
                 <configuration>
    
    903 902
                   <target>
    
    904
    -                <copy failonerror="true" overwrite="true" file="../CHANGELOG.md" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md"/>
    
    903
    +                <copy failonerror="true" overwrite="true" file="../CHANGELOG.md" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md" />
    
    905 904
                   </target>
    
    906 905
                 </configuration>
    
    907 906
                 <goals>
    

  • dto/pom.xml
    ... ... @@ -21,14 +21,13 @@
    21 21
       #L%
    
    22 22
       -->
    
    23 23
     
    
    24
    -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
    
    25
    -         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    
    24
    +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    
    26 25
       <modelVersion>4.0.0</modelVersion>
    
    27 26
     
    
    28 27
       <parent>
    
    29 28
         <groupId>fr.ird.observe</groupId>
    
    30 29
         <artifactId>ird-observe</artifactId>
    
    31
    -    <version>7.0-RC-18-SNAPSHOT</version>
    
    30
    +    <version>7.0-RC-19-SNAPSHOT</version>
    
    32 31
       </parent>
    
    33 32
     
    
    34 33
       <artifactId>dto</artifactId>
    
    ... ... @@ -224,10 +223,10 @@
    224 223
                   <target>
    
    225 224
                     <copy failonerror="true" overwrite="true" filtering="true" todir="${project.build.directory}/models">
    
    226 225
                       <filterset>
    
    227
    -                    <filter value="${observe.model.version}" token="observe.model.version"/>
    
    226
    +                    <filter value="${observe.model.version}" token="observe.model.version" />
    
    228 227
                       </filterset>
    
    229 228
                       <fileset dir="${basedir}/src/main/models">
    
    230
    -                    <include name="*.model"/>
    
    229
    +                    <include name="*.model" />
    
    231 230
                       </fileset>
    
    232 231
                     </copy>
    
    233 232
                   </target>
    

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

  • persistence/pom.xml
    ... ... @@ -20,14 +20,13 @@
    20 20
       <http://www.gnu.org/licenses/gpl-3.0.html>.
    
    21 21
       #L%
    
    22 22
       -->
    
    23
    -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
    
    24
    -         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    
    23
    +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    
    25 24
       <modelVersion>4.0.0</modelVersion>
    
    26 25
     
    
    27 26
       <parent>
    
    28 27
         <groupId>fr.ird.observe</groupId>
    
    29 28
         <artifactId>ird-observe</artifactId>
    
    30
    -    <version>7.0-RC-18-SNAPSHOT</version>
    
    29
    +    <version>7.0-RC-19-SNAPSHOT</version>
    
    31 30
       </parent>
    
    32 31
     
    
    33 32
       <artifactId>persistence</artifactId>
    
    ... ... @@ -236,10 +235,10 @@
    236 235
                   <target>
    
    237 236
                     <copy failonerror="true" overwrite="true" filtering="true" todir="${project.build.directory}/models">
    
    238 237
                       <filterset>
    
    239
    -                    <filter value="${observe.model.version}" token="observe.model.version"/>
    
    238
    +                    <filter value="${observe.model.version}" token="observe.model.version" />
    
    240 239
                       </filterset>
    
    241 240
                       <fileset dir="${basedir}/src/main/models">
    
    242
    -                    <include name="*.model"/>
    
    241
    +                    <include name="*.model" />
    
    243 242
                       </fileset>
    
    244 243
                     </copy>
    
    245 244
                   </target>
    

  • pom.xml
    ... ... @@ -20,8 +20,7 @@
    20 20
       <http://www.gnu.org/licenses/gpl-3.0.html>.
    
    21 21
       #L%
    
    22 22
       -->
    
    23
    -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
    
    24
    -         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    
    23
    +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    
    25 24
       <modelVersion>4.0.0</modelVersion>
    
    26 25
     
    
    27 26
       <parent>
    
    ... ... @@ -32,7 +31,7 @@
    32 31
     
    
    33 32
       <groupId>fr.ird.observe</groupId>
    
    34 33
       <artifactId>ird-observe</artifactId>
    
    35
    -  <version>7.0-RC-18-SNAPSHOT</version>
    
    34
    +  <version>7.0-RC-19-SNAPSHOT</version>
    
    36 35
       <packaging>pom</packaging>
    
    37 36
     
    
    38 37
       <name>ObServe :: Pom</name>
    

  • server-configuration/pom.xml
    ... ... @@ -20,14 +20,13 @@
    20 20
       <http://www.gnu.org/licenses/gpl-3.0.html>.
    
    21 21
       #L%
    
    22 22
       -->
    
    23
    -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
    
    24
    -         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    
    23
    +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    
    25 24
       <modelVersion>4.0.0</modelVersion>
    
    26 25
     
    
    27 26
       <parent>
    
    28 27
         <groupId>fr.ird.observe</groupId>
    
    29 28
         <artifactId>ird-observe</artifactId>
    
    30
    -    <version>7.0-RC-18-SNAPSHOT</version>
    
    29
    +    <version>7.0-RC-19-SNAPSHOT</version>
    
    31 30
       </parent>
    
    32 31
     
    
    33 32
       <artifactId>server-configuration</artifactId>
    

  • server/pom.xml
    ... ... @@ -21,14 +21,13 @@
    21 21
       #L%
    
    22 22
       -->
    
    23 23
     
    
    24
    -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
    
    25
    -         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    
    24
    +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    
    26 25
       <modelVersion>4.0.0</modelVersion>
    
    27 26
     
    
    28 27
       <parent>
    
    29 28
         <groupId>fr.ird.observe</groupId>
    
    30 29
         <artifactId>ird-observe</artifactId>
    
    31
    -    <version>7.0-RC-18-SNAPSHOT</version>
    
    30
    +    <version>7.0-RC-19-SNAPSHOT</version>
    
    32 31
       </parent>
    
    33 32
     
    
    34 33
       <artifactId>server</artifactId>
    

  • services-client/pom.xml
    ... ... @@ -21,14 +21,13 @@
    21 21
       #L%
    
    22 22
       -->
    
    23 23
     
    
    24
    -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
    
    25
    -         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    
    24
    +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    
    26 25
       <modelVersion>4.0.0</modelVersion>
    
    27 26
     
    
    28 27
       <parent>
    
    29 28
         <groupId>fr.ird.observe</groupId>
    
    30 29
         <artifactId>ird-observe</artifactId>
    
    31
    -    <version>7.0-RC-18-SNAPSHOT</version>
    
    30
    +    <version>7.0-RC-19-SNAPSHOT</version>
    
    32 31
       </parent>
    
    33 32
     
    
    34 33
       <artifactId>services-client</artifactId>
    

  • services-local/pom.xml
    ... ... @@ -21,14 +21,13 @@
    21 21
       #L%
    
    22 22
       -->
    
    23 23
     
    
    24
    -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
    
    25
    -         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    
    24
    +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    
    26 25
       <modelVersion>4.0.0</modelVersion>
    
    27 26
     
    
    28 27
       <parent>
    
    29 28
         <groupId>fr.ird.observe</groupId>
    
    30 29
         <artifactId>ird-observe</artifactId>
    
    31
    -    <version>7.0-RC-18-SNAPSHOT</version>
    
    30
    +    <version>7.0-RC-19-SNAPSHOT</version>
    
    32 31
       </parent>
    
    33 32
     
    
    34 33
       <artifactId>services-local</artifactId>
    

  • services/pom.xml
    ... ... @@ -21,14 +21,13 @@
    21 21
       #L%
    
    22 22
       -->
    
    23 23
     
    
    24
    -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
    
    25
    -         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    
    24
    +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    
    26 25
       <modelVersion>4.0.0</modelVersion>
    
    27 26
     
    
    28 27
       <parent>
    
    29 28
         <groupId>fr.ird.observe</groupId>
    
    30 29
         <artifactId>ird-observe</artifactId>
    
    31
    -    <version>7.0-RC-18-SNAPSHOT</version>
    
    30
    +    <version>7.0-RC-19-SNAPSHOT</version>
    
    32 31
       </parent>
    
    33 32
     
    
    34 33
       <artifactId>services</artifactId>
    

  • test/pom.xml
    ... ... @@ -20,14 +20,13 @@
    20 20
       <http://www.gnu.org/licenses/gpl-3.0.html>.
    
    21 21
       #L%
    
    22 22
       -->
    
    23
    -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
    
    24
    -         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    
    23
    +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    
    25 24
       <modelVersion>4.0.0</modelVersion>
    
    26 25
     
    
    27 26
       <parent>
    
    28 27
         <groupId>fr.ird.observe</groupId>
    
    29 28
         <artifactId>ird-observe</artifactId>
    
    30
    -    <version>7.0-RC-18-SNAPSHOT</version>
    
    29
    +    <version>7.0-RC-19-SNAPSHOT</version>
    
    31 30
       </parent>
    
    32 31
     
    
    33 32
       <artifactId>test</artifactId>
    

  • validation/pom.xml
    ... ... @@ -20,14 +20,13 @@
    20 20
       <http://www.gnu.org/licenses/gpl-3.0.html>.
    
    21 21
       #L%
    
    22 22
       -->
    
    23
    -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
    
    24
    -         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    
    23
    +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    
    25 24
       <modelVersion>4.0.0</modelVersion>
    
    26 25
     
    
    27 26
       <parent>
    
    28 27
         <groupId>fr.ird.observe</groupId>
    
    29 28
         <artifactId>ird-observe</artifactId>
    
    30
    -    <version>7.0-RC-18-SNAPSHOT</version>
    
    29
    +    <version>7.0-RC-19-SNAPSHOT</version>
    
    31 30
       </parent>
    
    32 31
     
    
    33 32
       <artifactId>validation</artifactId>