[Git][ultreiaio/ird-observe][develop-7.x] update some libs

18 Nov 2018

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


Commits:
f249e6ae by tchemit at 2018-11-18T19:54:21Z
update some libs

- - - - -


7 changed files:

- client-core/pom.xml
- client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidationMessageTableRenderer.java
- client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidatorMessageTableRenderer.java
- dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nDecoratorHelper.java
- dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java
- persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql
- pom.xml


Changes:

=====================================
client-core/pom.xml
=====================================
@@ -20,7 +20,8 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<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">
+<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">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -769,7 +770,6 @@
             <artifactId>common-dto</artifactId>
             <version>${observeToolkitVersion}</version>
           </dependency>
-
         </dependencies>
       </plugin>
 


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


=====================================
client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidatorMessageTableRenderer.java
=====================================
@@ -23,10 +23,10 @@ package fr.ird.observe.client.ui.util;
  */
 
 import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper;
+import io.ultreia.java4all.i18n.spi.bean.BeanPropertyI18nKeyProducer;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.nuiton.i18n.util.BeanPropertyI18nKeyProducer;
 import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;
 import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel;
 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;
  */
 
 import com.google.auto.service.AutoService;
-import org.nuiton.i18n.util.BeanPropertyI18nKeyProducer;
-import org.nuiton.i18n.util.BeanPropertyI18nKeyProducerProvider;
+import io.ultreia.java4all.i18n.spi.bean.BeanPropertyI18nKeyProducer;
+import io.ultreia.java4all.i18n.spi.bean.BeanPropertyI18nKeyProducerProvider;
 
 /**
  * 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;
 import fr.ird.observe.dto.data.DataDto;
 import fr.ird.observe.dto.referential.I18nReferentialDto;
 import fr.ird.observe.dto.referential.ReferentialDto;
-import org.nuiton.i18n.util.BeanPropertyI18nKeyProducerSupport;
+import io.ultreia.java4all.i18n.spi.bean.BeanPropertyI18nKeyProducerSupport;
 
 import java.util.Map;
 


=====================================
persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql
=====================================
@@ -19,27 +19,7 @@
 -- <http://www.gnu.org/licenses/gpl-3.0.html>.
 -- #L%
 ---
----

--- #%L
--- ObServe :: Persistence
--- %%
--- Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
--- %%
--- This program is free software: you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as
--- published by the Free Software Foundation, either version 3 of the
--- License, or (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public
--- License along with this program.  If not, see
--- <http://www.gnu.org/licenses/gpl-3.0.html>.
--- #L%
----
+
 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);
 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);
 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 @@
   <parent>
     <groupId>io.ultreia.maven</groupId>
     <artifactId>pom</artifactId>
-    <version>2018.8.4</version>
+    <version>2018.8.8</version>
   </parent>
 
   <groupId>fr.ird.observe</groupId>
@@ -155,7 +155,7 @@
     <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>
     <buildDate>${maven.build.timestamp}</buildDate>
 
-    <observeToolkitVersion>3.7.12</observeToolkitVersion>
+    <observeToolkitVersion>3.7.13</observeToolkitVersion>
     <!--<lib.version.java4all.http>1.0.13</lib.version.java4all.http>-->
     <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>
     <!--<lib.version.java4all.config>1.0.3</lib.version.java4all.config>-->
@@ -163,12 +163,12 @@
     <!--<lib.version.hibernate>5.2.10.Final</lib.version.hibernate>-->
     <!--can't use 1.4.197 (date has changed + blob also-->
     <lib.version.h2>1.4.196</lib.version.h2>
-    <!--<lib.version.java4all.jaxx>3.0-alpha-43-SNAPSHOT</lib.version.java4all.jaxx>-->
-    <!--<lib.version.java4all.i18n>4.0-beta-3-SNAPSHOT</lib.version.java4all.i18n>-->
+    <!--<lib.version.java4all.jaxx>3.0-alpha-47-SNAPSHOT</lib.version.java4all.jaxx>-->
+    <!--<lib.version.java4all.i18n>4.0-beta-6-SNAPSHOT</lib.version.java4all.i18n>-->
 
     <!--<lib.version.nuiton.topia>3.6-SNAPSHOT</lib.version.nuiton.topia>-->
     <!--<lib.version.java4all.eugene>3.0-alpha-21</lib.version.java4all.eugene>-->
-    <!--<lib.version.java4all.topia>1.1.9-SNAPSHOT</lib.version.java4all.topia>-->
+    <!--<lib.version.java4all.config>1.0.9-SNAPSHOT</lib.version.java4all.config>-->
     <!-- license header configuration -->
     <license.licenseName>gpl_v3</license.licenseName>
     <license.organizationName>IRD, Code Lutin, Ultreia.io</license.organizationName>
@@ -336,6 +336,21 @@
           </configuration>
         </plugin>
 
+        <plugin>
+          <groupId>io.ultreia.java4all.config</groupId>
+          <artifactId>config-maven-plugin</artifactId>
+          <version>${lib.version.java4all.config}</version>
+          <dependencies>
+            <dependency>
+              <groupId>io.ultreia.java4all.jaxx</groupId>
+              <artifactId>jaxx-widgets-gis</artifactId>
+              <version>${lib.version.java4all.jaxx}</version>
+            </dependency>
+          </dependencies>
+
+        </plugin>
+
+
       </plugins>
     </pluginManagement>
   </build>
@@ -374,19 +389,20 @@
       <reporting>
         <plugins>
 
-          <!--<plugin>-->
-            <!--<groupId>io.ultreia.java4all.config</groupId>-->
-            <!--<artifactId>config-maven-plugin</artifactId>-->
-            <!--<version>${lib.version.java4all.config}</version>-->
-            <!--<inherited>false</inherited>-->
-            <!--<reportSets>-->
-              <!--<reportSet>-->
-                <!--<reports>-->
-                  <!--<report>aggregate-report</report>-->
-                <!--</reports>-->
-              <!--</reportSet>-->
-            <!--</reportSets>-->
-          <!--</plugin>-->
+          <plugin>
+            <groupId>io.ultreia.java4all.config</groupId>
+            <artifactId>config-maven-plugin</artifactId>
+            <version>${lib.version.java4all.config}</version>
+            <inherited>false</inherited>
+            <reportSets>
+              <reportSet>
+                <reports>
+                  <report>aggregate-report</report>
+                </reports>
+              </reportSet>
+            </reportSets>
+
+          </plugin>
 
           <plugin>
             <artifactId>maven-project-info-reports-plugin</artifactId>



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f249e6aed50fa991277efbf4422b...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f249e6aed50fa991277efbf4422b...
You're receiving this email because of your account on gitlab.com.

    

Tony CHEMIT

tags

participants (1)