Tony CHEMIT pushed to branch feature/refactor_ui at ultreiaio / ird-observe

Commits:

2 changed files:

Changes:

  • client/pom.xml
    ... ... @@ -539,10 +539,6 @@
    539 539 
           <groupId>org.swinglabs.swingx</groupId>
    540 540 
           <artifactId>swingx-core</artifactId>
    541 541 
         </dependency>
    542 
    -    <!--dependency>
    543 
    -      <groupId>org.swinglabs.swingx</groupId>
    544 
    -      <artifactId>swingx-painters</artifactId>
    545 
    -    </dependency-->
    546 542 
         <dependency>
    547 543 
           <groupId>org.swinglabs.swingx</groupId>
    548 544 
           <artifactId>swingx-common</artifactId>
    ... ... @@ -562,11 +558,6 @@
    562 558 
           <artifactId>h2</artifactId>
    563 559 
         </dependency>
    564 560
    565 
    -    <!--dependency>
    566 
    -      <groupId>org.reflections</groupId>
    567 
    -      <artifactId>reflections</artifactId>
    568 
    -    </dependency-->
    569 
    -
    570 561 
         <!-- FreeMarker -->
    571 562 
         <dependency>
    572 563 
           <groupId>org.freemarker</groupId>
    ... ... @@ -655,7 +646,7 @@
    655 646 
         <dependency>
    656 647 
           <groupId>org.jetbrains</groupId>
    657 648 
           <artifactId>annotations</artifactId>
    658 
    -      <version>RELEASE</version>
    649 
    +      <version>15.0</version>
    659 650 
         </dependency>
    660 651
    661 652 
       </dependencies>

  • pom.xml
    ... ... @@ -35,7 +35,7 @@
    35 35 
       <packaging>pom</packaging>
    36 36
    37 37 
       <name>ObServe :: Pom</name>
    38 
    -  <description>Projet ObServe</description>
    38 
    +  <description>Project ObServe</description>
    39 39 
       <url>https://ultreiaio.gitlab.io/ird-observe</url>
    40 40 
       <inceptionYear>2008</inceptionYear>
    41 41 
       <organization>
    ... ... @@ -141,17 +141,17 @@
    141 141 
         <projectId>ird-observe</projectId>
    142 142 
         <stageId>frirdobserve</stageId>
    143 143
    144 
    -    <!-- dev version (for develop purpose -->
    144 
    +    <!-- dev version -->
    145 145 
         <devMode>true</devMode>
    146 146
    147 
    -    <!--Modèle version-->
    147 
    +    <!--persistence model version-->
    148 148 
         <observe.model.version>6.904</observe.model.version>
    149 149
    150 150 
         <!-- build timestamp configuration -->
    151 151 
         <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>
    152 152 
         <buildDate>${maven.build.timestamp}</buildDate>
    153 153
    154 
    -    <observeToolkitVersion>1.6</observeToolkitVersion>
    154 
    +    <observeToolkitVersion>1.7-SNAPSHOT</observeToolkitVersion>
    155 155 
         <eugenePluginVersion>3.0-alpha-16</eugenePluginVersion>
    156 156 
         <processorPluginVersion>1.3</processorPluginVersion>
    157 157
    ... ... @@ -219,12 +219,6 @@
    219 219
    220 220 
           <dependency>
    221 221 
             <groupId>fr.ird.observe.toolkit</groupId>
    222 
    -        <artifactId>topia-templates-extension</artifactId>
    223 
    -        <version>${observeToolkitVersion}</version>
    224 
    -      </dependency>
    225 
    -
    226 
    -      <dependency>
    227 
    -        <groupId>fr.ird.observe.toolkit</groupId>
    228 222 
             <artifactId>common-dto</artifactId>
    229 223 
             <version>${observeToolkitVersion}</version>
    230 224 
           </dependency>
    ... ... @@ -282,6 +276,7 @@
    282 276 
             <artifactId>commons-io</artifactId>
    283 277 
             <version>2.5</version>
    284 278 
           </dependency>
    279 
    +      <!--We don't use it, but we want to use only one version-->
    285 280 
           <dependency>
    286 281 
             <groupId>commons-collections</groupId>
    287 282 
             <artifactId>commons-collections</artifactId>
    ... ... @@ -310,6 +305,7 @@
    310 305 
             <version>2.8.2</version>
    311 306 
           </dependency>
    312 307
    308 
    +      <!--We don't use it, but we want to use only one version-->
    313 309 
           <dependency>
    314 310 
             <groupId>org.apache.httpcomponents</groupId>
    315 311 
             <artifactId>httpclient</artifactId>
    ... ... @@ -320,11 +316,6 @@
    320 316 
             <artifactId>httpcore</artifactId>
    321 317 
             <version>4.4.7</version>
    322 318 
           </dependency>
    323 
    -      <dependency>
    324 
    -        <groupId>org.apache.httpcomponents</groupId>
    325 
    -        <artifactId>httpmime</artifactId>
    326 
    -        <version>${httpComponentsVersion}</version>
    327 
    -      </dependency>
    328 319
    329 320 
           <dependency>
    330 321 
             <groupId>junit</groupId>
    ... ... @@ -473,152 +464,68 @@
    473 464 
           </dependency>
    474 465 
           <dependency>
    475 466 
             <groupId>io.ultreia.java4all.jaxx</groupId>
    476 
    -        <artifactId>jaxx-runtime-swing-session</artifactId>
    477 
    -        <version>${jaxxVersion}</version>
    478 
    -        <scope>compile</scope>
    479 
    -      </dependency>
    480 
    -      <dependency>
    481 
    -        <groupId>io.ultreia.java4all.jaxx</groupId>
    482 467 
             <artifactId>jaxx-runtime-swing-wizard</artifactId>
    483 468 
             <version>${jaxxVersion}</version>
    484 469 
             <scope>compile</scope>
    485 
    -        <exclusions>
    486 
    -          <exclusion>
    487 
    -            <groupId>org.nuiton.i18n</groupId>
    488 
    -            <artifactId>nuiton-i18n</artifactId>
    489 
    -          </exclusion>
    490 
    -        </exclusions>
    491 470 
           </dependency>
    492 471 
           <dependency>
    493 472 
             <groupId>io.ultreia.java4all.jaxx</groupId>
    494 473 
             <artifactId>jaxx-validator</artifactId>
    495 474 
             <version>${jaxxVersion}</version>
    496 475 
             <scope>compile</scope>
    497 
    -        <exclusions>
    498 
    -          <exclusion>
    499 
    -            <groupId>org.nuiton.i18n</groupId>
    500 
    -            <artifactId>nuiton-i18n</artifactId>
    501 
    -          </exclusion>
    502 
    -        </exclusions>
    503 476 
           </dependency>
    504 477 
           <dependency>
    505 478 
             <groupId>io.ultreia.java4all.jaxx</groupId>
    506 479 
             <artifactId>jaxx-widgets-error</artifactId>
    507 480 
             <version>${jaxxVersion}</version>
    508 481 
             <scope>compile</scope>
    509 
    -        <exclusions>
    510 
    -          <exclusion>
    511 
    -            <groupId>org.nuiton.i18n</groupId>
    512 
    -            <artifactId>nuiton-i18n</artifactId>
    513 
    -          </exclusion>
    514 
    -        </exclusions>
    515 
    -      </dependency>
    516 
    -      <dependency>
    517 
    -        <groupId>io.ultreia.java4all.jaxx</groupId>
    518 
    -        <artifactId>jaxx-widgets-hidor</artifactId>
    519 
    -        <version>${jaxxVersion}</version>
    520 
    -        <scope>compile</scope>
    521 
    -        <exclusions>
    522 
    -          <exclusion>
    523 
    -            <groupId>org.nuiton.i18n</groupId>
    524 
    -            <artifactId>nuiton-i18n</artifactId>
    525 
    -          </exclusion>
    526 
    -        </exclusions>
    527 482 
           </dependency>
    528 483 
           <dependency>
    529 484 
             <groupId>io.ultreia.java4all.jaxx</groupId>
    530 485 
             <artifactId>jaxx-widgets-gis</artifactId>
    531 486 
             <version>${jaxxVersion}</version>
    532 487 
             <scope>compile</scope>
    533 
    -        <exclusions>
    534 
    -          <exclusion>
    535 
    -            <groupId>org.nuiton.i18n</groupId>
    536 
    -            <artifactId>nuiton-i18n</artifactId>
    537 
    -          </exclusion>
    538 
    -        </exclusions>
    539 488 
           </dependency>
    540 489 
           <dependency>
    541 490 
             <groupId>io.ultreia.java4all.jaxx</groupId>
    542 491 
             <artifactId>jaxx-widgets-datetime</artifactId>
    543 492 
             <version>${jaxxVersion}</version>
    544 493 
             <scope>compile</scope>
    545 
    -        <exclusions>
    546 
    -          <exclusion>
    547 
    -            <groupId>org.nuiton.i18n</groupId>
    548 
    -            <artifactId>nuiton-i18n</artifactId>
    549 
    -          </exclusion>
    550 
    -        </exclusions>
    551 494 
           </dependency>
    552 495 
           <dependency>
    553 496 
             <groupId>io.ultreia.java4all.jaxx</groupId>
    554 497 
             <artifactId>jaxx-widgets-select</artifactId>
    555 498 
             <version>${jaxxVersion}</version>
    556 499 
             <scope>compile</scope>
    557 
    -        <exclusions>
    558 
    -          <exclusion>
    559 
    -            <groupId>org.nuiton.i18n</groupId>
    560 
    -            <artifactId>nuiton-i18n</artifactId>
    561 
    -          </exclusion>
    562 
    -        </exclusions>
    563 500 
           </dependency>
    564 501 
           <dependency>
    565 502 
             <groupId>io.ultreia.java4all.jaxx</groupId>
    566 503 
             <artifactId>jaxx-widgets-about</artifactId>
    567 504 
             <version>${jaxxVersion}</version>
    568 505 
             <scope>compile</scope>
    569 
    -        <exclusions>
    570 
    -          <exclusion>
    571 
    -            <groupId>org.nuiton.i18n</groupId>
    572 
    -            <artifactId>nuiton-i18n</artifactId>
    573 
    -          </exclusion>
    574 
    -        </exclusions>
    575 506 
           </dependency>
    576 507 
           <dependency>
    577 508 
             <groupId>io.ultreia.java4all.jaxx</groupId>
    578 509 
             <artifactId>jaxx-widgets-number</artifactId>
    579 510 
             <version>${jaxxVersion}</version>
    580 511 
             <scope>compile</scope>
    581 
    -        <exclusions>
    582 
    -          <exclusion>
    583 
    -            <groupId>org.nuiton.i18n</groupId>
    584 
    -            <artifactId>nuiton-i18n</artifactId>
    585 
    -          </exclusion>
    586 
    -        </exclusions>
    587 512 
           </dependency>
    588 513 
           <dependency>
    589 514 
             <groupId>io.ultreia.java4all.jaxx</groupId>
    590 515 
             <artifactId>jaxx-widgets-file</artifactId>
    591 516 
             <version>${jaxxVersion}</version>
    592 517 
             <scope>compile</scope>
    593 
    -        <exclusions>
    594 
    -          <exclusion>
    595 
    -            <groupId>org.nuiton.i18n</groupId>
    596 
    -            <artifactId>nuiton-i18n</artifactId>
    597 
    -          </exclusion>
    598 
    -        </exclusions>
    599 518 
           </dependency>
    600 519 
           <dependency>
    601 520 
             <groupId>io.ultreia.java4all.jaxx</groupId>
    602 521 
             <artifactId>jaxx-widgets-status</artifactId>
    603 522 
             <version>${jaxxVersion}</version>
    604 
    -        <exclusions>
    605 
    -          <exclusion>
    606 
    -            <groupId>org.nuiton.i18n</groupId>
    607 
    -            <artifactId>nuiton-i18n</artifactId>
    608 
    -          </exclusion>
    609 
    -        </exclusions>
    610 523 
           </dependency>
    611 524 
           <dependency>
    612 525 
             <groupId>io.ultreia.java4all.jaxx</groupId>
    613 526 
             <artifactId>jaxx-widgets-config</artifactId>
    614 527 
             <version>${jaxxVersion}</version>
    615 528 
             <scope>compile</scope>
    616 
    -        <exclusions>
    617 
    -          <exclusion>
    618 
    -            <groupId>org.nuiton.i18n</groupId>
    619 
    -            <artifactId>nuiton-i18n</artifactId>
    620 
    -          </exclusion>
    621 
    -        </exclusions>
    622 529 
           </dependency>
    623 530 
           <dependency>
    624 531 
             <groupId>io.ultreia.java4all.jaxx</groupId>
    ... ... @@ -644,11 +551,6 @@
    644 551 
           </dependency>
    645 552 
           <dependency>
    646 553 
             <groupId>org.swinglabs.swingx</groupId>
    647 
    -        <artifactId>swingx-painters</artifactId>
    648 
    -        <version>${swingXVersion}</version>
    649 
    -      </dependency>
    650 
    -      <dependency>
    651 
    -        <groupId>org.swinglabs.swingx</groupId>
    652 554 
             <artifactId>swingx-autocomplete</artifactId>
    653 555 
             <version>${swingXVersion}</version>
    654 556 
           </dependency>
    ... ... @@ -810,11 +712,6 @@
    810 712 
           </dependency>
    811 713 
           <dependency>
    812 714 
             <groupId>org.slf4j</groupId>
    813 
    -        <artifactId>slf4j-log4j12</artifactId>
    814 
    -        <version>${sl4jVersion}</version>
    815 
    -      </dependency>
    816 
    -      <dependency>
    817 
    -        <groupId>org.slf4j</groupId>
    818 715 
             <artifactId>slf4j-api</artifactId>
    819 716 
             <version>${sl4jVersion}</version>
    820 717 
           </dependency>
    ... ... @@ -870,6 +767,7 @@
    870 767 
             <version>${flexmarkVersion}</version>
    871 768 
           </dependency>
    872 769
    770 
    +      <!--We don't use it, but we want to use only one version-->
    873 771 
           <dependency>
    874 772 
             <groupId>org.javassist</groupId>
    875 773 
             <artifactId>javassist</artifactId>
    ... ... @@ -931,36 +829,6 @@
    931 829 
               </dependencies>
    932 830 
             </plugin>
    933 831
    934 
    -        <plugin>
    935 
    -          <artifactId>maven-scm-publish-plugin</artifactId>
    936 
    -          <configuration>
    937 
    -            <pubScmUrl>${project.distributionManagement.site.url}</pubScmUrl>
    938 
    -            <scmBranch>pages</scmBranch>
    939 
    -            <content>${project.reporting.outputDirectory}</content><!-- mono-module doesn't require site:stage -->
    940 
    -          </configuration>
    941 
    -          <executions>
    942 
    -            <execution>
    943 
    -              <id>scm-publish</id>
    944 
    -              <phase>site-deploy</phase><!-- deploy site with maven-scm-publish-plugin -->
    945 
    -              <goals>
    946 
    -                <goal>publish-scm</goal>
    947 
    -              </goals>
    948 
    -            </execution>
    949 
    -          </executions>
    950 
    -        </plugin>
    951 
    -
    952 
    -        <plugin>
    953 
    -          <groupId>org.codehaus.gmavenplus</groupId>
    954 
    -          <artifactId>gmavenplus-plugin</artifactId>
    955 
    -          <dependencies>
    956 
    -            <dependency>
    957 
    -              <groupId>org.reflections</groupId>
    958 
    -              <artifactId>reflections</artifactId>
    959 
    -              <version>${reflectionsVersion}</version>
    960 
    -            </dependency>
    961 
    -          </dependencies>
    962 
    -        </plugin>
    963 
    -
    964 832 
             <!-- Plugins version from nuiton -->
    965 833 
             <plugin>
    966 834 
               <groupId>io.ultreia.java4all.i18n</groupId>
    ... ... @@ -1000,18 +868,6 @@
    1000 868 
             </plugin>
    1001 869
    1002 870 
             <plugin>
    1003 
    -          <groupId>org.nuiton.processor</groupId>
    1004 
    -          <artifactId>processor-maven-plugin</artifactId>
    1005 
    -          <version>${processorPluginVersion}</version>
    1006 
    -        </plugin>
    1007 
    -
    1008 
    -        <plugin>
    1009 
    -          <groupId>org.nuiton</groupId>
    1010 
    -          <artifactId>helper-maven-plugin</artifactId>
    1011 
    -          <version>${helperPluginVersion}</version>
    1012 
    -        </plugin>
    1013 
    -
    1014 
    -        <plugin>
    1015 871 
               <groupId>io.ultreia.maven</groupId>
    1016 872 
               <artifactId>gitlab-maven-plugin</artifactId>
    1017 873 
               <configuration>

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