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

Commits:

3 changed files:

Changes:

  • application-swing/pom.xml
    ... ... @@ -61,8 +61,6 @@
    61 61 
         <!-- to run via maven mvn exec:java -->
    62 62 
         <exec.mainClass>${maven.jar.main.class}</exec.mainClass>
    63 63
    64 
    -    <geoToolsVersion>16.0</geoToolsVersion>
    65 
    -
    66 64 
       </properties>
    67 65
    68 66 
       <repositories>

  • pom.xml
    ... ... @@ -172,9 +172,7 @@
    172 172
    173 173 
         <eugenePluginVersion>3.0-alpha-11</eugenePluginVersion>
    174 174 
         <processorPluginVersion>1.3</processorPluginVersion>
    175 
    -    <!-- il faudra attendre la version 1.13 qui corrige des pb -->
    176 
    -    <licensePluginVersion>1.9</licensePluginVersion>
    177 
    -
    175 
    +
    178 176 
         <jaxxVersion>3.0-alpha-6</jaxxVersion>
    179 177 
         <nuitonI18nVersion>4.0-alpha-1-SNAPSHOT</nuitonI18nVersion>
    180 178 
         <nuitonConfigVersion>3.2</nuitonConfigVersion>
    ... ... @@ -184,13 +182,14 @@
    184 182 
         <nuitonConverterVersion>1.0</nuitonConverterVersion>
    185 183 
         <nuitonVersionVersion>1.0-rc-2</nuitonVersionVersion>
    186 184 
         <xworkVersion>2.3.32</xworkVersion>
    187 
    -    <flexmarkVersion>0.18.9</flexmarkVersion>
    188 
    -    <hibernateVersion>5.1.5.Final</hibernateVersion>
    185 
    +    <flexmarkVersion>0.20.2</flexmarkVersion>
    186 
    +    <hibernateVersion>5.1.8.Final</hibernateVersion>
    189 187 
         <sl4jVersion>1.7.25</sl4jVersion>
    190 188 
         <swingXVersion>1.6.5-1</swingXVersion>
    191 189 
         <reflectionsVersion>0.9.11</reflectionsVersion>
    192 190 
         <webmotionVersion>2.5.3</webmotionVersion>
    193 191 
         <httpComponentsVersion>4.5.3</httpComponentsVersion>
    192 
    +    <geoToolsVersion>17.1</geoToolsVersion>
    194 193
    195 194 
         <!-- license header configuration -->
    196 195 
         <license.licenseName>gpl_v3</license.licenseName>
    ... ... @@ -232,7 +231,7 @@
    232 231 
           <dependency>
    233 232 
             <groupId>org.apache.commons</groupId>
    234 233 
             <artifactId>commons-lang3</artifactId>
    235 
    -        <version>3.5</version>
    234 
    +        <version>3.6</version>
    236 235 
           </dependency>
    237 236 
           <dependency>
    238 237 
             <groupId>commons-logging</groupId>
    ... ... @@ -268,12 +267,12 @@
    268 267 
           <dependency>
    269 268 
             <groupId>com.google.guava</groupId>
    270 269 
             <artifactId>guava</artifactId>
    271 
    -        <version>21.0</version>
    270 
    +        <version>22.0</version>
    272 271 
           </dependency>
    273 272 
           <dependency>
    274 273 
             <groupId>com.google.code.gson</groupId>
    275 274 
             <artifactId>gson</artifactId>
    276 
    -        <version>2.8.0</version>
    275 
    +        <version>2.8.1</version>
    277 276 
           </dependency>
    278 277
    279 278 
           <dependency>
    ... ... @@ -642,13 +641,13 @@
    642 641 
           <dependency>
    643 642 
             <groupId>com.h2database</groupId>
    644 643 
             <artifactId>h2</artifactId>
    645 
    -        <version>1.4.195</version>
    644 
    +        <version>1.4.196</version>
    646 645 
           </dependency>
    647 646
    648 647 
           <dependency>
    649 648 
             <groupId>org.postgresql</groupId>
    650 649 
             <artifactId>postgresql</artifactId>
    651 
    -        <version>42.0.0.jre7</version>
    650 
    +        <version>42.1.1.jre7</version>
    652 651 
           </dependency>
    653 652
    654 653 
           <!-- hibernate  -->
    ... ... @@ -661,7 +660,7 @@
    661 660 
           <dependency>
    662 661 
             <groupId>com.zaxxer</groupId>
    663 662 
             <artifactId>HikariCP</artifactId>
    664 
    -        <version>2.6.1</version>
    663 
    +        <version>2.6.3</version>
    665 664 
           </dependency>
    666 665
    667 666 
           <dependency>
    ... ... @@ -706,14 +705,14 @@
    706 705 
           <dependency>
    707 706 
             <groupId>com.esotericsoftware.yamlbeans</groupId>
    708 707 
             <artifactId>yamlbeans</artifactId>
    709 
    -        <version>1.08</version>
    708 
    +        <version>1.12</version>
    710 709 
           </dependency>
    711 710
    712 711 
           <!-- ne pas mettre à jour cette version est pour tomcat 7-->
    713 712 
           <dependency>
    714 713 
             <groupId>javax.servlet</groupId>
    715 714 
             <artifactId>javax.servlet-api</artifactId>
    716 
    -        <version>4.0.0-b05</version>
    715 
    +        <version>4.0.0-b07</version>
    717 716 
             <scope>provided</scope>
    718 717 
           </dependency>
    719 718
    ... ... @@ -837,7 +836,7 @@
    837 836 
           <dependency>
    838 837 
             <groupId>org.javassist</groupId>
    839 838 
             <artifactId>javassist</artifactId>
    840 
    -        <version>3.22.0-CR1</version>
    839 
    +        <version>3.22.0-CR2</version>
    841 840 
             <scope>runtime</scope>
    842 841 
           </dependency>
    843 842

  • src/site/resources/img/architecture.svg
    1 1 
     <?xml version="1.0" encoding="UTF-8" standalone="no"?>
    2 
    +<!--
    3 
    +  #%L
    4 
    +  ObServe :: Pom
    5 
    +  %%
    6 
    +  Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
    7 
    +  %%
    8 
    +  This program is free software: you can redistribute it and/or modify
    9 
    +  it under the terms of the GNU General Public License as
    10 
    +  published by the Free Software Foundation, either version 3 of the
    11 
    +  License, or (at your option) any later version.
    12 
    +
    13 
    +  This program is distributed in the hope that it will be useful,
    14 
    +  but WITHOUT ANY WARRANTY; without even the implied warranty of
    15 
    +  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    16 
    +  GNU General Public License for more details.
    17 
    +
    18 
    +  You should have received a copy of the GNU General Public
    19 
    +  License along with this program.  If not, see
    20 
    +  <http://www.gnu.org/licenses/gpl-3.0.html>.
    21 
    +  #L%
    22 
    +  -->
    23 
    +
    2 24 
     <!-- Created with Inkscape (http://www.inkscape.org/) -->
    3 25 
     <svg
    4 26 
        xmlns:ns="http://creativecommons.org/ns#"

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