fix(TESB-27713): Fix by checking if the child job is of type routines.system.api.TalendESBJob since method setEndpointRegistry exists only in routines.system.api.TalendESBJob interface and sometimes the job is not of that type.

* fix(TDI-43222): Lock write operation by filename in parallel

* fix(TDI-43222): Apply same changes for tFileOutputPositional

PATCH_RELEASE_NOTE.md

@@ -1,57 +0,0 @@
----
-version: 6.3.1
-module: https://talend.poolparty.biz/coretaxonomy/42
-product:
-- https://talend.poolparty.biz/coretaxonomy/23
----
-
-# TPS-3694
-
-| Info             | Value |
-| ---------------- | ---------------- |
-| Patch Name       | Patch\_20200107\_TPS\-3694\_v1\-6.3.1 |
-| Release Date     | 2020-01-07 |
-| Target Version   | Talend-Studio-20161216_1026-V6.3.1 |
-| Product affected | Talend Studio |
-
-## Introduction
-
-This is a self-contained patch.
-
-**NOTE**: For information on how to obtain this patch, reach out to your Support contact at Talend.
-
-## Fixed issues
-
-This patch contains the following fixes:
-
-- TPS-3694  [6.3.1] Getting Compilation error while enabling store on Disk in tmap with dynamic datatype columns (TDI-43446)
-
-## Prerequisites
-
-Consider the following requirements for your system:
-
-- Talend Studio 6.3.1 must be installed.
-
-## Installation
-
-### Installing the patch using Software update
-
-1) Logon TAC and switch to Configuration->Software Update, then enter the correct values and save referring to the documentation: https://help.talend.com/reader/f7Em9WV_cPm2RRywucSN0Q/j9x5iXV~vyxMlUafnDejaQ
-
-2) Switch to Software update page, where the new patch will be listed. The patch can be downloaded from here into the nexus repository.
-
-3) On Studio Side: Logon Studio with remote mode, on the logon page the Update button is displayed: click this button to install the patch.
-
-### Installing the patch using Talend Studio
-
-1) Create a folder named "patches" under your studio installer directory and copy the patch .zip file to this folder.
-
-2) Restart your studio: a window pops up, then click OK to install the patch, or restart the commandline and the patch will be installed automatically.
-
-### Installing the patch using Commandline
-
-Execute the following commands:
-
-1. Talend-Studio-win-x86_64.exe -nosplash -application org.talend.commandline.CommandLine -consoleLog -data commandline-workspace startServer -p 8002 --talendDebug
-2. initRemote {tac_url} -ul {TAC login username} -up {TAC login password}
-3. checkAndUpdate -tu {TAC login username} -tup {TAC login password}

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

@@ -211,10 +211,8 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="Java_DOM4J1.6" MODULE="dom4j-1.6.1.jar" MVN="mvn:dom4j/dom4j/1.6.1"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/dom4j-1.6.1.jar"
-				REQUIRED="true" BundleID="" />
-			<IMPORT NAME="Java_JAXEN1.1" MODULE="jaxen-1.1.1.jar" MVN="mvn:org.talend.libraries/jaxen-1.1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/jaxen-1.1.1.jar"
-				REQUIRED="true" BundleID="" />
+			<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_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/tBigQueryBulkExec/tBigQueryBulkExec_begin.javajet

@@ -5,6 +5,7 @@
 		org.talend.designer.codegen.config.CodeGeneratorArgument
 		org.talend.core.model.metadata.IMetadataTable 
 		org.talend.core.model.metadata.IMetadataColumn 
+		org.talend.core.model.process.IConnection
 		java.util.List
 	    "
 %>
@@ -36,6 +37,18 @@
 	
 	String passwordFieldName = "";
 	
+	IConnection incomingConnection = null;
+	if(node.getUniqueName().startsWith("tBigQueryOutput_")) {
+		List< ? extends IConnection> conns = node.getIncomingConnections();
+		IConnection virtConnection = null;
+		if(conns!=null && conns.size()>0){
+			virtConnection = node.getIncomingConnections().get(0);
+		}
+		if(virtConnection != null && virtConnection.getSource() != null && virtConnection.getSource().getIncomingConnections() != null && virtConnection.getSource().getIncomingConnections().size() > 0) {
+			incomingConnection = virtConnection.getSource().getIncomingConnections().get(0);
+		}
+	}
+	
     if (authMode.equals("OAUTH")) {
 		%>
 		/* ----START-CREATING-CLIENT (OAuth 2.0)---- */
@@ -247,6 +260,11 @@
 	%>
 
 	<%
+	if(isLog4jEnabled){
+	%>
+	int currIndex_<%=cid%> = 0;
+	<%
+	}
     if (authMode.equals("OAUTH")) {
 		if(isLog4jEnabled){
 		%>
@@ -309,41 +327,82 @@
 						if (metadata != null) {
 							List<IMetadataColumn> columns = metadata.getListColumns();
 							int nbColumns = columns.size();
+							int dynamicColumnSize = 0;
 							for (int i = 0; i < nbColumns; i++ ) {
 								IMetadataColumn column = columns.get(i);
 								String columnName = column.getLabel();
-								String typeToGenerate = "string";
-								if("id_Float".equals(column.getTalendType()) || "id_Double".equals(column.getTalendType())) {
-									typeToGenerate = "float";
-								}else if("id_Integer".equals(column.getTalendType()) || "id_Long".equals(column.getTalendType()) || "id_Short".equals(column.getTalendType())) {
-									typeToGenerate = "integer";
-								} else if("id_Character".equals(column.getTalendType())) {
-									typeToGenerate = "string";
-								} else if("id_BigDecimal".equals(column.getTalendType())) {
-									typeToGenerate = "numeric";
-								} else if("id_Boolean".equals(column.getTalendType())) {
-									typeToGenerate = "boolean";
-								} else if("id_Date".equals(column.getTalendType())) {
-									String pattern = column.getPattern();
-								    if(pattern.length() == 12 || pattern.isEmpty() || "\"\"".equals(pattern)) {
-								        typeToGenerate = "date";
-								    }else if(pattern.length() > 12){
-								        typeToGenerate = "timestamp";
-								    }else{
-								        typeToGenerate = "string";
-								    }
-								}
-								String modeType = (!column.isNullable()) ? "REQUIRED" : "NULLABLE";
+								if(!"id_Dynamic".equals(column.getTalendType())) {
+									String typeToGenerate = "string";
+									if("id_Float".equals(column.getTalendType()) || "id_Double".equals(column.getTalendType())) {
+										typeToGenerate = "float";
+									}else if("id_Integer".equals(column.getTalendType()) || "id_Long".equals(column.getTalendType()) || "id_Short".equals(column.getTalendType())) {
+										typeToGenerate = "integer";
+									} else if("id_Character".equals(column.getTalendType())) {
+										typeToGenerate = "string";
+									} else if("id_BigDecimal".equals(column.getTalendType())) {
+										typeToGenerate = "numeric";
+									} else if("id_Boolean".equals(column.getTalendType())) {
+										typeToGenerate = "boolean";
+									} else if("id_Date".equals(column.getTalendType())) {
+										String pattern = column.getPattern();
+										if(pattern.length() == 12 || pattern.isEmpty() || "\"\"".equals(pattern)) {
+											typeToGenerate = "date";
+										}else if(pattern.length() > 12){
+											typeToGenerate = "timestamp";
+										}else{
+											typeToGenerate = "string";
+										}
+									}
+									String modeType = (!column.isNullable()) ? "REQUIRED" : "NULLABLE";
+									%>
+									com.google.api.services.bigquery.model.TableFieldSchema <%=columnName%>_<%=cid%> = new com.google.api.services.bigquery.model.TableFieldSchema();
+									<%=columnName%>_<%=cid%>.setName("<%=columnName%>");
+									<%=columnName%>_<%=cid%>.setType("<%=typeToGenerate%>");
+									<%=columnName%>_<%=cid%>.setMode("<%=modeType%>");
+									fields_<%=cid%>.add(<%=columnName%>_<%=cid%>);
+									<%
+									if(isLog4jEnabled){
+									%>
+										log.debug("<%=cid%> - Field index[" + currIndex_<%=cid%> + "] {\"name\":\"<%=columnName%>\",\"type\":\"<%=typeToGenerate%>\",\"mode\":\"<%=modeType%>\"}");
+										currIndex_<%=cid%>++;
+									<%
+									}
+								} else if(incomingConnection != null) {
 								%>
-								com.google.api.services.bigquery.model.TableFieldSchema <%=columnName%>_<%=cid%> = new com.google.api.services.bigquery.model.TableFieldSchema();
-								<%=columnName%>_<%=cid%>.setName("<%=columnName%>");
-								<%=columnName%>_<%=cid%>.setType("<%=typeToGenerate%>");
-								<%=columnName%>_<%=cid%>.setMode("<%=modeType%>");
-								fields_<%=cid%>.add(<%=columnName%>_<%=cid%>);
-								<%
-								if(isLog4jEnabled){
-								%>
-									log.debug("<%=cid%> - Field index[<%=i%>] {\"name\":\"<%=columnName%>\",\"type\":\"<%=typeToGenerate%>\",\"mode\":\"<%=modeType%>\"}");
+									routines.system.Dynamic column_<%=cid%> = (routines.system.Dynamic)<%=incomingConnection.getName()%>.<%=column.getLabel()%>;
+									for (int i = 0; i < column_<%=cid%>.getColumnCount(); i++) {
+										routines.system.DynamicMetadata metadata = column_<%=cid%>.getColumnMetadata(i);
+										String dataType = routines.system.MetadataTalendType.getDefaultSelectedDbType("bigquery_id", metadata.getType(), -1, -1);
+										String orignalDBType = metadata.getDbType();
+										java.util.List<String> outputDBTypelist = routines.system.MetadataTalendType.getTalendToDBList("bigquery_id", metadata.getType());
+										if (outputDBTypelist != null && outputDBTypelist.size() > 0) {
+											for (String dbType : outputDBTypelist) {
+												if (orignalDBType.equalsIgnoreCase(dbType)) {
+													dataType = dbType;
+													break;
+												}
+											}
+										}
+										if (dataType == null || ("").equals(dataType)) {
+											dataType = orignalDBType;
+										} else if(dataType.equalsIgnoreCase("RECORD") || dataType.equalsIgnoreCase("STRUCT")) {
+											dataType = "STRING";
+										}
+										String modeType = (!metadata.isNullable()) ? "REQUIRED" : "NULLABLE";
+										com.google.api.services.bigquery.model.TableFieldSchema <%=columnName%>_<%=cid%> = new com.google.api.services.bigquery.model.TableFieldSchema();
+										<%=columnName%>_<%=cid%>.setName(metadata.getName());
+										<%=columnName%>_<%=cid%>.setType(dataType);
+										<%=columnName%>_<%=cid%>.setMode(modeType);
+										fields_<%=cid%>.add(<%=columnName%>_<%=cid%>);
+										<%
+										if(isLog4jEnabled){
+										%>
+											log.debug("<%=cid%> - Field index[" + currIndex_<%=cid%> + "] {\"name\":\"" + metadata.getName() + "\",\"type\":\"" + dataType + "\",\"mode\":\"" + modeType + "\"}");
+											currIndex_<%=cid%>++;
+										<%
+										}
+										%>
+									}
 								<%
 								}
 							}
@@ -529,38 +588,117 @@
 						for (int i = 0; i < nbColumns; i++ ) {
 							IMetadataColumn column = columns.get(i);
 							String columnName = column.getLabel();
-							String typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.STRING";
-							if("id_String".equals(column.getTalendType()) || "id_Character".equals(column.getTalendType())) {
-								typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.STRING";
-							} else if ("id_Float".equals(column.getTalendType()) || "id_Double".equals(column.getTalendType())) {
-								typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.FLOAT";
-							} else if ("id_Short".equals(column.getTalendType()) || "id_Integer".equals(column.getTalendType()) || "id_Long".equals(column.getTalendType())) {
-								typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.INTEGER";
-							} else if ("id_BigDecimal".equals(column.getTalendType())) {
-								typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.NUMERIC";						
-							} else if ("id_Boolean".equals(column.getTalendType())) {
-								typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.BOOLEAN";
-							} else if ("id_Date".equals(column.getTalendType())) {							
-								String pattern = column.getPattern();
-							    if(pattern.length() == 12 || pattern.isEmpty() || "\"\"".equals(pattern)) {
-							        typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.DATE";
-							    }else if(pattern.length() > 12){
-							        typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.TIMESTAMP";
-							    }else{
-							        typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.STRING";
-							    }
-							}
-							String modeType = (!column.isNullable()) ? "REQUIRED" : "NULLABLE";
-						%>
-						
-						com.google.cloud.bigquery.Field field_<%=i%> = com.google.cloud.bigquery.Field.newBuilder("<%=columnName%>", <%=typeToGenerate%>)
-																									  .setMode(com.google.cloud.bigquery.Field.Mode.valueOf("<%=modeType%>"))
-																									  .build();
-						fields_<%=cid%>.add(field_<%=i%>);		
-							<%
-							if(isLog4jEnabled){
+							if(!"id_Dynamic".equals(column.getTalendType())) {
+								String typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.STRING";
+								if("id_String".equals(column.getTalendType()) || "id_Character".equals(column.getTalendType())) {
+									typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.STRING";
+								} else if ("id_Float".equals(column.getTalendType()) || "id_Double".equals(column.getTalendType())) {
+									typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.FLOAT";
+								} else if ("id_Short".equals(column.getTalendType()) || "id_Integer".equals(column.getTalendType()) || "id_Long".equals(column.getTalendType())) {
+									typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.INTEGER";
+								} else if ("id_BigDecimal".equals(column.getTalendType())) {
+									typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.NUMERIC";						
+								} else if ("id_Boolean".equals(column.getTalendType())) {
+									typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.BOOLEAN";
+								} else if ("id_Date".equals(column.getTalendType())) {							
+									String pattern = column.getPattern();
+									if(pattern.length() == 12 || pattern.isEmpty() || "\"\"".equals(pattern)) {
+										typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.DATE";
+									}else if(pattern.length() > 12){
+										typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.TIMESTAMP";
+									}else{
+										typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.STRING";
+									}
+								}
+								String modeType = (!column.isNullable()) ? "REQUIRED" : "NULLABLE";
 							%>
-								log.debug("<%=cid%> - Field index[<%=i%>] {\"name\":\"<%=columnName%>\",\"type\":\"<%=typeToGenerate%>\"}");
+							
+							com.google.cloud.bigquery.Field field_<%=i%> = com.google.cloud.bigquery.Field.newBuilder("<%=columnName%>", <%=typeToGenerate%>)
+																										  .setMode(com.google.cloud.bigquery.Field.Mode.valueOf("<%=modeType%>"))
+																										  .build();
+							fields_<%=cid%>.add(field_<%=i%>);		
+								<%
+								if(isLog4jEnabled){
+								%>
+									log.debug("<%=cid%> - Field index[" + currIndex_<%=cid%> + "] {\"name\":\"<%=columnName%>\",\"type\":\"<%=typeToGenerate%>\"}");
+									currIndex_<%=cid%>++;
+								<%
+								}
+							} else if(incomingConnection != null) {
+							%>
+								routines.system.Dynamic column_<%=cid%> = (routines.system.Dynamic)<%=incomingConnection.getName()%>.<%=column.getLabel()%>;
+								for (int i = 0; i < column_<%=cid%>.getColumnCount(); i++) {
+									com.google.cloud.bigquery.LegacySQLTypeName typeToGenerate = com.google.cloud.bigquery.LegacySQLTypeName.STRING;
+									routines.system.DynamicMetadata metadata = column_<%=cid%>.getColumnMetadata(i);
+									String dataType = routines.system.MetadataTalendType.getDefaultSelectedDbType("bigquery_id", metadata.getType(), -1, -1);
+									String orignalDBType = metadata.getDbType();
+									java.util.List<String> outputDBTypelist = routines.system.MetadataTalendType.getTalendToDBList("bigquery_id", metadata.getType());
+									if (outputDBTypelist != null && outputDBTypelist.size() > 0) {
+										for (String dbType : outputDBTypelist) {
+											if (orignalDBType.equalsIgnoreCase(dbType)) {
+												dataType = dbType;
+												break;
+											}
+										}
+									}
+									if (dataType == null || ("").equals(dataType)) {
+										dataType = orignalDBType;
+									}
+									String modeType = (!metadata.isNullable()) ? "REQUIRED" : "NULLABLE";
+									switch(dataType) {
+									case "BOOL":
+									case "BOOLEAN":
+										typeToGenerate = com.google.cloud.bigquery.LegacySQLTypeName.BOOLEAN;
+										break;
+									case "INT64":
+									case "INTEGER":
+										typeToGenerate = com.google.cloud.bigquery.LegacySQLTypeName.INTEGER;
+										break;
+									case "FLOAT64":
+									case "FLOAT":
+										typeToGenerate = com.google.cloud.bigquery.LegacySQLTypeName.FLOAT;
+										break;
+									case "STRING":
+										typeToGenerate = com.google.cloud.bigquery.LegacySQLTypeName.STRING;
+										break;
+									case "BYTES":
+										typeToGenerate = com.google.cloud.bigquery.LegacySQLTypeName.BYTES;
+										break;
+									case "TIMESTAMP":
+										typeToGenerate = com.google.cloud.bigquery.LegacySQLTypeName.TIMESTAMP;
+										break;
+									case "DATE":
+										typeToGenerate = com.google.cloud.bigquery.LegacySQLTypeName.DATE;
+										break;
+									case "TIME":
+										typeToGenerate = com.google.cloud.bigquery.LegacySQLTypeName.TIME;
+										break;
+									case "DATETIME":
+										typeToGenerate = com.google.cloud.bigquery.LegacySQLTypeName.DATETIME;
+										break;
+									case "NUMERIC":
+										typeToGenerate = com.google.cloud.bigquery.LegacySQLTypeName.NUMERIC;
+										break;
+									case "GEOGRAPHY":
+										typeToGenerate = com.google.cloud.bigquery.LegacySQLTypeName.valueOf("GEOGRAPHY");
+										break;
+									default:
+										typeToGenerate = com.google.cloud.bigquery.LegacySQLTypeName.STRING;
+										break;
+									}
+									com.google.cloud.bigquery.Field field_<%=i%> = com.google.cloud.bigquery.Field.newBuilder(metadata.getName(), typeToGenerate)
+																											  .setMode(com.google.cloud.bigquery.Field.Mode.valueOf(modeType))
+																											  .build();
+									fields_<%=cid%>.add(field_<%=i%>);
+									<%
+									if(isLog4jEnabled){
+									%>
+										log.debug("<%=cid%> - Field index[" + currIndex_<%=cid%> + "] {\"name\":\"" + metadata.getName() + "\",\"type\":\"" + typeToGenerate + "\",\"mode\":\"" + modeType + "\"}");
+										currIndex_<%=cid%>++;
+									<%
+									}
+									%>
+								}
 							<%
 							}
 						}
@@ -589,11 +727,11 @@
 																				
 			<%if(setFieldDelimiter) {
 	        %>
-	         	csvOptions_<%=cid%>.setFieldDelimiter(<%=fieldDelimiter%>);
+	         	loadJobBuilder_<%=cid%>.setFormatOptions(csvOptions_<%=cid%>.setFieldDelimiter(<%=fieldDelimiter%>).build());
 	        <%
 	        }
 	        %>		
-		   loadJobBuilder_<%=cid%>.setFormatOptions(csvOptions_<%=cid%>.build());
+		
 			loadJobBuilder_<%=cid%>.setNullMarker("\\N");																
 			com.google.cloud.bigquery.Job job_<%=cid%> = bigquery_<%=cid%>.create(com.google.cloud.bigquery.JobInfo.of(loadJobBuilder_<%=cid%>.build()));
 			job_<%=cid%> = job_<%=cid%>.waitFor(com.google.cloud.RetryOption.initialRetryDelay(org.threeten.bp.Duration.ofSeconds(1)));

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

@@ -183,12 +183,12 @@
    </ADVANCED_PARAMETERS>
    <CODEGENERATION>
      <IMPORTS>
-		<IMPORT NAME="google-api-client-1.19.0.jar" MODULE="google-api-client-1.19.0.jar" MVN="mvn:org.talend.libraries/google-api-client-1.19.0/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-api-client-1.19.0.jar" REQUIRED="true" />
-		<IMPORT NAME="google-api-services-oauth2-v2-rev78-1.19.0.jar" MODULE="google-api-services-oauth2-v2-rev78-1.19.0.jar" MVN="mvn:org.talend.libraries/google-api-services-oauth2-v2-rev78-1.19.0/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-api-services-oauth2-v2-rev78-1.19.0.jar" REQUIRED="true" />
-		<IMPORT NAME="google-api-services-bigquery-v2-rev391-1.21.0.jar" MODULE="google-api-services-bigquery-v2-rev391-1.21.0.jar" MVN="mvn:org.talend.libraries/google-api-services-bigquery-v2-rev391-1.21.0/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-api-services-bigquery-v2-rev391-1.21.0.jar" REQUIRED="true" />
-		<IMPORT NAME="google-http-client-1.19.0.jar" MODULE="google-http-client-1.19.0.jar" MVN="mvn:org.talend.libraries/google-http-client-1.19.0/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-http-client-1.19.0.jar" REQUIRED="true" />
-		<IMPORT NAME="google-oauth-client-1.19.0.jar" MODULE="google-oauth-client-1.19.0.jar" MVN="mvn:org.talend.libraries/google-oauth-client-1.19.0/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-oauth-client-1.19.0.jar" REQUIRED="true" />
-		<IMPORT NAME="google-http-client-jackson2-1.19.0.jar" MODULE="google-http-client-jackson2-1.19.0.jar" MVN="mvn:org.talend.libraries/google-http-client-jackson2-1.19.0/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-http-client-jackson2-1.19.0.jar" REQUIRED="true" />
+         <IMPORT NAME="google-api-client-1.25.0.jar" MODULE="google-api-client-1.25.0.jar" MVN="mvn:com.google.api-client/google-api-client/1.25.0"  REQUIRED="true" />
+         <IMPORT NAME="google-api-services-oauth2-v2-rev151-1.25.0.jar" MODULE="google-api-services-oauth2-v2-rev151-1.25.0.jar" MVN="mvn:com.google.apis/google-api-services-oauth2/v2-rev151-1.25.0"  REQUIRED="true" />
+         <IMPORT NAME="google-api-services-bigquery-v2-rev454-1.25.0.jar" MODULE="google-api-services-bigquery-v2-rev454-1.25.0.jar" MVN="mvn:com.google.apis/google-api-services-bigquery/v2-rev454-1.25.0" REQUIRED="true" />
+         <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="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 -->

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryInput/tBigQueryInput_begin.javajet

@@ -32,12 +32,37 @@
 	String basePackage = "";
 	boolean isCustomTemporaryName = ElementParameterParser.getBooleanValue(node,"__USE_CUSTOM_TEMPORARY_DATASET__");
 	String tempDataset =  ElementParameterParser.getValue(node,"__TEMPORARY_DATASET_NAME__");
+	
+	String encoding = ElementParameterParser.getValue(node,"__ENCODING__");
+	String advancedSeparatorStr = ElementParameterParser.getValue(node, "__ADVANCED_SEPARATOR__");
+	boolean advancedSeparator = (advancedSeparatorStr!=null&&!("").equals(advancedSeparatorStr))?("true").equals(advancedSeparatorStr):false;
+	String thousandsSeparator = ElementParameterParser.getValueWithJavaType(node, "__THOUSANDS_SEPARATOR__", JavaTypesManager.CHARACTER);
+	String decimalSeparator = ElementParameterParser.getValueWithJavaType(node, "__DECIMAL_SEPARATOR__", JavaTypesManager.CHARACTER);
 
 	query = query.replaceAll("\n"," ");
 	query = query.replaceAll("\r"," ");
 
     String tokenFile = ElementParameterParser.getValue(node,"__TOKEN_NAME__");
     boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(node.getProcess(), "__LOG4J_ACTIVATE__"));
+	
+	//Dynamic start
+	List<IMetadataTable> metadatas = node.getMetadataList();
+	    int sizeListColumns = 0;
+		List<IMetadataColumn> columnList = null;
+		boolean isDynamic = false;
+	    if ((metadatas!=null)&&(metadatas.size()>0)) {
+		    IMetadataTable metadata = metadatas.get(0);
+			isDynamic = metadata.isDynamicSchema();
+		    if (metadata!=null) {
+			    columnList = metadata.getListColumns();
+			    sizeListColumns = columnList.size();
+		    }
+	    }
+		int dynamic_index=-1;
+		
+	//Dynamic end
+	
+	
     if (authMode.equals("OAUTH")) {
 		%>
 		final String CLIENT_ID_<%=cid %> = <%=clientId %>;
@@ -214,6 +239,43 @@
 		}
 		%>
 		String pageToken_<%=cid%> = null;
+		//Dynamic start
+
+		<%
+		
+		if(isDynamic){
+		%>
+		<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/DB/Input/BigQuery/BigQueryHelper_Oauth.javajet"%>
+		BigQueryHelper_<%=cid%> helper_<%=cid%> = new BigQueryHelper_<%=cid%>();
+		com.google.api.services.bigquery.model.TableSchema schema_<%=cid%> = bigqueryclient_<%=cid%>
+						.jobs().getQueryResults(PROJECT_ID_<%=cid%>, insert_<%=cid%>.getJobReference().getJobId()).execute().getSchema();
+		routines.system.Dynamic dcg_<%=cid%> =  new routines.system.Dynamic();
+		
+		    <%
+
+		    for(int i=0; i< columnList.size(); i++) {
+		        if(columnList.get(i).getTalendType().equals("id_Dynamic")){
+		            dynamic_index = i+1;
+		        }
+			}
+			%>
+			//
+			    int colsLen_<%=cid %> = schema_<%=cid%>.getFields().size();
+			    for (int i = <%=dynamic_index-1%>; i < colsLen_<%=cid %>-<%=columnList.size()-dynamic_index%>; i++) {
+			    	routines.system.DynamicMetadata dynamicMetadata_<%=cid%> = new routines.system.DynamicMetadata();
+			    	dynamicMetadata_<%=cid%>.setName(schema_<%=cid%>.getFields().get(i).getName());
+			    	dynamicMetadata_<%=cid%>.setDbName(dynamicMetadata_<%=cid%>.getName());
+			    	dynamicMetadata_<%=cid%>.setType(routines.system.Dynamic.getTalendTypeFromDBType("bigquery_id", schema_<%=cid%>.getFields().get(i).getType(), 0, 0));
+					dynamicMetadata_<%=cid%>.setDbType(schema_<%=cid%>.getFields().get(i).getType());
+			    	dynamicMetadata_<%=cid%>.setNullable("NULLABLE".equals(schema_<%=cid%>.getFields().get(i).getMode()));
+			    	dynamicMetadata_<%=cid%>.setColumnPosition(i);
+			    	dcg_<%=cid%>.metadatas.add(dynamicMetadata_<%=cid%>);
+			    }
+			<%
+		
+		}
+		%>
+		//Dynamic end
 	<%
 	} else if (authMode.equals("SERVICEACCOUNT")) {
 	%>
@@ -310,6 +372,44 @@
 			log.info("<%=cid%> - Job " + jobId_<%=cid%> + " finished successfully.");
 		<% } %>
 		com.google.cloud.bigquery.TableResult result_<%=cid%> = job_<%=cid%>.getQueryResults();
+		//Dynamic start
+
+		<%
+		
+		if(isDynamic){
+		%>
+		<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/DB/Input/BigQuery/BigQueryHelper_ServiceAccount.javajet"%>
+		BigQueryHelper_<%=cid%> helper_<%=cid%> = new BigQueryHelper_<%=cid%>();
+		com.google.cloud.bigquery.Schema schema_<%=cid%> = result_<%=cid%>.getSchema();
+		routines.system.Dynamic dcg_<%=cid%> =  new routines.system.Dynamic();
+		
+		    <%
+
+		    for(int i=0; i< columnList.size(); i++) {
+		        if(columnList.get(i).getTalendType().equals("id_Dynamic")){
+		            dynamic_index = i+1;
+		        }
+			}
+			%>
+			//
+			    int colsLen_<%=cid %> = schema_<%=cid%>.getFields().size();
+			    for (int i = <%=dynamic_index-1%>; i < colsLen_<%=cid %>-<%=columnList.size()-dynamic_index%>; i++) {
+			    	routines.system.DynamicMetadata dynamicMetadata_<%=cid%> = new routines.system.DynamicMetadata();
+			    	dynamicMetadata_<%=cid%>.setName(schema_<%=cid%>.getFields().get(i).getName());
+			    	dynamicMetadata_<%=cid%>.setDbName(dynamicMetadata_<%=cid%>.getName());
+			    	com.google.cloud.bigquery.StandardSQLTypeName typeName_<%=cid%> = schema_<%=cid%>.getFields().get(i).getType().getStandardType();
+			    	String typeNameString_<%=cid%> = (typeName_<%=cid%> != null) ? typeName_<%=cid%>.name() : schema_<%=cid%>.getFields().get(i).getType().name();
+			    	dynamicMetadata_<%=cid%>.setType(routines.system.Dynamic.getTalendTypeFromDBType("bigquery_id", typeNameString_<%=cid%>, 0, 0));
+			    	dynamicMetadata_<%=cid%>.setDbType(typeNameString_<%=cid%>);
+			    	dynamicMetadata_<%=cid%>.setNullable(schema_<%=cid%>.getFields().get(i).getMode() == com.google.cloud.bigquery.Field.Mode.NULLABLE);
+			    	dynamicMetadata_<%=cid%>.setColumnPosition(i);
+			    	dcg_<%=cid%>.metadatas.add(dynamicMetadata_<%=cid%>);
+			    }
+			<%
+		
+		}
+		%>
+		//Dynamic end
 		long nb_line_<%=cid%> = 0;
 	<%
 	} else {
@@ -349,21 +449,23 @@
 	} else {
 		throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\" or \"OAUTH\", but it is " + authMode);
 	}
+		%>
+		int fieldsCount_<%=cid %> = field_<%=cid %>.size();
+		int column_index_<%=cid%> =0;
+		<%if(isDynamic){%>
+			int fixedColumnCount_<%=cid%> = <%=dynamic_index-1%>;
+		<%}
 		List< ? extends IConnection> conns = node.getOutgoingSortedConnections();
 		if (conns != null){
 			if (conns.size()>0){
 				IConnection conn =conns.get(0);
 				String connName = conn.getName();
 				if (conn.getLineStyle().hasConnectionCategory(IConnectionCategory.DATA)) {
-					List<IMetadataTable> metadatas = node.getMetadataList();
+				    
+					
 					if ((metadatas!=null) && (metadatas.size() > 0)) {
 						IMetadataTable metadata = metadatas.get(0);
 						if (metadata != null) {
-							String encoding = ElementParameterParser.getValue(node,"__ENCODING__");
-							String advancedSeparatorStr = ElementParameterParser.getValue(node, "__ADVANCED_SEPARATOR__");
-							boolean advancedSeparator = (advancedSeparatorStr!=null&&!("").equals(advancedSeparatorStr))?("true").equals(advancedSeparatorStr):false;
-							String thousandsSeparator = ElementParameterParser.getValueWithJavaType(node, "__THOUSANDS_SEPARATOR__", JavaTypesManager.CHARACTER);
-							String decimalSeparator = ElementParameterParser.getValueWithJavaType(node, "__DECIMAL_SEPARATOR__", JavaTypesManager.CHARACTER);
 
 							List<IMetadataColumn> columns = metadata.getListColumns();
 							int nbColumns = columns.size();
@@ -373,14 +475,33 @@
 
 								String typeToGenerate = JavaTypesManager.getTypeToGenerate(column.getTalendType(), column.isNullable());
 								JavaType javaType = JavaTypesManager.getJavaTypeFromId(column.getTalendType());
+								String defVal = JavaTypesManager.getDefaultValueFromJavaType(typeToGenerate);
+								if(isDynamic && !("Dynamic").equals(typeToGenerate) && dynamic_index - 1 < i) {
+								%>
+									column_index_<%=cid%> = <%=i-1%> + dcg_<%=cid%>.getColumnCount();
+								<%}else{%>
+									column_index_<%=cid%> = <%=i%>;
+								<%
+								}
 								String patternValue = column.getPattern() == null || column.getPattern().trim().length() == 0 ? null : column.getPattern();
+								if(("Dynamic").equals(typeToGenerate)) {
+									%>
+									    <%=connName%>.<%=columnName%> = dcg_<%=cid%>;
+										helper_<%=cid%>.readColumnsFromBigQuery(<%=connName%>.<%=columnName%>, field_<%=cid %>, fixedColumnCount_<%=cid%>, true);
+									<%
+								} else {
+								%>
+								if(fieldsCount_<%=cid %> <= column_index_<%=cid%>) {
+									<%=connName%>.<%=column.getLabel()%> = <%=defVal%>;
+								} else {
+								<%
 								if (authMode.equals("OAUTH")) {
 								%>
-								value_<%=cid%> = field_<%=cid %>.get(<%=i%>).getV();
+								value_<%=cid%> = field_<%=cid %>.get(column_index_<%=cid%>).getV();
 								<%
 								} else if (authMode.equals("SERVICEACCOUNT")) {
 								%>
-								value_<%=cid%> = field_<%=cid %>.get(<%=i%>).getValue();
+								value_<%=cid%> = field_<%=cid %>.get(column_index_<%=cid%>).getValue();
 								<%
 								} else {
 									throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\" or \"OAUTH\", but it is " + authMode);
@@ -426,7 +547,9 @@
 								}else{
 									<%=connName%>.<%=columnName%> = <%=JavaTypesManager.getDefaultValueFromJavaType(typeToGenerate, column.getDefault())%>;
 								}
+								}
 							<%
+								}
 							}
 							log4jFileUtil.debugRetriveData(node);
 						}

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

@@ -29,6 +29,14 @@
     <CONNECTOR CTYPE="RUN_IF"/>
   </CONNECTORS>
   <PARAMETERS>
+	<PARAMETER
+      NAME="MAPPING"
+      FIELD="MAPPING_TYPE"
+      NUM_ROW="120"
+      SHOW="false"
+    >
+      <DEFAULT>bigquery_id</DEFAULT>
+    </PARAMETER>
     <PARAMETER
     	NAME="SCHEMA"
     	FIELD="SCHEMA_TYPE"
@@ -171,12 +179,12 @@
    </ADVANCED_PARAMETERS>
    <CODEGENERATION>
      <IMPORTS>
-		<IMPORT NAME="google-api-client-1.19.0.jar" MODULE="google-api-client-1.19.0.jar" MVN="mvn:org.talend.libraries/google-api-client-1.19.0/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-api-client-1.19.0.jar" REQUIRED="true" />
-		<IMPORT NAME="google-api-services-oauth2-v2-rev78-1.19.0.jar" MODULE="google-api-services-oauth2-v2-rev78-1.19.0.jar" MVN="mvn:org.talend.libraries/google-api-services-oauth2-v2-rev78-1.19.0/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-api-services-oauth2-v2-rev78-1.19.0.jar" REQUIRED="true" />
-		<IMPORT NAME="google-api-services-bigquery-v2-rev391-1.21.0.jar" MODULE="google-api-services-bigquery-v2-rev391-1.21.0.jar" MVN="mvn:org.talend.libraries/google-api-services-bigquery-v2-rev391-1.21.0/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-api-services-bigquery-v2-rev391-1.21.0.jar" REQUIRED="true" />
-		<IMPORT NAME="google-http-client-1.19.0.jar" MODULE="google-http-client-1.19.0.jar" MVN="mvn:org.talend.libraries/google-http-client-1.19.0/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-http-client-1.19.0.jar" REQUIRED="true" />
-		<IMPORT NAME="google-oauth-client-1.19.0.jar" MODULE="google-oauth-client-1.19.0.jar" MVN="mvn:org.talend.libraries/google-oauth-client-1.19.0/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-oauth-client-1.19.0.jar" REQUIRED="true" />
-		<IMPORT NAME="google-http-client-jackson2-1.19.0.jar" MODULE="google-http-client-jackson2-1.19.0.jar" MVN="mvn:org.talend.libraries/google-http-client-jackson2-1.19.0/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-http-client-jackson2-1.19.0.jar" REQUIRED="true" />
+		 <IMPORT NAME="google-api-client-1.25.0.jar" MODULE="google-api-client-1.25.0.jar" MVN="mvn:com.google.api-client/google-api-client/1.25.0"  REQUIRED="true" />
+		 <IMPORT NAME="google-api-services-oauth2-v2-rev151-1.25.0.jar" MODULE="google-api-services-oauth2-v2-rev151-1.25.0.jar" MVN="mvn:com.google.apis/google-api-services-oauth2/v2-rev151-1.25.0"  REQUIRED="true" />
+		 <IMPORT NAME="google-api-services-bigquery-v2-rev454-1.25.0.jar" MODULE="google-api-services-bigquery-v2-rev454-1.25.0.jar" MVN="mvn:com.google.apis/google-api-services-bigquery/v2-rev454-1.25.0" REQUIRED="true" />
+		 <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="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.32.0.jar" MODULE="google-cloud-bigquery-1.32.0.jar" MVN="mvn:com.google.cloud/google-cloud-bigquery/1.32.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />

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

@@ -33,6 +33,14 @@
   </CONNECTORS>
 
   <PARAMETERS>
+	<PARAMETER
+      NAME="MAPPING"
+      FIELD="MAPPING_TYPE"
+      NUM_ROW="120"
+      SHOW="false"
+    >
+      <DEFAULT>bigquery_id</DEFAULT>
+    </PARAMETER>
     <PARAMETER NAME="PROPERTY" FIELD="PROPERTY_TYPE" SHOW="true" NUM_ROW="10" REPOSITORY_VALUE="DELIMITED" />
 
     <PARAMETER NAME="FILENAME" FIELD="FILE" NUM_ROW="11" REQUIRED="true" REPOSITORY_VALUE="FILE_PATH">

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryOutputBulk/tBigQueryOutputBulk_begin.javajet

@@ -16,6 +16,63 @@ imports="
 	if ((metadatas!=null)&&(metadatas.size()>0)) {
 	    IMetadataTable metadata = metadatas.get(0);
 	    if (metadata!=null) {
+			
+	        String encoding = ElementParameterParser.getValue(node,"__ENCODING__");
+			
+			if(metadata.isDynamicSchema()) {
+			%>
+			class BigQueryOutputHelper_<%=cid%> {
+				public void writeData(routines.system.Dynamic column, String[] row, int offset) {
+					for (int i = 0; i < column.getColumnCount(); i++) {
+						if (column.getColumnValue(i) != null) {
+							routines.system.DynamicMetadata metadata = column.getColumnMetadata(i);
+							String dataType = routines.system.MetadataTalendType.getDefaultSelectedDbType("bigquery_id", metadata.getType(), -1, -1);
+							String orignalDBType = metadata.getDbType();
+							java.util.List<String> outputDBTypelist = routines.system.MetadataTalendType.getTalendToDBList("bigquery_id", metadata.getType());
+							if (outputDBTypelist != null && outputDBTypelist.size() > 0) {
+								for (String dbType : outputDBTypelist) {
+									if (orignalDBType.equalsIgnoreCase(dbType)) {
+										dataType = dbType;
+										break;
+									}
+								}
+							}
+							if (dataType == null || ("").equals(dataType)) {
+								dataType = orignalDBType;
+							}
+							if ("id_Date".equals(metadata.getType())) {
+								String pattern = getPattern(dataType);
+								row[offset + i] = routines.system.DynamicUtils.formatDate(column.getColumnValue(i), pattern);
+							} else if ("id_byte[]".equals(metadata.getType())) {
+								row[offset + i] = java.nio.charset.Charset.forName(<%=encoding %>).decode(java.nio.ByteBuffer.wrap((byte[])column.getColumnValue(i))).toString();
+							} else {
+								row[offset + i] = String.valueOf(column.getColumnValue(i));
+							}
+						}
+					}
+				}
+				public String getPattern(String typeName) {
+					if(typeName == null) {
+						return "yyyy-MM-dd hh:mm:ss.SSS";
+					}
+					switch(typeName.toUpperCase()) {
+					case "TIMESTAMP":
+						return "yyyy-MM-dd hh:mm:ss.SSSXXX";
+					case "DATE":
+						return "yyyy-MM-dd";
+					case "TIME":
+						return "hh:mm:ss.SSS";
+					case "DATETIME":
+						return "yyyy-MM-dd hh:mm:ss.SSS";
+					default:
+						return "yyyy-MM-dd hh:mm:ss.SSS";
+					}
+				}
+			}
+			BigQueryOutputHelper_<%=cid%> bigQueryHelper_<%=cid%> = new BigQueryOutputHelper_<%=cid%>();
+			<%
+			}
+			
 	        String filename = ElementParameterParser.getValue(node,"__FILENAME__");
 	        
 	        String rowSeparator = ElementParameterParser.getValue(node,"__ROWSEPARATOR__");
@@ -26,8 +83,6 @@ imports="
 	        
 	        String textEnclosure = ElementParameterParser.getValue(node, "__TEXT_ENCLOSURE__");
 	        
-	        String encoding = ElementParameterParser.getValue(node,"__ENCODING__");
-	        
 	        boolean checkDiskSpace = ("true").equals(ElementParameterParser.getValue(node,"__CHECK_DISK_SPACE__"));
 	        
 	        boolean isAppend = ("true").equals(ElementParameterParser.getValue(node,"__APPEND__"));

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryOutputBulk/tBigQueryOutputBulk_main.javajet

@@ -21,7 +21,12 @@
     if ((metadatas!=null)&&(metadatas.size()>0)) {
         IMetadataTable metadata = metadatas.get(0);
         if (metadata!=null) {
-        
+			boolean hasDynamic = metadata.isDynamicSchema();
+			if(hasDynamic) {
+			%>
+			int dynamic_column_count_<%=cid%> = 1;
+			<%
+			}
             boolean checkDiskSpace = ("true").equals(ElementParameterParser.getValue(node,"__CHECK_DISK_SPACE__"));
             boolean flushOnRow = ("true").equals(ElementParameterParser.getValue(node, "__FLUSHONROW__"));
             String flushMod = ElementParameterParser.getValue(node, "__FLUSHONROW_NUM__");
@@ -35,72 +40,95 @@
             		if (conn.getLineStyle().hasConnectionCategory(IConnectionCategory.DATA)) {
             			List<IMetadataColumn> columns = metadata.getListColumns();
                 		int sizeColumns = columns.size();
-            			%>  	
-                    	String[] row_<%=cid%>=new String[]{<%for(int j=0;j<sizeColumns;j++){%>"\\N",<%}%>};		//empty value must be NULL('\N' in bulk file)
+						IMetadataColumn dynamicCol = metadata.getDynamicColumn();
+            			%>
+						String[] row_<%=cid%>=new String[<%=sizeColumns%><%=hasDynamic?"+"+conn.getName()+".":"" %><%=dynamicCol==null?"":dynamicCol.getLabel()+".getColumnCount()-1" %>];
+						java.util.Arrays.fill(row_<%=cid%>, "\\N");
                     	<%
+						int dynamicColIndex = -1;
+						%>
+						int curColumnIndex_<%=cid%> = 0;
+						<%
             			for (int i = 0; i < sizeColumns; i++) {
                 			IMetadataColumn column = columns.get(i);
                 			JavaType javaType = JavaTypesManager.getJavaTypeFromId(column.getTalendType());
                 			String pattern = column.getPattern() == null || column.getPattern().trim().length() == 0 ? null : column.getPattern();
-                			if(JavaTypesManager.isJavaPrimitiveType( column.getTalendType(), column.isNullable())){
+							if(dynamicColIndex != -1 && i > dynamicColIndex) {
+							%>
+							curColumnIndex_<%=cid%> = <%=i-1%> + dynamic_column_count_<%=cid%>;
+							<%
+							} else {
+							%>
+							curColumnIndex_<%=cid%> = <%=i%>;
+							<%
+							}
+							if(("id_Dynamic").equals(column.getTalendType())) {
+								dynamicColIndex = i;
+                                %>
+                                dynamic_column_count_<%=cid%> = <%=conn.getName()%>.<%=column.getLabel()%>.getColumnCount();
+								if (<%=conn.getName()%>.<%=column.getLabel()%> != null) {
+									bigQueryHelper_<%=cid%>.writeData(<%=conn.getName()%>.<%=column.getLabel()%>, row_<%=cid%>, <%=dynamicColIndex%>);
+								}
+								<%
+                            } else if(JavaTypesManager.isJavaPrimitiveType( column.getTalendType(), column.isNullable())){
  
-             				if(javaType == JavaTypesManager.BOOLEAN ){
+								if(javaType == JavaTypesManager.BOOLEAN ){
                     				%>
-                                        row_<%=cid%>[<%=i%>] = String.valueOf(
+                                        row_<%=cid%>[curColumnIndex_<%=cid%>] = String.valueOf(
                     							true == <%=conn.getName() %>.<%=column.getLabel() %> ?"1":"0"
                     							);
                     				<%
-                    				} else {
+                    			} else {
                     			    %>
-                    			    	row_<%=cid%>[<%=i%>] = String.valueOf(<%=conn.getName() %>.<%=column.getLabel() %>);
+                    			    	row_<%=cid%>[curColumnIndex_<%=cid%>] = String.valueOf(<%=conn.getName() %>.<%=column.getLabel() %>);
                     			    <%
                     		    }
                             
-                			}else {
+                			} else {
                 			    %>
                 			    if(<%=conn.getName() %>.<%=column.getLabel() %> != null){
                 			        <%					
                 			        if(javaType == JavaTypesManager.STRING ){
                 			            %>
-                			            row_<%=cid%>[<%=i%>] = <%=conn.getName() %>.<%=column.getLabel() %>;
+                			            row_<%=cid%>[curColumnIndex_<%=cid%>] = <%=conn.getName() %>.<%=column.getLabel() %>;
                 			            <%
                 			        }else if(javaType == JavaTypesManager.DATE && pattern == null){
                 			        	%>
-                			            row_<%=cid%>[<%=i%>] = FormatterUtils.format_Date(<%=conn.getName() %>.<%=column.getLabel() %>, "yyyy-MM-dd");
+                			            row_<%=cid%>[curColumnIndex_<%=cid%>] = FormatterUtils.format_Date(<%=conn.getName() %>.<%=column.getLabel() %>, "yyyy-MM-dd");
                 			            <%
                 			        }else if(javaType == JavaTypesManager.DATE && pattern != null){
                 			            if(pattern.length() > 12){
 	                			            %> 
-	                			            row_<%=cid%>[<%=i%>] = FormatterUtils.format_Date(<%=conn.getName() %>.<%=column.getLabel() %>, "yyyy-MM-dd HH:mm:ss");
+	                			            row_<%=cid%>[curColumnIndex_<%=cid%>] = FormatterUtils.format_Date(<%=conn.getName() %>.<%=column.getLabel() %>, "yyyy-MM-dd HH:mm:ss");
 	                			            <%
                 			            }else if(pattern.length() == 12 || "\"\"".equals(pattern)) {	
                 			            	%>
-	                			            row_<%=cid%>[<%=i%>] = FormatterUtils.format_Date(<%=conn.getName() %>.<%=column.getLabel() %>, "yyyy-MM-dd");
+	                			            row_<%=cid%>[curColumnIndex_<%=cid%>] = FormatterUtils.format_Date(<%=conn.getName() %>.<%=column.getLabel() %>, "yyyy-MM-dd");
 	                			            <%
                 			            }else {
                 			            	%>
-	                			            row_<%=cid%>[<%=i%>] = FormatterUtils.format_Date(<%=conn.getName() %>.<%=column.getLabel() %>, <%=pattern%>);
+	                			            row_<%=cid%>[curColumnIndex_<%=cid%>] = FormatterUtils.format_Date(<%=conn.getName() %>.<%=column.getLabel() %>, <%=pattern%>);
 	                			            <%
                 			            }
                 			        }else if(javaType == JavaTypesManager.BYTE_ARRAY){
                 			            %>
-                			            row_<%=cid%>[<%=i%>] = java.nio.charset.Charset.forName(<%=encoding %>).decode(java.nio.ByteBuffer.wrap(<%=conn.getName() %>.<%=column.getLabel() %>)).toString();
+                			            row_<%=cid%>[curColumnIndex_<%=cid%>] = java.nio.charset.Charset.forName(<%=encoding %>).decode(java.nio.ByteBuffer.wrap(<%=conn.getName() %>.<%=column.getLabel() %>)).toString();
                 			            <%
                 			        }else if(javaType == JavaTypesManager.BOOLEAN ){
                 					%>
-                						row_<%=cid%>[<%=i%>] = String.valueOf(
+                						row_<%=cid%>[curColumnIndex_<%=cid%>] = String.valueOf(
                 							true == <%=conn.getName() %>.<%=column.getLabel() %> ?"1":"0"
                 							);
                 					<%
                 					}	             			        
                 			        else{
                 			            %>
-                			            row_<%=cid%>[<%=i%>] = String.valueOf(<%=conn.getName() %>.<%=column.getLabel() %>);
+                			            row_<%=cid%>[curColumnIndex_<%=cid%>] = String.valueOf(<%=conn.getName() %>.<%=column.getLabel() %>);
                 			            <%
                 			        }
                 			        %>                			    
                 			    } else {
-                                    row_<%=cid%>[<%=i%>] = "\\N";
+                                    row_<%=cid%>[curColumnIndex_<%=cid%>] = "\\N";
                                 }
                 		 	<% 
                 			}

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

@@ -166,32 +166,12 @@
     </ADVANCED_PARAMETERS>
     <CODEGENERATION>
         <IMPORTS>
-            <IMPORT NAME="google-api-client-1.19.0.jar" MODULE="google-api-client-1.19.0.jar"
-                    MVN="mvn:org.talend.libraries/google-api-client-1.19.0/6.0.0"
-                    UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-api-client-1.19.0.jar"
-                    REQUIRED="true"/>
-            <IMPORT NAME="google-api-services-oauth2-v2-rev78-1.19.0.jar"
-                    MODULE="google-api-services-oauth2-v2-rev78-1.19.0.jar"
-                    MVN="mvn:org.talend.libraries/google-api-services-oauth2-v2-rev78-1.19.0/6.0.0"
-                    UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-api-services-oauth2-v2-rev78-1.19.0.jar"
-                    REQUIRED="true"/>
-            <IMPORT NAME="google-api-services-bigquery-v2-rev391-1.21.0.jar"
-                    MODULE="google-api-services-bigquery-v2-rev391-1.21.0.jar"
-                    MVN="mvn:org.talend.libraries/google-api-services-bigquery-v2-rev391-1.21.0/6.0.0"
-                    UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-api-services-bigquery-v2-rev391-1.21.0.jar"
-                    REQUIRED="true"/>
-            <IMPORT NAME="google-http-client-1.19.0.jar" MODULE="google-http-client-1.19.0.jar"
-                    MVN="mvn:org.talend.libraries/google-http-client-1.19.0/6.0.0"
-                    UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-http-client-1.19.0.jar"
-                    REQUIRED="true"/>
-            <IMPORT NAME="google-oauth-client-1.19.0.jar" MODULE="google-oauth-client-1.19.0.jar"
-                    MVN="mvn:org.talend.libraries/google-oauth-client-1.19.0/6.0.0"
-                    UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-oauth-client-1.19.0.jar"
-                    REQUIRED="true"/>
-            <IMPORT NAME="google-http-client-jackson2-1.19.0.jar" MODULE="google-http-client-jackson2-1.19.0.jar"
-                    MVN="mvn:org.talend.libraries/google-http-client-jackson2-1.19.0/6.0.0"
-                    UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/google-http-client-jackson2-1.19.0.jar"
-                    REQUIRED="true"/>
+            <IMPORT NAME="google-api-client-1.25.0.jar" MODULE="google-api-client-1.25.0.jar" MVN="mvn:com.google.api-client/google-api-client/1.25.0"  REQUIRED="true" />
+            <IMPORT NAME="google-api-services-oauth2-v2-rev151-1.25.0.jar" MODULE="google-api-services-oauth2-v2-rev151-1.25.0.jar" MVN="mvn:com.google.apis/google-api-services-oauth2/v2-rev151-1.25.0"  REQUIRED="true" />
+            <IMPORT NAME="google-api-services-bigquery-v2-rev454-1.25.0.jar" MODULE="google-api-services-bigquery-v2-rev454-1.25.0.jar" MVN="mvn:com.google.apis/google-api-services-bigquery/v2-rev454-1.25.0" REQUIRED="true" />
+            <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"/>

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-1.6.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-1.6.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.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_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_161" MODULE="dom4j-1.6.1.jar" MVN="mvn:dom4j/dom4j/1.6.1"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/dom4j-1.6.1.jar" REQUIRED_IF="DB_VERSION=='BONITA_561'" BundleID="" />
+			<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="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" />
 

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-1.6.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-1.6.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.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_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_161" MODULE="dom4j-1.6.1.jar" MVN="mvn:dom4j/dom4j/1.6.1"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/dom4j-1.6.1.jar" REQUIRED_IF="(CLIENT_MODE=='JAVA_CLIENT') AND (DB_VERSION=='BONITA_561')" BundleID="" />
+			<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="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" />
 

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

@@ -898,7 +898,7 @@
 		<IMPORT NAME="Driver-VERTICA_7.0.1" MODULE="vertica-jdbc-7.0.1-0.jar" MVN="mvn:org.talend.libraries/vertica-jdbc-7.0.1-0/6.0.0"   REQUIRED_IF="(DBTYPE=='VERTICA') and (USE_EXISTING_CONNECTION == 'false') and (DB_VERTICA_VERSION=='VERTICA_7_0_X')" />
   		<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.32.1056.jar" MVN="mvn:com.amazon.redshift/redshift-jdbc42-no-awssdk/1.2.32.1056" REQUIRED_IF="(DBTYPE=='REDSHIFT') 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.9.0.jar" MVN="mvn:net.snowflake/snowflake-jdbc/3.9.0"  REQUIRED_IF="(DBTYPE=='SNOWFLAKE') and (USE_EXISTING_CONNECTION == 'false')" />
 		<IMPORT NAME="Driver-VERTICA_9.0" MODULE="vertica-jdbc-9.0.0-0.jar" MVN="mvn:org.talend.libraries/vertica-jdbc-9.0.0-0/6.0.0"   REQUIRED_IF="(DBTYPE=='VERTICA') and (USE_EXISTING_CONNECTION == 'false') and (DB_VERTICA_VERSION=='VERTICA_9_0')"/>
      </IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tDB2BulkExec/tDB2BulkExec_messages.properties

@@ -10,6 +10,9 @@ DBNAME.NAME=Database
 ENCODING.NAME=Encoding
 HOST.NAME=Host
 NB_LINE.NAME=Number of line
+NB_LINE_UPDATED.NAME=Number of updated line
+NB_LINE_INSERTED.NAME=Number of inserted line
+NB_LINE_DELETED.NAME=Number of deleted line
 NULL_CHAR.NAME=Null Char
 PASS.NAME=Password
 PORT.NAME=Port

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

@@ -174,7 +174,7 @@
 				REQUIRED="true" />
 			<IMPORT NAME="mylin-smooks" MODULE="milyn-smooks-all-1.7.0.jar" MVN="mvn:org.talend.libraries/milyn-smooks-all-1.7.0/6.0.0"
 				REQUIRED="true" />
-			<IMPORT NAME="jaxen" MODULE="jaxen-1.1.1.jar" MVN="mvn:org.talend.libraries/jaxen-1.1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/jaxen-1.1.1.jar" BundleID="org.apache.servicemix.bundles.jaxen"
+			<IMPORT NAME="jaxen" MODULE="jaxen-1.1.6.jar" MVN="mvn:jaxen/jaxen/1.1.6" BundleID="org.apache.servicemix.bundles.jaxen"
 				REQUIRED="true" />
 			<IMPORT NAME="commons-logging" MODULE="commons-logging-1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.jar"
 				REQUIRED="true" />
@@ -182,8 +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-1.6.1.jar" MVN="mvn:dom4j/dom4j/1.6.1"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/dom4j-1.6.1.jar" BundleID="org.apache.servicemix.bundles.dom4j"
-				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" />
 	</IMPORTS>
   </CODEGENERATION>
   <RETURNS/>

main/plugins/org.talend.designer.components.localprovider/components/tExtractJSONFields/read_by_xpath_init.javajet

@@ -257,7 +257,7 @@ if (outConn!=null) {
                 if(extractColNo%schemaOptNum==0){
 %>
             public void putExtractValue_<%=extractColNo/schemaOptNum%>(<%=NodeUtil.getPrivateConnClassName(outConn)%>Struct <%=firstConnName%>,<%if(inConn!=null){%><%=NodeUtil.getPrivateConnClassName(inConn)%>Struct <%=inConn.getName()%>,<%}%>
-                String xmlStr_<%=cid%>,org.dom4j.tree.AbstractNode temp_<%=cid %>,String loopQuery_<%=cid %>,java.util.HashMap xmlNameSpaceMap_<%=cid%>,org.dom4j.Node node_<%=cid %>,
+                String xmlStr_<%=cid%>,org.dom4j.Node temp_<%=cid %>,String loopQuery_<%=cid %>,java.util.HashMap xmlNameSpaceMap_<%=cid%>,org.dom4j.Node node_<%=cid %>,
                     String str_<%=cid %>,XML_API_<%=cid%> xml_api_<%=cid%>,OriginalJSONString_<%=cid %> originalJSONString_<%=cid %>,ConvertJSONString_<%=cid%> cjs_<%=cid %>,boolean isGetWholeJson_<%=cid%> ) throws java.lang.Exception {
 <%
                 }

main/plugins/org.talend.designer.components.localprovider/components/tExtractJSONFields/read_by_xpath_process.javajet

@@ -7,7 +7,7 @@ if (outConn!=null) {
     org.dom4j.Document doc_<%=cid%> = null;
     java.util.HashMap xmlNameSpaceMap_<%=cid%> = new java.util.HashMap<String, String>();
     org.dom4j.XPath x_<%=cid%> = null;
-    java.util.List<org.dom4j.tree.AbstractNode> nodeList_<%=cid%> = null;
+    java.util.List<org.dom4j.Node> nodeList_<%=cid%> = null;
     boolean isStructError_<%=cid %> = true;
 
     String loopQuery_<%=cid %> =  <%=loopQuery %> ;
@@ -32,7 +32,7 @@ if (outConn!=null) {
         doc_<%=cid%>= reader_<%=cid%>.read(new java.io.StringReader(xmlStr_<%=cid%>));
         x_<%=cid%> = doc_<%=cid%>.createXPath(loopQuery_<%=cid %>);
         x_<%=cid%>.setNamespaceURIs(xmlNameSpaceMap_<%=cid%>); 
-        nodeList_<%=cid%> = (java.util.List<org.dom4j.tree.AbstractNode>)x_<%=cid%>.selectNodes(doc_<%=cid%>);
+        nodeList_<%=cid%> = (java.util.List<org.dom4j.Node>)x_<%=cid%>.selectNodes(doc_<%=cid%>);
         isStructError_<%=cid %> = false;
         
     }catch(java.lang.Exception ex_<%=cid %>){
@@ -109,7 +109,7 @@ if(outConns!=null){
 %>
             <%=firstConnName %> = new <%=firstConnName %>Struct();
         
-            org.dom4j.tree.AbstractNode temp_<%=cid %> = nodeList_<%=cid %>.get(i_<%=cid %>);
+            org.dom4j.Node temp_<%=cid %> = nodeList_<%=cid %>.get(i_<%=cid %>);
     
             nb_line_<%=cid%>++; 
             try{

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

@@ -176,8 +176,8 @@
 
     <CODEGENERATION>
     <IMPORTS>
-            <IMPORT NAME="Java_DOM4J1.6" MODULE="dom4j-1.6.1.jar" MVN="mvn:dom4j/dom4j/1.6.1"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/dom4j-1.6.1.jar" REQUIRED_IF="READ_BY == 'XPATH'" BundleID="" />
-            <IMPORT NAME="Java_JAXEN1.1" MODULE="jaxen-1.1.1.jar" MVN="mvn:org.talend.libraries/jaxen-1.1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/jaxen-1.1.1.jar" REQUIRED_IF="READ_BY == 'XPATH'" BundleID="" />
+    		<IMPORT NAME="Java_DOM4J_2.1.1" MODULE="dom4j-2.1.1.jar" MVN="mvn:org.dom4j/dom4j/2.1.1" REQUIRED_IF="READ_BY == 'XPATH'" BundleID="" />
+            <IMPORT NAME="Java_JAXEN_1.1.6" MODULE="jaxen-1.1.6.jar" MVN="mvn:jaxen/jaxen/1.1.6" REQUIRED_IF="READ_BY == 'XPATH'" BundleID="" />
             <IMPORT NAME="json-lib" MODULE="json-lib-2.4.4-talend.jar" MVN="mvn:net.sf.json-lib/json-lib/2.4.4-talend" REQUIRED_IF="READ_BY == 'XPATH'" />
             <IMPORT NAME="commons_lang" MODULE="commons-lang-2.6.jar" MVN="mvn:commons-lang/commons-lang/2.6"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang-2.6.jar" REQUIRED_IF="READ_BY == 'XPATH'" />
             <IMPORT NAME="commons_logging" MODULE="commons-logging-1.1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1.1/6.0.0"  UrlPath="platform:/base/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar" REQUIRED_IF="READ_BY == 'XPATH'" />

main/plugins/org.talend.designer.components.localprovider/components/tExtractXMLField/tExtractXMLField_begin.javajet

@@ -305,7 +305,7 @@ if (outConn!=null) {
 				if(extractColNo%schemaOptNum==0){
 %>
 			public void putExtractValue_<%=extractColNo/schemaOptNum%>(<%=NodeUtil.getPrivateConnClassName(outConn)%>Struct <%=firstConnName%>,<%if(inConn!=null){%><%=NodeUtil.getPrivateConnClassName(inConn)%>Struct <%=inConn.getName()%>,<%}%>
-				String xmlStr_<%=cid%>,org.dom4j.tree.AbstractNode temp_<%=cid %>,NameSpaceTool_<%=cid%> nsTool_<%=cid%>,String loopQuery_<%=cid %>,java.util.HashMap xmlNameSpaceMap_<%=cid%>,org.dom4j.Node node_<%=cid %>,
+				String xmlStr_<%=cid%>,org.dom4j.Node temp_<%=cid %>,NameSpaceTool_<%=cid%> nsTool_<%=cid%>,String loopQuery_<%=cid %>,java.util.HashMap xmlNameSpaceMap_<%=cid%>,org.dom4j.Node node_<%=cid %>,
 					String str_<%=cid %>,XML_API_<%=cid%> xml_api_<%=cid%><%if(ignore_NS_Str){%>,org.jaxen.NamespaceContext namespaceContext_<%=cid%><%}%>)throws java.lang.Exception {
 				
 					boolean resultIsNode_<%=cid%> = true;

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

@@ -157,14 +157,16 @@
     <CODEGENERATION>
     <IMPORTS>
       <IMPORT
-        NAME="Java_DOM4J1.6"
-        MODULE="dom4j-1.6.1.jar" MVN="mvn:dom4j/dom4j/1.6.1"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/dom4j-1.6.1.jar"
+        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_JAXEN1.1"
-        MODULE="jaxen-1.1.1.jar" MVN="mvn:org.talend.libraries/jaxen-1.1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/jaxen-1.1.1.jar"
+        NAME="Java_JAXEN_1.1.6"
+        MODULE="jaxen-1.1.6.jar" 
+        MVN="mvn:jaxen/jaxen/1.1.6" 
         REQUIRED="true"
         BundleID=""
       />

main/plugins/org.talend.designer.components.localprovider/components/tExtractXMLField/tExtractXMLField_main.javajet

@@ -170,7 +170,7 @@ if (outConn!=null) {
     org.dom4j.Document doc_<%=cid%> = null;
     java.util.HashMap xmlNameSpaceMap_<%=cid%> = null;
     org.dom4j.XPath x_<%=cid%> = null;
-    java.util.List<org.dom4j.tree.AbstractNode> nodeList_<%=cid%> = null;
+    java.util.List<org.dom4j.Node> nodeList_<%=cid%> = null;
 <%if(useXMLField){%>
 	String loopQuery_<%=cid %> = <%=strXMLPrefix %>+<%=loopQuery %>;
 <%}else{
@@ -217,7 +217,7 @@ if (outConn!=null) {
 		<%if(ignore_NS_Str){%>
 			x_<%=cid%>.setNamespaceContext(namespaceContext_<%=cid%>);
 		<%}%> 
-    	nodeList_<%=cid%> = (java.util.List<org.dom4j.tree.AbstractNode>)x_<%=cid%>.selectNodes(doc_<%=cid%>);
+    	nodeList_<%=cid%> = (java.util.List<org.dom4j.Node>)x_<%=cid%>.selectNodes(doc_<%=cid%>);
     	
     	isStructError_<%=cid %> = false;
     	
@@ -304,7 +304,7 @@ if(outConns!=null){
 %>
     		<%=firstConnName %> = new <%=firstConnName %>Struct();
     	
-    		org.dom4j.tree.AbstractNode temp_<%=cid %> = nodeList_<%=cid %>.get(i_<%=cid %>);
+    		org.dom4j.Node temp_<%=cid %> = nodeList_<%=cid %>.get(i_<%=cid %>);
 	
 	    	nb_line_<%=cid%>++;	
 <%

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

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

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

@@ -161,10 +161,8 @@
 			    REQUIRED_IF="(READ_BY == 'JSONPATH_WITHOUTPUT_LOOP')" />
 
 			<!-- xpath -->
-			<IMPORT NAME="Java_DOM4J1.6" MODULE="dom4j-1.6.1.jar" MVN="mvn:dom4j/dom4j/1.6.1"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/dom4j-1.6.1.jar"
-				REQUIRED_IF="(READ_BY == 'XPATH')" BundleID="" />
-			<IMPORT NAME="Java_JAXEN1.1" MODULE="jaxen-1.1.1.jar" MVN="mvn:org.talend.libraries/jaxen-1.1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/jaxen-1.1.1.jar"
-				REQUIRED_IF="(READ_BY == 'XPATH')" BundleID="" />
+			<IMPORT NAME="Java_DOM4J_2.1.1" MODULE="dom4j-2.1.1.jar" MVN="mvn:org.dom4j/dom4j/2.1.1" REQUIRED_IF="(READ_BY == 'XPATH')" BundleID="" />
+			<IMPORT NAME="Java_JAXEN_1.1.6" MODULE="jaxen-1.1.6.jar" MVN="mvn:jaxen/jaxen/1.1.6" REQUIRED_IF="(READ_BY == 'XPATH')" BundleID="" />
 			<IMPORT NAME="json-lib" MODULE="json-lib-2.4.3-talend.jar" MVN="mvn:net.sf.json-lib/json-lib/2.4.3-talend" REQUIRED_IF="(READ_BY == 'XPATH')" />
 			<IMPORT NAME="commons_lang" MODULE="commons-lang-2.6.jar" MVN="mvn:commons-lang/commons-lang/2.6"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang-2.6.jar"
 				REQUIRED_IF="(READ_BY == 'XPATH')" />

main/plugins/org.talend.designer.components.localprovider/components/tFileInputJSON/xpath.javajet

@@ -294,7 +294,7 @@ boolean checkDate = (checkDateStr!=null&&!("").equals(checkDateStr))?("true").eq
             java.util.HashMap<String,String> xmlNameSpaceMap_<%=cid%> = new java.util.HashMap<String, String>();
             x_<%=cid%> = doc_<%=cid%>.createXPath(loopQuery_<%=cid %>); 
             x_<%=cid%>.setNamespaceURIs(xmlNameSpaceMap_<%=cid%>); 
-            java.util.List<org.dom4j.tree.AbstractNode> nodeList_<%=cid%> = (java.util.List<org.dom4j.tree.AbstractNode>)x_<%=cid%>.selectNodes(doc_<%=cid%>);  
+            java.util.List<org.dom4j.Node> nodeList_<%=cid%> = (java.util.List<org.dom4j.Node>)x_<%=cid%>.selectNodes(doc_<%=cid%>);  
             XML_API_<%=cid%> xml_api_<%=cid%> = new XML_API_<%=cid%>();
             String str_<%=cid %> = "";
             org.dom4j.Node node_<%=cid%> = null;
@@ -310,7 +310,7 @@ boolean checkDate = (checkDateStr!=null&&!("").equals(checkDateStr))?("true").eq
             }
 %>
 
-            for (org.dom4j.tree.AbstractNode temp_<%=cid%>: nodeList_<%=cid%>) {
+            for (org.dom4j.Node temp_<%=cid%>: nodeList_<%=cid%>) {
                 nb_line_<%=cid%>++;
 <%
 log4jFileUtil.debugRetriveData(node);

main/plugins/org.talend.designer.components.localprovider/components/tFileInputMSXML/tFileInputMSXML_begin.javajet

@@ -307,17 +307,17 @@ java.util.HashMap<String,String> xmlNameSpaceMap_<%=cid %> = nsTool_<%=cid %>.xm
 org.dom4j.XPath x_<%=cid %> = doc_<%=cid %>.createXPath(nsTool_<%=cid %>.addDefaultNSPrefix(rootpath_<%=cid %>,rootpath_<%=cid %>));  
 x_<%=cid %>.setNamespaceURIs(xmlNameSpaceMap_<%=cid %>);
 
-java.util.List<org.dom4j.Element> nodeList_<%=cid %> = (java.util.List<org.dom4j.Element>)x_<%=cid %>.selectNodes(doc_<%=cid %>);	
+java.util.List<org.dom4j.Node> nodeList_<%=cid %> = (java.util.List<org.dom4j.Node>)x_<%=cid %>.selectNodes(doc_<%=cid %>);	
 XML_API_<%=cid %> xml_api_<%=cid %> = new XML_API_<%=cid %>();
 String str_<%=cid %> = "";
 org.dom4j.Node node_<%=cid %> = null;
 boolean isSingleNode_<%=cid %> = true;
 Object obj_<%=cid %> = null;
 
-for (org.dom4j.Element loop_<%=cid %>: nodeList_<%=cid %>) {
+for (org.dom4j.Node loop_<%=cid %>: nodeList_<%=cid %>) {
 
 <%	if(!ignoreOrder){//order %>
-	java.util.Iterator<org.dom4j.Element> it_<%=cid %> = loop_<%=cid %>.elementIterator();
+	java.util.Iterator<org.dom4j.Element> it_<%=cid %> = ((org.dom4j.Element)loop_<%=cid %>).elementIterator();
 	
 	while(it_<%=cid%>.hasNext()){
 		nb_line_<%=cid %>++;
@@ -328,17 +328,17 @@ for (org.dom4j.Element loop_<%=cid %>: nodeList_<%=cid %>) {
 
 		org.dom4j.Element temp_<%=cid %> = it_<%=cid %>.next();
 <%	}else{ // out of order%>
-	java.util.List<java.util.Map<String,org.dom4j.Element>> resultList_<%=cid %> = new java.util.ArrayList<java.util.Map<String,org.dom4j.Element>>();
+	java.util.List<java.util.Map<String,org.dom4j.Node>> resultList_<%=cid %> = new java.util.ArrayList<java.util.Map<String,org.dom4j.Node>>();
 <%
 		for(IConnection conn : connections){
 			if (conn.getLineStyle().hasConnectionCategory(IConnectionCategory.MAIN)){
 %>
 	org.dom4j.XPath groupPath_<%=conn.getName() %> = loop_<%=cid %>.createXPath(nsTool_<%=cid %>.addDefaultNSPrefix(query_<%=conn.getName() %>,rootpath_<%=cid %>));
 	groupPath_<%=conn.getName() %>.setNamespaceURIs(xmlNameSpaceMap_<%=cid %>);
-	java.util.List<org.dom4j.Element> groupList_<%=conn.getName() %> = (java.util.List<org.dom4j.Element>)groupPath_<%=conn.getName() %>.selectNodes(loop_<%=cid %>);
+	java.util.List<org.dom4j.Node> groupList_<%=conn.getName() %> = (java.util.List<org.dom4j.Node>)groupPath_<%=conn.getName() %>.selectNodes(loop_<%=cid %>);
 	if(groupList_<%=conn.getName() %>!=null && groupList_<%=conn.getName() %>.size()>0){
-		for(org.dom4j.Element ele_<%=cid %> : groupList_<%=conn.getName() %>){
-			java.util.Map<String, org.dom4j.Element> map = new java.util.HashMap<String,org.dom4j.Element>();
+		for(org.dom4j.Node ele_<%=cid %> : groupList_<%=conn.getName() %>){
+			java.util.Map<String, org.dom4j.Node> map = new java.util.HashMap<String,org.dom4j.Node>();
 			map.put("<%=conn.getName()%>", ele_<%=cid %>);
 			resultList_<%=cid %>.add(map);
 		}
@@ -347,7 +347,7 @@ for (org.dom4j.Element loop_<%=cid %>: nodeList_<%=cid %>) {
 			}
 		}
 %>
-	for(java.util.Map<String,org.dom4j.Element> tempMap_<%=cid %> : resultList_<%=cid %> ){
+	for(java.util.Map<String,org.dom4j.Node> tempMap_<%=cid %> : resultList_<%=cid %> ){
 <%
 	}
 // ***dom4j end and sax begin*** //
@@ -476,7 +476,7 @@ looper_<%=cid%>.parse(<%=filename %>);
 					}else{ //out of order
 %>
 	if(tempMap_<%=cid %>.get("<%=conn.getName() %>") != null){
-		org.dom4j.Element temp_<%=cid %> = tempMap_<%=cid %>.get("<%=conn.getName() %>");
+		org.dom4j.Element temp_<%=cid %> = (org.dom4j.Element)tempMap_<%=cid %>.get("<%=conn.getName() %>");
 <%
 					}
 				}else{

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

@@ -82,10 +82,8 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="Java_DOM4J1.6" MODULE="dom4j-1.6.1.jar" MVN="mvn:dom4j/dom4j/1.6.1"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/dom4j-1.6.1.jar"
-				REQUIRED="true" BundleID="" />
-			<IMPORT NAME="Java_JAXEN1.1" MODULE="jaxen-1.1.1.jar" MVN="mvn:org.talend.libraries/jaxen-1.1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/jaxen-1.1.1.jar"
-				REQUIRED="true" BundleID="" />
+			<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_JAXEN_1.1.6" MODULE="jaxen-1.1.6.jar" MVN="mvn:jaxen/jaxen/1.1.6" REQUIRED="true" BundleID="" />
 			<IMPORT NAME="Java_talendSAX" MODULE="TalendSAX-1.0.1-20190326.jar" MVN="mvn:org.talend.libraries/TalendSAX/1.0.1-20190326"  UrlPath="platform:/plugin/org.talend.libraries.xml/lib/TalendSAX-1.0.1-20190326.jar"
 				REQUIRED="true" />
 		</IMPORTS>

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

@@ -550,7 +550,7 @@ org.jaxen.NamespaceContext namespaceContext_<%=cid%> = new org.jaxen.NamespaceCo
 x_<%=cid%>.setNamespaceContext(namespaceContext_<%=cid%>);
 <%}%>
 
-java.util.List<org.dom4j.tree.AbstractNode> nodeList_<%=cid%> = (java.util.List<org.dom4j.tree.AbstractNode>)x_<%=cid%>.selectNodes(doc_<%=cid%>);	
+java.util.List<org.dom4j.Node> nodeList_<%=cid%> = (java.util.List<org.dom4j.Node>)x_<%=cid%>.selectNodes(doc_<%=cid%>);	
 XML_API_<%=cid%> xml_api_<%=cid%> = new XML_API_<%=cid%>();
 String str_<%=cid %> = "";
 org.dom4j.Node node_<%=cid%> = null;
@@ -618,7 +618,7 @@ if(schemaOptNum>0){
 }
 %>
 <%log4jFileUtil.startRetriveDataInfo();%>
-for (org.dom4j.tree.AbstractNode temp_<%=cid%>: nodeList_<%=cid%>) {
+for (org.dom4j.Node temp_<%=cid%>: nodeList_<%=cid%>) {
 <%
 // *** SAX *** //
 }else if(("SAX").equals(mode)){
@@ -771,7 +771,7 @@ if ((metadatas!=null)&&(metadatas.size()>0)) {
 				varsMap.put("node_"+cid,"org.dom4j.Node");
 				varsMap.put("nsTool_"+cid,"NameSpaceTool_"+cid);
 				varsMap.put("xmlNameSpaceMap_"+cid,"java.util.HashMap<String,String>");
-				varsMap.put("temp_"+cid,"org.dom4j.tree.AbstractNode");
+				varsMap.put("temp_"+cid,"org.dom4j.Node");
 				if(ignore_NS){
 					varsMap.put("namespaceContext_"+cid,"org.jaxen.NamespaceContext");
 				}

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

@@ -138,10 +138,8 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="Java_DOM4J1.6" MODULE="dom4j-1.6.1.jar" MVN="mvn:dom4j/dom4j/1.6.1" BundleID="org.apache.servicemix.bundles.dom4j" UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/dom4j-1.6.1.jar"
-				REQUIRED_IF="GENERATION_MODE == 'DOM4J'" />
-			<IMPORT NAME="Java_JAXEN1.1" MODULE="jaxen-1.1.1.jar" MVN="mvn:org.talend.libraries/jaxen-1.1.1/6.0.0" BundleID="org.apache.servicemix.bundles.jaxen" UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/jaxen-1.1.1.jar"
-				REQUIRED_IF="GENERATION_MODE == 'DOM4J'" />
+			<IMPORT NAME="Java_DOM4J_2.1.1" MODULE="dom4j-2.1.1.jar" MVN="mvn:org.dom4j/dom4j/2.1.1" BundleID="org.apache.servicemix.bundles.dom4j" REQUIRED_IF="GENERATION_MODE == 'DOM4J'" />
+			<IMPORT NAME="Java_JAXEN_1.1.6" MODULE="jaxen-1.1.6.jar" MVN="mvn:jaxen/jaxen/1.1.6" BundleID="org.apache.servicemix.bundles.jaxen" REQUIRED_IF="GENERATION_MODE == 'DOM4J'" />
 			<IMPORT NAME="Java_xercesImpl" MODULE="xercesImpl.jar" MVN="mvn:org.talend.libraries/xercesImpl/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.xml/lib/xercesImpl.jar"
 				REQUIRED_IF="(GENERATION_MODE == 'XERCES') OR (GENERATION_MODE == 'SAX')" BundleID="" />
 			<IMPORT NAME="Java_xalan" MODULE="xalan-2.7.2.jar" MVN="mvn:xalan/xalan/2.7.2" REQUIRED_IF="GENERATION_MODE == 'XERCES'" BundleID="" />

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

@@ -499,7 +499,7 @@ if(("false").equals(ElementParameterParser.getValue(node,"__CSV_OPTION__"))) {
                     }
                         if (((AbstractNode)node).getParallelIterator() != null) {
                         %>
-                            synchronized ((Object[])globalMap.get("lockWrite_<%=((AbstractNode)node).getParallelIterator()%>")) {
+                            synchronized (fileName_<%=cid%>.intern()) {
                         <%
                         }
                             if (isParallelize) {
@@ -928,7 +928,7 @@ if(("false").equals(ElementParameterParser.getValue(node,"__CSV_OPTION__"))) {
                     }
                     if (((AbstractNode)node).getParallelIterator() != null) {
                     %>
-                        synchronized ((Object[])globalMap.get("lockWrite_<%=((AbstractNode)node).getParallelIterator()%>")) {
+                        synchronized (fileName_<%=cid%>.intern()) {
                     <%
                     }
                     if (isParallelize) {

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

@@ -47,7 +47,7 @@ if ((metadatas!=null)&&(metadatas.size()>0)) {
 		}
 		if (((AbstractNode)node).getParallelIterator() != null) {
 		%>
-			synchronized ((Object[])globalMap.get("lockWrite_<%=((AbstractNode)node).getParallelIterator()%>")) {
+			synchronized (fileName_<%=cid %>.intern()) {
 		<% 
 		}
 		if (isParallelize) {

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

@@ -90,7 +90,7 @@ if(("false").equals(ElementParameterParser.getValue(node,"__CSV_OPTION__"))) {
                         }
                         if (((AbstractNode)node).getParallelIterator() != null) {
                 %>
-                synchronized ((Object[])globalMap.get("lockWrite_<%=((AbstractNode)node).getParallelIterator()%>")) {
+                synchronized (fileName_<%=cid%>.intern()) {
                 <%
                         }
                         if (isParallelize) {
@@ -240,7 +240,7 @@ if(("false").equals(ElementParameterParser.getValue(node,"__CSV_OPTION__"))) {
                         }
                         if (((AbstractNode)node).getParallelIterator() != null) {
                     %>
-                    synchronized ((Object[])globalMap.get("lockWrite_<%=((AbstractNode)node).getParallelIterator()%>")) {
+                    synchronized (fileName_<%=cid%>.intern()) {
                     <%
                         }
                         if (isParallelize) {
@@ -439,7 +439,7 @@ if(("false").equals(ElementParameterParser.getValue(node,"__CSV_OPTION__"))) {
                             }
                             if (((AbstractNode)node).getParallelIterator() != null) {
                             %>
-                    synchronized ((Object[])globalMap.get("lockWrite_<%=((AbstractNode)node).getParallelIterator()%>")) {
+                    synchronized (fileName_<%=cid%>.intern()) {
                             <%
                             }
                             if (isParallelize) {
@@ -610,7 +610,7 @@ if(("false").equals(ElementParameterParser.getValue(node,"__CSV_OPTION__"))) {
                         }
                         if (((AbstractNode)node).getParallelIterator() != null) {
 %>
-                synchronized ((Object[])globalMap.get("lockWrite_<%=((AbstractNode)node).getParallelIterator()%>")) {
+                synchronized (fileName_<%=cid%>.intern()) {
 <%
                         }
                         if (isParallelize) {

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

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

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

@@ -124,10 +124,8 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="Java_DOM4J1.6" MODULE="dom4j-1.6.1.jar" MVN="mvn:dom4j/dom4j/1.6.1"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/dom4j-1.6.1.jar"
-				REQUIRED="true" BundleID="" />
-			<IMPORT NAME="Java_JAXEN1.1" MODULE="jaxen-1.1.1.jar" MVN="mvn:org.talend.libraries/jaxen-1.1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/jaxen-1.1.1.jar"
-				REQUIRED="true" BundleID="" />
+			<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_JAXEN_1.1.6" MODULE="jaxen-1.1.6.jar" MVN="mvn:jaxen/jaxen/1.1.6" REQUIRED="true" BundleID="" />
 			<IMPORT NAME="Java_xmlUtil" MODULE="xmlUtil.jar" MVN="mvn:org.talend.libraries/xmlUtil/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.xml/lib/xmlUtil.jar"
 				REQUIRED="true" />
 		</IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tFileOutputPositional/tFileOutputPositional_end.javajet

@@ -37,7 +37,7 @@
 	}
 	if (((AbstractNode)node).getParallelIterator() != null) {
 %>
-	synchronized ((Object[])globalMap.get("lockWrite_<%=((AbstractNode)node).getParallelIterator()%>")) {
+	synchronized (fileNewName_<%=cid%>.intern()) {
 <% 
 	}
 	if (isParallelize) {

main/plugins/org.talend.designer.components.localprovider/components/tFileOutputPositional/tFileOutputPositional_main.javajet

@@ -77,7 +77,7 @@ if ((metadatas!=null)&&(metadatas.size()>0)) {
 				}
 				if (((AbstractNode)node).getParallelIterator() != null) {
 			%>
-			synchronized ((Object[])globalMap.get("lockWrite_<%=((AbstractNode)node).getParallelIterator()%>")) {
+			synchronized (fileNewName_<%=cid%>.intern()) {
 			<% 
 				}
 				if (isParallelize) {

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

@@ -134,7 +134,7 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="dom4j-1_6" MODULE="dom4j-1.6.1.jar" MVN="mvn:dom4j/dom4j/1.6.1"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/dom4j-1.6.1.jar" REQUIRED="true" BundleID="" />
+			<IMPORT NAME="dom4j-2.1.1" MODULE="dom4j-2.1.1.jar" MVN="mvn:org.dom4j/dom4j/2.1.1" REQUIRED="true" BundleID="" />
 		</IMPORTS>
 	</CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tGoogleDataprocManage/tGoogleDataprocManage_begin.javajet

@@ -24,6 +24,8 @@
 	String action = ElementParameterParser.getValue(node, "__ACTION__");
 	String version = ElementParameterParser.getValue(node, "__CLUSTER_VERSION__");
 	String zone = ElementParameterParser.getValue(node, "__ZONE__");
+	String region = ElementParameterParser.getValue(node, "__REGION__");
+
 	
 	String masterNumInstances = ElementParameterParser.getValue(node, "__MASTER_NUM_INSTANCES__");
 	String masterInstanceType = ElementParameterParser.getValue(node, "__MASTER_INSTANCE_TYPE__");
@@ -49,6 +51,7 @@
 	List<Map<String, String>> tags = (List<Map<String, String>>) ElementParameterParser.getObjectValue(node, "__TAGS__");
 %>
 
+    final String region_<%=cid %> = <%=region%>;
 <%
 	if("START".equals(action)) {
 %>
@@ -67,11 +70,16 @@
 <%
 		}
 %>
-		org.talend.bigdata.manage.google.dataproc.DataprocCreateCluster.newBuilder() //
+        final String zone_<%=cid %> = <%=zone%>;
+
+        if (!"global".equals(region_<%=cid %>) && !zone_<%=cid %>.startsWith(region_<%=cid %>)) {
+            throw new IllegalArgumentException("Selected zone should fit for the selected region");
+        }
+        org.talend.bigdata.manage.google.dataproc.DataprocCreateCluster.newBuilder() //
          .withProjectId(<%=projectId%>) //
-			.withClusterName(<%=clusterId%>) //
-         .withRegion("global") //
-         .withZone(<%=zone%>) //
+         .withClusterName(<%=clusterId%>) //
+         .withRegion(region_<%=cid %>) //
+         .withZone(zone_<%=cid %>) //
          .withVersion(<%=version%>) //
          .withMasterNumInstances(<%=masterNumInstances%>) //
          .withMasterBootDiskSizeGb(<%=masterDiskSize%>) //
@@ -109,8 +117,8 @@
 %>
 		org.talend.bigdata.manage.google.dataproc.DataprocDeleteCluster.newBuilder() //
          .withProjectId(<%=projectId%>) //
-			.withClusterName(<%=clusterId%>) //
-			.withRegion("global") //
+         .withClusterName(<%=clusterId%>) //
+         .withRegion(region_<%=cid %>) //
          .withTalendJobName(projectName + "_" + jobName + "_" + jobVersion.replace(".","_") + "_" + pid) //
 <%
 			if(useServiceAccount) {

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

@@ -41,7 +41,7 @@
 		</PARAMETER>
 
 		<PARAMETER NAME="PATH_TO_GOOGLE_CREDENTIALS"
-			REPOSITORY_VALUE="PATH_TO_GOOGLE_CREDENTIALS" FIELD="TEXT" REQUIRED="true"
+			REPOSITORY_VALUE="PATH_TO_GOOGLE_CREDENTIALS" FIELD="FILE" REQUIRED="true"
 			NUM_ROW="16" GROUP="CONFIGURATION"
 			SHOW_IF="((isShow[DEFINE_PATH_TO_GOOGLE_CREDENTIALS]) AND DEFINE_PATH_TO_GOOGLE_CREDENTIALS=='true')">
 			<DEFAULT>""</DEFAULT>
@@ -57,35 +57,104 @@
 
 		<PARAMETER NAME="CLUSTER_VERSION" FIELD="OPENED_LIST"
 			NUM_ROW="21" SHOW_IF="ACTION=='START'" REQUIRED="true" GROUP="CONFIGURATION">
-			<ITEMS DEFAULT="LATEST">
-				<ITEM NAME="LATEST" VALUE="&quot;latest&quot;" />
+			<ITEMS DEFAULT="DATAPROC_1_4_0">
+				<ITEM NAME="DATAPROC_1_4_0" VALUE="&quot;1.4&quot;" />
+				<ITEM NAME="DATAPROC_1_3_0" VALUE="&quot;1.3&quot;" />
 				<ITEM NAME="DATAPROC_1_1_0" VALUE="&quot;1.1&quot;" />
 			</ITEMS>
 		</PARAMETER>
 
+			<PARAMETER NAME="REGION" FIELD="OPENED_LIST" NUM_ROW="25"
+			REQUIRED="true" GROUP="CONFIGURATION">
+			<ITEMS DEFAULT="GLOBAL">
+				<ITEM NAME="GLOBAL" VALUE="&quot;global&quot;" />
+				<ITEM NAME="ASIA_EAST1" VALUE="&quot;asia-east1&quot;" />
+				<ITEM NAME="ASIA_EAST2" VALUE="&quot;asia-east2&quot;" />
+				<ITEM NAME="ASIA_NORTHEAST1" VALUE="&quot;asia-northeast1&quot;" />
+				<ITEM NAME="ASIA_NORTHEAST2" VALUE="&quot;asia-northeast2&quot;" />
+				<ITEM NAME="ASIA_SOUTH1" VALUE="&quot;asia-south1&quot;" />
+				<ITEM NAME="ASIA_SOUTHEAST1" VALUE="&quot;asia-southeast1&quot;" />
+				<ITEM NAME="AUSTRALIA_SOUTHEAST1" VALUE="&quot;australia-southeast1&quot;" />
+				<ITEM NAME="EUROPE_NORTH1" VALUE="&quot;europe-north1&quot;" />
+				<ITEM NAME="EUROPE_WEST1" VALUE="&quot;europe-west1&quot;" />
+				<ITEM NAME="EUROPE_WEST2" VALUE="&quot;europe-west2&quot;" />
+				<ITEM NAME="EUROPE_WEST3" VALUE="&quot;europe-west3&quot;" />
+				<ITEM NAME="EUROPE_WEST4" VALUE="&quot;europe-west4&quot;" />
+				<ITEM NAME="EUROPE_WEST6" VALUE="&quot;europe-west6&quot;" />
+				<ITEM NAME="NORTHAMERICA_NORTHEAST1" VALUE="&quot;northamerica-northeast1&quot;" />
+				<ITEM NAME="SOUTHAMERICA_EAST1" VALUE="&quot;southhamerica-east1&quot;" />
+				<ITEM NAME="US_WEST1" VALUE="&quot;us-west1&quot;" />
+				<ITEM NAME="US_WEST2" VALUE="&quot;us-west2&quot;" />
+				<ITEM NAME="US_CENTRAL1" VALUE="&quot;us-central1&quot;" />
+				<ITEM NAME="US_EAST1" VALUE="&quot;us-east1&quot;" />
+				<ITEM NAME="US_EAST4" VALUE="&quot;us-east4&quot;" />
+			</ITEMS>
+		</PARAMETER>
+
 		<PARAMETER NAME="ZONE" FIELD="OPENED_LIST" NUM_ROW="25"
 			REQUIRED="true" SHOW_IF="ACTION=='START'" GROUP="CONFIGURATION">
 			<ITEMS DEFAULT="US_CENTRAL1_A">
-				<ITEM NAME="US_WEST1_A" VALUE="&quot;us-west1-a&quot;" />
-				<ITEM NAME="US_WEST1_B" VALUE="&quot;us-west1-b&quot;" />
-				<ITEM NAME="US_CENTRAL1_A" VALUE="&quot;us-central1-a&quot;" />
-				<ITEM NAME="US_CENTRAL1_B" VALUE="&quot;us-central1-b&quot;" />
-				<ITEM NAME="US_CENTRAL1_C" VALUE="&quot;us-central1-c&quot;" />
-				<ITEM NAME="US_CENTRAL1_F" VALUE="&quot;us-central1-f&quot;" />
-				<ITEM NAME="US_EAST1_B" VALUE="&quot;us-east1-b&quot;" />
-				<ITEM NAME="US_EAST1_C" VALUE="&quot;us-east1-c&quot;" />
-				<ITEM NAME="US_EAST1_D" VALUE="&quot;us-east1-d&quot;" />
-				<ITEM NAME="EUROPE_WEST1_B" VALUE="&quot;europe-west1-b&quot;" />
-				<ITEM NAME="EUROPE_WEST1_C" VALUE="&quot;europe-west1-c&quot;" />
-				<ITEM NAME="EUROPE_WEST1_D" VALUE="&quot;europe-west1-d&quot;" />
-				<ITEM NAME="ASIA_SOUTHEAST1_A" VALUE="&quot;asia-southeast1-a&quot;" />
-				<ITEM NAME="ASIA_SOUTHEAST1_B" VALUE="&quot;asia-southeast1-b&quot;" />
-				<ITEM NAME="ASIA_EAST1_A" VALUE="&quot;asia-east1-a&quot;" />
-				<ITEM NAME="ASIA_EAST1_B" VALUE="&quot;asia-east1-b&quot;" />
-				<ITEM NAME="ASIA_EAST1_C" VALUE="&quot;asia-east1-c&quot;" />
-				<ITEM NAME="ASIA_NORTHEAST1_A" VALUE="&quot;asia-northeast1-a&quot;" />
-				<ITEM NAME="ASIA_NORTHEAST1_B" VALUE="&quot;asia-northeast1-b&quot;" />
-				<ITEM NAME="ASIA_NORTHEAST1_C" VALUE="&quot;asia-northeast1-c&quot;" />
+				<ITEM NAME="ASIA_EAST1_A" VALUE="&quot;asia-east1-a&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'ASIA_EAST1')" />
+				<ITEM NAME="ASIA_EAST1_B" VALUE="&quot;asia-east1-b&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'ASIA_EAST1')" />
+				<ITEM NAME="ASIA_EAST1_C" VALUE="&quot;asia-east1-c&quot;" SHOW_IF="(REGION == 'GLOBAL' OR (REGION == 'ASIA_EAST1')" />
+				<ITEM NAME="ASIA_EAST2_A" VALUE="&quot;asia-east2-a&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'ASIA_EAST2')" />
+				<ITEM NAME="ASIA_EAST2_B" VALUE="&quot;asia-east2-b&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'ASIA_EAST2')" />
+				<ITEM NAME="ASIA_EAST2_C" VALUE="&quot;asia-east2-c&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'ASIA_EAST2')" />
+				<ITEM NAME="ASIA_NORTHEAST1_A" VALUE="&quot;asia-northeast1-a&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'ASIA_NORTHEAST1')" />
+				<ITEM NAME="ASIA_NORTHEAST1_B" VALUE="&quot;asia-northeast1-b&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'ASIA_NORTHEAST1')" />
+				<ITEM NAME="ASIA_NORTHEAST1_C" VALUE="&quot;asia-northeast1-c&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'ASIA_NORTHEAST1')" />
+				<ITEM NAME="ASIA_NORTHEAST2_A" VALUE="&quot;asia-northeast2-a&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'ASIA_NORTHEAST2')" />
+				<ITEM NAME="ASIA_NORTHEAST2_B" VALUE="&quot;asia-northeast2-b&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'ASIA_NORTHEAST2')" />
+				<ITEM NAME="ASIA_NORTHEAST2_C" VALUE="&quot;asia-northeast2-c&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'ASIA_NORTHEAST2')" />
+				<ITEM NAME="ASIA_SOUTH1_A" VALUE="&quot;asia-south1-a&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'ASIA_SOUTH1')" />
+				<ITEM NAME="ASIA_SOUTH1_B" VALUE="&quot;asia-south1-b&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'ASIA_SOUTH1')" />
+				<ITEM NAME="ASIA_SOUTH1_C" VALUE="&quot;asia-south1-c&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'ASIA_SOUTH1')" />
+				<ITEM NAME="ASIA_SOUTHEAST1_A" VALUE="&quot;asia-southeast1-a&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'ASIA_SOUTHEAST1')" />
+				<ITEM NAME="ASIA_SOUTHEAST1_B" VALUE="&quot;asia-southeast1-b&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'ASIA_SOUTHEAST1')" />
+				<ITEM NAME="ASIA_SOUTHEAST1_C" VALUE="&quot;asia-southeast1-c&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'ASIA_SOUTHEAST1')" />
+				<ITEM NAME="AUSTRALIA_SOUTHEAST1_A" VALUE="&quot;australia-southeast1-a&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'AUSTRALIA_SOUTHEAST1')" />
+				<ITEM NAME="AUSTRALIA_SOUTHEAST1_B" VALUE="&quot;australia-southeast1-b&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'AUSTRALIA_SOUTHEAST1')" />
+				<ITEM NAME="AUSTRALIA_SOUTHEAST1_C" VALUE="&quot;australia-southeast1-c&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'AUSTRALIA_SOUTHEAST1')" />
+				<ITEM NAME="EUROPE_NORTH1_A" VALUE="&quot;europe-north1-a&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'EUROPE_NORTH1')" />
+				<ITEM NAME="EUROPE_NORTH1_B" VALUE="&quot;europe-north1-b&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'EUROPE_NORTH1')" />
+				<ITEM NAME="EUROPE_NORTH1_C" VALUE="&quot;europe-north1-c&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'EUROPE_NORTH1')" />
+				<ITEM NAME="EUROPE_WEST1_B" VALUE="&quot;europe-west1-b&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'EUROPE_WEST1')" />
+				<ITEM NAME="EUROPE_WEST1_C" VALUE="&quot;europe-west1-c&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'EUROPE_WEST1')" />
+				<ITEM NAME="EUROPE_WEST1_D" VALUE="&quot;europe-west1-d&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'EUROPE_WEST1')" />
+				<ITEM NAME="EUROPE_WEST2_A" VALUE="&quot;europe-west2-a&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'EUROPE_WEST2')" />
+				<ITEM NAME="EUROPE_WEST2_B" VALUE="&quot;europe-west2-b&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'EUROPE_WEST2')" />
+				<ITEM NAME="EUROPE_WEST2_C" VALUE="&quot;europe-west2-c&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'EUROPE_WEST2')" />
+				<ITEM NAME="EUROPE_WEST3_A" VALUE="&quot;europe-west3-a&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'EUROPE_WEST3')" />
+				<ITEM NAME="EUROPE_WEST3_B" VALUE="&quot;europe-west3-b&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'EUROPE_WEST3')" />
+				<ITEM NAME="EUROPE_WEST3_C" VALUE="&quot;europe-west3-c&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'EUROPE_WEST3')" />
+				<ITEM NAME="EUROPE_WEST4_A" VALUE="&quot;europe-west4-a&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'EUROPE_WEST4')" />
+				<ITEM NAME="EUROPE_WEST4_B" VALUE="&quot;europe-west4-b&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'EUROPE_WEST4')" />
+				<ITEM NAME="EUROPE_WEST4_C" VALUE="&quot;europe-west4-c&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'EUROPE_WEST4')" />
+				<ITEM NAME="EUROPE_WEST6_A" VALUE="&quot;europe-west6-a&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'EUROPE_WEST6')" />
+				<ITEM NAME="EUROPE_WEST6_B" VALUE="&quot;europe-west6-b&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'EUROPE_WEST6')" />
+				<ITEM NAME="EUROPE_WEST6_C" VALUE="&quot;europe-west6-c&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'EUROPE_WEST6')" />
+				<ITEM NAME="NORTHAMERICA_NORTHEAST1_A" VALUE="&quot;northamerica-northeast1-a&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'NORTHAMERICA_NORTHEAST1')" />
+				<ITEM NAME="NORTHAMERICA_NORTHEAST1_B" VALUE="&quot;northamerica-northeast1-b&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'NORTHAMERICA_NORTHEAST1')" />
+				<ITEM NAME="NORTHAMERICA_NORTHEAST1_C" VALUE="&quot;northamerica-northeast1-c&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'NORTHAMERICA_NORTHEAST1')" />
+				<ITEM NAME="SOUTHAMERICA_EAST1_A" VALUE="&quot;southhamerica-east1-a&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'SOUTHAMERICA_EAST1')" />
+				<ITEM NAME="SOUTHAMERICA_EAST1_B" VALUE="&quot;southhamerica-east1-b&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'SOUTHAMERICA_EAST1')" />
+				<ITEM NAME="SOUTHAMERICA_EAST1_C" VALUE="&quot;southhamerica-east1-c&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'SOUTHAMERICA_EAST1')" />
+				<ITEM NAME="US_CENTRAL1_A" VALUE="&quot;us-central1-a&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'US_CENTRAL1')" />
+				<ITEM NAME="US_CENTRAL1_B" VALUE="&quot;us-central1-b&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'US_CENTRAL1')" />
+				<ITEM NAME="US_CENTRAL1_C" VALUE="&quot;us-central1-c&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'US_CENTRAL1')" />
+				<ITEM NAME="US_CENTRAL1_F" VALUE="&quot;us-central1-f&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'US_CENTRAL1')" />
+				<ITEM NAME="US_EAST1_B" VALUE="&quot;us-east1-b&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'US_EAST1')" />
+				<ITEM NAME="US_EAST1_C" VALUE="&quot;us-east1-c&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'US_EAST1')" />
+				<ITEM NAME="US_EAST1_D" VALUE="&quot;us-east1-d&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'US_EAST1')" />
+				<ITEM NAME="US_EAST4_A" VALUE="&quot;us-east4-a&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'US_EAST4')" />
+				<ITEM NAME="US_EAST4_B" VALUE="&quot;us-east4-b&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'US_EAST4')" />
+				<ITEM NAME="US_EAST4_C" VALUE="&quot;us-east4-c&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'US_EAST4')" />
+				<ITEM NAME="US_WEST1_A" VALUE="&quot;us-west1-a&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'US_WEST1')" />
+				<ITEM NAME="US_WEST1_B" VALUE="&quot;us-west1-b&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'US_WEST1')" />
+				<ITEM NAME="US_WEST1_C" VALUE="&quot;us-west1-c&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'US_WEST1')" />
+				<ITEM NAME="US_WEST2_A" VALUE="&quot;us-west2-a&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'US_WEST2')" />
+				<ITEM NAME="US_WEST2_B" VALUE="&quot;us-west2-b&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'US_WEST2')" />
+				<ITEM NAME="US_WEST2_C" VALUE="&quot;us-west2-c&quot;" SHOW_IF="(REGION == 'GLOBAL') OR (REGION == 'US_WEST2')" />
 			</ITEMS>
 		</PARAMETER>
 
@@ -226,8 +295,12 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT MODULE_GROUP="GOOGLE-DATAPROC-MANAGE-LIB-DATAPROC11"
+			<IMPORT MODULE_GROUP="GOOGLE-DATAPROC-MANAGE-LIB-DATAPROC14"
 				REQUIRED="true" />
+			<IMPORT NAME="commons-codec"
+				MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED="true"/>
+			<IMPORT NAME="log4j"
+				MODULE="log4j-1.2.17.jar" MVN="mvn:log4j/log4j/1.2.17" REQUIRED="true"/>
 		</IMPORTS>
 	</CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tGoogleDataprocManage/tGoogleDataprocManage_messages.properties

@@ -12,18 +12,75 @@ ACTION.NAME=Action
 ACTION.ITEM.START=Start
 ACTION.ITEM.STOP=Stop
 
+REGION.NAME=Region
+REGION.ITEM.GLOBAL=Global
+REGION.ITEM.ASIA_EAST1=Asia East1 (Taiwan)
+REGION.ITEM.ASIA_EAST2=Asia East2 (Hong Kong)
+REGION.ITEM.ASIA_NORTHEAST1=Asia NE1 (Tokyo)
+REGION.ITEM.ASIA_NORTHEAST2=Asia NE2 (Osaka)
+REGION.ITEM.ASIA_SOUTH1=Asia South1(Mumbai)
+REGION.ITEM.ASIA_SOUTHEAST1=Asia SE1(Singapore)
+REGION.ITEM.AUSTRALIA_SOUTHEAST1=Australia SE1 (Sydney)
+REGION.ITEM.EUROPE_NORTH1=Europe North1 (Finland)
+REGION.ITEM.EUROPE_WEST1=Europe West1 (Belgium)
+REGION.ITEM.EUROPE_WEST2=Europe West2 (London)
+REGION.ITEM.EUROPE_WEST3=Europe West3 (Frankfurt)
+REGION.ITEM.EUROPE_WEST4=Europe West4 (Netherlands)
+REGION.ITEM.EUROPE_WEST6=Europe West6 (Zurich)
+REGION.ITEM.NORTHAMERICA_NORTHEAST1=North America NE1 (Montreal)
+REGION.ITEM.SOUTHAMERICA_EAST1=South America East1 (Osasco)
+REGION.ITEM.US_WEST1=US West1 (Oregon)
+REGION.ITEM.US_WEST2=US West2 (Los Angeles)
+REGION.ITEM.US_CENTRAL1=US Central1 (Iowa)
+REGION.ITEM.US_EAST1=US East1 (South Carolina)
+REGION.ITEM.US_EAST4=US East4 (Northern Virginia)
+
 ZONE.NAME=Zone
 ZONE.ITEM.ASIA_EAST1_A=Asia East1 (Taiwan) - A
 ZONE.ITEM.ASIA_EAST1_B=Asia East1 (Taiwan) - B
 ZONE.ITEM.ASIA_EAST1_C=Asia East1 (Taiwan) - C
+ZONE.ITEM.ASIA_EAST2_A=Asia East2 (Hong Kong) - A
+ZONE.ITEM.ASIA_EAST2_B=Asia East2 (Hong Kong) - B
+ZONE.ITEM.ASIA_EAST2_C=Asia East2 (Hong Kong) - C
 ZONE.ITEM.ASIA_NORTHEAST1_A=Asia NE1 (Tokyo) - A
 ZONE.ITEM.ASIA_NORTHEAST1_B=Asia NE1 (Tokyo) - B
-ZONE.ITEM.ASIA_NORTHEAST1_C=Asia SE1 (Tokyo) - C
+ZONE.ITEM.ASIA_NORTHEAST1_C=Asia NE1 (Tokyo) - C
+ZONE.ITEM.ASIA_NORTHEAST2_A=Asia NE2 (Osaka) - A
+ZONE.ITEM.ASIA_NORTHEAST2_B=Asia NE2 (Osaka) - B
+ZONE.ITEM.ASIA_NORTHEAST2_C=Asia NE2 (Osaka) - C
+ZONE.ITEM.ASIA_SOUTH1_A=Asia South1(Mumbai) - A
+ZONE.ITEM.ASIA_SOUTH1_B=Asia South1(Mumbai) - B
+ZONE.ITEM.ASIA_SOUTH1_C=Asia South1(Mumbai) - C
 ZONE.ITEM.ASIA_SOUTHEAST1_A=Asia SE1 (Singapore) - A
 ZONE.ITEM.ASIA_SOUTHEAST1_B=Asia SE1 (Singapore) - B
+ZONE.ITEM.ASIA_SOUTHEAST1_C=Asia SE1 (Singapore) - C
+ZONE.ITEM.AUSTRALIA_SOUTHEAST1_A=Australia SE1 (Sydney) - A
+ZONE.ITEM.AUSTRALIA_SOUTHEAST1_B=Australia SE1 (Sydney) - B
+ZONE.ITEM.AUSTRALIA_SOUTHEAST1_C=Australia SE1 (Sydney) - C
+ZONE.ITEM.EUROPE_NORTH1_A=Europe North1 (Finland) - A
+ZONE.ITEM.EUROPE_NORTH1_B=Europe North1 (Finland) - B
+ZONE.ITEM.EUROPE_NORTH1_C=Europe North1 (Finland) - C
 ZONE.ITEM.EUROPE_WEST1_B=Europe West1 (Belgium) - B
 ZONE.ITEM.EUROPE_WEST1_C=Europe West1 (Belgium) - C
 ZONE.ITEM.EUROPE_WEST1_D=Europe West1 (Belgium) - D
+ZONE.ITEM.EUROPE_WEST2_A=Europe West2 (London) - A
+ZONE.ITEM.EUROPE_WEST2_B=Europe West2 (London) - B
+ZONE.ITEM.EUROPE_WEST2_C=Europe West2 (London) - C
+ZONE.ITEM.EUROPE_WEST3_A=Europe West3 (Frankfurt) - A
+ZONE.ITEM.EUROPE_WEST3_B=Europe West3 (Frankfurt) - B
+ZONE.ITEM.EUROPE_WEST3_C=Europe West3 (Frankfurt) - C
+ZONE.ITEM.EUROPE_WEST4_A=Europe West4 (Netherlands) - A
+ZONE.ITEM.EUROPE_WEST4_B=Europe West4 (Netherlands) - B
+ZONE.ITEM.EUROPE_WEST4_C=Europe West4 (Netherlands) - C
+ZONE.ITEM.EUROPE_WEST6_A=Europe West6 (Zurich) - A
+ZONE.ITEM.EUROPE_WEST6_B=Europe West6 (Zurich) - B
+ZONE.ITEM.EUROPE_WEST6_C=Europe West6 (Zurich) - C
+ZONE.ITEM.NORTHAMERICA_NORTHEAST1_A=North America NE1 (Montreal) - A
+ZONE.ITEM.NORTHAMERICA_NORTHEAST1_B=North America NE1 (Montreal) - B
+ZONE.ITEM.NORTHAMERICA_NORTHEAST1_C=North America NE1 (Montreal) - C
+ZONE.ITEM.SOUTHAMERICA_EAST1_A=South America East1 (Osasco) - A
+ZONE.ITEM.SOUTHAMERICA_EAST1_B=South America East1 (Osasco) - B
+ZONE.ITEM.SOUTHAMERICA_EAST1_C=South America East1 (Osasco) - C
 ZONE.ITEM.US_CENTRAL1_A=US Central1 (Iowa) - A
 ZONE.ITEM.US_CENTRAL1_B=US Central1 (Iowa) - B
 ZONE.ITEM.US_CENTRAL1_C=US Central1 (Iowa) - C
@@ -31,11 +88,20 @@ ZONE.ITEM.US_CENTRAL1_F=US Central1 (Iowa) - F
 ZONE.ITEM.US_EAST1_B=US East1 (SC) - B
 ZONE.ITEM.US_EAST1_C=US East1 (SC) - C
 ZONE.ITEM.US_EAST1_D=US East1 (SC) - D
-ZONE.ITEM.US_WEST1_A=US East1 (Oregon) - A
-ZONE.ITEM.US_WEST1_B=US East1 (Oregon) - B
+ZONE.ITEM.US_EAST4_A=US East4 (Northern Virginia) - A
+ZONE.ITEM.US_EAST4_B=US East4 (Northern Virginia) - B
+ZONE.ITEM.US_EAST4_C=US East4 (Northern Virginia) - C
+ZONE.ITEM.US_WEST1_A=US West1 (Oregon) - A
+ZONE.ITEM.US_WEST1_B=US West1 (Oregon) - B
+ZONE.ITEM.US_WEST1_C=US West1 (Oregon) - C
+ZONE.ITEM.US_WEST2_A=US West2 (Los Angeles) - A
+ZONE.ITEM.US_WEST2_B=US West2 (Los Angeles) - B
+ZONE.ITEM.US_WEST2_C=US West2 (Los Angeles) - C
 
 CLUSTER_VERSION.NAME=Version
 CLUSTER_VERSION.ITEM.DATAPROC_1_1_0=Dataproc 1.1
+CLUSTER_VERSION.ITEM.DATAPROC_1_3_0=Dataproc 1.3
+CLUSTER_VERSION.ITEM.DATAPROC_1_4_0=Dataproc 1.4
 CLUSTER_VERSION.ITEM.LATEST=Latest
 
 INSTANCE_CONFIGURATION.NAME=Instance Configuration

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

@@ -3585,8 +3585,7 @@
 				UrlPath="platform:/plugin/org.talend.libraries.hadoop/lib/parquet-hive-bundle-1.3.2.jar"
 				REQUIRED_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[] AND DISTRIBUTION=='PIVOTAL_HD' AND HIVE_VERSION!='PIVOTAL_HD_1_0_1')" />
 			<IMPORT NAME="snappy-java-1.0.5.jar" MODULE="snappy-java-1.0.5.jar"
-				MVN="mvn:org.talend.libraries/snappy-java-1.0.5/6.0.0"
-				UrlPath="platform:/plugin/org.talend.libraries.pig/lib/snappy-java-1.0.5.jar"
+				MVN="mvn:org.talend.libraries/snappy-java-1.0.5/6.0.0"				
 				REQUIRED_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[] AND DISTRIBUTION!='CUSTOM' AND HIVE_VERSION!='Cloudera_CDH4' AND HIVE_VERSION!='MAPR2' AND HIVE_VERSION!='APACHE_1_0_0' AND HIVE_VERSION!='PIVOTAL_HD_1_0_1' AND HIVE_VERSION!='APACHE_2_4_0_EMR_0_13_1')" />
 			<!-- ############## -->
 			<IMPORT MODULE_GROUP="TEZ-LIB-HDP220"

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

@@ -3641,8 +3641,7 @@
 				UrlPath="platform:/plugin/org.talend.libraries.hadoop/lib/parquet-hive-bundle-1.3.2.jar"
 				REQUIRED_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[] AND USE_EXISTING_CONNECTION=='false' AND USE_PARQUET=='true' AND DISTRIBUTION=='PIVOTAL_HD' AND HIVE_VERSION!='PIVOTAL_HD_1_0_1')" />
 			<IMPORT NAME="snappy-java-1.0.5.jar" MODULE="snappy-java-1.0.5.jar"
-				MVN="mvn:org.talend.libraries/snappy-java-1.0.5/6.0.0"
-				UrlPath="platform:/plugin/org.talend.libraries.pig/lib/snappy-java-1.0.5.jar"
+				MVN="mvn:org.talend.libraries/snappy-java-1.0.5/6.0.0"				
 				REQUIRED_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[] AND USE_EXISTING_CONNECTION=='false' AND USE_PARQUET=='true' AND DISTRIBUTION!='CUSTOM' AND HIVE_VERSION!='Cloudera_CDH4' AND HIVE_VERSION!='MAPR2' AND HIVE_VERSION!='APACHE_1_0_0' AND HIVE_VERSION!='PIVOTAL_HD_1_0_1')" />
 			<!-- ############## -->
 			<!-- HDP_2_1 Tez additional -->

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

@@ -27514,7 +27514,7 @@
                 <IMPORT NAME="geronimo-stax" MODULE="geronimo-stax-api_1.0_spec-1.0.1.jar" MVN="mvn:org.talend.libraries/geronimo-stax-api_1.0_spec-1.0.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/geronimo-stax-api_1.0_spec-1.0.1.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
                 <IMPORT NAME="wstx-asl" MODULE="wstx-asl-3.2.4.jar" MVN="mvn:org.talend.libraries/wstx-asl-3.2.4/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/wstx-asl-3.2.4.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
                 <IMPORT NAME="SOAP-JAF" MODULE="activation.jar" MVN="mvn:org.talend.libraries/activation/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/activation.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-                <IMPORT NAME="Java-JAXEN" MODULE="jaxen-1.1.1.jar" MVN="mvn:org.talend.libraries/jaxen-1.1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/jaxen-1.1.1.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')" BundleID="" />
+                <IMPORT NAME="Java-JAXEN" MODULE="jaxen-1.1.6.jar" MVN="mvn:jaxen/jaxen/1.1.6" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')" BundleID="" />
                 <IMPORT NAME="saajapi" MODULE="saaj-api.jar" MVN="mvn:org.talend.libraries/saaj-api/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.saaj/lib/saaj-api.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
                 <IMPORT NAME="saajimpl" MODULE="saaj-impl.jar" MVN="mvn:org.talend.libraries/saaj-impl/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.saaj/lib/saaj-impl.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
                 <IMPORT NAME="jaxpapi" MODULE="jaxp-api.jar" MVN="mvn:org.talend.libraries/jaxp-api/6.0.0"  BundleID="" UrlPath="platform:/plugin/org.talend.libraries.jax/lib/jaxp-api.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
@@ -27755,10 +27755,9 @@
                     MVN="mvn:org.apache.santuario/xmlsec/2.1.2"
                     REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
                 <IMPORT
-                    NAME="dom4j-1.6.1"
-                    MODULE="dom4j-1.6.1.jar"
-                    MVN="mvn:dom4j/dom4j/1.6.1"
-                    UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/dom4j-1.6.1.jar"
+                    NAME="dom4j-2.1.1"
+                    MODULE="dom4j-2.1.1.jar"
+                    MVN="mvn:org.dom4j/dom4j/2.1.1"
                     REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')"
                     BundleID="" />
                 <IMPORT

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

@@ -38277,7 +38277,7 @@
             <IMPORT NAME="geronimo-stax" MODULE="geronimo-stax-api_1.0_spec-1.0.1.jar" MVN="mvn:org.talend.libraries/geronimo-stax-api_1.0_spec-1.0.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/geronimo-stax-api_1.0_spec-1.0.1.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
             <IMPORT NAME="wstx-asl" MODULE="wstx-asl-3.2.4.jar" MVN="mvn:org.talend.libraries/wstx-asl-3.2.4/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/wstx-asl-3.2.4.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
             <IMPORT NAME="SOAP-JAF" MODULE="activation.jar" MVN="mvn:org.talend.libraries/activation/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/activation.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-            <IMPORT NAME="Java-JAXEN" MODULE="jaxen-1.1.1.jar" MVN="mvn:org.talend.libraries/jaxen-1.1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/jaxen-1.1.1.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')" BundleID="" />
+            <IMPORT NAME="Java-JAXEN" MODULE="jaxen-1.1.6.jar" MVN="mvn:jaxen/jaxen/1.1.6" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')" BundleID="" />
             <IMPORT NAME="saajapi" MODULE="saaj-api.jar" MVN="mvn:org.talend.libraries/saaj-api/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.saaj/lib/saaj-api.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
             <IMPORT NAME="saajimpl" MODULE="saaj-impl.jar" MVN="mvn:org.talend.libraries/saaj-impl/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.saaj/lib/saaj-impl.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
             <IMPORT NAME="jaxpapi" MODULE="jaxp-api.jar" MVN="mvn:org.talend.libraries/jaxp-api/6.0.0"  BundleID="" UrlPath="platform:/plugin/org.talend.libraries.jax/lib/jaxp-api.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
@@ -38518,17 +38518,15 @@
                 MVN="mvn:org.apache.santuario/xmlsec/2.1.2"
                 REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
             <IMPORT
-                NAME="dom4j-1.6.1"
-                MODULE="dom4j-1.6.1.jar"
-                MVN="mvn:dom4j/dom4j/1.6.1"
-                UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/dom4j-1.6.1.jar"
+                NAME="dom4j-2.1.1"
+                MODULE="dom4j-2.1.1.jar"
+                MVN="mvn:org.dom4j/dom4j/2.1.1"
                 REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')"
                 BundleID="" />
             <IMPORT
-                NAME="jaxen-1.1.1"
-                MODULE="jaxen-1.1.1.jar"
-                MVN="mvn:org.talend.libraries/jaxen-1.1.1/6.0.0"
-                UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/jaxen-1.1.1.jar"
+                NAME="jaxen-1.1.6"
+                MODULE="jaxen-1.1.6.jar"
+                MVN="mvn:jaxen/jaxen/1.1.6"
                 REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')"
                 BundleID="" />
             <IMPORT

main/plugins/org.talend.designer.components.localprovider/components/tOpenbravoERPInput/tOpenbravoERPInput_begin.javajet

@@ -293,7 +293,7 @@ String loopPath_<%=cid %> = "/ob:Openbravo/<%=entityName %>";
 org.dom4j.XPath x_<%=cid%> = doc_<%=cid%>.createXPath(nsTool_<%=cid%>.addDefaultNSPrefix(loopPath_<%=cid %>, loopPath_<%=cid %>));  
 x_<%=cid%>.setNamespaceURIs(xmlNameSpaceMap_<%=cid%>); 
 
-java.util.List<org.dom4j.tree.AbstractNode> nodeList_<%=cid%> = (java.util.List<org.dom4j.tree.AbstractNode>)x_<%=cid%>.selectNodes(doc_<%=cid%>);	
+java.util.List<org.dom4j.Node> nodeList_<%=cid%> = (java.util.List<org.dom4j.Node>)x_<%=cid%>.selectNodes(doc_<%=cid%>);	
 XML_API_<%=cid%> xml_api_<%=cid%> = new XML_API_<%=cid%>();
 String str_<%=cid %> = "";
 String referenceFieldSeparator_<%=cid %> = ";";
@@ -301,7 +301,7 @@ org.dom4j.Node node_<%=cid%> = null;
 StringBuilder referenceValue_<%=cid %> = new StringBuilder();
 is_<%=cid %>.close();
 hc_<%=cid %>.disconnect();
-for (org.dom4j.tree.AbstractNode temp_<%=cid%>: nodeList_<%=cid%>) {
+for (org.dom4j.Node temp_<%=cid%>: nodeList_<%=cid%>) {
 	nb_line_<%=cid%>++;
 <%
 List< ? extends IConnection> conns = node.getOutgoingSortedConnections();
@@ -390,10 +390,10 @@ if(itemType<%=i %>_<%=cid %>.equals("")){
 						}
 %>
 // List field: <%=columnName %>. Entity type of the list item is "<%=itemType %>".
-java.util.List<org.dom4j.tree.AbstractNode> nodes<%=i %>_<%=cid %> = temp_<%=cid %>.selectNodes("./<%=openbravoName %>/<%=itemType %>");
+java.util.List<org.dom4j.Node> nodes<%=i %>_<%=cid %> = temp_<%=cid %>.selectNodes("./<%=openbravoName %>/<%=itemType %>");
 //System.out.print(nodes23_<%=cid %>.size());
 <%=conn.getName() %>.<%=columnName %> = new java.util.ArrayList<String>();
-for (org.dom4j.tree.AbstractNode node<%=i %>_<%=cid %> : nodes<%=i %>_<%=cid %>) {
+for (org.dom4j.Node node<%=i %>_<%=cid %> : nodes<%=i %>_<%=cid %>) {
 	// string value for Reference.
     referenceValue_<%=cid %>.delete(0, referenceValue_<%=cid %>.length());
     // @id

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

@@ -10604,10 +10604,8 @@
 
   	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="Java_DOM4J1.6" MODULE="dom4j-1.6.1.jar" MVN="mvn:dom4j/dom4j/1.6.1"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/dom4j-1.6.1.jar"
-				REQUIRED="true" BundleID="" />
-			<IMPORT NAME="Java_JAXEN1.1" MODULE="jaxen-1.1.1.jar" MVN="mvn:org.talend.libraries/jaxen-1.1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/jaxen-1.1.1.jar"
-				REQUIRED="true" BundleID="" />
+			<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_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/tOpenbravoERPOutput/tOpenbravoERPOutput_java.xml

@@ -10592,10 +10592,8 @@
 
   	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="Java_DOM4J1.6" MODULE="dom4j-1.6.1.jar" MVN="mvn:dom4j/dom4j/1.6.1"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/dom4j-1.6.1.jar"
-				REQUIRED="true" BundleID="" />
-			<IMPORT NAME="Java_JAXEN1.1" MODULE="jaxen-1.1.1.jar" MVN="mvn:org.talend.libraries/jaxen-1.1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/jaxen-1.1.1.jar"
-				REQUIRED="true" BundleID="" />
+			<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_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/tRSSInput/tRSSInput_java.xml

@@ -154,7 +154,7 @@
 	<CODEGENERATION>
     <IMPORTS>
        <IMPORT NAME="Java-Feed" MODULE="feed4j.jar" MVN="mvn:org.talend.libraries/feed4j/6.0.0"  REQUIRED="true" />
-       <IMPORT NAME="Java-DOM" MODULE="dom4j-1.6.1.jar" MVN="mvn:dom4j/dom4j/1.6.1"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/dom4j-1.6.1.jar" REQUIRED="true" BundleID="" />
+       <IMPORT NAME="Java-DOM" MODULE="dom4j-2.1.1.jar" MVN="mvn:org.dom4j/dom4j/2.1.1" REQUIRED="true" BundleID="" />
         <IMPORT NAME="Java-NEKO" MODULE="nekohtml.jar" MVN="mvn:org.talend.libraries/nekohtml/6.0.0"  REQUIRED="true" />
        <IMPORT NAME="Java-XER" MODULE="xercesImpl.jar" MVN="mvn:org.talend.libraries/xercesImpl/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.xml/lib/xercesImpl.jar" REQUIRED="true" BundleID="" />
        <IMPORT NAME="Java-XML" MODULE="xml-apis.jar" MVN="mvn:org.talend.libraries/xml-apis/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.xml/lib/xml-apis.jar" REQUIRED="true" />

main/plugins/org.talend.designer.components.localprovider/components/tRSSOutput/tRSSOutput_java.xml

@@ -188,8 +188,8 @@
   </PARAMETERS>
  <CODEGENERATION>
     <IMPORTS>
-       <IMPORT NAME="Java-DOM4J" MODULE="dom4j-1.6.1.jar" MVN="mvn:dom4j/dom4j/1.6.1"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/dom4j-1.6.1.jar" REQUIRED="true" BundleID="" />
-        <IMPORT NAME="Java-JAXEN" MODULE="jaxen-1.1.1.jar" MVN="mvn:org.talend.libraries/jaxen-1.1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/jaxen-1.1.1.jar" REQUIRED="true" BundleID="" />
+       <IMPORT NAME="Java-DOM4J" MODULE="dom4j-2.1.1.jar" MVN="mvn:org.dom4j/dom4j/2.1.1" REQUIRED="true" BundleID="" />
+        <IMPORT NAME="Java-JAXEN" 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/tRedshiftBulkExec/tRedshiftBulkExec_java.xml

@@ -412,8 +412,8 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="Driver-Redshift" MODULE="redshift-jdbc42-no-awssdk-1.2.32.1056.jar"
-				MVN="mvn:com.amazon.redshift/redshift-jdbc42-no-awssdk/1.2.32.1056" 
+			<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="true" />
 			<IMPORT NAME="aws-java-sdk-1.11.406.jar" MODULE="aws-java-sdk-1.11.406.jar"
 				MVN="mvn:com.amazonaws/aws-java-sdk/1.11.406" 

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

@@ -196,7 +196,7 @@
 
     <CODEGENERATION>
       <IMPORTS>
-        <IMPORT NAME="Driver-Redshift" MODULE="redshift-jdbc42-no-awssdk-1.2.32.1056.jar" MVN="mvn:com.amazon.redshift/redshift-jdbc42-no-awssdk/1.2.32.1056" REQUIRED="true" />
+        <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="true" />
         <IMPORT NAME="aws-java-sdk-1.11.406.jar" MODULE="aws-java-sdk-1.11.406.jar" MVN="mvn:com.amazonaws/aws-java-sdk/1.11.406" REQUIRED_IF="(JDBC_URL == 'SSO')" />
         <IMPORT NAME="commons-logging-1.1.3.jar" MODULE="commons-logging-1.1.3.jar" MVN="mvn:commons-logging/commons-logging/1.1.3" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.3.jar" REQUIRED_IF="(JDBC_URL == 'SSO')" />
         <IMPORT NAME="jackson-databind-2.10.1.jar" MODULE="jackson-databind-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.10.1" REQUIRED_IF="(JDBC_URL == 'SSO')" />

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

@@ -279,7 +279,7 @@
 
    <CODEGENERATION>
      <IMPORTS>
-        <IMPORT NAME="Driver-Redshift" MODULE="redshift-jdbc42-no-awssdk-1.2.32.1056.jar" MVN="mvn:com.amazon.redshift/redshift-jdbc42-no-awssdk/1.2.32.1056" REQUIRED="true" />
+        <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="true" />
         <IMPORT NAME="aws-java-sdk-1.11.406.jar" MODULE="aws-java-sdk-1.11.406.jar" MVN="mvn:com.amazonaws/aws-java-sdk/1.11.406" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="commons-logging-1.1.3.jar" MODULE="commons-logging-1.1.3.jar" MVN="mvn:commons-logging/commons-logging/1.1.3" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.3.jar" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="jackson-databind-2.10.1.jar" MODULE="jackson-databind-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.10.1" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />

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

@@ -388,7 +388,7 @@
 
    <CODEGENERATION>
      <IMPORTS>
-        <IMPORT NAME="Driver-Redshift" MODULE="redshift-jdbc42-no-awssdk-1.2.32.1056.jar" MVN="mvn:com.amazon.redshift/redshift-jdbc42-no-awssdk/1.2.32.1056" REQUIRED="true" />
+        <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="true" />
         <IMPORT NAME="aws-java-sdk-1.11.406.jar" MODULE="aws-java-sdk-1.11.406.jar" MVN="mvn:com.amazonaws/aws-java-sdk/1.11.406" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="commons-logging-1.1.3.jar" MODULE="commons-logging-1.1.3.jar" MVN="mvn:commons-logging/commons-logging/1.1.3" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.3.jar" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="jackson-databind-2.10.1.jar" MODULE="jackson-databind-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.10.1" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />

main/plugins/org.talend.designer.components.localprovider/components/tRedshiftOutputBulkExec/tRedshiftOutputBulkExec_java.xml

@@ -536,8 +536,8 @@
 		</TEMPLATES>
 
 		<IMPORTS>
-			<IMPORT NAME="Driver-Redshift" MODULE="redshift-jdbc42-no-awssdk-1.2.32.1056.jar"
-				MVN="mvn:com.amazon.redshift/redshift-jdbc42-no-awssdk/1.2.32.1056" 
+			<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="true" />
 			<IMPORT NAME="aws-java-sdk-1.11.406.jar" MODULE="aws-java-sdk-1.11.406.jar"
 				MVN="mvn:com.amazonaws/aws-java-sdk/1.11.406"

main/plugins/org.talend.designer.components.localprovider/components/tRedshiftRow/tRedshiftRow_java.xml

@@ -297,7 +297,7 @@
 
    <CODEGENERATION>
      <IMPORTS>
-        <IMPORT NAME="Driver-Redshift" MODULE="redshift-jdbc42-no-awssdk-1.2.32.1056.jar" MVN="mvn:com.amazon.redshift/redshift-jdbc42-no-awssdk/1.2.32.1056" REQUIRED="true" />
+        <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="true" />
         <IMPORT NAME="aws-java-sdk-1.11.406.jar" MODULE="aws-java-sdk-1.11.406.jar" MVN="mvn:com.amazonaws/aws-java-sdk/1.11.406" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="commons-logging-1.1.3.jar" MODULE="commons-logging-1.1.3.jar" MVN="mvn:commons-logging/commons-logging/1.1.3" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.3.jar" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="jackson-databind-2.10.1.jar" MODULE="jackson-databind-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.10.1" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />

main/plugins/org.talend.designer.components.localprovider/components/tRedshiftUnload/tRedshiftUnload_java.xml

@@ -282,7 +282,7 @@
 
     <CODEGENERATION>
         <IMPORTS>
-            <IMPORT NAME="Driver-Redshift" MODULE="redshift-jdbc42-no-awssdk-1.2.32.1056.jar" MVN="mvn:com.amazon.redshift/redshift-jdbc42-no-awssdk/1.2.32.1056" REQUIRED="true" />
+            <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="true" />
             <IMPORT NAME="aws-java-sdk-1.11.406.jar" MODULE="aws-java-sdk-1.11.406.jar" MVN="mvn:com.amazonaws/aws-java-sdk/1.11.406" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="commons-logging-1.1.3.jar" MODULE="commons-logging-1.1.3.jar" MVN="mvn:commons-logging/commons-logging/1.1.3" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.3.jar" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="jackson-databind-2.10.1.jar" MODULE="jackson-databind-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.10.1" REQUIRED_IF="(JDBC_URL == 'SSO') AND (USE_EXISTING_CONNECTION == 'false')" />

main/plugins/org.talend.designer.components.localprovider/components/tRunJob/tRunJob_main.javajet

@@ -435,7 +435,9 @@ String inputConnName = null;
         <%
             if (ProcessorUtilities.isEsbJob(currentProcess)) {
         %>
-        childJob_<%=cid %>.setEndpointRegistry(registry);
+        if (childJob_<%=cid %> instanceof routines.system.api.TalendESBJob) {
+            ((routines.system.api.TalendESBJob)childJob_<%=cid %>).setEndpointRegistry(registry);
+        }
         <%
             }
         %>

main/plugins/org.talend.designer.components.localprovider/components/tSageX3Input/tSageX3Input_java.xml

@@ -111,8 +111,8 @@
 			<IMPORT NAME="SOAP-logging" MODULE="commons-logging-1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.jar" REQUIRED="true" />
 			<IMPORT NAME="SOAP-JavaMail" MODULE="mail.jar" MVN="mvn:org.talend.libraries/mail/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/mail.jar" REQUIRED="true" />
 			<IMPORT NAME="SOAP-JAF" MODULE="activation.jar" MVN="mvn:org.talend.libraries/activation/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/activation.jar" REQUIRED="true" />
-			<IMPORT NAME="XML-DOM4J" MODULE="dom4j-1.6.1.jar" MVN="mvn:dom4j/dom4j/1.6.1"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/dom4j-1.6.1.jar" REQUIRED="true" BundleID="" />
-			<IMPORT NAME="XML-XPATH-JAXEN" MODULE="jaxen-1.1.1.jar" MVN="mvn:org.talend.libraries/jaxen-1.1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/jaxen-1.1.1.jar" REQUIRED="true" BundleID="" />
+			<IMPORT NAME="XML-DOM4J" MODULE="dom4j-2.1.1.jar" MVN="mvn:org.dom4j/dom4j/2.1.1" REQUIRED="true" BundleID="" />
+			<IMPORT NAME="XML-XPATH-JAXEN" MODULE="jaxen-1.1.6.jar" MVN="mvn:jaxen/jaxen/1.1.6" REQUIRED="true" BundleID="" />
 			<IMPORT NAME="TALEND-SAGE" MODULE="talend-sage.jar" MVN="mvn:org.talend.libraries/talend-sage/6.0.0"  REQUIRED="true" />
      </IMPORTS>
   </CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tSageX3Output/tSageX3Output_java.xml

@@ -100,8 +100,8 @@
 			<IMPORT NAME="SOAP-logging" MODULE="commons-logging-1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.jar" REQUIRED="true" />
 			<IMPORT NAME="SOAP-JavaMail" MODULE="mail.jar" MVN="mvn:org.talend.libraries/mail/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/mail.jar" REQUIRED="true" />
 			<IMPORT NAME="SOAP-JAF" MODULE="activation.jar" MVN="mvn:org.talend.libraries/activation/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/activation.jar" REQUIRED="true" />
-			<IMPORT NAME="XML-DOM4J" MODULE="dom4j-1.6.1.jar" MVN="mvn:dom4j/dom4j/1.6.1"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/dom4j-1.6.1.jar" REQUIRED="true" BundleID="" />
-			<IMPORT NAME="XML-XPATH-JAXEN" MODULE="jaxen-1.1.1.jar" MVN="mvn:org.talend.libraries/jaxen-1.1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/jaxen-1.1.1.jar" REQUIRED="true" BundleID="" />
+			<IMPORT NAME="XML-DOM4J" MODULE="dom4j-2.1.1.jar" MVN="mvn:org.dom4j/dom4j/2.1.1" REQUIRED="true" BundleID="" />
+			<IMPORT NAME="XML-XPATH-JAXEN" MODULE="jaxen-1.1.6.jar" MVN="mvn:jaxen/jaxen/1.1.6" REQUIRED="true" BundleID="" />
 			<IMPORT NAME="TALEND-SAGE" MODULE="talend-sage.jar" MVN="mvn:org.talend.libraries/talend-sage/6.0.0"  REQUIRED="true" />
      </IMPORTS>
   </CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tSalesforceEinsteinBulkExec/tSalesforceEinsteinBulkExec_java.xml

@@ -86,7 +86,7 @@
           REPOSITORY_VALUE="ENDPOINT"
           SHOW_IF="USE_EXISTING_CONNECTION == 'false'"
         >
-          <DEFAULT>"https://login.salesforce.com/services/Soap/u/45.0"</DEFAULT>
+          <DEFAULT>"https://login.salesforce.com/services/Soap/u/47.0"</DEFAULT>
         </PARAMETER>
 
         <PARAMETER
@@ -339,15 +339,15 @@
     <CODEGENERATION>
       <IMPORTS>
         <IMPORT
-            NAME="force-wsc-46.0.0"
-            MODULE="force-wsc-46.0.0.jar"
-            MVN="mvn:com.force.api/force-wsc/46.0.0"
+            NAME="force-wsc-47.0.0"
+            MODULE="force-wsc-47.0.0.jar"
+            MVN="mvn:com.force.api/force-wsc/47.0.0"
             REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'"
         />
         <IMPORT
-            NAME="force-partner-api-46.0.0"
-            MODULE="force-partner-api-46.0.0.jar"
-            MVN="mvn:com.force.api/force-partner-api/46.0.0"
+            NAME="force-partner-api-47.0.0"
+            MODULE="force-partner-api-47.0.0.jar"
+            MVN="mvn:com.force.api/force-partner-api/47.0.0"
             REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'"
         />
         <IMPORT

main/plugins/org.talend.designer.components.localprovider/components/tSalesforceEinsteinOutputBulkExec/tSalesforceEinsteinOutputBulkExec_java.xml

@@ -122,7 +122,7 @@
           GROUP="CONNECTION_INFO"
           SHOW_IF="USE_EXISTING_CONNECTION == 'false'"
         >
-          <DEFAULT>"https://login.salesforce.com/services/Soap/u/45.0"</DEFAULT>
+          <DEFAULT>"https://login.salesforce.com/services/Soap/u/47.0"</DEFAULT>
         </PARAMETER>
 
         <PARAMETER

main/plugins/org.talend.designer.components.localprovider/components/tWriteXMLFieldOut/tWriteXMLFieldOut_java.xml

@@ -166,10 +166,8 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="Java_DOM4J1.6" MODULE="dom4j-1.6.1.jar" MVN="mvn:dom4j/dom4j/1.6.1"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/dom4j-1.6.1.jar"
-				REQUIRED="true" BundleID="" />
-			<IMPORT NAME="Java_JAXEN1.1" MODULE="jaxen-1.1.1.jar" MVN="mvn:org.talend.libraries/jaxen-1.1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/jaxen-1.1.1.jar"
-				REQUIRED="true" BundleID="" />
+			<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_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/tXMLMap/tXMLMap_java.xml

@@ -72,11 +72,9 @@
 		</TEMPLATES>
 
 		<IMPORTS>
-			<IMPORT NAME="Java_DOM4J1.6" MODULE="dom4j-1.6.1.jar" MVN="mvn:dom4j/dom4j/1.6.1"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/dom4j-1.6.1.jar"
-				BundleID="org.apache.servicemix.bundles.dom4j"
+			<IMPORT NAME="Java_DOM4J_2.1.1" MODULE="dom4j-2.1.1.jar" MVN="mvn:org.dom4j/dom4j/2.1.1" BundleID="org.apache.servicemix.bundles.dom4j"
 				REQUIRED="true" />
-			<IMPORT NAME="Java_JAXEN1.1" MODULE="jaxen-1.1.1.jar" MVN="mvn:org.talend.libraries/jaxen-1.1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/jaxen-1.1.1.jar"
-				BundleID="org.apache.servicemix.bundles.jaxen"
+			<IMPORT NAME="Java_JAXEN_1.1.6" MODULE="jaxen-1.1.6.jar" MVN="mvn:jaxen/jaxen/1.1.6" BundleID="org.apache.servicemix.bundles.jaxen"
 				REQUIRED="true" />
 		</IMPORTS>
 	</CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tXMLMap/tXMLMap_main.inc.javajet

@@ -188,84 +188,7 @@ skeleton="tXMLMap_java.skeleton"
 			}// for(outputNode)
 		} // for (outputXMLTree)
 		%>
-		<%
-		if(hasDocumentInAnyLookupTable) {//it's impossible that hasDocumentInMainInputTable is true, please see org.talend.designer.xmlmap.util.XMLMapperHelper
-		%>
-		treeNodeAPI_<%=cid %>.clear();
-		<%
-		}
 		
-		//TODO should remove the code as it's never been used, please see org.talend.designer.xmlmap.util.XMLMapperHelper
-		String mainInputName = mainInputTable.getName();
-		for(TreeNode tmpNode : mainInputTable.getNodes()){
-			boolean isInnerJoin = true;
-//			currentMainNode = tmpNode;
-
-			if(tmpNode.getType().equals("id_Document")){
-				isPlainNode = false;
-			}
-			
-			if(("id_Document").equals(tmpNode.getType())) { // find the type:document node.
-				hasDocumentInMainInputTable = true;
-				//find the loop path
-				XPathHelper xpathHelper = new XPathHelper(tmpNode);
-				
-				String loopPath = xpathHelper.getLoopNodeXPath();
-				%>
-				String xPathLoop_<%=cid %> = "<%=loopPath %>";
-				org.dom4j.Document doc_<%=cid%> = <%=mainInputName %>.<%=tmpNode.getName() %>.getDocument(); 
-				<%if(!xpathHelper.hasDefinedNS()){%>
-					//old version, find NS from doc
-					nsTool_<%=cid%>.countNSMap(doc_<%=cid%>.getRootElement());
-					java.util.HashMap<String,String> xmlNameSpaceMap_<%=cid%> = nsTool_<%=cid%>.xmlNameSpaceMap;
-					org.dom4j.XPath x_<%=cid%> = doc_<%=cid%>.createXPath(nsTool_<%=cid%>.addDefaultNSPrefix(xPathLoop_<%=cid %>,xPathLoop_<%=cid %>));  
-					x_<%=cid%>.setNamespaceURIs(xmlNameSpaceMap_<%=cid%>);
-				<%}else{%>
-					java.util.HashMap<String,String> xmlNameSpaceMap_<%=cid%> = new java.util.HashMap<String,String>();
-					<%=xpathHelper.buildNSMapping("xmlNameSpaceMap"+"_"+cid)%>
-					org.dom4j.XPath x_<%=cid%> = doc_<%=cid%>.createXPath(xPathLoop_<%=cid %>);
-					x_<%=cid%>.setNamespaceURIs(xmlNameSpaceMap_<%=cid%>);
-				<%}%>
-
-			    java.util.List<org.dom4j.tree.AbstractNode> nodeList_<%=cid%> = (java.util.List<org.dom4j.tree.AbstractNode>)x_<%=cid%>.selectNodes(doc_<%=cid%>);	
-			    String str_<%=cid %> = null;
-			    org.dom4j.Node node_<%=cid%> = null;
-
-				for (org.dom4j.tree.AbstractNode temp_<%=cid%>: nodeList_<%=cid%>) { // G_TXM_M_001
-			    	nb_line_<%=cid%>++;
-			    	<%= rejectedInnerJoin %> = false;
-			    	<%= rejectedDocInnerJoin %> = false;
-					<%=mainRowRejected%>=false;
-				    isMatchDocRow<%=cid%> = false;
-					
-			    	treeNodeAPI_<%=cid %>.clear();
-					<%
-					Map<String,String> outNodesXPath = xpathHelper.getOutNodesXPath();
-					int i = 0;
-					for (Object key : outNodesXPath.keySet()) { 
-					    Object val = outNodesXPath.get(key);
-						if(!xpathHelper.hasDefinedNS()){
-						%>
-						org.dom4j.XPath xTmp<%=i%>_<%=cid%> = temp_<%=cid%>.createXPath(nsTool_<%=cid%>.addDefaultNSPrefix("<%=val %>",xPathLoop_<%=cid %>));
-					    <%}else{%>
-					   	org.dom4j.XPath xTmp<%=i%>_<%=cid%> = temp_<%=cid%>.createXPath("<%=val%>");
-					    <%}%>
-					    xTmp<%=i%>_<%=cid%>.setNamespaceURIs(xmlNameSpaceMap_<%=cid%>);
-					    Object obj<%=i%>_<%=cid%> = xTmp<%=i%>_<%=cid%>.evaluate(temp_<%=cid%>);
-					    if(obj<%=i%>_<%=cid%> instanceof String || obj<%=i%>_<%=cid%> instanceof Number){
-					    	str_<%=cid %> = String.valueOf(obj<%=i%>_<%=cid%>);
-					    	treeNodeAPI_<%=cid %>.put("<%=key %>", str_<%=cid %>);
-					    }else{
-					    	node_<%=cid%> = xTmp<%=i%>_<%=cid%>.selectSingleNode(temp_<%=cid%>);
-					    	treeNodeAPI_<%=cid %>.put("<%=key %>", node_<%=cid%>!=null ? xTmp<%=i%>_<%=cid%>.valueOf(temp_<%=cid%>) : null);
-					    }
-					<%
-						i++;
-					}
-	   		}// if(document)
-		}// for()
-		%>
-
 <%
 	TreeUtil treeUtil = new TreeUtil();
 	for (int iInputTable = 0; iInputTable < sizeInputTables; iInputTable++) {

main/plugins/org.talend.designer.components.localprovider/components/templates/DB/Input/BigQuery/BigQueryHelper_Oauth.javajet

@@ -0,0 +1,75 @@
+<%@ jet
+%>
+class BigQueryHelper_<%=cid%> {
+			
+	private final java.time.format.DateTimeFormatter timeParserFormat = java.time.format.DateTimeFormatter.ofPattern("[H][HH]:[m][mm]:[s][ss][.SSSSSS][.SSSSS][.SSSS][.SSS][.SS][.S][X][Z][VV][z]");
+			
+	private final java.time.format.DateTimeFormatter timeDateParserFormat = java.time.format.DateTimeFormatter.ofPattern("yyyy-[M][MM]-[d][dd][ ]['T']HH:[m][mm]:[s][ss][.SSSSSS][.SSSSS][.SSSS][.SSS][.SS][.S][X][Z][VV][z]");
+			
+	private final java.time.format.DateTimeFormatter dateParserFormat = java.time.format.DateTimeFormatter.ofPattern("yyyy-[M][MM]-[d][dd]");
+	
+	public void readColumnsFromBigQuery(Dynamic column, java.util.List<com.google.api.services.bigquery.model.TableCell> rs, int fixedColumnCount, boolean trim) throws Exception {
+		column.clearColumnValues();
+		for (int i = 0; i < column.getColumnCount(); i++) {
+			DynamicMetadata dcm = column.getColumnMetadata(i);
+			int colNum = fixedColumnCount + i;
+			if (com.google.api.client.util.Data.isNull(rs.get(colNum).getV())) {
+				column.addColumnValue(null);
+				continue;
+			}
+			if ("id_String".equals(dcm.getType())) {
+				String value = rs.get(colNum).getV().toString();
+				column.addColumnValue((trim && (value!=null)) ? value.trim() : value);
+			} else if ("id_Date".equals(dcm.getType())) {
+				if("TIMESTAMP".equals(dcm.getDbType())) {
+					column.addColumnValue(new Date(ParserUtils.parseTo_Double(rs.get(colNum).getV().toString()).longValue() * 1000));
+				} else if("TIME".equalsIgnoreCase(dcm.getDbType())) {
+					java.time.LocalTime ta = timeParserFormat.parse(rs.get(colNum).getV().toString(), java.time.LocalTime::from);
+					column.addColumnValue(Date.from(ta.atDate(java.time.LocalDate.of(1970, 1, 1)).
+							atZone(java.time.ZoneId.systemDefault()).toInstant()));
+				} else if("DATETIME".equalsIgnoreCase(dcm.getDbType())) {
+					java.time.LocalDateTime ta = timeDateParserFormat.parse(rs.get(colNum).getV().toString(), java.time.LocalDateTime::from);
+					column.addColumnValue(Date.from(ta.atZone(java.time.ZoneId.systemDefault()).toInstant()));
+				} else if("DATE".equalsIgnoreCase(dcm.getDbType())) {
+					java.time.LocalDate ta = dateParserFormat.parse(rs.get(colNum).getV().toString(), java.time.LocalDate::from);
+					column.addColumnValue(Date.from(ta.atStartOfDay(java.time.ZoneId.systemDefault()).toInstant()));
+				}
+			} else if ("id_Integer".equals(dcm.getType()) || "id_Long".equals(dcm.getType()) || "id_Double".equals(dcm.getType())
+					|| "id_Byte".equals(dcm.getType()) || "id_BigDecimal".equals(dcm.getType())) {
+				<%
+				if(advancedSeparator) {
+				%>
+					String strNum = ParserUtils.parseTo_Number(value_<%=cid%>.toString(), <%= thousandsSeparator %>, <%= decimalSeparator %>).toString();
+				<%
+				} else {
+				%>
+					String strNum = rs.get(colNum).getV().toString();
+				<%
+				}
+				%>
+				if ("id_Integer".equals(dcm.getType())) {
+					column.addColumnValue(ParserUtils.parseTo_Integer(strNum));
+				} else if ("id_Long".equals(dcm.getType())) {
+					column.addColumnValue(ParserUtils.parseTo_Long(strNum));
+				} else if ("id_Double".equals(dcm.getType())) {
+					column.addColumnValue(ParserUtils.parseTo_Double(strNum));
+				} else if ("id_Byte".equals(dcm.getType())) {
+					column.addColumnValue(ParserUtils.parseTo_Byte(strNum));
+				} else if ("id_BigDecimal".equals(dcm.getType())) {
+					column.addColumnValue(ParserUtils.parseTo_BigDecimal(strNum));
+				}
+			} else if("id_byte[]".equals(dcm.getType())) {
+				column.addColumnValue(rs.get(colNum).getV().toString().getBytes(<%=encoding %>));
+			} else  if ("id_Boolean".equals(dcm.getType())) {
+				if (rs.get(colNum).getV() == null) {
+					column.addColumnValue(null);
+				}else{
+					column.addColumnValue(ParserUtils.parseTo_Boolean(rs.get(colNum).getV().toString()));
+				}
+			} else {
+				column.addColumnValue(rs.get(colNum).getV());
+			}
+		}
+	}
+		
+}

main/plugins/org.talend.designer.components.localprovider/components/templates/DB/Input/BigQuery/BigQueryHelper_ServiceAccount.javajet

@@ -0,0 +1,72 @@
+<%@jet
+%>
+class BigQueryHelper_<%=cid%> {
+			
+	private final java.time.format.DateTimeFormatter timeParserFormat = java.time.format.DateTimeFormatter.ofPattern("[H][HH]:[m][mm]:[s][ss][.SSSSSS][.SSSSS][.SSSS][.SSS][.SS][.S][X][Z][VV][z]");
+			
+	private final java.time.format.DateTimeFormatter timeDateParserFormat = java.time.format.DateTimeFormatter.ofPattern("yyyy-[M][MM]-[d][dd][ ]['T']HH:[m][mm]:[s][ss][.SSSSSS][.SSSSS][.SSSS][.SSS][.SS][.S][X][Z][VV][z]");
+			
+	private final java.time.format.DateTimeFormatter dateParserFormat = java.time.format.DateTimeFormatter.ofPattern("yyyy-[M][MM]-[d][dd]");
+
+	public void readColumnsFromBigQuery(Dynamic column, com.google.cloud.bigquery.FieldValueList rs, int fixedColumnCount, boolean trim) throws Exception {
+		column.clearColumnValues();
+		for (int i = 0; i < column.getColumnCount(); i++) {
+			DynamicMetadata dcm = column.getColumnMetadata(i);
+			int colNum = fixedColumnCount + i;
+			if (rs.get(colNum).getValue() == null) {
+				column.addColumnValue(null);
+				continue;
+			}
+			if ("id_String".equals(dcm.getType())) {
+				String value;
+				if("STRING".equalsIgnoreCase(dcm.getDbType())) {
+					value = rs.get(colNum).getStringValue();
+				} else {
+					value = String.valueOf(rs.get(colNum).getValue());
+				}
+				column.addColumnValue((trim && (value!=null)) ? value.trim() : value);
+			} else if ("id_Date".equals(dcm.getType())) {
+				if("TIMESTAMP".equals(dcm.getDbType())) {
+					column.addColumnValue(new Date(ParserUtils.parseTo_Double(rs.get(colNum).getStringValue()).longValue() * 1000));
+				} else if("TIME".equalsIgnoreCase(dcm.getDbType())) {
+					java.time.LocalTime ta = timeParserFormat.parse(rs.get(colNum).getStringValue(), java.time.LocalTime::from);
+					column.addColumnValue(Date.from(ta.atDate(java.time.LocalDate.of(1970, 1, 1)).
+							atZone(java.time.ZoneId.systemDefault()).toInstant()));
+				} else if("DATETIME".equalsIgnoreCase(dcm.getDbType())) {
+					java.time.LocalDateTime ta = timeDateParserFormat.parse(rs.get(colNum).getStringValue(), java.time.LocalDateTime::from);
+					column.addColumnValue(Date.from(ta.atZone(java.time.ZoneId.systemDefault()).toInstant()));
+				} else if("DATE".equalsIgnoreCase(dcm.getDbType())) {
+					java.time.LocalDate ta = dateParserFormat.parse(rs.get(colNum).getStringValue(), java.time.LocalDate::from);
+					column.addColumnValue(Date.from(ta.atStartOfDay(java.time.ZoneId.systemDefault()).toInstant()));
+				}
+			} else if ("id_Integer".equals(dcm.getType()) || "id_Long".equals(dcm.getType()) || "id_Double".equals(dcm.getType())
+					|| "id_Byte".equals(dcm.getType()) || "id_byte[]".equals(dcm.getType()) || "id_BigDecimal".equals(dcm.getType())) {
+				if (rs.get(colNum).getValue() == null) {
+					column.addColumnValue(null);
+					continue;
+				}
+				if ("id_Integer".equals(dcm.getType())) {
+					column.addColumnValue(rs.get(colNum).getNumericValue().intValue());
+				} else if ("id_Long".equals(dcm.getType())) {
+					column.addColumnValue(rs.get(colNum).getLongValue());
+				} else if ("id_Double".equals(dcm.getType())) {
+					column.addColumnValue(rs.get(colNum).getDoubleValue());
+				} else if ("id_Byte".equals(dcm.getType())) {
+					column.addColumnValue(rs.get(colNum).getNumericValue().byteValue());
+				} else if ("id_byte[]".equals(dcm.getType())) {
+					column.addColumnValue(rs.get(colNum).getValue().toString().getBytes(<%=encoding %>));
+				} else if ("id_BigDecimal".equals(dcm.getType())) {
+					column.addColumnValue(rs.get(colNum).getNumericValue());
+				}
+			}else  if ("id_Boolean".equals(dcm.getType())) {
+				if (rs.get(colNum).getValue() == null) {
+					column.addColumnValue(null);
+				}else{
+					column.addColumnValue(rs.get(colNum).getBooleanValue());
+				}
+			} else {
+				column.addColumnValue(rs.get(colNum).getValue());
+			}
+		}
+	}
+}

main/plugins/org.talend.designer.components.localprovider/plugin.xml

@@ -213,12 +213,11 @@
          	name="zookeeper-3.4.5-cdh5.4.0.jar" mvn_uri="mvn:org.talend.libraries/zookeeper-3.4.5-cdh5.4.0/6.0.0"
          	uripath="platform:/plugin/org.talend.libraries.zookeeper/lib/zookeeper-3.4.5-cdh5.4.0.jar">
     	</libraryNeeded>
-
+    	
     	<libraryNeeded
 	   		context="plugin:org.talend.libraries.pig"
         	id="pig-withouthadoop-cdh5.4-lastest"
-         	name="pig-0.12.0-cdh5.4.0-withouthadoop.jar" mvn_uri="mvn:org.talend.libraries/pig-0.12.0-cdh5.4.0-withouthadoop/6.0.0"
-         	uripath="platform:/plugin/org.talend.libraries.pig/lib/pig-0.12.0-cdh5.4.0-withouthadoop.jar">
+         	name="pig-0.12.0-cdh5.4.0-withouthadoop.jar" mvn_uri="mvn:org.talend.libraries/pig-0.12.0-cdh5.4.0-withouthadoop/6.0.0">         	
     	</libraryNeeded>
 
     	<libraryNeeded
@@ -440,8 +439,7 @@
     	<libraryNeeded
 	   		context="plugin:org.talend.libraries.pig"
         	id="pig-withouthadoop-cdh5.1-lastest"
-         	name="pig-0.12.0-cdh5.1.2-withouthadoop.jar" mvn_uri="mvn:org.talend.libraries/pig-0.12.0-cdh5.1.2-withouthadoop/6.0.0"
-         	uripath="platform:/plugin/org.talend.libraries.pig/lib/pig-0.12.0-cdh5.1.2-withouthadoop.jar">
+         	name="pig-0.12.0-cdh5.1.2-withouthadoop.jar" mvn_uri="mvn:org.talend.libraries/pig-0.12.0-cdh5.1.2-withouthadoop/6.0.0">        	
     	</libraryNeeded>
 
     	<libraryNeeded
@@ -785,15 +783,13 @@
         <libraryNeeded
             context="plugin:org.talend.libraries.pig"
             id="pig-HDP_2_3"
-            name="pig-0.15.0.2.3.2.0-2950-core-h2.jar" mvn_uri="mvn:org.talend.libraries/pig-0.15.0.2.3.2.0-2950-core-h2/6.1.0"
-            uripath="platform:/plugin/org.talend.libraries.pig/lib/pig-0.15.0.2.3.2.0-2950-core-h2.jar">
+            name="pig-0.15.0.2.3.2.0-2950-core-h2.jar" mvn_uri="mvn:org.talend.libraries/pig-0.15.0.2.3.2.0-2950-core-h2/6.1.0">         
         </libraryNeeded>
 
         <libraryNeeded
             context="plugin:org.talend.libraries.pig"
             id="piggybank-hdp2.3.jar"
-            name="piggybank-hdp2.3.jar" mvn_uri="mvn:org.talend.libraries/piggybank-hdp2.3/6.1.0"
-            uripath="platform:/plugin/org.talend.libraries.pig/lib/piggybank-hdp2.3.jar">
+            name="piggybank-hdp2.3.jar" mvn_uri="mvn:org.talend.libraries/piggybank-hdp2.3/6.1.0">       
         </libraryNeeded>
 
         <libraryNeeded
@@ -1050,8 +1046,7 @@
     	<libraryNeeded
 	   		context="plugin:org.talend.libraries.pig"
         	id="pig-withouthadoop-hdp2.2-lastest"
-         	name="pig-0.14.0.2.2.0.0-2041-core-h2.jar" mvn_uri="mvn:org.talend.libraries/pig-0.14.0.2.2.0.0-2041-core-h2/6.0.0"
-         	uripath="platform:/plugin/org.talend.libraries.pig/lib/pig-0.14.0.2.2.0.0-2041-core-h2.jar">
+         	name="pig-0.14.0.2.2.0.0-2041-core-h2.jar" mvn_uri="mvn:org.talend.libraries/pig-0.14.0.2.2.0.0-2041-core-h2/6.0.0">     	
     	</libraryNeeded>
 
     	<libraryNeeded
@@ -1267,8 +1262,7 @@
         <libraryNeeded
             context="plugin:org.talend.libraries.pig"
             id="pig-withouthadoop-emr400-latest"
-            name="pig-0.14.0-amzn-0-core-h2.jar" mvn_uri="mvn:org.talend.libraries/pig-0.14.0-amzn-0-core-h2/6.0.0"
-            uripath="platform:/plugin/org.talend.libraries.pig/lib/pig-0.14.0-amzn-0-core-h2.jar">
+            name="pig-0.14.0-amzn-0-core-h2.jar" mvn_uri="mvn:org.talend.libraries/pig-0.14.0-amzn-0-core-h2/6.0.0">          
         </libraryNeeded>
 
         <libraryNeeded
@@ -1474,8 +1468,7 @@
     	<libraryNeeded
 	   		context="plugin:org.talend.libraries.pig"
         	id="pig-withouthadoop-mapr-4.0.X-lastest"
-         	name="pig-withouthadoop-0.12.1-mapr-1408-h2.jar" mvn_uri="mvn:org.talend.libraries/pig-withouthadoop-0.12.1-mapr-1408-h2/6.0.0"
-         	uripath="platform:/plugin/org.talend.libraries.pig/lib/pig-withouthadoop-0.12.1-mapr-1408-h2.jar">
+         	name="pig-withouthadoop-0.12.1-mapr-1408-h2.jar" mvn_uri="mvn:org.talend.libraries/pig-withouthadoop-0.12.1-mapr-1408-h2/6.0.0">        	
     	</libraryNeeded>
 
     	<libraryNeeded
@@ -1558,8 +1551,7 @@
         <libraryNeeded
             context="plugin:org.talend.libraries.pig"
             id="pig-withouthadoop-mapr-4.1.X-lastest"
-            name="pig-core-h2.jar" mvn_uri="mvn:org.talend.libraries/pig-core-h2/6.0.0"
-            uripath="platform:/plugin/org.talend.libraries.pig/lib/pig-core-h2.jar">
+            name="pig-core-h2.jar" mvn_uri="mvn:org.talend.libraries/pig-core-h2/6.0.0">      
         </libraryNeeded>
 
         <libraryNeeded
@@ -1984,8 +1976,7 @@
     	<libraryNeeded
 	   		context="plugin:org.talend.libraries.pig"
         	id="snappy-java-1.0.5.jar"
-         	name="snappy-java-1.0.5.jar" mvn_uri="mvn:org.talend.libraries/snappy-java-1.0.5/6.0.0"
-         	uripath="platform:/plugin/org.talend.libraries.pig/lib/snappy-java-1.0.5.jar">
+         	name="snappy-java-1.0.5.jar" mvn_uri="mvn:org.talend.libraries/snappy-java-1.0.5/6.0.0">       	
     	</libraryNeeded>
 
     	<libraryNeeded
@@ -2038,22 +2029,19 @@
     	<libraryNeeded
 	   		context="plugin:org.talend.libraries.pig"
         	id="piggybank-cdh5.1.jar"
-         	name="piggybank-cdh5.1.jar" mvn_uri="mvn:org.talend.libraries/piggybank-cdh5.1/6.0.0"
-         	uripath="platform:/plugin/org.talend.libraries.pig/lib/piggybank-cdh5.1.jar">
+         	name="piggybank-cdh5.1.jar" mvn_uri="mvn:org.talend.libraries/piggybank-cdh5.1/6.0.0">        	
     	</libraryNeeded>
 
     	<libraryNeeded
 	   		context="plugin:org.talend.libraries.pig"
         	id="piggybank-cdh5.4.jar"
-         	name="piggybank-cdh5.4.jar" mvn_uri="mvn:org.talend.libraries/piggybank-cdh5.4/6.0.0"
-         	uripath="platform:/plugin/org.talend.libraries.pig/lib/piggybank-cdh5.4.jar">
+         	name="piggybank-cdh5.4.jar" mvn_uri="mvn:org.talend.libraries/piggybank-cdh5.4/6.0.0">         	
     	</libraryNeeded>
 
     	<libraryNeeded
 	   		context="plugin:org.talend.libraries.pig"
         	id="piggybank-hdp2.2.jar"
-         	name="piggybank-hdp2.2.jar" mvn_uri="mvn:org.talend.libraries/piggybank-hdp2.2/6.0.0"
-         	uripath="platform:/plugin/org.talend.libraries.pig/lib/piggybank-hdp2.2.jar">
+         	name="piggybank-hdp2.2.jar" mvn_uri="mvn:org.talend.libraries/piggybank-hdp2.2/6.0.0">         	
     	</libraryNeeded>
 
     	<libraryNeeded

main/plugins/org.talend.designer.core.generic/src/main/java/org/talend/designer/core/generic/controller/ComponentRefController.java

@@ -20,6 +20,7 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.jface.fieldassist.DecoratedField;
 import org.eclipse.jface.fieldassist.FieldDecoration;
@@ -61,6 +62,9 @@ public class ComponentRefController extends AbstractElementPropertySectionContro
 
     private Map<String, String> labelToValueMap = new HashMap<>();
 
+    private String[] componentsName = new String[] { "tJDBCClose", "tJDBCRollback", "tJDBCCommit", "tSnowflakeClose", //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$
+            "tSnowflakeRollback", "tSnowflakeCommit", "tMarkLogicClose" }; //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+
     public ComponentRefController(IDynamicProperty dp) {
         super(dp);
     }
@@ -286,7 +290,10 @@ public class ComponentRefController extends AbstractElementPropertySectionContro
 
         // First item is this component (see also createComboCommand)
         // FIXME - I18N for this message
-        itemsLabel.add("Use this Component");
+        String componentName = currentNode.getComponent().getName();
+        if (!ArrayUtils.contains(componentsName, componentName)) {
+            itemsLabel.add("Use this Component"); //$NON-NLS-1$
+        }
         itemsValue.add(currentNode.getUniqueName());
         String selectedValue;
         Object referenceType = props.referenceType.getValue();
@@ -324,7 +331,9 @@ public class ComponentRefController extends AbstractElementPropertySectionContro
             String iValue = itemsValue.get(i);
             if ((selectedValue == null && (((INode) elem).getUniqueName()).equals(iValue))
                     || (selectedValue != null && StringUtils.isNotEmpty(iValue) && iValue.endsWith(selectedValue))) {
-                iLabel = itemsLabel.get(i);
+                if (itemsLabel.size() > 0) {
+                    iLabel = itemsLabel.get(i);
+                }
                 break;
             }
             selection++;

main/plugins/org.talend.designer.core.generic/src/main/java/org/talend/designer/core/generic/utils/ComponentsUtils.java

@@ -883,21 +883,6 @@ public class ComponentsUtils {
                 propertyParameter.setShow(false);
             }
         }
-        IElementParameter parent = refPara.getParentParameter();
-        Widget parentWidget = null;
-        if (parent != null) {
-            parentWidget = ((GenericElementParameter) parent).getWidget();
-        }
-        for (IElementParameter param : refPara.getElement().getElementParameters()) {
-            if (param instanceof GenericElementParameter) {
-                widget.setHidden();
-                if (param.getName().startsWith("connection")) {
-                    param.setShow(false);
-                    continue;
-                }
-                param.setShow(parentWidget == null ? !widget.isHidden() : !parentWidget.isHidden() && !widget.isHidden());
-            }
-        }
     }
 
     public static void setPropertiesPepositoryValue(ComponentProperties componentProperties, String paramName) {

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/utils/JavaProcessUtil.java

@@ -315,6 +315,10 @@ public class JavaProcessUtil {
     }
 
     public static String getHadoopClusterItemId(INode node) {
+        return getHadoopClusterItemId(node, true);
+    }
+
+    public static String getHadoopClusterItemId(INode node, boolean ignore) {
         IHadoopClusterService hadoopClusterService = HadoopRepositoryUtil.getHadoopClusterService();
         if (hadoopClusterService == null) {
             return null;
@@ -329,7 +333,7 @@ public class JavaProcessUtil {
         }
         Map<String, IElementParameter> childParameters = propertyElementParameter.getChildParameters();
         String propertyType = (String) childParameters.get(EParameterName.PROPERTY_TYPE.getName()).getValue();
-        if (!EmfComponent.REPOSITORY.equals(propertyType)) {
+        if (ignore && !EmfComponent.REPOSITORY.equals(propertyType)) {
             return null;
         }
         IElementParameter propertyParam = childParameters.get(EParameterName.REPOSITORY_PROPERTY_TYPE.getName());

main/plugins/org.talend.designer.dbmap/src/main/java/org/talend/designer/dbmap/model/table/InputTable.java

@@ -81,7 +81,9 @@ public class InputTable extends AbstractInOutTable {
      */
     @Override
     public void initFromExternalData(ExternalDbMapTable externalMapperTable) {
-        setMetadataTable(connection.getTable());
+        if(connection != null) {
+            setMetadataTable(connection.getTable());
+        }
         super.initFromExternalData(externalMapperTable);
 
         List<IMetadataColumn> columns = getMetadataTable().getListColumns();

main/plugins/org.talend.designer.maven.job/resources/templates/osgi/pom_job_template.xml

@@ -13,7 +13,7 @@
 	<artifactId>@JobArtifactId@-bundle</artifactId>
 	<version>@JobVersion@</version>
 	<packaging>bundle</packaging>
-    <name>@ProjectName@ @JobName@-@JobVersion@ (@TalendJobVersion@,@JobType@)</name>
+    <name>@ProjectName@ @JobName@-${project.version} (@TalendJobVersion@,@JobType@)</name>
 	
     <properties>
 		<item.name>@ItemName@</item.name>
@@ -72,6 +72,36 @@
 					</instructions>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>3.0.0</version>
+				<executions>
+					<execution>
+						<id>attach-artifacts-feature</id>
+						<phase>package</phase>
+						<goals>
+							<goal>attach-artifact</goal>
+						</goals>
+						<configuration>
+							<artifacts>
+								<artifact>
+									<file>${basedir}/src/main/bundle-resources/feature.xml</file>
+									<type>xml</type>
+									<classifier>feature</classifier>
+								</artifact>
+							</artifacts>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.7</version>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
     <profiles>
@@ -254,41 +284,5 @@
                 <microservice.running.configs.dir>${current.resources.dir}/</microservice.running.configs.dir>
             </properties>
         </profile>
-        <profile>
-          <id>deploy-nexus</id>
-          <activation>
-            <property>
-              <name>altDeploymentRepository</name>
-            </property>
-          </activation>
-          <build>
-            <plugins>
-                <plugin>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <version>2.7</version>
-                    <executions>
-                        <execution>
-                            <id>deploy-file</id>
-                            <phase>deploy</phase>
-                            <goals>
-                                <goal>deploy-file</goal>
-                            </goals>
-                            <configuration>
-                                <file>${basedir}/src/main/resources/feature/feature.xml</file>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>${talend.job.name}-feature</artifactId>
-                                <version>${project.version}</version>
-                                <classifier>features</classifier>
-                                <packaging>xml</packaging>
-                                <repositoryId>${project.distribution-management.repository.id}</repositoryId>
-                                <url>${project.distribution-management.repository.url}</url>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-          </build>
-        </profile>
-            
     </profiles>
 </project>

main/plugins/org.talend.designer.runprocess/src/main/java/org/talend/designer/runprocess/DefaultRunProcessService.java

@@ -900,9 +900,11 @@ public class DefaultRunProcessService implements IRunProcessService {
     
     private void deleteRefProjects(Project refProject, AggregatorPomsHelper refHelper) throws Exception {
         IProgressMonitor monitor = new NullProgressMonitor();
-        deleteRefProject(ERepositoryObjectType.ROUTINES, refHelper, monitor);
-        deleteRefProject(ERepositoryObjectType.PIG_UDF, refHelper, monitor);
-        deleteRefProject(ERepositoryObjectType.valueOf("BEANS"), refHelper, monitor); //$NON-NLS-1$
+        for (ERepositoryObjectType codeType : ERepositoryObjectType.getAllTypesOfCodes()) {
+            // use getAllTypesOfCodes to avoid NPE
+            // the ERepositoryObjectType may not load on current license
+            deleteRefProject(codeType, refHelper, monitor);
+        }
 
     }
     

main/plugins/org.talend.repository.resource/src/org/talend/repository/resource/editors/RouteResourceEditor.java

@@ -51,7 +51,7 @@ public class RouteResourceEditor extends TextEditor {
 		String displayName = item.getProperty().getDisplayName();
 		String version = item.getProperty().getVersion();
 		String partName = "Resource " + displayName + " " + version;
-//		setPartName(partName);
+		setPartName(partName);
 		setTitleToolTip(partName);
 		getSourceViewer().setEditable(!rrInput.isReadOnly());
 	}

main/plugins/org.talend.repository/plugin.properties

@@ -79,7 +79,6 @@ projectSetting.deploymentConfiguration=Deployment Configuration
 projectSetting.projectRefSettingPage=Reference Projects
 ProjectSetting.groupId=Deployment GroupId
 projectsetting.Audit=Audit
-projectsetting.RepositoryShare=Repository Share
 updateAllJobs.title=Upate modified jobs
 updateAllJobs.tooltip=Detect and update all jobs
 customCompSetting=Custom component

main/plugins/org.talend.repository/plugin.xml

@@ -3311,6 +3311,15 @@
               name="ChangeDefaultValueTDI36397"
               version="7.3.1">
         </projecttask>
+        <projecttask
+              beforeLogon="false"
+              breaks="7.3.0"
+              class="org.talend.repository.model.migration.ChangeDBVersionValue4BonitaComponentsTDI43395"
+              description="change db version values for bonita"
+              id="org.talend.repository.model.migration.ChangeDBVersionValue4BonitaComponentsTDI43395"
+              name="ChangeDBVersionValue4BonitaComponentsTDI43395"
+              version="7.3.1">
+        </projecttask>
    </extension>
 
    <extension

main/plugins/org.talend.repository/src/main/java/messages.properties

@@ -1039,4 +1039,4 @@ ProjectSettingPage.ArtifactProxySetting.checkConnection=Check Connection
 ProjectSettingPage.ArtifactProxySetting.connectionFailureMsg=Connection failure,please check the proxy configuration
 
 LoginHelper.connectUserLibraryTitle=Check user libraries connection.
-LoginHelper.connectUserLibraryFailureWarning=The user libraries artifact repository set in administrator can not connected , do you want to continue to open the project?
+LoginHelper.connectUserLibraryFailureWarning=The user libraries artifact repository set in administrator can not connected , do you want to continue to open the project?

main/plugins/org.talend.repository/src/main/java/org/talend/repository/model/migration/ChangeDBVersionValue4BonitaComponentsTDI43395.java

@@ -0,0 +1,89 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2019 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.repository.model.migration;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.GregorianCalendar;
+
+import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.exception.PersistenceException;
+import org.talend.core.model.components.ComponentUtilities;
+import org.talend.core.model.components.ModifyComponentsAction;
+import org.talend.core.model.components.conversions.IComponentConversion;
+import org.talend.core.model.components.filters.IComponentFilter;
+import org.talend.core.model.components.filters.NameComponentFilter;
+import org.talend.core.model.migration.AbstractJobMigrationTask;
+import org.talend.core.model.properties.Item;
+import org.talend.designer.core.model.utils.emf.talendfile.ElementParameterType;
+import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
+import org.talend.designer.core.model.utils.emf.talendfile.ProcessType;
+
+/**
+ * DOC Administrator class global comment. Detailled comment
+ */
+public class ChangeDBVersionValue4BonitaComponentsTDI43395 extends AbstractJobMigrationTask {
+
+    @Override
+    public ExecutionResult execute(Item item) {
+        final ProcessType processType = getProcessType(item);
+        String[] compNames = { "tBonitaDeploy", "tBonitaInstantiateProcess" };
+
+        IComponentConversion conversion = new IComponentConversion() {
+
+            public void transform(NodeType node) {
+                if (node == null) {
+                    return;
+                }
+
+                ElementParameterType parameter = ComponentUtilities.getNodeProperty(node, "DB_VERSION");
+
+                if (parameter != null) {
+                    String value = parameter.getValue();
+                    if (value == null) {
+                        return;
+                    }
+
+                    String oldDom4jVersion = "dom4j-1.6.1.jar";
+                    String newDom4jVersion = "dom4j-2.1.1.jar";
+                    if (value.indexOf(oldDom4jVersion) > -1) {
+                        String newDBVersion = value.replaceAll(oldDom4jVersion, newDom4jVersion);
+                        ComponentUtilities.setNodeValue(node, "DB_VERSION", newDBVersion);
+                    }
+                }
+            }
+
+        };
+
+        for (String name : compNames) {
+            IComponentFilter filter = new NameComponentFilter(name);
+
+            try {
+                ModifyComponentsAction.searchAndModify(item, processType, filter,
+                        Arrays.<IComponentConversion> asList(conversion));
+            } catch (PersistenceException e) {
+                // TODO Auto-generated catch block
+                ExceptionHandler.process(e);
+                return ExecutionResult.FAILURE;
+            }
+        }
+
+        return ExecutionResult.SUCCESS_NO_ALERT;
+
+    }
+
+    public Date getOrder() {
+        GregorianCalendar gc = new GregorianCalendar(2020, 0, 2, 12, 0, 0);
+        return gc.getTime();
+    }
+}

main/plugins/org.talend.repository/src/main/java/org/talend/repository/preference/Log4jSettingPage.java

@@ -146,14 +146,17 @@ public class Log4jSettingPage extends ProjectSettingPage {
                 }
                 if (!log4jBtn.getSelection()) {
                     combo.setEnabled(false);
-                    combo.select(1);
-                    IRunProcessService service = null;
-                    if (GlobalServiceRegister.getDefault().isServiceRegistered(IRunProcessService.class)) {
-                        service = (IRunProcessService) GlobalServiceRegister.getDefault().getService(IRunProcessService.class);
-                    }
-                    if (service != null) {
-                        String logTemplate = service.getLogTemplate(Log4jPrefsConstants.LOG4J_VERSION2_FILEPATH);
-                        templateTxt.setText(logTemplate);
+                    if (combo.getSelectionIndex() != 1) {
+                        combo.select(1);
+                        IRunProcessService service = null;
+                        if (GlobalServiceRegister.getDefault().isServiceRegistered(IRunProcessService.class)) {
+                            service = (IRunProcessService) GlobalServiceRegister.getDefault()
+                                    .getService(IRunProcessService.class);
+                        }
+                        if (service != null) {
+                            String logTemplate = service.getLogTemplate(Log4jPrefsConstants.LOG4J_VERSION2_FILEPATH);
+                            templateTxt.setText(logTemplate);
+                        }
                     }
                 } else {
                     combo.setEnabled(true);

main/plugins/org.talend.repository/src/main/java/org/talend/repository/ui/utils/Log4jPrefsSettingManager.java

@@ -163,10 +163,7 @@ public class Log4jPrefsSettingManager {
     }
 
     public boolean isLog4jEnable() {
-        if (!org.talend.core.PluginChecker.isCoreTISPluginLoaded()) {
-            return false;
-        }
-        if (Log4jUtil.isEnable() && Boolean.parseBoolean(getValueOfPreNode(Log4jPrefsConstants.LOG4J_ENABLE_NODE))) {
+        if (Boolean.parseBoolean(getValueOfPreNode(Log4jPrefsConstants.LOG4J_ENABLE_NODE))) {
             return true;
         }
         return false;

main/plugins/org.talend.repository/src/main/java/org/talend/repository/ui/utils/UpdateLog4jJarUtils.java

@@ -25,6 +25,8 @@ import org.talend.librariesmanager.model.ModulesNeededProvider;
 
 public class UpdateLog4jJarUtils {
 
+    private static final String LOG4J_VERSION = "2.12.1";
+
     public static final String[] MODULES_NEED_UPDATE_ORDER = { "spark-assembly-1.6.0-hadoop2.6.0.jar" };
 
     public static void addLog4jToJarList(Collection<String> jarList, boolean isSelectLog4j2) {
@@ -43,10 +45,10 @@ public class UpdateLog4jJarUtils {
         addBackModules(jarList, isSelectLog4j2, modulesUsedBefore, currentProcess);
     }
 
-    public static final String[] MODULES_NEED_ADDED_BACK = { "log4j-jcl-2.12.1.jar", "log4j-jul-2.12.1.jar",
-            "log4j-slf4j-impl-2.12.1.jar", "log4j-api-2.12.1.jar", "log4j-core-2.12.1.jar", "jcl-over-slf4j-1.7.25.jar",
-            "jul-to-slf4j-1.7.25.jar", "log4j-to-slf4j-2.12.1.jar", "slf4j-log4j12-1.7.25.jar", "log4j-1.2.17.jar",
-            "log4j-1.2-api-2.12.1.jar" };
+    public static final String[] MODULES_NEED_ADDED_BACK = { "log4j-jcl-"+LOG4J_VERSION+".jar", "log4j-jul-"+LOG4J_VERSION+".jar",
+            "log4j-slf4j-impl-"+LOG4J_VERSION+".jar", "log4j-api-"+LOG4J_VERSION+".jar", "log4j-core-"+LOG4J_VERSION+".jar", "jcl-over-slf4j-1.7.25.jar",
+            "jul-to-slf4j-1.7.25.jar", "log4j-to-slf4j-"+LOG4J_VERSION+".jar", "slf4j-log4j12-1.7.25.jar", "log4j-1.2.17.jar",
+            "log4j-1.2-api-"+LOG4J_VERSION+".jar" };
 
     private static void addBackJars(Collection<String> moduleNeededList, boolean isSelectLog4j2, List<String> modulesUsedBefore,
             IProcess process) {
@@ -81,17 +83,17 @@ public class UpdateLog4jJarUtils {
             }
 
             if (usedlog4jJclBefore) {
-                moduleNeededList.add("log4j-jcl-2.12.1.jar");//$NON-NLS-1$
+                moduleNeededList.add("log4j-jcl-"+LOG4J_VERSION+".jar");//$NON-NLS-1$
             }
             if (usedlog4jJulBefore) {
-                moduleNeededList.add("log4j-jul-2.12.1.jar");//$NON-NLS-1$
+                moduleNeededList.add("log4j-jul-"+LOG4J_VERSION+".jar");//$NON-NLS-1$
             }
             if (usedlog4j1JarBefore) {
-                moduleNeededList.add("log4j-1.2-api-2.12.1.jar");
+                moduleNeededList.add("log4j-1.2-api-"+LOG4J_VERSION+".jar");
             }
-            moduleNeededList.add("log4j-slf4j-impl-2.12.1.jar");//$NON-NLS-1$
-            moduleNeededList.add("log4j-api-2.12.1.jar");//$NON-NLS-1$
-            moduleNeededList.add("log4j-core-2.12.1.jar");//$NON-NLS-1$
+            moduleNeededList.add("log4j-slf4j-impl-"+LOG4J_VERSION+".jar");//$NON-NLS-1$
+            moduleNeededList.add("log4j-api-"+LOG4J_VERSION+".jar");//$NON-NLS-1$
+            moduleNeededList.add("log4j-core-"+LOG4J_VERSION+".jar");//$NON-NLS-1$
         } else {
             boolean usedjclOverSlf4jBefore = false;
             for (String module : modulesUsedBefore) {
@@ -107,7 +109,7 @@ public class UpdateLog4jJarUtils {
                 moduleNeededList.add("jcl-over-slf4j-1.7.25.jar");//$NON-NLS-1$
             }
 
-            moduleNeededList.add("log4j-to-slf4j-2.12.1.jar");//$NON-NLS-1$
+            moduleNeededList.add("log4j-to-slf4j-"+LOG4J_VERSION+".jar");//$NON-NLS-1$
             moduleNeededList.add("slf4j-log4j12-1.7.25.jar");//$NON-NLS-1$
             moduleNeededList.add("log4j-1.2.17.jar");//$NON-NLS-1$
         }
@@ -150,28 +152,28 @@ public class UpdateLog4jJarUtils {
             }
 
             if (usedlog4jJclBefore) {
-                ModuleNeeded log4jJcl = new ModuleNeeded("org.apache.logging.log4j", "log4j-jcl-2.12.1.jar", null, true); //$NON-NLS-1$ //$NON-NLS-2$
-                log4jJcl.setMavenUri("mvn:org.apache.logging.log4j/log4j-jcl/2.12.1");//$NON-NLS-1$
+                ModuleNeeded log4jJcl = new ModuleNeeded("org.apache.logging.log4j", "log4j-jcl-"+LOG4J_VERSION+".jar", null, true); //$NON-NLS-1$ //$NON-NLS-2$
+                log4jJcl.setMavenUri("mvn:org.apache.logging.log4j/log4j-jcl/"+LOG4J_VERSION);//$NON-NLS-1$
                 moduleNeededList.add(log4jJcl);
             }
             if (usedlog4jJulBefore) {
-                ModuleNeeded log4jJul = new ModuleNeeded("org.apache.logging.log4j", "log4j-jul-2.12.1.jar", null, true); //$NON-NLS-1$ //$NON-NLS-2$
-                log4jJul.setMavenUri("mvn:org.apache.logging.log4j/log4j-jul/2.12.1");//$NON-NLS-1$
+                ModuleNeeded log4jJul = new ModuleNeeded("org.apache.logging.log4j", "log4j-jul-"+LOG4J_VERSION+".jar", null, true); //$NON-NLS-1$ //$NON-NLS-2$
+                log4jJul.setMavenUri("mvn:org.apache.logging.log4j/log4j-jul/"+LOG4J_VERSION);//$NON-NLS-1$
                 moduleNeededList.add(log4jJul);
             }
             if (usedlog4j1JarBefore) {
-                ModuleNeeded log4j1To2Api = new ModuleNeeded("org.apache.logging.log4j", "log4j-1.2-api-2.12.1.jar", null, true); //$NON-NLS-1$ //$NON-NLS-2$
-                log4j1To2Api.setMavenUri("mvn:org.apache.logging.log4j/log4j-1.2-api/2.12.1");//$NON-NLS-1$
+                ModuleNeeded log4j1To2Api = new ModuleNeeded("org.apache.logging.log4j", "log4j-1.2-api-"+LOG4J_VERSION+".jar", null, true); //$NON-NLS-1$ //$NON-NLS-2$
+                log4j1To2Api.setMavenUri("mvn:org.apache.logging.log4j/log4j-1.2-api/"+LOG4J_VERSION);//$NON-NLS-1$
                 moduleNeededList.add(log4j1To2Api);
             }
-            ModuleNeeded log4jSlf4jImpl = new ModuleNeeded("org.apache.logging.log4j", "log4j-slf4j-impl-2.12.1.jar", null, true); //$NON-NLS-1$ //$NON-NLS-2$
-            log4jSlf4jImpl.setMavenUri("mvn:org.apache.logging.log4j/log4j-slf4j-impl/2.12.1");//$NON-NLS-1$
+            ModuleNeeded log4jSlf4jImpl = new ModuleNeeded("org.apache.logging.log4j", "log4j-slf4j-impl-"+LOG4J_VERSION+".jar", null, true); //$NON-NLS-1$ //$NON-NLS-2$
+            log4jSlf4jImpl.setMavenUri("mvn:org.apache.logging.log4j/log4j-slf4j-impl/"+LOG4J_VERSION);//$NON-NLS-1$
             moduleNeededList.add(log4jSlf4jImpl);
-            ModuleNeeded log4jApi = new ModuleNeeded("org.apache.logging.log4j", "log4j-api-2.12.1.jar", null, true); //$NON-NLS-1$ //$NON-NLS-2$
-            log4jApi.setMavenUri("mvn:org.apache.logging.log4j/log4j-api/2.12.1");//$NON-NLS-1$
+            ModuleNeeded log4jApi = new ModuleNeeded("org.apache.logging.log4j", "log4j-api-"+LOG4J_VERSION+".jar", null, true); //$NON-NLS-1$ //$NON-NLS-2$
+            log4jApi.setMavenUri("mvn:org.apache.logging.log4j/log4j-api/"+LOG4J_VERSION);//$NON-NLS-1$
             moduleNeededList.add(log4jApi);
-            ModuleNeeded log4jCore = new ModuleNeeded("org.apache.logging.log4j", "log4j-core-2.12.1.jar", null, true); //$NON-NLS-1$ //$NON-NLS-2$
-            log4jCore.setMavenUri("mvn:org.apache.logging.log4j/log4j-core/2.12.1");//$NON-NLS-1$
+            ModuleNeeded log4jCore = new ModuleNeeded("org.apache.logging.log4j", "log4j-core-"+LOG4J_VERSION+".jar", null, true); //$NON-NLS-1$ //$NON-NLS-2$
+            log4jCore.setMavenUri("mvn:org.apache.logging.log4j/log4j-core/"+LOG4J_VERSION);//$NON-NLS-1$
             moduleNeededList.add(log4jCore);
 
         } else {
@@ -192,8 +194,8 @@ public class UpdateLog4jJarUtils {
                 moduleNeededList.add(jclOverSlf4j);
             }
 
-            ModuleNeeded log4jToSlf4j = new ModuleNeeded("org.apache.logging.log4j", "log4j-to-slf4j-2.12.1.jar", null, true); //$NON-NLS-1$ //$NON-NLS-2$
-            log4jToSlf4j.setMavenUri("mvn:org.apache.logging.log4j/log4j-to-slf4j/2.12.1");//$NON-NLS-1$
+            ModuleNeeded log4jToSlf4j = new ModuleNeeded("org.apache.logging.log4j", "log4j-to-slf4j-"+LOG4J_VERSION+".jar", null, true); //$NON-NLS-1$ //$NON-NLS-2$
+            log4jToSlf4j.setMavenUri("mvn:org.apache.logging.log4j/log4j-to-slf4j/"+LOG4J_VERSION);//$NON-NLS-1$
             moduleNeededList.add(log4jToSlf4j);
             ModuleNeeded slf4jLog4j12 = new ModuleNeeded("org.slf4j", "slf4j-log4j12-1.7.25.jar", null, true); //$NON-NLS-1$ //$NON-NLS-2$
             slf4jLog4j12.setMavenUri("mvn:org.slf4j/slf4j-log4j12/1.7.25");//$NON-NLS-1$

main/plugins/org.talend.repository/src/main/java/org/talend/repository/ui/wizards/exportjob/JavaJobScriptsExportWSWizardPage.java

@@ -270,7 +270,6 @@ public class JavaJobScriptsExportWSWizardPage extends JavaJobScriptsExportWizard
         data.widthHint = SIZING_TEXT_FIELD_WIDTH;
         destinationNameField.setLayoutData(data);
         destinationNameField.setFont(font);
-        destinationNameField.setTextDirection(SWT.RIGHT_TO_LEFT);
         BidiUtils.applyBidiProcessing(destinationNameField, "file"); //$NON-NLS-1$
 
         // destination browse button
@@ -911,6 +910,8 @@ public class JavaJobScriptsExportWSWizardPage extends JavaJobScriptsExportWizard
             } else {
                 setDefaultDestination();
             }
+            this.destinationNameField.pack(true);
+
             shellLauncherButton.setSelection(settings.getBoolean(STORE_SHELL_LAUNCHER_ID));
             // TDQ-15391: when have tDqReportRun, must always export items.
             if (EmfModelUtils.getComponentByName(getProcessItem(), "tDqReportRun") != null) { //$NON-NLS-1$

main/plugins/org.talend.sdk.component.studio-integration/META-INF/MANIFEST.MF

@@ -80,7 +80,8 @@ Bundle-ClassPath: .,
   lib/tomcat-servlet-api.jar,
   lib/tomcat-util.jar,
   lib/tomcat-websocket-api.jar,
-  lib/tomcat-websocket.jar
+  lib/tomcat-websocket.jar,
+  lib/slf4j-simple.jar
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.emf.common,

main/plugins/org.talend.sdk.component.studio-integration/src/main/java/org/talend/sdk/component/studio/service/TaCoKitUpdateService.java

@@ -34,6 +34,7 @@ import org.talend.updates.runtime.model.ExtraFeature;
 import org.talend.updates.runtime.model.InstallationStatus;
 import org.talend.updates.runtime.model.InstallationStatus.Status;
 import org.talend.updates.runtime.model.interfaces.ITaCoKitCarFeature;
+import org.talend.updates.runtime.nexus.component.ComponentIndexBean;
 import org.talend.updates.runtime.service.ITaCoKitUpdateService;
 import org.talend.updates.runtime.storage.AbstractFeatureStorage;
 
@@ -62,6 +63,11 @@ public class TaCoKitUpdateService implements ITaCoKitUpdateService {
         return taCoKitCarFeature;
     }
 
+    @Override
+    public ITaCoKitCarFeature generateExtraFeature(ComponentIndexBean indexBean, IProgressMonitor monitor) throws Exception {
+        return new TaCoKitCarFeature(indexBean);
+    }
+
     @Override
     public ICarInstallationResult installCars(Collection<File> files, boolean share, IProgressMonitor monitor) throws Exception {
         if (monitor == null) {
@@ -81,6 +87,7 @@ public class TaCoKitUpdateService implements ITaCoKitUpdateService {
                 ITaCoKitCarFeature carFeature = null;
                 try {
                     carFeature = generateExtraFeature(carFile, monitor);
+                    carFeature.setShareEnable(share);
                 } catch (Exception e) {
                     ExceptionHandler.process(e);
                 }
@@ -131,6 +138,8 @@ public class TaCoKitUpdateService implements ITaCoKitUpdateService {
                         carFeature.setAutoReloadAfterInstalled(false);
                         IStatus installStatus = carFeature.install(monitor, Collections.EMPTY_LIST);
                         if (share) {
+                            // won't share here, just copy file to installed folder
+                            carFeature.setShareEnable(false);
                             carFeature.syncComponentsToInstalledFolder(monitor, carFeature.getStorage().getFeatureFile(monitor));
                         }
                         result.getInstalledStatus().put(carFeature.getCarFile(monitor), installStatus);

main/plugins/org.talend.sdk.component.studio-integration/src/main/java/org/talend/sdk/component/studio/update/TaCoKitCarFeature.java

@@ -337,6 +337,16 @@ public class TaCoKitCarFeature extends AbstractExtraFeature implements ITaCoKitC
         this.autoReloadAfterInstalled = autoReload;
     }
 
+    @Override
+    public boolean isShareEnable() {
+        return share;
+    }
+
+    @Override
+    public void setShareEnable(boolean share) {
+        this.share = share;
+    }
+
     @Override
     public File getCarFile(IProgressMonitor progress) throws Exception {
         return getCar(new NullProgressMonitor()).getCarFile();

test/plugins/org.talend.designer.mapper.test/src/org/talend/designer/components/tisprovider/ReplaceParallelizationNodeForTMapTest.java

@@ -0,0 +1,138 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2020 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.designer.components.tisprovider;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang.StringUtils;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.junit.Test;
+import org.talend.core.model.components.IComponent;
+import org.talend.core.model.metadata.MetadataTable;
+import org.talend.core.model.process.EConnectionType;
+import org.talend.core.model.process.IConnection;
+import org.talend.core.model.process.INode;
+import org.talend.core.model.process.IReplaceNodeInProcess;
+import org.talend.core.model.process.node.IExternalMapTable;
+import org.talend.core.model.repository.FakePropertyImpl;
+import org.talend.core.ui.component.ComponentsFactoryProvider;
+import org.talend.designer.core.model.components.EParameterName;
+import org.talend.designer.core.ui.editor.connections.Connection;
+import org.talend.designer.core.ui.editor.nodes.Node;
+import org.talend.designer.core.ui.editor.process.Process;
+import org.talend.designer.mapper.external.data.ExternalMapperData;
+import org.talend.designer.mapper.external.data.ExternalMapperTable;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class ReplaceParallelizationNodeForTMapTest {
+
+    private static final String ATTR_CLASS = "class";
+
+    private static final String EXTENSION_ID = "org.talend.designer.core.replace_nodes";
+
+    private static final String REPLACE_PARALLELIZATION_NODE = "org.talend.designer.components.tisprovider.ReplaceParallelizationNodeInProcess";
+
+    @Test
+    public void test_rebuildGraphicProcessFromNode_partitionAfterTMap() {
+        List<INode> graphicalNodeList = new LinkedList<>();
+        Process process = new Process(new FakePropertyImpl());
+        Node tRowGenerator = createNode(process, "tRowGenerator");
+        tRowGenerator.setStart(true);
+        graphicalNodeList.add(tRowGenerator);
+        Node tMap = createNode(process, "tMap");
+        graphicalNodeList.add(tMap);
+        Node tLogRow = createNode(process, "tLogRow");
+        graphicalNodeList.add(tLogRow);
+
+        Connection row1 = new Connection(tRowGenerator, tMap, EConnectionType.FLOW_MAIN, EConnectionType.FLOW_MAIN.getName(),
+                "row1", "row1", "row1", false);
+        row1.setMetaName("row1");
+        tRowGenerator.addOutput(row1);
+        tMap.addInput(row1);
+
+        Connection row2 = new Connection(tMap, tLogRow, EConnectionType.FLOW_MAIN, EConnectionType.FLOW_MAIN.getName(),
+                "outmap", "outmap", "outmap", false);
+        row2.getElementParameter(EParameterName.PARTITIONER.getName()).setValue(true);
+        row2.setMetaName("outmap");
+        MetadataTable metadataTable = new MetadataTable();
+        metadataTable.setTableName("outmap");
+        metadataTable.setAttachedConnector(EConnectionType.FLOW_MAIN.getName());
+        row2.getSource().getMetadataList().add(metadataTable);
+        ExternalMapperTable extMapTable = new ExternalMapperTable();
+        extMapTable.setName("outmap");
+        ExternalMapperData externalData = (ExternalMapperData) row2.getSource().getExternalData();
+        externalData.getOutputTables().add(extMapTable);
+        tMap.addOutput(row2);
+        tLogRow.addInput(row2);
+
+        try {
+            IReplaceNodeInProcess replaceNodeAction = getReplaceNodeActionByClassName(REPLACE_PARALLELIZATION_NODE);
+            assertNotNull("Can't find the class " + REPLACE_PARALLELIZATION_NODE, replaceNodeAction);
+            
+            replaceNodeAction.rebuildGraphicProcessFromNode(tRowGenerator, graphicalNodeList);
+            assertEquals(5, graphicalNodeList.size());
+
+            // simulate the usage in tMap component
+            Map<String, IConnection> nameToOutputConnection = new HashMap<String, IConnection>();
+            for (IConnection outputConnection : tMap.getOutgoingConnections()) {
+                nameToOutputConnection.put(outputConnection.getName(), outputConnection);
+            }
+
+            for (IExternalMapTable outputTable : tMap.getExternalData().getOutputTables()) {
+                assertTrue(nameToOutputConnection.containsKey(outputTable.getName()));
+            }
+
+        } catch (Exception e) {
+            fail("Exist exception when getReplaceNodeActionByClassName: " + e.getMessage());
+            e.printStackTrace();
+        }
+
+    }
+
+    private IReplaceNodeInProcess getReplaceNodeActionByClassName(String className) throws Exception {
+        IReplaceNodeInProcess replaceNodeAction = null;
+        IConfigurationElement[] elems = Platform.getExtensionRegistry()
+                .getConfigurationElementsFor(EXTENSION_ID);
+        for (IConfigurationElement elem : elems) {
+            String attrValue = elem.getAttribute(ATTR_CLASS);
+            if (StringUtils.isNotBlank(attrValue) && attrValue.equals(className)) {
+                replaceNodeAction = (IReplaceNodeInProcess) elem.createExecutableExtension(ATTR_CLASS);
+                break;
+            }
+        }
+        return replaceNodeAction;
+
+    }
+
+    private Node createNode(Process process, String componentName) {
+        IComponent parCom = ComponentsFactoryProvider.getInstance().get(componentName);
+        Node parNode = new Node(parCom, process);
+        parNode.setActivate(true);
+        parNode.setStart(false);
+        parNode.setComponent(parCom);
+        parNode.setProcess(process);
+        return parNode;
+    }
+
+}