fix(TUP-35616): Problems on the \ processing on the password field after TUP-32821 (#7553)

* fix(TUP-35616): Problems on the \ processing on the password field after
TUP-32821
https://jira.talendforge.org/browse/TUP-35616

* Update PasswordDialog.java

* fix(TUP-35616): Problems on the \ processing on the password field after
TUP-32821
https://jira.talendforge.org/browse/TUP-35616

main/plugins/org.talend.designer.codegen/jet_stub/generic/component_util_indexedrecord_to_rowstruct.javajet

@@ -170,16 +170,8 @@ class IndexedRecordToRowStructGenerator {
             if (columnName.equals(dynamicColName)) {
             %>
                 java.util.Map<String, Object> dynamicValue_<%=cid%> = (java.util.Map<String, Object>) <%=codeVarSchemaEnforcer%>.get(<%=i%>);
-				org.apache.avro.Schema dynSchema_<%=cid%> = ((org.talend.codegen.enforcer.OutgoingDynamicSchemaEnforcer) <%=codeVarSchemaEnforcer%>).getDynamicFieldsSchema();
-                for (org.apache.avro.Schema.Field dynamicField_<%=cid%> : dynSchema_<%=cid%>.getFields()){
-					String name = dynamicField_<%=cid%>.name();
-					if("true".equals(dynamicField_<%=cid%>.getProp("ENABLE_SPECIAL_TABLENAME"))){
-							dynamicValue_<%=cid%>.put(dynamicField_<%=cid%>.getProp("talend.field.dbColumnName"), dynamicValue_<%=cid%>.get(name));
-							dynamicValue_<%=cid%>.remove(name);
-					}
-				}
                 for (java.util.Map.Entry<String, Object> dynamicValueEntry_<%=cid%> : dynamicValue_<%=cid%>.entrySet()) {
-                    <%=codeVarDynamic%>.setColumnValue(<%=codeVarDynamic%>.getIndex(dynamicValueEntry_<%=cid%>.getKey()), dynamicValueEntry_<%=cid%>.getValue());
+                    <%=codeVarDynamic%>.addColumnValue(dynamicValueEntry_<%=cid%>.getValue());
                 }
                 <%=codeVarRowStruct%>.<%=dynamicColName%> = <%=codeVarDynamic%>;
             <%

main/plugins/org.talend.designer.codegen/src/main/java/messages_fr.properties

@@ -10,7 +10,7 @@ CodeGenerator.getGraphicalNode2=------process.getGeneratingNodes()------
 CodeGenerator.JET.TimeOut=D\u00E9lai d'initialisation JET d\u00E9pass\u00E9
 CodeGenerator.newLine=\n\n\n\n
 CodeGenerator.Node.NotFound=N\u0153ud introuvable dans le processus courant
-CodeGenerator.Comp.NotFound=Le composant est manquant\u00A0: {0}
+CodeGenerator.Components.NotFound={0}\u00A0: Le composant est manquant\u00A0: {1}; utilisez -D{2}=false dans votre Studio ou CommandLine pour ignorer cette v\u00E9rification. Un message d'avertissement sera enregistr\u00E9 dans les logs.
 JavaRoutineSynchronizer.UnsupportedOperation.Exception1=M\u00E9thode non impl\u00E9ment\u00E9e : org.talend.designer.codegen.JavaRoutineSynchronizer line:49
 JavaRoutineSynchronizer.UnsupportedOperation.Exception2=M\u00E9thode non impl\u00E9ment\u00E9e : org.talend.designer.codegen.JavaRoutineSynchronizer line:58
 JetSkeletonManager.unableLoad=Impossible de charger le fichier de cache de la mise \u00E0 jour du squelette

main/plugins/org.talend.designer.components.exchange/src/main/java/messages_ja.properties

@@ -97,5 +97,5 @@ ImportExchangeDialog.LATEST_REVISION=\u6700\u65B0\u30EA\u30D3\u30B8\u30E7\u30F3
 ImportExchangeDialog.EXTENSION_DESCRIPTION=\u62E1\u5F35\u306E\u8AAC\u660E
 ImportExchangeDialog.download.extensions=\u62E1\u5F35\u6A5F\u80FD\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u4E2D\u3067\u3059\u3002\u66AB\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044\u3002
 ImportExchangeDialog.REFRESH_BUTTON=\u66F4\u65B0
-ImportExchangeDialog.REFRESHING_PROGRESSBAR=\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5\u4E2D\u3067\u3059\u3002\u66AB\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044\u3002
+ImportExchangeDialog.REFRESHING_PROGRESSBAR=\u66F4\u65B0\u4E2D\u3067\u3059\u3002\u66AB\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044\u3002
 ImportExchangeDialog.OPERATION_CANCELLED=\u64CD\u4F5C\u306F\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u307E\u3057\u305F

main/plugins/org.talend.designer.components.libs/libs_src/checkArchive/pom.xml

@@ -1,69 +0,0 @@
-<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>
-  <groupId>org.talend.components</groupId>
-  <artifactId>checkArchive</artifactId>
-  <version>1.2-20210901</version>
-  <name>checkArchive</name>
-  <description>Dependence for tFileArchive and tFileUnAchive</description>
-<url>http://maven.apache.org</url>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
-		<java.source.version>1.8</java.source.version>
-	</properties>
-
-	<distributionManagement>
-		<snapshotRepository>
-			<id>talend_nexus_deployment</id>
-			<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-		</snapshotRepository>
-		<repository>
-			<id>talend_nexus_deployment</id>
-			<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceRelease/</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-		</repository>
-	</distributionManagement>
-
-	<dependencies>
-  <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-compress -->
-<dependency>
-    <groupId>org.apache.commons</groupId>
-    <artifactId>commons-compress</artifactId>
-    <version>1.21</version>
-</dependency>
-	</dependencies>
-	<build>
-		<resources>
-			<resource>
-				<directory>src/main/java</directory>
-			</resource>
-		</resources>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
-				<configuration>
-					<source>${java.source.version}</source>
-					<target>${java.source.version}</target>
-					<showDeprecation>true</showDeprecation>
-					<showWarnings>true</showWarnings>
-					<compilerArgument>-XDignore.symbol.file</compilerArgument>
-					<fork>true</fork>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>

main/plugins/org.talend.designer.components.libs/libs_src/talendzip/pom.xml

@@ -4,7 +4,16 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.talend.components</groupId>
 	<artifactId>talendzip</artifactId>
-	<version>1.2-20210901</version>
+	<version>1.3</version>
+
+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+			<distribution>may be downloaded from the Maven repository</distribution>
+		</license>
+	</licenses>
+
 	<build>
 		<plugins>
 			<plugin>
@@ -52,7 +61,7 @@
 		<dependency>
 			<groupId>net.lingala.zip4j</groupId>
 			<artifactId>zip4j</artifactId>
-			<version>1.3.3</version>
+			<version>2.10.0</version>
 		</dependency>
 
 		<dependency>
@@ -61,10 +70,5 @@
 			<version>1.21</version>
 		</dependency>
 
-		<dependency>
-			<groupId>org.talend.components</groupId>
-			<artifactId>checkArchive</artifactId>
-			<version>1.2-20210901</version>
-		</dependency>
 	</dependencies>
 </project>

main/plugins/org.talend.designer.components.libs/libs_src/talendzip/src/main/java/com/talend/compress/zip/IntegrityUtil.java

@@ -1,184 +1,183 @@
-package org.talend.archive;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.zip.GZIPInputStream;
-
-import javax.crypto.Cipher;
-import javax.crypto.CipherInputStream;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.PBEParameterSpec;
-
-import org.apache.commons.compress.archivers.ArchiveEntry;
-import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
-import org.apache.commons.compress.archivers.zip.ZipFile;
-
-// import javax.crypto.Cipher;
-
-public class IntegrityUtil {
-
-    /**
-     * Is used to check if the zip file is corrupted/destroyed
-     * 
-     * @param file
-     * @return
-     */
-    public static boolean isZipValid(final File file) {
-        ZipFile zipFile = null;
-
-        try {
-            zipFile = new ZipFile(file);
-
-            return true;
-        } catch (IOException e) {
-            return false;
-        } finally {
-            try {
-                if (zipFile != null) {
-                    zipFile.close();
-                    zipFile = null;
-                }
-            } catch (IOException e) {
-
-            }
-        }
-    }
-
-    public static void validate(final File file) {
-        ZipFile zipFile = null;
-
-        try {
-            zipFile = new ZipFile(file);
-
-        } catch (IOException e) {
-        } finally {
-            try {
-                if (zipFile != null) {
-                    zipFile.close();
-                    zipFile = null;
-                }
-            } catch (IOException e) {
-
-            }
-        }
-    }
-
-    /**
-     * To check if the encrpted zip file is corrupted or not
-     * 
-     * @param file
-     * @param password
-     * @return
-     */
-    public static boolean isEncryptedZipValid(final File file, String password) {
-        ZipArchiveInputStream input = null;
-        InputStream target = null;
-        try {
-            target = new FileInputStream(file);
-            target = new CipherInputStream(target, createCipher(Cipher.DECRYPT_MODE, password));
-            input = new ZipArchiveInputStream(target);
-            ArchiveEntry entry = input.getNextEntry();
-            return true;
-
-        } catch (IOException e) {
-            return false;
-        } catch (Exception e) {
-            return false;
-        } finally {
-            try {
-                if (input != null) {
-                    input.close();
-                    input = null;
-                }
-                if (target != null) {
-                    target.close();
-                    target = null;
-                }
-            } catch (IOException e) {
-            }
-        }
-    }
-
-    /**
-     * Used to check tar.gz/.tgz/.gz file is corrupted/destroyed
-     * 
-     * @param fileName
-     * @return
-     */
-    public static boolean isGZIPValid(final String fileName) {
-        GZIPInputStream inputStream = null;
-        InputStream is = null;
-        try {
-    		is = new FileInputStream(new File(fileName));
-            inputStream = new GZIPInputStream(is);
-            return true;
-        } catch (IOException e) {
-            return false;
-        }finally {
-            try {
-                if (inputStream != null) {
-                    inputStream.close();
-                    inputStream = null;
-                } else if(is != null) {
-                	is.close();
-                	is = null;
-                }
-            } catch (IOException e) {
-            }
-        }
-    }
-    
-    /**
-     * Used to check tar.tar file is corrupted/destroyed
-     * 
-     * @param fileName
-     * @return
-     */
-    public static boolean isTarValid(final String fileName) {
-    	TarArchiveInputStream inputStream = null;
-        InputStream is = null;
-        try {
-    		is = new FileInputStream(new File(fileName));
-            inputStream = new TarArchiveInputStream(is);
-            return inputStream.canReadEntryData(inputStream.getNextEntry());
-            
-        } catch (IOException e) {
-            return false;
-        }finally {
-            try {
-                if (inputStream != null) {
-                    inputStream.close();
-                    inputStream = null;
-                } else if(is != null) {
-                	is.close();
-                	is = null;
-                }
-            } catch (IOException e) {
-            }
-        }
-    }
-
-    /**
-     * 
-     * @param mode
-     * @param password
-     * @return
-     * @throws Exception
-     */
-    public static Cipher createCipher(int mode, String password) throws Exception {
-        String alg = "PBEWithSHA1AndDESede"; // BouncyCastle has better algorithms
-        PBEKeySpec keySpec = new PBEKeySpec(password.toCharArray());
-        SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(alg);
-        SecretKey secretKey = keyFactory.generateSecret(keySpec);
-
-        Cipher cipher = Cipher.getInstance("PBEWithSHA1AndDESede");
-        cipher.init(mode, secretKey, new PBEParameterSpec("saltsalt".getBytes(), 2000));
-
-        return cipher;
-    }
-}
+package com.talend.compress.zip;
+
+import org.apache.commons.compress.archivers.ArchiveEntry;
+import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
+import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
+import org.apache.commons.compress.archivers.zip.ZipFile;
+
+import javax.crypto.Cipher;
+import javax.crypto.CipherInputStream;
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.PBEKeySpec;
+import javax.crypto.spec.PBEParameterSpec;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.zip.GZIPInputStream;
+
+// import javax.crypto.Cipher;
+
+public class IntegrityUtil {
+
+    /**
+     * Is used to check if the zip file is corrupted/destroyed
+     * 
+     * @param file
+     * @return
+     */
+    public static boolean isZipValid(final File file) {
+        ZipFile zipFile = null;
+
+        try {
+            zipFile = new ZipFile(file);
+
+            return true;
+        } catch (IOException e) {
+            return false;
+        } finally {
+            try {
+                if (zipFile != null) {
+                    zipFile.close();
+                    zipFile = null;
+                }
+            } catch (IOException e) {
+
+            }
+        }
+    }
+
+    public static void validate(final File file) {
+        ZipFile zipFile = null;
+
+        try {
+            zipFile = new ZipFile(file);
+
+        } catch (IOException e) {
+        } finally {
+            try {
+                if (zipFile != null) {
+                    zipFile.close();
+                    zipFile = null;
+                }
+            } catch (IOException e) {
+
+            }
+        }
+    }
+
+    /**
+     * To check if the encrpted zip file is corrupted or not
+     * 
+     * @param file
+     * @param password
+     * @return
+     */
+    public static boolean isEncryptedZipValid(final File file, String password) {
+        ZipArchiveInputStream input = null;
+        InputStream target = null;
+        try {
+            target = new FileInputStream(file);
+            target = new CipherInputStream(target, createCipher(Cipher.DECRYPT_MODE, password));
+            input = new ZipArchiveInputStream(target);
+            ArchiveEntry entry = input.getNextEntry();
+            return true;
+
+        } catch (IOException e) {
+            return false;
+        } catch (Exception e) {
+            return false;
+        } finally {
+            try {
+                if (input != null) {
+                    input.close();
+                    input = null;
+                }
+                if (target != null) {
+                    target.close();
+                    target = null;
+                }
+            } catch (IOException e) {
+            }
+        }
+    }
+
+    /**
+     * Used to check tar.gz/.tgz/.gz file is corrupted/destroyed
+     * 
+     * @param fileName
+     * @return
+     */
+    public static boolean isGZIPValid(final String fileName) {
+        GZIPInputStream inputStream = null;
+        InputStream is = null;
+        try {
+    		is = new FileInputStream(new File(fileName));
+            inputStream = new GZIPInputStream(is);
+            return true;
+        } catch (IOException e) {
+            return false;
+        }finally {
+            try {
+                if (inputStream != null) {
+                    inputStream.close();
+                    inputStream = null;
+                } else if(is != null) {
+                	is.close();
+                	is = null;
+                }
+            } catch (IOException e) {
+            }
+        }
+    }
+    
+    /**
+     * Used to check tar.tar file is corrupted/destroyed
+     * 
+     * @param fileName
+     * @return
+     */
+    public static boolean isTarValid(final String fileName) {
+    	TarArchiveInputStream inputStream = null;
+        InputStream is = null;
+        try {
+    		is = new FileInputStream(new File(fileName));
+            inputStream = new TarArchiveInputStream(is);
+            return inputStream.canReadEntryData(inputStream.getNextEntry());
+            
+        } catch (IOException e) {
+            return false;
+        }finally {
+            try {
+                if (inputStream != null) {
+                    inputStream.close();
+                    inputStream = null;
+                } else if(is != null) {
+                	is.close();
+                	is = null;
+                }
+            } catch (IOException e) {
+            }
+        }
+    }
+
+    /**
+     * 
+     * @param mode
+     * @param password
+     * @return
+     * @throws Exception
+     */
+    public static Cipher createCipher(int mode, String password) throws Exception {
+        String alg = "PBEWithSHA1AndDESede"; // BouncyCastle has better algorithms
+        PBEKeySpec keySpec = new PBEKeySpec(password.toCharArray());
+        SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(alg);
+        SecretKey secretKey = keyFactory.generateSecret(keySpec);
+
+        Cipher cipher = Cipher.getInstance("PBEWithSHA1AndDESede");
+        cipher.init(mode, secretKey, new PBEParameterSpec("saltsalt".getBytes(), 2000));
+
+        return cipher;
+    }
+}

main/plugins/org.talend.designer.components.libs/libs_src/talendzip/src/main/java/com/talend/compress/zip/Unzip.java

@@ -1,10 +1,11 @@
 package com.talend.compress.zip;
 
 import java.io.File;
+import java.nio.charset.Charset;
 import java.util.List;
 import java.util.Optional;
 
-import net.lingala.zip4j.core.ZipFile;
+import net.lingala.zip4j.ZipFile;
 import net.lingala.zip4j.model.FileHeader;
 
 public class Unzip {
@@ -96,9 +97,10 @@ public class Unzip {
 					"Please enter the password and try again..");
 		}
 
-		ZipFile zipFile = new ZipFile(sourceZip);
+		ZipFile zipFile = new ZipFile(sourceZip,password.toCharArray());
+
 		if(encording != null){
-            zipFile.setFileNameCharset(encording);
+            zipFile.setCharset(Charset.forName(encording));
         }
 
 		if (checkArchive) {
@@ -108,10 +110,6 @@ public class Unzip {
 			}
 		}
 
-		if (zipFile.isEncrypted()) {
-			zipFile.setPassword(password);
-		}
-
 		List fileHeaderList = zipFile.getFileHeaders();
 
 		if (fileHeaderList == null) {
@@ -130,7 +128,7 @@ public class Unzip {
 				filename = filename.substring(filename.lastIndexOf('/') + 1);
 			}
 
-			zipFile.extractFile(fileHeader, targetDir, null, filename);
+			zipFile.extractFile(fileHeader, targetDir, filename);
 			util.addUnzippedFiles(targetDir, filename);
 		}
 	}
@@ -147,7 +145,7 @@ public class Unzip {
 		}
 
 		if (checkArchive) {
-			if (!org.talend.archive.IntegrityUtil.isEncryptedZipValid(file,
+			if (!IntegrityUtil.isEncryptedZipValid(file,
 					password)) {
 				throw new RuntimeException("The file " + sourceZip
 						+ " is corrupted, process terminated...");
@@ -158,7 +156,7 @@ public class Unzip {
 		try {
 			is = new java.io.FileInputStream(sourceZip);
 			is = new javax.crypto.CipherInputStream(is,
-					org.talend.archive.IntegrityUtil.createCipher(
+					IntegrityUtil.createCipher(
 							javax.crypto.Cipher.DECRYPT_MODE, password));
 			org.apache.commons.compress.archivers.zip.ZipArchiveInputStream input = new org.apache.commons.compress.archivers.zip.ZipArchiveInputStream(
 					new java.io.BufferedInputStream(is),Optional.ofNullable(encording).orElse("UTF8"));
@@ -184,7 +182,7 @@ public class Unzip {
 	// apache common compress impl
 	public void doUnzipWithoutDecryption() throws Exception {
 		if (checkArchive
-				&& !org.talend.archive.IntegrityUtil
+				&& !IntegrityUtil
 						.isZipValid(new java.io.File(sourceZip))) {
 			Thread.sleep(1000); // To make the process terminated after the
 								// System.out.println

main/plugins/org.talend.designer.components.libs/libs_src/talendzip/src/main/java/com/talend/compress/zip/Zip.java

@@ -5,16 +5,20 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.zip.GZIPOutputStream;
 
-import net.lingala.zip4j.core.ZipFile;
+import net.lingala.zip4j.ZipFile;
 import net.lingala.zip4j.model.ZipParameters;
-import net.lingala.zip4j.util.Zip4jConstants;
 
+import net.lingala.zip4j.model.enums.AesKeyStrength;
+import net.lingala.zip4j.model.enums.CompressionLevel;
+import net.lingala.zip4j.model.enums.CompressionMethod;
+import net.lingala.zip4j.model.enums.EncryptionMethod;
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
 import org.apache.commons.compress.compressors.gzip.GzipUtils;
@@ -26,7 +30,7 @@ public class Zip {
     private String targetZip;
     private boolean overwriteExistTargetZip = true;
     private boolean makeTargetDir = false;
-    private int compressLevel = 4;
+    private CompressionLevel compressLevel = CompressionLevel.MEDIUM_FAST;
     private String encoding = "ISO-8859-15";
 
     private boolean allFiles = true;
@@ -40,8 +44,8 @@ public class Zip {
 
     private boolean useZip4jEncryption = false;
 
-    private int encryptionMethod = Zip4jConstants.ENC_METHOD_AES;
-    private int aesKeyStrength = Zip4jConstants.AES_STRENGTH_256;
+    private EncryptionMethod encryptionMethod = EncryptionMethod.AES;
+    private AesKeyStrength aesKeyStrength = AesKeyStrength.KEY_STRENGTH_256;
 
     private String archiveFormat = "zip";
     private boolean syncFlush;
@@ -79,19 +83,29 @@ public class Zip {
     }
 
     public void setCompressLevel(int compressLevel) {
-        this.compressLevel = compressLevel;
+        switch (compressLevel){
+            case 0:
+                this.compressLevel = CompressionLevel.NO_COMPRESSION;
+                break;
+            case 4:
+                this.compressLevel = CompressionLevel.MEDIUM_FAST;
+                break;
+            case 9:
+                this.compressLevel = CompressionLevel.ULTRA;
+                break;
+        }
     }
 
     public void setMakeTargetDir(boolean makeTargetDir) {
         this.makeTargetDir = makeTargetDir;
     }
 
-    public void setEncryptionMethod(int encryptionMethod) {
-        this.encryptionMethod = encryptionMethod;
+    public void setEncryptionMethod(String encryptionMethod) {
+        this.encryptionMethod = EncryptionMethod.valueOf(encryptionMethod);
     }
 
     public void setAesKeyStrength(int aesKeyStrength) {
-        this.aesKeyStrength = aesKeyStrength;
+        this.aesKeyStrength = AesKeyStrength.getAesKeyStrengthFromRawCode(aesKeyStrength);
     }
 
     public String getArchiveFormat() {
@@ -185,7 +199,7 @@ public class Zip {
         targetFile.setLastModified(System.currentTimeMillis());
         FileOutputStream fos = new FileOutputStream(targetFile);
         final boolean syncFlush = this.syncFlush;
-        final int compressLevel = this.compressLevel;
+        final int compressLevel = this.compressLevel.getLevel();
         TarArchiveOutputStream taos = new TarArchiveOutputStream(new GZIPOutputStream(fos, syncFlush) {
             {
             	this.def.setLevel(compressLevel);
@@ -222,7 +236,7 @@ public class Zip {
         OutputStream out = new FileOutputStream(tarFile);
         try {
             final boolean syncFlush = this.syncFlush;
-            final int compressLevel = this.compressLevel;
+            final int compressLevel = this.compressLevel.getLevel();
         	GZIPOutputStream gcos = new GZIPOutputStream(out, syncFlush) {
                 {
                 	this.def.setLevel(compressLevel);
@@ -247,7 +261,7 @@ public class Zip {
         try {
             output_stream = new java.io.FileOutputStream(targetZip);
             if (isEncrypted && !"".equals(password)) {
-                output_stream = new javax.crypto.CipherOutputStream(output_stream, org.talend.archive.IntegrityUtil.createCipher(
+                output_stream = new javax.crypto.CipherOutputStream(output_stream, IntegrityUtil.createCipher(
                         javax.crypto.Cipher.ENCRYPT_MODE, password));
             }
         } catch (Exception e) {
@@ -260,7 +274,7 @@ public class Zip {
         org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream out = null;
         out = new org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream(
                 new java.io.BufferedOutputStream(output_stream));
-        out.setLevel(compressLevel);
+        out.setLevel(compressLevel.getLevel());
         // set filename & comment encoding
         out.setEncoding(encoding);
         if ("ALWAYS".equals(zip64Mode)) {
@@ -302,26 +316,26 @@ public class Zip {
     // zip4j impl
     private void doZip2(final File source, final List<File> list) throws Exception {
 
-        ZipFile zipFile = new ZipFile(targetZip);
+        ZipFile zipFile = new ZipFile(targetZip,password.toCharArray());
         if ("UTF-8".equalsIgnoreCase(encoding)) {
             encoding = "UTF8";
         }
-        zipFile.setFileNameCharset(encoding);
+        zipFile.setCharset(Charset.forName(encoding));
 
         ZipParameters params = new ZipParameters();
-        params.setCompressionMethod(Zip4jConstants.COMP_DEFLATE);
+        params.setCompressionMethod(CompressionMethod.DEFLATE);
         params.setCompressionLevel(compressLevel);
 
         if (isEncrypted && !"".equals(password)) {
             params.setEncryptFiles(true);
             params.setEncryptionMethod(encryptionMethod);
-            if (Zip4jConstants.ENC_METHOD_AES == encryptionMethod) {
+            if (encryptionMethod == EncryptionMethod.AES) {
+
                 params.setAesKeyStrength(aesKeyStrength);
             }
-            params.setPassword(password);
         }
 
         params.setDefaultFolderPath(source.getAbsoluteFile().getPath());
-        zipFile.addFiles((ArrayList) list, params);
+        zipFile.addFiles(list, params);
     }
 }

main/plugins/org.talend.designer.components.localprovider/components/tAmazonEMRListInstances/tAmazonEMRListInstances_java.xml

@@ -231,14 +231,14 @@
 			<IMPORT NAME="aws-java-sdk-1.11.848.jar" MODULE="aws-java-sdk-1.11.848.jar"
 				MVN="mvn:com.amazonaws/aws-java-sdk/1.11.848"
 				REQUIRED="true" />
-			<IMPORT NAME="jackson-core-2.11.4.jar" MODULE="jackson-core-2.11.4.jar"
-				MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4"
+			<IMPORT NAME="jackson-core-2.13.2.jar" MODULE="jackson-core-2.13.2.jar"
+				MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
 				REQUIRED="true" />
-			<IMPORT NAME="jackson-databind-2.11.4.jar" MODULE="jackson-databind-2.11.4.jar"
-				MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4"
+			<IMPORT NAME="jackson-databind-2.13.2.2.jar" MODULE="jackson-databind-2.13.2.2.jar"
+				MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"
 				REQUIRED="true" />
-			<IMPORT NAME="jackson-annotations-2.11.4.jar" MODULE="jackson-annotations-2.11.4.jar"
-				MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4"
+			<IMPORT NAME="jackson-annotations-2.13.2.jar" MODULE="jackson-annotations-2.13.2.jar"
+				MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"
 				REQUIRED="true" />
 			<IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar"
 				MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13"

main/plugins/org.talend.designer.components.localprovider/components/tAmazonEMRManage/tAmazonEMRManage_java.xml

@@ -558,14 +558,14 @@
 			<IMPORT NAME="aws-java-sdk-1.11.848.jar" MODULE="aws-java-sdk-1.11.848.jar"
 				MVN="mvn:com.amazonaws/aws-java-sdk/1.11.848"
 				REQUIRED="true" />
-			<IMPORT NAME="jackson-core-2.11.4.jar" MODULE="jackson-core-2.11.4.jar"
-				MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4"
+			<IMPORT NAME="jackson-core-2.13.2.jar" MODULE="jackson-core-2.13.2.jar"
+				MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
 				REQUIRED="true" />
-			<IMPORT NAME="jackson-databind-2.11.4.jar" MODULE="jackson-databind-2.11.4.jar"
-				MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4"
+			<IMPORT NAME="jackson-databind-2.13.2.2.jar" MODULE="jackson-databind-2.13.2.2.jar"
+				MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"
 				REQUIRED="true" />
-			<IMPORT NAME="jackson-annotations-2.11.4.jar" MODULE="jackson-annotations-2.11.4.jar"
-				MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4"
+			<IMPORT NAME="jackson-annotations-2.13.2.jar" MODULE="jackson-annotations-2.13.2.jar"
+				MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"
 				REQUIRED="true" />
 			<IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar"
 				MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13"

main/plugins/org.talend.designer.components.localprovider/components/tAmazonEMRResize/tAmazonEMRResize_java.xml

@@ -288,14 +288,14 @@
 			<IMPORT NAME="aws-java-sdk-1.11.848.jar" MODULE="aws-java-sdk-1.11.848.jar"
 				MVN="mvn:com.amazonaws/aws-java-sdk/1.11.848"
 				REQUIRED="true" />
-			<IMPORT NAME="jackson-core-2.11.4.jar" MODULE="jackson-core-2.11.4.jar"
-				MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4"
+			<IMPORT NAME="jackson-core-2.13.2.jar" MODULE="jackson-core-2.13.2.jar"
+				MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
 				REQUIRED="true" />
-			<IMPORT NAME="jackson-databind-2.11.4.jar" MODULE="jackson-databind-2.11.4.jar"
-				MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4"
+			<IMPORT NAME="jackson-databind-2.13.2.2.jar" MODULE="jackson-databind-2.13.2.2.jar"
+				MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"
 				REQUIRED="true" />
-			<IMPORT NAME="jackson-annotations-2.11.4.jar" MODULE="jackson-annotations-2.11.4.jar"
-				MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4"
+			<IMPORT NAME="jackson-annotations-2.13.2.jar" MODULE="jackson-annotations-2.13.2.jar"
+				MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"
 				REQUIRED="true" />
 			<IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar"
 				MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13"

main/plugins/org.talend.designer.components.localprovider/components/tAmazonRedshiftManage/tAmazonRedshiftManage_java.xml

@@ -348,14 +348,14 @@
 			<IMPORT NAME="aws-java-sdk-1.11.848.jar" MODULE="aws-java-sdk-1.11.848.jar"
 				MVN="mvn:com.amazonaws/aws-java-sdk/1.11.848"
 				REQUIRED="true" />
-			<IMPORT NAME="jackson-core-2.11.4.jar" MODULE="jackson-core-2.11.4.jar"
-				MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4"
+			<IMPORT NAME="jackson-core-2.13.2.jar" MODULE="jackson-core-2.13.2.jar"
+				MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
 				REQUIRED="true" />
-			<IMPORT NAME="jackson-databind-2.11.4.jar" MODULE="jackson-databind-2.11.4.jar"
-				MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4"
+			<IMPORT NAME="jackson-databind-2.13.2.2.jar" MODULE="jackson-databind-2.13.2.2.jar"
+				MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"
 				REQUIRED="true" />
-			<IMPORT NAME="jackson-annotations-2.11.4.jar" MODULE="jackson-annotations-2.11.4.jar"
-				MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4"
+			<IMPORT NAME="jackson-annotations-2.13.2.jar" MODULE="jackson-annotations-2.13.2.jar"
+				MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"
 				REQUIRED="true" />
 			<IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar"
 				MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13"

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseBulkExec/tAzureSynapseBulkExec_java.xml

@@ -383,9 +383,9 @@
 			<IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:com.microsoft.sqlserver/mssql-jdbc/actual"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
 			<!--Active directory dependency module: msal4j and transitive -->
 			<IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="jackson-core" MODULE="jackson-core-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseConnection/tAzureSynapseConnection_java.xml

@@ -206,9 +206,9 @@
         <IMPORT NAME="slf4j-log4j12-1.7.29.jar" MODULE="slf4j-log4j12-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.29" REQUIRED_IF="(USE_SHARED_CONNECTION == 'true' AND SPECIFY_DATASOURCE_ALIAS=='false')" />
         <!--Active directory dependency module: msal4j and transitive -->
         <IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
-        <IMPORT NAME="jackson-core" MODULE="jackson-core-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
-        <IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
-        <IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
+        <IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
+        <IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
+        <IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
         <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
         <IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
         <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseInput/tAzureSynapseInput_java.xml

@@ -266,9 +266,9 @@
         <IMPORT NAME="Talend_MssqlUtil" MODULE="talend_DB_mssqlUtil-1.4.jar" MVN="mvn:org.talend.components.lib/talend_DB_mssqlUtil/1.4" UrlPath="platform:/plugin/org.talend.libraries.custom/lib/talend_DB_mssqlUtil-1.4.jar" REQUIRED="true" />
         <!--Active directory dependency module: msal4j and transitive -->
         <IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="jackson-core" MODULE="jackson-core-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseOutput/tAzureSynapseOutput_java.xml

@@ -337,9 +337,9 @@
 			<IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:com.microsoft.sqlserver/mssql-jdbc/actual"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
 			<!--Active directory dependency module: msal4j and transitive -->
 			<IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="jackson-core" MODULE="jackson-core-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseRow/tAzureSynapseRow_java.xml

@@ -322,9 +322,9 @@
         <IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:com.microsoft.sqlserver/mssql-jdbc/actual"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
         <!--Active directory dependency module: msal4j and transitive -->
         <IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="jackson-core" MODULE="jackson-core-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryBulkExec/tBigQueryBulkExec_java.xml

@@ -266,7 +266,7 @@
          <IMPORT NAME="google-http-client-jackson2-1.38.0.jar" MODULE="google-http-client-jackson2-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.38.0"  REQUIRED="true" />
          <IMPORT NAME="guava-30.0-jre.jar" MODULE="guava-30.0-jre.jar" MVN="mvn:com.google.guava/guava/30.0-jre" REQUIRED="true" />
          <IMPORT NAME="failureaccess-1.0.1.jar" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED="true" />
-		<IMPORT NAME="jackson-core-2.11.4.jar" MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" REQUIRED="true" />
+		<IMPORT NAME="jackson-core-2.13.2.jar" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2" REQUIRED="true" />
 		<!-- REQUIRED FOR GOOGLE STORAGE -->
 		<IMPORT NAME="jets3t-0.9.1" MODULE="jets3t-0.9.1.jar" MVN="mvn:org.talend.libraries/jets3t-0.9.1/6.0.0"  REQUIRED="true" />
 		<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED="true" />

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryInput/tBigQueryInput_java.xml

@@ -209,7 +209,7 @@
 		 <IMPORT NAME="google-http-client-jackson2-1.38.0.jar" MODULE="google-http-client-jackson2-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.38.0"  REQUIRED="true" />
 		 <IMPORT NAME="guava-30.0-jre.jar" MODULE="guava-30.0-jre.jar" MVN="mvn:com.google.guava/guava/30.0-jre" REQUIRED="true" />
 		 <IMPORT NAME="failureaccess-1.0.1.jar" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED="true" />
-		<IMPORT NAME="jackson-core-2.11.4.jar" MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" REQUIRED="true" />
+		<IMPORT NAME="jackson-core-2.13.2.jar" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2" REQUIRED="true" />
 		<IMPORT NAME="google-cloud-bigquery-1.126.3.jar" MODULE="google-cloud-bigquery-1.126.3.jar" MVN="mvn:com.google.cloud/google-cloud-bigquery/1.126.3" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
 
 		<!-- TODO remove it -->

main/plugins/org.talend.designer.components.localprovider/components/tBigQuerySQLRow/tBigQuerySQLRow_java.xml

@@ -195,8 +195,8 @@
             <IMPORT NAME="google-http-client-jackson2-1.38.0.jar" MODULE="google-http-client-jackson2-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.38.0"  REQUIRED="true" />
             <IMPORT NAME="guava-30.0-jre.jar" MODULE="guava-30.0-jre.jar" MVN="mvn:com.google.guava/guava/30.0-jre" REQUIRED="true"/>
             <IMPORT NAME="failureaccess-1.0.1.jar" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED="true" />
-            <IMPORT NAME="jackson-core-2.11.4.jar" MODULE="jackson-core-2.11.4.jar"
-                    MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" REQUIRED="true"/>
+            <IMPORT NAME="jackson-core-2.13.2.jar" MODULE="jackson-core-2.13.2.jar"
+                    MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2" REQUIRED="true"/>
             <IMPORT NAME="google-cloud-bigquery-1.126.3.jar" MODULE="google-cloud-bigquery-1.126.3.jar"
                     MVN="mvn:com.google.cloud/google-cloud-bigquery/1.126.3"
                     REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>

main/plugins/org.talend.designer.components.localprovider/components/tBoxConnection/tBoxConnection_java.xml

@@ -72,13 +72,13 @@
                 MODULE="boxjavalibv2-v3.0.10.jar" MVN="mvn:net.box/boxjavalibv2/v3.0.10"
                 REQUIRED="true" />
             <IMPORT NAME="jackson-core"
-                MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" 
+                MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
                 REQUIRED="true" />
             <IMPORT NAME="jackson-databind"
-                MODULE="jackson-databind-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4" 
+                MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"
                 REQUIRED="true" />
             <IMPORT NAME="jackson-annotations"
-                MODULE="jackson-annotations-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4" 
+                MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"
                 REQUIRED="true" />
             <IMPORT NAME="apache-http-client"
                 MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13"

main/plugins/org.talend.designer.components.localprovider/components/tBoxCopy/tBoxCopy_java.xml

@@ -127,13 +127,13 @@
                     MODULE="boxjavalibv2-v3.0.10.jar" MVN="mvn:net.box/boxjavalibv2/v3.0.10"
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-core"
-                    MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" 
+                    MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-databind"
-                    MODULE="jackson-databind-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4" 
+                    MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-annotations"
-                    MODULE="jackson-annotations-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4" 
+                    MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="apache-http-client"
                 	MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13"

main/plugins/org.talend.designer.components.localprovider/components/tBoxDelete/tBoxDelete_java.xml

@@ -88,13 +88,13 @@
                     MODULE="boxjavalibv2-v3.0.10.jar" MVN="mvn:net.box/boxjavalibv2/v3.0.10"
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-core"
-                    MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" 
+                    MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-databind"
-                    MODULE="jackson-databind-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4" 
+                    MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-annotations"
-                    MODULE="jackson-annotations-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4" 
+                    MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="apache-http-client"
                 	MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13"

main/plugins/org.talend.designer.components.localprovider/components/tBoxGet/tBoxGet_java.xml

@@ -98,13 +98,13 @@
                     MODULE="boxjavalibv2-v3.0.10.jar" MVN="mvn:net.box/boxjavalibv2/v3.0.10"
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-core"
-                    MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" 
+                    MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-databind"
-                    MODULE="jackson-databind-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4" 
+                    MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-annotations"
-                    MODULE="jackson-annotations-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4" 
+                    MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="apache-http-client"
                 	MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13"

main/plugins/org.talend.designer.components.localprovider/components/tBoxList/tBoxList_java.xml

@@ -106,13 +106,13 @@
                     MODULE="boxjavalibv2-v3.0.10.jar" MVN="mvn:net.box/boxjavalibv2/v3.0.10"
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-core"
-                    MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" 
+                    MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-databind"
-                    MODULE="jackson-databind-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4" 
+                    MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-annotations"
-                    MODULE="jackson-annotations-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4" 
+                    MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="apache-http-client"
                 	MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13"

main/plugins/org.talend.designer.components.localprovider/components/tBoxPut/tBoxPut_java.xml

@@ -109,13 +109,13 @@
                     MODULE="boxjavalibv2-v3.0.10.jar" MVN="mvn:net.box/boxjavalibv2/v3.0.10"
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-core"
-                    MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" 
+                    MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-databind"
-                    MODULE="jackson-databind-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4" 
+                    MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-annotations"
-                    MODULE="jackson-annotations-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4" 
+                    MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="apache-http-client"
                 	MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13"

main/plugins/org.talend.designer.components.localprovider/components/tCreateTable/tCreateTable_java.xml

@@ -848,9 +848,9 @@
 		<IMPORT NAME="Driver-MSSQL-prop" MODULE="mssql-jdbc.jar" MVN="mvn:com.microsoft.sqlserver/mssql-jdbc/actual"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP')" />
 		<!--Active directory dependency module: msal4j and transitive -->
 		<IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
-		<IMPORT NAME="jackson-core" MODULE="jackson-core-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.12.1"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
-		<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.12.1"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
-		<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.12.1"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
+		<IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
+		<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
+		<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
 		<IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
 		<IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
 		<IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />

main/plugins/org.talend.designer.components.localprovider/components/tCreateTable/tCreateTable_messages_fr.properties

@@ -137,3 +137,12 @@ ACCOUNT.NAME=Compte
 ROLE.NAME=R\u00F4le
 ENFORCE_DELIMITED_IDENTIFIERS.NAME=Impl\u00E9menter les identifiants d\u00E9limit\u00E9s de base de donn\u00E9es
 UNLOGGED.NAME=Table sans log
+
+REDSHIFT_DRIVER_VERSION.NAME=Version du pilote
+REDSHIFT_DRIVER_VERSION.ITEM.DRIVER_V1=Pilote v1
+REDSHIFT_DRIVER_VERSION.ITEM.DRIVER_V2=Pilote v2
+
+USE_STRING_PROPERTIES.NAME=Utiliser des param\u00E8tres de cha\u00EEnes de caract\u00E8res JDBC
+ENTRY_PROPERTIES.NAME=Param\u00E8tres suppl\u00E9mentaires JDBC
+ENTRY_PROPERTIES.ITEM.KEY=Cl\u00E9
+ENTRY_PROPERTIES.ITEM.VALUE=Valeur

main/plugins/org.talend.designer.components.localprovider/components/tCreateTable/tCreateTable_messages_ja.properties

@@ -137,3 +137,12 @@ ACCOUNT.NAME=\u30A2\u30AB\u30A6\u30F3\u30C8
 ROLE.NAME=\u30ED\u30FC\u30EB
 ENFORCE_DELIMITED_IDENTIFIERS.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u533A\u5207\u308A\u4ED8\u304D\u8B58\u5225\u5B50\u306E\u5F37\u5236
 UNLOGGED.NAME=\u30ED\u30B0\u306A\u3057\u30C6\u30FC\u30D6\u30EB
+
+REDSHIFT_DRIVER_VERSION.NAME=\u30C9\u30E9\u30A4\u30D0\u30FC\u306E\u30D0\u30FC\u30B8\u30E7\u30F3
+REDSHIFT_DRIVER_VERSION.ITEM.DRIVER_V1=\u30C9\u30E9\u30A4\u30D0\u30FCv1
+REDSHIFT_DRIVER_VERSION.ITEM.DRIVER_V2=\u30C9\u30E9\u30A4\u30D0\u30FCv2
+
+USE_STRING_PROPERTIES.NAME=\u6587\u5B57\u5217JDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u4F7F\u7528
+ENTRY_PROPERTIES.NAME=\u8FFD\u52A0\u306EJDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
+ENTRY_PROPERTIES.ITEM.KEY=\u30AD\u30FC
+ENTRY_PROPERTIES.ITEM.VALUE=\u5024

main/plugins/org.talend.designer.components.localprovider/components/tCreateTable/tCreateTable_messages_zh_CN.properties

@@ -137,3 +137,12 @@ ACCOUNT.NAME=\u5E10\u6237
 ROLE.NAME=\u89D2\u8272
 ENFORCE_DELIMITED_IDENTIFIERS.NAME=\u6267\u884C\u6570\u636E\u5E93\u5206\u9694\u578B\u6807\u8BC6\u7B26
 UNLOGGED.NAME=\u672A\u8BB0\u5F55\u7684\u8868
+
+REDSHIFT_DRIVER_VERSION.NAME=\u9A71\u52A8\u7248\u672C
+REDSHIFT_DRIVER_VERSION.ITEM.DRIVER_V1=\u9A71\u52A8 v1
+REDSHIFT_DRIVER_VERSION.ITEM.DRIVER_V2=\u9A71\u52A8 v2
+
+USE_STRING_PROPERTIES.NAME=\u4F7F\u7528\u5B57\u4E32 JDBC \u53C2\u6570
+ENTRY_PROPERTIES.NAME=\u9644\u52A0 JDBC \u53C2\u6570
+ENTRY_PROPERTIES.ITEM.KEY=\u952E
+ENTRY_PROPERTIES.ITEM.VALUE=\u503C

main/plugins/org.talend.designer.components.localprovider/components/tDropboxConnection/tDropboxConnection_java.xml

@@ -61,7 +61,7 @@
                     MODULE="dropbox-core-sdk-2.1.2.jar" MVN="mvn:org.talend.libraries/dropbox-core-sdk-2.1.2/6.3.0" 
                     REQUIRED="true" />
                <IMPORT NAME="jackson-core"
-                    MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" 
+                    MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
                     REQUIRED="true" />
 		</IMPORTS>
    </CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tDropboxDelete/tDropboxDelete_java.xml

@@ -71,7 +71,7 @@
                     MODULE="dropbox-core-sdk-2.1.2.jar" MVN="mvn:org.talend.libraries/dropbox-core-sdk-2.1.2/6.3.0" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-core"
-                    MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" 
+                    MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
 		</IMPORTS>
    </CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tDropboxGet/tDropboxGet_java.xml

@@ -85,7 +85,7 @@
                     MODULE="dropbox-core-sdk-2.1.2.jar" MVN="mvn:org.talend.libraries/dropbox-core-sdk-2.1.2/6.3.0" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-core"
-                    MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" 
+                    MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
 		</IMPORTS>
    </CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tDropboxList/tDropboxList_java.xml

@@ -83,7 +83,7 @@
                     MODULE="dropbox-core-sdk-2.1.2.jar" MVN="mvn:org.talend.libraries/dropbox-core-sdk-2.1.2/6.3.0" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-core"
-                    MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" 
+                    MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
 		</IMPORTS>
    </CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tDropboxPut/tDropboxPut_java.xml

@@ -110,7 +110,7 @@
                     MODULE="dropbox-core-sdk-2.1.2.jar" MVN="mvn:org.talend.libraries/dropbox-core-sdk-2.1.2/6.3.0" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="jackson-core"
-                    MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" 
+                    MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
 		</IMPORTS>
    </CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tELTMSSqlMap/tELTMSSqlMap_java.xml

@@ -200,9 +200,9 @@
 			<IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:com.microsoft.sqlserver/mssql-jdbc/actual"  REQUIRED_IF="(DRIVER == 'MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<!--Active directory dependency module: msal4j and transitive -->
 			<IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="jackson-core" MODULE="jackson-core-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />

main/plugins/org.talend.designer.components.localprovider/components/tELTOracleOutput/tELTOracleOutput_main.javajet

@@ -637,46 +637,37 @@ if(dbtable != null && columnList != null){
 	if(("INSERT").equals(dataAction)){
 	%>
 
-<%if(!isLog4jEnabled){%>System.out.println("Inserting with : \n" + insertQuery_<%=cid %> + "\n");<%}%>
+System.out.println("Inserting with : \n" + insertQuery_<%=cid %> + "\n");
 <%log4jCodeGenerateUtil.logInfo(node,"info",cid+" - Executing SQL:\"+insertQuery_"+ cid +"+\"");%>
 nb_line_inserted_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
 <%log4jCodeGenerateUtil.logInfo(node,"info",cid+" - Executed successfully.");%>
-<%if(!isLog4jEnabled){%>System.out.println("--> " + nb_line_inserted_<%=cid%> + " rows inserted. \n");<%}%>
+System.out.println("--> " + nb_line_inserted_<%=cid%> + " rows inserted. \n");
 
 	<%
 	}else if(("UPDATE").equals(dataAction)){
 
 	%>
-<%if(!isLog4jEnabled){%>System.out.println("Updating with : \n" + updateQuery_<%=cid %>.toString() +"\n");<%}%>
+System.out.println("Updating with : \n" + updateQuery_<%=cid %>.toString() +"\n");
 <%log4jCodeGenerateUtil.logInfo(node,"info",cid+" - Executing SQL:\"+updateQuery_"+ cid +"+\"");%>
 nb_line_updated_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
 <%log4jCodeGenerateUtil.logInfo(node,"info",cid+" - Executed successfully.");%>
-	<%if(!isLog4jEnabled){%>System.out.println("--> " + nb_line_updated_<%=cid%> + " rows updated. \n");<%}%>
+System.out.println("--> " + nb_line_updated_<%=cid%> + " rows updated. \n");
 	<%
 	}else if (("DELETE").equals(dataAction)){
 		%>
-	<%if(!isLog4jEnabled){%>System.out.println("Deleting with : \n" + deleteQuery_<%=cid %>.toString() +"\n");<%}%>
+		System.out.println("Deleting with : \n" + deleteQuery_<%=cid %>.toString() +"\n");
 		<%log4jCodeGenerateUtil.logInfo(node,"info",cid+" - Executing SQL:\"+deleteQuery_"+ cid +"+\"");%>
 		nb_line_deleted_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
 		<%log4jCodeGenerateUtil.logInfo(node,"info",cid+" - Executed successfully.");%>
-	<%if(!isLog4jEnabled){%>System.out.println("--> " + nb_line_deleted_<%=cid%> + " rows deleted. \n");<%}%>
+		System.out.println("--> " + nb_line_deleted_<%=cid%> + " rows deleted. \n");
 		<%
 	}else if (("MERGE").equals(dataAction)){
 	%>
-<%
-    if(!isLog4jEnabled){
-%>
         System.out.println("Merge with : \n" + mergeQuery_<%=cid %> +"\n");
-<%
-    } else {
-%>
-        log.info("<%=cid %> - Executing SQL: " + mergeQuery_<%=cid %>);
-<%
-    }
-%>
+        <%log4jCodeGenerateUtil.logInfo(node,"info",cid+" - Executing SQL:\"+mergeQuery_"+ cid +"+\"");%>
 	    nb_line_merged_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
 		<%log4jCodeGenerateUtil.logInfo(node,"info",cid+" - Executed successfully.");%>
-	<%if(!isLog4jEnabled){%>System.out.println("--> " + nb_line_merged_<%=cid%> + " rows merged. \n");<%}%>
+		System.out.println("--> " + nb_line_merged_<%=cid%> + " rows merged. \n");
 	<%
 	}
   }

main/plugins/org.talend.designer.components.localprovider/components/tExtractJSONFields/tExtractJSONFields_java.xml

@@ -178,7 +178,7 @@
     <IMPORTS>
     		<IMPORT NAME="Java_DOM4J2" MODULE="dom4j-2.1.3.jar" MVN="mvn:org.dom4j/dom4j/2.1.3" REQUIRED_IF="READ_BY == 'XPATH'" BundleID="" />
             <IMPORT NAME="Java_JAXEN_1.1.6" MODULE="jaxen-1.1.6.jar" MVN="mvn:jaxen/jaxen/1.1.6" REQUIRED_IF="READ_BY == 'XPATH'" BundleID="" />
-            <IMPORT NAME="json-lib" MODULE="json-lib-2.4.6-talend.jar" MVN="mvn:net.sf.json-lib/json-lib/2.4.6-talend" REQUIRED_IF="READ_BY == 'XPATH'" />
+            <IMPORT NAME="json-lib" MODULE="json-lib-2.4.7-talend.jar" MVN="mvn:net.sf.json-lib/json-lib/2.4.7-talend" REQUIRED_IF="READ_BY == 'XPATH'" />
             <IMPORT NAME="commons_lang" MODULE="commons-lang-2.6.jar" MVN="mvn:commons-lang/commons-lang/2.6"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang-2.6.jar" REQUIRED_IF="READ_BY == 'XPATH'" />
             <IMPORT NAME="commons_logging" MODULE="commons-logging-1.1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1.1/6.0.0"  UrlPath="platform:/base/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar" REQUIRED_IF="READ_BY == 'XPATH'" />
             <IMPORT NAME="ezmorph" MODULE="ezmorph-1.0.6.jar" MVN="mvn:org.talend.libraries/ezmorph-1.0.6/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.jackson/lib/ezmorph-1.0.6.jar" REQUIRED_IF="READ_BY == 'XPATH'" />

main/plugins/org.talend.designer.components.localprovider/components/tFileArchive/tFileArchive_java.xml

@@ -132,9 +132,8 @@
    <CODEGENERATION>
      <IMPORTS>
        <IMPORT NAME="commons-compress-1.21" MODULE="commons-compress-1.21.jar" MVN="mvn:org.apache.commons/commons-compress/1.21" REQUIRED="true" />
-       <IMPORT NAME="Encrypt-Zip" MODULE="checkArchive-1.2-20210901.jar" MVN="mvn:org.talend.components/checkArchive/1.2-20210901" UrlPath="platform:/plugin/org.talend.libraries.custom/lib/checkArchive-1.2-20210901.jar" REQUIRED="true" />
-       <IMPORT NAME="zip4j-1.3.3.jar" MODULE="zip4j-1.3.3.jar" MVN="mvn:net.lingala.zip4j/zip4j/1.3.3" REQUIRED="true" />
-       <IMPORT NAME="talendzip-1.2-20210901.jar" MODULE="talendzip-1.2-20210901.jar" MVN="mvn:org.talend.components/talendzip/1.2-20210901" UrlPath="platform:/plugin/org.talend.libraries.custom/lib/talendzip-1.2-20210901.jar" REQUIRED="true" />
+       <IMPORT NAME="zip4j-2.10.0.jar" MODULE="zip4j-2.10.0.jar" MVN="mvn:net.lingala.zip4j/zip4j/2.10.0" REQUIRED="true" />
+       <IMPORT NAME="talendzip-1.3.jar" MODULE="talendzip-1.3.jar" MVN="mvn:org.talend.components/talendzip/1.3" UrlPath="platform:/plugin/org.talend.libraries.custom/lib/talendzip-1.3.jar" REQUIRED="true" />
      </IMPORTS>
    </CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tFileArchive/tFileArchive_main.javajet

@@ -29,7 +29,8 @@
 
 	String zip64Mode = ElementParameterParser.getValue(node, "__ZIP64_MODE__");
 	String encryptMethod = ElementParameterParser.getValue(node, "__ENCRYPT_METHOD__");
-	String aesKeyStrength = ElementParameterParser.getValue(node, "__AES_KEY_STRENGTH__");
+	int aesKeyStrength = "AES_STRENGTH_256".equals(ElementParameterParser.getValue(node, "__AES_KEY_STRENGTH__"))?3:1;
+
 
 	String archiveFormat = ElementParameterParser.getValue(node, "__ARCHIVE_FORMAT__");
 	String sourceFile = ElementParameterParser.getValue(node, "__SOURCE_FILE__");
@@ -109,12 +110,17 @@
 	   if(!"JAVA_ENCRYPT".equals(encryptMethod)){
 	   %>
 	      zip_<%=cid%>.setUseZip4jEncryption(true);
-	      zip_<%=cid%>.setEncryptionMethod(net.lingala.zip4j.util.Zip4jConstants.<%=encryptMethod%>);
+
 	      <%
 		  if("ENC_METHOD_AES".equals(encryptMethod)){
 		  %>
-	         zip_<%=cid%>.setAesKeyStrength(net.lingala.zip4j.util.Zip4jConstants.<%=aesKeyStrength%>);
+		     zip_<%=cid%>.setEncryptionMethod("AES");
+	         zip_<%=cid%>.setAesKeyStrength(<%=aesKeyStrength%>);
 	      <%
+	   	  }else if("ENC_METHOD_STANDARD".equals(encryptMethod)){
+	   	  %>
+	   	  zip_<%=cid%>.setEncryptionMethod("ZIP_STANDARD");
+	   	  <%
 	   	  }
 	   	}else{
 	   	%>

main/plugins/org.talend.designer.components.localprovider/components/tFileFetch/tFileFetch_java.xml

@@ -1,441 +1,446 @@
 <COMPONENT>
-  <HEADER
-    PLATEFORM="ALL"
-       SERIAL=""
-      VERSION="0.101"
-       STATUS="ALPHA"
-COMPATIBILITY="ALL"
-       AUTHOR="Talend"
- RELEASE_DATE="20050320A"
-    STARTABLE="true"
-	PARTITIONING="AUTO"
-  LOG4J_ENABLED="true"
-  >
-    <SIGNATURE></SIGNATURE>
-  </HEADER>
-
-  <FAMILIES>
-    <FAMILY>Internet</FAMILY>
-  </FAMILIES>
-
-  <DOCUMENTATION>
-    <URL/>
-  </DOCUMENTATION>
-
-  <CONNECTORS>
-    <CONNECTOR CTYPE="FLOW" MAX_INPUT="1" MAX_OUTPUT="1"/>
-    <CONNECTOR CTYPE="ITERATE" MAX_OUTPUT="0" MAX_INPUT="1"/>
-    <CONNECTOR CTYPE="SUBJOB_OK" MAX_INPUT="1" />
-    <CONNECTOR CTYPE="SUBJOB_ERROR" MAX_INPUT="1" />
-    <CONNECTOR CTYPE="COMPONENT_OK"/>
-    <CONNECTOR CTYPE="COMPONENT_ERROR"/>
-    <CONNECTOR CTYPE="RUN_IF"/>
-  </CONNECTORS>
-
-  <PARAMETERS>
-
-  <PARAMETER
-      NAME="PROTO"
-      FIELD="CLOSED_LIST"
-      NUM_ROW="10"
+    <HEADER
+            PLATEFORM="ALL"
+            SERIAL=""
+            VERSION="0.101"
+            STATUS="ALPHA"
+            COMPATIBILITY="ALL"
+            AUTHOR="Talend"
+            RELEASE_DATE="20050320A"
+            STARTABLE="true"
+            PARTITIONING="AUTO"
+            LOG4J_ENABLED="true"
     >
-      <ITEMS DEFAULT="HTTP_PROTO">
-        <ITEM NAME="HTTP_PROTO"   VALUE="http" />
-        <ITEM NAME="HTTPS_PROTO"   VALUE="https" />
-        <ITEM NAME="FTP_PROTO"   VALUE="ftp" />
-        <ITEM NAME="SAMBA_PROTO" VALUE="smb" />
-      </ITEMS>
-    </PARAMETER>
+        <SIGNATURE></SIGNATURE>
+    </HEADER>
 
-  <PARAMETER
-  	NAME="POST"
-  	FIELD="CHECK"
-  	NUM_ROW="50"
-  	SHOW_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')"
-  >
-  <DEFAULT>true</DEFAULT>
-  </PARAMETER>
+    <FAMILIES>
+        <FAMILY>Internet</FAMILY>
+    </FAMILIES>
 
-  <PARAMETER
-     NAME="URI"
-     FIELD="TEXT"
-     REQUIRED="true"
-     NUM_ROW="20"
-     SHOW_IF="PROTO!='SAMBA_PROTO'"
-  >
-   <DEFAULT>"http://talendforge.org/file_fetch.txt"</DEFAULT>
-  </PARAMETER>
+    <DOCUMENTATION>
+        <URL/>
+    </DOCUMENTATION>
 
-  <PARAMETER
-  	NAME="USE_CACHE"
-  	FIELD="CHECK"
-  	NUM_ROW="21"
-  >
-  <DEFAULT>false</DEFAULT>
-  </PARAMETER>
+    <CONNECTORS>
+        <CONNECTOR CTYPE="FLOW" MAX_INPUT="1" MAX_OUTPUT="1"/>
+        <CONNECTOR CTYPE="ITERATE" MAX_OUTPUT="0" MAX_INPUT="1"/>
+        <CONNECTOR CTYPE="SUBJOB_OK" MAX_INPUT="1" />
+        <CONNECTOR CTYPE="SUBJOB_ERROR" MAX_INPUT="1" />
+        <CONNECTOR CTYPE="COMPONENT_OK"/>
+        <CONNECTOR CTYPE="COMPONENT_ERROR"/>
+        <CONNECTOR CTYPE="RUN_IF"/>
+    </CONNECTORS>
 
-  <PARAMETER
-     NAME="SMB_URI"
-     FIELD="TEXT"
-     REQUIRED="true"
-     NUM_ROW="20"
-     SHOW_IF="PROTO=='SAMBA_PROTO'"
-  >
-   <DEFAULT>"smb://host/dir/remoteFileName.txt"</DEFAULT>
-  </PARAMETER>
+    <PARAMETERS>
 
-  <PARAMETER
-     NAME="DIRECTORY"
-     FIELD="DIRECTORY"
-     NUM_ROW="30"
-     REQUIRED="true"
-     SHOW_IF=" USE_CACHE == 'false'"
-  >
-    <DEFAULT>"C:"</DEFAULT>
-  </PARAMETER>
-
-  <PARAMETER
-  	NAME="MAKEDIRS"
-  	FIELD="CHECK"
-  	NUM_ROW="35"
-  	SHOW_IF="(PROTO != 'SAMBA_PROTO') AND (USE_CACHE == 'false')"
-  >
-  <DEFAULT>false</DEFAULT>
-  </PARAMETER>
-
-  <PARAMETER
-     NAME="FILENAME"
-     FIELD="TEXT"
-     REQUIRED="true"
-     NUM_ROW="40"
-     SHOW_IF=" USE_CACHE == 'false'"
-  >
-    <DEFAULT>""</DEFAULT>
-  </PARAMETER>
-
-  <PARAMETER
-  	NAME="ADD_HEADER"
-  	FIELD="CHECK"
-  	NUM_ROW="45"
-  	SHOW_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')"
-  >
-  <DEFAULT>false</DEFAULT>
-  </PARAMETER>
-
-  <PARAMETER
-     NAME="HEADERS"
-     FIELD="TABLE" NUM_ROW="46"
-     NB_LINES="5"
-     SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND (ADD_HEADER == 'true')"
-  >
-     <ITEMS>
-       <ITEM NAME="HEADER_NAME" />
-       <ITEM NAME="HEADER_VALUE"/>
-     </ITEMS>
-   </PARAMETER>
-
-   <PARAMETER
-     NAME="SMB_DOMAIN"
-     FIELD="TEXT"
-     REQUIRED="true"
-     NUM_ROW="25"
-     SHOW_IF="PROTO=='SAMBA_PROTO'"
-  >
-    <DEFAULT>"domain"</DEFAULT>
-  </PARAMETER>
-
-     <PARAMETER
-     NAME="SMB_USERNAME"
-     FIELD="TEXT"
-     REQUIRED="true"
-     NUM_ROW="25"
-     SHOW_IF="PROTO=='SAMBA_PROTO'"
-  >
-    <DEFAULT>"username"</DEFAULT>
-  </PARAMETER>
-
-     <PARAMETER
-     NAME="SMB_PASSWORD"
-     FIELD="PASSWORD"
-     REQUIRED="true"
-     NUM_ROW="25"
-     SHOW_IF="PROTO=='SAMBA_PROTO'"
-  >
-    <DEFAULT>"password"</DEFAULT>
-  </PARAMETER>
-
-   <PARAMETER
-     NAME="DIE_ON_ERROR"
-     FIELD="CHECK"
-     NUM_ROW="50"
-     SHOW_IF="PROTO!='SAMBA_PROTO'"
-  >
-  <DEFAULT>true</DEFAULT>
-  </PARAMETER>
-
-  <PARAMETER
-     NAME="COMMON_PARAMS"
-     FIELD="TABLE" NUM_ROW="60"
-     NB_LINES="5"
-     SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND (POST == 'true')"
-  >
-     <ITEMS>
-       <ITEM NAME="COMMON_PARAMS_NAME" />
-       <ITEM NAME="COMMON_PARAMS_VALUE"/>
-     </ITEMS>
-   </PARAMETER>
-
-   <PARAMETER
-     NAME="READ_COOKIE"
-     FIELD="CHECK"
-     NUM_ROW="70"
-  >
-  <DEFAULT>false</DEFAULT>
-  </PARAMETER>
-
-   <PARAMETER
-     NAME="SAVE_COOKIE"
-     FIELD="CHECK"
-     NUM_ROW="70"
-  >
-  <DEFAULT>false</DEFAULT>
-  </PARAMETER>
-
-  <PARAMETER
-     NAME="COOKIE_DIR"
-     FIELD="FILE"
-     NUM_ROW="71"
-     REQUIRED="true"
-     SHOW_IF="(SAVE_COOKIE == 'true') OR (READ_COOKIE == 'true')"
-  >
-    <DEFAULT>"C:/cookie"</DEFAULT>
-  </PARAMETER>
-
-  <PARAMETER
-		NAME="COOKIE_POLICY"
-		FIELD="CLOSED_LIST"
-		NUM_ROW="72"
-		SHOW_IF="(SAVE_COOKIE == 'true') OR (READ_COOKIE == 'true')"
-	>
-	<ITEMS DEFAULT="DEFAULT">
-		<ITEM NAME="DEFAULT"   VALUE="DEFAULT" />
-		<ITEM NAME="BROWSER_COMPATIBILITY"   VALUE="BROWSER_COMPATIBILITY" />
-		<ITEM NAME="NETSCAPE"   VALUE="NETSCAPE" />
-		<ITEM NAME="RFC_2109" VALUE="RFC_2109" />
-		<!-- RFC_2965 is not support in commons-httpclient-3.0.1.jar -->
-		<!-- <ITEM NAME="RFC_2965" VALUE="RFC_2965" />  -->
-	</ITEMS>
-	</PARAMETER>
-
-  <PARAMETER
-		NAME="SINGLE_COOKIE"
-		FIELD="CHECK"
-		NUM_ROW="73"
-		SHOW_IF="(SAVE_COOKIE == 'true') OR (READ_COOKIE == 'true')"
-  >
-  <DEFAULT>false</DEFAULT>
-  </PARAMETER>
-  </PARAMETERS>
-
-   <ADVANCED_PARAMETERS>
-	<PARAMETER
-    	NAME="ENCODE_URI"
-    	FIELD="CHECK"
-    	NUM_ROW="6"
-    	SHOW_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')"
-    >
-	<DEFAULT>false</DEFAULT>
-	</PARAMETER>
-	<PARAMETER
-      NAME="COMMON_PARAMS_CHARSET"
-      FIELD="OPENED_LIST"
-      NUM_ROW="7"
-      SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND (POST == 'true')"
-    >
-        <ITEMS DEFAULT="UTF8">
-          <ITEM NAME="USASCII" VALUE="&quot;US-ASCII&quot;" />
-          <ITEM NAME="UTF8"    VALUE="&quot;UTF-8&quot;" />
-          <ITEM NAME="WIN1252" VALUE="&quot;windows-1252&quot;" />
-      </ITEMS>
-    </PARAMETER>
-     <PARAMETER
-    	NAME="PRINT"
-    	FIELD="CHECK"
-    	NUM_ROW="8"
-    	SHOW_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')"
-    >
-    </PARAMETER>
-
-    <PARAMETER
-      NAME="TIMEOUT"
-      FIELD="TEXT"
-      REQUIRED="false"
-      NUM_ROW="5"
-      SHOW_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')"
-    >
-      <DEFAULT>30000</DEFAULT>
-    </PARAMETER>
-
-    <PARAMETER
-      NAME="UPLOAD"
-      FIELD="CHECK"
-      NUM_ROW="10"
-      SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND (POST == 'true')"
-    >
-      <DEFAULT>false</DEFAULT>
-    </PARAMETER>
-
-    <PARAMETER
-      NAME="FILE_PARAMS"
-      FIELD="TABLE"
-      NUM_ROW="20"
-      NB_LINES="8"
-	  SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND (POST == 'true') AND (UPLOAD == 'true')"
-    >
-      <ITEMS>
-        <ITEM NAME="FILE_PARAMS_NAME" />
-        <ITEM NAME="FILE_PARAMS_VALUE"/>
-		<ITEM NAME="FILE_PARAMS_CONTENT_TYPE" VALUE="&quot;application/octet-stream&quot;"/>
-		<ITEM NAME="FILE_PARAMS_CHARSET" VALUE="&quot;ISO-8859-1&quot;"/>
-      </ITEMS>
-    </PARAMETER>
-    
-    <PARAMETER
-       NAME="USE_PROXY"
-       FIELD="CHECK"
-       REQUIRED="true"
-	   NUM_ROW="30"
-	   SHOW_IF="PROTO!='SAMBA_PROTO'"
-	   REPOSITORY_VALUE="UES_PROXY">
-	   <DEFAULT>false</DEFAULT>
-	</PARAMETER>
-
-	<PARAMETER
-		NAME="PROXY_HOST"
-		FIELD="TEXT"
-		NUM_ROW="35"
-		SHOW_IF="USE_PROXY == 'true'"
-		REPOSITORY_VALUE="PROXY_HOST">
-		<DEFAULT>"127.0.0.1"</DEFAULT>
-	</PARAMETER>
-
-	<PARAMETER
-		NAME="PROXY_PORT"
-		FIELD="TEXT"
-		NUM_ROW="36"
-		SHOW_IF="USE_PROXY == 'true'"
-		REPOSITORY_VALUE="PROXY_PORT">
-		<DEFAULT>"8080"</DEFAULT>
-	</PARAMETER>
-
-	<PARAMETER
-		NAME="PROXY_USERNAME"
-		FIELD="TEXT"
-		NUM_ROW="37"
-		SHOW_IF="USE_PROXY == 'true'"
-		REPOSITORY_VALUE="PROXY_USERNAME">
-		<DEFAULT>""</DEFAULT>
-	</PARAMETER>
-
-	<PARAMETER
-		NAME="PROXY_PASSWORD"
-		FIELD="PASSWORD"
-		NUM_ROW="38"
-		SHOW_IF="USE_PROXY == 'true'"
-		REPOSITORY_VALUE="PROXY_PASSWORD">
-		<DEFAULT>""</DEFAULT>
-	</PARAMETER>
-
-	<PARAMETER
-		NAME="PROXY_NTLM"
-		FIELD="CHECK"
-		NUM_ROW="39"
-		SHOW_IF="PROTO!='SAMBA_PROTO'"
-		REPOSITORY_VALUE="PROXY_NTLM"
-	 >
-		<DEFAULT>false</DEFAULT>
-	</PARAMETER>
-
-	<PARAMETER
-		NAME="PROXY_DOMAIN"
-		FIELD="TEXT"
-		NUM_ROW="39"
-		SHOW_IF="(PROTO!='SAMBA_PROTO') and (PROXY_NTLM == 'true')"
-		REPOSITORY_VALUE="PROXY_DOMAIN"
+        <PARAMETER
+                NAME="PROTO"
+                FIELD="CLOSED_LIST"
+                NUM_ROW="10"
         >
-		<DEFAULT>""</DEFAULT>
-	</PARAMETER>
+            <ITEMS DEFAULT="HTTP_PROTO">
+                <ITEM NAME="HTTP_PROTO"   VALUE="http" />
+                <ITEM NAME="HTTPS_PROTO"   VALUE="https" />
+                <ITEM NAME="FTP_PROTO"   VALUE="ftp" />
+                <ITEM NAME="SAMBA_PROTO" VALUE="smb" />
+            </ITEMS>
+        </PARAMETER>
 
-	<PARAMETER
-		NAME="NEED_AUTH"
-		FIELD="CHECK"
-		REQUIRED="true"
-		NUM_ROW="45"
-		SHOW_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')"
+        <PARAMETER
+                NAME="POST"
+                FIELD="CHECK"
+                NUM_ROW="50"
+                SHOW_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')"
+        >
+            <DEFAULT>true</DEFAULT>
+        </PARAMETER>
 
-	 >
-		<DEFAULT>false</DEFAULT>
-	</PARAMETER>
+        <PARAMETER
+                NAME="URI"
+                FIELD="TEXT"
+                REQUIRED="true"
+                NUM_ROW="20"
+                SHOW_IF="PROTO!='SAMBA_PROTO'"
+        >
+            <DEFAULT>"http://talendforge.org/file_fetch.txt"</DEFAULT>
+        </PARAMETER>
 
-    <PARAMETER
-      NAME="AUTH_USERNAME"
-      FIELD="TEXT"
-      REQUIRED="false"
-      NUM_ROW="50"
-      SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND (NEED_AUTH == 'true')"
-    >
-      <DEFAULT>"username"</DEFAULT>
-    </PARAMETER>
+        <PARAMETER
+                NAME="USE_CACHE"
+                FIELD="CHECK"
+                NUM_ROW="21"
+        >
+            <DEFAULT>false</DEFAULT>
+        </PARAMETER>
 
-    <PARAMETER
-      NAME="AUTH_PASSWORD"
-      FIELD="PASSWORD"
-      REQUIRED="false"
-      NUM_ROW="50"
-      SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND (NEED_AUTH == 'true')"
-    >
-      <DEFAULT>"password"</DEFAULT>
-    </PARAMETER>
+        <PARAMETER
+                NAME="SMB_URI"
+                FIELD="TEXT"
+                REQUIRED="true"
+                NUM_ROW="20"
+                SHOW_IF="PROTO=='SAMBA_PROTO'"
+        >
+            <DEFAULT>"smb://host/dir/remoteFileName.txt"</DEFAULT>
+        </PARAMETER>
 
-	<PARAMETER
-		NAME="REDIRECT"
-		FIELD="CHECK"
-		REQUIRED="true"
-		NUM_ROW="60"
-	 >
-		<DEFAULT>false</DEFAULT>
-	</PARAMETER>
-   <PARAMETER
-           NAME="REDIRECT_302_AS_303"
-           FIELD="CHECK"
-           REQUIRED="true"
-           SHOW_IF="REDIRECT == 'true'"
-           NUM_ROW="60"
-   >
-       <DEFAULT>false</DEFAULT>
-   </PARAMETER>
-   <PARAMETER
-           NAME="TRUST_ALL_SERVER"
-           FIELD="CHECK"
-           REQUIRED="true"
-           SHOW_IF="PROTO == 'HTTPS_PROTO'"
-           NUM_ROW="70"
-   >
-       <DEFAULT>false</DEFAULT>
-   </PARAMETER>
+        <PARAMETER
+                NAME="DIRECTORY"
+                FIELD="DIRECTORY"
+                NUM_ROW="30"
+                REQUIRED="true"
+                SHOW_IF=" USE_CACHE == 'false'"
+        >
+            <DEFAULT>"C:"</DEFAULT>
+        </PARAMETER>
+
+        <PARAMETER
+                NAME="MAKEDIRS"
+                FIELD="CHECK"
+                NUM_ROW="35"
+                SHOW_IF="(PROTO != 'SAMBA_PROTO') AND (USE_CACHE == 'false')"
+        >
+            <DEFAULT>false</DEFAULT>
+        </PARAMETER>
+
+        <PARAMETER
+                NAME="FILENAME"
+                FIELD="TEXT"
+                REQUIRED="true"
+                NUM_ROW="40"
+                SHOW_IF=" USE_CACHE == 'false'"
+        >
+            <DEFAULT>""</DEFAULT>
+        </PARAMETER>
+
+        <PARAMETER
+                NAME="ADD_HEADER"
+                FIELD="CHECK"
+                NUM_ROW="45"
+                SHOW_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')"
+        >
+            <DEFAULT>false</DEFAULT>
+        </PARAMETER>
+
+        <PARAMETER
+                NAME="HEADERS"
+                FIELD="TABLE" NUM_ROW="46"
+                NB_LINES="5"
+                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND (ADD_HEADER == 'true')"
+        >
+            <ITEMS>
+                <ITEM NAME="HEADER_NAME" />
+                <ITEM NAME="HEADER_VALUE"/>
+            </ITEMS>
+        </PARAMETER>
+
+        <PARAMETER
+                NAME="SMB_DOMAIN"
+                FIELD="TEXT"
+                REQUIRED="true"
+                NUM_ROW="25"
+                SHOW_IF="PROTO=='SAMBA_PROTO'"
+        >
+            <DEFAULT>"domain"</DEFAULT>
+        </PARAMETER>
+
+        <PARAMETER
+                NAME="SMB_USERNAME"
+                FIELD="TEXT"
+                REQUIRED="true"
+                NUM_ROW="25"
+                SHOW_IF="PROTO=='SAMBA_PROTO'"
+        >
+            <DEFAULT>"username"</DEFAULT>
+        </PARAMETER>
+
+        <PARAMETER
+                NAME="SMB_PASSWORD"
+                FIELD="PASSWORD"
+                REQUIRED="true"
+                NUM_ROW="25"
+                SHOW_IF="PROTO=='SAMBA_PROTO'"
+        >
+            <DEFAULT>"password"</DEFAULT>
+        </PARAMETER>
+
+        <PARAMETER
+                NAME="DIE_ON_ERROR"
+                FIELD="CHECK"
+                NUM_ROW="50"
+                SHOW_IF="PROTO!='SAMBA_PROTO'"
+        >
+            <DEFAULT>true</DEFAULT>
+        </PARAMETER>
+
+        <PARAMETER
+                NAME="COMMON_PARAMS"
+                FIELD="TABLE" NUM_ROW="60"
+                NB_LINES="5"
+                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND (POST == 'true')"
+        >
+            <ITEMS>
+                <ITEM NAME="COMMON_PARAMS_NAME" />
+                <ITEM NAME="COMMON_PARAMS_VALUE"/>
+            </ITEMS>
+        </PARAMETER>
+
+        <PARAMETER
+                NAME="READ_COOKIE"
+                FIELD="CHECK"
+                NUM_ROW="70"
+                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO'))"
+        >
+            <DEFAULT>false</DEFAULT>
+        </PARAMETER>
+
+        <PARAMETER
+                NAME="SAVE_COOKIE"
+                FIELD="CHECK"
+                NUM_ROW="70"
+                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO'))"
+        >
+            <DEFAULT>false</DEFAULT>
+        </PARAMETER>
+
+        <PARAMETER
+                NAME="COOKIE_DIR"
+                FIELD="FILE"
+                NUM_ROW="71"
+                REQUIRED="true"
+                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND ((SAVE_COOKIE == 'true') OR (READ_COOKIE == 'true'))"
+        >
+            <DEFAULT>"C:/cookie"</DEFAULT>
+        </PARAMETER>
+
+        <PARAMETER
+                NAME="COOKIE_POLICY"
+                FIELD="CLOSED_LIST"
+                NUM_ROW="72"
+                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND ((SAVE_COOKIE == 'true') OR (READ_COOKIE == 'true'))"
+        >
+            <ITEMS DEFAULT="DEFAULT">
+                <ITEM NAME="DEFAULT"   VALUE="DEFAULT" />
+                <ITEM NAME="BROWSER_COMPATIBILITY"   VALUE="BROWSER_COMPATIBILITY" />
+                <ITEM NAME="NETSCAPE"   VALUE="NETSCAPE" />
+                <ITEM NAME="RFC_2109" VALUE="RFC_2109" />
+                <!-- RFC_2965 is not support in commons-httpclient-3.0.1.jar -->
+                <!-- <ITEM NAME="RFC_2965" VALUE="RFC_2965" />  -->
+            </ITEMS>
+        </PARAMETER>
+
+        <PARAMETER
+                NAME="SINGLE_COOKIE"
+                FIELD="CHECK"
+                NUM_ROW="73"
+                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND ((SAVE_COOKIE == 'true') OR (READ_COOKIE == 'true'))"
+        >
+            <DEFAULT>false</DEFAULT>
+        </PARAMETER>
+    </PARAMETERS>
+
+    <ADVANCED_PARAMETERS>
+        <PARAMETER
+                NAME="ENCODE_URI"
+                FIELD="CHECK"
+                NUM_ROW="6"
+                SHOW_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')"
+        >
+            <DEFAULT>false</DEFAULT>
+        </PARAMETER>
+        <PARAMETER
+                NAME="COMMON_PARAMS_CHARSET"
+                FIELD="OPENED_LIST"
+                NUM_ROW="7"
+                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND (POST == 'true')"
+        >
+            <ITEMS DEFAULT="UTF8">
+                <ITEM NAME="USASCII" VALUE="&quot;US-ASCII&quot;" />
+                <ITEM NAME="UTF8"    VALUE="&quot;UTF-8&quot;" />
+                <ITEM NAME="WIN1252" VALUE="&quot;windows-1252&quot;" />
+            </ITEMS>
+        </PARAMETER>
+        <PARAMETER
+                NAME="PRINT"
+                FIELD="CHECK"
+                NUM_ROW="8"
+                SHOW_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')"
+        >
+        </PARAMETER>
+
+        <PARAMETER
+                NAME="TIMEOUT"
+                FIELD="TEXT"
+                REQUIRED="false"
+                NUM_ROW="5"
+                SHOW_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')"
+        >
+            <DEFAULT>30000</DEFAULT>
+        </PARAMETER>
+
+        <PARAMETER
+                NAME="UPLOAD"
+                FIELD="CHECK"
+                NUM_ROW="10"
+                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND (POST == 'true')"
+        >
+            <DEFAULT>false</DEFAULT>
+        </PARAMETER>
+
+        <PARAMETER
+                NAME="FILE_PARAMS"
+                FIELD="TABLE"
+                NUM_ROW="20"
+                NB_LINES="8"
+                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND (POST == 'true') AND (UPLOAD == 'true')"
+        >
+            <ITEMS>
+                <ITEM NAME="FILE_PARAMS_NAME" />
+                <ITEM NAME="FILE_PARAMS_VALUE"/>
+                <ITEM NAME="FILE_PARAMS_CONTENT_TYPE" VALUE="&quot;application/octet-stream&quot;"/>
+                <ITEM NAME="FILE_PARAMS_CHARSET" VALUE="&quot;ISO-8859-1&quot;"/>
+            </ITEMS>
+        </PARAMETER>
+
+        <PARAMETER
+                NAME="USE_PROXY"
+                FIELD="CHECK"
+                REQUIRED="true"
+                NUM_ROW="30"
+                SHOW_IF="PROTO!='SAMBA_PROTO'"
+                REPOSITORY_VALUE="UES_PROXY">
+            <DEFAULT>false</DEFAULT>
+        </PARAMETER>
+
+        <PARAMETER
+                NAME="PROXY_HOST"
+                FIELD="TEXT"
+                NUM_ROW="35"
+                SHOW_IF="USE_PROXY == 'true'"
+                REPOSITORY_VALUE="PROXY_HOST">
+            <DEFAULT>"127.0.0.1"</DEFAULT>
+        </PARAMETER>
+
+        <PARAMETER
+                NAME="PROXY_PORT"
+                FIELD="TEXT"
+                NUM_ROW="36"
+                SHOW_IF="USE_PROXY == 'true'"
+                REPOSITORY_VALUE="PROXY_PORT">
+            <DEFAULT>"8080"</DEFAULT>
+        </PARAMETER>
+
+        <PARAMETER
+                NAME="PROXY_USERNAME"
+                FIELD="TEXT"
+                NUM_ROW="37"
+                SHOW_IF="USE_PROXY == 'true'"
+                REPOSITORY_VALUE="PROXY_USERNAME">
+            <DEFAULT>""</DEFAULT>
+        </PARAMETER>
+
+        <PARAMETER
+                NAME="PROXY_PASSWORD"
+                FIELD="PASSWORD"
+                NUM_ROW="38"
+                SHOW_IF="USE_PROXY == 'true'"
+                REPOSITORY_VALUE="PROXY_PASSWORD">
+            <DEFAULT>""</DEFAULT>
+        </PARAMETER>
+
+        <PARAMETER
+                NAME="PROXY_NTLM"
+                FIELD="CHECK"
+                NUM_ROW="39"
+                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO'))"
+                REPOSITORY_VALUE="PROXY_NTLM"
+        >
+            <DEFAULT>false</DEFAULT>
+        </PARAMETER>
+
+        <PARAMETER
+                NAME="PROXY_DOMAIN"
+                FIELD="TEXT"
+                NUM_ROW="39"
+                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) and (PROXY_NTLM == 'true')"
+                REPOSITORY_VALUE="PROXY_DOMAIN"
+        >
+            <DEFAULT>""</DEFAULT>
+        </PARAMETER>
+
+        <PARAMETER
+                NAME="NEED_AUTH"
+                FIELD="CHECK"
+                REQUIRED="true"
+                NUM_ROW="45"
+                SHOW_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')"
+
+        >
+            <DEFAULT>false</DEFAULT>
+        </PARAMETER>
+
+        <PARAMETER
+                NAME="AUTH_USERNAME"
+                FIELD="TEXT"
+                REQUIRED="false"
+                NUM_ROW="50"
+                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND (NEED_AUTH == 'true')"
+        >
+            <DEFAULT>"username"</DEFAULT>
+        </PARAMETER>
+
+        <PARAMETER
+                NAME="AUTH_PASSWORD"
+                FIELD="PASSWORD"
+                REQUIRED="false"
+                NUM_ROW="50"
+                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND (NEED_AUTH == 'true')"
+        >
+            <DEFAULT>"password"</DEFAULT>
+        </PARAMETER>
+
+        <PARAMETER
+                NAME="REDIRECT"
+                FIELD="CHECK"
+                REQUIRED="true"
+                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO'))"
+                NUM_ROW="60"
+        >
+            <DEFAULT>false</DEFAULT>
+        </PARAMETER>
+        <PARAMETER
+                NAME="REDIRECT_302_AS_303"
+                FIELD="CHECK"
+                REQUIRED="true"
+                SHOW_IF="((PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')) AND (REDIRECT == 'true')"
+                NUM_ROW="60"
+        >
+            <DEFAULT>false</DEFAULT>
+        </PARAMETER>
+        <PARAMETER
+                NAME="TRUST_ALL_SERVER"
+                FIELD="CHECK"
+                REQUIRED="true"
+                SHOW_IF="PROTO == 'HTTPS_PROTO'"
+                NUM_ROW="70"
+        >
+            <DEFAULT>false</DEFAULT>
+        </PARAMETER>
     </ADVANCED_PARAMETERS>
 
-  <CODEGENERATION>
-   <IMPORTS>
-       <IMPORT NAME="COMMONS-httpclient" MODULE="commons-httpclient-3.0.1.jar" MVN="mvn:commons-httpclient/commons-httpclient/3.0.1" REQUIRED="true" />
-       <IMPORT NAME="COMMONS-Logging" MODULE="commons-logging-1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.jar" REQUIRED="true" />
-       <IMPORT NAME="commons-codec-1.14" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" REQUIRED="true" />
-  	   <IMPORT NAME="jcifs-samba" MODULE="jcifs-1.3.0.jar" MVN="mvn:org.talend.libraries/jcifs-1.3.0/6.0.0"  REQUIRED="true" />
-     </IMPORTS>
-  </CODEGENERATION>
+    <CODEGENERATION>
+        <IMPORTS>
+            <IMPORT NAME="httpclient-4.5.13" MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13" REQUIRED_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')" />
+            <IMPORT NAME="httpcore-4.4.13" MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" REQUIRED_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')" />
+            <IMPORT NAME="httpmime-4.5.13" MODULE="httpmime-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpmime/4.5.13" REQUIRED_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')" />
+            <IMPORT NAME="COMMONS-Logging" MODULE="commons-logging-1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.jar" REQUIRED_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')" />
+            <IMPORT NAME="commons-codec-1.14" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" REQUIRED_IF="(PROTO == 'HTTP_PROTO') or (PROTO == 'HTTPS_PROTO')" />
+            <IMPORT NAME="jcifs-samba" MODULE="jcifs-1.3.0.jar" MVN="mvn:org.talend.libraries/jcifs-1.3.0/6.0.0"  REQUIRED_IF="(PROTO == 'SAMBA_PROTO')" />
+        </IMPORTS>
+    </CODEGENERATION>
 
-  <RETURNS>
-    <RETURN NAME="INPUT_STREAM" TYPE="java.io.InputStream" AVAILABILITY="FLOW"/>
-  </RETURNS>
+    <RETURNS>
+        <RETURN NAME="INPUT_STREAM" TYPE="java.io.InputStream" AVAILABILITY="FLOW"/>
+    </RETURNS>
 
 </COMPONENT>

main/plugins/org.talend.designer.components.localprovider/components/tFileFetch/tFileFetch_main.javajet

@@ -87,15 +87,16 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
 		}
 %>
 	}
+  final org.apache.http.impl.client.HttpClientBuilder httpClientBuilder_<%=cid%> = org.apache.http.impl.client.HttpClientBuilder.create();
 	<%
 	if ("https".equals(protocol)) {
 	%>
-	
-		class SocketFactory_<%=cid%> implements org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory {
 
-			private javax.net.ssl.SSLContext sslcontext = null;
+		 class tFileFetchHelper_<%=cid%>  {
 
-			private javax.net.ssl.SSLContext createSSLContext() throws java.io.IOException{
+			private  javax.net.ssl.SSLContext sslcontext = null;
+
+			private  javax.net.ssl.SSLContext createSSLContext() throws java.io.IOException{
 				javax.net.ssl.SSLContext sslcontext = null;
 				try {
                     sslcontext = javax.net.ssl.SSLContext.getInstance("SSL");
@@ -111,7 +112,7 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
                             kmf.init(keyStore, keyStorePassword.toCharArray());
                             keyManagers = kmf.getKeyManagers();
                         } catch (java.security.UnrecoverableKeyException|java.security.KeyStoreException|java.security.cert.CertificateException e) {
-globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
+                            globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
                             <%if(isLog4jEnabled) {%>
                             log.error(e.getLocalizedMessage());
                             <%}%>
@@ -131,7 +132,7 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
                             trustManagers = tmf.getTrustManagers();
 
                         } catch (java.security.KeyStoreException|java.security.cert.CertificateException e) {
-globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
+                            globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
                             <%if(isLog4jEnabled) {%>
                             log.error(e.getLocalizedMessage());
                             <%}%>
@@ -142,13 +143,13 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
                     }
                     sslcontext.init(keyManagers, trustManagers, new java.security.SecureRandom());
                 } catch (java.security.NoSuchAlgorithmException e) {
-globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
+                    globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
 					<%if(isLog4jEnabled){%>
 						log.error("<%=cid%> - " + e.getMessage());
 					<%}%>
 					e.printStackTrace();
 				} catch (java.security.KeyManagementException e) {
-globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
+                    globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
 					<%if(isLog4jEnabled){%>
 						log.error("<%=cid%> - " + e.getMessage());
 					<%}%>
@@ -158,47 +159,12 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
 			}
 
 			private javax.net.ssl.SSLContext getSSLContext() throws java.io.IOException{
-
 				if (this.sslcontext == null) {
 					this.sslcontext = createSSLContext();
 				}
 				return this.sslcontext;
 			}
 
-			public java.net.Socket createSocket(java.net.Socket socket, String host, int port, boolean autoClose)
-				throws java.io.IOException, java.net.UnknownHostException {
-				return getSSLContext().getSocketFactory().createSocket(socket, host, port, autoClose);
-			}
-
-			public java.net.Socket createSocket(String host, int port) throws java.io.IOException, java.net.UnknownHostException {
-				return getSSLContext().getSocketFactory().createSocket(host, port);
-			}
-
-			public java.net.Socket createSocket(String host, int port, java.net.InetAddress clientHost, int clientPort)
-				throws java.io.IOException, java.net.UnknownHostException {
-				return getSSLContext().getSocketFactory().createSocket(host, port, clientHost, clientPort);
-			}
-
-			public java.net.Socket createSocket(String host, int port, java.net.InetAddress localAddress, int localPort, org.apache.commons.httpclient.params.HttpConnectionParams params) 
-				throws java.io.IOException, java.net.UnknownHostException, org.apache.commons.httpclient.ConnectTimeoutException {
-
-				if (params == null) {
-					throw new IllegalArgumentException("Parameters may not be null");
-				}
-				int timeout = params.getConnectionTimeout();
-				javax.net.SocketFactory socketfactory = getSSLContext().getSocketFactory();
-
-				if (timeout == 0) {
-					return socketfactory.createSocket(host, port, localAddress, localPort);
-				} else {
-					java.net.Socket socket = socketfactory.createSocket();
-					java.net.SocketAddress localaddr = new java.net.InetSocketAddress(localAddress, localPort);
-					java.net.SocketAddress remoteaddr = new java.net.InetSocketAddress(host, port);
-					socket.bind(localaddr);
-					socket.connect(remoteaddr, timeout);
-					return socket;
-				}
-			}
 
 			class TrustAnyTrustManager implements javax.net.ssl.X509TrustManager {
 				public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType)
@@ -213,98 +179,37 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
 			}
 		}
 
-			org.apache.commons.httpclient.protocol.Protocol myhttps_<%=cid%> = new org.apache.commons.httpclient.protocol.Protocol("https", new SocketFactory_<%=cid%>(), 443);
-			org.apache.commons.httpclient.protocol.Protocol.registerProtocol("https", myhttps_<%=cid%>);
+		org.apache.http.conn.ssl.SSLConnectionSocketFactory sslConSocFactory_<%=cid %> =
+		new org.apache.http.conn.ssl.SSLConnectionSocketFactory(new tFileFetchHelper_<%=cid%>().getSSLContext()
+		, new org.apache.http.conn.ssl.NoopHostnameVerifier());
+		httpClientBuilder_<%=cid %>.setSSLSocketFactory(sslConSocFactory_<%=cid %>);
+
 <%
 	}
 %>
-	org.apache.commons.httpclient.HttpClient client_<%=cid %> = new org.apache.commons.httpclient.HttpClient();
-	<%if(isLog4jEnabled){%>
-		log.info("<%=cid%> - Connection attempt to '" + <%=uri %>);
-	<%}%>
-	client_<%=cid %>.getHttpConnectionManager().getParams().setConnectionTimeout(<%=timeout %>);
-	<%if(isLog4jEnabled){%>
-		log.info("<%=cid%> - Connection to '" +  <%=uri %> + "' has succeeded.");
-	<%}%>
-	client_<%=cid %>.getParams().setCookiePolicy(org.apache.commons.httpclient.cookie.CookiePolicy.<%=cookiePolicy %>);
-	<%if(singleCookie){%>
-	client_<%=cid%>.getParams().setBooleanParameter(org.apache.commons.httpclient.params.HttpMethodParams.SINGLE_COOKIE_HEADER, true);
-	<%}%>
-	<%if (readCookie) {%>
-		List<org.apache.commons.httpclient.Cookie> cookieList_<%=cid%> = null;
-		java.io.FileInputStream fis_<%=cid%> = null;
-		java.io.ObjectInputStream is_<%=cid%> = null;
-		
-		try {
-			cookieList_<%=cid%> = new java.util.ArrayList<org.apache.commons.httpclient.Cookie>();
-			fis_<%=cid%> = new java.io.FileInputStream(new java.io.File(<%=cookieDir%>));
-			is_<%=cid%> = new java.io.ObjectInputStream(fis_<%=cid%>);
-			Object obj_<%=cid%> = is_<%=cid%>.readObject();
 
-			while (obj_<%=cid%> != null) {
-				cookieList_<%=cid%>.add((org.apache.commons.httpclient.Cookie) obj_<%=cid%>);
 
-				try {
-					obj_<%=cid%> = is_<%=cid%>.readObject();
-				} catch (java.io.IOException e) {
-globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
-					<%if(isLog4jEnabled){%>
-						log.warn("<%=cid%> - " + e.getMessage());
-					<%}%>
-					obj_<%=cid%> = null;
-				}
-			}
-		} catch (java.io.FileNotFoundException e1) {
-globalMap.put("<%=cid%>_ERROR_MESSAGE",e1.getMessage());
-			<%if(isLog4jEnabled){%>
-				log.error("<%=cid%> - " + e1.getMessage());
-			<%}%>
-			e1.printStackTrace();
-		} catch (java.io.IOException e) {
-globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
-			<%if(isLog4jEnabled){%>
-				log.error("<%=cid%> - " + e.getMessage());
-			<%}%>
-			e.printStackTrace();
-		} catch (java.lang.ClassNotFoundException e) {
-globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
-			<%if(isLog4jEnabled){%>
-				log.error("<%=cid%> - " + e.getMessage());
-			<%}%>
-			e.printStackTrace();
-		} finally {
-			if (is_<%=cid%> != null) is_<%=cid%>.close();
-			if (fis_<%=cid%> != null) fis_<%=cid%>.close();
-		}
+org.apache.http.client.CredentialsProvider credsProvider_<%=cid %> = new org.apache.http.impl.client.BasicCredentialsProvider();
+<%
+		if (useProxy) {
 
-		if (cookieList_<%=cid%> != null)
-			client_<%=cid %>.getState().addCookies(cookieList_<%=cid%>.toArray(new org.apache.commons.httpclient.Cookie[0]));
-	<%
-	}
+    		String passwordFieldName = "__PROXY_PASSWORD__";
+    		%>
+    		httpClientBuilder_<%=cid %>.setProxy(new org.apache.http.HttpHost(<%=proxyHost %>, Integer.parseInt(<%=proxyPort%>)));
 
-	if (useProxy) {%> 
-		client_<%=cid %>.getHostConfiguration().setProxy(<%=proxyHost %>, Integer.parseInt(<%=proxyPort%>));
-	        
-		<%
-		String passwordFieldName = "__PROXY_PASSWORD__";
-		%>
-		
-		<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/password.javajet"%>
-	   	
-		<%if (useProxyNTLM) {%>
-			client_<%=cid %>.getState().setProxyCredentials(
-			new org.apache.commons.httpclient.auth.AuthScope( <%=proxyHost %>, Integer.parseInt(<%=proxyPort%>), null ),
-			new org.apache.commons.httpclient.NTCredentials( <%=proxyUser %>,
-			decryptedPassword_<%=cid%>, <%=proxyHost %>, <%=proxyDomain %> ));
-		<%} else {%>
-			client_<%=cid %>.getState().setProxyCredentials(
-			new org.apache.commons.httpclient.auth.AuthScope(<%=proxyHost %>, Integer.parseInt(<%=proxyPort%>), null),
-			new org.apache.commons.httpclient.UsernamePasswordCredentials(<%=proxyUser %>, decryptedPassword_<%=cid%>));
-			
-			java.util.List<String> authPrefs_<%=cid %> = java.util.Collections.singletonList(org.apache.commons.httpclient.auth.AuthPolicy.BASIC);
-			client_<%=cid %>.getParams().setParameter(org.apache.commons.httpclient.auth.AuthPolicy.AUTH_SCHEME_PRIORITY, authPrefs_<%=cid %>);
-		<%}
-	}
+    		<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/password.javajet"%>
+    		
+
+    		<%if (useProxyNTLM) {%>
+    			credsProvider_<%=cid %>.setCredentials(new org.apache.http.auth.AuthScope(<%=proxyHost %>, Integer.parseInt(<%=proxyPort%>)), new
+                                org.apache.http.auth.NTCredentials( <%=proxyUser %>,
+                                                 decryptedPassword_<%=cid%>, <%=proxyHost %>, <%=proxyDomain %> ));
+    		<%} else {%>
+    			credsProvider_<%=cid %>.setCredentials(new org.apache.http.auth.AuthScope(<%=proxyHost %>, Integer.parseInt(<%=proxyPort%>)), new
+                                                org.apache.http.auth.UsernamePasswordCredentials( <%=proxyUser %>,
+                                                                 decryptedPassword_<%=cid%> ));
+    		<%}
+    	}
 
 	if (needAuth) {
 		if (ElementParameterParser.canEncrypt(node, "__AUTH_PASSWORD__")) {
@@ -316,22 +221,111 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
 		String decryptedPwd_<%=cid%> = <%= ElementParameterParser.getValue(node, "__AUTH_PASSWORD__")%>;
 		<%
 		}
-		
+
 		if ((!useProxy) && useProxyNTLM && (!"".equals(proxyDomain))) {
 		%>
-			client_<%=cid %>.getState().setCredentials(org.apache.commons.httpclient.auth.AuthScope.ANY, new org.apache.commons.httpclient.NTCredentials(<%=username %>, decryptedPwd_<%=cid%>, new java.net.URL(<%=uri%>).getHost(), <%=proxyDomain%>));
+						   credsProvider_<%=cid %>.setCredentials( org.apache.http.auth.AuthScope.ANY, new
+                                                                        org.apache.http.auth.NTCredentials( <%=username %>, decryptedPwd_<%=cid%>, 
+																		new java.net.URL(<%=uri%>).getHost(), <%=proxyDomain%>));
 		<%} else {%>
-			client_<%=cid %>.getState().setCredentials(org.apache.commons.httpclient.auth.AuthScope.ANY, new org.apache.commons.httpclient.UsernamePasswordCredentials(<%=username %>, decryptedPwd_<%=cid%>));
-		<%}
+			    			credsProvider_<%=cid %>.setCredentials( org.apache.http.auth.AuthScope.ANY, new
+                                                            org.apache.http.auth.UsernamePasswordCredentials( <%=username %>, decryptedPwd_<%=cid%>));
+		<%}%>
+		
+		<%
 	}
 
+    	%>
+		httpClientBuilder_<%=cid %>.setDefaultCredentialsProvider(credsProvider_<%=cid %>);
+
+     org.apache.http.impl.client.CloseableHttpClient client_<%=cid %> = httpClientBuilder_<%=cid%>.build();
+	<%if(isLog4jEnabled){%>
+		log.info("<%=cid%> - Connection attempt to '" + <%=uri %>);
+	<%}%>
+	final org.apache.http.client.config.RequestConfig.Builder builder_<%=cid%> = org.apache.http.client.config.RequestConfig.custom();
+	builder_<%=cid%>.setConnectTimeout(<%=timeout %>);
+	<%if(isLog4jEnabled){%>
+		log.info("<%=cid%> - Connection to '" +  <%=uri %> + "' has succeeded.");
+	<%
+	}
+	%>
+        org.apache.http.conn.util.PublicSuffixMatcher publicSuffixMatcher_<%=cid%> = org.apache.http.conn.util.PublicSuffixMatcherLoader.getDefault();
+        org.apache.http.config.Registry<org.apache.http.cookie.CookieSpecProvider> cookieSpecReg_<%=cid%> = org.apache.http.config.RegistryBuilder.<org.apache.http.cookie.CookieSpecProvider>create()
+                .register(org.apache.http.client.config.CookieSpecs.DEFAULT, new org.apache.http.impl.cookie.DefaultCookieSpecProvider(org.apache.http.impl.cookie.DefaultCookieSpecProvider.CompatibilityLevel.DEFAULT, publicSuffixMatcher_<%=cid%>, null, <%=singleCookie%>))
+                .register(org.apache.http.client.config.CookieSpecs.STANDARD, new org.apache.http.impl.cookie.RFC6265CookieSpecProvider(publicSuffixMatcher_<%=cid%>)).build();
+         org.apache.http.client.CookieStore cookieStore_<%=cid%> = new org.apache.http.impl.client.BasicCookieStore();
+
+        final org.apache.http.client.protocol.HttpClientContext context_<%=cid%> = org.apache.http.client.protocol.HttpClientContext.create();
+        context_<%=cid%>.setCookieSpecRegistry(cookieSpecReg_<%=cid%>);
+        context_<%=cid%>.setCookieStore(cookieStore_<%=cid%>);
+
+
+	<%if (readCookie) {%>
+		List<org.apache.http.cookie.Cookie> cookieList_<%=cid%> = null;
+		java.io.FileInputStream fis_<%=cid%> = null;
+		java.io.ObjectInputStream is_<%=cid%> = null;
+		
+		try {
+			cookieList_<%=cid%> = new java.util.ArrayList<org.apache.http.cookie.Cookie>();
+			fis_<%=cid%> = new java.io.FileInputStream(new java.io.File(<%=cookieDir%>));
+			is_<%=cid%> = new java.io.ObjectInputStream(fis_<%=cid%>);
+		    Object obj_<%=cid%> = null;
+		try{
+		        obj_<%=cid%> = is_<%=cid%>.readObject();
+		}catch (java.io.EOFException e){
+             <%if(isLog4jEnabled){%>
+		        log.warn("<%=cid%> - cookie file {} {}",<%=cookieDir%>," is empty." );
+             <%}%>
+		    }
+			while (obj_<%=cid%> != null) {
+				cookieList_<%=cid%>.add((org.apache.http.cookie.Cookie) obj_<%=cid%>);
+
+				try {
+					obj_<%=cid%> = is_<%=cid%>.readObject();
+				} catch (java.io.IOException e) {
+                    globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
+					<%if(isLog4jEnabled){%>
+						log.warn("<%=cid%> - " + e.getMessage());
+					<%}%>
+					obj_<%=cid%> = null;
+				}
+			}
+		} catch (java.io.IOException e1) {
+            globalMap.put("<%=cid%>_ERROR_MESSAGE",e1.getMessage());
+			<%if(isLog4jEnabled){%>
+				log.error("<%=cid%> - " + e1.getMessage());
+			<%}%>
+			e1.printStackTrace();
+		} catch (java.lang.ClassNotFoundException e) {
+            globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
+			<%if(isLog4jEnabled){%>
+		        log.error("<%=cid%> - " + "Existing cookie is not compatible with library, please check the \"Save cookie\" option to regenerate.");
+			<%}else{%>
+		        System.err.println("Existing cookie is not compatible with library, please check the \"Save cookie\" option to regenerate.");
+		    <%}%>
+		} finally {
+			if (is_<%=cid%> != null) is_<%=cid%>.close();
+			if (fis_<%=cid%> != null) fis_<%=cid%>.close();
+		}
+
+		if (cookieList_<%=cid%> != null)
+			cookieList_<%=cid%>.forEach(cookieStore_<%=cid%>::addCookie);
+	<%
+	}
+
+
 	if (post) {
 	%>
-		org.apache.commons.httpclient.HttpMethod method_<%=cid%> = new org.apache.commons.httpclient.methods.PostMethod(uriToFetch_<%=cid %><% if (encodeURI) { %>.toASCIIString()<% } else {%>.toString() <% } %>);
+		org.apache.http.client.methods.HttpPost method_<%=cid%> = new org.apache.http.client.methods.HttpPost(uriToFetch_<%=cid %><% if (encodeURI) { %>.toASCIIString()<% } else {%>.toString() <% } %>);
+		List<org.apache.http.NameValuePair> nameValuePairList_<%=cid%> = new java.util.ArrayList<>();
 		<%
 		List<Map<String, String>> commonParams = (List<Map<String,String>>)ElementParameterParser.getObjectValue(node, "__COMMON_PARAMS__");	
 		List<String> varPartList = new ArrayList<String>();	//common string parameter part	
 		int i = 0;
+		%>
+		org.apache.http.entity.mime.MultipartEntityBuilder entityBuilder_<%=cid%> = org.apache.http.entity.mime.MultipartEntityBuilder.create();
+		<%
+
 
 		for (Map<String, String> param : commonParams) {
 			i++;
@@ -339,7 +333,7 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
 			String value = param.get("COMMON_PARAMS_VALUE");
 			varPartList.add("common_" + i + "_" + cid);
 			%>
-			org.apache.commons.httpclient.methods.multipart.StringPart common_<%=i%>_<%=cid%> = new org.apache.commons.httpclient.methods.multipart.StringPart(<%=name %>, <%=value %>, <%=paramsCharset %>);
+		    entityBuilder_<%=cid%>.addTextBody(<%=name %>, <%=value %>);
 			<%
 		}
 
@@ -355,15 +349,20 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
 				String charset = param.get("FILE_PARAMS_CHARSET");
 				varPartList.add("file_" + j + "_" + cid);
 				%>
-				org.apache.commons.httpclient.methods.multipart.FilePart file_<%=j%>_<%=cid%>  = new org.apache.commons.httpclient.methods.multipart.FilePart(<%=name %>, new java.io.File(<%=value %>), <%=content_type%>, <%=charset%>);
+
+                entityBuilder_<%=cid%>.setCharset(java.nio.charset.Charset.forName(<%=charset%>));
+                entityBuilder_<%=cid%>.addBinaryBody(<%=name%>,new java.io.File(<%=value %>),
+                org.apache.http.entity.ContentType.parse(<%=content_type%>),new java.io.File(<%=value %>).getName());
+
+
 			<%
 			}
 		}
 		%>
-		org.apache.commons.httpclient.methods.multipart.Part[] parts_<%=cid %> = new org.apache.commons.httpclient.methods.multipart.Part[]{<%for(String var: varPartList){%><%=var %>,<%}%>};    
-		((org.apache.commons.httpclient.methods.PostMethod)method_<%=cid%>).setRequestEntity(new org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity(parts_<%=cid %>, method_<%=cid%>.getParams()));
+		method_<%=cid%>.setEntity(entityBuilder_<%=cid%>.build());
+
 	<%} else {%>
-		org.apache.commons.httpclient.HttpMethod method_<%=cid%> = new org.apache.commons.httpclient.methods.GetMethod(uriToFetch_<%=cid %><% if (encodeURI) { %>.toASCIIString()<% } else {%>.toString() <% } %>);
+		org.apache.http.client.methods.HttpGet method_<%=cid%> = new org.apache.http.client.methods.HttpGet(uriToFetch_<%=cid %><% if (encodeURI) { %>.toASCIIString()<% } else {%>.toString() <% } %>);
 	<%}
 
 	if (addHeader) {
@@ -371,63 +370,68 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
 		
 		for (Map<String, String> header : headers) {
 		%>
-			method_<%=cid%>.addRequestHeader(<%=header.get("HEADER_NAME")%>,<%=header.get("HEADER_VALUE")%>);
+			method_<%=cid%>.setHeader(<%=header.get("HEADER_NAME")%>,<%=header.get("HEADER_VALUE")%>);
 		<%
 		}
 	}
 	%>
 	boolean isContinue_<%=cid%> = true;
 	int status_<%=cid%>;
+	org.apache.http.client.methods.CloseableHttpResponse httpResponse_<%=cid%> = null;
 	String finalURL_<%=cid%> = uriToFetch_<%=cid %><% if (encodeURI) { %>.toASCIIString()<% } else {%>.toString() <% } %>;
 
 	try { // B_01
 		<%if (redirect) { //Bug13155, add support of redirection%>
 			boolean redirect_<%=cid%> = true;
+			 org.apache.http.client.methods.HttpRequestBase request_<%=cid%> = method_<%=cid%>;
 
 			while (redirect_<%=cid%>) {
-				status_<%=cid%> = client_<%=cid %>.executeMethod(method_<%=cid%>);
 
-				if ((status_<%=cid%> == org.apache.commons.httpclient.HttpStatus.SC_MOVED_TEMPORARILY) 
-					|| (status_<%=cid%> == org.apache.commons.httpclient.HttpStatus.SC_MOVED_PERMANENTLY)
-						|| (status_<%=cid%> == org.apache.commons.httpclient.HttpStatus.SC_SEE_OTHER) 
-							|| (status_<%=cid%> == org.apache.commons.httpclient.HttpStatus.SC_TEMPORARY_REDIRECT)) {
+				httpResponse_<%=cid%> = client_<%=cid %>.execute( request_<%=cid%> ,context_<%=cid%>);
+				status_<%=cid%> = httpResponse_<%=cid%>.getStatusLine().getStatusCode();
+
+				if ((status_<%=cid%> == org.apache.http.HttpStatus.SC_MOVED_TEMPORARILY)
+					|| (status_<%=cid%> == org.apache.http.HttpStatus.SC_MOVED_PERMANENTLY)
+						|| (status_<%=cid%> == org.apache.http.HttpStatus.SC_SEE_OTHER)
+							|| (status_<%=cid%> == org.apache.http.HttpStatus.SC_TEMPORARY_REDIRECT)) {
 					<%if(isLog4jEnabled){%>
 						log.info("<%=cid%> - Closing the connection to the server.");
 					<%}%>
-					method_<%=cid%>.releaseConnection();
+					request_<%=cid%>.releaseConnection();
 					<%if(isLog4jEnabled){%>
 						log.info("<%=cid%> - Connection to the server closed.");
 					<%}%>
 
-					String redirect_url_<%=cid%> = method_<%=cid%>.getResponseHeader("location").getValue();
+					String redirect_url_<%=cid%> = httpResponse_<%=cid%>.getFirstHeader("location").getValue();
                     if(!redirect_url_<%=cid%>.startsWith("http")){
-                        redirect_url_<%=cid%> = method_<%=cid%>.getHostConfiguration().getProtocol().getScheme()+"://" + method_<%=cid%>.getURI().getHost() + ":" + method_<%=cid%>.getURI().getPort() + redirect_url_<%=cid%>;
+                        redirect_url_<%=cid%> = request_<%=cid%>.getURI().getScheme()+"://" + request_<%=cid%>.getURI().getHost() + ":" + request_<%=cid%>.getURI().getPort() + redirect_url_<%=cid%>;
                     }
 
-                    if(status_<%=cid%> == org.apache.commons.httpclient.HttpStatus.SC_SEE_OTHER<% if(redirect_302_as_303) {%> || status_<%=cid%> == org.apache.commons.httpclient.HttpStatus.SC_MOVED_TEMPORARILY<% } %>) {
-                        method_<%=cid%> = new org.apache.commons.httpclient.methods.GetMethod(redirect_url_<%=cid%>);
+                    if(status_<%=cid%> == org.apache.http.HttpStatus.SC_SEE_OTHER<% if(redirect_302_as_303) {%> || status_<%=cid%> == org.apache.http.HttpStatus.SC_MOVED_TEMPORARILY<% } %>) {
+                        request_<%=cid%> = new org.apache.http.client.methods.HttpGet(redirect_url_<%=cid%>);
                     }
                     else{
-                        method_<%=cid%> = new org.apache.commons.httpclient.methods.<%if(post){%>Post<%}else{%>Get<%}%>Method(redirect_url_<%=cid%>);
+                        request_<%=cid%> =new org.apache.http.client.methods.Http<%if(post){%>Post<%}else{%>Get<%}%>(redirect_url_<%=cid%>);
                     }
 
-					System.out.println("Redirect to: " + method_<%=cid%>.getURI());
-					finalURL_<%=cid%> = method_<%=cid%>.getURI().toString();
+					System.out.println("Redirect to: " + request_<%=cid%>.getURI());
+					finalURL_<%=cid%> = request_<%=cid%>.getURI().toString();
 				} else if (status_<%=cid%> >= 200 && status_<%=cid%> < 300) { //Status code 2XX indicates success
 					redirect_<%=cid%> = false;
 				} else {
-					throw new java.lang.Exception("Method failed: " + method_<%=cid%>.getStatusLine());
+					throw new java.lang.Exception("Method failed: " + httpResponse_<%=cid%>.getStatusLine());
 				}
 			}
 		<%} else {%>
-			status_<%=cid%>  = client_<%=cid %>.executeMethod(method_<%=cid%>);
+			httpResponse_<%=cid%> = client_<%=cid %>.execute(method_<%=cid%>,context_<%=cid%>);
+            status_<%=cid%> = httpResponse_<%=cid%>.getStatusLine().getStatusCode();
 		<%
 		}
 
 		if (!redirect) {
 		%>
 			if (!(status_<%=cid%> >= 200 && status_<%=cid%> < 300)){//Status code 2XX indicates success
-				throw new java.lang.Exception("Method failed: " + method_<%=cid%>.getStatusLine());
+				throw new java.lang.Exception("Method failed: " + httpResponse_<%=cid%>.getStatusLine());
 			}
 		<%
 		}
@@ -448,7 +452,7 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
 	}
     <% if(saveCookie){ %>
 	finally {
-        org.apache.commons.httpclient.Cookie[] cookies_<%=cid%> = client_<%=cid %>.getState().getCookies();
+        List<org.apache.http.cookie.Cookie> cookies_<%=cid%> = context_<%=cid%>.getCookieStore().getCookies();
         java.io.File cookieFile_<%=cid%> = new java.io.File(<%=cookieDir%>);
         java.io.File cookieDir_<%=cid%>= cookieFile_<%=cid%>.getParentFile();
         if(!cookieDir_<%=cid%>.exists()){
@@ -457,7 +461,7 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
         java.io.FileOutputStream fos_<%=cid%> = new java.io.FileOutputStream(cookieFile_<%=cid%>);
         java.io.ObjectOutputStream os_<%=cid%> = new java.io.ObjectOutputStream(fos_<%=cid%>);
 
-        for (org.apache.commons.httpclient.Cookie c : cookies_<%=cid%>) {
+        for (org.apache.http.cookie.Cookie c : cookies_<%=cid%>) {
             os_<%=cid%>.writeObject(c);
         }
         os_<%=cid%>.close();
@@ -467,20 +471,20 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
 
 	if (isContinue_<%=cid%>) {    
 		<%if (printResponse) {%>
-			System.out.println("Status Line: " + method_<%=cid%>.getStatusLine());  
+			System.out.println("Status Line: " + httpResponse_<%=cid%>.getStatusLine());  
 			System.out.println("*** Response Header ***");  
-			org.apache.commons.httpclient.Header[] responseHeaders_<%=cid %> = method_<%=cid%>.getResponseHeaders();  
+			org.apache.http.Header[] responseHeaders_<%=cid %> = httpResponse_<%=cid%>.getAllHeaders();
 
 			for (int i = 0; i < responseHeaders_<%=cid %>.length; i++) {
-				System.out.print(responseHeaders_<%=cid %>[i]);
+				System.out.println(responseHeaders_<%=cid %>[i]);
 			}
 		<%
 		}
 
 		if (bUseCache) {%>
-			retIS_<%=cid%> = method_<%=cid%>.getResponseBodyAsStream();
+			retIS_<%=cid%> = httpResponse_<%=cid%>.getEntity().getContent();
 		<%} else {%>
-			java.io.InputStream in_<%=cid %> = method_<%=cid%>.getResponseBodyAsStream();
+			java.io.InputStream in_<%=cid %> = httpResponse_<%=cid%>.getEntity().getContent();
 			String sDir_<%=cid%> = (<%=directory%>).trim();
 			String fileName_<%=cid %> = (<%=filename%>).trim();    
 			//open directory

main/plugins/org.talend.designer.components.localprovider/components/tFileFetch/tFileFetch_messages.properties

@@ -46,11 +46,11 @@ TRUST_ALL_SERVER.NAME=Trust all servers
 SAVE_COOKIE.NAME=Save cookie
 READ_COOKIE.NAME=Read cookie
 COOKIE_DIR.NAME=Cookie directory
-COOKIE_POLICY.NAME=Cookie policy
+COOKIE_POLICY.NAME=Cookie policy (Deprecated)
 COOKIE_POLICY.ITEM.DEFAULT=DEFAULT
-COOKIE_POLICY.ITEM.BROWSER_COMPATIBILITY=BROWSER_COMPATIBILITY
+COOKIE_POLICY.ITEM.BROWSER_COMPATIBILITY=BROWSER_COMPATIBILITY (Deprecated)
 COOKIE_POLICY.ITEM.NETSCAPE=NETSCAPE
-COOKIE_POLICY.ITEM.RFC_2109=RFC_2109
+COOKIE_POLICY.ITEM.RFC_2109=RFC_2109 (Deprecated)
 SINGLE_COOKIE.NAME=Single cookie header
 ADD_HEADER.NAME=Add header
 HEADERS.NAME=Headers

main/plugins/org.talend.designer.components.localprovider/components/tFileInputJSON/tFileInputJSON_java.xml

@@ -167,7 +167,7 @@
 			<!-- xpath -->
 			<IMPORT NAME="Java_DOM4J2" MODULE="dom4j-2.1.3.jar" MVN="mvn:org.dom4j/dom4j/2.1.3" REQUIRED_IF="(READ_BY == 'XPATH')" BundleID="" />
 			<IMPORT NAME="Java_JAXEN_1.1.6" MODULE="jaxen-1.1.6.jar" MVN="mvn:jaxen/jaxen/1.1.6" REQUIRED_IF="(READ_BY == 'XPATH')" BundleID="" />
-			<IMPORT NAME="json-lib" MODULE="json-lib-2.4.6-talend.jar" MVN="mvn:net.sf.json-lib/json-lib/2.4.6-talend" REQUIRED_IF="(READ_BY == 'XPATH')" />
+			<IMPORT NAME="json-lib" MODULE="json-lib-2.4.7-talend.jar" MVN="mvn:net.sf.json-lib/json-lib/2.4.7-talend" REQUIRED_IF="(READ_BY == 'XPATH')" />
 			<IMPORT NAME="commons_lang" MODULE="commons-lang-2.6.jar" MVN="mvn:commons-lang/commons-lang/2.6"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang-2.6.jar"
 				REQUIRED_IF="(READ_BY == 'XPATH')" />
 			<IMPORT NAME="commons_logging" MODULE="commons-logging-1.1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1.1/6.0.0"  UrlPath="platform:/base/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar"

main/plugins/org.talend.designer.components.localprovider/components/tFileOutputDelimited/tFileOutputDelimited_messages_ja.properties

@@ -27,7 +27,7 @@ TEXT_ENCLOSURE.NAME=[Text enclosure] (\u30C6\u30AD\u30B9\u30C8\u56F2\u307F\u6587
 THOUSANDS_SEPARATOR.NAME=\u6841\u533A\u5207\u308A
 ROW_MODE.NAME=[Output in row mode] (\u884C\u30E2\u30FC\u30C9\u51FA\u529B)
 DELETE_EMPTYFILE.NAME=\u7A7A\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u751F\u6210\u3057\u306A\u3044
-FILE_EXIST_EXCEPTION.NAME=\u30D5\u30A1\u30A4\u30EB\u304C\u65E2\u306B\u5B58\u5728\u3059\u308B\u5834\u5408\u306F\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3059
+FILE_EXIST_EXCEPTION.NAME=\u30D5\u30A1\u30A4\u30EB\u304C\u65E2\u5B58\u306E\u5834\u5408\u306F\u30A8\u30E9\u30FC\u306B\u3059\u308B
 ALWAYS_QUOTE.NAME=\u5E38\u306B\u5F15\u7528\u7B26
 USESTREAM.NAME=\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u306E\u4F7F\u7528
 STREAMNAME.NAME=\u51FA\u529B\u30B9\u30C8\u30EA\u30FC\u30E0

main/plugins/org.talend.designer.components.localprovider/components/tFileOutputJSON/tFileOutputJSON_main.javajet

@@ -49,7 +49,23 @@ for (IConnection conn : conns) {
 				%>
 					jsonRow<%=cid%>.put("<%=column.getLabel()%>", String.valueOf(<%=conn.getName()%>.<%=column.getLabel()%>));
 				<%
-				}else{
+				}
+				// add dynamic schema support here
+				else if("id_Dynamic".equals(column.getTalendType())) {%>
+					Dynamic col_<%=cid%> = <%=conn.getName()%>.<%=column.getLabel()%>;
+					for (int i_<%=cid%> = 0; i_<%=cid%> < col_<%=cid%>.getColumnCount(); i_<%=cid%>++) {
+						DynamicMetadata metadata_<%=cid%> = col_<%=cid%>.getColumnMetadata(i_<%=cid%>);
+						Object val_<%=cid%> = col_<%=cid%>.getColumnValue(i_<%=cid%>);
+						if (metadata_<%=cid%> != null && val_<%=cid%> != null) {
+							if (val_<%=cid%> instanceof Date) {
+								val_<%=cid%> = FormatterUtils.format_Date((Date)val_<%=cid%>, metadata_<%=cid%>.getFormat());
+							}
+							jsonRow<%=cid%>.put(metadata_<%=cid%>.getName(),val_<%=cid%>);
+						}
+					}
+				<%
+				} //end of add dynamic support here  (this assumes dynamic datatype does not contain nested dynamic datatype fields)
+				else {
 				%>
 					jsonRow<%=cid%>.put("<%=column.getLabel()%>", <%=conn.getName()%>.<%=column.getLabel()%>);
 				<%

main/plugins/org.talend.designer.components.localprovider/components/tFileUnarchive/tFileUnarchive_begin.javajet

@@ -62,10 +62,10 @@
        || tmpFileURL_<%=cid %>.endsWith(".tgz")
        || tmpFileURL_<%=cid %>.endsWith(".gz")
        ){
-           isValidArchive_<%= cid %> = org.talend.archive.IntegrityUtil.isGZIPValid(zipFileURL_<%=cid %>);
+           isValidArchive_<%= cid %> = com.talend.compress.zip.IntegrityUtil.isGZIPValid(zipFileURL_<%=cid %>);
 
        }else if(tmpFileURL_<%=cid %>.endsWith(".tar")){
-       		isValidArchive_<%= cid %> = org.talend.archive.IntegrityUtil.isTarValid(zipFileURL_<%=cid %>);
+       		isValidArchive_<%= cid %> = com.talend.compress.zip.IntegrityUtil.isTarValid(zipFileURL_<%=cid %>);
        }
            <%
     if(dieWhenArchiveCorrupted){

main/plugins/org.talend.designer.components.localprovider/components/tFileUnarchive/tFileUnarchive_java.xml

@@ -93,9 +93,8 @@
      <IMPORTS>
        <IMPORT NAME="commons-compress-1.21" MODULE="commons-compress-1.21.jar" MVN="mvn:org.apache.commons/commons-compress/1.21" REQUIRED="true" />
        <IMPORT NAME="Ant-Zip" MODULE="ant-1.10.11.jar" MVN="mvn:org.apache.ant/ant/1.10.11" REQUIRED="true" />
-       <IMPORT NAME="Check-Archive" MODULE="checkArchive-1.2-20210901.jar" MVN="mvn:org.talend.components/checkArchive/1.2-20210901" UrlPath="platform:/plugin/org.talend.libraries.custom/lib/checkArchive-1.2-20210901.jar" REQUIRED="true" />
-       <IMPORT NAME="zip4j-1.3.3.jar" MODULE="zip4j-1.3.3.jar" MVN="mvn:net.lingala.zip4j/zip4j/1.3.3"  REQUIRED="true" />
-       <IMPORT NAME="talendzip-1.2-20210901.jar" MODULE="talendzip-1.2-20210901.jar" MVN="mvn:org.talend.components/talendzip/1.2-20210901" UrlPath="platform:/plugin/org.talend.libraries.custom/lib/talendzip-1.2-20210901.jar" REQUIRED="true" />
+       <IMPORT NAME="zip4j-2.10.0.jar" MODULE="zip4j-2.10.0.jar" MVN="mvn:net.lingala.zip4j/zip4j/2.10.0"  REQUIRED="true" />
+       <IMPORT NAME="talendzip-1.3.jar" MODULE="talendzip-1.3.jar" MVN="mvn:org.talend.components/talendzip/1.3" UrlPath="platform:/plugin/org.talend.libraries.custom/lib/talendzip-1.3.jar" REQUIRED="true" />
      </IMPORTS>
    </CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tGSBucketCreate/tGSBucketCreate_java.xml

@@ -185,7 +185,7 @@
 				<IMPORT NAME="google-auth-library-credentials-0.20.0" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-http-client-1.38.0" MODULE="google-http-client-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.38.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-http-client-jackson2-1.38.0" MODULE="google-http-client-jackson2-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.38.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
-				<IMPORT NAME="jackson-core-2.11.4" MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
+				<IMPORT NAME="jackson-core-2.13.2" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="guava-30.0-jre.jar" MODULE="guava-30.0-jre.jar" MVN="mvn:com.google.guava/guava/30.0-jre" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="failureaccess-1.0.1.jar" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED="true" />
 

main/plugins/org.talend.designer.components.localprovider/components/tGSBucketDelete/tGSBucketDelete_java.xml

@@ -137,7 +137,7 @@
 				<IMPORT NAME="google-auth-library-credentials-0.20.0" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-http-client-1.38.0" MODULE="google-http-client-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.38.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-http-client-jackson2-1.38.0" MODULE="google-http-client-jackson2-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.38.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
-				<IMPORT NAME="jackson-core-2.11.4" MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
+				<IMPORT NAME="jackson-core-2.13.2" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="guava-30.0-jre.jar" MODULE="guava-30.0-jre.jar" MVN="mvn:com.google.guava/guava/30.0-jre" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="failureaccess-1.0.1.jar" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED="true" />
 

main/plugins/org.talend.designer.components.localprovider/components/tGSBucketExist/tGSBucketExist_java.xml

@@ -137,7 +137,7 @@
 				<IMPORT NAME="google-auth-library-credentials-0.20.0" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-http-client-1.38.0" MODULE="google-http-client-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.38.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-http-client-jackson2-1.38.0" MODULE="google-http-client-jackson2-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.38.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
-				<IMPORT NAME="jackson-core-2.11.4" MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
+				<IMPORT NAME="jackson-core-2.13.2" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="guava-30.0-jre.jar" MODULE="guava-30.0-jre.jar" MVN="mvn:com.google.guava/guava/30.0-jre" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="failureaccess-1.0.1.jar" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED="true" />
 

main/plugins/org.talend.designer.components.localprovider/components/tGSBucketList/tGSBucketList_java.xml

@@ -122,7 +122,7 @@
 				<IMPORT NAME="google-auth-library-credentials-0.20.0" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-http-client-1.38.0" MODULE="google-http-client-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.38.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-http-client-jackson2-1.38.0" MODULE="google-http-client-jackson2-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.38.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
-				<IMPORT NAME="jackson-core-2.11.4" MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
+				<IMPORT NAME="jackson-core-2.13.2" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="guava-30.0-jre.jar" MODULE="guava-30.0-jre.jar" MVN="mvn:com.google.guava/guava/30.0-jre" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="failureaccess-1.0.1.jar" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED="true" />
 

main/plugins/org.talend.designer.components.localprovider/components/tGSConnection/tGSConnection_java.xml

@@ -95,7 +95,7 @@
 				<IMPORT NAME="google-auth-library-credentials-0.20.0" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
 				<IMPORT NAME="google-http-client-1.38.0" MODULE="google-http-client-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.38.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
 				<IMPORT NAME="google-http-client-jackson2-1.38.0" MODULE="google-http-client-jackson2-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.38.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
-				<IMPORT NAME="jackson-core-2.11.4" MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
+				<IMPORT NAME="jackson-core-2.13.2" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
 				<IMPORT NAME="guava-30.0-jre.jar" MODULE="guava-30.0-jre.jar" MVN="mvn:com.google.guava/guava/30.0-jre" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
 				<IMPORT NAME="failureaccess-1.0.1.jar" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED="true" />
 

main/plugins/org.talend.designer.components.localprovider/components/tGSCopy/tGSCopy_java.xml

@@ -215,7 +215,7 @@
 				<IMPORT NAME="google-auth-library-credentials-0.20.0" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-http-client-1.38.0" MODULE="google-http-client-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.38.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-http-client-jackson2-1.38.0" MODULE="google-http-client-jackson2-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.38.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
-				<IMPORT NAME="jackson-core-2.11.4" MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
+				<IMPORT NAME="jackson-core-2.13.2" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="guava-30.0-jre.jar" MODULE="guava-30.0-jre.jar" MVN="mvn:com.google.guava/guava/30.0-jre" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="failureaccess-1.0.1.jar" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED="true" />
 

main/plugins/org.talend.designer.components.localprovider/components/tGSDelete/tGSDelete_java.xml

@@ -178,7 +178,7 @@
 				<IMPORT NAME="google-auth-library-credentials-0.20.0" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-http-client-1.38.0" MODULE="google-http-client-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.38.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-http-client-jackson2-1.38.0" MODULE="google-http-client-jackson2-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.38.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
-				<IMPORT NAME="jackson-core-2.11.4" MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
+				<IMPORT NAME="jackson-core-2.13.2" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="guava-30.0-jre.jar" MODULE="guava-30.0-jre.jar" MVN="mvn:com.google.guava/guava/30.0-jre" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="failureaccess-1.0.1.jar" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED="true" />
 				

main/plugins/org.talend.designer.components.localprovider/components/tGSGet/tGSGet_java.xml

@@ -215,7 +215,7 @@
 				<IMPORT NAME="google-auth-library-credentials-0.20.0" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-http-client-1.38.0" MODULE="google-http-client-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.38.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-http-client-jackson2-1.38.0" MODULE="google-http-client-jackson2-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.38.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
-				<IMPORT NAME="jackson-core-2.11.4" MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
+				<IMPORT NAME="jackson-core-2.13.2" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="guava-30.0-jre.jar" MODULE="guava-30.0-jre.jar" MVN="mvn:com.google.guava/guava/30.0-jre" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="failureaccess-1.0.1.jar" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED="true" />
 

main/plugins/org.talend.designer.components.localprovider/components/tGSList/tGSList_java.xml

@@ -178,7 +178,7 @@
 				<IMPORT NAME="google-auth-library-credentials-0.20.0" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-http-client-1.38.0" MODULE="google-http-client-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.38.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-http-client-jackson2-1.38.0" MODULE="google-http-client-jackson2-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.38.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
-				<IMPORT NAME="jackson-core-2.11.4" MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
+				<IMPORT NAME="jackson-core-2.13.2" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="guava-30.0-jre.jar" MODULE="guava-30.0-jre.jar" MVN="mvn:com.google.guava/guava/30.0-jre" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="failureaccess-1.0.1.jar" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED="true" />
 

main/plugins/org.talend.designer.components.localprovider/components/tGSPut/tGSPut_java.xml

@@ -192,7 +192,7 @@
 				<IMPORT NAME="google-auth-library-credentials-0.20.0" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-http-client-1.38.0" MODULE="google-http-client-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.38.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-http-client-jackson2-1.38.0" MODULE="google-http-client-jackson2-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.38.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
-				<IMPORT NAME="jackson-core-2.11.4" MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
+				<IMPORT NAME="jackson-core-2.13.2" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="guava-30.0-jre.jar" MODULE="guava-30.0-jre.jar" MVN="mvn:com.google.guava/guava/30.0-jre" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="failureaccess-1.0.1.jar" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED="true" />
 

main/plugins/org.talend.designer.components.localprovider/components/tGoogleDataprocManage/tGoogleDataprocManage_java.xml

@@ -409,7 +409,7 @@
 			<IMPORT NAME="guava"
 				MODULE="guava-27.0.1-jre.jar" MVN="mvn:com.google.guava/guava/27.0.1-jre" REQUIRED="true"/>
 			<IMPORT NAME="jackson-core"
-				MODULE="jackson-core-2.9.9.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.9.9" REQUIRED="true"/>
+				MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2" REQUIRED="true"/>
 			<IMPORT NAME="jackson-core-asl"
 				MODULE="jackson-core-asl-1.9.16-TALEND.jar" MVN="mvn:org.codehaus.jackson/jackson-core-asl/1.9.16-TALEND" REQUIRED="true"/>
 			<IMPORT NAME="jackson-mapper-asl"

main/plugins/org.talend.designer.components.localprovider/components/tHiveConnection/tHiveConnection_begin.javajet

@@ -13,7 +13,7 @@ imports="
 	String theDistribution = ElementParameterParser.getValue(theNode, "__DISTRIBUTION__");
 	String theVersion = ElementParameterParser.getValue(theNode, "__HIVE_VERSION__");
     boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(theNode.getProcess(), "__LOG4J_ACTIVATE__"));
-
+	String connMode = ElementParameterParser.getValue(theNode, "__CONNECTION_MODE__");
 	org.talend.hadoop.distribution.component.HiveComponent hiveDistrib = null;
 	try {
 		hiveDistrib = (org.talend.hadoop.distribution.component.HiveComponent) org.talend.hadoop.distribution.DistributionFactory.buildDistribution(theDistribution, theVersion);
@@ -27,7 +27,7 @@ imports="
 %>
         <%@ include file="@{org.talend.designer.components.localprovider}/components/tHiveConnection/tHiveConnection_azure.javajet"%>
 <%
-    } else if (hiveDistrib.isGoogleDataprocDistribution()) { // Connection through Dataproc api
+    } else if("DATAPROC".equalsIgnoreCase(connMode)) { // Connection through Dataproc api
 %>
         <%@ include file="@{org.talend.designer.components.localprovider}/components/tHiveConnection/tHiveConnection_dataproc.javajet"%>
 <%

main/plugins/org.talend.designer.components.localprovider/components/tHiveConnection/tHiveConnection_java.xml

@@ -32,13 +32,6 @@
 		<PARAMETER NAME="PROPERTY" FIELD="PROPERTY_TYPE" SHOW="true"
 			NUM_ROW="1" REPOSITORY_VALUE="DATABASE:HIVE" />
 
-		<PARAMETER FIELD="LABEL" NAME="DEPRECATE_NOTE" COLOR="255;0;0"
-                   NUM_ROW="6" REQUIRED="true"
-                   SHOW_IF="(HIVE_VERSION=='MAPR500' OR HIVE_VERSION=='MAPR510' OR HIVE_VERSION=='MAPR520')"
-                   GROUP="VERSION">
-            <DEFAULT>This distribution is deprecated</DEFAULT>
-        </PARAMETER>
-
 		<PARAMETER NAME="HIVE" FIELD="HADOOP_LIBRARIES" NUM_ROW="9"
 			SHOW="false" />
 
@@ -70,6 +63,8 @@
 					SHOW_IF="(DISTRIBUTION=='CUSTOM') OR DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportEmbeddedMode[]" />
 				<ITEM NAME="STANDALONE" VALUE="STANDALONE"
 					SHOW_IF="(DISTRIBUTION=='CUSTOM') OR (HIVE_SERVER == 'HIVE2' AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportStandaloneMode[]) OR (HIVE_SERVER == 'HIVE' AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHive1Standalone[])" />
+				<ITEM NAME="DATAPROC" VALUE="DATAPROC"
+					SHOW_IF="DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportUniversalDataprocMode[]"/>
 			</ITEMS>
 		</PARAMETER>
 		<PARAMETER NAME="HIVE_SERVER" FIELD="CLOSED_LIST" NUM_ROW="15"
@@ -84,7 +79,7 @@
 
 		<PARAMETER NAME="HOST" FIELD="TEXT" NUM_ROW="20"
 			REPOSITORY_VALUE="SERVER_NAME" GROUP="CONNECTION"
-			SHOW_IF="!DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[]">
+			SHOW_IF="!DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[] AND (CONNECTION_MODE != 'DATAPROC')">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
 
@@ -95,7 +90,7 @@
 
 		<PARAMETER NAME="PORT" FIELD="TEXT" NUM_ROW="20"
 			REPOSITORY_VALUE="PORT" GROUP="CONNECTION"
-			SHOW_IF="!DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[]">
+			SHOW_IF="!DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[] AND (CONNECTION_MODE != 'DATAPROC')">
 			<DEFAULT>"10000"</DEFAULT>
 		</PARAMETER>
 
@@ -107,13 +102,13 @@
 
 		<PARAMETER NAME="USER" FIELD="TEXT" NUM_ROW="28"
 			REPOSITORY_VALUE="USERNAME" REQUIRED="true" GROUP="CONNECTION"
-			SHOW_IF="!DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[]">
+			SHOW_IF="!DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[] AND (CONNECTION_MODE != 'DATAPROC')">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
 
 		<PARAMETER NAME="PASS" FIELD="PASSWORD" NUM_ROW="28"
 			REPOSITORY_VALUE="PASSWORD" REQUIRED="true" GROUP="CONNECTION"
-			SHOW_IF="!DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[]">
+			SHOW_IF="!DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[] AND (CONNECTION_MODE != 'DATAPROC')">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
 
@@ -132,7 +127,7 @@
 
 		<PARAMETER NAME="USE_KRB" FIELD="CHECK" NUM_ROW="31"
 			REQUIRED="true" REPOSITORY_VALUE="USE_KRB"
-			SHOW_IF="(CONFIGURATIONS_FROM_CLASSPATH == 'false') AND ((DISTRIBUTION=='CUSTOM') OR (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportKerberos[] AND ((DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHive1[] AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportEmbeddedMode[] AND HIVE_SERVER=='HIVE' AND CONNECTION_MODE=='EMBEDDED') OR (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHive2[] AND HIVE_SERVER=='HIVE2'))))"
+			SHOW_IF="(CONNECTION_MODE!='DATAPROC') AND (CONFIGURATIONS_FROM_CLASSPATH == 'false') AND ((DISTRIBUTION=='CUSTOM') OR (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportKerberos[] AND ((DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHive1[] AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportEmbeddedMode[] AND HIVE_SERVER=='HIVE' AND CONNECTION_MODE=='EMBEDDED') OR (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHive2[] AND HIVE_SERVER=='HIVE2'))))"
 			GROUP="AUTHENTICATION">
 			<DEFAULT>false</DEFAULT>
 		</PARAMETER>
@@ -246,7 +241,6 @@
         </PARAMETER>
 
 
-
 		<PARAMETER NAME="USE_SSL" FIELD="CHECK" NUM_ROW="49"
 			REPOSITORY_VALUE="USE_SSL" REQUIRED="true"
 			SHOW_IF="(CONFIGURATIONS_FROM_CLASSPATH == 'false') AND ((DISTRIBUTION=='CUSTOM' OR DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHive2[]) AND HIVE_SERVER=='HIVE2') AND (DISTRIBUTION=='CUSTOM' OR DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportSSL[])"
@@ -300,7 +294,7 @@
 			<DEFAULT>"localhost:8032"</DEFAULT>
 		</PARAMETER>
 		<PARAMETER NAME="SET_FS_DEFAULT_NAME" FIELD="CHECK" NUM_ROW="53"
-			SHOW_IF="(CONFIGURATIONS_FROM_CLASSPATH == 'false') AND !DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[]"
+			SHOW_IF="(CONFIGURATIONS_FROM_CLASSPATH == 'false') AND !DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[] AND (CONNECTION_MODE != 'DATAPROC')"
 			REQUIRED="true" GROUP="HADOOP_PROPS">
 			<DEFAULT IF="(CONNECTION_MODE == 'STANDALONE')">false</DEFAULT>
 			<DEFAULT IF="(CONNECTION_MODE == 'EMBEDDED')">true</DEFAULT>
@@ -431,44 +425,42 @@
 			SHOW_IF="DISTRIB[DISTRIBUTION, HIVE_VERSION].isExecutedThroughWebHCat[]">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
-
 		<!-- -->
 
 		<!-- GOOGLE DATAPROC -->
 		<PARAMETER NAME="GOOGLE_PROJECT_ID" REPOSITORY_VALUE="GOOGLE_PROJECT_ID" FIELD="TEXT" REQUIRED="true"
 			NUM_ROW="16" GROUP="CONNECTION"
-			SHOW_IF="DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[]">
+			SHOW_IF="CONNECTION_MODE=='DATAPROC'">
 			<DEFAULT>"my-google-project"</DEFAULT>
 		</PARAMETER>
 		<PARAMETER NAME="GOOGLE_CLUSTER_ID" REPOSITORY_VALUE="GOOGLE_CLUSTER_ID" FIELD="TEXT" REQUIRED="true"
 			NUM_ROW="17" GROUP="CONNECTION"
-			SHOW_IF="DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[]">
+			SHOW_IF="CONNECTION_MODE=='DATAPROC'">
 			<DEFAULT>"my-cluster-id"</DEFAULT>
 		</PARAMETER>
 		<PARAMETER NAME="GOOGLE_REGION" REPOSITORY_VALUE="GOOGLE_REGION" FIELD="TEXT" REQUIRED="true"
 			NUM_ROW="18" GROUP="CONNECTION"
-			SHOW_IF="DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[]">
+			SHOW_IF="CONNECTION_MODE=='DATAPROC'">
 			<DEFAULT>"global"</DEFAULT>
 		</PARAMETER>
 		<PARAMETER NAME="GOOGLE_JARS_BUCKET" REPOSITORY_VALUE="GOOGLE_JARS_BUCKET" FIELD="TEXT" REQUIRED="true"
 			NUM_ROW="19" GROUP="CONNECTION"
-			SHOW_IF="DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[]">
+			SHOW_IF="CONNECTION_MODE=='DATAPROC'">
 			<DEFAULT>"gs://my-bucket/talend/jars"</DEFAULT>
 		</PARAMETER>
 
 		<PARAMETER NAME="DEFINE_PATH_TO_GOOGLE_CREDENTIALS" REPOSITORY_VALUE="DEFINE_PATH_TO_GOOGLE_CREDENTIALS" FIELD="CHECK"
 			REQUIRED="true" NUM_ROW="50" GROUP="AUTHENTICATION"
-			SHOW_IF="DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[]">
+			SHOW_IF="CONNECTION_MODE=='DATAPROC'">
 			<DEFAULT>false</DEFAULT>
 		</PARAMETER>
 		<PARAMETER NAME="PATH_TO_GOOGLE_CREDENTIALS" REPOSITORY_VALUE="PATH_TO_GOOGLE_CREDENTIALS" FIELD="FILE" REQUIRED="true"
 			NUM_ROW="51" GROUP="AUTHENTICATION"
-			SHOW_IF="((isShow[DEFINE_PATH_TO_GOOGLE_CREDENTIALS]) AND DEFINE_PATH_TO_GOOGLE_CREDENTIALS=='true' AND DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[])">
+			SHOW_IF="(isShow[DEFINE_PATH_TO_GOOGLE_CREDENTIALS]) AND (DEFINE_PATH_TO_GOOGLE_CREDENTIALS=='true') AND (CONNECTION_MODE=='DATAPROC')">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
 		<!-- END GOOGLE DATAPROC -->
 
-
 		<PARAMETER NAME="USE_SHARED_CONNECTION" FIELD="CHECK"
 			NUM_ROW="60" REQUIRED="true"
 			SHOW_IF="(!DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[])">
@@ -491,7 +483,7 @@
 
 		<PARAMETER NAME="STORE_BY_HBASE" FIELD="CHECK" NUM_ROW="70"
 			REQUIRED="true"
-			SHOW_IF="(CONFIGURATIONS_FROM_CLASSPATH == 'true') OR ((CONNECTION_MODE != 'EMBEDDED' OR !DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportEmbeddedMode[]) AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHBaseForHive[])"
+			SHOW_IF="(CONFIGURATIONS_FROM_CLASSPATH == 'true') AND (CONNECTION_MODE!='DATAPROC') OR ((CONNECTION_MODE != 'EMBEDDED' OR !DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportEmbeddedMode[]) AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHBaseForHive[])"
 			GROUP="HBASE_GROUP">
 			<DEFAULT>false</DEFAULT>
 		</PARAMETER>
@@ -596,7 +588,7 @@
 
 		<PARAMETER NAME="HADOOP_ADVANCED_PROPERTIES"
 			REPOSITORY_VALUE="HADOOP_ADVANCED_PROPERTIES" FIELD="TABLE" REQUIRED="false"
-			SHOW_IF="!DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[]"
+			SHOW_IF="!DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[] AND (CONNECTION_MODE != 'DATAPROC')"
 			NUM_ROW="40" NB_LINES="3">
 			<ITEMS>
 				<ITEM NAME="PROPERTY" />
@@ -685,93 +677,26 @@
 				REQUIRED="false"
 				REQUIRED_IF="(CONFIGURATIONS_FROM_CLASSPATH == 'false') AND (DISTRIBUTION!='CUSTOM') AND (isShow[USE_KRB] AND USE_KRB=='true') AND (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportKerberos[] AND ((DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHive1[] AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportEmbeddedMode[] AND HIVE_SERVER=='HIVE' AND CONNECTION_MODE=='EMBEDDED') OR (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHive2[] AND HIVE_SERVER=='HIVE2')))" />
 
-			<!-- HDP_2_2 -->
-			<IMPORT MODULE_GROUP="HIVE-LIB-HDP_2_2_LASTEST"
-				REQUIRED_IF="HIVE_VERSION=='HDP_2_2' AND (DISTRIBUTION!='CUSTOM')" />
-			<!-- HDP_2_2 Hbase -->
-			<IMPORT MODULE_GROUP="HIVE-HBASE-LIB-HDP_2_2_LASTEST"
-				REQUIRED_IF="(HIVE_VERSION=='HDP_2_2' AND STORE_BY_HBASE=='true') AND (DISTRIBUTION!='CUSTOM')" />
-
-			<!-- Hive libraries for HDP_2_3 -->
-			<IMPORT MODULE_GROUP="HIVE-LIB-HDP_2_3"
-				REQUIRED_IF="HIVE_VERSION=='HDP_2_3' AND (DISTRIBUTION!='CUSTOM')" />
-
-			<!-- Hive HBase libraries for HDP_2_3 -->
-			<IMPORT MODULE_GROUP="HIVE-HBASE-LIB-HDP_2_3"
-				REQUIRED_IF="(HIVE_VERSION=='HDP_2_3' AND STORE_BY_HBASE=='true') AND (DISTRIBUTION!='CUSTOM')" />
-
-			<!-- EMR 4_0_0 -->
-			<IMPORT MODULE_GROUP="HIVE-LIB-EMR_4_0_0_LATEST"
-				REQUIRED_IF="HIVE_VERSION=='EMR_4_0_0' AND (DISTRIBUTION!='CUSTOM')" />
-
-			<!-- MAPR401 -->
-			<IMPORT MODULE_GROUP="HIVE-LIB-MAPR40X_LASTEST"
-				REQUIRED_IF="HIVE_VERSION=='MAPR401' AND (DISTRIBUTION!='CUSTOM')" />
-
-			<!-- MAPR500 -->
-			<IMPORT MODULE_GROUP="HIVE-LIB-MAPR50X_LASTEST"
-				REQUIRED_IF="HIVE_VERSION=='MAPR500' AND (DISTRIBUTION!='CUSTOM')" />
-
-			<!-- MAPR401 Hbase -->
-			<IMPORT MODULE_GROUP="HIVE-HBASE-LIB-MAPR40X_LASTEST"
-				REQUIRED_IF="(HIVE_VERSION=='MAPR401' AND STORE_BY_HBASE=='true') AND (DISTRIBUTION!='CUSTOM')" />
-
-			<!-- MAPR500 Hbase -->
-			<IMPORT MODULE_GROUP="HIVE-HBASE-LIB-MAPR50X_LASTEST"
-				REQUIRED_IF="(HIVE_VERSION=='MAPR500' AND STORE_BY_HBASE=='true') AND (DISTRIBUTION!='CUSTOM')" />
-			<!-- ############## -->
-
-			<!-- HDP_2_1 Tez additional -->
-			<IMPORT MODULE_GROUP="HIVE-TEZ-LIB-HDP211"
-				REQUIRED_IF="(HIVE_VERSION=='HDP_2_1') AND (DISTRIBUTION!='CUSTOM') AND (EXECUTION_ENGINE=='tez')" />
-			<!-- MapR401 Tez additional -->
-			<IMPORT MODULE_GROUP="HIVE-TEZ-LIB-MapR401"
-				REQUIRED_IF="(HIVE_VERSION=='MAPR401') AND (DISTRIBUTION!='CUSTOM') AND (EXECUTION_ENGINE=='tez')" />
-			<!-- MAPR410 -->
-			<IMPORTS REQUIRED_IF="(DISTRIBUTION!='CUSTOM')">
-				<IMPORTS REQUIRED_IF="(HIVE_VERSION=='MAPR410')">
-					<IMPORTS REQUIRED_IF="(EXECUTION_ENGINE!='tez')">
-						<IMPORT MODULE_GROUP="HIVE-LIB-MAPR41X_LASTEST" />
-						<IMPORT MODULE_GROUP="HIVE-HBASE-LIB-MAPR41X_LASTEST"
-							REQUIRED_IF="(STORE_BY_HBASE=='true')" />
-					</IMPORTS>
-					<IMPORTS REQUIRED_IF="(EXECUTION_ENGINE=='tez')">
-						<IMPORT MODULE_GROUP="HIVE-TEZ-LIB-MapR410" />
-						<IMPORT MODULE_GROUP="HIVE100-LIB-MAPR41X_LASTEST" />
-						<IMPORT MODULE_GROUP="HIVE100-HBASE-LIB-MAPR41X_LASTEST"
-							REQUIRED_IF="(STORE_BY_HBASE=='true')" />
-					</IMPORTS>
-				</IMPORTS>
-			</IMPORTS>
-			<!-- Parquet libraries for HDP_2_3 -->
-			<IMPORT MODULE_GROUP="PARQUET-LIB-HDP_2_3"
-				REQUIRED_IF="(HIVE_VERSION=='HDP_2_3') AND (DISTRIBUTION!='CUSTOM')" />
-
 			<!-- PARQUET SUPPORT -->
 			<IMPORT NAME="parquet-hive-bundle-1.5.0" MODULE="parquet-hive-bundle-1.5.0.jar"
 				MVN="mvn:org.talend.libraries/parquet-hive-bundle-1.5.0/6.0.0"
 				UrlPath="platform:/plugin/org.talend.libraries.hadoop/lib/parquet-hive-bundle-1.5.0.jar"
-				REQUIRED_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[] AND DISTRIBUTION!='PIVOTAL_HD' AND DISTRIBUTION!='CUSTOM' AND HIVE_VERSION!='MAPR2' AND HIVE_VERSION!='HDP_2_3' AND HIVE_VERSION!='APACHE_1_0_0' AND HIVE_VERSION!='APACHE_2_4_0_EMR_0_13_1')" />
+				REQUIRED_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[] AND DISTRIBUTION!='CUSTOM')" />
 			<IMPORT NAME="parquet-hive-bundle-1.3.2" MODULE="parquet-hive-bundle-1.3.2.jar"
 				MVN="mvn:org.talend.libraries/parquet-hive-bundle-1.3.2/6.0.0"
 				UrlPath="platform:/plugin/org.talend.libraries.hadoop/lib/parquet-hive-bundle-1.3.2.jar"
-				REQUIRED_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[] AND DISTRIBUTION=='PIVOTAL_HD' AND HIVE_VERSION!='PIVOTAL_HD_1_0_1')" />
+				REQUIRED_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[])" />
 			<IMPORT NAME="snappy-java-1.0.5.jar" MODULE="snappy-java-1.0.5.jar"
 				MVN="mvn:org.talend.libraries/snappy-java-1.0.5/6.0.0"
-				REQUIRED_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[] AND DISTRIBUTION!='CUSTOM' AND HIVE_VERSION!='MAPR2' AND HIVE_VERSION!='APACHE_1_0_0' AND HIVE_VERSION!='PIVOTAL_HD_1_0_1' AND HIVE_VERSION!='APACHE_2_4_0_EMR_0_13_1')" />
-			<!-- ############## -->
-			<IMPORT MODULE_GROUP="TEZ-LIB-HDP220"
-				REQUIRED_IF="(DISTRIBUTION == 'HORTONWORKS') AND (HIVE_VERSION == 'HDP_2_2') AND (EXECUTION_ENGINE == 'tez')" />
-			<IMPORT MODULE_GROUP="TEZ-SERVER-LIB-HDP220"
-				REQUIRED_IF="(DISTRIBUTION == 'HORTONWORKS') AND (HIVE_VERSION == 'HDP_2_2') AND (EXECUTION_ENGINE == 'tez') AND (TEZ_LIB == 'INSTALL')" />
-
-			<!-- Tez libraries for HDP_2_3 -->
-			<IMPORT MODULE_GROUP="TEZ-LIB-HDP_2_3"
-				REQUIRED_IF="(DISTRIBUTION == 'HORTONWORKS') AND (HIVE_VERSION == 'HDP_2_3') AND (EXECUTION_ENGINE == 'tez')" />
-
-			<!-- Tez Server libraries for HDP_2_3 -->
-			<IMPORT MODULE_GROUP="TEZ-SERVER-LIB-HDP_2_3"
-				REQUIRED_IF="(DISTRIBUTION == 'HORTONWORKS') AND (HIVE_VERSION == 'HDP_2_3') AND (EXECUTION_ENGINE == 'tez') AND (TEZ_LIB == 'INSTALL')" />
+				REQUIRED_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[] AND DISTRIBUTION!='CUSTOM')" />
+			
+			<!-- Dataproc 2.x -->	
+			<IMPORT MODULE_GROUP="DATAPROC-LAUNCHER-DI" 
+                   REQUIRED_IF="CONNECTION_MODE=='DATAPROC'" REQUIRED="false"/>
+            
+            <!-- Spark universal 3.1.x -->
+            <IMPORT MODULE_GROUP="UNIVERSAL-SPARK-3.1.X" 
+                   REQUIRED_IF="(CONNECTION_MODE=='STANDALONE') AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportUniversalLocalMode[]" REQUIRED="false"/>	
 		</IMPORTS>
 	</CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tHiveConnection/tHiveConnection_messages.properties

@@ -30,35 +30,13 @@ DISTRIBUTION.ITEM.CUSTOM=Custom - Unsupported
 DISTRIBUTION.ITEM.AMAZON_EMR=Amazon EMR
 DISTRIBUTION.ITEM.MICROSOFT_HD_INSIGHT=Microsoft HD Insight
 HIVE_VERSION.NAME=Hive version
-HIVE_VERSION.ITEM.HDP_1_2=Hortonworks Data Platform V1.2.0(Bimota)
-HIVE_VERSION.ITEM.HDP_1_3=Hortonworks Data Platform V1.3.0(Condor)
-HIVE_VERSION.ITEM.HDP_2_0=Hortonworks Data Platform V2.0.0(BigWheel)
-HIVE_VERSION.ITEM.HDP_2_1=Hortonworks Data Platform V2.1.0(Baikal)
-HIVE_VERSION.ITEM.HDP_2_2=Hortonworks Data Platform V2.2.0
-HIVE_VERSION.ITEM.HDP_2_3=Hortonworks Data Platform V2.3.2
-HIVE_VERSION.ITEM.APACHE_1_0_0=Apache 1.0.0 (Hive 0.9.0)
-HIVE_VERSION.ITEM.MAPR2=MapR 2.0.0
-HIVE_VERSION.ITEM.MAPR212=MapR 2.1.2
-HIVE_VERSION.ITEM.MAPR213=MapR 2.1.3
-HIVE_VERSION.ITEM.MAPR301=MapR 3.0.1
-HIVE_VERSION.ITEM.MAPR310=MapR 3.1.0
-HIVE_VERSION.ITEM.MAPR401=MapR 4.0.1(YARN mode)
-HIVE_VERSION.ITEM.MAPR410=MapR 4.1.0(YARN mode)
-HIVE_VERSION.ITEM.MAPR500=MapR 5.0.0(YARN mode)
-HIVE_VERSION.ITEM.APACHE_1_0_3_EMR=Apache 1.0.3 (Hive 0.8.1)
-HIVE_VERSION.ITEM.APACHE_2_4_0_EMR=Apache 2.4.0 (Hive 0.11.0)
-HIVE_VERSION.ITEM.APACHE_2_4_0_EMR_0_13_1=Apache 2.4.0 (Hive 0.13.1)
-HIVE_VERSION.ITEM.EMR_4_0_0=EMR 4.0.0 (Hive 1.0.0)
-HIVE_VERSION.ITEM.PIVOTAL_HD_1_0_1=Pivotal HD 1.0.1
-HIVE_VERSION.ITEM.PIVOTAL_HD_2_0=Pivotal HD 2.0
-HIVE_VERSION.ITEM.MICROSOFT_HD_INSIGHT_3_1=Microsoft HD Insight 3.1
-HIVE_VERSION.ITEM.MICROSOFT_HD_INSIGHT_3_2=Microsoft HD Insight 3.2
 HIVE_SERVER.NAME=Hive Server
 HIVE_SERVER.ITEM.HIVE=Hive 1
 HIVE_SERVER.ITEM.HIVE2=Hive 2
 CONNECTION_MODE.NAME=Connection mode
 CONNECTION_MODE.ITEM.EMBEDDED=Embedded
 CONNECTION_MODE.ITEM.STANDALONE=Standalone
+CONNECTION_MODE.ITEM.DATAPROC=Dataproc
 HIVE_ADDITIONAL_JDBC.NAME=Additional JDBC Settings
 SET_MAPRED_JT.NAME=Set Jobtracker URI
 SET_FS_DEFAULT_NAME.NAME=Set Namenode URI

main/plugins/org.talend.designer.components.localprovider/components/tHiveConnection/tHiveConnection_messages_fr.properties

@@ -30,29 +30,6 @@ DISTRIBUTION.ITEM.CUSTOM=Personnalis\u00E9 - Non support\u00E9
 DISTRIBUTION.ITEM.AMAZON_EMR=Amazon EMR
 DISTRIBUTION.ITEM.MICROSOFT_HD_INSIGHT=Microsoft HD Insight
 HIVE_VERSION.NAME=Version de Hive
-HIVE_VERSION.ITEM.HDP_1_2=Hortonworks Data Platform V1.2.0 (Bimota)
-HIVE_VERSION.ITEM.HDP_1_3=Hortonworks Data Platform V1.3.0 (Condor)
-HIVE_VERSION.ITEM.HDP_2_0=Hortonworks Data Platform V2.0.0 (BigWheel)
-HIVE_VERSION.ITEM.HDP_2_1=Hortonworks Data Platform V2.1.0 (Baikal)
-HIVE_VERSION.ITEM.HDP_2_2=Hortonworks Data Platform V2.2.0
-HIVE_VERSION.ITEM.HDP_2_3=Hortonworks Data Platform V2.3.2
-HIVE_VERSION.ITEM.APACHE_1_0_0=Apache 1.0.0 (Hive 0.9.0)
-HIVE_VERSION.ITEM.MAPR2=MapR 2.0.0
-HIVE_VERSION.ITEM.MAPR212=MapR 2.1.2
-HIVE_VERSION.ITEM.MAPR213=MapR 2.1.3
-HIVE_VERSION.ITEM.MAPR301=MapR 3.0.1
-HIVE_VERSION.ITEM.MAPR310=MapR 3.1.0
-HIVE_VERSION.ITEM.MAPR401=MapR 4.0.1 (mode YARN)
-HIVE_VERSION.ITEM.MAPR410=MapR 4.1.0 (mode YARN)
-HIVE_VERSION.ITEM.MAPR500=MapR 5.0.0 (mode YARN)
-HIVE_VERSION.ITEM.APACHE_1_0_3_EMR=Apache 1.0.3 (Hive 0.8.1)
-HIVE_VERSION.ITEM.APACHE_2_4_0_EMR=Apache 2.4.0 (Hive 0.11.0)
-HIVE_VERSION.ITEM.APACHE_2_4_0_EMR_0_13_1=Apache 2.4.0 (Hive 0.13.1)
-HIVE_VERSION.ITEM.EMR_4_0_0=EMR 4.0.0 (Hive 1.0.0)
-HIVE_VERSION.ITEM.PIVOTAL_HD_1_0_1=Pivotal HD 1.0.1
-HIVE_VERSION.ITEM.PIVOTAL_HD_2_0=Pivotal HD 2.0
-HIVE_VERSION.ITEM.MICROSOFT_HD_INSIGHT_3_1=Microsoft HD Insight 3.1
-HIVE_VERSION.ITEM.MICROSOFT_HD_INSIGHT_3_2=Microsoft HD Insight 3.2
 HIVE_SERVER.NAME=Serveur de Hive
 HIVE_SERVER.ITEM.HIVE=Hive 1
 HIVE_SERVER.ITEM.HIVE2=Hive 2

main/plugins/org.talend.designer.components.localprovider/components/tHiveConnection/tHiveConnection_messages_ja.properties

@@ -30,29 +30,6 @@ DISTRIBUTION.ITEM.CUSTOM=\u30AB\u30B9\u30BF\u30E0 - \u975E\u30B5\u30DD\u30FC\u30
 DISTRIBUTION.ITEM.AMAZON_EMR=Amazon EMR
 DISTRIBUTION.ITEM.MICROSOFT_HD_INSIGHT=Microsoft HD Insight
 HIVE_VERSION.NAME=HIve\u30D0\u30FC\u30B8\u30E7\u30F3
-HIVE_VERSION.ITEM.HDP_1_2=Hortonworks Data Platform V1.2.0(Bimota)
-HIVE_VERSION.ITEM.HDP_1_3=Hortonworks Data Platform V1.3.0(Condor)
-HIVE_VERSION.ITEM.HDP_2_0=Hortonworks Data Platform V2.0.0 (BigWheel)
-HIVE_VERSION.ITEM.HDP_2_1=Hortonworks Data Platform V2.1.0 (Baikal)
-HIVE_VERSION.ITEM.HDP_2_2=Hortonworks Data Platform V2.2.0
-HIVE_VERSION.ITEM.HDP_2_3=Hortonworks Data Platform V2.3.2
-HIVE_VERSION.ITEM.APACHE_1_0_0=Apache 1.0.0 (Hive 0.9.0)
-HIVE_VERSION.ITEM.MAPR2=MapR 2.0.0
-HIVE_VERSION.ITEM.MAPR212=MapR 2.1.2
-HIVE_VERSION.ITEM.MAPR213=MapR 2.1.3
-HIVE_VERSION.ITEM.MAPR301=MapR 3.0.1
-HIVE_VERSION.ITEM.MAPR310=MapR 3.1.0
-HIVE_VERSION.ITEM.MAPR401=MapR 4.0.1(YARN\u30E2\u30FC\u30C9)
-HIVE_VERSION.ITEM.MAPR410=MapR 4.1.0(YARN\u30E2\u30FC\u30C9)
-HIVE_VERSION.ITEM.MAPR500=MapR 5.0.0(YARN\u30E2\u30FC\u30C9)
-HIVE_VERSION.ITEM.APACHE_1_0_3_EMR=Apache 1.0.3 (Hive 0.8.1)
-HIVE_VERSION.ITEM.APACHE_2_4_0_EMR=Apache 2.4.0 (Hive 0.11.0)
-HIVE_VERSION.ITEM.APACHE_2_4_0_EMR_0_13_1=Apache 2.4.0 (Hive 0.13.1)
-HIVE_VERSION.ITEM.EMR_4_0_0=EMR 4.0.0 (Hive 1.0.0)
-HIVE_VERSION.ITEM.PIVOTAL_HD_1_0_1=Pivotal HD 1.0.1
-HIVE_VERSION.ITEM.PIVOTAL_HD_2_0=Pivotal HD 2.0
-HIVE_VERSION.ITEM.MICROSOFT_HD_INSIGHT_3_1=Microsoft HD Insight 3.1
-HIVE_VERSION.ITEM.MICROSOFT_HD_INSIGHT_3_2=Microsoft HD Insight 3.2
 HIVE_SERVER.NAME=Hive\u30B5\u30FC\u30D0\u30FC
 HIVE_SERVER.ITEM.HIVE=Hive 1
 HIVE_SERVER.ITEM.HIVE2=Hive 2

main/plugins/org.talend.designer.components.localprovider/components/tHiveConnection/tHiveConnection_messages_zh_CN.properties

@@ -30,29 +30,6 @@ DISTRIBUTION.ITEM.CUSTOM=\u4E0D\u652F\u6301\u81EA\u5B9A\u4E49
 DISTRIBUTION.ITEM.AMAZON_EMR=Amazon EMR
 DISTRIBUTION.ITEM.MICROSOFT_HD_INSIGHT=Microsoft HD Insight
 HIVE_VERSION.NAME=Hive \u7248\u672C
-HIVE_VERSION.ITEM.HDP_1_2=Hortonworks Data Platform V1.2.0(Bimota)
-HIVE_VERSION.ITEM.HDP_1_3=Hortonworks Data Platform V1.3.0(Condor)
-HIVE_VERSION.ITEM.HDP_2_0=Hortonworks Data Platform V2.0.0 (BigWheel)
-HIVE_VERSION.ITEM.HDP_2_1=Hortonworks Data Platform V2.1.0 (Baikal)
-HIVE_VERSION.ITEM.HDP_2_2=Hortonworks Data Platform V2.2.0
-HIVE_VERSION.ITEM.HDP_2_3=Hortonworks Data Platform V2.3.2
-HIVE_VERSION.ITEM.APACHE_1_0_0=Apache 1.0.0 (Hive 0.9.0)
-HIVE_VERSION.ITEM.MAPR2=MapR 2.0.0
-HIVE_VERSION.ITEM.MAPR212=MapR 2.1.2
-HIVE_VERSION.ITEM.MAPR213=MapR 2.1.3
-HIVE_VERSION.ITEM.MAPR301=MapR 3.0.1
-HIVE_VERSION.ITEM.MAPR310=MapR 3.1.0
-HIVE_VERSION.ITEM.MAPR401=MapR 4.0.1 (YARN \u6A21\u5F0F)
-HIVE_VERSION.ITEM.MAPR410=MapR 4.1.0 (YARN \u6A21\u5F0F)
-HIVE_VERSION.ITEM.MAPR500=MapR 5.0.0 (YARN \u6A21\u5F0F)
-HIVE_VERSION.ITEM.APACHE_1_0_3_EMR=Apache 1.0.3 (Hive 0.8.1)
-HIVE_VERSION.ITEM.APACHE_2_4_0_EMR=Apache 2.4.0 (Hive 0.11.0)
-HIVE_VERSION.ITEM.APACHE_2_4_0_EMR_0_13_1=Apache 2.4.0 (Hive 0.13.1)
-HIVE_VERSION.ITEM.EMR_4_0_0=EMR 4.0.0 (Hive 1.0.0)
-HIVE_VERSION.ITEM.PIVOTAL_HD_1_0_1=Pivotal HD 1.0.1
-HIVE_VERSION.ITEM.PIVOTAL_HD_2_0=Pivotal HD 2.0
-HIVE_VERSION.ITEM.MICROSOFT_HD_INSIGHT_3_1=Microsoft HD Insight 3.1
-HIVE_VERSION.ITEM.MICROSOFT_HD_INSIGHT_3_2=Microsoft HD Insight 3.2
 HIVE_SERVER.NAME=Hive Server
 HIVE_SERVER.ITEM.HIVE=Hive 1
 HIVE_SERVER.ITEM.HIVE2=Hive 2

main/plugins/org.talend.designer.components.localprovider/components/tHiveIn/tHiveIn_java.xml

@@ -84,26 +84,30 @@
 
 
 		<!-- GOOGLE DATAPROC -->
-		<PARAMETER NAME="GOOGLE_PROJECT_ID" FIELD="TEXT" REQUIRED="true"
-			NUM_ROW="16" GROUP="CONN">
-			<DEFAULT>""</DEFAULT>
+		<PARAMETER NAME="GOOGLE_PROJECT_ID" REPOSITORY_VALUE="GOOGLE_PROJECT_ID" FIELD="TEXT" REQUIRED="true"
+			NUM_ROW="16" GROUP="CONN"
+			SHOW_IF="(USE_EXISTING_CONNECTION=='false') AND (CONNECTION_MODE=='DATAPROC')">
+			<DEFAULT>"my-google-project"</DEFAULT>
 		</PARAMETER>
-		<PARAMETER NAME="GOOGLE_CLUSTER_ID" FIELD="TEXT" REQUIRED="true"
-			NUM_ROW="17" GROUP="CONN">
-			<DEFAULT>""</DEFAULT>
+		<PARAMETER NAME="GOOGLE_CLUSTER_ID" REPOSITORY_VALUE="GOOGLE_CLUSTER_ID" FIELD="TEXT" REQUIRED="true"
+			NUM_ROW="17" GROUP="CONN"
+			SHOW_IF="(USE_EXISTING_CONNECTION=='false') AND (CONNECTION_MODE=='DATAPROC')">
+			<DEFAULT>"my-cluster-id"</DEFAULT>
 		</PARAMETER>
-		<PARAMETER NAME="GOOGLE_REGION" FIELD="TEXT" REQUIRED="true"
-			NUM_ROW="18" GROUP="CONN">
-			<DEFAULT>""</DEFAULT>
+		<PARAMETER NAME="GOOGLE_REGION" REPOSITORY_VALUE="GOOGLE_REGION" FIELD="TEXT" REQUIRED="true"
+			NUM_ROW="18" GROUP="CONN"
+			SHOW_IF="(USE_EXISTING_CONNECTION=='false') AND (CONNECTION_MODE=='DATAPROC')">
+			<DEFAULT>"global"</DEFAULT>
 		</PARAMETER>
-		<PARAMETER NAME="GOOGLE_JARS_BUCKET" FIELD="TEXT" REQUIRED="true"
-			NUM_ROW="19" GROUP="CONN">
-			<DEFAULT>""</DEFAULT>
+		<PARAMETER NAME="GOOGLE_JARS_BUCKET" REPOSITORY_VALUE="GOOGLE_JARS_BUCKET" FIELD="TEXT" REQUIRED="true"
+			NUM_ROW="19" GROUP="CONN"
+			SHOW_IF="(USE_EXISTING_CONNECTION=='false') AND (CONNECTION_MODE=='DATAPROC')">
+			<DEFAULT>"gs://my-bucket/talend/jars"</DEFAULT>
 		</PARAMETER>
 
 		<PARAMETER NAME="AUTH_TYPE" NUM_ROW="20" REQUIRED="true"
 				   FIELD="CLOSED_LIST" GROUP="CONN"
-				   SHOW_IF="((DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[]) AND USE_EXISTING_CONNECTION=='false') OR (USE_EXISTING_CONNECTION=='true' AND DISTRIB[#LINK@NODE.CONNECTION.DISTRIBUTION, #LINK@NODE.CONNECTION.HIVE_VERSION].isGoogleDataprocDistribution[])">
+				   SHOW_IF="(CONNECTION_MODE=='DATAPROC') AND (USE_EXISTING_CONNECTION=='false')">
 			<ITEMS DEFAULT="USER_ACCOUNT_HMAC">
 				<ITEM NAME="USER_ACCOUNT_HMAC" VALUE="USER_ACCOUNT_HMAC"/>
 				<ITEM NAME="SERVICE_ACCOUNT" VALUE="SERVICE_ACCOUNT"/>
@@ -113,22 +117,24 @@
 	    <PARAMETER
 			NAME="ACCESS_KEY" FIELD="TEXT" REQUIRED="true"
 			NUM_ROW="20"  GROUP="CONN"
-			SHOW_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[]) AND (AUTH_TYPE=='USER_ACCOUNT_HMAC')">
+			SHOW_IF="(isShow[AUTH_TYPE]) AND (AUTH_TYPE=='USER_ACCOUNT_HMAC') AND (CONNECTION_MODE=='DATAPROC')">
 	      <DEFAULT>""</DEFAULT>
 	    </PARAMETER>
 	    <PARAMETER
 			NAME="SECRET_KEY" FIELD="PASSWORD" REQUIRED="true"
 			NUM_ROW="21"  GROUP="CONN"
-			SHOW_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[]) AND (AUTH_TYPE=='USER_ACCOUNT_HMAC')">
+			SHOW_IF="(isShow[AUTH_TYPE]) AND (AUTH_TYPE=='USER_ACCOUNT_HMAC') AND (CONNECTION_MODE=='DATAPROC')">
 	        <DEFAULT>""</DEFAULT>
 	    </PARAMETER>
 
 		<PARAMETER NAME="DEFINE_PATH_TO_GOOGLE_CREDENTIALS" FIELD="CHECK" REQUIRED="true"
-			NUM_ROW="51" GROUP="AUTHENTICATION">
+			NUM_ROW="51" GROUP="AUTHENTICATION"
+			SHOW_IF="(USE_EXISTING_CONNECTION=='false') AND (CONNECTION_MODE=='DATAPROC')">
 			<DEFAULT>false</DEFAULT>
 		</PARAMETER>
 		<PARAMETER NAME="PATH_TO_GOOGLE_CREDENTIALS" FIELD="FILE" REQUIRED="true"
-			NUM_ROW="51" GROUP="AUTHENTICATION">
+			NUM_ROW="51" GROUP="AUTHENTICATION"
+			SHOW_IF="((isShow[DEFINE_PATH_TO_GOOGLE_CREDENTIALS]) AND DEFINE_PATH_TO_GOOGLE_CREDENTIALS=='true' AND CONNECTION_MODE=='DATAPROC')">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
 		<!-- END GOOGLE DATAPROC -->
@@ -180,35 +186,13 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<!-- MICROSOFT HD INSIGHT 3.1 -->
-            <IMPORT NAME="talend-bigdata-launcher-1.1.0-20160405" MODULE="talend-bigdata-launcher-1.1.0-20160405.jar" MVN="mvn:org.talend.libraries/talend-bigdata-launcher-1.1.0-20160405/6.0.0" 
-                REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (DISTRIBUTION=='MICROSOFT_HD_INSIGHT') AND (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[])" />
-            <IMPORT NAME="cxf-api-2.7.7" MODULE="cxf-api-2.7.7.jar" MVN="mvn:org.talend.libraries/cxf-api-2.7.7/6.0.0" 
-                UrlPath="platform:/plugin/org.talend.libraries.apache.cxf/lib/cxf-api-2.7.7.jar"
-                REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (DISTRIBUTION=='MICROSOFT_HD_INSIGHT') AND (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[])" />
-            <IMPORT NAME="cxf-rt-bindings-xml-2.7.7" MODULE="cxf-rt-bindings-xml-2.7.7.jar" MVN="mvn:org.talend.libraries/cxf-rt-bindings-xml-2.7.7/6.0.0" 
-                UrlPath="platform:/plugin/org.talend.libraries.apache.cxf/lib/cxf-rt-bindings-xml-2.7.7.jar"
-                REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (DISTRIBUTION=='MICROSOFT_HD_INSIGHT') AND (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[])" />
-            <IMPORT NAME="cxf-rt-core-2.7.7" MODULE="cxf-rt-core-2.7.7.jar" MVN="mvn:org.talend.libraries/cxf-rt-core-2.7.7/6.0.0" 
-                UrlPath="platform:/plugin/org.talend.libraries.apache.cxf/lib/cxf-rt-core-2.7.7.jar"
-                REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (DISTRIBUTION=='MICROSOFT_HD_INSIGHT') AND (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[])" />
-            <IMPORT NAME="cxf-rt-frontend-jaxrs-2.7.7" MODULE="cxf-rt-frontend-jaxrs-2.7.7.jar" MVN="mvn:org.talend.libraries/cxf-rt-frontend-jaxrs-2.7.7/6.0.0" 
-                UrlPath="platform:/plugin/org.talend.libraries.apache.cxf/lib/cxf-rt-frontend-jaxrs-2.7.7.jar"
-                REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (DISTRIBUTION=='MICROSOFT_HD_INSIGHT') AND (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[])" />
-            <IMPORT NAME="cxf-rt-transports-http-2.7.7" MODULE="cxf-rt-transports-http-2.7.7.jar" MVN="mvn:org.talend.libraries/cxf-rt-transports-http-2.7.7/6.0.0" 
-                UrlPath="platform:/plugin/org.talend.libraries.apache.cxf/lib/cxf-rt-transports-http-2.7.7.jar"
-                REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (DISTRIBUTION=='MICROSOFT_HD_INSIGHT') AND (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[])" />
-            <IMPORT NAME="json-simple" MODULE="json_simple-1.1.jar" MVN="mvn:org.talend.libraries/json_simple-1.1/6.0.0" 
-                UrlPath="platform:/plugin/org.talend.libraries.jackson/lib/json_simple-1.1.jar"
-                REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (DISTRIBUTION=='MICROSOFT_HD_INSIGHT') AND (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[])" />
-            <IMPORT NAME="javax.ws.rs-api-2.0-m10" MODULE="javax.ws.rs-api-2.0-m10.jar" MVN="mvn:org.talend.libraries/javax.ws.rs-api-2.0-m10/6.0.0" 
-                REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (DISTRIBUTION=='MICROSOFT_HD_INSIGHT') AND (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[])" />
-            <IMPORT NAME="WSDL4J-1_6_3" MODULE="wsdl4j-1.6.3.jar" MVN="mvn:wsdl4j/wsdl4j/1.6.3" 
-                BundleID="org.apache.servicemix.bundles.wsdl4j" REQUIRED="false"
-                REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (DISTRIBUTION=='MICROSOFT_HD_INSIGHT') AND (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[])" />
-            <IMPORT NAME="azure-storage-1.2.0" MODULE="azure-storage-1.2.0.jar" MVN="mvn:org.talend.libraries/azure-storage-1.2.0/6.0.0" 
-                REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (DISTRIBUTION=='MICROSOFT_HD_INSIGHT') AND (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[])" />
-			<!-- #################### -->
+			<!-- Dataproc 2.x -->	
+			<IMPORT MODULE_GROUP="DATAPROC-LAUNCHER-DI" 
+                   REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (CONNECTION_MODE=='DATAPROC')" REQUIRED="false"/>
+            
+            <!-- Spark universal 3.1.x -->
+            <IMPORT MODULE_GROUP="UNIVERSAL-SPARK-3.1.X" 
+                   REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (CONNECTION_MODE=='STANDALONE') AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportUniversalLocalMode[]" REQUIRED="false"/>	
 		</IMPORTS>
 	</CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tHiveIn/tHiveIn_main.javajet

@@ -33,7 +33,7 @@ imports="
 
     String theDistribution = ElementParameterParser.getValue(node, "__DISTRIBUTION__");
     String theVersion = ElementParameterParser.getValue(node, "__HIVE_VERSION__");
-
+    
 	final String studioVersion = org.talend.commons.utils.VersionUtils.getDisplayVersion();
 
     if ("true".equals(ElementParameterParser.getValue(node,"__USE_EXISTING_CONNECTION__"))) { //with connection
@@ -45,7 +45,7 @@ imports="
             }
         }
     }
-
+	
     org.talend.hadoop.distribution.component.HiveComponent hiveDistrib = null;
     try {
         hiveDistrib = (org.talend.hadoop.distribution.component.HiveComponent) org.talend.hadoop.distribution.DistributionFactory.buildDistribution(theDistribution, theVersion);
@@ -95,7 +95,7 @@ bw_<%=cid%>.write("!set showHeader false\n");
 <%
         }
     }
-    if (hiveDistrib.isGoogleDataprocDistribution()) {
+    if (hiveDistrib.doSupportUniversalDataprocMode()) {
 %>
         <%@ include file="@{org.talend.designer.components.localprovider}/components/templates/Hive/GetDataprocConnection.javajet"%>
 <%
@@ -193,7 +193,7 @@ bw_<%=cid%>.write("!set showHeader false\n");
 <%
     }
 
-    if (hiveDistrib.isGoogleDataprocDistribution()) {
+    if (hiveDistrib.doSupportUniversalDataprocMode()) {
         if (isLog4jEnabled) {
 %>
             log.debug("Query for <%=cid%>: " + <%=dbquery%>.replace("';'", "'\\;'") + ";");

main/plugins/org.talend.designer.components.localprovider/components/tHiveRow/tHiveRow_begin.javajet

@@ -33,7 +33,8 @@ imports="
 
     String theDistribution = ElementParameterParser.getValue(node, "__DISTRIBUTION__");
     String theVersion = ElementParameterParser.getValue(node, "__HIVE_VERSION__");
-
+	String connMode = ElementParameterParser.getValue(node, "__CONNECTION_MODE__");
+	
 	String encryptedToken = null;
     if("true".equals(ElementParameterParser.getValue(node,"__USE_EXISTING_CONNECTION__"))) {
         String connection = ElementParameterParser.getValue(node, "__CONNECTION__");
@@ -41,6 +42,7 @@ imports="
             if(connection!=null && connection.equals(pNode.getUniqueName())) {
                 theDistribution = ElementParameterParser.getValue(pNode, "__DISTRIBUTION__");
                 theVersion = ElementParameterParser.getValue(pNode, "__HIVE_VERSION__");
+                connMode = ElementParameterParser.getValue(pNode, "__CONNECTION_MODE__");
             }
         }
     }
@@ -89,12 +91,12 @@ imports="
 			}
 <%
 		}
-    } else if(hiveDistrib.isGoogleDataprocDistribution()) {
+    } else if ("DATAPROC".equalsIgnoreCase(connMode)) {
 		// Distribution: Google Dataproc
 %>
         <%@ include file="@{org.talend.designer.components.localprovider}/components/templates/Hive/GetDataprocConnection.javajet"%>
 <%
-	} else {
+	 } else {
 		// Distribution: other than WebHCat, Dataproc
 %>
 		<%@ include file="../templates/Hive/GetConnection.javajet"%>
@@ -231,7 +233,7 @@ imports="
 	    }
 	}
 
-	if(!hiveDistrib.useCloudLauncher()) {
+	if(!hiveDistrib.useCloudLauncher() && !"DATAPROC".equalsIgnoreCase(connMode)) {
 		if (usePrepareStatement) {
 		%>
 			java.sql.PreparedStatement pstmt_<%=cid %> = conn_<%=cid%>.prepareStatement(<%=dbquery%>);
@@ -244,3 +246,4 @@ imports="
 %>
 	String query_<%=cid %> = "";
 	boolean whetherReject_<%=cid%> = false;
+

main/plugins/org.talend.designer.components.localprovider/components/tHiveRow/tHiveRow_end.javajet

@@ -17,13 +17,15 @@ imports="
 	
     String theDistribution = ElementParameterParser.getValue(node, "__DISTRIBUTION__");
     String theVersion = ElementParameterParser.getValue(node, "__HIVE_VERSION__");
-
+	String connMode = ElementParameterParser.getValue(node, "__CONNECTION_MODE__");
+	
     if("true".equals(ElementParameterParser.getValue(node,"__USE_EXISTING_CONNECTION__"))) {
         String connection = ElementParameterParser.getValue(node, "__CONNECTION__");
         for (INode pNode : node.getProcess().getNodesOfType("tHiveConnection")) {
             if(connection!=null && connection.equals(pNode.getUniqueName())) {
                 theDistribution = ElementParameterParser.getValue(pNode, "__DISTRIBUTION__");
                 theVersion = ElementParameterParser.getValue(pNode, "__HIVE_VERSION__");
+                connMode = ElementParameterParser.getValue(pNode, "__CONNECTION_MODE__");
             }
         }
     }
@@ -37,10 +39,10 @@ imports="
     }
     boolean isCustom = hiveDistrib instanceof org.talend.hadoop.distribution.custom.CustomDistribution;
 
-	if(!hiveDistrib.useCloudLauncher()) {
+	if(!hiveDistrib.useCloudLauncher() && !"DATAPROC".equalsIgnoreCase(connMode)) {
 		if (usePrepareStatement) {
 		%>
-			pstmt_<%=cid %>.close();	
+			pstmt_<%=cid %>.close();
 		<%
 		} 
 		%>
@@ -99,3 +101,4 @@ imports="
 <%
 	}
 %>
+

main/plugins/org.talend.designer.components.localprovider/components/tHiveRow/tHiveRow_java.xml

@@ -17,12 +17,12 @@
 
 	<CONNECTORS>
 		<CONNECTOR CTYPE="FLOW" MAX_INPUT="1" MAX_OUTPUT="1" 
-			NOT_SHOW_IF="DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[]" />
+			NOT_SHOW_IF="CONNECTION_MODE=='DATAPROC'" />
 		<CONNECTOR NAME="REJECT" CTYPE="FLOW" MAX_INPUT="0"
 			MAX_OUTPUT="1" LINE_STYLE="2" COLOR="FF0000" BASE_SCHEMA="FLOW"
-			NOT_SHOW_IF="(DATA_ACTION == 'INSERT' OR DIE_ON_ERROR == 'true' OR DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[])" />
+			NOT_SHOW_IF="(DATA_ACTION == 'INSERT') OR (DIE_ON_ERROR=='true') OR (CONNECTION_MODE=='DATAPROC')" />
 		<CONNECTOR CTYPE="ITERATE" MAX_OUTPUT="1" MAX_INPUT="1" 
-			NOT_SHOW_IF="DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[]" />
+			NOT_SHOW_IF="CONNECTION_MODE=='DATAPROC'" />
 		<CONNECTOR CTYPE="SUBJOB_OK" MAX_INPUT="1" />
 		<CONNECTOR CTYPE="SUBJOB_ERROR" MAX_INPUT="1" />
 		<CONNECTOR CTYPE="COMPONENT_OK" />
@@ -74,6 +74,8 @@
 					SHOW_IF="(DISTRIBUTION=='CUSTOM') OR DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportEmbeddedMode[]" />
 				<ITEM NAME="STANDALONE" VALUE="STANDALONE"
 					SHOW_IF="(DISTRIBUTION=='CUSTOM') OR (HIVE_SERVER == 'HIVE2' AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportStandaloneMode[]) OR (HIVE_SERVER == 'HIVE' AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHive1Standalone[])" />
+				<ITEM NAME="DATAPROC" VALUE="DATAPROC"
+					SHOW_IF="DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportUniversalDataprocMode[]"/>
 			</ITEMS>
 		</PARAMETER>
 		<PARAMETER NAME="HIVE_SERVER" FIELD="CLOSED_LIST" NUM_ROW="13"
@@ -88,14 +90,14 @@
 
 		<PARAMETER NAME="HOST" FIELD="TEXT" NUM_ROW="20"
 			REPOSITORY_VALUE="SERVER_NAME" REQUIRED="true"
-			SHOW_IF="(USE_EXISTING_CONNECTION == 'false' AND !DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[])"
+			SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND !DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[] AND (CONNECTION_MODE!='DATAPROC')"
 			GROUP="CONN">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
 
 		<PARAMETER NAME="PORT" FIELD="TEXT" NUM_ROW="20"
 			REPOSITORY_VALUE="PORT" REQUIRED="true"
-			SHOW_IF="(USE_EXISTING_CONNECTION == 'false' AND !DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[])"
+			SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND !DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[] AND (CONNECTION_MODE!='DATAPROC')"
 			GROUP="CONN">
 			<DEFAULT>"10000"</DEFAULT>
 		</PARAMETER>
@@ -113,28 +115,28 @@
 
 		<PARAMETER NAME="USER" FIELD="TEXT" NUM_ROW="28"
 			REPOSITORY_VALUE="USERNAME" REQUIRED="true"
-			SHOW_IF="(USE_EXISTING_CONNECTION == 'false' AND !DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[])"
+			SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND !DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[] AND (CONNECTION_MODE!='DATAPROC')"
 			GROUP="CONN">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
 
 		<PARAMETER NAME="PASS" FIELD="PASSWORD" NUM_ROW="28"
 			REPOSITORY_VALUE="PASSWORD" REQUIRED="true"
-			SHOW_IF="(USE_EXISTING_CONNECTION == 'false' AND !DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[])"
+			SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND !DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[] AND (CONNECTION_MODE!='DATAPROC')"
 			GROUP="CONN">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
 
 		<PARAMETER NAME="HIVE_ADDITIONAL_JDBC" FIELD="TEXT" NUM_ROW="29"
 			REPOSITORY_VALUE="HIVE_ADDITIONAL_JDBC" REQUIRED="false" GROUP="CONN"
-			SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND (!DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[] AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHive2[] AND HIVE_SERVER=='HIVE2' AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportStandaloneMode[] AND CONNECTION_MODE=='STANDALONE')">
+			SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND (!DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[] AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHive2[] AND HIVE_SERVER=='HIVE2' AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportStandaloneMode[] AND CONNECTION_MODE=='STANDALONE' AND CONNECTION_MODE!='DATAPROC')">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
 
 
 		<PARAMETER NAME="USE_KRB" FIELD="CHECK" NUM_ROW="30"
 			REQUIRED="true" REPOSITORY_VALUE="USE_KRB"
-			SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND ((DISTRIBUTION=='CUSTOM') OR (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportKerberos[] AND ((DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHive1[] AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportEmbeddedMode[] AND HIVE_SERVER=='HIVE' AND CONNECTION_MODE=='EMBEDDED') OR (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHive2[] AND HIVE_SERVER=='HIVE2'))))"
+			SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND (CONNECTION_MODE!='DATAPROC') AND ((DISTRIBUTION=='CUSTOM') OR (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportKerberos[] AND ((DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHive1[] AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportEmbeddedMode[] AND HIVE_SERVER=='HIVE' AND CONNECTION_MODE=='EMBEDDED') OR (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHive2[] AND HIVE_SERVER=='HIVE2'))))"
 			GROUP="AUTHENTICATION">
 			<DEFAULT>false</DEFAULT>
 		</PARAMETER>
@@ -304,7 +306,7 @@
 
 		<PARAMETER NAME="SET_FS_DEFAULT_NAME" FIELD="CHECK" NUM_ROW="53"
 			REQUIRED="true"
-			SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND (!DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[])"
+			SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND (!DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[]) AND (CONNECTION_MODE!='DATAPROC')"
 			GROUP="HADOOP_PROPS">
 			<DEFAULT IF="(CONNECTION_MODE == 'STANDALONE')">false</DEFAULT>
 			<DEFAULT IF="(CONNECTION_MODE == 'EMBEDDED')">true</DEFAULT>
@@ -439,43 +441,42 @@
 			SHOW_IF="(USE_EXISTING_CONNECTION == 'false' AND DISTRIB[DISTRIBUTION, HIVE_VERSION].isExecutedThroughWebHCat[])">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
-
 		<!-- -->
 
 		<!-- GOOGLE DATAPROC -->
 		<PARAMETER NAME="GOOGLE_PROJECT_ID" REPOSITORY_VALUE="GOOGLE_PROJECT_ID" FIELD="TEXT" REQUIRED="true"
 			NUM_ROW="16" GROUP="CONN"
-			SHOW_IF="(USE_EXISTING_CONNECTION=='false' AND DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[])">
+			SHOW_IF="(USE_EXISTING_CONNECTION=='false') AND (CONNECTION_MODE=='DATAPROC')">
 			<DEFAULT>"my-google-project"</DEFAULT>
 		</PARAMETER>
 		<PARAMETER NAME="GOOGLE_CLUSTER_ID" REPOSITORY_VALUE="GOOGLE_CLUSTER_ID" FIELD="TEXT" REQUIRED="true"
 			NUM_ROW="17" GROUP="CONN"
-			SHOW_IF="(USE_EXISTING_CONNECTION=='false' AND DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[])">
+			SHOW_IF="(USE_EXISTING_CONNECTION=='false') AND (CONNECTION_MODE=='DATAPROC')">
 			<DEFAULT>"my-cluster-id"</DEFAULT>
 		</PARAMETER>
 		<PARAMETER NAME="GOOGLE_REGION" REPOSITORY_VALUE="GOOGLE_REGION" FIELD="TEXT" REQUIRED="true"
 			NUM_ROW="18" GROUP="CONN"
-			SHOW_IF="(USE_EXISTING_CONNECTION=='false' AND DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[])">
+			SHOW_IF="(USE_EXISTING_CONNECTION=='false') AND (CONNECTION_MODE=='DATAPROC')">
 			<DEFAULT>"global"</DEFAULT>
 		</PARAMETER>
 		<PARAMETER NAME="GOOGLE_JARS_BUCKET" REPOSITORY_VALUE="GOOGLE_JARS_BUCKET" FIELD="TEXT" REQUIRED="true"
 			NUM_ROW="19" GROUP="CONN"
-			SHOW_IF="(USE_EXISTING_CONNECTION=='false' AND DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[])">
+			SHOW_IF="(USE_EXISTING_CONNECTION=='false') AND (CONNECTION_MODE=='DATAPROC')">
 			<DEFAULT>"gs://my-bucket/talend/jars"</DEFAULT>
 		</PARAMETER>
 
 		<PARAMETER NAME="DEFINE_PATH_TO_GOOGLE_CREDENTIALS" REPOSITORY_VALUE="DEFINE_PATH_TO_GOOGLE_CREDENTIALS" FIELD="CHECK"
 			REQUIRED="true" NUM_ROW="50" GROUP="AUTHENTICATION"
-			SHOW_IF="(USE_EXISTING_CONNECTION=='false' AND DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[])">
+			SHOW_IF="(USE_EXISTING_CONNECTION=='false') AND (CONNECTION_MODE=='DATAPROC')">
 			<DEFAULT>false</DEFAULT>
 		</PARAMETER>
 		<PARAMETER NAME="PATH_TO_GOOGLE_CREDENTIALS" REPOSITORY_VALUE="PATH_TO_GOOGLE_CREDENTIALS" FIELD="FILE" REQUIRED="true"
 			NUM_ROW="51" GROUP="AUTHENTICATION"
-			SHOW_IF="((isShow[DEFINE_PATH_TO_GOOGLE_CREDENTIALS]) AND DEFINE_PATH_TO_GOOGLE_CREDENTIALS=='true' AND DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[])">
+			SHOW_IF="(isShow[DEFINE_PATH_TO_GOOGLE_CREDENTIALS]) AND (DEFINE_PATH_TO_GOOGLE_CREDENTIALS=='true') AND (CONNECTION_MODE=='DATAPROC')">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
 		<!-- END GOOGLE DATAPROC -->
-
+		
 		<PARAMETER NAME="SCHEMA_FLOW" FIELD="SCHEMA_TYPE" NUM_ROW="60">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
@@ -755,96 +756,27 @@
 				REQUIRED="false"
 				REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DISTRIBUTION!='CUSTOM') AND (USE_KRB=='true') AND (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportKerberos[] AND ((DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHive1[] AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportEmbeddedMode[] AND HIVE_SERVER=='HIVE' AND CONNECTION_MODE=='EMBEDDED') OR (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHive2[] AND HIVE_SERVER=='HIVE2')))" />
 
-			<!-- HDP_2_2 -->
-			<IMPORT MODULE_GROUP="HIVE-LIB-HDP_2_2_LASTEST"
-				REQUIRED_IF="(HIVE_VERSION=='HDP_2_2') and (USE_EXISTING_CONNECTION == 'false') AND DISTRIBUTION!='CUSTOM'" />
-			<!-- HDP_2_2 Hbase -->
-			<IMPORT MODULE_GROUP="HIVE-HBASE-LIB-HDP_2_2_LASTEST"
-				REQUIRED_IF="(HIVE_VERSION=='HDP_2_2' AND STORE_BY_HBASE=='true') and (USE_EXISTING_CONNECTION == 'false') AND DISTRIBUTION!='CUSTOM'" />
-
-			<!-- Hive libraries for HDP_2_3 -->
-			<IMPORT MODULE_GROUP="HIVE-LIB-HDP_2_3"
-				REQUIRED_IF="(HIVE_VERSION=='HDP_2_3') and (USE_EXISTING_CONNECTION == 'false') AND DISTRIBUTION!='CUSTOM'" />
-
-			<!-- Hive HBase libraries for HDP_2_3 -->
-			<IMPORT MODULE_GROUP="HIVE-HBASE-LIB-HDP_2_3"
-				REQUIRED_IF="(HIVE_VERSION=='HDP_2_3' AND STORE_BY_HBASE=='true') and (USE_EXISTING_CONNECTION == 'false') AND DISTRIBUTION!='CUSTOM'" />
-
-			<!-- ############## -->
-
-			<!-- EMR 4_0_0 -->
-			<IMPORT MODULE_GROUP="HIVE-LIB-EMR_4_0_0_LATEST"
-				REQUIRED_IF="HIVE_VERSION=='EMR_4_0_0' AND (USE_EXISTING_CONNECTION == 'false') AND (DISTRIBUTION!='CUSTOM')" />
-
-			<!-- MAPR401 -->
-			<IMPORT MODULE_GROUP="HIVE-LIB-MAPR40X_LASTEST"
-				REQUIRED_IF="(HIVE_VERSION=='MAPR401') and (USE_EXISTING_CONNECTION == 'false') AND DISTRIBUTION!='CUSTOM'" />
-			<!-- MAPR500 -->
-			<IMPORT MODULE_GROUP="HIVE-LIB-MAPR50X_LASTEST"
-				REQUIRED_IF="(HIVE_VERSION=='MAPR500') and (USE_EXISTING_CONNECTION == 'false') AND DISTRIBUTION!='CUSTOM'" />
-			<!-- MAPR401 Hbase -->
-			<IMPORT MODULE_GROUP="HIVE-HBASE-LIB-MAPR40X_LASTEST"
-				REQUIRED_IF="(HIVE_VERSION=='MAPR401' AND STORE_BY_HBASE=='true') and (USE_EXISTING_CONNECTION == 'false') AND DISTRIBUTION!='CUSTOM'" />
-			<!-- MAPR500 Hbase -->
-			<IMPORT MODULE_GROUP="HIVE-HBASE-LIB-MAPR50X_LASTEST"
-				REQUIRED_IF="(HIVE_VERSION=='MAPR500' AND STORE_BY_HBASE=='true') and (USE_EXISTING_CONNECTION == 'false') AND DISTRIBUTION!='CUSTOM'" />
-			<!-- ############## -->
-
-			<!-- MICROSOFT HD INSIGHT 3.1 && MICROSOFT HD INSIGHT 3.2 -->
-			<IMPORT MODULE_GROUP="HD_INSIGHT_COMMON_LIBRARIES_LATEST"
-				REQUIRED_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[]) AND (USE_EXISTING_CONNECTION=='false') AND (DISTRIBUTION=='MICROSOFT_HD_INSIGHT')" />
-
-			<!-- Parquet libraries for HDP_2_3 -->
-			<IMPORT MODULE_GROUP="PARQUET-LIB-HDP_2_3"
-				REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (USE_PARQUET=='true') AND (HIVE_VERSION=='HDP_2_3') AND (DISTRIBUTION!='CUSTOM')" />
-
 			<!-- PARQUET SUPPORT -->
 			<IMPORT NAME="parquet-hive-bundle-1.5.0" MODULE="parquet-hive-bundle-1.5.0.jar"
 				MVN="mvn:org.talend.libraries/parquet-hive-bundle-1.5.0/6.0.0"
 				UrlPath="platform:/plugin/org.talend.libraries.hadoop/lib/parquet-hive-bundle-1.5.0.jar"
-				REQUIRED_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[] AND USE_EXISTING_CONNECTION=='false' AND USE_PARQUET=='true' AND DISTRIBUTION!='PIVOTAL_HD' AND DISTRIBUTION!='CUSTOM' AND HIVE_VERSION!='HDP_2_3' AND HIVE_VERSION!='MAPR2' AND HIVE_VERSION!='APACHE_1_0_0')" />
+				REQUIRED_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[] AND USE_EXISTING_CONNECTION=='false' AND USE_PARQUET=='true' AND DISTRIBUTION!='CUSTOM')" />
 			<IMPORT NAME="parquet-hive-bundle-1.3.2" MODULE="parquet-hive-bundle-1.3.2.jar"
 				MVN="mvn:org.talend.libraries/parquet-hive-bundle-1.3.2/6.0.0"
 				UrlPath="platform:/plugin/org.talend.libraries.hadoop/lib/parquet-hive-bundle-1.3.2.jar"
-				REQUIRED_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[] AND USE_EXISTING_CONNECTION=='false' AND USE_PARQUET=='true' AND DISTRIBUTION=='PIVOTAL_HD' AND HIVE_VERSION!='PIVOTAL_HD_1_0_1')" />
+				REQUIRED_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[] AND USE_EXISTING_CONNECTION=='false' AND USE_PARQUET=='true')" />
 			<IMPORT NAME="snappy-java-1.0.5.jar" MODULE="snappy-java-1.0.5.jar"
 				MVN="mvn:org.talend.libraries/snappy-java-1.0.5/6.0.0"				
-				REQUIRED_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[] AND USE_EXISTING_CONNECTION=='false' AND USE_PARQUET=='true' AND DISTRIBUTION!='CUSTOM' AND HIVE_VERSION!='MAPR2' AND HIVE_VERSION!='APACHE_1_0_0' AND HIVE_VERSION!='PIVOTAL_HD_1_0_1')" />
-			<!-- ############## -->
-			<!-- HDP_2_1 Tez additional -->
-			<IMPORT MODULE_GROUP="HIVE-TEZ-LIB-HDP211"
-				REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (HIVE_VERSION=='HDP_2_1') AND (DISTRIBUTION!='CUSTOM') AND (EXECUTION_ENGINE=='tez')" />
-			<!-- MapR401 Tez additional -->
-			<IMPORT MODULE_GROUP="HIVE-TEZ-LIB-MapR401"
-				REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (HIVE_VERSION=='MAPR401') AND (DISTRIBUTION!='CUSTOM') AND (EXECUTION_ENGINE=='tez')" />
-			<!-- MAPR410 -->
-			<IMPORTS
-				REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (DISTRIBUTION!='CUSTOM')">
-				<IMPORTS REQUIRED_IF="(HIVE_VERSION=='MAPR410')">
-					<IMPORTS REQUIRED_IF="(EXECUTION_ENGINE!='tez')">
-						<IMPORT MODULE_GROUP="HIVE-LIB-MAPR41X_LASTEST" />
-						<IMPORT MODULE_GROUP="HIVE-HBASE-LIB-MAPR41X_LASTEST"
-							REQUIRED_IF="(STORE_BY_HBASE=='true')" />
-					</IMPORTS>
-					<IMPORTS REQUIRED_IF="(EXECUTION_ENGINE=='tez')">
-						<IMPORT MODULE_GROUP="HIVE-TEZ-LIB-MapR410" />
-						<IMPORT MODULE_GROUP="HIVE100-LIB-MAPR41X_LASTEST" />
-						<IMPORT MODULE_GROUP="HIVE100-HBASE-LIB-MAPR41X_LASTEST"
-							REQUIRED_IF="(STORE_BY_HBASE=='true')" />
-					</IMPORTS>
-				</IMPORTS>
-			</IMPORTS>
-			<!-- HDP_2_2 Tez additional -->
-			<IMPORT MODULE_GROUP="TEZ-LIB-HDP220"
-				REQUIRED_IF="(DISTRIBUTION == 'HORTONWORKS') AND (HIVE_VERSION == 'HDP_2_2') AND (EXECUTION_ENGINE == 'tez')" />
-			<IMPORT MODULE_GROUP="TEZ-SERVER-LIB-HDP220"
-				REQUIRED_IF="(DISTRIBUTION == 'HORTONWORKS') AND (HIVE_VERSION == 'HDP_2_2') AND (EXECUTION_ENGINE == 'tez') AND (TEZ_LIB == 'INSTALL')" />
-			<!-- Tez libraries for HDP_2_3 -->
-			<IMPORT MODULE_GROUP="TEZ-LIB-HDP_2_3"
-				REQUIRED_IF="(DISTRIBUTION == 'HORTONWORKS') AND (HIVE_VERSION == 'HDP_2_3') AND (EXECUTION_ENGINE == 'tez')" />
-			<!-- Tez Server libraries for HDP_2_3 -->
-			<IMPORT MODULE_GROUP="TEZ-SERVER-LIB-HDP_2_3"
-				REQUIRED_IF="(DISTRIBUTION == 'HORTONWORKS') AND (HIVE_VERSION == 'HDP_2_3') AND (EXECUTION_ENGINE == 'tez') AND (TEZ_LIB == 'INSTALL')" />
+				REQUIRED_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[] AND USE_EXISTING_CONNECTION=='false' AND USE_PARQUET=='true' AND DISTRIBUTION!='CUSTOM')" />
+			
+			<!-- Dataproc 2.x -->	
+			<IMPORT MODULE_GROUP="DATAPROC-LAUNCHER-DI" 
+                   REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (CONNECTION_MODE=='DATAPROC')" REQUIRED="false"/>
+            
+            <!-- Spark universal 3.1.x -->
+            <IMPORT MODULE_GROUP="UNIVERSAL-SPARK-3.1.X" 
+                   REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (CONNECTION_MODE=='STANDALONE') AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportUniversalLocalMode[]" REQUIRED="false"/>
+                   
 		</IMPORTS>
 	</CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tHiveRow/tHiveRow_main.javajet

@@ -32,6 +32,7 @@ dbquery = org.talend.core.model.utils.NodeUtil.replaceCRLFInMEMO_SQL(dbquery);
 
 String theDistribution = ElementParameterParser.getValue(node, "__DISTRIBUTION__");
 String theVersion = ElementParameterParser.getValue(node, "__HIVE_VERSION__");
+String connMode = ElementParameterParser.getValue(node, "__CONNECTION_MODE__");
 
 final String studioVersion = org.talend.commons.utils.VersionUtils.getDisplayVersion();
 
@@ -42,6 +43,7 @@ if("true".equals(ElementParameterParser.getValue(node,"__USE_EXISTING_CONNECTION
         if(connection!=null && connection.equals(pNode.getUniqueName())) {
             theDistribution = ElementParameterParser.getValue(pNode, "__DISTRIBUTION__");
             theVersion = ElementParameterParser.getValue(pNode, "__HIVE_VERSION__");
+            connMode = ElementParameterParser.getValue(pNode, "__CONNECTION_MODE__");
         }
     }
 }
@@ -88,7 +90,7 @@ if(hiveDistrib.isExecutedThroughWebHCat()) {
 %>
 	}
 <%
-} else if (hiveDistrib.isGoogleDataprocDistribution()) {
+} else if("DATAPROC".equalsIgnoreCase(connMode)) { // Dataproc
     if(isLog4jEnabled) {
 %>
         log.debug("Query for <%=cid%>: " + query_<%=cid %>.replace("';'", "'\\;'") + ";");
@@ -120,7 +122,7 @@ if(hiveDistrib.isExecutedThroughWebHCat()) {
 %>
     }
 <%
-} else { // normal mode
+} else { //Standalone mode
 	List<Map<String, String>> prepareStatementParameters = (List<Map<String,String>>)ElementParameterParser.getObjectValue(node, "__SET_PREPAREDSTATEMENT_PARAMETERS__");  
 	
 	String incomingConnName = null;
@@ -331,3 +333,4 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
 	}
 }
 %>
+

main/plugins/org.talend.designer.components.localprovider/components/tHiveRow/tHiveRow_messages.properties

@@ -70,33 +70,13 @@ DISTRIBUTION.ITEM.CUSTOM=Custom - Unsupported
 DISTRIBUTION.ITEM.AMAZON_EMR=Amazon EMR
 DISTRIBUTION.ITEM.MICROSOFT_HD_INSIGHT=Microsoft HD Insight
 HIVE_VERSION.NAME=Hive version
-HIVE_VERSION.ITEM.HDP_1_2=Hortonworks Data Platform V1.2.0(Bimota)
-HIVE_VERSION.ITEM.HDP_1_3=Hortonworks Data Platform V1.3.0(Condor)
-HIVE_VERSION.ITEM.HDP_2_0=Hortonworks Data Platform V2.0.0(BigWheel)
-HIVE_VERSION.ITEM.HDP_2_1=Hortonworks Data Platform V2.1.0(Baikal)
-HIVE_VERSION.ITEM.HDP_2_2=Hortonworks Data Platform V2.2.0
-HIVE_VERSION.ITEM.HDP_2_3=Hortonworks Data Platform V2.3.2
-HIVE_VERSION.ITEM.APACHE_1_0_0=Apache 1.0.0 (Hive 0.9.0)
-HIVE_VERSION.ITEM.MAPR2=MapR 2.0.0
-HIVE_VERSION.ITEM.MAPR212=MapR 2.1.2
-HIVE_VERSION.ITEM.MAPR213=MapR 2.1.3
-HIVE_VERSION.ITEM.MAPR301=MapR 3.0.1
-HIVE_VERSION.ITEM.MAPR310=MapR 3.1.0
-HIVE_VERSION.ITEM.MAPR401=MapR 4.0.1(YARN mode)
-HIVE_VERSION.ITEM.MAPR410=MapR 4.1.0(YARN mode)
-HIVE_VERSION.ITEM.MAPR500=MapR 5.0.0(YARN mode)
-HIVE_VERSION.ITEM.EMR_4_0_0=EMR 4.0.0 (Hive 1.0.0)
-HIVE_VERSION.ITEM.APACHE_1_0_3_EMR=Apache 1.0.3 (Hive 0.8.1)
-HIVE_VERSION.ITEM.APACHE_2_4_0_EMR=Apache 2.4.0 (Hive 0.11.0)
-HIVE_VERSION.ITEM.APACHE_2_4_0_EMR_0_13_1=Apache 2.4.0 (Hive 0.13.1)
-HIVE_VERSION.ITEM.MICROSOFT_HD_INSIGHT_3_1=Microsoft HD Insight 3.1
-HIVE_VERSION.ITEM.MICROSOFT_HD_INSIGHT_3_2=Microsoft HD Insight 3.2
 HIVE_SERVER.NAME=Hive Server
 HIVE_SERVER.ITEM.HIVE=Hive 1
 HIVE_SERVER.ITEM.HIVE2=Hive 2
 CONNECTION_MODE.NAME=Connection mode
 CONNECTION_MODE.ITEM.EMBEDDED=Embedded
 CONNECTION_MODE.ITEM.STANDALONE=Standalone
+CONNECTION_MODE.ITEM.DATAPROC=Dataproc
 SET_TEMP_PATH.NAME=Set temporary path
 TEMP_PATH.NAME=
 TEMP_PATH_GROUP.NAME=Temporary Path

main/plugins/org.talend.designer.components.localprovider/components/tHiveRow/tHiveRow_messages_fr.properties

@@ -70,27 +70,6 @@ DISTRIBUTION.ITEM.CUSTOM=Personnalis\u00E9 - Non support\u00E9
 DISTRIBUTION.ITEM.AMAZON_EMR=Amazon EMR
 DISTRIBUTION.ITEM.MICROSOFT_HD_INSIGHT=Microsoft HD Insight
 HIVE_VERSION.NAME=Version de Hive
-HIVE_VERSION.ITEM.HDP_1_2=Hortonworks Data Platform V1.2.0 (Bimota)
-HIVE_VERSION.ITEM.HDP_1_3=Hortonworks Data Platform V1.3.0 (Condor)
-HIVE_VERSION.ITEM.HDP_2_0=Hortonworks Data Platform V2.0.0 (BigWheel)
-HIVE_VERSION.ITEM.HDP_2_1=Hortonworks Data Platform V2.1.0 (Baikal)
-HIVE_VERSION.ITEM.HDP_2_2=Hortonworks Data Platform V2.2.0
-HIVE_VERSION.ITEM.HDP_2_3=Hortonworks Data Platform V2.3.2
-HIVE_VERSION.ITEM.APACHE_1_0_0=Apache 1.0.0 (Hive 0.9.0)
-HIVE_VERSION.ITEM.MAPR2=MapR 2.0.0
-HIVE_VERSION.ITEM.MAPR212=MapR 2.1.2
-HIVE_VERSION.ITEM.MAPR213=MapR 2.1.3
-HIVE_VERSION.ITEM.MAPR301=MapR 3.0.1
-HIVE_VERSION.ITEM.MAPR310=MapR 3.1.0
-HIVE_VERSION.ITEM.MAPR401=MapR 4.0.1 (mode YARN)
-HIVE_VERSION.ITEM.MAPR410=MapR 4.1.0 (mode YARN)
-HIVE_VERSION.ITEM.MAPR500=MapR 5.0.0 (mode YARN)
-HIVE_VERSION.ITEM.EMR_4_0_0=EMR 4.0.0 (Hive 1.0.0)
-HIVE_VERSION.ITEM.APACHE_1_0_3_EMR=Apache 1.0.3 (Hive 0.8.1)
-HIVE_VERSION.ITEM.APACHE_2_4_0_EMR=Apache 2.4.0 (Hive 0.11.0)
-HIVE_VERSION.ITEM.APACHE_2_4_0_EMR_0_13_1=Apache 2.4.0 (Hive 0.13.1)
-HIVE_VERSION.ITEM.MICROSOFT_HD_INSIGHT_3_1=Microsoft HD Insight 3.1
-HIVE_VERSION.ITEM.MICROSOFT_HD_INSIGHT_3_2=Microsoft HD Insight 3.2
 HIVE_SERVER.NAME=Serveur de Hive
 HIVE_SERVER.ITEM.HIVE=Hive 1
 HIVE_SERVER.ITEM.HIVE2=Hive 2

main/plugins/org.talend.designer.components.localprovider/components/tHiveRow/tHiveRow_messages_ja.properties

@@ -70,27 +70,6 @@ DISTRIBUTION.ITEM.CUSTOM=\u30AB\u30B9\u30BF\u30E0 - \u975E\u30B5\u30DD\u30FC\u30
 DISTRIBUTION.ITEM.AMAZON_EMR=Amazon EMR
 DISTRIBUTION.ITEM.MICROSOFT_HD_INSIGHT=Microsoft HD Insight
 HIVE_VERSION.NAME=HIve\u30D0\u30FC\u30B8\u30E7\u30F3
-HIVE_VERSION.ITEM.HDP_1_2=Hortonworks Data Platform V1.2.0(Bimota)
-HIVE_VERSION.ITEM.HDP_1_3=Hortonworks Data Platform V1.3.0(Condor)
-HIVE_VERSION.ITEM.HDP_2_0=Hortonworks Data Platform V2.0.0 (BigWheel)
-HIVE_VERSION.ITEM.HDP_2_1=Hortonworks Data Platform V2.1.0 (Baikal)
-HIVE_VERSION.ITEM.HDP_2_2=Hortonworks Data Platform V2.2.0
-HIVE_VERSION.ITEM.HDP_2_3=Hortonworks Data Platform V2.3.2
-HIVE_VERSION.ITEM.APACHE_1_0_0=Apache 1.0.0 (Hive 0.9.0)
-HIVE_VERSION.ITEM.MAPR2=MapR 2.0.0
-HIVE_VERSION.ITEM.MAPR212=MapR 2.1.2
-HIVE_VERSION.ITEM.MAPR213=MapR 2.1.3
-HIVE_VERSION.ITEM.MAPR301=MapR 3.0.1
-HIVE_VERSION.ITEM.MAPR310=MapR 3.1.0
-HIVE_VERSION.ITEM.MAPR401=MapR 4.0.1(YARN\u30E2\u30FC\u30C9)
-HIVE_VERSION.ITEM.MAPR410=MapR 4.1.0(YARN\u30E2\u30FC\u30C9)
-HIVE_VERSION.ITEM.MAPR500=MapR 5.0.0(YARN\u30E2\u30FC\u30C9)
-HIVE_VERSION.ITEM.EMR_4_0_0=EMR 4.0.0 (Hive 1.0.0)
-HIVE_VERSION.ITEM.APACHE_1_0_3_EMR=Apache 1.0.3 (Hive 0.8.1)
-HIVE_VERSION.ITEM.APACHE_2_4_0_EMR=Apache 2.4.0 (Hive 0.11.0)
-HIVE_VERSION.ITEM.APACHE_2_4_0_EMR_0_13_1=Apache 2.4.0 (Hive 0.13.1)
-HIVE_VERSION.ITEM.MICROSOFT_HD_INSIGHT_3_1=Microsoft HD Insight 3.1
-HIVE_VERSION.ITEM.MICROSOFT_HD_INSIGHT_3_2=Microsoft HD Insight 3.2
 HIVE_SERVER.NAME=Hive\u30B5\u30FC\u30D0\u30FC
 HIVE_SERVER.ITEM.HIVE=Hive 1
 HIVE_SERVER.ITEM.HIVE2=Hive 2

main/plugins/org.talend.designer.components.localprovider/components/tHiveRow/tHiveRow_messages_zh_CN.properties

@@ -70,27 +70,6 @@ DISTRIBUTION.ITEM.CUSTOM=\u4E0D\u652F\u6301\u81EA\u5B9A\u4E49
 DISTRIBUTION.ITEM.AMAZON_EMR=Amazon EMR
 DISTRIBUTION.ITEM.MICROSOFT_HD_INSIGHT=Microsoft HD Insight
 HIVE_VERSION.NAME=Hive \u7248\u672C
-HIVE_VERSION.ITEM.HDP_1_2=Hortonworks Data Platform V1.2.0(Bimota)
-HIVE_VERSION.ITEM.HDP_1_3=Hortonworks Data Platform V1.3.0(Condor)
-HIVE_VERSION.ITEM.HDP_2_0=Hortonworks Data Platform V2.0.0 (BigWheel)
-HIVE_VERSION.ITEM.HDP_2_1=Hortonworks Data Platform V2.1.0 (Baikal)
-HIVE_VERSION.ITEM.HDP_2_2=Hortonworks Data Platform V2.2.0
-HIVE_VERSION.ITEM.HDP_2_3=Hortonworks Data Platform V2.3.2
-HIVE_VERSION.ITEM.APACHE_1_0_0=Apache 1.0.0 (Hive 0.9.0)
-HIVE_VERSION.ITEM.MAPR2=MapR 2.0.0
-HIVE_VERSION.ITEM.MAPR212=MapR 2.1.2
-HIVE_VERSION.ITEM.MAPR213=MapR 2.1.3
-HIVE_VERSION.ITEM.MAPR301=MapR 3.0.1
-HIVE_VERSION.ITEM.MAPR310=MapR 3.1.0
-HIVE_VERSION.ITEM.MAPR401=MapR 4.0.1 (YARN \u6A21\u5F0F)
-HIVE_VERSION.ITEM.MAPR410=MapR 4.1.0 (YARN \u6A21\u5F0F)
-HIVE_VERSION.ITEM.MAPR500=MapR 5.0.0 (YARN \u6A21\u5F0F)
-HIVE_VERSION.ITEM.EMR_4_0_0=EMR 4.0.0 (Hive 1.0.0)
-HIVE_VERSION.ITEM.APACHE_1_0_3_EMR=Apache 1.0.3 (Hive 0.8.1)
-HIVE_VERSION.ITEM.APACHE_2_4_0_EMR=Apache 2.4.0 (Hive 0.11.0)
-HIVE_VERSION.ITEM.APACHE_2_4_0_EMR_0_13_1=Apache 2.4.0 (Hive 0.13.1)
-HIVE_VERSION.ITEM.MICROSOFT_HD_INSIGHT_3_1=Microsoft HD Insight 3.1
-HIVE_VERSION.ITEM.MICROSOFT_HD_INSIGHT_3_2=Microsoft HD Insight 3.2
 HIVE_SERVER.NAME=Hive Server
 HIVE_SERVER.ITEM.HIVE=Hive 1
 HIVE_SERVER.ITEM.HIVE2=Hive 2

main/plugins/org.talend.designer.components.localprovider/components/tJasperOutput/tJasperOutput_java.xml

@@ -114,9 +114,9 @@
 	  <IMPORT NAME="Talend_CSV" MODULE="talendcsv-1.0.0.jar" MVN="mvn:org.talend.components/talendcsv/1.0.0" UrlPath="platform:/plugin/org.talend.libraries.csv/lib/talendcsv-1.0.0.jar" REQUIRED="true" />
 
 	  <IMPORT NAME="jasperreports" MODULE="jasperreports-6.15.0.jar" MVN="mvn:net.sf.jasperreports/jasperreports/6.15.0" REQUIRED="true" />
-	  <IMPORT NAME="jackson-core" MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" REQUIRED="true" />
-	  <IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4" REQUIRED="true" />
-	  <IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4" REQUIRED="true" />
+	  <IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2" REQUIRED="true" />
+	  <IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2" REQUIRED="true" />
+	  <IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2" REQUIRED="true" />
 	  <IMPORT NAME="commons-beanutils" MODULE="commons-beanutils-1.9.4.jar" MVN="mvn:commons-beanutils/commons-beanutils/1.9.4" REQUIRED="true" />
 	  <IMPORT NAME="Itext" MODULE="itext-2.1.7.js8.jar" MVN="mvn:com.lowagie/itext/2.1.7.js8" REQUIRED="true" />
 	  <IMPORT NAME="CommonsDigester" MODULE="commons-digester-2.1.jar" MVN="mvn:commons-digester/commons-digester/2.1" REQUIRED="true" />

main/plugins/org.talend.designer.components.localprovider/components/tJasperOutputExec/tJasperOutputExec_java.xml

@@ -110,9 +110,9 @@
 	  <IMPORT NAME="Talend_CSV" MODULE="talendcsv-1.0.0.jar" MVN="mvn:org.talend.components/talendcsv/1.0.0" UrlPath="platform:/plugin/org.talend.libraries.csv/lib/talendcsv-1.0.0.jar" REQUIRED="true" />
 
 	  <IMPORT NAME="jasperreports" MODULE="jasperreports-6.15.0.jar" MVN="mvn:net.sf.jasperreports/jasperreports/6.15.0" REQUIRED="true" />
-	  <IMPORT NAME="jackson-core" MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" REQUIRED="true" />
-	  <IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4" REQUIRED="true" />
-	  <IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4" REQUIRED="true" />
+	  <IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2" REQUIRED="true" />
+	  <IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2" REQUIRED="true" />
+	  <IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2" REQUIRED="true" />
 	  <IMPORT NAME="commons-beanutils" MODULE="commons-beanutils-1.9.4.jar" MVN="mvn:commons-beanutils/commons-beanutils/1.9.4" REQUIRED="true" />
 	  <IMPORT NAME="Itext" MODULE="itext-2.1.7.js8.jar" MVN="mvn:com.lowagie/itext/2.1.7.js8" REQUIRED="true" />
 	  <IMPORT NAME="CommonsDigester" MODULE="commons-digester-2.1.jar" MVN="mvn:commons-digester/commons-digester/2.1" REQUIRED="true" />

main/plugins/org.talend.designer.components.localprovider/components/tMSSqlBulkExec/tMSSqlBulkExec_java.xml

@@ -415,9 +415,9 @@
 		<IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:com.microsoft.sqlserver/mssql-jdbc/actual"  REQUIRED_IF="(DRIVER == 'MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
 		<!--Active directory dependency module: msal4j and transitive -->
 		<IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-		<IMPORT NAME="jackson-core" MODULE="jackson-core-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-		<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-		<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+		<IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+		<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+		<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
 		<IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
 		<IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
 		<IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />

main/plugins/org.talend.designer.components.localprovider/components/tMSSqlConnection/tMSSqlConnection_java.xml

@@ -208,9 +208,9 @@
         <IMPORT NAME="slf4j-log4j12-1.7.29.jar" MODULE="slf4j-log4j12-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.29" REQUIRED_IF="(USE_SHARED_CONNECTION == 'true' AND SPECIFY_DATASOURCE_ALIAS=='false')" />
         <!--Active directory dependency module: msal4j and transitive -->
         <IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP')" />
-        <IMPORT NAME="jackson-core" MODULE="jackson-core-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP')" />
-        <IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP')" />
-        <IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP')" />
+        <IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP')" />
+        <IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP')" />
+        <IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP')" />
         <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP')" />
         <IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP')" />
         <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP')" />

main/plugins/org.talend.designer.components.localprovider/components/tMSSqlInput/tMSSqlInput_java.xml

@@ -283,9 +283,9 @@
 
         <!--Active directory dependency module: msal4j and transitive -->
         <IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="jackson-core" MODULE="jackson-core-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />

main/plugins/org.talend.designer.components.localprovider/components/tMSSqlOutput/tMSSqlOutput_java.xml

@@ -376,9 +376,9 @@
 			<IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:com.microsoft.sqlserver/mssql-jdbc/actual"  REQUIRED_IF="(DRIVER == 'MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<!--Active directory dependency module: msal4j and transitive -->
 			<IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="jackson-core" MODULE="jackson-core-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />

main/plugins/org.talend.designer.components.localprovider/components/tMSSqlRow/tMSSqlRow_java.xml

@@ -340,9 +340,9 @@
         <IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:com.microsoft.sqlserver/mssql-jdbc/actual"  REQUIRED_IF="(DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />	
         <!--Active directory dependency module: msal4j and transitive -->
         <IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="jackson-core" MODULE="jackson-core-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />

main/plugins/org.talend.designer.components.localprovider/components/tMSSqlSCD/tMSSqlSCD_java.xml

@@ -522,9 +522,9 @@
         <IMPORT NAME="Talend_MssqlUtil" MODULE="talend_DB_mssqlUtil-1.4.jar" MVN="mvn:org.talend.components.lib/talend_DB_mssqlUtil/1.4"  UrlPath="platform:/plugin/org.talend.libraries.custom/lib/talend_DB_mssqlUtil-1.4.jar" REQUIRED="true" />
         <!--Active directory dependency module: msal4j and transitive -->
         <IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="jackson-core" MODULE="jackson-core-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />

main/plugins/org.talend.designer.components.localprovider/components/tMSSqlSP/tMSSqlSP_java.xml

@@ -262,9 +262,9 @@
         <IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:com.microsoft.sqlserver/mssql-jdbc/actual"  REQUIRED_IF="(DRIVER == 'MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <!--Active directory dependency module: msal4j and transitive -->
         <IMPORT NAME="msal4j" MODULE="msal4j-1.11.0.jar" MVN="mvn:com.microsoft.azure/msal4j/1.11.0"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="jackson-core" MODULE="jackson-core-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.12.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.12.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="jackson-core" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="jackson-databind" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="jackson-annotations" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="jcip-annotations" MODULE="jcip-annotations-1.0-1.jar" MVN="mvn:com.github.stephenc.jcip/jcip-annotations/1.0-1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />

main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmInput/tMicrosoftCrmInput_java.xml

@@ -27850,19 +27850,19 @@
                 MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13"
                 REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018')))" />
             <IMPORT
-                NAME="jackson-core-2.11.4.jar"
-                MODULE="jackson-core-2.11.4.jar"
-                MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4"
+                NAME="jackson-core-2.13.2.jar"
+                MODULE="jackson-core-2.13.2.jar"
+                MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
                 REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018')))" />
             <IMPORT
-                NAME="jackson-databind-2.11.4.jar"
-                MODULE="jackson-databind-2.11.4.jar"
-                MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4"
+                NAME="jackson-databind-2.13.2.2.jar"
+                MODULE="jackson-databind-2.13.2.2.jar"
+                MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"
                 REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018')))" />
             <IMPORT
-                NAME="jackson-annotations-2.11.4.jar"
-                MODULE="jackson-annotations-2.11.4.jar"
-                MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4"
+                NAME="jackson-annotations-2.13.2.jar"
+                MODULE="jackson-annotations-2.13.2.jar"
+                MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"
                 REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018')))" />
             <IMPORT
                 NAME="json-smart-2.4.7.jar"

main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmOutput/tMicrosoftCrmOutput_java.xml

@@ -38616,19 +38616,19 @@
                 MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13"
                 REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018'))" />
             <IMPORT
-                NAME="jackson-core-2.11.4.jar"
-                MODULE="jackson-core-2.11.4.jar"
-                MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4"
+                NAME="jackson-core-2.13.2.jar"
+                MODULE="jackson-core-2.13.2.jar"
+                MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
                 REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018'))" />
             <IMPORT
-                NAME="jackson-databind-2.11.4.jar"
-                MODULE="jackson-databind-2.11.4.jar"
-                MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4"
+                NAME="jackson-databind-2.13.2.2.jar"
+                MODULE="jackson-databind-2.13.2.2.jar"
+                MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"
                 REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018'))" />
             <IMPORT
-                NAME="jackson-annotations-2.11.4.jar"
-                MODULE="jackson-annotations-2.11.4.jar"
-                MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4"
+                NAME="jackson-annotations-2.13.2.jar"
+                MODULE="jackson-annotations-2.13.2.jar"
+                MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"
                 REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018'))" />
             <IMPORT
                 NAME="json-smart-2.4.7.jar"

main/plugins/org.talend.designer.components.localprovider/components/tREST/tREST_begin.javajet

@@ -36,6 +36,19 @@ imports="
 	String keyStorePWD_<%=cid%> = System.getProperty("javax.net.ssl.keyStorePassword");
 	
 	com.sun.jersey.api.client.config.ClientConfig config_<%=cid%> = new com.sun.jersey.api.client.config.DefaultClientConfig();
+	
+	// APPINT-33909: add entitiy providers (for OSGi deployment)
+	config_<%=cid%>.getClasses().add(com.sun.jersey.core.impl.provider.entity.StringProvider.class);
+	config_<%=cid%>.getClasses().add(com.sun.jersey.core.impl.provider.entity.ByteArrayProvider.class);
+	config_<%=cid%>.getClasses().add(com.sun.jersey.core.impl.provider.entity.FileProvider.class);
+	config_<%=cid%>.getClasses().add(com.sun.jersey.core.impl.provider.entity.InputStreamProvider.class);
+	config_<%=cid%>.getClasses().add(com.sun.jersey.core.impl.provider.entity.DataSourceProvider.class);
+	config_<%=cid%>.getClasses().add(com.sun.jersey.core.impl.provider.entity.MimeMultipartProvider.class);
+	config_<%=cid%>.getClasses().add(com.sun.jersey.core.impl.provider.entity.FormProvider.class);
+	config_<%=cid%>.getClasses().add(com.sun.jersey.core.impl.provider.entity.ReaderProvider.class);
+	config_<%=cid%>.getClasses().add(com.sun.jersey.core.impl.provider.entity.DocumentProvider.class);
+	config_<%=cid%>.getClasses().add(com.sun.jersey.core.impl.provider.entity.StreamingOutputProvider.class);
+	
 	javax.net.ssl.SSLContext ctx_<%=cid%> = javax.net.ssl.SSLContext.getInstance("SSL");
 	
 	javax.net.ssl.TrustManager[] tms_<%=cid%> = null;

main/plugins/org.talend.designer.components.localprovider/components/tRedshiftBulkExec/tRedshiftBulkExec_java.xml

@@ -471,14 +471,14 @@
 			<IMPORT NAME="aws-java-sdk-1.11.848.jar" MODULE="aws-java-sdk-1.11.848.jar"
 				MVN="mvn:com.amazonaws/aws-java-sdk/1.11.848" 
 				REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="jackson-core-2.11.4.jar" MODULE="jackson-core-2.11.4.jar"
-				MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4"
+			<IMPORT NAME="jackson-core-2.13.2.jar" MODULE="jackson-core-2.13.2.jar"
+				MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2"
 				REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="jackson-databind-2.11.4.jar" MODULE="jackson-databind-2.11.4.jar"
-				MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4"
+			<IMPORT NAME="jackson-databind-2.13.2.2.jar" MODULE="jackson-databind-2.13.2.2.jar"
+				MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2"
 				REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="jackson-annotations-2.11.4.jar" MODULE="jackson-annotations-2.11.4.jar"
-				MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4"
+			<IMPORT NAME="jackson-annotations-2.13.2.jar" MODULE="jackson-annotations-2.13.2.jar"
+				MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2"
 				REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar"
 				MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13"

main/plugins/org.talend.designer.components.localprovider/components/tRedshiftBulkExec/tRedshiftBulkExec_messages_fr.properties

@@ -12,6 +12,16 @@ USER.NAME=Utilisateur
 TABLE_ACTION.NAME=Action sur la table
 USE_SHARED_CONNECTION.NAME=Utiliser ou enregistrer une connexion partag\u00E9e \u00E0 une base de donn\u00E9es
 SHARED_CONNECTION_NAME.NAME=Nom de la connexion partag\u00E9e \u00E0 la base de donn\u00E9es
+
+DRIVER_VERSION.NAME=Version du pilote
+DRIVER_VERSION.ITEM.DRIVER_V1=Pilote v1
+DRIVER_VERSION.ITEM.DRIVER_V2=Pilote v2
+
+USE_STRING_PROPERTIES.NAME=Utiliser des param\u00E8tres de cha\u00EEnes de caract\u00E8res JDBC
+ENTRY_PROPERTIES.NAME=Param\u00E8tres suppl\u00E9mentaires JDBC
+ENTRY_PROPERTIES.ITEM.KEY=Cl\u00E9
+ENTRY_PROPERTIES.ITEM.VALUE=Valeur
+
 TABLE_ACTION.ITEM.NONE=Aucune
 TABLE_ACTION.ITEM.CREATE=Cr\u00E9er la table
 TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=Cr\u00E9er la table si elle n'existe pas

main/plugins/org.talend.designer.components.localprovider/components/tRedshiftBulkExec/tRedshiftBulkExec_messages_ja.properties

@@ -12,6 +12,16 @@ USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
 TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 USE_SHARED_CONNECTION.NAME=\u5171\u6709DB\u63A5\u7D9A\u306E\u4F7F\u7528\u307E\u305F\u306F\u767B\u9332
 SHARED_CONNECTION_NAME.NAME=\u5171\u6709DB\u63A5\u7D9A\u540D
+
+DRIVER_VERSION.NAME=\u30C9\u30E9\u30A4\u30D0\u30FC\u306E\u30D0\u30FC\u30B8\u30E7\u30F3
+DRIVER_VERSION.ITEM.DRIVER_V1=\u30C9\u30E9\u30A4\u30D0\u30FCv1
+DRIVER_VERSION.ITEM.DRIVER_V2=\u30C9\u30E9\u30A4\u30D0\u30FCv2
+
+USE_STRING_PROPERTIES.NAME=\u6587\u5B57\u5217JDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u4F7F\u7528
+ENTRY_PROPERTIES.NAME=\u8FFD\u52A0\u306EJDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
+ENTRY_PROPERTIES.ITEM.KEY=\u30AD\u30FC
+ENTRY_PROPERTIES.ITEM.VALUE=\u5024
+
 TABLE_ACTION.ITEM.NONE=\u306A\u3057
 TABLE_ACTION.ITEM.CREATE=\u30C6\u30FC\u30D6\u30EB\u306E\u4F5C\u6210
 TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u30C6\u30FC\u30D6\u30EB\u3092\u4F5C\u6210

main/plugins/org.talend.designer.components.localprovider/components/tRedshiftBulkExec/tRedshiftBulkExec_messages_zh_CN.properties

@@ -12,6 +12,16 @@ USER.NAME=\u7528\u6237\u540D
 TABLE_ACTION.NAME=\u8868\u64CD\u4F5C
 USE_SHARED_CONNECTION.NAME=\u4F7F\u7528\u6216\u6CE8\u518C\u5171\u4EAB\u6570\u636E\u5E93\u8FDE\u63A5
 SHARED_CONNECTION_NAME.NAME=\u5171\u4EAB\u6570\u636E\u5E93\u8FDE\u63A5\u540D\u79F0
+
+DRIVER_VERSION.NAME=\u9A71\u52A8\u7248\u672C
+DRIVER_VERSION.ITEM.DRIVER_V1=\u9A71\u52A8 v1
+DRIVER_VERSION.ITEM.DRIVER_V2=\u9A71\u52A8 v2
+
+USE_STRING_PROPERTIES.NAME=\u4F7F\u7528\u5B57\u4E32 JDBC \u53C2\u6570
+ENTRY_PROPERTIES.NAME=\u9644\u52A0 JDBC \u53C2\u6570
+ENTRY_PROPERTIES.ITEM.KEY=\u952E
+ENTRY_PROPERTIES.ITEM.VALUE=\u503C
+
 TABLE_ACTION.ITEM.NONE=\u65E0
 TABLE_ACTION.ITEM.CREATE=\u521B\u5EFA\u8868
 TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5982\u679C\u8868\u4E0D\u5B58\u5728\u5219\u521B\u5EFA\u8868

main/plugins/org.talend.designer.components.localprovider/components/tRedshiftConnection/tRedshiftConnection_java.xml

@@ -236,9 +236,9 @@
         <IMPORT NAME="aws-java-sdk-1.11.848.jar" MODULE="aws-java-sdk-1.11.848.jar" MVN="mvn:com.amazonaws/aws-java-sdk/1.11.848" REQUIRED_IF="(JDBC_URL == 'SSO')" />
         <IMPORT NAME="aws-java-sdk-redshift-internal-1.12.x.jar" MODULE="aws-java-sdk-redshift-internal-1.12.x.jar" MVN="mvn:com.amazonaws/aws-java-sdk-redshift-internal/1.12.x" REQUIRED_IF="(JDBC_URL == 'SSO')"/>
         <IMPORT NAME="commons-logging-1.2.jar" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(JDBC_URL == 'SSO')" />
-        <IMPORT NAME="jackson-databind-2.11.4.jar" MODULE="jackson-databind-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4" REQUIRED_IF="(JDBC_URL == 'SSO')" />
-        <IMPORT NAME="jackson-core-2.11.4.jar" MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" REQUIRED_IF="(JDBC_URL == 'SSO')" />
-        <IMPORT NAME="jackson-annotations-2.11.4.jar" MODULE="jackson-annotations-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4" REQUIRED_IF="(JDBC_URL == 'SSO')" />
+        <IMPORT NAME="jackson-databind-2.13.2.2.jar" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2" REQUIRED_IF="(JDBC_URL == 'SSO')" />
+        <IMPORT NAME="jackson-core-2.13.2.jar" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2" REQUIRED_IF="(JDBC_URL == 'SSO')" />
+        <IMPORT NAME="jackson-annotations-2.13.2.jar" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2" REQUIRED_IF="(JDBC_URL == 'SSO')" />
         <IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" REQUIRED_IF="(JDBC_URL == 'SSO')" />
         <IMPORT NAME="httpclient-4.5.13.jar" MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13" REQUIRED_IF="(JDBC_URL == 'SSO')" />
         <IMPORT NAME="joda-time-2.8.1.jar" MODULE="joda-time-2.8.1.jar" MVN="mvn:joda-time/joda-time/2.8.1" REQUIRED_IF="(JDBC_URL == 'SSO')" />

main/plugins/org.talend.designer.components.localprovider/components/tRedshiftConnection/tRedshiftConnection_messages_fr.properties

@@ -22,3 +22,12 @@ PROPERTIES.NAME=Param\u00E8tres suppl\u00E9mentaires JDBC
 JDBC_URL.NAME=URL de JDBC
 JDBC_URL.ITEM.STANDARD=Standard
 JDBC_URL.ITEM.SSO=SSO
+
+DRIVER_VERSION.NAME=Version du pilote
+DRIVER_VERSION.ITEM.DRIVER_V1=Pilote v1
+DRIVER_VERSION.ITEM.DRIVER_V2=Pilote v2
+
+USE_STRING_PROPERTIES.NAME=Utiliser des param\u00E8tres de cha\u00EEnes de caract\u00E8res JDBC
+ENTRY_PROPERTIES.NAME=Param\u00E8tres suppl\u00E9mentaires JDBC
+ENTRY_PROPERTIES.ITEM.KEY=Cl\u00E9
+ENTRY_PROPERTIES.ITEM.VALUE=Valeur

main/plugins/org.talend.designer.components.localprovider/components/tRedshiftConnection/tRedshiftConnection_messages_ja.properties

@@ -22,3 +22,12 @@ PROPERTIES.NAME=\u8FFD\u52A0\u306EJDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
 JDBC_URL.NAME=JDBC url
 JDBC_URL.ITEM.STANDARD=\u6A19\u6E96\u30B8\u30E7\u30D6
 JDBC_URL.ITEM.SSO=SSO
+
+DRIVER_VERSION.NAME=\u30C9\u30E9\u30A4\u30D0\u30FC\u306E\u30D0\u30FC\u30B8\u30E7\u30F3
+DRIVER_VERSION.ITEM.DRIVER_V1=\u30C9\u30E9\u30A4\u30D0\u30FCv1
+DRIVER_VERSION.ITEM.DRIVER_V2=\u30C9\u30E9\u30A4\u30D0\u30FCv2
+
+USE_STRING_PROPERTIES.NAME=\u6587\u5B57\u5217JDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u4F7F\u7528
+ENTRY_PROPERTIES.NAME=\u8FFD\u52A0\u306EJDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
+ENTRY_PROPERTIES.ITEM.KEY=\u30AD\u30FC
+ENTRY_PROPERTIES.ITEM.VALUE=\u5024

main/plugins/org.talend.designer.components.localprovider/components/tRedshiftConnection/tRedshiftConnection_messages_zh_CN.properties

@@ -22,3 +22,12 @@ PROPERTIES.NAME=\u9644\u52A0 JDBC \u53C2\u6570
 JDBC_URL.NAME=JDBC url
 JDBC_URL.ITEM.STANDARD=\u6807\u51C6
 JDBC_URL.ITEM.SSO=SSO
+
+DRIVER_VERSION.NAME=\u9A71\u52A8\u7248\u672C
+DRIVER_VERSION.ITEM.DRIVER_V1=\u9A71\u52A8 v1
+DRIVER_VERSION.ITEM.DRIVER_V2=\u9A71\u52A8 v2
+
+USE_STRING_PROPERTIES.NAME=\u4F7F\u7528\u5B57\u4E32 JDBC \u53C2\u6570
+ENTRY_PROPERTIES.NAME=\u9644\u52A0 JDBC \u53C2\u6570
+ENTRY_PROPERTIES.ITEM.KEY=\u952E
+ENTRY_PROPERTIES.ITEM.VALUE=\u503C

main/plugins/org.talend.designer.components.localprovider/components/tRedshiftInput/tRedshiftInput_java.xml

@@ -321,9 +321,9 @@
         <IMPORT NAME="aws-java-sdk-1.11.848.jar" MODULE="aws-java-sdk-1.11.848.jar" MVN="mvn:com.amazonaws/aws-java-sdk/1.11.848" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="aws-java-sdk-redshift-internal-1.12.x.jar" MODULE="aws-java-sdk-redshift-internal-1.12.x.jar" MVN="mvn:com.amazonaws/aws-java-sdk-redshift-internal/1.12.x" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="commons-logging-1.2.jar" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="jackson-databind-2.11.4.jar" MODULE="jackson-databind-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="jackson-core-2.11.4.jar" MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="jackson-annotations-2.11.4.jar" MODULE="jackson-annotations-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="jackson-databind-2.13.2.2.jar" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="jackson-core-2.13.2.jar" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="jackson-annotations-2.13.2.jar" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="httpclient-4.5.13.jar" MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="joda-time-2.8.1.jar" MODULE="joda-time-2.8.1.jar" MVN="mvn:joda-time/joda-time/2.8.1" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />

main/plugins/org.talend.designer.components.localprovider/components/tRedshiftInput/tRedshiftInput_messages_fr.properties

@@ -46,3 +46,12 @@ PROPERTIES.NAME=Param\u00E8tres suppl\u00E9mentaires JDBC
 JDBC_URL.NAME=URL de JDBC
 JDBC_URL.ITEM.STANDARD=Standard
 JDBC_URL.ITEM.SSO=SSO
+
+DRIVER_VERSION.NAME=Version du pilote
+DRIVER_VERSION.ITEM.DRIVER_V1=Pilote v1
+DRIVER_VERSION.ITEM.DRIVER_V2=Pilote v2
+
+USE_STRING_PROPERTIES.NAME=Utiliser des param\u00E8tres de cha\u00EEnes de caract\u00E8res JDBC
+ENTRY_PROPERTIES.NAME=Param\u00E8tres suppl\u00E9mentaires JDBC
+ENTRY_PROPERTIES.ITEM.KEY=Cl\u00E9
+ENTRY_PROPERTIES.ITEM.VALUE=Valeur

main/plugins/org.talend.designer.components.localprovider/components/tRedshiftInput/tRedshiftInput_messages_ja.properties

@@ -46,3 +46,12 @@ PROPERTIES.NAME=\u8FFD\u52A0\u306EJDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
 JDBC_URL.NAME=JDBC url
 JDBC_URL.ITEM.STANDARD=\u6A19\u6E96\u30B8\u30E7\u30D6
 JDBC_URL.ITEM.SSO=SSO
+
+DRIVER_VERSION.NAME=\u30C9\u30E9\u30A4\u30D0\u30FC\u306E\u30D0\u30FC\u30B8\u30E7\u30F3
+DRIVER_VERSION.ITEM.DRIVER_V1=\u30C9\u30E9\u30A4\u30D0\u30FCv1
+DRIVER_VERSION.ITEM.DRIVER_V2=\u30C9\u30E9\u30A4\u30D0\u30FCv2
+
+USE_STRING_PROPERTIES.NAME=\u6587\u5B57\u5217JDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u4F7F\u7528
+ENTRY_PROPERTIES.NAME=\u8FFD\u52A0\u306EJDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
+ENTRY_PROPERTIES.ITEM.KEY=\u30AD\u30FC
+ENTRY_PROPERTIES.ITEM.VALUE=\u5024

main/plugins/org.talend.designer.components.localprovider/components/tRedshiftInput/tRedshiftInput_messages_zh_CN.properties

@@ -46,3 +46,12 @@ PROPERTIES.NAME=\u9644\u52A0 JDBC \u53C2\u6570
 JDBC_URL.NAME=JDBC url
 JDBC_URL.ITEM.STANDARD=\u6807\u51C6
 JDBC_URL.ITEM.SSO=SSO
+
+DRIVER_VERSION.NAME=\u9A71\u52A8\u7248\u672C
+DRIVER_VERSION.ITEM.DRIVER_V1=\u9A71\u52A8 v1
+DRIVER_VERSION.ITEM.DRIVER_V2=\u9A71\u52A8 v2
+
+USE_STRING_PROPERTIES.NAME=\u4F7F\u7528\u5B57\u4E32 JDBC \u53C2\u6570
+ENTRY_PROPERTIES.NAME=\u9644\u52A0 JDBC \u53C2\u6570
+ENTRY_PROPERTIES.ITEM.KEY=\u952E
+ENTRY_PROPERTIES.ITEM.VALUE=\u503C

main/plugins/org.talend.designer.components.localprovider/components/tRedshiftOutput/tRedshiftOutput_java.xml

@@ -429,9 +429,9 @@
         <IMPORT NAME="aws-java-sdk-1.11.848.jar" MODULE="aws-java-sdk-1.11.848.jar" MVN="mvn:com.amazonaws/aws-java-sdk/1.11.848" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="aws-java-sdk-redshift-internal-1.12.x.jar" MODULE="aws-java-sdk-redshift-internal-1.12.x.jar" MVN="mvn:com.amazonaws/aws-java-sdk-redshift-internal/1.12.x" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="commons-logging-1.2.jar" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="jackson-databind-2.11.4.jar" MODULE="jackson-databind-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.11.4" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="jackson-core-2.11.4.jar" MODULE="jackson-core-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.11.4" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="jackson-annotations-2.11.4.jar" MODULE="jackson-annotations-2.11.4.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.4" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="jackson-databind-2.13.2.2.jar" MODULE="jackson-databind-2.13.2.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2.2" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="jackson-core-2.13.2.jar" MODULE="jackson-core-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.13.2" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="jackson-annotations-2.13.2.jar" MODULE="jackson-annotations-2.13.2.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="httpclient-4.5.13.jar" MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="joda-time-2.8.1.jar" MODULE="joda-time-2.8.1.jar" MVN="mvn:joda-time/joda-time/2.8.1" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />