fix(TBD-10885): force value to timestamp if checkbox did not exist

* fix(TUP-28085):Error while compiling a Kafka component with Big Data
studio
https://jira.talendforge.org/browse/TUP-28085
Signed-off-by: jding-tlnd <jding@talend.com>

* fix(TUP-28085):Error while compiling a Kafka component with Big Data
studio
https://jira.talendforge.org/browse/TUP-28085

Signed-off-by: jding-tlnd <jding@talend.com>

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

@@ -11,7 +11,7 @@
 	
 	<!-- modification 2: compile classpath -->
 		<path id="compile.classpath">
-			<pathelement location="../../../../../../tcommon-studio-se/main/plugins/org.talend.libraries.dom4j-jaxen/lib/dom4j-1.6.1.jar" /> 
+			<pathelement location="../../../../../../tcommon-studio-se/main/plugins/org.talend.libraries.dom4j-jaxen/lib/dom4j-2.1.3.jar" /> 
 			<pathelement location="../../../../../../tcommon-studio-se/main/plugins/org.talend.libraries.apache.common/lib/commons-lang-2.6.jar" /> 
 		</path>
 

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

@@ -13,9 +13,9 @@
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>dom4j</groupId>
+			<groupId>org.dom4j</groupId>
 			<artifactId>dom4j</artifactId>
-			<version>1.6.1</version>
+			<version>2.1.3</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-lang</groupId>

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

@@ -73,11 +73,10 @@
 			<artifactId>geronimo-stax-api_1.0_spec</artifactId>
 			<version>1.0</version>
 		</dependency>
-		<!-- https://mvnrepository.com/artifact/dom4j/dom4j -->
 		<dependency>
-			<groupId>dom4j</groupId>
+			<groupId>org.dom4j</groupId>
 			<artifactId>dom4j</artifactId>
-			<version>1.6.1</version>
+			<version>2.1.3</version>
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.apache.xmlbeans/xmlbeans -->
 		<dependency>

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

@@ -1,9 +1,9 @@
 <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.libraries</groupId>
-	<artifactId>talend-soap</artifactId>
-	<version>2.1-20190716</version>
+	<groupId>org.talend.components</groupId>
+	<artifactId>components-soap</artifactId>
+	<version>2.2-20200730</version>
 	<packaging>jar</packaging>
 	
 	<name>talend-soap</name>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>xerces</groupId>
 			<artifactId>xercesImpl</artifactId>
-			<version>2.6.2</version>
+			<version>2.12.0</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-codec</groupId>

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

@@ -73,11 +73,10 @@
 			<artifactId>geronimo-stax-api_1.0_spec</artifactId>
 			<version>1.0</version>
 		</dependency>
-		<!-- https://mvnrepository.com/artifact/dom4j/dom4j -->
 		<dependency>
-			<groupId>dom4j</groupId>
+			<groupId>org.dom4j</groupId>
 			<artifactId>dom4j</artifactId>
-			<version>1.6.1</version>
+			<version>2.1.3</version>
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.apache.xmlbeans/xmlbeans -->
 		<dependency>

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

@@ -37,7 +37,7 @@
 		<dependency>
 			<groupId>org.dom4j</groupId>
 			<artifactId>dom4j</artifactId>
-			<version>2.1.1</version>
+			<version>2.1.3</version>
 		</dependency>
 
 		<dependency>

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

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

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

main/plugins/org.talend.designer.components.localprovider/components/tAdvancedFileOutputXML/tAdvancedFileOutputXML_java.xml

@@ -211,7 +211,7 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="Java_DOM4J_2.1.1" MODULE="dom4j-2.1.1.jar" MVN="mvn:org.dom4j/dom4j/2.1.1" REQUIRED="true" BundleID="" />
+			<IMPORT NAME="Java_DOM4J" MODULE="dom4j-2.1.3.jar" MVN="mvn:org.dom4j/dom4j/2.1.3" REQUIRED="true" BundleID="" />
 			<IMPORT NAME="Java_JAXEN_1.1.6" MODULE="jaxen-1.1.6.jar" MVN="mvn:jaxen/jaxen/1.1.6" REQUIRED="true" BundleID="" />
 		</IMPORTS>
 	</CODEGENERATION>

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

@@ -240,11 +240,11 @@
 			<IMPORT NAME="jackson-annotations-2.10.1.jar" MODULE="jackson-annotations-2.10.1.jar"
 				MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.10.1"
 				REQUIRED="true" />
-			<IMPORT NAME="httpcore-4.4.11.jar" MODULE="httpcore-4.4.11.jar"
-				MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11"
+			<IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar"
+				MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13"
 				REQUIRED="true" />
-			<IMPORT NAME="httpclient-4.5.9.jar" MODULE="httpclient-4.5.9.jar"
-				MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9"
+			<IMPORT NAME="httpclient-4.5.12.jar" MODULE="httpclient-4.5.12.jar"
+				MVN="mvn:org.apache.httpcomponents/httpclient/4.5.12"
 				REQUIRED="true" />
 			<IMPORT NAME="joda-time-2.8.1.jar" MODULE="joda-time-2.8.1.jar"
 				MVN="mvn:joda-time/joda-time/2.8.1"
@@ -252,8 +252,8 @@
 			<IMPORT NAME="commons-logging-1.2.jar" MODULE="commons-logging-1.2.jar"
 				MVN="mvn:commons-logging/commons-logging/1.2"
 				REQUIRED="true" />
-			<IMPORT NAME="commons-codec-1.11.jar" MODULE="commons-codec-1.11.jar"
-				MVN="mvn:commons-codec/commons-codec/1.11"
+			<IMPORT NAME="commons-codec-1.14.jar" MODULE="commons-codec-1.14.jar"
+				MVN="mvn:commons-codec/commons-codec/1.14"
 				REQUIRED="true" />
 		</IMPORTS>
 	</CODEGENERATION>

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

@@ -110,6 +110,7 @@
 	String key_pair = ElementParameterParser.getValue(node, "__KEY_PAIR__");
 	
 	String instance_count = ElementParameterParser.getValue(node, "__INSTANCE_COUNT__");
+	String slave_instance_count = ElementParameterParser.getValue(node, "__SLAVE_INSTANCE_COUNT__");
 	
 	String master_instance_type = ElementParameterParser.getValue(node, "__MASTER_INSTANCE_TYPE__");
 	String slave_instance_type = ElementParameterParser.getValue(node, "__SLAVE_INSTANCE_TYPE__");
@@ -139,6 +140,8 @@
 	boolean use_customize_version = "true".equals(ElementParameterParser.getValue(node, "__USE_CUSTOMIZE_VERSION__"));
 	String cluster_version = use_customize_version?ElementParameterParser.getValue(node, "__CUSTOMIZE_VERSION__").trim().replace(' ', '-'):ElementParameterParser.getValue(node, "__CLUSTER_VERSION__");
 	cluster_version = cluster_version.toLowerCase();
+	
+	boolean use_multiple_master = "true".equals(ElementParameterParser.getValue(node, "__USE_MULTIPLE_MASTER_NODES__"));
 %>
 	        
 	<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/Amazon/EMRClient.javajet"%>
@@ -246,59 +249,81 @@
 	if(setApps) {
 	%>
 	<%@ include file="./app_mapping.javajet"%>
-	<%
-	}
+	<%}%>
 	
+	java.util.List<com.amazonaws.services.elasticmapreduce.model.Configuration> configs_<%=cid%> = new java.util.ArrayList<com.amazonaws.services.elasticmapreduce.model.Configuration>();
+	<%
 	Map<String, List<Map<String,String>>> classification2Properties = new HashMap<String, List<Map<String,String>>>();
-	if(newApi) {
-		List<Map<String, String>> property_table = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__PROPERTY_TABLE__");
-		if(property_table!=null) {
-			for (int i=0; i<property_table.size(); i++) {
-				Map<String, String> property = property_table.get(i);
-				String classification = property.get("CLASSIFICATION");
-				
-				List<Map<String,String>> properties = classification2Properties.get(classification);
-				if(properties == null) {
-					properties = new ArrayList<Map<String,String>>();
-					classification2Properties.put(classification, properties);
+	String property_json = ElementParameterParser.getValue(node, "__PROPERTY_JSON__");
+	boolean property_json_validated = property_json != null && !property_json.equals("\"\"") && property_json.length() > 0;
+	%>
+	boolean property_json_validated_<%=cid%> = <%=property_json_validated %>;
+	<%
+	if(!use_multiple_master) {
+		if(newApi) {
+			List<Map<String, String>> property_table = (List<Map<String, String>>)ElementParameterParser.getObjectValue(node, "__PROPERTY_TABLE__");
+			if(property_table!=null) {
+				for (int i=0; i<property_table.size(); i++) {
+					Map<String, String> property = property_table.get(i);
+					String classification = property.get("CLASSIFICATION");
+					
+					List<Map<String,String>> properties = classification2Properties.get(classification);
+					if(properties == null) {
+						properties = new ArrayList<Map<String,String>>();
+						classification2Properties.put(classification, properties);
+					}
+					
+					properties.add(property);
 				}
 				
-				properties.add(property);
-			}
-			
-			if(!classification2Properties.isEmpty()) {
-			%>
-				java.util.List<com.amazonaws.services.elasticmapreduce.model.Configuration> configs_<%=cid%> = new java.util.ArrayList<com.amazonaws.services.elasticmapreduce.model.Configuration>();
-				java.util.Map<String,String> properties_<%=cid%> = null;
-				com.amazonaws.services.elasticmapreduce.model.Configuration config_<%=cid%> = null;
-			<%
-			}
-			
-			for(java.util.Map.Entry<String, List<Map<String,String>>> entry : classification2Properties.entrySet()) {
-				String classification = entry.getKey();
-				List<Map<String,String>> properties = entry.getValue();
+				if(!classification2Properties.isEmpty()) {
 				%>
-    			properties_<%=cid%> = new java.util.HashMap<String,String>();
-    			
-    			<%
-    			for(Map<String,String> property : properties) {
-    			%>
-    				properties_<%=cid%>.put(<%=property.get("KEY")%>, <%=property.get("VALUE")%>);
-    			<%
-    			}
-    			%>
-    			
-            	config_<%=cid%> = new com.amazonaws.services.elasticmapreduce.model.Configuration()
-                    .withClassification(<%=classification%>)
-                    .withProperties(properties_<%=cid%>);
-                    
-                configs_<%=cid%>.add(config_<%=cid%>);
-			<%
+					java.util.Map<String,String> properties_<%=cid%> = null;
+					com.amazonaws.services.elasticmapreduce.model.Configuration config_<%=cid%> = null;
+				<%
+				}
+				
+				for(java.util.Map.Entry<String, List<Map<String,String>>> entry : classification2Properties.entrySet()) {
+					String classification = entry.getKey();
+					List<Map<String,String>> properties = entry.getValue();
+					%>
+	    			properties_<%=cid%> = new java.util.HashMap<String,String>();
+	    			
+	    			<%
+	    			for(Map<String,String> property : properties) {
+	    			%>
+	    				properties_<%=cid%>.put(<%=property.get("KEY")%>, <%=property.get("VALUE")%>);
+	    			<%
+	    			}
+	    			%>
+	    			
+	            	config_<%=cid%> = new com.amazonaws.services.elasticmapreduce.model.Configuration()
+	                    .withClassification(<%=classification%>)
+	                    .withProperties(properties_<%=cid%>);
+	                    
+	                configs_<%=cid%>.add(config_<%=cid%>);
+				<%
+				}
 			}
 		}
-	}
+	}else{
+		boolean isHasSubnetId = subnet_id != null && !subnet_id.equals("\"\"") && subnet_id.length() > 0;
 	%>
-	
+		boolean isHasSubnetId_<%=cid%> = <%=isHasSubnetId %>;
+		if(!isHasSubnetId_<%=cid%>) {
+			throw new RuntimeException("The subnet ID must be specified while using multiple master nodes.");
+		}
+		
+		if(property_json_validated_<%=cid%>) {
+			com.fasterxml.jackson.databind.ObjectMapper mapper_<%=cid%> = new com.fasterxml.jackson.databind.ObjectMapper();
+			mapper_<%=cid%>.configure(com.fasterxml.jackson.databind.MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true);
+			try {
+				configs_<%=cid%> = java.util.Arrays.asList(mapper_<%=cid%>.readValue(<%=property_json%>, com.amazonaws.services.elasticmapreduce.model.Configuration[].class));
+			} catch (com.fasterxml.jackson.core.JsonProcessingException e) {
+				e.printStackTrace();
+			}
+		}
+	<%}%>
 	com.amazonaws.services.elasticmapreduce.model.RunJobFlowRequest request_<%=cid%> = new com.amazonaws.services.elasticmapreduce.model.RunJobFlowRequest()
     	.withName(<%=cluster_name%>)
     	<%if(enable_log){%>
@@ -342,18 +367,32 @@
     	.withBootstrapActions(actions_<%=cid %>)
     	<%}%>
     	
-    	<%if(!classification2Properties.isEmpty()){%>
-    	.withConfigurations(configs_<%=cid%>)
-    	<%}%>
+		<%if(!classification2Properties.isEmpty() || (use_multiple_master && property_json_validated)){%>
+			.withConfigurations(configs_<%=cid%>)
+		<%}%>
     	
     	.withInstances(
     		new com.amazonaws.services.elasticmapreduce.model.JobFlowInstancesConfig()
-    			.withInstanceCount(<%=instance_count%>)
     			<%if(enable_key_pair){%>
     			.withEc2KeyName(<%=key_pair%>)
     			<%}%>
+    			
+    			<%if(use_multiple_master){%>
+				.withInstanceGroups(
+					new com.amazonaws.services.elasticmapreduce.model.InstanceGroupConfig()
+					.withInstanceRole(com.amazonaws.services.elasticmapreduce.model.InstanceRoleType.MASTER)
+					.withInstanceCount(3)
+					.withInstanceType(<%=master_instance_type%>),
+					new com.amazonaws.services.elasticmapreduce.model.InstanceGroupConfig()
+					.withInstanceRole(com.amazonaws.services.elasticmapreduce.model.InstanceRoleType.CORE)
+					.withInstanceCount(<%=slave_instance_count%>)
+					.withInstanceType(<%=slave_instance_type%>)
+				)    			
+    			<%}else{%>
+    			.withInstanceCount(<%=instance_count%>)
     			.withMasterInstanceType(<%=master_instance_type%>)
     			.withSlaveInstanceType(<%=slave_instance_type%>)
+    			<%}%>
     			
     			<%if(parameterUtil.isValid(subnet_id)){%>
     			.withEc2SubnetId(<%=subnet_id%>)

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

@@ -157,9 +157,14 @@
 		</PARAMETER>
 
 		<PARAMETER NAME="INSTANCE_COUNT" FIELD="TEXT" NUM_ROW="52"
-			SHOW_IF="ACTION=='START'" GROUP="INSTANCE_CONFIGURATION">
+			SHOW_IF="ACTION=='START' AND (USE_MULTIPLE_MASTER_NODES=='false')" GROUP="INSTANCE_CONFIGURATION">
 			<DEFAULT>3</DEFAULT>
 		</PARAMETER>
+		
+		<PARAMETER NAME="SLAVE_INSTANCE_COUNT" FIELD="TEXT" NUM_ROW="52"
+			SHOW_IF="ACTION=='START' AND (USE_MULTIPLE_MASTER_NODES=='true')" GROUP="INSTANCE_CONFIGURATION">
+			<DEFAULT>2</DEFAULT>
+		</PARAMETER>
 
 		<PARAMETER NAME="MASTER_INSTANCE_TYPE" FIELD="OPENED_LIST"
 			NUM_ROW="55" SHOW_IF="ACTION=='START'" GROUP="INSTANCE_CONFIGURATION">
@@ -405,6 +410,16 @@
 			<DEFAULT>false</DEFAULT>
 		</PARAMETER>
 		
+		<PARAMETER NAME="USE_MULTIPLE_MASTER_NODES" FIELD="CHECK"
+			NUM_ROW="31" SHOW_IF="ACTION=='START'" GROUP="ADVANCED_CONFIGURATION">
+			<DEFAULT>false</DEFAULT>
+		</PARAMETER>
+		
+		<PARAMETER NAME="NOTE" FIELD="LABEL" 
+			NUM_ROW="31" SHOW_IF="isShow[USE_MULTIPLE_MASTER_NODES]" GROUP="ADVANCED_CONFIGURATION" >
+		    <DEFAULT>(supported by version 5.23.0 and later)</DEFAULT>
+		</PARAMETER>
+		
 		<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.29.0"</DEFAULT>
@@ -522,13 +537,20 @@
 		</PARAMETER>
 		
 		<PARAMETER NAME="PROPERTY_TABLE" FIELD="TABLE" NUM_ROW="95" NB_LINES="5" GROUP="PROPERTY_GROUP"
-			SHOW_IF="(ACTION=='START') AND (CLUSTER_VERSION!='AMI3_10_0') AND (CLUSTER_VERSION!='AMI3_9_0') AND (CLUSTER_VERSION!='AMI3_8_0') AND (CLUSTER_VERSION!='AMI2_4_11') AND (CLUSTER_VERSION!='AMI2_4_10')">
+			SHOW_IF="(ACTION=='START') AND (CLUSTER_VERSION!='AMI3_10_0') AND (CLUSTER_VERSION!='AMI3_9_0') AND (CLUSTER_VERSION!='AMI3_8_0') AND (CLUSTER_VERSION!='AMI2_4_11') AND (CLUSTER_VERSION!='AMI2_4_10')
+				AND (USE_MULTIPLE_MASTER_NODES=='false')">
 			<ITEMS>
 				<ITEM NAME="CLASSIFICATION" />
 				<ITEM NAME="KEY" />
 				<ITEM NAME="VALUE" />
 			</ITEMS>
 		</PARAMETER>
+		
+		<PARAMETER NAME="PROPERTY_JSON" FIELD="MEMO" NUM_ROW="95" NB_LINES="15" GROUP="PROPERTY_GROUP"
+			SHOW_IF="(ACTION=='START') AND (CLUSTER_VERSION!='AMI3_10_0') AND (CLUSTER_VERSION!='AMI3_9_0') AND (CLUSTER_VERSION!='AMI3_8_0') AND (CLUSTER_VERSION!='AMI2_4_11') AND (CLUSTER_VERSION!='AMI2_4_10')
+				AND (USE_MULTIPLE_MASTER_NODES=='true')">
+			<DEFAULT>""</DEFAULT>
+		</PARAMETER>
 	</ADVANCED_PARAMETERS>
 
 	<CODEGENERATION>
@@ -545,11 +567,11 @@
 			<IMPORT NAME="jackson-annotations-2.10.1.jar" MODULE="jackson-annotations-2.10.1.jar"
 				MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.10.1"
 				REQUIRED="true" />
-			<IMPORT NAME="httpcore-4.4.11.jar" MODULE="httpcore-4.4.11.jar"
-				MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11"
+			<IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar"
+				MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13"
 				REQUIRED="true" />
-			<IMPORT NAME="httpclient-4.5.9.jar" MODULE="httpclient-4.5.9.jar"
-				MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9"
+			<IMPORT NAME="httpclient-4.5.12.jar" MODULE="httpclient-4.5.12.jar"
+				MVN="mvn:org.apache.httpcomponents/httpclient/4.5.12"
 				REQUIRED="true" />
 			<IMPORT NAME="joda-time-2.8.1.jar" MODULE="joda-time-2.8.1.jar"
 				MVN="mvn:joda-time/joda-time/2.8.1"
@@ -557,8 +579,8 @@
 			<IMPORT NAME="commons-logging-1.2.jar" MODULE="commons-logging-1.2.jar"
 				MVN="mvn:commons-logging/commons-logging/1.2"
 				REQUIRED="true" />
-			<IMPORT NAME="commons-codec-1.11.jar" MODULE="commons-codec-1.11.jar"
-				MVN="mvn:commons-codec/commons-codec/1.11"
+			<IMPORT NAME="commons-codec-1.14.jar" MODULE="commons-codec-1.14.jar"
+				MVN="mvn:commons-codec/commons-codec/1.14"
 				REQUIRED="true" />
 		</IMPORTS>
 	</CODEGENERATION>

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

@@ -62,6 +62,8 @@ INSTANCE_CONFIGURATION.NAME=Instance Configuration
 
 INSTANCE_COUNT.NAME=Instance count
 
+SLAVE_INSTANCE_COUNT.NAME=Slave instance count
+
 MASTER_INSTANCE_TYPE.NAME=Master instance type
 MASTER_INSTANCE_TYPE.ITEM.m3.xlarge=m3.xlarge
 MASTER_INSTANCE_TYPE.ITEM.m3.2xlarge=m3.2xlarge
@@ -191,8 +193,12 @@ PROPERTY_TABLE.ITEM.CLASSIFICATION=Classification
 PROPERTY_TABLE.ITEM.KEY=Key
 PROPERTY_TABLE.ITEM.VALUE=Value
 
+PROPERTY_JSON.NAME=Properties in JSON
+
 ENABLE_DEBUG.NAME=Enable debug
 
+USE_MULTIPLE_MASTER_NODES.NAME=Use multiple master nodes
+
 INHERIT_CREDENTIALS.NAME=Inherit credentials from AWS role
 ASSUME_ROLE.NAME=Assume role
 ARN.NAME=Role ARN

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

@@ -297,11 +297,11 @@
 			<IMPORT NAME="jackson-annotations-2.10.1.jar" MODULE="jackson-annotations-2.10.1.jar"
 				MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.10.1"
 				REQUIRED="true" />
-			<IMPORT NAME="httpcore-4.4.11.jar" MODULE="httpcore-4.4.11.jar"
-				MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11"
+			<IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar"
+				MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13"
 				REQUIRED="true" />
-			<IMPORT NAME="httpclient-4.5.9.jar" MODULE="httpclient-4.5.9.jar"
-				MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9"
+			<IMPORT NAME="httpclient-4.5.12.jar" MODULE="httpclient-4.5.12.jar"
+				MVN="mvn:org.apache.httpcomponents/httpclient/4.5.12"
 				REQUIRED="true" />
 			<IMPORT NAME="joda-time-2.8.1.jar" MODULE="joda-time-2.8.1.jar"
 				MVN="mvn:joda-time/joda-time/2.8.1"
@@ -309,8 +309,8 @@
 			<IMPORT NAME="commons-logging-1.2.jar" MODULE="commons-logging-1.2.jar"
 				MVN="mvn:commons-logging/commons-logging/1.2"
 				REQUIRED="true" />
-			<IMPORT NAME="commons-codec-1.11.jar" MODULE="commons-codec-1.11.jar"
-				MVN="mvn:commons-codec/commons-codec/1.11"
+			<IMPORT NAME="commons-codec-1.14.jar" MODULE="commons-codec-1.14.jar"
+				MVN="mvn:commons-codec/commons-codec/1.14"
 				REQUIRED="true" />
 		</IMPORTS>
 	</CODEGENERATION>

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,7 +121,6 @@ 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)) {
 	            	    	%>
@@ -142,7 +141,6 @@ 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%>;
@@ -198,7 +196,6 @@ 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)) {
 	    	%>
@@ -224,7 +221,6 @@ 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%>;
@@ -258,12 +254,10 @@ skeleton="../templates/db_output_bulk.skeleton"
 		if(!("").equals(commitEvery) && !("0").equals(commitEvery))
 		{
     		%>
-    		if (commitCounter_<%=cid%> > 0 && rowsToCommitCount_<%=cid%> != 0) {
-        		<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
+    		if (commitCounter_<%=cid%> > 0) {
+        		<%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
         		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,9 +631,7 @@ if(columnList != null && columnList.size() > 0) {
 	                try {
 	                    nb_line_<%=cid%>++;
 	                    <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-	                    int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-	                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
-	                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+	                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
 	                    <%dbLog.data().inserting(dbLog.var("nb_line"));%>
 	                } catch(java.lang.Exception e) {
 	                    whetherReject_<%=cid%> = true;
@@ -711,9 +709,7 @@ if(columnList != null && columnList.size() > 0) {
                 try {
                     nb_line_<%=cid%>++;
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
                     whetherReject_<%=cid%> = true;
@@ -848,9 +844,7 @@ if(columnList != null && columnList.size() > 0) {
             try {
                 nb_line_<%=cid%>++;
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                updatedCount_<%=cid%> += processedCount_<%=cid%>;
-                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                 <%dbLog.data().updating(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
@@ -1002,9 +996,7 @@ if(columnList != null && columnList.size() > 0) {
     			%>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    int processedCount_<%=cid%> = pstmtUpdate_<%=cid %>.executeUpdate();
-                    updatedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmtUpdate_<%=cid %>.executeUpdate();
                     nb_line_<%=cid%>++;
         			<%dbLog.data().updating(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -1080,9 +1072,7 @@ if(columnList != null && columnList.size() > 0) {
     			%>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
-                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -1214,7 +1204,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) {
 
             	<%
@@ -1260,9 +1250,7 @@ if(columnList != null && columnList.size() > 0) {
                 }
         		%>
              		<%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
-                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
              		nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
     			}else{
@@ -1354,9 +1342,7 @@ if(columnList != null && columnList.size() > 0) {
     		%>
             try {
             	<%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                deletedCount_<%=cid%> += processedCount_<%=cid%>;
-                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+        	    deletedCount_<%=cid%> = deletedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
             	nb_line_<%=cid%>++;
             	<%dbLog.data().deleting(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
@@ -1424,9 +1410,7 @@ if(columnList != null && columnList.size() > 0) {
             %>
             int replaceCount_<%=cid%> = 0;
             try {
-                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                replaceCount_<%=cid%> += processedCount_<%=cid%>;
-                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                replaceCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
                 <%dbLog.data().replacing(null);%>
             } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
@@ -1506,9 +1490,7 @@ if(columnList != null && columnList.size() > 0) {
             int count_on_duplicate_key_<%=cid%> = 0;
             try {
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                count_on_duplicate_key_<%=cid%> += processedCount_<%=cid%>;
-                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                count_on_duplicate_key_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
                 <%dbLog.data().insertingOnDuplicateKeyUpdating(null);%>
             } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
@@ -1574,9 +1556,7 @@ if(columnList != null && columnList.size() > 0) {
                 try {
                     nb_line_<%=cid%>++;
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                     <%dbLog.data().insertingOnDuplicateKeyUpdating(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
                     whetherReject_<%=cid%> = true;
@@ -1647,7 +1627,6 @@ 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)) {
             	    	%>
@@ -1666,7 +1645,6 @@ 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%>;
@@ -1696,7 +1674,6 @@ 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)) {
@@ -1720,7 +1697,6 @@ 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)) {%>
@@ -1751,7 +1727,6 @@ 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)) {
             	    	%>
@@ -1778,7 +1753,6 @@ 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%>;
@@ -1801,12 +1775,9 @@ if(columnList != null && columnList.size() > 0) {
                 <%
                 }
                 %>
-                    if(rowsToCommitCount_<%=cid%> != 0){
-                    	<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
-                    	conn_<%=cid%>.commit();
-                    	<%dbLog.commit().commitDone(null);%>
-                    	rowsToCommitCount_<%=cid%> = 0;
-                    }
+                	<%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
+                	conn_<%=cid%>.commit();
+            		<%dbLog.commit().commitDone(null);%>
                 	commitCounter_<%=cid%>=0;
                 }
                 <%

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

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

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

@@ -353,11 +353,11 @@
 			<IMPORT NAME="jackson-annotations-2.10.1.jar" MODULE="jackson-annotations-2.10.1.jar"
 				MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.10.1"
 				REQUIRED="true" />
-			<IMPORT NAME="httpcore-4.4.11.jar" MODULE="httpcore-4.4.11.jar"
-				MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11"
+			<IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar"
+				MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13"
 				REQUIRED="true" />
-			<IMPORT NAME="httpclient-4.5.9.jar" MODULE="httpclient-4.5.9.jar"
-				MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9"
+			<IMPORT NAME="httpclient-4.5.12.jar" MODULE="httpclient-4.5.12.jar"
+				MVN="mvn:org.apache.httpcomponents/httpclient/4.5.12"
 				REQUIRED="true" />
 			<IMPORT NAME="joda-time-2.8.1.jar" MODULE="joda-time-2.8.1.jar"
 				MVN="mvn:joda-time/joda-time/2.8.1"
@@ -365,8 +365,8 @@
 			<IMPORT NAME="commons-logging-1.2.jar" MODULE="commons-logging-1.2.jar"
 				MVN="mvn:commons-logging/commons-logging/1.2"
 				REQUIRED="true" />
-			<IMPORT NAME="commons-codec-1.11.jar" MODULE="commons-codec-1.11.jar"
-				MVN="mvn:commons-codec/commons-codec/1.11"
+			<IMPORT NAME="commons-codec-1.14.jar" MODULE="commons-codec-1.14.jar"
+				MVN="mvn:commons-codec/commons-codec/1.14"
 				REQUIRED="true" />
 		</IMPORTS>
 	</CODEGENERATION>

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

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

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

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

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

@@ -244,9 +244,9 @@
 		<!-- REQUIRED FOR GOOGLE STORAGE -->
 		<IMPORT NAME="jets3t-0.9.1" MODULE="jets3t-0.9.1.jar" MVN="mvn:org.talend.libraries/jets3t-0.9.1/6.0.0"  REQUIRED="true" />
 		<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED="true" />
-		<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="httpclient-4.5.12" MODULE="httpclient-4.5.12.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.12" REQUIRED="true" />
+		<IMPORT NAME="httpcore-4.4.13" MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" REQUIRED="true" />
+		<IMPORT NAME="commons-codec-1.14" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" REQUIRED="true" />
         <IMPORT NAME="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'" />

main/plugins/org.talend.designer.components.localprovider/components/tBonitaDeploy/tBonitaDeploy_java.xml

@@ -37,8 +37,8 @@
 
   	<PARAMETER NAME="DB_VERSION" FIELD="CLOSED_LIST" NUM_ROW="1">
 		<ITEMS DEFAULT="BONITA_523">
-			<ITEM NAME="BONITA_523" VALUE="antlr-2.7.6.jar;asm-1.5.3.jar;asm-3.1.jar;asm-attrs-1.5.3.jar;cglib-nodep-2.1_3.jar;commons-collections-2.1.1.jar;commons-logging-1.0.4.jar;dom4j-2.1.1.jar;ehcache-1.2.3.jar;groovy-all-1.7.0.jar;h2-1.2.132.jar;hibernate-3.2.6.ga.jar;jline-0.9.94.jar;jta-1.1.jar;novaBpmIdentity-1.0.jar;novaBpmPerf-1.0.jar;novaBpmUtil-1.0.jar" />
-			<ITEM NAME="BONITA_531" VALUE="novaBpmIdentity-1.0.jar;novaBpmPerf-1.0.jar;novaBpmUtil-1.0.jar;hibernate-core-3.5.6-Final.jar;commons-collections-3.2.2.jar;ehcache-core-2.2.0.jar;hibernate-commons-annotations-3.2.0.Final.jar;hibernate-search-3.2.1.Final.jar;javassist-3.8.0.GA.jar;lucene-core-2.9.3.jar;slf4j-api-1.6.1.jar;dom4j-2.1.1.jar;h2-1.2.132.jar;jta-1.1.jar;antlr-2.7.6.jar;commons-logging-1.1.1.jar" />
+			<ITEM NAME="BONITA_523" VALUE="antlr-2.7.6.jar;asm-1.5.3.jar;asm-3.1.jar;asm-attrs-1.5.3.jar;cglib-nodep-2.1_3.jar;commons-collections-2.1.1.jar;commons-logging-1.0.4.jar;dom4j-2.1.3.jar;ehcache-1.2.3.jar;groovy-all-1.7.0.jar;h2-1.2.132.jar;hibernate-3.2.6.ga.jar;jline-0.9.94.jar;jta-1.1.jar;novaBpmIdentity-1.0.jar;novaBpmPerf-1.0.jar;novaBpmUtil-1.0.jar" />
+			<ITEM NAME="BONITA_531" VALUE="novaBpmIdentity-1.0.jar;novaBpmPerf-1.0.jar;novaBpmUtil-1.0.jar;hibernate-core-3.5.6-Final.jar;commons-collections-3.2.2.jar;ehcache-core-2.2.0.jar;hibernate-commons-annotations-3.2.0.Final.jar;hibernate-search-3.2.1.Final.jar;javassist-3.8.0.GA.jar;lucene-core-2.9.3.jar;slf4j-api-1.6.1.jar;dom4j-2.1.3.jar;h2-1.2.132.jar;jta-1.1.jar;antlr-2.7.6.jar;commons-logging-1.1.1.jar" />
 			<ITEM NAME="BONITA_561" VALUE="BONITA_561" />
 			<ITEM NAME="BONITA_5101" VALUE="BONITA_5101" />
 			<ITEM NAME="BONITA_652" VALUE="BONITA_652" />
@@ -177,7 +177,7 @@
 			<IMPORT NAME="cglib_nodep_213" MODULE="cglib-nodep-2.1_3.jar" MVN="mvn:org.talend.libraries/cglib-nodep-2.1_3/6.0.0"  REQUIRED="false" />
 			<IMPORT NAME="commons_collections_211" MODULE="commons-collections-2.1.1.jar" MVN="mvn:org.talend.libraries/commons-collections-2.1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-collections-2.1.1.jar" REQUIRED="false" />
 			<IMPORT NAME="commons_logging_104" MODULE="commons-logging-1.0.4.jar" MVN="mvn:org.talend.libraries/commons-logging-1.0.4/6.0.0"  UrlPath="platform:/base/plugins/org.apache.commons.logging_1.0.4.v201101211617.jar" REQUIRED="false" />
-			<IMPORT NAME="dom4j_2.1.1" MODULE="dom4j-2.1.1.jar" MVN="mvn:org.dom4j/dom4j/2.1.1" REQUIRED_IF="DB_VERSION=='BONITA_561'" BundleID="" />
+			<IMPORT NAME="dom4j2" MODULE="dom4j-2.1.3.jar" MVN="mvn:org.dom4j/dom4j/2.1.3" REQUIRED_IF="DB_VERSION=='BONITA_561'" BundleID="" />
 			<IMPORT NAME="ehcache_123" MODULE="ehcache-1.2.3.jar" MVN="mvn:org.talend.libraries/ehcache-1.2.3/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.ehcache/lib/ehcache-1.2.3.jar" REQUIRED="false" />
 			<IMPORT NAME="groovy_all_170" MODULE="groovy-all-1.7.0.jar" MVN="mvn:org.talend.libraries/groovy-all-1.7.0/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.groovy/lib/groovy-all-1.7.0.jar" REQUIRED="false" />
 
@@ -226,9 +226,9 @@
 			<IMPORT NAME="bonita-common-6.5.2.jar" MODULE="bonita-common-6.5.2.jar" MVN="mvn:org.talend.libraries/bonita-common-6.5.2/6.0.0" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
 			
 			<IMPORT NAME="httpmime-4.2.5.jar" MODULE="httpmime-4.2.5.jar" MVN="mvn:org.talend.libraries/httpmime-4.2.5/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.http/lib/httpmime-4.2.5.jar" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
-			<IMPORT NAME="httpclient-4.5.9.jar" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
-			<IMPORT NAME="httpcore-4.4.11.jar" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
-			<IMPORT NAME="commons-codec-1.11.jar" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
+			<IMPORT NAME="httpclient-4.5.12.jar" MODULE="httpclient-4.5.12.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.12" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
+			<IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
+			<IMPORT NAME="commons-codec-1.14.jar" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
 			<IMPORT NAME="commons-logging-1.2.jar" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
 			
 			<!-- Bonita 6.5.2 JAVA API -->
@@ -239,10 +239,10 @@
 			<IMPORT NAME="xpp3-1.1.6.jar" MODULE="xpp3-1.1.6.jar" MVN="mvn:org.talend.libraries/xpp3-1.1.6/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.xml/lib/xpp3-1.1.6.jar" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
 			
 			<IMPORT NAME="httpmime-4.2.5.jar" MODULE="httpmime-4.2.5.jar" MVN="mvn:org.talend.libraries/httpmime-4.2.5/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.http/lib/httpmime-4.2.5.jar" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
-			<IMPORT NAME="httpclient-4.5.9.jar" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
-			<IMPORT NAME="httpcore-4.4.11.jar" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
+			<IMPORT NAME="httpclient-4.5.12.jar" MODULE="httpclient-4.5.12.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.12" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
+			<IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
 			<IMPORT NAME="commons-logging-1.2.jar" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
-			<IMPORT NAME="commons-codec-1.11.jar" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
+			<IMPORT NAME="commons-codec-1.14.jar" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
 			
 			<!-- Bonita 7.2.4 HTTP API -->
 			<IMPORT NAME="talend-bonita-client-1.0.0.jar" MODULE="talend-bonita-client-1.0.0.jar" MVN="mvn:org.talend.libraries/talend-bonita-client-1.0.0/6.0.0" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
@@ -250,10 +250,10 @@
 			<IMPORT NAME="bonita-common-7.2.4.jar" MODULE="bonita-common-7.2.4.jar" MVN="mvn:org.talend.libraries/bonita-common-7.2.4/6.3.0" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
 			
 			<IMPORT NAME="httpmime-4.2.5.jar" MODULE="httpmime-4.2.5.jar" MVN="mvn:org.talend.libraries/httpmime-4.2.5/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.http/lib/httpmime-4.2.5.jar" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
-			<IMPORT NAME="httpclient-4.5.9.jar" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
-			<IMPORT NAME="httpcore-4.4.11.jar" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
+			<IMPORT NAME="httpclient-4.5.12.jar" MODULE="httpclient-4.5.12.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.12" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
+			<IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
 			<IMPORT NAME="commons-logging-1.2.jar" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
-			<IMPORT NAME="commons-codec-1.11.jar" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
+			<IMPORT NAME="commons-codec-1.14.jar" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
 			
 			<!-- Bonita 7.2.4 JAVA API -->
 			<IMPORT NAME="talend-bonita-client-1.0.0.jar" MODULE="talend-bonita-client-1.0.0.jar" MVN="mvn:org.talend.libraries/talend-bonita-client-1.0.0/6.0.0" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
@@ -263,10 +263,10 @@
 			<IMPORT NAME="xpp3-1.1.6.jar" MODULE="xpp3-1.1.6.jar" MVN="mvn:org.talend.libraries/xpp3-1.1.6/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.xml/lib/xpp3-1.1.6.jar" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
 			
 			<IMPORT NAME="httpmime-4.2.5.jar" MODULE="httpmime-4.2.5.jar" MVN="mvn:org.talend.libraries/httpmime-4.2.5/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.http/lib/httpmime-4.2.5.jar" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
-			<IMPORT NAME="httpclient-4.5.9.jar" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
-			<IMPORT NAME="httpcore-4.4.11.jar" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
+			<IMPORT NAME="httpclient-4.5.12.jar" MODULE="httpclient-4.5.12.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.12" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
+			<IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
 			<IMPORT NAME="commons-logging-1.2.jar" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
-			<IMPORT NAME="commons-codec-1.11.jar" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
+			<IMPORT NAME="commons-codec-1.14.jar" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
 			<IMPORT NAME="commons-io-2.1.jar" MODULE="commons-io-2.1.jar" MVN="mvn:org.talend.libraries/commons-io-2.1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-io-2.1.jar" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
 	     </IMPORTS>
 	</CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tBonitaInstantiateProcess/tBonitaInstantiateProcess_java.xml

@@ -50,8 +50,8 @@
 
 	<PARAMETER NAME="DB_VERSION" FIELD="CLOSED_LIST" NUM_ROW="2">
 		<ITEMS DEFAULT="BONITA_523">
-			<ITEM NAME="BONITA_523" VALUE="antlr-2.7.6.jar;asm-1.5.3.jar;asm-3.1.jar;asm-attrs-1.5.3.jar;cglib-nodep-2.1_3.jar;commons-collections-2.1.1.jar;commons-logging-1.0.4.jar;dom4j-2.1.1.jar;ehcache-1.2.3.jar;groovy-all-1.7.0.jar;h2-1.2.132.jar;hibernate-3.2.6.ga.jar;jline-0.9.94.jar;jta-1.1.jar;novaBpmIdentity-1.0.jar;novaBpmPerf-1.0.jar;novaBpmUtil-1.0.jar" />
-			<ITEM NAME="BONITA_531" VALUE="novaBpmIdentity-1.0.jar;novaBpmPerf-1.0.jar;novaBpmUtil-1.0.jar;hibernate-core-3.5.6-Final.jar;commons-collections-3.2.2.jar;ehcache-core-2.2.0.jar;hibernate-commons-annotations-3.2.0.Final.jar;hibernate-search-3.2.1.Final.jar;javassist-3.8.0.GA.jar;lucene-core-2.9.3.jar;slf4j-api-1.6.1.jar;dom4j-2.1.1.jar;h2-1.2.132.jar;jta-1.1.jar;antlr-2.7.6.jar;commons-logging-1.1.1.jar" />
+			<ITEM NAME="BONITA_523" VALUE="antlr-2.7.6.jar;asm-1.5.3.jar;asm-3.1.jar;asm-attrs-1.5.3.jar;cglib-nodep-2.1_3.jar;commons-collections-2.1.1.jar;commons-logging-1.0.4.jar;dom4j-2.1.3.jar;ehcache-1.2.3.jar;groovy-all-1.7.0.jar;h2-1.2.132.jar;hibernate-3.2.6.ga.jar;jline-0.9.94.jar;jta-1.1.jar;novaBpmIdentity-1.0.jar;novaBpmPerf-1.0.jar;novaBpmUtil-1.0.jar" />
+			<ITEM NAME="BONITA_531" VALUE="novaBpmIdentity-1.0.jar;novaBpmPerf-1.0.jar;novaBpmUtil-1.0.jar;hibernate-core-3.5.6-Final.jar;commons-collections-3.2.2.jar;ehcache-core-2.2.0.jar;hibernate-commons-annotations-3.2.0.Final.jar;hibernate-search-3.2.1.Final.jar;javassist-3.8.0.GA.jar;lucene-core-2.9.3.jar;slf4j-api-1.6.1.jar;dom4j-2.1.3.jar;h2-1.2.132.jar;jta-1.1.jar;antlr-2.7.6.jar;commons-logging-1.1.1.jar" />
 			<ITEM NAME="BONITA_561" VALUE="BONITA_561" />
 			<ITEM NAME="BONITA_5101" VALUE="BONITA_5101" />
 			<ITEM NAME="BONITA_652" VALUE="BONITA_652" />
@@ -226,7 +226,7 @@
 			<IMPORT NAME="cglib_nodep_213" MODULE="cglib-nodep-2.1_3.jar" MVN="mvn:org.talend.libraries/cglib-nodep-2.1_3/6.0.0"  REQUIRED="false" />
 			<IMPORT NAME="commons_collections_211" MODULE="commons-collections-2.1.1.jar" MVN="mvn:org.talend.libraries/commons-collections-2.1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-collections-2.1.1.jar" REQUIRED="false" />
 			<IMPORT NAME="commons_logging_104" MODULE="commons-logging-1.0.4.jar" MVN="mvn:org.talend.libraries/commons-logging-1.0.4/6.0.0"  UrlPath="platform:/base/plugins/org.apache.commons.logging_1.0.4.v201101211617.jar" REQUIRED="false" />
-			<IMPORT NAME="dom4j_2.1.1" MODULE="dom4j-2.1.1.jar" MVN="mvn:org.dom4j/dom4j/2.1.1"  REQUIRED_IF="(CLIENT_MODE=='JAVA_CLIENT') AND (DB_VERSION=='BONITA_561')" BundleID="" />
+			<IMPORT NAME="dom4j2" MODULE="dom4j-2.1.3.jar" MVN="mvn:org.dom4j/dom4j/2.1.3"  REQUIRED_IF="(CLIENT_MODE=='JAVA_CLIENT') AND (DB_VERSION=='BONITA_561')" BundleID="" />
 			<IMPORT NAME="ehcache_123" MODULE="ehcache-1.2.3.jar" MVN="mvn:org.talend.libraries/ehcache-1.2.3/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.ehcache/lib/ehcache-1.2.3.jar" REQUIRED="false" />
 			<IMPORT NAME="groovy_all_170" MODULE="groovy-all-1.7.0.jar" MVN="mvn:org.talend.libraries/groovy-all-1.7.0/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.groovy/lib/groovy-all-1.7.0.jar" REQUIRED="false" />
 
@@ -274,9 +274,9 @@
 			<IMPORT NAME="bonita-common-6.5.2.jar" MODULE="bonita-common-6.5.2.jar" MVN="mvn:org.talend.libraries/bonita-common-6.5.2/6.0.0" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
 			
 			<IMPORT NAME="httpmime-4.2.5.jar" MODULE="httpmime-4.2.5.jar" MVN="mvn:org.talend.libraries/httpmime-4.2.5/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.http/lib/httpmime-4.2.5.jar" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
-			<IMPORT NAME="httpclient-4.5.9.jar" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
-			<IMPORT NAME="httpcore-4.4.11.jar" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
-			<IMPORT NAME="commons-codec-1.11.jar" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
+			<IMPORT NAME="httpclient-4.5.12.jar" MODULE="httpclient-4.5.12.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.12" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
+			<IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
+			<IMPORT NAME="commons-codec-1.14.jar" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
 			<IMPORT NAME="commons-logging-1.2.jar" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
 			<IMPORT NAME="commons-lang3-3.8.1.jar" MODULE="commons-lang3-3.8.1.jar" MVN="mvn:org.apache.commons/commons-lang3/3.8.1" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang3-3.8.1.jar" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
 			
@@ -288,10 +288,10 @@
 			<IMPORT NAME="xpp3-1.1.6.jar" MODULE="xpp3-1.1.6.jar" MVN="mvn:org.talend.libraries/xpp3-1.1.6/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.xml/lib/xpp3-1.1.6.jar" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
 			
 			<IMPORT NAME="httpmime-4.2.5.jar" MODULE="httpmime-4.2.5.jar" MVN="mvn:org.talend.libraries/httpmime-4.2.5/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.http/lib/httpmime-4.2.5.jar" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
-			<IMPORT NAME="httpclient-4.5.9.jar" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
-			<IMPORT NAME="httpcore-4.4.11.jar" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
+			<IMPORT NAME="httpclient-4.5.12.jar" MODULE="httpclient-4.5.12.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.12" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
+			<IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
 			<IMPORT NAME="commons-logging-1.2.jar" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
-			<IMPORT NAME="commons-codec-1.11.jar" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
+			<IMPORT NAME="commons-codec-1.14.jar" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
 			
 			<!-- Bonita 7.2.4 HTTP API -->
 			<IMPORT NAME="talend-bonita-client-1.0.0.jar" MODULE="talend-bonita-client-1.0.0.jar" MVN="mvn:org.talend.libraries/talend-bonita-client-1.0.0/6.0.0" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
@@ -299,10 +299,10 @@
 			<IMPORT NAME="bonita-common-7.2.4.jar" MODULE="bonita-common-7.2.4.jar" MVN="mvn:org.talend.libraries/bonita-common-7.2.4/6.3.0" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
 			
 			<IMPORT NAME="httpmime-4.2.5.jar" MODULE="httpmime-4.2.5.jar" MVN="mvn:org.talend.libraries/httpmime-4.2.5/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.http/lib/httpmime-4.2.5.jar" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
-			<IMPORT NAME="httpclient-4.5.9.jar" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
-			<IMPORT NAME="httpcore-4.4.11.jar" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
+			<IMPORT NAME="httpclient-4.5.12.jar" MODULE="httpclient-4.5.12.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.12" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
+			<IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
 			<IMPORT NAME="commons-logging-1.2.jar" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
-			<IMPORT NAME="commons-codec-1.11.jar" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
+			<IMPORT NAME="commons-codec-1.14.jar" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
 			<IMPORT NAME="commons-lang3-3.8.1.jar" MODULE="commons-lang3-3.8.1.jar" MVN="mvn:org.apache.commons/commons-lang3/3.8.1" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang3-3.8.1.jar" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
 			
 			<!-- Bonita 7.2.4 JAVA API -->
@@ -313,10 +313,10 @@
 			<IMPORT NAME="xpp3-1.1.6.jar" MODULE="xpp3-1.1.6.jar" MVN="mvn:org.talend.libraries/xpp3-1.1.6/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.xml/lib/xpp3-1.1.6.jar" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
 			
 			<IMPORT NAME="httpmime-4.2.5.jar" MODULE="httpmime-4.2.5.jar" MVN="mvn:org.talend.libraries/httpmime-4.2.5/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.http/lib/httpmime-4.2.5.jar" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
-			<IMPORT NAME="httpclient-4.5.9.jar" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
-			<IMPORT NAME="httpcore-4.4.11.jar" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
+			<IMPORT NAME="httpclient-4.5.12.jar" MODULE="httpclient-4.5.12.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.12" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
+			<IMPORT NAME="httpcore-4.4.13.jar" MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
 			<IMPORT NAME="commons-logging-1.2.jar" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
-			<IMPORT NAME="commons-codec-1.11.jar" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
+			<IMPORT NAME="commons-codec-1.14.jar" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
 			<IMPORT NAME="commons-io-2.1.jar" MODULE="commons-io-2.1.jar" MVN="mvn:org.talend.libraries/commons-io-2.1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-io-2.1.jar" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
 			
 			<!-- Bonita Http Client -->

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

@@ -81,10 +81,10 @@
                 MODULE="jackson-annotations-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.10.1" 
                 REQUIRED="true" />
             <IMPORT NAME="apache-http-client"
-                MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" 
+                MODULE="httpclient-4.5.12.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.12" 
             	REQUIRED="true" />
             <IMPORT NAME="apache-http-core"
-                MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" 
+                MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" 
             	REQUIRED="true" />
             <IMPORT NAME="apache-http-mime"
                 MODULE="httpmime-4.1.2.jar" MVN="mvn:org.talend.libraries/httpmime-4.1.2/6.0.0" 
@@ -94,7 +94,7 @@
                 MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" 
             	REQUIRED="true" BundleID="" />
             <IMPORT NAME="apache-commons-codec"
-                MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" 
+                MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" 
             	REQUIRED="true" BundleID="" />
             <IMPORT NAME="apache-commons-lang"
                 MODULE="commons-lang-2.6.jar" MVN="mvn:commons-lang/commons-lang/2.6" 

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

@@ -136,10 +136,10 @@
                     MODULE="jackson-annotations-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.10.1" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="apache-http-client"
-                	MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9"
+                	MODULE="httpclient-4.5.12.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.12"
                		REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="apache-http-core"
-                	MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11"
+                	MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13"
                		REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                 <IMPORT NAME="apache-http-mime"
                 	MODULE="httpmime-4.1.2.jar" MVN="mvn:org.talend.libraries/httpmime-4.1.2/6.0.0" 
@@ -149,7 +149,7 @@
                 	MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" 
                		REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" BundleID="" />
                	<IMPORT NAME="apache-commons-codec"
-	                MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" 
+	                MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" 
 	            	REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="apache-commons-lang"
                     MODULE="commons-lang-2.6.jar" MVN="mvn:commons-lang/commons-lang/2.6" 

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

@@ -97,10 +97,10 @@
                     MODULE="jackson-annotations-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.10.1" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="apache-http-client"
-                	MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9"
+                	MODULE="httpclient-4.5.12.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.12"
                		REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="apache-http-core"
-                    MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" 
+                    MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" 
                		REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="apache-http-mime"
                 	MODULE="httpmime-4.1.2.jar" MVN="mvn:org.talend.libraries/httpmime-4.1.2/6.0.0" 
@@ -110,7 +110,7 @@
                 	MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" 
                		REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" BundleID="" />
                	<IMPORT NAME="apache-commons-codec"
-	                MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" 
+	                MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" 
 	            	REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="apache-commons-lang"
                     MODULE="commons-lang-2.6.jar" MVN="mvn:commons-lang/commons-lang/2.6" 

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

@@ -107,10 +107,10 @@
                     MODULE="jackson-annotations-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.10.1" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="apache-http-client"
-                	MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9"
+                	MODULE="httpclient-4.5.12.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.12"
                		REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="apache-http-core"
-                	MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11"
+                	MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13"
                		REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="apache-http-mime"
                 	MODULE="httpmime-4.1.2.jar" MVN="mvn:org.talend.libraries/httpmime-4.1.2/6.0.0" 
@@ -120,7 +120,7 @@
                 	MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" 
                		REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" BundleID="" />
                	<IMPORT NAME="apache-commons-codec"
-	                MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" 
+	                MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" 
 	            	REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="apache-commons-lang"
                     MODULE="commons-lang-2.6.jar" MVN="mvn:commons-lang/commons-lang/2.6" 

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

@@ -115,10 +115,10 @@
                     MODULE="jackson-annotations-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.10.1" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="apache-http-client"
-                	MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9"
+                	MODULE="httpclient-4.5.12.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.12"
                		REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="apache-http-core"
-                	MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11"
+                	MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13"
                		REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="apache-http-mime"
                 	MODULE="httpmime-4.1.2.jar" MVN="mvn:org.talend.libraries/httpmime-4.1.2/6.0.0" 
@@ -128,7 +128,7 @@
                 	MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" 
                		REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" BundleID="" />
                	<IMPORT NAME="apache-commons-codec"
-	                MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" 
+	                MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" 
 	            	REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="apache-commons-lang"
                     MODULE="commons-lang-2.6.jar" MVN="mvn:commons-lang/commons-lang/2.6" 

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

@@ -118,10 +118,10 @@
                     MODULE="jackson-annotations-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.10.1" 
                     REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="apache-http-client"
-                	MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9"
+                	MODULE="httpclient-4.5.12.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.12"
                		REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="apache-http-core"
-                	MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11"
+                	MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13"
                		REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="apache-http-mime"
                 	MODULE="httpmime-4.1.2.jar" MVN="mvn:org.talend.libraries/httpmime-4.1.2/6.0.0" 
@@ -131,7 +131,7 @@
                 	MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" 
                		REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" BundleID="" />
                	<IMPORT NAME="apache-commons-codec"
-	                MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" 
+	                MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" 
 	            	REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
                <IMPORT NAME="apache-commons-lang"
                     MODULE="commons-lang-2.6.jar" MVN="mvn:commons-lang/commons-lang/2.6" 

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

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

main/plugins/org.talend.designer.components.localprovider/components/tEDIFACTtoXML/tEDIFACTtoXML_java.xml

@@ -182,7 +182,7 @@
 				REQUIRED="true" />
 			<IMPORT NAME="commons-lang" MODULE="commons-lang-2.6.jar" MVN="mvn:commons-lang/commons-lang/2.6"  UrlPath="platform:/base/plugins/org.apache.commons.lang_2.6.0.v201404270220.jar"
 				REQUIRED="true" />
-			<IMPORT NAME="dom4j" MODULE="dom4j-2.1.1.jar" MVN="mvn:org.dom4j/dom4j/2.1.1" BundleID="org.apache.servicemix.bundles.dom4j" REQUIRED="true" />
+			<IMPORT NAME="dom4j" MODULE="dom4j-2.1.3.jar" MVN="mvn:org.dom4j/dom4j/2.1.3" BundleID="org.apache.servicemix.bundles.dom4j" REQUIRED="true" />
 	</IMPORTS>
   </CODEGENERATION>
   <RETURNS/>

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

@@ -153,7 +153,6 @@ 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,7 +96,6 @@ 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)) {
@@ -142,7 +141,6 @@ 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%>;
@@ -179,13 +177,9 @@ imports="
         if(!("").equals(commitEvery) && !("0").equals(commitEvery))
         {
         %>
-            if(rowsToCommitCount_<%=cid%> != 0){
-            	<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
-            	conn_<%=cid%>.commit();
-            	<%dbLog.commit().commitDone(null);%>
-            	rowsToCommitCount_<%=cid%> = 0;
-            	commitCounter_<%=cid%> = 0;
-            }
+            <%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
+            conn_<%=cid%>.commit();
+            <%dbLog.commit().commitDone(null);%>
         <%
         }
 

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

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

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

@@ -176,7 +176,7 @@
 
     <CODEGENERATION>
     <IMPORTS>
-    		<IMPORT NAME="Java_DOM4J_2.1.1" MODULE="dom4j-2.1.1.jar" MVN="mvn:org.dom4j/dom4j/2.1.1" REQUIRED_IF="READ_BY == 'XPATH'" BundleID="" />
+    		<IMPORT NAME="Java_DOM4J2" MODULE="dom4j-2.1.3.jar" MVN="mvn:org.dom4j/dom4j/2.1.3" REQUIRED_IF="READ_BY == 'XPATH'" BundleID="" />
             <IMPORT NAME="Java_JAXEN_1.1.6" MODULE="jaxen-1.1.6.jar" MVN="mvn:jaxen/jaxen/1.1.6" REQUIRED_IF="READ_BY == 'XPATH'" BundleID="" />
             <IMPORT NAME="json-lib" MODULE="json-lib-2.4.5-talend.jar" MVN="mvn:net.sf.json-lib/json-lib/2.4.5-talend" REQUIRED_IF="READ_BY == 'XPATH'" />
             <IMPORT NAME="commons_lang" MODULE="commons-lang-2.6.jar" MVN="mvn:commons-lang/commons-lang/2.6"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang-2.6.jar" REQUIRED_IF="READ_BY == 'XPATH'" />

main/plugins/org.talend.designer.components.localprovider/components/tExtractXMLField/tExtractXMLField_java.xml

@@ -157,9 +157,9 @@
     <CODEGENERATION>
     <IMPORTS>
       <IMPORT
-        NAME="Java_DOM4J_2.1.1"
-        MODULE="dom4j-2.1.1.jar"
-        MVN="mvn:org.dom4j/dom4j/2.1.1"
+        NAME="Java_DOM4J2"
+        MODULE="dom4j-2.1.3.jar"
+        MVN="mvn:org.dom4j/dom4j/2.1.3"
         REQUIRED="true"
         BundleID=""
       />

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

@@ -178,7 +178,7 @@
 		<IMPORTS>
 			<IMPORT NAME="Java_Excel" MODULE="jxl.jar" MVN="mvn:org.talend.libraries/jxl/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.jexcel/lib/jxl.jar" REQUIRED_IF="(VERSION_2007 == 'false')" />
 
-			<IMPORT NAME="dom4j" MODULE="dom4j-2.1.1.jar" MVN="mvn:org.dom4j/dom4j/2.1.1" REQUIRED_IF="(VERSION_2007 == 'true')" BundleID="" />
+			<IMPORT NAME="Java_DOM4J2" MODULE="dom4j-2.1.3.jar" MVN="mvn:org.dom4j/dom4j/2.1.3" REQUIRED_IF="(VERSION_2007 == 'true')" BundleID="" />
 			<IMPORT NAME="geronimo-stax-api" MODULE="geronimo-stax-api_1.0_spec-1.0.1.jar" MVN="mvn:org.talend.libraries/geronimo-stax-api_1.0_spec-1.0.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/geronimo-stax-api_1.0_spec-1.0.1.jar" REQUIRED_IF="(VERSION_2007 == 'true')" BundleID="" />
 			<IMPORT NAME="log4j" MODULE="log4j-1.2.17.jar" MVN="mvn:log4j/log4j/1.2.17" UrlPath="platform:/plugin/org.talend.libraries.apache/lib/log4j-1.2.17.jar" REQUIRED_IF="(VERSION_2007 == 'true')" BundleID="" />
 			<IMPORT NAME="poi" MODULE="poi-4.1.0-20190523141255_modified_talend.jar" MVN="mvn:org.apache.poi/poi/4.1.0-20190523141255_modified_talend" UrlPath="platform:/plugin/org.talend.libraries.excel/lib/poi-4.1.0-20190523141255_modified_talend.jar" REQUIRED_IF="(VERSION_2007 == 'true')" />

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

@@ -161,7 +161,7 @@
 			    REQUIRED_IF="(READ_BY == 'JSONPATH_WITHOUTPUT_LOOP')" />
 
 			<!-- xpath -->
-			<IMPORT NAME="Java_DOM4J_2.1.1" MODULE="dom4j-2.1.1.jar" MVN="mvn:org.dom4j/dom4j/2.1.1" REQUIRED_IF="(READ_BY == 'XPATH')" BundleID="" />
+			<IMPORT NAME="Java_DOM4J2" MODULE="dom4j-2.1.3.jar" MVN="mvn:org.dom4j/dom4j/2.1.3" REQUIRED_IF="(READ_BY == 'XPATH')" BundleID="" />
 			<IMPORT NAME="Java_JAXEN_1.1.6" MODULE="jaxen-1.1.6.jar" MVN="mvn:jaxen/jaxen/1.1.6" REQUIRED_IF="(READ_BY == 'XPATH')" BundleID="" />
 			<IMPORT NAME="json-lib" MODULE="json-lib-2.4.5-talend.jar" MVN="mvn:net.sf.json-lib/json-lib/2.4.5-talend" REQUIRED_IF="(READ_BY == 'XPATH')" />
 			<IMPORT NAME="commons_lang" MODULE="commons-lang-2.6.jar" MVN="mvn:commons-lang/commons-lang/2.6"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang-2.6.jar"

main/plugins/org.talend.designer.components.localprovider/components/tFileInputMSXML/tFileInputMSXML_java.xml

@@ -82,7 +82,7 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="Java_DOM4J_2.1.1" MODULE="dom4j-2.1.1.jar" MVN="mvn:org.dom4j/dom4j/2.1.1" REQUIRED="true" BundleID="" />
+			<IMPORT NAME="Java_DOM4J2" MODULE="dom4j-2.1.3.jar" MVN="mvn:org.dom4j/dom4j/2.1.3" REQUIRED="true" BundleID="" />
 			<IMPORT NAME="Java_JAXEN_1.1.6" MODULE="jaxen-1.1.6.jar" MVN="mvn:jaxen/jaxen/1.1.6" REQUIRED="true" BundleID="" />
 			<IMPORT NAME="Java_talendSAX" MODULE="TalendSAX-1.0.1-20190326.jar" MVN="mvn:org.talend.libraries/TalendSAX/1.0.1-20190326"  UrlPath="platform:/plugin/org.talend.libraries.xml/lib/TalendSAX-1.0.1-20190326.jar"
 				REQUIRED="true" />

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

@@ -138,9 +138,11 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="Java_DOM4J_2.1.1" MODULE="dom4j-2.1.1.jar" MVN="mvn:org.dom4j/dom4j/2.1.1" BundleID="org.apache.servicemix.bundles.dom4j" REQUIRED_IF="GENERATION_MODE == 'DOM4J'" />
+			<IMPORT NAME="Java_DOM4J2" MODULE="dom4j-2.1.3.jar" MVN="mvn:org.dom4j/dom4j/2.1.3" BundleID="org.apache.servicemix.bundles.dom4j" REQUIRED_IF="GENERATION_MODE == 'DOM4J'" />
 			<IMPORT NAME="Java_JAXEN_1.1.6" MODULE="jaxen-1.1.6.jar" MVN="mvn:jaxen/jaxen/1.1.6" BundleID="org.apache.servicemix.bundles.jaxen" REQUIRED_IF="GENERATION_MODE == 'DOM4J'" />
-			<IMPORT NAME="Java_xercesImpl" MODULE="xercesImpl.jar" MVN="mvn:org.talend.libraries/xercesImpl/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.xml/lib/xercesImpl.jar"
+			<IMPORT NAME="xercesImpl-2.12.0" MODULE="xercesImpl-2.12.0.jar" MVN="mvn:xerces/xercesImpl/2.12.0"
+				REQUIRED_IF="(GENERATION_MODE == 'XERCES') OR (GENERATION_MODE == 'SAX')" BundleID="" />
+			<IMPORT NAME="xml-apis-1.4.01" MODULE="xml-apis-1.4.01.jar" MVN="mvn:xml-apis/xml-apis/1.4.01" 
 				REQUIRED_IF="(GENERATION_MODE == 'XERCES') OR (GENERATION_MODE == 'SAX')" BundleID="" />
 			<IMPORT NAME="Java_xalan" MODULE="xalan-2.7.2.jar" MVN="mvn:xalan/xalan/2.7.2" REQUIRED_IF="GENERATION_MODE == 'XERCES'" BundleID="" />
 			<IMPORT NAME="Java_talendSAX" MODULE="TalendSAX-1.0.1-20190326.jar" MVN="mvn:org.talend.libraries/TalendSAX/1.0.1-20190326"  UrlPath="platform:/plugin/org.talend.libraries.xml/lib/TalendSAX-1.0.1-20190326.jar"

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

@@ -229,7 +229,7 @@
       <IMPORT NAME="Java_Excel" MODULE="jxl.jar" MVN="mvn:org.talend.libraries/jxl/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.jexcel/lib/jxl.jar" REQUIRED_IF="(VERSION_2007 == 'false')" />
       <IMPORT NAME="TALEND_EXCEL" MODULE="talendExcel-1.5-20190731.jar" MVN="mvn:org.talend.libraries/talendExcel-1.5-20190731/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.excel/lib/talendExcel-1.5-20190731.jar" REQUIRED_IF="(VERSION_2007 == 'true')" />
       <IMPORT NAME="commons-lang3" MODULE="commons-lang3-3.8.1.jar" MVN="mvn:org.apache.commons/commons-lang3/3.8.1" REQUIRED_IF="(VERSION_2007 == 'true')" />
-      <IMPORT NAME="dom4j" MODULE="dom4j-2.1.1.jar" MVN="mvn:org.dom4j/dom4j/2.1.1" REQUIRED_IF="(VERSION_2007 == 'true')" BundleID="" />
+      <IMPORT NAME="Java_DOM4J2" MODULE="dom4j-2.1.3.jar" MVN="mvn:org.dom4j/dom4j/2.1.3" REQUIRED_IF="(VERSION_2007 == 'true')" BundleID="" />
       <IMPORT NAME="geronimo-stax-api" MODULE="geronimo-stax-api_1.0_spec-1.0.1.jar" MVN="mvn:org.talend.libraries/geronimo-stax-api_1.0_spec-1.0.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/geronimo-stax-api_1.0_spec-1.0.1.jar" REQUIRED_IF="(VERSION_2007 == 'true')" BundleID="" />
       <IMPORT NAME="log4j" MODULE="log4j-1.2.17.jar" MVN="mvn:log4j/log4j/1.2.17"  UrlPath="platform:/plugin/org.talend.libraries.apache/lib/log4j-1.2.17.jar" REQUIRED_IF="(VERSION_2007 == 'true')" BundleID="" />
       <IMPORT NAME="poi" MODULE="poi-4.1.0-20190523141255_modified_talend.jar" MVN="mvn:org.apache.poi/poi/4.1.0-20190523141255_modified_talend" UrlPath="platform:/plugin/org.talend.libraries.excel/lib/poi-4.1.0-20190523141255_modified_talend.jar" REQUIRED_IF="(VERSION_2007 == 'true')" />

main/plugins/org.talend.designer.components.localprovider/components/tFileOutputMSXML/tFileOutputMSXML_java.xml

@@ -124,7 +124,7 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="Java_DOM4J_2.1.1" MODULE="dom4j-2.1.1.jar" MVN="mvn:org.dom4j/dom4j/2.1.1" REQUIRED="true" BundleID="" />
+			<IMPORT NAME="Java_DOM4J2" MODULE="dom4j-2.1.3.jar" MVN="mvn:org.dom4j/dom4j/2.1.3" REQUIRED="true" BundleID="" />
 			<IMPORT NAME="Java_JAXEN_1.1.6" MODULE="jaxen-1.1.6.jar" MVN="mvn:jaxen/jaxen/1.1.6" REQUIRED="true" BundleID="" />
 			<IMPORT NAME="Java_xmlUtil" MODULE="xmlUtil.jar" MVN="mvn:org.talend.libraries/xmlUtil/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.xml/lib/xmlUtil.jar"
 				REQUIRED="true" />

main/plugins/org.talend.designer.components.localprovider/components/tFileOutputXML/tFileOutputXML_java.xml

@@ -134,7 +134,7 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="dom4j-2.1.1" MODULE="dom4j-2.1.1.jar" MVN="mvn:org.dom4j/dom4j/2.1.1" REQUIRED="true" BundleID="" />
+			<IMPORT NAME="Java_DOM4J2" MODULE="dom4j-2.1.3.jar" MVN="mvn:org.dom4j/dom4j/2.1.3" REQUIRED="true" BundleID="" />
 		</IMPORTS>
 	</CODEGENERATION>
 

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

@@ -82,7 +82,6 @@ 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,7 +94,6 @@ imports="
                                     countSum_<%=cid%> += (countEach_<%=cid%> < 0 ? 0 : countEach_<%=cid%>);
                                 }
                             }
-                            rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
                         }catch (java.sql.BatchUpdateException e){
                             <%
                             if(("true").equals(dieOnError)) {
@@ -119,7 +118,6 @@ 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%>;
@@ -154,12 +152,10 @@ imports="
             <%
             if(!("").equals(commitEvery) && !("0").equals(commitEvery)) {
                 %>
-            if (commitCounter_<%=cid%> > 0 && rowsToCommitCount_<%=cid%> != 0) {
-                <%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
+            if (commitCounter_<%=cid%> > 0) {
+				<%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
                 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,9 +161,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                     %>
                        try {
                            <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                           int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                           insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                           rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                           insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                            nb_line_<%=cid%>++;
                            <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                        } catch(java.lang.Exception e) {
@@ -268,9 +266,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                         %>
                            try {
                                <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                               int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                               updatedCount_<%=cid%> += processedCount_<%=cid%>;
-                               rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                               updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                                nb_line_<%=cid%>++;
                                <%dbLog.data().updating(dbLog.var("nb_line"));%>
                            } catch(java.lang.Exception e) {
@@ -392,9 +388,7 @@ skeleton="../templates/db_output_bulk.skeleton"
     			%>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    int processedCount_<%=cid%> = pstmtUpdate_<%=cid %>.executeUpdate();
-                    updatedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmtUpdate_<%=cid %>.executeUpdate();
                     nb_line_<%=cid%>++;
         			<%dbLog.data().updating(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -456,9 +450,7 @@ skeleton="../templates/db_output_bulk.skeleton"
     			%>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
-                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -557,7 +549,6 @@ 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) {
             	<%
@@ -588,9 +579,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                 }
         		%>
                 	<%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                	int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
-                	insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                	rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                	insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
                 	nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
     			}else{
@@ -686,9 +675,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                     %>
                        try {
                            <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                           int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                           deletedCount_<%=cid%> += processedCount_<%=cid%>;
-                           rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                           deletedCount_<%=cid%> = deletedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                            nb_line_<%=cid%>++;
                            <%dbLog.data().deleting(dbLog.var("nb_line"));%>
                        } catch(java.lang.Exception e) {
@@ -790,7 +777,6 @@ 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%>;
@@ -824,7 +810,6 @@ 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)) {
 	                    %>
@@ -852,7 +837,6 @@ 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%>;
@@ -874,12 +858,10 @@ skeleton="../templates/db_output_bulk.skeleton"
                 }
                 <%
                 }%>
-                if(rowsToCommitCount_<%=cid%> != 0){
-                	<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
-                	conn_<%=cid%>.commit();
-                	<%dbLog.commit().commitDone(null);%>
-                	rowsToCommitCount_<%=cid%> = 0;
-                }
+                
+                <%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
+                conn_<%=cid%>.commit();
+                <%dbLog.commit().commitDone(null);%>
                 commitCounter_<%=cid%>=0;
             }
             <%

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

@@ -204,9 +204,9 @@
 			<!-- 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="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="httpclient-4.5.12" MODULE="httpclient-4.5.12.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.12" REQUIRED="true" />
+			<IMPORT NAME="httpcore-4.4.13" MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" REQUIRED="true" />
+			<IMPORT NAME="commons-codec-1.14" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" 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="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />

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

@@ -122,9 +122,9 @@
 			<!-- 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="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="httpclient-4.5.12" MODULE="httpclient-4.5.12.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.12" REQUIRED="true" />
+			<IMPORT NAME="httpcore-4.4.13" MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" REQUIRED="true" />
+			<IMPORT NAME="commons-codec-1.14" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" 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="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />

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

@@ -123,9 +123,9 @@
 			<!-- 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="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="httpclient-4.5.12" MODULE="httpclient-4.5.12.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.12" REQUIRED="true" />
+			<IMPORT NAME="httpcore-4.4.13" MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" REQUIRED="true" />
+			<IMPORT NAME="commons-codec-1.14" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" 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="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />

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

@@ -127,9 +127,9 @@
 			<!-- 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="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="httpclient-4.5.12" MODULE="httpclient-4.5.12.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.12" REQUIRED="true" />
+			<IMPORT NAME="httpcore-4.4.13" MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" REQUIRED="true" />
+			<IMPORT NAME="commons-codec-1.14" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" 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="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />

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

@@ -77,9 +77,9 @@
 			<!-- 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="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="httpclient-4.5.12" MODULE="httpclient-4.5.12.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.12" REQUIRED="true" />
+			<IMPORT NAME="httpcore-4.4.13" MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" REQUIRED="true" />
+			<IMPORT NAME="commons-codec-1.14" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" 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')" />

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

@@ -192,9 +192,9 @@
 			<!-- 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="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="httpclient-4.5.12" MODULE="httpclient-4.5.12.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.12" REQUIRED="true" />
+			<IMPORT NAME="httpcore-4.4.13" MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" REQUIRED="true" />
+			<IMPORT NAME="commons-codec-1.14" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" 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="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />

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

@@ -193,9 +193,9 @@
 			<!-- 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="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="httpclient-4.5.12" MODULE="httpclient-4.5.12.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.12" REQUIRED="true" />
+			<IMPORT NAME="httpcore-4.4.13" MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" REQUIRED="true" />
+			<IMPORT NAME="commons-codec-1.14" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" 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="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />

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

@@ -231,9 +231,9 @@
 			<!-- 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="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="httpclient-4.5.12" MODULE="httpclient-4.5.12.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.12" REQUIRED="true" />
+			<IMPORT NAME="httpcore-4.4.13" MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" REQUIRED="true" />
+			<IMPORT NAME="commons-codec-1.14" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" 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="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />

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

@@ -193,9 +193,9 @@
 			<!-- 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="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="httpclient-4.5.12" MODULE="httpclient-4.5.12.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.12" REQUIRED="true" />
+			<IMPORT NAME="httpcore-4.4.13" MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" REQUIRED="true" />
+			<IMPORT NAME="commons-codec-1.14" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" 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="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />

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

@@ -165,9 +165,9 @@
 			<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="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="httpclient-4.5.12" MODULE="httpclient-4.5.12.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.12" REQUIRED="true" />
+			<IMPORT NAME="httpcore-4.4.13" MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" REQUIRED="true" />
+			<IMPORT NAME="commons-codec-1.14" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" 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="(USE_EXISTING_CONNECTION == 'false') AND (AUTH_TYPE == 'SERVICE_ACCOUNT')" />

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

@@ -155,7 +155,6 @@ 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,7 +118,6 @@ 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,12 +151,10 @@ imports="
 		if(!("").equals(commitEvery) && !("0").equals(commitEvery))
 		{
 			%>
-		if (commitCounter_<%=cid%> > 0 && rowsToCommitCount_<%=cid%> != 0) {
-			<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
-			conn_<%=cid%>.commit();
+		if (commitCounter_<%=cid%> > 0) {
+			<%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
+		    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,9 +139,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                }else{
                     %>
                         try {
-                            int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                            insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                            rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                            insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                             nb_line_<%=cid%>++;
                             <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                         } catch(java.lang.Exception e) {
@@ -228,9 +226,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                }else{
                     %>
                     try {
-                        int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                        updatedCount_<%=cid%> += processedCount_<%=cid%>;
-                        rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                        updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                         nb_line_<%=cid%>++;
                         <%dbLog.data().updating(dbLog.var("nb_line"));%>
                     } catch(java.lang.Exception e) {
@@ -338,9 +334,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                 }
                 %>
                 try {
-                    int processedCount_<%=cid%> = pstmtUpdate_<%=cid %>.executeUpdate();
-                    updatedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmtUpdate_<%=cid %>.executeUpdate();
                     nb_line_<%=cid%>++;
                     <%dbLog.data().updating(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -391,9 +385,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                 }
                 %>
                 try {
-                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
-                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -477,7 +469,6 @@ 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;
@@ -491,9 +482,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                     }
                 }
                 %>
-                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
-                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 }else{
@@ -573,9 +562,7 @@ skeleton="../templates/db_output_bulk.skeleton"
               }else{
                     %>
                     try {
-                        int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                        deletedCount_<%=cid%> += processedCount_<%=cid%>;
-                        rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                        deletedCount_<%=cid%> = deletedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                         nb_line_<%=cid%>++;
                         <%dbLog.data().deleting(dbLog.var("nb_line"));%>
                     } catch(java.lang.Exception e) {
@@ -675,7 +662,6 @@ 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%>;
@@ -709,7 +695,6 @@ 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)) {
 	                    %>
@@ -737,7 +722,6 @@ 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%>;
@@ -760,12 +744,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                 <%
                 }%>
                 
-                if(rowsToCommitCount_<%=cid%> != 0){
-                	<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
-                	conn_<%=cid%>.commit();
-                	<%dbLog.commit().commitDone(null);%>
-                	rowsToCommitCount_<%=cid%> = 0;
-                }
+                <%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
+                conn_<%=cid%>.commit();
+                <%dbLog.commit().commitDone(null);%>
                 commitCounter_<%=cid%>=0;
             }
             <%

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

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

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

@@ -285,7 +285,6 @@ bw_<%=cid%>.write("!set showHeader false\n");
             org.jets3t.service.security.GSCredentials credentials_<%=cid%> = new org.jets3t.service.security.GSCredentials(<%=accessKey%>,decryptedPassword_<%=cid%>);
 
             service_<%=cid%> = new org.jets3t.service.impl.rest.httpclient.GoogleStorageService(credentials_<%=cid%>," <%=GoogleTracker%>",null);
-            service_<%=cid%>.getAccountOwner();
 
             java.util.regex.Matcher m = org.talend.bigdata.launcher.google.dataproc.DataprocJobUtil.GS_URI_PATTERN.matcher(<%=gsTempDir%>);
             if (m.find()) {

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

@@ -102,7 +102,6 @@ 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,7 +103,6 @@ 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)) {
@@ -149,13 +148,9 @@ imports="
 <%
 if(!useExistingConnection && useTransaction && !("").equals(commitEvery)&&!("0").equals(commitEvery)){
     %>
-		if(rowsToCommitCount_<%=cid%> != 0){
-			<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
-			conn_<%=cid%>.commit();
-			<%dbLog.commit().commitDone(null);%>
-			rowsToCommitCount_<%=cid%> = 0;
-			commitCounter_<%=cid%> = 0;
-		}
+		<%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
+        conn_<%=cid%>.commit();
+		<%dbLog.commit().commitDone(null);%>
     <%
 }
 if (!useExistingConnection) {

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

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

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

@@ -78,7 +78,6 @@ 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,7 +131,6 @@ 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,12 +150,10 @@ imports="
     if(!useExistingConnection) {
         if(!("").equals(commitEvery)&&!("0").equals(commitEvery)){
             %>
-        if (commitCounter_<%=cid%> > 0 && rowsToCommitCount_<%=cid%> != 0) {
-            <%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
+        if (commitCounter_<%=cid%> > 0) {
+            <%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
             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,9 +158,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                     %>
                       try {
                           <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                          int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                          insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                          rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                          insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                           nb_line_<%=cid%>++;
                           <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                       } catch(java.lang.Exception e) {
@@ -264,9 +262,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                     %>
                       try {
                           <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                          int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                          updatedCount_<%=cid%> += processedCount_<%=cid%>;
-                          rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                          updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                           nb_line_<%=cid%>++;
                           <%dbLog.data().updating(dbLog.var("nb_line"));%>
                       } catch(java.lang.Exception e) {
@@ -386,9 +382,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                 %>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    int processedCount_<%=cid%> = pstmtUpdate_<%=cid %>.executeUpdate();
-                    updatedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmtUpdate_<%=cid %>.executeUpdate();
                     nb_line_<%=cid%>++;
                     <%dbLog.data().updating(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -450,9 +444,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                 %>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
-                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -551,7 +543,6 @@ 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) {
@@ -581,9 +572,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                 }
                 %>
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
-                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 }else{
@@ -678,9 +667,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                     %>
                        try {
                            <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                           int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                           deletedCount_<%=cid%> += processedCount_<%=cid%>;
-                           rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                           deletedCount_<%=cid%> = deletedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                            nb_line_<%=cid%>++;
                            <%dbLog.data().deleting(dbLog.var("nb_line"));%>
                        } catch(java.lang.Exception e) {
@@ -780,7 +767,6 @@ 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%>;
@@ -814,7 +800,6 @@ 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)) {
 	                    %>
@@ -842,7 +827,6 @@ 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%>;
@@ -864,12 +848,10 @@ skeleton="../templates/db_output_bulk.skeleton"
                 }
                 <%
                 }%>
-                if(rowsToCommitCount_<%=cid%> != 0){
-                	<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
-                	conn_<%=cid%>.commit();
-                	<%dbLog.commit().commitDone(null);%>
-                	rowsToCommitCount_<%=cid%> = 0;
-                }
+                
+                <%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
+                conn_<%=cid%>.commit();
+                <%dbLog.commit().commitDone(null);%>
                 commitCounter_<%=cid%>=0;
             }
             <%

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

@@ -78,7 +78,6 @@ 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,7 +116,6 @@ 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%>;
@@ -148,12 +147,10 @@ imports="
     if(!useExistingConnection){
         if(!("").equals(commitEvery)&&!("0").equals(commitEvery)){
             %>
-        if (commitCounter_<%=cid%> > 0 && rowsToCommitCount_<%=cid%> != 0) {
-            <%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
+        if (commitCounter_<%=cid%> > 0) {
+            <%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
             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,9 +153,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                     %>
                        try {
                            <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                           int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                           insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                           rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                           insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                            nb_line_<%=cid%>++;
                            <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                        } catch(java.lang.Exception e) {
@@ -256,9 +254,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                     %>
                        try {
                            <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                           int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                           updatedCount_<%=cid%> += processedCount_<%=cid%>;
-                           rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                           updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                            nb_line_<%=cid%>++;
                         <%dbLog.data().updating(dbLog.var("nb_line"));%>
                        } catch(java.lang.Exception e) {
@@ -377,9 +373,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                 %>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    int processedCount_<%=cid%> = pstmtUpdate_<%=cid %>.executeUpdate();
-                    updatedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmtUpdate_<%=cid %>.executeUpdate();
                     nb_line_<%=cid%>++;
                     <%dbLog.data().updating(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -441,9 +435,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                 %>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
-                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -540,7 +532,6 @@ 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) {
@@ -570,9 +561,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                 }
                 %>
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
-                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 }else{
@@ -663,9 +652,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                     %>
                        try {
                            <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                           int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                           deletedCount_<%=cid%> += processedCount_<%=cid%>;
-                           rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                           deletedCount_<%=cid%> = deletedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                            nb_line_<%=cid%>++;
                            <%dbLog.data().deleting(dbLog.var("nb_line"));%>
                        } catch(java.lang.Exception e) {
@@ -766,7 +753,6 @@ 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%>;
@@ -801,7 +787,6 @@ 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)) {
                         %>
@@ -829,7 +814,6 @@ 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%>;
@@ -851,12 +835,10 @@ skeleton="../templates/db_output_bulk.skeleton"
                 }
                 <%
                 }%>
-                if(rowsToCommitCount_<%=cid%> != 0){
-                	<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
-                	conn_<%=cid%>.commit();
-                	<%dbLog.commit().commitDone(null);%>
-                	rowsToCommitCount_<%=cid%> = 0;
-                }
+                
+                <%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
+                conn_<%=cid%>.commit();
+                <%dbLog.commit().commitDone(null);%>
                 commitCounter_<%=cid%>=0;
             }
             <%

main/plugins/org.talend.designer.components.localprovider/components/tJavaDBOutput/tJavaDBOutput_begin.javajet

@@ -174,7 +174,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;
 

main/plugins/org.talend.designer.components.localprovider/components/tJavaDBOutput/tJavaDBOutput_end.javajet

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

main/plugins/org.talend.designer.components.localprovider/components/tJavaDBOutput/tJavaDBOutput_main.javajet

@@ -126,9 +126,7 @@ skeleton="../templates/db_output_bulk.skeleton"
             %>
             try {
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                 nb_line_<%=cid%>++;
                 <%dbLog.data().inserting(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
@@ -202,9 +200,7 @@ skeleton="../templates/db_output_bulk.skeleton"
             %>
             try {
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                updatedCount_<%=cid%> += processedCount_<%=cid%>;
-                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                 nb_line_<%=cid%>++;
                 <%dbLog.data().updating(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
@@ -296,9 +292,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                 %>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    int processedCount_<%=cid%> = pstmtUpdate_<%=cid %>.executeUpdate();
-                    updatedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmtUpdate_<%=cid %>.executeUpdate();
                     nb_line_<%=cid%>++;
         			<%dbLog.data().updating(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -360,9 +354,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                 %>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
-                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -450,7 +442,6 @@ skeleton="../templates/db_output_bulk.skeleton"
 					<%dbLog.data().updating(dbLog.var("nb_line"));%>
                 }
                 updatedCount_<%=cid%> = updatedCount_<%=cid%>+updateFlag_<%=cid%>;
-                rowsToCommitCount_<%=cid%> += updateFlag_<%=cid%>;
             } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
                 <%
@@ -512,9 +503,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                 %>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
-                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
                     nb_line_<%=cid%>++;
                 	<%dbLog.data().inserting(dbLog.var("nb_line"));%>   
                 } catch(java.lang.Exception e) {
@@ -577,9 +566,7 @@ skeleton="../templates/db_output_bulk.skeleton"
             %>
             try {
             	<%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-            	int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-            	deletedCount_<%=cid%> += processedCount_<%=cid%>;
-            	rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                deletedCount_<%=cid%> = deletedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
             	nb_line_<%=cid%>++;
                 <%dbLog.data().deleting(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
@@ -648,12 +635,9 @@ skeleton="../templates/db_output_bulk.skeleton"
             commitCounter_<%=cid%>++;
             
             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;
-            	}
+            	<%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
+                conn_<%=cid%>.commit();
+            	<%dbLog.commit().commitDone(null);%>
                 commitCounter_<%=cid%>=0;
             
             }

main/plugins/org.talend.designer.components.localprovider/components/tMSSqlOutput/tMSSqlOutput_begin.javajet

@@ -94,7 +94,6 @@ 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/tMSSqlOutput/tMSSqlOutput_end.javajet

@@ -98,7 +98,7 @@ skeleton="../templates/db_output_bulk.skeleton"
 		isSpecifyIdentityKey = false;
 	}
     String identityKey = ElementParameterParser.getValue(node, "__IDENTITY_FIELD__");
-	if(identityInsert && useExistingConnection) {
+	if(identityInsert && useExistingConnection ) {
         %>
 		if ( isShareIdentity_<%=cid%> ) {
 			String setIdentityInsertONSQL_<%=cid%> = "SET IDENTITY_INSERT ["+ tableName_<%=cid%> +"] ON";
@@ -379,9 +379,7 @@ skeleton="../templates/db_output_bulk.skeleton"
 
 		    row2Count<%=cid%>++;
 		}
-		int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-		insertedCount_<%=cid%> += processedCount_<%=cid%>;
-		rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+		insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
 		}
    <% }else {
    %>
@@ -398,7 +396,6 @@ skeleton="../templates/db_output_bulk.skeleton"
 								}
 								countSum_<%=cid%> += countEach_<%=cid%>;
 							}
-							rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
 							<%dbLog.batch().executeDone(dbLog.str(dataAction));%>
 						}
             	    	<%if (("INSERT").equals(dataAction)) {
@@ -425,7 +422,6 @@ 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%>;
@@ -482,13 +478,9 @@ if(identityInsert){
         if(!("").equals(commitEvery) && !("0").equals(commitEvery))
         {
             %>
-            if(rowsToCommitCount_<%=cid%> != 0){
-            	<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
-            	conn_<%=cid%>.commit();
-            	<%dbLog.commit().commitDone(null);%>
-            	rowsToCommitCount_<%=cid%> = 0;
-            	commitCounter_<%=cid%> = 0;
-            }
+            <%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
+            conn_<%=cid%>.commit();
+			<%dbLog.commit().commitDone(null);%>
             <%
         }
 

main/plugins/org.talend.designer.components.localprovider/components/tMSSqlOutput/tMSSqlOutput_main.javajet

@@ -604,9 +604,7 @@ if(incomingConnName != null && columnList != null){
 %>
                 nb_line_<%=cid%>++;
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                 <%dbLog.data().inserting(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
@@ -728,9 +726,7 @@ if(incomingConnName != null && columnList != null){
 				}
 		%>
 		                if(rowCount<%=cid%> == <%=batchSize%>){
-		                    int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-		                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
-		                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+		                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
 		                    sInsertColValueList<%=cid%>.clear();
 		                    rowCount<%=cid%> = 0;
 		                    counter<%=cid%>=1;
@@ -855,10 +851,8 @@ if(incomingConnName != null && columnList != null){
 %>
                 nb_line_<%=cid%>++;
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                updatedCount_<%=cid%> += processedCount_<%=cid%>;
-                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
-                <%dbLog.data().updating(dbLog.var("nb_line"));%>
+                updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
+        	    <%dbLog.data().updating(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
                 <%
@@ -1027,9 +1021,7 @@ if(incomingConnName != null && columnList != null){
 				}//end issue0010403 date type
 %>
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    int processedCount_<%=cid%> = pstmtUpdate_<%=cid %>.executeUpdate();
-                    updatedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmtUpdate_<%=cid %>.executeUpdate();
                     nb_line_<%=cid%>++;
         			<%dbLog.data().updating(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -1121,9 +1113,7 @@ if(incomingConnName != null && columnList != null){
 				}//end issue0010403 date type
 %>
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
-                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -1270,7 +1260,6 @@ if(incomingConnName != null && columnList != null){
 %>
                 updateFlag_<%=cid%>=pstmtUpdate_<%=cid %>.executeUpdate();
                 updatedCount_<%=cid%> = updatedCount_<%=cid%>+updateFlag_<%=cid%>;
-                rowsToCommitCount_<%=cid%> += updateFlag_<%=cid%>;
             if(updateFlag_<%=cid%> == 0) {
             	<%
             	if(isEnableDebug) {
@@ -1316,13 +1305,12 @@ if(incomingConnName != null && columnList != null){
                     <%
                 }
                 %>
-                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
-                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
-                    nb_line_<%=cid%>++;
+                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
+					nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
     			}else{
     				nb_line_<%=cid%>++;
+    				
     				<%dbLog.data().updating(dbLog.var("nb_line"));%>
     			}
                 } catch(java.lang.Exception e) {
@@ -1429,9 +1417,7 @@ if(incomingConnName != null && columnList != null){
 				}//end issue0010403 date type
 %>
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                deletedCount_<%=cid%> += processedCount_<%=cid%>;
-                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                deletedCount_<%=cid%> = deletedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                 nb_line_<%=cid%>++;
                 <%dbLog.data().deleting(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
@@ -1550,9 +1536,7 @@ if(incomingConnName != null && columnList != null){
 				}//end issue0010403 date type
 %>
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
-                insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
                 nb_line_<%=cid%>++;
                 <%dbLog.data().inserting(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
@@ -1695,17 +1679,14 @@ if(incomingConnName != null && columnList != null){
     		            <%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%>;
             	    	<%
             	    	}%>
     			
@@ -1744,13 +1725,10 @@ if(incomingConnName != null && columnList != null){
         <%
         }
         %>
-                if(rowsToCommitCount_<%=cid%> != 0){
-                	<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
+                	<%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
                 	conn_<%=cid%>.commit();
-                	<%dbLog.commit().commitDone(null);%>
-                	rowsToCommitCount_<%=cid%> = 0;	
-                }
-                commitCounter_<%=cid%>=0;
+            		<%dbLog.commit().commitDone(null);%>
+                	commitCounter_<%=cid%>=0;
                 }
                 <%
     		}

main/plugins/org.talend.designer.components.localprovider/components/tMaxDBOutput/tMaxDBOutput_begin.javajet

@@ -93,7 +93,6 @@ 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;

main/plugins/org.talend.designer.components.localprovider/components/tMaxDBOutput/tMaxDBOutput_end.javajet

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

main/plugins/org.talend.designer.components.localprovider/components/tMaxDBOutput/tMaxDBOutput_main.javajet

@@ -131,9 +131,7 @@ skeleton="../templates/db_output_bulk.skeleton"
     		%>
             try {
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                 nb_line_<%=cid%>++;
                 <%dbLog.data().inserting(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
@@ -220,9 +218,7 @@ skeleton="../templates/db_output_bulk.skeleton"
     		%>
             try {
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                updatedCount_<%=cid%> += processedCount_<%=cid%>;
-                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                 nb_line_<%=cid%>++;
                 <%dbLog.data().updating(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
@@ -338,9 +334,7 @@ skeleton="../templates/db_output_bulk.skeleton"
     			%>
                 try {
         			<%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-        			int processedCount_<%=cid%> = pstmtUpdate_<%=cid %>.executeUpdate();
-        			updatedCount_<%=cid%> += processedCount_<%=cid%>;
-        			rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+        			updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmtUpdate_<%=cid %>.executeUpdate();
         			nb_line_<%=cid%>++;
         			<%dbLog.data().updating(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -399,9 +393,7 @@ skeleton="../templates/db_output_bulk.skeleton"
     			%>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
-                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
                     nb_line_<%=cid%>++;
 					<%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -495,7 +487,6 @@ skeleton="../templates/db_output_bulk.skeleton"
             try {
                 updateFlag_<%=cid%> = pstmtUpdate_<%=cid %>.executeUpdate();
                 updatedCount_<%=cid%> = updatedCount_<%=cid%> + updateFlag_<%=cid%>;
-                rowsToCommitCount_<%=cid%> += updateFlag_<%=cid%>;
             } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
                 <%
@@ -555,9 +546,7 @@ skeleton="../templates/db_output_bulk.skeleton"
         		%>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
-                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -636,9 +625,7 @@ skeleton="../templates/db_output_bulk.skeleton"
     		%>
             try {
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                deletedCount_<%=cid%> += processedCount_<%=cid%>;
-                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                deletedCount_<%=cid%> = deletedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                 nb_line_<%=cid%>++;
 				<%dbLog.data().deleting(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
@@ -703,14 +690,14 @@ skeleton="../templates/db_output_bulk.skeleton"
             commitCounter_<%=cid%>++;
             
             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;
-            	}
+            
+            	<%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
+            	conn_<%=cid%>.commit();
+            	<%dbLog.commit().commitDone(null);%>
+            	
             	commitCounter_<%=cid%>=0;
-            }
+            
+            }	
     	<%
     	}
     }

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

@@ -27755,9 +27755,9 @@
                     MVN="mvn:org.apache.santuario/xmlsec/2.1.2"
                     REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
                 <IMPORT
-                    NAME="dom4j-2.1.1"
-                    MODULE="dom4j-2.1.1.jar"
-                    MVN="mvn:org.dom4j/dom4j/2.1.1"
+                    NAME="Java_DOM4J2"
+                    MODULE="dom4j-2.1.3.jar"
+                    MVN="mvn:org.dom4j/dom4j/2.1.3"
                     REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')"
                     BundleID="" />
                 <IMPORT

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

@@ -38518,9 +38518,9 @@
                 MVN="mvn:org.apache.santuario/xmlsec/2.1.2"
                 REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
             <IMPORT
-                NAME="dom4j-2.1.1"
-                MODULE="dom4j-2.1.1.jar"
-                MVN="mvn:org.dom4j/dom4j/2.1.1"
+                NAME="Java_DOM4J2"
+                MODULE="dom4j-2.1.3.jar"
+                MVN="mvn:org.dom4j/dom4j/2.1.3"
                 REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')"
                 BundleID="" />
             <IMPORT

main/plugins/org.talend.designer.components.localprovider/components/tMysqlOutput/tMysqlOutput_begin.javajet

@@ -147,7 +147,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/tMysqlOutput/tMysqlOutput_end.javajet

@@ -362,9 +362,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                 %>
 	        }
 	        try{
-	        	int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-	        	insertedCount_<%=cid%> += processedCount_<%=cid%>;
-	        	rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+	        	insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
 	        }catch(java.lang.Exception e){
 	        	<% if(onErrDie){%>
 	       		throw e;
@@ -389,7 +387,6 @@ skeleton="../templates/db_output_bulk.skeleton"
 							for(int countEach_<%=cid%>: pstmt_<%=cid %>.executeBatch()) {
 								countSum_<%=cid%> += (countEach_<%=cid%> == java.sql.Statement.EXECUTE_FAILED ? 0 : 1);
 							}
-							rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
 							<%dbLog.batch().executeDone(dbLog.str(dataAction));%>
 	            	    	<%if (("INSERT").equals(dataAction)) {
 	            	    	%>
@@ -410,7 +407,6 @@ 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%>;
@@ -469,7 +465,6 @@ 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 (("UPDATE").equals(dataAction)) {
 	    	%>
@@ -492,7 +487,6 @@ 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 (("UPDATE").equals(dataAction)) {
     	%>
     	updatedCount_<%=cid%> += countSum_<%=cid%>;
@@ -534,12 +528,10 @@ skeleton="../templates/db_output_bulk.skeleton"
 		if(!("").equals(commitEvery) && !("0").equals(commitEvery))
 		{
     		%>
-    	if (commitCounter_<%=cid%> > 0 && rowsToCommitCount_<%=cid%> != 0) {
-    		<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
+    	if (commitCounter_<%=cid%> > 0) {
+    		<%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
     		conn_<%=cid%>.commit();
     		<%dbLog.commit().commitDone(null);%>
-			rowsToCommitCount_<%=cid%> = 0;
-			commitCounter_<%=cid%> = 0;
     	}
     		<%
 		}

main/plugins/org.talend.designer.components.localprovider/components/tMysqlOutput/tMysqlOutput_main.javajet

@@ -723,9 +723,7 @@ if(columnList != null && columnList.size() > 0) {
 %>
                     if(rowCount<%=cid%> == <%=numPerInsert%>){
                         try{
-                            int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                            insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                            rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                            insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                         }catch(java.lang.Exception e){
                         <% if(onErrDie){%>
                              throw e;
@@ -797,9 +795,7 @@ if(columnList != null && columnList.size() > 0) {
                     try {
                         nb_line_<%=cid%>++;
                         <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                        int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                        insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                        rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                        insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                         <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                     } catch(java.lang.Exception e) {
                         whetherReject_<%=cid%> = true;
@@ -877,9 +873,7 @@ if(columnList != null && columnList.size() > 0) {
                 try {
                     nb_line_<%=cid%>++;
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
                     whetherReject_<%=cid%> = true;
@@ -1007,7 +1001,7 @@ if(columnList != null && columnList.size() > 0) {
             %>
             pstmt_<%=cid %>.addBatch();
             nb_line_<%=cid%>++;
-
+				
 				<%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
                 <%dbLog.data().addingToBatch(dbLog.var("nb_line"), dbLog.str(dataAction));%>
                 <%
@@ -1023,9 +1017,7 @@ if(columnList != null && columnList.size() > 0) {
             try {
                 nb_line_<%=cid%>++;
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                updatedCount_<%=cid%> += processedCount_<%=cid%>;
-                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                 <%dbLog.data().updating(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
@@ -1183,9 +1175,7 @@ if(columnList != null && columnList.size() > 0) {
                 %>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    int processedCount_<%=cid%> = pstmtUpdate_<%=cid %>.executeUpdate();
-                    updatedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmtUpdate_<%=cid %>.executeUpdate();
                     nb_line_<%=cid%>++;
                     <%dbLog.data().updating(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -1257,9 +1247,7 @@ if(columnList != null && columnList.size() > 0) {
                 %>
                 try {
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
-                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
@@ -1391,7 +1379,6 @@ 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) {
 
@@ -1434,9 +1421,7 @@ if(columnList != null && columnList.size() > 0) {
                 }
                 %>
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
-                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 }else{
@@ -1541,9 +1526,7 @@ if(columnList != null && columnList.size() > 0) {
             %>
             try {
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                deletedCount_<%=cid%> += processedCount_<%=cid%>;
-                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                deletedCount_<%=cid%> = deletedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                 nb_line_<%=cid%>++;
                 <%dbLog.data().deleting(dbLog.var("nb_line"));%>
             } catch(java.lang.Exception e) {
@@ -1617,9 +1600,7 @@ if(columnList != null && columnList.size() > 0) {
             int replaceCount_<%=cid%> = 0;
             try {
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                replaceCount_<%=cid%> += processedCount_<%=cid%>;
-                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                replaceCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
                 <%dbLog.data().replacing(null);%>
             } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
@@ -1709,9 +1690,7 @@ if(columnList != null && columnList.size() > 0) {
             int count_on_duplicate_key_<%=cid%> = 0;
             try {
                 <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                count_on_duplicate_key_<%=cid%> += processedCount_<%=cid%>;
-                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                count_on_duplicate_key_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
                 <%dbLog.data().insertingOnDuplicateKeyUpdating(null);%>
             } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
@@ -1782,9 +1761,7 @@ if(columnList != null && columnList.size() > 0) {
                 try {
                     nb_line_<%=cid%>++;
                     <%if(isEnableDebug){dbLog.data().sqlDebugPrint("globalMap.get(\""+cid+"_QUERY\")");}%>
-                    int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                     <%dbLog.data().insertingIgnore(dbLog.var("nb_line"));%>
                 } catch(java.lang.Exception e) {
                     whetherReject_<%=cid%> = true;
@@ -1856,7 +1833,6 @@ if(columnList != null && columnList.size() > 0) {
                         for(int countEach_<%=cid%>: pstmt_<%=cid %>.executeBatch()) {
                             countSum_<%=cid%> += (countEach_<%=cid%> == java.sql.Statement.EXECUTE_FAILED ? 0 : 1);
                         }
-                        rowsToCommitCount_<%=cid%> += countSum_<%=cid%>;
                         <%dbLog.batch().executeDone(dbLog.str(dataAction));%>
                         <%if (("INSERT").equals(dataAction)) {
                         %>
@@ -1875,7 +1851,6 @@ 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%>;
@@ -1908,7 +1883,6 @@ 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)) {
@@ -1932,7 +1906,6 @@ 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)) {%>
@@ -1969,7 +1942,6 @@ 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)) {
                         %>
@@ -1995,7 +1967,6 @@ 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%>;
@@ -2017,12 +1988,9 @@ if(columnList != null && columnList.size() > 0) {
                 }
                 <%
                 }%>
-                    if(rowsToCommitCount_<%=cid%> != 0){
-                        <%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
-                        conn_<%=cid%>.commit();
-                        <%dbLog.commit().commitDone(null);%>
-                        rowsToCommitCount_<%=cid%> = 0;
-                    }
+                    <%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
+                    conn_<%=cid%>.commit();
+                    <%dbLog.commit().commitDone(null);%>
                     commitCounter_<%=cid%>=0;
 
                 }

main/plugins/org.talend.designer.components.localprovider/components/tNetezzaOutput/tNetezzaOutput_begin.javajet

@@ -107,7 +107,6 @@ 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/tNetezzaOutput/tNetezzaOutput_end.javajet

@@ -96,7 +96,6 @@ skeleton="../templates/db_output_bulk.skeleton"
 				pstmt_<%=cid %>.executeBatch();
 				<%dbLog.batch().executeDone(dbLog.str(dataAction));%>
 				pstmt_<%=cid %>.clearBatch();
-				rowsToCommitCount_<%=cid%> += pstmt_<%=cid %>.getUpdateCount();
 		    	<%if (("INSERT").equals(dataAction)) {
 		    	%>
 		    	insertedCount_<%=cid%> +=pstmt_<%=cid %>.getUpdateCount();
@@ -151,12 +150,10 @@ skeleton="../templates/db_output_bulk.skeleton"
 		if(!("").equals(commitEvery) && !("0").equals(commitEvery))
 		{
     		%>
-			if(commitCounter_<%=cid%> > 0 && rowsToCommitCount_<%=cid%> != 0){
-				<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
+			if(commitCounter_<%=cid%> > 0){
+				<%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
 				conn_<%=cid%>.commit();
 				<%dbLog.commit().commitDone(null);%>
-				rowsToCommitCount_<%=cid%> = 0;
-				commitCounter_<%=cid%> = 0;
 			}
     		<%
 		}

main/plugins/org.talend.designer.components.localprovider/components/tNetezzaOutput/tNetezzaOutput_main.javajet

@@ -142,9 +142,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                 <%}else{%>
                 try{
                     nb_line_<%=cid%>++;
-                    int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 }catch(java.lang.Exception e)
                 {
@@ -232,9 +230,7 @@ skeleton="../templates/db_output_bulk.skeleton"
             %>
             try{
                 nb_line_<%=cid%>++;
-                int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-                updatedCount_<%=cid%> += processedCount_<%=cid%>;
-                rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                 <%dbLog.data().updating(dbLog.var("nb_line"));%>
             }catch(java.lang.Exception e)
             {
@@ -344,9 +340,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                 }
                 %>
                 try{
-                    int processedCount_<%=cid%> = pstmtUpdate_<%=cid %>.executeUpdate();
-                    updatedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmtUpdate_<%=cid %>.executeUpdate();
                     nb_line_<%=cid%>++;
                     <%dbLog.data().updating(dbLog.var("nb_line"));%>
                 }catch(java.lang.Exception e)
@@ -400,9 +394,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                 }
                 %>
                 try{
-                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
-                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 }catch(java.lang.Exception e)
@@ -485,7 +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;
@@ -500,9 +492,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                     }
                 }
                 %>
-                    int processedCount_<%=cid%> = pstmtInsert_<%=cid %>.executeUpdate();
-                    insertedCount_<%=cid%> += processedCount_<%=cid%>;
-                    rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
                     nb_line_<%=cid%>++;
                     <%dbLog.data().inserting(dbLog.var("nb_line"));%>
                 }else{
@@ -585,9 +575,7 @@ skeleton="../templates/db_output_bulk.skeleton"
             }else {
             %>
         try{
-            int processedCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-            deletedCount_<%=cid%> += processedCount_<%=cid%>;
-            rowsToCommitCount_<%=cid%> += processedCount_<%=cid%>;
+            deletedCount_<%=cid%> = deletedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
             nb_line_<%=cid%>++;
             <%dbLog.data().deleting(dbLog.var("nb_line"));%>
         }catch(java.lang.Exception e)
@@ -663,7 +651,6 @@ skeleton="../templates/db_output_bulk.skeleton"
                         pstmt_<%=cid %>.executeBatch();
                         <%dbLog.batch().executeDone(dbLog.str(dataAction));%>
                         pstmt_<%=cid %>.clearBatch();
-                        rowsToCommitCount_<%=cid%> += pstmt_<%=cid %>.getUpdateCount();
                         <%
                          if (("INSERT").equals(dataAction)) {
                         %>
@@ -724,7 +711,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                         pstmt_<%=cid %>.executeBatch();
                         <%dbLog.batch().executeDone(dbLog.str(dataAction));%>
                         pstmt_<%=cid %>.clearBatch();
-                        rowsToCommitCount_<%=cid%> += pstmt_<%=cid %>.getUpdateCount();
+          
                         <%if (("INSERT").equals(dataAction)) {
                         %>
                             insertedCount_<%=cid%> += pstmt_<%=cid %>.getUpdateCount();
@@ -765,12 +752,9 @@ skeleton="../templates/db_output_bulk.skeleton"
                 }
                 <%
                 }%>
-                    if(rowsToCommitCount_<%=cid%> != 0){
-                    	<%dbLog.commit().commitTry(null, dbLog.var("rowsToCommitCount"));%>
-                    	conn_<%=cid%>.commit();
-                    	<%dbLog.commit().commitDone(null);%>
-                    	rowsToCommitCount_<%=cid%> = 0;
-                    }
+                    <%dbLog.commit().commitTry(null, dbLog.var("commitCounter"));%>
+                    conn_<%=cid%>.commit();
+                    <%dbLog.commit().commitDone(null);%>
                     commitCounter_<%=cid%>=0;
 
                 }

main/plugins/org.talend.designer.components.localprovider/components/tOpenbravoERPInput/tOpenbravoERPInput_java.xml

@@ -10604,7 +10604,7 @@
 
   	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="Java_DOM4J_2.1.1" MODULE="dom4j-2.1.1.jar" MVN="mvn:org.dom4j/dom4j/2.1.1" REQUIRED="true" BundleID="" />
+			<IMPORT NAME="Java_DOM4J2" MODULE="dom4j-2.1.3.jar" MVN="mvn:org.dom4j/dom4j/2.1.3" REQUIRED="true" BundleID="" />
 			<IMPORT NAME="Java_JAXEN_1.1.6" MODULE="jaxen-1.1.6.jar" MVN="mvn:jaxen/jaxen/1.1.6" REQUIRED="true" BundleID="" />
 		</IMPORTS>
 	</CODEGENERATION>