feat(TBD-10769): delta Features for R08

https://jira.talendforge.org/browse/TUP-27697

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

@@ -145,6 +145,9 @@
 	String cid = node.getUniqueName();
 	boolean logstashCurrent = !cid.startsWith("tJobStructureCatcher") && !cid.startsWith("talend") && enableLogStash;
 	
+	//about performance monitor, no way to support more than one job catcher component, also that is not necessary
+	final String subprocessName4Catcher = logstashCurrent ? jobCatcherNodes.get(0).getDesignSubjobStartNode().getUniqueName() : null;
+	
 	if ((codePart.equals(ECodePart.BEGIN))&&(stat || logstashCurrent)&&connSet.size()>0) {
 		if(containsTPartitioner) {
 			%>
@@ -178,9 +181,6 @@
 	}
 	
 	if((codePart.equals(ECodePart.MAIN))&&(stat || logstashCurrent)&&connSet.size()>0){
-		INode jobStructureCatcher = jobCatcherNodes.get(0);//about performance monitor, no way to support more than one job catcher component, also that is not necessary
-		String subprocessName4Catcher = jobStructureCatcher.getDesignSubjobStartNode().getUniqueName();
-	
 		if(!node.getComponent().useMerge()) {
 			if(stat && logstashCurrent) {
 			%>

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

@@ -275,7 +275,7 @@
     }
 %>
 
-    private PropertiesWithType context_param = new PropertiesWithType();
+    protected PropertiesWithType context_param = new PropertiesWithType();
     public java.util.Map<String, Object> parentContextMap = new java.util.HashMap<String, Object>();
 
     public String status= "";

main/plugins/org.talend.designer.components.libs/libs_src/google-storage-utils/src/main/java/org/talend/gs/util/GSObjectUtil.java

@@ -3,6 +3,7 @@ package org.talend.gs.util;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.FileSystems;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -182,7 +183,7 @@ public class GSObjectUtil {
 
     private String combineTwoNames(String coreDir, String targetDir, File file){
         String filePath = file.getAbsolutePath();
-        String relativePath =  targetDir + filePath.replace(coreDir + "/", "");
-        return relativePath;
+        String relativePath =  targetDir + filePath.replace(coreDir + FileSystems.getDefault().getSeparator(), "");
+        return relativePath.replaceAll("\\\\","/");
     }
 }

main/plugins/org.talend.designer.components.libs/libs_src/google-storage-utils/src/test/java/util/GSObjectUtilTest.java

@@ -4,6 +4,8 @@ import org.junit.jupiter.api.Test;
 import org.talend.gs.util.GSObjectUtil;
 
 import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -12,26 +14,26 @@ class GSObjectUtilTest {
 
     @Test
     void checkSizeOfFilesInFolderTest() {
-        String pathToDirectory = "src/test/resources/dirWithThreeFiles";
-        String pathToFile1 = "src/test/resources/dirWithThreeFiles/1.csv";
-        String pathToFile2 = "src/test/resources/dirWithThreeFiles/2.csv";
-        String pathToFile3 = "src/test/resources/dirWithThreeFiles/3.csv";
-        String pathToFile4 = "src/test/resources/dirWithThreeFiles/inner/1.csv";
+        Path pathToDirectory = Paths.get("src", "test", "resources", "dirWithThreeFiles");
+        Path pathToFile1 = Paths.get("src", "test", "resources", "dirWithThreeFiles", "1.csv");
+        Path pathToFile2 = Paths.get("src", "test", "resources", "dirWithThreeFiles", "2.csv");
+        Path pathToFile3 = Paths.get("src", "test", "resources", "dirWithThreeFiles", "3.csv");
+        Path pathToFile4 = Paths.get("src", "test", "resources", "dirWithThreeFiles", "inner", "1.csv");
 
         String expectedRelativePathToFile1 = "/1.csv";
         String expectedRelativePathToFile2 = "/2.csv";
         String expectedRelativePathToFile3 = "/3.csv";
         String expectedRelativePathToFile4 = "/inner/1.csv";
 
-        File rootFile = new File(pathToDirectory);
+        File rootFile = new File(pathToDirectory.toUri());
         GSObjectUtil gsObjectUtil = new GSObjectUtil();
         Map<String, File> files = gsObjectUtil.generateFileMap(rootFile, "/");
         assertEquals(4, files.size());
 
-        File expectedFile1 = new File(pathToFile1);
-        File expectedFile2 = new File(pathToFile2);
-        File expectedFile3 = new File(pathToFile3);
-        File expectedFile4 = new File(pathToFile4);
+        File expectedFile1 = new File(pathToFile1.toUri());
+        File expectedFile2 = new File(pathToFile2.toUri());
+        File expectedFile3 = new File(pathToFile3.toUri());
+        File expectedFile4 = new File(pathToFile4.toUri());
 
         assertTrue(files.containsKey(expectedRelativePathToFile1));
         assertTrue(files.containsKey(expectedRelativePathToFile2));
@@ -46,26 +48,26 @@ class GSObjectUtilTest {
 
     @Test
     void checkSizeOfFilesInFolder2Test() {
-        String pathToDirectory = "src/test/resources/dirWithThreeFiles";
-        String pathToFile1 = "src/test/resources/dirWithThreeFiles/1.csv";
-        String pathToFile2 = "src/test/resources/dirWithThreeFiles/2.csv";
-        String pathToFile3 = "src/test/resources/dirWithThreeFiles/3.csv";
-        String pathToFile4 = "src/test/resources/dirWithThreeFiles/inner/1.csv";
+        Path pathToDirectory = Paths.get("src", "test", "resources", "dirWithThreeFiles");
+        Path pathToFile1 = Paths.get("src", "test", "resources", "dirWithThreeFiles", "1.csv");
+        Path pathToFile2 = Paths.get("src", "test", "resources", "dirWithThreeFiles", "2.csv");
+        Path pathToFile3 = Paths.get("src", "test", "resources", "dirWithThreeFiles", "3.csv");
+        Path pathToFile4 = Paths.get("src", "test", "resources", "dirWithThreeFiles", "inner", "1.csv");
 
         String expectedRelativePathToFile1 = "1.csv";
         String expectedRelativePathToFile2 = "2.csv";
         String expectedRelativePathToFile3 = "3.csv";
         String expectedRelativePathToFile4 = "inner/1.csv";
 
-        File rootFile = new File(pathToDirectory);
+        File rootFile = new File(pathToDirectory.toUri());
         GSObjectUtil gsObjectUtil = new GSObjectUtil();
         Map<String, File> files = gsObjectUtil.generateFileMap(rootFile, "");
         assertEquals(4, files.size());
 
-        File expectedFile1 = new File(pathToFile1);
-        File expectedFile2 = new File(pathToFile2);
-        File expectedFile3 = new File(pathToFile3);
-        File expectedFile4 = new File(pathToFile4);
+        File expectedFile1 = new File(pathToFile1.toUri());
+        File expectedFile2 = new File(pathToFile2.toUri());
+        File expectedFile3 = new File(pathToFile3.toUri());
+        File expectedFile4 = new File(pathToFile4.toUri());
 
         assertTrue(files.containsKey(expectedRelativePathToFile1));
         assertTrue(files.containsKey(expectedRelativePathToFile2));
@@ -80,9 +82,9 @@ class GSObjectUtilTest {
 
     @Test
     void oneFileWithCustomPathTest(){
-        String pathToFile = "src/test/resources/empty.csv";
+        Path pathToFile = Paths.get("src","test", "resources", "empty.csv");
         String pathToFolder = "/folder/folder";
-        File expectedFile = new File(pathToFile);
+        File expectedFile = new File(pathToFile.toUri());
         GSObjectUtil gsObjectUtil = new GSObjectUtil();
 
         Map<String, File> files = gsObjectUtil.generateFileMap(expectedFile, pathToFolder);
@@ -96,9 +98,9 @@ class GSObjectUtilTest {
 
     @Test
     void oneFileWithOtherCustomPathTest(){
-        String pathToFile = "src/test/resources/empty.csv";
+        Path pathToFile = Paths.get("src","test", "resources", "empty.csv");
         String pathToFolder = "folder/folder";
-        File expectedFile = new File(pathToFile);
+        File expectedFile = new File(pathToFile.toUri());
         GSObjectUtil gsObjectUtil = new GSObjectUtil();
 
         Map<String, File> files = gsObjectUtil.generateFileMap(expectedFile, pathToFolder);
@@ -112,9 +114,9 @@ class GSObjectUtilTest {
 
     @Test
     void folderWithOtherCustomPathTest(){
-        String pathToFolder = "src/test/resources/dirWithThreeFiles/inner";
+        Path pathToFolder = Paths.get("src", "test", "resources", "dirWithThreeFiles", "inner");
         String pathToGSFolder = "folder";
-        File folder = new File(pathToFolder);
+        File folder = new File(pathToFolder.toUri());
         GSObjectUtil gsObjectUtil = new GSObjectUtil();
 
         Map<String, File> files = gsObjectUtil.generateFileMap(folder, pathToGSFolder);

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

@@ -170,7 +170,7 @@
       <dependency>
          <groupId>commons-beanutils</groupId>
          <artifactId>commons-beanutils</artifactId>
-         <version>1.8.0</version>
+         <version>1.9.4</version>
          <scope>compile</scope>
       </dependency>
       <dependency>
@@ -310,7 +310,7 @@
                   <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
                   <link>http://www.junit.org/junit/javadoc/</link>
                   <link>
-                     http://jakarta.apache.org/commons/beanutils/commons-beanutils-1.7.0/docs/api/
+                     http://jakarta.apache.org/commons/beanutils/commons-beanutils-1.9.4/docs/api/
                   </link>
                   <link>
                      http://jakarta.apache.org/commons/lang/api-2.2/

main/plugins/org.talend.designer.components.libs/libs_src/json-lib-talend/src/test/java/net/sf/json/AbstractJSONObjectStaticBuildersTestCase.java

@@ -51,7 +51,8 @@ public abstract class AbstractJSONObjectStaticBuildersTestCase extends TestCase
       jsonConfig.setIgnoreDefaultExcludes( true );
       JSONObject json = JSONObject.fromObject( getSource(), jsonConfig );
       assertJSONObject( json, getProperties() );
-      assertTrue( json.has( "class" ) );
+      //see : https://github.com/apache/commons-beanutils/compare/BEANUTILS_1_9_3...commons-beanutils-1.9.4#diff-dbeaa70d3a09169fb5a1e42e5b319037R34-R43
+      //assertTrue( json.has( "class" ) );
       assertTrue( !json.has( "pexcluded" ) );
    }
 

main/plugins/org.talend.designer.components.libs/libs_src/json-lib-talend/src/test/java/net/sf/json/TestJSONObject.java

@@ -199,7 +199,8 @@ public class TestJSONObject extends TestCase {
       jsonConfig.setIgnoreDefaultExcludes( true );
       jsonObject.element( "bean", new ObjectBean(), jsonConfig );
       JSONObject actual = jsonObject.getJSONObject( "bean" );
-      Assertions.assertTrue( actual.has( "class" ) );
+      //see : https://github.com/apache/commons-beanutils/compare/BEANUTILS_1_9_3...commons-beanutils-1.9.4#diff-dbeaa70d3a09169fb5a1e42e5b319037R34-R43
+      //Assertions.assertTrue( actual.has( "class" ) );
       Assertions.assertTrue( !actual.has( "pexcluded" ) );
    }
 
@@ -258,7 +259,8 @@ public class TestJSONObject extends TestCase {
       jsonObject.element( "list", list, jsonConfig );
       JSONObject actual = jsonObject.getJSONArray( "list" )
             .getJSONObject( 0 );
-      Assertions.assertTrue( actual.has( "class" ) );
+      //see : https://github.com/apache/commons-beanutils/compare/BEANUTILS_1_9_3...commons-beanutils-1.9.4#diff-dbeaa70d3a09169fb5a1e42e5b319037R34-R43
+      //Assertions.assertTrue( actual.has( "class" ) );
       Assertions.assertTrue( !actual.has( "pexcluded" ) );
    }
 

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

@@ -1,26 +1,64 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.talend</groupId>
+	<groupId>org.talend.libraries</groupId>
 	<artifactId>mdm_transaction</artifactId>
 	<name>mdm_transaction</name>
+	<version>1.0.1</version>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
+	</properties>
+
+	<distributionManagement>
+		<snapshotRepository>
+			<id>talend_nexus_deployment</id>
+			<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+		</snapshotRepository>
+		<repository>
+			<id>talend_nexus_deployment</id>
+			<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceRelease/</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</repository>
+	</distributionManagement>
 
 	<dependencies>
-	<dependency>
-		<groupId>commons-codec</groupId>
-		<artifactId>commons-codec</artifactId>
-		<version>1.7</version>
-	</dependency>
-	<dependency>
-		<groupId>commons-logging</groupId>
-		<artifactId>commons-logging</artifactId>
-		<version>1.1</version>
-	</dependency>
-	<dependency>
-		<groupId>commons-httpclient</groupId>
-		<artifactId>commons-httpclient</artifactId>
-		<version>3.0</version>
-	</dependency>
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.7</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-httpclient</groupId>
+			<artifactId>commons-httpclient</artifactId>
+			<version>3.0</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-codec</groupId>
+					<artifactId>commons-codec</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>junit</groupId>
+					<artifactId>junit</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -49,5 +87,4 @@
 			</testResource>
 		</testResources>
 	</build>
-	<version>1</version>
 </project>

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

@@ -4,7 +4,7 @@
 
   <groupId>org.talend.libraries</groupId>
   <artifactId>talend-webservice-input</artifactId>
-  <version>1.0.0-20170301</version>
+  <version>1.0.2</version>
   <packaging>jar</packaging>
 
   <name>talend-webservice-input</name>
@@ -51,6 +51,12 @@
 	    <groupId>commons-discovery</groupId>
 	    <artifactId>commons-discovery</artifactId>
     	<version>0.2</version>
+		<exclusions>
+			<exclusion>
+				<groupId>commons-logging</groupId>
+				<artifactId>commons-logging</artifactId>
+			</exclusion>
+		</exclusions>
 	</dependency>
 	<!-- https://mvnrepository.com/artifact/wsdl4j/wsdl4j -->
 	<dependency>
@@ -64,12 +70,6 @@
 	    <groupId>javax.xml</groupId>
 	    <artifactId>jaxrpc-api</artifactId>
 	    <version>1.1</version>
-	</dependency>
-		<!-- https://mvnrepository.com/artifact/commons-logging/commons-logging -->
-	<dependency>
-	    <groupId>commons-logging</groupId>
-	    <artifactId>commons-logging</artifactId>
-	    <version>1.1</version>
 	</dependency>
   </dependencies>
 	  
@@ -95,6 +95,7 @@
             </plugin>
 			<plugin>
 				<artifactId>maven-jar-plugin</artifactId>
+				<version>2.6</version>
 				<executions>
 					<execution>
 						<id>default-jar</id>

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

@@ -18,7 +18,7 @@
 		<pathelement location="${component.plugin.home}/tMicrosoftCrmInput/commons-logging-1.1.1.jar" />
 		<pathelement location="${component.plugin.home}/tWriteJSONFieldIn/commons-lang-2.6.jar" />
 		<pathelement location="${component.plugin.home}/tWebService/commons-collections-3.2.1.jar" />
-		<pathelement location="${component.plugin.home}/tWebService/commons-beanutils-1.7.0.jar" />
+		<pathelement location="${component.plugin.home}/tWebService/commons-beanutils-1.9.4.jar" />
 		<pathelement location="${component.plugin.home}/tWebService/cxf-2.6.0-modified.jar" />
 		<pathelement location="${component.plugin.home}/tWebService/jaxb-xjc-2.2.5-modified.jar" />
 		<pathelement location="${component.plugin.home}/tWebService/jaxb-impl-2.2.5-modified.jar" />

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

@@ -85,7 +85,7 @@
 		<dependency>
 			<groupId>commons-beanutils</groupId>
 			<artifactId>commons-beanutils</artifactId>
-			<version>1.8.3</version>
+			<version>1.9.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>

main/plugins/org.talend.designer.components.localprovider/components/tAS400Output/tAS400Output_begin.javajet

@@ -132,7 +132,7 @@ int tmp_batchUpdateCount_<%=cid%> = 0;
 int deletedCount_<%=cid%>=0;
 int updatedCount_<%=cid%>=0;
 int insertedCount_<%=cid%>=0;
-
+int rowsToCommitCount_<%=cid%>=0;
 String tableName_<%=cid%> = <%=table%>;
 boolean whetherReject_<%=cid%> = false;
 

main/plugins/org.talend.designer.components.localprovider/components/tAS400Output/tAS400Output_end.javajet

@@ -102,10 +102,12 @@ imports="
         if(("true").equals(useCommitControl)) {
             if(!("").equals(commitEvery) && !("0").equals(commitEvery)) {
                 %>
-                if(commitCounter_<%=cid%> > 0) {
-                	<%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
+                if(commitCounter_<%=cid%> > 0 && rowsToCommitCount_<%=cid%> != 0) {
+                    <%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
                     conn_<%=cid%>.commit();
                     <%dbLog.commit().commitDone(null);%>
+                    rowsToCommitCount_<%=cid%> = 0;
+                    commitCounter_<%=cid%> = 0;
                 }
                 <%
             }

main/plugins/org.talend.designer.components.localprovider/components/tAS400Output/tAS400Output_main.javajet

@@ -310,7 +310,9 @@ skeleton="../templates/db_output_bulk.skeleton"
             try {
                 nb_line_<%=cid%>++;
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                 <%dbLog.data().inserting(dbLog.var("nb_line"));%>
             } catch(java.sql.SQLException e) {
                 whetherReject_<%=cid%> = true;
@@ -442,7 +444,9 @@ skeleton="../templates/db_output_bulk.skeleton"
              try {
                 nb_line_<%=cid%>++;
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                updatedCount_<%=cid%> += processedCount_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                 <%dbLog.data().updating(dbLog.var("nb_line"));%>
             } catch(java.sql.SQLException e) {
                 whetherReject_<%=cid%> = true;
@@ -589,7 +593,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                 }
     			%>
         			<%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-        			updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmtUpdate_<%=cid %>.executeUpdate();
+        			int processedCount_<%=cid%> = pstmtUpdate_<%=cid %>.executeUpdate();
+        			updatedCount_<%=cid%> += processedCount_<%=cid%>;
+        			rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
         			nb_line_<%=cid%>++;
         			<%dbLog.data().updating(dbLog.var("nb_line"));%>
                 } catch(java.sql.SQLException e) {
@@ -665,7 +671,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                 }
     			%>
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
+                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 } catch(java.sql.SQLException e) {
@@ -795,6 +803,7 @@ skeleton="../templates/db_output_bulk.skeleton"
     		%>
                 updateFlag_<%=cid%>=pstmtUpdate_<%=cid %>.executeUpdate();
                 updatedCount_<%=cid%> = updatedCount_<%=cid%>+updateFlag_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += updateFlag_<%=cid%>;
 
             if(updateFlag_<%=cid%> == 0) {
 
@@ -840,7 +849,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                 }
         		%>
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
+                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
     			}else{
@@ -930,7 +941,9 @@ skeleton="../templates/db_output_bulk.skeleton"
     		%>
             try {
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                deletedCount_<%=cid%> = deletedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                deletedCount_<%=cid%> += processedCount_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                 nb_line_<%=cid%>++;
 				<%dbLog.data().deleting(dbLog.var("nb_line"));%>
             } catch(java.sql.SQLException e) {
@@ -1014,10 +1027,13 @@ skeleton="../templates/db_output_bulk.skeleton"
                     }
 	                <%
 	                }%>
-	                	<%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
-                        conn_<%=cid%>.commit();
-                        <%dbLog.commit().commitDone(null);%>
-                        commitCounter_<%=cid%>=0;
+	                if(rowsToCommitCount_<%=cid%> != 0){
+	                	<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
+	                	conn_<%=cid%>.commit();
+	                	<%dbLog.commit().commitDone(null);%>
+	                	rowsToCommitCount_<%=cid%> = 0;
+	                }
+	                commitCounter_<%=cid%>=0;
                     }
                     <%
                 }

main/plugins/org.talend.designer.components.localprovider/components/tAccessOutput/tAccessOutput_begin.javajet

@@ -100,7 +100,7 @@ int nb_line_rejected_<%=cid%> = 0;
 int deletedCount_<%=cid%>=0;
 int updatedCount_<%=cid%>=0;
 int insertedCount_<%=cid%>=0;
-
+int rowsToCommitCount_<%=cid%>=0;
 String tableName_<%=cid%> = <%=tableName%>;
 boolean whetherReject_<%=cid%> = false;
 java.sql.Connection conn_<%=cid%> = null;

main/plugins/org.talend.designer.components.localprovider/components/tAccessOutput/tAccessOutput_end.javajet

@@ -61,9 +61,13 @@ imports="
 	{
         if(!("").equals(commitEvery)&&!("0").equals(commitEvery)){
         %>
-        <%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
-        conn_<%=cid%>.commit();
-        <%dbLog.commit().commitDone(null);%>
+        if(rowsToCommitCount_<%=cid%> != 0){
+            <%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
+            conn_<%=cid%>.commit();
+            <%dbLog.commit().commitDone(null);%>
+            rowsToCommitCount_<%=cid%> = 0;
+        }
+        commitCounter_<%=cid%> = 0;
         <%
     	}
     	%>

main/plugins/org.talend.designer.components.localprovider/components/tAccessOutput/tAccessOutput_main.javajet

@@ -140,7 +140,9 @@ skeleton="../templates/db_output_bulk.skeleton"
     		%>
             try {
             	<%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-            	insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+            	int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+            	insertedCount_<%=cid%> += processedCount_<%=cid%>;
+            	rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
             	nb_line_<%=cid%>++;
             	<%dbLog.data().inserting(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
@@ -230,7 +232,9 @@ skeleton="../templates/db_output_bulk.skeleton"
             %>
             try {
             	<%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-            	updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+            	int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+            	updatedCount_<%=cid%> += processedCount_<%=cid%>;
+            	rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
             	nb_line_<%=cid%>++;
             	<%dbLog.data().updating(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
@@ -348,7 +352,9 @@ skeleton="../templates/db_output_bulk.skeleton"
     			%>
                 try {
     				<%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-    				updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmtUpdate_<%=cid %>.executeUpdate();
+    				int processedCount_<%=cid%> = pstmtUpdate_<%=cid %>.executeUpdate();
+    				updatedCount_<%=cid%> += processedCount_<%=cid%>;
+    				rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
     				nb_line_<%=cid%>++;
     				<%dbLog.data().updating(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -410,7 +416,9 @@ skeleton="../templates/db_output_bulk.skeleton"
     			%>
                 try{
         			<%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-        			insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
+        			int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
+        			insertedCount_<%=cid%> = processedCount_<%=cid%>;
+        			rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
         			nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -511,7 +519,8 @@ skeleton="../templates/db_output_bulk.skeleton"
             		nb_line_<%=cid%>++;
     				<%dbLog.data().updating(dbLog.var("nb_line"));%>
                  }
-                 updatedCount_<%=cid%> = updatedCount_<%=cid%>+updateFlag_<%=cid%>;
+                 updatedCount_<%=cid%> += updateFlag_<%=cid%>;
+                 rowsToCommitCount_<%=cid%> += updateFlag_<%=cid%>;
              } catch(java.lang.Exception e) {
                  whetherReject_<%=cid%> = true;
                  <%
@@ -573,7 +582,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                  %>
                  try {
         			<%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-        			insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
+        			int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
+        			insertedCount_<%=cid%> += processedCount_<%=cid%>;
+        			rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
         			nb_line_<%=cid%>++;
                 	<%dbLog.data().inserting(dbLog.var("nb_line"));%>
                  } catch(java.lang.Exception e) {
@@ -585,7 +596,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                          <%
                      } else {
                      %>
-                    	nb_line_<%=cid%>++; 					
+                    	nb_line_<%=cid%>++;
                      	<%
                          if(rejectConnName != null && rejectColumnList != null && rejectColumnList.size() > 0) {
                              %>
@@ -652,7 +663,8 @@ skeleton="../templates/db_output_bulk.skeleton"
     		%>
             try {
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                deletedCount_<%=cid%> = deletedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                deletedCount_<%=cid%> += processedCount_<%=cid%>;
                 nb_line_<%=cid%>++;
                 <%dbLog.data().deleting(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
@@ -697,7 +709,7 @@ skeleton="../templates/db_output_bulk.skeleton"
             <%
                 for(IConnection outgoingConn : outgoingConns) {
                     if(rejectConnName == null || (rejectConnName != null && !outgoingConn.getName().equals(rejectConnName))) {
-                        if(outgoingConn.getLineStyle().hasConnectionCategory(IConnectionCategory.DATA)) {                            
+                        if(outgoingConn.getLineStyle().hasConnectionCategory(IConnectionCategory.DATA)){                            
                             %>
                             <%=outgoingConn.getName()%> = new <%=outgoingConn.getName()%>Struct();
                             <%
@@ -720,12 +732,15 @@ skeleton="../templates/db_output_bulk.skeleton"
 	    	    %>
 	            commitCounter_<%=cid%>++;
 	            
-	            if(commitEvery_<%=cid%><=commitCounter_<%=cid%>) {
-	            	<%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
-	            	conn_<%=cid%>.commit();
-	            	<%dbLog.commit().commitDone(null);%>    
-	            	commitCounter_<%=cid%>=0;	
-	            }	
+	            if(commitEvery_<%=cid%> <= commitCounter_<%=cid%>){
+	            	if(rowsToCommitCount_<%=cid%> != 0){
+	                	<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
+	                	conn_<%=cid%>.commit();
+	                	<%dbLog.commit().commitDone(null);%>
+	                	rowsToCommitCount_<%=cid%> = 0;
+	            	}
+	            	commitCounter_<%=cid%>=0;
+	            }
 	            <%
 	    	}
 		}

main/plugins/org.talend.designer.components.localprovider/components/tAdvancedFileOutputXML/tAdvancedFileOutputXML_begin.inc.javajet

@@ -465,7 +465,7 @@ class GenerateToolByDom4j{
 				}
 %>
 		}
-		<%touchXMLNode.getXMLElement(parentName);%>.elements().add(orders_<%=cid %>[<%=currPos %>],<%touchXMLNode.getXMLNode(currEleName);%>);
+		<%touchXMLNode.getXMLElement(parentName);%>.elements().add(orders_<%=cid %>[<%=currPos %>],<%touchXMLNode.getXMLElement(currEleName);%>);
 <%
 			}else{
 %>
@@ -475,7 +475,7 @@ class GenerateToolByDom4j{
         if(<%=currPos +1 %> < orders_<%=cid %>.length){
         		orders_<%=cid %>[<%=currPos +1 %>] = 0;
         }
-        <%touchXMLNode.getXMLElement(parentName);%>.elements().add(orders_<%=cid %>[<%=currPos %>]++,<%touchXMLNode.getXMLNode(currEleName);%>);
+        <%touchXMLNode.getXMLElement(parentName);%>.elements().add(orders_<%=cid %>[<%=currPos %>]++,<%touchXMLNode.getXMLElement(currEleName);%>);
 <%
 			}
 		}else{

main/plugins/org.talend.designer.components.localprovider/components/tAmazonEMRManage/app_mapping.javajet

@@ -5,7 +5,7 @@ if(!use_customize_version){
 %>String[] applications_<%=cid%> = <%
 	String application = ElementParameterParser.getValue(node, "__APPLICATION__");
 	if("ALL_APPLICATIONS".equals(application)) {
-		if("\"emr-4.6.0\",\"emr-4.9.2\",\"emr-5.11.0\",\"emr-5.15.0\"".contains(cluster_version)) {
+		if("\"emr-4.6.0\",\"emr-4.9.2\",\"emr-5.11.0\",\"emr-5.15.0\", \"emr-5.29.0\"".contains(cluster_version)) {
 		%>
 		{}
 		<%
@@ -15,7 +15,7 @@ if(!use_customize_version){
 		<%
 		}
 	} else if("CORE_HADOOP".equals(application)) {
-	    if("\"emr-5.11.0\"".equals(cluster_version) || "\"emr-5.15.0\"".equals(cluster_version)){%>
+	    if("\"emr-5.11.0\"".equals(cluster_version) || "\"emr-5.15.0\"".equals(cluster_version) || "\"emr-5.29.0\"".equals(cluster_version)){%>
 	    {"Ganglia","Hadoop","Hive","Hue","Mahout","Pig","Tez"}
 	    <%
 	    }else if("\"emr-4.6.0\"".equals(cluster_version) || "\"emr-4.9.2\"".equals(cluster_version)) {
@@ -38,7 +38,7 @@ if(!use_customize_version){
 		<%
 		}
     } else if("PRESTO".equals(application)) {
-        if("\"emr-5.11.0\"".equals(cluster_version) || "\"emr-5.15.0\"".equals(cluster_version)){%>
+        if("\"emr-5.11.0\"".equals(cluster_version) || "\"emr-5.15.0\"".equals(cluster_version) || "\"emr-5.29.0\"".equals(cluster_version)){%>
         {"Hadoop","Hive","Presto"}
     <% } else { %>
         if(true) {
@@ -47,7 +47,7 @@ if(!use_customize_version){
         <%
         }
 	} else if("SPARK".equals(application)) {
-	    if("\"emr-5.11.0\"".equals(cluster_version) || "\"emr-5.15.0\"".equals(cluster_version)){%>
+	    if("\"emr-5.11.0\"".equals(cluster_version) || "\"emr-5.15.0\"".equals(cluster_version) || "\"emr-5.29.0\"".equals(cluster_version)){%>
         {"Ganglia","Hadoop","Spark","Zeppelin"}
         <%  
         } else if("\"emr-4.6.0\"".equals(cluster_version) || "\"emr-4.9.2\"".equals(cluster_version)) {
@@ -60,7 +60,7 @@ if(!use_customize_version){
 		<%
 		}
 	} else if("HBASE".equals(application)) {
-	    if("\"emr-5.11.0\"".equals(cluster_version) || "\"emr-4.9.2\"".equals(cluster_version) || "\"emr-5.15.0\"".equals(cluster_version)){%>
+	    if("\"emr-5.11.0\"".equals(cluster_version) || "\"emr-4.9.2\"".equals(cluster_version) || "\"emr-5.15.0\"".equals(cluster_version) || "\"emr-5.29.0\"".equals(cluster_version)){%>
         {"HBase","Ganglia","Hadoop","Hive","Hue","Phoenix","ZooKeeper"}
         <%  
         } else if("\"emr-4.6.0\"".equals(cluster_version)) {

main/plugins/org.talend.designer.components.localprovider/components/tAmazonEMRManage/tAmazonEMRManage_begin.javajet

@@ -403,7 +403,7 @@
 	if(wait_for_cluster_ready) {
 	%>
 		boolean clusterIsAlive_<%=cid%> = false;
-        System.out.println("Wating for cluster to become available.");
+        System.out.println("Waiting for cluster to become available.");
         while (true) {
             com.amazonaws.services.elasticmapreduce.model.DescribeClusterResult result2_<%=cid%> = emr_<%=cid%>.describeCluster(
             	new com.amazonaws.services.elasticmapreduce.model.DescribeClusterRequest()
@@ -433,7 +433,7 @@
 		boolean waitForStep_<%=cid%> = clusterIsAlive_<%=cid%> && (steps_<%=cid %>.size() > 1);
 		
 		if(waitForStep_<%=cid%>) {
-        	System.out.println("Wating for steps to complete.");
+        	System.out.println("Waiting for steps to complete.");
         }
         
         while (waitForStep_<%=cid%>) {

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

@@ -97,7 +97,8 @@
 
 		<PARAMETER NAME="CLUSTER_VERSION" FIELD="OPENED_LIST"
 			NUM_ROW="32" SHOW_IF="(ACTION=='START') AND (USE_CUSTOMIZE_VERSION == 'false')" GROUP="CONFIGURATION">
-			<ITEMS DEFAULT="EMR5_15_0">
+			<ITEMS DEFAULT="EMR5_29_0">
+				<ITEM NAME="EMR5_29_0" VALUE="&quot;emr-5.29.0&quot;" />
 			    <ITEM NAME="EMR5_15_0" VALUE="&quot;emr-5.15.0&quot;" />
 			    <ITEM NAME="EMR5_11_0" VALUE="&quot;emr-5.11.0&quot;" />
 			    <ITEM NAME="EMR4_9_2" VALUE="&quot;emr-4.9.2&quot;" />
@@ -112,14 +113,14 @@
 		</PARAMETER>
 		
 		<PARAMETER NAME="APPLICATION" FIELD="CLOSED_LIST" NUM_ROW="32"
-			SHOW_IF="(ACTION=='START') AND (USE_CUSTOMIZE_VERSION == 'false') AND ((CLUSTER_VERSION=='EMR5_15_0') OR (CLUSTER_VERSION=='EMR5_11_0') OR (CLUSTER_VERSION=='EMR4_9_2') OR (CLUSTER_VERSION=='EMR4_6_0') OR (CLUSTER_VERSION=='EMR4_5_0'))" GROUP="CONFIGURATION">
+			SHOW_IF="(ACTION=='START') AND (USE_CUSTOMIZE_VERSION == 'false') AND ((CLUSTER_VERSION=='EMR5_29_0') OR (CLUSTER_VERSION=='EMR5_15_0') OR (CLUSTER_VERSION=='EMR5_11_0') OR (CLUSTER_VERSION=='EMR4_9_2') OR (CLUSTER_VERSION=='EMR4_6_0') OR (CLUSTER_VERSION=='EMR4_5_0'))" GROUP="CONFIGURATION">
 
 			<ITEMS DEFAULT="CORE_HADOOP">
-				<ITEM NAME="ALL_APPLICATIONS" VALUE="ALL_APPLICATIONS" NOT_SHOW_IF="(CLUSTER_VERSION=='EMR4_6_0') OR (CLUSTER_VERSION=='EMR4_9_2') OR (CLUSTER_VERSION=='EMR5_11_0') OR (CLUSTER_VERSION=='EMR5_15_0')"/>
+				<ITEM NAME="ALL_APPLICATIONS" VALUE="ALL_APPLICATIONS" NOT_SHOW_IF="(CLUSTER_VERSION=='EMR4_6_0') OR (CLUSTER_VERSION=='EMR4_9_2') OR (CLUSTER_VERSION=='EMR5_11_0') OR (CLUSTER_VERSION=='EMR5_15_0') OR (CLUSTER_VERSION=='EMR5_29_0')"/>
 				<ITEM NAME="CORE_HADOOP" VALUE="CORE_HADOOP" />
-				<ITEM NAME="HBASE" VALUE="HBASE" SHOW_IF="(CLUSTER_VERSION=='EMR5_11_0') OR (CLUSTER_VERSION=='EMR4_9_2') OR (CLUSTER_VERSION=='EMR4_6_0') OR (CLUSTER_VERSION=='EMR5_15_0')"/>
-				<ITEM NAME="PRESTO_SANDBOX" VALUE="PRESTO_SANDBOX" NOT_SHOW_IF="(CLUSTER_VERSION=='EMR5_11_0') OR (CLUSTER_VERSION=='EMR5_15_0')"/>
-				<ITEM NAME="PRESTO" VALUE="PRESTO" SHOW_IF="(CLUSTER_VERSION=='EMR5_11_0') OR (CLUSTER_VERSION=='EMR5_15_0')"/>
+				<ITEM NAME="HBASE" VALUE="HBASE" SHOW_IF="(CLUSTER_VERSION=='EMR5_29_0') OR (CLUSTER_VERSION=='EMR5_11_0') OR (CLUSTER_VERSION=='EMR4_9_2') OR (CLUSTER_VERSION=='EMR4_6_0') OR (CLUSTER_VERSION=='EMR5_15_0')"/>
+				<ITEM NAME="PRESTO_SANDBOX" VALUE="PRESTO_SANDBOX" NOT_SHOW_IF="(CLUSTER_VERSION=='EMR5_11_0') OR (CLUSTER_VERSION=='EMR5_15_0') OR (CLUSTER_VERSION=='EMR5_29_0')"/>
+				<ITEM NAME="PRESTO" VALUE="PRESTO" SHOW_IF="(CLUSTER_VERSION=='EMR5_11_0') OR (CLUSTER_VERSION=='EMR5_15_0') OR (CLUSTER_VERSION=='EMR5_29_0')"/>
 				<ITEM NAME="SPARK" VALUE="SPARK" />
 			</ITEMS>
 		</PARAMETER>
@@ -406,7 +407,7 @@
 		
 		<PARAMETER NAME="CUSTOMIZE_VERSION" FIELD="TEXT"
 			NUM_ROW="35" SHOW_IF="(ACTION=='START') AND (USE_CUSTOMIZE_VERSION =='true')" GROUP="CUSTOMIZE_APPLICATION_GROUP">
-			<DEFAULT>"emr-5.15.0"</DEFAULT>
+			<DEFAULT>"emr-5.29.0"</DEFAULT>
 		</PARAMETER>
 		
 		<PARAMETER NAME="CUSTOMIZE_APPLICATION_TABLE" FIELD="TABLE" NUM_ROW="40" NB_LINES="5" GROUP="CUSTOMIZE_APPLICATION_GROUP"

main/plugins/org.talend.designer.components.localprovider/components/tAmazonEMRManage/tAmazonEMRManage_messages.properties

@@ -29,6 +29,7 @@ REGION.ITEM.SA_EAST_1=South America (Sao Paulo)
 CLUSTER_NAME.NAME=Cluster name
 
 CLUSTER_VERSION.NAME=Cluster version
+CLUSTER_VERSION.ITEM.EMR5_29_0=EMR 5.29.0
 CLUSTER_VERSION.ITEM.EMR5_15_0=EMR 5.15.0
 CLUSTER_VERSION.ITEM.EMR5_11_0=EMR 5.11.0
 CLUSTER_VERSION.ITEM.EMR4_9_2=EMR 4.9.2

main/plugins/org.talend.designer.components.localprovider/components/tAmazonMysqlOutput/tAmazonMysqlOutput_begin.javajet

@@ -163,7 +163,7 @@ int nb_line_rejected_<%=cid%> = 0;
 int deletedCount_<%=cid%>=0;
 int updatedCount_<%=cid%>=0;
 int insertedCount_<%=cid%>=0;
-
+int rowsToCommitCount_<%=cid%>=0;
 int rejectedCount_<%=cid%>=0;
 
 String tableName_<%=cid%> = <%=table%>;

main/plugins/org.talend.designer.components.localprovider/components/tAmazonMysqlOutput/tAmazonMysqlOutput_end.javajet

@@ -37,7 +37,7 @@ skeleton="../templates/db_output_bulk.skeleton"
 	String dataAction = ElementParameterParser.getValue(node,"__DATA_ACTION__");
 
 	String commitEvery = ElementParameterParser.getValue(node, "__COMMIT_EVERY__");
-	
+
 	boolean setAutoCommit = false;
 
 	boolean useExistingConnection = "true".equals(ElementParameterParser.getValue(node,"__USE_EXISTING_CONNECTION__"));
@@ -121,6 +121,7 @@ skeleton="../templates/db_output_bulk.skeleton"
 							for(int countEach_<%=cid%>: pstmt_<%=cid %>.executeBatch()) {
 								countSum_<%=cid%> += (countEach_<%=cid%> < 0 ? 0 : 1);
 							}
+							rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
 							<%dbLog.batch().executeDone(dbLog.str(dataAction));%>
 	            	    	<%if (("INSERT").equals(dataAction)) {
 	            	    	%>
@@ -141,6 +142,7 @@ skeleton="../templates/db_output_bulk.skeleton"
 					for(int countEach_<%=cid%>: e.getUpdateCounts()) {
 						countSum_<%=cid%> += (countEach_<%=cid%> < 0 ? 0 : countEach_<%=cid%>);
 					}
+					rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
 					<%if (("INSERT").equals(dataAction)) {
             	    %>
             	    insertedCount_<%=cid%> += countSum_<%=cid%>;
@@ -196,6 +198,7 @@ skeleton="../templates/db_output_bulk.skeleton"
 			for(int countEach_<%=cid%>: pstmt_<%=cid %>.executeBatch()) {
 				countSum_<%=cid%> += (countEach_<%=cid%> < 0 ? 0 : <%=("INSERT").equals(dataAction)? "1" : "countEach_" +cid%>);
 			}
+			rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
 			<%dbLog.batch().executeDone(dbLog.str(dataAction));%>
 	    	<%if (("INSERT").equals(dataAction)) {
 	    	%>
@@ -221,6 +224,7 @@ skeleton="../templates/db_output_bulk.skeleton"
 		for(int countEach_<%=cid%>: e.getUpdateCounts()) {
 			countSum_<%=cid%> += (countEach_<%=cid%> < 0 ? 0 : countEach_<%=cid%>);
 		}
+		rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
 		<%if (("INSERT").equals(dataAction)) {
     	%>
     	insertedCount_<%=cid%> += countSum_<%=cid%>;
@@ -254,10 +258,12 @@ skeleton="../templates/db_output_bulk.skeleton"
 		if(!("").equals(commitEvery) && !("0").equals(commitEvery))
 		{
     		%>
-    		if (commitCounter_<%=cid%> > 0) {
-        		<%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
+    		if (commitCounter_<%=cid%> > 0 && rowsToCommitCount_<%=cid%> != 0) {
+        		<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
         		conn_<%=cid%>.commit();
         		<%dbLog.commit().commitDone(null);%>
+        		rowsToCommitCount_<%=cid%> = 0;
+        		commitCounter_<%=cid%> = 0;
     		}
     		<%
 		}

main/plugins/org.talend.designer.components.localprovider/components/tAmazonMysqlOutput/tAmazonMysqlOutput_main.javajet

@@ -631,7 +631,9 @@ if(columnList != null && columnList.size() > 0) {
 	                try {
 	                    nb_line_<%=cid%>++;
 	                    <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-	                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+	                    int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+	                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
+	                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
 	                    <%dbLog.data().inserting(dbLog.var("nb_line"));%>
 	                } catch(java.lang.Exception e) {
 	                    whetherReject_<%=cid%> = true;
@@ -709,7 +711,9 @@ if(columnList != null && columnList.size() > 0) {
                 try {
                     nb_line_<%=cid%>++;
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
                     whetherReject_<%=cid%> = true;
@@ -844,7 +848,9 @@ if(columnList != null && columnList.size() > 0) {
             try {
                 nb_line_<%=cid%>++;
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                updatedCount_<%=cid%> += processedCount_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                 <%dbLog.data().updating(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
@@ -996,7 +1002,9 @@ if(columnList != null && columnList.size() > 0) {
     			%>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmtUpdate_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtUpdate_<%=cid %>.executeUpdate();
+                    updatedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                     nb_line_<%=cid%>++;
         			<%dbLog.data().updating(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -1072,7 +1080,9 @@ if(columnList != null && columnList.size() > 0) {
     			%>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
+                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -1204,7 +1214,7 @@ if(columnList != null && columnList.size() > 0) {
             try {
                 updateFlag_<%=cid%>=pstmtUpdate_<%=cid %>.executeUpdate();
                 updatedCount_<%=cid%> = updatedCount_<%=cid%>+updateFlag_<%=cid%>;
-
+                rowsToCommitCount_<%=cid%> += updateFlag_<%=cid%>;
             if(updateFlag_<%=cid%> == 0) {
 
             	<%
@@ -1250,7 +1260,9 @@ if(columnList != null && columnList.size() > 0) {
                 }
         		%>
              		<%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
+                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
              		nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
     			}else{
@@ -1342,7 +1354,9 @@ if(columnList != null && columnList.size() > 0) {
     		%>
             try {
             	<%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-        	    deletedCount_<%=cid%> = deletedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                deletedCount_<%=cid%> += processedCount_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
             	nb_line_<%=cid%>++;
             	<%dbLog.data().deleting(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
@@ -1410,7 +1424,9 @@ if(columnList != null && columnList.size() > 0) {
             %>
             int replaceCount_<%=cid%> = 0;
             try {
-                replaceCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                replaceCount_<%=cid%> += processedCount_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                 <%dbLog.data().replacing(null);%>
             } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
@@ -1490,7 +1506,9 @@ if(columnList != null && columnList.size() > 0) {
             int count_on_duplicate_key_<%=cid%> = 0;
             try {
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                count_on_duplicate_key_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                count_on_duplicate_key_<%=cid%> += processedCount_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                 <%dbLog.data().insertingOnDuplicateKeyUpdating(null);%>
             } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
@@ -1556,7 +1574,9 @@ if(columnList != null && columnList.size() > 0) {
                 try {
                     nb_line_<%=cid%>++;
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                     <%dbLog.data().insertingOnDuplicateKeyUpdating(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
                     whetherReject_<%=cid%> = true;
@@ -1627,6 +1647,7 @@ if(columnList != null && columnList.size() > 0) {
 						for(int countEach_<%=cid%>: pstmt_<%=cid %>.executeBatch()) {
 							countSum_<%=cid%> += (countEach_<%=cid%> < 0 ? 0 : 1);
 						}
+						rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
 						<%dbLog.batch().executeDone(dbLog.str(dataAction));%>
             	    	<%if (("INSERT").equals(dataAction)) {
             	    	%>
@@ -1645,6 +1666,7 @@ if(columnList != null && columnList.size() > 0) {
 					for(int countEach_<%=cid%>: e.getUpdateCounts()) {
 						countSum_<%=cid%> += (countEach_<%=cid%> < 0 ? 0 : countEach_<%=cid%>);
 					}
+					rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
 					<%if (("INSERT").equals(dataAction)) {
             	    %>
             	    insertedCount_<%=cid%> += countSum_<%=cid%>;
@@ -1674,6 +1696,7 @@ if(columnList != null && columnList.size() > 0) {
 						for(int countEach_<%=cid%>: pstmt_<%=cid %>.executeBatch()) {
 							countSum_<%=cid%> += (countEach_<%=cid%> < 0 ? 0 : countEach_<%=cid%>);
 						}
+						rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
 						<%dbLog.batch().executeDone(dbLog.str(dataAction));%>
             	    	<%
             	    	 if (("UPDATE").equals(dataAction)) {
@@ -1697,6 +1720,7 @@ if(columnList != null && columnList.size() > 0) {
 					for(int countEach_<%=cid%>: e.getUpdateCounts()) {
 						countSum_<%=cid%> += (countEach_<%=cid%> < 0 ? 0 : countEach_<%=cid%>);
 					}
+					rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
 					<%if (("UPDATE").equals(dataAction)) {%>
             	    updatedCount_<%=cid%> += countSum_<%=cid%>;
             	    <% }else if (("DELETE").equals(dataAction)) {%>
@@ -1727,6 +1751,7 @@ if(columnList != null && columnList.size() > 0) {
 						for(int countEach_<%=cid%>: pstmt_<%=cid %>.executeBatch()) {
 							countSum_<%=cid%> += (countEach_<%=cid%> < 0 ? 0 : <%=("INSERT").equals(dataAction)? "1" : "countEach_" +cid%>);
 						}
+						rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
 						<%dbLog.batch().executeDone(dbLog.str(dataAction));%>
             	    	<%if (("INSERT").equals(dataAction)) {
             	    	%>
@@ -1753,6 +1778,7 @@ if(columnList != null && columnList.size() > 0) {
 					for(int countEach_<%=cid%>: e.getUpdateCounts()) {
 						countSum_<%=cid%> += (countEach_<%=cid%> < 0 ? 0 : countEach_<%=cid%>);
 					}
+					rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
 					<%if (("INSERT").equals(dataAction)) {
         	    	%>
         	    	insertedCount_<%=cid%> += countSum_<%=cid%>;
@@ -1775,9 +1801,12 @@ if(columnList != null && columnList.size() > 0) {
                 <%
                 }
                 %>
-                	<%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
-                	conn_<%=cid%>.commit();
-            		<%dbLog.commit().commitDone(null);%>
+                    if(rowsToCommitCount_<%=cid%> != 0){
+                    	<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
+                    	conn_<%=cid%>.commit();
+                    	<%dbLog.commit().commitDone(null);%>
+                    	rowsToCommitCount_<%=cid%> = 0;
+                    }
                 	commitCounter_<%=cid%>=0;
                 }
                 <%

main/plugins/org.talend.designer.components.localprovider/components/tAmazonOracleOutput/tAmazonOracleOutput_begin.javajet

@@ -188,6 +188,7 @@ int tmp_batchUpdateCount_<%=cid%> = 0;
 int deletedCount_<%=cid%>=0;
 int updatedCount_<%=cid%>=0;
 int insertedCount_<%=cid%>=0;
+int rowsToCommitCount_<%=cid%>=0;
 int rejectedCount_<%=cid%>=0;
 
 boolean whetherReject_<%=cid%> = false;

main/plugins/org.talend.designer.components.localprovider/components/tAmazonOracleOutput/tAmazonOracleOutput_end.javajet

@@ -209,6 +209,7 @@ imports="
 	    	    	<%
 	    	    	}%>
 	    	    	+= (tmp_batchUpdateCount_<%=cid%>!=-1?tmp_batchUpdateCount_<%=cid%>:0);
+	    	    	rowsToCommitCount_<%=cid%> += tmp_batchUpdateCount_<%=cid%> != -1 ? tmp_batchUpdateCount_<%=cid%> : 0;
                 }
             }
         <% } %>
@@ -226,10 +227,12 @@ imports="
 		if(!("").equals(commitEvery) && !("0").equals(commitEvery))
 		{
 		    %>
-		    if (commitCounter_<%=cid%> > 0 ) {
-    		    <%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
+		    if (commitCounter_<%=cid%> > 0 && rowsToCommitCount_<%=cid%> != 0) {
+    		    <%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
     		    conn_<%=cid%>.commit();
     		    <%dbLog.commit().commitDone(null);%>
+    		    rowsToCommitCount_<%=cid%> = 0;
+    		    commitCounter_<%=cid%> = 0;
 		    }
 		    <%
 		}

main/plugins/org.talend.designer.components.localprovider/components/tAmazonOracleOutput/tAmazonOracleOutput_main.javajet

@@ -454,7 +454,9 @@ IMetadataColumn talendDynCol = null;
             try {
                 nb_line_<%=cid%>++;
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                 <%dbLog.data().inserting(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
@@ -596,7 +598,9 @@ IMetadataColumn talendDynCol = null;
              try {
                 nb_line_<%=cid%>++;
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                updatedCount_<%=cid%> += processedCount_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                 <%dbLog.data().updating(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
@@ -761,7 +765,9 @@ IMetadataColumn talendDynCol = null;
     			%>
                 try {
         			<%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-        			updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmtUpdate_<%=cid %>.executeUpdate();
+        			int processedCount_<%=cid%> = pstmtUpdate_<%=cid %>.executeUpdate();
+        			updatedCount_<%=cid%> += processedCount_<%=cid%>;
+        			rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
         			nb_line_<%=cid%>++;
         			<%dbLog.data().updating(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -842,7 +848,9 @@ IMetadataColumn talendDynCol = null;
     			%>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
+                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -980,6 +988,7 @@ IMetadataColumn talendDynCol = null;
             try {
                 updateFlag_<%=cid%> = pstmtUpdate_<%=cid %>.executeUpdate();
                 updatedCount_<%=cid%> = updatedCount_<%=cid%>+updateFlag_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += updateFlag_<%=cid%>;
             if(updateFlag_<%=cid%> == 0) {
 
 				<%
@@ -1028,7 +1037,9 @@ IMetadataColumn talendDynCol = null;
                 }
         		%>
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
+                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
     			}else{
@@ -1123,7 +1134,9 @@ IMetadataColumn talendDynCol = null;
     		%>
             try {
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                deletedCount_<%=cid%> = deletedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                deletedCount_<%=cid%> += processedCount_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                 nb_line_<%=cid%>++;
                 <%dbLog.data().deleting(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
@@ -1222,6 +1235,7 @@ IMetadataColumn talendDynCol = null;
         	    	<%
         	    	}%>
         	    	+= (tmp_batchUpdateCount_<%=cid%>!=-1?tmp_batchUpdateCount_<%=cid%>:0);
+        	    	rowsToCommitCount_<%=cid%> += tmp_batchUpdateCount_<%=cid%> != -1 ? tmp_batchUpdateCount_<%=cid%> : 0;
         	    	batchSizeCounter_<%=cid%> = 0;
     			}
 	    		<%
@@ -1271,15 +1285,19 @@ IMetadataColumn talendDynCol = null;
 		    	    	<%
 		    	    	}%>
 		    	    	+= (tmp_batchUpdateCount_<%=cid%>!=-1?tmp_batchUpdateCount_<%=cid%>:0);
+		    	    	rowsToCommitCount_<%=cid%> += tmp_batchUpdateCount_<%=cid%> != -1 ? tmp_batchUpdateCount_<%=cid%> : 0;
 		    	    	batchSizeCounter_<%=cid%> = 0;
 		    	    	}
 	                <%
 	                }
 	                %>
-	                <%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
-                	conn_<%=cid%>.commit();
-    				<%dbLog.commit().commitDone(null);%>
-                	commitCounter_<%=cid%>=0;
+	                if(rowsToCommitCount_<%=cid%> != 0){
+	                	<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
+	                	conn_<%=cid%>.commit();
+	                	<%dbLog.commit().commitDone(null);%>
+	                	rowsToCommitCount_<%=cid%> = 0;
+	                }
+	                commitCounter_<%=cid%>=0;
                 }
                 <%
     		}

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseOutput/tAzureSynapseOutput_begin.javajet

@@ -94,6 +94,7 @@ int nb_line_rejected_<%=cid%> = 0;
 int deletedCount_<%=cid%>=0;
 int updatedCount_<%=cid%>=0;
 int insertedCount_<%=cid%>=0;
+int rowsToCommitCount_<%=cid%>=0;
 int rejectedCount_<%=cid%>=0;
 String dbschema_<%=cid%> = null;
 String tableName_<%=cid%> = null;

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseOutput/tAzureSynapseOutput_end.javajet

@@ -376,7 +376,9 @@ skeleton="../templates/db_output_bulk.skeleton"
 
 		    row2Count<%=cid%>++;
 		}
-		insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+		int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+		insertedCount_<%=cid%> += processedCount_<%=cid%>;
+		rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
 		}
    <% }else {
    %>
@@ -393,6 +395,7 @@ skeleton="../templates/db_output_bulk.skeleton"
 								}
 								countSum_<%=cid%> += countEach_<%=cid%>;
 							}
+							rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
 							<%dbLog.batch().executeDone(dbLog.str(dataAction));%>
 						}
             	    	<%if (("INSERT").equals(dataAction)) {
@@ -419,6 +422,7 @@ skeleton="../templates/db_output_bulk.skeleton"
 					for(int countEach_<%=cid%>: e.getUpdateCounts()) {
 						countSum_<%=cid%> += (countEach_<%=cid%> < 0 ? 0 : countEach_<%=cid%>);
 					}
+					rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
 					<%if (("INSERT").equals(dataAction)) {
             	    	%>
             	    		insertedCount_<%=cid%> += countSum_<%=cid%>;
@@ -475,9 +479,13 @@ if(identityInsert){
         if(!("").equals(commitEvery) && !("0").equals(commitEvery))
         {
             %>
-            <%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
-            conn_<%=cid%>.commit();
-			<%dbLog.commit().commitDone(null);%>
+            if(rowsToCommitCount_<%=cid%> != 0){
+            	<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
+            	conn_<%=cid%>.commit();
+            	<%dbLog.commit().commitDone(null);%>
+            	rowsToCommitCount_<%=cid%> = 0;
+            	commitCounter_<%=cid%> = 0;
+            }
             <%
         }
 

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseOutput/tAzureSynapseOutput_main.javajet

@@ -581,7 +581,9 @@ if((cid.equals("talendLogs_DB") || cid.equals("talendStats_DB") || cid.equals("t
 %>
                 nb_line_<%=cid%>++;
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                 <%dbLog.data().inserting(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
@@ -703,7 +705,9 @@ if((cid.equals("talendLogs_DB") || cid.equals("talendStats_DB") || cid.equals("t
 				}
 		%>
 		                if(rowCount<%=cid%> == <%=batchSize%>){
-		                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+		                    int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+		                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
+		                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
 		                    sInsertColValueList<%=cid%>.clear();
 		                    rowCount<%=cid%> = 0;
 		                    counter<%=cid%>=1;
@@ -828,7 +832,9 @@ if((cid.equals("talendLogs_DB") || cid.equals("talendStats_DB") || cid.equals("t
 %>
                 nb_line_<%=cid%>++;
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                updatedCount_<%=cid%> += processedCount_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
         	    <%dbLog.data().updating(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
@@ -998,7 +1004,9 @@ if((cid.equals("talendLogs_DB") || cid.equals("talendStats_DB") || cid.equals("t
 				}//end issue0010403 date type
 %>
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmtUpdate_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtUpdate_<%=cid %>.executeUpdate();
+                    updatedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                     nb_line_<%=cid%>++;
         			<%dbLog.data().updating(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -1090,7 +1098,9 @@ if((cid.equals("talendLogs_DB") || cid.equals("talendStats_DB") || cid.equals("t
 				}//end issue0010403 date type
 %>
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
+                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -1237,6 +1247,7 @@ if((cid.equals("talendLogs_DB") || cid.equals("talendStats_DB") || cid.equals("t
 %>
                 updateFlag_<%=cid%>=pstmtUpdate_<%=cid %>.executeUpdate();
                 updatedCount_<%=cid%> = updatedCount_<%=cid%>+updateFlag_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += updateFlag_<%=cid%>;
             if(updateFlag_<%=cid%> == 0) {
             	<%
             	if(isEnableDebug) {
@@ -1283,7 +1294,9 @@ if((cid.equals("talendLogs_DB") || cid.equals("talendStats_DB") || cid.equals("t
                 }
                 %>
 					<%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
+                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
 					nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
     			}else{
@@ -1393,7 +1406,9 @@ if((cid.equals("talendLogs_DB") || cid.equals("talendStats_DB") || cid.equals("t
 				}//end issue0010403 date type
 %>
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                deletedCount_<%=cid%> = deletedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                deletedCount_<%=cid%> += processedCount_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                 nb_line_<%=cid%>++;
                 <%dbLog.data().deleting(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
@@ -1512,7 +1527,9 @@ if((cid.equals("talendLogs_DB") || cid.equals("talendStats_DB") || cid.equals("t
 				}//end issue0010403 date type
 %>
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
+                int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
+                insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                 nb_line_<%=cid%>++;
                 <%dbLog.data().inserting(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
@@ -1686,14 +1703,17 @@ if((cid.equals("talendLogs_DB") || cid.equals("talendStats_DB") || cid.equals("t
     		            <%if (("INSERT").equals(dataAction)) {
             	    	%>
             	    		insertedCount_<%=cid%> = new LimitBytesHelper_<%=cid%>().limitBytePart1(insertedCount_<%=cid%>,pstmt_<%=cid %>);
+            	    		rowsToCommitCount_<%=cid%> = insertedCount_<%=cid%>;
             	    	<%
             	    	}else if (("UPDATE").equals(dataAction)) {
             	    	%>
             	    		updatedCount_<%=cid%> = new LimitBytesHelper_<%=cid%>().limitBytePart1(updatedCount_<%=cid%>,pstmt_<%=cid %>);
+            	    		rowsToCommitCount_<%=cid%> = updatedCount_<%=cid%>;
             	    	<%
             	    	}else if (("DELETE").equals(dataAction)) {
             	    	%>
             	    	    deletedCount_<%=cid%> = new LimitBytesHelper_<%=cid%>().limitBytePart1(deletedCount_<%=cid%>,pstmt_<%=cid %>);
+            	    	    rowsToCommitCount_<%=cid%> = deletedCount_<%=cid%>;
             	    	<%
             	    	}%>
             	batchSizeCounter_<%=cid%> = 0;
@@ -1701,9 +1721,12 @@ if((cid.equals("talendLogs_DB") || cid.equals("talendStats_DB") || cid.equals("t
         <%
         }
         %>
-                	<%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
-                	conn_<%=cid%>.commit();
-            		<%dbLog.commit().commitDone(null);%>
+                	if(rowsToCommitCount_<%=cid%> != 0){
+                		<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
+                		conn_<%=cid%>.commit();
+                		<%dbLog.commit().commitDone(null);%>
+                		rowsToCommitCount_<%=cid%> = 0;
+                	}
                 	commitCounter_<%=cid%>=0;
                 }
                 <%

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryBulkExec/tBigQueryBulkExec_begin.javajet

@@ -34,8 +34,8 @@
     String tokenFile = ElementParameterParser.getValue(node,"__TOKEN_NAME__");
 	boolean isLog4jEnabled = ElementParameterParser.getBooleanValue(node.getProcess(), "__LOG4J_ACTIVATE__");
 	boolean dropTable = ElementParameterParser.getBooleanValue(node, "__DROP__");
-	boolean useCustomNullMarker = ElementParameterParser.getBooleanValue(node, "__USE_CUSTOM_NULL_MARKER__");
-	String nullMarker = useCustomNullMarker ? ElementParameterParser.getValue(node, "__CUSTOM_NULL_MARKER__") : "\"\\\\N\"";
+	boolean useCustomNullMarker = ElementParameterParser.getBooleanValue(node, "__USE_CUSTOM_NULL_MARKER__");
+	String nullMarker = useCustomNullMarker ? ElementParameterParser.getValue(node, "__CUSTOM_NULL_MARKER__") : "\"\\\\N\"";
 	String passwordFieldName = "";
 	
 	IConnection incomingConnection = null;
@@ -222,40 +222,87 @@
 	String secretKey = ElementParameterParser.getValue(node, "__GS_SECRET_KEY__");
 	String localFilename = ElementParameterParser.getValue(node, "__GS_LOCAL_FILE__");
 	String bucketName = ElementParameterParser.getValue(node, "__BUCKET_NAME__");
+	String authType = ElementParameterParser.getValue(node, "__AUTH_TYPE__");
+	boolean useServiceAccountForConnection = "GS_SERVICE_ACCOUNT".equals(authType);
+
+
 	if(!bulkFileAlreadyExists) {
-	%>
-		/* ----START-UPLOADING-FILE---- */
-        <%
-        passwordFieldName = "__GS_SECRET_KEY__";
-        %>
-        
-        <%if (ElementParameterParser.canEncrypt(node, passwordFieldName)) {%> 
-        	final String decryptedPwd_<%=cid%> = routines.system.PasswordEncryptUtil.decryptPassword(<%=ElementParameterParser.getEncryptedValue(node, passwordFieldName)%>);
-        <%} else {%>
-        	final String decryptedPwd_<%=cid%> = <%= ElementParameterParser.getValue(node, passwordFieldName)%>; 
-        <%}%>
+		if (!useServiceAccountForConnection){
+			%>
+			/* ----START-UPLOADING-FILE WITH HMAC ACCOUNT---- */
+			<%
+			passwordFieldName = "__GS_SECRET_KEY__";
+			%>
+			
+			<%if (ElementParameterParser.canEncrypt(node, passwordFieldName)) {%> 
+				final String decryptedPwd_<%=cid%> = routines.system.PasswordEncryptUtil.decryptPassword(<%=ElementParameterParser.getEncryptedValue(node, passwordFieldName)%>);
+			<%} else {%>
+				final String decryptedPwd_<%=cid%> = <%= ElementParameterParser.getValue(node, passwordFieldName)%>; 
+			<%}%>
 
 
-		org.jets3t.service.security.GSCredentials gsCredentials_<%=cid%> = new org.jets3t.service.security.GSCredentials(<%=accessKey%>, decryptedPwd_<%=cid%>);
-		<%final String GoogleTracker = org.talend.core.utils.TrackerUtil.getGoogleTracker();%>
-		org.jets3t.service.impl.rest.httpclient.GoogleStorageService gsService_<%=cid%> = new org.jets3t.service.impl.rest.httpclient.GoogleStorageService(gsCredentials_<%=cid%>," <%=GoogleTracker%>",null);
+			org.jets3t.service.security.GSCredentials gsCredentials_<%=cid%> = new org.jets3t.service.security.GSCredentials(<%=accessKey%>, decryptedPwd_<%=cid%>);
+			<%final String GoogleTracker = org.talend.core.utils.TrackerUtil.getGoogleTracker();%>
+			org.jets3t.service.impl.rest.httpclient.GoogleStorageService gsService_<%=cid%> = new org.jets3t.service.impl.rest.httpclient.GoogleStorageService(gsCredentials_<%=cid%>," <%=GoogleTracker%>",null);
 
-		java.io.File fileData_<%=cid%> = new java.io.File(<%=localFilename%>);
-		org.jets3t.service.model.GSObject fileObject_<%=cid%> = new org.jets3t.service.model.GSObject(fileData_<%=cid%>);
-		<%
-		if(isLog4jEnabled){
-		%>
-			log.info("<%=cid%> - Upload "+<%=localFilename%> + " to Google Service Bucket: "+<%=bucketName%>);
-		<%
-		}
-		%>
-		gsService_<%=cid%>.putObject(<%=bucketName%>, fileObject_<%=cid%>);
-		/* ----END-UPLOADING-FILE---- */
-		<%
-		if(isLog4jEnabled){
-		%>
-			log.info("<%=cid%> - Upload Done.");
-		<%
+			java.io.File fileData_<%=cid%> = new java.io.File(<%=localFilename%>);
+			org.jets3t.service.model.GSObject fileObject_<%=cid%> = new org.jets3t.service.model.GSObject(fileData_<%=cid%>);
+			<%
+			if(isLog4jEnabled){
+			%>
+				log.info("<%=cid%> - Upload "+<%=localFilename%> + " to Google Service Bucket: "+<%=bucketName%>);
+			<%
+			}
+			%>
+			gsService_<%=cid%>.putObject(<%=bucketName%>, fileObject_<%=cid%>);
+			/* ----END-UPLOADING-FILE---- */
+			<%
+			if(isLog4jEnabled){
+			%>
+				log.info("<%=cid%> - Upload Done.");
+			<%
+			}
+		} else {
+			String pathToServerAccoutKeyFile = ElementParameterParser.getValue(node, "__GS_SERVICE_ACCOUNT_KEY__");
+			%>
+			/* ----START-UPLOADING-FILE WITH SERVICE ACCOUNT---- */
+			com.google.cloud.storage.Storage storage_<%=cid%> = null;
+			com.google.auth.Credentials credential_<%=cid%> = null;
+			try {
+				credential_<%=cid%> = com.google.auth.oauth2.GoogleCredentials
+						.fromStream(new java.io.FileInputStream(<%=pathToServerAccoutKeyFile%>));
+			} catch (IOException e_<%=cid%>) {
+				<%
+				if (("true").equals(dieOnError)) {
+				%>
+					throw(e_<%=cid%>);
+				<%
+				}
+				%>
+				<%
+				if(isLog4jEnabled){
+				%>
+					log.error("<%=cid%> - Exception in component <%=cid%>.", e_<%=cid%>);
+				<%
+				}
+				%>
+			}
+			com.google.cloud.storage.StorageOptions.Builder builder = com.google.cloud.storage.StorageOptions.newBuilder();
+			storage_<%=cid%> = builder.setCredentials(credential_<%=cid%>).build().getService();
+
+			java.io.File file_<%=cid%> = new java.io.File(<%=localFilename%>);
+
+			com.google.cloud.storage.BlobInfo blobInfo_<%=cid%> = com.google.cloud.storage.BlobInfo.
+							newBuilder(<%=bucketName%>, file_<%=cid%>.getName()).build();
+			storage_<%=cid%>.create(blobInfo_<%=cid%>, java.nio.file.Files.readAllBytes(file_<%=cid%>.toPath()));
+			<%
+			if(isLog4jEnabled){
+			%>
+				log.info("<%=cid%> - Upload Done.");
+			<%
+			}
+			%>
+			<%
 		}
 	}
 	%>
@@ -454,7 +501,7 @@
 		queryLoad_<%=cid%>.setDestinationTable(destinationTable_<%=cid%>);
 		queryLoad_<%=cid%>.setSourceUris(java.util.Arrays.asList(<%=gsFile%>));
 		queryLoad_<%=cid%>.setSkipLeadingRows(<%=gsFileHeader%>);
-		queryLoad_<%=cid%>.setNullMarker(<%= nullMarker %>);
+		queryLoad_<%=cid%>.setNullMarker(<%= nullMarker %>);
 		config_<%=cid%>.setLoad(queryLoad_<%=cid%>);
 		
 		job_<%=cid%>.setConfiguration(config_<%=cid%>);

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

@@ -124,19 +124,63 @@
 		<ITEM NAME="EMPTY" VALUE="EMPTY" />
 	</ITEMS>
     </PARAMETER>
-    <PARAMETER NAME="BULK_FILE_ALREADY_EXIST" FIELD="CHECK" NUM_ROW="59" REQUIRED="true" GROUP="GS_CONF">
-	<DEFAULT>false</DEFAULT>
+
+    <PARAMETER 
+      NAME="BULK_FILE_ALREADY_EXIST" 
+      FIELD="CHECK" 
+      NUM_ROW="58" 
+      REQUIRED="true" 
+      GROUP="GS_CONF">
+      <DEFAULT>false</DEFAULT>
     </PARAMETER>
-    <PARAMETER NAME="GS_ACCESS_KEY" FIELD="TEXT" NUM_ROW="60" REQUIRED="true" GROUP="GS_CONF" SHOW_IF="BULK_FILE_ALREADY_EXIST=='false'">
+
+    <PARAMETER
+      NAME="AUTH_TYPE"
+      FIELD="CLOSED_LIST"
+      NUM_ROW="59"
+      GROUP="GS_CONF"
+      SHOW_IF="(BULK_FILE_ALREADY_EXIST=='false')"
+      >
+      <ITEMS DEFAULT="GS_SERVICE_ACCOUNT">
+        <ITEM NAME="USER_ACCOUNT_HMAC" VALUE="USER_ACCOUNT_HMAC"/>
+        <ITEM NAME="GS_SERVICE_ACCOUNT" VALUE="GS_SERVICE_ACCOUNT"/>
+      </ITEMS>
+    </PARAMETER>
+
+    <PARAMETER 
+      NAME="GS_ACCESS_KEY" 
+      FIELD="TEXT" 
+      NUM_ROW="60" 
+      REQUIRED="true" 
+      GROUP="GS_CONF" 
+      SHOW_IF="(BULK_FILE_ALREADY_EXIST=='false') AND (AUTH_TYPE == 'USER_ACCOUNT_HMAC')">
       <DEFAULT>""</DEFAULT>
     </PARAMETER>
-    <PARAMETER NAME="GS_SECRET_KEY" FIELD="PASSWORD" NUM_ROW="61" REQUIRED="true" GROUP="GS_CONF" SHOW_IF="BULK_FILE_ALREADY_EXIST=='false'">
+
+    <PARAMETER 
+      NAME="GS_SECRET_KEY" 
+      FIELD="PASSWORD" 
+      NUM_ROW="61" 
+      REQUIRED="true" 
+      GROUP="GS_CONF" 
+      SHOW_IF="(BULK_FILE_ALREADY_EXIST=='false') AND (AUTH_TYPE == 'USER_ACCOUNT_HMAC')">
       <DEFAULT>""</DEFAULT>
     </PARAMETER>
-    <PARAMETER NAME="GS_LOCAL_FILE" FIELD="FILE" NUM_ROW="62" REQUIRED="true" GROUP="GS_CONF" SHOW_IF="BULK_FILE_ALREADY_EXIST=='false'">
+
+    <PARAMETER
+      NAME="GS_SERVICE_ACCOUNT_KEY"
+      FIELD="FILE"
+      NUM_ROW="62"
+      REQUIRED_IF="(BULK_FILE_ALREADY_EXIST=='false') AND (AUTH_TYPE == 'GS_SERVICE_ACCOUNT')"
+      SHOW_IF="(BULK_FILE_ALREADY_EXIST=='false') AND (AUTH_TYPE == 'GS_SERVICE_ACCOUNT')"
+      GROUP="GS_CONF">
+      <DEFAULT>"__COMP_DEFAULT_FILE_DIR__/key.json"</DEFAULT>
+    </PARAMETER>
+
+    <PARAMETER NAME="GS_LOCAL_FILE" FIELD="FILE" NUM_ROW="63" REQUIRED="true" GROUP="GS_CONF" SHOW_IF="BULK_FILE_ALREADY_EXIST=='false'">
       <DEFAULT>""</DEFAULT>
     </PARAMETER>
-    <PARAMETER NAME="BUCKET_NAME" FIELD="TEXT" NUM_ROW="63" REQUIRED="true" GROUP="GS_CONF" SHOW_IF="BULK_FILE_ALREADY_EXIST=='false'">
+    <PARAMETER NAME="BUCKET_NAME" FIELD="TEXT" NUM_ROW="64" REQUIRED="true" GROUP="GS_CONF" SHOW_IF="BULK_FILE_ALREADY_EXIST=='false'">
       <DEFAULT>""</DEFAULT>
     </PARAMETER>
     <PARAMETER
@@ -206,16 +250,31 @@
         <IMPORT NAME="google-cloud-bigquery-1.60.0.jar" MODULE="google-cloud-bigquery-1.60.0.jar" MVN="mvn:com.google.cloud/google-cloud-bigquery/1.60.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
 		<IMPORT NAME="google-http-client-jackson-1.25.0.jar" MODULE="google-http-client-jackson-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson/1.25.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
 		<IMPORT NAME="threetenbp-1.3.3.jar" MODULE="threetenbp-1.3.3.jar" MVN="mvn:org.threeten/threetenbp/1.3.3" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
-		<IMPORT NAME="google-auth-library-credentials-0.9.1.jar" MODULE="google-auth-library-credentials-0.9.1.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.9.1" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
+		<IMPORT NAME="google-auth-library-credentials-0.20.0.jar" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
 		<IMPORT NAME="gax-httpjson-0.44.0.jar" MODULE="gax-httpjson-0.44.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.44.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
 		<IMPORT NAME="jackson-core-asl-1.9.13.jar" MODULE="jackson-core-asl-1.9.13.jar" MVN="mvn:org.codehaus.jackson/jackson-core-asl/1.9.13" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
-		<IMPORT NAME="google-auth-library-oauth2-http-0.9.1.jar" MODULE="google-auth-library-oauth2-http-0.9.1.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.9.1" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
-		<IMPORT NAME="google-cloud-core-1.32.0.jar" MODULE="google-cloud-core-1.32.0.jar" MVN="mvn:com.google.cloud/google-cloud-core/1.32.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
+		<IMPORT NAME="google-auth-library-oauth2-http-0.20.0.jar" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
+		<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_MODE == 'SERVICEACCOUNT'" />
 		<IMPORT NAME="google-cloud-core-http-1.32.0.jar" MODULE="google-cloud-core-http-1.32.0.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.32.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
 		<IMPORT NAME="guava-20.0.jar" MODULE="guava-20.0.jar" MVN="mvn:com.google.guava/guava/20.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
-		<IMPORT NAME="gax-1.27.0.jar" MODULE="gax-1.27.0.jar" MVN="mvn:com.google.api/gax/1.27.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
-		<IMPORT NAME="google-http-client-appengine-1.25.0.jar" MODULE="google-http-client-appengine-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.25.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
-		<IMPORT NAME="api-common-1.6.0.jar" MODULE="api-common-1.6.0.jar" MVN="mvn:com.google.api/api-common/1.6.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
+		<IMPORT NAME="gax-1.27.0.jar" MODULE="gax-1.27.0.jar" MVN="mvn:com.google.api/gax/1.27.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT')" />
+		<IMPORT NAME="google-http-client-appengine-1.25.0.jar" MODULE="google-http-client-appengine-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.25.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT')" />
+		<IMPORT NAME="api-common-1.6.0.jar" MODULE="api-common-1.6.0.jar" MVN="mvn:com.google.api/api-common/1.6.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT')" />
+
+    <IMPORT NAME="google-cloud-storage-1.104.0" MODULE="google-cloud-storage-1.104.0.jar" MVN="mvn:com.google.cloud/google-cloud-storage/1.104.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT')" />
+      <!-- Transitive dependencies of google-cloud-storage -->
+      <IMPORT NAME="google-api-services-storage-v1-rev20191011-1.30.3" MODULE="google-api-services-storage-v1-rev20191011-1.30.3.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20191011-1.30.3" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT')" />
+      <IMPORT NAME="gson-2.8.6" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT')" />
+      <IMPORT NAME="javax.annotation-api" MODULE="javax.annotation-api-1.3.jar" MVN="mvn:javax.annotation/javax.annotation-api/1.3" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT')" />
+      <IMPORT NAME="protobuf-java-2.5.0" MODULE="protobuf-java-2.5.0.jar" MVN="mvn:com.google.protobuf/protobuf-java/2.5.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT')" />
+      <IMPORT NAME="error_prone_annotation-2.1.3" MODULE="error_prone_annotation-2.1.3.jar" MVN="mvn:com.google.errorprone/error_prone_annotations/2.1.3" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT')" />
+      <IMPORT NAME="opencensus-api-0.21.0" MODULE="opencensus-api-0.21.0.jar" MVN="mvn:io.opencensus/opencensus-api/0.21.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT')" />
+      <IMPORT NAME="opencensus-contrib-http-util-0.21.0" MODULE="opencensus-contrib-http-util-0.21.0.jar" MVN="mvn:io.opencensus/opencensus-contrib-http-util/0.21.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT')" />
+      <IMPORT NAME="grpc-context-1.19.0" MODULE="grpc-context-1.19.0.jar" MVN="mvn:io.grpc/grpc-context/1.19.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT')" />
+      <IMPORT NAME="proto-google-common-protos-1.17.0" MODULE="proto-google-common-protos-1.17.0.jar" MVN="mvn:com.google.api.grpc/proto-google-common-protos/1.17.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT')" />
+      <IMPORT NAME="proto-google-iam-v1-0.13.0" MODULE="proto-google-iam-v1-0.13.0.jar" MVN="mvn:com.google.api.grpc/proto-google-iam-v1/0.13.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT')" />
+      <IMPORT NAME="protobuf-java-util-3.11.4" MODULE="protobuf-java-util-3.11.4.jar" MVN="mvn:com.google.protobuf/protobuf-java-util/3.11.4" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT')" />
+      <IMPORT NAME="annotation-1.1.0" MODULE="annotation-1.1.0.jar" MVN="mvn:androidx.annotation/annotation/1.1.0" REQUIRED_IF="(AUTH_TYPE == 'GS_SERVICE_ACCOUNT')" />
      </IMPORTS>
    </CODEGENERATION>
    <RETURNS>

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

@@ -45,3 +45,8 @@ CUSTOM_NULL_MARKER.NAME=
 DROP.NAME=Drop table if exists
 
 DIE_ON_ERROR.NAME=Die on error
+
+AUTH_TYPE.NAME=Credential type
+AUTH_TYPE.ITEM.USER_ACCOUNT_HMAC=HMAC key (deprecated)
+AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=Service account
+GS_SERVICE_ACCOUNT_KEY.NAME=Service account key

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

@@ -30,3 +30,7 @@ AUTH_MODE.NAME=Authentication mode
 AUTH_MODE.ITEM.SERVICEACCOUNT=Service account
 AUTH_MODE.ITEM.OAUTH=OAuth 2.0
 DROP.NAME=Drop table if exists
+AUTH_TYPE.NAME=Credential type
+AUTH_TYPE.ITEM.USER_ACCOUNT_HMAC=HMAC key (deprecated)
+AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=Service account
+GS_SERVICE_ACCOUNT_KEY.NAME=Service account key

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

@@ -190,11 +190,11 @@
 		<IMPORT NAME="google-cloud-bigquery-1.60.0.jar" MODULE="google-cloud-bigquery-1.60.0.jar" MVN="mvn:com.google.cloud/google-cloud-bigquery/1.60.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
 		<IMPORT NAME="google-http-client-jackson-1.25.0.jar" MODULE="google-http-client-jackson-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson/1.25.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
 		<IMPORT NAME="threetenbp-1.3.3.jar" MODULE="threetenbp-1.3.3.jar" MVN="mvn:org.threeten/threetenbp/1.3.3" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
-		<IMPORT NAME="google-auth-library-credentials-0.9.1.jar" MODULE="google-auth-library-credentials-0.9.1.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.9.1" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
+		<IMPORT NAME="google-auth-library-credentials-0.20.0.jar" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
 		<IMPORT NAME="gax-httpjson-0.44.0.jar" MODULE="gax-httpjson-0.44.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.44.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
 		<IMPORT NAME="jackson-core-asl-1.9.13.jar" MODULE="jackson-core-asl-1.9.13.jar" MVN="mvn:org.codehaus.jackson/jackson-core-asl/1.9.13" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
-		<IMPORT NAME="google-auth-library-oauth2-http-0.9.1.jar" MODULE="google-auth-library-oauth2-http-0.9.1.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.9.1" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
-		<IMPORT NAME="google-cloud-core-1.32.0.jar" MODULE="google-cloud-core-1.32.0.jar" MVN="mvn:com.google.cloud/google-cloud-core/1.32.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
+		<IMPORT NAME="google-auth-library-oauth2-http-0.20.0.jar" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
+		<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_MODE == 'SERVICEACCOUNT'" />
 		<IMPORT NAME="google-cloud-core-http-1.32.0.jar" MODULE="google-cloud-core-http-1.32.0.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.32.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
 		<IMPORT NAME="guava-20.0.jar" MODULE="guava-20.0.jar" MVN="mvn:com.google.guava/guava/20.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
 		<IMPORT NAME="gax-1.27.0.jar" MODULE="gax-1.27.0.jar" MVN="mvn:com.google.api/gax/1.27.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryOutput/tBigQueryOutput_java.xml

@@ -153,12 +153,48 @@
 	<DEFAULT>false</DEFAULT>
     </PARAMETER>
 
-    <PARAMETER NAME="GS_ACCESS_KEY" FIELD="TEXT" NUM_ROW="60" REQUIRED="true" GROUP="GS_CONF" SHOW_IF="BULK_FILE_ALREADY_EXIST=='false'">
+    <PARAMETER
+      NAME="AUTH_TYPE"
+      FIELD="CLOSED_LIST"
+      NUM_ROW="58"
+      GROUP="GS_CONF"
+      SHOW_IF="(BULK_FILE_ALREADY_EXIST=='false')">
+      <ITEMS DEFAULT="GS_SERVICE_ACCOUNT">
+        <ITEM NAME="USER_ACCOUNT_HMAC" VALUE="USER_ACCOUNT_HMAC"/>
+        <ITEM NAME="GS_SERVICE_ACCOUNT" VALUE="GS_SERVICE_ACCOUNT"/>
+      </ITEMS>
+    </PARAMETER>
+
+    <PARAMETER 
+      NAME="GS_ACCESS_KEY" 
+      FIELD="TEXT" 
+      NUM_ROW="60" 
+      REQUIRED="true" 
+      GROUP="GS_CONF" 
+      SHOW_IF="(BULK_FILE_ALREADY_EXIST=='false') AND (AUTH_TYPE == 'USER_ACCOUNT_HMAC')">
       <DEFAULT>""</DEFAULT>
     </PARAMETER>
-    <PARAMETER NAME="GS_SECRET_KEY" FIELD="PASSWORD" NUM_ROW="61" REQUIRED="true" GROUP="GS_CONF" SHOW_IF="BULK_FILE_ALREADY_EXIST=='false'">
+
+    <PARAMETER 
+      NAME="GS_SECRET_KEY" 
+      FIELD="PASSWORD" 
+      NUM_ROW="61" 
+      REQUIRED="true" 
+      GROUP="GS_CONF" 
+      SHOW_IF="(BULK_FILE_ALREADY_EXIST=='false') AND (AUTH_TYPE == 'USER_ACCOUNT_HMAC')">
       <DEFAULT>""</DEFAULT>
     </PARAMETER>
+
+    <PARAMETER
+      NAME="GS_SERVICE_ACCOUNT_KEY"
+      FIELD="FILE"
+      NUM_ROW="62"
+      REQUIRED_IF="(BULK_FILE_ALREADY_EXIST=='false') AND (AUTH_TYPE == 'GS_SERVICE_ACCOUNT')"
+      SHOW_IF="(BULK_FILE_ALREADY_EXIST=='false') AND (AUTH_TYPE == 'GS_SERVICE_ACCOUNT')"
+      GROUP="GS_CONF">
+      <DEFAULT>"__COMP_DEFAULT_FILE_DIR__/key.json"</DEFAULT>
+    </PARAMETER>
+
     <PARAMETER NAME="BUCKET_NAME" FIELD="TEXT" NUM_ROW="63" REQUIRED="true" GROUP="GS_CONF" SHOW_IF="BULK_FILE_ALREADY_EXIST=='false'">
       <DEFAULT>""</DEFAULT>
     </PARAMETER>
@@ -275,6 +311,8 @@
       <TEMPLATE_PARAM SOURCE="self.TABLE"   TARGET="tBQBE.TABLE" />
       <TEMPLATE_PARAM SOURCE="self.CREATE_TABLE_IF_NOT_EXIST"  TARGET="tBQBE.CREATE_TABLE_IF_NOT_EXIST" />
       <TEMPLATE_PARAM SOURCE="self.ACTION_ON_DATA"  TARGET="tBQBE.ACTION_ON_DATA" />
+      <TEMPLATE_PARAM SOURCE="self.AUTH_TYPE"  TARGET="tBQBE.AUTH_TYPE" />
+      <TEMPLATE_PARAM SOURCE="self.GS_SERVICE_ACCOUNT_KEY"  TARGET="tBQBE.GS_SERVICE_ACCOUNT_KEY" />
       <TEMPLATE_PARAM SOURCE="self.GS_ACCESS_KEY"  TARGET="tBQBE.GS_ACCESS_KEY" />
       <TEMPLATE_PARAM SOURCE="self.GS_SECRET_KEY"  TARGET="tBQBE.GS_SECRET_KEY" />
       <TEMPLATE_PARAM SOURCE="self.BUCKET_NAME"  TARGET="tBQBE.BUCKET_NAME" />

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

@@ -59,3 +59,7 @@ TOKEN_NAME.NAME=token properties File Name
 CHECK_DISK_SPACE.NAME=Check disk space
 
 DIE_ON_ERROR.NAME=Die on error
+AUTH_TYPE.NAME=Credential type
+AUTH_TYPE.ITEM.USER_ACCOUNT_HMAC=HMAC key (deprecated)
+AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=Service account
+GS_SERVICE_ACCOUNT_KEY.NAME=Service account key

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

@@ -44,3 +44,7 @@ SERVICE_ACCOUNT_CREDENTIALS_FILE.NAME=Service account credentials file
 AUTH_MODE.NAME=Authentication mode
 AUTH_MODE.ITEM.SERVICEACCOUNT=Service account
 AUTH_MODE.ITEM.OAUTH=OAuth 2.0
+AUTH_TYPE.NAME=Credential type
+AUTH_TYPE.ITEM.USER_ACCOUNT_HMAC=HMAC key (deprecated)
+AUTH_TYPE.ITEM.GS_SERVICE_ACCOUNT=Service account
+GS_SERVICE_ACCOUNT_KEY.NAME=Service account key

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

@@ -185,18 +185,18 @@
                     REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
             <IMPORT NAME="threetenbp-1.3.3.jar" MODULE="threetenbp-1.3.3.jar" MVN="mvn:org.threeten/threetenbp/1.3.3"
                     REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
-            <IMPORT NAME="google-auth-library-credentials-0.9.1.jar" MODULE="google-auth-library-credentials-0.9.1.jar"
-                    MVN="mvn:com.google.auth/google-auth-library-credentials/0.9.1"
+            <IMPORT NAME="google-auth-library-credentials-0.20.0.jar" MODULE="google-auth-library-credentials-0.20.0.jar"
+                    MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0"
                     REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
             <IMPORT NAME="gax-httpjson-0.44.0.jar" MODULE="gax-httpjson-0.44.0.jar"
                     MVN="mvn:com.google.api/gax-httpjson/0.44.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
             <IMPORT NAME="jackson-core-asl-1.9.13.jar" MODULE="jackson-core-asl-1.9.13.jar"
                     MVN="mvn:org.codehaus.jackson/jackson-core-asl/1.9.13" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
-            <IMPORT NAME="google-auth-library-oauth2-http-0.9.1.jar" MODULE="google-auth-library-oauth2-http-0.9.1.jar"
-                    MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.9.1"
+            <IMPORT NAME="google-auth-library-oauth2-http-0.20.0.jar" MODULE="google-auth-library-oauth2-http-0.20.0.jar"
+                    MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0"
                     REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
-            <IMPORT NAME="google-cloud-core-1.32.0.jar" MODULE="google-cloud-core-1.32.0.jar"
-                    MVN="mvn:com.google.cloud/google-cloud-core/1.32.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
+            <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_MODE == 'SERVICEACCOUNT'"/>
             <IMPORT NAME="google-cloud-core-http-1.32.0.jar" MODULE="google-cloud-core-http-1.32.0.jar"
                     MVN="mvn:com.google.cloud/google-cloud-core-http/1.32.0"
                     REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>

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

@@ -778,6 +778,7 @@
       <DEFAULT IF="DBTYPE=='EXASOL'">Exasol_id</DEFAULT>
       <DEFAULT IF="DBTYPE=='REDSHIFT'">redshift_id</DEFAULT>
       <DEFAULT IF="DBTYPE=='SNOWFLAKE'">snowflake_id</DEFAULT>
+      <DEFAULT IF="DBTYPE=='SYBASE'">sybase_id</DEFAULT>
       <DEFAULT>mysql_id</DEFAULT>
     </PARAMETER>
 

main/plugins/org.talend.designer.components.localprovider/components/tCreateTable/tCreateTable_main.javajet

@@ -138,7 +138,7 @@ abstract class Manager {
                 dataType = metadataColumn.getType();
             }
             
-            Integer length = metadataColumn.getLength() == null ? 0 : metadataColumn.getLength();
+            Integer length = metadataColumn.getLength() == null ? "sybase_id".equalsIgnoreCase(getDBMSId()) ? 1 : 0 : metadataColumn.getLength();
             
             if ("mysql_id".equalsIgnoreCase(getDBMSId()) && dataType.endsWith("UNSIGNED") ) {
             	createTableSQL.append(dataType.substring(0,dataType.indexOf("UNSIGNED"))) ; 

main/plugins/org.talend.designer.components.localprovider/components/tDB2Output/tDB2Output_begin.javajet

@@ -66,6 +66,7 @@ int nb_line_rejected_<%=cid%> = 0;
 int deletedCount_<%=cid%> = 0;
 int updatedCount_<%=cid%> = 0;
 int insertedCount_<%=cid%> = 0;
+int rowsToCommitCount_<%=cid%>=0;
 int rejectedCount_<%=cid%> = 0;
 <%
 getManager(dbmsId, cid, node);

main/plugins/org.talend.designer.components.localprovider/components/tDB2Output/tDB2Output_end.javajet

@@ -93,6 +93,7 @@ imports="
 						countSum_<%=cid%> += (countEach_<%=cid%> < 0 ? 0 : countEach_<%=cid%>);
 					}
 				}
+				rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
 				<%dbLog.batch().executeDone(dbLog.str(dataAction));%>
 			}
 	    	<%if (("INSERT").equals(dataAction)) {
@@ -139,6 +140,7 @@ imports="
 				countSum_<%=cid%> += (countEach_<%=cid%> < 0 ? 0 : countEach_<%=cid%>);
 			}
 		}
+		rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
 		<%if (("INSERT").equals(dataAction)) {
     	%>
     		insertedCount_<%=cid%> += countSum_<%=cid%>;
@@ -171,10 +173,12 @@ imports="
     if(!useExistingConnection) {
         if(!("").equals(commitEvery) && !("0").equals(commitEvery)) {
         %>
-        if (commitCounter_<%=cid%> > 0) {
-        	<%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
+        if (commitCounter_<%=cid%> > 0 && rowsToCommitCount_<%=cid%> != 0) {
+            <%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
             conn_<%=cid%>.commit();
             <%dbLog.commit().commitDone(null);%>
+            rowsToCommitCount_<%=cid%> = 0;
+            commitCounter_<%=cid%> = 0;
         }
         <%
         }

main/plugins/org.talend.designer.components.localprovider/components/tDB2Output/tDB2Output_main.javajet

@@ -348,7 +348,9 @@ skeleton="../templates/db_output_bulk.skeleton"
             try {
                 nb_line_<%=cid%>++;
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                 <%dbLog.data().inserting(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
@@ -505,7 +507,9 @@ skeleton="../templates/db_output_bulk.skeleton"
             try {
                 nb_line_<%=cid%>++;
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                updatedCount_<%=cid%> += processedCount_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                 <%dbLog.data().updating(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
@@ -680,7 +684,9 @@ skeleton="../templates/db_output_bulk.skeleton"
     			%>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmtUpdate_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtUpdate_<%=cid %>.executeUpdate();
+                    updatedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                     nb_line_<%=cid%>++;
         			<%dbLog.data().updating(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -779,7 +785,9 @@ skeleton="../templates/db_output_bulk.skeleton"
     			%>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
+                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -932,6 +940,7 @@ skeleton="../templates/db_output_bulk.skeleton"
             try {
                 updateFlag_<%=cid%>=pstmtUpdate_<%=cid %>.executeUpdate();
                 updatedCount_<%=cid%> = updatedCount_<%=cid%> + updateFlag_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += updateFlag_<%=cid%>;
             if(updateFlag_<%=cid%> == 0) {
             	<%
             	if(isEnableDebug) {
@@ -987,7 +996,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                 }
         		%>
 					<%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
+                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
 					nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
     			}else{
@@ -1093,7 +1104,9 @@ skeleton="../templates/db_output_bulk.skeleton"
     		%>
             try {
             	<%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-            	deletedCount_<%=cid%> = deletedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+            	int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+            	deletedCount_<%=cid%> += processedCount_<%=cid%>;
+            	rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
             	nb_line_<%=cid%>++;
                 <%dbLog.data().deleting(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
@@ -1194,6 +1207,7 @@ skeleton="../templates/db_output_bulk.skeleton"
         						countSum_<%=cid%> += (countEach_<%=cid%> < 0 ? 0 : countEach_<%=cid%>);
         					}
 						}
+						rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
 						<%dbLog.batch().executeDone(dbLog.str(dataAction));%>
             	    	<%if (("INSERT").equals(dataAction)) {
             	    	%>
@@ -1240,6 +1254,7 @@ skeleton="../templates/db_output_bulk.skeleton"
 						countSum_<%=cid%> += (countEach_<%=cid%> < 0 ? 0 : countEach_<%=cid%>);
 					}
 				}
+				rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
 				<%if (("INSERT").equals(dataAction)) {
 				%>
 					insertedCount_<%=cid%> += countSum_<%=cid%>;
@@ -1281,6 +1296,7 @@ skeleton="../templates/db_output_bulk.skeleton"
         						countSum_<%=cid%> += (countEach_<%=cid%> < 0 ? 0 : countEach_<%=cid%>);
         					}
 						}
+						rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
 						<%dbLog.batch().executeDone(dbLog.str(dataAction));%>
             	    	<%if (("INSERT").equals(dataAction)) {
             	    	%>
@@ -1326,6 +1342,7 @@ skeleton="../templates/db_output_bulk.skeleton"
 						countSum_<%=cid%> += (countEach_<%=cid%> < 0 ? 0 : countEach_<%=cid%>);
 					}
 				}
+				rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
 				<%if (("INSERT").equals(dataAction)) {
 				%>
 					insertedCount_<%=cid%> += countSum_<%=cid%>;
@@ -1346,9 +1363,12 @@ skeleton="../templates/db_output_bulk.skeleton"
                 <%
                 }
                 %>
-                	<%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
+                if(rowsToCommitCount_<%=cid%> != 0){
+                	<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
                 	conn_<%=cid%>.commit();
                 	<%dbLog.commit().commitDone(null);%>
+                	rowsToCommitCount_<%=cid%> = 0;
+                }
                 	commitCounter_<%=cid%>=0;
                 }
                 <%

main/plugins/org.talend.designer.components.localprovider/components/tExasolOutput/tExasolOutput_begin.javajet

@@ -153,6 +153,7 @@ int nb_line_rejected_<%=cid%> = 0;
 int deletedCount_<%=cid%>=0;
 int updatedCount_<%=cid%>=0;
 int insertedCount_<%=cid%>=0;
+int rowsToCommitCount_<%=cid%>=0;
 int rejectedCount_<%=cid%>=0;
 
 boolean whetherReject_<%=cid%> = false;

main/plugins/org.talend.designer.components.localprovider/components/tExasolOutput/tExasolOutput_end.javajet

@@ -96,6 +96,7 @@ imports="
                     for(int countEach_<%=cid%>: pstmt_<%=cid %>.executeBatch()) {
                         countSum_<%=cid%> += (countEach_<%=cid%> != java.sql.Statement.EXECUTE_FAILED ? 1 : 0);
                     }
+                        rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
                         <%dbLog.batch().executeDone(dbLog.str(dataAction));%>
                 }
                 <%if (("INSERT").equals(dataAction)) {
@@ -141,6 +142,7 @@ imports="
                     for(int countEach_<%=cid%> : bue_<%=cid%>.getUpdateCounts()) {
                         countSum_<%=cid%> += (countEach_<%=cid%> != java.sql.Statement.EXECUTE_FAILED ? 1 : 0);
                     }
+                    rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
                     <%if (("INSERT").equals(dataAction)) {
 %>
                         insertedCount_<%=cid%> += countSum_<%=cid%>;
@@ -177,9 +179,13 @@ imports="
         if(!("").equals(commitEvery) && !("0").equals(commitEvery))
         {
         %>
-            <%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
-            conn_<%=cid%>.commit();
-            <%dbLog.commit().commitDone(null);%>
+            if(rowsToCommitCount_<%=cid%> != 0){
+            	<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
+            	conn_<%=cid%>.commit();
+            	<%dbLog.commit().commitDone(null);%>
+            	rowsToCommitCount_<%=cid%> = 0;
+            	commitCounter_<%=cid%> = 0;
+            }
         <%
         }
 

main/plugins/org.talend.designer.components.localprovider/components/tExasolOutput/tExasolOutput_main.javajet

@@ -323,7 +323,9 @@ skeleton="@{org.talend.designer.components.localprovider}/components/templates/d
             try {
                 nb_line_<%=cid%>++;
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                 <%dbLog.data().inserting(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
@@ -461,7 +463,9 @@ skeleton="@{org.talend.designer.components.localprovider}/components/templates/d
             try {
                 nb_line_<%=cid%>++;
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                updatedCount_<%=cid%> += processedCount_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                 <%dbLog.data().updating(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
@@ -611,7 +615,9 @@ skeleton="@{org.talend.designer.components.localprovider}/components/templates/d
                 %>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmtUpdate_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtUpdate_<%=cid %>.executeUpdate();
+                    updatedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                     nb_line_<%=cid%>++;
                     <%dbLog.data().updating(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -689,7 +695,9 @@ skeleton="@{org.talend.designer.components.localprovider}/components/templates/d
                 %>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
+                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -819,6 +827,7 @@ skeleton="@{org.talend.designer.components.localprovider}/components/templates/d
             try {
                 updateFlag_<%=cid%> = pstmtUpdate_<%=cid %>.executeUpdate();
                 updatedCount_<%=cid%> = updatedCount_<%=cid%>+updateFlag_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += updateFlag_<%=cid%>;
             if(updateFlag_<%=cid%> == 0) {
                 <%
                 if(isEnableDebug) {
@@ -862,7 +871,9 @@ skeleton="@{org.talend.designer.components.localprovider}/components/templates/d
                 }
                 %>
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
+                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                     }else{
@@ -958,7 +969,9 @@ skeleton="@{org.talend.designer.components.localprovider}/components/templates/d
             %>
             try {
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                deletedCount_<%=cid%> = deletedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                deletedCount_<%=cid%> += processedCount_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                 nb_line_<%=cid%>++;
                 <%dbLog.data().deleting(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
@@ -1036,6 +1049,7 @@ skeleton="@{org.talend.designer.components.localprovider}/components/templates/d
                         for(int countEach_<%=cid%>: pstmt_<%=cid %>.executeBatch()) {
                             countSum_<%=cid%> += (countEach_<%=cid%> != java.sql.Statement.EXECUTE_FAILED ? 1 : 0);
                         }
+                        rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
                             <%dbLog.batch().executeDone(dbLog.str(dataAction));%>
                         <%if (("INSERT").equals(dataAction)) {
                         %>
@@ -1081,6 +1095,7 @@ skeleton="@{org.talend.designer.components.localprovider}/components/templates/d
                             for(int countEach_<%=cid%>: bue_<%=cid%>.getUpdateCounts()) {
                                 countSum_<%=cid%> += (countEach_<%=cid%> != java.sql.Statement.EXECUTE_FAILED ? 1 : 0);
                             }
+                            rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
                             <%if (("INSERT").equals(dataAction)) {
 %>
                                insertedCount_<%=cid%> += countSum_<%=cid%>;
@@ -1120,6 +1135,7 @@ skeleton="@{org.talend.designer.components.localprovider}/components/templates/d
                             countSum_<%=cid%> += (countEach_<%=cid%> != java.sql.Statement.EXECUTE_FAILED ? 1 : 0);
                         }
                             <%dbLog.batch().executeDone(dbLog.str(dataAction));%>
+                        rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
                         <%if (("INSERT").equals(dataAction)) {
                         %>
                             insertedCount_<%=cid%> += countSum_<%=cid%>;
@@ -1164,6 +1180,7 @@ skeleton="@{org.talend.designer.components.localprovider}/components/templates/d
                             for(int countEach_<%=cid%>: bue_<%=cid%>.getUpdateCounts()) {
                                 countSum_<%=cid%> += (countEach_<%=cid%> != java.sql.Statement.EXECUTE_FAILED ? 1 : 0);
                             }
+                            rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
                             <%if (("INSERT").equals(dataAction)) {
 %>
                                 insertedCount_<%=cid%> += countSum_<%=cid%>;
@@ -1187,9 +1204,12 @@ skeleton="@{org.talend.designer.components.localprovider}/components/templates/d
         <%
         }
         %>
-                    <%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
-                    conn_<%=cid%>.commit();
-                    <%dbLog.commit().commitDone(null);%>
+                    if(rowsToCommitCount_<%=cid%> != 0){
+                    	<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
+                    	conn_<%=cid%>.commit();
+                    	<%dbLog.commit().commitDone(null);%>
+                    	rowsToCommitCount_<%=cid%> = 0;
+                    }
                     commitCounter_<%=cid%>=0;
                 }
                 <%

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

@@ -183,7 +183,7 @@
             <IMPORT NAME="commons_logging" MODULE="commons-logging-1.1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1.1/6.0.0"  UrlPath="platform:/base/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar" REQUIRED_IF="READ_BY == 'XPATH'" />
             <IMPORT NAME="ezmorph" MODULE="ezmorph-1.0.6.jar" MVN="mvn:org.talend.libraries/ezmorph-1.0.6/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.jackson/lib/ezmorph-1.0.6.jar" REQUIRED_IF="READ_BY == 'XPATH'" />
             <IMPORT NAME="xom" MODULE="xom-1.2.7.jar" MVN="mvn:org.talend.libraries/xom-1.2.7/6.0.0"  REQUIRED_IF="READ_BY == 'XPATH'" />
-            <IMPORT NAME="commons_beanutils" MODULE="commons-beanutils-1.8.3.jar" MVN="mvn:commons-beanutils/commons-beanutils/1.8.3"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-beanutils-1.8.3.jar" REQUIRED_IF="READ_BY == 'XPATH'" />
+            <IMPORT NAME="commons_beanutils" MODULE="commons-beanutils-1.9.4.jar" MVN="mvn:commons-beanutils/commons-beanutils/1.9.4" REQUIRED_IF="READ_BY == 'XPATH'" />
             <IMPORT NAME="commons_collections" MODULE="commons-collections-3.2.2.jar" MVN="mvn:commons-collections/commons-collections/3.2.2"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-collections-3.2.2.jar" REQUIRED_IF="READ_BY == 'XPATH'" />
             <IMPORT NAME="staxon" MODULE="staxon-1.2.jar" MVN="mvn:org.talend.libraries/staxon-1.2/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.json/lib/staxon-1.2.jar" REQUIRED_IF="READ_BY == 'XPATH'" />
             

main/plugins/org.talend.designer.components.localprovider/components/tFileInputDelimited/tFileInputDelimited_begin.javajet

@@ -1118,8 +1118,7 @@
 							%>
 								csvReader<%=cid %>=new com.talend.csv.CSVReader((java.io.InputStream)filename_<%=cid %>, fieldSeparator_<%=cid %>[0], <%=encoding %>);
 							}else{
-								csvReader<%=cid %>=new com.talend.csv.CSVReader(new java.io.BufferedReader(new java.io.InputStreamReader(
-		                		new java.io.FileInputStream(String.valueOf(filename_<%=cid %>)),<%=encoding %>)), fieldSeparator_<%=cid %>[0]);
+								csvReader<%=cid %>=new com.talend.csv.CSVReader(String.valueOf(filename_<%=cid %>),fieldSeparator_<%=cid %>[0], <%=encoding %>);
 		        			}
 					<%
 					}
@@ -1223,8 +1222,7 @@
 				        if(filename_<%=cid %> instanceof java.io.InputStream){
 				 			csvReader<%=cid %>=new com.talend.csv.CSVReader((java.io.InputStream)filename_<%=cid %>, fieldSeparator_<%=cid %>[0], <%=encoding %>);
 		        		}else{
-				 			csvReader<%=cid %>=new com.talend.csv.CSVReader(new java.io.BufferedReader(new java.io.InputStreamReader(
-				          	new java.io.FileInputStream(String.valueOf(filename_<%=cid %>)),<%=encoding %>)), fieldSeparator_<%=cid %>[0]);
+							csvReader<%=cid %>=new com.talend.csv.CSVReader(String.valueOf(filename_<%=cid %>),fieldSeparator_<%=cid %>[0], <%=encoding %>);
 						}
 						csvReader<%=cid %>.setTrimWhitespace(false);
 						if ( (rowSeparator_<%=cid %>[0] != '\n') && (rowSeparator_<%=cid %>[0] != '\r') )	
@@ -1295,7 +1293,7 @@
 	        		rowstate_<%=cid%>.reset();
 	        
 		        	row<%=cid %>=csvReader<%=cid %>.getValues();
-	        	
+		        	
 					<%
 	   				if(("true").equals(removeEmptyRow)){
 	   				%>

main/plugins/org.talend.designer.components.localprovider/components/tFileInputDelimited/tFileInputDelimited_messages.properties

@@ -39,4 +39,4 @@ ENABLE_DECODE.NAME=Permit hexadecimal (0xNNN) or octal (0NNNN) for numeric types
 DECODE_COLS.NAME=Decode table
 DECODE_COLS.ITEM.DECODE=Enable Decode
 TEMP_DIR.NAME=Temporary directory
-DESTINATION.NAME=Destination
+DESTINATION.NAME=Destination

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

@@ -172,7 +172,7 @@
 			    REQUIRED_IF="(READ_BY == 'XPATH')" />
 			<IMPORT NAME="xom" MODULE="xom-1.2.7.jar" MVN="mvn:org.talend.libraries/xom-1.2.7/6.0.0"
 			    REQUIRED_IF="(READ_BY == 'XPATH')" />
-			<IMPORT NAME="commons_beanutils" MODULE="commons-beanutils-1.8.3.jar" MVN="mvn:commons-beanutils/commons-beanutils/1.8.3"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-beanutils-1.8.3.jar"
+			<IMPORT NAME="commons_beanutils" MODULE="commons-beanutils-1.9.4.jar" MVN="mvn:commons-beanutils/commons-beanutils/1.9.4"
 				REQUIRED_IF="(READ_BY == 'XPATH')" />
 			<IMPORT NAME="commons_collections" MODULE="commons-collections-3.2.2.jar" MVN="mvn:commons-collections/commons-collections/3.2.2"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-collections-3.2.2.jar"
 				REQUIRED_IF="(READ_BY == 'XPATH')" />

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

@@ -761,10 +761,10 @@
                 try {//TD110 begin
                 	if(filename_<%=cid %> instanceof java.io.InputStream){
                 		in_<%=cid %> = 
-                				new java.io.BufferedReader(new java.io.InputStreamReader((java.io.InputStream)filename_<%=cid %>, <%=encoding %>));
+                				new java.io.BufferedReader(new routines.system.UnicodeReader((java.io.InputStream)filename_<%=cid %>, <%=encoding %>));
                 	}else{
                 		in_<%=cid %> = 
-                			new java.io.BufferedReader(new java.io.InputStreamReader(new java.io.FileInputStream(String.valueOf(filename_<%=cid %>)), <%=encoding %>));
+                			new java.io.BufferedReader(new routines.system.UnicodeReader(new java.io.FileInputStream(String.valueOf(filename_<%=cid %>)), <%=encoding %>));
                 	}
 
 			<%
@@ -838,7 +838,7 @@
             	if(filename_<%=cid %> instanceof java.io.InputStream){
             		throw new java.lang.RuntimeException("When the input source is a stream,footer shouldn't be bigger than 0.");
             	}else{
-            		in_<%=cid %> = new java.io.BufferedReader(new java.io.InputStreamReader(new java.io.FileInputStream(String.valueOf(filename_<%=cid %>)), <%=encoding %>));
+            		in_<%=cid %> = new java.io.BufferedReader(new routines.system.UnicodeReader(new java.io.FileInputStream(String.valueOf(filename_<%=cid %>)), <%=encoding %>));
             	}
 				<%
 				if("BYTES".equals(patternUnits)&&(("").equals(rowSeparator) || ("\"\"").equals(rowSeparator))){

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

@@ -87,7 +87,7 @@
    <CODEGENERATION>
      <IMPORTS>
        <IMPORT NAME="commons-compress-1.19" MODULE="commons-compress-1.19.jar" MVN="mvn:org.apache.commons/commons-compress/1.19" REQUIRED="true" />
-       <IMPORT NAME="Ant-Zip" MODULE="ant-1.10.1.jar" MVN="mvn:org.apache.ant/ant/1.10.1" REQUIRED="true" />
+       <IMPORT NAME="Ant-Zip" MODULE="ant-1.10.8.jar" MVN="mvn:org.apache.ant/ant/1.10.8" REQUIRED="true" />
        <IMPORT NAME="Check-Archive" MODULE="checkArchive-1.1-20190917.jar" MVN="mvn:org.talend.libraries/checkArchive-1.1-20190917/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.custom/lib/checkArchive-1.1-20190917.jar" REQUIRED="true" />
        <IMPORT NAME="zip4j-1.3.3.jar" MODULE="zip4j-1.3.3.jar" MVN="mvn:net.lingala.zip4j/zip4j/1.3.3"  REQUIRED="true" />
        <IMPORT NAME="talendzip-1.0-20190917.jar" MODULE="talendzip-1.0-20190917.jar" MVN="mvn:org.talend.libraries/talendzip/1.0-20190917" UrlPath="platform:/plugin/org.talend.libraries.custom/lib/talendzip-1.0-20190917.jar" REQUIRED="true" />

main/plugins/org.talend.designer.components.localprovider/components/tFirebirdOutput/tFirebirdOutput_begin.javajet

@@ -82,6 +82,7 @@ int nb_line_rejected_<%=cid%> = 0;
 int deletedCount_<%=cid%>=0;
 int updatedCount_<%=cid%>=0;
 int insertedCount_<%=cid%>=0;
+int rowsToCommitCount_<%=cid%>=0;
 int rejectedCount_<%=cid%>=0;
 
 String tableName_<%=cid%> = <%=tableName%>;

main/plugins/org.talend.designer.components.localprovider/components/tFirebirdOutput/tFirebirdOutput_end.javajet

@@ -94,6 +94,7 @@ imports="
                                     countSum_<%=cid%> += (countEach_<%=cid%> < 0 ? 0 : countEach_<%=cid%>);
                                 }
                             }
+                            rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
                         }catch (java.sql.BatchUpdateException e){
                             <%
                             if(("true").equals(dieOnError)) {
@@ -118,6 +119,7 @@ imports="
 
                             }
                             tmp_batchUpdateCount_<%=cid%> = tmp_batchUpdateCount_<%=cid%> > countSum_<%=cid%> ? tmp_batchUpdateCount_<%=cid%> : countSum_<%=cid%>;
+                            rowsToCommitCount_<%=cid%> += tmp_batchUpdateCount_<%=cid%>;
                             <%if (("INSERT").equals(dataAction)) {
                             %>
                                 insertedCount_<%=cid%> += tmp_batchUpdateCount_<%=cid%>;
@@ -152,10 +154,12 @@ imports="
             <%
             if(!("").equals(commitEvery) && !("0").equals(commitEvery)) {
                 %>
-            if (commitCounter_<%=cid%> > 0) {
-				<%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
+            if (commitCounter_<%=cid%> > 0 && rowsToCommitCount_<%=cid%> != 0) {
+                <%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
                 conn_<%=cid%>.commit();
                 <%dbLog.commit().commitDone(null);%>
+                rowsToCommitCount_<%=cid%> = 0;
+                commitCounter_<%=cid%> = 0;
             }
                 <%
             }

main/plugins/org.talend.designer.components.localprovider/components/tFirebirdOutput/tFirebirdOutput_main.javajet

@@ -161,7 +161,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                     %>
                        try {
                            <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                           insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                           int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                           insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                           rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                            nb_line_<%=cid%>++;
                            <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                        } catch(java.lang.Exception e) {
@@ -266,7 +268,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                         %>
                            try {
                                <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                               updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                               int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                               updatedCount_<%=cid%> += processedCount_<%=cid%>;
+                               rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                                nb_line_<%=cid%>++;
                                <%dbLog.data().updating(dbLog.var("nb_line"));%>
                            } catch(java.lang.Exception e) {
@@ -388,7 +392,9 @@ skeleton="../templates/db_output_bulk.skeleton"
     			%>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmtUpdate_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtUpdate_<%=cid %>.executeUpdate();
+                    updatedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                     nb_line_<%=cid%>++;
         			<%dbLog.data().updating(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -450,7 +456,9 @@ skeleton="../templates/db_output_bulk.skeleton"
     			%>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
+                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -549,6 +557,7 @@ skeleton="../templates/db_output_bulk.skeleton"
             try {
                 updateFlag_<%=cid%>=pstmtUpdate_<%=cid %>.executeUpdate();
                 updatedCount_<%=cid%> = updatedCount_<%=cid%> + updateFlag_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += updateFlag_<%=cid%>;
 
             if(updateFlag_<%=cid%> == 0) {
             	<%
@@ -579,7 +588,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                 }
         		%>
                 	<%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                	insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
+                	int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
+                	insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                	rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                 	nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
     			}else{
@@ -675,7 +686,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                     %>
                        try {
                            <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                           deletedCount_<%=cid%> = deletedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                           int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                           deletedCount_<%=cid%> += processedCount_<%=cid%>;
+                           rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                            nb_line_<%=cid%>++;
                            <%dbLog.data().deleting(dbLog.var("nb_line"));%>
                        } catch(java.lang.Exception e) {
@@ -777,6 +790,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                         System.err.println(e.getMessage());
                     }
                     tmp_batchUpdateCount_<%=cid%> = tmp_batchUpdateCount_<%=cid%> > countSum_<%=cid%> ? tmp_batchUpdateCount_<%=cid%> : countSum_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += tmp_batchUpdateCount_<%=cid%>;
                     <%if (("INSERT").equals(dataAction)) {
                     %>
                         insertedCount_<%=cid%> += tmp_batchUpdateCount_<%=cid%>;
@@ -810,6 +824,7 @@ skeleton="../templates/db_output_bulk.skeleton"
 	                    for(int countEach_<%=cid%>: pstmt_<%=cid %>.executeBatch()) {
 	                        countSum_<%=cid%> += (countEach_<%=cid%> < 0 ? 0 : countEach_<%=cid%>);
 	                    }
+	                    rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
 	                    <%dbLog.batch().executeDone(dbLog.str(dataAction));%>
 	                    <%if (("INSERT").equals(dataAction)) {
 	                    %>
@@ -837,6 +852,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                         for(int countEach_<%=cid%>: e.getUpdateCounts()) {
                             countSum_<%=cid%> += (countEach_<%=cid%> < 0 ? 0 : countEach_<%=cid%>);
                         }
+                        rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
                         <%if (("INSERT").equals(dataAction)) {
                         %>
                             insertedCount_<%=cid%> += countSum_<%=cid%>;
@@ -858,10 +874,12 @@ skeleton="../templates/db_output_bulk.skeleton"
                 }
                 <%
                 }%>
-                
-                <%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
-                conn_<%=cid%>.commit();
-                <%dbLog.commit().commitDone(null);%>
+                if(rowsToCommitCount_<%=cid%> != 0){
+                	<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
+                	conn_<%=cid%>.commit();
+                	<%dbLog.commit().commitDone(null);%>
+                	rowsToCommitCount_<%=cid%> = 0;
+                }
                 commitCounter_<%=cid%>=0;
             }
             <%

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

@@ -202,53 +202,44 @@
 	<CODEGENERATION>
 		<IMPORTS>
 			<!-- USER_ACCOUNT_HMAC -->
-	      	<IMPORT NAME="jets3t-0.9.1" MODULE="jets3t-0.9.1.jar" MVN="mvn:org.talend.libraries/jets3t-0.9.1/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="httpclient-4.5.9" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="httpcore-4.4.11" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="jets3t-0.9.1" MODULE="jets3t-0.9.1.jar" MVN="mvn:org.talend.libraries/jets3t-0.9.1/6.0.0"  REQUIRED_IF="(#LINK@NODE.CONNECTION.AUTH_TYPE == 'USER_ACCOUNT_HMAC') OR (AUTH_TYPE == 'USER_ACCOUNT_HMAC')" />
+			<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED="true" />
+			<IMPORT NAME="httpclient-4.5.9" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED="true" />
+			<IMPORT NAME="httpcore-4.4.11" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED="true" />
+			<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED="true" />
 
 			<!-- SERVICE_ACCOUNT -->
-			<IMPORT NAME="google-auth-library-oauth2-http-0.20.0" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+			<IMPORT NAME="google-auth-library-oauth2-http-0.20.0" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 				<!-- Transitive dependencies of google-auth-library-oauth2-http -->
-				<IMPORT NAME="auto-value-annotations-1.7" MODULE="auto-value-annotations-1.7.jar" MVN="mvn:com.google.auto.value/auto-value-annotations/1.7" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="jsr305-3.0.2" MODULE="jsr305-3.0.2.jar" MVN="mvn:com.google.code.findbugs/jsr305/3.0.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-auth-library-credentials-0.20.0" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-http-client-1.34.0" MODULE="google-http-client-1.34.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.34.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="httpclient-4.5.10" MODULE="httpclient-4.5.10.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.10" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="httpcore-4.4.12" MODULE="httpcore-4.4.12.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.12" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="j2objc-annotations-1.3" MODULE="j2objc-annotations-1.3.jar" MVN="mvn:com.google.j2objc/j2objc-annotations/1.3" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="opencensus-contrib-http-util-0.24.0" MODULE="opencensus-contrib-http-util-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-contrib-http-util/0.24.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-http-client-jackson2-1.34.0" MODULE="google-http-client-jackson2-1.34.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.34.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="jackson-core-2.10.1" MODULE="jackson-core-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="guava-28.2-android" MODULE="guava-28.2-android.jar" MVN="mvn:com.google.guava/guava/28.2-android" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="failureaccess-1.0.1" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava" MODULE="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" MVN="mvn:com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="checker-compat-qual-2.5.5" MODULE="checker-compat-qual-2.5.5.jar" MVN="mvn:org.checkerframework/checker-compat-qual/2.5.5" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="error_prone_annotations-2.3.4" MODULE="error_prone_annotations-2.3.4.jar" MVN="mvn:com.google.errorprone/error_prone_annotations/2.3.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-auth-library-credentials-0.20.0" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-http-client-1.25.0" MODULE="google-http-client-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-http-client-jackson2-1.25.0" MODULE="google-http-client-jackson2-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="jackson-core-2.10.1" MODULE="jackson-core-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="guava-20.0.jar" MODULE="guava-20.0.jar" MVN="mvn:com.google.guava/guava/20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 
-			<IMPORT NAME="google-cloud-storage-1.108.0" MODULE="google-cloud-storage-1.108.0.jar" MVN="mvn:com.google.cloud/google-cloud-storage/1.108.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+			<IMPORT NAME="google-cloud-storage-1.104.0" MODULE="google-cloud-storage-1.104.0.jar" MVN="mvn:com.google.cloud/google-cloud-storage/1.104.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 				<!-- Transitive dependencies of google-cloud-storage -->
-				<IMPORT NAME="google-api-client-1.30.9" MODULE="google-api-client-1.30.9.jar" MVN="mvn:com.google.api-client/google-api-client/1.30.9" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-oauth-client-1.30.5" MODULE="google-oauth-client-1.30.5.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.30.5" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-api-services-storage-v1-rev20200326-1.30.9" MODULE="google-api-services-storage-v1-rev20200326-1.30.9.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20200326-1.30.9" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="gson-2.8.6" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-cloud-core-1.93.4" 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')" />
-				<IMPORT NAME="proto-google-common-protos-1.17.0" MODULE="proto-google-common-protos-1.17.0.jar" MVN="mvn:com.google.api.grpc/proto-google-common-protos/1.17.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-cloud-core-http-1.93.4" MODULE="google-cloud-core-http-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.93.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-http-client-appengine-1.34.2" MODULE="google-http-client-appengine-1.34.2.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.34.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="gax-httpjson-0.73.0" MODULE="gax-httpjson-0.73.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.73.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="gax-1.56.0" MODULE="gax-1.56.0.jar" MVN="mvn:com.google.api/gax/1.56.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="api-common-1.9.0" MODULE="api-common-1.9.0.jar" MVN="mvn:com.google.api/api-common/1.9.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="javax.annotation-api-1.3.2" MODULE="javax.annotation-api-1.3.2.jar" MVN="mvn:javax.annotation/javax.annotation-api/1.3.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="opencensus-api-0.24.0" MODULE="opencensus-api-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-api/0.24.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="grpc-context-1.22.1" MODULE="grpc-context-1.22.1.jar" MVN="mvn:io.grpc/grpc-context/1.22.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="proto-google-iam-v1-0.13.0" MODULE="proto-google-iam-v1-0.13.0.jar" MVN="mvn:com.google.api.grpc/proto-google-iam-v1/0.13.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="protobuf-java-3.11.4" MODULE="protobuf-java-3.11.4.jar" MVN="mvn:com.google.protobuf/protobuf-java/3.11.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="protobuf-java-util-3.11.4" MODULE="protobuf-java-util-3.11.4.jar" MVN="mvn:com.google.protobuf/protobuf-java-util/3.11.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="threetenbp-1.4.4" MODULE="threetenbp-1.4.4.jar" MVN="mvn:org.threeten/threetenbp/1.4.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<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')" />
+				<IMPORT NAME="google-api-client-1.25.0.jar" MODULE="google-api-client-1.25.0.jar" MVN="mvn:com.google.api-client/google-api-client/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-oauth-client-1.25.0.jar" MODULE="google-oauth-client-1.25.0.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-api-services-storage-v1-rev20191011-1.30.3" MODULE="google-api-services-storage-v1-rev20191011-1.30.3.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20191011-1.30.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="gson-2.8.6" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<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')" />
+				<IMPORT NAME="javax.annotation-api" MODULE="javax.annotation-api-1.3.jar" MVN="mvn:javax.annotation/javax.annotation-api/1.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="gax-1.27.0" MODULE="gax-1.27.0.jar" MVN="mvn:com.google.api/gax/1.27.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="gax-httpjson-0.44.0" MODULE="gax-httpjson-0.44.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.44.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="threetenbp-1.3.3.jar" MODULE="threetenbp-1.3.3.jar" MVN="mvn:org.threeten/threetenbp/1.3.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="protobuf-java-2.5.0" MODULE="protobuf-java-2.5.0.jar" MVN="mvn:com.google.protobuf/protobuf-java/2.5.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="error_prone_annotation-2.1.3" MODULE="error_prone_annotation-2.1.3.jar" MVN="mvn:com.google.errorprone/error_prone_annotations/2.1.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-cloud-core-http-1.32.0.jar" MODULE="google-cloud-core-http-1.32.0.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.32.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-http-client-appengine-1.25.0.jar" MODULE="google-http-client-appengine-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="opencensus-api-0.21.0" MODULE="opencensus-api-0.21.0.jar" MVN="mvn:io.opencensus/opencensus-api/0.21.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="opencensus-contrib-http-util-0.21.0" MODULE="opencensus-contrib-http-util-0.21.0.jar" MVN="mvn:io.opencensus/opencensus-contrib-http-util/0.21.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="grpc-context-1.19.0" MODULE="grpc-context-1.19.0.jar" MVN="mvn:io.grpc/grpc-context/1.19.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="proto-google-common-protos-1.17.0" MODULE="proto-google-common-protos-1.17.0.jar" MVN="mvn:com.google.api.grpc/proto-google-common-protos/1.17.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="proto-google-iam-v1-0.13.0" MODULE="proto-google-iam-v1-0.13.0.jar" MVN="mvn:com.google.api.grpc/proto-google-iam-v1/0.13.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="protobuf-java-util-3.11.4" MODULE="protobuf-java-util-3.11.4.jar" MVN="mvn:com.google.protobuf/protobuf-java-util/3.11.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="annotation-1.1.0" MODULE="annotation-1.1.0.jar" MVN="mvn:androidx.annotation/annotation/1.1.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 		</IMPORTS>
 	</CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tGSBucketCreate/tGSBucketCreate_main.javajet

@@ -148,16 +148,16 @@ if (!useServiceAccountForConnection){
 					.fromStream(new java.io.FileInputStream(<%=pathToServerAccoutKeyFile%>));
 		} catch (IOException e_<%=cid%>) {
 			<%
-			if (("true").equals(dieOnError)) {
+			if(isLog4jEnabled){
 			%>
-				throw(e_<%=cid%>);
+				log.error("<%=cid%> - Exception in component <%=cid%>.", e_<%=cid%>);
 			<%
 			}
 			%>
 			<%
-			if(isLog4jEnabled){
+			if (("true").equals(dieOnError)) {
 			%>
-				log.error("<%=cid%> - Exception in component <%=cid%>.", e_<%=cid%>);
+				throw(e_<%=cid%>);
 			<%
 			}
 			%>

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

@@ -22,7 +22,7 @@ LONG_NAME=Creates a Bucket in Google Storage
 NB_BUCKET.NAME=Number of Bucket
 PROJECT_ID.NAME=Project ID
 SECRET_KEY.NAME=Secret Key
-SPECIAL_CONFIGUER.NAME=Special configure
+SPECIAL_CONFIGUER.NAME=Location and access control
 USE_EXISTING_CONNECTION.NAME=Use an existing connection
 AUTH_TYPE.NAME=Credential type
 AUTH_TYPE.ITEM.USER_ACCOUNT_HMAC=HMAC key (deprecated)

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

@@ -120,53 +120,44 @@
 	<CODEGENERATION>
 		<IMPORTS>
 			<!-- USER_ACCOUNT_HMAC -->
-			<IMPORT NAME="jets3t-0.9.1" MODULE="jets3t-0.9.1.jar" MVN="mvn:org.talend.libraries/jets3t-0.9.1/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="httpclient-4.5.9" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="httpcore-4.4.11" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="jets3t-0.9.1" MODULE="jets3t-0.9.1.jar" MVN="mvn:org.talend.libraries/jets3t-0.9.1/6.0.0"  REQUIRED_IF="(#LINK@NODE.CONNECTION.AUTH_TYPE == 'USER_ACCOUNT_HMAC') OR (AUTH_TYPE == 'USER_ACCOUNT_HMAC')" />
+			<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED="true" />
+			<IMPORT NAME="httpclient-4.5.9" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED="true" />
+			<IMPORT NAME="httpcore-4.4.11" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED="true" />
+			<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED="true" />
 
 			<!-- SERVICE_ACCOUNT -->
-			<IMPORT NAME="google-auth-library-oauth2-http-0.20.0" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+			<IMPORT NAME="google-auth-library-oauth2-http-0.20.0" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 				<!-- Transitive dependencies of google-auth-library-oauth2-http -->
-				<IMPORT NAME="auto-value-annotations-1.7" MODULE="auto-value-annotations-1.7.jar" MVN="mvn:com.google.auto.value/auto-value-annotations/1.7" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="jsr305-3.0.2" MODULE="jsr305-3.0.2.jar" MVN="mvn:com.google.code.findbugs/jsr305/3.0.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-auth-library-credentials-0.20.0" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-http-client-1.34.0" MODULE="google-http-client-1.34.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.34.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="httpclient-4.5.10" MODULE="httpclient-4.5.10.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.10" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="httpcore-4.4.12" MODULE="httpcore-4.4.12.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.12" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="j2objc-annotations-1.3" MODULE="j2objc-annotations-1.3.jar" MVN="mvn:com.google.j2objc/j2objc-annotations/1.3" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="opencensus-contrib-http-util-0.24.0" MODULE="opencensus-contrib-http-util-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-contrib-http-util/0.24.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-http-client-jackson2-1.34.0" MODULE="google-http-client-jackson2-1.34.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.34.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="jackson-core-2.10.1" MODULE="jackson-core-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="guava-28.2-android" MODULE="guava-28.2-android.jar" MVN="mvn:com.google.guava/guava/28.2-android" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="failureaccess-1.0.1" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava" MODULE="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" MVN="mvn:com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="checker-compat-qual-2.5.5" MODULE="checker-compat-qual-2.5.5.jar" MVN="mvn:org.checkerframework/checker-compat-qual/2.5.5" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="error_prone_annotations-2.3.4" MODULE="error_prone_annotations-2.3.4.jar" MVN="mvn:com.google.errorprone/error_prone_annotations/2.3.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-auth-library-credentials-0.20.0" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-http-client-1.25.0" MODULE="google-http-client-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-http-client-jackson2-1.25.0" MODULE="google-http-client-jackson2-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="jackson-core-2.10.1" MODULE="jackson-core-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="guava-20.0.jar" MODULE="guava-20.0.jar" MVN="mvn:com.google.guava/guava/20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 
-			<IMPORT NAME="google-cloud-storage-1.108.0" MODULE="google-cloud-storage-1.108.0.jar" MVN="mvn:com.google.cloud/google-cloud-storage/1.108.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+			<IMPORT NAME="google-cloud-storage-1.104.0" MODULE="google-cloud-storage-1.104.0.jar" MVN="mvn:com.google.cloud/google-cloud-storage/1.104.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 				<!-- Transitive dependencies of google-cloud-storage -->
-				<IMPORT NAME="google-api-client-1.30.9" MODULE="google-api-client-1.30.9.jar" MVN="mvn:com.google.api-client/google-api-client/1.30.9" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-oauth-client-1.30.5" MODULE="google-oauth-client-1.30.5.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.30.5" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-api-services-storage-v1-rev20200326-1.30.9" MODULE="google-api-services-storage-v1-rev20200326-1.30.9.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20200326-1.30.9" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="gson-2.8.6" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-cloud-core-1.93.4" 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')" />
-				<IMPORT NAME="proto-google-common-protos-1.17.0" MODULE="proto-google-common-protos-1.17.0.jar" MVN="mvn:com.google.api.grpc/proto-google-common-protos/1.17.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-cloud-core-http-1.93.4" MODULE="google-cloud-core-http-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.93.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-http-client-appengine-1.34.2" MODULE="google-http-client-appengine-1.34.2.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.34.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="gax-httpjson-0.73.0" MODULE="gax-httpjson-0.73.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.73.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="gax-1.56.0" MODULE="gax-1.56.0.jar" MVN="mvn:com.google.api/gax/1.56.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="api-common-1.9.0" MODULE="api-common-1.9.0.jar" MVN="mvn:com.google.api/api-common/1.9.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="javax.annotation-api-1.3.2" MODULE="javax.annotation-api-1.3.2.jar" MVN="mvn:javax.annotation/javax.annotation-api/1.3.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="opencensus-api-0.24.0" MODULE="opencensus-api-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-api/0.24.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="grpc-context-1.22.1" MODULE="grpc-context-1.22.1.jar" MVN="mvn:io.grpc/grpc-context/1.22.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="proto-google-iam-v1-0.13.0" MODULE="proto-google-iam-v1-0.13.0.jar" MVN="mvn:com.google.api.grpc/proto-google-iam-v1/0.13.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="protobuf-java-3.11.4" MODULE="protobuf-java-3.11.4.jar" MVN="mvn:com.google.protobuf/protobuf-java/3.11.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="protobuf-java-util-3.11.4" MODULE="protobuf-java-util-3.11.4.jar" MVN="mvn:com.google.protobuf/protobuf-java-util/3.11.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="threetenbp-1.4.4" MODULE="threetenbp-1.4.4.jar" MVN="mvn:org.threeten/threetenbp/1.4.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<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')" />
+				<IMPORT NAME="google-api-client-1.25.0.jar" MODULE="google-api-client-1.25.0.jar" MVN="mvn:com.google.api-client/google-api-client/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-oauth-client-1.25.0.jar" MODULE="google-oauth-client-1.25.0.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-api-services-storage-v1-rev20191011-1.30.3" MODULE="google-api-services-storage-v1-rev20191011-1.30.3.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20191011-1.30.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="gson-2.8.6" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<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')" />
+				<IMPORT NAME="javax.annotation-api" MODULE="javax.annotation-api-1.3.jar" MVN="mvn:javax.annotation/javax.annotation-api/1.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="gax-1.27.0" MODULE="gax-1.27.0.jar" MVN="mvn:com.google.api/gax/1.27.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="gax-httpjson-0.44.0" MODULE="gax-httpjson-0.44.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.44.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="threetenbp-1.3.3.jar" MODULE="threetenbp-1.3.3.jar" MVN="mvn:org.threeten/threetenbp/1.3.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="protobuf-java-2.5.0" MODULE="protobuf-java-2.5.0.jar" MVN="mvn:com.google.protobuf/protobuf-java/2.5.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="error_prone_annotation-2.1.3" MODULE="error_prone_annotation-2.1.3.jar" MVN="mvn:com.google.errorprone/error_prone_annotations/2.1.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-cloud-core-http-1.32.0.jar" MODULE="google-cloud-core-http-1.32.0.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.32.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-http-client-appengine-1.25.0.jar" MODULE="google-http-client-appengine-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="opencensus-api-0.21.0" MODULE="opencensus-api-0.21.0.jar" MVN="mvn:io.opencensus/opencensus-api/0.21.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="opencensus-contrib-http-util-0.21.0" MODULE="opencensus-contrib-http-util-0.21.0.jar" MVN="mvn:io.opencensus/opencensus-contrib-http-util/0.21.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="grpc-context-1.19.0" MODULE="grpc-context-1.19.0.jar" MVN="mvn:io.grpc/grpc-context/1.19.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="proto-google-common-protos-1.17.0" MODULE="proto-google-common-protos-1.17.0.jar" MVN="mvn:com.google.api.grpc/proto-google-common-protos/1.17.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="proto-google-iam-v1-0.13.0" MODULE="proto-google-iam-v1-0.13.0.jar" MVN="mvn:com.google.api.grpc/proto-google-iam-v1/0.13.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="protobuf-java-util-3.11.4" MODULE="protobuf-java-util-3.11.4.jar" MVN="mvn:com.google.protobuf/protobuf-java-util/3.11.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="annotation-1.1.0" MODULE="annotation-1.1.0.jar" MVN="mvn:androidx.annotation/annotation/1.1.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 		</IMPORTS>
 	</CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tGSBucketDelete/tGSBucketDelete_main.javajet

@@ -134,16 +134,16 @@ if(("true").equals(useExistingConn)) {
 				.fromStream(new java.io.FileInputStream(<%=pathToServerAccoutKeyFile%>));
 	} catch (IOException e_<%=cid%>) {
 		<%
-		if (("true").equals(dieOnError)) {
+		if(isLog4jEnabled){
 		%>
-			throw(e_<%=cid%>);
+			log.error("<%=cid%> - Exception in component <%=cid%>.", e_<%=cid%>);
 		<%
 		}
 		%>
 		<%
-		if(isLog4jEnabled){
+		if (("true").equals(dieOnError)) {
 		%>
-			log.error("<%=cid%> - Exception in component <%=cid%>.", e_<%=cid%>);
+			throw(e_<%=cid%>);
 		<%
 		}
 		%>

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

@@ -121,53 +121,44 @@
 	<CODEGENERATION>
 		<IMPORTS>
 			<!-- USER_ACCOUNT_HMAC -->
-			<IMPORT NAME="jets3t-0.9.1" MODULE="jets3t-0.9.1.jar" MVN="mvn:org.talend.libraries/jets3t-0.9.1/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="httpclient-4.5.9" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="httpcore-4.4.11" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="jets3t-0.9.1" MODULE="jets3t-0.9.1.jar" MVN="mvn:org.talend.libraries/jets3t-0.9.1/6.0.0"  REQUIRED_IF="(#LINK@NODE.CONNECTION.AUTH_TYPE == 'USER_ACCOUNT_HMAC') OR (AUTH_TYPE == 'USER_ACCOUNT_HMAC')" />
+			<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED="true" />
+			<IMPORT NAME="httpclient-4.5.9" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED="true" />
+			<IMPORT NAME="httpcore-4.4.11" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED="true" />
+			<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED="true" />
 
 			<!-- SERVICE_ACCOUNT -->
-			<IMPORT NAME="google-auth-library-oauth2-http-0.20.0" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+			<IMPORT NAME="google-auth-library-oauth2-http-0.20.0" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 				<!-- Transitive dependencies of google-auth-library-oauth2-http -->
-				<IMPORT NAME="auto-value-annotations-1.7" MODULE="auto-value-annotations-1.7.jar" MVN="mvn:com.google.auto.value/auto-value-annotations/1.7" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="jsr305-3.0.2" MODULE="jsr305-3.0.2.jar" MVN="mvn:com.google.code.findbugs/jsr305/3.0.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-auth-library-credentials-0.20.0" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-http-client-1.34.0" MODULE="google-http-client-1.34.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.34.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="httpclient-4.5.10" MODULE="httpclient-4.5.10.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.10" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="httpcore-4.4.12" MODULE="httpcore-4.4.12.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.12" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="j2objc-annotations-1.3" MODULE="j2objc-annotations-1.3.jar" MVN="mvn:com.google.j2objc/j2objc-annotations/1.3" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="opencensus-contrib-http-util-0.24.0" MODULE="opencensus-contrib-http-util-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-contrib-http-util/0.24.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-http-client-jackson2-1.34.0" MODULE="google-http-client-jackson2-1.34.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.34.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="jackson-core-2.10.1" MODULE="jackson-core-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="guava-28.2-android" MODULE="guava-28.2-android.jar" MVN="mvn:com.google.guava/guava/28.2-android" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="failureaccess-1.0.1" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava" MODULE="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" MVN="mvn:com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="checker-compat-qual-2.5.5" MODULE="checker-compat-qual-2.5.5.jar" MVN="mvn:org.checkerframework/checker-compat-qual/2.5.5" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="error_prone_annotations-2.3.4" MODULE="error_prone_annotations-2.3.4.jar" MVN="mvn:com.google.errorprone/error_prone_annotations/2.3.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-auth-library-credentials-0.20.0" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-http-client-1.25.0" MODULE="google-http-client-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-http-client-jackson2-1.25.0" MODULE="google-http-client-jackson2-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="jackson-core-2.10.1" MODULE="jackson-core-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="guava-20.0.jar" MODULE="guava-20.0.jar" MVN="mvn:com.google.guava/guava/20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 
-			<IMPORT NAME="google-cloud-storage-1.108.0" MODULE="google-cloud-storage-1.108.0.jar" MVN="mvn:com.google.cloud/google-cloud-storage/1.108.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+			<IMPORT NAME="google-cloud-storage-1.104.0" MODULE="google-cloud-storage-1.104.0.jar" MVN="mvn:com.google.cloud/google-cloud-storage/1.104.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 				<!-- Transitive dependencies of google-cloud-storage -->
-				<IMPORT NAME="google-api-client-1.30.9" MODULE="google-api-client-1.30.9.jar" MVN="mvn:com.google.api-client/google-api-client/1.30.9" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-oauth-client-1.30.5" MODULE="google-oauth-client-1.30.5.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.30.5" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-api-services-storage-v1-rev20200326-1.30.9" MODULE="google-api-services-storage-v1-rev20200326-1.30.9.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20200326-1.30.9" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="gson-2.8.6" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-cloud-core-1.93.4" 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')" />
-				<IMPORT NAME="proto-google-common-protos-1.17.0" MODULE="proto-google-common-protos-1.17.0.jar" MVN="mvn:com.google.api.grpc/proto-google-common-protos/1.17.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-cloud-core-http-1.93.4" MODULE="google-cloud-core-http-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.93.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-http-client-appengine-1.34.2" MODULE="google-http-client-appengine-1.34.2.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.34.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="gax-httpjson-0.73.0" MODULE="gax-httpjson-0.73.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.73.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="gax-1.56.0" MODULE="gax-1.56.0.jar" MVN="mvn:com.google.api/gax/1.56.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="api-common-1.9.0" MODULE="api-common-1.9.0.jar" MVN="mvn:com.google.api/api-common/1.9.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="javax.annotation-api-1.3.2" MODULE="javax.annotation-api-1.3.2.jar" MVN="mvn:javax.annotation/javax.annotation-api/1.3.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="opencensus-api-0.24.0" MODULE="opencensus-api-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-api/0.24.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="grpc-context-1.22.1" MODULE="grpc-context-1.22.1.jar" MVN="mvn:io.grpc/grpc-context/1.22.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="proto-google-iam-v1-0.13.0" MODULE="proto-google-iam-v1-0.13.0.jar" MVN="mvn:com.google.api.grpc/proto-google-iam-v1/0.13.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="protobuf-java-3.11.4" MODULE="protobuf-java-3.11.4.jar" MVN="mvn:com.google.protobuf/protobuf-java/3.11.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="protobuf-java-util-3.11.4" MODULE="protobuf-java-util-3.11.4.jar" MVN="mvn:com.google.protobuf/protobuf-java-util/3.11.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="threetenbp-1.4.4" MODULE="threetenbp-1.4.4.jar" MVN="mvn:org.threeten/threetenbp/1.4.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<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')" />
+				<IMPORT NAME="google-api-client-1.25.0.jar" MODULE="google-api-client-1.25.0.jar" MVN="mvn:com.google.api-client/google-api-client/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-oauth-client-1.25.0.jar" MODULE="google-oauth-client-1.25.0.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-api-services-storage-v1-rev20191011-1.30.3" MODULE="google-api-services-storage-v1-rev20191011-1.30.3.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20191011-1.30.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="gson-2.8.6" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<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')" />
+				<IMPORT NAME="javax.annotation-api" MODULE="javax.annotation-api-1.3.jar" MVN="mvn:javax.annotation/javax.annotation-api/1.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="gax-1.27.0" MODULE="gax-1.27.0.jar" MVN="mvn:com.google.api/gax/1.27.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="gax-httpjson-0.44.0" MODULE="gax-httpjson-0.44.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.44.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="threetenbp-1.3.3.jar" MODULE="threetenbp-1.3.3.jar" MVN="mvn:org.threeten/threetenbp/1.3.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="protobuf-java-2.5.0" MODULE="protobuf-java-2.5.0.jar" MVN="mvn:com.google.protobuf/protobuf-java/2.5.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="error_prone_annotation-2.1.3" MODULE="error_prone_annotation-2.1.3.jar" MVN="mvn:com.google.errorprone/error_prone_annotations/2.1.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-cloud-core-http-1.32.0.jar" MODULE="google-cloud-core-http-1.32.0.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.32.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-http-client-appengine-1.25.0.jar" MODULE="google-http-client-appengine-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="opencensus-api-0.21.0" MODULE="opencensus-api-0.21.0.jar" MVN="mvn:io.opencensus/opencensus-api/0.21.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="opencensus-contrib-http-util-0.21.0" MODULE="opencensus-contrib-http-util-0.21.0.jar" MVN="mvn:io.opencensus/opencensus-contrib-http-util/0.21.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="grpc-context-1.19.0" MODULE="grpc-context-1.19.0.jar" MVN="mvn:io.grpc/grpc-context/1.19.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="proto-google-common-protos-1.17.0" MODULE="proto-google-common-protos-1.17.0.jar" MVN="mvn:com.google.api.grpc/proto-google-common-protos/1.17.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="proto-google-iam-v1-0.13.0" MODULE="proto-google-iam-v1-0.13.0.jar" MVN="mvn:com.google.api.grpc/proto-google-iam-v1/0.13.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="protobuf-java-util-3.11.4" MODULE="protobuf-java-util-3.11.4.jar" MVN="mvn:com.google.protobuf/protobuf-java-util/3.11.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="annotation-1.1.0" MODULE="annotation-1.1.0.jar" MVN="mvn:androidx.annotation/annotation/1.1.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 		</IMPORTS>
 	</CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tGSBucketExist/tGSBucketExist_main.javajet

@@ -139,16 +139,16 @@ if(("true").equals(useExistingConn)) {
 				.fromStream(new java.io.FileInputStream(<%=pathToServerAccoutKeyFile%>));
 	} catch (IOException e_<%=cid%>) {
 		<%
-		if (("true").equals(dieOnError)) {
+		if(isLog4jEnabled){
 		%>
-			throw(e_<%=cid%>);
+			log.error("<%=cid%> - Exception in component <%=cid%>.", e_<%=cid%>);
 		<%
 		}
 		%>
 		<%
-		if(isLog4jEnabled){
+		if (("true").equals(dieOnError)) {
 		%>
-			log.error("<%=cid%> - Exception in component <%=cid%>.", e_<%=cid%>);
+			throw(e_<%=cid%>);
 		<%
 		}
 		%>

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

@@ -125,53 +125,44 @@
    	<CODEGENERATION>
 		<IMPORTS>
 			<!-- USER_ACCOUNT_HMAC -->
-			<IMPORT NAME="jets3t-0.9.1" MODULE="jets3t-0.9.1.jar" MVN="mvn:org.talend.libraries/jets3t-0.9.1/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="httpclient-4.5.9" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="httpcore-4.4.11" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="jets3t-0.9.1" MODULE="jets3t-0.9.1.jar" MVN="mvn:org.talend.libraries/jets3t-0.9.1/6.0.0"  REQUIRED_IF="(#LINK@NODE.CONNECTION.AUTH_TYPE == 'USER_ACCOUNT_HMAC') OR (AUTH_TYPE == 'USER_ACCOUNT_HMAC')" />
+			<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED="true" />
+			<IMPORT NAME="httpclient-4.5.9" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED="true" />
+			<IMPORT NAME="httpcore-4.4.11" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED="true" />
+			<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED="true" />
 
 			<!-- SERVICE_ACCOUNT -->
-			<IMPORT NAME="google-auth-library-oauth2-http-0.20.0" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+			<IMPORT NAME="google-auth-library-oauth2-http-0.20.0" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 				<!-- Transitive dependencies of google-auth-library-oauth2-http -->
-				<IMPORT NAME="auto-value-annotations-1.7" MODULE="auto-value-annotations-1.7.jar" MVN="mvn:com.google.auto.value/auto-value-annotations/1.7" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="jsr305-3.0.2" MODULE="jsr305-3.0.2.jar" MVN="mvn:com.google.code.findbugs/jsr305/3.0.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-auth-library-credentials-0.20.0" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-http-client-1.34.0" MODULE="google-http-client-1.34.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.34.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="httpclient-4.5.10" MODULE="httpclient-4.5.10.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.10" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="httpcore-4.4.12" MODULE="httpcore-4.4.12.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.12" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="j2objc-annotations-1.3" MODULE="j2objc-annotations-1.3.jar" MVN="mvn:com.google.j2objc/j2objc-annotations/1.3" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="opencensus-contrib-http-util-0.24.0" MODULE="opencensus-contrib-http-util-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-contrib-http-util/0.24.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-http-client-jackson2-1.34.0" MODULE="google-http-client-jackson2-1.34.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.34.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="jackson-core-2.10.1" MODULE="jackson-core-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="guava-28.2-android" MODULE="guava-28.2-android.jar" MVN="mvn:com.google.guava/guava/28.2-android" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="failureaccess-1.0.1" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava" MODULE="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" MVN="mvn:com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="checker-compat-qual-2.5.5" MODULE="checker-compat-qual-2.5.5.jar" MVN="mvn:org.checkerframework/checker-compat-qual/2.5.5" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="error_prone_annotations-2.3.4" MODULE="error_prone_annotations-2.3.4.jar" MVN="mvn:com.google.errorprone/error_prone_annotations/2.3.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-auth-library-credentials-0.20.0" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-http-client-1.25.0" MODULE="google-http-client-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-http-client-jackson2-1.25.0" MODULE="google-http-client-jackson2-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="jackson-core-2.10.1" MODULE="jackson-core-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="guava-20.0.jar" MODULE="guava-20.0.jar" MVN="mvn:com.google.guava/guava/20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 
-			<IMPORT NAME="google-cloud-storage-1.108.0" MODULE="google-cloud-storage-1.108.0.jar" MVN="mvn:com.google.cloud/google-cloud-storage/1.108.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+			<IMPORT NAME="google-cloud-storage-1.104.0" MODULE="google-cloud-storage-1.104.0.jar" MVN="mvn:com.google.cloud/google-cloud-storage/1.104.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 				<!-- Transitive dependencies of google-cloud-storage -->
-				<IMPORT NAME="google-api-client-1.30.9" MODULE="google-api-client-1.30.9.jar" MVN="mvn:com.google.api-client/google-api-client/1.30.9" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-oauth-client-1.30.5" MODULE="google-oauth-client-1.30.5.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.30.5" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-api-services-storage-v1-rev20200326-1.30.9" MODULE="google-api-services-storage-v1-rev20200326-1.30.9.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20200326-1.30.9" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="gson-2.8.6" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-cloud-core-1.93.4" 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')" />
-				<IMPORT NAME="proto-google-common-protos-1.17.0" MODULE="proto-google-common-protos-1.17.0.jar" MVN="mvn:com.google.api.grpc/proto-google-common-protos/1.17.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-cloud-core-http-1.93.4" MODULE="google-cloud-core-http-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.93.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-http-client-appengine-1.34.2" MODULE="google-http-client-appengine-1.34.2.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.34.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="gax-httpjson-0.73.0" MODULE="gax-httpjson-0.73.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.73.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="gax-1.56.0" MODULE="gax-1.56.0.jar" MVN="mvn:com.google.api/gax/1.56.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="api-common-1.9.0" MODULE="api-common-1.9.0.jar" MVN="mvn:com.google.api/api-common/1.9.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="javax.annotation-api-1.3.2" MODULE="javax.annotation-api-1.3.2.jar" MVN="mvn:javax.annotation/javax.annotation-api/1.3.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="opencensus-api-0.24.0" MODULE="opencensus-api-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-api/0.24.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="grpc-context-1.22.1" MODULE="grpc-context-1.22.1.jar" MVN="mvn:io.grpc/grpc-context/1.22.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="proto-google-iam-v1-0.13.0" MODULE="proto-google-iam-v1-0.13.0.jar" MVN="mvn:com.google.api.grpc/proto-google-iam-v1/0.13.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="protobuf-java-3.11.4" MODULE="protobuf-java-3.11.4.jar" MVN="mvn:com.google.protobuf/protobuf-java/3.11.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="protobuf-java-util-3.11.4" MODULE="protobuf-java-util-3.11.4.jar" MVN="mvn:com.google.protobuf/protobuf-java-util/3.11.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="threetenbp-1.4.4" MODULE="threetenbp-1.4.4.jar" MVN="mvn:org.threeten/threetenbp/1.4.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<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')" />
+				<IMPORT NAME="google-api-client-1.25.0.jar" MODULE="google-api-client-1.25.0.jar" MVN="mvn:com.google.api-client/google-api-client/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-oauth-client-1.25.0.jar" MODULE="google-oauth-client-1.25.0.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-api-services-storage-v1-rev20191011-1.30.3" MODULE="google-api-services-storage-v1-rev20191011-1.30.3.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20191011-1.30.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="gson-2.8.6" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<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')" />
+				<IMPORT NAME="javax.annotation-api" MODULE="javax.annotation-api-1.3.jar" MVN="mvn:javax.annotation/javax.annotation-api/1.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="gax-1.27.0" MODULE="gax-1.27.0.jar" MVN="mvn:com.google.api/gax/1.27.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="gax-httpjson-0.44.0" MODULE="gax-httpjson-0.44.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.44.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="threetenbp-1.3.3.jar" MODULE="threetenbp-1.3.3.jar" MVN="mvn:org.threeten/threetenbp/1.3.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="protobuf-java-2.5.0" MODULE="protobuf-java-2.5.0.jar" MVN="mvn:com.google.protobuf/protobuf-java/2.5.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="error_prone_annotation-2.1.3" MODULE="error_prone_annotation-2.1.3.jar" MVN="mvn:com.google.errorprone/error_prone_annotations/2.1.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-cloud-core-http-1.32.0.jar" MODULE="google-cloud-core-http-1.32.0.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.32.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-http-client-appengine-1.25.0.jar" MODULE="google-http-client-appengine-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="opencensus-api-0.21.0" MODULE="opencensus-api-0.21.0.jar" MVN="mvn:io.opencensus/opencensus-api/0.21.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="opencensus-contrib-http-util-0.21.0" MODULE="opencensus-contrib-http-util-0.21.0.jar" MVN="mvn:io.opencensus/opencensus-contrib-http-util/0.21.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="grpc-context-1.19.0" MODULE="grpc-context-1.19.0.jar" MVN="mvn:io.grpc/grpc-context/1.19.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="proto-google-common-protos-1.17.0" MODULE="proto-google-common-protos-1.17.0.jar" MVN="mvn:com.google.api.grpc/proto-google-common-protos/1.17.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="proto-google-iam-v1-0.13.0" MODULE="proto-google-iam-v1-0.13.0.jar" MVN="mvn:com.google.api.grpc/proto-google-iam-v1/0.13.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="protobuf-java-util-3.11.4" MODULE="protobuf-java-util-3.11.4.jar" MVN="mvn:com.google.protobuf/protobuf-java-util/3.11.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="annotation-1.1.0" MODULE="annotation-1.1.0.jar" MVN="mvn:androidx.annotation/annotation/1.1.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 		</IMPORTS>
 	</CODEGENERATION>
 

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

@@ -76,52 +76,43 @@
 	    <IMPORTS>
 			<!-- USER_ACCOUNT_HMAC -->
 	       	<IMPORT NAME="jets3t-0.9.1" MODULE="jets3t-0.9.1.jar" MVN="mvn:org.talend.libraries/jets3t-0.9.1/6.0.0" REQUIRED_IF="(AUTH_TYPE == 'USER_ACCOUNT_HMAC')" />
-			<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(AUTH_TYPE == 'USER_ACCOUNT_HMAC')" />
-			<IMPORT NAME="httpclient-4.5.9" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED_IF="(AUTH_TYPE == 'USER_ACCOUNT_HMAC')" />
-			<IMPORT NAME="httpcore-4.4.11" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED_IF="(AUTH_TYPE == 'USER_ACCOUNT_HMAC')" />
-			<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(AUTH_TYPE == 'USER_ACCOUNT_HMAC')" />
+			<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED="true" />
+			<IMPORT NAME="httpclient-4.5.9" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED="true" />
+			<IMPORT NAME="httpcore-4.4.11" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED="true" />
+			<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED="true" />
 
 			<!-- SERVICE_ACCOUNT -->
 			<IMPORT NAME="google-auth-library-oauth2-http-0.20.0" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 				<!-- Transitive dependencies of google-auth-library-oauth2-http -->
-				<IMPORT NAME="auto-value-annotations-1.7" MODULE="auto-value-annotations-1.7.jar" MVN="mvn:com.google.auto.value/auto-value-annotations/1.7" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="jsr305-3.0.2" MODULE="jsr305-3.0.2.jar" MVN="mvn:com.google.code.findbugs/jsr305/3.0.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 				<IMPORT NAME="google-auth-library-credentials-0.20.0" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-http-client-1.34.0" MODULE="google-http-client-1.34.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.34.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="httpclient-4.5.10" MODULE="httpclient-4.5.10.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.10" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="httpcore-4.4.12" MODULE="httpcore-4.4.12.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.12" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="j2objc-annotations-1.3" MODULE="j2objc-annotations-1.3.jar" MVN="mvn:com.google.j2objc/j2objc-annotations/1.3" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="opencensus-contrib-http-util-0.24.0" MODULE="opencensus-contrib-http-util-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-contrib-http-util/0.24.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-http-client-jackson2-1.34.0" MODULE="google-http-client-jackson2-1.34.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.34.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-http-client-1.25.0" MODULE="google-http-client-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.25.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-http-client-jackson2-1.25.0" MODULE="google-http-client-jackson2-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.25.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 				<IMPORT NAME="jackson-core-2.10.1" MODULE="jackson-core-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="guava-28.2-android" MODULE="guava-28.2-android.jar" MVN="mvn:com.google.guava/guava/28.2-android" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="failureaccess-1.0.1" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava" MODULE="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" MVN="mvn:com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="checker-compat-qual-2.5.5" MODULE="checker-compat-qual-2.5.5.jar" MVN="mvn:org.checkerframework/checker-compat-qual/2.5.5" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="error_prone_annotations-2.3.4" MODULE="error_prone_annotations-2.3.4.jar" MVN="mvn:com.google.errorprone/error_prone_annotations/2.3.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="guava-20.0.jar" MODULE="guava-20.0.jar" MVN="mvn:com.google.guava/guava/20.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 
-			<IMPORT NAME="google-cloud-storage-1.108.0" MODULE="google-cloud-storage-1.108.0.jar" MVN="mvn:com.google.cloud/google-cloud-storage/1.108.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+			<IMPORT NAME="google-cloud-storage-1.104.0" MODULE="google-cloud-storage-1.104.0.jar" MVN="mvn:com.google.cloud/google-cloud-storage/1.104.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 				<!-- Transitive dependencies of google-cloud-storage -->
-				<IMPORT NAME="google-api-client-1.30.9" MODULE="google-api-client-1.30.9.jar" MVN="mvn:com.google.api-client/google-api-client/1.30.9" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-oauth-client-1.30.5" MODULE="google-oauth-client-1.30.5.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.30.5" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-api-services-storage-v1-rev20200326-1.30.9" MODULE="google-api-services-storage-v1-rev20200326-1.30.9.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20200326-1.30.9" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<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')" />
+				<IMPORT NAME="google-api-client-1.25.0.jar" MODULE="google-api-client-1.25.0.jar" MVN="mvn:com.google.api-client/google-api-client/1.25.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-oauth-client-1.25.0.jar" MODULE="google-oauth-client-1.25.0.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.25.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-api-services-storage-v1-rev20191011-1.30.3" MODULE="google-api-services-storage-v1-rev20191011-1.30.3.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20191011-1.30.3" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 				<IMPORT NAME="gson-2.8.6" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-cloud-core-1.93.4" 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')" />
+				<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')" />
+				<IMPORT NAME="javax.annotation-api" MODULE="javax.annotation-api-1.3.jar" MVN="mvn:javax.annotation/javax.annotation-api/1.3" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="gax-1.27.0" MODULE="gax-1.27.0.jar" MVN="mvn:com.google.api/gax/1.27.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="gax-httpjson-0.44.0" MODULE="gax-httpjson-0.44.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.44.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="threetenbp-1.3.3.jar" MODULE="threetenbp-1.3.3.jar" MVN="mvn:org.threeten/threetenbp/1.3.3" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="protobuf-java-2.5.0" MODULE="protobuf-java-2.5.0.jar" MVN="mvn:com.google.protobuf/protobuf-java/2.5.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="error_prone_annotation-2.1.3" MODULE="error_prone_annotation-2.1.3.jar" MVN="mvn:com.google.errorprone/error_prone_annotations/2.1.3" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-cloud-core-http-1.32.0.jar" MODULE="google-cloud-core-http-1.32.0.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.32.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-http-client-appengine-1.25.0.jar" MODULE="google-http-client-appengine-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.25.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="opencensus-api-0.21.0" MODULE="opencensus-api-0.21.0.jar" MVN="mvn:io.opencensus/opencensus-api/0.21.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="opencensus-contrib-http-util-0.21.0" MODULE="opencensus-contrib-http-util-0.21.0.jar" MVN="mvn:io.opencensus/opencensus-contrib-http-util/0.21.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="grpc-context-1.19.0" MODULE="grpc-context-1.19.0.jar" MVN="mvn:io.grpc/grpc-context/1.19.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 				<IMPORT NAME="proto-google-common-protos-1.17.0" MODULE="proto-google-common-protos-1.17.0.jar" MVN="mvn:com.google.api.grpc/proto-google-common-protos/1.17.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-cloud-core-http-1.93.4" MODULE="google-cloud-core-http-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.93.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-http-client-appengine-1.34.2" MODULE="google-http-client-appengine-1.34.2.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.34.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="gax-httpjson-0.73.0" MODULE="gax-httpjson-0.73.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.73.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="gax-1.56.0" MODULE="gax-1.56.0.jar" MVN="mvn:com.google.api/gax/1.56.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="api-common-1.9.0" MODULE="api-common-1.9.0.jar" MVN="mvn:com.google.api/api-common/1.9.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="javax.annotation-api-1.3.2" MODULE="javax.annotation-api-1.3.2.jar" MVN="mvn:javax.annotation/javax.annotation-api/1.3.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="opencensus-api-0.24.0" MODULE="opencensus-api-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-api/0.24.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="grpc-context-1.22.1" MODULE="grpc-context-1.22.1.jar" MVN="mvn:io.grpc/grpc-context/1.22.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 				<IMPORT NAME="proto-google-iam-v1-0.13.0" MODULE="proto-google-iam-v1-0.13.0.jar" MVN="mvn:com.google.api.grpc/proto-google-iam-v1/0.13.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="protobuf-java-3.11.4" MODULE="protobuf-java-3.11.4.jar" MVN="mvn:com.google.protobuf/protobuf-java/3.11.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 				<IMPORT NAME="protobuf-java-util-3.11.4" MODULE="protobuf-java-util-3.11.4.jar" MVN="mvn:com.google.protobuf/protobuf-java-util/3.11.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="threetenbp-1.4.4" MODULE="threetenbp-1.4.4.jar" MVN="mvn:org.threeten/threetenbp/1.4.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="annotation-1.1.0" MODULE="annotation-1.1.0.jar" MVN="mvn:androidx.annotation/annotation/1.1.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 		</IMPORTS>
 	</CODEGENERATION>
 

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

@@ -190,53 +190,44 @@
 	<CODEGENERATION>
 		<IMPORTS>
 			<!-- USER_ACCOUNT_HMAC -->
-	      	<IMPORT NAME="jets3t-0.9.1" MODULE="jets3t-0.9.1.jar" MVN="mvn:org.talend.libraries/jets3t-0.9.1/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="httpclient-4.5.9" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="httpcore-4.4.11" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			
-			<!-- SERVICE_ACCOUNT -->
-			<IMPORT NAME="google-auth-library-oauth2-http-0.20.0" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<!-- Transitive dependencies of google-auth-library-oauth2-http -->
-				<IMPORT NAME="auto-value-annotations-1.7" MODULE="auto-value-annotations-1.7.jar" MVN="mvn:com.google.auto.value/auto-value-annotations/1.7" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="jsr305-3.0.2" MODULE="jsr305-3.0.2.jar" MVN="mvn:com.google.code.findbugs/jsr305/3.0.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-auth-library-credentials-0.20.0" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-http-client-1.34.0" MODULE="google-http-client-1.34.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.34.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="httpclient-4.5.10" MODULE="httpclient-4.5.10.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.10" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="httpcore-4.4.12" MODULE="httpcore-4.4.12.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.12" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="j2objc-annotations-1.3" MODULE="j2objc-annotations-1.3.jar" MVN="mvn:com.google.j2objc/j2objc-annotations/1.3" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="opencensus-contrib-http-util-0.24.0" MODULE="opencensus-contrib-http-util-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-contrib-http-util/0.24.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-http-client-jackson2-1.34.0" MODULE="google-http-client-jackson2-1.34.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.34.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="jackson-core-2.10.1" MODULE="jackson-core-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="guava-28.2-android" MODULE="guava-28.2-android.jar" MVN="mvn:com.google.guava/guava/28.2-android" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="failureaccess-1.0.1" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava" MODULE="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" MVN="mvn:com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="checker-compat-qual-2.5.5" MODULE="checker-compat-qual-2.5.5.jar" MVN="mvn:org.checkerframework/checker-compat-qual/2.5.5" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="error_prone_annotations-2.3.4" MODULE="error_prone_annotations-2.3.4.jar" MVN="mvn:com.google.errorprone/error_prone_annotations/2.3.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+			<IMPORT NAME="jets3t-0.9.1" MODULE="jets3t-0.9.1.jar" MVN="mvn:org.talend.libraries/jets3t-0.9.1/6.0.0"  REQUIRED_IF="(#LINK@NODE.CONNECTION.AUTH_TYPE == 'USER_ACCOUNT_HMAC') OR (AUTH_TYPE == 'USER_ACCOUNT_HMAC')" />
+			<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED="true" />
+			<IMPORT NAME="httpclient-4.5.9" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED="true" />
+			<IMPORT NAME="httpcore-4.4.11" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED="true" />
+			<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED="true" />
 
-			<IMPORT NAME="google-cloud-storage-1.108.0" MODULE="google-cloud-storage-1.108.0.jar" MVN="mvn:com.google.cloud/google-cloud-storage/1.108.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+			<!-- SERVICE_ACCOUNT -->
+			<IMPORT NAME="google-auth-library-oauth2-http-0.20.0" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<!-- Transitive dependencies of google-auth-library-oauth2-http -->
+				<IMPORT NAME="google-auth-library-credentials-0.20.0" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-http-client-1.25.0" MODULE="google-http-client-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-http-client-jackson2-1.25.0" MODULE="google-http-client-jackson2-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="jackson-core-2.10.1" MODULE="jackson-core-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="guava-20.0.jar" MODULE="guava-20.0.jar" MVN="mvn:com.google.guava/guava/20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+
+			<IMPORT NAME="google-cloud-storage-1.104.0" MODULE="google-cloud-storage-1.104.0.jar" MVN="mvn:com.google.cloud/google-cloud-storage/1.104.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 				<!-- Transitive dependencies of google-cloud-storage -->
-				<IMPORT NAME="google-api-client-1.30.9" MODULE="google-api-client-1.30.9.jar" MVN="mvn:com.google.api-client/google-api-client/1.30.9" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-oauth-client-1.30.5" MODULE="google-oauth-client-1.30.5.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.30.5" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-api-services-storage-v1-rev20200326-1.30.9" MODULE="google-api-services-storage-v1-rev20200326-1.30.9.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20200326-1.30.9" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="gson-2.8.6" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-cloud-core-1.93.4" 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')" />
-				<IMPORT NAME="proto-google-common-protos-1.17.0" MODULE="proto-google-common-protos-1.17.0.jar" MVN="mvn:com.google.api.grpc/proto-google-common-protos/1.17.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-cloud-core-http-1.93.4" MODULE="google-cloud-core-http-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.93.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-http-client-appengine-1.34.2" MODULE="google-http-client-appengine-1.34.2.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.34.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="gax-httpjson-0.73.0" MODULE="gax-httpjson-0.73.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.73.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="gax-1.56.0" MODULE="gax-1.56.0.jar" MVN="mvn:com.google.api/gax/1.56.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="api-common-1.9.0" MODULE="api-common-1.9.0.jar" MVN="mvn:com.google.api/api-common/1.9.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="javax.annotation-api-1.3.2" MODULE="javax.annotation-api-1.3.2.jar" MVN="mvn:javax.annotation/javax.annotation-api/1.3.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="opencensus-api-0.24.0" MODULE="opencensus-api-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-api/0.24.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="grpc-context-1.22.1" MODULE="grpc-context-1.22.1.jar" MVN="mvn:io.grpc/grpc-context/1.22.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="proto-google-iam-v1-0.13.0" MODULE="proto-google-iam-v1-0.13.0.jar" MVN="mvn:com.google.api.grpc/proto-google-iam-v1/0.13.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="protobuf-java-3.11.4" MODULE="protobuf-java-3.11.4.jar" MVN="mvn:com.google.protobuf/protobuf-java/3.11.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="protobuf-java-util-3.11.4" MODULE="protobuf-java-util-3.11.4.jar" MVN="mvn:com.google.protobuf/protobuf-java-util/3.11.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="threetenbp-1.4.4" MODULE="threetenbp-1.4.4.jar" MVN="mvn:org.threeten/threetenbp/1.4.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<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')" />
+				<IMPORT NAME="google-api-client-1.25.0.jar" MODULE="google-api-client-1.25.0.jar" MVN="mvn:com.google.api-client/google-api-client/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-oauth-client-1.25.0.jar" MODULE="google-oauth-client-1.25.0.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-api-services-storage-v1-rev20191011-1.30.3" MODULE="google-api-services-storage-v1-rev20191011-1.30.3.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20191011-1.30.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="gson-2.8.6" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<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')" />
+				<IMPORT NAME="javax.annotation-api" MODULE="javax.annotation-api-1.3.jar" MVN="mvn:javax.annotation/javax.annotation-api/1.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="gax-1.27.0" MODULE="gax-1.27.0.jar" MVN="mvn:com.google.api/gax/1.27.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="gax-httpjson-0.44.0" MODULE="gax-httpjson-0.44.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.44.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="threetenbp-1.3.3.jar" MODULE="threetenbp-1.3.3.jar" MVN="mvn:org.threeten/threetenbp/1.3.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="protobuf-java-2.5.0" MODULE="protobuf-java-2.5.0.jar" MVN="mvn:com.google.protobuf/protobuf-java/2.5.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="error_prone_annotation-2.1.3" MODULE="error_prone_annotation-2.1.3.jar" MVN="mvn:com.google.errorprone/error_prone_annotations/2.1.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-cloud-core-http-1.32.0.jar" MODULE="google-cloud-core-http-1.32.0.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.32.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-http-client-appengine-1.25.0.jar" MODULE="google-http-client-appengine-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="opencensus-api-0.21.0" MODULE="opencensus-api-0.21.0.jar" MVN="mvn:io.opencensus/opencensus-api/0.21.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="opencensus-contrib-http-util-0.21.0" MODULE="opencensus-contrib-http-util-0.21.0.jar" MVN="mvn:io.opencensus/opencensus-contrib-http-util/0.21.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="grpc-context-1.19.0" MODULE="grpc-context-1.19.0.jar" MVN="mvn:io.grpc/grpc-context/1.19.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="proto-google-common-protos-1.17.0" MODULE="proto-google-common-protos-1.17.0.jar" MVN="mvn:com.google.api.grpc/proto-google-common-protos/1.17.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="proto-google-iam-v1-0.13.0" MODULE="proto-google-iam-v1-0.13.0.jar" MVN="mvn:com.google.api.grpc/proto-google-iam-v1/0.13.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="protobuf-java-util-3.11.4" MODULE="protobuf-java-util-3.11.4.jar" MVN="mvn:com.google.protobuf/protobuf-java-util/3.11.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="annotation-1.1.0" MODULE="annotation-1.1.0.jar" MVN="mvn:androidx.annotation/annotation/1.1.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 	    </IMPORTS>
 	</CODEGENERATION>
 

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

@@ -212,16 +212,16 @@ if (!useServiceAccountForConnection){
 					.fromStream(new java.io.FileInputStream(<%=pathToServerAccoutKeyFile%>));
 		} catch (IOException e_<%=cid%>) {
 			<%
-			if (("true").equals(dieOnError)) {
+			if(isLog4jEnabled){
 			%>
-				throw(e_<%=cid%>);
+				log.error("<%=cid%> - Exception in component <%=cid%>.", e_<%=cid%>);
 			<%
 			}
 			%>
 			<%
-			if(isLog4jEnabled){
+			if (("true").equals(dieOnError)) {
 			%>
-				log.error("<%=cid%> - Exception in component <%=cid%>.", e_<%=cid%>);
+				throw(e_<%=cid%>);
 			<%
 			}
 			%>

main/plugins/org.talend.designer.components.localprovider/components/tGSDelete/tGSDelete_begin.javajet

@@ -193,16 +193,16 @@ if (!useServiceAccountForConnection){
 					.fromStream(new java.io.FileInputStream(<%=pathToServerAccoutKeyFile%>));
 		} catch (IOException e_<%=cid%>) {
 			<%
-			if (("true").equals(dieOnError)) {
+			if(isLog4jEnabled){
 			%>
-				throw(e_<%=cid%>);
+				log.error("<%=cid%> - Exception in component <%=cid%>.", e_<%=cid%>);
 			<%
 			}
 			%>
 			<%
-			if(isLog4jEnabled){
+			if (("true").equals(dieOnError)) {
 			%>
-				log.error("<%=cid%> - Exception in component <%=cid%>.", e_<%=cid%>);
+				throw(e_<%=cid%>);
 			<%
 			}
 			%>

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

@@ -191,53 +191,44 @@
 	<CODEGENERATION>
 	    <IMPORTS>
 			<!-- USER_ACCOUNT_HMAC -->
-	      	<IMPORT NAME="jets3t-0.9.1" MODULE="jets3t-0.9.1.jar" MVN="mvn:org.talend.libraries/jets3t-0.9.1/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="httpclient-4.5.9" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="httpcore-4.4.11" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="jets3t-0.9.1" MODULE="jets3t-0.9.1.jar" MVN="mvn:org.talend.libraries/jets3t-0.9.1/6.0.0"  REQUIRED_IF="(#LINK@NODE.CONNECTION.AUTH_TYPE == 'USER_ACCOUNT_HMAC') OR (AUTH_TYPE == 'USER_ACCOUNT_HMAC')" />
+			<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED="true" />
+			<IMPORT NAME="httpclient-4.5.9" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED="true" />
+			<IMPORT NAME="httpcore-4.4.11" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED="true" />
+			<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED="true" />
 
 			<!-- SERVICE_ACCOUNT -->
-			<IMPORT NAME="google-auth-library-oauth2-http-0.20.0" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+			<IMPORT NAME="google-auth-library-oauth2-http-0.20.0" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 				<!-- Transitive dependencies of google-auth-library-oauth2-http -->
-				<IMPORT NAME="auto-value-annotations-1.7" MODULE="auto-value-annotations-1.7.jar" MVN="mvn:com.google.auto.value/auto-value-annotations/1.7" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="jsr305-3.0.2" MODULE="jsr305-3.0.2.jar" MVN="mvn:com.google.code.findbugs/jsr305/3.0.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-auth-library-credentials-0.20.0" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-http-client-1.34.0" MODULE="google-http-client-1.34.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.34.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="httpclient-4.5.10" MODULE="httpclient-4.5.10.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.10" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="httpcore-4.4.12" MODULE="httpcore-4.4.12.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.12" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="j2objc-annotations-1.3" MODULE="j2objc-annotations-1.3.jar" MVN="mvn:com.google.j2objc/j2objc-annotations/1.3" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="opencensus-contrib-http-util-0.24.0" MODULE="opencensus-contrib-http-util-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-contrib-http-util/0.24.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-http-client-jackson2-1.34.0" MODULE="google-http-client-jackson2-1.34.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.34.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="jackson-core-2.10.1" MODULE="jackson-core-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="guava-28.2-android" MODULE="guava-28.2-android.jar" MVN="mvn:com.google.guava/guava/28.2-android" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="failureaccess-1.0.1" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava" MODULE="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" MVN="mvn:com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="checker-compat-qual-2.5.5" MODULE="checker-compat-qual-2.5.5.jar" MVN="mvn:org.checkerframework/checker-compat-qual/2.5.5" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="error_prone_annotations-2.3.4" MODULE="error_prone_annotations-2.3.4.jar" MVN="mvn:com.google.errorprone/error_prone_annotations/2.3.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-auth-library-credentials-0.20.0" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-http-client-1.25.0" MODULE="google-http-client-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-http-client-jackson2-1.25.0" MODULE="google-http-client-jackson2-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="jackson-core-2.10.1" MODULE="jackson-core-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="guava-20.0.jar" MODULE="guava-20.0.jar" MVN="mvn:com.google.guava/guava/20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 
-			<IMPORT NAME="google-cloud-storage-1.108.0" MODULE="google-cloud-storage-1.108.0.jar" MVN="mvn:com.google.cloud/google-cloud-storage/1.108.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+			<IMPORT NAME="google-cloud-storage-1.104.0" MODULE="google-cloud-storage-1.104.0.jar" MVN="mvn:com.google.cloud/google-cloud-storage/1.104.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 				<!-- Transitive dependencies of google-cloud-storage -->
-				<IMPORT NAME="google-api-client-1.30.9" MODULE="google-api-client-1.30.9.jar" MVN="mvn:com.google.api-client/google-api-client/1.30.9" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-oauth-client-1.30.5" MODULE="google-oauth-client-1.30.5.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.30.5" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-api-services-storage-v1-rev20200326-1.30.9" MODULE="google-api-services-storage-v1-rev20200326-1.30.9.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20200326-1.30.9" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="gson-2.8.6" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-cloud-core-1.93.4" 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')" />
-				<IMPORT NAME="proto-google-common-protos-1.17.0" MODULE="proto-google-common-protos-1.17.0.jar" MVN="mvn:com.google.api.grpc/proto-google-common-protos/1.17.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-cloud-core-http-1.93.4" MODULE="google-cloud-core-http-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.93.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-http-client-appengine-1.34.2" MODULE="google-http-client-appengine-1.34.2.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.34.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="gax-httpjson-0.73.0" MODULE="gax-httpjson-0.73.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.73.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="gax-1.56.0" MODULE="gax-1.56.0.jar" MVN="mvn:com.google.api/gax/1.56.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="api-common-1.9.0" MODULE="api-common-1.9.0.jar" MVN="mvn:com.google.api/api-common/1.9.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="javax.annotation-api-1.3.2" MODULE="javax.annotation-api-1.3.2.jar" MVN="mvn:javax.annotation/javax.annotation-api/1.3.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="opencensus-api-0.24.0" MODULE="opencensus-api-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-api/0.24.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="grpc-context-1.22.1" MODULE="grpc-context-1.22.1.jar" MVN="mvn:io.grpc/grpc-context/1.22.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="proto-google-iam-v1-0.13.0" MODULE="proto-google-iam-v1-0.13.0.jar" MVN="mvn:com.google.api.grpc/proto-google-iam-v1/0.13.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="protobuf-java-3.11.4" MODULE="protobuf-java-3.11.4.jar" MVN="mvn:com.google.protobuf/protobuf-java/3.11.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="protobuf-java-util-3.11.4" MODULE="protobuf-java-util-3.11.4.jar" MVN="mvn:com.google.protobuf/protobuf-java-util/3.11.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="threetenbp-1.4.4" MODULE="threetenbp-1.4.4.jar" MVN="mvn:org.threeten/threetenbp/1.4.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<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')" />
+				<IMPORT NAME="google-api-client-1.25.0.jar" MODULE="google-api-client-1.25.0.jar" MVN="mvn:com.google.api-client/google-api-client/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-oauth-client-1.25.0.jar" MODULE="google-oauth-client-1.25.0.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-api-services-storage-v1-rev20191011-1.30.3" MODULE="google-api-services-storage-v1-rev20191011-1.30.3.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20191011-1.30.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="gson-2.8.6" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<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')" />
+				<IMPORT NAME="javax.annotation-api" MODULE="javax.annotation-api-1.3.jar" MVN="mvn:javax.annotation/javax.annotation-api/1.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="gax-1.27.0" MODULE="gax-1.27.0.jar" MVN="mvn:com.google.api/gax/1.27.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="gax-httpjson-0.44.0" MODULE="gax-httpjson-0.44.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.44.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="threetenbp-1.3.3.jar" MODULE="threetenbp-1.3.3.jar" MVN="mvn:org.threeten/threetenbp/1.3.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="protobuf-java-2.5.0" MODULE="protobuf-java-2.5.0.jar" MVN="mvn:com.google.protobuf/protobuf-java/2.5.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="error_prone_annotation-2.1.3" MODULE="error_prone_annotation-2.1.3.jar" MVN="mvn:com.google.errorprone/error_prone_annotations/2.1.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-cloud-core-http-1.32.0.jar" MODULE="google-cloud-core-http-1.32.0.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.32.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-http-client-appengine-1.25.0.jar" MODULE="google-http-client-appengine-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="opencensus-api-0.21.0" MODULE="opencensus-api-0.21.0.jar" MVN="mvn:io.opencensus/opencensus-api/0.21.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="opencensus-contrib-http-util-0.21.0" MODULE="opencensus-contrib-http-util-0.21.0.jar" MVN="mvn:io.opencensus/opencensus-contrib-http-util/0.21.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="grpc-context-1.19.0" MODULE="grpc-context-1.19.0.jar" MVN="mvn:io.grpc/grpc-context/1.19.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="proto-google-common-protos-1.17.0" MODULE="proto-google-common-protos-1.17.0.jar" MVN="mvn:com.google.api.grpc/proto-google-common-protos/1.17.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="proto-google-iam-v1-0.13.0" MODULE="proto-google-iam-v1-0.13.0.jar" MVN="mvn:com.google.api.grpc/proto-google-iam-v1/0.13.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="protobuf-java-util-3.11.4" MODULE="protobuf-java-util-3.11.4.jar" MVN="mvn:com.google.protobuf/protobuf-java-util/3.11.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="annotation-1.1.0" MODULE="annotation-1.1.0.jar" MVN="mvn:androidx.annotation/annotation/1.1.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 	    </IMPORTS>
    	</CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tGSGet/tGSGet_begin.javajet

@@ -315,16 +315,16 @@ if (!useServiceAccountForConnection){
 					.fromStream(new java.io.FileInputStream(<%=pathToServerAccoutKeyFile%>));
 		} catch (IOException e_<%=cid%>) {
 			<%
-			if (("true").equals(dieOnError)) {
+			if(isLog4jEnabled){
 			%>
-				throw(e_<%=cid%>);
+				log.error("<%=cid%> - Exception in component <%=cid%>.", e_<%=cid%>);
 			<%
 			}
 			%>
 			<%
-			if(isLog4jEnabled){
+			if (("true").equals(dieOnError)) {
 			%>
-				log.error("<%=cid%> - Exception in component <%=cid%>.", e_<%=cid%>);
+				throw(e_<%=cid%>);
 			<%
 			}
 			%>

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

@@ -229,53 +229,44 @@
    	<CODEGENERATION>
 	    <IMPORTS>
 			<!-- USER_ACCOUNT_HMAC -->
-	      	<IMPORT NAME="jets3t-0.9.1" MODULE="jets3t-0.9.1.jar" MVN="mvn:org.talend.libraries/jets3t-0.9.1/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="httpclient-4.5.9" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="httpcore-4.4.11" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="jets3t-0.9.1" MODULE="jets3t-0.9.1.jar" MVN="mvn:org.talend.libraries/jets3t-0.9.1/6.0.0"  REQUIRED_IF="(#LINK@NODE.CONNECTION.AUTH_TYPE == 'USER_ACCOUNT_HMAC') OR (AUTH_TYPE == 'USER_ACCOUNT_HMAC')" />
+			<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED="true" />
+			<IMPORT NAME="httpclient-4.5.9" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED="true" />
+			<IMPORT NAME="httpcore-4.4.11" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED="true" />
+			<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED="true" />
 
-						<!-- SERVICE_ACCOUNT -->
-			<IMPORT NAME="google-auth-library-oauth2-http-0.20.0" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+			<!-- SERVICE_ACCOUNT -->
+			<IMPORT NAME="google-auth-library-oauth2-http-0.20.0" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 				<!-- Transitive dependencies of google-auth-library-oauth2-http -->
-				<IMPORT NAME="auto-value-annotations-1.7" MODULE="auto-value-annotations-1.7.jar" MVN="mvn:com.google.auto.value/auto-value-annotations/1.7" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="jsr305-3.0.2" MODULE="jsr305-3.0.2.jar" MVN="mvn:com.google.code.findbugs/jsr305/3.0.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-auth-library-credentials-0.20.0" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-http-client-1.34.0" MODULE="google-http-client-1.34.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.34.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="httpclient-4.5.10" MODULE="httpclient-4.5.10.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.10" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="httpcore-4.4.12" MODULE="httpcore-4.4.12.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.12" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="j2objc-annotations-1.3" MODULE="j2objc-annotations-1.3.jar" MVN="mvn:com.google.j2objc/j2objc-annotations/1.3" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="opencensus-contrib-http-util-0.24.0" MODULE="opencensus-contrib-http-util-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-contrib-http-util/0.24.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-http-client-jackson2-1.34.0" MODULE="google-http-client-jackson2-1.34.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.34.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="jackson-core-2.10.1" MODULE="jackson-core-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="guava-28.2-android" MODULE="guava-28.2-android.jar" MVN="mvn:com.google.guava/guava/28.2-android" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="failureaccess-1.0.1" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava" MODULE="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" MVN="mvn:com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="checker-compat-qual-2.5.5" MODULE="checker-compat-qual-2.5.5.jar" MVN="mvn:org.checkerframework/checker-compat-qual/2.5.5" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="error_prone_annotations-2.3.4" MODULE="error_prone_annotations-2.3.4.jar" MVN="mvn:com.google.errorprone/error_prone_annotations/2.3.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-auth-library-credentials-0.20.0" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-http-client-1.25.0" MODULE="google-http-client-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-http-client-jackson2-1.25.0" MODULE="google-http-client-jackson2-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="jackson-core-2.10.1" MODULE="jackson-core-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="guava-20.0.jar" MODULE="guava-20.0.jar" MVN="mvn:com.google.guava/guava/20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 
-			<IMPORT NAME="google-cloud-storage-1.108.0" MODULE="google-cloud-storage-1.108.0.jar" MVN="mvn:com.google.cloud/google-cloud-storage/1.108.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+			<IMPORT NAME="google-cloud-storage-1.104.0" MODULE="google-cloud-storage-1.104.0.jar" MVN="mvn:com.google.cloud/google-cloud-storage/1.104.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 				<!-- Transitive dependencies of google-cloud-storage -->
-				<IMPORT NAME="google-api-client-1.30.9" MODULE="google-api-client-1.30.9.jar" MVN="mvn:com.google.api-client/google-api-client/1.30.9" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-oauth-client-1.30.5" MODULE="google-oauth-client-1.30.5.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.30.5" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-api-services-storage-v1-rev20200326-1.30.9" MODULE="google-api-services-storage-v1-rev20200326-1.30.9.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20200326-1.30.9" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="gson-2.8.6" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-cloud-core-1.93.4" 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')" />
-				<IMPORT NAME="proto-google-common-protos-1.17.0" MODULE="proto-google-common-protos-1.17.0.jar" MVN="mvn:com.google.api.grpc/proto-google-common-protos/1.17.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-cloud-core-http-1.93.4" MODULE="google-cloud-core-http-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.93.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-http-client-appengine-1.34.2" MODULE="google-http-client-appengine-1.34.2.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.34.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="gax-httpjson-0.73.0" MODULE="gax-httpjson-0.73.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.73.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="gax-1.56.0" MODULE="gax-1.56.0.jar" MVN="mvn:com.google.api/gax/1.56.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="api-common-1.9.0" MODULE="api-common-1.9.0.jar" MVN="mvn:com.google.api/api-common/1.9.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="javax.annotation-api-1.3.2" MODULE="javax.annotation-api-1.3.2.jar" MVN="mvn:javax.annotation/javax.annotation-api/1.3.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="opencensus-api-0.24.0" MODULE="opencensus-api-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-api/0.24.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="grpc-context-1.22.1" MODULE="grpc-context-1.22.1.jar" MVN="mvn:io.grpc/grpc-context/1.22.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="proto-google-iam-v1-0.13.0" MODULE="proto-google-iam-v1-0.13.0.jar" MVN="mvn:com.google.api.grpc/proto-google-iam-v1/0.13.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="protobuf-java-3.11.4" MODULE="protobuf-java-3.11.4.jar" MVN="mvn:com.google.protobuf/protobuf-java/3.11.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="protobuf-java-util-3.11.4" MODULE="protobuf-java-util-3.11.4.jar" MVN="mvn:com.google.protobuf/protobuf-java-util/3.11.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="threetenbp-1.4.4" MODULE="threetenbp-1.4.4.jar" MVN="mvn:org.threeten/threetenbp/1.4.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<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')" />
+				<IMPORT NAME="google-api-client-1.25.0.jar" MODULE="google-api-client-1.25.0.jar" MVN="mvn:com.google.api-client/google-api-client/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-oauth-client-1.25.0.jar" MODULE="google-oauth-client-1.25.0.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-api-services-storage-v1-rev20191011-1.30.3" MODULE="google-api-services-storage-v1-rev20191011-1.30.3.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20191011-1.30.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="gson-2.8.6" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<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')" />
+				<IMPORT NAME="javax.annotation-api" MODULE="javax.annotation-api-1.3.jar" MVN="mvn:javax.annotation/javax.annotation-api/1.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="gax-1.27.0" MODULE="gax-1.27.0.jar" MVN="mvn:com.google.api/gax/1.27.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="gax-httpjson-0.44.0" MODULE="gax-httpjson-0.44.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.44.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="threetenbp-1.3.3.jar" MODULE="threetenbp-1.3.3.jar" MVN="mvn:org.threeten/threetenbp/1.3.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="protobuf-java-2.5.0" MODULE="protobuf-java-2.5.0.jar" MVN="mvn:com.google.protobuf/protobuf-java/2.5.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="error_prone_annotation-2.1.3" MODULE="error_prone_annotation-2.1.3.jar" MVN="mvn:com.google.errorprone/error_prone_annotations/2.1.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-cloud-core-http-1.32.0.jar" MODULE="google-cloud-core-http-1.32.0.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.32.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-http-client-appengine-1.25.0.jar" MODULE="google-http-client-appengine-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="opencensus-api-0.21.0" MODULE="opencensus-api-0.21.0.jar" MVN="mvn:io.opencensus/opencensus-api/0.21.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="opencensus-contrib-http-util-0.21.0" MODULE="opencensus-contrib-http-util-0.21.0.jar" MVN="mvn:io.opencensus/opencensus-contrib-http-util/0.21.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="grpc-context-1.19.0" MODULE="grpc-context-1.19.0.jar" MVN="mvn:io.grpc/grpc-context/1.19.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="proto-google-common-protos-1.17.0" MODULE="proto-google-common-protos-1.17.0.jar" MVN="mvn:com.google.api.grpc/proto-google-common-protos/1.17.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="proto-google-iam-v1-0.13.0" MODULE="proto-google-iam-v1-0.13.0.jar" MVN="mvn:com.google.api.grpc/proto-google-iam-v1/0.13.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="protobuf-java-util-3.11.4" MODULE="protobuf-java-util-3.11.4.jar" MVN="mvn:com.google.protobuf/protobuf-java-util/3.11.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="annotation-1.1.0" MODULE="annotation-1.1.0.jar" MVN="mvn:androidx.annotation/annotation/1.1.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 	    </IMPORTS>
    	</CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tGSList/tGSList_begin.javajet

@@ -193,16 +193,16 @@ if (!useServiceAccountForConnection){
 					.fromStream(new java.io.FileInputStream(<%=pathToServerAccoutKeyFile%>));
 		} catch (IOException e_<%=cid%>) {
 			<%
-			if (("true").equals(dieOnError)) {
+			if(isLog4jEnabled){
 			%>
-				throw(e_<%=cid%>);
+				log.error("<%=cid%> - Exception in component <%=cid%>.", e_<%=cid%>);
 			<%
 			}
 			%>
 			<%
-			if(isLog4jEnabled){
+			if (("true").equals(dieOnError)) {
 			%>
-				log.error("<%=cid%> - Exception in component <%=cid%>.", e_<%=cid%>);
+				throw(e_<%=cid%>);
 			<%
 			}
 			%>

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

@@ -191,53 +191,44 @@
    	<CODEGENERATION>
 	    <IMPORTS>
 			<!-- USER_ACCOUNT_HMAC -->
-	      	<IMPORT NAME="jets3t-0.9.1" MODULE="jets3t-0.9.1.jar" MVN="mvn:org.talend.libraries/jets3t-0.9.1/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="httpclient-4.5.9" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="httpcore-4.4.11" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="jets3t-0.9.1" MODULE="jets3t-0.9.1.jar" MVN="mvn:org.talend.libraries/jets3t-0.9.1/6.0.0"  REQUIRED_IF="(#LINK@NODE.CONNECTION.AUTH_TYPE == 'USER_ACCOUNT_HMAC') OR (AUTH_TYPE == 'USER_ACCOUNT_HMAC')" />
+			<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED="true" />
+			<IMPORT NAME="httpclient-4.5.9" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED="true" />
+			<IMPORT NAME="httpcore-4.4.11" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED="true" />
+			<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED="true" />
 
 			<!-- SERVICE_ACCOUNT -->
-			<IMPORT NAME="google-auth-library-oauth2-http-0.20.0" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+			<IMPORT NAME="google-auth-library-oauth2-http-0.20.0" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 				<!-- Transitive dependencies of google-auth-library-oauth2-http -->
-				<IMPORT NAME="auto-value-annotations-1.7" MODULE="auto-value-annotations-1.7.jar" MVN="mvn:com.google.auto.value/auto-value-annotations/1.7" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="jsr305-3.0.2" MODULE="jsr305-3.0.2.jar" MVN="mvn:com.google.code.findbugs/jsr305/3.0.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-auth-library-credentials-0.20.0" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-http-client-1.34.0" MODULE="google-http-client-1.34.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.34.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="httpclient-4.5.10" MODULE="httpclient-4.5.10.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.10" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="httpcore-4.4.12" MODULE="httpcore-4.4.12.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.12" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="j2objc-annotations-1.3" MODULE="j2objc-annotations-1.3.jar" MVN="mvn:com.google.j2objc/j2objc-annotations/1.3" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="opencensus-contrib-http-util-0.24.0" MODULE="opencensus-contrib-http-util-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-contrib-http-util/0.24.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-http-client-jackson2-1.34.0" MODULE="google-http-client-jackson2-1.34.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.34.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="jackson-core-2.10.1" MODULE="jackson-core-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="guava-28.2-android" MODULE="guava-28.2-android.jar" MVN="mvn:com.google.guava/guava/28.2-android" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="failureaccess-1.0.1" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava" MODULE="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" MVN="mvn:com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="checker-compat-qual-2.5.5" MODULE="checker-compat-qual-2.5.5.jar" MVN="mvn:org.checkerframework/checker-compat-qual/2.5.5" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="error_prone_annotations-2.3.4" MODULE="error_prone_annotations-2.3.4.jar" MVN="mvn:com.google.errorprone/error_prone_annotations/2.3.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-auth-library-credentials-0.20.0" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-http-client-1.25.0" MODULE="google-http-client-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-http-client-jackson2-1.25.0" MODULE="google-http-client-jackson2-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="jackson-core-2.10.1" MODULE="jackson-core-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="guava-20.0.jar" MODULE="guava-20.0.jar" MVN="mvn:com.google.guava/guava/20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 
-			<IMPORT NAME="google-cloud-storage-1.108.0" MODULE="google-cloud-storage-1.108.0.jar" MVN="mvn:com.google.cloud/google-cloud-storage/1.108.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+			<IMPORT NAME="google-cloud-storage-1.104.0" MODULE="google-cloud-storage-1.104.0.jar" MVN="mvn:com.google.cloud/google-cloud-storage/1.104.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 				<!-- Transitive dependencies of google-cloud-storage -->
-				<IMPORT NAME="google-api-client-1.30.9" MODULE="google-api-client-1.30.9.jar" MVN="mvn:com.google.api-client/google-api-client/1.30.9" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-oauth-client-1.30.5" MODULE="google-oauth-client-1.30.5.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.30.5" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-api-services-storage-v1-rev20200326-1.30.9" MODULE="google-api-services-storage-v1-rev20200326-1.30.9.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20200326-1.30.9" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="gson-2.8.6" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-cloud-core-1.93.4" 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')" />
-				<IMPORT NAME="proto-google-common-protos-1.17.0" MODULE="proto-google-common-protos-1.17.0.jar" MVN="mvn:com.google.api.grpc/proto-google-common-protos/1.17.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-cloud-core-http-1.93.4" MODULE="google-cloud-core-http-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.93.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-http-client-appengine-1.34.2" MODULE="google-http-client-appengine-1.34.2.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.34.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="gax-httpjson-0.73.0" MODULE="gax-httpjson-0.73.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.73.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="gax-1.56.0" MODULE="gax-1.56.0.jar" MVN="mvn:com.google.api/gax/1.56.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="api-common-1.9.0" MODULE="api-common-1.9.0.jar" MVN="mvn:com.google.api/api-common/1.9.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="javax.annotation-api-1.3.2" MODULE="javax.annotation-api-1.3.2.jar" MVN="mvn:javax.annotation/javax.annotation-api/1.3.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="opencensus-api-0.24.0" MODULE="opencensus-api-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-api/0.24.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="grpc-context-1.22.1" MODULE="grpc-context-1.22.1.jar" MVN="mvn:io.grpc/grpc-context/1.22.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="proto-google-iam-v1-0.13.0" MODULE="proto-google-iam-v1-0.13.0.jar" MVN="mvn:com.google.api.grpc/proto-google-iam-v1/0.13.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="protobuf-java-3.11.4" MODULE="protobuf-java-3.11.4.jar" MVN="mvn:com.google.protobuf/protobuf-java/3.11.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="protobuf-java-util-3.11.4" MODULE="protobuf-java-util-3.11.4.jar" MVN="mvn:com.google.protobuf/protobuf-java-util/3.11.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="threetenbp-1.4.4" MODULE="threetenbp-1.4.4.jar" MVN="mvn:org.threeten/threetenbp/1.4.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<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')" />
+				<IMPORT NAME="google-api-client-1.25.0.jar" MODULE="google-api-client-1.25.0.jar" MVN="mvn:com.google.api-client/google-api-client/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-oauth-client-1.25.0.jar" MODULE="google-oauth-client-1.25.0.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-api-services-storage-v1-rev20191011-1.30.3" MODULE="google-api-services-storage-v1-rev20191011-1.30.3.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20191011-1.30.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="gson-2.8.6" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<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')" />
+				<IMPORT NAME="javax.annotation-api" MODULE="javax.annotation-api-1.3.jar" MVN="mvn:javax.annotation/javax.annotation-api/1.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="gax-1.27.0" MODULE="gax-1.27.0.jar" MVN="mvn:com.google.api/gax/1.27.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="gax-httpjson-0.44.0" MODULE="gax-httpjson-0.44.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.44.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="threetenbp-1.3.3.jar" MODULE="threetenbp-1.3.3.jar" MVN="mvn:org.threeten/threetenbp/1.3.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="protobuf-java-2.5.0" MODULE="protobuf-java-2.5.0.jar" MVN="mvn:com.google.protobuf/protobuf-java/2.5.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="error_prone_annotation-2.1.3" MODULE="error_prone_annotation-2.1.3.jar" MVN="mvn:com.google.errorprone/error_prone_annotations/2.1.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-cloud-core-http-1.32.0.jar" MODULE="google-cloud-core-http-1.32.0.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.32.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-http-client-appengine-1.25.0.jar" MODULE="google-http-client-appengine-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="opencensus-api-0.21.0" MODULE="opencensus-api-0.21.0.jar" MVN="mvn:io.opencensus/opencensus-api/0.21.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="opencensus-contrib-http-util-0.21.0" MODULE="opencensus-contrib-http-util-0.21.0.jar" MVN="mvn:io.opencensus/opencensus-contrib-http-util/0.21.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="grpc-context-1.19.0" MODULE="grpc-context-1.19.0.jar" MVN="mvn:io.grpc/grpc-context/1.19.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="proto-google-common-protos-1.17.0" MODULE="proto-google-common-protos-1.17.0.jar" MVN="mvn:com.google.api.grpc/proto-google-common-protos/1.17.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="proto-google-iam-v1-0.13.0" MODULE="proto-google-iam-v1-0.13.0.jar" MVN="mvn:com.google.api.grpc/proto-google-iam-v1/0.13.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="protobuf-java-util-3.11.4" MODULE="protobuf-java-util-3.11.4.jar" MVN="mvn:com.google.protobuf/protobuf-java-util/3.11.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="annotation-1.1.0" MODULE="annotation-1.1.0.jar" MVN="mvn:androidx.annotation/annotation/1.1.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 	    </IMPORTS>
    	</CODEGENERATION>
 

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

@@ -161,55 +161,46 @@
 
     <CODEGENERATION>
         <IMPORTS>
-            <!-- USER_ACCOUNT_HMAC -->
+			<!-- USER_ACCOUNT_HMAC -->
+			<IMPORT NAME="jets3t-0.9.1" MODULE="jets3t-0.9.1.jar" MVN="mvn:org.talend.libraries/jets3t-0.9.1/6.0.0"  REQUIRED_IF="(#LINK@NODE.CONNECTION.AUTH_TYPE == 'USER_ACCOUNT_HMAC') OR (AUTH_TYPE == 'USER_ACCOUNT_HMAC')" />
             <IMPORT NAME="google-storage-utils-1.1.0" MODULE="google-storage-utils-1.1.0.jar" MVN="mvn:org.talend.components/google-storage-utils/1.1.0" REQUIRED="true" />
-            <IMPORT NAME="jets3t-0.9.1" MODULE="jets3t-0.9.1.jar" MVN="mvn:org.talend.libraries/jets3t-0.9.1/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="httpclient-4.5.9" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="httpcore-4.4.11" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED="true" />
+			<IMPORT NAME="httpclient-4.5.9" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED="true" />
+			<IMPORT NAME="httpcore-4.4.11" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED="true" />
+			<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED="true" />
 
-            <!-- SERVICE_ACCOUNT -->
-			<IMPORT NAME="google-auth-library-oauth2-http-0.20.0" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+			<!-- SERVICE_ACCOUNT -->
+			<IMPORT NAME="google-auth-library-oauth2-http-0.20.0" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 				<!-- Transitive dependencies of google-auth-library-oauth2-http -->
-				<IMPORT NAME="auto-value-annotations-1.7" MODULE="auto-value-annotations-1.7.jar" MVN="mvn:com.google.auto.value/auto-value-annotations/1.7" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="jsr305-3.0.2" MODULE="jsr305-3.0.2.jar" MVN="mvn:com.google.code.findbugs/jsr305/3.0.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-auth-library-credentials-0.20.0" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-http-client-1.34.0" MODULE="google-http-client-1.34.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.34.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="httpclient-4.5.10" MODULE="httpclient-4.5.10.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.10" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="httpcore-4.4.12" MODULE="httpcore-4.4.12.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.12" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="j2objc-annotations-1.3" MODULE="j2objc-annotations-1.3.jar" MVN="mvn:com.google.j2objc/j2objc-annotations/1.3" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="opencensus-contrib-http-util-0.24.0" MODULE="opencensus-contrib-http-util-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-contrib-http-util/0.24.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-http-client-jackson2-1.34.0" MODULE="google-http-client-jackson2-1.34.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.34.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="jackson-core-2.10.1" MODULE="jackson-core-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="guava-28.2-android" MODULE="guava-28.2-android.jar" MVN="mvn:com.google.guava/guava/28.2-android" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="failureaccess-1.0.1" MODULE="failureaccess-1.0.1.jar" MVN="mvn:com.google.guava/failureaccess/1.0.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava" MODULE="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" MVN="mvn:com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="checker-compat-qual-2.5.5" MODULE="checker-compat-qual-2.5.5.jar" MVN="mvn:org.checkerframework/checker-compat-qual/2.5.5" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="error_prone_annotations-2.3.4" MODULE="error_prone_annotations-2.3.4.jar" MVN="mvn:com.google.errorprone/error_prone_annotations/2.3.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-auth-library-credentials-0.20.0" MODULE="google-auth-library-credentials-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-credentials/0.20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-http-client-1.25.0" MODULE="google-http-client-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-http-client-jackson2-1.25.0" MODULE="google-http-client-jackson2-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="jackson-core-2.10.1" MODULE="jackson-core-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="guava-20.0.jar" MODULE="guava-20.0.jar" MVN="mvn:com.google.guava/guava/20.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 
-			<IMPORT NAME="google-cloud-storage-1.108.0" MODULE="google-cloud-storage-1.108.0.jar" MVN="mvn:com.google.cloud/google-cloud-storage/1.108.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+			<IMPORT NAME="google-cloud-storage-1.104.0" MODULE="google-cloud-storage-1.104.0.jar" MVN="mvn:com.google.cloud/google-cloud-storage/1.104.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
 				<!-- Transitive dependencies of google-cloud-storage -->
-				<IMPORT NAME="google-api-client-1.30.9" MODULE="google-api-client-1.30.9.jar" MVN="mvn:com.google.api-client/google-api-client/1.30.9" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-oauth-client-1.30.5" MODULE="google-oauth-client-1.30.5.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.30.5" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-api-services-storage-v1-rev20200326-1.30.9" MODULE="google-api-services-storage-v1-rev20200326-1.30.9.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20200326-1.30.9" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="gson-2.8.6" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-cloud-core-1.93.4" 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')" />
-				<IMPORT NAME="proto-google-common-protos-1.17.0" MODULE="proto-google-common-protos-1.17.0.jar" MVN="mvn:com.google.api.grpc/proto-google-common-protos/1.17.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-cloud-core-http-1.93.4" MODULE="google-cloud-core-http-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.93.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="google-http-client-appengine-1.34.2" MODULE="google-http-client-appengine-1.34.2.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.34.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="gax-httpjson-0.73.0" MODULE="gax-httpjson-0.73.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.73.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="gax-1.56.0" MODULE="gax-1.56.0.jar" MVN="mvn:com.google.api/gax/1.56.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="api-common-1.9.0" MODULE="api-common-1.9.0.jar" MVN="mvn:com.google.api/api-common/1.9.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="javax.annotation-api-1.3.2" MODULE="javax.annotation-api-1.3.2.jar" MVN="mvn:javax.annotation/javax.annotation-api/1.3.2" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="opencensus-api-0.24.0" MODULE="opencensus-api-0.24.0.jar" MVN="mvn:io.opencensus/opencensus-api/0.24.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="grpc-context-1.22.1" MODULE="grpc-context-1.22.1.jar" MVN="mvn:io.grpc/grpc-context/1.22.1" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="proto-google-iam-v1-0.13.0" MODULE="proto-google-iam-v1-0.13.0.jar" MVN="mvn:com.google.api.grpc/proto-google-iam-v1/0.13.0" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="protobuf-java-3.11.4" MODULE="protobuf-java-3.11.4.jar" MVN="mvn:com.google.protobuf/protobuf-java/3.11.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="protobuf-java-util-3.11.4" MODULE="protobuf-java-util-3.11.4.jar" MVN="mvn:com.google.protobuf/protobuf-java-util/3.11.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
-				<IMPORT NAME="threetenbp-1.4.4" MODULE="threetenbp-1.4.4.jar" MVN="mvn:org.threeten/threetenbp/1.4.4" REQUIRED_IF="(AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<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')" />
+				<IMPORT NAME="google-api-client-1.25.0.jar" MODULE="google-api-client-1.25.0.jar" MVN="mvn:com.google.api-client/google-api-client/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-oauth-client-1.25.0.jar" MODULE="google-oauth-client-1.25.0.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-api-services-storage-v1-rev20191011-1.30.3" MODULE="google-api-services-storage-v1-rev20191011-1.30.3.jar" MVN="mvn:com.google.apis/google-api-services-storage/v1-rev20191011-1.30.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="gson-2.8.6" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<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')" />
+				<IMPORT NAME="javax.annotation-api" MODULE="javax.annotation-api-1.3.jar" MVN="mvn:javax.annotation/javax.annotation-api/1.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="gax-1.27.0" MODULE="gax-1.27.0.jar" MVN="mvn:com.google.api/gax/1.27.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="gax-httpjson-0.44.0" MODULE="gax-httpjson-0.44.0.jar" MVN="mvn:com.google.api/gax-httpjson/0.44.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="threetenbp-1.3.3.jar" MODULE="threetenbp-1.3.3.jar" MVN="mvn:org.threeten/threetenbp/1.3.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="protobuf-java-2.5.0" MODULE="protobuf-java-2.5.0.jar" MVN="mvn:com.google.protobuf/protobuf-java/2.5.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="error_prone_annotation-2.1.3" MODULE="error_prone_annotation-2.1.3.jar" MVN="mvn:com.google.errorprone/error_prone_annotations/2.1.3" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-cloud-core-http-1.32.0.jar" MODULE="google-cloud-core-http-1.32.0.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.32.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="google-http-client-appengine-1.25.0.jar" MODULE="google-http-client-appengine-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.25.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="opencensus-api-0.21.0" MODULE="opencensus-api-0.21.0.jar" MVN="mvn:io.opencensus/opencensus-api/0.21.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="opencensus-contrib-http-util-0.21.0" MODULE="opencensus-contrib-http-util-0.21.0.jar" MVN="mvn:io.opencensus/opencensus-contrib-http-util/0.21.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="grpc-context-1.19.0" MODULE="grpc-context-1.19.0.jar" MVN="mvn:io.grpc/grpc-context/1.19.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="proto-google-common-protos-1.17.0" MODULE="proto-google-common-protos-1.17.0.jar" MVN="mvn:com.google.api.grpc/proto-google-common-protos/1.17.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="proto-google-iam-v1-0.13.0" MODULE="proto-google-iam-v1-0.13.0.jar" MVN="mvn:com.google.api.grpc/proto-google-iam-v1/0.13.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="protobuf-java-util-3.11.4" MODULE="protobuf-java-util-3.11.4.jar" MVN="mvn:com.google.protobuf/protobuf-java-util/3.11.4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
+				<IMPORT NAME="annotation-1.1.0" MODULE="annotation-1.1.0.jar" MVN="mvn:androidx.annotation/annotation/1.1.0" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />
         </IMPORTS>
     </CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tGSPut/tGSPut_main.javajet

@@ -187,16 +187,16 @@ if (!useServiceAccountForConnection){
 					.fromStream(new java.io.FileInputStream(<%=pathToServerAccoutKeyFile%>));
 		} catch (IOException e_<%=cid%>) {
 			<%
-			if (("true").equals(dieOnError)) {
+			if(isLog4jEnabled){
 			%>
-				throw(e_<%=cid%>);
+				log.error("<%=cid%> - Exception in component <%=cid%>.", e_<%=cid%>);
 			<%
 			}
 			%>
 			<%
-			if(isLog4jEnabled){
+			if (("true").equals(dieOnError)) {
 			%>
-				log.error("<%=cid%> - Exception in component <%=cid%>.", e_<%=cid%>);
+				throw(e_<%=cid%>);
 			<%
 			}
 			%>

main/plugins/org.talend.designer.components.localprovider/components/tGreenplumOutput/tGreenplumOutput_begin.javajet

@@ -155,6 +155,7 @@ int nb_line_rejected_<%=cid%> = 0;
 int deletedCount_<%=cid%>=0;
 int updatedCount_<%=cid%>=0;
 int insertedCount_<%=cid%>=0;
+int rowsToCommitCount_<%=cid%>=0;
 int rejectedCount_<%=cid%>=0;
 
 boolean whetherReject_<%=cid%> = false;

main/plugins/org.talend.designer.components.localprovider/components/tGreenplumOutput/tGreenplumOutput_end.javajet

@@ -118,6 +118,7 @@ imports="
 
                             }
                             tmp_batchUpdateCount_<%=cid%> = tmp_batchUpdateCount_<%=cid%> > countSum_<%=cid%> ? tmp_batchUpdateCount_<%=cid%> : countSum_<%=cid%>;
+                            rowsToCommitCount_<%=cid%> += tmp_batchUpdateCount_<%=cid%>;
                             <%if (("INSERT").equals(dataAction)) {
                             %>
                                 insertedCount_<%=cid%> += tmp_batchUpdateCount_<%=cid%>;
@@ -151,10 +152,12 @@ imports="
 		if(!("").equals(commitEvery) && !("0").equals(commitEvery))
 		{
 			%>
-		if (commitCounter_<%=cid%> > 0) {
-			<%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
-		    conn_<%=cid%>.commit();
+		if (commitCounter_<%=cid%> > 0 && rowsToCommitCount_<%=cid%> != 0) {
+			<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
+			conn_<%=cid%>.commit();
 			<%dbLog.commit().commitDone(null);%>
+			rowsToCommitCount_<%=cid%> = 0;
+			commitCounter_<%=cid%> = 0;
 		}
             <%
 		}

main/plugins/org.talend.designer.components.localprovider/components/tGreenplumOutput/tGreenplumOutput_main.javajet

@@ -139,7 +139,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                }else{
                     %>
                         try {
-                            insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                            int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                            insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                            rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                             nb_line_<%=cid%>++;
                             <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                         } catch(java.lang.Exception e) {
@@ -226,7 +228,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                }else{
                     %>
                     try {
-                        updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                        int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                        updatedCount_<%=cid%> += processedCount_<%=cid%>;
+                        rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                         nb_line_<%=cid%>++;
                         <%dbLog.data().updating(dbLog.var("nb_line"));%>
                     } catch(java.lang.Exception e) {
@@ -334,7 +338,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                 }
                 %>
                 try {
-                    updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmtUpdate_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtUpdate_<%=cid %>.executeUpdate();
+                    updatedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                     nb_line_<%=cid%>++;
                     <%dbLog.data().updating(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -385,7 +391,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                 }
                 %>
                 try {
-                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
+                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -469,6 +477,7 @@ skeleton="../templates/db_output_bulk.skeleton"
             try {
                 updateFlag_<%=cid%>=pstmtUpdate_<%=cid %>.executeUpdate();
                 updatedCount_<%=cid%> = updatedCount_<%=cid%>+updateFlag_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += updateFlag_<%=cid%>;
             if(updateFlag_<%=cid%> == 0) {
                 <%
                 int counter = 1;
@@ -482,7 +491,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                     }
                 }
                 %>
-                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
+                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 }else{
@@ -562,7 +573,9 @@ skeleton="../templates/db_output_bulk.skeleton"
               }else{
                     %>
                     try {
-                        deletedCount_<%=cid%> = deletedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                        int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                        deletedCount_<%=cid%> += processedCount_<%=cid%>;
+                        rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                         nb_line_<%=cid%>++;
                         <%dbLog.data().deleting(dbLog.var("nb_line"));%>
                     } catch(java.lang.Exception e) {
@@ -662,6 +675,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                         System.err.println(e.getMessage());
                     }
                     tmp_batchUpdateCount_<%=cid%> = tmp_batchUpdateCount_<%=cid%> > countSum_<%=cid%> ? tmp_batchUpdateCount_<%=cid%> : countSum_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += tmp_batchUpdateCount_<%=cid%>;
                     <%if (("INSERT").equals(dataAction)) {
                     %>
                         insertedCount_<%=cid%> += tmp_batchUpdateCount_<%=cid%>;
@@ -695,6 +709,7 @@ skeleton="../templates/db_output_bulk.skeleton"
 	                    for(int countEach_<%=cid%>: pstmt_<%=cid %>.executeBatch()) {
 	                        countSum_<%=cid%> += (countEach_<%=cid%> < 0 ? 0 : countEach_<%=cid%>);
 	                    }
+	                    rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
 	                    <%dbLog.batch().executeDone(dbLog.str(dataAction));%>
 	                    <%if (("INSERT").equals(dataAction)) {
 	                    %>
@@ -722,6 +737,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                         for(int countEach_<%=cid%>: e.getUpdateCounts()) {
                             countSum_<%=cid%> += (countEach_<%=cid%> < 0 ? 0 : countEach_<%=cid%>);
                         }
+                        rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
                         <%if (("INSERT").equals(dataAction)) {
                         %>
                             insertedCount_<%=cid%> += countSum_<%=cid%>;
@@ -744,9 +760,12 @@ skeleton="../templates/db_output_bulk.skeleton"
                 <%
                 }%>
                 
-                <%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
-                conn_<%=cid%>.commit();
-                <%dbLog.commit().commitDone(null);%>
+                if(rowsToCommitCount_<%=cid%> != 0){
+                	<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
+                	conn_<%=cid%>.commit();
+                	<%dbLog.commit().commitDone(null);%>
+                	rowsToCommitCount_<%=cid%> = 0;
+                }
                 commitCounter_<%=cid%>=0;
             }
             <%

main/plugins/org.talend.designer.components.localprovider/components/tHSQLDbOutput/tHSQLDbOutput_begin.javajet

@@ -105,6 +105,7 @@ int nb_line_rejected_<%=cid%> = 0;
 int deletedCount_<%=cid%>=0;
 int updatedCount_<%=cid%>=0;
 int insertedCount_<%=cid%>=0;
+int rowsToCommitCount_<%=cid%>=0;
 int rejectedCount_<%=cid%>=0;
 
 String tableName_<%=cid%> = <%=tableName%>;

main/plugins/org.talend.designer.components.localprovider/components/tHSQLDbOutput/tHSQLDbOutput_end.javajet

@@ -21,10 +21,12 @@ imports="
 	
     if(!("").equals(commitEvery)&&!("0").equals(commitEvery)){
         %>
-    if (commitCounter_<%=cid%> > 0) {
-        <%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
+    if (commitCounter_<%=cid%> > 0 && rowsToCommitCount_<%=cid%> != 0) {
+        <%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
         conn_<%=cid%>.commit();
         <%dbLog.commit().commitDone(null);%>
+        rowsToCommitCount_<%=cid%> = 0;
+        commitCounter_<%=cid%> = 0;
     }
         <%
     }

main/plugins/org.talend.designer.components.localprovider/components/tHSQLDbOutput/tHSQLDbOutput_main.javajet

@@ -126,7 +126,9 @@ skeleton="../templates/db_output_bulk.skeleton"
             %>
             try {
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                 nb_line_<%=cid%>++;
                 <%dbLog.data().inserting(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
@@ -200,7 +202,9 @@ skeleton="../templates/db_output_bulk.skeleton"
             %>
             try {
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                updatedCount_<%=cid%> += processedCount_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                 nb_line_<%=cid%>++;
                 <%dbLog.data().updating(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
@@ -292,7 +296,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                 %>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmtUpdate_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtUpdate_<%=cid %>.executeUpdate();
+                    updatedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                     nb_line_<%=cid%>++;
         			<%dbLog.data().updating(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -354,7 +360,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                 %>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
+                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -436,6 +444,7 @@ skeleton="../templates/db_output_bulk.skeleton"
             try {
                 updateFlag_<%=cid%>=pstmtUpdate_<%=cid %>.executeUpdate();
                 updatedCount_<%=cid%> = updatedCount_<%=cid%> + updateFlag_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += updateFlag_<%=cid%>;
             if(updateFlag_<%=cid%> == 0) {
             	<%
             	if(isEnableDebug) {
@@ -465,7 +474,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                 }                
                 %>
          			<%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();  
+                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
+                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
          			nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
     			}else{
@@ -532,7 +543,9 @@ skeleton="../templates/db_output_bulk.skeleton"
             %>
             try {
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                deletedCount_<%=cid%> = deletedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                deletedCount_<%=cid%> += processedCount_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                 nb_line_<%=cid%>++;
                 <%dbLog.data().deleting(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
@@ -601,9 +614,12 @@ skeleton="../templates/db_output_bulk.skeleton"
             commitCounter_<%=cid%>++;
             
             if(commitEvery_<%=cid%> <= commitCounter_<%=cid%>) {
-            	<%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
-                conn_<%=cid%>.commit();
-				<%dbLog.commit().commitDone(null);%>                
+            	if(rowsToCommitCount_<%=cid%> != 0){
+            		<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
+            		conn_<%=cid%>.commit();
+            		<%dbLog.commit().commitDone(null);%>
+            		rowsToCommitCount_<%=cid%> = 0;
+            	}
                 commitCounter_<%=cid%>=0;
             
             }

main/plugins/org.talend.designer.components.localprovider/components/tInformixOutput/tInformixOutput_begin.javajet

@@ -102,6 +102,7 @@ int nb_line_rejected_<%=cid%> = 0;
 int deletedCount_<%=cid%>=0;
 int updatedCount_<%=cid%>=0;
 int insertedCount_<%=cid%>=0;
+int rowsToCommitCount_<%=cid%>=0;
 int rejectedCount_<%=cid%>=0;
 
 String dbschema_<%=cid%> = null;

main/plugins/org.talend.designer.components.localprovider/components/tInformixOutput/tInformixOutput_end.javajet

@@ -24,7 +24,7 @@ imports="
 
 	boolean setAutoCommit = false;
 
-	boolean useExistingConnection = "true".equals(ElementParameterParser.getValue(node,"__USE_EXISTING_CONNECTION__"));
+	boolean useExistingConnection = "true".equals(ElementParameterParser.getValue(node, "__USE_EXISTING_CONNECTION__"));
 	String useBatchAndUseConn = ElementParameterParser.getValue(node,"__USE_BATCH_AND_USE_CONN__");
 
 	String dieOnError = ElementParameterParser.getValue(node, "__DIE_ON_ERROR__");
@@ -103,6 +103,7 @@ imports="
 					for(int countEach_<%=cid%>: pstmt_<%=cid %>.executeBatch()) {
 						countSum_<%=cid%> += (countEach_<%=cid%> < 0 ? 0 : countEach_<%=cid%>);
 					}
+					rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
 					<%dbLog.batch().executeDone(dbLog.str(dataAction));%>
 	    	    	<%
 	    	    	if (("INSERT").equals(dataAction)) {
@@ -148,9 +149,13 @@ imports="
 <%
 if(!useExistingConnection && useTransaction && !("").equals(commitEvery)&&!("0").equals(commitEvery)){
     %>
-		<%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
-        conn_<%=cid%>.commit();
-		<%dbLog.commit().commitDone(null);%>
+		if(rowsToCommitCount_<%=cid%> != 0){
+			<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
+			conn_<%=cid%>.commit();
+			<%dbLog.commit().commitDone(null);%>
+			rowsToCommitCount_<%=cid%> = 0;
+			commitCounter_<%=cid%> = 0;
+		}
     <%
 }
 if (!useExistingConnection) {

main/plugins/org.talend.designer.components.localprovider/components/tInformixOutput/tInformixOutput_main.javajet

@@ -341,7 +341,9 @@ skeleton="../templates/db_output_bulk.skeleton"
             try {
                 nb_line_<%=cid%>++;
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                 <%dbLog.data().inserting(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
@@ -479,7 +481,9 @@ skeleton="../templates/db_output_bulk.skeleton"
             try {
                 nb_line_<%=cid%>++;
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                updatedCount_<%=cid%> += processedCount_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
         	    <%dbLog.data().updating(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
@@ -628,7 +632,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                 %>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmtUpdate_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtUpdate_<%=cid %>.executeUpdate();
+                    updatedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                     nb_line_<%=cid%>++;
         			<%dbLog.data().updating(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -704,7 +710,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                 %>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
+                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -833,6 +841,7 @@ skeleton="../templates/db_output_bulk.skeleton"
             try {
                 updateFlag_<%=cid%>=pstmtUpdate_<%=cid %>.executeUpdate();
                 updatedCount_<%=cid%> = updatedCount_<%=cid%> + updateFlag_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += updateFlag_<%=cid%>;
             if(updateFlag_<%=cid%> == 0) {
             	<%
             	if(isEnableDebug) {
@@ -876,7 +885,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                 }
                 %>
              		<%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
+            		int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
+            		insertedCount_<%=cid%> += processedCount_<%=cid%>;
+            		rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
              		nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
     			}else{
@@ -975,7 +986,9 @@ skeleton="../templates/db_output_bulk.skeleton"
 %>
             try {
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                deletedCount_<%=cid%> = deletedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                deletedCount_<%=cid%> += processedCount_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                 nb_line_<%=cid%>++;
                 <%dbLog.data().deleting(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
@@ -1050,6 +1063,7 @@ skeleton="../templates/db_output_bulk.skeleton"
 						for(int countEach_<%=cid%>: pstmt_<%=cid %>.executeBatch()) {
 							countSum_<%=cid%> += (countEach_<%=cid%> < 0 ? 0 : countEach_<%=cid%>);
 						}
+						rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
 						<%dbLog.batch().executeDone(dbLog.str(dataAction));%>
             	    	<%
             	    	if (("INSERT").equals(dataAction)) {
@@ -1087,10 +1101,13 @@ skeleton="../templates/db_output_bulk.skeleton"
             %>
             commitCounter_<%=cid%>++;
 
-            if(commitEvery_<%=cid%><=commitCounter_<%=cid%>) {
-            	<%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
-                conn_<%=cid%>.commit();
-                <%dbLog.commit().commitDone(null);%>
+            if(commitEvery_<%=cid%> <= commitCounter_<%=cid%>) {
+            	if(rowsToCommitCount_<%=cid%> != 0){
+            		<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
+            		conn_<%=cid%>.commit();
+            		<%dbLog.commit().commitDone(null);%>
+            		rowsToCommitCount_<%=cid%> = 0;
+            	}
                 commitCounter_<%=cid%> = 0;
 
             }

main/plugins/org.talend.designer.components.localprovider/components/tIngresOutput/tIngresOutput_begin.javajet

@@ -78,6 +78,7 @@ int nb_line_rejected_<%=cid%> = 0;
 int deletedCount_<%=cid%>=0;
 int updatedCount_<%=cid%>=0;
 int insertedCount_<%=cid%>=0;
+int rowsToCommitCount_<%=cid%>=0;
 int rejectedCount_<%=cid%> = 0;
 
 String tableName_<%=cid%> = <%=tableName%>;

main/plugins/org.talend.designer.components.localprovider/components/tIngresOutput/tIngresOutput_end.javajet

@@ -131,6 +131,7 @@ imports="
 
                     }
                     tmp_batchUpdateCount_<%=cid%> = tmp_batchUpdateCount_<%=cid%> > countSum_<%=cid%> ? tmp_batchUpdateCount_<%=cid%> : countSum_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += tmp_batchUpdateCount_<%=cid%>;
                     <%if (("INSERT").equals(dataAction)) {
                     %>
                         insertedCount_<%=cid%> += tmp_batchUpdateCount_<%=cid%>;
@@ -150,10 +151,12 @@ imports="
     if(!useExistingConnection) {
         if(!("").equals(commitEvery)&&!("0").equals(commitEvery)){
             %>
-        if (commitCounter_<%=cid%> > 0) {
-            <%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
+        if (commitCounter_<%=cid%> > 0 && rowsToCommitCount_<%=cid%> != 0) {
+            <%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
             conn_<%=cid%>.commit();
             <%dbLog.commit().commitDone(null);%>
+            rowsToCommitCount_<%=cid%> = 0;
+            commitCounter_<%=cid%> = 0;
         }
             <%
         }

main/plugins/org.talend.designer.components.localprovider/components/tIngresOutput/tIngresOutput_main.javajet

@@ -158,7 +158,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                     %>
                       try {
                           <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                          insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                          int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                          insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                          rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                           nb_line_<%=cid%>++;
                           <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                       } catch(java.lang.Exception e) {
@@ -262,7 +264,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                     %>
                       try {
                           <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                          updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                          int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                          updatedCount_<%=cid%> += processedCount_<%=cid%>;
+                          rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                           nb_line_<%=cid%>++;
                           <%dbLog.data().updating(dbLog.var("nb_line"));%>
                       } catch(java.lang.Exception e) {
@@ -382,7 +386,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                 %>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmtUpdate_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtUpdate_<%=cid %>.executeUpdate();
+                    updatedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                     nb_line_<%=cid%>++;
                     <%dbLog.data().updating(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -444,7 +450,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                 %>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
+                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -543,6 +551,7 @@ skeleton="../templates/db_output_bulk.skeleton"
             try {
                 updateFlag_<%=cid%>=pstmtUpdate_<%=cid %>.executeUpdate();
                 updatedCount_<%=cid%> = updatedCount_<%=cid%> + updateFlag_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += updateFlag_<%=cid%>;
             if(updateFlag_<%=cid%> == 0) {
                 <%
                 if(isEnableDebug) {
@@ -572,7 +581,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                 }
                 %>
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
+                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 }else{
@@ -667,7 +678,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                     %>
                        try {
                            <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                           deletedCount_<%=cid%> = deletedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                           int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                           deletedCount_<%=cid%> += processedCount_<%=cid%>;
+                           rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                            nb_line_<%=cid%>++;
                            <%dbLog.data().deleting(dbLog.var("nb_line"));%>
                        } catch(java.lang.Exception e) {
@@ -767,6 +780,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                         System.err.println(e.getMessage());
                     }
                     tmp_batchUpdateCount_<%=cid%> = tmp_batchUpdateCount_<%=cid%> > countSum_<%=cid%> ? tmp_batchUpdateCount_<%=cid%> : countSum_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += tmp_batchUpdateCount_<%=cid%>;
                     <%if (("INSERT").equals(dataAction)) {
                     %>
                         insertedCount_<%=cid%> += tmp_batchUpdateCount_<%=cid%>;
@@ -800,6 +814,7 @@ skeleton="../templates/db_output_bulk.skeleton"
 	                    for(int countEach_<%=cid%>: pstmt_<%=cid %>.executeBatch()) {
 	                        countSum_<%=cid%> += (countEach_<%=cid%> < 0 ? 0 : countEach_<%=cid%>);
 	                    }
+	                    rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
 	                    <%dbLog.batch().executeDone(dbLog.str(dataAction));%>
 	                    <%if (("INSERT").equals(dataAction)) {
 	                    %>
@@ -827,6 +842,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                         for(int countEach_<%=cid%>: e.getUpdateCounts()) {
                             countSum_<%=cid%> += (countEach_<%=cid%> < 0 ? 0 : countEach_<%=cid%>);
                         }
+                        rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
                         <%if (("INSERT").equals(dataAction)) {
                         %>
                             insertedCount_<%=cid%> += countSum_<%=cid%>;
@@ -848,10 +864,12 @@ skeleton="../templates/db_output_bulk.skeleton"
                 }
                 <%
                 }%>
-                
-                <%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
-                conn_<%=cid%>.commit();
-                <%dbLog.commit().commitDone(null);%>
+                if(rowsToCommitCount_<%=cid%> != 0){
+                	<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
+                	conn_<%=cid%>.commit();
+                	<%dbLog.commit().commitDone(null);%>
+                	rowsToCommitCount_<%=cid%> = 0;
+                }
                 commitCounter_<%=cid%>=0;
             }
             <%

main/plugins/org.talend.designer.components.localprovider/components/tInterbaseOutput/tInterbaseOutput_begin.javajet

@@ -78,6 +78,7 @@ int nb_line_rejected_<%=cid%> = 0;
 int deletedCount_<%=cid%>=0;
 int updatedCount_<%=cid%>=0;
 int insertedCount_<%=cid%>=0;
+int rowsToCommitCount_<%=cid%>=0;
 int rejectedCount_<%=cid%>=0;
 
 String tableName_<%=cid%> = <%=tableName%>;

main/plugins/org.talend.designer.components.localprovider/components/tInterbaseOutput/tInterbaseOutput_end.javajet

@@ -116,6 +116,7 @@ imports="
 
                             }
                             tmp_batchUpdateCount_<%=cid%> = tmp_batchUpdateCount_<%=cid%> > countSum_<%=cid%> ? tmp_batchUpdateCount_<%=cid%> : countSum_<%=cid%>;
+                            rowsToCommitCount_<%=cid%> += tmp_batchUpdateCount_<%=cid%>;
                             <%if (("INSERT").equals(dataAction)) {
                             %>
                                 insertedCount_<%=cid%> += tmp_batchUpdateCount_<%=cid%>;
@@ -147,10 +148,12 @@ imports="
     if(!useExistingConnection){
         if(!("").equals(commitEvery)&&!("0").equals(commitEvery)){
             %>
-        if (commitCounter_<%=cid%> > 0) {
-            <%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
+        if (commitCounter_<%=cid%> > 0 && rowsToCommitCount_<%=cid%> != 0) {
+            <%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
             conn_<%=cid%>.commit();
             <%dbLog.commit().commitDone(null);%>
+            rowsToCommitCount_<%=cid%> = 0;
+            commitCounter_<%=cid%> = 0;
         }
             <%
         }

main/plugins/org.talend.designer.components.localprovider/components/tInterbaseOutput/tInterbaseOutput_main.javajet

@@ -153,7 +153,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                     %>
                        try {
                            <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                           insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                           int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                           insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                           rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                            nb_line_<%=cid%>++;
                            <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                        } catch(java.lang.Exception e) {
@@ -254,7 +256,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                     %>
                        try {
                            <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                           updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                           int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                           updatedCount_<%=cid%> += processedCount_<%=cid%>;
+                           rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                            nb_line_<%=cid%>++;
                         <%dbLog.data().updating(dbLog.var("nb_line"));%>
                        } catch(java.lang.Exception e) {
@@ -373,7 +377,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                 %>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmtUpdate_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtUpdate_<%=cid %>.executeUpdate();
+                    updatedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                     nb_line_<%=cid%>++;
                     <%dbLog.data().updating(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -435,7 +441,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                 %>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
+                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -532,6 +540,7 @@ skeleton="../templates/db_output_bulk.skeleton"
             try {
                 updateFlag_<%=cid%>=pstmtUpdate_<%=cid %>.executeUpdate();
                 updatedCount_<%=cid%> = updatedCount_<%=cid%>+updateFlag_<%=cid%>;
+                rowsToCommitCount_<%=cid%> += updateFlag_<%=cid%>;
             if(updateFlag_<%=cid%> == 0) {
                 <%
                 if(isEnableDebug) {
@@ -561,7 +570,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                 }
                 %>
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
+                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
+                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 }else{
@@ -652,7 +663,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                     %>
                        try {
                            <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                           deletedCount_<%=cid%> = deletedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+                           int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
+                           deletedCount_<%=cid%> += processedCount_<%=cid%>;
+                           rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
                            nb_line_<%=cid%>++;
                            <%dbLog.data().deleting(dbLog.var("nb_line"));%>
                        } catch(java.lang.Exception e) {
@@ -753,6 +766,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                         System.err.println(e.getMessage());
                     }
                     tmp_batchUpdateCount_<%=cid%> = tmp_batchUpdateCount_<%=cid%> > countSum_<%=cid%> ? tmp_batchUpdateCount_<%=cid%> : countSum_<%=cid%>;
+                    rowsToCommitCount_<%=cid%> += tmp_batchUpdateCount_<%=cid%>;
                     <%if (("INSERT").equals(dataAction)) {
                     %>
                         insertedCount_<%=cid%> += tmp_batchUpdateCount_<%=cid%>;
@@ -787,6 +801,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                             countSum_<%=cid%> += (countEach_<%=cid%> < 0 ? 0 : countEach_<%=cid%>);
                         }
                         pstmt_<%= cid %>.clearBatch();
+                        rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
                         <%dbLog.batch().executeDone(dbLog.str(dataAction));%>
                         <%if (("INSERT").equals(dataAction)) {
                         %>
@@ -814,6 +829,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                         for(int countEach_<%=cid%>: e.getUpdateCounts()) {
                             countSum_<%=cid%> += (countEach_<%=cid%> < 0 ? 0 : countEach_<%=cid%>);
                         }
+                        rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
                         <%if (("INSERT").equals(dataAction)) {
                         %>
                             insertedCount_<%=cid%> += countSum_<%=cid%>;
@@ -835,10 +851,12 @@ skeleton="../templates/db_output_bulk.skeleton"
                 }
                 <%
                 }%>
-                
-                <%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
-                conn_<%=cid%>.commit();
-                <%dbLog.commit().commitDone(null);%>
+                if(rowsToCommitCount_<%=cid%> != 0){
+                	<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
+                	conn_<%=cid%>.commit();
+                	<%dbLog.commit().commitDone(null);%>
+                	rowsToCommitCount_<%=cid%> = 0;
+                }
                 commitCounter_<%=cid%>=0;
             }
             <%

main/plugins/org.talend.designer.components.localprovider/components/tJDBCSCDELT/common_scd_pattern1.javajet

@@ -1,46 +1,10 @@
 <%@ jet%>
 
 <%
-boolean isEnableType0 = ("true").equals(ElementParameterParser.getValue(node, "__USE_L0__"));
-List<Map<String, String>> type0Attributes = new ArrayList<Map<String, String>>();
-if(isEnableType0) {
-    type0Attributes = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__L0_FIELDS__");
-}
-
-boolean isEnableType1 = ("true").equals(ElementParameterParser.getValue(node, "__USE_L1__"));
-List<Map<String, String>> type1Attributes = new ArrayList<Map<String, String>>();
-if(isEnableType1) {
-    type1Attributes = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__L1_FIELDS__");
-}
-
-boolean isEnableType2 = ("true").equals(ElementParameterParser.getValue(node, "__USE_L2__"));
-List<Map<String, String>> type2Attributes = new ArrayList<Map<String, String>>();
-if(isEnableType2) {
-    type2Attributes = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__L2_FIELDS__");
-}
-
-List<Map<String, String>> sourceKeys = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__SOURCE_KEYS__");
-
-boolean isEqualWithSK = false;
-for(Map<String, String> sk : sourceKeys) {
-    if(surrogateKey.equals(sk.get("NAME"))) {
-        isEqualWithSK = true;
-        break;
-    }
-}
-
-boolean isFieldValueIncNull = ("true").equals(ElementParameterParser.getValue(node, "__FIELD_VALUE_INC_NULL__"));
-
-List<String> joinClause = new ArrayList<String>();
 for(Map<String, String> sk : sourceKeys) {
     joinClause.add(" d." + text_util.wrap(sk.get("NAME")) + " = t." + text_util.wrap(sk.get("NAME")));
 }
 String joinClauseString = StringUtils.join(joinClause.toArray(), " AND ");
-
-String strFieldName = "";
-String selectColumnString = "";
-String columnNameString = "";
-
 if(isEnableType1) {
     List<String> columnNames = new ArrayList<String>();
     List<String> setColumns = new ArrayList<String>();
@@ -80,19 +44,6 @@ if(isEnableType1) {
         <%
     }
 }
-
-String startDateField = ElementParameterParser.getValue(node,"__L2_STARTDATE_FIELD__");
-String endDateField = ElementParameterParser.getValue(node,"__L2_ENDDATE_FIELD__");
-String l2EndDateFieldType = ElementParameterParser.getValue(node,"__L2_ENDDATE_FIELD_TYPE__");
-String l2EndDateFieldFixedDateValue = ElementParameterParser.getValue(node,"__FIXED_DATE_VALUE__");
-boolean isEnableActive = ("true").equals(ElementParameterParser.getValue(node,"__USE_L2_ACTIVE__"));
-String activeField = ElementParameterParser.getValue(node,"__L2_ACTIVE_FIELD__");
-boolean isEnableVersion = ("true").equals(ElementParameterParser.getValue(node,"__USE_L2_VERSION__"));
-String versionField = ElementParameterParser.getValue(node,"__L2_VERSION_FIELD__");
-
-boolean useSequence = "DB_SEQUENCE".equals(surrogateKeyType);
-String sequenceName = ElementParameterParser.getValue(node,"__SK_DB_SEQUENCE__");
-
 if(isEnableType2) {
     List<String> whereClause = new ArrayList<String>();
     for (Map<String, String> type2Attribute : type2Attributes) {

main/plugins/org.talend.designer.components.localprovider/components/tJDBCSCDELT/common_scd_pattern2.javajet

@@ -1,46 +1,9 @@
 <%@ jet%>
-
 <%
-boolean isEnableType0 = ("true").equals(ElementParameterParser.getValue(node, "__USE_L0__"));
-List<Map<String, String>> type0Attributes = new ArrayList<Map<String, String>>();
-if(isEnableType0) {
-    type0Attributes = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__L0_FIELDS__");
-}
-
-boolean isEnableType1 = ("true").equals(ElementParameterParser.getValue(node, "__USE_L1__"));
-List<Map<String, String>> type1Attributes = new ArrayList<Map<String, String>>();
-if(isEnableType1) {
-    type1Attributes = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__L1_FIELDS__");
-}
-
-boolean isEnableType2 = ("true").equals(ElementParameterParser.getValue(node, "__USE_L2__"));
-List<Map<String, String>> type2Attributes = new ArrayList<Map<String, String>>();
-if(isEnableType2) {
-    type2Attributes = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__L2_FIELDS__");
-}
-
-List<Map<String, String>> sourceKeys = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__SOURCE_KEYS__");
-
-boolean isEqualWithSK = false;
-for(Map<String, String> sk : sourceKeys) {
-    if(surrogateKey.equals(sk.get("NAME"))) {
-        isEqualWithSK = true;
-        break;
-    }
-}
-
-boolean isFieldValueIncNull = ("true").equals(ElementParameterParser.getValue(node, "__FIELD_VALUE_INC_NULL__"));
-
-List<String> joinClause = new ArrayList<String>();
 for(Map<String, String> sk : sourceKeys) {
     joinClause.add(" d." + text_util.wrap(sk.get("NAME")) + " = t." + text_util.wrap(sk.get("NAME")));
 }
 String joinClauseString = StringUtils.join(joinClause.toArray(), " AND ");
-
-String strFieldName = "";
-String selectColumnString = "";
-String columnNameString = "";
-
 if(isEnableType1) {
     List<String> columnNames = new ArrayList<String>();
     List<String> setColumns = new ArrayList<String>();
@@ -80,19 +43,6 @@ if(isEnableType1) {
         <%
     }
 }
-
-String startDateField = ElementParameterParser.getValue(node,"__L2_STARTDATE_FIELD__");
-String endDateField = ElementParameterParser.getValue(node,"__L2_ENDDATE_FIELD__");
-String l2EndDateFieldType = ElementParameterParser.getValue(node,"__L2_ENDDATE_FIELD_TYPE__");
-String l2EndDateFieldFixedDateValue = ElementParameterParser.getValue(node,"__FIXED_DATE_VALUE__");
-boolean isEnableActive = ("true").equals(ElementParameterParser.getValue(node,"__USE_L2_ACTIVE__"));
-String activeField = ElementParameterParser.getValue(node,"__L2_ACTIVE_FIELD__");
-boolean isEnableVersion = ("true").equals(ElementParameterParser.getValue(node,"__USE_L2_VERSION__"));
-String versionField = ElementParameterParser.getValue(node,"__L2_VERSION_FIELD__");
-
-boolean useSequence = "DB_SEQUENCE".equals(surrogateKeyType);
-String sequenceName = ElementParameterParser.getValue(node,"__SK_DB_SEQUENCE__");
-
 if(isEnableType2) {
     List<String> whereClause = new ArrayList<String>();
     for (Map<String, String> type2Attribute : type2Attributes) {

main/plugins/org.talend.designer.components.localprovider/components/tJDBCSCDELT/databricks_delta_lake.javajet

@@ -0,0 +1,180 @@
+<%@ jet%>
+
+<%
+for(Map<String, String> sk : sourceKeys) {
+    joinClause.add(" d." + text_util.wrap(sk.get("NAME")) + " = t." + text_util.wrap(sk.get("NAME")));
+}
+String joinClauseString = StringUtils.join(joinClause.toArray(), " AND ");
+String l2StartDateFieldType = ElementParameterParser.getValue(node,"__L2_STARTDATE_FIELD_TYPE__");
+String l2StartDateFieldInputFieldName =  ElementParameterParser.getValue(node,"__INPUT_FIELD_NAME__");
+
+//three cases :
+//type 1 only
+//type 2 only
+//type 1&2
+
+if(isEnableType2) {
+%>
+    final String changeDateTime_<%=cid %> = "\"" + (new java.sql.Timestamp((Long)start_Hash.get("<%=cid %>"))).toString() + "\"";
+    
+    <%if("INPUT_FIELD".equals(l2StartDateFieldType)) {%>
+    
+    <%} else {%>
+    final String startDateTime_<%=cid%> = changeDateTime_<%=cid%>;
+    <%}%>
+    
+    <% if("FIXED_DATE_VALUE".equals(l2EndDateFieldType)) {%>
+    String customEndDate_<%=cid%> = "to_date('" + <%=l2EndDateFieldFixedDateValue%> + "', 'yyyy-MM-dd')";
+    <%}
+}
+
+if(isEnableType1) {
+    List<String> columnNames = new ArrayList<String>();
+    List<String> setColumns = new ArrayList<String>();
+    List<String> whereClause = new ArrayList<String>();
+    for(Map<String, String> sk : sourceKeys) {
+        columnNames.add(text_util.wrap(sk.get("NAME")));
+    }
+    for(Map<String, String> type1Attribute : type1Attributes) {
+    	strFieldName = text_util.wrap(type1Attribute.get("NAME"));
+        columnNames.add(strFieldName);
+        setColumns.add(" " + strFieldName + " = t." + strFieldName);
+        if(isFieldValueIncNull){
+            whereClause.add("( d." + strFieldName + " is null AND t." + strFieldName + " is not null )");
+        	whereClause.add("( d." + strFieldName + " is not null AND t." + strFieldName + " is null )");
+       	}
+        whereClause.add("( d." + strFieldName + " <> t." + strFieldName+")");
+    }
+    for(Map<String, String> type2Attribute : type2Attributes) {
+        columnNames.add(text_util.wrap(type2Attribute.get("NAME")));
+    }
+    selectColumnString = StringUtils.join(columnNames.toArray(), ", t.");
+    
+    if(isEnableType2) {
+        columnNames.add(text_util.wrap(startDateField));
+        columnNames.add(text_util.wrap(endDateField));
+        if(isEnableActive) {
+            columnNames.add(text_util.wrap(activeField));
+        }
+        if(isEnableVersion) {
+            columnNames.add(text_util.wrap(versionField));
+        }
+    }
+    columnNameString = StringUtils.join(columnNames.toArray(), ", ");
+    String setColumnsString = StringUtils.join(setColumns.toArray(), ", ");
+    String whereClauseString = StringUtils.join(whereClause.toArray(), " OR ");
+    %>
+    StringBuilder sb_type1_<%=cid%> = new StringBuilder();
+    sb_type1_<%=cid%>.append("MERGE INTO <%=text_util.wrap("tableName", cid)%> AS d ")
+               .append("USING <%=text_util.wrap("sourceTable", cid)%> AS t ")
+               .append("ON <%=joinClauseString%> ")
+               .append("WHEN MATCHED AND (<%=whereClauseString%>) THEN ")
+               .append("UPDATE SET <%=setColumnsString%> ")
+               .append("WHEN NOT MATCHED <%if(isEnableType2){%>AND 1!=1 <%}%>THEN ")
+               <%if(isEnableType2) {%>
+               .append("INSERT (<%=columnNameString%>) VALUES (t.<%=selectColumnString%>, " + <%if("INPUT_FIELD".equals(l2StartDateFieldType)) {%>"t.<%=l2StartDateFieldInputFieldName%>"<%} else {%>startDateTime_<%=cid%><%}%> + ", " + <%if("NULL".equals(l2EndDateFieldType)) { %>"NULL"<% } else {%>customEndDate_<%=cid%><%}%>
+<%if(isEnableActive) {%>+ ", 1"<%}%><%if(isEnableVersion) {%>+", 1"<%}%> + ")");
+               <%} else {%>
+               .append("INSERT (<%=columnNameString%>) VALUES (t.<%=selectColumnString%>)");
+               <%}%>
+    
+    String mergeForType1_<%=cid%> = sb_type1_<%=cid%>.toString();
+    
+    <%if(isEnableDebug) {%>
+    System.out.println("[<%=cid%>] type1 action sql\n" + mergeForType1_<%=cid%> + "\nstart");
+    <%}%>
+    
+    java.sql.Statement stmtType1Merge_<%=cid%> = conn_<%=cid%>.createStatement();
+    stmtType1Merge_<%=cid%>.executeUpdate(mergeForType1_<%=cid%>);
+    stmtType1Merge_<%=cid%>.close();
+    
+    <%
+    if(isEnableDebug) {
+        %>
+        System.out.println("[<%=cid%>] type1 action sql done");
+        <%
+    }
+}
+
+if(isEnableType2) {
+    List<String> whereClause = new ArrayList<String>();
+    for (Map<String, String> type2Attribute : type2Attributes) {
+        strFieldName = text_util.wrap(type2Attribute.get("NAME"));
+    	if(isFieldValueIncNull){
+        	whereClause.add("( d." + strFieldName + " is null AND t." + strFieldName + " is not null )");
+        	whereClause.add("( d." + strFieldName + " is not null AND t." + strFieldName + " is null )");
+     	}
+        whereClause.add("( d." + strFieldName + " <> t." + strFieldName+")");
+    }
+    String whereClauseString = StringUtils.join(whereClause.toArray(), " OR ");
+    
+    List<String> columnNames = new ArrayList<String>();
+    for(Map<String, String> sourceKey : sourceKeys) {
+        columnNames.add(text_util.wrap(sourceKey.get("NAME")));
+    }
+    for(Map<String, String> type1Attribute : type1Attributes) {
+        columnNames.add(text_util.wrap(type1Attribute.get("NAME")));
+    }
+    for(Map<String, String> type2Attribute : type2Attributes) {
+        columnNames.add(text_util.wrap(type2Attribute.get("NAME")));
+    }
+    selectColumnString = StringUtils.join(columnNames.toArray(), ", t.");
+    columnNames.add(text_util.wrap(startDateField));
+    columnNames.add(text_util.wrap(endDateField));
+    if(isEnableActive) {
+        columnNames.add(text_util.wrap(activeField));
+    }
+    if(isEnableVersion) {
+        columnNames.add(text_util.wrap(versionField));
+    }
+    columnNameString = StringUtils.join(columnNames.toArray(), ", ");
+    %>
+    StringBuilder sb_type2_merge_<%=cid%> = new StringBuilder();
+    sb_type2_merge_<%=cid%>.append("MERGE INTO <%=text_util.wrap("tableName", cid)%> AS d ")
+               .append("USING <%=text_util.wrap("sourceTable", cid)%> AS t ")
+               .append("ON <%=joinClauseString%> ")
+               .append("WHEN MATCHED AND (<%=whereClauseString%>) AND d.<%=text_util.wrap(endDateField)%>" + <%if("NULL".equals(l2EndDateFieldType)) { %>" IS NULL "<% } else { %>" = " + customEndDate_<%=cid%><%}%> + " THEN ")
+               .append("UPDATE SET <%=text_util.wrap(endDateField)%> = " + changeDateTime_<%=cid%> + " "<%if(isEnableActive) {%> + ", <%=text_util.wrap(activeField)%> = 0 "<%}%>)
+               .append("WHEN NOT MATCHED THEN ")
+               .append("INSERT (<%=columnNameString%>) VALUES (t.<%=selectColumnString%>, " + <%if("INPUT_FIELD".equals(l2StartDateFieldType)) {%>"t.<%=l2StartDateFieldInputFieldName%>"<%} else {%>startDateTime_<%=cid%><%}%> + ", " + <%if("NULL".equals(l2EndDateFieldType)) { %>"NULL"<% } else {%>customEndDate_<%=cid%><%}%>
+<%if(isEnableActive) {%>+ ", 1"<%}%><%if(isEnableVersion) {%>+", 1"<%}%> + ")");
+
+    String mergeForType2_<%=cid%> = sb_type2_merge_<%=cid%>.toString();
+    
+    <%if(isEnableDebug) {%>
+    System.out.println("[<%=cid%>] type2 merge sql\n" + mergeForType2_<%=cid %> + "\nstart");
+    <%}%>
+               
+    java.sql.Statement stmtType2Merge_<%=cid%> = conn_<%=cid%>.createStatement();
+    stmtType2Merge_<%=cid%>.executeUpdate(mergeForType2_<%=cid%>);
+    stmtType2Merge_<%=cid%>.close();
+    
+    <%if(isEnableDebug) {%>
+    System.out.println("[<%=cid%>] type2 merge sql done");
+    <%}%>
+    
+    StringBuilder sb_type2_active_<%=cid%> = new StringBuilder();
+    sb_type2_active_<%=cid%>.append("MERGE INTO <%=text_util.wrap("tableName", cid)%> AS d ")
+               .append("USING (SELECT NULL as mergeKey, <%if(isEnableVersion) {%><%=text_util.wrap("tableName", cid)%>.<%=text_util.wrap(versionField)%>, <%}%>t.* FROM <%=text_util.wrap("sourceTable", cid)%> AS t JOIN <%=text_util.wrap("tableName", cid)%> ON " + "<%=joinClauseString%>".replace(" d."," "+tableName_<%=cid%>+".") + " WHERE (" + "<%=whereClauseString%>".replace(" d."," "+tableName_<%=cid%>+".") + ") AND " + tableName_<%=cid%> + ".<%=text_util.wrap(endDateField)%> = " + changeDateTime_<%=cid%> + ") AS staged_updates ")
+               .append("ON d.<%=columnNames.get(0)%> = mergeKey ")//expect not match always as null value for mergeKey, then go to the insert action, never go to update 
+               .append("WHEN MATCHED AND 1!=1 THEN ")
+               .append("UPDATE SET <%=text_util.wrap(endDateField)%> = " + changeDateTime_<%=cid%> + " ")//should never happen
+               .append("WHEN NOT MATCHED THEN ")
+               .append("INSERT (<%=columnNameString%>) VALUES (staged_updates.<%=selectColumnString.replace(" t."," staged_updates.")%>, " + <%if("INPUT_FIELD".equals(l2StartDateFieldType)) {%>"staged_updates.<%=l2StartDateFieldInputFieldName%>"<%} else {%>startDateTime_<%=cid%><%}%> 
+     + ", " + <% if("NULL".equals(l2EndDateFieldType)) { %>"NULL "<% } else {%>customEndDate_<%=cid%><%} if(isEnableActive) {%> + ", 1"<%}%><%if(isEnableVersion) {%> + ", staged_updates.<%=text_util.wrap(versionField)%> + 1"<%}%> + ")");
+     
+    String activeForType2_<%=cid%> = sb_type2_active_<%=cid%>.toString();
+    
+    <%if(isEnableDebug) {%>
+    System.out.println("[<%=cid%>] type2 new active row sql\n" + activeForType2_<%=cid %> + "\nstart");
+    <%}%>
+    
+    java.sql.Statement stmtType2Active_<%=cid%> = conn_<%=cid%>.createStatement();
+    stmtType2Active_<%=cid%>.executeUpdate(activeForType2_<%=cid%>);
+    stmtType2Active_<%=cid%>.close();
+    
+    <%if(isEnableDebug) {%>
+    System.out.println("[<%=cid%>] type2 new active row sql done");
+    <%}
+}
+%>

main/plugins/org.talend.designer.components.localprovider/components/tJDBCSCDELT/db2.javajet

@@ -1,41 +1,10 @@
 <%@ jet%>
-
 <%
-boolean isEnableType1 = ("true").equals(ElementParameterParser.getValue(node, "__USE_L1__"));
-List<Map<String, String>> type1Attributes = new ArrayList<Map<String, String>>();
-if(isEnableType1) {
-    type1Attributes = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__L1_FIELDS__");
-}
-
-boolean isEnableType2 = ("true").equals(ElementParameterParser.getValue(node, "__USE_L2__"));
-List<Map<String, String>> type2Attributes = new ArrayList<Map<String, String>>();
-if(isEnableType2) {
-    type2Attributes = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__L2_FIELDS__");
-}
-
-List<Map<String, String>> sourceKeys = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__SOURCE_KEYS__");
-
-boolean isEqualWithSK = false;
-for(Map<String, String> sk : sourceKeys) {
-    if(surrogateKey.equals(sk.get("NAME"))) {
-        isEqualWithSK = true;
-        break;
-    }
-}
-
-boolean isFieldValueIncNull = ("true").equals(ElementParameterParser.getValue(node, "__FIELD_VALUE_INC_NULL__"));
-
-List<String> joinClause = new ArrayList<String>();
 for(Map<String, String> sk : sourceKeys) {
     joinClause.add(" d." + StringUtils.getPostgresqlProtectedColumnName(sk.get("NAME")) +
             " = t." + StringUtils.getPostgresqlProtectedColumnName(sk.get("NAME")));
 }
 String joinClauseString = StringUtils.join(joinClause.toArray(), " AND ");
-
-String strFieldName = "";
-String selectColumnString = "";
-String columnNameString = "";
-
 if(isEnableType1) {
     List<String> columnNames = new ArrayList<String>();
     List<String> setColumns = new ArrayList<String>();
@@ -75,19 +44,7 @@ if(isEnableType1) {
         <%
     }
 }
-
 String endDateFieldType="DATE";
-String sequenceName = ElementParameterParser.getValue(node,"__SK_DB_SEQUENCE__");
-
-String startDateField = ElementParameterParser.getValue(node,"__L2_STARTDATE_FIELD__");
-String endDateField = ElementParameterParser.getValue(node,"__L2_ENDDATE_FIELD__");
-String l2EndDateFieldType = ElementParameterParser.getValue(node,"__L2_ENDDATE_FIELD_TYPE__");
-String l2EndDateFieldFixedDateValue = ElementParameterParser.getValue(node,"__FIXED_DATE_VALUE__");
-boolean isEnableActive = ("true").equals(ElementParameterParser.getValue(node,"__USE_L2_ACTIVE__"));
-String activeField = ElementParameterParser.getValue(node,"__L2_ACTIVE_FIELD__");
-boolean isEnableVersion = ("true").equals(ElementParameterParser.getValue(node,"__USE_L2_VERSION__"));
-String versionField = ElementParameterParser.getValue(node,"__L2_VERSION_FIELD__");
-
 if(isEnableType2) {
     List<String> whereClause = new ArrayList<String>();
     for (Map<String, String> type2Attribute : type2Attributes) {

main/plugins/org.talend.designer.components.localprovider/components/tJDBCSCDELT/mysql.javajet

@@ -1,46 +1,9 @@
 <%@ jet%>
-
 <%
-boolean isEnableType0 = ("true").equals(ElementParameterParser.getValue(node, "__USE_L0__"));
-List<Map<String, String>> type0Attributes = new ArrayList<Map<String, String>>();
-if(isEnableType0) {
-    type0Attributes = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__L0_FIELDS__");
-}
-
-boolean isEnableType1 = ("true").equals(ElementParameterParser.getValue(node, "__USE_L1__"));
-List<Map<String, String>> type1Attributes = new ArrayList<Map<String, String>>();
-if(isEnableType1) {
-    type1Attributes = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__L1_FIELDS__");
-}
-
-boolean isEnableType2 = ("true").equals(ElementParameterParser.getValue(node, "__USE_L2__"));
-List<Map<String, String>> type2Attributes = new ArrayList<Map<String, String>>();
-if(isEnableType2) {
-    type2Attributes = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__L2_FIELDS__");
-}
-
-List<Map<String, String>> sourceKeys = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__SOURCE_KEYS__");
-
-boolean isEqualWithSK = false;
-for(Map<String, String> sk : sourceKeys) {
-    if(surrogateKey.equals(sk.get("NAME"))) {
-        isEqualWithSK = true;
-        break;
-    }
-}
-
-boolean isFieldValueIncNull = ("true").equals(ElementParameterParser.getValue(node, "__FIELD_VALUE_INC_NULL__"));
-
-List<String> joinClause = new ArrayList<String>();
 for(Map<String, String> sk : sourceKeys) {
     joinClause.add(" d." + StringUtils.getMysqlProtectedColumnName(sk.get("NAME")) + " = t." + StringUtils.getMysqlProtectedColumnName(sk.get("NAME")));
 }
 String joinClauseString = StringUtils.join(joinClause.toArray(), " AND ");
-
-String strFieldName = "";
-String selectColumnString = "";
-String columnNameString = "";
-
 if(isEnableType1) {
     List<String> columnNames = new ArrayList<String>();
     List<String> setColumns = new ArrayList<String>();
@@ -81,15 +44,6 @@ if(isEnableType1) {
     }
 }
 
-String startDateField = ElementParameterParser.getValue(node,"__L2_STARTDATE_FIELD__");
-String endDateField = ElementParameterParser.getValue(node,"__L2_ENDDATE_FIELD__");
-String l2EndDateFieldType = ElementParameterParser.getValue(node,"__L2_ENDDATE_FIELD_TYPE__");
-String l2EndDateFieldFixedDateValue = ElementParameterParser.getValue(node,"__FIXED_DATE_VALUE__");
-boolean isEnableActive = ("true").equals(ElementParameterParser.getValue(node,"__USE_L2_ACTIVE__"));
-String activeField = ElementParameterParser.getValue(node,"__L2_ACTIVE_FIELD__");
-boolean isEnableVersion = ("true").equals(ElementParameterParser.getValue(node,"__USE_L2_VERSION__"));
-String versionField = ElementParameterParser.getValue(node,"__L2_VERSION_FIELD__");
-
 if(isEnableType2) {
     List<String> whereClause = new ArrayList<String>();
     for (Map<String, String> type2Attribute : type2Attributes) {
@@ -206,7 +160,6 @@ stmtInsert_<%=cid%>.close();
 <%}%>
 
 <%
-	
 	if(isEnableType0) {
 	    List<String> columnNames = new ArrayList<String>();
 	    List<String> setColumns = new ArrayList<String>();
@@ -290,7 +243,5 @@ stmtInsert_<%=cid%>.close();
 	stmtInsertForTpye0_<%=cid%>.close();
 	    <%
 		}
-
-
 	}
 %>

main/plugins/org.talend.designer.components.localprovider/components/tJDBCSCDELT/oracle.javajet

@@ -1,43 +1,9 @@
 <%@ jet%>
 
-<%
-boolean isEnableType0 = ("true").equals(ElementParameterParser.getValue(node, "__USE_L0__"));
-List<Map<String, String>> type0Attributes = new ArrayList<Map<String, String>>();
-if(isEnableType0) {
-    type0Attributes = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__L0_FIELDS__");
-}
-
-boolean isEnableType1 = ("true").equals(ElementParameterParser.getValue(node, "__USE_L1__"));
-List<Map<String, String>> type1Attributes = new ArrayList<Map<String, String>>();
-if(isEnableType1) {
-    type1Attributes = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__L1_FIELDS__");
-}
-
-boolean isEnableType2 = ("true").equals(ElementParameterParser.getValue(node, "__USE_L2__"));
-List<Map<String, String>> type2Attributes = new ArrayList<Map<String, String>>();
-if(isEnableType2) {
-    type2Attributes = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__L2_FIELDS__");
-}
-
-List<Map<String, String>> sourceKeys = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__SOURCE_KEYS__");
-
-boolean isEqualWithSK = false;
-for(Map<String, String> sk : sourceKeys) {
-    if(surrogateKey.equals(sk.get("NAME"))) {
-        isEqualWithSK = true;
-        break;
-    }
-}
-
-boolean isFieldValueIncNull = ("true").equals(ElementParameterParser.getValue(node, "__FIELD_VALUE_INC_NULL__"));
-%>
 java.util.Date currentDate_<%=cid %> = new java.util.Date((Long)start_Hash.get("<%=cid %>"));
 String dateString_<%=cid %> = routines.system.FormatterUtils.format_Date(currentDate_<%=cid %>, "yyyy-MM-dd HH:mm:ss");
 String dateValue_<%=cid %> = "to_date('" + dateString_<%=cid %> + "', 'yyyy-mm-dd HH24:MI:SS')";
 <%
-String selectColumnString = "";
-String columnNameString = "";
-List<String> joinClause = new ArrayList<String>();
 for(Map<String, String> sk : sourceKeys) {
     joinClause.add(" d." + sk.get("NAME") + " = t." + sk.get("NAME"));
 }
@@ -82,16 +48,7 @@ if(isEnableType1) {
     }
 }
 
-String sequenceName = ElementParameterParser.getValue(node,"__SK_DB_SEQUENCE__");
-
-String startDateField = ElementParameterParser.getValue(node,"__L2_STARTDATE_FIELD__");
-String endDateField = ElementParameterParser.getValue(node,"__L2_ENDDATE_FIELD__");
-boolean isEnableActive = ("true").equals(ElementParameterParser.getValue(node,"__USE_L2_ACTIVE__"));
-String activeField = ElementParameterParser.getValue(node,"__L2_ACTIVE_FIELD__");
-boolean isEnableVersion = ("true").equals(ElementParameterParser.getValue(node,"__USE_L2_VERSION__"));
-String versionField = ElementParameterParser.getValue(node,"__L2_VERSION_FIELD__");
 String l2StartDateFieldType = ElementParameterParser.getValue(node,"__L2_STARTDATE_FIELD_TYPE__");
-String l2EndDateFieldType = ElementParameterParser.getValue(node,"__L2_ENDDATE_FIELD_TYPE__");
 String l2StartDateFieldInputFieldName =  ElementParameterParser.getValue(node,"__INPUT_FIELD_NAME__");
 String l2EndDateFieldFixedYearValue = ElementParameterParser.getValue(node,"__FIXED_DATE_VALUE__");
 
@@ -281,7 +238,7 @@ stmtInsert_<%=cid%>.close();
 	        }
 	    }
 	    for(Map<String, String> type0Attribute : type0Attributes) {
-	    	String strFieldName = text_util.wrap(type0Attribute.get("NAME"));
+	    	strFieldName = text_util.wrap(type0Attribute.get("NAME"));
 	        columnNames.add(strFieldName);
 	        setColumns.add(strFieldName);
 	        whereClause.add("( d." + strFieldName + " is null )");

main/plugins/org.talend.designer.components.localprovider/components/tJDBCSCDELT/postgres.javajet

@@ -1,39 +1,6 @@
 <%@ jet%>
 
 <%
-boolean isEnableType0 = ("true").equals(ElementParameterParser.getValue(node, "__USE_L0__"));
-List<Map<String, String>> type0Attributes = new ArrayList<Map<String, String>>();
-if(isEnableType0) {
-    type0Attributes = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__L0_FIELDS__");
-}
-
-boolean isEnableType1 = ("true").equals(ElementParameterParser.getValue(node, "__USE_L1__"));
-List<Map<String, String>> type1Attributes = new ArrayList<Map<String, String>>();
-if(isEnableType1) {
-    type1Attributes = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__L1_FIELDS__");
-}
-
-boolean isEnableType2 = ("true").equals(ElementParameterParser.getValue(node, "__USE_L2__"));
-List<Map<String, String>> type2Attributes = new ArrayList<Map<String, String>>();
-if(isEnableType2) {
-    type2Attributes = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__L2_FIELDS__");
-}
-
-List<Map<String, String>> sourceKeys = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__SOURCE_KEYS__");
-
-boolean isEqualWithSK = false;
-for(Map<String, String> sk : sourceKeys) {
-    if(surrogateKey.equals(sk.get("NAME"))) {
-        isEqualWithSK = true;
-        break;
-    }
-}
-
-String strFieldName = "";
-String selectColumnString = "";
-String columnNameString = "";
-
-List<String> joinClause = new ArrayList<String>();
 for(Map<String, String> sk : sourceKeys) {
     joinClause.add(" d." + StringUtils.getPostgresqlProtectedColumnName(sk.get("NAME")) +
             " = t." + StringUtils.getPostgresqlProtectedColumnName(sk.get("NAME")));
@@ -77,17 +44,6 @@ if(isEnableType1) {
     }
 }
 
-String sequenceName = ElementParameterParser.getValue(node,"__SK_DB_SEQUENCE__");
-
-String startDateField = ElementParameterParser.getValue(node,"__L2_STARTDATE_FIELD__");
-String endDateField = ElementParameterParser.getValue(node,"__L2_ENDDATE_FIELD__");
-String l2EndDateFieldType = ElementParameterParser.getValue(node,"__L2_ENDDATE_FIELD_TYPE__");
-String l2EndDateFieldFixedDateValue = ElementParameterParser.getValue(node,"__FIXED_DATE_VALUE__");
-boolean isEnableActive = ("true").equals(ElementParameterParser.getValue(node,"__USE_L2_ACTIVE__"));
-String activeField = ElementParameterParser.getValue(node,"__L2_ACTIVE_FIELD__");
-boolean isEnableVersion = ("true").equals(ElementParameterParser.getValue(node,"__USE_L2_VERSION__"));
-String versionField = ElementParameterParser.getValue(node,"__L2_VERSION_FIELD__");
-
 if(isEnableType2) {
     List<String> whereClause = new ArrayList<String>();
     for (Map<String, String> type2Attribute : type2Attributes) {

main/plugins/org.talend.designer.components.localprovider/components/tJDBCSCDELT/postgresplus.javajet

@@ -1,32 +1,6 @@
 <%@ jet%>
 
 <%
-boolean isEnableType1 = ("true").equals(ElementParameterParser.getValue(node, "__USE_L1__"));
-List<Map<String, String>> type1Attributes = new ArrayList<Map<String, String>>();
-if(isEnableType1) {
-    type1Attributes = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__L1_FIELDS__");
-}
-
-boolean isEnableType2 = ("true").equals(ElementParameterParser.getValue(node, "__USE_L2__"));
-List<Map<String, String>> type2Attributes = new ArrayList<Map<String, String>>();
-if(isEnableType2) {
-    type2Attributes = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__L2_FIELDS__");
-}
-
-List<Map<String, String>> sourceKeys = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__SOURCE_KEYS__");
-
-boolean isEqualWithSK = false;
-for(Map<String, String> sk : sourceKeys) {
-    if(surrogateKey.equals(sk.get("NAME"))) {
-        isEqualWithSK = true;
-        break;
-    }
-}
-
-String selectColumnString = "";
-String columnNameString = "";
-
-List<String> joinClause = new ArrayList<String>();
 for(Map<String, String> sk : sourceKeys) {
     joinClause.add(" d." + StringUtils.getPostgresqlProtectedColumnName(sk.get("NAME")) +
             " = t." + StringUtils.getPostgresqlProtectedColumnName(sk.get("NAME")));
@@ -69,17 +43,6 @@ if(isEnableType1) {
         <%
     }
 }
-
-String sequenceName = ElementParameterParser.getValue(node,"__SK_DB_SEQUENCE__");
-
-String startDateField = ElementParameterParser.getValue(node,"__L2_STARTDATE_FIELD__");
-String endDateField = ElementParameterParser.getValue(node,"__L2_ENDDATE_FIELD__");
-String l2EndDateFieldType = ElementParameterParser.getValue(node,"__L2_ENDDATE_FIELD_TYPE__");
-String l2EndDateFieldFixedDateValue = ElementParameterParser.getValue(node,"__FIXED_DATE_VALUE__");
-boolean isEnableActive = ("true").equals(ElementParameterParser.getValue(node,"__USE_L2_ACTIVE__"));
-String activeField = ElementParameterParser.getValue(node,"__L2_ACTIVE_FIELD__");
-boolean isEnableVersion = ("true").equals(ElementParameterParser.getValue(node,"__USE_L2_VERSION__"));
-String versionField = ElementParameterParser.getValue(node,"__L2_VERSION_FIELD__");    
 if(isEnableType2) {
     List<String> whereClause = new ArrayList<String>();
     for (Map<String, String> type2Attribute : type2Attributes) {

main/plugins/org.talend.designer.components.localprovider/components/tJDBCSCDELT/sap_hana.javajet

@@ -1,40 +1,10 @@
 <%@ jet%>
 
 <%
-boolean isEnableType1 = ("true").equals(ElementParameterParser.getValue(node, "__USE_L1__"));
-List<Map<String, String>> type1Attributes = new ArrayList<Map<String, String>>();
-if(isEnableType1) {
-    type1Attributes = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__L1_FIELDS__");
-}
-
-boolean isEnableType2 = ("true").equals(ElementParameterParser.getValue(node, "__USE_L2__"));
-List<Map<String, String>> type2Attributes = new ArrayList<Map<String, String>>();
-if(isEnableType2) {
-    type2Attributes = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__L2_FIELDS__");
-}
-
-List<Map<String, String>> sourceKeys = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__SOURCE_KEYS__");
-
-boolean isEqualWithSK = false;
-for(Map<String, String> sk : sourceKeys) {
-    if(surrogateKey.equals(sk.get("NAME"))) {
-        isEqualWithSK = true;
-        break;
-    }
-}
-
-boolean isFieldValueIncNull = ("true").equals(ElementParameterParser.getValue(node, "__FIELD_VALUE_INC_NULL__"));
-
-List<String> joinClause = new ArrayList<String>();
 for(Map<String, String> sk : sourceKeys) {
     joinClause.add(" d." + text_util.wrap(sk.get("NAME")) + " = t." + text_util.wrap(sk.get("NAME")));
 }
 String joinClauseString = StringUtils.join(joinClause.toArray(), " AND ");
-
-String strFieldName = "";
-String selectColumnString = "";
-String columnNameString = "";
-
 if(isEnableType1) {
     List<String> columnNames = new ArrayList<String>();
     List<String> setColumns = new ArrayList<String>();
@@ -75,19 +45,6 @@ if(isEnableType1) {
         <%
     }
 }
-
-String startDateField = ElementParameterParser.getValue(node,"__L2_STARTDATE_FIELD__");
-String endDateField = ElementParameterParser.getValue(node,"__L2_ENDDATE_FIELD__");
-String l2EndDateFieldType = ElementParameterParser.getValue(node,"__L2_ENDDATE_FIELD_TYPE__");
-String l2EndDateFieldFixedDateValue = ElementParameterParser.getValue(node,"__FIXED_DATE_VALUE__");
-boolean isEnableActive = ("true").equals(ElementParameterParser.getValue(node,"__USE_L2_ACTIVE__"));
-String activeField = ElementParameterParser.getValue(node,"__L2_ACTIVE_FIELD__");
-boolean isEnableVersion = ("true").equals(ElementParameterParser.getValue(node,"__USE_L2_VERSION__"));
-String versionField = ElementParameterParser.getValue(node,"__L2_VERSION_FIELD__");
-
-boolean useSequence = "DB_SEQUENCE".equals(surrogateKeyType);
-String sequenceName = ElementParameterParser.getValue(node,"__SK_DB_SEQUENCE__");
-
 if(isEnableType2) {
     List<String> whereClause = new ArrayList<String>();
     for (Map<String, String> type2Attribute : type2Attributes) {