test patch

* Revert "fix(TDI-30522): extra '(' removed. (#5160)"

This reverts commit e06952d023.

* Revert "fix(TDI-30522): backport to "master""

This reverts commit 58fb8847cf.

CONTRIBUTORS.md

@@ -6,4 +6,5 @@ Huge thanks to these people who contributed in making Talend product better:
  - [mrizzato](https://github.com/mrizzato) (Massimiliano Rizzato)
  - [overpackaging](https://github.com/overpackaging) (Steeve Dreux)
  - [brazabr](https://github.com/brazabr) (Thiago Benvenuto)
- - [phoflack](https://jira.talendforge.org/secure/ViewProfile.jspa?name=phoflack) (Philip Hoflack)
+ - [phoflack](https://jira.talendforge.org/secure/ViewProfile.jspa?name=phoflack) (Philip Hoflack)
+ - [bgunics-talend](https://github.com/bgunics-talend) (Balasz Gunics)

i18n/plugins/org.talend.designer.dbmap.nl/src/main/java/messages_en.properties

@@ -157,3 +157,12 @@ DataMapTableView.buttonTooltip.menu.addOtherClauses=Add an other (GROUP...) clau
 ProblemsAnalyser.needAlias.error1=The '{0}' linked table name '{1}' is too complex ,please use alias to generate sql!
 ToolbarOutputZone.widgetTooltip.delimitedIdentifiers=Active me to add double quotes for schemas to support delimited identifiers.
 ToolbarOutputZone.widgetText.delimitedIdentifiers=Delimited identifiers
+ExpressionComposite.expression=Expression
+ExpressionComposite.clear=Clear
+ExpressionBuilderDialog.message=Close without saving
+ExpressionBuilderDialog.Confirm=Do you want to close the Expression Builder without save and lose your changes?
+ExpressionBuilderDialog.ok.button=Ok
+ExpressionBuilderDialog.cancel.button=Cancel
+ExpressionBuilderDialog.expression.builder=Expression Builder
+ExpressionComposite.Wrap=Wrap
+ExpressionComposite.undo=Undo

i18n/plugins/org.talend.repository.nl/src/main/java/messages_en.properties

@@ -704,7 +704,6 @@ GenerateDocAsHTMLWizardPage.OverWrite=Warning:this file already exist,do you wan
 GenerateDocAsHTMLWizardPage.Warning=Warning
 ImportItemUtil.cannotImportMessage=from the project {0} use a more recent version of studio so cannot import it.
 ImportProjectAction.messageDialogContent.projectImportedSuccessfully=Project has been successfully imported in your workspace
-ImportProjectAction.messageDialogTitle.project=Project imported
 StatusDialog.errorMessage.codeLetters1=Code must have 1 to 5 letters.
 JobScriptsExportWizardPage.ApplyContextToChildren=Apply Context to children Jobs
 JobScriptsExportWizardPage.addBuildScripts=Add build script
@@ -1012,3 +1011,6 @@ ReferenceProjectSetupPage.ButtonTooltipStrict=Use strict references to find jobl
 ConnectionsDialog.usernameOrPasswordInvalid=Check your username or password or contact your administrator.
 LoginProjectPage.authorizationErrorMessage=Invalid username or password for the remote connection. Do you want to fix it now?
 LoginProjectPage.errorMessageTitle=Error
+ImportProjectAction.messageDialogTitle.projectFailed=Import failed
+ImportProjectAction.messageDialogContent.projectImportedFailed=Your project cannot be imported because of invalid items.
+ImportProjectAction.messageDialogContent.projectsImportedFailed=Your project(s) <{0}> cannot be imported because of invalid items.

i18n/plugins/org.talend.repository.nl/src/main/java/messages_fr.properties

@@ -704,7 +704,6 @@ GenerateDocAsHTMLWizardPage.OverWrite=Attention : ce fichier existe d\u00E9j\u00
 GenerateDocAsHTMLWizardPage.Warning=Avertissement
 ImportItemUtil.cannotImportMessage=Impossible d'importer le projet {0} car il utilise une version plus r\u00E9cente du studio.
 ImportProjectAction.messageDialogContent.projectImportedSuccessfully=Le projet a bien \u00E9t\u00E9 import\u00E9 dans votre workspace
-ImportProjectAction.messageDialogTitle.project=Projet import\u00E9
 StatusDialog.errorMessage.codeLetters1=Le code doit contenir entre 1 et 5 lettres.
 JobScriptsExportWizardPage.ApplyContextToChildren=Appliquer le contexte aux Jobs fils
 JobScriptsExportWizardPage.addBuildScripts.ant=Ant

i18n/plugins/org.talend.repository.nl/src/main/java/messages_ja.properties

@@ -704,7 +704,6 @@ GenerateDocAsHTMLWizardPage.OverWrite=\u8B66\u544A\uFF1A\u30D5\u30A1\u30A4\u30EB
 GenerateDocAsHTMLWizardPage.Warning=\u8B66\u544A
 ImportItemUtil.cannotImportMessage={0} \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3067\u304D\u307E\u305B\u3093\u3002\u30A4\u30F3\u30DD\u30FC\u30C8\u3059\u308B\u306B\u306F\u3001\u3088\u308A\u65B0\u3057\u3044\u30D0\u30FC\u30B8\u30E7\u30F3\u306E Studio \u304C\u5FC5\u8981\u3067\u3059\u3002
 ImportProjectAction.messageDialogContent.projectImportedSuccessfully=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u304B\u3089\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u306B\u6210\u529F\u3057\u307E\u3057\u305F
-ImportProjectAction.messageDialogTitle.project=\u30A4\u30F3\u30DD\u30FC\u30C8\u6E08\u307F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8
 StatusDialog.errorMessage.codeLetters1=\u30B3\u30FC\u30C9\u306F1\uFF5E5\u6587\u5B57\u3067\u3059\u3002
 JobScriptsExportWizardPage.ApplyContextToChildren=\u5B50\u30B8\u30E7\u30D6\u306B\u5909\u6570\u3092\u9069\u7528
 JobScriptsExportWizardPage.addBuildScripts=\u30B9\u30AF\u30EA\u30D7\u30C8\u3092\u8FFD\u52A0

i18n/plugins/org.talend.repository.nl/src/main/java/messages_zh_CN.properties

@@ -704,7 +704,6 @@ GenerateDocAsHTMLWizardPage.OverWrite=\u8B66\u544A\uFF1A\u6B64\u6587\u4EF6\u5DF2
 GenerateDocAsHTMLWizardPage.Warning=\u8B66\u544A
 ImportItemUtil.cannotImportMessage=\u4ECE\u5DE5\u7A0B {0} \u4F7F\u7528\u4E86\u66F4\u65B0\u7248\u672C\u7684 Studio\uFF0C\u56E0\u6B64\u65E0\u6CD5\u5BFC\u5165\u5B83\u3002
 ImportProjectAction.messageDialogContent.projectImportedSuccessfully=\u5DE5\u7A0B\u5DF2\u7ECF\u88AB\u6210\u529F\u5BFC\u5165\u5230\u60A8\u7684\u5DE5\u4F5C\u533A\u3002
-ImportProjectAction.messageDialogTitle.project=\u5DE5\u7A0B\u5DF2\u5BFC\u5165
 StatusDialog.errorMessage.codeLetters1=\u4EE3\u7801\u5FC5\u987B\u6709 1 \u5230 5 \u4E2A\u5B57\u6BCD\u3002
 JobScriptsExportWizardPage.ApplyContextToChildren=\u5C06\u4E0A\u4E0B\u6587\u5E94\u7528\u4E8E\u5B50\u4F5C\u4E1A
 JobScriptsExportWizardPage.addBuildScripts=\u6DFB\u52A0\u6784\u5EFA\u811A\u672C

main/features/org.talend.tos.libraries.feature/feature.xml

@@ -20,7 +20,6 @@
   <plugin id="org.talend.libraries.apache.chemistry" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.apache.common" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.apache.cxf" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.apache.google" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.apache.http" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.apache.lucene" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.apache.xml" download-size="0" install-size="0" version="0.0.0"/>

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

@@ -50,8 +50,11 @@ List<IConnection> allSubProcessConnection = codeGenArgument.getAllMainSubTreeCon
 String cid = node.getUniqueName();
 
 List<? extends INode> jobCatcherNodes = process.getNodesOfType("tJobStructureCatcher");
-boolean enableLogStash = jobCatcherNodes != null && !jobCatcherNodes.isEmpty();
-boolean logstashCurrent = !cid.startsWith("tJobStructureCatcher") && !cid.startsWith("talend") && enableLogStash;
+boolean jobCatcherExists = jobCatcherNodes != null && !jobCatcherNodes.isEmpty();
+INode jobCatcherNode = jobCatcherExists ? jobCatcherNodes.get(0) : null;
+
+boolean enableLogStash = !Boolean.getBoolean("deactivate_extended_component_log") && jobCatcherExists;
+boolean logstashCurrent = enableLogStash && !cid.startsWith("tJobStructureCatcher") && !cid.startsWith("talend");
 
 if((codePart.equals(ECodePart.END))&&(stat || logstashCurrent)){
 	boolean iterateInVFComp = (node.getVirtualLinkTo() != null && node.getVirtualLinkTo() == EConnectionType.ITERATE);
@@ -164,6 +167,7 @@ if((codePart.equals(ECodePart.END))&&(stat || logstashCurrent)){
     }
    }
   }
+  
   List<IMetadataTable> metadatas = node.getMetadataList();
   if ((!node.isSubProcessStart())&&(NodeUtil.isDataAutoPropagated(node))) {
    if (inputColName!=null) {
@@ -189,6 +193,117 @@ if((codePart.equals(ECodePart.END))&&(stat || logstashCurrent)){
     }
    }
   }
+  
+  //log runtime lineage
+  boolean enable_runtime_lineage_log = NodeUtil.isJobUsingRuntimeLineage(process) && jobCatcherExists && !cid.startsWith("tJobStructureCatcher") && !cid.startsWith("talend");
+  if(enable_runtime_lineage_log) {//}
+  
+  List<? extends IConnection> outConns = node.getOutgoingConnections();
+  if(!outConns.isEmpty()) {
+  %>
+  if(tos_count_<%=node.getUniqueName() %> == 0) {
+  <%
+  //}
+  }
+  
+  for (IConnection conn : outConns) {
+      if(!conn.getLineStyle().equals(EConnectionType.FLOW_MAIN) && !conn.getLineStyle().equals(EConnectionType.FLOW_MERGE) && !conn.getLineStyle().equals(EConnectionType.FLOW_REF)) {
+          continue;
+      }
+      
+      IMetadataTable metadata = conn.getMetadataTable();
+      if (metadata==null) {
+          continue;
+      }
+      
+      List<IMetadataColumn> columns = metadata.getListColumns();
+      
+      if(columns == null || columns.isEmpty()) {
+          continue;
+      }
+      
+      %>
+      
+      class SchemaUtil_<%=conn.getUniqueName()%>_<%=conn.getMetadataTable().getTableName()%> {
+          
+          public java.util.List<java.util.Map<String, String>> getSchema(final <%=NodeUtil.getPrivateConnClassName(conn) %>Struct <%=conn.getName()%>) {
+              java.util.List<java.util.Map<String, String>> schema = new java.util.ArrayList<>();
+              if(<%=conn.getName()%> == null) {
+            	  return schema;
+              }
+              java.util.Map<String, String> field = null;
+          <%
+          for(IMetadataColumn column : columns){
+              if("id_Dynamic".equals(column.getTalendType())) {
+              %>
+              routines.system.Dynamic dynamic = <%=conn.getName()%>.<%=column.getLabel()%>;
+              if(dynamic != null) {
+                  for(routines.system.DynamicMetadata metadata :  dynamic.metadatas) {
+                      field = new java.util.HashMap<>();
+                      field.put("name", metadata.getName());
+                      field.put("origin_name", metadata.getDbName());
+                      field.put("iskey", "" + metadata.isKey());
+                      field.put("talend_type", metadata.getType());
+                      field.put("type", metadata.getDbType());
+                      field.put("nullable", "" + metadata.isNullable());
+                      field.put("pattern", metadata.getFormat());
+                      field.put("length", "" + metadata.getLength());
+                      field.put("precision", "" + metadata.getPrecision());
+                      schema.add(field);
+                  }
+              }
+              
+              <%
+                  continue;
+              }
+              
+              String pattern = column.getPattern();
+              if(pattern == null || pattern.isEmpty() || pattern.equals("\"\"")) {
+                  pattern = "\"\"";
+              }
+              %>
+              field = new java.util.HashMap<>();
+              field.put("name", "<%=column.getLabel()%>");
+              field.put("origin_name", "<%=column.getOriginalDbColumnName()%>");
+              field.put("iskey", "<%=column.isKey()%>");
+              field.put("talend_type", "<%=column.getTalendType()%>");
+              field.put("type", "<%=column.getType()%>");
+              field.put("nullable", "<%=column.isNullable()%>");
+              field.put("pattern", <%=pattern%>);
+              field.put("length", "<%=column.getLength()%>");
+              field.put("precision", "<%=column.getPrecision()%>");
+              schema.add(field);
+          <%
+          }
+          %>
+              return schema;
+          }
+          
+      }
+      
+      java.util.List<java.util.Map<String, String>> schema_<%=conn.getUniqueName()%>_<%=conn.getMetadataTable().getTableName()%> = new SchemaUtil_<%=conn.getUniqueName()%>_<%=conn.getMetadataTable().getTableName()%>().getSchema(<%=conn.getName()%>);
+      <%
+      INode target = conn.getTarget();
+      String targetNodeId = target.getUniqueName();
+      String targetNodeComponent = target.getComponent().getName();
+      
+      %>
+      <%=jobCatcherNode.getUniqueName()%>.addConnectionSchemaMessage("<%=node.getUniqueName()%>","<%=node.getComponent().getName()%>", 
+        "<%=targetNodeId%>","<%=targetNodeComponent%>", "<%=conn.getUniqueName()%>" + iterateId, schema_<%=conn.getUniqueName()%>_<%=conn.getMetadataTable().getTableName()%>);
+      <%=jobCatcherNode.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
+      <%
+  }
+  
+  if(!outConns.isEmpty()) {
+  //{
+  %>
+  }
+  <%
+  }
+  
+  //{
+  }
+
 //======================================TDI-17183 end=====================================
   boolean traceCodeGenerated = false;     
   for (IConnection conn : node.getOutgoingConnections()) {

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

@@ -8,6 +8,9 @@
 		org.talend.core.model.metadata.IMetadataColumn 
 		org.talend.core.model.process.EConnectionType 
         org.talend.core.model.process.ElementParameterParser
+        org.talend.core.model.process.EParameterFieldType
+        org.talend.designer.core.model.components.EParameterName
+        org.talend.designer.core.model.components.ElementParameter
 		org.talend.designer.codegen.config.CodeGeneratorArgument
 		org.talend.core.model.utils.NodeUtil
 		org.talend.core.model.process.IConnectionCategory
@@ -140,10 +143,14 @@
 	connSet.addAll(node.getIncomingConnections(EConnectionType.FLOW_MAIN));
 	connSet.addAll(node.getIncomingConnections(EConnectionType.FLOW_MERGE));
 	
-	List<? extends INode> jobCatcherNodes = node.getProcess().getNodesOfType("tJobStructureCatcher");
-	boolean enableLogStash = jobCatcherNodes != null && !jobCatcherNodes.isEmpty();
 	String cid = node.getUniqueName();
-	boolean logstashCurrent = !cid.startsWith("tJobStructureCatcher") && !cid.startsWith("talend") && enableLogStash;
+	
+	List<? extends INode> jobCatcherNodes = node.getProcess().getNodesOfType("tJobStructureCatcher");
+	boolean jobCatcherExists = jobCatcherNodes != null && !jobCatcherNodes.isEmpty();
+	INode jobCatcherNode = jobCatcherExists ? jobCatcherNodes.get(0) : null;
+	
+	boolean enableLogStash = !Boolean.getBoolean("deactivate_extended_component_log") && jobCatcherExists;
+	boolean logstashCurrent = enableLogStash && !cid.startsWith("tJobStructureCatcher") && !cid.startsWith("talend");
 	
 	//about performance monitor, no way to support more than one job catcher component, also that is not necessary
 	final String subprocessName4Catcher = logstashCurrent ? jobCatcherNodes.get(0).getDesignSubjobStartNode().getUniqueName() : null;
@@ -331,6 +338,99 @@
 		<%
 		log.startWork();
 		log.logCompSetting();
+		boolean enable_runtime_lineage_log = NodeUtil.isJobUsingRuntimeLineage(node.getProcess()) && jobCatcherExists && !cid.startsWith("tJobStructureCatcher") && !cid.startsWith("talend");
+		if(enable_runtime_lineage_log) {
+		%>
+		class ParameterUtil_<%=cid%>{
+		
+            public java.util.Map<String, String> getParameter() throws Exception{
+                java.util.Map<String, String> component_parameters = new java.util.HashMap<>();
+                <%
+                java.util.Set<org.talend.core.model.process.EParameterFieldType> ignoredParamsTypes = new java.util.HashSet<org.talend.core.model.process.EParameterFieldType>(); 
+                ignoredParamsTypes.addAll(
+                    java.util.Arrays.asList(
+                        org.talend.core.model.process.EParameterFieldType.SCHEMA_TYPE,
+                        org.talend.core.model.process.EParameterFieldType.SCHEMA_REFERENCE,
+                        org.talend.core.model.process.EParameterFieldType.LABEL,
+                        org.talend.core.model.process.EParameterFieldType.EXTERNAL,
+                        org.talend.core.model.process.EParameterFieldType.MAPPING_TYPE,
+                        org.talend.core.model.process.EParameterFieldType.IMAGE,
+                        org.talend.core.model.process.EParameterFieldType.TNS_EDITOR,
+                        org.talend.core.model.process.EParameterFieldType.WSDL2JAVA,
+                        org.talend.core.model.process.EParameterFieldType.GENERATEGRAMMARCONTROLLER,
+                        org.talend.core.model.process.EParameterFieldType.GENERATE_SURVIVORSHIP_RULES_CONTROLLER,
+                        org.talend.core.model.process.EParameterFieldType.REFRESH_REPORTS,
+                        org.talend.core.model.process.EParameterFieldType.BROWSE_REPORTS,
+                        org.talend.core.model.process.EParameterFieldType.PALO_DIM_SELECTION,
+                        org.talend.core.model.process.EParameterFieldType.GUESS_SCHEMA,
+                        org.talend.core.model.process.EParameterFieldType.MATCH_RULE_IMEX_CONTROLLER,
+                        org.talend.core.model.process.EParameterFieldType.MEMO_PERL,
+                        org.talend.core.model.process.EParameterFieldType.DBTYPE_LIST,
+                        org.talend.core.model.process.EParameterFieldType.VERSION,
+                        org.talend.core.model.process.EParameterFieldType.TECHNICAL,
+                        org.talend.core.model.process.EParameterFieldType.ICON_SELECTION,
+                        org.talend.core.model.process.EParameterFieldType.JAVA_COMMAND,
+                        org.talend.core.model.process.EParameterFieldType.TREE_TABLE,
+                        org.talend.core.model.process.EParameterFieldType.VALIDATION_RULE_TYPE,
+                        org.talend.core.model.process.EParameterFieldType.DCSCHEMA,
+                        org.talend.core.model.process.EParameterFieldType.SURVIVOR_RELATION,
+                        org.talend.core.model.process.EParameterFieldType.REST_RESPONSE_SCHEMA_TYPE,
+                        org.talend.core.model.process.EParameterFieldType.BUTTON
+                        )
+                );
+                for(org.talend.core.model.process.IElementParameter ep : org.talend.core.model.utils.NodeUtil.getDisplayedParameters(node)){
+                    if(!ep.isLog4JEnabled() || ignoredParamsTypes.contains(ep.getFieldType())){
+                        continue;
+                    }
+                    
+                    ElementParameter p = (ElementParameter)ep;
+                    Object pluginValue = p.getTaggedValue("org.talend.sdk.component.source");
+                    if(pluginValue != null && String.class.cast(pluginValue).equalsIgnoreCase("tacokit")) {
+                        try {
+                            if (!(Boolean) org.talend.core.runtime.IAdditionalInfo.class.cast(p).func("isPersisted")) {
+                                continue;
+                            }
+                        } catch (Exception ex) {
+                            //do nothing
+                        }
+                        
+                        %>
+                        <%@ include file="./tacokit_runtime_log.javajet"%>
+                        <%
+                        
+                        continue;
+                    }
+                    
+                    String name = ep.getName();
+                    java.util.Set<String> ignoredParamsNames = new java.util.HashSet<String>();
+                    ignoredParamsNames.add("SQLPATTERN_VALUE");
+                    ignoredParamsNames.add("ADDITIONAL_INSERT_COLUMNS");
+                    ignoredParamsNames.add("ADDITIONAL_UPDATE_COLUMNS");
+                    ignoredParamsNames.add("SELECTION_TABLE");
+                    ignoredParamsNames.add("DIFFER_MESSAGE");
+                    ignoredParamsNames.add("NO_DIFFER_MESSAGE");
+                    
+                    if(ignoredParamsNames.contains(name)) {
+                        //do nothing
+                    } else if(org.talend.core.model.process.EParameterFieldType.PASSWORD.equals(ep.getFieldType())){
+                        //not log password
+                    }else{
+                        String value = org.talend.core.model.utils.NodeUtil.getRuntimeParameterValue(node, ep);
+                        %>
+                        component_parameters.put("<%=name%>", String.valueOf(<%=value%>));
+                    <%
+                    }
+                }
+                %>
+                return component_parameters;
+            }
+        }
+        
+        <%=jobCatcherNode.getUniqueName()%>.addComponentParameterMessage("<%=node.getUniqueName()%>", "<%=node.getComponent().getName()%>",
+          new ParameterUtil_<%=cid%>().getParameter());
+        <%=jobCatcherNode.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
+		<%
+		}
 		
 		if(logstashCurrent) {
 			for (INode jobStructureCatcher : jobCatcherNodes) {

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

@@ -24,6 +24,7 @@
         org.talend.core.model.process.ProcessUtils
         org.talend.core.model.components.IComponent
         org.talend.core.model.components.EComponentType
+        org.talend.core.model.utils.NodeUtil
     "
     class="Footer"
     skeleton="footer_java.skeleton"
@@ -275,7 +276,7 @@
     }
 %>
 
-    private PropertiesWithType context_param = new PropertiesWithType();
+    protected PropertiesWithType context_param = new PropertiesWithType();
     public java.util.Map<String, Object> parentContextMap = new java.util.HashMap<String, Object>();
 
     public String status= "";
@@ -518,8 +519,63 @@
 				break;
 			}
 		}
-    	if(jobCatcherNode!=null) {
-    		String location = ElementParameterParser.getValue(jobCatcherNode, "__LOCATION__");
+		
+		boolean enableLogStash = !Boolean.getBoolean("deactivate_extended_component_log") && (jobCatcherNode!=null);
+		boolean enable_runtime_lineage_log = NodeUtil.isJobUsingRuntimeLineage(process) && (jobCatcherNode!=null);
+		if(enable_runtime_lineage_log) {
+		%>
+			java.util.Properties p_<%=jobCatcherNode.getUniqueName()%> = new java.util.Properties();
+			p_<%=jobCatcherNode.getUniqueName()%>.setProperty("root.logger", "runtime");
+			p_<%=jobCatcherNode.getUniqueName()%>.setProperty("encoding", "UTF-8");
+			p_<%=jobCatcherNode.getUniqueName()%>.setProperty("application.name", "Talend Studio");
+			p_<%=jobCatcherNode.getUniqueName()%>.setProperty("service.name", "Talend Studio Job");
+			p_<%=jobCatcherNode.getUniqueName()%>.setProperty("instance.name", "Talend Studio Job Instance");
+			p_<%=jobCatcherNode.getUniqueName()%>.setProperty("propagate.appender.exceptions", "none");
+			p_<%=jobCatcherNode.getUniqueName()%>.setProperty("log.appender", "file");
+			p_<%=jobCatcherNode.getUniqueName()%>.setProperty("appender.file.path", "runtime.json");
+			p_<%=jobCatcherNode.getUniqueName()%>.setProperty("appender.file.maxsize", "52428800");
+			p_<%=jobCatcherNode.getUniqueName()%>.setProperty("appender.file.maxbackup", "20");
+			p_<%=jobCatcherNode.getUniqueName()%>.setProperty("host", "false");
+			
+			final String runtime_dir_<%=jobCatcherNode.getUniqueName()%> = System.getProperty("runtime.lineage.outputpath");
+			final String runtime_path_<%=jobCatcherNode.getUniqueName()%> = System.getProperty("runtime.lineage.appender.file.path");
+			if(runtime_path_<%=jobCatcherNode.getUniqueName()%>==null || runtime_path_<%=jobCatcherNode.getUniqueName()%>.isEmpty()) {
+				if(runtime_dir_<%=jobCatcherNode.getUniqueName()%>!=null && !runtime_dir_<%=jobCatcherNode.getUniqueName()%>.isEmpty()) {
+					System.setProperty("runtime.lineage.appender.file.path", 
+						new StringBuilder().append(runtime_dir_<%=jobCatcherNode.getUniqueName()%>)
+						.append((runtime_dir_<%=jobCatcherNode.getUniqueName()%>.endsWith("/") || runtime_dir_<%=jobCatcherNode.getUniqueName()%>.endsWith("\\")) ? "" : java.io.File.separator)
+						.append(projectName)
+						.append(java.io.File.separatorChar)
+						.append(jobName)
+						.append(java.io.File.separatorChar)
+						.append(jobVersion)
+						.append(java.io.File.separatorChar)
+						.append("runtime_log_")
+						.append(new java.text.SimpleDateFormat("yyyyMMddHHmmss").format(new java.util.Date()))
+						.append(".json")
+						.toString()
+					);
+				}
+			}
+			
+			System.getProperties().stringPropertyNames().stream()
+					.filter(it -> it.startsWith("runtime.lineage.") && !"runtime.lineage.outputpath".equals(it))
+					.forEach(key -> p_<%=jobCatcherNode.getUniqueName()%>.setProperty(key.substring("runtime.lineage.".length()), System.getProperty(key)));
+			
+			<%if(isLog4j1Enabled) {%>
+			org.apache.log4j.Logger.getLogger(p_<%=jobCatcherNode.getUniqueName()%>.getProperty("root.logger")).setLevel(org.apache.log4j.Level.DEBUG);
+			<%}%>
+			
+			<%if(isLog4j2Enabled) {%>
+			org.apache.logging.log4j.core.config.Configurator.setLevel(p_<%=jobCatcherNode.getUniqueName()%>.getProperty("root.logger"), org.apache.logging.log4j.Level.DEBUG);
+			<%}%>
+			
+			runtime_lineage_logger_<%=jobCatcherNode.getUniqueName()%> = org.talend.job.audit.JobEventAuditLoggerFactory.createJobAuditLogger(p_<%=jobCatcherNode.getUniqueName()%>);
+		<%
+		}
+		
+		if(enableLogStash) {
+			String location = ElementParameterParser.getValue(jobCatcherNode, "__LOCATION__");
 		%>
 			if(enableLogStash) {
 				java.util.Properties properties_<%=jobCatcherNode.getUniqueName()%> = new java.util.Properties();
@@ -550,7 +606,7 @@
 			}
 		<%
 		}
-    	%>
+		%>
 
         if(clientHost == null) {
             clientHost = defaultClientHost;
@@ -954,7 +1010,7 @@ this.globalResumeTicket = true;//to run tPreJob
 <%
         }
         
-        if(jobCatcherNode!=null) {
+        if(enableLogStash) {
 %>
 		if(enableLogStash) {
 	        <%=jobCatcherNode.getUniqueName() %>.addJobStartMessage();
@@ -1107,7 +1163,7 @@ this.globalResumeTicket = true;//to run tPostJob
 <%
     }
     
-    if(jobCatcherNode!=null) {
+    if(enableLogStash) {
 %>
 		if(enableLogStash) {
 	        <%=jobCatcherNode.getUniqueName() %>.addJobEndMessage(startTime, end, status);
@@ -1146,6 +1202,24 @@ if (execStat) {
     }
 %>
     int returnCode = 0;
+
+<%
+    if (isRunInMultiThread) {
+%>
+        Integer localErrorCode = (Integer)(((java.util.Map)threadLocal.get()).get("errorCode"));
+        String localStatus = (String)(((java.util.Map)threadLocal.get()).get("status"));
+        if (localErrorCode != null) {
+            if (errorCode == null || localErrorCode.compareTo(errorCode) > 0) {
+                   errorCode = localErrorCode;
+            }
+        }
+        if (localStatus != null && !status.equals("failure")){
+            status = localStatus;
+        }
+<%
+    }
+%>
+
     if(errorCode == null) {
          returnCode = status != null && status.equals("failure") ? 1 : 0;
     } else {

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

@@ -389,13 +389,26 @@ public <%=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true)%> get<%=Ch
 			break;
 		}
 	}
-	boolean enableLogStash = jobCatcherNode != null;
-	if (enableLogStash) {
+	
+	boolean enableLogStash = !Boolean.getBoolean("deactivate_extended_component_log") && (jobCatcherNode!=null);
+	boolean enable_runtime_lineage_log = NodeUtil.isJobUsingRuntimeLineage(process) && (jobCatcherNode!=null);
+	
+	if(jobCatcherNode!=null) {
 %>
 private final JobStructureCatcherUtils <%=jobCatcherNode.getUniqueName() %> = new JobStructureCatcherUtils(jobName, "<%=process.getId() %>", "<%=process.getVersion() %>");
+<%
+	}
+	if(enable_runtime_lineage_log) {
+%>
+private org.talend.job.audit.JobAuditLogger runtime_lineage_logger_<%=jobCatcherNode.getUniqueName()%> = null;
+<%
+	}
+	
+	if (enableLogStash) {
+%>
 private org.talend.job.audit.JobAuditLogger auditLogger_<%=jobCatcherNode.getUniqueName()%> = null;
 
-private RunStat runStat = new RunStat(<%=jobCatcherNode.getUniqueName() %>);
+private RunStat runStat = new RunStat(<%=jobCatcherNode.getUniqueName() %>, System.getProperty("audit.interval"));
 <%
 	} else if(stats) {
 %>

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

@@ -12,6 +12,7 @@
   org.talend.designer.codegen.config.CodeGeneratorArgument
   org.talend.designer.codegen.config.NodesSubTree
   org.talend.core.model.process.IProcess
+  org.talend.core.model.process.ProcessUtils
   org.talend.core.model.utils.NodeUtil
   org.talend.core.model.process.IContextParameter  
   java.util.List
@@ -28,7 +29,13 @@ INode node = (INode)codeGenArgument.getArgument();
 boolean containsTPartitioner = node.getProcess().getNodesOfType("tPartitioner").size() > 0 ? true : false;
 boolean isRunJob = "tRunJob".equals(node.getComponent().getName());
 IProcess process = node.getProcess();
- 
+
+boolean isTestContainer=ProcessUtils.isTestContainer(process);
+String className = process.getName();
+if (isTestContainer) {
+	className = className + "Test";
+}
+
 NodesSubTree subTree = (NodesSubTree) codeGenArgument.getSubTree();
 ECodePart codePart = codeGenArgument.getCodePart();
 //boolean trace = codeGenArgument.isTrace();
@@ -78,10 +85,10 @@ for (IConnection iterateConn : iterateConnSet) { //1
 					@Override
 					public Object put(String key, Object value) {
 						<%if(!isRunInMultiThread){%>
-						synchronized (<%=process.getName()%>.this.obj) {
+						synchronized (<%=className%>.this.obj) {
 						<%}%>
 							super.put(key, value);
-							return <%=process.getName()%>.this.globalMap.put(key, value);
+							return <%=className%>.this.globalMap.put(key, value);
 						<%if(!isRunInMultiThread){%>
 						}
 						<%}%>
@@ -158,7 +165,7 @@ for (IConnection iterateConn : iterateConnSet) { //1
 						synchronized (globalMap) {
 							this.globalMap = java.util.Collections.synchronizedMap(new ThreadedMap(globalMap));
 					<%}else{%>
-						synchronized (<%=process.getName()%>.this.obj) {
+						synchronized (<%=className%>.this.obj) {
 							this.globalMap = new ThreadedMap(globalMap);
 					<%}%>
 						}

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

@@ -0,0 +1,121 @@
+<%
+//copy from configuration.javajet for tacokit
+%>
+
+<%
+            //TODO: modify this part for Maps and nested lists.
+            if (p.getFieldType() == EParameterFieldType.TABLE || p.getFieldType() == EParameterFieldType.TACOKIT_SUGGESTABLE_TABLE) {
+                java.util.List<java.util.Map<String, String>> tableValues = ElementParameterParser.createTableValues((java.util.List<java.util.Map<String, Object>>) p.getValue(), p);
+                String[] items = p.getListItemsDisplayCodeName();
+                String tableName = p.getName().replace('$', '.');
+                boolean primitiveTable = items.length == 1 && items[0].equals(tableName + "[]");
+                String tableNamePrefix = tableName + "[]";
+                for (int i = 0; i < tableValues.size(); i++) {
+                    java.util.Map<String, String> lineValues = tableValues.get(i);
+                    for (int j = 0; j < items.length; j++) {
+                        String key = tableName + "[" + i + "]";
+                        if (!primitiveTable) {
+                            final String columnName = items[j].substring(tableNamePrefix.length(), items[j].length());
+                            key = key + columnName;
+                        }
+                        String value = lineValues.get(items[j]);
+                        if (!org.talend.core.model.utils.ContextParameterUtils.isDynamic(value)) {
+                            value = org.talend.core.model.utils.TalendTextUtils.removeQuotes(value);
+                            value = org.talend.core.model.utils.TalendTextUtils.addQuotes(value);
+                        }
+                        
+                        if(value==null || "null".equals(value.trim())) {
+                            value = "(Object)null";
+                        }
+%>
+                        component_parameters.put("<%=key%>",String.valueOf(<%=value%>));
+<%
+                    }
+                }
+            } else if(p.getFieldType() == EParameterFieldType.SCHEMA_TYPE) {
+                final String parameterName = p.getName();
+                IConnection connection = null;
+                final List<? extends IConnection> connections = NodeUtil.getOutgoingConnections(node, p.getContext());
+                if(connections != null && !connections.isEmpty()) {
+                    connection = connections.get(0);
+                }
+                if(connection != null) {
+                    IMetadataTable metaTable = connection.getMetadataTable();
+                    List<IMetadataColumn> columns = metaTable.getListColumns();
+                    for(int i = 0; i < columns.size(); i++) {
+                        IMetadataColumn column = columns.get(i);
+                    %>
+                        component_parameters.put("<%=parameterName%>[<%=i%>]", "<%=column.getLabel()%>");
+                    <%
+                    }
+                }
+            } else if (p.getFieldType() == EParameterFieldType.TACOKIT_INPUT_SCHEMA) {
+                final String parameterName = p.getName();
+                IConnection connection = null;
+                final List<? extends IConnection> connections = NodeUtil.getIncomingConnections(node, p.getContext());
+                if(connections != null && !connections.isEmpty()) {
+                    connection = connections.get(0);
+                }
+                if(connection != null) {
+                    IMetadataTable metaTable = connection.getMetadataTable();
+                    List<IMetadataColumn> columns = metaTable.getListColumns();
+                    for(int i = 0; i < columns.size(); i++) {
+                        IMetadataColumn column = columns.get(i);
+                    %>
+                        component_parameters.put("<%=parameterName%>[<%=i%>]", "<%=column.getLabel()%>");
+                    <%
+                    }
+                }
+            } else {
+                final String key;
+                if(!p.getName().contains("$")){
+                    key = p.getName();
+                }else{
+                    final StringBuilder keyBuilder = new StringBuilder();
+                    for (String part : p.getName().split("\\.")) {
+                        if (keyBuilder.length() != 0) {
+                            keyBuilder.append(".");
+                        }
+                        if (part.contains("$") && !part.startsWith("$")) {
+                            keyBuilder.append(part.replace("$", "."));
+                        } else {
+                            keyBuilder.append(part);
+                        }
+                    }
+                    key = keyBuilder.toString();
+                }
+                String value = null;
+                if(p.getFieldType() == EParameterFieldType.PASSWORD) {
+                    continue;
+                } else {
+                    value = ElementParameterParser.getStringElementParameterValue(p);
+                    if (!org.talend.core.model.utils.ContextParameterUtils.isDynamic(value)) {
+                        value = org.talend.core.model.utils.TalendTextUtils.removeQuotes(value);
+                        value = org.talend.core.model.utils.TalendTextUtils.addQuotes(value);
+                    }
+                }
+                if (value != null) {
+                 if(key.endsWith("$maxBatchSize")){
+                  %>
+                  
+                  <%
+                 } else if(p.getFieldType() == EParameterFieldType.CLOSED_LIST) {
+                   String valueTemp = org.talend.core.model.utils.TalendTextUtils.removeQuotes(value);
+                    if ("".equals(valueTemp)) {
+                       String[] listItemsDisplayCodeValue = p.getListItemsDisplayCodeName();
+                       if(listItemsDisplayCodeValue != null && listItemsDisplayCodeValue.length > 0){
+                          valueTemp = listItemsDisplayCodeValue[0];
+                          value = org.talend.core.model.utils.TalendTextUtils.addQuotes(valueTemp);
+                       }
+                    }
+                }
+                
+                if(value==null || "null".equals(value.trim())) {
+                    value = "(Object)null";
+                }
+%>
+                    component_parameters.put("<%=key%>", String.valueOf(<%=value%>));
+<%
+                } // else do not put value in configuration
+            }
+%>

main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/model/CodeGeneratorEmittersPoolFactory.java

@@ -402,13 +402,7 @@ public final class CodeGeneratorEmittersPoolFactory {
     private static JetBean initializeUtilTemplate(TemplateUtil template, ECodeLanguage codeLanguage) {
         JetBean jetBean = new JetBean(template.getJetPluginRepository(), template.getTemplateRelativeUri(),
                 template.getResourceName(), template.getVersion(), codeLanguage.getName(), ""); //$NON-NLS-1$
-        jetBean.addClassPath("EMF_ECORE", "org.eclipse.emf.ecore"); //$NON-NLS-1$ //$NON-NLS-2$
-        jetBean.addClassPath("EMF_COMMON", "org.eclipse.emf.common"); //$NON-NLS-1$ //$NON-NLS-2$
-        jetBean.addClassPath("CORERUNTIME_LIBRARIES", "org.talend.core.runtime"); //$NON-NLS-1$ //$NON-NLS-2$
-        jetBean.addClassPath("MANAGEMENT_LIBRARIES", "org.talend.metadata.managment"); //$NON-NLS-1$ //$NON-NLS-2$
-        jetBean.addClassPath("CORE_LIBRARIES", CorePlugin.PLUGIN_ID); //$NON-NLS-1$
-        jetBean.addClassPath("CODEGEN_LIBRARIES", CodeGeneratorActivator.PLUGIN_ID); //$NON-NLS-1$
-        jetBean.addClassPath("COMMON_LIBRARIES", CommonsPlugin.PLUGIN_ID); //$NON-NLS-1$
+        addCommonLibs(jetBean);
         jetBean.addClassPath("COMPONENT_FRAMEWORK", "org.talend.components.api"); //$NON-NLS-1$ //$NON-NLS-2$
         jetBean.addClassPath("TALEND_MODEL", "org.talend.model"); //$NON-NLS-1$ //$NON-NLS-2$
         jetBean.addClassPath("DAIKON", "org.talend.daikon"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -453,13 +447,7 @@ public final class CodeGeneratorEmittersPoolFactory {
             }
             JetBean jetBean = new JetBean(componentsPath, templateURI, component.getName(), component.getVersion(),
                     codeLanguage.getName(), codePart.getName());
-            jetBean.addClassPath("EMF_ECORE", "org.eclipse.emf.ecore"); //$NON-NLS-1$ //$NON-NLS-2$
-            jetBean.addClassPath("EMF_COMMON", "org.eclipse.emf.common"); //$NON-NLS-1$ //$NON-NLS-2$
-            jetBean.addClassPath("CORERUNTIME_LIBRARIES", "org.talend.core.runtime"); //$NON-NLS-1$ //$NON-NLS-2$
-            jetBean.addClassPath("MANAGEMENT_LIBRARIES", "org.talend.metadata.managment"); //$NON-NLS-1$ //$NON-NLS-2$
-            jetBean.addClassPath("CORE_LIBRARIES", CorePlugin.PLUGIN_ID); //$NON-NLS-1$
-            jetBean.addClassPath("CODEGEN_LIBRARIES", CodeGeneratorActivator.PLUGIN_ID); //$NON-NLS-1$
-            jetBean.addClassPath("COMMON_LIBRARIES", CommonsPlugin.PLUGIN_ID); //$NON-NLS-1$
+            addCommonLibs(jetBean);
             jetBean.addClassPath("COMPONENT_FRAMEWORK", "org.talend.components.api"); //$NON-NLS-1$ //$NON-NLS-2$
             jetBean.addClassPath("DAIKON", "org.talend.daikon"); //$NON-NLS-1$ //$NON-NLS-2$
             jetBean.addClassPath("COMPONENT_CORE", "org.talend.designer.core.generic"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -549,13 +537,7 @@ public final class CodeGeneratorEmittersPoolFactory {
             // TODO
             JetBean jetBean = new JetBean(componentsPath, templateURI, "component", component.getVersion(), //$NON-NLS-1$
                     "", codePart.getName());//$NON-NLS-1$
-            jetBean.addClassPath("EMF_ECORE", "org.eclipse.emf.ecore"); //$NON-NLS-1$ //$NON-NLS-2$
-            jetBean.addClassPath("EMF_COMMON", "org.eclipse.emf.common"); //$NON-NLS-1$ //$NON-NLS-2$
-            jetBean.addClassPath("CORERUNTIME_LIBRARIES", "org.talend.core.runtime"); //$NON-NLS-1$ //$NON-NLS-2$
-            jetBean.addClassPath("MANAGEMENT_LIBRARIES", "org.talend.metadata.managment"); //$NON-NLS-1$ //$NON-NLS-2$
-            jetBean.addClassPath("CORE_LIBRARIES", CorePlugin.PLUGIN_ID); //$NON-NLS-1$
-            jetBean.addClassPath("CODEGEN_LIBRARIES", CodeGeneratorActivator.PLUGIN_ID); //$NON-NLS-1$
-            jetBean.addClassPath("COMMON_LIBRARIES", CommonsPlugin.PLUGIN_ID); //$NON-NLS-1$
+            addCommonLibs(jetBean);
             jetBean.addClassPath("AVRO", "org.apache.servicemix.bundles.avro"); //$NON-NLS-1$ //$NON-NLS-2$
 
             for (String pluginDependency : component.getPluginDependencies()) {
@@ -856,6 +838,17 @@ public final class CodeGeneratorEmittersPoolFactory {
         CodeGeneratorEmittersPoolFactory.initialized = initialized;
     }
 
+    public static void addCommonLibs(JetBean jetBean) {
+        jetBean.addClassPath("EMF_ECORE", "org.eclipse.emf.ecore"); //$NON-NLS-1$ //$NON-NLS-2$
+        jetBean.addClassPath("EMF_COMMON", "org.eclipse.emf.common"); //$NON-NLS-1$ //$NON-NLS-2$
+        jetBean.addClassPath("CORERUNTIME_LIBRARIES", "org.talend.core.runtime"); //$NON-NLS-1$ //$NON-NLS-2$
+        jetBean.addClassPath("MANAGEMENT_LIBRARIES", "org.talend.metadata.managment"); //$NON-NLS-1$ //$NON-NLS-2$
+        jetBean.addClassPath("CORE_LIBRARIES", CorePlugin.PLUGIN_ID); //$NON-NLS-1$
+        jetBean.addClassPath("CODEGEN_LIBRARIES", CodeGeneratorActivator.PLUGIN_ID); //$NON-NLS-1$
+        jetBean.addClassPath("COMMON_LIBRARIES", CommonsPlugin.PLUGIN_ID); //$NON-NLS-1$
+        jetBean.addClassPath("COMMON_LIBRARIES_STUDIO_UTILS", "org.talend.studio.studio-utils"); //$NON-NLS-1$
+    }
+
     /***/
     private static class DelegateProgressMonitor implements IProgressMonitor {
 

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/adal4j/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.microsoft.azure</groupId>
 	<artifactId>adal4j</artifactId>
-	<version>1.6.4-20200211</version>
+	<version>1.6.4-20200824</version>
 	<packaging>jar</packaging>
 	<name>adal4j</name>
 	<description>
@@ -109,12 +109,12 @@
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.11</version>
+			<version>1.14</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>3.5</version>
+			<version>3.9</version>
 		</dependency>
 
 		<!-- test dependencies -->

main/plugins/org.talend.designer.components.libs/libs_src/buildall.xml

@@ -2,7 +2,6 @@
 <project name="org.talend.designer.components.libs" default="buildall" basedir=".">
 
 	<target name="buildall">
-		<ant antfile="talend_file_enhanced_20070724/build.xml" target="process" inheritall="no" />
 		<ant antfile="sugarCRMManagement/build.xml" target="process" inheritall="no" />
 		<ant antfile="TalendSAX/build.xml" target="process" inheritall="no" />
 	</target>

main/plugins/org.talend.designer.components.libs/libs_src/commons-net-ftps-proxy/pom.xml

@@ -3,11 +3,32 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.talend.components.lib</groupId>
     <artifactId>commons-net-ftps-proxy</artifactId>
-    <version>3.6.1-talend-20190819</version>
+    <version>3.6.1-talend-20200902</version>
 
     <name>commons-net-talend</name>
 
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
+        <slf4.version>1.7.25</slf4.version>
+        <lombok.version>1.18.12</lombok.version>
+    </properties>
+
     <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>commons-net</groupId>
             <artifactId>commons-net</artifactId>
@@ -15,10 +36,6 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
-    </properties>
-
     <distributionManagement>
         <snapshotRepository>
             <id>talend_nexus_deployment</id>

main/plugins/org.talend.designer.components.libs/libs_src/commons-net-ftps-proxy/src/main/java/org/talend/ftp/SSLSessionReuseFTPSClient.java

@@ -11,8 +11,10 @@ import javax.net.ssl.SSLSession;
 import javax.net.ssl.SSLSessionContext;
 import javax.net.ssl.SSLSocket;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.net.ftp.FTPSClient;
 
+@Slf4j
 public class SSLSessionReuseFTPSClient extends FTPSClient {
 
     public SSLSessionReuseFTPSClient(boolean isImplicit, SSLContext context) {
@@ -24,6 +26,12 @@ public class SSLSessionReuseFTPSClient extends FTPSClient {
         if (socket instanceof SSLSocket) {
             final SSLSession session = ((SSLSocket) _socket_).getSession();
             final SSLSessionContext context = session.getSessionContext();
+            if (context == null) {
+                // TDI-44654 (may be reproduced with Syncplify server)
+                log.info("SSL Session Context is null. SSL Session was re-initialized.");
+                return;
+            }
+
             try {
                 final Field sessionHostPortCache = context.getClass().getDeclaredField("sessionHostPortCache");
                 sessionHostPortCache.setAccessible(true);
@@ -32,10 +40,10 @@ public class SSLSessionReuseFTPSClient extends FTPSClient {
                 putMethod.setAccessible(true);
                 InetAddress address = socket.getInetAddress();
                 int port = socket.getPort();
-                
+
                 String key = String.format("%s:%s", address.getHostName(), String.valueOf(port)).toLowerCase(Locale.ROOT);
                 putMethod.invoke(cache, key, session);
-                
+
                 key = String.format("%s:%s", address.getHostAddress(), String.valueOf(port)).toLowerCase(Locale.ROOT);
                 putMethod.invoke(cache, key, session);
             } catch (Exception e) {

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/mdm_taskloadclient/pom.xml

@@ -12,11 +12,6 @@
 			<type>jar</type>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>1.4</version>
-		</dependency>
 	</dependencies>
 
 	<build>

main/plugins/org.talend.designer.components.libs/libs_src/mdm_taskloadclient/src/main/java/org/talend/datastewardship/server/task/creation/TaskLoadClient.java

@@ -21,8 +21,7 @@ import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLEncoder;
-
-import org.apache.commons.codec.binary.Base64;
+import java.util.Base64;
 
 /**
  * DOC Starkey class global comment. Detailled comment
@@ -96,7 +95,7 @@ public class TaskLoadClient {
 			String str;
 			try {
 			  byte[] arrayOfByte1 = localStringBuilder.toString().getBytes("UTF-8");
-			  byte[] arrayOfByte2 = Base64.encodeBase64(arrayOfByte1);
+			  byte[] arrayOfByte2 = Base64.getEncoder().encode(arrayOfByte1);
 			  str = new String(arrayOfByte2, "UTF-8");
 			}
 			catch (UnsupportedEncodingException localUnsupportedEncodingException) {

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

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

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

@@ -20,7 +20,7 @@
     <groupId>org.talend.components</groupId>
     <artifactId>components-servicenow</artifactId>
     <name>servicenow</name>
-    <version>1.0.1</version>
+    <version>1.0.1-20200824</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.6</version>
+            <version>1.14</version>
             <type>jar</type>
         </dependency>
         <dependency>

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-20200824</version>
 	<packaging>jar</packaging>
 	
 	<name>talend-soap</name>
@@ -63,12 +63,12 @@
 		<dependency>
 			<groupId>xerces</groupId>
 			<artifactId>xercesImpl</artifactId>
-			<version>2.6.2</version>
+			<version>2.12.0</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.9</version>
+			<version>1.14</version>
 		</dependency>
 	</dependencies>
 	<build>

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

@@ -6,11 +6,11 @@
 
 	<groupId>org.talend.components.lib</groupId>
 	<artifactId>job-audit</artifactId>
-	<version>1.2</version>
+	<version>1.4</version>
 
 	<properties>
 		<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
-		<daikon.audit.version>1.16.0</daikon.audit.version>
+		<daikon.audit.version>1.16.1</daikon.audit.version>
 	</properties>
 
 	<repositories>

main/plugins/org.talend.designer.components.libs/libs_src/talend-job-monitoring/src/main/java/org/talend/job/audit/JobAuditLogger.java

@@ -24,5 +24,11 @@ public interface JobAuditLogger extends EventAuditLogger {
 
 	@AuditEvent(category = "flowexecution", message = "connection : {connection_name}, row : {rows}, cost : {duration}", level = LogLevel.INFO)
 	void flowExecution(Context context);
+	
+	@AuditEvent(category = "componentparameters", message = "Component {connector_id} parameters", level = LogLevel.INFO)
+    void componentParameters(Context context);
+    
+    @AuditEvent(category = "schema", message = "{connection_name} : {schema} from {source_id} to {target_id}", level = LogLevel.INFO)
+    void schema(Context context);
 
 }

main/plugins/org.talend.designer.components.libs/libs_src/talend-job-monitoring/src/main/java/org/talend/job/audit/JobContextBuilder.java

@@ -15,6 +15,11 @@ public class JobContextBuilder {
 		return new JobContextBuilder(ContextBuilder.create());
 	}
 
+	public JobContextBuilder custom(String key, String value) {
+		builder.with(key, value);
+		return this;
+	}
+	
 	public JobContextBuilder jobName(String job_name) {
 		builder.with("job_name", job_name);
 		return this;
@@ -161,4 +166,14 @@ public class JobContextBuilder {
 		return this;
 	}
 
+	public JobContextBuilder connectorParameters(String connector_parameters) {
+        builder.with("connector_parameters", connector_parameters);
+        return this;
+    }
+    
+    public JobContextBuilder schema(String schema) {
+        builder.with("schema", schema);
+        return this;
+	}
+	
 }

main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/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>
+	<groupId>org.talend.components</groupId>
 	<artifactId>talend-mscrm</artifactId>
-	<version>3.4-20200330</version>
+	<version>3.4-20200824</version>
 	<packaging>jar</packaging>
 	
 	<name>talend-mscrm</name>
@@ -110,7 +110,7 @@
         <dependency>
 	    <groupId>com.microsoft.azure</groupId>
             <artifactId>adal4j</artifactId>
-            <version>1.6.4-20200211</version>
+            <version>1.6.4-20200824</version>
         </dependency>
 	</dependencies>
 	<build>

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

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

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

@@ -2,9 +2,9 @@
 	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>
+	<groupId>org.talend.components</groupId>
 	<artifactId>talend-ws</artifactId>
-	<version>1.0.1-20191112</version>
+	<version>1.0.1-20200824</version>
 	<packaging>jar</packaging>
 
 	<properties>
@@ -43,7 +43,7 @@
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.10</version>
+			<version>1.14</version>
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/commons-httpclient/commons-httpclient -->
 		<dependency>

main/plugins/org.talend.designer.components.libs/libs_src/talend-ws/readme.txt

@@ -48,4 +48,6 @@ please @see org\talend\ws\helper\ServiceDiscoveryHelper.java
 please @see org\talend\ws\helper\ServiceInvokerHelper.java
 			org\talend\ws\mapper\MapperFactory.java
 			
-10.(2019-01-18 modified by dchmyga) fixed TDI-41647
+10.(2019-01-18 modified by dchmyga) fixed TDI-41647
+
+11.(2020-08-24 modified by ozhelezniak) updated commons-codec to 1.14 in scope of TDI-44145

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

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.talend.libraries</groupId>
-	<artifactId>talendExcel-1.5-20190731</artifactId>
+	<artifactId>talendExcel-1.5-20200825</artifactId>
 	<version>6.0.0</version>
 	<packaging>jar</packaging>
 
@@ -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/talendExcel/src/main/java/org/talend/ExcelTool.java

@@ -6,11 +6,13 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.security.GeneralSecurityException;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.poifs.crypt.Decryptor;
 import org.apache.poi.poifs.crypt.EncryptionInfo;
 import org.apache.poi.poifs.crypt.EncryptionMode;
 import org.apache.poi.poifs.crypt.Encryptor;
@@ -158,9 +160,13 @@ public class ExcelTool {
         }
     }
 
-    private void appendActionForFile(String fileName) throws IOException {
-        InputStream inp = new FileInputStream(fileName);
-        wb = WorkbookFactory.create(inp);
+    private void appendActionForFile(String fileName) throws Exception {
+        if (password == null) {
+            InputStream inp = new FileInputStream(fileName);
+            wb = WorkbookFactory.create(inp);
+        } else {
+           wb = readEncryptedFile(fileName);
+        }
         sheet = wb.getSheet(sheetName);
         if (sheet != null) {
             if (appendSheet) {
@@ -185,10 +191,27 @@ public class ExcelTool {
     }
 
     private void initPreXlsx(String fileName) throws Exception {
-        InputStream preIns = new FileInputStream(fileName);
-        preWb = WorkbookFactory.create(preIns);
+        if(password == null) {
+            InputStream preIns = new FileInputStream(fileName);
+            preWb = WorkbookFactory.create(preIns);
+        } else {
+            preWb = readEncryptedFile(fileName);
+        }
         preSheet = preWb.getSheet(sheetName);
     }
+    
+    private Workbook readEncryptedFile(String fileName)
+            throws IOException, GeneralSecurityException {
+        InputStream inp = new FileInputStream(fileName);
+        POIFSFileSystem fs = new POIFSFileSystem(inp);
+        EncryptionInfo info = new EncryptionInfo(fs);
+        Decryptor decryptor = Decryptor.getInstance(info);
+        if (!decryptor.verifyPassword(password)) {
+            throw new GeneralSecurityException("Error: Incorrect password!");
+        }
+        InputStream dataStream = decryptor.getDataStream(fs);
+        return WorkbookFactory.create(dataStream);
+    }
 
     public void setFont(String fontName) {
         if (StringUtils.isNotEmpty(fontName)) {

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

@@ -0,0 +1,57 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.talend.components.lib</groupId>
+	<artifactId>talend_file_enhanced</artifactId>
+	<name>talend_file_enhanced</name>
+	<version>1.0</version>
+
+	<properties>
+		<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.0</version>
+			<type>jar</type>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<distributionManagement>
+		<snapshotRepository>
+			<id>talend_nexus_deployment</id>
+			<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+			<snapshots><enabled>true</enabled></snapshots>
+			<releases><enabled>false</enabled></releases>
+		</snapshotRepository>
+		<repository>
+			<id>talend_nexus_deployment</id>
+			<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceRelease/</url>
+			<snapshots><enabled>false</enabled></snapshots>
+			<releases><enabled>true</enabled></releases>
+		</repository>
+	</distributionManagement>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+					<encoding>UTF-8</encoding>
+				</configuration>
+			</plugin>
+		</plugins>
+		
+		<resources>
+			<resource>
+				<directory>src/main/java</directory>
+			</resource>
+		</resources>
+	</build>
+</project>

main/plugins/org.talend.designer.components.libs/libs_src/talend_file_enhanced/src/main/java/org/talend/fileprocess/TOSDelimitedReader.java

@@ -561,7 +561,17 @@ public class TOSDelimitedReader {
                 System.out.println(streamBuffer);
             }
 
+            setStreamEnd(readCount, maxReadLength);
+
+            if (readCount > -1) {
+                count += readCount;
+                lastIndexToRead = count - maxLimit;
+            }
+        }
+
+        private void setStreamEnd(int readCount, int maxReadLength) throws IOException {
             /* @see bug:http://talendforge.org/bugs/view.php?id=4554 */
+            //https://jira.talendforge.org/browse/TDI-44745
             if (readCount < maxReadLength) {
                 if (readCount == -1) {
                     streamEndMeet = true;
@@ -575,11 +585,6 @@ public class TOSDelimitedReader {
                     }
                 }
             }
-
-            if (readCount > -1) {
-                count += readCount;
-                lastIndexToRead = count - maxLimit;
-            }
         }
 
         /* --------------1------------------- */
@@ -652,7 +657,7 @@ public class TOSDelimitedReader {
             currentPosition = 0;
             columnStart = 0;
             lastIndexToRead = count - maxLimit;
-            streamEndMeet = (count < buffer.length);
+            setStreamEnd(count, buffer.length);
         }
 
         public boolean isStartFieldDelimited() {

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

@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.talend.designer.components.libs" default="process" basedir=".">
-	
-	<property name="jar.plugin.home" value="../../../org.talend.libraries.custom/lib" />
-
-	<!-- #################################################### -->
-
-	<!-- modification 1: config -->
-	<property name="jar.name" value="talend_file_enhanced_20070724.jar" />
-	<property name="author.name" value="wyang" />
-	
-	<!-- modification 2: compile classpath -->
-	<path id="compile.classpath">
-	</path>
-
-	<!-- #################################################### -->	
-	
-
-	<!-- sourcecode and final jar path -->
-	<property name="source.home" value="." />
-	<property name="jar.home" value="${jar.plugin.home}/${jar.name}" />
-
-	<!-- temp dir for clasee files -->
-	<property name="build.dir" value="../../build" />
-
-	<!-- compile option -->
-	<property name="compile.debug" value="true" />
-	<property name="compile.deprecation" value="false" />
-	<property name="compile.optimize" value="true" />
-
-    <property name="ant.build.javac.source" value="1.6"/>
-    <property name="ant.build.javac.target" value="1.6"/>
-
-	<target name="process" description="prepare a temp dir">
-		<antcall target="prepare" />
-		<antcall target="compile" />
-		<antcall target="clean" />		
-	</target>
-
-	<target name="prepare" description="prepare a temp dir">
-		<delete dir="${build.dir}" />
-		<mkdir dir="${build.dir}" />
-		<mkdir dir="${build.dir}/classes" />
-	</target>
-
-	<target name="compile" description="Compile Java sources">
-
-		<!-- compile -->
-		<javac srcdir="${source.home}" destdir="${build.dir}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}">
-			<classpath refid="compile.classpath" />
-		</javac>
-		
-		<!-- include source code -->
-		<copy todir="${build.dir}/classes">
-			<fileset dir="${source.home}">
-				<exclude name="build.xml" />
-			</fileset>
-		</copy>
-
-		<!-- make jar -->
-		<tstamp>
-			<format property="date" pattern="yyyy-MM-dd HH:mm:ss" />
-		</tstamp>
-
-		<jar destfile="${build.dir}/${jar.name}" basedir="${build.dir}/classes">
-			<manifest>
-				<!-- who -->
-				<attribute name="Built-By" value="${author.name}" />
-				<!-- when -->
-				<attribute name="Built-Date" value="${date}"/>  
-				<!-- JDK version -->
-				<attribute name="Created-By" value="${java.version} (${java.vendor})" />
-				<!-- Information about the program itself -->
-				<attribute name="Implementation-Vendor" value="Talend SA" />
-				<attribute name="Implementation-Title" value="${jar.name}" />
-				<attribute name="Implementation-Version" value="1.0" />
-			</manifest>
-		</jar>
-
-		<!-- move jar -->
-		<move file="${build.dir}/${jar.name}" tofile="${jar.home}" />
-
-	</target>
-
-	<target name="clean" description="clean the temp dir">
-		<delete dir="${build.dir}" />
-		<mkdir dir="${build.dir}" />
-	</target>
-</project>

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

@@ -228,8 +228,8 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="aws-java-sdk-1.11.729.jar" MODULE="aws-java-sdk-1.11.729.jar"
-				MVN="mvn:com.amazonaws/aws-java-sdk/1.11.729"
+			<IMPORT NAME="aws-java-sdk-1.11.848.jar" MODULE="aws-java-sdk-1.11.848.jar"
+				MVN="mvn:com.amazonaws/aws-java-sdk/1.11.848"
 				REQUIRED="true" />
 			<IMPORT NAME="jackson-core-2.10.1.jar" MODULE="jackson-core-2.10.1.jar"
 				MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1"
@@ -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,19 +537,26 @@
 		</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>
 		<IMPORTS>
-			<IMPORT NAME="aws-java-sdk-1.11.729.jar" MODULE="aws-java-sdk-1.11.729.jar"
-				MVN="mvn:com.amazonaws/aws-java-sdk/1.11.729"
+			<IMPORT NAME="aws-java-sdk-1.11.848.jar" MODULE="aws-java-sdk-1.11.848.jar"
+				MVN="mvn:com.amazonaws/aws-java-sdk/1.11.848"
 				REQUIRED="true" />
 			<IMPORT NAME="jackson-core-2.10.1.jar" MODULE="jackson-core-2.10.1.jar"
 				MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1"
@@ -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/tAmazonEMRManage/tAmazonEMRManage_messages_en.properties

@@ -223,3 +223,6 @@ SIGNING_REGION.ITEM.AP_NORTHEAST_2=Asia Pacific (Seoul)
 SIGNING_REGION.ITEM.AP_SOUTH_1=Asia Pacific (Mumbai)
 SIGNING_REGION.ITEM.CA_CENTRAL_1=Canada (Central)
 CLUSTER_VERSION.ITEM.EMR5_29_0=EMR 5.29.0
+SLAVE_INSTANCE_COUNT.NAME=Slave instance count
+PROPERTY_JSON.NAME=Properties in JSON
+USE_MULTIPLE_MASTER_NODES.NAME=Use multiple master nodes

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

@@ -285,8 +285,8 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="aws-java-sdk-1.11.729.jar" MODULE="aws-java-sdk-1.11.729.jar"
-				MVN="mvn:com.amazonaws/aws-java-sdk/1.11.729"
+			<IMPORT NAME="aws-java-sdk-1.11.848.jar" MODULE="aws-java-sdk-1.11.848.jar"
+				MVN="mvn:com.amazonaws/aws-java-sdk/1.11.848"
 				REQUIRED="true" />
 			<IMPORT NAME="jackson-core-2.10.1.jar" MODULE="jackson-core-2.10.1.jar"
 				MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1"
@@ -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_begin.javajet

@@ -216,7 +216,54 @@
     	}
     	%>
 		
+	<%
+	} else if("PAUSE_CLUSTER".equals(action)) {
+	%>
+		com.amazonaws.services.redshift.model.PauseClusterRequest request_Pause_<%=cid %> = 
+				new com.amazonaws.services.redshift.model.PauseClusterRequest().withClusterIdentifier(<%=cluster_id%>);		
+				
+		com.amazonaws.services.redshift.model.Cluster result_<%=cid%> = client_<%=cid %>.pauseCluster(request_Pause_<%=cid %>);
+		<%if(isLog4jEnabled) {%>
+    	log.info("<%=cid%> - cluster status : " + result_<%=cid%>);
+    	<%}%>
+		globalMap.put("<%=cid %>_CLUSTER_FINAL_ID", result_<%=cid%>.getClusterIdentifier());
 		
+	<%
+	} else if("RESUME_CLUSTER".equals(action)) {
+	%>
+		com.amazonaws.services.redshift.model.ResumeClusterRequest request_Resume_<%=cid %> = 
+				new com.amazonaws.services.redshift.model.ResumeClusterRequest().withClusterIdentifier(<%=cluster_id%>);		
+				
+		com.amazonaws.services.redshift.model.Cluster result_<%=cid%> = client_<%=cid %>.resumeCluster(request_Resume_<%=cid %>);
+		<%if(isLog4jEnabled) {%>
+    	log.info("<%=cid%> - cluster status : " + result_<%=cid%>);
+    	<%}%>
+		globalMap.put("<%=cid %>_CLUSTER_FINAL_ID", result_<%=cid%>.getClusterIdentifier());
+		
+		<%
+    	if(wait_for_cluster_ready) {
+    	%>
+    		boolean clusterReady_<%=cid%> = false;
+            System.out.println("Wating for cluster to become available.");
+            while (!clusterReady_<%=cid%>) {
+                com.amazonaws.services.redshift.model.DescribeClustersResult result2_<%=cid%> = client_<%=cid%>.describeClusters(
+                	new com.amazonaws.services.redshift.model.DescribeClustersRequest()
+                   		.withClusterIdentifier(result_<%=cid%>.getClusterIdentifier())
+                );
+                com.amazonaws.services.redshift.model.Cluster cluster_<%=cid%> = result2_<%=cid%>.getClusters().get(0);
+                String status_<%=cid%> = cluster_<%=cid%>.getClusterStatus();
+                if ("available".equalsIgnoreCase(status_<%=cid%>)) {
+                    clusterReady_<%=cid%> = true;
+                    globalMap.put("<%=cid %>_ENDPOINT", cluster_<%=cid%>.getEndpoint().getAddress());
+                } else {
+                    System.out.print(".");
+                    Thread.sleep(2000);
+                }
+            }
+    	<%
+    	}
+    	%>
+	
 	<%
 	} else if("RESTORE_FROM_SNAPSHOT".equals(action)) {
 	%>

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

@@ -71,6 +71,8 @@
 				<ITEM NAME="CREATE_CLUSTER" VALUE="CREATE_CLUSTER" />
 				<ITEM NAME="DELETE_CLUSTER" VALUE="DELETE_CLUSTER" />
 				<ITEM NAME="RESIZE_CLUSTER" VALUE="RESIZE_CLUSTER" />
+				<ITEM NAME="PAUSE_CLUSTER" VALUE="PAUSE_CLUSTER" />
+				<ITEM NAME="RESUME_CLUSTER" VALUE="RESUME_CLUSTER" />
 				<ITEM NAME="RESTORE_FROM_SNAPSHOT" VALUE="RESTORE_FROM_SNAPSHOT" />
 				<ITEM NAME="DELETE_SNAPSHOT" VALUE="DELETE_SNAPSHOT" />
 			</ITEMS>
@@ -142,6 +144,8 @@
 				<ITEM NAME="ds2.8xlarge" VALUE="&quot;ds2.8xlarge&quot;" />
 				<ITEM NAME="ds1.xlarge" VALUE="&quot;ds1.xlarge&quot;" />
 				<ITEM NAME="ds1.8xlarge" VALUE="&quot;ds1.8xlarge&quot;" />
+				<ITEM NAME="ra3.4xlarge" VALUE="&quot;ra3.4xlarge&quot;" />
+				<ITEM NAME="ra3.16xlarge" VALUE="&quot;ra3.16xlarge&quot;" />
 			</ITEMS>
 		</PARAMETER>
 
@@ -275,7 +279,7 @@
 		
 		<PARAMETER NAME="WAIT_FOR_CLUSTER_READY" FIELD="CHECK"
 			NUM_ROW="9"
-			SHOW_IF="(ACTION=='CREATE_CLUSTER') OR (ACTION=='RESIZE_CLUSTER') OR (ACTION=='RESTORE_FROM_SNAPSHOT')"
+			SHOW_IF="(ACTION=='CREATE_CLUSTER') OR (ACTION=='RESIZE_CLUSTER') OR (ACTION=='RESTORE_FROM_SNAPSHOT') OR (ACTION=='RESUME_CLUSTER')"
 			GROUP="ADVANCED_CONFIGURATION">
 			<DEFAULT>true</DEFAULT>
 		</PARAMETER>
@@ -341,8 +345,8 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="aws-java-sdk-1.11.729.jar" MODULE="aws-java-sdk-1.11.729.jar"
-				MVN="mvn:com.amazonaws/aws-java-sdk/1.11.729"
+			<IMPORT NAME="aws-java-sdk-1.11.848.jar" MODULE="aws-java-sdk-1.11.848.jar"
+				MVN="mvn:com.amazonaws/aws-java-sdk/1.11.848"
 				REQUIRED="true" />
 			<IMPORT NAME="jackson-core-2.10.1.jar" MODULE="jackson-core-2.10.1.jar"
 				MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1"
@@ -353,11 +357,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 +369,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/tAmazonRedshiftManage/tAmazonRedshiftManage_messages.properties

@@ -12,6 +12,8 @@ ACTION.NAME=Action
 ACTION.ITEM.CREATE_CLUSTER=Create cluster
 ACTION.ITEM.DELETE_CLUSTER=Delete cluster
 ACTION.ITEM.RESIZE_CLUSTER=Resize cluster
+ACTION.ITEM.PAUSE_CLUSTER=Pause cluster
+ACTION.ITEM.RESUME_CLUSTER=Resume cluster
 ACTION.ITEM.RESTORE_FROM_SNAPSHOT=Restore from snapshot
 ACTION.ITEM.DELETE_SNAPSHOT=Delete snapshot
 
@@ -46,6 +48,8 @@ NODE_TYPE.ITEM.ds2.xlarge=ds2.xlarge
 NODE_TYPE.ITEM.ds2.8xlarge=ds2.8xlarge
 NODE_TYPE.ITEM.ds1.xlarge=ds1.xlarge
 NODE_TYPE.ITEM.ds1.8xlarge=ds1.8xlarge
+NODE_TYPE.ITEM.ra3.4xlarge=ra3.4xlarge
+NODE_TYPE.ITEM.ra3.16xlarge=ra3.16xlarge
 
 NODE_COUNT.NAME=Node count
 

main/plugins/org.talend.designer.components.localprovider/components/tAmazonRedshiftManage/tAmazonRedshiftManage_messages_en.properties

@@ -88,3 +88,7 @@ SIGNING_REGION.ITEM.AP_NORTHEAST_1=Asia Pacific (Tokyo)
 SIGNING_REGION.ITEM.AP_NORTHEAST_2=Asia Pacific (Seoul)
 SIGNING_REGION.ITEM.AP_SOUTH_1=Asia Pacific (Mumbai)
 SIGNING_REGION.ITEM.CA_CENTRAL_1=Canada (Central)
+ACTION.ITEM.PAUSE_CLUSTER=Pause cluster
+ACTION.ITEM.RESUME_CLUSTER=Resume cluster
+NODE_TYPE.ITEM.ra3.4xlarge=ra3.4xlarge
+NODE_TYPE.ITEM.ra3.16xlarge=ra3.16xlarge

main/plugins/org.talend.designer.components.localprovider/components/tApacheLogInput/tApacheLogInput_java.xml

@@ -149,7 +149,7 @@
     <IMPORTS>
       <IMPORT
         NAME="Talen File Enhanced"
-        MODULE="talend_file_enhanced_20070724.jar" MVN="mvn:org.talend.libraries/talend_file_enhanced_20070724/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.custom/lib/talend_file_enhanced_20070724.jar"
+        MODULE="talend_file_enhanced-1.0.jar" MVN="mvn:org.talend.components.lib/talend_file_enhanced/1.0"  UrlPath="platform:/plugin/org.talend.libraries.custom/lib/talend_file_enhanced-1.0.jar"
         REQUIRED="true"
       />
     </IMPORTS>

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

@@ -77,7 +77,7 @@ skeleton="../templates/db_output_bulk.skeleton"
 
     String connection = ElementParameterParser.getValue(node,"__CONNECTION__");
     if(useExistingConnection) {
-        List<? extends INode> nodes = process.getNodesOfType("tAzureSynapseConnection");
+        List<? extends INode> nodes = process.getNodesOfType("tInformixConnection");
         for (INode ne:nodes) {
             if (connection.equals(ne.getUniqueName())) {
                 setAutoCommit = "true".equals(ElementParameterParser.getValue(ne, "__AUTO_COMMIT__"));
@@ -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

@@ -124,14 +124,20 @@
 		<ITEM NAME="EMPTY" VALUE="EMPTY" />
 	</ITEMS>
     </PARAMETER>
-    <PARAMETER NAME="BULK_FILE_ALREADY_EXIST" FIELD="CHECK" NUM_ROW="59" REQUIRED="true" GROUP="GS_CONF">
-	<DEFAULT>false</DEFAULT>
+
+    <PARAMETER 
+      NAME="BULK_FILE_ALREADY_EXIST" 
+      FIELD="CHECK" 
+      NUM_ROW="58" 
+      REQUIRED="true" 
+      GROUP="GS_CONF">
+      <DEFAULT>false</DEFAULT>
     </PARAMETER>
 
     <PARAMETER
       NAME="AUTH_TYPE"
       FIELD="CLOSED_LIST"
-      NUM_ROW="58"
+      NUM_ROW="59"
       GROUP="GS_CONF"
       SHOW_IF="(BULK_FILE_ALREADY_EXIST=='false')"
       >
@@ -233,14 +239,14 @@
          <IMPORT NAME="google-http-client-1.25.0.jar" MODULE="google-http-client-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.25.0"  REQUIRED="true" />
          <IMPORT NAME="google-oauth-client-1.25.0.jar" MODULE="google-oauth-client-1.25.0.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.25.0" REQUIRED="true" />
          <IMPORT NAME="google-http-client-jackson2-1.25.0.jar" MODULE="google-http-client-jackson2-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.25.0"  REQUIRED="true" />
-		<IMPORT NAME="guava-jdk5-13.0.jar" MODULE="guava-jdk5-13.0.jar" MVN="mvn:org.talend.libraries/guava-jdk5-13.0/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.guava/lib/guava-jdk5-13.0.jar" REQUIRED="true" />
+         <IMPORT NAME="guava-20.0.jar" MODULE="guava-20.0.jar" MVN="mvn:com.google.guava/guava/20.0" REQUIRED="true" />
 		<IMPORT NAME="jackson-core-2.10.1.jar" MODULE="jackson-core-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1" REQUIRED="true" />
 		<!-- REQUIRED FOR GOOGLE STORAGE -->
 		<IMPORT NAME="jets3t-0.9.1" MODULE="jets3t-0.9.1.jar" MVN="mvn:org.talend.libraries/jets3t-0.9.1/6.0.0"  REQUIRED="true" />
 		<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED="true" />
-		<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'" />
@@ -250,7 +256,6 @@
 		<IMPORT NAME="google-auth-library-oauth2-http-0.20.0.jar" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
 		<IMPORT NAME="google-cloud-core-1.93.4.jar" MODULE="google-cloud-core-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core/1.93.4" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
 		<IMPORT NAME="google-cloud-core-http-1.32.0.jar" MODULE="google-cloud-core-http-1.32.0.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.32.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
-		<IMPORT NAME="guava-20.0.jar" MODULE="guava-20.0.jar" MVN="mvn:com.google.guava/guava/20.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
 		<IMPORT NAME="gax-1.27.0.jar" MODULE="gax-1.27.0.jar" MVN="mvn:com.google.api/gax/1.27.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT')" />
 		<IMPORT NAME="google-http-client-appengine-1.25.0.jar" MODULE="google-http-client-appengine-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.25.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT')" />
 		<IMPORT NAME="api-common-1.6.0.jar" MODULE="api-common-1.6.0.jar" MVN="mvn:com.google.api/api-common/1.6.0" REQUIRED_IF="(AUTH_MODE == 'SERVICEACCOUNT') OR (AUTH_TYPE == 'GS_SERVICE_ACCOUNT')" />

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

@@ -185,7 +185,7 @@
 		 <IMPORT NAME="google-http-client-1.25.0.jar" MODULE="google-http-client-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.25.0"  REQUIRED="true" />
 		 <IMPORT NAME="google-oauth-client-1.25.0.jar" MODULE="google-oauth-client-1.25.0.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.25.0" REQUIRED="true" />
 		 <IMPORT NAME="google-http-client-jackson2-1.25.0.jar" MODULE="google-http-client-jackson2-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.25.0"  REQUIRED="true" />
-		<IMPORT NAME="guava-jdk5-13.0.jar" MODULE="guava-jdk5-13.0.jar" MVN="mvn:org.talend.libraries/guava-jdk5-13.0/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.guava/lib/guava-jdk5-13.0.jar" REQUIRED="true" />
+		 <IMPORT NAME="guava-20.0.jar" MODULE="guava-20.0.jar" MVN="mvn:com.google.guava/guava/20.0" REQUIRED="true" />
 		<IMPORT NAME="jackson-core-2.10.1.jar" MODULE="jackson-core-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1" 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'" />
@@ -196,7 +196,6 @@
 		<IMPORT NAME="google-auth-library-oauth2-http-0.20.0.jar" MODULE="google-auth-library-oauth2-http-0.20.0.jar" MVN="mvn:com.google.auth/google-auth-library-oauth2-http/0.20.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
 		<IMPORT NAME="google-cloud-core-1.93.4.jar" MODULE="google-cloud-core-1.93.4.jar" MVN="mvn:com.google.cloud/google-cloud-core/1.93.4" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
 		<IMPORT NAME="google-cloud-core-http-1.32.0.jar" MODULE="google-cloud-core-http-1.32.0.jar" MVN="mvn:com.google.cloud/google-cloud-core-http/1.32.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
-		<IMPORT NAME="guava-20.0.jar" MODULE="guava-20.0.jar" MVN="mvn:com.google.guava/guava/20.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
 		<IMPORT NAME="gax-1.27.0.jar" MODULE="gax-1.27.0.jar" MVN="mvn:com.google.api/gax/1.27.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
 		<IMPORT NAME="google-http-client-appengine-1.25.0.jar" MODULE="google-http-client-appengine-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-appengine/1.25.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
 		<IMPORT NAME="api-common-1.6.0.jar" MODULE="api-common-1.6.0.jar" MVN="mvn:com.google.api/api-common/1.6.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />

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

@@ -172,9 +172,7 @@
             <IMPORT NAME="google-http-client-1.25.0.jar" MODULE="google-http-client-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client/1.25.0"  REQUIRED="true" />
             <IMPORT NAME="google-oauth-client-1.25.0.jar" MODULE="google-oauth-client-1.25.0.jar" MVN="mvn:com.google.oauth-client/google-oauth-client/1.25.0" REQUIRED="true" />
             <IMPORT NAME="google-http-client-jackson2-1.25.0.jar" MODULE="google-http-client-jackson2-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson2/1.25.0"  REQUIRED="true" />
-            <IMPORT NAME="guava-jdk5-13.0.jar" MODULE="guava-jdk5-13.0.jar"
-                    MVN="mvn:org.talend.libraries/guava-jdk5-13.0/6.0.0"
-                    UrlPath="platform:/plugin/org.talend.libraries.guava/lib/guava-jdk5-13.0.jar" REQUIRED="true"/>
+            <IMPORT NAME="guava-20.0.jar" MODULE="guava-20.0.jar" MVN="mvn:com.google.guava/guava/20.0" REQUIRED="true"/>
             <IMPORT NAME="jackson-core-2.10.1.jar" MODULE="jackson-core-2.10.1.jar"
                     MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1" REQUIRED="true"/>
             <IMPORT NAME="google-cloud-bigquery-1.60.0.jar" MODULE="google-cloud-bigquery-1.60.0.jar"
@@ -200,8 +198,6 @@
             <IMPORT NAME="google-cloud-core-http-1.32.0.jar" MODULE="google-cloud-core-http-1.32.0.jar"
                     MVN="mvn:com.google.cloud/google-cloud-core-http/1.32.0"
                     REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
-            <IMPORT NAME="guava-20.0.jar" MODULE="guava-20.0.jar" MVN="mvn:com.google.guava/guava/20.0"
-                    REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
             <IMPORT NAME="gax-1.27.0.jar" MODULE="gax-1.27.0.jar" MVN="mvn:com.google.api/gax/1.27.0"
                     REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'"/>
             <IMPORT NAME="google-http-client-appengine-1.25.0.jar" MODULE="google-http-client-appengine-1.25.0.jar"

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" 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" 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" 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,14 +313,14 @@
 			<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 -->
-			<IMPORT NAME="apache_commons_codec_1_7" MODULE="commons-codec-1.7.jar" MVN="mvn:org.talend.libraries/commons-codec-1.7/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-codec-1.7.jar" REQUIRED_IF="CLIENT_MODE=='HTTP_CLIENT'" />
+		   <IMPORT NAME="commons-codec-1.14" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" REQUIRED_IF="CLIENT_MODE=='HTTP_CLIENT'" />
 	     </IMPORTS>
 	</CODEGENERATION>
 

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/tCreateTable/tCreateTable_java.xml

@@ -888,9 +888,9 @@
 		<IMPORT NAME="Driver-INFORMIX-TOOLS" MODULE="ifxtools.jar" MVN="mvn:org.talend.libraries/ifxtools/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='INFORMIX')"/>
 		<IMPORT NAME="Driver-INGRES" MODULE="iijdbc.jar" MVN="mvn:org.talend.libraries/iijdbc/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.jdbc.ingres/lib/iijdbc.jar" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='INGRES')"/>
 		<IMPORT NAME="Driver-Interbase" MODULE="interclient.jar" MVN="mvn:org.talend.libraries/interclient/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='INTERBASE')" />
-		<IMPORT NAME="Driver-JAVADB-DERBY" MODULE="derby.jar" MVN="mvn:org.talend.libraries/derby/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.jdbc.derby/lib/derby.jar" REQUIRED_IF="DBTYPE=='JAVADB'"/>
-		<IMPORT NAME="Driver-JAVADB-DERBYCLIENT" MODULE="derbyclient.jar" MVN="mvn:org.talend.libraries/derbyclient/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.jdbc.derby/lib/derbyclient.jar" REQUIRED_IF="DBTYPE=='JAVADB'"/>
-		<IMPORT NAME="Driver-JAVADB-DERBYNET" MODULE="derbynet.jar" MVN="mvn:org.talend.libraries/derbynet/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.jdbc.derby/lib/derbynet.jar" REQUIRED_IF="DBTYPE=='JAVADB'"/>
+		<IMPORT NAME="Driver-JAVADB-DERBY" MODULE="derby.jar" MVN="mvn:org.talend.libraries/derby/6.0.0" REQUIRED_IF="DBTYPE=='JAVADB'"/>
+		<IMPORT NAME="Driver-JAVADB-DERBYCLIENT" MODULE="derbyclient.jar" MVN="mvn:org.talend.libraries/derbyclient/6.0.0" REQUIRED_IF="DBTYPE=='JAVADB'"/>
+		<IMPORT NAME="Driver-JAVADB-DERBYNET" MODULE="derbynet.jar" MVN="mvn:org.talend.libraries/derbynet/6.0.0" REQUIRED_IF="DBTYPE=='JAVADB'"/>
 		<IMPORT NAME="Driver-SQLITE-JDBC-NESTED" MODULE="sqlitejdbc-v056.jar" MVN="mvn:org.talend.libraries/sqlitejdbc-v056/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.jdbc.sqlite3/lib/sqlitejdbc-v056.jar" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='SQLITE')" />
 		<IMPORT NAME="Driver-SYBASE-JCONN3" MODULE="jconn3.jar" MVN="mvn:org.talend.libraries/jconn3/6.0.0" BundleID="" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='SYBASE') AND (DB_SYBASE_VERSION == 'SYBSEIQ_12_15')" />
 		<IMPORT NAME="Driver-SYBASE-JCONN4" MODULE="jconn4.jar" MVN="mvn:org.talend.libraries/jconn4/6.0.0" BundleID="" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='SYBASE') AND (DB_SYBASE_VERSION == 'SYBSEIQ_16')" />
@@ -910,7 +910,7 @@
   		<IMPORT NAME="Driver-VERTICA_7.1.2" MODULE="vertica-jdbc-7.1.2-0.jar" MVN="mvn:org.talend.libraries/vertica-jdbc-7.1.2-0/6.0.0" REQUIRED_IF="(DBTYPE=='VERTICA') and (USE_EXISTING_CONNECTION == 'false') and (DB_VERTICA_VERSION=='VERTICA_7_1_X')" />
   		<IMPORT NAME="Driver-EXASolution" MODULE="exajdbc-6.0.9302.jar" MVN="mvn:org.talend.libraries/exajdbc-6.0.9302/6.3.0"  REQUIRED_IF="(DBTYPE=='EXASOL') and (USE_EXISTING_CONNECTION == 'false')" />
 		<IMPORT NAME="Driver-Redshift" MODULE="redshift-jdbc42-no-awssdk-1.2.37.1061.jar" MVN="mvn:com.amazon.redshift/redshift-jdbc42-no-awssdk/1.2.37.1061" REQUIRED_IF="(DBTYPE=='REDSHIFT') and (USE_EXISTING_CONNECTION == 'false')" />
-		<IMPORT NAME="Driver-Snowflake" MODULE="snowflake-jdbc-3.11.1.jar" MVN="mvn:net.snowflake/snowflake-jdbc/3.11.1"  REQUIRED_IF="(DBTYPE=='SNOWFLAKE') and (USE_EXISTING_CONNECTION == 'false')" />
+		<IMPORT NAME="Driver-Snowflake" MODULE="snowflake-jdbc-3.12.11.jar" MVN="mvn:net.snowflake/snowflake-jdbc/3.12.11"  REQUIRED_IF="(DBTYPE=='SNOWFLAKE') and (USE_EXISTING_CONNECTION == 'false')" />
 		<IMPORT NAME="Driver-VERTICA_9.0" MODULE="vertica-jdbc-9.3.1-0.jar" MVN="mvn:com.vertica/vertica-jdbc/9.3.1-0"   REQUIRED_IF="(DBTYPE=='VERTICA') and (USE_EXISTING_CONNECTION == 'false') and (DB_VERTICA_VERSION=='VERTICA_9_0')"/>
      </IMPORTS>
    </CODEGENERATION>

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);%>
         <%
         }