Merge pull request #264 from arxit-ygr/v2.0-ARXIT

V2.0.1 arxit
asit-asso · Nov 24, 2022 · b3174a7 · b3174a7
2 parents bf7b285 + ad2f6bb
commit b3174a7
Show file tree

Hide file tree

Showing 36 changed files with 322 additions and 123 deletions.
diff --git a/doc/MAN_ASITVD_Extract_ManuelExploitation.pdf b/doc/MAN_ASITVD_Extract_ManuelExploitation.pdf
diff --git a/doc/MAN_ASITVD_Extract_ManuelInstallation.pdf b/doc/MAN_ASITVD_Extract_ManuelInstallation.pdf
diff --git a/doc/MAN_ASITVD_Extract_ManuelUtilisation.pdf b/doc/MAN_ASITVD_Extract_ManuelUtilisation.pdf
diff --git a/doc/MAN_ASIT_Extract_ManuelExploitation.pdf b/doc/MAN_ASIT_Extract_ManuelExploitation.pdf
diff --git a/...ITVD_Extract_ManuelExploitation_V1.8.docx → ...SIT_Extract_ManuelExploitation_V1.10.docx b/...ITVD_Extract_ManuelExploitation_V1.8.docx → ...SIT_Extract_ManuelExploitation_V1.10.docx
diff --git a/doc/MAN_ASIT_Extract_ManuelInstallation.pdf b/doc/MAN_ASIT_Extract_ManuelInstallation.pdf
diff --git a/...ITVD_Extract_ManuelInstallation_V1.8.docx → ...SIT_Extract_ManuelInstallation_V1.10.docx b/...ITVD_Extract_ManuelInstallation_V1.8.docx → ...SIT_Extract_ManuelInstallation_V1.10.docx
diff --git a/doc/MAN_ASIT_Extract_ManuelUtilisation.pdf b/doc/MAN_ASIT_Extract_ManuelUtilisation.pdf
diff --git a/...SITVD_Extract_ManuelUtilisation_V1.7.docx → ..._ASIT_Extract_ManuelUtilisation_V1.8.docx b/...SITVD_Extract_ManuelUtilisation_V1.7.docx → ..._ASIT_Extract_ManuelUtilisation_V1.8.docx
diff --git a/extract-connector-easysdiv4/pom.xml b/extract-connector-easysdiv4/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ch.asit_asso</groupId>
     <artifactId>extract-connector-easysdiv4</artifactId>
-    <version>2.0-RELEASE</version>
+    <version>2.0.1-RELEASE</version>
     <packaging>jar</packaging>
     <pluginRepositories>
         <pluginRepository>
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.36</version>
+            <version>2.0.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>ch.asit_asso</groupId>
             <artifactId>extract-plugin-commoninterface</artifactId>
-            <version>2.0-RELEASE</version>
+            <version>2.0.1-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.13.3</version>
+            <version>2.13.4.2</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.2.11</version>
+            <version>1.4.4</version>
         </dependency>
     </dependencies>
     <properties>

diff --git a/extract-connector-easysdiv4/src/main/java/module-info.java b/extract-connector-easysdiv4/src/main/java/module-info.java
@@ -17,5 +17,5 @@
     requires org.apache.httpcomponents.httpcore;
     requires org.apache.httpcomponents.httpmime;
     requires org.slf4j;
-    requires logback.classic;
-}
+    requires ch.qos.logback.classic;
+}
diff --git a/extract-interface/pom.xml b/extract-interface/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ch.asit_asso</groupId>
     <artifactId>extract-plugin-commoninterface</artifactId>
-    <version>2.0-RELEASE</version>
+    <version>2.0.1-RELEASE</version>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>
@@ -14,12 +14,12 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.2.11</version>
+            <version>1.4.4</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
-            <version>1.7.36</version>
+            <version>2.0.3</version>
         </dependency>
     </dependencies>
     <build>

diff --git a/extract-task-archive/pom.xml b/extract-task-archive/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ch.asit_asso</groupId>
     <artifactId>extract-task-archive</artifactId>
-    <version>2.0-RELEASE</version>
+    <version>2.0.1-RELEASE</version>
     <packaging>jar</packaging>
     <pluginRepositories>
         <pluginRepository>
@@ -15,12 +15,12 @@
         <dependency>
             <groupId>ch.asit_asso</groupId>
             <artifactId>extract-plugin-commoninterface</artifactId>
-            <version>2.0-RELEASE</version>
+            <version>2.0.1-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.36</version>
+            <version>2.0.3</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
@@ -51,7 +51,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.13.3</version>
+            <version>2.13.4.2</version>
         </dependency>
     </dependencies>
     <properties>

diff --git a/extract-task-email/pom.xml b/extract-task-email/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ch.asit_asso</groupId>
     <artifactId>extract-task-email</artifactId>
-    <version>2.0-RELEASE</version>
+    <version>2.0.1-RELEASE</version>
     <packaging>jar</packaging>
     <pluginRepositories>
         <pluginRepository>
@@ -21,12 +21,12 @@
         <dependency>
             <groupId>ch.asit_asso</groupId>
             <artifactId>extract-plugin-commoninterface</artifactId>
-            <version>2.0-RELEASE</version>
+            <version>2.0.1-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.36</version>
+            <version>2.0.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -38,20 +38,22 @@
             <artifactId>commons-io</artifactId>
             <version>2.11.0</version>
         </dependency>
-        <dependency>
-            <groupId>commons-validator</groupId>
-            <artifactId>commons-validator</artifactId>
-            <version>1.7</version>
-        </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>javax.mail</artifactId>
             <version>1.6.2</version>
         </dependency>
+<!--
+        <dependency>
+            <groupId>commons-validator</groupId>
+            <artifactId>commons-validator</artifactId>
+            <version>1.7</version>
+        </dependency>
+-->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.13.3</version>
+            <version>2.13.4.2</version>
         </dependency>
     </dependencies>
     <properties>

diff --git a/extract-task-email/src/main/java/ch/asit_asso/extract/plugins/email/EmailPlugin.java b/extract-task-email/src/main/java/ch/asit_asso/extract/plugins/email/EmailPlugin.java
@@ -16,24 +16,24 @@
  */
 package ch.asit_asso.extract.plugins.email;
 
-import ch.asit_asso.extract.plugins.common.ITaskProcessor;
-import ch.asit_asso.extract.plugins.common.ITaskProcessorRequest;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import java.lang.reflect.Field;
 import java.text.DateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
 import javax.mail.internet.AddressException;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.validator.routines.EmailValidator;
+import javax.mail.internet.InternetAddress;
 import ch.asit_asso.extract.plugins.common.IEmailSettings;
+import ch.asit_asso.extract.plugins.common.ITaskProcessor;
+import ch.asit_asso.extract.plugins.common.ITaskProcessorRequest;
 import ch.asit_asso.extract.plugins.common.ITaskProcessorResult;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -397,12 +397,11 @@ private String[] parseToAddressesString(final String addressesString) {
         }
 
         List<String> addressesList = new ArrayList<>();
-        EmailValidator validator = EmailValidator.getInstance();
 
         for (String address : addressesString.split("[,;]")) {
             address = address.trim();
 
-            if (validator.isValid(address)) {
+            if (this.isEmailAddressValid(address)) {
                 addressesList.add(address);
             }
         }
@@ -412,6 +411,30 @@ private String[] parseToAddressesString(final String addressesString) {
 
 
 
+    private boolean isEmailAddressValid(final String address) {
+//        EmailValidator validator = EmailValidator.getInstance();
+//
+//        if (validator.isValid(address)) {
+//            return true;
+//        }
+//
+//        return false;
+
+        // Version temporaire le temps que la faille due aux dépendances d'Apache Commons Validator soit corrigée
+        // (prévu pour la v2.0 de cette librairie)
+        try {
+            InternetAddress emailAddr = new InternetAddress(address);
+            emailAddr.validate();
+
+        } catch (AddressException ex) {
+            return false;
+        }
+
+        return true;
+    }
+
+
+
     /**
      * Substitutes the placeholders for request variables in a string with their value.
      *

diff --git a/extract-task-email/src/main/java/module-info.java b/extract-task-email/src/main/java/module-info.java
@@ -9,9 +9,9 @@
 
     requires com.fasterxml.jackson.core;
     requires com.fasterxml.jackson.databind;
-    requires commons.validator;
+    //requires commons.validator;
     requires java.mail;
     requires org.apache.commons.io;
     requires org.apache.commons.lang3;
     requires org.slf4j;
-}
+}
diff --git a/extract-task-fmedesktop/pom.xml b/extract-task-fmedesktop/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ch.asit_asso</groupId>
     <artifactId>extract-task-fmedesktop</artifactId>
-    <version>2.0-RELEASE</version>
+    <version>2.0.1-RELEASE</version>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>extract-plugin-commoninterface</artifactId>
-            <version>2.0-RELEASE</version>
+            <version>2.0.1-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.13.3</version>
+            <version>2.13.4.2</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/extract-task-fmeserver/pom.xml b/extract-task-fmeserver/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ch.asit_asso</groupId>
     <artifactId>extract-task-fmeserver</artifactId>
-    <version>2.0-RELEASE</version>
+    <version>2.0.1-RELEASE</version>
     <packaging>jar</packaging>
     <pluginRepositories>
         <pluginRepository>
@@ -12,6 +12,11 @@
         </pluginRepository>
     </pluginRepositories>
     <dependencies>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>2.0.3</version>
+        </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
@@ -21,12 +26,12 @@
         <dependency>
             <groupId>ch.asit_asso</groupId>
             <artifactId>extract-plugin-commoninterface</artifactId>
-            <version>2.0-RELEASE</version>
+            <version>2.0.1-RELEASE</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.13</version>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>5.1.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -36,7 +41,7 @@
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20211205</version>
+            <version>20220924</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -51,7 +56,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.13.3</version>
+            <version>2.13.4.2</version>
         </dependency>
     </dependencies>
     <properties>

diff --git a/extract-task-reject/pom.xml b/extract-task-reject/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ch.asit_asso</groupId>
     <artifactId>extract-task-reject</artifactId>
-    <version>2.0-RELEASE</version>
+    <version>2.0.1-RELEASE</version>
     <packaging>jar</packaging>
     <pluginRepositories>
         <pluginRepository>
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>ch.asit_asso</groupId>
             <artifactId>extract-plugin-commoninterface</artifactId>
-            <version>2.0-RELEASE</version>
+            <version>2.0.1-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.13.3</version>
+            <version>2.13.4.2</version>
         </dependency>
     </dependencies>
     <properties>

diff --git a/extract-task-remark/pom.xml b/extract-task-remark/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ch.asit_asso</groupId>
     <artifactId>extract-task-remark</artifactId>
-    <version>2.0-RELEASE</version>
+    <version>2.0.1-RELEASE</version>
     <packaging>jar</packaging>
     <pluginRepositories>
         <pluginRepository>
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>ch.asit_asso</groupId>
             <artifactId>extract-plugin-commoninterface</artifactId>
-            <version>2.0-RELEASE</version>
+            <version>2.0.1-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.13.3</version>
+            <version>2.13.4.2</version>
         </dependency>
     </dependencies>
     <properties>