GitLab

at 2021-12-24T00:02:24+01:00

[jgitflow-maven-plugin]updating poms for 7.6.11-SNAPSHOT development[skip ci]
[jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci]
[jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x'
[jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci]
Revert "Problème sur la gestion des référentiels manquant lors d'un import - See #1784"

Closes #2150

This reverts commit 87dd7e14da1f7ce7eb956809bf6378c1ccb889b6.

update to log4j 2.17.1 - Closes #2151

[jgitflow-maven-plugin]updating poms for branch'release/7.6.11' with non-snapshot versions[skip ci]
[jgitflow-maven-plugin]merging 'release/7.6.11' into 'master-7.x'
   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.6.10</version>

+    <version>7.6.11</version>

   </parent>

   <artifactId>client-configuration</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.6.10</version>

+    <version>7.6.11</version>

   </parent>

   <artifactId>client-core</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.6.10</version>

+    <version>7.6.11</version>

   </parent>

   <artifactId>client-runner</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.6.10</version>

+    <version>7.6.11</version>

   </parent>

   <groupId>fr.ird.observe.toolkit</groupId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.6.10</version>

+    <version>7.6.11</version>

   </parent>

   <groupId>fr.ird.observe.toolkit</groupId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.6.10</version>

+    <version>7.6.11</version>

   </parent>

   <groupId>fr.ird.observe.toolkit</groupId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.6.10</version>

+    <version>7.6.11</version>

   </parent>

   <groupId>fr.ird.observe.toolkit</groupId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.6.10</version>

+    <version>7.6.11</version>

   </parent>

   <artifactId>dto</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.6.10</version>

+    <version>7.6.11</version>

   </parent>

   <artifactId>observe-i18n</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.6.10</version>

+    <version>7.6.11</version>

   </parent>

   <artifactId>observe</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.6.10</version>

+    <version>7.6.11</version>

   </parent>

   <artifactId>persistence</artifactId>

   <groupId>fr.ird.observe</groupId>

   <artifactId>ird-observe</artifactId>

-  <version>7.6.10</version>

+  <version>7.6.11</version>

   <packaging>pom</packaging>

   <name>ObServe :: Pom</name>

     <lib.version.nuiton.utils>3.0</lib.version.nuiton.utils>

     <lib.version.java4all.jaxx>3.0-alpha-75</lib.version.java4all.jaxx>

-    <lib.version.log4j2>2.17.0</lib.version.log4j2>

+    <lib.version.log4j2>2.17.1</lib.version.log4j2>

 <!--    <lib.version.hibernate>5.6.3.Final</lib.version.hibernate>-->

 <!--    <lib.version.hikariCP>5.0.0</lib.version.hikariCP>-->

 <!--    <lib.version.bytebuddy>1.12.2</lib.version.bytebuddy>-->

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.6.10</version>

+    <version>7.6.11</version>

   </parent>

   <artifactId>server-configuration</artifactId>

     <dependency>

       <groupId>fr.ird.observe</groupId>

       <artifactId>services</artifactId>

-      <version>7.6.10</version>

+      <version>7.6.11</version>

       <scope>compile</scope>

     </dependency>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.6.10</version>

+    <version>7.6.11</version>

   </parent>

   <artifactId>server-core</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.6.10</version>

+    <version>7.6.11</version>

   </parent>

   <artifactId>server-runner</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.6.10</version>

+    <version>7.6.11</version>

   </parent>

   <artifactId>services-client</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.6.10</version>

+    <version>7.6.11</version>

   </parent>

   <artifactId>services-local</artifactId>

 import org.nuiton.topia.persistence.TopiaEntity;

 import org.nuiton.topia.persistence.TopiaEntityVisitor;

-import java.util.Collection;

 import java.util.Set;

 import java.util.TreeSet;

         @Override

         public void visit(TopiaEntity entity, String propertyName, Class<?> collectionType, Class<?> type, Object value) {

-            if (TopiaEntity.class.isAssignableFrom(type)) {

-                for (Object child : ((Collection<?>) value)) {

-                    ((TopiaEntity) child).accept(this);

-                }

-            }

+

         }

         @Override

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.6.10</version>

+    <version>7.6.11</version>

   </parent>

   <artifactId>services</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.6.10</version>

+    <version>7.6.11</version>

   </parent>

   <groupId>fr.ird.observe.toolkit</groupId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.6.10</version>

+    <version>7.6.11</version>

   </parent>

   <artifactId>test</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.6.10</version>

+    <version>7.6.11</version>

   </parent>

   <groupId>fr.ird.observe.toolkit</groupId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>ird-observe</artifactId>

-    <version>7.6.10</version>

+    <version>7.6.11</version>

   </parent>

   <artifactId>validation</artifactId>

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

Commits:

23 changed files:

Changes: