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

Commits:

25 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.5.3-SNAPSHOT</version>
    29 
    +    <version>7.6.0-SNAPSHOT</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>client-configuration</artifactId>
    ... ... @@ -90,7 +90,10 @@
    90 90 
           <groupId>com.google.code.gson</groupId>
    91 91 
           <artifactId>gson</artifactId>
    92 92 
         </dependency>
    93 
    -
    93 
    +    <dependency>
    94 
    +      <groupId>com.google.auto.service</groupId>
    95 
    +      <artifactId>auto-service-annotations</artifactId>
    96 
    +    </dependency>
    94 97 
         <dependency>
    95 98 
           <groupId>com.google.auto.service</groupId>
    96 99 
           <artifactId>auto-service</artifactId>

  • client-core/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.5.3-SNAPSHOT</version>
    29 
    +    <version>7.6.0-SNAPSHOT</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>client-core</artifactId>
    ... ... @@ -488,6 +488,10 @@
    488 488 
           <groupId>com.google.code.gson</groupId>
    489 489 
           <artifactId>gson</artifactId>
    490 490 
         </dependency>
    491 
    +    <dependency>
    492 
    +      <groupId>com.google.auto.service</groupId>
    493 
    +      <artifactId>auto-service-annotations</artifactId>
    494 
    +    </dependency>
    491 495
    492 496 
         <!-- Nuiton -->
    493 497 
         <dependency>

  • client-runner/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.5.3-SNAPSHOT</version>
    29 
    +    <version>7.6.0-SNAPSHOT</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>client-runner</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.5.3-SNAPSHOT</version>
    30 
    +    <version>7.6.0-SNAPSHOT</version>
    31 31 
       </parent>
    32 32
    33 33 
       <artifactId>dto</artifactId>
    ... ... @@ -107,6 +107,10 @@
    107 107 
           <groupId>com.google.guava</groupId>
    108 108 
           <artifactId>guava</artifactId>
    109 109 
         </dependency>
    110 
    +    <dependency>
    111 
    +      <groupId>com.google.auto.service</groupId>
    112 
    +      <artifactId>auto-service-annotations</artifactId>
    113 
    +    </dependency>
    110 114 
         <dependency>
    111 115 
           <groupId>com.google.auto.service</groupId>
    112 116 
           <artifactId>auto-service</artifactId>

  • observe-i18n/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.5.3-SNAPSHOT</version>
    29 
    +    <version>7.6.0-SNAPSHOT</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>observe-i18n</artifactId>
    ... ... @@ -37,7 +37,10 @@
    37 37 
         <i18n.artifactId>observe</i18n.artifactId>
    38 38 
       </properties>
    39 39 
       <dependencies>
    40 
    -
    40 
    +    <dependency>
    41 
    +      <groupId>com.google.auto.service</groupId>
    42 
    +      <artifactId>auto-service-annotations</artifactId>
    43 
    +    </dependency>
    41 44 
         <dependency>
    42 45 
           <groupId>com.google.auto.service</groupId>
    43 46 
           <artifactId>auto-service</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.5.3-SNAPSHOT</version>
    29 
    +    <version>7.6.0-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.5.3-SNAPSHOT</version>
    29 
    +    <version>7.6.0-SNAPSHOT</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>persistence</artifactId>
    ... ... @@ -113,6 +113,10 @@
    113 113 
           <groupId>com.google.guava</groupId>
    114 114 
           <artifactId>guava</artifactId>
    115 115 
         </dependency>
    116 
    +    <dependency>
    117 
    +      <groupId>com.google.auto.service</groupId>
    118 
    +      <artifactId>auto-service-annotations</artifactId>
    119 
    +    </dependency>
    116 120 
         <dependency>
    117 121 
           <groupId>com.google.auto.service</groupId>
    118 122 
           <artifactId>auto-service</artifactId>

  • persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_5_1.java → persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_6.java
    ... ... @@ -40,10 +40,10 @@ import java.util.Set;
    40 40 
      * @since 7.5.1
    41 41 
      */
    42 42 
     @AutoService(MigrationVersionResource.class)
    43 
    -public class DataSourceMigrationForVersion_7_5_1 extends MigrationVersionResource {
    43 
    +public class DataSourceMigrationForVersion_7_6 extends MigrationVersionResource {
    44 44
    45 
    -    public DataSourceMigrationForVersion_7_5_1() {
    46 
    -        super(Versions.valueOf("7.5.1"));
    45 
    +    public DataSourceMigrationForVersion_7_6() {
    46 
    +        super(Versions.valueOf("7.6"));
    47 47 
         }
    48 48
    49 49 
         @Override

  • pom.xml
    ... ... @@ -26,12 +26,12 @@
    26 26 
       <parent>
    27 27 
         <groupId>io.ultreia.maven</groupId>
    28 28 
         <artifactId>pom</artifactId>
    29 
    -    <version>2020.25</version>
    29 
    +    <version>2020.27</version>
    30 30 
       </parent>
    31 31
    32 32 
       <groupId>fr.ird.observe</groupId>
    33 33 
       <artifactId>ird-observe</artifactId>
    34 
    -  <version>7.5.3-SNAPSHOT</version>
    34 
    +  <version>7.6.0-SNAPSHOT</version>
    35 35 
       <packaging>pom</packaging>
    36 36
    37 37 
       <name>ObServe :: Pom</name>
    ... ... @@ -149,7 +149,7 @@
    149 149 
         <devMode>true</devMode>
    150 150
    151 151 
         <!--persistence model version-->
    152 
    -    <observe.model.version>7.5.1</observe.model.version>
    152 
    +    <observe.model.version>7.6</observe.model.version>
    153 153
    154 154 
         <!-- build timestamp configuration -->
    155 155 
         <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>

  • 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.5.3-SNAPSHOT</version>
    29 
    +    <version>7.6.0-SNAPSHOT</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>server-configuration</artifactId>
    ... ... @@ -75,6 +75,10 @@
    75 75 
           <groupId>com.google.guava</groupId>
    76 76 
           <artifactId>guava</artifactId>
    77 77 
         </dependency>
    78 
    +    <dependency>
    79 
    +      <groupId>com.google.auto.service</groupId>
    80 
    +      <artifactId>auto-service-annotations</artifactId>
    81 
    +    </dependency>
    78 82
    79 83 
         <!-- Nuiton -->
    80 84 
         <dependency>
    ... ... @@ -115,7 +119,7 @@
    115 119 
         <dependency>
    116 120 
           <groupId>fr.ird.observe</groupId>
    117 121 
           <artifactId>services</artifactId>
    118 
    -      <version>7.5.3-SNAPSHOT</version>
    122 
    +      <version>7.6.0-SNAPSHOT</version>
    119 123 
           <scope>compile</scope>
    120 124 
         </dependency>
    121 125

  • server-core/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.5.3-SNAPSHOT</version>
    30 
    +    <version>7.6.0-SNAPSHOT</version>
    31 31 
       </parent>
    32 32
    33 33 
       <artifactId>server-core</artifactId>

  • server-runner/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.5.3-SNAPSHOT</version>
    30 
    +    <version>7.6.0-SNAPSHOT</version>
    31 31 
       </parent>
    32 32
    33 33 
       <artifactId>server-runner</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.5.3-SNAPSHOT</version>
    30 
    +    <version>7.6.0-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.5.3-SNAPSHOT</version>
    30 
    +    <version>7.6.0-SNAPSHOT</version>
    31 31 
       </parent>
    32 32
    33 33 
       <artifactId>services-local</artifactId>
    ... ... @@ -101,10 +101,7 @@
    101 101 
         <dependency>
    102 102 
           <groupId>org.apache.logging.log4j</groupId>
    103 103 
           <artifactId>log4j-api</artifactId>
    104 
    -    </dependency>    <!--<dependency>-->
    105 
    -    <!--<groupId>commons-io</groupId>-->
    106 
    -    <!--<artifactId>commons-io</artifactId>-->
    107 
    -    <!--</dependency>-->
    104 
    +    </dependency>
    108 105 
         <dependency>
    109 106 
           <groupId>org.apache.commons</groupId>
    110 107 
           <artifactId>commons-collections4</artifactId>
    ... ... @@ -117,7 +114,10 @@
    117 114 
           <groupId>com.google.guava</groupId>
    118 115 
           <artifactId>guava</artifactId>
    119 116 
         </dependency>
    120 
    -
    117 
    +    <dependency>
    118 
    +      <groupId>com.google.auto.service</groupId>
    119 
    +      <artifactId>auto-service-annotations</artifactId>
    120 
    +    </dependency>
    121 121 
         <dependency>
    122 122 
           <groupId>io.ultreia.java4all.http</groupId>
    123 123 
           <artifactId>http-api</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.5.3-SNAPSHOT</version>
    30 
    +    <version>7.6.0-SNAPSHOT</version>
    31 31 
       </parent>
    32 32
    33 33 
       <artifactId>services</artifactId>
    ... ... @@ -112,7 +112,10 @@
    112 112 
           <groupId>com.google.guava</groupId>
    113 113 
           <artifactId>guava</artifactId>
    114 114 
         </dependency>
    115 
    -
    115 
    +    <dependency>
    116 
    +      <groupId>com.google.auto.service</groupId>
    117 
    +      <artifactId>auto-service-annotations</artifactId>
    118 
    +    </dependency>
    116 119 
         <dependency>
    117 120 
           <groupId>com.google.code.gson</groupId>
    118 121 
           <artifactId>gson</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.5.3-SNAPSHOT</version>
    29 
    +    <version>7.6.0-SNAPSHOT</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>test</artifactId>

  • test/src/main/resources/db/7.5.1/dataForTestLongline.sql.gz deleted
    No preview for this file type
  • test/src/main/resources/db/7.5.1/dataForTestSeine.sql.gz deleted
    No preview for this file type
  • test/src/main/resources/db/7.5.1/referentiel.sql.gz deleted
    No preview for this file type
  • test/src/main/resources/db/7.6/dataForTestLongline.sql.gz
    No preview for this file type
  • test/src/main/resources/db/7.6/dataForTestSeine.sql.gz
    No preview for this file type
  • test/src/main/resources/db/7.5.1/empty_h2.sql.gz → test/src/main/resources/db/7.6/empty_h2.sql.gz
    No preview for this file type
  • test/src/main/resources/db/7.5.1/empty_pg.sql.gz → test/src/main/resources/db/7.6/empty_pg.sql.gz
    No preview for this file type
  • test/src/main/resources/db/7.6/referentiel.sql.gz
    No preview for this file type
  • 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.5.3-SNAPSHOT</version>
    29 
    +    <version>7.6.0-SNAPSHOT</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>validation</artifactId>
    ... ... @@ -75,6 +75,10 @@
    75 75 
           <groupId>com.google.guava</groupId>
    76 76 
           <artifactId>guava</artifactId>
    77 77 
         </dependency>
    78 
    +    <dependency>
    79 
    +      <groupId>com.google.auto.service</groupId>
    80 
    +      <artifactId>auto-service-annotations</artifactId>
    81 
    +    </dependency>
    78 82
    79 83 
         <!-- provided dependencies -->
    80 84 
         <dependency>

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.