fix(TDI-47223):CVE_axis2-kernel compile error

Merge remote-tracking branch 'origin/maintenance/8.0' into pyzhou/TDI-47223_CVE_axis2-kernel
# Conflicts: # main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmInput/tMicrosoftCrmInput_java.xml # main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmOutput/tMicrosoftCrmOutput_java.xml
2022-03-15 16:34:08 +08:00 · 2022-02-21 17:20:42 +08:00 · 2022-02-21 16:34:36 +08:00 · 2022-02-21 10:22:21 +02:00 · 2022-02-18 17:17:40 +08:00 · 2022-02-17 19:22:16 +01:00
24 changed files with 189 additions and 138 deletions
--- a/main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/pom.xml
@@ -3,10 +3,17 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.talend.components</groupId>
 	<artifactId>talend-mscrm</artifactId>
-	<version>3.9-20210713</version>
+	<version>3.11-20220124</version>
 	<packaging>jar</packaging>
 	
 	<name>talend-mscrm</name>
+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+			<distribution>may be downloaded from the Maven repository</distribution>
+		</license>
+	</licenses>
 	
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/src/main/java/org/talend/ms/crm/odata/ClientConfigurationFactory.java
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/src/main/java/org/talend/ms/crm/odata/ClientConfigurationFactory.java
@@ -60,12 +60,13 @@ public class ClientConfigurationFactory {
    }

    public final static ClientConfiguration buildOAuthPremiseClientConfiguration(String userName, String password, String authoryEndpoint,
-                                                                                 String serviceAPI, String clientId, String redirectUrl, String forcedResource) {
+                                                                                 String serviceAPI, String clientId, String clientSecret, String redirectUrl, String forcedResource) {
        ClientConfiguration clientConfiguration = new ClientConfiguration(AuthStrategyEnum.OAUTH_PREMISE);
        clientConfiguration.setUserName(userName);
        clientConfiguration.setPassword(password);
        clientConfiguration.setAuthoryEndpoint(authoryEndpoint);
        clientConfiguration.setClientId(clientId);
+        clientConfiguration.setClientSecret(clientSecret);
        clientConfiguration.setRedirectURL(redirectUrl);
        clientConfiguration.setServiceAPI(serviceAPI);
        clientConfiguration.setForceResource(forcedResource);
--- a/main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/src/main/java/org/talend/ms/crm/odata/DynamicsCRMClient.java
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/src/main/java/org/talend/ms/crm/odata/DynamicsCRMClient.java
@@ -116,11 +116,8 @@ public class DynamicsCRMClient implements IHttpClientFactoryObserver {
    public DynamicsCRMClient(ClientConfiguration clientConfiguration, String serviceRootURL, String entitySet)
            throws AuthenticationException {
        this.clientConfiguration = clientConfiguration;
-
        this.serviceRootURL = serviceRootURL;
-
        this.entitySet = entitySet;
-
        init();
    }

--- a/main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/src/main/java/org/talend/ms/crm/odata/authentication/OAuthPremiseStrategyImpl.java
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/src/main/java/org/talend/ms/crm/odata/authentication/OAuthPremiseStrategyImpl.java
@@ -146,6 +146,10 @@ public class OAuthPremiseStrategyImpl implements IAuthStrategy {
        body.put("redirect_uri", conf.getRedirectURL());
        body.put("client_id", conf.getClientId());

+        if(conf.getClientSecret() != null && !"".equals(conf.getClientSecret().trim())){
+            body.put("client_secret", conf.getClientSecret());
+        }
+
        RequestHttpContext queryContext = new RequestHttpContext("POST",
                computeTokenUrl(conf.getAuthoryEndpoint()),
                Collections.emptyMap(),
--- a/main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/src/main/java/org/talend/ms/crm/odata/authentication/httpclienthelper/HttpClient.java
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/src/main/java/org/talend/ms/crm/odata/authentication/httpclienthelper/HttpClient.java
@@ -59,8 +59,6 @@ public final class HttpClient {
            redirect = true;
        }

-
-        //final HttpHeaders headers = resp.headers();
        final Optional<String> location = response.getFirstValueHeader("location");


@@ -127,4 +125,4 @@ public final class HttpClient {
    public RequestHttpContext getRequestHttpContext() {
        return requestHttpContext;
    }
-}
+}
--- a/main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/src/main/java/org/talend/ms/crm/odata/authentication/httpclienthelper/HttpResponse.java
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/src/main/java/org/talend/ms/crm/odata/authentication/httpclienthelper/HttpResponse.java
@@ -15,7 +15,7 @@ public final class HttpResponse {
    private Map<String, List<String>> headers;
    private String body;

-    private Optional<String> code = null;//Optional.empty();
+    private Optional<String> code = null;

    public static HttpResponse fromHttpUrlConnection(HttpURLConnection conn) throws IOException {
        final int status = conn.getResponseCode();
@@ -82,12 +82,12 @@ public final class HttpResponse {
            return Optional.empty();
        }

-        final List<String> ss = values.get();
-        if(ss.size() <= 0){
+        final List<String> v = values.get();
+        if (v.size() <= 0) {
            return Optional.empty();
        }

-        return Optional.ofNullable(ss.get(0));
+        return Optional.ofNullable(v.get(0));
    }

    public String getBody() {
@@ -107,11 +107,13 @@ public final class HttpResponse {
        if (!optLocation.isPresent()) {
            return Optional.empty();
        }
-        final String[] split = optLocation.get().split("&|\\?");
-        final Optional<String> optCode = Arrays.stream(split).filter(e -> e.startsWith("code=")).findFirst();
+        final String optLocationValue = optLocation.get();
+        final String[] split = optLocationValue.split("&|\\?");

+        final Optional<String> optCode = Arrays.stream(split).filter(e -> e.startsWith("code=")).findFirst();
        if (optCode.isPresent()) {
-            String code = optCode.get().substring(5);
+            final String optCodeValue = optCode.get();
+            String code = optCodeValue.substring(5);
            return Optional.ofNullable(code);
        }

--- a/main/plugins/org.talend.designer.components.localprovider/components/tFileUnarchive/tFileUnarchive_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tFileUnarchive/tFileUnarchive_java.xml
@@ -92,7 +92,7 @@
   <CODEGENERATION>
     <IMPORTS>
       <IMPORT NAME="commons-compress-1.21" MODULE="commons-compress-1.21.jar" MVN="mvn:org.apache.commons/commons-compress/1.21" REQUIRED="true" />
-       <IMPORT NAME="Ant-Zip" MODULE="ant-1.10.9.jar" MVN="mvn:org.apache.ant/ant/1.10.9" REQUIRED="true" />
+       <IMPORT NAME="Ant-Zip" MODULE="ant-1.10.11.jar" MVN="mvn:org.apache.ant/ant/1.10.11" REQUIRED="true" />
       <IMPORT NAME="Check-Archive" MODULE="checkArchive-1.2-20210901.jar" MVN="mvn:org.talend.components/checkArchive/1.2-20210901" UrlPath="platform:/plugin/org.talend.libraries.custom/lib/checkArchive-1.2-20210901.jar" REQUIRED="true" />
       <IMPORT NAME="zip4j-1.3.3.jar" MODULE="zip4j-1.3.3.jar" MVN="mvn:net.lingala.zip4j/zip4j/1.3.3"  REQUIRED="true" />
       <IMPORT NAME="talendzip-1.2-20210901.jar" MODULE="talendzip-1.2-20210901.jar" MVN="mvn:org.talend.components/talendzip/1.2-20210901" UrlPath="platform:/plugin/org.talend.libraries.custom/lib/talendzip-1.2-20210901.jar" REQUIRED="true" />
--- a/main/plugins/org.talend.designer.components.localprovider/components/tMap/tMap_main.inc.javajet
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tMap/tMap_main.inc.javajet
@@ -803,7 +803,7 @@
                        		    		<%
                        		    	} else {
                        		    		if("java.util.Date".equals(typeToGenerate)) {%>
-                        		    		    <%= tableName %>HashKey.<%= aKeysNames[iKeyName] %> = <%= aKeysValues[iKeyName] %> == null ? null : new java.util.Date(<%= aKeysValues[iKeyName] %>.getTime());
+                        		    		    <%= tableName %>HashKey.<%= aKeysNames[iKeyName] %> = <%= aKeysValues[iKeyName] %> == null ? null : new java.util.Date((<%= aKeysValues[iKeyName] %>).getTime());
                        		    		<%
                        		    		}else {
 	                        		    	%>
--- a/main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmInput/tMicrosoftCrmInput_begin_AXIS.javajet
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmInput/tMicrosoftCrmInput_begin_AXIS.javajet
@@ -63,10 +63,10 @@ if ((metadatas != null) && (metadatas.size() > 0)) {

 					com.microsoft.crm4.webserviceTest.CrmServiceStub service_<%=cid%> = new com.microsoft.crm4.webserviceTest.CrmServiceStub(<%=endpointURL%>);
 					org.apache.axis2.client.Options options_<%=cid%> = service_<%=cid%>._getServiceClient().getOptions();
-					org.apache.axis2.transport.http.HttpTransportProperties.Authenticator auth_<%=cid%> = new org.apache.axis2.transport.http.HttpTransportProperties.Authenticator();
+					org.apache.axis2.transport.http.impl.httpclient4.HttpTransportPropertiesImpl.Authenticator auth_<%=cid%> = new org.apache.axis2.transport.http.impl.httpclient4.HttpTransportPropertiesImpl.Authenticator();

 					List<String> authSchemes_<%=cid%> = new java.util.ArrayList<String>();
-					authSchemes_<%=cid%>.add(org.apache.axis2.transport.http.HttpTransportProperties.Authenticator.NTLM);
+					authSchemes_<%=cid%>.add(org.apache.axis2.transport.http.impl.httpclient4.HttpTransportPropertiesImpl.Authenticator.NTLM);
 					auth_<%=cid%> .setAuthSchemes(authSchemes_<%=cid%>);

 		            auth_<%=cid%> .setUsername(<%=username%>);
@@ -445,7 +445,7 @@ if ((metadatas != null) && (metadatas.size() > 0)) {
 	        		try{
 	        			retrieveMultipleResp_<%=cid%> = serviceStub_<%=cid%>.retrieveMultiple(rmrdoc_<%=cid%>).getRetrieveMultipleResponse();
 	        		}catch(com.microsoft.schemas.xrm._2011.contracts.IOrganizationService_RetrieveMultiple_OrganizationServiceFaultFault_FaultMessage ex_<%=cid%>){
-globalMap.put("<%=cid%>_ERROR_MESSAGE",ex_<%=cid%>.getMessage());
+globalMap.put("<%=cid%>_ERROR_MESSAGE",ex_<%=cid%>.getMessage());
 	        			throw new Exception(ex_<%=cid%>.getFaultMessage().getOrganizationServiceFault().getMessage());
 	        		}
 	        		com.microsoft.schemas.xrm._2011.contracts.EntityCollection retrieveMultipleResult_<%=cid%> = retrieveMultipleResp_<%=cid%>.getRetrieveMultipleResult();
--- a/main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmInput/tMicrosoftCrmInput_begin_odata.javajet
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmInput/tMicrosoftCrmInput_begin_odata.javajet
@@ -95,7 +95,7 @@ if ((metadatas != null) && (metadatas.size() > 0)) {
 				else{
 			%>
 			    org.talend.ms.crm.odata.ClientConfiguration clientConfig_<%=cid%> = org.talend.ms.crm.odata.ClientConfigurationFactory
-                        .buildOAuthPremiseClientConfiguration(<%=userName%>, decryptedPassword_<%=cid%>, <%=authority%>, <%=serviceURL%>,<%=applicationId%>, <%=redirectUrl%>, <%=oauth_resource%>);
+                        .buildOAuthPremiseClientConfiguration(<%=userName%>, decryptedPassword_<%=cid%>, <%=authority%>, <%=serviceURL%>,<%=applicationId%>, <%=clientSecret%>, <%=redirectUrl%>, <%=oauth_resource%>);
 			<%
 				}
 			    } else {
--- a/main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmInput/tMicrosoftCrmInput_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmInput/tMicrosoftCrmInput_java.xml
@@ -27532,57 +27532,64 @@

    <CODEGENERATION>
            <IMPORTS>
-                <IMPORT NAME="axiom-api" MODULE="axiom-api-1.2.14.jar" MVN="mvn:org.apache.ws.commons.axiom/axiom-api/1.2.14" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-                <IMPORT NAME="axiom-impl" MODULE="axiom-impl-1.2.14.jar" MVN="mvn:org.apache.ws.commons.axiom/axiom-impl/1.2.14" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-                <IMPORT NAME="axis2-kernel" MODULE="axis2-kernel-1.6.3.jar" MVN="mvn:org.apache.axis2/axis2-kernel/1.6.3" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-                <IMPORT NAME="axis2-adb" MODULE="axis2-adb-1.6.3.jar" MVN="mvn:org.apache.axis2/axis2-adb/1.6.3"  REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')" />
-                <IMPORT NAME="axis2-transport-http" MODULE="axis2-transport-http-1.6.3.jar" MVN="mvn:org.apache.axis2/axis2-transport-http/1.6.3" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-                <IMPORT NAME="axis2-transport-local" MODULE="axis2-transport-local-1.6.3.jar" MVN="mvn:org.apache.axis2/axis2-transport-local/1.6.3" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-                <IMPORT NAME="commons-codec-1.14" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-                <IMPORT NAME="commons-httpclient" MODULE="commons-httpclient-3.1.jar" MVN="mvn:commons-httpclient/commons-httpclient/3.1" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-                <IMPORT NAME="commons-logging" MODULE="commons-logging-1.1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1.1/6.0.0"  UrlPath="platform:/base/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-                <IMPORT NAME="httpcore" MODULE="httpcore-4.2.1.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.2.1" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-                <IMPORT NAME="mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-                <IMPORT NAME="neethi" MODULE="neethi-3.0.1.jar" MVN="mvn:org.talend.libraries/neethi-3.0.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/neethi-3.0.1.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-                <IMPORT NAME="WSDL4J-1_6_3" MODULE="wsdl4j-1.6.3.jar" MVN="mvn:wsdl4j/wsdl4j/1.6.3"  BundleID="org.apache.servicemix.bundles.wsdl4j" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-                <IMPORT NAME="xmlbeans" MODULE="xmlbeans-2.3.0.jar" MVN="mvn:org.talend.libraries/xmlbeans-2.3.0/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.xml/lib/xmlbeans-2.3.0.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-                <IMPORT NAME="XmlSchema" MODULE="xmlschema-core-2.0.1.jar" MVN="mvn:org.talend.libraries/xmlschema-core-2.0.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/xmlschema-core-2.0.1.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-                <IMPORT NAME="geronimo-stax" MODULE="geronimo-stax-api_1.0_spec-1.0.1.jar" MVN="mvn:org.talend.libraries/geronimo-stax-api_1.0_spec-1.0.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/geronimo-stax-api_1.0_spec-1.0.1.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-                <IMPORT NAME="wstx-asl" MODULE="wstx-asl-3.2.4.jar" MVN="mvn:org.talend.libraries/wstx-asl-3.2.4/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/wstx-asl-3.2.4.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-                <IMPORT NAME="SOAP-JAF" MODULE="activation.jar" MVN="mvn:org.talend.libraries/activation/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/activation.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-                <IMPORT NAME="Java-JAXEN" MODULE="jaxen-1.1.6.jar" MVN="mvn:jaxen/jaxen/1.1.6" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')" BundleID="" />
-                <IMPORT NAME="saajapi" MODULE="saaj-api.jar" MVN="mvn:org.talend.libraries/saaj-api/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.saaj/lib/saaj-api.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-                <IMPORT NAME="saajimpl" MODULE="saaj-impl.jar" MVN="mvn:org.talend.libraries/saaj-impl/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.saaj/lib/saaj-impl.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-                <IMPORT NAME="jaxpapi" MODULE="jaxp-api.jar" MVN="mvn:org.talend.libraries/jaxp-api/6.0.0"  BundleID="" UrlPath="platform:/plugin/org.talend.libraries.jax/lib/jaxp-api.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-                <IMPORT NAME="jaxpri" MODULE="jaxp-ri.jar" MVN="mvn:org.talend.libraries/jaxp-ri/6.0.0"  BundleID="" UrlPath="platform:/plugin/org.talend.libraries.jax/lib/jaxp-ri.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-                <IMPORT NAME="crm4client" MODULE="crm4client.jar" MVN="mvn:org.talend.libraries/crm4client/6.0.0" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')" />
-                <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" MODULE="talend-mscrm-3.10-20211021.jar" MVN="mvn:org.talend.components/talend-mscrm/3.10-20211021" REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION =='API_2016_ODATA' OR API_VERSION =='API_2018_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018')))" />
-                <!-- 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')" />
-                <IMPORT NAME="axiom-impl-1.2.20" MODULE="axiom-impl-1.2.20.jar" MVN="mvn:org.talend.libraries/axiom-impl-1.2.20/6.0.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
-                <IMPORT NAME="axis2-adb-1.7.4" MODULE="axis2-adb-1.7.4.jar" MVN="mvn:org.talend.libraries/axis2-adb-1.7.4/6.0.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
-                <IMPORT NAME="axis2-kernel-1.7.4" MODULE="axis2-kernel-1.7.4.jar" MVN="mvn:org.talend.libraries/axis2-kernel-1.7.4/6.0.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
-                <IMPORT NAME="axis2-xmlbeans-1.7.4" MODULE="axis2-xmlbeans-1.7.4.jar" MVN="mvn:org.talend.libraries/axis2-xmlbeans-1.7.4/6.0.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
-                <IMPORT NAME="axis2-transport-http-1.7.4" MODULE="axis2-transport-http-1.7.4.jar" MVN="mvn:org.talend.libraries/axis2-transport-http-1.7.4/6.0.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
-                <IMPORT NAME="axis2-transport-local-1.7.4" MODULE="axis2-transport-local-1.7.4.jar" MVN="mvn:org.talend.libraries/axis2-transport-local-1.7.4/6.0.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
-                <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="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')" />
-                <IMPORT NAME="xmlbeans-2.6.0" MODULE="xmlbeans-2.6.0.jar" MVN="mvn:org.talend.libraries/xmlbeans-2.6.0/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.xml/lib/xmlbeans-2.6.0.jar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
-                <IMPORT NAME="xmlschema-core-2.2.1" MODULE="xmlschema-core-2.2.1.jar" MVN="mvn:org.apache.ws.xmlschema/xmlschema-core/2.2.1" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')"/>
-                <IMPORT NAME="commons-fileupload-1.3.1" MODULE="commons-fileupload-1.3.1.jar" MVN="mvn:org.talend.libraries/commons-fileupload-1.3.1/6.0.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
-                <IMPORT NAME="addressing-1.6.2" MODULE="addressing-1.6.2.jar" MVN="mvn:org.talend.libraries/addressing-1.6.2/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/addressing-1.6.2.jar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
-                <IMPORT NAME="addressing" MODULE="addressing-1.6.2.mar" MVN="mvn:org.talend.libraries/addressing-1.6.2/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/addressing-1.6.2.mar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
-                <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')" />
+            <IMPORT NAME="axiom-api" MODULE="axiom-api-1.3.0.jar" MVN="mvn:org.apache.ws.commons.axiom/axiom-api/1.3.0"  REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="axiom-impl" MODULE="axiom-impl-1.3.0.jar" MVN="mvn:org.apache.ws.commons.axiom/axiom-impl/1.3.0"  REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="axiom-dom" MODULE="axiom-dom-1.3.0.jar" MVN="mvn:org.apache.ws.commons.axiom/axiom-dom/1.3.0"  REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="axis2-kernel" MODULE="axis2-kernel-1.8.0.jar" MVN="mvn:org.apache.axis2/axis2-kernel/1.8.0" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="axis2-adb" MODULE="axis2-adb-1.8.0.jar" MVN="mvn:org.apache.axis2/axis2-adb/1.8.0"  REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')" />
+            <IMPORT NAME="axis2-transport-http" MODULE="axis2-transport-http-1.8.0.jar" MVN="mvn:org.apache.axis2/axis2-transport-http/1.8.0" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="axis2-transport-local" MODULE="axis2-transport-local-1.8.0.jar" MVN="mvn:org.apache.axis2/axis2-transport-local/1.8.0" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="commons-codec-1.14" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="commons-logging" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2"  REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/><IMPORT NAME="commons-httpclient" MODULE="commons-httpclient-3.1.jar" MVN="mvn:commons-httpclient/commons-httpclient/3.1" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="httpcore" MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="neethi" MODULE="neethi-3.1.1.jar" MVN="mvn:org.apache.neethi/neethi/3.1.1" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="WSDL4J-1_6_3" MODULE="wsdl4j-1.6.3.jar" MVN="mvn:wsdl4j/wsdl4j/1.6.3"  BundleID="org.apache.servicemix.bundles.wsdl4j" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="xmlbeans" MODULE="xmlbeans-3.0.1.jar" MVN="mvn:org.apache.xmlbeans/xmlbeans/3.0.1"  REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="XmlSchema" MODULE="xmlschema-core-2.2.5.jar" MVN="mvn:org.apache.ws.xmlschema/xmlschema-core/2.2.5" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="geronimo-ws-metadata_2.0_spec-1.1.3" MODULE="geronimo-ws-metadata_2.0_spec-1.1.3.jar" MVN="mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/1.1.3"  REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="wstx-asl" MODULE="wstx-asl-3.2.4.jar" MVN="mvn:org.talend.libraries/wstx-asl-3.2.4/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/wstx-asl-3.2.4.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="SOAP-JAF" MODULE="activation.jar" MVN="mvn:org.talend.libraries/activation/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/activation.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="Java-JAXEN" MODULE="jaxen-1.2.0.jar" MVN="mvn:jaxen/jaxen/1.2.0" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')" BundleID="" />
+            <IMPORT NAME="saajapi" MODULE="saaj-api.jar" MVN="mvn:org.talend.libraries/saaj-api/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.saaj/lib/saaj-api.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="saajimpl" MODULE="saaj-impl.jar" MVN="mvn:org.talend.libraries/saaj-impl/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.saaj/lib/saaj-impl.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="jaxpapi" MODULE="jaxp-api.jar" MVN="mvn:org.talend.libraries/jaxp-api/6.0.0"  BundleID="" UrlPath="platform:/plugin/org.talend.libraries.jax/lib/jaxp-api.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="jaxpri" MODULE="jaxp-ri.jar" MVN="mvn:org.talend.libraries/jaxp-ri/6.0.0"  BundleID="" UrlPath="platform:/plugin/org.talend.libraries.jax/lib/jaxp-ri.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="crm4client" MODULE="crm4client.jar" MVN="mvn:org.talend.libraries/crm4client/6.0.0" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')" />
+            <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')" />
+            <IMPORT NAME="woden-core-1.0M10" MODULE="woden-core-1.0M10.jar" MVN="mvn:org.apache.woden/woden-core/1.0M10" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')" />
+            <IMPORT NAME="httpclient" MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="javax.servlet-api-3.1.0" MODULE="javax.servlet-api-3.1.0.jar" MVN="mvn:javax.servlet/javax.servlet-api/3.1.0" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="javax.transaction-api-1.3" MODULE="javax.transaction-api-1.3.jar" MVN="mvn:javax.transaction/javax.transaction-api/1.3" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="jakarta.activation-api-1.2.1" MODULE="jakarta.activation-api-1.2.1.jar" MVN="mvn:jakarta.activation/jakarta.activation-api/1.2.1"  REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')" />
+
+            <!-- 2011 -->
+            <!-- crm client -->
+            <IMPORT NAME="talend-mscrm" MODULE="talend-mscrm-3.10-20211021.jar" MVN="mvn:org.talend.components/talend-mscrm/3.10-20211021" REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION =='API_2016_ODATA' OR API_VERSION =='API_2018_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018'))" />
+            <!-- axis2 1.8.0 -->
+            <IMPORT NAME="jakarta.activation-api-1.2.1" MODULE="jakarta.activation-api-1.2.1.jar" MVN="mvn:jakarta.activation/jakarta.activation-api/1.2.1"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <IMPORT NAME="axiom-api-1.3.0" MODULE="axiom-api-1.3.0.jar" MVN="mvn:org.talend.libraries/axiom-api-1.3.0/6.0.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <IMPORT NAME="axiom-impl-1.3.0" MODULE="axiom-impl-1.3.0.jar" MVN="mvn:org.talend.libraries/axiom-impl-1.3.0/6.0.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <IMPORT NAME="axiom-dom-1.3.0" MODULE="axiom-dom-1.3.0.jar" MVN="mvn:org.talend.libraries/axiom-dom-1.3.0/6.0.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <IMPORT NAME="axis2-adb" MODULE="axis2-adb-1.8.0.jar" MVN="mvn:org.apache.axis2/axis2-adb/1.8.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <IMPORT NAME="axis2-kernel" MODULE="axis2-kernel-1.8.0.jar" MVN="mvn:org.apache.axis2/axis2-kernel/1.8.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <IMPORT NAME="axis2-xmlbeans" MODULE="axis2-xmlbeans-1.8.0.jar" MVN="mvn:org.apache.axis2/axis2-xmlbeans/1.8.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <IMPORT NAME="axis2-transport-http" MODULE="axis2-transport-http-1.8.0.jar" MVN="mvn:org.apache.axis2/axis2-transport-http/1.8.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <IMPORT NAME="axis2-transport-local-1.8.0" MODULE="axis2-transport-local-1.8.0.jar" MVN="mvn:org.apache.axis2/axis2-transport-local/1.8.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <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-ws-metadata_2.0_spec-1.1.3" MODULE="geronimo-ws-metadata_2.0_spec-1.1.3.jar" MVN="mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/1.1.3"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <IMPORT NAME="jaxen-1.2.0" MODULE="jaxen-1.2.0.jar" MVN="mvn:jaxen/jaxen/1.2.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" BundleID="" />
+            <IMPORT NAME="neethi" MODULE="neethi-3.1.1.jar" MVN="mvn:org.apache.neethi/neethi/3.1.1" 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')" />
+            <IMPORT NAME="xmlbeans-3.0.1" MODULE="xmlbeans-3.0.1.jar" MVN="mvn:org.talend.libraries/xmlbeans-3.0.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.xml/lib/xmlbeans-3.0.1.jar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <IMPORT NAME="xmlschema-core-2.2.5" MODULE="xmlschema-core-2.2.5.jar" MVN="mvn:org.apache.ws.xmlschema/xmlschema-core/2.2.5" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')"/>
+            <IMPORT NAME="commons-fileupload-1.4" MODULE="commons-fileupload-1.4.jar" MVN="mvn:commons-fileupload/commons-fileupload/1.4"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <IMPORT NAME="addressing-1.6.2" MODULE="addressing-1.6.2.jar" MVN="mvn:org.talend.libraries/addressing-1.6.2/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/addressing-1.6.2.jar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <IMPORT NAME="addressing" MODULE="addressing-1.6.2.mar" MVN="mvn:org.talend.libraries/addressing-1.6.2/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/addressing-1.6.2.mar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <IMPORT NAME="woden-core-1.0M10" MODULE="woden-core-1.0M10.jar" MVN="mvn:org.apache.woden/woden-core/1.0M10" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <IMPORT NAME="javax.servlet-api-3.1.0" MODULE="javax.servlet-api-3.1.0.jar" MVN="mvn:javax.servlet/javax.servlet-api/3.1.0" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="javax.transaction-api-1.3" MODULE="javax.transaction-api-1.3.jar" MVN="mvn:javax.transaction/javax.transaction-api/1.3" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
                <!-- 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 -->
--- a/main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmOutput/tMicrosoftCrmOutput_begin_AXIS.javajet
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmOutput/tMicrosoftCrmOutput_begin_AXIS.javajet
@@ -46,10 +46,10 @@ imports="

 			com.microsoft.crm4.webserviceTest.CrmServiceStub service_<%=cid%> = new com.microsoft.crm4.webserviceTest.CrmServiceStub(<%=endpointURL%>);
 			org.apache.axis2.client.Options options_<%=cid%> = service_<%=cid%>._getServiceClient().getOptions();
-			org.apache.axis2.transport.http.HttpTransportProperties.Authenticator auth_<%=cid%> = new org.apache.axis2.transport.http.HttpTransportProperties.Authenticator();
+			org.apache.axis2.transport.http.impl.httpclient4.HttpTransportPropertiesImpl.Authenticator auth_<%=cid%> = new org.apache.axis2.transport.http.impl.httpclient4.HttpTransportPropertiesImpl.Authenticator();

 			List<String> authSchemes_<%=cid%> = new java.util.ArrayList<String>();
-			authSchemes_<%=cid%>.add(org.apache.axis2.transport.http.HttpTransportProperties.Authenticator.NTLM);
+			authSchemes_<%=cid%>.add(org.apache.axis2.transport.http.impl.httpclient4.HttpTransportPropertiesImpl.Authenticator.NTLM);
 			auth_<%=cid%> .setAuthSchemes(authSchemes_<%=cid%>);

            auth_<%=cid%> .setUsername(<%=username%>);
--- a/main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmOutput/tMicrosoftCrmOutput_begin_odata.javajet
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmOutput/tMicrosoftCrmOutput_begin_odata.javajet
@@ -80,7 +80,7 @@
       else {
    %>
    org.talend.ms.crm.odata.ClientConfiguration clientConfig_<%=cid%> = org.talend.ms.crm.odata.ClientConfigurationFactory
-            .buildOAuthPremiseClientConfiguration(<%=userName%>, decryptedPassword_<%=cid%>, <%=authority%>, <%=serviceURL%>,<%=applicationId%>, <%=redirectUrl%>, <%=oauth_resource%>);
+            .buildOAuthPremiseClientConfiguration(<%=userName%>, decryptedPassword_<%=cid%>, <%=authority%>, <%=serviceURL%>,<%=applicationId%>, <%=clientSecret%>, <%=redirectUrl%>, <%=oauth_resource%>);
    <%
       }
    } else {
--- a/main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmOutput/tMicrosoftCrmOutput_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmOutput/tMicrosoftCrmOutput_java.xml
@@ -38291,57 +38291,65 @@

    <CODEGENERATION>
        <IMPORTS>
-            <IMPORT NAME="axiom-api" MODULE="axiom-api-1.2.14.jar" MVN="mvn:org.apache.ws.commons.axiom/axiom-api/1.2.14"  REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-            <IMPORT NAME="axiom-impl" MODULE="axiom-impl-1.2.14.jar" MVN="mvn:org.apache.ws.commons.axiom/axiom-impl/1.2.14"  REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-            <IMPORT NAME="axis2-kernel" MODULE="axis2-kernel-1.6.3.jar" MVN="mvn:org.apache.axis2/axis2-kernel/1.6.3" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-            <IMPORT NAME="axis2-adb" MODULE="axis2-adb-1.6.3.jar" MVN="mvn:org.apache.axis2/axis2-adb/1.6.3"  REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')" />
-            <IMPORT NAME="axis2-transport-http" MODULE="axis2-transport-http-1.6.3.jar" MVN="mvn:org.apache.axis2/axis2-transport-http/1.6.3" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-            <IMPORT NAME="axis2-transport-local" MODULE="axis2-transport-local-1.6.3.jar" MVN="mvn:org.apache.axis2/axis2-transport-local/1.6.3" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="axiom-api" MODULE="axiom-api-1.3.0.jar" MVN="mvn:org.apache.ws.commons.axiom/axiom-api/1.3.0"  REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="axiom-impl" MODULE="axiom-impl-1.3.0.jar" MVN="mvn:org.apache.ws.commons.axiom/axiom-impl/1.3.0"  REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="axiom-dom" MODULE="axiom-dom-1.3.0.jar" MVN="mvn:org.apache.ws.commons.axiom/axiom-dom/1.3.0"  REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="axis2-kernel" MODULE="axis2-kernel-1.8.0.jar" MVN="mvn:org.apache.axis2/axis2-kernel/1.8.0" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="axis2-adb" MODULE="axis2-adb-1.8.0.jar" MVN="mvn:org.apache.axis2/axis2-adb/1.8.0"  REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')" />
+            <IMPORT NAME="axis2-transport-http" MODULE="axis2-transport-http-1.8.0.jar" MVN="mvn:org.apache.axis2/axis2-transport-http/1.8.0" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="axis2-transport-local" MODULE="axis2-transport-local-1.8.0.jar" MVN="mvn:org.apache.axis2/axis2-transport-local/1.8.0" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
            <IMPORT NAME="commons-codec-1.14" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="commons-logging" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2"  REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
            <IMPORT NAME="commons-httpclient" MODULE="commons-httpclient-3.1.jar" MVN="mvn:commons-httpclient/commons-httpclient/3.1" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-            <IMPORT NAME="commons-logging" MODULE="commons-logging-1.1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1.1/6.0.0"  UrlPath="platform:/base/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-            <IMPORT NAME="httpcore" MODULE="httpcore-4.2.1.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.2.1" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="httpcore" MODULE="httpcore-4.4.13.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.13" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
            <IMPORT NAME="mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-            <IMPORT NAME="neethi" MODULE="neethi-3.0.1.jar" MVN="mvn:org.talend.libraries/neethi-3.0.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/neethi-3.0.1.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="neethi" MODULE="neethi-3.1.1.jar" MVN="mvn:org.apache.neethi/neethi/3.1.1" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
            <IMPORT NAME="WSDL4J-1_6_3" MODULE="wsdl4j-1.6.3.jar" MVN="mvn:wsdl4j/wsdl4j/1.6.3"  BundleID="org.apache.servicemix.bundles.wsdl4j" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-            <IMPORT NAME="xmlbeans" MODULE="xmlbeans-2.3.0.jar" MVN="mvn:org.talend.libraries/xmlbeans-2.3.0/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.xml/lib/xmlbeans-2.3.0.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-            <IMPORT NAME="XmlSchema" MODULE="xmlschema-core-2.0.1.jar" MVN="mvn:org.talend.libraries/xmlschema-core-2.0.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/xmlschema-core-2.0.1.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-            <IMPORT NAME="geronimo-stax" MODULE="geronimo-stax-api_1.0_spec-1.0.1.jar" MVN="mvn:org.talend.libraries/geronimo-stax-api_1.0_spec-1.0.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/geronimo-stax-api_1.0_spec-1.0.1.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="xmlbeans" MODULE="xmlbeans-3.0.1.jar" MVN="mvn:org.apache.xmlbeans/xmlbeans/3.0.1"  REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="XmlSchema" MODULE="xmlschema-core-2.2.5.jar" MVN="mvn:org.apache.ws.xmlschema/xmlschema-core/2.2.5" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="geronimo-ws-metadata_2.0_spec-1.1.3" MODULE="geronimo-ws-metadata_2.0_spec-1.1.3.jar" MVN="mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/1.1.3"  REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
            <IMPORT NAME="wstx-asl" MODULE="wstx-asl-3.2.4.jar" MVN="mvn:org.talend.libraries/wstx-asl-3.2.4/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/wstx-asl-3.2.4.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
            <IMPORT NAME="SOAP-JAF" MODULE="activation.jar" MVN="mvn:org.talend.libraries/activation/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/activation.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
-            <IMPORT NAME="Java-JAXEN" MODULE="jaxen-1.1.6.jar" MVN="mvn:jaxen/jaxen/1.1.6" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')" BundleID="" />
+            <IMPORT NAME="Java-JAXEN" MODULE="jaxen-1.2.0.jar" MVN="mvn:jaxen/jaxen/1.2.0" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')" BundleID="" />
            <IMPORT NAME="saajapi" MODULE="saaj-api.jar" MVN="mvn:org.talend.libraries/saaj-api/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.saaj/lib/saaj-api.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
            <IMPORT NAME="saajimpl" MODULE="saaj-impl.jar" MVN="mvn:org.talend.libraries/saaj-impl/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.saaj/lib/saaj-impl.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
            <IMPORT NAME="jaxpapi" MODULE="jaxp-api.jar" MVN="mvn:org.talend.libraries/jaxp-api/6.0.0"  BundleID="" UrlPath="platform:/plugin/org.talend.libraries.jax/lib/jaxp-api.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
            <IMPORT NAME="jaxpri" MODULE="jaxp-ri.jar" MVN="mvn:org.talend.libraries/jaxp-ri/6.0.0"  BundleID="" UrlPath="platform:/plugin/org.talend.libraries.jax/lib/jaxp-ri.jar" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
            <IMPORT NAME="crm4client" MODULE="crm4client.jar" MVN="mvn:org.talend.libraries/crm4client/6.0.0" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')" />
            <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')" />
+            <IMPORT NAME="woden-core-1.0M10" MODULE="woden-core-1.0M10.jar" MVN="mvn:org.apache.woden/woden-core/1.0M10" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')" />
+            <IMPORT NAME="httpclient" MODULE="httpclient-4.5.13.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.13" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="javax.servlet-api-3.1.0" MODULE="javax.servlet-api-3.1.0.jar" MVN="mvn:javax.servlet/javax.servlet-api/3.1.0" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="javax.transaction-api-1.3" MODULE="javax.transaction-api-1.3.jar" MVN="mvn:javax.transaction/javax.transaction-api/1.3" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="jakarta.activation-api-1.2.1" MODULE="jakarta.activation-api-1.2.1.jar" MVN="mvn:jakarta.activation/jakarta.activation-api/1.2.1"  REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')" />
+
            <!-- 2011 -->
            <!-- crm client -->
            <IMPORT NAME="talend-mscrm" MODULE="talend-mscrm-3.10-20211021.jar" MVN="mvn:org.talend.components/talend-mscrm/3.10-20211021" REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION =='API_2016_ODATA' OR API_VERSION =='API_2018_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018'))" />
-            <!-- 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')" />
-            <IMPORT NAME="axiom-impl-1.2.20" MODULE="axiom-impl-1.2.20.jar" MVN="mvn:org.talend.libraries/axiom-impl-1.2.20/6.0.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
-            <IMPORT NAME="axis2-adb-1.7.4" MODULE="axis2-adb-1.7.4.jar" MVN="mvn:org.talend.libraries/axis2-adb-1.7.4/6.0.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
-            <IMPORT NAME="axis2-kernel-1.7.4" MODULE="axis2-kernel-1.7.4.jar" MVN="mvn:org.talend.libraries/axis2-kernel-1.7.4/6.0.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
-            <IMPORT NAME="axis2-xmlbeans-1.7.4" MODULE="axis2-xmlbeans-1.7.4.jar" MVN="mvn:org.talend.libraries/axis2-xmlbeans-1.7.4/6.0.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
-            <IMPORT NAME="axis2-transport-http-1.7.4" MODULE="axis2-transport-http-1.7.4.jar" MVN="mvn:org.talend.libraries/axis2-transport-http-1.7.4/6.0.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
-            <IMPORT NAME="axis2-transport-local-1.7.4" MODULE="axis2-transport-local-1.7.4.jar" MVN="mvn:org.talend.libraries/axis2-transport-local-1.7.4/6.0.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <!-- axis2 1.8.0 -->
+            <IMPORT NAME="jakarta.activation-api-1.2.1" MODULE="jakarta.activation-api-1.2.1.jar" MVN="mvn:jakarta.activation/jakarta.activation-api/1.2.1"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <IMPORT NAME="axiom-api-1.3.0" MODULE="axiom-api-1.3.0.jar" MVN="mvn:org.talend.libraries/axiom-api-1.3.0/6.0.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <IMPORT NAME="axiom-impl-1.3.0" MODULE="axiom-impl-1.3.0.jar" MVN="mvn:org.talend.libraries/axiom-impl-1.3.0/6.0.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <IMPORT NAME="axiom-dom-1.3.0" MODULE="axiom-dom-1.3.0.jar" MVN="mvn:org.talend.libraries/axiom-dom-1.3.0/6.0.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <IMPORT NAME="axis2-adb" MODULE="axis2-adb-1.8.0.jar" MVN="mvn:org.apache.axis2/axis2-adb/1.8.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <IMPORT NAME="axis2-kernel" MODULE="axis2-kernel-1.8.0.jar" MVN="mvn:org.apache.axis2/axis2-kernel/1.8.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <IMPORT NAME="axis2-xmlbeans" MODULE="axis2-xmlbeans-1.8.0.jar" MVN="mvn:org.apache.axis2/axis2-xmlbeans/1.8.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <IMPORT NAME="axis2-transport-http" MODULE="axis2-transport-http-1.8.0.jar" MVN="mvn:org.apache.axis2/axis2-transport-http/1.8.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <IMPORT NAME="axis2-transport-local-1.8.0" MODULE="axis2-transport-local-1.8.0.jar" MVN="mvn:org.apache.axis2/axis2-transport-local/1.8.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
            <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="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="geronimo-ws-metadata_2.0_spec-1.1.3" MODULE="geronimo-ws-metadata_2.0_spec-1.1.3.jar" MVN="mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/1.1.3"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <IMPORT NAME="jaxen-1.2.0" MODULE="jaxen-1.2.0.jar" MVN="mvn:jaxen/jaxen/1.2.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" BundleID="" />
+            <IMPORT NAME="neethi" MODULE="neethi-3.1.1.jar" MVN="mvn:org.apache.neethi/neethi/3.1.1" 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')" />
-            <IMPORT NAME="xmlbeans-2.6.0" MODULE="xmlbeans-2.6.0.jar" MVN="mvn:org.talend.libraries/xmlbeans-2.6.0/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.xml/lib/xmlbeans-2.6.0.jar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
-            <IMPORT NAME="xmlschema-core-2.2.1" MODULE="xmlschema-core-2.2.1.jar" MVN="mvn:org.apache.ws.xmlschema/xmlschema-core/2.2.1" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')"/>
-            <IMPORT NAME="commons-fileupload-1.3.1" MODULE="commons-fileupload-1.3.1.jar" MVN="mvn:org.talend.libraries/commons-fileupload-1.3.1/6.0.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <IMPORT NAME="xmlbeans-3.0.1" MODULE="xmlbeans-3.0.1.jar" MVN="mvn:org.talend.libraries/xmlbeans-3.0.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.xml/lib/xmlbeans-3.0.1.jar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <IMPORT NAME="xmlschema-core-2.2.5" MODULE="xmlschema-core-2.2.5.jar" MVN="mvn:org.apache.ws.xmlschema/xmlschema-core/2.2.5" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')"/>
+            <IMPORT NAME="commons-fileupload-1.4" MODULE="commons-fileupload-1.4.jar" MVN="mvn:commons-fileupload/commons-fileupload/1.4"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
            <IMPORT NAME="addressing-1.6.2" MODULE="addressing-1.6.2.jar" MVN="mvn:org.talend.libraries/addressing-1.6.2/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/addressing-1.6.2.jar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
            <IMPORT NAME="addressing" MODULE="addressing-1.6.2.mar" MVN="mvn:org.talend.libraries/addressing-1.6.2/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/addressing-1.6.2.mar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
-            <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')" />
+            <IMPORT NAME="woden-core-1.0M10" MODULE="woden-core-1.0M10.jar" MVN="mvn:org.apache.woden/woden-core/1.0M10" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
+            <IMPORT NAME="javax.servlet-api-3.1.0" MODULE="javax.servlet-api-3.1.0.jar" MVN="mvn:javax.servlet/javax.servlet-api/3.1.0" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
+            <IMPORT NAME="javax.transaction-api-1.3" MODULE="javax.transaction-api-1.3.jar" MVN="mvn:javax.transaction/javax.transaction-api/1.3" REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')"/>
            <!-- 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 -->
--- a/main/plugins/org.talend.designer.components.localprovider/components/tPostgresqlOutput/tPostgresqlOutput_begin.javajet
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tPostgresqlOutput/tPostgresqlOutput_begin.javajet
@@ -281,10 +281,16 @@ if(columnList != null && columnList.size()>0) {
            java.lang.StringBuilder primaryKeysSB = new java.lang.StringBuilder();
            java.lang.StringBuilder updateColumnSB = new java.lang.StringBuilder();
            for(Column column : stmtStructure) {
+                String columnName = column.getColumnName();
+                if (column.isReplaced()) {
+                    for (Column replacedColumn : column.getReplacement()) {
+                        columnName = replacedColumn.getColumnName();
+                    }
+                }
                if (column.isKey()) {
-                    primaryKeysSB.append("\\\"").append(column.getColumnName()).append("\\\"").append(",");
+                    primaryKeysSB.append("\\\"").append(columnName).append("\\\"").append(",");
                } else {
-                    updateColumnSB.append("\\\"").append(column.getColumnName()).append("\\\"").append(" = EXCLUDED.").append("\\\"").append(column.getColumnName()).append("\\\"").append(",");
+                    updateColumnSB.append("\\\"").append(columnName).append("\\\"").append(" = EXCLUDED.").append("\\\"").append(columnName).append("\\\"").append(",");
                }
            }
            String primaryKeys = primaryKeysSB.toString();
--- a/main/plugins/org.talend.designer.components.localprovider/components/tPostgresqlOutput/tPostgresqlOutput_main.javajet
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tPostgresqlOutput/tPostgresqlOutput_main.javajet
@@ -189,6 +189,22 @@ skeleton="../templates/db_output_bulk.skeleton"
            if (("UPSERT").equals(dataAction)) {%>
                java.lang.StringBuilder dynamicPrimaryKeysSB_<%=cid%> = new java.lang.StringBuilder();
                java.lang.StringBuilder dynamicUpdateColumnSB_<%=cid%> = new java.lang.StringBuilder();
+				<%for(Column column : stmtStructure) {
+					if (!column.isDynamic()) {
+                        String columnName = column.getColumnName();
+                        if (column.isReplaced()) {
+                            for (Column replacedColumn : column.getReplacement()) {
+                                columnName = replacedColumn.getColumnName();
+                            }
+                        }
+						if(column.isKey()) {%>
+							dynamicPrimaryKeysSB_<%=cid%>.append("\"").append("<%=columnName%>").append("\"").append(",");
+						<%} else {%>
+							dynamicUpdateColumnSB_<%=cid%>.append("\"").append("<%=columnName%>").append("\"").append(" = EXCLUDED.").append("\"")
+								.append("<%=columnName%>").append("\"").append(",");
+						<%}
+					}
+				}%>
                for (int x_<%=cid%> = 0; x_<%=cid%> < dynamic_<%=cid%>.getColumnCount(); x_<%=cid%>++) {
                    routines.system.DynamicMetadata column_<%=cid%> = dynamic_<%=cid%>.getColumnMetadata(x_<%=cid%>);
                    if(column_<%=cid%>.isKey()) {
--- a/main/plugins/org.talend.designer.components.localprovider/components/templates/DB/Output/splitSQLForAllDBInBegin.javajet
+++ b/main/plugins/org.talend.designer.components.localprovider/components/templates/DB/Output/splitSQLForAllDBInBegin.javajet
@@ -1,7 +1,7 @@
 <%@ jet 
 %>
 <%
-	     if(("INSERT").equals(dataAction) || ("INSERT_IGNORE").equals(dataAction)) {
+	     if(("INSERT").equals(dataAction) || ("INSERT_IGNORE").equals(dataAction) || ("UPSERT").equals(dataAction)) {
 %>
 		 	String[] insertSQLSplits_<%=cid%> = insert_<%=cid%>.split("\\?");
 <%
--- a/main/plugins/org.talend.designer.components.localprovider/components/templates/DB/Output/splitSQLForAllDBInDynamicBegin.javajet
+++ b/main/plugins/org.talend.designer.components.localprovider/components/templates/DB/Output/splitSQLForAllDBInDynamicBegin.javajet
@@ -1,7 +1,7 @@
 <%@ jet 
 %>
 <%
-	     if(("INSERT").equals(dataAction) || ("INSERT_IGNORE").equals(dataAction)) {
+	     if(("INSERT").equals(dataAction) || ("INSERT_IGNORE").equals(dataAction) || ("UPSERT").equals(dataAction)) {
 %>
 		 	String[] insertSQLSplits_<%=cid%> = null;
 <%
--- a/main/plugins/org.talend.designer.components.localprovider/components/templates/DB/Output/splitSQLForAllDBInDynamicMain.javajet
+++ b/main/plugins/org.talend.designer.components.localprovider/components/templates/DB/Output/splitSQLForAllDBInDynamicMain.javajet
@@ -1,7 +1,7 @@
 <%@ jet 
 %>
 <%
-	     if(("INSERT").equals(dataAction) || ("INSERT_IGNORE").equals(dataAction)) {
+	     if(("INSERT").equals(dataAction) || ("INSERT_IGNORE").equals(dataAction) || ("UPSERT").equals(dataAction)) {
 %>
 		 	insertSQLSplits_<%=cid%> = insert_<%=cid%>.split("\\?");
 <%
--- a/main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/model/components/EmfComponent.java
+++ b/main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/model/components/EmfComponent.java
@@ -149,6 +149,7 @@ import org.talend.hadoop.distribution.condition.NestedComponentCondition;
 import org.talend.hadoop.distribution.condition.SimpleComponentCondition;
 import org.talend.hadoop.distribution.constants.SparkBatchConstant;
 import org.talend.hadoop.distribution.constants.apache.ESparkMode;
+import org.talend.hadoop.distribution.constants.databricks.DatabricksRuntimeVersion;
 import org.talend.hadoop.distribution.dynamic.template.AbstractDynamicDistributionTemplate;
 import org.talend.hadoop.distribution.dynamic.template.IDynamicDistributionTemplate;
 import org.talend.hadoop.distribution.helper.DistributionsManager;
@@ -1888,6 +1889,30 @@ public class EmfComponent extends AbstractBasicComponent {
                newParam.setGroup(xmlParam.getGROUP());
                newParam.setGroupDisplayName(parentParam.getGroupDisplayName());
                newParam.setDefaultValues(sparkModesDefaultValues);
+                newParam.setRepositoryValue(SparkBatchConstant.SPARK_MODE_PARAMETER);
+                listParam.add(newParam);
+                
+                // databricksRuntimeVersion for universal
+                String[] databricksRuntimeVersionLabels = DatabricksRuntimeVersion.getAvailableRuntimeAndSparkVersion().stream().map(x -> x.getRuntimeVersion())
+                        .collect(Collectors.toList()).toArray(new String[0]);
+                String[] databricksRuntimeVersionDisplayConditions = DatabricksRuntimeVersion.getAvailableRuntimeAndSparkVersion().stream()
+                		.map(x -> "(SPARK_VERSION=='"+x.getSparkVersion()+"')")
+                        .collect(Collectors.toList()).toArray(new String[0]);
+
+                newParam = new ElementParameter(node);
+                newParam.setCategory(EComponentCategory.BASIC);
+                newParam.setName(SparkBatchConstant.DATABRICKS_RUNTIME_VERSION);
+                newParam.setDisplayName(SparkBatchConstant.getName(SparkBatchConstant.DATABRICKS_RUNTIME_VERSION));
+                newParam.setShowIf(DatabricksRuntimeVersion.showIfCondition);
+                newParam.setListItemsDisplayName(databricksRuntimeVersionLabels);
+                newParam.setListItemsDisplayCodeName(databricksRuntimeVersionLabels);
+                newParam.setListItemsValue(databricksRuntimeVersionLabels);
+                newParam.setListItemsShowIf(databricksRuntimeVersionDisplayConditions);
+                newParam.setListItemsNotShowIf(new String[DatabricksRuntimeVersion.getAvailableRuntimeAndSparkVersion().size()]);
+                newParam.setNumRow(xmlParam.getNUMROW() + 1);
+                newParam.setFieldType(EParameterFieldType.CLOSED_LIST);
+                newParam.setShow(true);
+                newParam.setGroup(xmlParam.getGROUP());
                listParam.add(newParam);
            }
        }
--- a/main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/nodecontainer/NodeContainerFigure.java
+++ b/main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/nodecontainer/NodeContainerFigure.java
@@ -287,7 +287,7 @@ public class NodeContainerFigure extends Figure {
                    text += "\t- " + str + "<br>"; //$NON-NLS-1$ //$NON-NLS-2$
                }
            }
-            htmlStatusHint.setText(text);
+            htmlStatusHint.setText(text, true);
            if (errorFigure.isVisible()) {
                warningFigure.setToolTip(null);
                errorFigure.setToolTip(htmlStatusHint);
--- a/main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/utils/UnifiedComponentUtil.java
+++ b/main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/utils/UnifiedComponentUtil.java
@@ -28,7 +28,6 @@ import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 import org.talend.components.api.properties.ComponentProperties;
 import org.talend.core.GlobalServiceRegister;
-import org.talend.core.database.EDatabaseTypeName;
 import org.talend.core.model.components.IComponent;
 import org.talend.core.model.components.IComponentsHandler;
 import org.talend.core.model.components.IComponentsService;
@@ -138,7 +137,7 @@ public class UnifiedComponentUtil {
            for (IComponent component : componentList) {
                String databaseName = service.getUnifiedCompDisplayName(service.getDelegateComponent(component),
                        component.getName());
-                if (!isDatabaseMatch(dbTypeName, databaseName)) {
+                if (StringUtils.isNotBlank(databaseName) && !databaseName.equals(dbTypeName)) {
                    continue;
                }
                if (isAdditionalJDBC(databaseName)) {
@@ -191,19 +190,6 @@ public class UnifiedComponentUtil {
        return componentList;
    }

-    private static boolean isDatabaseMatch(String dbTypeName, String unifiedCompDisplayName) {
-        if (StringUtils.isBlank(dbTypeName) || StringUtils.isBlank(unifiedCompDisplayName)) {
-            return false;
-        }
-        boolean isMatch = StringUtils.isNotBlank(unifiedCompDisplayName) && unifiedCompDisplayName.equals(dbTypeName);
-        EDatabaseTypeName databaseType = EDatabaseTypeName.getTypeFromDbType(dbTypeName);
-        if (databaseType != null && (databaseType.getDbType().equals(unifiedCompDisplayName)
-                || databaseType.getDisplayName().equals(unifiedCompDisplayName))) {
-            isMatch = true;
-        }
-        return isMatch;
-    }
-
    public static IComponent getEmfComponent(IComponentName setting, IComponent selectedComponent) {
        if (isDelegateComponent(selectedComponent)) {
            IUnifiedComponentService service = GlobalServiceRegister.getDefault().getService(IUnifiedComponentService.class);
--- a/main/plugins/org.talend.designer.unifiedcomponent/src/main/java/org/talend/designer/unifiedcomponent/UnifiedComponentService.java
+++ b/main/plugins/org.talend.designer.unifiedcomponent/src/main/java/org/talend/designer/unifiedcomponent/UnifiedComponentService.java
@@ -22,7 +22,6 @@ import java.util.Map;
 import java.util.Set;

 import org.talend.core.GlobalServiceRegister;
-import org.talend.core.database.EDatabaseTypeName;
 import org.talend.core.model.components.IComponent;
 import org.talend.core.model.components.IComponentsFactory;
 import org.talend.core.model.components.IComponentsService;
@@ -130,14 +129,6 @@ public class UnifiedComponentService implements IUnifiedComponentService {
                    UnifiedObject unifiedObjectByDatabase = selectedDcomp.getUnifiedObjectByDatabase(database);
                    if (unifiedObjectByDatabase != null) {
                        return unifiedObjectByDatabase.getDisplayComponentName();
-                    } else if (EDatabaseTypeName.SYBASEASE.getDisplayName().equals(database)) {
-                        // sybase can be dbType as database
-                        // ref:org.talend.designer.unifiedcomponent.unifier.sybase.SybaseComponentsUnifier
-                        unifiedObjectByDatabase = selectedDcomp
-                                .getUnifiedObjectByDatabase(EDatabaseTypeName.SYBASEASE.getXmlName());
-                        if (unifiedObjectByDatabase != null) {
-                            return unifiedObjectByDatabase.getDisplayComponentName();
-                        }
                    }
                }

--- a/main/plugins/org.talend.sdk.component.studio-integration/src/main/java/org/talend/sdk/component/studio/metadata/tableeditor/TaCoKitPropertiesTableEditorView.java
+++ b/main/plugins/org.talend.sdk.component.studio-integration/src/main/java/org/talend/sdk/component/studio/metadata/tableeditor/TaCoKitPropertiesTableEditorView.java
@@ -14,6 +14,7 @@ package org.talend.sdk.component.studio.metadata.tableeditor;

 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;

 import org.apache.commons.lang3.StringUtils;
@@ -52,13 +53,15 @@ public class TaCoKitPropertiesTableEditorView<B> extends PropertiesTableEditorVi
            CCombo combo = (CCombo) cbc.getControl();
            String val = null;

+            boolean needUpdateListItem = false;
            if (combo.getEditable() && !StringUtils.isBlank(combo.getText())) {
                val = String.valueOf(combo.getText());
+                needUpdateListItem = true;
            }

            int rowNumber = ((Table) combo.getParent()).getSelectionIndex();

-            Map<String, String> svs = new HashMap<String, String>();
+            Map<String, String> svs = new LinkedHashMap<String, String>();

            if (currentParam.getListItemsValue() != null && currentParam.getListItemsValue().length > 0) {
                for (Object o : currentParam.getListItemsValue()) {
@@ -70,7 +73,7 @@ public class TaCoKitPropertiesTableEditorView<B> extends PropertiesTableEditorVi
                svs.put(val, val);
            }

-            if (!svs.isEmpty()) {
+            if (!svs.isEmpty() && needUpdateListItem) {
                TaCoKitUtil.updateElementParameter(currentParam, svs);
            }
Author	SHA1	Message	Date
pyzhou	6c627aa134	fix(TDI-47223):CVE_axis2-kernel compile error	2022-03-15 16:34:08 +08:00
pyzhou	e53a4d7d28	Merge remote-tracking branch 'origin/maintenance/8.0' into pyzhou/TDI-47223_CVE_axis2-kernel # Conflicts: # main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmInput/tMicrosoftCrmInput_java.xml # main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmOutput/tMicrosoftCrmOutput_java.xml	2022-02-21 17:20:42 +08:00
pyzhou	9dd26974a3	compile error	2022-02-21 16:34:36 +08:00
Dmytro Grygorenko	f56ea273f8	fix(TDI-47524): replace non-dynamic column for PosgresqlOutput with dynamic schema. (#7223 )	2022-02-21 10:22:21 +02:00
Jane Ding	e52b6fd10f	Revert "fix(TUP-28898):Drag Exasol connection to a job choose tDBOutput(Exasol) (#7023 )" (#7217 ) This reverts commit `6b82e95328`.	2022-02-18 17:17:40 +08:00
unknown	51432e83c6	Revert "feat(TBD-12990): Dataproc TP" This reverts commit `982a048e43`.	2022-02-17 19:22:16 +01:00
Svitlana Ponomarova	982a048e43	feat(TBD-12990): Dataproc TP	2022-02-17 14:19:53 +02:00
AlixMetivier	b1f26c263b	feat(TBD-12989): add databricks to universal plugins (#7143 ) * feat(TBD-12989): add databricks to universal plugins * feat(TBD-12989): add databricks to universal plugin	2022-02-17 11:32:16 +01:00
kjwang	5e89b28c72	Revert "Fix TUP-32950 On Ubuntu 18.04.5 documentation comment is displayed as a (#7098 )" (#7211 ) This reverts commit `20a1cd9476`.	2022-02-17 17:32:07 +08:00
ypiel	53328080a5	fix(TDI-46848): mscrm oauth2+on-premise + client secret (#7157 ) * fix(TDI-46848): add mscrm oauth2 logs * fix(TDI-46848): Add client secret for oauth2 on-premise * fix(TDI-46848): Fix pom version. * fix(TDI-46848): client_secret not mandatory	2022-02-17 10:23:36 +01:00
kjwang	044548edc1	TUP-34156 UI is broken for TCK Table structures in 8.0.1 + nighty (#7202 ) TUP-34156 UI is broken for TCK Table structures in 8.0.1 + nighty https://jira.talendforge.org/browse/TUP-34156	2022-02-17 11:46:57 +08:00
Dmytro Ochkas	af479b6e6a	fix(TDI-47435): tPostgreSqlOutput 'Debug query mode' and 'Upsert' (#7167 ) * Modified some DB templates so they initialize unresolved variable when dataAction is 'Upsert'	2022-02-16 19:12:34 +02:00
Dmytro Grygorenko	c12301d5a3	fix(TDI-47344): update Apache Ant for tFileUnarchive. (#7208 )	2022-02-16 16:30:02 +02:00
Dmytro Grygorenko	459cb23bae	fix(TDI-47437): check for replaced column for Postgres Upsert action. (#7207 )	2022-02-16 16:24:31 +02:00
Dmytro Ochkas	2896cb57d4	fix(TDI-47436): tPostgreSqlOutput upsert and dynamic column (#7172 ) * ON CONFLICT clause now contains not only dynamic columns but not dynamic ones as well	2022-02-16 16:00:32 +02:00
Dmytro Ochkas	ece6b4cd0d	fix(TDI-47385): tMap error when tenary operator is used (#7188 ) Add parentheses so that user don't add them manually	2022-02-16 15:37:11 +02:00
pyzhou	8d4c303a5e	correct compile error	2022-02-10 12:50:28 +08:00
pyzhou	56e3c4c968	upgrade dependency	2022-01-29 13:20:22 +08:00
pyzhou	d1ad8d7645	Other axis2 jar	2022-01-27 17:19:47 +08:00
pyzhou	a0973838cc	fix(TDI-47223):CVE axis2-kernel 1.8.0	2022-01-27 15:21:16 +08:00