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

Commits:

7 changed files:

Changes:

  • client-core/pom.xml
    ... ... @@ -20,7 +20,8 @@
    20 20 
       <http://www.gnu.org/licenses/gpl-3.0.html>.
    21 21 
       #L%
    22 22 
       -->
    23 
    -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    23 
    +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    24 
    +         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    24 25 
       <modelVersion>4.0.0</modelVersion>
    25 26
    26 27 
       <parent>
    ... ... @@ -769,7 +770,6 @@
    769 770 
                 <artifactId>common-dto</artifactId>
    770 771 
                 <version>${observeToolkitVersion}</version>
    771 772 
               </dependency>
    772 
    -
    773 773 
             </dependencies>
    774 774 
           </plugin>
    775 775

  • client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidationMessageTableRenderer.java
    ... ... @@ -25,7 +25,7 @@ package fr.ird.observe.client.ui.util;
    25 25 
     import fr.ird.observe.client.ui.admin.validate.ValidationMessageTableModel;
    26 26 
     import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper;
    27 27 
     import fr.ird.observe.services.service.actions.validate.ValidationResultDtoMessage;
    28 
    -import org.nuiton.i18n.util.BeanPropertyI18nKeyProducer;
    28 
    +import io.ultreia.java4all.i18n.spi.bean.BeanPropertyI18nKeyProducer;
    29 29 
     import org.nuiton.jaxx.validator.swing.SwingValidatorUtil;
    30 30 
     import org.nuiton.validator.NuitonValidatorScope;
    31 31

  • client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidatorMessageTableRenderer.java
    ... ... @@ -23,10 +23,10 @@ package fr.ird.observe.client.ui.util;
    23 23 
      */
    24 24
    25 25 
     import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper;
    26 
    +import io.ultreia.java4all.i18n.spi.bean.BeanPropertyI18nKeyProducer;
    26 27 
     import org.apache.commons.lang3.BooleanUtils;
    27 28 
     import org.apache.logging.log4j.LogManager;
    28 29 
     import org.apache.logging.log4j.Logger;
    29 
    -import org.nuiton.i18n.util.BeanPropertyI18nKeyProducer;
    30 30 
     import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;
    31 31 
     import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel;
    32 32 
     import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableRenderer;

  • dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nDecoratorHelper.java
    ... ... @@ -23,8 +23,8 @@ package fr.ird.observe.dto.decoration;
    23 23 
      */
    24 24
    25 25 
     import com.google.auto.service.AutoService;
    26 
    -import org.nuiton.i18n.util.BeanPropertyI18nKeyProducer;
    27 
    -import org.nuiton.i18n.util.BeanPropertyI18nKeyProducerProvider;
    26 
    +import io.ultreia.java4all.i18n.spi.bean.BeanPropertyI18nKeyProducer;
    27 
    +import io.ultreia.java4all.i18n.spi.bean.BeanPropertyI18nKeyProducerProvider;
    28 28
    29 29 
     /**
    30 30 
      * Created on 03/09/16.

  • dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java
    ... ... @@ -28,7 +28,7 @@ import fr.ird.observe.dto.IdHelper;
    28 28 
     import fr.ird.observe.dto.data.DataDto;
    29 29 
     import fr.ird.observe.dto.referential.I18nReferentialDto;
    30 30 
     import fr.ird.observe.dto.referential.ReferentialDto;
    31 
    -import org.nuiton.i18n.util.BeanPropertyI18nKeyProducerSupport;
    31 
    +import io.ultreia.java4all.i18n.spi.bean.BeanPropertyI18nKeyProducerSupport;
    32 32
    33 33 
     import java.util.Map;
    34 34

  • persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql
    ... ... @@ -19,27 +19,7 @@
    19 19 
     -- <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 20 
     -- #L%
    21 21 
     ---
    22 
    ----
    23 
    --- #%L
    24 
    --- ObServe :: Persistence
    25 
    --- %%
    26 
    --- Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
    27 
    --- %%
    28 
    --- This program is free software: you can redistribute it and/or modify
    29 
    --- it under the terms of the GNU General Public License as
    30 
    --- published by the Free Software Foundation, either version 3 of the
    31 
    --- License, or (at your option) any later version.
    32 
    ---
    33 
    --- This program is distributed in the hope that it will be useful,
    34 
    --- but WITHOUT ANY WARRANTY; without even the implied warranty of
    35 
    --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    36 
    --- GNU General Public License for more details.
    37 
    ---
    38 
    --- You should have received a copy of the GNU General Public
    39 
    --- License along with this program.  If not, see
    40 
    --- <http://www.gnu.org/licenses/gpl-3.0.html>.
    41 
    --- #L%
    42 
    ----
    22 
    +
    43 23 
     INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.3',0,'2018-11-12','2018-11-12 17:27:06.06232','',null,'FOB',null,1,false,null,null,false,false,'FOB','FOB','FOB',null,null,null,null,null,true,true,null);
    44 24 
     INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1',0,'2018-11-12','2018-11-12 17:27:06.06232','1',null,'FAD','fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.3',1,false,null,null,false,false,'FAD','FAD','FAD',null,null,null,null,null,false,false,null);
    45 25 
     INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2',1,'2018-11-12','2018-11-12 17:27:06.06232','1-1',null,'DFAD','fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1',1,false,null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0',false,false,'DFAD (drifting FAD)','DFAD (FAD dérivant)','DFAD (FAD a la deriva)',null,null,null,null,null,true,false,null);

  • pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>io.ultreia.maven</groupId>
    28 28 
         <artifactId>pom</artifactId>
    29 
    -    <version>2018.8.4</version>
    29 
    +    <version>2018.8.8</version>
    30 30 
       </parent>
    31 31
    32 32 
       <groupId>fr.ird.observe</groupId>
    ... ... @@ -155,7 +155,7 @@
    155 155 
         <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>
    156 156 
         <buildDate>${maven.build.timestamp}</buildDate>
    157 157
    158 
    -    <observeToolkitVersion>3.7.12</observeToolkitVersion>
    158 
    +    <observeToolkitVersion>3.7.13</observeToolkitVersion>
    159 159 
         <!--<lib.version.java4all.http>1.0.13</lib.version.java4all.http>-->
    160 160 
         <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>
    161 161 
         <!--<lib.version.java4all.config>1.0.3</lib.version.java4all.config>-->
    ... ... @@ -163,12 +163,12 @@
    163 163 
         <!--<lib.version.hibernate>5.2.10.Final</lib.version.hibernate>-->
    164 164 
         <!--can't use 1.4.197 (date has changed + blob also-->
    165 165 
         <lib.version.h2>1.4.196</lib.version.h2>
    166 
    -    <!--<lib.version.java4all.jaxx>3.0-alpha-43-SNAPSHOT</lib.version.java4all.jaxx>-->
    167 
    -    <!--<lib.version.java4all.i18n>4.0-beta-3-SNAPSHOT</lib.version.java4all.i18n>-->
    166 
    +    <!--<lib.version.java4all.jaxx>3.0-alpha-47-SNAPSHOT</lib.version.java4all.jaxx>-->
    167 
    +    <!--<lib.version.java4all.i18n>4.0-beta-6-SNAPSHOT</lib.version.java4all.i18n>-->
    168 168
    169 169 
         <!--<lib.version.nuiton.topia>3.6-SNAPSHOT</lib.version.nuiton.topia>-->
    170 170 
         <!--<lib.version.java4all.eugene>3.0-alpha-21</lib.version.java4all.eugene>-->
    171 
    -    <!--<lib.version.java4all.topia>1.1.9-SNAPSHOT</lib.version.java4all.topia>-->
    171 
    +    <!--<lib.version.java4all.config>1.0.9-SNAPSHOT</lib.version.java4all.config>-->
    172 172 
         <!-- license header configuration -->
    173 173 
         <license.licenseName>gpl_v3</license.licenseName>
    174 174 
         <license.organizationName>IRD, Code Lutin, Ultreia.io</license.organizationName>
    ... ... @@ -336,6 +336,21 @@
    336 336 
               </configuration>
    337 337 
             </plugin>
    338 338
    339 
    +        <plugin>
    340 
    +          <groupId>io.ultreia.java4all.config</groupId>
    341 
    +          <artifactId>config-maven-plugin</artifactId>
    342 
    +          <version>${lib.version.java4all.config}</version>
    343 
    +          <dependencies>
    344 
    +            <dependency>
    345 
    +              <groupId>io.ultreia.java4all.jaxx</groupId>
    346 
    +              <artifactId>jaxx-widgets-gis</artifactId>
    347 
    +              <version>${lib.version.java4all.jaxx}</version>
    348 
    +            </dependency>
    349 
    +          </dependencies>
    350 
    +
    351 
    +        </plugin>
    352 
    +
    353 
    +
    339 354 
           </plugins>
    340 355 
         </pluginManagement>
    341 356 
       </build>
    ... ... @@ -374,19 +389,20 @@
    374 389 
           <reporting>
    375 390 
             <plugins>
    376 391
    377 
    -          <!--<plugin>-->
    378 
    -            <!--<groupId>io.ultreia.java4all.config</groupId>-->
    379 
    -            <!--<artifactId>config-maven-plugin</artifactId>-->
    380 
    -            <!--<version>${lib.version.java4all.config}</version>-->
    381 
    -            <!--<inherited>false</inherited>-->
    382 
    -            <!--<reportSets>-->
    383 
    -              <!--<reportSet>-->
    384 
    -                <!--<reports>-->
    385 
    -                  <!--<report>aggregate-report</report>-->
    386 
    -                <!--</reports>-->
    387 
    -              <!--</reportSet>-->
    388 
    -            <!--</reportSets>-->
    389 
    -          <!--</plugin>-->
    392 
    +          <plugin>
    393 
    +            <groupId>io.ultreia.java4all.config</groupId>
    394 
    +            <artifactId>config-maven-plugin</artifactId>
    395 
    +            <version>${lib.version.java4all.config}</version>
    396 
    +            <inherited>false</inherited>
    397 
    +            <reportSets>
    398 
    +              <reportSet>
    399 
    +                <reports>
    400 
    +                  <report>aggregate-report</report>
    401 
    +                </reports>
    402 
    +              </reportSet>
    403 
    +            </reportSets>
    404 
    +
    405 
    +          </plugin>
    390 406
    391 407 
               <plugin>
    392 408 
                 <artifactId>maven-project-info-reports-plugin</artifactId>

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