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

Commits:

14 changed files:

Changes:

  • client-configuration/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-13-SNAPSHOT</version>
    
    29
    +    <version>7.0-RC-12-SNAPSHOT</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <artifactId>client-configuration</artifactId>
    

  • client/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-13-SNAPSHOT</version>
    
    29
    +    <version>7.0-RC-12-SNAPSHOT</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <artifactId>client</artifactId>
    

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

  • 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-13-SNAPSHOT</version>
    
    29
    +    <version>7.0-RC-12-SNAPSHOT</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <artifactId>observe</artifactId>
    

  • persistence/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-13-SNAPSHOT</version>
    
    29
    +    <version>7.0-RC-12-SNAPSHOT</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <artifactId>persistence</artifactId>
    

  • persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_2.java
    ... ... @@ -103,7 +103,7 @@ public class DataSourceMigrationForVersion_7_2 extends AbstractObserveMigrationC
    103 103
                 });
    
    104 104
                 if (withoutWhaleSharkObservedSystem) {
    
    105 105
                     queries.add("INSERT INTO observe_seine.activity_observedsystem(activity, observedSystem) VALUES('" + activityId + "', 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#0#1.1');");
    
    106
    -                queries.add("UPDATE observe_seine.set s SET s.schoolType = 1 WHERE s.topiaId = (SELECT a.set FROM observe_seine.activity WHERE a.topiaId = '" + activityId + "');");
    
    106
    +                queries.add("UPDATE observe_seine.set SET schoolType = 1 WHERE topiaId = (SELECT a.set FROM observe_seine.activity a WHERE a.topiaId = '" + activityId + "');");
    
    107 107
                 }
    
    108 108
             }
    
    109 109
         }
    

  • pom.xml
    ... ... @@ -31,7 +31,7 @@
    31 31
     
    
    32 32
       <groupId>fr.ird.observe</groupId>
    
    33 33
       <artifactId>ird-observe</artifactId>
    
    34
    -  <version>7.0-RC-13-SNAPSHOT</version>
    
    34
    +  <version>7.0-RC-12-SNAPSHOT</version>
    
    35 35
       <packaging>pom</packaging>
    
    36 36
     
    
    37 37
       <name>ObServe :: Pom</name>
    

  • server-configuration/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-13-SNAPSHOT</version>
    
    29
    +    <version>7.0-RC-12-SNAPSHOT</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <artifactId>server-configuration</artifactId>
    

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

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

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

  • services/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27
       <parent>
    
    28 28
         <groupId>fr.ird.observe</groupId>
    
    29 29
         <artifactId>ird-observe</artifactId>
    
    30
    -    <version>7.0-RC-13-SNAPSHOT</version>
    
    30
    +    <version>7.0-RC-12-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>ird-observe</artifactId>
    
    29
    -    <version>7.0-RC-13-SNAPSHOT</version>
    
    29
    +    <version>7.0-RC-12-SNAPSHOT</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <artifactId>test</artifactId>
    

  • validation/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-13-SNAPSHOT</version>
    
    29
    +    <version>7.0-RC-12-SNAPSHOT</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <artifactId>validation</artifactId>