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

Commits:

26 changed files:

Changes:

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

  • application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties
    ... ... @@ -34,6 +34,7 @@ observe.config.h2.can.migrate.description=Autoriser la mise à jour des bases lo
    34 34 
     observe.config.h2.login.description=L'identifiant H2
    35 35 
     observe.config.h2.password.description=Le mot de passe H2
    36 36 
     observe.config.h2.serverPort.description=Port du serveur H2
    37 
    +observe.config.httpTimeout.description=Maximum delay in millisecondes to http connections
    37 38 
     observe.config.importDirectory.description=Répertoire où chercher les imports
    38 39 
     observe.config.logConfigurationFile.description=Fichier de configuration des logs
    39 40 
     observe.config.map.background.description=Couleur du fond de carte
    ... ... @@ -61,10 +62,12 @@ observe.config.obstuna.password.description=Le mot de passe pour se connecter à
    61 62 
     observe.config.obstuna.url.description=L’URL de connexion à la base Obstuna
    62 63 
     observe.config.obstuna.useSsl.description=Drapeau pour permettre l'utilisation du mode ssl pour la connexion à Obstuna
    63 64 
     observe.config.pg.can.migrate.description=Autoriser la mise à jour des bases distantes (il faut être propriétaire de la base)
    65 
    +observe.config.remoteDataSourceConfigurations.description=connexions à des sources distantes
    64 66 
     observe.config.server.dataBaseName.description=Le nom optionnel de la base cible sur le serveur
    65 67 
     observe.config.server.login.description=Identifiant de l'utilisateur
    66 68 
     observe.config.server.password.description=Le mot de passe de l'utilisateur
    67 69 
     observe.config.server.url.description=L’URL du serveur
    70 
    +observe.config.serverDataSourceConfigurations.description=connexions à des serveursdistantes
    68 71 
     observe.config.showMigrationProgression=Afficher dans les logs la progression de la mise à jour d'une base
    69 72 
     observe.config.showMigrationSql=Afficher dans les logs les requêtes jouées lors de la mise à jour d'une base
    70 73 
     observe.config.showSql=Afficher dans les logs toutes les requêtes sql executées

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

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

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

  • application-swing/pom.xml
    ... ... @@ -3,7 +3,7 @@
    3 3 
       #%L
    4 4 
       ObServe :: Application Swing
    5 5 
       %%
    6 
    -  Copyright (C) 2008 - 2017 IRD, Code Lutin, Tony Chemit
    6 
    +  Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
    7 7 
       %%
    8 8 
       This program is free software: you can redistribute it and/or modify
    9 9 
       it under the terms of the GNU General Public License as
    ... ... @@ -25,7 +25,7 @@
    25 25
    26 26 
       <parent>
    27 27 
         <groupId>fr.ird.observe</groupId>
    28 
    -    <artifactId>observe</artifactId>
    28 
    +    <artifactId>pom</artifactId>
    29 29 
         <version>6.0-SNAPSHOT</version>
    30 30 
       </parent>
    31 31
    ... ... @@ -35,6 +35,7 @@
    35 35 
       <description>ObServe Application Swing</description>
    36 36
    37 37 
       <properties>
    38 
    +    <maven.deploy.skip>true</maven.deploy.skip>
    38 39
    39 40 
         <!-- jaxx configuration -->
    40 41 
         <jaxx.validatorFactoryFQN>
    ... ... @@ -47,7 +48,7 @@
    47 48 
         <!-- main class in JAR -->
    48 49 
         <maven.jar.main.class>fr.ird.observe.application.swing.RunObserve</maven.jar.main.class>
    49 50
    50 
    -    <applicationName>${projectId}</applicationName>
    51 
    +    <applicationName>observe</applicationName>
    51 52
    52 53 
         <i18n.bundleOutputName>${applicationName}-i18n</i18n.bundleOutputName>
    53 54 
         <i18n.bundleCsvFile>${applicationName}-i18n.csv</i18n.bundleCsvFile>
    ... ... @@ -58,21 +59,262 @@
    58 59 
         <license.bundleThirdPartyPath>META-INF/${applicationName}-THIRD-PARTY.txt</license.bundleThirdPartyPath>
    59 60 
         <license.bundleLicensePath>META-INF/${applicationName}-LICENSE.txt</license.bundleLicensePath>
    60 61
    61 
    -    <!-- Post Release configuration -->
    62 
    -    <skipPostRelease>false</skipPostRelease>
    63 
    -
    64 
    -    <redmine.releaseFiles>
    65 
    -      ${project.build.directory}/${project.build.finalName}.zip
    66 
    -    </redmine.releaseFiles>
    67 
    -
    68 
    -    <!-- by default, we are in dev mode -->
    69 
    -    <devMode>true</devMode>
    70 
    -
    71 62 
         <!-- to run via maven mvn exec:java -->
    72 63 
         <exec.mainClass>${maven.jar.main.class}</exec.mainClass>
    73 64
    65 
    +    <geoToolsVersion>16.0</geoToolsVersion>
    66 
    +
    74 67 
       </properties>
    75 68
    69 
    +  <repositories>
    70 
    +    <repository>
    71 
    +      <id>central</id>
    72 
    +      <url>http://repo1.maven.org/maven2/</url>
    73 
    +      <releases>
    74 
    +        <enabled>true</enabled>
    75 
    +        <checksumPolicy>fail</checksumPolicy>
    76 
    +      </releases>
    77 
    +    </repository>
    78 
    +    <repository>
    79 
    +      <id>geotools-repository</id>
    80 
    +      <url>http://download.osgeo.org/webdav/geotools</url>
    81 
    +      <releases>
    82 
    +        <enabled>true</enabled>
    83 
    +        <checksumPolicy>fail</checksumPolicy>
    84 
    +      </releases>
    85 
    +    </repository>
    86 
    +  </repositories>
    87 
    +
    88 
    +  <dependencyManagement>
    89 
    +    <dependencies>
    90 
    +      <!-- Map -->
    91 
    +      <dependency>
    92 
    +        <groupId>org.geotools</groupId>
    93 
    +        <artifactId>gt-shapefile</artifactId>
    94 
    +        <version>${geoToolsVersion}</version>
    95 
    +        <exclusions>
    96 
    +          <exclusion>
    97 
    +            <groupId>java3d</groupId>
    98 
    +            <artifactId>vecmath</artifactId>
    99 
    +          </exclusion>
    100 
    +          <exclusion>
    101 
    +            <groupId>jgridshift</groupId>
    102 
    +            <artifactId>jgridshift</artifactId>
    103 
    +          </exclusion>
    104 
    +        </exclusions>
    105 
    +      </dependency>
    106 
    +      <dependency>
    107 
    +        <groupId>org.geotools</groupId>
    108 
    +        <artifactId>gt-swing</artifactId>
    109 
    +        <version>${geoToolsVersion}</version>
    110 
    +      </dependency>
    111 
    +
    112 
    +      <dependency>
    113 
    +        <groupId>org.geotools</groupId>
    114 
    +        <artifactId>gt-api</artifactId>
    115 
    +        <version>${geoToolsVersion}</version>
    116 
    +        <exclusions>
    117 
    +          <exclusion>
    118 
    +            <groupId>jgridshift</groupId>
    119 
    +            <artifactId>jgridshift</artifactId>
    120 
    +          </exclusion>
    121 
    +          <exclusion>
    122 
    +            <groupId>java3d</groupId>
    123 
    +            <artifactId>vecmath</artifactId>
    124 
    +          </exclusion>
    125 
    +        </exclusions>
    126 
    +      </dependency>
    127 
    +
    128 
    +      <dependency>
    129 
    +        <groupId>org.geotools</groupId>
    130 
    +        <artifactId>gt-main</artifactId>
    131 
    +        <version>${geoToolsVersion}</version>
    132 
    +      </dependency>
    133 
    +      <dependency>
    134 
    +        <groupId>org.geotools</groupId>
    135 
    +        <artifactId>gt-render</artifactId>
    136 
    +        <version>${geoToolsVersion}</version>
    137 
    +        <exclusions>
    138 
    +          <exclusion>
    139 
    +            <groupId>it.geosolutions.jaiext</groupId>
    140 
    +            <artifactId>jaiext</artifactId>
    141 
    +          </exclusion>
    142 
    +          <exclusion>
    143 
    +            <groupId>it.geosolutions.jaiext.bandmerge</groupId>
    144 
    +            <artifactId>jt-bandmerge</artifactId>
    145 
    +          </exclusion>
    146 
    +          <exclusion>
    147 
    +            <groupId>it.geosolutions.jaiext.bandcombine</groupId>
    148 
    +            <artifactId>jt-bandcombine</artifactId>
    149 
    +          </exclusion>
    150 
    +          <exclusion>
    151 
    +            <groupId>it.geosolutions.jaiext.bandselect</groupId>
    152 
    +            <artifactId>jt-bandselect</artifactId>
    153 
    +          </exclusion>
    154 
    +          <exclusion>
    155 
    +            <groupId>it.geosolutions.imageio-ext</groupId>
    156 
    +            <artifactId>imageio-ext-tiff</artifactId>
    157 
    +          </exclusion>
    158 
    +          <exclusion>
    159 
    +            <groupId>it.geosolutions.jaiext.affine</groupId>
    160 
    +            <artifactId>jt-affine</artifactId>
    161 
    +          </exclusion>
    162 
    +          <exclusion>
    163 
    +            <groupId>it.geosolutions.jaiext.crop</groupId>
    164 
    +            <artifactId>jt-crop</artifactId>
    165 
    +          </exclusion>
    166 
    +          <exclusion>
    167 
    +            <groupId>it.geosolutions.jaiext.colorconvert</groupId>
    168 
    +            <artifactId>jt-colorconvert</artifactId>
    169 
    +          </exclusion>
    170 
    +          <exclusion>
    171 
    +            <groupId>it.geosolutions.jaiext.mosaic</groupId>
    172 
    +            <artifactId>jt-mosaic</artifactId>
    173 
    +          </exclusion>
    174 
    +          <exclusion>
    175 
    +            <groupId>it.geosolutions.jaiext.zonal</groupId>
    176 
    +            <artifactId>jt-zonal</artifactId>
    177 
    +          </exclusion>
    178 
    +          <exclusion>
    179 
    +            <groupId>it.geosolutions.jaiext.binarize</groupId>
    180 
    +            <artifactId>jt-binarize</artifactId>
    181 
    +          </exclusion>
    182 
    +          <exclusion>
    183 
    +            <groupId>it.geosolutions.jaiext.stats</groupId>
    184 
    +            <artifactId>jt-stats</artifactId>
    185 
    +          </exclusion>
    186 
    +          <exclusion>
    187 
    +            <groupId>it.geosolutions.jaiext.nullop</groupId>
    188 
    +            <artifactId>jt-nullop</artifactId>
    189 
    +          </exclusion>
    190 
    +          <exclusion>
    191 
    +            <groupId>it.geosolutions.jaiext.piecewise</groupId>
    192 
    +            <artifactId>jt-piecewise</artifactId>
    193 
    +          </exclusion>
    194 
    +          <exclusion>
    195 
    +            <groupId>it.geosolutions.jaiext.classifier</groupId>
    196 
    +            <artifactId>jt-classifier</artifactId>
    197 
    +          </exclusion>
    198 
    +          <exclusion>
    199 
    +            <groupId>it.geosolutions.jaiext.rlookup</groupId>
    200 
    +            <artifactId>jt-rlookup</artifactId>
    201 
    +          </exclusion>
    202 
    +          <exclusion>
    203 
    +            <groupId>it.geosolutions.jaiext.algebra</groupId>
    204 
    +            <artifactId>jt-algebra</artifactId>
    205 
    +          </exclusion>
    206 
    +          <exclusion>
    207 
    +            <groupId>it.geosolutions.jaiext.border</groupId>
    208 
    +            <artifactId>jt-border</artifactId>
    209 
    +          </exclusion>
    210 
    +          <exclusion>
    211 
    +            <groupId>it.geosolutions.jaiext.lookup</groupId>
    212 
    +            <artifactId>jt-lookup</artifactId>
    213 
    +          </exclusion>
    214 
    +          <exclusion>
    215 
    +            <groupId>it.geosolutions.jaiext.warp</groupId>
    216 
    +            <artifactId>jt-warp</artifactId>
    217 
    +          </exclusion>
    218 
    +          <exclusion>
    219 
    +            <groupId>it.geosolutions.jaiext.rescale</groupId>
    220 
    +            <artifactId>jt-rescale</artifactId>
    221 
    +          </exclusion>
    222 
    +          <exclusion>
    223 
    +            <groupId>it.geosolutions.jaiext.format</groupId>
    224 
    +            <artifactId>jt-format</artifactId>
    225 
    +          </exclusion>
    226 
    +          <exclusion>
    227 
    +            <groupId>it.geosolutions.jaiext.errordiffusion</groupId>
    228 
    +            <artifactId>jt-errordiffusion</artifactId>
    229 
    +          </exclusion>
    230 
    +          <exclusion>
    231 
    +            <groupId>it.geosolutions.jaiext.orderdither</groupId>
    232 
    +            <artifactId>jt-orderdither</artifactId>
    233 
    +          </exclusion>
    234 
    +          <exclusion>
    235 
    +            <groupId>it.geosolutions.jaiext.colorindexer</groupId>
    236 
    +            <artifactId>jt-colorindexer</artifactId>
    237 
    +          </exclusion>
    238 
    +          <exclusion>
    239 
    +            <groupId>it.geosolutions.jaiext.imagefunction</groupId>
    240 
    +            <artifactId>jt-imagefunction</artifactId>
    241 
    +          </exclusion>
    242 
    +          <exclusion>
    243 
    +            <groupId>it.geosolutions.jaiext.vectorbin</groupId>
    244 
    +            <artifactId>jt-vectorbin</artifactId>
    245 
    +          </exclusion>
    246 
    +          <exclusion>
    247 
    +            <groupId>it.geosolutions.jaiext.buffer</groupId>
    248 
    +            <artifactId>jt-buffer</artifactId>
    249 
    +          </exclusion>
    250 
    +          <exclusion>
    251 
    +            <groupId>it.geosolutions.jaiext.translate</groupId>
    252 
    +            <artifactId>jt-translate</artifactId>
    253 
    +          </exclusion>
    254 
    +          <exclusion>
    255 
    +            <groupId>it.geosolutions.jaiext.scale</groupId>
    256 
    +            <artifactId>jt-scale</artifactId>
    257 
    +          </exclusion>
    258 
    +          <exclusion>
    259 
    +            <groupId>it.geosolutions.jaiext.iterators</groupId>
    260 
    +            <artifactId>jt-iterators</artifactId>
    261 
    +          </exclusion>
    262 
    +          <exclusion>
    263 
    +            <groupId>it.geosolutions.jaiext.utilities</groupId>
    264 
    +            <artifactId>jt-utilities</artifactId>
    265 
    +          </exclusion>
    266 
    +          <exclusion>
    267 
    +            <groupId>org.jaitools</groupId>
    268 
    +            <artifactId>jt-zonalstats</artifactId>
    269 
    +          </exclusion>
    270 
    +          <exclusion>
    271 
    +            <groupId>org.jaitools</groupId>
    272 
    +            <artifactId>jt-utils</artifactId>
    273 
    +          </exclusion>
    274 
    +
    275 
    +          <exclusion>
    276 
    +            <groupId>javax.media</groupId>
    277 
    +            <artifactId>jai_imageio</artifactId>
    278 
    +          </exclusion>
    279 
    +          <exclusion>
    280 
    +            <groupId>javax.media</groupId>
    281 
    +            <artifactId>jai_core</artifactId>
    282 
    +          </exclusion>
    283 
    +
    284 
    +        </exclusions>
    285 
    +      </dependency>
    286 
    +
    287 
    +      <dependency>
    288 
    +        <groupId>org.geotools</groupId>
    289 
    +        <artifactId>gt-referencing</artifactId>
    290 
    +        <version>${geoToolsVersion}</version>
    291 
    +        <exclusions>
    292 
    +          <exclusion>
    293 
    +            <groupId>jgridshift</groupId>
    294 
    +            <artifactId>jgridshift</artifactId>
    295 
    +          </exclusion>
    296 
    +        </exclusions>
    297 
    +      </dependency>
    298 
    +
    299 
    +      <dependency>
    300 
    +        <groupId>org.geotools</groupId>
    301 
    +        <artifactId>gt-opengis</artifactId>
    302 
    +        <version>${geoToolsVersion}</version>
    303 
    +        <exclusions>
    304 
    +          <exclusion>
    305 
    +            <groupId>java3d</groupId>
    306 
    +            <artifactId>vecmath</artifactId>
    307 
    +          </exclusion>
    308 
    +        </exclusions>
    309 
    +      </dependency>
    310 
    +      <dependency>
    311 
    +        <groupId>org.geotools</groupId>
    312 
    +        <artifactId>gt-epsg-hsql</artifactId>
    313 
    +        <version>${geoToolsVersion}</version>
    314 
    +      </dependency>
    315 
    +    </dependencies>
    316 
    +
    317 
    +  </dependencyManagement>
    76 318 
       <dependencies>
    77 319
    78 320 
         <!-- sibling dependencies -->
    ... ... @@ -219,6 +461,10 @@
    219 461 
           <groupId>com.google.guava</groupId>
    220 462 
           <artifactId>guava</artifactId>
    221 463 
         </dependency>
    464 
    +    <dependency>
    465 
    +      <groupId>com.google.code.gson</groupId>
    466 
    +      <artifactId>gson</artifactId>
    467 
    +    </dependency>
    222 468
    223 469 
         <!-- Nuiton -->
    224 470 
         <dependency>
    ... ... @@ -334,6 +580,15 @@
    334 580 
           <artifactId>xwork-core</artifactId>
    335 581 
         </dependency>
    336 582
    583 
    +    <dependency>
    584 
    +      <groupId>com.vladsch.flexmark</groupId>
    585 
    +      <artifactId>flexmark</artifactId>
    586 
    +    </dependency>
    587 
    +    <dependency>
    588 
    +      <groupId>com.vladsch.flexmark</groupId>
    589 
    +      <artifactId>flexmark-util</artifactId>
    590 
    +    </dependency>
    591 
    +
    337 592 
         <!-- Logging -->
    338 593 
         <dependency>
    339 594 
           <groupId>org.slf4j</groupId>
    ... ... @@ -436,6 +691,7 @@
    436 691 
                   <enumerationSets>
    437 692 
                     <enumerationSet>
    438 693 
                       <name>label</name>
    694 
    +                  <!--suppress MavenModelInspection -->
    439 695 
                       <pattern>observe.enum.@CLASS_NAME@.@NAME@</pattern>
    440 696 
                       <enums>
    441 697 
                         <enum>fr.ird.observe.common.constants.GearType</enum>
    ... ... @@ -460,6 +716,7 @@
    460 716 
                     </enumerationSet>
    461 717 
                     <enumerationSet>
    462 718 
                       <name>description</name>
    719 
    +                  <!--suppress MavenModelInspection -->
    463 720 
                       <pattern>observe.enum.@CLASS_NAME@.@NAME@.description</pattern>
    464 721 
                       <enums>
    465 722 
                         <enum>fr.ird.observe.application.swing.configuration.constants.CreationMode</enum>
    ... ... @@ -543,6 +800,7 @@
    543 800 
                 </goals>
    544 801 
                 <phase>prepare-package</phase>
    545 802 
                 <configuration>
    803 
    +              <!--suppress MavenModelInspection -->
    546 804 
                   <skip>${performRelease}</skip>
    547 805 
                   <overWriteReleases>false</overWriteReleases>
    548 806 
                   <overWriteSnapshots>true</overWriteSnapshots>
    ... ... @@ -686,20 +944,22 @@
    686 944 
             <plugins>
    687 945
    688 946 
               <plugin>
    689 
    -            <groupId>org.codehaus.mojo</groupId>
    690 
    -            <artifactId>buildnumber-maven-plugin</artifactId>
    947 
    +            <artifactId>maven-antrun-plugin</artifactId>
    948 
    +            <inherited>false</inherited>
    691 949 
                 <executions>
    692 950 
                   <execution>
    951 
    +                <id>Copy change log</id>
    952 
    +                <phase>generate-resources</phase>
    953 
    +                <configuration>
    954 
    +                  <target>
    955 
    +                    <copy failonerror="true" overwrite="true" file="../CHANGELOG.md" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md" />
    956 
    +                  </target>
    957 
    +                </configuration>
    693 958 
                     <goals>
    694 
    -                  <goal>create</goal>
    959 
    +                  <goal>run</goal>
    695 960 
                     </goals>
    696 
    -                <phase>validate</phase>
    697 961 
                   </execution>
    698 962 
                 </executions>
    699 
    -            <configuration>
    700 
    -              <doCheck>false</doCheck>
    701 
    -              <doUpdate>false</doUpdate>
    702 
    -            </configuration>
    703 963 
               </plugin>
    704 964
    705 965 
               <plugin>
    ... ... @@ -837,7 +1097,6 @@
    837 1097 
               <plugin>
    838 1098 
                 <groupId>com.akathist.maven.plugins.launch4j</groupId>
    839 1099 
                 <artifactId>launch4j-maven-plugin</artifactId>
    840 
    -            <version>1.7.11</version>
    841 1100 
                 <executions>
    842 1101 
                   <execution>
    843 1102 
                     <id>launch4j</id>
    ... ... @@ -855,10 +1114,12 @@
    855 1114 
                         <minVersion>1.8.0</minVersion>
    856 1115 
                       </jre>
    857 1116 
                       <versionInfo>
    1117 
    +                    <!--suppress MavenModelInspection -->
    858 1118 
                         <fileVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0</fileVersion>
    859 1119 
                         <txtFileVersion>${project.version}</txtFileVersion>
    860 1120 
                         <fileDescription>${project.parent.description}</fileDescription>
    861 1121 
                         <productName>${project.parent.name}</productName>
    1122 
    +                    <!--suppress MavenModelInspection -->
    862 1123 
                         <productVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0</productVersion>
    863 1124 
                         <txtProductVersion>${project.version}</txtProductVersion>
    864 1125 
                         <companyName>${project.organization.name}</companyName>
    ... ... @@ -884,7 +1145,7 @@
    884 1145 
                       <descriptors>
    885 1146 
                         <descriptor>src/main/assembly/bin.xml</descriptor>
    886 1147 
                       </descriptors>
    887 
    -                  <attach>false</attach>
    1148 
    +                  <attach>true</attach>
    888 1149 
                       <finalName>${project.build.finalName}</finalName>
    889 1150 
                       <appendAssemblyId>false</appendAssemblyId>
    890 1151 
                       <outputDirectory>${project.build.directory}</outputDirectory>
    ... ... @@ -897,77 +1158,5 @@
    897 1158 
           </build>
    898 1159 
         </profile>
    899 1160
    900 
    -    <profile>
    901 
    -      <id>changelog-profile</id>
    902 
    -      <activation>
    903 
    -        <property>
    904 
    -          <name>performRelease</name>
    905 
    -          <value>true</value>
    906 
    -        </property>
    907 
    -      </activation>
    908 
    -      <build>
    909 
    -        <defaultGoal>generate-resources</defaultGoal>
    910 
    -
    911 
    -        <resources>
    912 
    -          <resource>
    913 
    -            <directory>${project.build.directory}/generated-sources/license</directory>
    914 
    -            <includes>
    915 
    -              <include>*.txt</include>
    916 
    -            </includes>
    917 
    -          </resource>
    918 
    -        </resources>
    919 
    -        <plugins>
    920 
    -
    921 
    -          <plugin>
    922 
    -            <artifactId>maven-dependency-plugin</artifactId>
    923 
    -            <executions>
    924 
    -
    925 
    -              <execution>
    926 
    -                <id>get-changelog</id>
    927 
    -                <phase>generate-resources</phase>
    928 
    -                <goals>
    929 
    -                  <goal>copy</goal>
    930 
    -                </goals>
    931 
    -                <configuration>
    932 
    -                  <outputDirectory>${project.build.directory}/changelog</outputDirectory>
    933 
    -                  <artifactItems>
    934 
    -                    <artifactItem>
    935 
    -                      <groupId>${project.parent.groupId}</groupId>
    936 
    -                      <artifactId>${project.parent.artifactId}</artifactId>
    937 
    -                      <version>${project.version}</version>
    938 
    -                      <classifier>changelog</classifier>
    939 
    -                      <type>pom</type>
    940 
    -                    </artifactItem>
    941 
    -                  </artifactItems>
    942 
    -                </configuration>
    943 
    -              </execution>
    944 
    -
    945 
    -            </executions>
    946 
    -          </plugin>
    947 
    -
    948 
    -          <plugin>
    949 
    -
    950 
    -            <artifactId>maven-antrun-plugin</artifactId>
    951 
    -            <executions>
    952 
    -              <execution>
    953 
    -                <id>Copy changelog</id>
    954 
    -                <phase>process-resources</phase>
    955 
    -                <configuration>
    956 
    -                  <target>
    957 
    -                    <copy failonerror="true" overwrite="true" file="${project.build.directory}/changelog/${project.parent.artifactId}-${project.version}-changelog.pom" tofile="${project.build.directory}/generated-sources/license/CHANGELOG.txt" />
    958 
    -                    <copy failonerror="true" overwrite="true" file="${project.build.directory}/changelog/${project.parent.artifactId}-${project.version}-changelog.pom" tofile="${project.build.directory}/generated-sources/license/META-INF/${applicationName}-CHANGELOG.txt" />
    959 
    -                  </target>
    960 
    -                </configuration>
    961 
    -                <goals>
    962 
    -                  <goal>run</goal>
    963 
    -                </goals>
    964 
    -              </execution>
    965 
    -            </executions>
    966 
    -          </plugin>
    967 
    -
    968 
    -        </plugins>
    969 
    -      </build>
    970 
    -    </profile>
    971 
    -
    972 1161 
       </profiles>
    973 1162 
     </project>

  • application-swing/src/main/resources/i18n/application-swing_fr_FR.properties
    ... ... @@ -83,6 +83,9 @@ observe.action.goto.next.stage=Suivant
    83 83 
     observe.action.goto.next.stage.tip=Accéder à l'étape suivante
    84 84 
     observe.action.goto.previous.stage=Précédent
    85 85 
     observe.action.goto.previous.stage.tip=Accéder à l'étape précédente
    86 
    +observe.action.goto.referentiel.common.tip=Référentiel commun
    87 
    +observe.action.goto.referentiel.longline.tip=Référentiel palangre
    88 
    +observe.action.goto.referentiel.seine.tip=Référentiel senne
    86 89 
     observe.action.goto.referentiel.short=Référentiel
    87 90 
     observe.action.goto.referentiel.tip=Accéder au référentiel
    88 91 
     observe.action.info.storage=Informations sur la source de données
    ... ... @@ -99,8 +102,9 @@ observe.action.modify=Modifier
    99 102 
     observe.action.new.entry=Nouveau
    100 103 
     observe.action.new.entry.tip=Créer une nouvelle entrée
    101 104 
     observe.action.open.screen=Ouverture de l'écran <%1$s>
    102 
    -observe.action.quitHelp.tip=Quitter l'écran d'aide
    105 
    +observe.action.quit=Quitter
    103 106 
     observe.action.quit.tip=Quitter le gestionnaire
    107 
    +observe.action.quitHelp.tip=Quitter l'écran d'aide
    104 108 
     observe.action.reload.application=Redémarrer l'application
    105 109 
     observe.action.reload.storage=Recharger la source de données
    106 110 
     observe.action.reload.storage.tip=Ferme et rouvre la source de données
    ... ... @@ -302,6 +306,7 @@ observe.actions.validate.message.operation.needFix=Vos données ne sont valides
    302 306 
     observe.actions.validate.message.prepare.validators=Détection des validateurs
    303 307 
     observe.actions.validate.message.save.report=Le rapport de validation a été sauvegardé dans le fichier %1$s
    304 308 
     observe.actions.validate.message.use.storage=La validation sera effectuée sur %1$s
    309 
    +observe.actions.validate.message.validate.trip=Validation de la marée « %s »
    305 310 
     observe.actions.validate.report.contextName=Contexte de validation utilisé \: %1$s
    306 311 
     observe.actions.validate.report.entities.with.messages=Nombre d'entités avec des messages \: %1$s
    307 312 
     observe.actions.validate.report.entity=Entité %1$s '%2$s' Nombre de messages %3$s (sur %4$s scope(s)).

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

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

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

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

  • pom.xml
    ... ... @@ -3,7 +3,7 @@
    3 3 
       #%L
    4 4 
       ObServe
    5 5 
       %%
    6 
    -  Copyright (C) 2008 - 2017 IRD, Code Lutin, Tony Chemit
    6 
    +  Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
    7 7 
       %%
    8 8 
       This program is free software: you can redistribute it and/or modify
    9 9 
       it under the terms of the GNU General Public License as
    ... ... @@ -24,19 +24,19 @@
    24 24 
       <modelVersion>4.0.0</modelVersion>
    25 25
    26 26 
       <parent>
    27 
    -    <groupId>org.nuiton</groupId>
    28 
    -    <artifactId>codelutinpom</artifactId>
    29 
    -    <version>10.5</version>
    27 
    +    <groupId>io.ultreia.maven</groupId>
    28 
    +    <artifactId>pom</artifactId>
    29 
    +    <version>2</version>
    30 30 
       </parent>
    31 31
    32 32 
       <groupId>fr.ird.observe</groupId>
    33 
    -  <artifactId>observe</artifactId>
    33 
    +  <artifactId>pom</artifactId>
    34 34 
       <version>6.0-SNAPSHOT</version>
    35 35 
       <packaging>pom</packaging>
    36 36
    37 37 
       <name>ObServe</name>
    38 38 
       <description>Projet ObServe</description>
    39 
    -  <url>http://observe.codelutin.com</url>
    39 
    +  <url>http://observe.ultreia.io</url>
    40 40 
       <inceptionYear>2008</inceptionYear>
    41 41 
       <organization>
    42 42 
         <name>IRD</name>
    ... ... @@ -55,6 +55,8 @@
    55 55 
           <id>tchemit</id>
    56 56 
           <name>Tony Chemit</name>
    57 57 
           <email>dev@tchemit.fr</email>
    58 
    +      <organization>Ultreia.io</organization>
    59 
    +      <organizationUrl>http://ultreia.io</organizationUrl>
    58 60 
           <roles>
    59 61 
             <role>lead</role>
    60 62 
             <role>developer</role>
    ... ... @@ -140,44 +142,50 @@
    140 142 
           </developerConnection>
    141 143 
         </scm-->
    142 144 
       <scm>
    143 
    -    <url>https://gitlab.nuiton.org/codelutin/observe</url>
    144 
    -    <connection>scm:git:git@gitlab.nuiton.org:codelutin/observe.git</connection>
    145 
    -    <developerConnection>scm:git:git@gitlab.nuiton.org:codelutin/observe.git</developerConnection>
    145 
    +    <url>https://gitlab.com/ultreia.io/ird-observe</url>
    146 
    +    <connection>scm:git:git@gitlab.com:ultreia.io/ird-observe.git</connection>
    147 
    +    <developerConnection>scm:git:ssh://git@gitlab.com:ultreia.io/ird-observe.git</developerConnection>
    146 148 
       </scm>
    147 149
    150 
    +  <distributionManagement>
    151 
    +    <site>
    152 
    +      <id>doc.ultreia.io</id>
    153 
    +    </site>
    154 
    +  </distributionManagement>
    155 
    +
    148 156 
       <properties>
    149 157
    150 
    -    <projectId>observe</projectId>
    151 
    -    <ciViewId>ObServe</ciViewId>
    158 
    +    <organizationId>ultreia.io</organizationId>
    159 
    +    <projectId>ird-observe</projectId>
    152 160
    153 
    -    <javaVersion>1.8</javaVersion>
    154 
    -    <signatureArtifactId>java18</signatureArtifactId>
    155 
    -    <signatureVersion>1.0</signatureVersion>
    161 
    +    <gitlabPluginVersion>1.0.4</gitlabPluginVersion>
    156 162
    157 163 
         <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion>
    158 164 
         <processorPluginVersion>1.3</processorPluginVersion>
    159 
    -
    165 
    +    <jaxxVersion>3.0-alpha-4</jaxxVersion>
    166 
    +    <nuitonI18nVersion>3.6.3</nuitonI18nVersion>
    167 
    +    <nuitonConfigVersion>3.2</nuitonConfigVersion>
    160 168 
         <topiaVersion>3.2.1</topiaVersion>
    161 
    -    <jaxxVersion>3.0-alpha-3</jaxxVersion>
    162 
    -    <nuitonI18nVersion>3.6.2</nuitonI18nVersion>
    163 169 
         <nuitonValidatorVersion>3.1</nuitonValidatorVersion>
    164 
    -    <nuitonUtilsVersion>3.0-rc-16</nuitonUtilsVersion>
    165 
    -    <nuitonConfigVersion>3.1.1</nuitonConfigVersion>
    170 
    +    <nuitonUtilsVersion>3.0-rc-18</nuitonUtilsVersion>
    171 
    +    <nuitonConverterVersion>1.0</nuitonConverterVersion>
    172 
    +    <nuitonVersionVersion>1.0-rc-2</nuitonVersionVersion>
    166 173 
         <xworkVersion>2.3.31</xworkVersion>
    167 174 
         <hibernateVersion>5.1.3.Final</hibernateVersion>
    168 
    -    <sl4jVersion>1.7.22</sl4jVersion>
    175 
    +    <sl4jVersion>1.7.23</sl4jVersion>
    169 176 
         <swingXVersion>1.6.5-1</swingXVersion>
    170 177 
         <reflectionsVersion>0.9.10</reflectionsVersion>
    171 178
    172 
    -    <geoToolsVersion>16.1</geoToolsVersion>
    173 179 
         <webmotionVersion>2.5.1</webmotionVersion>
    174 
    -    <httpComponentsVersion>4.5.2</httpComponentsVersion>
    180 
    +    <httpComponentsVersion>4.5.3</httpComponentsVersion>
    181 
    +
    182 
    +    <licensePluginVersion>1.9</licensePluginVersion>
    175 183
    176 184 
         <mavenVersion>3.3.9</mavenVersion>
    177 185
    178 186 
         <!-- license header configuration -->
    179 187 
         <license.licenseName>gpl_v3</license.licenseName>
    180 
    -    <license.organizationName>IRD, Code Lutin, Tony Chemit</license.organizationName>
    188 
    +    <license.organizationName>IRD, Code Lutin, Ultreia.io</license.organizationName>
    181 189
    182 190 
         <!-- i18n configuration -->
    183 191 
         <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles>
    ... ... @@ -191,7 +199,15 @@
    191 199
    192 200 
         <!-- Site configuration -->
    193 201 
         <locales>fr</locales>
    194 
    -    <siteSourcesType>rst</siteSourcesType>
    202 
    +    <generateSitemap>true</generateSitemap>
    203 
    +    <relativizeDecorationLinks>false</relativizeDecorationLinks>
    204 
    +    <helper.distributionSiteUrlPrefix>scpexe://ultreia.io/var/www/observe</helper.distributionSiteUrlPrefix>
    205 
    +
    206 
    +    <!--Gitlab configuration-->
    207 
    +    <gitlab.changesTitle>ObServe changelog</gitlab.changesTitle>
    208 
    +    <gitlab.changesAuthor>Tony Chemit</gitlab.changesAuthor>
    209 
    +    <gitlab.changesAuthorEmail>dev@tchemit.fr</gitlab.changesAuthorEmail>
    210 
    +    <gitlab.trackers>Anomalie,Evolution,Tache</gitlab.trackers>
    195 211
    196 212 
         <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>
    197 213 
         <buildDate>${maven.build.timestamp}</buildDate>
    ... ... @@ -202,35 +218,6 @@
    202 218
    203 219 
       </properties>
    204 220
    205 
    -  <repositories>
    206 
    -    <repository>
    207 
    -      <id>observe-public-group</id>
    208 
    -      <url>https://nexus.nuiton.org/nexus/content/groups/observe</url>
    209 
    -      <snapshots>
    210 
    -        <enabled>true</enabled>
    211 
    -        <checksumPolicy>fail</checksumPolicy>
    212 
    -      </snapshots>
    213 
    -      <releases>
    214 
    -        <enabled>true</enabled>
    215 
    -        <checksumPolicy>fail</checksumPolicy>
    216 
    -      </releases>
    217 
    -    </repository>
    218 
    -  </repositories>
    219 
    -  <pluginRepositories>
    220 
    -    <pluginRepository>
    221 
    -      <id>observe-public-group</id>
    222 
    -      <url>https://nexus.nuiton.org/nexus/content/groups/observe</url>
    223 
    -      <snapshots>
    224 
    -        <enabled>true</enabled>
    225 
    -        <checksumPolicy>fail</checksumPolicy>
    226 
    -      </snapshots>
    227 
    -      <releases>
    228 
    -        <enabled>true</enabled>
    229 
    -        <checksumPolicy>fail</checksumPolicy>
    230 
    -      </releases>
    231 
    -    </pluginRepository>
    232 
    -  </pluginRepositories>
    233 
    -
    234 221 
       <dependencyManagement>
    235 222 
         <dependencies>
    236 223
    ... ... @@ -274,7 +261,7 @@
    274 261 
           <dependency>
    275 262 
             <groupId>com.google.guava</groupId>
    276 263 
             <artifactId>guava</artifactId>
    277 
    -        <version>20.0</version>
    264 
    +        <version>21.0</version>
    278 265 
           </dependency>
    279 266 
           <dependency>
    280 267 
             <groupId>com.google.code.gson</groupId>
    ... ... @@ -290,7 +277,7 @@
    290 277 
           <dependency>
    291 278 
             <groupId>org.apache.httpcomponents</groupId>
    292 279 
             <artifactId>httpcore</artifactId>
    293 
    -        <version>4.4.5</version>
    280 
    +        <version>4.4.6</version>
    294 281 
           </dependency>
    295 282 
           <dependency>
    296 283 
             <groupId>org.apache.httpcomponents</groupId>
    ... ... @@ -327,13 +314,19 @@
    327 314 
           <dependency>
    328 315 
             <groupId>org.nuiton</groupId>
    329 316 
             <artifactId>nuiton-version</artifactId>
    330 
    -        <version>1.0-rc-2</version>
    317 
    +        <version>${nuitonVersionVersion}</version>
    331 318 
             <scope>compile</scope>
    332 319 
           </dependency>
    333 320 
           <dependency>
    334 321 
             <groupId>org.nuiton</groupId>
    335 322 
             <artifactId>nuiton-converter</artifactId>
    336 
    -        <version>1.0</version>
    323 
    +        <version>${nuitonConverterVersion}</version>
    324 
    +        <scope>compile</scope>
    325 
    +      </dependency>
    326 
    +      <dependency>
    327 
    +        <groupId>org.nuiton</groupId>
    328 
    +        <artifactId>nuiton-csv</artifactId>
    329 
    +        <version>3.0-rc-6</version>
    337 330 
             <scope>compile</scope>
    338 331 
           </dependency>
    339 332 
           <dependency>
    ... ... @@ -362,8 +355,8 @@
    362 355 
             <groupId>org.nuiton</groupId>
    363 356 
             <artifactId>nuiton-validator</artifactId>
    364 357 
             <version>${nuitonValidatorVersion}</version>
    365 
    -        <scope>test</scope>
    366 358 
             <classifier>tests</classifier>
    359 
    +        <scope>test</scope>
    367 360 
             <exclusions>
    368 361 
               <exclusion>
    369 362 
                 <groupId>javassist</groupId>
    ... ... @@ -558,7 +551,7 @@
    558 551 
           <dependency>
    559 552 
             <groupId>org.postgresql</groupId>
    560 553 
             <artifactId>postgresql</artifactId>
    561 
    -        <version>9.4.1212.jre7</version>
    554 
    +        <version>42.0.0.jre7</version>
    562 555 
           </dependency>
    563 556
    564 557 
           <!-- hibernate  -->
    ... ... @@ -571,7 +564,7 @@
    571 564 
           <dependency>
    572 565 
             <groupId>com.zaxxer</groupId>
    573 566 
             <artifactId>HikariCP</artifactId>
    574 
    -        <version>2.5.1</version>
    567 
    +        <version>2.6.0</version>
    575 568 
           </dependency>
    576 569
    577 570 
           <dependency>
    ... ... @@ -586,232 +579,6 @@
    586 579 
             </exclusions>
    587 580 
           </dependency>
    588 581
    589 
    -      <!-- Map -->
    590 
    -      <dependency>
    591 
    -        <groupId>org.geotools</groupId>
    592 
    -        <artifactId>gt-shapefile</artifactId>
    593 
    -        <version>${geoToolsVersion}</version>
    594 
    -        <exclusions>
    595 
    -          <exclusion>
    596 
    -            <groupId>java3d</groupId>
    597 
    -            <artifactId>vecmath</artifactId>
    598 
    -          </exclusion>
    599 
    -          <exclusion>
    600 
    -            <groupId>jgridshift</groupId>
    601 
    -            <artifactId>jgridshift</artifactId>
    602 
    -          </exclusion>
    603 
    -        </exclusions>
    604 
    -      </dependency>
    605 
    -      <dependency>
    606 
    -        <groupId>org.geotools</groupId>
    607 
    -        <artifactId>gt-swing</artifactId>
    608 
    -        <version>${geoToolsVersion}</version>
    609 
    -      </dependency>
    610 
    -
    611 
    -      <dependency>
    612 
    -        <groupId>org.geotools</groupId>
    613 
    -        <artifactId>gt-api</artifactId>
    614 
    -        <version>${geoToolsVersion}</version>
    615 
    -        <exclusions>
    616 
    -          <exclusion>
    617 
    -            <groupId>jgridshift</groupId>
    618 
    -            <artifactId>jgridshift</artifactId>
    619 
    -          </exclusion>
    620 
    -          <exclusion>
    621 
    -            <groupId>java3d</groupId>
    622 
    -            <artifactId>vecmath</artifactId>
    623 
    -          </exclusion>
    624 
    -        </exclusions>
    625 
    -      </dependency>
    626 
    -
    627 
    -      <dependency>
    628 
    -        <groupId>org.geotools</groupId>
    629 
    -        <artifactId>gt-main</artifactId>
    630 
    -        <version>${geoToolsVersion}</version>
    631 
    -      </dependency>
    632 
    -      <dependency>
    633 
    -        <groupId>org.geotools</groupId>
    634 
    -        <artifactId>gt-render</artifactId>
    635 
    -        <version>${geoToolsVersion}</version>
    636 
    -        <exclusions>
    637 
    -          <exclusion>
    638 
    -            <groupId>it.geosolutions.jaiext</groupId>
    639 
    -            <artifactId>jaiext</artifactId>
    640 
    -          </exclusion>
    641 
    -          <exclusion>
    642 
    -            <groupId>it.geosolutions.jaiext.bandmerge</groupId>
    643 
    -            <artifactId>jt-bandmerge</artifactId>
    644 
    -          </exclusion>
    645 
    -          <exclusion>
    646 
    -            <groupId>it.geosolutions.jaiext.bandcombine</groupId>
    647 
    -            <artifactId>jt-bandcombine</artifactId>
    648 
    -          </exclusion>
    649 
    -          <exclusion>
    650 
    -            <groupId>it.geosolutions.jaiext.bandselect</groupId>
    651 
    -            <artifactId>jt-bandselect</artifactId>
    652 
    -          </exclusion>
    653 
    -          <exclusion>
    654 
    -            <groupId>it.geosolutions.imageio-ext</groupId>
    655 
    -            <artifactId>imageio-ext-tiff</artifactId>
    656 
    -          </exclusion>
    657 
    -          <exclusion>
    658 
    -            <groupId>it.geosolutions.jaiext.affine</groupId>
    659 
    -            <artifactId>jt-affine</artifactId>
    660 
    -          </exclusion>
    661 
    -          <exclusion>
    662 
    -            <groupId>it.geosolutions.jaiext.crop</groupId>
    663 
    -            <artifactId>jt-crop</artifactId>
    664 
    -          </exclusion>
    665 
    -          <exclusion>
    666 
    -            <groupId>it.geosolutions.jaiext.colorconvert</groupId>
    667 
    -            <artifactId>jt-colorconvert</artifactId>
    668 
    -          </exclusion>
    669 
    -          <exclusion>
    670 
    -            <groupId>it.geosolutions.jaiext.mosaic</groupId>
    671 
    -            <artifactId>jt-mosaic</artifactId>
    672 
    -          </exclusion>
    673 
    -          <exclusion>
    674 
    -            <groupId>it.geosolutions.jaiext.zonal</groupId>
    675 
    -            <artifactId>jt-zonal</artifactId>
    676 
    -          </exclusion>
    677 
    -          <exclusion>
    678 
    -            <groupId>it.geosolutions.jaiext.binarize</groupId>
    679 
    -            <artifactId>jt-binarize</artifactId>
    680 
    -          </exclusion>
    681 
    -          <exclusion>
    682 
    -            <groupId>it.geosolutions.jaiext.stats</groupId>
    683 
    -            <artifactId>jt-stats</artifactId>
    684 
    -          </exclusion>
    685 
    -          <exclusion>
    686 
    -            <groupId>it.geosolutions.jaiext.nullop</groupId>
    687 
    -            <artifactId>jt-nullop</artifactId>
    688 
    -          </exclusion>
    689 
    -          <exclusion>
    690 
    -            <groupId>it.geosolutions.jaiext.piecewise</groupId>
    691 
    -            <artifactId>jt-piecewise</artifactId>
    692 
    -          </exclusion>
    693 
    -          <exclusion>
    694 
    -            <groupId>it.geosolutions.jaiext.classifier</groupId>
    695 
    -            <artifactId>jt-classifier</artifactId>
    696 
    -          </exclusion>
    697 
    -          <exclusion>
    698 
    -            <groupId>it.geosolutions.jaiext.rlookup</groupId>
    699 
    -            <artifactId>jt-rlookup</artifactId>
    700 
    -          </exclusion>
    701 
    -          <exclusion>
    702 
    -            <groupId>it.geosolutions.jaiext.algebra</groupId>
    703 
    -            <artifactId>jt-algebra</artifactId>
    704 
    -          </exclusion>
    705 
    -          <exclusion>
    706 
    -            <groupId>it.geosolutions.jaiext.border</groupId>
    707 
    -            <artifactId>jt-border</artifactId>
    708 
    -          </exclusion>
    709 
    -          <exclusion>
    710 
    -            <groupId>it.geosolutions.jaiext.lookup</groupId>
    711 
    -            <artifactId>jt-lookup</artifactId>
    712 
    -          </exclusion>
    713 
    -          <exclusion>
    714 
    -            <groupId>it.geosolutions.jaiext.warp</groupId>
    715 
    -            <artifactId>jt-warp</artifactId>
    716 
    -          </exclusion>
    717 
    -          <exclusion>
    718 
    -            <groupId>it.geosolutions.jaiext.rescale</groupId>
    719 
    -            <artifactId>jt-rescale</artifactId>
    720 
    -          </exclusion>
    721 
    -          <exclusion>
    722 
    -            <groupId>it.geosolutions.jaiext.format</groupId>
    723 
    -            <artifactId>jt-format</artifactId>
    724 
    -          </exclusion>
    725 
    -          <exclusion>
    726 
    -            <groupId>it.geosolutions.jaiext.errordiffusion</groupId>
    727 
    -            <artifactId>jt-errordiffusion</artifactId>
    728 
    -          </exclusion>
    729 
    -          <exclusion>
    730 
    -            <groupId>it.geosolutions.jaiext.orderdither</groupId>
    731 
    -            <artifactId>jt-orderdither</artifactId>
    732 
    -          </exclusion>
    733 
    -          <exclusion>
    734 
    -            <groupId>it.geosolutions.jaiext.colorindexer</groupId>
    735 
    -            <artifactId>jt-colorindexer</artifactId>
    736 
    -          </exclusion>
    737 
    -          <exclusion>
    738 
    -            <groupId>it.geosolutions.jaiext.imagefunction</groupId>
    739 
    -            <artifactId>jt-imagefunction</artifactId>
    740 
    -          </exclusion>
    741 
    -          <exclusion>
    742 
    -            <groupId>it.geosolutions.jaiext.vectorbin</groupId>
    743 
    -            <artifactId>jt-vectorbin</artifactId>
    744 
    -          </exclusion>
    745 
    -          <exclusion>
    746 
    -            <groupId>it.geosolutions.jaiext.buffer</groupId>
    747 
    -            <artifactId>jt-buffer</artifactId>
    748 
    -          </exclusion>
    749 
    -          <exclusion>
    750 
    -            <groupId>it.geosolutions.jaiext.translate</groupId>
    751 
    -            <artifactId>jt-translate</artifactId>
    752 
    -          </exclusion>
    753 
    -          <exclusion>
    754 
    -            <groupId>it.geosolutions.jaiext.scale</groupId>
    755 
    -            <artifactId>jt-scale</artifactId>
    756 
    -          </exclusion>
    757 
    -          <exclusion>
    758 
    -            <groupId>it.geosolutions.jaiext.iterators</groupId>
    759 
    -            <artifactId>jt-iterators</artifactId>
    760 
    -          </exclusion>
    761 
    -          <exclusion>
    762 
    -            <groupId>it.geosolutions.jaiext.utilities</groupId>
    763 
    -            <artifactId>jt-utilities</artifactId>
    764 
    -          </exclusion>
    765 
    -          <exclusion>
    766 
    -            <groupId>org.jaitools</groupId>
    767 
    -            <artifactId>jt-zonalstats</artifactId>
    768 
    -          </exclusion>
    769 
    -          <exclusion>
    770 
    -            <groupId>org.jaitools</groupId>
    771 
    -            <artifactId>jt-utils</artifactId>
    772 
    -          </exclusion>
    773 
    -
    774 
    -          <exclusion>
    775 
    -            <groupId>javax.media</groupId>
    776 
    -            <artifactId>jai_imageio</artifactId>
    777 
    -          </exclusion>
    778 
    -          <exclusion>
    779 
    -            <groupId>javax.media</groupId>
    780 
    -            <artifactId>jai_core</artifactId>
    781 
    -          </exclusion>
    782 
    -
    783 
    -        </exclusions>
    784 
    -      </dependency>
    785 
    -
    786 
    -      <dependency>
    787 
    -        <groupId>org.geotools</groupId>
    788 
    -        <artifactId>gt-referencing</artifactId>
    789 
    -        <version>${geoToolsVersion}</version>
    790 
    -        <exclusions>
    791 
    -          <exclusion>
    792 
    -            <groupId>jgridshift</groupId>
    793 
    -            <artifactId>jgridshift</artifactId>
    794 
    -          </exclusion>
    795 
    -        </exclusions>
    796 
    -      </dependency>
    797 
    -
    798 
    -      <dependency>
    799 
    -        <groupId>org.geotools</groupId>
    800 
    -        <artifactId>gt-opengis</artifactId>
    801 
    -        <version>${geoToolsVersion}</version>
    802 
    -        <exclusions>
    803 
    -          <exclusion>
    804 
    -            <groupId>java3d</groupId>
    805 
    -            <artifactId>vecmath</artifactId>
    806 
    -          </exclusion>
    807 
    -        </exclusions>
    808 
    -      </dependency>
    809 
    -      <dependency>
    810 
    -        <groupId>org.geotools</groupId>
    811 
    -        <artifactId>gt-epsg-hsql</artifactId>
    812 
    -        <version>${geoToolsVersion}</version>
    813 
    -      </dependency>
    814 
    -
    815 582 
           <dependency>
    816 583 
             <groupId>com.vividsolutions</groupId>
    817 584 
             <artifactId>jts</artifactId>
    ... ... @@ -849,7 +616,7 @@
    849 616 
           <dependency>
    850 617 
             <groupId>javax.servlet</groupId>
    851 618 
             <artifactId>javax.servlet-api</artifactId>
    852 
    -        <version>4.0.0-b01</version>
    619 
    +        <version>4.0.0-b02</version>
    853 620 
             <scope>provided</scope>
    854 621 
           </dependency>
    855 622
    ... ... @@ -960,6 +727,17 @@
    960 727 
           </dependency>
    961 728
    962 729 
           <dependency>
    730 
    +        <groupId>com.vladsch.flexmark</groupId>
    731 
    +        <artifactId>flexmark</artifactId>
    732 
    +        <version>0.15.4</version>
    733 
    +      </dependency>
    734 
    +      <dependency>
    735 
    +        <groupId>com.vladsch.flexmark</groupId>
    736 
    +        <artifactId>flexmark-util</artifactId>
    737 
    +        <version>0.15.4</version>
    738 
    +      </dependency>
    739 
    +
    740 
    +      <dependency>
    963 741 
             <groupId>org.javassist</groupId>
    964 742 
             <artifactId>javassist</artifactId>
    965 743 
             <version>3.22.0-CR1</version>
    ... ... @@ -972,45 +750,65 @@
    972 750
    973 751 
       <build>
    974 752
    753 
    +    <plugins>
    754 
    +      <plugin>
    755 
    +        <groupId>org.codehaus.mojo</groupId>
    756 
    +        <artifactId>buildnumber-maven-plugin</artifactId>
    757 
    +        <executions>
    758 
    +          <execution>
    759 
    +            <inherited>false</inherited>
    760 
    +            <goals>
    761 
    +              <goal>create</goal>
    762 
    +            </goals>
    763 
    +            <phase>validate</phase>
    764 
    +          </execution>
    765 
    +        </executions>
    766 
    +        <configuration>
    767 
    +          <doCheck>false</doCheck>
    768 
    +          <doUpdate>false</doUpdate>
    769 
    +        </configuration>
    770 
    +      </plugin>
    771 
    +
    772 
    +    </plugins>
    773 
    +
    975 774 
         <pluginManagement>
    976 775 
           <plugins>
    977 776
    978 
    -
    777 
    +        <!-- plugin site -->
    979 778 
             <plugin>
    980 
    -          <groupId>org.apache.maven.plugins</groupId>
    981 
    -          <artifactId>maven-scm-publish-plugin</artifactId>
    982 
    -          <version>1.1</version>
    983 
    -          <configuration>
    984 
    -            <pubScmUrl>${project.scm.developerConnection}</pubScmUrl>
    985 
    -            <scmBranch>pages</scmBranch>
    986 
    -            <content>${project.build.directory}/staging</content>
    987 
    -          </configuration>
    988 
    -          <executions>
    989 
    -            <execution>
    990 
    -              <id>scm-publish</id>
    991 
    -              <phase>site-deploy</phase><!-- deploy site with maven-scm-publish-plugin -->
    992 
    -              <goals>
    993 
    -                <goal>publish-scm</goal>
    994 
    -              </goals>
    995 
    -            </execution>
    996 
    -          </executions>
    779 
    +          <artifactId>maven-site-plugin</artifactId>
    780 
    +          <dependencies>
    781 
    +            <dependency>
    782 
    +              <groupId>org.nuiton.jaxx</groupId>
    783 
    +              <artifactId>jaxx-widgets-gis</artifactId>
    784 
    +              <version>${jaxxVersion}</version>
    785 
    +            </dependency>
    786 
    +            <dependency>
    787 
    +              <groupId>org.nuiton</groupId>
    788 
    +              <artifactId>nuiton-converter</artifactId>
    789 
    +              <version>${nuitonConverterVersion}</version>
    790 
    +            </dependency>
    791 
    +            <dependency>
    792 
    +              <groupId>org.nuiton</groupId>
    793 
    +              <artifactId>nuiton-version</artifactId>
    794 
    +              <version>${nuitonVersionVersion}</version>
    795 
    +            </dependency>
    796 
    +          </dependencies>
    997 797 
             </plugin>
    998 798
    999 
    -        <!-- plugin site -->
    1000 799 
             <plugin>
    1001 
    -          <artifactId>maven-site-plugin</artifactId>
    800 
    +          <groupId>org.codehaus.gmavenplus</groupId>
    801 
    +          <artifactId>gmavenplus-plugin</artifactId>
    1002 802 
               <dependencies>
    1003 803 
                 <dependency>
    1004 
    -              <groupId>org.nuiton.jrst</groupId>
    1005 
    -              <artifactId>doxia-module-jrst</artifactId>
    1006 
    -              <version>${jrstPluginVersion}</version>
    804 
    +              <groupId>org.reflections</groupId>
    805 
    +              <artifactId>reflections</artifactId>
    806 
    +              <version>${reflectionsVersion}</version>
    1007 807 
                 </dependency>
    1008 808 
               </dependencies>
    1009 
    -          <configuration>
    1010 
    -            <skipDeploy>true</skipDeploy>
    1011 
    -          </configuration>
    1012 809 
             </plugin>
    1013 810
    811 
    +        <!-- Plugins version from nuiton -->
    1014 812 
             <plugin>
    1015 813 
               <groupId>org.nuiton.i18n</groupId>
    1016 814 
               <artifactId>i18n-maven-plugin</artifactId>
    ... ... @@ -1042,22 +840,30 @@
    1042 840 
             </plugin>
    1043 841
    1044 842 
             <plugin>
    1045 
    -          <groupId>org.codehaus.gmavenplus</groupId>
    1046 
    -          <artifactId>gmavenplus-plugin</artifactId>
    1047 
    -          <version>1.5</version>
    1048 
    -          <dependencies>
    1049 
    -            <dependency>
    1050 
    -              <groupId>org.reflections</groupId>
    1051 
    -              <artifactId>reflections</artifactId>
    1052 
    -              <version>${reflectionsVersion}</version>
    1053 
    -            </dependency>
    1054 
    -            <dependency>
    1055 
    -              <groupId>org.codehaus.groovy</groupId>
    1056 
    -              <artifactId>groovy-all</artifactId>
    1057 
    -              <version>2.4.7</version>
    1058 
    -              <scope>runtime</scope>
    1059 
    -            </dependency>
    1060 
    -          </dependencies>
    843 
    +          <groupId>org.nuiton</groupId>
    844 
    +          <artifactId>helper-maven-plugin</artifactId>
    845 
    +          <version>${helperPluginVersion}</version>
    846 
    +        </plugin>
    847 
    +
    848 
    +        <plugin>
    849 
    +          <groupId>io.ultreia.maven</groupId>
    850 
    +          <artifactId>gitlab-maven-plugin</artifactId>
    851 
    +          <configuration>
    852 
    +            <releaseArtifacts>
    853 
    +              <releaseArtifact>
    854 
    +                <groupId>fr.ird.observe</groupId>
    855 
    +                <artifactId>observe</artifactId>
    856 
    +                <name>Application</name>
    857 
    +                <type>zip</type>
    858 
    +              </releaseArtifact>
    859 
    +              <releaseArtifact>
    860 
    +                <groupId>fr.ird.observe</groupId>
    861 
    +                <artifactId>observe</artifactId>
    862 
    +                <name>Serveur</name>
    863 
    +                <type>war</type>
    864 
    +              </releaseArtifact>
    865 
    +            </releaseArtifacts>
    866 
    +          </configuration>
    1061 867 
             </plugin>
    1062 868
    1063 869 
           </plugins>
    ... ... @@ -1079,20 +885,20 @@
    1079 885 
       <profiles>
    1080 886
    1081 887 
         <profile>
    1082 
    -      <id>no-devmode</id>
    888 
    +      <id>release-profile</id>
    1083 889 
           <activation>
    1084 890 
             <property>
    1085 891 
               <name>performRelease</name>
    1086 892 
               <value>true</value>
    1087 893 
             </property>
    1088 894 
           </activation>
    1089 
    -      <properties>
    1090 
    -        <devMode>false</devMode>
    1091 
    -      </properties>
    895 
    +      <modules>
    896 
    +        <module>observe</module>
    897 
    +      </modules>
    1092 898 
         </profile>
    1093 899
    1094 900 
         <profile>
    1095 
    -      <id>central-safe</id>
    901 
    +      <id>reporting</id>
    1096 902 
           <activation>
    1097 903 
             <property>
    1098 904 
               <name>performRelease</name>
    ... ... @@ -1100,118 +906,86 @@
    1100 906 
             </property>
    1101 907 
           </activation>
    1102 908
    1103 
    -      <properties>
    1104 
    -
    1105 
    -        <!-- deploy releases on other-releases repository -->
    1106 
    -        <release.repository>${other.release.repository}</release.repository>
    1107 
    -
    1108 
    -      </properties>
    1109 
    -
    1110 
    -      <build>
    1111 
    -        <defaultGoal>validate</defaultGoal>
    909 
    +      <reporting>
    1112 910 
             <plugins>
    911 
    +
    1113 912 
               <plugin>
    1114 913 
                 <groupId>org.nuiton</groupId>
    1115 
    -            <artifactId>helper-maven-plugin</artifactId>
    1116 
    -            <executions>
    1117 
    -              <execution>
    1118 
    -                <id>check-central-safe</id>
    1119 
    -                <inherited>true</inherited>
    1120 
    -                <goals>
    1121 
    -                  <goal>check-auto-container</goal>
    1122 
    -                </goals>
    1123 
    -                <configuration>
    1124 
    -                  <runOnce>false</runOnce>
    1125 
    -                  <addMavenCentral>true</addMavenCentral>
    1126 
    -                  <failIfNotSafe>true</failIfNotSafe>
    1127 
    -                </configuration>
    1128 
    -              </execution>
    1129 
    -            </executions>
    914 
    +            <artifactId>nuiton-config-maven-plugin</artifactId>
    915 
    +            <version>${nuitonConfigVersion}</version>
    916 
    +            <inherited>false</inherited>
    917 
    +            <reportSets>
    918 
    +              <reportSet>
    919 
    +                <reports>
    920 
    +                  <report>aggregate-report</report>
    921 
    +                </reports>
    922 
    +              </reportSet>
    923 
    +            </reportSets>
    924 
    +            <configuration>
    925 
    +              <i18nBundleName>observe-i18n</i18nBundleName>
    926 
    +            </configuration>
    1130 927 
               </plugin>
    1131 928
    1132 
    -        </plugins>
    1133 
    -      </build>
    1134 
    -    </profile>
    1135 
    -
    1136 
    -    <profile>
    1137 
    -      <id>changelog-profile</id>
    1138 
    -      <activation>
    1139 
    -        <property>
    1140 
    -          <name>performRelease</name>
    1141 
    -          <value>true</value>
    1142 
    -        </property>
    1143 
    -      </activation>
    1144 
    -
    1145 
    -      <properties>
    1146 
    -
    1147 
    -        <redmine.xmlPath>${project.build.directory}/changes/changes.xml</redmine.xmlPath>
    1148 
    -      </properties>
    1149 
    -      <build>
    1150 
    -        <defaultGoal>process-classes</defaultGoal>
    1151 
    -        <plugins>
    1152 
    -
    1153 
    -          <!-- Generate changelog.txt and attach it to project -->
    1154 929 
               <plugin>
    1155 
    -            <groupId>org.nuiton.jredmine</groupId>
    1156 
    -            <artifactId>jredmine-maven-plugin</artifactId>
    1157 
    -            <executions>
    1158 
    -              <execution>
    1159 
    -                <id>generate-changes</id>
    1160 
    -                <goals>
    1161 
    -                  <goal>generate-changes</goal>
    1162 
    -                </goals>
    1163 
    -                <phase>process-classes</phase>
    1164 
    -                <configuration>
    1165 
    -                  <generateOnce>true</generateOnce>
    1166 
    -                  <actionMapping>fix:1, add:2, update:4</actionMapping>
    1167 
    -                </configuration>
    1168 
    -              </execution>
    1169 
    -              <execution>
    1170 
    -                <id>generate-changelog</id>
    1171 
    -                <inherited>false</inherited>
    1172 
    -                <goals>
    1173 
    -                  <goal>generate-changelog</goal>
    1174 
    -                </goals>
    1175 
    -                <phase>process-classes</phase>
    1176 
    -                <configuration>
    1177 
    -                  <attach>true</attach>
    1178 
    -                </configuration>
    1179 
    -              </execution>
    1180 
    -            </executions>
    930 
    +            <artifactId>maven-project-info-reports-plugin</artifactId>
    931 
    +            <version>${projectInfoReportsPluginVersion}</version>
    932 
    +            <reportSets>
    933 
    +              <reportSet>
    934 
    +                <reports>
    935 
    +                  <report>project-team</report>
    936 
    +                  <report>mailing-list</report>
    937 
    +                  <report>cim</report>
    938 
    +                  <report>issue-tracking</report>
    939 
    +                  <report>license</report>
    940 
    +                  <report>scm</report>
    941 
    +                  <report>dependency-info</report>
    942 
    +                  <report>dependencies</report>
    943 
    +                  <report>dependency-convergence</report>
    944 
    +                  <report>plugin-management</report>
    945 
    +                  <report>plugins</report>
    946 
    +                  <report>dependency-management</report>
    947 
    +                  <report>summary</report>
    948 
    +                </reports>
    949 
    +              </reportSet>
    950 
    +            </reportSets>
    1181 951 
               </plugin>
    1182 952
    1183 
    -        </plugins>
    1184 
    -      </build>
    1185 
    -    </profile>
    953 
    +          <plugin>
    954 
    +            <artifactId>maven-changes-plugin</artifactId>
    955 
    +            <version>${changesPluginVersion}</version>
    956 
    +            <configuration>
    957 
    +              <issueLinkTemplatePerSystem>
    958 
    +                <gitlab>https://gitlab.com/ultreia.io/${projectId}/issues/%ISSUE%</gitlab>
    959 
    +              </issueLinkTemplatePerSystem>
    960 
    +              <xmlPath>${project.build.directory}/generated-site/changes.xml</xmlPath>
    961 
    +            </configuration>
    962 
    +          </plugin>
    1186 963
    1187 
    -    <profile>
    1188 
    -      <id>reporting</id>
    1189 
    -      <activation>
    1190 
    -        <property>
    1191 
    -          <name>performRelease</name>
    1192 
    -          <value>true</value>
    1193 
    -        </property>
    1194 
    -      </activation>
    964 
    +          <plugin>
    965 
    +            <artifactId>maven-changelog-plugin</artifactId>
    966 
    +            <version>${changelogPluginVersion}</version>
    967 
    +          </plugin>
    1195 968
    1196 
    -      <reporting>
    969 
    +          <plugin>
    970 
    +            <groupId>org.codehaus.mojo</groupId>
    971 
    +            <artifactId>license-maven-plugin</artifactId>
    972 
    +            <version>${licensePluginVersion}</version>
    973 
    +          </plugin>
    1197 974
    1198 
    -        <plugins>
    1199 
    -          <!--plugin>
    1200 
    -            <groupId>org.nuiton</groupId>
    1201 
    -            <artifactId>nuiton-config-maven-plugin</artifactId>
    1202 
    -            <version>${nuitonConfigVersion}</version>
    1203 
    -            <inherited>false</inherited>
    975 
    +          <plugin>
    976 
    +            <groupId>org.codehaus.mojo</groupId>
    977 
    +            <artifactId>versions-maven-plugin</artifactId>
    978 
    +            <version>${versionsPluginVersion}</version>
    1204 979 
                 <reportSets>
    1205 980 
                   <reportSet>
    1206 981 
                     <reports>
    1207 
    -                  <report>aggregate-report</report>
    982 
    +                  <report>dependency-updates-report</report>
    983 
    +                  <report>plugin-updates-report</report>
    984 
    +                  <report>property-updates-report</report>
    1208 985 
                     </reports>
    1209 986 
                   </reportSet>
    1210 987 
                 </reportSets>
    1211 
    -            <configuration>
    1212 
    -              <i18nBundleName>${projectId}-i18n</i18nBundleName>
    1213 
    -            </configuration>
    1214 
    -          </plugin-->
    988 
    +          </plugin>
    1215 989
    1216 990 
             </plugins>
    1217 991 
           </reporting>
    ... ... @@ -1221,7 +995,6 @@
    1221 995 
             <plugins>
    1222 996
    1223 997 
               <plugin>
    1224 
    -
    1225 998 
                 <artifactId>maven-antrun-plugin</artifactId>
    1226 999 
                 <inherited>false</inherited>
    1227 1000 
                 <executions>
    ... ... @@ -1234,25 +1007,10 @@
    1234 1007 
                           <fileset dir="doc/modelisation">
    1235 1008 
                             <include name="**/*.pdf" />
    1236 1009 
                           </fileset>
    1237 
    -                      <fileset dir="persistence/src/main/xmi">
    1010 
    +                      <fileset dir="entities/src/main/xmi">
    1238 1011 
                             <include name="**/*.zargo" />
    1239 1012 
                           </fileset>
    1240 1013 
                         </copy>
    1241 
    -                    <copy todir="${project.reporting.outputDirectory}/validation/service" failonerror="true" overwrite="true">
    1242 
    -                      <fileset dir="services-validation/src/main/resources">
    1243 
    -                        <include name="**/*-validation.xml" />
    1244 
    -                      </fileset>
    1245 
    -                    </copy>
    1246 
    -                    <copy todir="${project.reporting.outputDirectory}/validation/ui" failonerror="true" overwrite="true">
    1247 
    -                      <fileset dir="application-swing-validation/src/main/resources">
    1248 
    -                        <include name="**/*-validation.xml" />
    1249 
    -                      </fileset>
    1250 
    -                    </copy>
    1251 
    -                    <copy todir="${project.reporting.outputDirectory}/validation" failonerror="true" overwrite="true">
    1252 
    -                      <fileset dir="application-swing-configuration/src/main/resources">
    1253 
    -                        <include name="validators.xml" />
    1254 
    -                      </fileset>
    1255 
    -                    </copy>
    1256 1014 
                       </target>
    1257 1015 
                     </configuration>
    1258 1016 
                     <goals>
    ... ... @@ -1262,6 +1020,35 @@
    1262 1020 
                 </executions>
    1263 1021 
               </plugin>
    1264 1022
    1023 
    +          <plugin>
    1024 
    +            <groupId>io.ultreia.maven</groupId>
    1025 
    +            <artifactId>gitlab-maven-plugin</artifactId>
    1026 
    +            <inherited>false</inherited>
    1027 
    +            <executions>
    1028 
    +              <execution>
    1029 
    +                <inherited>false</inherited>
    1030 
    +                <goals>
    1031 
    +                  <goal>generate-changes</goal>
    1032 
    +                </goals>
    1033 
    +                <phase>pre-site</phase>
    1034 
    +              </execution>
    1035 
    +            </executions>
    1036 
    +          </plugin>
    1037 
    +
    1038 
    +          <plugin>
    1039 
    +            <groupId>org.nuiton</groupId>
    1040 
    +            <artifactId>helper-maven-plugin</artifactId>
    1041 
    +            <executions>
    1042 
    +              <execution>
    1043 
    +                <id>compute-distribution-site-url</id>
    1044 
    +                <goals>
    1045 
    +                  <goal>compute-distribution-site-url</goal>
    1046 
    +                </goals>
    1047 
    +                <phase>pre-site</phase>
    1048 
    +              </execution>
    1049 
    +            </executions>
    1050 
    +          </plugin>
    1051 
    +
    1265 1052 
             </plugins>
    1266 1053
    1267 1054 
           </build>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    • —
    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.