chore: update timestamp of the patch

PATCH_RELEASE_NOTE.md

@@ -0,0 +1,64 @@
+---
+version: 7.1.1
+module: https://talend.poolparty.biz/coretaxonomy/42
+product:
+- https://talend.poolparty.biz/coretaxonomy/23
+---
+
+# TPS-4399
+
+| Info             | Value |
+| ---------------- | ---------------- |
+| Patch Name       | Patch\_20201023\_TPS-4399\_v1-7.1.1 |
+| Release Date     | 2020-10-23 |
+| Target Version   | 20181026\_1147-V7.1.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-4399 [7.1.1] tBigQueryInput cannot execute query within public dataset (TDI-43025)
+- TPS-4434 [7.1.1] Unable to write into Bigquery table when user defined delimiter is used
+- TBD-9137 tBigQueryInput does not support backtick in query
+
+## Prerequisites
+
+Consider the following requirements for your system:
+
+- Talend Studio 7.1.1 must be installed.
+
+## Installation
+- From the Talend Studio 7.1.1 installation folder, make a copy of the following files somewhere safe:
+- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryBulkExec/tBigQueryBulkExec_begin.javajet
+- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryBulkExec/tBigQueryBulkExec_java.xml
+- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryInput/BigQueryInputQueryHelper.javajet
+- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryInput/tBigQueryInput_begin.javajet
+- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryInput/tBigQueryInput_end.javajet
+- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryInput/tBigQueryInput_java.xml
+- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryOutput/tBigQueryOutput_java.xml
+- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryOutputBulk/tBigQueryOutputBulk_main.javajet
+- Unzip content of the patch zip onto your Talend Studio 7.1.1 folder.
+
+## Uninstallation
+
+- Replace the files overridden by the patch by the copy you made before unzipping.
+
+## Affected files for this patch
+
+The following files are installed by this patch:
+
+- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryBulkExec/tBigQueryBulkExec_begin.javajet
+- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryBulkExec/tBigQueryBulkExec_java.xml
+- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryInput/BigQueryInputQueryHelper.javajet
+- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryInput/tBigQueryInput_begin.javajet
+- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryInput/tBigQueryInput_end.javajet
+- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryInput/tBigQueryInput_java.xml
+- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryOutput/tBigQueryOutput_java.xml
+- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryOutputBulk/tBigQueryOutputBulk_main.javajet

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

@@ -550,16 +550,7 @@
                         } //endIf
 %>
                         context.setContextType("<%=ctxParam.getName()%>", "<%=ctxParam.getType()%>");
-                        if(context.getStringValue("<%=ctxParam.getName()%>") == null) {
-                            context.<%=ctxParam.getName()%> = null;
-                        } else {
-                        <%//}B1 block%>
 <%
-                        String typeToGenerate ="String";
-                        if( !(ctxParam.getType().equals("id_File") || ctxParam.getType().equals("id_Directory") ||ctxParam.getType().equals("id_List Of Value"))) {
-                           typeToGenerate=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true);
-                        }
-                        
                         if (ctxParam.getType().equals("id_Password")) {
 %>
                             String pwd_<%=ctxParam.getName()%>_value = context.getProperty("<%=ctxParam.getName()%>");
@@ -577,7 +568,13 @@
                                 }
                             }
 <%
-                        } else if(typeToGenerate.equals("java.util.Date")) {
+                            continue;
+                        }
+                        String typeToGenerate ="String";
+                        if( !(ctxParam.getType().equals("id_File") || ctxParam.getType().equals("id_Directory") ||ctxParam.getType().equals("id_List Of Value"))) {
+                           typeToGenerate=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true);
+                        }
+                        if(typeToGenerate.equals("java.util.Date")) {
 %>
                         try{
                             String context_<%=ctxParam.getName()%>_value = context.getProperty("<%=ctxParam.getName()%>");
@@ -636,10 +633,6 @@
                             }
 <%
                         }
-%>
-                        <%//{B1 block%>
-                        }
-<%
                     }
 %>
                 } <%/*close last method*/%>

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

@@ -289,15 +289,6 @@ if(isRunInMultiThread){
 			}
 			<% } %>
 		}
-		
-		//if the stored or passed value is "<TALEND_NULL>" string, it mean null
-		public String getStringValue(String key) {
-			String origin_value = this.getProperty(key);
-			if(NULL_VALUE_EXPRESSION_IN_COMMAND_STRING_FOR_CHILD_JOB_ONLY.equals(origin_value)) {
-				return null;
-			}
-			return origin_value;
-		}
 
 <%
 		for (IContextParameter ctxParam :params)

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

@@ -3,8 +3,9 @@
 
 	<target name="buildall">
 		<ant antfile="filecopy/build.xml" target="process" inheritall="no" />
+		<ant antfile="talend_file_enhanced_20070724/build.xml" target="process" inheritall="no" />
 		<ant antfile="sugarCRMManagement/build.xml" target="process" inheritall="no" />
 		<ant antfile="TalendSAX/build.xml" target="process" inheritall="no" />
 	</target>
 
-</project>
+</project>

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

@@ -3,7 +3,6 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.talend.libraries</groupId>
     <artifactId>commons-net-ftps-proxy</artifactId>
-    <!-- please see TDI-46016, now 7.1 use higher version : 3.6.1-talend-20190819, TODO remove current project as not necessary to backport -->
     <version>3.6.1-talend-20190128</version>
 
     <name>commons-net-talend</name>

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

@@ -3,16 +3,16 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.talend.libraries</groupId>
 	<artifactId>talend-mscrm</artifactId>
-	<version>3.3-20210618</version>
+	<version>3.3-20171205</version>
 	<packaging>jar</packaging>
 	
 	<name>talend-mscrm</name>
 	
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<cxf.version>3.1.1</cxf.version>
 		<odata.version>4.3.0</odata.version>
         <slf4j.version>1.7.12</slf4j.version>
-        <jackson.version>2.11.4</jackson.version>
 		<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
 	</properties>
 	
@@ -100,28 +100,12 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.12</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
 	    <groupId>com.microsoft.azure</groupId>
             <artifactId>adal4j</artifactId>
             <version>1.1.1-patch</version>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
 	</dependencies>
 	<build>
 		<resources>
@@ -133,6 +117,21 @@
 			</resource>
 		</resources>
 		<plugins>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>default-jar</id>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>../../../org.talend.libraries.crm/lib</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>

main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/src/main/java/org/talend/ms/crm/MSCRMClient.java

@@ -1,11 +1,8 @@
 package org.talend.ms.crm;
 
 import java.rmi.RemoteException;
-import java.util.Iterator;
 import java.util.UUID;
 
-import javax.naming.AuthenticationException;
-import javax.naming.ServiceUnavailableException;
 import javax.xml.stream.XMLStreamException;
 
 import org.apache.axiom.om.OMAbstractFactory;
@@ -22,32 +19,28 @@ import org.apache.axis2.client.ServiceClient;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.transport.http.HTTPTransportConstants;
 import org.apache.axis2.transport.http.HttpTransportProperties;
 import org.apache.axis2.transport.http.HttpTransportProperties.ProxyProperties;
 import org.apache.log4j.Logger;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
-import org.apache.olingo.client.api.http.HttpClientException;
-import org.talend.ms.crm.odata.ClientConfiguration;
-import org.talend.ms.crm.odata.authentication.AuthStrategyFactory;
-import org.talend.ms.crm.odata.authentication.IAuthStrategy;
-import org.talend.ms.crm.sdk.Instance;
+import org.datacontract.schemas._2004._07.system_collections_generic.KeyValuePairOfEndpointTypestringztYlk6OT;
 import org.talend.ms.crm.sdk.OnlineAuthenticationPolicy;
 import org.talend.ms.crm.sdk.OrganizationServiceStubWrapper;
 import org.talend.ms.crm.sdk.RequestDateTimeData;
 import org.talend.ms.crm.sdk.SecurityData;
 import org.talend.ms.crm.sdk.WsdlTokenManager;
 
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.MapperFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.microsoft.schemas.xrm._2011.contracts.DiscoveryServiceStub;
+import com.microsoft.schemas.xrm._2011.contracts.IDiscoveryService_Execute_DiscoveryServiceFaultFault_FaultMessage;
 import com.microsoft.schemas.xrm._2011.contracts.OrganizationServiceStub;
+import com.microsoft.schemas.xrm._2011.contracts.discovery.EndpointType;
+import com.microsoft.schemas.xrm._2011.contracts.discovery.ExecuteDocument;
+import com.microsoft.schemas.xrm._2011.contracts.discovery.ExecuteDocument.Execute;
+import com.microsoft.schemas.xrm._2011.contracts.discovery.ExecuteResponseDocument;
+import com.microsoft.schemas.xrm._2011.contracts.discovery.ExecuteResponseDocument.ExecuteResponse;
+import com.microsoft.schemas.xrm._2011.contracts.discovery.OrganizationDetail;
+import com.microsoft.schemas.xrm._2011.contracts.discovery.RetrieveOrganizationRequest;
+import com.microsoft.schemas.xrm._2011.contracts.discovery.RetrieveOrganizationResponse;
 
 // ============================================================================
 //
@@ -71,14 +64,20 @@ public class MSCRMClient {
     static Logger logger = Logger.getLogger(MSCRMClient.class.getName());
 
     /**
-     * Unique Name of the organization
+     * Microsoft account (e.g. youremail@live.com) or Microsoft Office 365 (Org ID e.g.
+     * youremail@yourorg.onmicrosoft.com) User Name.
      */
-    private String orgName;
-    
+    private String username;
+
+    /**
+     * Microsoft account or Microsoft Office 365 (Org ID) Password.
+     */
+    private String password;
+
     /**
      * Unique Name of the organization
      */
-    private ClientConfiguration clientConfiguration;
+    private String orgName;
 
     /**
      * Suffix for the Flat WSDL
@@ -87,84 +86,88 @@ public class MSCRMClient {
 
     private OrganizationServiceStub serviceStub;
 
-	private String discoveryServiceURL = "https://globaldisco.crm.dynamics.com/api/discovery/v2.0/Instances";
-	
-	/**
-     * This sample application registration values are available for all online instances
-     * This is suggested to use for development and prototyping purposes.For production use, you should create an AppId or ClientId that is specific 
-     * to your tenant in the Azure Management portal.
-     * 
-     */
-    private static final String DEFAULT_CLIENT_ID = "51f81489-12ee-4a9e-aaae-a2591f45987d";
-	
-	private IAuthStrategy authStrategy;
+    private Integer timeout;
 
-    public MSCRMClient(ClientConfiguration clientConfiguration, String orgName, String discoveryServiceURL) throws AuthenticationException {
-    	this.clientConfiguration = clientConfiguration;
-    	this.orgName = orgName;
-        this.discoveryServiceURL  = discoveryServiceURL;
-        init();
+    private Boolean reuseHttpClient;
 
-    }
-    
-    private void init() throws AuthenticationException {
-        if (clientConfiguration != null && discoveryServiceURL != null && discoveryServiceURL.indexOf("/api/discovery/") > 0) {
-            clientConfiguration.setResource(discoveryServiceURL.substring(0, discoveryServiceURL.indexOf("/api/discovery/")));
-        }
-        
-        if(clientConfiguration != null) {
-        	if (discoveryServiceURL != null && discoveryServiceURL.indexOf("/api/discovery/") > 0) {
-                clientConfiguration.setResource(discoveryServiceURL.substring(0, discoveryServiceURL.indexOf("/api/discovery/")));
-            }
-        	if (clientConfiguration.getClientId()==null || clientConfiguration.getClientId().isEmpty()) {
-                clientConfiguration.setClientId(DEFAULT_CLIENT_ID);
-            }
-        }
+    private int maxConnectionRetries = 5;
 
-        authStrategy = AuthStrategyFactory.createAuthStrategy(this.clientConfiguration);
-        authStrategy.init();
+    private int attemptsInterval = 1000;
+
+    public MSCRMClient(String username, String password, String orgName) {
+        this.username = username;
+        this.password = password;
+        this.orgName = orgName;
 
     }
 
+    public void setTimeout(Integer timeout) {
+        this.timeout = timeout;
+    }
 
-    public OrganizationServiceStub getOnlineConnection() throws Exception {
-        return new OrganizationServiceStubWrapper(doGetOnlineConnection(), this, discoveryServiceURL,
-        		clientConfiguration.getMaxRetryTimes(), clientConfiguration.getIntervalTime());
+    public void setReuseHttpClient(Boolean reuseHttpClient) {
+        this.reuseHttpClient = reuseHttpClient;
+    }
+
+    public void setMaxConnectionRetries(int maxConnectionRetries) {
+        this.maxConnectionRetries = maxConnectionRetries;
+    }
+
+    public void setAttemptsInterval(int attemptsInterval) {
+        this.attemptsInterval = attemptsInterval;
+    }
+
+    public OrganizationServiceStub getOnlineConnection(String discoveryServiceURL) throws Exception {
+        return new OrganizationServiceStubWrapper(doGetOnlineConnection(discoveryServiceURL), this, discoveryServiceURL,
+                maxConnectionRetries, attemptsInterval);
     }
 
     /**
-     * Organization information is stored in the Instance table of the Discovery Service. To see the kind of information contained in that table, 
-     * send an HTTP GET request to the service for one of your instances.
+     * URL for the Discovery Service For North America Microsoft account, discovery service url is
+     * https://dev.crm.dynamics.com/XRMServices/2011/Discovery.svc Microsoft office 365, discovery service url is
+     * https://disco.crm.dynamics.com/XRMServices/2011/Discovery.svc To use appropriate discovery service url for other
      * environments refer http://technet.microsoft.com/en-us/library/gg309401.aspx
      * 
      * @throws Exception
      */
-    public OrganizationServiceStub doGetOnlineConnection() throws Exception {
+    public OrganizationServiceStub doGetOnlineConnection(String discoveryServiceURL) throws Exception {
 
-    	String serviceURL = discoveryServiceURL;
-    	if(!discoveryServiceURL.contains("(")) {
-    		serviceURL =  discoveryServiceURL+"(UniqueName='"+orgName+"')";
-    	}
-		
-		String orgUrl = getOrgURL( serviceURL);
-		// The discovery service stub cannot be reused against the organization service
-		// as the Issuer and AppliesTo may differ between the discovery and organization services.
-		// Retrieve the authentication policy for the organization service.
-		OnlineAuthenticationPolicy organizationPolicy = new OnlineAuthenticationPolicy(orgUrl + FlatWSDLSuffix);
-		WsdlTokenManager orgTokenManager = new WsdlTokenManager();
-		// Authenticate the user using the organization authentication policy.
-		SecurityData securityData = orgTokenManager.authenticate(orgUrl, clientConfiguration.getUserName(), clientConfiguration.getPassword(),
-		        organizationPolicy.getAppliesTo(), organizationPolicy.getPolicy(), organizationPolicy.getIssuerUri());
+        try {
+            // Retrieve the authentication policy for the discovery service.
+            OnlineAuthenticationPolicy discoveryPolicy = new OnlineAuthenticationPolicy(discoveryServiceURL + FlatWSDLSuffix);
+            WsdlTokenManager discoeryTokenManager = new WsdlTokenManager();
+            // Authenticate the user using the discovery authentication policy.
+            SecurityData discoverySecurityData = discoeryTokenManager.authenticate(discoveryServiceURL, username, password,
+                    discoveryPolicy.getAppliesTo(), discoveryPolicy.getPolicy(), discoveryPolicy.getIssuerUri());
+            // Retrieve discovery stub using organization URL with the security data.
+            DiscoveryServiceStub discoveryServiceStub = createDiscoveryServiceStub(discoveryServiceURL, discoverySecurityData);
+            // Retrieve organization service url using discovery stub.
+            String orgUrl = discoverOrganizationUrl(discoveryServiceStub, orgName);
+            // The discovery service stub cannot be reused against the organization service
+            // as the Issuer and AppliesTo may differ between the discovery and organization services.
+            // Retrieve the authentication policy for the organization service.
+            OnlineAuthenticationPolicy organizationPolicy = new OnlineAuthenticationPolicy(orgUrl + FlatWSDLSuffix);
+            WsdlTokenManager orgTokenManager = new WsdlTokenManager();
+            // Authenticate the user using the organization authentication policy.
+            SecurityData securityData = orgTokenManager.authenticate(orgUrl, username, password,
+                    organizationPolicy.getAppliesTo(), organizationPolicy.getPolicy(), organizationPolicy.getIssuerUri());
 
-		// Retrieve organization stub using organization URL with the security data.
-		serviceStub = createOrganizationServiceStub(orgUrl, securityData);
+            // Retrieve organization stub using organization URL with the security data.
+            serviceStub = createOrganizationServiceStub(orgUrl, securityData);
 
-		Options options = serviceStub._getServiceClient().getOptions();
-		
-	    options.setProperty(org.apache.axis2.transport.http.HTTPConstants.REUSE_HTTP_CLIENT, clientConfiguration.isReuseHttpClient());
-	    options.setTimeOutInMilliSeconds(Long.valueOf(clientConfiguration.getTimeout()));
-	    options.setProperty(org.apache.axis2.transport.http.HTTPConstants.SO_TIMEOUT, clientConfiguration.getTimeout());
-	    options.setProperty(org.apache.axis2.transport.http.HTTPConstants.CONNECTION_TIMEOUT, clientConfiguration.getTimeout());
+            Options options = serviceStub._getServiceClient().getOptions();
+            if (reuseHttpClient != null) {
+                options.setProperty(org.apache.axis2.transport.http.HTTPConstants.REUSE_HTTP_CLIENT, reuseHttpClient);
+            }
+            if (timeout != null) {
+                options.setTimeOutInMilliSeconds(Long.valueOf(timeout));
+                options.setProperty(org.apache.axis2.transport.http.HTTPConstants.SO_TIMEOUT, timeout);
+                options.setProperty(org.apache.axis2.transport.http.HTTPConstants.CONNECTION_TIMEOUT, timeout);
+            }
+
+        } catch (IDiscoveryService_Execute_DiscoveryServiceFaultFault_FaultMessage e) {
+            throw new Exception(e.getFaultMessage().getDiscoveryServiceFault().getMessage());
+        }
         return serviceStub;
 
     }
@@ -181,6 +184,18 @@ public class MSCRMClient {
         }
     }
 
+    private static DiscoveryServiceStub createDiscoveryServiceStub(String discoveryServiceURL, SecurityData securityData)
+            throws RemoteException, XMLStreamException {
+        try {
+            DiscoveryServiceStub stub = new DiscoveryServiceStub(getConfigurationContext(), discoveryServiceURL);
+            setServiceClientOptions(stub._getServiceClient(), securityData);
+            return stub;
+        } catch (RemoteException e) {
+            logger.error(e.getMessage());
+            throw e;
+        }
+    }
+
     private static void setServiceClientOptions(ServiceClient sc, SecurityData securityData) throws AxisFault, XMLStreamException {
         Options options = sc.getOptions();
 
@@ -290,6 +305,45 @@ public class MSCRMClient {
         return ctx;
     }
 
+    private static String discoverOrganizationUrl(DiscoveryServiceStub serviceStub, String organizationUniqueName)
+            throws RemoteException, IDiscoveryService_Execute_DiscoveryServiceFaultFault_FaultMessage {
+        try {
+            RetrieveOrganizationRequest request = RetrieveOrganizationRequest.Factory.newInstance();
+
+            request.setUniqueName(organizationUniqueName);
+
+            Execute exe = Execute.Factory.newInstance();
+            exe.setRequest(request);
+
+            ExecuteDocument exeDoc = ExecuteDocument.Factory.newInstance();
+            exeDoc.setExecute(exe);
+
+            ExecuteResponseDocument executeRespDoc = serviceStub.execute(exeDoc);
+            ExecuteResponse executeResp = executeRespDoc.getExecuteResponse();
+
+            RetrieveOrganizationResponse result = (RetrieveOrganizationResponse) executeResp.getExecuteResult();
+
+            OrganizationDetail orgDetail = result.getDetail();
+
+            KeyValuePairOfEndpointTypestringztYlk6OT[] keyValuePairs = orgDetail.getEndpoints()
+                    .getKeyValuePairOfEndpointTypestringztYlk6OTArray();
+
+            for (KeyValuePairOfEndpointTypestringztYlk6OT keyValuePair : keyValuePairs) {
+
+                if (keyValuePair.getKey() == EndpointType.ORGANIZATION_SERVICE) {
+                    return keyValuePair.getValue();
+                }
+            }
+        } catch (RemoteException e) {
+            logger.error(e.getMessage());
+            throw e;
+        } catch (IDiscoveryService_Execute_DiscoveryServiceFaultFault_FaultMessage e) {
+            logger.error(e.getMessage());
+            throw e;
+        }
+        return null;
+    }
+
     private static HttpTransportProperties.ProxyProperties getProxyProperties() {
         String proxyHost = null;
         String proxyPort = null;
@@ -315,55 +369,5 @@ public class MSCRMClient {
         }
         return proxyProps;
     }
-    
-    private String getOrgURL(String discoveryServiceURL) throws ServiceUnavailableException {
-        try {
-            HttpGet request = new HttpGet(discoveryServiceURL);
-    		
-            // https://docs.microsoft.com/en-us/powerapps/developer/data-platform/webapi/discover-url-organization-web-api#authentication
-            authStrategy.configureRequest(request);
 
-            try (CloseableHttpClient httpClient = HttpClients.createDefault();
-                 CloseableHttpResponse response = httpClient.execute(request)) {
-            	
-            	int statusCode = response.getStatusLine().getStatusCode();
-            	if(statusCode != HttpStatus.SC_NO_CONTENT && statusCode != HttpStatus.SC_CREATED && statusCode != HttpStatus.SC_OK) {
-                    String message = null;
-                    if (statusCode == HttpStatus.SC_NOT_FOUND ) {
-                        message = "The organization '"+orgName+"' does not exist.";
-                    } else {
-                        message = response.getStatusLine().getReasonPhrase();
-                    }
-                    throw new HttpClientException(message);
-            	}
-
-                HttpEntity entity = response.getEntity();
-                String orgUrl = null;
-                if (entity != null) {
-                	String result = EntityUtils.toString(entity);
-                    ObjectMapper mapper = new ObjectMapper();
-                    mapper.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true);
-                    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-                    JsonNode tree = mapper.readTree(result);
-                    Iterator<JsonNode> iter = tree.path("value").elements();
-                    while (iter.hasNext()){
-                        JsonNode node = iter.next();
-                        Instance instance = mapper.readValue(node.toString(), Instance.class);
-                        // Should only return one instance.
-                        if(orgName.equals(instance.getUniqueName())) {
-                        	orgUrl = instance.getApiUrl() + "/XRMServices/2011/Organization.svc";
-                        	break;
-                        }
-                    }
-                }
-                if(orgUrl == null) {
-                	throw new HttpClientException("No organization available.");
-                }
-                return orgUrl;
-            }
-        } catch (Exception e) {
-            throw new ServiceUnavailableException(e.getMessage());
-        } 
-	}
-    
 }

main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/src/main/java/org/talend/ms/crm/sdk/Instance.java

@@ -1,85 +0,0 @@
-package org.talend.ms.crm.sdk;
-
-public class Instance {
-
-	public String id;
-	
-	public String uniqueName;
-	
-	public String urlName;
-	
-	public String friendlyName;
-	
-	public String state;
-	
-	public String version;
-	
-	public String url;
-	
-	public String apiUrl;
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getUniqueName() {
-		return uniqueName;
-	}
-
-	public void setUniqueName(String uniqueName) {
-		this.uniqueName = uniqueName;
-	}
-
-	public String getUrlName() {
-		return urlName;
-	}
-
-	public void setUrlName(String urlName) {
-		this.urlName = urlName;
-	}
-
-	public String getFriendlyName() {
-		return friendlyName;
-	}
-
-	public void setFriendlyName(String friendlyName) {
-		this.friendlyName = friendlyName;
-	}
-
-	public String getState() {
-		return state;
-	}
-
-	public void setState(String state) {
-		this.state = state;
-	}
-
-	public String getVersion() {
-		return version;
-	}
-
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	public String getUrl() {
-		return url;
-	}
-
-	public void setUrl(String url) {
-		this.url = url;
-	}
-
-	public String getApiUrl() {
-		return apiUrl;
-	}
-
-	public void setApiUrl(String apiUrl) {
-		this.apiUrl = apiUrl;
-	}
-
-}

main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/src/main/java/org/talend/ms/crm/sdk/OrganizationServiceStubWrapper.java

@@ -100,7 +100,7 @@ public class OrganizationServiceStubWrapper extends OrganizationServiceStub {
     }
 
     private void renewToken() throws Exception {
-        orgStub = client.doGetOnlineConnection();
+        orgStub = client.doGetOnlineConnection(discoveryServiceUrl);
     }
 
     private void sleep() {

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

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.talend.libraries</groupId>
-	<artifactId>talendExcel-1.4-20210126</artifactId>
+	<artifactId>talendExcel-1.3-20180215</artifactId>
 	<version>6.0.0</version>
 	<packaging>jar</packaging>
 

main/plugins/org.talend.designer.components.libs/libs_src/talendExcel/src/main/java/org/talend/ExcelTool.java

@@ -69,10 +69,6 @@ public class ExcelTool {
     private int rowAccessWindowSize = SXSSFWorkbook.DEFAULT_WINDOW_SIZE;// used in auto flush
 
     private boolean isTrackAllColumns = false;
-
-    private boolean isTruncateExceedingCharacters = false;
-
-    private static final int CELL_CHARACTERS_LIMIT = 32767;
 
     public ExcelTool() {
         cellStylesMapping = new HashMap<>();
@@ -278,10 +274,7 @@ public class ExcelTool {
 
     public void addCellValue(String stringValue) {
         addCell();
-        String value = isTruncateExceedingCharacters && stringValue != null && stringValue.length() > CELL_CHARACTERS_LIMIT
-                ? stringValue.substring(0, CELL_CHARACTERS_LIMIT)
-                        : stringValue;
-        curCell.setCellValue(value);
+        curCell.setCellValue(stringValue);
         curCell.setCellStyle(getNormalCellStyle());
     }
 
@@ -347,8 +340,4 @@ public class ExcelTool {
             ((SXSSFSheet) sheet).flushRows();
         }
     }
-
-    public void setTruncateExceedingCharacters(boolean isTruncateExceedingCharacters) {
-        this.isTruncateExceedingCharacters = isTruncateExceedingCharacters;
-    }
 }

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

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

main/plugins/org.talend.designer.components.localprovider/components/tAmazonOracleRow/tAmazonOracleRow_main.javajet

@@ -54,11 +54,11 @@ for(IConnection conn : outgoingConns) {
 		<%
 	}
 }
+log4jCodeGenerateUtil.query(node);
 %>
 query_<%=cid %> = <%=dbquery%>;
 whetherReject_<%=cid%> = false;
 <%
-log4jCodeGenerateUtil.query(node, "query_" + cid);
 List<IMetadataTable> metadatas = node.getMetadataList();
 if ((metadatas!=null)&&(metadatas.size()>0)) {
 	IMetadataTable metadata = metadatas.get(0);
@@ -131,7 +131,7 @@ try {
 		<%
 		}
 	}
-	log4jCodeGenerateUtil.logInfo(node,"info",cid+" - Execute the query: '\" + query_" + cid  + " + \"' has finished.");
+	log4jCodeGenerateUtil.logInfo(node,"info",cid+" - Execute the query: '\" + "+dbquery +" + \"' has finished.");
 %>
 <%	//feature 0010425
 	if(usePrepareStatement){

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

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

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

@@ -87,14 +87,40 @@ class BigQueryUtil_<%=cid%> {
 			insert = bigqueryclient.jobs().insert(projectId, job).execute();
 			jobId = insert.getJobReference();
 		} catch (com.google.api.client.googleapis.json.GoogleJsonResponseException e) {
-			//Auth errors throw TokenResponseExceptions.
-			if(e.getStatusCode() == 401) {
-				tryDeleteTokenPropertiesFile();
+			if(tokenFile != null){
+				try {
+					java.io.File f = new java.io.File(tokenFile);
+					boolean isRemoved = f.delete();
+					if(isRemoved){
+						<%
+				    	if(isLog4jEnabled){
+						%>
+							log.error("<%=cid%> - Unable to connect. This might come from the token expiration. Execute again the job with an empty authorization code.");
+						<%
+						}else{
+				    	%>
+							System.err.println("---> Unable to connect. This might come from the token expiration. Execute again the job with an empty authorization code.");
+						<%
+						}
+						%>
+					}else{
+						throw new java.lang.Exception();
+					}
+				} catch (java.lang.Exception ee) {
+					<%
+			    	if(isLog4jEnabled){
+					%>
+						log.error("<%=cid%> - Unable to connect. This might come from the token expiration. Remove the file " + tokenFile + " Execute again the job with an empty authorization code.");
+					<%
+					}else{
+			    	%>
+						System.err.println("---> Unable to connect. This might come from the token expiration. Remove the file " + tokenFile + " Execute again the job with an empty authorization code.");
+					<%
+					}
+					%>
+				}
 			}
 			throw e;
-		} catch (com.google.api.client.auth.oauth2.TokenResponseException e) {
-			tryDeleteTokenPropertiesFile();
-			throw e;
 		}
 
 		<%
@@ -146,41 +172,5 @@ class BigQueryUtil_<%=cid%> {
 
 			return insert;
 		}
-		
-		private void tryDeleteTokenPropertiesFile() {
-			if(tokenFile != null){
-				try {
-					java.io.File f = new java.io.File(tokenFile);
-					boolean isRemoved = f.delete();
-					if(isRemoved){
-						<%
-				    	if(isLog4jEnabled){
-						%>
-							log.error("<%=cid%> - Unable to connect. This might come from the token expiration. Execute again the job with an empty authorization code.");
-						<%
-						}else{
-				    	%>
-							System.err.println("---> Unable to connect. This might come from the token expiration. Execute again the job with an empty authorization code.");
-						<%
-						}
-						%>
-					}else{
-						throw new java.lang.Exception();
-					}
-				} catch (java.lang.Exception ee) {
-					<%
-			    	if(isLog4jEnabled){
-					%>
-						log.error("<%=cid%> - Unable to connect. This might come from the token expiration. Remove the file " + tokenFile + " Execute again the job with an empty authorization code.");
-					<%
-					}else{
-			    	%>
-						System.err.println("---> Unable to connect. This might come from the token expiration. Remove the file " + tokenFile + " Execute again the job with an empty authorization code.");
-					<%
-					}
-					%>
-				}
-			}
-		}
  		
 	}

main/plugins/org.talend.designer.components.localprovider/components/tExtractPositionalFields/tExtractPositionalFields_java.xml

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

main/plugins/org.talend.designer.components.localprovider/components/tFTPConnection/tFTPConnection_begin.javajet

@@ -113,7 +113,18 @@ if (!sftp && !ftps) { // *** ftp *** //
 		}
 	};
 	final com.jcraft.jsch.UserInfo defaultUserInfo_<%=cid%> = new MyUserInfo();
+	com.jcraft.jsch.JSch jsch_<%=cid%> = new com.jcraft.jsch.JSch(); 
 
+	<%if (("PUBLICKEY").equals(authMethod)){%>
+		<%if(isLog4jEnabled){%>
+			log.info("<%=cid%> - SFTP authentication using a public key.");
+			log.debug("<%=cid%> - Private key: '" + <%=privateKey%> + "'.");
+		<%}%>
+		jsch_<%=cid%>.addIdentity(<%=privateKey %>, defaultUserInfo_<%=cid%>.getPassphrase());
+	<%}%>
+	
+	com.jcraft.jsch.Session session_<%=cid%> = jsch_<%=cid%>.getSession(<%=user%>, <%=host%>, <%=port%>);
+	session_<%=cid%>.setConfig("PreferredAuthentications", "publickey,password,keyboard-interactive,gssapi-with-mic");
 
 	<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/FTP/sftp_connect.javajet"%>
 

main/plugins/org.talend.designer.components.localprovider/components/tFTPConnection/tFTPConnection_java.xml

@@ -236,7 +236,7 @@
   <CODEGENERATION>
      <IMPORTS>
        <IMPORT NAME="Java-SFTP" MODULE="jsch-0.1.55.jar" MVN="mvn:com.jcraft/jsch/0.1.55" REQUIRED_IF="(SFTP == 'true')"/>
-       <IMPORT NAME="FTP+S-Proxy-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20190819.jar" MVN="mvn:org.talend.components.lib/commons-net-ftps-proxy/3.6.1-talend-20190819" REQUIRED_IF="(FTPS == 'true')" />
+       <IMPORT NAME="FTP+S-Proxy-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20190128.jar" MVN="mvn:org.talend.components.lib/commons-net-ftps-proxy/3.6.1-talend-20190128" REQUIRED_IF="(FTPS == 'true')" />
        <IMPORT NAME="Java-FTP+S" MODULE="commons-net-3.6.jar" MVN="mvn:commons-net/commons-net/3.6" REQUIRED_IF="(SFTP == 'false')" />
        <IMPORT NAME="talend-proxy" MODULE="talend-proxy-1.0.1.jar" MVN="mvn:org.talend.components.lib/talend-proxy/1.0.1" REQUIRED="true" />
      </IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tFTPDelete/tFTPDelete_java.xml

@@ -295,8 +295,8 @@
 		<IMPORT NAME="Java-SFTP" MODULE="jsch-0.1.55.jar" MVN="mvn:com.jcraft/jsch/0.1.55" REQUIRED_IF="(SFTP == 'true') AND (USE_EXISTING_CONNECTION == 'false')"/>
 		<IMPORT NAME="jakarta-oro" MODULE="jakarta-oro-2.0.8.jar" MVN="mvn:org.talend.libraries/jakarta-oro-2.0.8/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache/lib/jakarta-oro-2.0.8.jar" REQUIRED="true" />
 		<IMPORT NAME="Java-FTP+S" MODULE="commons-net-3.6.jar" MVN="mvn:commons-net/commons-net/3.6" REQUIRED_IF="(SFTP == 'false') AND (USE_EXISTING_CONNECTION == 'false')" />
-		<IMPORT NAME="FTP+S-Proxy-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20190819.jar" 
-			MVN="mvn:org.talend.components.lib/commons-net-ftps-proxy/3.6.1-talend-20190819" 
+		<IMPORT NAME="FTP+S-Proxy-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20190128.jar" 
+			MVN="mvn:org.talend.components.lib/commons-net-ftps-proxy/3.6.1-talend-20190128" 
 			REQUIRED_IF="(SFTP == 'false') AND (USE_EXISTING_CONNECTION == 'false')" />
 		<IMPORT NAME="talend-proxy" MODULE="talend-proxy-1.0.1.jar" MVN="mvn:org.talend.components.lib/talend-proxy/1.0.1" REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
      </IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tFTPFileExist/tFTPFileExist_java.xml

@@ -282,8 +282,8 @@ COMPATIBILITY="ALL"
 	 <IMPORTS>
 		<IMPORT NAME="Java-SFTP" MODULE="jsch-0.1.55.jar" MVN="mvn:com.jcraft/jsch/0.1.55" REQUIRED_IF="(SFTP == 'true') AND (USE_EXISTING_CONNECTION == 'false')"/>
 		<IMPORT NAME="Java-FTP+S" MODULE="commons-net-3.6.jar" MVN="mvn:commons-net/commons-net/3.6" REQUIRED_IF="(SFTP == 'false') AND (USE_EXISTING_CONNECTION == 'false')" />
-		<IMPORT NAME="FTP+S-Proxy-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20190819.jar" 
-			MVN="mvn:org.talend.components.lib/commons-net-ftps-proxy/3.6.1-talend-20190819" 
+		<IMPORT NAME="FTP+S-Proxy-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20190128.jar" 
+			MVN="mvn:org.talend.components.lib/commons-net-ftps-proxy/3.6.1-talend-20190128" 
 			REQUIRED_IF="(SFTP == 'false') AND (USE_EXISTING_CONNECTION == 'false')" />
 		<IMPORT NAME="talend-proxy" MODULE="talend-proxy-1.0.1.jar" MVN="mvn:org.talend.components.lib/talend-proxy/1.0.1" REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
 	 </IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tFTPFileList/tFTPFileList_java.xml

@@ -260,8 +260,8 @@
 		<IMPORTS>
 			<IMPORT NAME="Java-SFTP" MODULE="jsch-0.1.55.jar" MVN="mvn:com.jcraft/jsch/0.1.55" REQUIRED_IF="(SFTP == 'true') AND (USE_EXISTING_CONNECTION == 'false')"/>
 			<IMPORT NAME="Java-FTP+S" MODULE="commons-net-3.6.jar" MVN="mvn:commons-net/commons-net/3.6" REQUIRED_IF="(SFTP == 'false') AND (USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="FTP+S-Proxy-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20190819.jar" 
-				MVN="mvn:org.talend.components.lib/commons-net-ftps-proxy/3.6.1-talend-20190819" 
+			<IMPORT NAME="FTP+S-Proxy-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20190128.jar" 
+				MVN="mvn:org.talend.components.lib/commons-net-ftps-proxy/3.6.1-talend-20190128" 
 				REQUIRED_IF="(SFTP == 'false') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="talend-proxy" MODULE="talend-proxy-1.0.1.jar" MVN="mvn:org.talend.components.lib/talend-proxy/1.0.1" REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
 		</IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tFTPFileProperties/tFTPFileProperties_java.xml

@@ -257,8 +257,8 @@
 		<IMPORTS>
 			<IMPORT NAME="Java-SFTP" MODULE="jsch-0.1.55.jar" MVN="mvn:com.jcraft/jsch/0.1.55" REQUIRED_IF="(SFTP == 'true') AND (USE_EXISTING_CONNECTION == 'false')"/>
 			<IMPORT NAME="Java-FTP+S" MODULE="commons-net-3.6.jar" MVN="mvn:commons-net/commons-net/3.6" REQUIRED_IF="(SFTP == 'false') AND (USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="FTP+S-Proxy-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20190819.jar" 
-				MVN="mvn:org.talend.components.lib/commons-net-ftps-proxy/3.6.1-talend-20190819" 
+			<IMPORT NAME="FTP+S-Proxy-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20190128.jar" 
+				MVN="mvn:org.talend.components.lib/commons-net-ftps-proxy/3.6.1-talend-20190128" 
 				REQUIRED_IF="(SFTP == 'false') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="talend-proxy" MODULE="talend-proxy-1.0.1.jar" MVN="mvn:org.talend.components.lib/talend-proxy/1.0.1" REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
 		</IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tFTPGet/tFTPGet_java.xml

@@ -301,8 +301,8 @@ COMPATIBILITY="ALL"
        <IMPORT NAME="Java-SFTP" MODULE="jsch-0.1.55.jar" MVN="mvn:com.jcraft/jsch/0.1.55" REQUIRED_IF="(SFTP == 'true') AND (USE_EXISTING_CONNECTION == 'false')"/>
        <IMPORT NAME="jakarta-oro" MODULE="jakarta-oro-2.0.8.jar" MVN="mvn:org.talend.libraries/jakarta-oro-2.0.8/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache/lib/jakarta-oro-2.0.8.jar" REQUIRED="true" />
         <IMPORT NAME="Java-FTP+S" MODULE="commons-net-3.6.jar" MVN="mvn:commons-net/commons-net/3.6" REQUIRED_IF="(SFTP == 'false') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="FTP+S-Proxy-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20190819.jar" 
-            MVN="mvn:org.talend.components.lib/commons-net-ftps-proxy/3.6.1-talend-20190819" 
+        <IMPORT NAME="FTP+S-Proxy-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20190128.jar" 
+            MVN="mvn:org.talend.components.lib/commons-net-ftps-proxy/3.6.1-talend-20190128" 
             REQUIRED_IF="(SFTP == 'false') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="talend-proxy" MODULE="talend-proxy-1.0.1.jar" MVN="mvn:org.talend.components.lib/talend-proxy/1.0.1" REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
      </IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tFTPPut/tFTPPut_java.xml

@@ -345,8 +345,8 @@ COMPATIBILITY="ALL"
      <IMPORTS>
 			<IMPORT NAME="Java-SFTP" MODULE="jsch-0.1.55.jar" MVN="mvn:com.jcraft/jsch/0.1.55" REQUIRED_IF="(SFTP == 'true') AND (USE_EXISTING_CONNECTION == 'false')"/>
 			<IMPORT NAME="Java-FTP+S" MODULE="commons-net-3.6.jar" MVN="mvn:commons-net/commons-net/3.6" REQUIRED_IF="(SFTP == 'false') AND (USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="FTP+S-Proxy-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20190819.jar" 
-				MVN="mvn:org.talend.components.lib/commons-net-ftps-proxy/3.6.1-talend-20190819" 
+			<IMPORT NAME="FTP+S-Proxy-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20190128.jar" 
+				MVN="mvn:org.talend.components.lib/commons-net-ftps-proxy/3.6.1-talend-20190128" 
 				REQUIRED_IF="(SFTP == 'false') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="talend-proxy" MODULE="talend-proxy-1.0.1.jar" MVN="mvn:org.talend.components.lib/talend-proxy/1.0.1" REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
      </IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tFTPRename/tFTPRename_java.xml

@@ -263,8 +263,8 @@ COMPATIBILITY="ALL"
 	<IMPORTS>
 		<IMPORT NAME="Java-SFTP" MODULE="jsch-0.1.55.jar" MVN="mvn:com.jcraft/jsch/0.1.55" REQUIRED_IF="(SFTP == 'true') AND (USE_EXISTING_CONNECTION == 'false')"/>
 		<IMPORT NAME="Java-FTP+S" MODULE="commons-net-3.6.jar" MVN="mvn:commons-net/commons-net/3.6" REQUIRED_IF="(SFTP == 'false') AND (USE_EXISTING_CONNECTION == 'false')" />
-		<IMPORT NAME="FTP+S-Proxy-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20190819.jar" 
-			MVN="mvn:org.talend.components.lib/commons-net-ftps-proxy/3.6.1-talend-20190819" 
+		<IMPORT NAME="FTP+S-Proxy-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20190128.jar" 
+			MVN="mvn:org.talend.components.lib/commons-net-ftps-proxy/3.6.1-talend-20190128" 
 			REQUIRED_IF="(SFTP == 'false') AND (USE_EXISTING_CONNECTION == 'false')" />
 		<IMPORT NAME="talend-proxy" MODULE="talend-proxy-1.0.1.jar" MVN="mvn:org.talend.components.lib/talend-proxy/1.0.1" REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
 	</IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tFTPTruncate/tFTPTruncate_java.xml

@@ -252,8 +252,8 @@ COMPATIBILITY="ALL"
 		<IMPORT NAME="Java-SFTP" MODULE="jsch-0.1.55.jar" MVN="mvn:com.jcraft/jsch/0.1.55" REQUIRED_IF="(SFTP == 'true') AND (USE_EXISTING_CONNECTION == 'false')"/>
 		<IMPORT NAME="jakarta-oro" MODULE="jakarta-oro-2.0.8.jar" MVN="mvn:org.talend.libraries/jakarta-oro-2.0.8/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache/lib/jakarta-oro-2.0.8.jar" REQUIRED="true" />
 		<IMPORT NAME="Java-FTP+S" MODULE="commons-net-3.6.jar" MVN="mvn:commons-net/commons-net/3.6" REQUIRED_IF="(SFTP == 'false') AND (USE_EXISTING_CONNECTION == 'false')" />
-		<IMPORT NAME="FTP+S-Proxy-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20190819.jar" 
-			MVN="mvn:org.talend.components.lib/commons-net-ftps-proxy/3.6.1-talend-20190819" 
+		<IMPORT NAME="FTP+S-Proxy-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20190128.jar" 
+			MVN="mvn:org.talend.components.lib/commons-net-ftps-proxy/3.6.1-talend-20190128" 
 			REQUIRED_IF="(SFTP == 'false') AND (USE_EXISTING_CONNECTION == 'false')" />
 		<IMPORT NAME="talend-proxy" MODULE="talend-proxy-1.0.1.jar" MVN="mvn:org.talend.components.lib/talend-proxy/1.0.1" REQUIRED_IF="USE_EXISTING_CONNECTION == 'false'" />
      </IMPORTS>

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

@@ -463,7 +463,6 @@
 									log.error("<%=cid%> - " +e.getMessage());
 								<%}%>
 								System.err.println(e.getMessage());
-								globalMap.put("<%=cid %>_ERROR_MESSAGE", e.getMessage());
 							<% } %>
 						}
 						java.util.zip.ZipEntry entry_<%=cid %> = null;
@@ -479,7 +478,6 @@
 										log.error("<%=cid%> - " +e.getMessage());
 									<%}%>
 									System.err.println(e.getMessage());
-									globalMap.put("<%=cid %>_ERROR_MESSAGE", e.getMessage());
 									break;
 								<% } %>
 							}
@@ -499,7 +497,6 @@
 										log.error("<%=cid%> - " +e.getMessage());
 									<%}%>
 									System.err.println(e.getMessage());
-									globalMap.put("<%=cid %>_ERROR_MESSAGE", e.getMessage());
 								<% } %>
 							}
 					<%
@@ -521,7 +518,6 @@
 									log.error("<%=cid%> - " +e.getMessage());
 								<%}%>
 								System.err.println(e.getMessage());
-								globalMap.put("<%=cid %>_ERROR_MESSAGE", e.getMessage());
 							<% } %>
 						}
 					<%
@@ -600,9 +596,7 @@
 			            					} else if(rejectConnName.equals(firstConnName)){%>
 			            						<%=rejectConnName%>.errorMessage = e.getMessage() + " - Line: " + tos_count_<%=node.getUniqueName() %>;
 			            					<%
-			            			} %>
-			            			globalMap.put("<%=cid %>_ERROR_MESSAGE", e.getMessage());
-										<%
+									}
 			        					} 
 			        					%>
 			    					}
@@ -1072,7 +1066,6 @@
 									log.error("<%=cid%> - " + e.getMessage());
 								<%}%>
 								System.err.println(e.getMessage());
-								globalMap.put("<%=cid %>_ERROR_MESSAGE", e.getMessage());
 							<% } %>
 	        			}
 	        			java.util.zip.ZipEntry entry_<%=cid %> = null;
@@ -1088,7 +1081,6 @@
 										log.error("<%=cid%> - " + e.getMessage());
 									<%}%>
 									System.err.println(e.getMessage());
-									globalMap.put("<%=cid %>_ERROR_MESSAGE", e.getMessage());
 									break;
 								<% } %>
 	        				}
@@ -1283,7 +1275,6 @@
 							log.error("<%=cid%> - " +e.getMessage());
 						<%}%>
 						System.err.println(e.getMessage());
-						globalMap.put("<%=cid %>_ERROR_MESSAGE", e.getMessage());
 					<% } %>
 	    		}//TD110 end
 	        
@@ -1387,9 +1378,7 @@
             							%>
             								<%=rejectConnName%>.errorMessage = e.getMessage() + " - Line: " + tos_count_<%=node.getUniqueName() %>;
             							<%
-            							} %>
-            							globalMap.put("<%=cid %>_ERROR_MESSAGE", e.getMessage());
-            							<%
+            							}
         							} 
         							%>
 	    						}

main/plugins/org.talend.designer.components.localprovider/components/tFileInputDelimited/tFileInputDelimited_java.xml

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

main/plugins/org.talend.designer.components.localprovider/components/tFileInputFullRow/tFileInputFullRow_java.xml

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

main/plugins/org.talend.designer.components.localprovider/components/tFileInputMSDelimited/tFileInputMSDelimited_java.xml

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

main/plugins/org.talend.designer.components.localprovider/components/tFileInputMSDelimited/tFileInputMSDelimited_java.xml.tmp

@@ -81,11 +81,11 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-				<IMPORT NAME="Talen File Enhanced" MODULE="talend_file_enhanced-1.1.jar" REQUIRED="true" />
+				<IMPORT NAME="Talen File Enhanced" MODULE="talend_file_enhanced_20070724.jar" REQUIRED="true" />
 		</IMPORTS>
 	</CODEGENERATION>
 
 	<RETURNS>
 		<RETURN NAME="NB_LINE" TYPE="id_Integer" AVAILABILITY="AFTER" />
 	</RETURNS>
-</COMPONENT>
+</COMPONENT>

main/plugins/org.talend.designer.components.localprovider/components/tFileInputMSPositional/tFileInputMSPositional_begin.javajet

@@ -39,7 +39,7 @@
     String skipEmptyRows = "true"; //("true").equals(ElementParameterParser.getValue(node, "__SKIP_EMPTY_ROWS__"));
 	boolean trimAll = ("true").equals(ElementParameterParser.getValue(node,"__TRIMALL__"));
 	String encoding = ElementParameterParser.getValue(node,"__ENCODING__");
-	//need to process rows longger than 100,000 characters, the property SafetySwitch(in talend_file_enhanced-1.1.jar) should be sent to false.(the default is true)
+	//need to process rows longger than 100,000 characters, the property SafetySwitch(in talend_file_enhanced_20070724.jar) should be sent to false.(the default is true)
     //that means if check the option(true), the logic value of bSafetySwitch should be changed to false (negate the property)
 	boolean bSafetySwitch = !(("true").equals(ElementParameterParser.getValue(node, "__PROCESS_LONG_ROW__")));
 	String advancedSeparatorStr = ElementParameterParser.getValue(node, "__ADVANCED_SEPARATOR__");

main/plugins/org.talend.designer.components.localprovider/components/tFileInputMSPositional/tFileInputMSPositional_java.xml

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

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

@@ -68,7 +68,7 @@
         	String dieOnErrorStr = ElementParameterParser.getValue(node, "__DIE_ON_ERROR__");
     		boolean dieOnError = (dieOnErrorStr!=null&&!("").equals(dieOnErrorStr))?("true").equals(dieOnErrorStr):false;
     		
-    		//need to process rows longger than 100 000 characters, the property SafetySwitch(in talend_file_enhanced-1.1.jar) should be sent to false.(the default is true)
+    		//need to process rows longger than 100 000 characters, the property SafetySwitch(in talend_file_enhanced_20070724.jar) should be sent to false.(the default is true)
     		//that means if check the option(true), the logic value of bSafetySwitch should be changed to false (XOR with 'true')
     		boolean bSafetySwitch = (("true").equals(ElementParameterParser.getValue(node, "__PROCESS_LONG_ROW__")) ^ true);    		
     		String advancedSeparatorStr = ElementParameterParser.getValue(node, "__ADVANCED_SEPARATOR__");

main/plugins/org.talend.designer.components.localprovider/components/tFileInputPositional/tFileInputPositional_java.xml

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

main/plugins/org.talend.designer.components.localprovider/components/tFileInputRegex/tFileInputRegex_java.xml

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

main/plugins/org.talend.designer.components.localprovider/components/tFileOutputExcel/tFileOutputExcel_begin.javajet

@@ -54,8 +54,7 @@ List<Map<String, String>> autoSizeList = (List<Map<String,String>>)ElementParame
 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);
-boolean isTruncateExceedingCharacters = ("true").equals(ElementParameterParser.getValue(node, "__TRUNCATE_EXCEEDING_CHARACTERS__" ));
+String decimalSeparator = ElementParameterParser.getValueWithJavaType(node, "__DECIMAL_SEPARATOR__", JavaTypesManager.CHARACTER); 
 Map<String,String> autColSizeMaping=new HashMap<String,String>();
 
 List< ? extends IConnection> conns = node.getIncomingConnections();
@@ -761,7 +760,6 @@ if(!hasDynamic && isIncludeHeader){
 %>
 		int nb_line_<%=cid%> = 0;
 		org.talend.ExcelTool xlsxTool_<%=cid%> = new org.talend.ExcelTool();
-                xlsxTool_<%=cid%>.setTruncateExceedingCharacters(<%=isTruncateExceedingCharacters%>);
 <%	 
 		if(flushOnRow && (useStream || !isAppendFile)){
 %>

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

@@ -193,10 +193,6 @@
 		SHOW_IF="(ADVANCED_SEPARATOR == 'true')" REPOSITORY_VALUE="DECIMAL_SEPARATOR">
 		<DEFAULT>"."</DEFAULT>
 	</PARAMETER>
-        <PARAMETER NAME="TRUNCATE_EXCEEDING_CHARACTERS" FIELD="CHECK" REQUIRED="true" NUM_ROW="49"
-                SHOW_IF="(VERSION_2007=='true')">
-                <DEFAULT>false</DEFAULT>
-        </PARAMETER>
 
 	<PARAMETER
       NAME="ENCODING"
@@ -224,7 +220,7 @@
   <CODEGENERATION>
     <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="TALEND_EXCEL" MODULE="talendExcel-1.4-20210126.jar" MVN="mvn:org.talend.libraries/talendExcel-1.4-20210126/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.excel/lib/talendExcel-1.4-20210126.jar" REQUIRED_IF="(VERSION_2007 == 'true')" />
+      <IMPORT NAME="TALEND_EXCEL" MODULE="talendExcel-1.3-20180215.jar" MVN="mvn:org.talend.libraries/talendExcel-1.3-20180215/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.excel/lib/talendExcel-1.3-20180215.jar" REQUIRED_IF="(VERSION_2007 == 'true')" />
       <IMPORT NAME="commons-lang3" MODULE="commons-lang3-3.7.jar" MVN="mvn:org.apache.commons/commons-lang3/3.7" 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="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="" />

main/plugins/org.talend.designer.components.localprovider/components/tFileOutputExcel/tFileOutputExcel_messages.properties

@@ -88,5 +88,4 @@ VERSION_2007.NAME=Write excel2007 file format(xlsx)
 FLUSHONROW.NAME=Custom the flush buffer size
 FLUSHONROW_NUM.NAME=Row number
 
-RECALCULATE_FORMULA.NAME=Recalculate formula
-TRUNCATE_EXCEEDING_CHARACTERS.NAME=Truncate characters exceeding max cell length
+RECALCULATE_FORMULA.NAME=Recalculate formula

main/plugins/org.talend.designer.components.localprovider/components/tFixedFlowInput/tFixedFlowInput_java.xml

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

main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmInput/tMicrosoftCrmInput_begin_AXIS.javajet

@@ -40,8 +40,6 @@ if ((metadatas != null) && (metadatas.size() > 0)) {
 			boolean debug = ("true").equals(ElementParameterParser.getValue(node,"__DEBUG__"));
 			boolean isAPI2011 = ("API_2011").equals(ElementParameterParser.getValue(node,"__API_VERSION__"));
 			String discWSDL = ElementParameterParser.getValue(node, "__DISC_WSDL__");
-			String applicationId = ElementParameterParser.getValue(node, "__APPLICATION_ID__");
-			String authority = ElementParameterParser.getValue(node, "__AUTHORITY__");
 			if(debug){%>
 			System.setProperty("org.apache.commons.logging.Log", "org.apache.commons.logging.impl.SimpleLog");
 		    System.setProperty("org.apache.commons.logging.simplelog.showdatetime", "true");
@@ -353,14 +351,12 @@ if ((metadatas != null) && (metadatas.size() > 0)) {
 
 			}else{//api 2011
 			%>
-				org.talend.ms.crm.odata.ClientConfiguration clientConfig_<%=cid%> = org.talend.ms.crm.odata.ClientConfigurationFactory
-		                        .buildOAuthNativeClientConfiguration(<%=applicationId%>, <%=username%>, decryptedPassword_<%=cid%>, <%=authority%>);
-				clientConfig_<%=cid%>.setTimeout(<%=timeout%>);
-				clientConfig_<%=cid%>.setReuseHttpClient(<%=reuseHttpClient%>);
-				clientConfig_<%=cid%>.setMaxRetry(reConnMaxNum_<%=cid%>,<%=attemptsInterval%>);
-				org.talend.ms.crm.MSCRMClient client_<%=cid%> = new org.talend.ms.crm.MSCRMClient(clientConfig_<%=cid%>, <%=orgName%>,<%=discWSDL%> );
-
-				com.microsoft.schemas.xrm._2011.contracts.OrganizationServiceStub serviceStub_<%=cid%> = client_<%=cid%>.getOnlineConnection();
+				org.talend.ms.crm.MSCRMClient client_<%=cid%> = new org.talend.ms.crm.MSCRMClient(<%=username%>, decryptedPassword_<%=cid%>, <%=orgName%>);
+				client_<%=cid%>.setTimeout(<%=timeout%>);
+				client_<%=cid%>.setReuseHttpClient(<%=reuseHttpClient%>);
+				client_<%=cid%>.setMaxConnectionRetries(reConnMaxNum_<%=cid%>);
+				client_<%=cid%>.setAttemptsInterval(<%=attemptsInterval%>);
+				com.microsoft.schemas.xrm._2011.contracts.OrganizationServiceStub serviceStub_<%=cid%> = client_<%=cid%>.getOnlineConnection(<%=discWSDL%>);
 				<%
 	     		String entityname = ElementParameterParser.getValue(node, "__ENTITYNAME__").trim();
 	     		String customEntityname = ElementParameterParser.getValue(node, "__CUSTOM_ENTITY_NAME__");

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

@@ -90,7 +90,7 @@
 
         <PARAMETER NAME="DISC_WSDL" FIELD="TEXT" NUM_ROW="20" REQUIRED="true"
             SHOW_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')">
-            <DEFAULT>"https://globaldisco.crm.dynamics.com/api/discovery/v2.0/Instances"</DEFAULT>
+            <DEFAULT>"https://disco.crm.dynamics.com/XRMServices/2011/Discovery.svc"</DEFAULT>
         </PARAMETER>
         
         <PARAMETER NAME="SERVICE_ROOT_URL" FIELD="TEXT" NUM_ROW="22" REQUIRED="true"
@@ -118,15 +118,15 @@
             <DEFAULT>""</DEFAULT>
         </PARAMETER>
         
-        <PARAMETER NAME="APPLICATION_ID" FIELD="TEXT" NUM_ROW="30" REQUIRED="true" SHOW_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')">
-            <DEFAULT>"51f81489-12ee-4a9e-aaae-a2591f45987d"</DEFAULT>
+        <PARAMETER NAME="APPLICATION_ID" FIELD="TEXT" NUM_ROW="30" REQUIRED="true" SHOW_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')">
+            <DEFAULT>""</DEFAULT>
         </PARAMETER>
 
         <PARAMETER NAME="CLIENT_SECRET" FIELD="TEXT" NUM_ROW="30" REQUIRED="true" SHOW_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA') AND (ONLINE_REGISTERED_APP != 'NATIVE')">
             <DEFAULT>""</DEFAULT>
         </PARAMETER>
         
-        <PARAMETER NAME="AUTHORITY" FIELD="TEXT" NUM_ROW="35" REQUIRED="true" SHOW_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')">
+        <PARAMETER NAME="AUTHORITY" FIELD="TEXT" NUM_ROW="35" REQUIRED="true" SHOW_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')">
             <DEFAULT>"https://login.windows.net/common/oauth2/authorize"</DEFAULT>
         </PARAMETER>
 
@@ -19432,7 +19432,7 @@
                 <IMPORT NAME="jcifs" MODULE="jcifs-1.3.0.jar" MVN="mvn:org.talend.libraries/jcifs-1.3.0/6.0.0"  REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')" />
                 <!-- 2011 -->
                 <!-- crm client -->
-                <IMPORT NAME="talend-mscrm-3.3-20210618" MODULE="talend-mscrm-3.3-20210618.jar" MVN="mvn:org.talend.libraries/talend-mscrm-3.3-20210618/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.crm/lib/talend-mscrm-3.3-20210618.jar" REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION =='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
+                <IMPORT NAME="talend-mscrm-3.3-20171205" MODULE="talend-mscrm-3.3-20171205.jar" MVN="mvn:org.talend.libraries/talend-mscrm-3.3-20171205/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.crm/lib/talend-mscrm-3.3-20171205.jar" REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION =='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
                 <!-- axis2 1.7.4 -->
                 <IMPORT NAME="activation-1.1" MODULE="activation-1.1.jar" MVN="mvn:org.talend.libraries/activation-1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/activation-1.1.jar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
                 <IMPORT NAME="axiom-api-1.2.20" MODULE="axiom-api-1.2.20.jar" MVN="mvn:org.talend.libraries/axiom-api-1.2.20/6.0.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
@@ -19445,6 +19445,7 @@
                 <IMPORT NAME="commons-cli-1.2" MODULE="commons-cli-1.2.jar" MVN="mvn:commons-cli/commons-cli/1.2"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-cli-1.2.jar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
                 <IMPORT NAME="geronimo-stax-api_1.0_spec-1.0.1" 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=='ONLINE') AND (API_VERSION=='API_2011')" />
                 <IMPORT NAME="jaxen-1.1.6" MODULE="jaxen-1.1.6.jar" MVN="mvn:jaxen/jaxen/1.1.6"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" BundleID="" />
+                <IMPORT NAME="mail-1.4.7" MODULE="mail-1.4.7.jar" MVN="mvn:javax.mail/mail/1.4.7" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
                 <IMPORT NAME="neethi-3.0.3" MODULE="neethi-3.0.3.jar" MVN="mvn:org.apache.neethi/neethi/3.0.3" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
                 <IMPORT NAME="WSDL4J-1_6_3" MODULE="wsdl4j-1.6.3.jar" MVN="mvn:wsdl4j/wsdl4j/1.6.3"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
                 <IMPORT NAME="wstx-asl-3.2.9" MODULE="wstx-asl-3.2.9.jar" MVN="mvn:org.talend.libraries/wstx-asl-3.2.9/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/wstx-asl-3.2.9.jar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
@@ -19457,6 +19458,11 @@
                 <IMPORT NAME="woden-api-1.0M9" MODULE="woden-api-1.0M9.jar" MVN="mvn:org.talend.libraries/woden-api-1.0M9/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/woden-api-1.0M9.jar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
                 <IMPORT NAME="woden-impl-commons-1.0M9" MODULE="woden-impl-commons-1.0M9.jar" MVN="mvn:org.talend.libraries/woden-impl-commons-1.0M9/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/woden-impl-commons-1.0M9.jar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
                 <IMPORT NAME="woden-impl-dom-1.0M9" MODULE="woden-impl-dom-1.0M9.jar" MVN="mvn:org.talend.libraries/woden-impl-dom-1.0M9/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/woden-impl-dom-1.0M9.jar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+                <!-- httpclient 4.2.1 -->
+                <IMPORT NAME="commons-codec-1.9" MODULE="commons-codec-1.9.jar" MVN="mvn:org.talend.libraries/commons-codec-1.9/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-codec-1.9.jar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+                <IMPORT NAME="commons-logging" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2"  UrlPath="platform:/base/plugins/org.apache.commons.logging_1.2.0.jar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')"/>
+                <IMPORT NAME="httpcore-4.4.4" MODULE="httpcore-4.4.4.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.4" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+                <IMPORT NAME="httpclient-4.5.2" MODULE="httpclient-4.5.2.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.2" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
                 <!-- log4j -->
                 <IMPORT NAME="Driver-Commons-log4j-1.2.17" 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="true" BundleID="" />
                 <!-- Jars for CRM 2015 CXF begin -->
@@ -19677,128 +19683,128 @@
                 NAME="aalto-xml-0.9.10"
                 MODULE="aalto-xml-0.9.10.jar"
                 MVN="mvn:org.talend.libraries/aalto-xml-0.9.10/6.4.0"
-                REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
+                REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
             <IMPORT
                 NAME="adal4j-1.1.1-patch"
                 MODULE="adal4j-1.1.1-patch.jar"
                 MVN="mvn:com.microsoft.azure/adal4j/1.1.1-patch"
-                REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
+                REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
             <IMPORT
                 NAME="commons-codec-1.9"
                 MODULE="commons-codec-1.9.jar"
                 MVN="mvn:org.talend.libraries/commons-codec-1.9/6.0.0"
                 UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-codec-1.9.jar"
-                REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
+                REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
 			<IMPORT
 				NAME="apache-commons-io"
 				MODULE="commons-io-2.4.jar"
 				MVN="mvn:commons-io/commons-io/2.4"
 				UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-io-2.4.jar"
-				REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
+				REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
 			<IMPORT
 				NAME="commons-lang3-3.3.2.jar"
 				MODULE="commons-lang3-3.3.2.jar"
 				MVN="mvn:org.talend.libraries/commons-lang3-3.3.2/6.0.0"
 				UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang3-3.3.2.jar"
-				REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
+				REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
 			<IMPORT
 				NAME="gson-2.3.1"
 				MODULE="gson-2.3.1.jar"
 				MVN="mvn:org.talend.libraries/gson-2.3.1/6.1.0"
 				UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/gson-2.3.1.jar"
-				REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
+				REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
 			<IMPORT
 				NAME="commons-logging"
 				MODULE="commons-logging-1.2.jar"
 				MVN="mvn:commons-logging/commons-logging/1.2"
 				UrlPath="platform:/base/plugins/org.apache.commons.logging_1.2.0.jar"
-				REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
+				REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
 			<IMPORT
 				NAME="httpcore-4.4.4"
 				MODULE="httpcore-4.4.4.jar"
 				MVN="mvn:org.apache.httpcomponents/httpcore/4.4.4"
-				REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
+				REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
 			<IMPORT
 				NAME="httpclient-4.5.2"
 				MODULE="httpclient-4.5.2.jar"
 				MVN="mvn:org.apache.httpcomponents/httpclient/4.5.2"
-				REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
+				REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
 			<IMPORT
 				NAME="jackson-core-2.9.5.jar"
 				MODULE="jackson-core-2.9.5.jar"
 				MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.9.5"
-				REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
+				REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
 			<IMPORT
 				NAME="jackson-databind-2.9.5.jar"
 				MODULE="jackson-databind-2.9.5.jar"
 				MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.9.5"
-				REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
+				REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
 			<IMPORT
 				NAME="jackson-annotations-2.9.0.jar"
 				MODULE="jackson-annotations-2.9.0.jar"
 				MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.9.0"
-				REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
+				REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
             <IMPORT
 				NAME="json-smart-2.2.1.jar"
 				MODULE="json-smart-2.2.1.jar"
 				MVN="mvn:org.talend.libraries/json-smart-2.2.1/6.0.0"
-				REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
+				REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
 			<IMPORT
 				NAME="accessors-smart-1.1"
 				MODULE="accessors-smart-1.1.jar"
 				MVN="mvn:org.talend.libraries/accessors-smart-1.1/6.0.0"
-				REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
+				REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
 			<IMPORT
 				NAME="mail-1.4.7"
 				MODULE="mail-1.4.7.jar"
 				MVN="mvn:javax.mail/mail/1.4.7"
-				REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
+				REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
             <IMPORT
                 NAME="nimbus-jose-jwt-3.1.2"
                 MODULE="nimbus-jose-jwt-3.1.2.jar"
                 MVN="mvn:org.talend.libraries/nimbus-jose-jwt-3.1.2/6.4.0"
-                REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
+                REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
             <IMPORT
                 NAME="oauth2-oidc-sdk-4.5"
                 MODULE="oauth2-oidc-sdk-4.5.jar"
                 MVN="mvn:org.talend.libraries/oauth2-oidc-sdk-4.5/6.4.0"
-                REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
+                REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
             <IMPORT
                 NAME="odata-client-core-4.3.0-patch"
                 MODULE="odata-client-core-4.3.0-patch.jar"
                 MVN="mvn:org.talend.libraries/odata-client-core-4.3.0-patch/6.4.0"
-                REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
+                REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
             <IMPORT
                 NAME="odata-client-api-4.3.0"
                 MODULE="odata-client-api-4.3.0.jar"
                 MVN="mvn:org.talend.libraries/odata-client-api-4.3.0/6.4.0"
-                REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
+                REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
             <IMPORT
                 NAME="odata-commons-api-4.3.0"
                 MODULE="odata-commons-api-4.3.0.jar"
                 MVN="mvn:org.talend.libraries/odata-commons-api-4.3.0/6.4.0"
-                REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
+                REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
             <IMPORT
                 NAME="odata-commons-core-4.3.0-patch"
                 MODULE="odata-commons-core-4.3.0-patch.jar"
                 MVN="mvn:org.talend.libraries/odata-commons-core-4.3.0-patch/6.4.0"
-                REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
+                REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
             <IMPORT
                 NAME="slf4j-api-1.7.12"
                 MODULE="slf4j-api-1.7.12.jar"
                 MVN="mvn:org.talend.libraries/slf4j-api-1.7.12/6.0.0"
-                REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
+                REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
 			<IMPORT
 				NAME="slf4j-simple-1.7.2"
 				MODULE="slf4j-simple-1.7.2.jar"
 				MVN="mvn:org.talend.libraries/slf4j-simple-1.7.2/6.0.0"
-				REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
+				REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
             <IMPORT
                 NAME="stax2-api-3.1.4"
                 MODULE="stax2-api-3.1.4.jar"
                 MVN="mvn:org.talend.libraries/stax2-api-3.1.4/6.0.0"
                 UrlPath="platform:/plugin/org.talend.libraries.apache.cxf/lib/stax2-api-3.1.4.jar"
-                REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
+                REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016')))" />
             <!-- CRM 2016 odata end -->
                 
             </IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmOutput/tMicrosoftCrmOutput_begin_AXIS.javajet

@@ -21,8 +21,6 @@ imports="
 	boolean debug = ("true").equals(ElementParameterParser.getValue(node,"__DEBUG__"));
 	boolean isAPI2011 = ("API_2011").equals(ElementParameterParser.getValue(node,"__API_VERSION__"));
 	String discWSDL = ElementParameterParser.getValue(node, "__DISC_WSDL__");
-	String applicationId = ElementParameterParser.getValue(node, "__APPLICATION_ID__");
-	String authority = ElementParameterParser.getValue(node, "__AUTHORITY__");
 	%>
 	int nb_line_<%=cid%> = 0;
 	<%if(debug){%>
@@ -96,13 +94,11 @@ imports="
     	<%}
     }else{
     %>
-        org.talend.ms.crm.odata.ClientConfiguration clientConfig_<%=cid%> = org.talend.ms.crm.odata.ClientConfigurationFactory
-                                .buildOAuthNativeClientConfiguration(<%=applicationId%>, <%=username%>, decryptedPassword_<%=cid%>, <%=authority%>);
-        clientConfig_<%=cid%>.setTimeout(<%=timeout%>);
-        clientConfig_<%=cid%>.setReuseHttpClient(<%=reuseHttpClient%>);
-        clientConfig_<%=cid%>.setMaxRetry(reConnMaxNum_<%=cid%>,<%=attemptsInterval%>);
-        org.talend.ms.crm.MSCRMClient client_<%=cid%> = new org.talend.ms.crm.MSCRMClient(clientConfig_<%=cid%>, <%=orgName%>,<%=discWSDL%> );
-
-        com.microsoft.schemas.xrm._2011.contracts.OrganizationServiceStub serviceStub_<%=cid%> = client_<%=cid%>.getOnlineConnection();
+    	org.talend.ms.crm.MSCRMClient client_<%=cid%> = new org.talend.ms.crm.MSCRMClient(<%=username%>, decryptedPassword_<%=cid%>, <%=orgName%>);
+		client_<%=cid%>.setTimeout(<%=timeout%>);
+		client_<%=cid%>.setReuseHttpClient(<%=reuseHttpClient%>);
+		client_<%=cid%>.setMaxConnectionRetries(reConnMaxNum_<%=cid%>);
+		client_<%=cid%>.setAttemptsInterval(<%=attemptsInterval%>);
+		com.microsoft.schemas.xrm._2011.contracts.OrganizationServiceStub serviceStub_<%=cid%> = client_<%=cid%>.getOnlineConnection(<%=discWSDL%>);
     <%
     }%>

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

@@ -90,7 +90,7 @@
 
         <PARAMETER NAME="DISC_WSDL" FIELD="TEXT" NUM_ROW="30" REQUIRED="true"
             SHOW_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')">
-            <DEFAULT>"https://globaldisco.crm.dynamics.com/api/discovery/v2.0/Instances"</DEFAULT>
+            <DEFAULT>"https://disco.crm.dynamics.com/XRMServices/2011/Discovery.svc"</DEFAULT>
         </PARAMETER>
         
         <PARAMETER NAME="SERVICE_ROOT_URL" FIELD="TEXT" NUM_ROW="31" REQUIRED="true"
@@ -118,15 +118,15 @@
             <DEFAULT>""</DEFAULT>
         </PARAMETER>
 
-        <PARAMETER NAME="APPLICATION_ID" FIELD="TEXT" NUM_ROW="40" REQUIRED="true" SHOW_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA'))">
-            <DEFAULT>"51f81489-12ee-4a9e-aaae-a2591f45987d"</DEFAULT>
+        <PARAMETER NAME="APPLICATION_ID" FIELD="TEXT" NUM_ROW="40" REQUIRED="true" SHOW_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA'))">
+            <DEFAULT>""</DEFAULT>
         </PARAMETER>
 
         <PARAMETER NAME="CLIENT_SECRET" FIELD="TEXT" NUM_ROW="40" REQUIRED="true" SHOW_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA') AND (ONLINE_REGISTERED_APP != 'NATIVE')">
             <DEFAULT>""</DEFAULT>
         </PARAMETER>
 
-        <PARAMETER NAME="AUTHORITY" FIELD="TEXT" NUM_ROW="42" REQUIRED="true" SHOW_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA'))">
+        <PARAMETER NAME="AUTHORITY" FIELD="TEXT" NUM_ROW="42" REQUIRED="true" SHOW_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA'))">
             <DEFAULT>"https://login.windows.net/common/oauth2/authorize"</DEFAULT>
         </PARAMETER>
 
@@ -28850,7 +28850,7 @@
             <IMPORT NAME="jcifs" MODULE="jcifs-1.3.0.jar" MVN="mvn:org.talend.libraries/jcifs-1.3.0/6.0.0"  REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')" />
             <!-- 2011 -->
             <!-- crm client -->
-            <IMPORT NAME="talend-mscrm-3.3-20210618" MODULE="talend-mscrm-3.3-20210618.jar" MVN="mvn:org.talend.libraries/talend-mscrm-3.3-20210618/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.crm/lib/talend-mscrm-3.3-20210618.jar" REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION =='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
+            <IMPORT NAME="talend-mscrm-3.3-20171205" MODULE="talend-mscrm-3.3-20171205.jar" MVN="mvn:org.talend.libraries/talend-mscrm-3.3-20171205/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.crm/lib/talend-mscrm-3.3-20171205.jar" REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION =='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
             <!-- axis2 1.7.4 -->
             <IMPORT NAME="activation-1.1" MODULE="activation-1.1.jar" MVN="mvn:org.talend.libraries/activation-1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/activation-1.1.jar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
             <IMPORT NAME="axiom-api-1.2.20" MODULE="axiom-api-1.2.20.jar" MVN="mvn:org.talend.libraries/axiom-api-1.2.20/6.0.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
@@ -28863,6 +28863,7 @@
             <IMPORT NAME="commons-cli-1.2" MODULE="commons-cli-1.2.jar" MVN="mvn:commons-cli/commons-cli/1.2"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-cli-1.2.jar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
             <IMPORT NAME="geronimo-stax-api_1.0_spec-1.0.1" 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=='ONLINE') AND (API_VERSION=='API_2011')" />
             <IMPORT NAME="jaxen-1.1.6" MODULE="jaxen-1.1.6.jar" MVN="mvn:jaxen/jaxen/1.1.6"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" BundleID="" />
+            <IMPORT NAME="mail-1.4.7" MODULE="mail-1.4.7.jar" MVN="mvn:javax.mail/mail/1.4.7" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
             <IMPORT NAME="neethi-3.0.3" MODULE="neethi-3.0.3.jar" MVN="mvn:org.apache.neethi/neethi/3.0.3" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
             <IMPORT NAME="WSDL4J-1_6_3" MODULE="wsdl4j-1.6.3.jar" MVN="mvn:wsdl4j/wsdl4j/1.6.3"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
             <IMPORT NAME="wstx-asl-3.2.9" MODULE="wstx-asl-3.2.9.jar" MVN="mvn:org.talend.libraries/wstx-asl-3.2.9/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/wstx-asl-3.2.9.jar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
@@ -28875,6 +28876,11 @@
             <IMPORT NAME="woden-api-1.0M9" MODULE="woden-api-1.0M9.jar" MVN="mvn:org.talend.libraries/woden-api-1.0M9/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/woden-api-1.0M9.jar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
             <IMPORT NAME="woden-impl-commons-1.0M9" MODULE="woden-impl-commons-1.0M9.jar" MVN="mvn:org.talend.libraries/woden-impl-commons-1.0M9/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/woden-impl-commons-1.0M9.jar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
             <IMPORT NAME="woden-impl-dom-1.0M9" MODULE="woden-impl-dom-1.0M9.jar" MVN="mvn:org.talend.libraries/woden-impl-dom-1.0M9/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/woden-impl-dom-1.0M9.jar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <!-- httpclient 4.2.1 -->
+            <IMPORT NAME="commons-codec-1.9" MODULE="commons-codec-1.9.jar" MVN="mvn:org.talend.libraries/commons-codec-1.9/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-codec-1.9.jar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <IMPORT NAME="commons-logging" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2"  UrlPath="platform:/base/plugins/org.apache.commons.logging_1.2.0.jar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')"/>
+            <IMPORT NAME="httpcore-4.4.4" MODULE="httpcore-4.4.4.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.4" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <IMPORT NAME="httpclient-4.5.2" MODULE="httpclient-4.5.2.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.2" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
             <!-- log4j -->
             <IMPORT NAME="Driver-Commons-log4j-1.2.17" 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="true" BundleID="" />
             <!-- Jars for CRM 2015 CXF begin -->
@@ -29102,128 +29108,128 @@
                 NAME="aalto-xml-0.9.10"
                 MODULE="aalto-xml-0.9.10.jar"
                 MVN="mvn:org.talend.libraries/aalto-xml-0.9.10/6.4.0"
-                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
+                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
             <IMPORT
                 NAME="adal4j-1.1.1-patch"
                 MODULE="adal4j-1.1.1-patch.jar"
                 MVN="mvn:com.microsoft.azure/adal4j/1.1.1-patch"
-                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
+                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
             <IMPORT
                 NAME="commons-codec-1.9"
                 MODULE="commons-codec-1.9.jar"
                 MVN="mvn:org.talend.libraries/commons-codec-1.9/6.0.0"
                 UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-codec-1.9.jar"
-                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
+                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
             <IMPORT
                 NAME="apache-commons-io"
                 MODULE="commons-io-2.4.jar"
                 MVN="mvn:commons-io/commons-io/2.4"
                 UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-io-2.4.jar"
-                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
+                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
             <IMPORT
                 NAME="commons-lang3-3.3.2.jar"
                 MODULE="commons-lang3-3.3.2.jar"
                 MVN="mvn:org.talend.libraries/commons-lang3-3.3.2/6.0.0"
                 UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang3-3.3.2.jar"
-                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
+                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
             <IMPORT
                 NAME="gson-2.3.1"
                 MODULE="gson-2.3.1.jar"
                 MVN="mvn:org.talend.libraries/gson-2.3.1/6.1.0"
                 UrlPath="platform:/plugin/org.talend.libraries.apache.google/lib/gson-2.3.1.jar"
-                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
+                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
             <IMPORT
                 NAME="commons-logging"
                 MODULE="commons-logging-1.2.jar"
                 MVN="mvn:commons-logging/commons-logging/1.2"
                 UrlPath="platform:/base/plugins/org.apache.commons.logging_1.2.0.jar"
-                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
+                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
             <IMPORT
                 NAME="httpcore-4.4.4"
                 MODULE="httpcore-4.4.4.jar"
                 MVN="mvn:org.apache.httpcomponents/httpcore/4.4.4"
-                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
+                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
             <IMPORT
                 NAME="httpclient-4.5.2"
                 MODULE="httpclient-4.5.2.jar"
                 MVN="mvn:org.apache.httpcomponents/httpclient/4.5.2"
-                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
+                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
             <IMPORT
                 NAME="jackson-core-2.9.5.jar"
                 MODULE="jackson-core-2.9.5.jar"
                 MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.9.5"
-                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
+                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
             <IMPORT
                 NAME="jackson-databind-2.9.5.jar"
                 MODULE="jackson-databind-2.9.5.jar"
                 MVN="mvn:com.fasterxml.jackson.core/jackson-databind/2.9.5"
-                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
+                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
             <IMPORT
                 NAME="jackson-annotations-2.9.0.jar"
                 MODULE="jackson-annotations-2.9.0.jar"
                 MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.9.0"
-                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
+                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
             <IMPORT
                 NAME="json-smart-2.2.1.jar"
                 MODULE="json-smart-2.2.1.jar"
                 MVN="mvn:org.talend.libraries/json-smart-2.2.1/6.0.0"
-                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
+                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
             <IMPORT
                 NAME="accessors-smart-1.1"
                 MODULE="accessors-smart-1.1.jar"
                 MVN="mvn:org.talend.libraries/accessors-smart-1.1/6.0.0"
-                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
+                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
             <IMPORT
                 NAME="mail-1.4.7"
                 MODULE="mail-1.4.7.jar"
                 MVN="mvn:javax.mail/mail/1.4.7"
-                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
+                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
             <IMPORT
                 NAME="nimbus-jose-jwt-3.1.2"
                 MODULE="nimbus-jose-jwt-3.1.2.jar"
                 MVN="mvn:org.talend.libraries/nimbus-jose-jwt-3.1.2/6.4.0"
-                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
+                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
             <IMPORT
                 NAME="oauth2-oidc-sdk-4.5"
                 MODULE="oauth2-oidc-sdk-4.5.jar"
                 MVN="mvn:org.talend.libraries/oauth2-oidc-sdk-4.5/6.4.0"
-                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
+                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
             <IMPORT
                 NAME="odata-client-core-4.3.0-patch"
                 MODULE="odata-client-core-4.3.0-patch.jar"
                 MVN="mvn:org.talend.libraries/odata-client-core-4.3.0-patch/6.4.0"
-                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
+                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
             <IMPORT
                 NAME="odata-client-api-4.3.0"
                 MODULE="odata-client-api-4.3.0.jar"
                 MVN="mvn:org.talend.libraries/odata-client-api-4.3.0/6.4.0"
-                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
+                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
             <IMPORT
                 NAME="odata-commons-api-4.3.0"
                 MODULE="odata-commons-api-4.3.0.jar"
                 MVN="mvn:org.talend.libraries/odata-commons-api-4.3.0/6.4.0"
-                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
+                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
             <IMPORT
                 NAME="odata-commons-core-4.3.0-patch"
                 MODULE="odata-commons-core-4.3.0-patch.jar"
                 MVN="mvn:org.talend.libraries/odata-commons-core-4.3.0-patch/6.4.0"
-                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
+                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
             <IMPORT
                 NAME="slf4j-api-1.7.12"
                 MODULE="slf4j-api-1.7.12.jar"
                 MVN="mvn:org.talend.libraries/slf4j-api-1.7.12/6.0.0"
-                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
+                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
             <IMPORT
                 NAME="slf4j-simple-1.7.2"
                 MODULE="slf4j-simple-1.7.2.jar"
                 MVN="mvn:org.talend.libraries/slf4j-simple-1.7.2/6.0.0"
-                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
+                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
             <IMPORT
                 NAME="stax2-api-3.1.4"
                 MODULE="stax2-api-3.1.4.jar"
                 MVN="mvn:org.talend.libraries/stax2-api-3.1.4/6.0.0"
                 UrlPath="platform:/plugin/org.talend.libraries.apache.cxf/lib/stax2-api-3.1.4.jar"
-                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
+                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016'))" />
             <!-- CRM 2016 odata end -->
          </IMPORTS>
     </CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tOracleRow/tOracleRow_main.javajet

@@ -54,11 +54,11 @@ for(IConnection conn : outgoingConns) {
 		<%
 	}
 }
+log4jCodeGenerateUtil.query(node);
 %>
 query_<%=cid %> = <%=dbquery%>;
 whetherReject_<%=cid%> = false;
 <%
-log4jCodeGenerateUtil.query(node, "query_" + cid);
 List<IMetadataTable> metadatas = node.getMetadataList();
 if ((metadatas!=null)&&(metadatas.size()>0)) {
 	IMetadataTable metadata = metadatas.get(0);
@@ -131,7 +131,7 @@ try {
 		<%
 		}
 	}
-	log4jCodeGenerateUtil.logInfo(node,"info",cid+" - Execute the query: '\" + query_" + cid  + " + \"' has finished.");
+	log4jCodeGenerateUtil.logInfo(node,"info",cid+" - Execute the query: '\" + "+dbquery +" + \"' has finished.");
 %>
 <%	//feature 0010425
 	if(usePrepareStatement){

main/plugins/org.talend.designer.components.localprovider/components/tRedshiftOutput/tRedshiftOutput_end.javajet

@@ -243,9 +243,7 @@ skeleton="../templates/db_output_bulk.skeleton"
 		if(!("true").equals(useExistingConn)) {
         	if(!("").equals(commitEvery) && !("0").equals(commitEvery)) {
     	    %>
-            if(commitCounter_<%=cid%> == 0) {
-                commitCounter_<%=cid%> = rowCount<%=cid%>;
-            }
+            commitCounter_<%=cid%> = rowCount<%=cid%>;//correct the commit counter as commit can happen before executing the sql for extend insert
             <%
         	}
         }

main/plugins/org.talend.designer.components.localprovider/components/tSendMail/tSendMail_main.javajet

@@ -219,7 +219,6 @@ boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(node.ge
 				log.error("<%=cid%> - " + e.toString());
 			<%}%>
   			System.err.println(e.toString());
-  			globalMap.put("<%=cid %>_ERROR_MESSAGE", e.getMessage());
 		<%}%>
 	}finally{
 		props_<%=cid %>.remove("mail.smtp.host");

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

@@ -93,7 +93,9 @@ imports="
 		    <%dbInputBeginUtil.createStatement(node);%>
 
 		    String dbquery_<%=cid%> = <%=dbInputBeginUtil.getQueryString(node)%>;
-		    <% log4jCodeGenerateUtil.query(node, "dbquery_" + cid); %>
+			<%if(isLog4jEnabled){%>
+                log.debug("<%=cid%> - Executing the query: '"+dbquery_<%=cid%>+"'.");
+			<%}%>
 
             <% 
             if(isAmazonAurora){

main/plugins/org.talend.designer.components.localprovider/components/templates/DB/Row/AbstractDBRowMain.javajet

@@ -55,11 +55,11 @@ for(IConnection conn : outgoingConns) {
 		<%
 	}
 }
+log4jCodeGenerateUtil.query(node);
 %>
 query_<%=cid %> = <%=dbquery%>;
 whetherReject_<%=cid%> = false;
 <%
-log4jCodeGenerateUtil.query(node, "query_" + cid);
 List<IMetadataTable> metadatas = node.getMetadataList();
 if ((metadatas!=null)&&(metadatas.size()>0)) {
 	IMetadataTable metadata = metadatas.get(0);
@@ -128,7 +128,7 @@ try {
 		<%
 		}
 	}
-	log4jCodeGenerateUtil.logInfo(node,"debug",cid+" - Execute the query: '\" + query_" + cid  + " + \"' has finished.");
+	log4jCodeGenerateUtil.logInfo(node,"debug",cid+" - Execute the query: '\" + "+dbquery +" + \"' has finished.");
 %>
 <%
 	if(usePrepareStatement){

main/plugins/org.talend.designer.components.localprovider/components/templates/Log4j/Log4jDBConnUtil.javajet

@@ -190,16 +190,6 @@ imports="
 			<%
 		}
 
-		public void query(INode node, String dbQueryVariableName){
-			beforeComponentProcess(node);
-			//for input
-			logInfo(node,"debug",cid+" - Executing the query: '\" + "+dbQueryVariableName +" + \"'.");
-		}
-
-		/**
-		* @deprecated please use another method instead: query(INode node, String dbQueryVariableName) because execution of the query expression can be not idempotent
-		*/
-		@Deprecated
 		public void query(INode node){
 			beforeComponentProcess(node);
 			//for input

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

@@ -17,18 +17,11 @@
 		<thashfile.dir>${project.basedir}/components/tHashInput</thashfile.dir>
 		<thashfile.version>3.0-20170711</thashfile.version>
 		<ftpProxy.dir>${project.basedir}/components/tFTPConnection</ftpProxy.dir>
-		<ftpProxy.version>3.6.1-talend-20190819</ftpProxy.version>
+		<ftpProxy.version>3.6.1-talend-20190128</ftpProxy.version>
 		<tproxy.dir>${project.basedir}/components/tSetProxy</tproxy.dir>
 		<tproxy.version>1.0.1</tproxy.version>
 	</properties>
 
-  <repositories>
-		<repository>
-			<id>talend-update</id>
-			<url>https://talend-update.talend.com/nexus/content/repositories/libraries/</url>
-		</repository>
-	</repositories>
-
 	<build>
 		<plugins>
 			<plugin>
@@ -96,7 +89,7 @@
 									<outputDirectory>${thashfile.dir}</outputDirectory>
 								</artifactItem>
 								<artifactItem>
-									<groupId>org.talend.components.lib</groupId>
+									<groupId>org.talend.libraries</groupId>
 									<artifactId>commons-net-ftps-proxy</artifactId>
 									<version>${ftpProxy.version}</version>
 									<type>jar</type>

main/plugins/org.talend.designer.core/src/main/java/messages.properties

@@ -398,7 +398,6 @@ GuessSchemaController.connectionFailed=Database connection is failed.
 GuessSchemaController.connError=Connection error
 GuessSchemaController.setParameter=Please set connection parameters
 GuessSchemaController.waitOpenDatabase=Waiting for opening Database ...
-GuessSchemaController.emptyQuery=Empty query
 I18nPreferencePage.allTranslation=Import all translations
 I18nPreferencePage.completeInfo=Translations loaded from Babili, these translations will be only displayed to test, on next restart of the application, these texts for translations will be lost.
 I18nPreferencePage.importBabili=Import Translation from Babili

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/process/Process.java

@@ -124,7 +124,6 @@ import org.talend.core.repository.model.ProxyRepositoryFactory;
 import org.talend.core.repository.utils.ConvertJobsUtil;
 import org.talend.core.repository.utils.ProjectHelper;
 import org.talend.core.repository.utils.XmiResourceManager;
-import org.talend.core.runtime.process.TalendProcessArgumentConstant;
 import org.talend.core.runtime.repository.item.ItemProductKeys;
 import org.talend.core.runtime.util.ItemDateParser;
 import org.talend.core.service.IScdComponentService;
@@ -4430,19 +4429,6 @@ public class Process extends Element implements IProcess2, IGEFProcess, ILastVer
     private void loadAdditionalProperties() {
         if (additionalProperties == null) {
             additionalProperties = new HashMap<Object, Object>();
-            
-            try {
-                if (property.getItem() != null && ERepositoryObjectType.getType(property) != null) {
-                    boolean isRouteProcess = ERepositoryObjectType.getType(property).equals(ERepositoryObjectType.PROCESS_ROUTE);
-                    if (!isRouteProcess && "ROUTE"
-                            .equals(this.property.getAdditionalProperties().get(TalendProcessArgumentConstant.ARG_BUILD_TYPE))) {
-                        this.property.getAdditionalProperties().remove(TalendProcessArgumentConstant.ARG_BUILD_TYPE);
-                    }
-                }
-            } catch (Exception e) {
-                ExceptionHandler.process(e);
-            }
-            
             for (Object key : this.property.getAdditionalProperties().keySet()) {
                 additionalProperties.put(key, this.property.getAdditionalProperties().get(key));
             }

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/properties/controllers/GuessSchemaController.java

@@ -86,7 +86,6 @@ import org.talend.core.ui.properties.tab.IDynamicProperty;
 import org.talend.core.ui.services.ISQLBuilderService;
 import org.talend.core.utils.CsvArray;
 import org.talend.core.utils.KeywordsValidator;
-import org.talend.core.utils.TalendQuoteUtils;
 import org.talend.designer.core.i18n.Messages;
 import org.talend.designer.core.model.components.EParameterName;
 import org.talend.designer.core.ui.editor.cmd.ChangeMetadataCommand;
@@ -215,11 +214,6 @@ public class GuessSchemaController extends AbstractElementPropertySectionControl
         IElementParameter elementParameterFromField = elem.getElementParameterFromField(EParameterFieldType.MEMO_SQL);
 
         memoSQL = (String) elementParameterFromField.getValue();
-        if (memoSQL == null || TalendQuoteUtils.removeQuotes(memoSQL).trim().isEmpty()) {
-            MessageDialog.open(MessageDialog.INFORMATION, this.btn.getShell(), "",
-                    Messages.getString("GuessSchemaController.emptyQuery"), SWT.NONE);
-            return null;
-        }
         initConnectionParameters();
         if (this.connParameters != null && memoSQL != null) {
             initConnectionParametersWithContext(elem, manager.getDefaultContext());

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/properties/controllers/GuessSchemaProcess.java

@@ -225,12 +225,6 @@ public class GuessSchemaProcess extends AbstractGuessSchemaProcess {
                 || EDatabaseTypeName.SAPHana.getXmlName().equals(info.getDbType())) {
             createStatament = "conn.createStatement()";
         }
-
-        if (EDatabaseTypeName.REDSHIFT.getXmlName().equals(info.getDbType())
-                || EDatabaseTypeName.REDSHIFT_SSO.getXmlName().equals(info.getDbType())) {
-            createStatament = "conn.createStatement()";
-        }
-
         codeStart = systemProperty + getCodeStart(connectionNode, createStatament, fetchSize);
 
         codeMain = "String[] dataOneRow = new String[numbOfColumn];\r\n" + "for (int i = 1; i <= numbOfColumn; i++) {\r\n" //$NON-NLS-1$ //$NON-NLS-2$
@@ -238,8 +232,13 @@ public class GuessSchemaProcess extends AbstractGuessSchemaProcess {
                 + "csvWriter.writeNext(dataOneRow);"; //$NON-NLS-1$
         
         
-        codeEnd = "nbRows++;\r\n" + "    if (nbRows > " + maximumRowsToPreview + ") break;\r\n" + "}\r\n" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-                + "conn.close();\r\n" + "csvWriter.close();\r\n"; //$NON-NLS-1$ //$NON-NLS-2$
+        if(EDatabaseTypeName.REDSHIFT.getXmlName().equals(info.getDbType())||EDatabaseTypeName.REDSHIFT_SSO.getXmlName().equals(info.getDbType())){
+            codeEnd = "nbRows++;\r\n" + "    if (nbRows > " + maximumRowsToPreview + ") break;\r\n" + "}\r\n" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+                    + "conn.close();\r\n" + "csvWriter.close();\r\n"; //$NON-NLS-1$ //$NON-NLS-2$
+        }else{
+            codeEnd = "nbRows++;\r\n" + "    if (nbRows > " + maximumRowsToPreview + ") break;\r\n" + "}\r\n"  //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+                    + "conn.close();\r\n" + "csvWriter.close();\r\n"; //$NON-NLS-1$ //$NON-NLS-2$
+        }
 
         IComponent component = null;
         switch (LanguageManager.getCurrentLanguage()) {
@@ -263,34 +262,99 @@ public class GuessSchemaProcess extends AbstractGuessSchemaProcess {
     
     private String getCodeStart(INode connectionNode, String createStatament, int fetchSize){
         IPath temppath = getTemppath();
-        String codeStart = "java.lang.Class.forName(\"" + info.getDriverClassName() + "\");\r\n" + "String url = \"" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                + info.getUrl() + "\";\r\n" + "java.sql.Connection conn = java.sql.DriverManager.getConnection(url, \"" //$NON-NLS-1$ //$NON-NLS-2$
-                + info.getUsername() + "\", \"" + info.getPwd() + "\");\r\n" + "java.sql.Statement stm = " + createStatament + ";\r\n" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                + "try {\r\nstm.setFetchSize(" + fetchSize //$NON-NLS-1$
-                + ");\r\n} catch (Exception e) {\r\n// Exception is thrown if db don't support, no need to catch exception here\r\n} \r\n" //$NON-NLS-1$
-                + "java.sql.ResultSet rs = stm.executeQuery(" + memoSQL + ");\r\n" //$NON-NLS-1$ //$NON-NLS-2$
-                + "java.sql.ResultSetMetaData rsmd = rs.getMetaData();\r\n" + "int numbOfColumn = rsmd.getColumnCount();\r\n" //$NON-NLS-1$ //$NON-NLS-2$
-                + "\r\n" + "String fileName = (new java.io.File(\r\n" + "                    \"" + temppath //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                + "\")).getAbsolutePath().replace(\r\n" + "                    \"\\\\\", \"/\");\r\n" //$NON-NLS-1$ //$NON-NLS-2$
-                + "com.talend.csv.CSVWriter csvWriter = new com.talend.csv.CSVWriter(\r\n" //$NON-NLS-1$
-                + "                    new java.io.BufferedWriter(new java.io.OutputStreamWriter(\r\n" //$NON-NLS-1$
-                + "                            new java.io.FileOutputStream(\r\n" //$NON-NLS-1$
-                + "                                    fileName, false),\r\n" //$NON-NLS-1$
-                + "                            \"GBK\")));\r\n" + "                            \r\n" //$NON-NLS-1$ //$NON-NLS-2$
-                + "csvWriter.setSeparator(';');\r\n" + "csvWriter.setQuoteStatus(com.talend.csv.CSVWriter.QuoteStatus.FORCE);\r\n" //$NON-NLS-1$ //$NON-NLS-2$
-                + "int nbRows = 0;\r\n" //$NON-NLS-1$
-                + "String[] columnNames = new String[numbOfColumn];\r\n" + "String[] nullables = new String[numbOfColumn];\r\n" //$NON-NLS-1$ //$NON-NLS-2$
-                + "String[] lengths = new String[numbOfColumn];\r\n" + "String[] precisions = new String[numbOfColumn];\r\n" //$NON-NLS-1$ //$NON-NLS-2$
-                + "String[] dbtypes = new String[numbOfColumn];\r\n" //$NON-NLS-1$
-                + "for(int i = 1;i<=numbOfColumn;i++){\r\n" + "columnNames[i-1] = rsmd.getColumnName(i);\r\n" //$NON-NLS-1$ //$NON-NLS-2$
-                + "nullables[i-1] = rsmd.isNullable(i) == 0? \"false\" : \"true\";\r\n" //$NON-NLS-1$
-                + "lengths[i-1] = Integer.toString(rsmd.getScale(i));\r\n" //$NON-NLS-1$
-                + "precisions[i-1] = Integer.toString(rsmd.getPrecision(i));" //$NON-NLS-1$
-                + "dbtypes[i-1] = rsmd.getColumnTypeName(i);\r\n" + "}\r\n" //$NON-NLS-1$ //$NON-NLS-2$
+        String codeStart = null;
+        if(EDatabaseTypeName.REDSHIFT.getXmlName().equals(info.getDbType())||EDatabaseTypeName.REDSHIFT_SSO.getXmlName().equals(info.getDbType())){
+            INode node = getNode();
+            String tableName = (String) node.getElementParameter("TABLE").getValue();
+            String dbName = null;
+            String schema = null;
+            if(connectionNode!=null){
+                if(connectionNode.getElementParameter("DBNAME")!=null){
+                    dbName = (String) connectionNode.getElementParameter("DBNAME").getValue();
+                }
+                if(connectionNode.getElementParameter("SCHEMA_DB")!=null){
+                    schema = (String) connectionNode.getElementParameter("SCHEMA_DB").getValue();
+                }
+            }else{
+                if(node.getElementParameter("DBNAME")!=null){
+                    dbName = (String) node.getElementParameter("DBNAME").getValue();
+                }
+                if(node.getElementParameter("SCHEMA_DB")!=null){
+                    schema = (String) node.getElementParameter("SCHEMA_DB").getValue();
+                }
+            }
 
-                + "csvWriter.writeNext(columnNames);\r\n" + "csvWriter.writeNext(nullables);\r\n" //$NON-NLS-1$ //$NON-NLS-2$
-                + "csvWriter.writeNext(lengths);\r\n" + "csvWriter.writeNext(precisions);\r\n" //$NON-NLS-1$ //$NON-NLS-2$
-                + "csvWriter.writeNext(dbtypes);\r\n" + "while (rs.next()) {"; //$NON-NLS-1$ //$NON-NLS-2$
+            codeStart = "java.lang.Class.forName(\"" + info.getDriverClassName() + "\");\r\n" + "String url = \"" + info.getUrl() //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                    + "\";\r\n" + "java.sql.Connection conn = java.sql.DriverManager.getConnection(url, \"" + info.getUsername() //$NON-NLS-1$ //$NON-NLS-2$
+                    + "\", \"" + info.getPwd() + "\");\r\n" + "java.sql.DatabaseMetaData metaData = conn.getMetaData();\r\n" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                    + "java.sql.ResultSet rs = metaData.getColumns(" + dbName + "," + schema + "," + tableName + ",null);\r\n" //$NON-NLS-1$ //$NON-NLS-2$
+                   
+                    + "\r\n" + "String fileName = (new java.io.File(\r\n" + "                    \"" + temppath //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                    + "\")).getAbsolutePath().replace(\r\n" + "                    \"\\\\\", \"/\");\r\n" //$NON-NLS-1$ //$NON-NLS-2$
+                    + "com.talend.csv.CSVWriter csvWriter = new com.talend.csv.CSVWriter(\r\n" //$NON-NLS-1$
+                    + "                    new java.io.BufferedWriter(new java.io.OutputStreamWriter(\r\n" //$NON-NLS-1$
+                    + "                            new java.io.FileOutputStream(\r\n" //$NON-NLS-1$
+                    + "                                    fileName, false),\r\n" //$NON-NLS-1$
+                    + "                            \"GBK\")));\r\n" + "                            \r\n" //$NON-NLS-1$ //$NON-NLS-2$
+                    + "csvWriter.setSeparator(';');\r\n" + "csvWriter.setQuoteStatus(com.talend.csv.CSVWriter.QuoteStatus.FORCE);\r\n" + "int nbRows = 0;\r\n" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                    
+                    
+                    
+                    + "java.util.List<String> columnNameList= new java.util.ArrayList<String>();\r\n" + "java.util.List<String> nullableList= new java.util.ArrayList<String>();\r\n" //$NON-NLS-1$ //$NON-NLS-2$
+                    + "java.util.List<String> lengthList= new java.util.ArrayList<String>();\r\n" + "java.util.List<String> precisionList= new java.util.ArrayList<String>();\r\n" //$NON-NLS-1$ //$NON-NLS-2$
+                    + "java.util.List<String> dbtypeList= new java.util.ArrayList<String>();\r\n" //$NON-NLS-1$
+                    
+                    +"while (rs.next()) {\r\n" //$NON-NLS-1$
+                    +"columnNameList.add(rs.getString(\"COLUMN_NAME\"));\r\n" //$NON-NLS-1$
+                    +"nullableList.add(rs.getBoolean(\"NULLABLE\") ? \"true\" : \"false\");\r\n" //$NON-NLS-1$
+                    +"lengthList.add(Integer.toString(rs.getInt(\"COLUMN_SIZE\")));\r\n" //$NON-NLS-1$
+                    +"precisionList.add(Integer.toString(rs.getInt(\"NUM_PREC_RADIX\")));\r\n" //$NON-NLS-1$
+                    +"dbtypeList.add(rs.getString(\"TYPE_NAME\"));\r\n" //$NON-NLS-1$
+                    +"}\r\n" //$NON-NLS-1$
+                    
+                    +"int numbOfColumn = columnNameList.size();" //$NON-NLS-1$
+                    + "String[] columnNames = new String[numbOfColumn];\r\n" + "String[] nullables = new String[numbOfColumn];\r\n" //$NON-NLS-1$ //$NON-NLS-2$
+                    + "String[] lengths = new String[numbOfColumn];\r\n" + "String[] precisions = new String[numbOfColumn];\r\n" //$NON-NLS-1$ //$NON-NLS-2$
+                    + "String[] dbtypes = new String[numbOfColumn];\r\n" //$NON-NLS-1$
+                    
+                    
+                    + "for(int i = 0;i<=numbOfColumn-1;i++){\r\n" + "columnNames[i] = columnNameList.get(i);\r\n" //$NON-NLS-1$ //$NON-NLS-2$
+                    + "nullables[i] = nullableList.get(i);\r\n" //$NON-NLS-1$
+                    + "lengths[i] = lengthList.get(i);\r\n" //$NON-NLS-1$
+                    + "precisions[i] = precisionList.get(i);" //$NON-NLS-1$
+                    + "dbtypes[i] = dbtypeList.get(i);\r\n" + "}\r\n" //$NON-NLS-1$ //$NON-NLS-2$
+
+                    + "csvWriter.writeNext(columnNames);\r\n" + "csvWriter.writeNext(nullables);\r\n" //$NON-NLS-1$ //$NON-NLS-2$
+                    + "csvWriter.writeNext(lengths);\r\n" + "csvWriter.writeNext(precisions);\r\n" //$NON-NLS-1$ //$NON-NLS-2$
+                    + "csvWriter.writeNext(dbtypes);\r\n" + "while (rs.next()) {"; //$NON-NLS-1$ //$NON-NLS-2$ 
+        }else{
+            codeStart = "java.lang.Class.forName(\"" + info.getDriverClassName() + "\");\r\n" + "String url = \"" + info.getUrl() //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                    + "\";\r\n" + "java.sql.Connection conn = java.sql.DriverManager.getConnection(url, \"" + info.getUsername() //$NON-NLS-1$ //$NON-NLS-2$
+                    + "\", \"" + info.getPwd() + "\");\r\n" + "java.sql.Statement stm = " + createStatament + ";\r\n" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                    + "try {\r\nstm.setFetchSize(" + fetchSize + ");\r\n} catch (Exception e) {\r\n// Exception is thrown if db don't support, no need to catch exception here\r\n} \r\n" //$NON-NLS-1$ //$NON-NLS-2$
+                    + "java.sql.ResultSet rs = stm.executeQuery(" + memoSQL + ");\r\n" //$NON-NLS-1$ //$NON-NLS-2$
+                    + "java.sql.ResultSetMetaData rsmd = rs.getMetaData();\r\n" + "int numbOfColumn = rsmd.getColumnCount();\r\n" //$NON-NLS-1$ //$NON-NLS-2$
+                    + "\r\n" + "String fileName = (new java.io.File(\r\n" + "                    \"" + temppath //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                    + "\")).getAbsolutePath().replace(\r\n" + "                    \"\\\\\", \"/\");\r\n" //$NON-NLS-1$ //$NON-NLS-2$
+                    + "com.talend.csv.CSVWriter csvWriter = new com.talend.csv.CSVWriter(\r\n" //$NON-NLS-1$
+                    + "                    new java.io.BufferedWriter(new java.io.OutputStreamWriter(\r\n" //$NON-NLS-1$
+                    + "                            new java.io.FileOutputStream(\r\n" //$NON-NLS-1$
+                    + "                                    fileName, false),\r\n" //$NON-NLS-1$
+                    + "                            \"GBK\")));\r\n" + "                            \r\n" //$NON-NLS-1$ //$NON-NLS-2$
+                    + "csvWriter.setSeparator(';');\r\n" + "csvWriter.setQuoteStatus(com.talend.csv.CSVWriter.QuoteStatus.FORCE);\r\n" + "int nbRows = 0;\r\n" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                    + "String[] columnNames = new String[numbOfColumn];\r\n" + "String[] nullables = new String[numbOfColumn];\r\n" //$NON-NLS-1$ //$NON-NLS-2$
+                    + "String[] lengths = new String[numbOfColumn];\r\n" + "String[] precisions = new String[numbOfColumn];\r\n" //$NON-NLS-1$ //$NON-NLS-2$
+                    + "String[] dbtypes = new String[numbOfColumn];\r\n" //$NON-NLS-1$
+                    + "for(int i = 1;i<=numbOfColumn;i++){\r\n" + "columnNames[i-1] = rsmd.getColumnName(i);\r\n" //$NON-NLS-1$ //$NON-NLS-2$
+                    + "nullables[i-1] = rsmd.isNullable(i) == 0? \"false\" : \"true\";\r\n" //$NON-NLS-1$
+                    + "lengths[i-1] = Integer.toString(rsmd.getScale(i));\r\n" //$NON-NLS-1$
+                    + "precisions[i-1] = Integer.toString(rsmd.getPrecision(i));" //$NON-NLS-1$
+                    + "dbtypes[i-1] = rsmd.getColumnTypeName(i);\r\n" + "}\r\n" //$NON-NLS-1$ //$NON-NLS-2$
+
+                    + "csvWriter.writeNext(columnNames);\r\n" + "csvWriter.writeNext(nullables);\r\n" //$NON-NLS-1$ //$NON-NLS-2$
+                    + "csvWriter.writeNext(lengths);\r\n" + "csvWriter.writeNext(precisions);\r\n" //$NON-NLS-1$ //$NON-NLS-2$
+                    + "csvWriter.writeNext(dbtypes);\r\n" + "while (rs.next()) {"; //$NON-NLS-1$ //$NON-NLS-2$ 
+        }
         return codeStart;
     }
 

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/preferences/PreferenceInitializer.java

@@ -175,8 +175,6 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
         store.setDefault(ITalendCorePrefConstants.NEXUS_TIMEOUT, 20000);
         store.setDefault(ITalendCorePrefConstants.NEXUS_REFRESH_FREQUENCY, 0);
 
-        store.setDefault(ITalendCorePrefConstants.NEXUS_SHARE_LIBS, true);
-
         if (!CommonUIPlugin.isFullyHeadless()) {
             Display display = Display.getDefault();
             if (display == null) {

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/views/jobsettings/tabs/MainComposite.java

@@ -784,7 +784,7 @@ public class MainComposite extends AbstractTabComposite {
                                                         RelationshipItemBuilder.getInstance().addOrUpdateItem(repositoryObject.getProperty().getItem());
                                                     }
                                                     proxyRepositoryFactory.save(ProjectManager.getInstance().getCurrentProject(),
-                                                            repositoryObject.getProperty(), oldName, oldVersion);
+                                                            repositoryObject.getProperty().getItem(), false);
                                                     if (needjobletRelateUpdate && GlobalServiceRegister.getDefault()
                                                             .isServiceRegistered(IJobletProviderService.class)) {
                                                         IJobletProviderService jobletService = (IJobletProviderService) GlobalServiceRegister

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

@@ -201,10 +201,7 @@ public class TalendJavaProjectManager {
                 if (!javaProject.isOpen()) {
                     javaProject.open(monitor);
                 }
-                // only update code pom for main project.
-                if (ProjectManager.getInstance().getCurrentProject().getTechnicalLabel().equals(projectTechName)) {
-                    helper.updateCodeProjectPom(monitor, type, codeProject.getFile(TalendMavenConstants.POM_FILE_NAME));
-                }
+                helper.updateCodeProjectPom(monitor, type, codeProject.getFile(TalendMavenConstants.POM_FILE_NAME));
                 talendCodeJavaProject = new TalendProcessJavaProject(javaProject);
                 talendCodeJavaProject.cleanMavenFiles(monitor);
                 BuildCacheManager.getInstance().clearCodesCache(type);

main/plugins/org.talend.libraries.crm/pom.xml

@@ -47,7 +47,7 @@
                             <artifactItem>
                                 <groupId>org.talend.libraries</groupId>
                                 <artifactId>talend-mscrm</artifactId>
-                                <version>3.3-20210618</version>
+                                <version>3.3-20171205</version>
                                 <type>jar</type>
                                 <overWrite>true</overWrite>
                                 <outputDirectory>${libs.dir}</outputDirectory>

main/plugins/org.talend.libraries.custom/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/talend_file_enhanced-1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/talend_file_enhanced_20070724.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>

main/plugins/org.talend.libraries.custom/META-INF/MANIFEST.MF

@@ -4,7 +4,7 @@ Bundle-Name: Custom
 Bundle-SymbolicName: org.talend.libraries.custom;singleton:=true
 Bundle-Version: 7.1.2.qualifier
 Bundle-ClassPath: .,
- lib/talend_file_enhanced-1.1.jar
+ lib/talend_file_enhanced_20070724.jar
 Export-Package: org.talend.fileprocess,
  org.talend.fileprocess.delimited
 Bundle-ActivationPolicy: lazy

main/plugins/org.talend.libraries.custom/pom.xml

@@ -23,7 +23,7 @@
               <goal>copy</goal>
             </goals>
             <configuration>
-              <stripVersion>true</stripVersion>
+              <stripVersion>true</stripVersion>
               <outputDirectory>${project.basedir}/lib</outputDirectory>
               <artifactItems>
                 <artifactItem>
@@ -41,23 +41,6 @@
                   <artifactId>checkArchive-1.1-20181130</artifactId>
                   <version>6.0.0</version>
                 </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-          <execution>
-            <id>copy-with-version</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.basedir}/lib</outputDirectory>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.talend.components.lib</groupId>
-                  <artifactId>talend_file_enhanced</artifactId>
-                  <version>1.1</version>
-                </artifactItem>
               </artifactItems>
             </configuration>
           </execution>

main/plugins/org.talend.libraries.excel/pom.xml

@@ -63,7 +63,7 @@
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>${talend.groupid}</groupId>
-                                    <artifactId>talendExcel-1.4-20210126</artifactId>
+                                    <artifactId>talendExcel-1.3-20180215</artifactId>
                                     <version>${talend.version.600}</version>
                                 </artifactItem>
 							</artifactItems>