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

v2.0.3 Release
asit-asso · Mar 1, 2023 · 7da1184 · 7da1184
2 parents 9e1d738 + cf6103e
commit 7da1184
Show file tree

Hide file tree

Showing 18 changed files with 117 additions and 111 deletions.
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.2-RELEASE</version>
+    <version>2.0.3-RELEASE</version>
     <packaging>jar</packaging>
     <pluginRepositories>
         <pluginRepository>
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>ch.asit_asso</groupId>
             <artifactId>extract-plugin-commoninterface</artifactId>
-            <version>2.0.2-RELEASE</version>
+            <version>2.0.3-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>

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.2-RELEASE</version>
+    <version>2.0.3-RELEASE</version>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>

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.2-RELEASE</version>
+    <version>2.0.3-RELEASE</version>
     <packaging>jar</packaging>
     <pluginRepositories>
         <pluginRepository>
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>ch.asit_asso</groupId>
             <artifactId>extract-plugin-commoninterface</artifactId>
-            <version>2.0.2-RELEASE</version>
+            <version>2.0.3-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -53,6 +53,11 @@
             <artifactId>jackson-databind</artifactId>
             <version>2.14.0</version>
         </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.4.5</version>
+        </dependency>
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/extract-task-archive/src/main/java/module-info.java b/extract-task-archive/src/main/java/module-info.java
@@ -12,4 +12,5 @@
     requires org.apache.commons.lang3;
     requires org.apache.commons.io;
     requires org.slf4j;
-}
+    requires ch.qos.logback.classic;
+}
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.2-RELEASE</version>
+    <version>2.0.3-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.2-RELEASE</version>
+            <version>2.0.3-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -55,6 +55,11 @@
             <artifactId>jackson-databind</artifactId>
             <version>2.14.0</version>
         </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.4.5</version>
+        </dependency>
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/extract-task-email/src/main/java/module-info.java b/extract-task-email/src/main/java/module-info.java
@@ -14,4 +14,5 @@
     requires org.apache.commons.io;
     requires org.apache.commons.lang3;
     requires org.slf4j;
+    requires ch.qos.logback.classic;
 }
diff --git a/extract-task-fmedesktop/pom.xml b/extract-task-fmedesktop/pom.xml
@@ -3,19 +3,24 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ch.asit_asso</groupId>
     <artifactId>extract-task-fmedesktop</artifactId>
-    <version>2.0.2-RELEASE</version>
+    <version>2.0.3-RELEASE</version>
     <packaging>jar</packaging>
     <dependencies>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.2</version>
-            <type>jar</type>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>commons-logging</groupId>-->
+<!--            <artifactId>commons-logging</artifactId>-->
+<!--            <version>1.2</version>-->
+<!--            <type>jar</type>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>extract-plugin-commoninterface</artifactId>
-            <version>2.0.2-RELEASE</version>
+            <version>2.0.3-RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.4.5</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -67,6 +72,39 @@
             </plugins>
         </pluginManagement>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.3.0</version>
+                <configuration>
+                    <filters>
+                        <filter>
+                            <artifact>*:*</artifact>
+                            <excludes>
+                                <exclude>module-info.class</exclude>
+                                <exclude>META-INF/*.SF</exclude>
+                                <exclude>META-INF/*.DSA</exclude>
+                                <exclude>META-INF/*.RSA</exclude>
+                            </excludes>
+                        </filter>
+                    </filters>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <minimizeJar>true</minimizeJar>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                            <dependencyReducedPomLocation>
+                                ${java.io.tmpdir}/dependency-reduced-pom.xml
+                            </dependencyReducedPomLocation>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

diff --git a/...sk-fmedesktop/src/main/java/ch/asit_asso/extract/plugins/fmedesktop/FmeDesktopPlugin.java b/...sk-fmedesktop/src/main/java/ch/asit_asso/extract/plugins/fmedesktop/FmeDesktopPlugin.java
@@ -11,6 +11,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -335,7 +336,11 @@ private String formatJsonParametersQuotes(final String json) {
             return json;
         }
 
-        return String.format("\"%s\"", json.replaceAll("\\\\\"", "\\\\u0022").replaceAll("\"", "\"\""));
+        return String.format("\"%s\"", json.replaceAll("\\\\\\\\", "\\\\u005c")
+                                           .replaceAll("\\\\n", "\\\\u000d\\\\u000a")
+                                           .replaceAll("\\\\\"", "\\\\u0022")
+                                           .replaceAll("\"", "\"\"")
+                                           .replaceAll("/", "\\\\u002f"));
     }
 
 
@@ -356,7 +361,8 @@ private String getFmeCommandForRequest(final ITaskProcessorRequest request, fina
 
         return String.format(
                 "\"%s\" \"%s\" --%s \"%s\" --%s \"%s\" --%s \"%s\" --%s %s --%s \"%s\" --%s %s --%s \"%s\" --%s \"%s\"",
-                fmeExecutablePath, fmeScriptPath, this.config.getProperty("paramRequestPerimeter"), perimeter,
+                fmeExecutablePath, Paths.get(fmeScriptPath).getFileName().toString(),
+                this.config.getProperty("paramRequestPerimeter"), perimeter,
                 this.config.getProperty("paramRequestProduct"), productId,
                 this.config.getProperty("paramRequestFolderOut"), request.getFolderOut(),
                 this.config.getProperty("paramRequestParameters"), this.formatJsonParametersQuotes(parameters),
@@ -375,7 +381,7 @@ private String[] getFmeCommandForRequestAsArray(final ITaskProcessorRequest requ
         final String parameters = request.getParameters();
 
         return new String[]{
-            fmeExecutablePath, fmeScriptPath,
+            fmeExecutablePath, Paths.get(fmeScriptPath).getFileName().toString(),
             this.formatParameterName("paramRequestPerimeter"), perimeter,
             this.formatParameterName("paramRequestProduct"), productId,
             this.formatParameterName("paramRequestFolderOut"), request.getFolderOut(),
@@ -458,11 +464,13 @@ private Process launchFmeTaskProcess(final ITaskProcessorRequest request, final
             if (SystemUtils.IS_OS_WINDOWS) {
                 final String command = this.getFmeCommandForRequest(request, fmeScriptPath, fmeExecutablePath);
                 this.logger.debug("Executed command line is : {}", command);
+                //fmeTaskProcess = Runtime.getRuntime().exec(command, null, dirWorkspace);
                 processBuilder = new ProcessBuilder(command);
 
             } else {
                 final String[] commandArray = this.getFmeCommandForRequestAsArray(request, fmeScriptPath, fmeExecutablePath);
                 this.logger.debug("Executed command line tokens are : {}", StringUtils.join(commandArray, " "));
+                //fmeTaskProcess = Runtime.getRuntime().exec(commandArray, null, dirWorkspace);
                 processBuilder = new ProcessBuilder(commandArray);
             }
 

diff --git a/extract-task-fmedesktop/src/main/java/module-info.java b/extract-task-fmedesktop/src/main/java/module-info.java
@@ -12,4 +12,5 @@
     requires org.apache.commons.io;
     requires org.apache.commons.lang3;
     requires org.slf4j;
-}
+    requires ch.qos.logback.classic;
+}
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.2-RELEASE</version>
+    <version>2.0.3-RELEASE</version>
     <packaging>jar</packaging>
     <pluginRepositories>
         <pluginRepository>
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>ch.asit_asso</groupId>
             <artifactId>extract-plugin-commoninterface</artifactId>
-            <version>2.0.2-RELEASE</version>
+            <version>2.0.3-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents.client5</groupId>
@@ -58,6 +58,11 @@
             <artifactId>jackson-databind</artifactId>
             <version>2.14.0</version>
         </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.4.5</version>
+        </dependency>
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/extract-task-fmeserver/src/main/java/module-info.java b/extract-task-fmeserver/src/main/java/module-info.java
@@ -15,4 +15,5 @@
     requires org.apache.httpcomponents.httpcore;
     requires org.json;
     requires org.slf4j;
-}
+    requires ch.qos.logback.classic;
+}
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.2-RELEASE</version>
+    <version>2.0.3-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.2-RELEASE</version>
+            <version>2.0.3-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -38,6 +38,11 @@
             <artifactId>jackson-databind</artifactId>
             <version>2.14.0</version>
         </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.4.5</version>
+        </dependency>
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/extract-task-reject/src/main/java/module-info.java b/extract-task-reject/src/main/java/module-info.java
@@ -12,4 +12,5 @@
     requires org.apache.commons.io;
     requires org.apache.commons.lang3;
     requires org.slf4j;
-}
+    requires ch.qos.logback.classic;
+}
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.2-RELEASE</version>
+    <version>2.0.3-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.2-RELEASE</version>
+            <version>2.0.3-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -38,6 +38,11 @@
             <artifactId>jackson-databind</artifactId>
             <version>2.14.0</version>
         </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.4.5</version>
+        </dependency>
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/extract-task-remark/src/main/java/module-info.java b/extract-task-remark/src/main/java/module-info.java
@@ -12,4 +12,5 @@
     requires org.apache.commons.io;
     requires org.apache.commons.lang3;
     requires org.slf4j;
-}
+    requires ch.qos.logback.classic;
+}
diff --git a/extract-task-validation/pom.xml b/extract-task-validation/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ch.asit_asso</groupId>
     <artifactId>extract-task-validation</artifactId>
-    <version>2.0.2-RELEASE</version>
+    <version>2.0.3-RELEASE</version>
     <packaging>jar</packaging>
     <pluginRepositories>
         <pluginRepository>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>ch.asit_asso</groupId>
             <artifactId>extract-plugin-commoninterface</artifactId>
-            <version>2.0.2-RELEASE</version>
+            <version>2.0.3-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>
@@ -49,6 +49,11 @@
             <artifactId>jackson-core</artifactId>
             <version>2.14.0</version>
         </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.4.5</version>
+        </dependency>
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/extract-task-validation/src/main/java/module-info.java b/extract-task-validation/src/main/java/module-info.java
@@ -11,4 +11,5 @@
     requires org.apache.commons.lang3;
     requires org.slf4j;
     requires com.fasterxml.jackson.databind;
-}
+    requires ch.qos.logback.classic;
+}