chore: support export item

* fix(TDI-48213):fix the closing resources issues. (#7826)

* fix(TDI-48213):fix the closing resources issues.

* fix(TDI-48213):change the log level.

* fix(TDI-48213):fix the risk of not closing resources.

* fix(TDI-48213):remove useless try/catch.

* feat(TDI-42323):add entry to custom ratio.

* Revert "feat(TDI-42323):add entry to custom ratio."

This reverts commit 18e23af73c.

* fix(TDI-48213):add finish flag to end and finally.

* fix(TDI-48213):remove useless codes.

Co-authored-by: vyu <vyu@192.168.1.15>

main/features/org.talend.rcp.branding.tos.test.feature/feature.xml

@@ -43,6 +43,7 @@
   <plugin id="org.talend.migrationTool.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.model.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.repository.generic.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
+  <plugin id="org.talend.repository.json.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.repository.items.importexport.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.repository.items.importexport.ui.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.repository.localprovider.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>

main/plugins/org.talend.designer.codegen/jet_stub/footer.javajet

@@ -58,6 +58,7 @@
     boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J_ACTIVATE__"));//log4j enable
     boolean isLog4j2Enabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J2_ACTIVATE__"));//log4j2 enable
     boolean isLog4j1Enabled = !isLog4j2Enabled;//log4j1 enable
+    String MDC_CLASS = "org.slf4j.MDC";
 
     boolean exist_tParallelize = false;
     List<? extends INode> tParallelizeList = process.getNodesOfType("tParallelize");
@@ -322,6 +323,8 @@
     }
     <%}%>
     
+    private final static java.util.Properties jobInfo = new java.util.Properties();
+
     public static void main(String[] args){
         final <%=className %> <%=className %>Class = new <%=className %>();
 
@@ -335,6 +338,42 @@
         System.exit(exitCode);
     }
 	
+
+	
+	
+	private void getjobInfo() {
+		final String TEMPLATE_PATH = "src/main/templates/jobInfo_template.properties";
+		final String BUILD_PATH = "../jobInfo.properties";
+		final String path = this.getClass().getResource("").getPath();
+		if(path.lastIndexOf("target") > 0) {
+			final java.io.File templateFile = new java.io.File(
+					path.substring(0, path.lastIndexOf("target")).concat(TEMPLATE_PATH));
+			if (templateFile.exists()) {
+				readJobInfo(templateFile);
+				return;
+			}
+		}
+			readJobInfo(new java.io.File(BUILD_PATH));
+	}
+
+    private void readJobInfo(java.io.File jobInfoFile){
+	
+        if(jobInfoFile.exists()) {
+            try {
+            	jobInfo.load(new java.io.FileInputStream(jobInfoFile));
+            } catch (IOException e) {
+            	 <%if(isLog4jEnabled){%>
+                log.debug("Read jobInfo.properties file fail: " + e.getMessage());
+                <%}%>
+                
+            }
+        }
+            <%if(isLog4jEnabled){%>
+		log.info(String.format("Project name: %s\tJob name: %s\tGIT Commit ID: %s\tTalend Version: %s",
+				projectName,jobName,jobInfo.getProperty("gitCommitId"), "<%=System.getProperties().getProperty("talend.studio.version")%>"));
+		<%}%>
+    }
+
    <%
     if (isTestContainer) {
          List<String> instanceList =  ProcessUtils.getTestInstances(process);
@@ -515,9 +554,35 @@
 				org.apache.logging.log4j.core.config.Configurator.setLevel(org.apache.logging.log4j.LogManager.getRootLogger().getName(), log.getLevel());
 				<%}%>
 			}
+
+	        getjobInfo();
 			log.info("TalendJob: '<%=codeGenArgument.getJobName()%>' - Start.");
 		<%}%>
 
+            <%if(isLog4j2Enabled) {%>
+                java.util.Set<Object> jobInfoKeys = jobInfo.keySet();
+                for(Object jobInfoKey: jobInfoKeys) {
+                    <%=MDC_CLASS%>.put("_" + jobInfoKey.toString(), jobInfo.get(jobInfoKey).toString());
+                }
+                <%=MDC_CLASS%>.put("_pid", pid);
+                <%=MDC_CLASS%>.put("_rootPid", rootPid);
+                <%=MDC_CLASS%>.put("_fatherPid", fatherPid);
+                <%=MDC_CLASS%>.put("_projectName", projectName);
+                <%=MDC_CLASS%>.put("_startTimestamp",java.time.ZonedDateTime.now(java.time.ZoneOffset.UTC ).format( java.time.format.DateTimeFormatter.ISO_INSTANT ));
+                <%=MDC_CLASS%>.put("_jobRepositoryId","<%=process.getId() %>");
+                <%=MDC_CLASS%>.put("_compiledAtTimestamp","<%=java.time.ZonedDateTime.now(java.time.ZoneOffset.UTC ).format( java.time.format.DateTimeFormatter.ISO_INSTANT )%>");
+
+                java.lang.management.RuntimeMXBean mx = java.lang.management.ManagementFactory.getRuntimeMXBean();
+                String[] mxNameTable = mx.getName().split("@"); //$NON-NLS-1$
+                if (mxNameTable.length == 2) {
+                    <%=MDC_CLASS%>.put("_systemPid", mxNameTable[0]);
+                } else {
+                    <%=MDC_CLASS%>.put("_systemPid", String.valueOf(java.lang.Thread.currentThread().getId()));
+                }
+
+                <%
+            }%>
+		
 		<%
 		INode jobCatcherNode = null;
 		
@@ -642,14 +707,26 @@
             pid = TalendString.getAsciiRandomString(6);
         }
 
+        <%if(isLog4j2Enabled) {%>
+            <%=MDC_CLASS%>.put("_pid", pid);
+        <%}%>
+
         if (rootPid==null) {
             rootPid = pid;
         }
+
+        <%if(isLog4j2Enabled) {%>
+            <%=MDC_CLASS%>.put("_rootPid", rootPid);
+        <%}%>
+
         if (fatherPid==null) {
             fatherPid = pid;
         }else{
             isChildJob = true;
         }
+        <%if(isLog4j2Enabled) {%>
+            <%=MDC_CLASS%>.put("_fatherPid", fatherPid);
+        <%}%>
 
 <%
         if (stats) {
@@ -883,7 +960,12 @@
         }
 %>
         //Resume: jobStart
-        resumeUtil.addLog("JOB_STARTED", "JOB:" + jobName, parent_part_launcher, Thread.currentThread().getId() + "", "","","","",resumeUtil.convertToJsonText(context,parametersToEncrypt));
+        resumeUtil.addLog("JOB_STARTED", "JOB:" + jobName, parent_part_launcher, Thread.currentThread().getId() + "", "","","","",resumeUtil.convertToJsonText(context,ContextProperties.class,parametersToEncrypt));
+
+        <%if(isLog4j2Enabled) {%>
+            <%=MDC_CLASS%>.put("_context", contextStr);
+            log.info("TalendJob: '<%=codeGenArgument.getJobName()%>' - Started.");
+        <%}%>
 
 <%
         if (stats) {
@@ -1298,6 +1380,15 @@ if (execStat) {
          returnCode = errorCode.intValue();
     }
     resumeUtil.addLog("JOB_ENDED", "JOB:" + jobName, parent_part_launcher, Thread.currentThread().getId() + "", "","" + returnCode,"","","");
+    resumeUtil.flush();
+
+    <%if(isLog4j2Enabled) {%>
+
+        <%=MDC_CLASS%>.remove("_subJobName");
+        <%=MDC_CLASS%>.remove("_subJobPid");
+        <%=MDC_CLASS%>.remove("_systemPid");
+        log.info("TalendJob: '<%=codeGenArgument.getJobName()%>' - Finished - status: " + status + " returnCode: " + returnCode );
+    <%}%>
 
     return returnCode;
 

main/plugins/org.talend.designer.codegen/jet_stub/subprocess_header.javajet

@@ -32,6 +32,8 @@
 	boolean stat = codeGenArgument.isStatistics();
 	boolean containsTPartitioner = subTree.getRootNode().getProcess().getNodesOfType("tPartitioner").size() > 0 ? true : false;
     boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(subTree.getRootNode().getProcess(), "__LOG4J_ACTIVATE__"));
+    boolean isLog4j2Enabled = ("true").equals(ElementParameterParser.getValue(subTree.getRootNode().getProcess(), "__LOG4J2_ACTIVATE__"));//log4j2 enable
+    String MDC_CLASS = "org.slf4j.MDC";
 %>
 
 <%
@@ -1603,6 +1605,11 @@ public void <%=subTree.getName() %>Process(final java.util.Map<String, Object> g
 	globalMap.put("<%=subTree.getName() %>_SUBPROCESS_STATE", 0);
 
  final boolean execStat = this.execStat;
+	<%if(isLog4j2Enabled) {%>
+		<%=MDC_CLASS%>.put("_subJobName", "<%=subTree.getName() %>");
+		<%=MDC_CLASS%>.put("_subJobPid", TalendString.getAsciiRandomString(6));
+	<%}%>
+
 <%
 	boolean isParallelize = false;
 	for (INode node : subTree.getNodes()) {

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

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.talend</groupId>
 	<artifactId>talendMQRFH2</artifactId>
-	<version>1.1.0-20220307</version>
+	<version>1.2.0-20220707</version>
 	<packaging>jar</packaging>
 
 	<licenses>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>com.ibm.mq</groupId>
 			<artifactId>com.ibm.mq.allclient</artifactId>
-			<version>9.2.4.0</version>
+			<version>9.2.5.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.libraries</groupId>

main/plugins/org.talend.designer.components.libs/libs_src/msmq/build.xml

@@ -6,7 +6,7 @@
 	<!-- #################################################### -->
 
 	<!-- modification 1: config -->
-	<property name="jar.name" value="MsmqTalend-1.0.0.jar" />
+	<property name="jar.name" value="MsmqTalend-1.0.5.jar" />
 	<property name="component.name" value="tMicrosoftMQInput" />
 	<property name="author.name" value="ytao" />
 

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

@@ -54,11 +54,6 @@
 			<artifactId>poi</artifactId>
 			<version>4.1.2</version>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.poi</groupId>
-			<artifactId>poi-scratchpad</artifactId>
-			<version>4.1.2</version>
-		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml -->
 		<dependency>
 			<groupId>org.apache.poi</groupId>

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

@@ -4,7 +4,7 @@
 
 	<groupId>org.talend.components.lib</groupId>
 	<artifactId>talend-aws</artifactId>
-	<version>1.0</version>
+	<version>1.1</version>
 	<packaging>jar</packaging>
 
 	<name>talend-aws</name>
@@ -50,7 +50,7 @@
 		<dependency>
 			<groupId>com.amazonaws</groupId>
 			<artifactId>aws-java-sdk</artifactId>
-			<version>1.11.848</version>
+			<version>1.12.297</version>
 		</dependency>
 	</dependencies>
 	<build>

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

@@ -65,11 +65,6 @@
 			<artifactId>poi</artifactId>
 			<version>4.1.2</version>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.poi</groupId>
-			<artifactId>poi-scratchpad</artifactId>
-			<version>4.1.2</version>
-		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml -->
 		<dependency>
 			<groupId>org.apache.poi</groupId>

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

@@ -5,7 +5,7 @@
 
 	<groupId>org.talend</groupId>
 	<artifactId>talendMQConnectionUtil</artifactId>
-	<version>1.1.0-20220307</version>
+	<version>1.2.0-20220707</version>
 	<packaging>jar</packaging>
 
 	<name>talendMQConnectionUtil</name>
@@ -64,7 +64,7 @@
 		<dependency>
 			<groupId>com.ibm.mq</groupId>
 			<artifactId>com.ibm.mq.allclient</artifactId>
-			<version>9.2.4.0</version>
+			<version>9.2.5.0</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.resource</groupId>
@@ -74,7 +74,7 @@
 		<dependency>
 			<groupId>org.talend</groupId>
 			<artifactId>talendMQRFH2</artifactId>
-			<version>1.1.0-20220307</version>
+			<version>1.2.0-20220707</version>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>

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

@@ -58,12 +58,31 @@
 		<dependency>
 			<groupId>org.apache.poi</groupId>
 			<artifactId>poi-scratchpad</artifactId>
-			<version>4.1.2</version>
+			<version>5.2.2</version>
 		</dependency>
 		<dependency>
-			<groupId>ch.qos.reload4j</groupId>
-			<artifactId>reload4j</artifactId>
-			<version>1.2.19</version>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.8.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-api</artifactId>
+			<version>2.17.1</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<version>2.17.1</version>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 	<build>

main/plugins/org.talend.designer.components.libs/libs_src/talendMsgMailUtil/src/test/java/org/talend/msg/utils/MsgMailUtilTest.java

@@ -0,0 +1,29 @@
+package org.talend.msg.utils;
+
+import org.apache.poi.hsmf.exceptions.ChunkNotFoundException;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import java.io.File;
+import java.io.IOException;
+
+public class MsgMailUtilTest {
+
+	@Rule
+	public TemporaryFolder folder = new TemporaryFolder();
+
+	@Test
+	public void test() throws IOException, ChunkNotFoundException {
+		File outDir = folder.newFolder("out");
+
+		MsgMailUtil msgMailUtil_tFileInputMail_1 = new MsgMailUtil(this.getClass().getClassLoader().getResource("test.msg").getPath(),
+				outDir.getAbsolutePath());
+
+		msgMailUtil_tFileInputMail_1.getAttachments();
+
+		Assert.assertEquals("Chaudhari,Pankaj", msgMailUtil_tFileInputMail_1.processMessage("From"));
+	}
+
+}

main/plugins/org.talend.designer.components.localprovider/components/tAccessConnection/tAccessConnection_java.xml

@@ -118,7 +118,7 @@
 		<IMPORT NAME="Driver-JACKCESS" MODULE="jackcess-2.1.12.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess/2.1.12" REQUIRED="true"/>
 		
 		<IMPORT NAME="jackcess-encrypt-2.1.4" MODULE="jackcess-encrypt-2.1.4.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess-encrypt/2.1.4" REQUIRED="true"/>
-		<IMPORT NAME="bcprov-jdk15on-1.69" MODULE="bcprov-jdk15on-1.69.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.69" REQUIRED="true"/>
+		<IMPORT NAME="bcprov-jdk15on-1.70" MODULE="bcprov-jdk15on-1.70.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.70" REQUIRED="true"/>
 		<IMPORT NAME="talend-ucanaccess-utils-1.0.0" MODULE="talend-ucanaccess-utils-1.0.0.jar" MVN="mvn:org.talend.libraries/talend-ucanaccess-utils-1.0.0/6.4.0" REQUIRED="true"/>
 		
 		<IMPORT NAME="common2.6" 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="true"/>

main/plugins/org.talend.designer.components.localprovider/components/tAccessInput/tAccessInput_java.xml

@@ -121,7 +121,7 @@
 		<IMPORT NAME="Driver-JACKCESS" MODULE="jackcess-2.1.12.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess/2.1.12" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
 		
 		<IMPORT NAME="jackcess-encrypt-2.1.4" MODULE="jackcess-encrypt-2.1.4.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess-encrypt/2.1.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
-		<IMPORT NAME="bcprov-jdk15on-1.69" MODULE="bcprov-jdk15on-1.69.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.69" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
+		<IMPORT NAME="bcprov-jdk15on-1.70" MODULE="bcprov-jdk15on-1.70.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.70" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
 		<IMPORT NAME="talend-ucanaccess-utils-1.0.0" MODULE="talend-ucanaccess-utils-1.0.0.jar" MVN="mvn:org.talend.libraries/talend-ucanaccess-utils-1.0.0/6.4.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
 		
 		<IMPORT NAME="common2.6" 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="(USE_EXISTING_CONNECTION == 'false')"/>

main/plugins/org.talend.designer.components.localprovider/components/tAccessOutput/tAccessOutput_java.xml

@@ -207,7 +207,7 @@
 		<IMPORT NAME="Driver-JACKCESS" MODULE="jackcess-2.1.12.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess/2.1.12" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
 		
 		<IMPORT NAME="jackcess-encrypt-2.1.4" MODULE="jackcess-encrypt-2.1.4.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess-encrypt/2.1.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
-		<IMPORT NAME="bcprov-jdk15on-1.69" MODULE="bcprov-jdk15on-1.69.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.69" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
+		<IMPORT NAME="bcprov-jdk15on-1.70" MODULE="bcprov-jdk15on-1.70.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.70" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
 		<IMPORT NAME="talend-ucanaccess-utils-1.0.0" MODULE="talend-ucanaccess-utils-1.0.0.jar" MVN="mvn:org.talend.libraries/talend-ucanaccess-utils-1.0.0/6.4.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
 		
 		<IMPORT NAME="common2.6" 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="(USE_EXISTING_CONNECTION == 'false')"/>

main/plugins/org.talend.designer.components.localprovider/components/tAccessRow/tAccessRow_java.xml

@@ -181,7 +181,7 @@
 		<IMPORT NAME="Driver-JACKCESS" MODULE="jackcess-2.1.12.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess/2.1.12" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
 		
 		<IMPORT NAME="jackcess-encrypt-2.1.4" MODULE="jackcess-encrypt-2.1.4.jar" MVN="mvn:com.healthmarketscience.jackcess/jackcess-encrypt/2.1.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
-		<IMPORT NAME="bcprov-jdk15on-1.69" MODULE="bcprov-jdk15on-1.69.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.69" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
+		<IMPORT NAME="bcprov-jdk15on-1.70" MODULE="bcprov-jdk15on-1.70.jar" MVN="mvn:org.bouncycastle/bcprov-jdk15on/1.70" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
 		<IMPORT NAME="talend-ucanaccess-utils-1.0.0" MODULE="talend-ucanaccess-utils-1.0.0.jar" MVN="mvn:org.talend.libraries/talend-ucanaccess-utils-1.0.0/6.4.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')"/>
 		
 		<IMPORT NAME="common2.6" 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="(USE_EXISTING_CONNECTION == 'false')"/>

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

@@ -228,8 +228,8 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<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"
+			<IMPORT NAME="aws-java-sdk-1.12.297.jar" MODULE="aws-java-sdk-1.12.297.jar"
+				MVN="mvn:com.amazonaws/aws-java-sdk/1.12.297"
 				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"

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

@@ -555,8 +555,8 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<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"
+			<IMPORT NAME="aws-java-sdk-1.12.297.jar" MODULE="aws-java-sdk-1.12.297.jar"
+				MVN="mvn:com.amazonaws/aws-java-sdk/1.12.297"
 				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"

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

@@ -285,8 +285,8 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<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"
+			<IMPORT NAME="aws-java-sdk-1.12.297.jar" MODULE="aws-java-sdk-1.12.297.jar"
+				MVN="mvn:com.amazonaws/aws-java-sdk/1.12.297"
 				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"

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

@@ -345,8 +345,8 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<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"
+			<IMPORT NAME="aws-java-sdk-1.12.297.jar" MODULE="aws-java-sdk-1.12.297.jar"
+				MVN="mvn:com.amazonaws/aws-java-sdk/1.12.297"
 				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"

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

@@ -262,7 +262,7 @@
          <IMPORT NAME="google-api-services-oauth2-v2-rev20200213-1.31.0.jar" MODULE="google-api-services-oauth2-v2-rev20200213-1.31.0.jar" MVN="mvn:com.google.apis/google-api-services-oauth2/v2-rev20200213-1.31.0"  REQUIRED="true" />
          <IMPORT NAME="google-api-services-bigquery-v2-rev20201030-1.31.0.jar" MODULE="google-api-services-bigquery-v2-rev20201030-1.31.0.jar" MVN="mvn:com.google.apis/google-api-services-bigquery/v2-rev20201030-1.31.0" REQUIRED="true" />
          <IMPORT NAME="google-http-client-1.38.0.jar" MODULE="google-http-client-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.38.0"  REQUIRED="true" />
-         <IMPORT NAME="google-oauth-client-1.31.0.jar" MODULE="google-oauth-client-1.31.0.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.31.0" REQUIRED="true" />
+         <IMPORT NAME="google-oauth-client-1.33.3.jar" MODULE="google-oauth-client-1.33.3.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.33.3" REQUIRED="true" />
          <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" />

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryBulkExec/tBigQueryBulkExec_messages_zh_CN.properties

@@ -35,7 +35,7 @@ USE_CUSTOM_NULL_MARKER.NAME=\u4F7F\u7528\u81EA\u5B9A\u4E49 null \u6807\u8BB0
 CUSTOM_NULL_MARKER.NAME=
 DROP.NAME=\u5982\u679C\u8868\u5B58\u5728\u5219\u5220\u9664
 DIE_ON_ERROR.NAME=\u9519\u8BEF\u65F6\u7EC8\u6B62
-AUTH_TYPE.NAME=\u7528\u6237\u540D\u548C\u5BC6\u7801\u7C7B\u578B
+AUTH_TYPE.NAME=\u51ED\u8BC1\u7C7B\u578B
 AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=\u670D\u52A1\u5E10\u6237
 GS_SERVICE_ACCOUNT_KEY.NAME=\u670D\u52A1\u5E10\u6237\u5BC6\u94A5
 GS_ACCESS_TOKEN.NAME=OAuth \u8BBF\u95EE\u4EE4\u724C

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

@@ -205,7 +205,7 @@
 		 <IMPORT NAME="google-api-services-oauth2-v2-rev20200213-1.31.0.jar" MODULE="google-api-services-oauth2-v2-rev20200213-1.31.0.jar" MVN="mvn:com.google.apis/google-api-services-oauth2/v2-rev20200213-1.31.0"  REQUIRED="true" />
 		 <IMPORT NAME="google-api-services-bigquery-v2-rev20201030-1.31.0.jar" MODULE="google-api-services-bigquery-v2-rev20201030-1.31.0.jar" MVN="mvn:com.google.apis/google-api-services-bigquery/v2-rev20201030-1.31.0" REQUIRED="true" />
 		 <IMPORT NAME="google-http-client-1.38.0.jar" MODULE="google-http-client-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.38.0"  REQUIRED="true" />
-		 <IMPORT NAME="google-oauth-client-1.31.0.jar" MODULE="google-oauth-client-1.31.0.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.31.0" REQUIRED="true" />
+		 <IMPORT NAME="google-oauth-client-1.33.3.jar" MODULE="google-oauth-client-1.33.3.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.33.3" REQUIRED="true" />
 		 <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" />

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryOutput/tBigQueryOutput_messages_zh_CN.properties

@@ -47,7 +47,7 @@ FIELD_DELIMITER.NAME=
 TOKEN_NAME.NAME=\u4EE4\u724C\u5C5E\u6027\u6587\u4EF6\u540D
 CHECK_DISK_SPACE.NAME=\u68C0\u67E5\u78C1\u76D8\u7A7A\u95F4
 DIE_ON_ERROR.NAME=\u9519\u8BEF\u65F6\u7EC8\u6B62
-AUTH_TYPE.NAME=\u7528\u6237\u540D\u548C\u5BC6\u7801\u7C7B\u578B
+AUTH_TYPE.NAME=\u51ED\u8BC1\u7C7B\u578B
 AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=\u670D\u52A1\u5E10\u6237
 AUTH_TYPE.ITEM.TOKEN=OAuth \u8BBF\u95EE\u4EE4\u724C
 GS_SERVICE_ACCOUNT_KEY.NAME=\u670D\u52A1\u5E10\u6237\u5BC6\u94A5

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

@@ -191,7 +191,7 @@
             <IMPORT NAME="google-api-services-oauth2-v2-rev20200213-1.31.0.jar" MODULE="google-api-services-oauth2-v2-rev20200213-1.31.0.jar" MVN="mvn:com.google.apis/google-api-services-oauth2/v2-rev20200213-1.31.0"  REQUIRED="true" />
             <IMPORT NAME="google-api-services-bigquery-v2-rev20201030-1.31.0.jar" MODULE="google-api-services-bigquery-v2-rev20201030-1.31.0.jar" MVN="mvn:com.google.apis/google-api-services-bigquery/v2-rev20201030-1.31.0" REQUIRED="true" />
             <IMPORT NAME="google-http-client-1.38.0.jar" MODULE="google-http-client-1.38.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.38.0"  REQUIRED="true" />
-            <IMPORT NAME="google-oauth-client-1.31.0.jar" MODULE="google-oauth-client-1.31.0.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.31.0" REQUIRED="true" />
+            <IMPORT NAME="google-oauth-client-1.33.3.jar" MODULE="google-oauth-client-1.33.3.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.33.3" REQUIRED="true" />
             <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" />

main/plugins/org.talend.designer.components.localprovider/components/tBonitaInstantiateProcess/tBonitaInstantiateProcess_messages_ja.properties

@@ -26,7 +26,7 @@ BONITA_ENVIRONMENT_FILE.NAME =Bonita\u30E9\u30F3\u30BF\u30A4\u30E0\u74B0\u5883\u
 JASS_STANDARD_FILE.NAME=Bonita\u30E9\u30F3\u30BF\u30A4\u30E0JAAS\u30D5\u30A1\u30A4\u30EB
 LOGGING_FILE.NAME =Bonita\u30E9\u30F3\u30BF\u30A4\u30E0\u30ED\u30B0\u30D5\u30A1\u30A4\u30EB
 
-USE_PROCESS_ID.NAME=\u30D7\u30ED\u30BB\u30B9ID\u306E\u4F7F\u7528
+USE_PROCESS_ID.NAME=\u30D7\u30ED\u30BB\u30B9ID\u3092\u4F7F\u7528
 PROCESS_NAME.NAME=\u30D7\u30ED\u30BB\u30B9\u540D
 PROCESS_VERSION.NAME=\u30D7\u30ED\u30BB\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
 LOGIN_MODULE.NAME=\u30ED\u30B0\u30A4\u30F3\u30E2\u30B8\u30E5\u30FC\u30EB

main/plugins/org.talend.designer.components.localprovider/components/tContextLoad/tContextLoad_end.javajet

@@ -99,7 +99,7 @@
     }
 	%>
 	
-	resumeUtil.addLog("NODE", "NODE:<%=cid %>", "", Thread.currentThread().getId() + "", "","","","",resumeUtil.convertToJsonText(context,parametersToEncrypt_<%=cid%>));    
+	resumeUtil.addLog("NODE", "NODE:<%=cid %>", "", Thread.currentThread().getId() + "", "","","","",resumeUtil.convertToJsonText(context,ContextProperties.class,parametersToEncrypt_<%=cid%>));    
     <%if(isLog4jEnabled){%>
     	log.info("<%=cid%> - Loaded contexts count: " + nb_line_<%=cid %> + ".");
     <%}%>

main/plugins/org.talend.designer.components.localprovider/components/tContextLoad/tContextLoad_main.javajet

@@ -95,7 +95,8 @@ if ((metadatas!=null)&&(metadatas.size()>0)) {
 				for (IContextParameter ctxParam: params) {
 					if ("id_Password".equals(ctxParam.getType()) ) {
 %>						
-						if ((key_<%=cid %> != null) && ("<%=ctxParam.getName()%>".equals(key_<%=cid %>)) ) currentValue_<%=cid %> = currentValue_<%=cid %>.replaceAll(".", "*");
+						if ((key_<%=cid %> != null) && ("<%=ctxParam.getName()%>".equals(key_<%=cid %>)) && (currentValue_<%=cid %> != null)) 
+							currentValue_<%=cid %> = currentValue_<%=cid %>.replaceAll(".", "*");
 <%						
 					}	
 

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

@@ -870,7 +870,7 @@
         <IMPORT NAME="Driver-Oracle12c" MODULE="ojdbc7.jar" MVN="mvn:org.talend.libraries/ojdbc7/6.0.0"  REQUIRED_IF="(DBTYPE=='DBORACLE') AND (DB_VERSION == 'ORACLE_12') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="ORACLE_18"        MODULE="ojdbc8-19.3.0.0.jar" MVN="mvn:com.oracle.ojdbc/ojdbc8/19.3.0.0" REQUIRED_IF="(DBTYPE=='DBORACLE') AND (DB_VERSION == 'ORACLE_18') AND (USE_EXISTING_CONNECTION == 'false')" />
 		<IMPORT NAME="Driver-POSTGRESQL" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((((DBTYPE=='POSTGRE') or (DBTYPE=='POSTGREPLUS')) AND (DB_POSTGRE_VERSION =='PRIOR_TO_V9')) or (DBTYPE=='GREENPLUM'))" />
-		<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (((DBTYPE=='POSTGRE') or (DBTYPE=='POSTGREPLUS')) AND (DB_POSTGRE_VERSION =='V9_X'))" />
+		<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.26.jar" MVN="mvn:org.postgresql/postgresql/42.2.26" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (((DBTYPE=='POSTGRE') or (DBTYPE=='POSTGREPLUS')) AND (DB_POSTGRE_VERSION =='V9_X'))" />
 		<IMPORT NAME="Driver-FIREBIRD" MODULE="jaybird-full-2.1.1.jar" MVN="mvn:org.talend.libraries/jaybird-full-2.1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.jdbc.firebird/lib/jaybird-full-2.1.1.jar" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='FIREBIRD')" />
 		<IMPORT NAME="Driver-HSQLDb" MODULE="hsqldb.jar" MVN="mvn:org.talend.libraries/hsqldb/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.jdbc.hsql/lib/hsqldb.jar" REQUIRED_IF="DBTYPE=='HSQLDB'"/>
 		<IMPORT NAME="Driver-INFORMIX-JDBC" MODULE="ifxjdbc.jar" MVN="mvn:org.talend.libraries/ifxjdbc/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='INFORMIX')" />

main/plugins/org.talend.designer.components.localprovider/components/tDenormalizeOut/tDenormalizeOut_end.javajet

@@ -175,7 +175,7 @@ while(<%=inputColumn%>_iterator_<%=cid %>.hasNext()){
 		}
 		
 	}
-	
+	if (sb_<%=cid %> != null)
 		denormalize_row_<%=cid %>.<%=inputColumn %> = sb_<%=cid %>.toString();
 	
 	sb_<%=cid %> = null;

main/plugins/org.talend.designer.components.localprovider/components/tELTPostgresqlMap/tELTPostgresqlMap_java.xml

@@ -189,8 +189,8 @@
   
    <CODEGENERATION>
       <IMPORTS>
-        <IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="DB_VERSION =='V9_X'" />
-        <IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="DB_VERSION =='PRIOR_TO_V9'" />
+        <IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.26.jar" MVN="mvn:org.postgresql/postgresql/42.2.26" REQUIRED_IF="DB_VERSION =='V9_X' AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="DB_VERSION =='PRIOR_TO_V9' AND (USE_EXISTING_CONNECTION == 'false')" />
       </IMPORTS>
   </CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tFTPConnection/tFTPConnection_messages_fr.properties

@@ -36,3 +36,7 @@ SECURITY_MODE.ITEM.EXPLICIT=Explicite
 USE_ENCODING.NAME=Encodage du nom de fichier
 CONNECTION_TIMEOUT.NAME=D\u00E9lai avant l'expiration de la connexion (millisecondes)
 USE_STRICT_REPLY_PARSING.NAME=Utiliser le parsage de la r\u00E9ponse stricte
+CONFIG_CLIENT.NAME=Config client
+CLIENT_PARAMETERS.NAME=
+CLIENT_PARAMETERS.ITEM.PARAMETER=Param\u00E8tre client
+CLIENT_PARAMETERS.ITEM.VALUE=Valeur

main/plugins/org.talend.designer.components.localprovider/components/tFTPConnection/tFTPConnection_messages_ja.properties

@@ -36,3 +36,7 @@ SECURITY_MODE.ITEM.EXPLICIT=\u660E\u793A\u7684
 USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
 USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528
+CONFIG_CLIENT.NAME=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u8A2D\u5B9A
+CLIENT_PARAMETERS.NAME=
+CLIENT_PARAMETERS.ITEM.PARAMETER=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
+CLIENT_PARAMETERS.ITEM.VALUE=\u5024

main/plugins/org.talend.designer.components.localprovider/components/tFTPConnection/tFTPConnection_messages_zh_CN.properties

@@ -36,3 +36,7 @@ SECURITY_MODE.ITEM.EXPLICIT=\u663E\u5F0F
 USE_ENCODING.NAME=\u6587\u4EF6\u540D\u7F16\u7801
 CONNECTION_TIMEOUT.NAME=\u8FDE\u63A5\u8D85\u65F6 (\u6BEB\u79D2)
 USE_STRICT_REPLY_PARSING.NAME=\u4F7F\u7528\u4E25\u683C\u56DE\u590D\u89E3\u6790
+CONFIG_CLIENT.NAME=\u914D\u7F6E\u5BA2\u6237\u7AEF
+CLIENT_PARAMETERS.NAME=
+CLIENT_PARAMETERS.ITEM.PARAMETER=\u5BA2\u6237\u7AEF\u53C2\u6570
+CLIENT_PARAMETERS.ITEM.VALUE=\u503C

main/plugins/org.talend.designer.components.localprovider/components/tFTPDelete/tFTPDelete_messages_fr.properties

@@ -51,3 +51,7 @@ MOVE_TO_THE_CURRENT_DIRECTORY.NAME=D\u00E9placer vers le r\u00E9pertoire courant
 USE_ENCODING.NAME=Encodage du nom de fichier
 CONNECTION_TIMEOUT.NAME=D\u00E9lai avant l'expiration de la connexion (millisecondes)
 USE_STRICT_REPLY_PARSING.NAME=Utiliser le parsage de la r\u00E9ponse stricte
+CONFIG_CLIENT.NAME=Config client
+CLIENT_PARAMETERS.NAME=
+CLIENT_PARAMETERS.ITEM.PARAMETER=Param\u00E8tre client
+CLIENT_PARAMETERS.ITEM.VALUE=Valeur

main/plugins/org.talend.designer.components.localprovider/components/tFTPDelete/tFTPDelete_messages_ja.properties

@@ -51,3 +51,7 @@ MOVE_TO_THE_CURRENT_DIRECTORY.NAME=\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u3
 USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
 USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528
+CONFIG_CLIENT.NAME=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u8A2D\u5B9A
+CLIENT_PARAMETERS.NAME=
+CLIENT_PARAMETERS.ITEM.PARAMETER=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
+CLIENT_PARAMETERS.ITEM.VALUE=\u5024

main/plugins/org.talend.designer.components.localprovider/components/tFTPDelete/tFTPDelete_messages_zh_CN.properties

@@ -51,3 +51,7 @@ MOVE_TO_THE_CURRENT_DIRECTORY.NAME=\u79FB\u81F3\u5F53\u524D\u76EE\u5F55
 USE_ENCODING.NAME=\u6587\u4EF6\u540D\u7F16\u7801
 CONNECTION_TIMEOUT.NAME=\u8FDE\u63A5\u8D85\u65F6 (\u6BEB\u79D2)
 USE_STRICT_REPLY_PARSING.NAME=\u4F7F\u7528\u4E25\u683C\u56DE\u590D\u89E3\u6790
+CONFIG_CLIENT.NAME=\u914D\u7F6E\u5BA2\u6237\u7AEF
+CLIENT_PARAMETERS.NAME=
+CLIENT_PARAMETERS.ITEM.PARAMETER=\u5BA2\u6237\u7AEF\u53C2\u6570
+CLIENT_PARAMETERS.ITEM.VALUE=\u503C

main/plugins/org.talend.designer.components.localprovider/components/tFTPFileExist/tFTPFileExist_messages_fr.properties

@@ -47,3 +47,7 @@ IGNORE_FAILURE_AT_QUIT.NAME=Ignorer les erreurs \u00E0 la fermeture (FTP)
 USE_ENCODING.NAME=Encodage du nom de fichier
 CONNECTION_TIMEOUT.NAME=D\u00E9lai avant l'expiration de la connexion (millisecondes)
 USE_STRICT_REPLY_PARSING.NAME=Utiliser le parsage de la r\u00E9ponse stricte
+CONFIG_CLIENT.NAME=Config client
+CLIENT_PARAMETERS.NAME=
+CLIENT_PARAMETERS.ITEM.PARAMETER=Param\u00E8tre client
+CLIENT_PARAMETERS.ITEM.VALUE=Valeur

main/plugins/org.talend.designer.components.localprovider/components/tFTPFileExist/tFTPFileExist_messages_ja.properties

@@ -47,3 +47,7 @@ IGNORE_FAILURE_AT_QUIT.NAME=\u7D42\u4E86\u6642\u306B\u30A8\u30E9\u30FC\u3092\u71
 USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
 USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528
+CONFIG_CLIENT.NAME=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u8A2D\u5B9A
+CLIENT_PARAMETERS.NAME=
+CLIENT_PARAMETERS.ITEM.PARAMETER=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
+CLIENT_PARAMETERS.ITEM.VALUE=\u5024

main/plugins/org.talend.designer.components.localprovider/components/tFTPFileExist/tFTPFileExist_messages_zh_CN.properties

@@ -47,3 +47,7 @@ IGNORE_FAILURE_AT_QUIT.NAME=\u9000\u51FA\u65F6\u5FFD\u7565\u5931\u8D25 (FTP)
 USE_ENCODING.NAME=\u6587\u4EF6\u540D\u7F16\u7801
 CONNECTION_TIMEOUT.NAME=\u8FDE\u63A5\u8D85\u65F6 (\u6BEB\u79D2)
 USE_STRICT_REPLY_PARSING.NAME=\u4F7F\u7528\u4E25\u683C\u56DE\u590D\u89E3\u6790
+CONFIG_CLIENT.NAME=\u914D\u7F6E\u5BA2\u6237\u7AEF
+CLIENT_PARAMETERS.NAME=
+CLIENT_PARAMETERS.ITEM.PARAMETER=\u5BA2\u6237\u7AEF\u53C2\u6570
+CLIENT_PARAMETERS.ITEM.VALUE=\u503C

main/plugins/org.talend.designer.components.localprovider/components/tFTPFileList/tFTPFileList_messages_fr.properties

@@ -48,3 +48,7 @@ MOVE_TO_THE_CURRENT_DIRECTORY.NAME=D\u00E9placer vers le r\u00E9pertoire courant
 USE_ENCODING.NAME=Encodage du nom de fichier
 CONNECTION_TIMEOUT.NAME=D\u00E9lai avant l'expiration de la connexion (millisecondes)
 USE_STRICT_REPLY_PARSING.NAME=Utiliser le parsage de la r\u00E9ponse stricte
+CONFIG_CLIENT.NAME=Config client
+CLIENT_PARAMETERS.NAME=
+CLIENT_PARAMETERS.ITEM.PARAMETER=Param\u00E8tre client
+CLIENT_PARAMETERS.ITEM.VALUE=Valeur

main/plugins/org.talend.designer.components.localprovider/components/tFTPFileList/tFTPFileList_messages_ja.properties

@@ -48,3 +48,7 @@ MOVE_TO_THE_CURRENT_DIRECTORY.NAME=\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u3
 USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
 USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528
+CONFIG_CLIENT.NAME=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u8A2D\u5B9A
+CLIENT_PARAMETERS.NAME=
+CLIENT_PARAMETERS.ITEM.PARAMETER=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
+CLIENT_PARAMETERS.ITEM.VALUE=\u5024

main/plugins/org.talend.designer.components.localprovider/components/tFTPFileList/tFTPFileList_messages_zh_CN.properties

@@ -48,3 +48,7 @@ MOVE_TO_THE_CURRENT_DIRECTORY.NAME=\u79FB\u81F3\u5F53\u524D\u76EE\u5F55
 USE_ENCODING.NAME=\u6587\u4EF6\u540D\u7F16\u7801
 CONNECTION_TIMEOUT.NAME=\u8FDE\u63A5\u8D85\u65F6 (\u6BEB\u79D2)
 USE_STRICT_REPLY_PARSING.NAME=\u4F7F\u7528\u4E25\u683C\u56DE\u590D\u89E3\u6790
+CONFIG_CLIENT.NAME=\u914D\u7F6E\u5BA2\u6237\u7AEF
+CLIENT_PARAMETERS.NAME=
+CLIENT_PARAMETERS.ITEM.PARAMETER=\u5BA2\u6237\u7AEF\u53C2\u6570
+CLIENT_PARAMETERS.ITEM.VALUE=\u503C

main/plugins/org.talend.designer.components.localprovider/components/tFTPFileProperties/tFTPFileProperties_messages_fr.properties

@@ -45,3 +45,7 @@ MODE.NAME=Mode de transfert
 USE_ENCODING.NAME=Encodage du nom de fichier
 CONNECTION_TIMEOUT.NAME=D\u00E9lai avant l'expiration de la connexion (millisecondes)
 USE_STRICT_REPLY_PARSING.NAME=Utiliser le parsage de la r\u00E9ponse stricte
+CONFIG_CLIENT.NAME=Config client
+CLIENT_PARAMETERS.NAME=
+CLIENT_PARAMETERS.ITEM.PARAMETER=Param\u00E8tre client
+CLIENT_PARAMETERS.ITEM.VALUE=Valeur

main/plugins/org.talend.designer.components.localprovider/components/tFTPFileProperties/tFTPFileProperties_messages_ja.properties

@@ -45,3 +45,7 @@ MODE.NAME=\u8EE2\u9001\u30E2\u30FC\u30C9
 USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
 USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528
+CONFIG_CLIENT.NAME=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u8A2D\u5B9A
+CLIENT_PARAMETERS.NAME=
+CLIENT_PARAMETERS.ITEM.PARAMETER=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
+CLIENT_PARAMETERS.ITEM.VALUE=\u5024

main/plugins/org.talend.designer.components.localprovider/components/tFTPFileProperties/tFTPFileProperties_messages_zh_CN.properties

@@ -45,3 +45,7 @@ MODE.NAME=\u4F20\u8F93\u65B9\u5F0F
 USE_ENCODING.NAME=\u6587\u4EF6\u540D\u7F16\u7801
 CONNECTION_TIMEOUT.NAME=\u8FDE\u63A5\u8D85\u65F6 (\u6BEB\u79D2)
 USE_STRICT_REPLY_PARSING.NAME=\u4F7F\u7528\u4E25\u683C\u56DE\u590D\u89E3\u6790
+CONFIG_CLIENT.NAME=\u914D\u7F6E\u5BA2\u6237\u7AEF
+CLIENT_PARAMETERS.NAME=
+CLIENT_PARAMETERS.ITEM.PARAMETER=\u5BA2\u6237\u7AEF\u53C2\u6570
+CLIENT_PARAMETERS.ITEM.VALUE=\u503C

main/plugins/org.talend.designer.components.localprovider/components/tFTPGet/tFTPGet_messages_fr.properties

@@ -63,3 +63,7 @@ MOVE_TO_THE_CURRENT_DIRECTORY.NAME=D\u00E9placer vers le r\u00E9pertoire courant
 USE_ENCODING.NAME=Encodage du nom de fichier
 CONNECTION_TIMEOUT.NAME=D\u00E9lai avant l'expiration de la connexion (millisecondes)
 USE_STRICT_REPLY_PARSING.NAME=Utiliser le parsage de la r\u00E9ponse stricte
+CONFIG_CLIENT.NAME=Config client
+CLIENT_PARAMETERS.NAME=
+CLIENT_PARAMETERS.ITEM.PARAMETER=Param\u00E8tre client
+CLIENT_PARAMETERS.ITEM.VALUE=Valeur

main/plugins/org.talend.designer.components.localprovider/components/tFTPGet/tFTPGet_messages_ja.properties

@@ -63,3 +63,7 @@ MOVE_TO_THE_CURRENT_DIRECTORY.NAME=\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u3
 USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
 USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528
+CONFIG_CLIENT.NAME=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u8A2D\u5B9A
+CLIENT_PARAMETERS.NAME=
+CLIENT_PARAMETERS.ITEM.PARAMETER=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
+CLIENT_PARAMETERS.ITEM.VALUE=\u5024

main/plugins/org.talend.designer.components.localprovider/components/tFTPGet/tFTPGet_messages_zh_CN.properties

@@ -63,3 +63,7 @@ MOVE_TO_THE_CURRENT_DIRECTORY.NAME=\u79FB\u81F3\u5F53\u524D\u76EE\u5F55
 USE_ENCODING.NAME=\u6587\u4EF6\u540D\u7F16\u7801
 CONNECTION_TIMEOUT.NAME=\u8FDE\u63A5\u8D85\u65F6 (\u6BEB\u79D2)
 USE_STRICT_REPLY_PARSING.NAME=\u4F7F\u7528\u4E25\u683C\u56DE\u590D\u89E3\u6790
+CONFIG_CLIENT.NAME=\u914D\u7F6E\u5BA2\u6237\u7AEF
+CLIENT_PARAMETERS.NAME=
+CLIENT_PARAMETERS.ITEM.PARAMETER=\u5BA2\u6237\u7AEF\u53C2\u6570
+CLIENT_PARAMETERS.ITEM.VALUE=\u503C

main/plugins/org.talend.designer.components.localprovider/components/tFTPPut/tFTPPut_messages_fr.properties

@@ -67,3 +67,7 @@ FTPSOVERWRITE.NAME=\u00C9craser le fichier
 USE_ENCODING.NAME=Encodage du nom de fichier
 CONNECTION_TIMEOUT.NAME=D\u00E9lai avant l'expiration de la connexion (millisecondes)
 USE_STRICT_REPLY_PARSING.NAME=Utiliser le parsage de la r\u00E9ponse stricte
+CONFIG_CLIENT.NAME=Config client
+CLIENT_PARAMETERS.NAME=
+CLIENT_PARAMETERS.ITEM.PARAMETER=Param\u00E8tre client
+CLIENT_PARAMETERS.ITEM.VALUE=Valeur

main/plugins/org.talend.designer.components.localprovider/components/tFTPPut/tFTPPut_messages_ja.properties

@@ -67,3 +67,7 @@ FTPSOVERWRITE.NAME=\u30D5\u30A1\u30A4\u30EB\u306E\u4E0A\u66F8\u304D
 USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
 USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528
+CONFIG_CLIENT.NAME=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u8A2D\u5B9A
+CLIENT_PARAMETERS.NAME=
+CLIENT_PARAMETERS.ITEM.PARAMETER=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
+CLIENT_PARAMETERS.ITEM.VALUE=\u5024

main/plugins/org.talend.designer.components.localprovider/components/tFTPPut/tFTPPut_messages_zh_CN.properties

@@ -67,3 +67,7 @@ FTPSOVERWRITE.NAME=\u6539\u5199\u6587\u4EF6
 USE_ENCODING.NAME=\u6587\u4EF6\u540D\u7F16\u7801
 CONNECTION_TIMEOUT.NAME=\u8FDE\u63A5\u8D85\u65F6 (\u6BEB\u79D2)
 USE_STRICT_REPLY_PARSING.NAME=\u4F7F\u7528\u4E25\u683C\u56DE\u590D\u89E3\u6790
+CONFIG_CLIENT.NAME=\u914D\u7F6E\u5BA2\u6237\u7AEF
+CLIENT_PARAMETERS.NAME=
+CLIENT_PARAMETERS.ITEM.PARAMETER=\u5BA2\u6237\u7AEF\u53C2\u6570
+CLIENT_PARAMETERS.ITEM.VALUE=\u503C

main/plugins/org.talend.designer.components.localprovider/components/tFTPRename/tFTPRename_messages_fr.properties

@@ -52,3 +52,7 @@ MOVE_TO_THE_CURRENT_DIRECTORY.NAME=D\u00E9placer vers le r\u00E9pertoire courant
 USE_ENCODING.NAME=Encodage du nom de fichier
 CONNECTION_TIMEOUT.NAME=D\u00E9lai avant l'expiration de la connexion (millisecondes)
 USE_STRICT_REPLY_PARSING.NAME=Utiliser le parsage de la r\u00E9ponse stricte
+CONFIG_CLIENT.NAME=Config client
+CLIENT_PARAMETERS.NAME=
+CLIENT_PARAMETERS.ITEM.PARAMETER=Param\u00E8tre client
+CLIENT_PARAMETERS.ITEM.VALUE=Valeur

main/plugins/org.talend.designer.components.localprovider/components/tFTPRename/tFTPRename_messages_ja.properties

@@ -52,3 +52,7 @@ MOVE_TO_THE_CURRENT_DIRECTORY.NAME=\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u3
 USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
 USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528
+CONFIG_CLIENT.NAME=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u8A2D\u5B9A
+CLIENT_PARAMETERS.NAME=
+CLIENT_PARAMETERS.ITEM.PARAMETER=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
+CLIENT_PARAMETERS.ITEM.VALUE=\u5024

main/plugins/org.talend.designer.components.localprovider/components/tFTPRename/tFTPRename_messages_zh_CN.properties

@@ -52,3 +52,7 @@ MOVE_TO_THE_CURRENT_DIRECTORY.NAME=\u79FB\u81F3\u5F53\u524D\u76EE\u5F55
 USE_ENCODING.NAME=\u6587\u4EF6\u540D\u7F16\u7801
 CONNECTION_TIMEOUT.NAME=\u8FDE\u63A5\u8D85\u65F6 (\u6BEB\u79D2)
 USE_STRICT_REPLY_PARSING.NAME=\u4F7F\u7528\u4E25\u683C\u56DE\u590D\u89E3\u6790
+CONFIG_CLIENT.NAME=\u914D\u7F6E\u5BA2\u6237\u7AEF
+CLIENT_PARAMETERS.NAME=
+CLIENT_PARAMETERS.ITEM.PARAMETER=\u5BA2\u6237\u7AEF\u53C2\u6570
+CLIENT_PARAMETERS.ITEM.VALUE=\u503C

main/plugins/org.talend.designer.components.localprovider/components/tFTPTruncate/tFTPTruncate_messages_fr.properties

@@ -47,3 +47,7 @@ MOVE_TO_THE_CURRENT_DIRECTORY.NAME=D\u00E9placer vers le r\u00E9pertoire courant
 USE_ENCODING.NAME=Encodage du nom de fichier
 CONNECTION_TIMEOUT.NAME=D\u00E9lai avant l'expiration de la connexion (millisecondes)
 USE_STRICT_REPLY_PARSING.NAME=Utiliser le parsage de la r\u00E9ponse stricte
+CONFIG_CLIENT.NAME=Config client
+CLIENT_PARAMETERS.NAME=
+CLIENT_PARAMETERS.ITEM.PARAMETER=Param\u00E8tre client
+CLIENT_PARAMETERS.ITEM.VALUE=Valeur

main/plugins/org.talend.designer.components.localprovider/components/tFTPTruncate/tFTPTruncate_messages_ja.properties

@@ -47,3 +47,7 @@ MOVE_TO_THE_CURRENT_DIRECTORY.NAME=\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u3
 USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
 USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528
+CONFIG_CLIENT.NAME=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u8A2D\u5B9A
+CLIENT_PARAMETERS.NAME=
+CLIENT_PARAMETERS.ITEM.PARAMETER=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
+CLIENT_PARAMETERS.ITEM.VALUE=\u5024

main/plugins/org.talend.designer.components.localprovider/components/tFTPTruncate/tFTPTruncate_messages_zh_CN.properties

@@ -47,3 +47,7 @@ MOVE_TO_THE_CURRENT_DIRECTORY.NAME=\u79FB\u81F3\u5F53\u524D\u76EE\u5F55
 USE_ENCODING.NAME=\u6587\u4EF6\u540D\u7F16\u7801
 CONNECTION_TIMEOUT.NAME=\u8FDE\u63A5\u8D85\u65F6 (\u6BEB\u79D2)
 USE_STRICT_REPLY_PARSING.NAME=\u4F7F\u7528\u4E25\u683C\u56DE\u590D\u89E3\u6790
+CONFIG_CLIENT.NAME=\u914D\u7F6E\u5BA2\u6237\u7AEF
+CLIENT_PARAMETERS.NAME=
+CLIENT_PARAMETERS.ITEM.PARAMETER=\u5BA2\u6237\u7AEF\u53C2\u6570
+CLIENT_PARAMETERS.ITEM.VALUE=\u503C

main/plugins/org.talend.designer.components.localprovider/components/tFileInputExcel/tFileInputExcel_java.xml

@@ -194,7 +194,7 @@
 			<IMPORT NAME="poi-ooxml-schemas" MODULE="poi-ooxml-schemas-4.1.2-20200903124306_modified_talend.jar" MVN="mvn:org.apache.poi/poi-ooxml-schemas/4.1.2-20200903124306_modified_talend" UrlPath="platform:/plugin/org.talend.libraries.excel/lib/poi-ooxml-schemas-4.1.2-20200903124306_modified_talend.jar" REQUIRED_IF="(VERSION_2007 == 'true')" />
 			<IMPORT NAME="xmlbeans" MODULE="xmlbeans-3.1.0.jar" MVN="mvn:org.apache.xmlbeans/xmlbeans/3.1.0" REQUIRED_IF="(VERSION_2007 == 'true')" />
 
-			<IMPORT NAME="poi-scratchpad" MODULE="poi-scratchpad-4.1.2-20200903124306_modified_talend.jar" MVN="mvn:org.apache.poi/poi-scratchpad/4.1.2-20200903124306_modified_talend" UrlPath="platform:/plugin/org.talend.libraries.excel/lib/poi-scratchpad-4.1.2-20200903124306_modified_talend.jar" REQUIRED_IF="(VERSION_2007 == 'true')" />
+			<IMPORT NAME="poi-scratchpad" MODULE="poi-scratchpad-5.2.2.jar" MVN="mvn:org.apache.poi/poi-scratchpad/5.2.2" UrlPath="platform:/plugin/org.talend.libraries.excel/lib/poi-scratchpad-5.2.2.jar" REQUIRED_IF="(VERSION_2007 == 'true')" />
 		</IMPORTS>
 	</CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tFileInputMail/tFileInputMail_java.xml

@@ -85,7 +85,7 @@
 
   <CODEGENERATION>
     <IMPORTS>
-      <IMPORT NAME="JavaMail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(MAIL_TYPE == 'MIME')" />
+      <IMPORT NAME="jakartaMail" MODULE="jakarta.mail-1.6.7.jar" MVN="mvn:com.sun.mail/jakarta.mail/1.6.7"  REQUIRED_IF="(MAIL_TYPE == 'MIME')" />
       <IMPORT NAME="JAF" MODULE="activation.jar" MVN="mvn:org.talend.libraries/activation/6.0.0"   REQUIRED_IF="(MAIL_TYPE == 'MIME')" />
 
       <IMPORT NAME="poi" MODULE="poi-4.1.2-20200903124306_modified_talend.jar" MVN="mvn:org.apache.poi/poi/4.1.2-20200903124306_modified_talend" UrlPath="platform:/plugin/org.talend.libraries.excel/lib/poi-4.1.2-20200903124306_modified_talend.jar" REQUIRED_IF="(MAIL_TYPE == 'MSG')" />
@@ -94,7 +94,8 @@
       <IMPORT NAME="commons-collections4" MODULE="commons-collections4-4.4.jar" MVN="mvn:org.apache.commons/commons-collections4/4.4" REQUIRED_IF="(MAIL_TYPE == 'MSG')" />
       <IMPORT NAME="commons-math3" MODULE="commons-math3-3.6.1.jar" MVN="mvn:org.apache.commons/commons-math3/3.6.1" REQUIRED_IF="(MAIL_TYPE == 'MSG')" />
 
-      <IMPORT NAME="poi-scratchpad" MODULE="poi-scratchpad-4.1.2-20200903124306_modified_talend.jar" MVN="mvn:org.apache.poi/poi-scratchpad/4.1.2-20200903124306_modified_talend" UrlPath="platform:/plugin/org.talend.libraries.excel/lib/poi-scratchpad-4.1.2-20200903124306_modified_talend.jar" REQUIRED_IF="(MAIL_TYPE == 'MSG')" />
+      <IMPORT NAME="poi-scratchpad" MODULE="poi-scratchpad-5.2.2.jar" MVN="mvn:org.apache.poi/poi-scratchpad/5.2.2" UrlPath="platform:/plugin/org.talend.libraries.excel/lib/poi-scratchpad-5.2.2.jar" REQUIRED_IF="(MAIL_TYPE == 'MSG')" />
+      <IMPORT NAME="commons-io-2.8.0" MODULE="commons-io-2.8.0.jar" MVN="mvn:commons-io/commons-io/2.8.0" REQUIRED_IF="(MAIL_TYPE == 'MSG')" />
       
       <IMPORT NAME="talendMsgMailUtil" MODULE="talendMsgMailUtil-1.2-20201022.jar" MVN="mvn:org.talend.components/talendMsgMailUtil/1.2-20201022" UrlPath="platform:/plugin/org.talend.libraries.excel/lib/talendMsgMailUtil-1.2-20201022.jar" REQUIRED_IF="(MAIL_TYPE == 'MSG')" />
       <IMPORT NAME="reload4j-1.2.19" MODULE="reload4j-1.2.19.jar" MVN="mvn:ch.qos.reload4j/reload4j/1.2.19" REQUIRED_IF="(MAIL_TYPE == 'MSG')" />

main/plugins/org.talend.designer.components.localprovider/components/tFileInputPositional/tFileInputPositional_begin.javajet

@@ -592,7 +592,7 @@
                 	}
                 }
                 %>
-			}
+			}//PositionalUtil end
 
 			PositionalUtil_<%=cid%> positionalUtil_<%=cid%>=new PositionalUtil_<%=cid%>();
 			positionalUtil_<%=cid%>.setUseStar(useStar_<%=cid%>);
@@ -809,6 +809,10 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
 			<%
 			}
 			%>
+			
+			resourceMap.put("byteReader_<%=cid %>", byteReader_<%=cid %>);
+			resourceMap.put("reader_<%=cid %>", reader_<%=cid %>);
+			
 				<%
             	if("BYTES".equals(patternUnits)&&(("").equals(rowSeparator) || ("\"\"").equals(rowSeparator))){
                 %>
@@ -858,6 +862,10 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
 				<%
 				}
 				%>	
+				
+				resourceMap.put("byteReader_<%=cid %>", byteReader_<%=cid %>);
+				resourceMap.put("reader_<%=cid %>", reader_<%=cid %>);
+				
                 <%
             	if("BYTES".equals(patternUnits)&&(("").equals(rowSeparator) || ("\"\"").equals(rowSeparator)) ){
                 %>

main/plugins/org.talend.designer.components.localprovider/components/tFileInputPositional/tFileInputPositional_end.javajet

@@ -37,6 +37,7 @@ if(!(filename_<%=cid %> instanceof java.io.InputStream)){
 	}
 }
 globalMap.put("<%=cid %>_NB_LINE",nb_line_<%=cid %>);
+resourceMap.put("finish_<%=cid%>", true);
 <%
 		}
 	}

main/plugins/org.talend.designer.components.localprovider/components/tFileInputPositional/tFileInputPositional_finally.javajet

@@ -0,0 +1,28 @@
+<%@ jet 
+	imports="
+		org.talend.core.model.process.INode 
+		org.talend.core.model.metadata.IMetadataTable 
+		org.talend.designer.codegen.config.CodeGeneratorArgument
+		org.talend.core.model.process.ElementParameterParser 
+		java.util.List
+	" 
+%>
+	<%@ include file="../templates/Log4j/Log4jFileUtil.javajet"%>
+<%
+	CodeGeneratorArgument codeGenArgument = (CodeGeneratorArgument) argument;
+	INode node = (INode)codeGenArgument.getArgument();
+	String cid = node.getUniqueName();
+%>
+if(resourceMap.get("finish_<%=cid%>") == null){ 
+	
+	org.talend.fileprocess.delimited.RowParser reader_<%=cid %> = (org.talend.fileprocess.delimited.RowParser)resourceMap.get("reader_<%=cid %>"); 
+    org.talend.fileprocess.delimited.RowParserByByte byteReader_<%=cid %> = (org.talend.fileprocess.delimited.RowParserByByte)resourceMap.get("byteReader_<%=cid %>"); 
+    
+	if(reader_<%=cid %>!=null) {
+		reader_<%=cid %>.close();
+	}
+
+	if(byteReader_<%=cid %>!=null) {
+		byteReader_<%=cid %>.close();
+	}
+}

main/plugins/org.talend.designer.components.localprovider/components/tFileInputXML/tFileInputXML_begin.javajet

@@ -82,7 +82,7 @@ class IgnoreDTDEntityResolver_<%=cid%> implements org.xml.sax.EntityResolver {
 // *** Xerces *** //
 if(("Xerces").equals(mode)){
 %>
-class TalendPrefixResolver_<%=cid%> implements org.apache.xml.utils.PrefixResolver {
+class TalendPrefixResolver_<%=cid%> {
 
     private java.util.Map<String, String> map = new java.util.HashMap<String, String>();
     
@@ -92,26 +92,14 @@ class TalendPrefixResolver_<%=cid%> implements org.apache.xml.utils.PrefixResolv
 		return defualtNSPath;
 	}
 	
-    public String getBaseIdentifier() {
-        return null;
-    }
-
-    public String getNamespaceForPrefix(String prefix) {
+    public String getNamespaceURI(String prefix) {
         if (("xml").equals(prefix)) {
-            return org.apache.xml.utils.Constants.S_XMLNAMESPACEURI;
+            return "http://www.w3.org/XML/1998/namespace";
         } else {
             return map.get(prefix);
         }
     }
 
-    public String getNamespaceForPrefix(String prefix, org.w3c.dom.Node context) {
-        return getNamespaceForPrefix(prefix);
-    }
-
-    public boolean handlesNullPrefixes() {
-        return false;
-    }
-
     public boolean countNSMap(org.w3c.dom.Node el) {
     	boolean hasDefaultPrefix = false;
         if (el.getNodeType() == org.w3c.dom.Node.ELEMENT_NODE) {
@@ -149,9 +137,10 @@ class TalendPrefixResolver_<%=cid%> implements org.apache.xml.utils.PrefixResolv
 
 class XML_API_<%=cid%>{
 
+	javax.xml.xpath.XPath xpathEvaluator = new net.sf.saxon.xpath.XPathFactoryImpl().newXPath();
+	
 	String loopPath = null;
 	boolean hasDefaultNS = false;
-	TalendPrefixResolver_<%=cid%> pr = null;
 	
 	public boolean isDefNull(org.w3c.dom.Node node) throws javax.xml.transform.TransformerException {
         if (node != null && node.getNodeType() == org.w3c.dom.Node.ELEMENT_NODE) {
@@ -174,37 +163,45 @@ class XML_API_<%=cid%>{
     private final org.talend.xpath.XPathUtil util = new  org.talend.xpath.XPathUtil();
 
     public void initXPath(org.w3c.dom.Node root){
-		pr= new TalendPrefixResolver_<%=cid%>();
+        final TalendPrefixResolver_<%=cid%> pr = new TalendPrefixResolver_<%=cid%>();
         hasDefaultNS = pr.countNSMap(root);
         util.setDefaultNSPath(pr.getDefualtNSPath());
+        
+        xpathEvaluator.setNamespaceContext(new javax.xml.namespace.NamespaceContext() {
+            @Override
+            public String getNamespaceURI(String prefix) {
+                return pr.getNamespaceURI(prefix);
+            }
+
+            @Override
+            public String getPrefix(String namespaceURI) {
+                return null;
+            }
+
+            @Override
+            public java.util.Iterator getPrefixes(String namespaceURI) {
+                return null;
+            }
+        });
     }
 
 //==============add for feature 10753 start================================
-	org.apache.xpath.objects.XObject obj = null;
-	
-	public int getNodeType(org.w3c.dom.Node node, String xpath) throws javax.xml.transform.TransformerException{
-		obj = org.apache.xpath.XPathAPI.eval(node, util.addDefaultNSPrefix(xpath,loopPath), pr);
-		return obj.getType();
+	public String getNodeString(org.w3c.dom.Node node, String xpath) throws javax.xml.xpath.XPathExpressionException {
+		javax.xml.xpath.XPathExpression expression = xpathEvaluator.compile(util.addDefaultNSPrefix(xpath,loopPath));
+		return expression.evaluate(node);
 	}
 
-	public String getNodeString(org.w3c.dom.Node node, String xpath) throws javax.xml.transform.TransformerException{
-		if(obj==null){
-			obj = org.apache.xpath.XPathAPI.eval(node, util.addDefaultNSPrefix(xpath,loopPath), pr);
-		}
-		return obj.str();
-	}
-
-    public org.w3c.dom.Node getSingleNode(org.w3c.dom.Node node, String xpath) throws javax.xml.transform.TransformerException {
-    	if(obj==null){
-        	obj = org.apache.xpath.XPathAPI.eval(node, util.addDefaultNSPrefix(xpath,loopPath), pr);
-        }
-        return obj.nodelist().item(0);
+    public org.w3c.dom.Node getSingleNode(org.w3c.dom.Node node, String xpath) throws javax.xml.xpath.XPathExpressionException {
+        javax.xml.xpath.XPathExpression expression = xpathEvaluator.compile(util.addDefaultNSPrefix(xpath,loopPath));
+        Object result = expression.evaluate(node, javax.xml.xpath.XPathConstants.NODESET);
+        return org.w3c.dom.NodeList.class.cast(result).item(0);
     }
 //=====================end=================================================
 
-    public org.w3c.dom.NodeList getNodeList(org.w3c.dom.Node node, String xpath) throws javax.xml.transform.TransformerException {
-        org.apache.xpath.objects.XObject obj = org.apache.xpath.XPathAPI.eval(node, util.addDefaultNSPrefix(xpath), pr);
-        return obj.nodelist();
+    public org.w3c.dom.NodeList getNodeList(org.w3c.dom.Node node, String xpath) throws javax.xml.xpath.XPathExpressionException {
+        javax.xml.xpath.XPathExpression expression = xpathEvaluator.compile(util.addDefaultNSPrefix(xpath));
+        Object result = expression.evaluate(node, javax.xml.xpath.XPathConstants.NODESET);
+        return org.w3c.dom.NodeList.class.cast(result);
     }
     
 }
@@ -813,7 +810,7 @@ if ((metadatas!=null)&&(metadatas.size()>0)) {
 						String nodeCheck = mapping.get(i).get("NODECHECK");
 						if(("Xerces").equals(mode)){
 %>
-	if(xml_api_<%=cid%>.getNodeType(tmp_<%=cid %>,<%=query%>)==org.apache.xpath.objects.XObject.CLASS_NODESET){
+	try {
 		node_<%=cid%> = xml_api_<%=cid%>.getSingleNode(tmp_<%=cid %>,<%=query%>);
 <%
 							if("true".equals(useSeparator)){
@@ -830,7 +827,7 @@ if ((metadatas!=null)&&(metadatas.size()>0)) {
 <%
 							}
 %>
-	}else{
+	} catch (javax.xml.xpath.XPathExpressionException xee) {
 		node_<%=cid %> = tmp_<%=cid %>;
 		str_<%=cid %> = xml_api_<%=cid%>.getNodeString(tmp_<%=cid %>,<%=query%>);
 	}

main/plugins/org.talend.designer.components.localprovider/components/tFileInputXML/tFileInputXML_java.xml

@@ -144,7 +144,7 @@
 				REQUIRED_IF="(GENERATION_MODE == 'XERCES') OR (GENERATION_MODE == 'SAX')" BundleID="" />
 			<IMPORT NAME="xml-apis-1.4.01" MODULE="xml-apis-1.4.01.jar" MVN="mvn:xml-apis/xml-apis/1.4.01" 
 				REQUIRED_IF="(GENERATION_MODE == 'XERCES') OR (GENERATION_MODE == 'SAX')" BundleID="" />
-			<IMPORT NAME="Java_xalan" MODULE="xalan-2.7.2.jar" MVN="mvn:xalan/xalan/2.7.2" REQUIRED_IF="GENERATION_MODE == 'XERCES'" BundleID="" />
+			<IMPORT NAME="SAXON-HE" MODULE="Saxon-HE-10.6.jar" MVN="mvn:net.sf.saxon/Saxon-HE/10.6" REQUIRED_IF="GENERATION_MODE == 'XERCES'" BundleID="" />
 			<IMPORT NAME="Java_talendSAX" MODULE="TalendSAX-1.0.1-20190326.jar" MVN="mvn:org.talend.libraries/TalendSAX/1.0.1-20190326"  UrlPath="platform:/plugin/org.talend.libraries.xml/lib/TalendSAX-1.0.1-20190326.jar"
 				REQUIRED_IF="GENERATION_MODE == 'SAX'" />
 			<IMPORT NAME="xpathutil" MODULE="xpathutil-1.0.0.jar" MVN="mvn:org.talend.libraries/xpathutil-1.0.0/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.xml/lib/xpathutil-1.0.0.jar"

main/plugins/org.talend.designer.components.localprovider/components/tFileOutputDelimited/tFileOutputDelimited_begin.javajet

@@ -487,7 +487,9 @@ if(("false").equals(ElementParameterParser.getValue(node,"__CSV_OPTION__"))) {
                         new java.io.FileOutputStream(fullName_<%=cid%> + splitedFileNo_<%=cid%> + extension_<%=cid%>, <%=isAppend%>),<%=encoding%>));
                 <%
                 }
-
+                %>
+                resourceMap.put("out_<%=cid%>", out<%=cid%>);
+                <%
                 if(isIncludeHeader && !hasDynamic){
                 %>
                     <%
@@ -588,7 +590,10 @@ if(("false").equals(ElementParameterParser.getValue(node,"__CSV_OPTION__"))) {
                     out<%=cid%> = new <%=writerClass%>(writer_<%=cid%>);
                 <%
                 }
-
+                %>
+                resourceMap.put("out_<%=cid%>", out<%=cid%>);
+            	resourceMap.put("writer_<%=cid%>", writer_<%=cid%>);
+            	<%
                 if(isIncludeHeader && !hasDynamic){
                     List<IMetadataColumn> columns = metadata.getListColumns();
                     int sizeColumns = columns.size();
@@ -904,6 +909,14 @@ if(("false").equals(ElementParameterParser.getValue(node,"__CSV_OPTION__"))) {
                     <%
                     }
                 }
+                %>
+                resourceMap.put("CsvWriter_<%=cid%>", CsvWriter<%=cid%>);
+                <%
+                if(isInRowMode) {
+                %>
+                	resourceMap.put("out_<%=cid%>", out<%=cid%>);
+                <%
+                }
 
                 if(!useOSLineSeparator) {
                 %>
@@ -1053,6 +1066,20 @@ if(("false").equals(ElementParameterParser.getValue(node,"__CSV_OPTION__"))) {
                     }
                 }
                 
+                %>
+                resourceMap.put("CsvWriter_<%=cid%>", CsvWriter<%=cid%>);
+                <%
+                if(isInRowMode){
+                %>
+                    resourceMap.put("out_<%=cid%>", out<%=cid%>);
+                    resourceMap.put("outWriter_<%=cid%>", outWriter_<%=cid%>);
+                <%
+                }else{
+                %>
+                    resourceMap.put("bufferWriter_<%=cid%>", bufferWriter_<%=cid%>);
+                    resourceMap.put("outWriter_<%=cid%>", outWriter_<%=cid%>);
+                <%
+                }
                 if(!useOSLineSeparator) {
                 %>
                     if(csvSettings_<%=cid%>.isUseCRLFRecordDelimiter()) {
@@ -1104,51 +1131,10 @@ if(("false").equals(ElementParameterParser.getValue(node,"__CSV_OPTION__"))) {
             }
         }
     }
-    %>
-
-
-<%
 // ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 }
 %>
 
-<%
-if(("false").equals(ElementParameterParser.getValue(node,"__CSV_OPTION__"))) {
-    if(!useStream){
-    %>
-        resourceMap.put("out_<%=cid%>", out<%=cid%>);
-    <%
-    }else{
-    %>
-        resourceMap.put("out_<%=cid%>", out<%=cid%>);
-        resourceMap.put("writer_<%=cid%>", writer_<%=cid%>);
-    <%
-    }
-}else{//the following is the tFileOutputCSV component
-%>
-    resourceMap.put("CsvWriter_<%=cid%>", CsvWriter<%=cid%>);
-    <%
-    if(!useStream){
-        if(isInRowMode){
-        %>
-            resourceMap.put("out_<%=cid%>", out<%=cid%>);
-        <%
-        }
-    }else{
-        if(isInRowMode){
-        %>
-            resourceMap.put("out_<%=cid%>", out<%=cid%>);
-            resourceMap.put("outWriter_<%=cid%>", outWriter_<%=cid%>);
-        <%
-        }else{
-        %>
-            resourceMap.put("bufferWriter_<%=cid%>", bufferWriter_<%=cid%>);
-            resourceMap.put("outWriter_<%=cid%>", outWriter_<%=cid%>);
-        <%
-        }
-    }
-}
-%>
 resourceMap.put("nb_line_<%=cid%>", nb_line_<%=cid%>);
 <%if(!useStream && ("true").equals(ElementParameterParser.getValue(node, "__DELETE_EMPTYFILE__"))){%>
     resourceMap.put("isFileGenerated_<%=cid%>", isFileGenerated_<%=cid%>);

main/plugins/org.talend.designer.components.localprovider/components/tFileOutputDelimited/tFileOutputDelimited_main.javajet

@@ -270,6 +270,7 @@ if(("false").equals(ElementParameterParser.getValue(node,"__CSV_OPTION__"))) {
                             <%}%>
                             out<%=cid %> = new <%=isInRowMode?"routines.system.BufferedOutput":"java.io.BufferedWriter"%>(new java.io.OutputStreamWriter(
                                     new java.io.FileOutputStream(fullName_<%=cid%> + splitedFileNo_<%=cid%> + extension_<%=cid%>, <%= isAppend%>),<%= encoding%>));
+                            resourceMap.put("out_<%=cid%>", out<%=cid %>);
                             <%
                             if(isIncludeHeader){
                                 %>
@@ -643,12 +644,15 @@ if(("false").equals(ElementParameterParser.getValue(node,"__CSV_OPTION__"))) {
                                 strWriter<%=cid%> = new java.io.StringWriter();
                                 CsvWriter<%=cid%> = new com.talend.csv.CSVWriter(strWriter<%=cid%>);
                                 CsvWriter<%=cid%>.setSeparator(csvSettings_<%=cid %>.getFieldDelim());
+                                resourceMap.put("out_<%=cid%>", out<%=cid%>);
                                 <%}else{%>
                                 CsvWriter<%=cid%> = new com.talend.csv.CSVWriter(new java.io.BufferedWriter(new java.io.OutputStreamWriter(
                                     new java.io.FileOutputStream(fullName_<%=cid%> + splitedFileNo_<%=cid%> + extension_<%=cid%>, <%=isAppend%>),<%=encoding%>)));
                                 CsvWriter<%=cid%>.setSeparator(csvSettings_<%=cid %>.getFieldDelim());
                                 <%}%>
                                 
+                                resourceMap.put("CsvWriter_<%=cid%>", CsvWriter<%=cid%>);
+                                
                                 <%
                                 if(!useOSLineSeparator) {
                                 %>

main/plugins/org.talend.designer.components.localprovider/components/tFileOutputExcel/tFileOutputExcel_java.xml

@@ -257,7 +257,7 @@
       <IMPORT NAME="poi-ooxml-schemas" MODULE="poi-ooxml-schemas-4.1.2-20200903124306_modified_talend.jar" MVN="mvn:org.apache.poi/poi-ooxml-schemas/4.1.2-20200903124306_modified_talend" UrlPath="platform:/plugin/org.talend.libraries.excel/lib/poi-ooxml-schemas-4.1.2-20200903124306_modified_talend.jar" REQUIRED_IF="(VERSION_2007 == 'true')" />
       <IMPORT NAME="xmlbeans" MODULE="xmlbeans-3.1.0.jar" MVN="mvn:org.apache.xmlbeans/xmlbeans/3.1.0" REQUIRED_IF="(VERSION_2007 == 'true')" />
 
-      <IMPORT NAME="poi-scratchpad" MODULE="poi-scratchpad-4.1.2-20200903124306_modified_talend.jar" MVN="mvn:org.apache.poi/poi-scratchpad/4.1.2-20200903124306_modified_talend" UrlPath="platform:/plugin/org.talend.libraries.excel/lib/poi-scratchpad-4.1.2-20200903124306_modified_talend.jar" REQUIRED_IF="(VERSION_2007 == 'true')" />
+      <IMPORT NAME="poi-scratchpad" MODULE="poi-scratchpad-5.2.2.jar" MVN="mvn:org.apache.poi/poi-scratchpad/5.2.2" UrlPath="platform:/plugin/org.talend.libraries.excel/lib/poi-scratchpad-5.2.2.jar" REQUIRED_IF="(VERSION_2007 == 'true')" />
     </IMPORTS>
   </CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tFileOutputRaw/tFileOutputRaw_main.javajet

@@ -34,6 +34,8 @@
 		for(IConnection incomingConn : incomingConns) {
 			if(incomingConn.getLineStyle().hasConnectionCategory(IConnectionCategory.DATA)) {
 %>
+				java.io.InputStream fis_<%=cid%> = null;
+				java.io.FileOutputStream fos_<%=cid%> = null;
 				try {
 					Object content_<%=cid%> = <%=incomingConn.getName()%>.<%=columnList.get(0).getLabel()%>;
 
@@ -48,8 +50,8 @@
 						} else if(content_<%=cid%> instanceof byte[]) {
 							org.apache.commons.io.FileUtils.writeByteArrayToFile(file_<%=cid%>, (byte[])content_<%=cid%>);
 						} else if(content_<%=cid%> instanceof java.io.InputStream) {
-							java.io.InputStream fis_<%=cid%> = (java.io.InputStream) content_<%=cid%>;
-							java.io.FileOutputStream fos_<%=cid%> = new java.io.FileOutputStream(file_<%=cid%>);
+							fis_<%=cid%> = (java.io.InputStream) content_<%=cid%>;
+							fos_<%=cid%> = new java.io.FileOutputStream(file_<%=cid%>);
 							byte[] buffer_<%=cid%> = new byte[65536];
 							int nb_<%=cid%> = 0;
 							while (true) {
@@ -59,8 +61,6 @@
 							      }		 
 							      fos_<%=cid%>.write(buffer_<%=cid%>, 0, nb_<%=cid%>);
 							}
-							fis_<%=cid%>.close();
-							fos_<%=cid%>.close();
 						} else {
 						    org.apache.commons.io.FileUtils.writeStringToFile(file_<%=cid%>, content_<%=cid%>.toString(), <%=encoding%>);
 						}
@@ -83,6 +83,33 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e_<%=cid%>.getMessage());
 						}
 					}
 %>
+				} finally {
+					if(fis_<%=cid%> != null) {
+						try {
+							fis_<%=cid%>.close();
+						} catch (java.io.IOException fisIOE_<%=cid%>) {
+<%
+							if(isLog4jEnabled) {
+%>
+								log.warn("<%=cid%> - " + fisIOE_<%=cid%>.getMessage());
+<%
+							}
+%>
+						}
+					}
+					if(fos_<%=cid%> != null) {
+						try {
+							fos_<%=cid%>.close();
+						} catch (java.io.IOException fosIOE_<%=cid%>) {
+<%
+							if(isLog4jEnabled) {
+%>
+								log.warn("<%=cid%> - " + fosIOE_<%=cid%>.getMessage());
+<%
+							}
+%>
+						}
+					}
 				}
 <%
 			}

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

@@ -193,7 +193,7 @@
 				<!-- Transitive dependencies of google-cloud-storage -->
 				<IMPORT NAME="google-cloud-core-1.93.4.jar" MODULE="google-cloud-core-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core/1.93.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-api-client-1.31.1.jar" MODULE="google-api-client-1.31.1.jar" MVN="mvn:com.google.api-client/google-api-client/1.31.1" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
-				<IMPORT NAME="google-oauth-client-1.31.0.jar" MODULE="google-oauth-client-1.31.0.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.31.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
+				<IMPORT NAME="google-oauth-client-1.33.3.jar" MODULE="google-oauth-client-1.33.3.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.33.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-api-services-storage-v1-rev20201112-1.31.0" MODULE="google-api-services-storage-v1-rev20201112-1.31.0.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20201112-1.31.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="gson-2.8.9" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="api-common-1.6.0" MODULE="api-common-1.6.0.jar" MVN="mvn:com.google.api/api-common/1.6.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />

main/plugins/org.talend.designer.components.localprovider/components/tGSBucketCreate/tGSBucketCreate_messages_zh_CN.properties

@@ -22,7 +22,7 @@ PROJECT_ID.NAME=\u5DE5\u7A0B ID
 SECRET_KEY.NAME=\u5BC6\u94A5
 SPECIAL_CONFIGUER.NAME=\u4F4D\u7F6E\u53CA\u8BBF\u95EE\u63A7\u5236
 USE_EXISTING_CONNECTION.NAME=\u4F7F\u7528\u4E00\u4E2A\u73B0\u6709\u8FDE\u63A5
-AUTH_TYPE.NAME=\u7528\u6237\u540D\u548C\u5BC6\u7801\u7C7B\u578B
+AUTH_TYPE.NAME=\u51ED\u8BC1\u7C7B\u578B
 AUTH_TYPE.ITEM.SERVICE_ACCOUNT=\u670D\u52A1\u5E10\u6237
 AUTH_TYPE.ITEM.TOKEN=OAuth \u8BBF\u95EE\u4EE4\u724C
 GS_ACCESS_TOKEN.NAME=OAuth \u8BBF\u95EE\u4EE4\u724C

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

@@ -145,7 +145,7 @@
 				<!-- Transitive dependencies of google-cloud-storage -->
 				<IMPORT NAME="google-cloud-core-1.93.4.jar" MODULE="google-cloud-core-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core/1.93.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-api-client-1.31.1.jar" MODULE="google-api-client-1.31.1.jar" MVN="mvn:com.google.api-client/google-api-client/1.31.1" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
-				<IMPORT NAME="google-oauth-client-1.31.0.jar" MODULE="google-oauth-client-1.31.0.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.31.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
+				<IMPORT NAME="google-oauth-client-1.33.3.jar" MODULE="google-oauth-client-1.33.3.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.33.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-api-services-storage-v1-rev20201112-1.31.0" MODULE="google-api-services-storage-v1-rev20201112-1.31.0.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20201112-1.31.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="gson-2.8.9" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="api-common-1.6.0" MODULE="api-common-1.6.0.jar" MVN="mvn:com.google.api/api-common/1.6.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />

main/plugins/org.talend.designer.components.localprovider/components/tGSBucketDelete/tGSBucketDelete_messages_zh_CN.properties

@@ -7,7 +7,7 @@ HELP=org.talend.help.tGSBucketDelete
 LONG_NAME=\u5728Google\u5B58\u50A8\u7A7A\u95F4\u4E2D\u5220\u9664\u4E00\u4E2Abucket
 SECRET_KEY.NAME=\u5BC6\u94A5
 USE_EXISTING_CONNECTION.NAME=\u4F7F\u7528\u4E00\u4E2A\u73B0\u6709\u8FDE\u63A5
-AUTH_TYPE.NAME=\u7528\u6237\u540D\u548C\u5BC6\u7801\u7C7B\u578B
+AUTH_TYPE.NAME=\u51ED\u8BC1\u7C7B\u578B
 AUTH_TYPE.ITEM.SERVICE_ACCOUNT=\u670D\u52A1\u5E10\u6237
 AUTH_TYPE.ITEM.TOKEN=OAuth \u8BBF\u95EE\u4EE4\u724C
 GS_ACCESS_TOKEN.NAME=OAuth \u8BBF\u95EE\u4EE4\u724C

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

@@ -145,7 +145,7 @@
 				<!-- Transitive dependencies of google-cloud-storage -->
 				<IMPORT NAME="google-cloud-core-1.93.4.jar" MODULE="google-cloud-core-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core/1.93.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-api-client-1.31.1.jar" MODULE="google-api-client-1.31.1.jar" MVN="mvn:com.google.api-client/google-api-client/1.31.1" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
-				<IMPORT NAME="google-oauth-client-1.31.0.jar" MODULE="google-oauth-client-1.31.0.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.31.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
+				<IMPORT NAME="google-oauth-client-1.33.3.jar" MODULE="google-oauth-client-1.33.3.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.33.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-api-services-storage-v1-rev20201112-1.31.0" MODULE="google-api-services-storage-v1-rev20201112-1.31.0.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20201112-1.31.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="gson-2.8.9" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="api-common-1.6.0" MODULE="api-common-1.6.0.jar" MVN="mvn:com.google.api/api-common/1.6.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />

main/plugins/org.talend.designer.components.localprovider/components/tGSBucketExist/tGSBucketExist_messages_zh_CN.properties

@@ -9,7 +9,7 @@ HELP=org.talend.help.tGSBucketExist
 LONG_NAME=\u68C0\u67E5 Google \u5B58\u50A8\u4E2D\u662F\u5426\u5B58\u5728\u7279\u5B9A\u7684\u6876\u540D\u79F0
 SECRET_KEY.NAME=\u5BC6\u94A5
 USE_EXISTING_CONNECTION.NAME=\u4F7F\u7528\u4E00\u4E2A\u73B0\u6709\u8FDE\u63A5
-AUTH_TYPE.NAME=\u7528\u6237\u540D\u548C\u5BC6\u7801\u7C7B\u578B
+AUTH_TYPE.NAME=\u51ED\u8BC1\u7C7B\u578B
 AUTH_TYPE.ITEM.SERVICE_ACCOUNT=\u670D\u52A1\u5E10\u6237
 AUTH_TYPE.ITEM.TOKEN=OAuth \u8BBF\u95EE\u4EE4\u724C
 GS_ACCESS_TOKEN.NAME=OAuth \u8BBF\u95EE\u4EE4\u724C

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

@@ -130,7 +130,7 @@
 				<!-- Transitive dependencies of google-cloud-storage -->
 				<IMPORT NAME="google-cloud-core-1.93.4.jar" MODULE="google-cloud-core-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core/1.93.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-api-client-1.31.1.jar" MODULE="google-api-client-1.31.1.jar" MVN="mvn:com.google.api-client/google-api-client/1.31.1" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
-				<IMPORT NAME="google-oauth-client-1.31.0.jar" MODULE="google-oauth-client-1.31.0.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.31.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
+				<IMPORT NAME="google-oauth-client-1.33.3.jar" MODULE="google-oauth-client-1.33.3.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.33.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-api-services-storage-v1-rev20201112-1.31.0" MODULE="google-api-services-storage-v1-rev20201112-1.31.0.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20201112-1.31.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="gson-2.8.9" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="api-common-1.6.0" MODULE="api-common-1.6.0.jar" MVN="mvn:com.google.api/api-common/1.6.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />

main/plugins/org.talend.designer.components.localprovider/components/tGSBucketList/tGSBucketList_messages_zh_CN.properties

@@ -9,7 +9,7 @@ PROJECT_ID.NAME=\u5DE5\u7A0B ID
 SECRET_KEY.NAME=\u5BC6\u94A5
 SPECIFY_PROJECT.NAME=\u6307\u5B9A\u5DE5\u7A0B ID
 USE_EXISTING_CONNECTION.NAME=\u4F7F\u7528\u4E00\u4E2A\u73B0\u6709\u8FDE\u63A5
-AUTH_TYPE.NAME=\u7528\u6237\u540D\u548C\u5BC6\u7801\u7C7B\u578B
+AUTH_TYPE.NAME=\u51ED\u8BC1\u7C7B\u578B
 AUTH_TYPE.ITEM.SERVICE_ACCOUNT=\u670D\u52A1\u5E10\u6237
 AUTH_TYPE.ITEM.TOKEN=OAuth \u8BBF\u95EE\u4EE4\u724C
 GS_ACCESS_TOKEN.NAME=OAuth \u8BBF\u95EE\u4EE4\u724C

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

@@ -103,7 +103,7 @@
 				<!-- Transitive dependencies of google-cloud-storage -->
 				<IMPORT NAME="google-cloud-core-1.93.4.jar" MODULE="google-cloud-core-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core/1.93.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
 				<IMPORT NAME="google-api-client-1.31.1.jar" MODULE="google-api-client-1.31.1.jar" MVN="mvn:com.google.api-client/google-api-client/1.31.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
-				<IMPORT NAME="google-oauth-client-1.31.0.jar" MODULE="google-oauth-client-1.31.0.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.31.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
+				<IMPORT NAME="google-oauth-client-1.33.3.jar" MODULE="google-oauth-client-1.33.3.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.33.3" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
 				<IMPORT NAME="google-api-services-storage-v1-rev20201112-1.31.0" MODULE="google-api-services-storage-v1-rev20201112-1.31.0.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20201112-1.31.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
 				<IMPORT NAME="gson-2.8.9" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />
 				<IMPORT NAME="api-common-1.6.0" MODULE="api-common-1.6.0.jar" MVN="mvn:com.google.api/api-common/1.6.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN')" />

main/plugins/org.talend.designer.components.localprovider/components/tGSConnection/tGSConnection_messages_zh_CN.properties

@@ -2,7 +2,7 @@ ACCESS_KEY.NAME=\u8BBF\u95EE\u5BC6\u94A5
 HELP=org.talend.help.tGSConnection
 LONG_NAME=\u521B\u5EFA\u5230 Google \u5B58\u50A8\u670D\u52A1\u7684\u8FDE\u63A5
 SECRET_KEY.NAME=\u5BC6\u94A5
-AUTH_TYPE.NAME=\u7528\u6237\u540D\u548C\u5BC6\u7801\u7C7B\u578B
+AUTH_TYPE.NAME=\u51ED\u8BC1\u7C7B\u578B
 AUTH_TYPE.ITEM.SERVICE_ACCOUNT=\u670D\u52A1\u5E10\u6237
 AUTH_TYPE.ITEM.TOKEN=OAuth \u8BBF\u95EE\u4EE4\u724C
 SERVICE_ACCOUNT_KEY.NAME=\u670D\u52A1\u5E10\u6237\u5BC6\u94A5

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

@@ -223,7 +223,7 @@
 				<!-- Transitive dependencies of google-cloud-storage -->
 				<IMPORT NAME="google-cloud-core-1.93.4.jar" MODULE="google-cloud-core-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core/1.93.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-api-client-1.31.1.jar" MODULE="google-api-client-1.31.1.jar" MVN="mvn:com.google.api-client/google-api-client/1.31.1" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
-				<IMPORT NAME="google-oauth-client-1.31.0.jar" MODULE="google-oauth-client-1.31.0.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.31.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
+				<IMPORT NAME="google-oauth-client-1.33.3.jar" MODULE="google-oauth-client-1.33.3.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.33.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-api-services-storage-v1-rev20201112-1.31.0" MODULE="google-api-services-storage-v1-rev20201112-1.31.0.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20201112-1.31.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="gson-2.8.9" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="api-common-1.6.0" MODULE="api-common-1.6.0.jar" MVN="mvn:com.google.api/api-common/1.6.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />

main/plugins/org.talend.designer.components.localprovider/components/tGSCopy/tGSCopy_main.javajet

@@ -54,9 +54,6 @@ if ("USER_ACCOUNT_HMAC".equals(authType)){
 			<%
 			}
 		} else {
-		%>
-
-	       	<%
 			String passwordFieldName = "__SECRET_KEY__";
 			final String GoogleTracker = org.talend.core.utils.TrackerUtil.getGoogleTracker();
 %>
@@ -234,10 +231,16 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e_<%=cid%>.getMessage());
 %>
 		com.google.cloud.storage.Blob blob_<%=cid%> = storage_<%=cid%>.get(<%=srcBucketName%>, <%=sourceObjectKey%>);
 		String targetName_<%=cid%> = blob_<%=cid%>.getName();
-		<% if(!useSrcPath) { %>
-			targetName_<%=cid%> = targetFolder_<%=cid%>+targetName_<%=cid%>.substring(targetName_<%=cid%>.lastIndexOf('/') + 1);
-		<% } %>
 <%
+		if(!useSrcPath) {
+%>
+			targetName_<%=cid%> = targetFolder_<%=cid%>+targetName_<%=cid%>.substring(targetName_<%=cid%>.lastIndexOf('/') + 1);
+<%
+		} else {
+%>
+			targetName_<%=cid%> = targetFolder_<%=cid%>+targetName_<%=cid%>;
+<%
+		}
 		if(isRename){
 %>
 			targetName_<%=cid%> = targetFolder_<%=cid%>+<%=newObjectKey%>;
@@ -251,8 +254,6 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e_<%=cid%>.getMessage());
 			blob_<%=cid%>.delete();
 <%
 		}
-		%>
-	<%
 	}
 %>
 	globalMap.put("<%=cid %>_SOURCE_BUCKET",<%=srcBucketName%>);

main/plugins/org.talend.designer.components.localprovider/components/tGSCopy/tGSCopy_messages_zh_CN.properties

@@ -19,7 +19,7 @@ SOURCE_OBJECTKEY.NAME=\u6E90\u5BF9\u8C61\u952E
 TARGET_BUCKET.NAME=\u76EE\u6807\u6876\u540D\u79F0
 TARGET_FOLDER.NAME=\u76EE\u6807\u6587\u4EF6\u5939
 USE_EXISTING_CONNECTION.NAME=\u4F7F\u7528\u4E00\u4E2A\u73B0\u6709\u8FDE\u63A5
-AUTH_TYPE.NAME=\u7528\u6237\u540D\u548C\u5BC6\u7801\u7C7B\u578B
+AUTH_TYPE.NAME=\u51ED\u8BC1\u7C7B\u578B
 AUTH_TYPE.ITEM.SERVICE_ACCOUNT=\u670D\u52A1\u5E10\u6237
 AUTH_TYPE.ITEM.TOKEN=OAuth \u8BBF\u95EE\u4EE4\u724C
 GS_ACCESS_TOKEN.NAME=OAuth \u8BBF\u95EE\u4EE4\u724C

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

@@ -186,7 +186,7 @@
 				<!-- Transitive dependencies of google-cloud-storage -->
 				<IMPORT NAME="google-cloud-core-1.93.4.jar" MODULE="google-cloud-core-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core/1.93.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-api-client-1.31.1.jar" MODULE="google-api-client-1.31.1.jar" MVN="mvn:com.google.api-client/google-api-client/1.31.1" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
-				<IMPORT NAME="google-oauth-client-1.31.0.jar" MODULE="google-oauth-client-1.31.0.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.31.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
+				<IMPORT NAME="google-oauth-client-1.33.3.jar" MODULE="google-oauth-client-1.33.3.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.33.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-api-services-storage-v1-rev20201112-1.31.0" MODULE="google-api-services-storage-v1-rev20201112-1.31.0.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20201112-1.31.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="gson-2.8.9" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="api-common-1.6.0" MODULE="api-common-1.6.0.jar" MVN="mvn:com.google.api/api-common/1.6.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />

main/plugins/org.talend.designer.components.localprovider/components/tGSDelete/tGSDelete_messages_zh_CN.properties

@@ -21,7 +21,7 @@ PROJECT_ID.NAME=\u5DE5\u7A0B ID
 SECRET_KEY.NAME=\u5BC6\u94A5
 SPECIFY_PROJECT.NAME=\u6307\u5B9A\u5DE5\u7A0B ID
 USE_EXISTING_CONNECTION.NAME=\u4F7F\u7528\u4E00\u4E2A\u73B0\u6709\u8FDE\u63A5
-AUTH_TYPE.NAME=\u7528\u6237\u540D\u548C\u5BC6\u7801\u7C7B\u578B
+AUTH_TYPE.NAME=\u51ED\u8BC1\u7C7B\u578B
 AUTH_TYPE.ITEM.SERVICE_ACCOUNT=\u670D\u52A1\u5E10\u6237
 AUTH_TYPE.ITEM.TOKEN=OAuth \u8BBF\u95EE\u4EE4\u724C
 GS_ACCESS_TOKEN.NAME=OAuth \u8BBF\u95EE\u4EE4\u724C

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

@@ -223,7 +223,7 @@
 				<!-- Transitive dependencies of google-cloud-storage -->
 				<IMPORT NAME="google-cloud-core-1.93.4.jar" MODULE="google-cloud-core-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core/1.93.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-api-client-1.31.1.jar" MODULE="google-api-client-1.31.1.jar" MVN="mvn:com.google.api-client/google-api-client/1.31.1" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
-				<IMPORT NAME="google-oauth-client-1.31.0.jar" MODULE="google-oauth-client-1.31.0.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.31.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
+				<IMPORT NAME="google-oauth-client-1.33.3.jar" MODULE="google-oauth-client-1.33.3.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.33.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-api-services-storage-v1-rev20201112-1.31.0" MODULE="google-api-services-storage-v1-rev20201112-1.31.0.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20201112-1.31.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="gson-2.8.9" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="api-common-1.6.0" MODULE="api-common-1.6.0.jar" MVN="mvn:com.google.api/api-common/1.6.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />

main/plugins/org.talend.designer.components.localprovider/components/tGSGet/tGSGet_messages_zh_CN.properties

@@ -27,7 +27,7 @@ SECRET_KEY.NAME=\u5BC6\u94A5
 SPECIFY_PROJECT.NAME=\u6307\u5B9A\u5DE5\u7A0B ID
 USE_EXISTING_CONNECTION.NAME=\u4F7F\u7528\u4E00\u4E2A\u73B0\u6709\u8FDE\u63A5
 USE_KEYS_LIST.NAME=\u4F7F\u7528\u952E
-AUTH_TYPE.NAME=\u7528\u6237\u540D\u548C\u5BC6\u7801\u7C7B\u578B
+AUTH_TYPE.NAME=\u51ED\u8BC1\u7C7B\u578B
 AUTH_TYPE.ITEM.SERVICE_ACCOUNT=\u670D\u52A1\u5E10\u6237
 AUTH_TYPE.ITEM.TOKEN=OAuth \u8BBF\u95EE\u4EE4\u724C
 GS_ACCESS_TOKEN.NAME=OAuth \u8BBF\u95EE\u4EE4\u724C

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

@@ -186,7 +186,7 @@
 				<!-- Transitive dependencies of google-cloud-storage -->
 				<IMPORT NAME="google-cloud-core-1.93.4.jar" MODULE="google-cloud-core-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core/1.93.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-api-client-1.31.1.jar" MODULE="google-api-client-1.31.1.jar" MVN="mvn:com.google.api-client/google-api-client/1.31.1" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
-				<IMPORT NAME="google-oauth-client-1.31.0.jar" MODULE="google-oauth-client-1.31.0.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.31.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
+				<IMPORT NAME="google-oauth-client-1.33.3.jar" MODULE="google-oauth-client-1.33.3.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.33.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-api-services-storage-v1-rev20201112-1.31.0" MODULE="google-api-services-storage-v1-rev20201112-1.31.0.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20201112-1.31.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="gson-2.8.9" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="api-common-1.6.0" MODULE="api-common-1.6.0.jar" MVN="mvn:com.google.api/api-common/1.6.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />

main/plugins/org.talend.designer.components.localprovider/components/tGSList/tGSList_messages_zh_CN.properties

@@ -23,7 +23,7 @@ QUERY_CONFIG.NAME=\u67E5\u8BE2\u914D\u7F6E
 SECRET_KEY.NAME=\u5BC6\u94A5
 SPECIFY_PROJECT.NAME=\u6307\u5B9A\u5DE5\u7A0B ID
 USE_EXISTING_CONNECTION.NAME=\u4F7F\u7528\u4E00\u4E2A\u73B0\u6709\u8FDE\u63A5
-AUTH_TYPE.NAME=\u7528\u6237\u540D\u548C\u5BC6\u7801\u7C7B\u578B
+AUTH_TYPE.NAME=\u51ED\u8BC1\u7C7B\u578B
 AUTH_TYPE.ITEM.SERVICE_ACCOUNT=\u670D\u52A1\u5E10\u6237
 AUTH_TYPE.ITEM.TOKEN=OAuth \u8BBF\u95EE\u4EE4\u724C
 GS_ACCESS_TOKEN.NAME=OAuth \u8BBF\u95EE\u4EE4\u724C

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

@@ -200,7 +200,7 @@
 				<!-- Transitive dependencies of google-cloud-storage -->
 				<IMPORT NAME="google-cloud-core-1.93.4.jar" MODULE="google-cloud-core-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core/1.93.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-api-client-1.31.1.jar" MODULE="google-api-client-1.31.1.jar" MVN="mvn:com.google.api-client/google-api-client/1.31.1" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
-				<IMPORT NAME="google-oauth-client-1.31.0.jar" MODULE="google-oauth-client-1.31.0.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.31.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
+				<IMPORT NAME="google-oauth-client-1.33.3.jar" MODULE="google-oauth-client-1.33.3.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.33.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="google-api-services-storage-v1-rev20201112-1.31.0" MODULE="google-api-services-storage-v1-rev20201112-1.31.0.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20201112-1.31.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="gson-2.8.9" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />
 				<IMPORT NAME="api-common-1.6.0" MODULE="api-common-1.6.0.jar" MVN="mvn:com.google.api/api-common/1.6.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((AUTH_TYPE == 'SERVICE_ACCOUNT') OR (AUTH_TYPE == 'TOKEN'))" />

main/plugins/org.talend.designer.components.localprovider/components/tGSPut/tGSPut_messages_zh_CN.properties

@@ -16,7 +16,7 @@ REMOTEDIR.NAME=Google \u5B58\u50A8\u76EE\u5F55
 SECRET_KEY.NAME=\u5BC6\u94A5
 USE_EXISTING_CONNECTION.NAME=\u4F7F\u7528\u4E00\u4E2A\u73B0\u6709\u8FDE\u63A5
 USE_FILES_LIST.NAME=\u4F7F\u7528\u6587\u4EF6\u5217\u8868
-AUTH_TYPE.NAME=\u7528\u6237\u540D\u548C\u5BC6\u7801\u7C7B\u578B
+AUTH_TYPE.NAME=\u51ED\u8BC1\u7C7B\u578B
 AUTH_TYPE.ITEM.SERVICE_ACCOUNT=\u670D\u52A1\u5E10\u6237
 AUTH_TYPE.ITEM.TOKEN=OAuth \u8BBF\u95EE\u4EE4\u724C
 GS_ACCESS_TOKEN.NAME=OAuth \u8BBF\u95EE\u4EE4\u724C

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

@@ -390,16 +390,16 @@
 				MODULE="google-http-client-jackson2-1.30.1.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.30.1" REQUIRED="true"/>
 			<IMPORT NAME="google-http-client-protobuf"
 				MODULE="google-http-client-protobuf-1.30.2.jar" MVN="mvn:com.google.http-client/google-http-client-protobuf/1.30.2" REQUIRED="true"/>
-			<IMPORT NAME="google-oauth-client"
-				MODULE="google-oauth-client-1.30.1.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.30.1" REQUIRED="true"/>
+			<IMPORT NAME="google-oauth-client-1.33.3.jar"
+				MODULE="google-oauth-client-1.33.3.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.33.3" REQUIRED="true"/>
 			<IMPORT NAME="google-oauth-client-appengine"
-				MODULE="google-oauth-client-appengine-1.30.1.jar" MVN="mvn:com.google.oauth-client/google-oauth-client-appengine/1.30.1" REQUIRED="true"/>
+				MODULE="google-oauth-client-appengine-1.33.3.jar" MVN="mvn:com.google.oauth-client/google-oauth-client-appengine/1.33.3" REQUIRED="true"/>
 			<IMPORT NAME="google-oauth-client-java6"
-				MODULE="google-oauth-client-java6-1.30.1.jar" MVN="mvn:com.google.oauth-client/google-oauth-client-java6/1.30.1" REQUIRED="true"/>
+				MODULE="google-oauth-client-java6-1.33.3.jar" MVN="mvn:com.google.oauth-client/google-oauth-client-java6/1.33.3" REQUIRED="true"/>
 			<IMPORT NAME="google-oauth-client-jetty"
-				MODULE="google-oauth-client-jetty-1.30.1.jar" MVN="mvn:com.google.oauth-client/google-oauth-client-jetty/1.30.1" REQUIRED="true"/>
+				MODULE="google-oauth-client-jetty-1.33.3.jar" MVN="mvn:com.google.oauth-client/google-oauth-client-jetty/1.33.3" REQUIRED="true"/>
 			<IMPORT NAME="google-oauth-client-servlet"
-				MODULE="google-oauth-client-servlet-1.30.1.jar" MVN="mvn:com.google.oauth-client/google-oauth-client-servlet/1.30.1" REQUIRED="true"/>
+				MODULE="google-oauth-client-servlet-1.33.3.jar" MVN="mvn:com.google.oauth-client/google-oauth-client-servlet/1.33.3" REQUIRED="true"/>
 			<IMPORT NAME="grpc-context"
 				MODULE="grpc-context-1.19.0.jar" MVN="mvn:io.grpc/grpc-context/1.19.0" REQUIRED="true"/>
 			<IMPORT NAME="gson"
@@ -407,7 +407,7 @@
 			<IMPORT NAME="json"
 				MODULE="json-20170516.jar" MVN="mvn:org.json/json/20170516" REQUIRED="true"/>
 			<IMPORT NAME="guava"
-				MODULE="guava-27.0.1-jre.jar" MVN="mvn:com.google.guava/guava/27.0.1-jre" REQUIRED="true"/>
+				MODULE="guava-30.0-jre.jar" MVN="mvn:com.google.guava/guava/30.0-jre" 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-core-asl"

main/plugins/org.talend.designer.components.localprovider/components/tGreenplumBulkExec/tGreenplumBulkExec_begin.javajet

@@ -24,6 +24,7 @@ String dataAction = ElementParameterParser.getValue(node,"__DATA_ACTION__");
 boolean convertToUppercase = false; // not active this function
 String dbDriver = ElementParameterParser.getValue(node, "__DB_DRIVER__");
 boolean useExistingConnection = "true".equalsIgnoreCase(ElementParameterParser.getValue(node,"__USE_EXISTING_CONNECTION__"));
+String dbproperties = ElementParameterParser.getValue(node, "__PROPERTIES__");
 %>
 String tableName_<%=cid%> = null;
 String dbschema_<%=cid%> = null;
@@ -124,12 +125,22 @@ if(useExistingConnection) {
 	log4jCodeGenerateUtil.useExistConnection(node);
 } else {
 %>	
+	String dbProperties_<%=cid%> = <%=dbproperties%>;
+	
 	<%if (dbDriver.equals("POSTGRESQL")){%>
 			String driverClass_<%=cid%> = "org.postgresql.Driver";
 			String url_<%=cid %> = "jdbc:postgresql://" + <%=host%> + ":" + <%=port%> + "/" + <%=dbName%>;
+			
+			if(dbProperties_<%=cid%> != null && !"".equals(dbProperties_<%=cid%>.trim())) {
+				url_<%=cid %> = url_<%=cid%> + "?" + dbProperties_<%=cid%>;
+            }
 		<%} else {%>
 			String driverClass_<%=cid%> = "com.pivotal.jdbc.GreenplumDriver";
 			String url_<%=cid %> = "jdbc:pivotal:greenplum://"+<%=host%>+":"+<%=port%>+";DatabaseName="+<%=dbName%>;
+			
+			if(dbProperties_<%=cid%> != null && !"".equals(dbProperties_<%=cid%>.trim())) {
+				url_<%=cid %> = url_<%=cid%> + ";" + dbProperties_<%=cid%>;
+            }
 	<%}%>
 	java.lang.Class.forName(driverClass_<%=cid%>).newInstance();
 	String dbUser_<%=cid%> = <%=userName%>;

main/plugins/org.talend.designer.components.localprovider/components/tGreenplumBulkExec/tGreenplumBulkExec_java.xml

@@ -126,6 +126,16 @@
 	</PARAMETERS>
 
 	<ADVANCED_PARAMETERS>
+		<PARAMETER 
+	        NAME="PROPERTIES" 
+	        FIELD="TEXT" 
+	        NUM_ROW="1" 
+	        REPOSITORY_VALUE="PROPERTIES_STRING"
+	        SHOW_IF="USE_EXISTING_CONNECTION == 'false'"
+	    >
+	        <DEFAULT>""</DEFAULT>
+	    </PARAMETER>
+		
 		<PARAMETER
 			NAME="DB_DRIVER"
 			FIELD="CLOSED_LIST"

main/plugins/org.talend.designer.components.localprovider/components/tGreenplumBulkExec/tGreenplumBulkExec_messages.properties

@@ -52,3 +52,4 @@ CONNECTION.NAME=Component List
 DB_DRIVER.NAME=DB driver
 DB_DRIVER.ITEM.POSTGRESQL=PostgreSQL
 DB_DRIVER.ITEM.GREENPLUM=Greenplum
+PROPERTIES.NAME=Additional JDBC Parameters

main/plugins/org.talend.designer.components.localprovider/components/tGreenplumBulkExec/tGreenplumBulkExec_messages_fr.properties

@@ -52,3 +52,4 @@ CONNECTION.NAME=Liste des composants
 DB_DRIVER.NAME=Pilote de la BdD
 DB_DRIVER.ITEM.POSTGRESQL=PostgreSQL
 DB_DRIVER.ITEM.GREENPLUM=Greenplum
+PROPERTIES.NAME=Param\u00E8tres suppl\u00E9mentaires JDBC

main/plugins/org.talend.designer.components.localprovider/components/tGreenplumBulkExec/tGreenplumBulkExec_messages_ja.properties

@@ -52,3 +52,4 @@ CONNECTION.NAME=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30EA\u30B9\u30C8
 DB_DRIVER.NAME=DB\u30C9\u30E9\u30A4\u30D0\u30FC
 DB_DRIVER.ITEM.POSTGRESQL=PostgreSQL
 DB_DRIVER.ITEM.GREENPLUM=Greenplum
+PROPERTIES.NAME=\u8FFD\u52A0\u306EJDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC

main/plugins/org.talend.designer.components.localprovider/components/tGreenplumBulkExec/tGreenplumBulkExec_messages_zh_CN.properties

@@ -52,3 +52,4 @@ CONNECTION.NAME=\u7EC4\u4EF6\u5217\u8868
 DB_DRIVER.NAME=\u6570\u636E\u5E93\u9A71\u52A8
 DB_DRIVER.ITEM.POSTGRESQL=PostgreSQL
 DB_DRIVER.ITEM.GREENPLUM=Greenplum
+PROPERTIES.NAME=\u9644\u52A0 JDBC \u53C2\u6570

main/plugins/org.talend.designer.components.localprovider/components/tGreenplumInput/tGreenplumInput_begin.javajet

@@ -20,10 +20,21 @@ imports="
 	    
 		public void setURL(INode node) {
 			dbDriver = ElementParameterParser.getValue(node, "__DB_DRIVER__");
-			if (dbDriver.equals("POSTGRESQL")){%>
+%>
+			String dbProperties_<%=cid%> = <%=dbproperties%>;
+			
+			<%if (dbDriver.equals("POSTGRESQL")){%>
 				String url_<%=cid %> = "jdbc:postgresql://" + <%=dbhost%> + ":" + <%=dbport%> + "/" + <%=dbname%>;
+				
+				if(dbProperties_<%=cid%> != null && !"".equals(dbProperties_<%=cid%>.trim())) {
+                    url_<%=cid %> = url_<%=cid%> + "?" + dbProperties_<%=cid%>;
+                }
 			<%} else {%>
 				String url_<%=cid %> = "jdbc:pivotal:greenplum://"+<%=dbhost%>+":"+<%=dbport%>+";DatabaseName="+<%=dbname%>;
+				
+				if(dbProperties_<%=cid%> != null && !"".equals(dbProperties_<%=cid%>.trim())) {
+                    url_<%=cid %> = url_<%=cid%> + ";" + dbProperties_<%=cid%>;
+                }
 			<%}
 		}
 		

main/plugins/org.talend.designer.components.localprovider/components/tGreenplumInput/tGreenplumInput_java.xml

@@ -190,6 +190,16 @@
    </PARAMETERS>
 
    <ADVANCED_PARAMETERS>
+   	<PARAMETER 
+        NAME="PROPERTIES" 
+        FIELD="TEXT" 
+        NUM_ROW="1" 
+        REPOSITORY_VALUE="PROPERTIES_STRING"
+        SHOW_IF="USE_EXISTING_CONNECTION == 'false'"
+    >
+        <DEFAULT>""</DEFAULT>
+    </PARAMETER>
+   
 	<PARAMETER
 		NAME="DB_DRIVER"
 		FIELD="CLOSED_LIST"

main/plugins/org.talend.designer.components.localprovider/components/tGreenplumInput/tGreenplumInput_messages.properties

@@ -39,3 +39,4 @@ MAPPING.NAME=Mapping
 DB_DRIVER.NAME=DB driver
 DB_DRIVER.ITEM.POSTGRESQL=PostgreSQL
 DB_DRIVER.ITEM.GREENPLUM=Greenplum
+PROPERTIES.NAME=Additional JDBC Parameters