fix(TDQ-20754): revert code to keep project is lowercase (#7742)

"build job" working in 7.2.1 fails in 8.0.1: Failed to generate code :
NPE org.talend.designer.dbmap.language.oracle.OracleGenerationManager.addQuoteForSpecialChar
https://jira.talendforge.org/browse/TUP-35887

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

@@ -11,7 +11,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<cxf.version>3.3.10</cxf.version>
+		<cxf.version>3.4.7</cxf.version>
 	</properties>
 
 	<build>
@@ -77,8 +77,8 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>2.5.1</version>
                     <configuration>
-                        <source>1.7</source>
-                        <target>1.7</target>
+                        <source>1.8</source>
+                        <target>1.8</target>
                         <encoding>UTF-8</encoding>
                     </configuration>
                 </plugin>

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

@@ -2,17 +2,28 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.talend.libraries</groupId>
+	<groupId>org.talend.components</groupId>
 	<artifactId>talend-ws</artifactId>
-	<version>1.0.1-20191112</version>
+	<version>1.0.7-20220526</version>
 	<packaging>jar</packaging>
 
+	<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>
-		<cxf.version>3.3.4</cxf.version>
+
+		<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
+
+		<cxf.version>3.4.7</cxf.version>
 		<odata.version>4.3.0</odata.version>
 		<slf4j.version>1.7.12</slf4j.version>
-		<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
+		<httpclient.version>4.5.13</httpclient.version>
 	</properties>
 
 	<distributionManagement>
@@ -43,13 +54,19 @@
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.10</version>
+			<version>1.14</version>
 		</dependency>
-		<!-- https://mvnrepository.com/artifact/commons-httpclient/commons-httpclient -->
+		<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
 		<dependency>
-			<groupId>commons-httpclient</groupId>
-			<artifactId>commons-httpclient</artifactId>
-			<version>3.1</version>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<version>${httpclient.version}</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore -->
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpcore</artifactId>
+			<version>4.4.13</version>
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.codehaus.woodstox/stax2-api -->
 		<dependency>
@@ -91,6 +108,12 @@
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-core</artifactId>
 			<version>${cxf.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.glassfish.jaxb</groupId>
+					<artifactId>jaxb-runtime</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
@@ -101,6 +124,16 @@
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-tools-common</artifactId>
 			<version>${cxf.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.glassfish.jaxb</groupId>
+					<artifactId>jaxb-xjc</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.glassfish.jaxb</groupId>
+					<artifactId>jaxb-runtime</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
@@ -127,6 +160,16 @@
 			<artifactId>cxf-rt-transports-http</artifactId>
 			<version>${cxf.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>2.2.6</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.libraries</groupId>
+			<artifactId>jaxb-impl-2.2.6-modified</artifactId>
+			<version>6.0.0</version>
+		</dependency>
 		<dependency>
 			<groupId>org.talend.libraries</groupId>
 			<artifactId>jaxb-xjc-2.2.6-modified</artifactId>
@@ -244,6 +287,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.8.1</version>
 				<configuration>
 					<source>1.8</source>
 					<target>1.8</target>
@@ -251,4 +295,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
+</project>

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

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

main/plugins/org.talend.designer.components.libs/libs_src/talend-ws/src/main/java/org/talend/webservice/helper/PathUtil.java

@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2019 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt

main/plugins/org.talend.designer.components.libs/libs_src/talend-ws/src/main/java/org/talend/webservice/helper/ServiceDiscoveryHelper.java

@@ -3,29 +3,22 @@
  */
 package org.talend.webservice.helper;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
+import com.ibm.wsdl.Constants;
+import com.ibm.wsdl.extensions.schema.SchemaConstants;
+import com.ibm.wsdl.util.xml.DOMUtils;
+import com.ibm.wsdl.util.xml.QNameUtils;
+import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.XmlSchemaCollection;
+import org.talend.webservice.helper.conf.ServiceHelperConfiguration;
+import org.talend.webservice.helper.conf.WSDLLocatorImpl;
+import org.w3c.dom.Element;
 
 import javax.wsdl.Definition;
 import javax.wsdl.Import;
 import javax.wsdl.Types;
 import javax.wsdl.WSDLException;
 import javax.wsdl.extensions.ExtensibilityElement;
+import javax.wsdl.extensions.UnknownExtensibilityElement;
 import javax.wsdl.extensions.schema.Schema;
 import javax.wsdl.extensions.schema.SchemaImport;
 import javax.wsdl.extensions.schema.SchemaReference;
@@ -37,16 +30,15 @@ import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
-
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.talend.webservice.helper.conf.ServiceHelperConfiguration;
-import org.talend.webservice.helper.conf.WSDLLocatorImpl;
-import org.w3c.dom.Element;
-
-import com.ibm.wsdl.Constants;
-import com.ibm.wsdl.extensions.schema.SchemaConstants;
-import com.ibm.wsdl.util.xml.DOMUtils;
-import com.ibm.wsdl.util.xml.QNameUtils;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.*;
 
 /**
  * This helper allow easy discovery of services and types
@@ -70,26 +62,36 @@ public class ServiceDiscoveryHelper {
     private Set<String> namespaces;
 
     private final String LOCAL_WSDL_NAME = "mainWSDL.wsdl";
-
+    
+    private boolean createTempFiles = true;
+    
     public ServiceDiscoveryHelper(String wsdlUri) throws WSDLException, IOException, TransformerException, URISyntaxException {
-        this(wsdlUri, null, null);
+        this(wsdlUri, null, null, true);
     }
 
     public ServiceDiscoveryHelper(String wsdlUri, String tempPath) throws WSDLException, IOException, TransformerException,
             URISyntaxException {
-        this(wsdlUri, null, tempPath);
+        this(wsdlUri, null, tempPath, true);
     }
 
     public ServiceDiscoveryHelper(String wsdlUri, ServiceHelperConfiguration configuration) throws WSDLException, IOException,
             TransformerException, URISyntaxException {
-        this(wsdlUri, configuration, null);
+        this(wsdlUri, configuration, null, true);
     }
 
     public ServiceDiscoveryHelper(String wsdlUri, ServiceHelperConfiguration configuration, String tempPath)
             throws WSDLException, IOException, TransformerException, URISyntaxException {
+        this(wsdlUri, configuration, tempPath, true);
+    }
+    
+    public ServiceDiscoveryHelper(String wsdlUri, ServiceHelperConfiguration configuration, String tempPath, boolean createTempFiles)
+            throws WSDLException, IOException, TransformerException, URISyntaxException {
         this.wsdlUri = wsdlUri;
         this.configuration = configuration;
-        this.wsdlTmpDir = createTempWsdlDir(tempPath);
+        this.createTempFiles = createTempFiles;
+        if(createTempFiles) {
+            this.wsdlTmpDir = createTempWsdlDir(tempPath);
+        }
         init();
     }
 
@@ -139,7 +141,9 @@ public class ServiceDiscoveryHelper {
 
         namespaces = collectNamespaces();
 
-        generateTempWsdlFile();
+        if(this.createTempFiles) {
+            generateTempWsdlFile();
+        }
 
     }
 
@@ -436,6 +440,10 @@ public class ServiceDiscoveryHelper {
         return definitions.get(this.LOCAL_WSDL_NAME);
     }
 
+    Collection<Definition> getDefinitions() {
+        return definitions.values();
+    }
+
     /**
      * Return the xml schema collection
      * 
@@ -450,7 +458,11 @@ public class ServiceDiscoveryHelper {
     }
 
     public String getLocalWsdlUri() {
-        return new File(wsdlTmpDir, this.LOCAL_WSDL_NAME).toURI().toString();
+        if(createTempFiles) {
+            return new File(wsdlTmpDir, this.LOCAL_WSDL_NAME).toURI().toString();
+        } else {
+            return this.wsdlUri;
+        }
     }
 
     public Set<String> getNamespaces() {
@@ -464,4 +476,33 @@ public class ServiceDiscoveryHelper {
             return "NOLOCATION";
         }
     }
+
+    public static void main(String[] args) throws Exception {
+        System.setProperty("javax.xml.transform.TransformerFactory", "org.apache.xalan.processor.TransformerFactoryImpl");
+        System.setProperty("org.apache.commons.logging.Log", "org.apache.commons.logging.impl.NoOpLog");
+
+        System.setProperty("javax.xml.accessExternalSchema", "all");
+
+        //shade the log level for DynamicClientFactory.class
+        java.util.logging.Logger LOG = org.apache.cxf.common.logging.LogUtils.getL7dLogger(org.apache.cxf.endpoint.dynamic.DynamicClientFactory.class);
+        LOG.setLevel(java.util.logging.Level.WARNING);
+
+        ServiceDiscoveryHelper helper = new ServiceDiscoveryHelper("http://gcomputer.net/webservices/knowledge.asmx?WSDL", null, null, false);
+        //ServiceDiscoveryHelper helper = new ServiceDiscoveryHelper("/Users/wangwei/Downloads/knowledge.wsdl", null, null, false);
+        /*
+        WSDLMetadataUtils utils = new WSDLMetadataUtils();
+        //WSDLMetadataUtils.OperationInfo info = utils.parseOperationInfo(helper, "KnowledgeLeakSoap12", "Knowledge");
+        WSDLMetadataUtils.OperationInfo info = utils.parseOperationInfo(helper, null, "Knowledge");
+        System.out.println(info.operationName);
+        System.out.println(info.port);
+        System.out.println(info.service);
+        System.out.println(info.inputParameters);
+        System.out.println(info.outputParameter);
+        System.out.println("done");
+        */
+
+        org.talend.webservice.helper.ServiceInvokerHelper serviceInvokerHelper = new org.talend.webservice.helper.ServiceInvokerHelper(helper, null);
+        Map<String, Object> result = serviceInvokerHelper.invokeDynamic("Knowledge", Arrays.asList(1));
+        System.out.println(result);
+    }
 }

main/plugins/org.talend.designer.components.libs/libs_src/talend-ws/src/main/java/org/talend/webservice/helper/ServiceInvokerHelper.java

@@ -3,30 +3,6 @@
  */
 package org.talend.webservice.helper;
 
-import java.beans.PropertyDescriptor;
-import java.io.File;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.WSDLException;
-import javax.xml.bind.annotation.XmlSchema;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-import javax.xml.transform.TransformerException;
-
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.cxf.endpoint.Client;
@@ -39,11 +15,18 @@ import org.talend.webservice.helper.conf.ServiceHelperConfiguration;
 import org.talend.webservice.helper.map.MapConverter;
 import org.talend.webservice.jaxb.JAXBUtils;
 import org.talend.webservice.jaxb.JAXBUtils.IdentifierType;
-import org.talend.webservice.mapper.AnyPropertyMapper;
-import org.talend.webservice.mapper.ClassMapper;
-import org.talend.webservice.mapper.EmptyMessageMapper;
-import org.talend.webservice.mapper.MapperFactory;
-import org.talend.webservice.mapper.MessageMapper;
+import org.talend.webservice.mapper.*;
+
+import javax.wsdl.*;
+import javax.xml.bind.annotation.XmlSchema;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.namespace.QName;
+import javax.xml.transform.TransformerException;
+import java.beans.PropertyDescriptor;
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.*;
 
 /**
  * 
@@ -261,6 +244,61 @@ public class ServiceInvokerHelper implements ClassMapper {
         return MapConverter.deepMapToMap(result);
     }
 
+    //auto decide the service, port, and operation name and params are necessary
+    public Map<String, Object> invokeDynamic(String operationNameAndPortName, List<Object> param_values)
+            throws Exception, LocalizedException {
+        String portName = null;
+        String operationName = operationNameAndPortName;
+        try {
+            portName = operationName.substring(operationName.indexOf("(") + 1, operationName.indexOf(")"));
+            operationName = operationName.substring(0, operationName.indexOf("("));
+        } catch (Exception ignored) {
+        }
+
+        WSDLMetadataUtils utils = new WSDLMetadataUtils();
+        WSDLMetadataUtils.OperationInfo info = utils.parseOperationInfo(this.serviceDiscoveryHelper, portName, operationName);
+
+        Map<String, Object> paramsMap = null;
+        if(param_values!=null && !param_values.isEmpty()) {
+            List<String> paths = new ArrayList<>();
+            flat(paths, info.inputParameters, null);
+
+            int size = Math.min(paths.size(), param_values.size());
+
+            paramsMap = new HashMap<>();
+
+            for(int i=0;i<size;i++) {
+                paramsMap.put(paths.get(i), param_values.get(i));
+            }
+
+            if (!paramsMap.isEmpty()) {
+                paramsMap = MapConverter.mapToDeepMap(paramsMap);
+            }
+
+            if (paramsMap.isEmpty()) {
+                paramsMap = null;
+            }
+        }
+        Map<String, Object> result = invoke(info.service, info.port, info.operationName, paramsMap);
+
+        if(result==null || result.isEmpty()) return null;
+
+        return MapConverter.deepMapToMap(result, true);
+    }
+
+    private void flat(List<String> paths, List<WSDLMetadataUtils.ParameterInfo> inputParameters, String path) {
+        if(inputParameters==null || inputParameters.isEmpty()) {
+            if(path!=null) {
+                paths.add(path);
+            }
+            return;
+        }
+
+        for(WSDLMetadataUtils.ParameterInfo info : inputParameters) {
+            flat(paths, info.childParameters, path!=null? path + "." + info.name : info.name);
+        }
+    }
+
     protected String getClassNameForType(QName xmlSchemaTypeMapperQname) {
         StringBuilder sb = new StringBuilder();
         sb.append(getPackageForNamespaceURI(xmlSchemaTypeMapperQname.getNamespaceURI()));

main/plugins/org.talend.designer.components.libs/libs_src/talend-ws/src/main/java/org/talend/webservice/helper/WSDLMetadataUtils.java

@@ -0,0 +1,640 @@
+package org.talend.webservice.helper;
+
+import org.apache.ws.commons.schema.*;
+import org.w3c.dom.Element;
+
+import javax.wsdl.*;
+import javax.wsdl.extensions.ExtensibilityElement;
+import javax.wsdl.extensions.UnknownExtensibilityElement;
+import javax.wsdl.extensions.soap.SOAPBinding;
+import javax.wsdl.extensions.soap.SOAPBody;
+import javax.wsdl.extensions.soap.SOAPOperation;
+import javax.wsdl.extensions.soap12.SOAP12Binding;
+import javax.wsdl.extensions.soap12.SOAP12Body;
+import javax.wsdl.extensions.soap12.SOAP12Operation;
+import javax.wsdl.factory.WSDLFactory;
+import javax.xml.namespace.QName;
+import java.io.File;
+import java.net.URL;
+import java.util.*;
+
+public class WSDLMetadataUtils {
+
+    WSDLFactory wsdlFactory = null;
+
+    private Vector<XmlSchema> wsdlTypes = new Vector<XmlSchema>();
+
+    private List<String> parametersName = new ArrayList<String>();
+
+    private List<String> schemaNames = new ArrayList<String>();
+
+    private List<String> documentBaseList = new ArrayList<String>();
+
+    private List<XmlSchemaElement> allXmlSchemaElement = new ArrayList<XmlSchemaElement>();
+
+    private List<XmlSchemaType> allXmlSchemaType = new ArrayList<XmlSchemaType>();
+
+    public final static String DEFAULT_SOAP_ENCODING_STYLE = "http://schemas.xmlsoap.org/soap/encoding/";
+
+    public WSDLMetadataUtils() throws WSDLException {
+        wsdlFactory = WSDLFactory.newInstance();
+    }
+
+    public static class OperationInfo {
+        QName port;
+        QName service;
+
+        String operationName;
+
+        List<ParameterInfo> inputParameters = new ArrayList<ParameterInfo>();
+        List<ParameterInfo> outputParameter = new ArrayList<ParameterInfo>();
+    }
+
+    public class ParameterInfo {
+        String name;
+
+        /* list of parameters, only filled if complex type */
+        List<ParameterInfo> childParameters = new ArrayList<ParameterInfo>();
+    }
+
+    //not thread safe
+    private List<OperationInfo> operations;
+
+    private String targetOperationName;
+    private String currentPort;
+    private QName currentService;
+
+    public OperationInfo parseOperationInfo(ServiceDiscoveryHelper sdh, String port, String operationName) throws Exception {
+        this.targetOperationName = operationName;
+
+        Collection<Definition> defs = sdh.getDefinitions();
+
+        wsdlTypes = createSchemaFromTypes(defs);
+
+        collectAllXmlSchemaElement();
+
+        collectAllXmlSchemaType();
+
+        //only fetch services from main wsdl/definition, others for elements and type definition
+        Map services = defs.iterator().next().getServices();
+        if (services != null) {
+            Iterator iter = services.values().iterator();
+            while (iter.hasNext()) {
+                List<OperationInfo> operations = getOperations((Service) iter.next());
+                for(OperationInfo info : operations) {
+                    if(port==null) {
+                        return info;
+                    }
+                    if(port.equals(info.port.getLocalPart())) {
+                        return info;
+                    }
+                }
+            }
+        }
+
+        throw new RuntimeException("can't find the operation : " + operationName + " with port : " + port);
+    }
+
+    private void collectAllXmlSchemaElement() {
+        for (int i = 0; i < wsdlTypes.size(); i++) {
+            XmlSchema xmlSchema = (wsdlTypes.elementAt(i));
+            if (xmlSchema == null) {
+                continue;
+            }
+            Map<QName, XmlSchemaElement> elements = xmlSchema.getElements();
+            Iterator elementsItr = elements.values().iterator();
+            while (elementsItr.hasNext()) {
+                XmlSchemaElement xmlSchemaElement = (XmlSchemaElement) elementsItr.next();
+
+                allXmlSchemaElement.add(xmlSchemaElement);
+            }
+        }
+    }
+
+    private void collectAllXmlSchemaType() {
+        for (int i = 0; i < wsdlTypes.size(); i++) {
+            XmlSchema xmlSchema = (wsdlTypes.elementAt(i));
+            if (xmlSchema == null) {
+                continue;
+            }
+            Map<QName, XmlSchemaType> xmlSchemaObjectTable = xmlSchema.getSchemaTypes();
+            Iterator typesItr = xmlSchemaObjectTable.values().iterator();
+            while (typesItr.hasNext()) {
+                XmlSchemaType xmlSchemaType = (XmlSchemaType) typesItr.next();
+                allXmlSchemaType.add(xmlSchemaType);
+            }
+        }
+
+    }
+
+    protected Vector<XmlSchema> createSchemaFromTypes(Collection<Definition> wsdlDefinitions) throws WSDLException {
+        Vector<XmlSchema> schemas = new Vector<XmlSchema>();
+        Set<String> imports = new HashSet<String>();
+        Element schemaElementt = null;
+        Map importElement = null;
+        List includeElement = null;
+        for (Definition def : wsdlDefinitions) {
+            if (def.getTypes() != null) {
+                List schemaExtElem = findExtensibilityElement(def.getTypes().getExtensibilityElements(), "schema");
+                for (int i = 0; i < schemaExtElem.size(); i++) {
+                    ExtensibilityElement schemaElement = (ExtensibilityElement) schemaExtElem.get(i);
+                    if (schemaElement != null && schemaElement instanceof UnknownExtensibilityElement) {
+                        schemaElementt = ((UnknownExtensibilityElement) schemaElement).getElement();
+
+                        String documentBase = ((javax.wsdl.extensions.schema.Schema) schemaElement).getDocumentBaseURI();
+                        XmlSchema schema = createschemafromtype(schemaElementt, def, documentBase);
+                        if (schema != null) {
+                            schemas.add(schema);
+                            if (schema.getTargetNamespace() != null) {
+                                schemaNames.add(schema.getTargetNamespace());
+                            }
+                        }
+                        importElement = ((javax.wsdl.extensions.schema.Schema) schemaElement).getImports();
+                        if (importElement != null && importElement.size() > 0) {
+                            findImportSchema(def, schemas, importElement, imports);
+                        }
+                    }
+
+                    if (schemaElement != null && schemaElement instanceof javax.wsdl.extensions.schema.Schema) {
+                        schemaElementt = ((javax.wsdl.extensions.schema.Schema) schemaElement).getElement();
+                        String documentBase = ((javax.wsdl.extensions.schema.Schema) schemaElement).getDocumentBaseURI();
+                        Boolean isHaveImport = false;
+                        importElement = ((javax.wsdl.extensions.schema.Schema) schemaElement).getImports();
+                        if (importElement != null && importElement.size() > 0) {
+                            Iterator keyIterator = importElement.keySet().iterator();
+                            if (importElement.size() > 0) {
+                                isHaveImport = true;
+                            }
+                        }
+
+                        XmlSchema schema = createschemafromtype(schemaElementt, def, documentBase);
+                        if (schema != null) {
+                            schemas.add(schema);
+                            if (schema.getTargetNamespace() != null) {
+                                schemaNames.add(schema.getTargetNamespace());
+                            }
+                        }
+
+                        if (isHaveImport) {
+                            findImportSchema(def, schemas, importElement, imports);
+                        }
+                    }
+                }
+
+            }
+        }
+        return schemas;
+    }
+
+    private void findIncludesSchema(Definition wsdlDefinition, Vector schemas, List includeElement) throws WSDLException {
+        Element schemaElementt;
+        for (int i = 0; i < includeElement.size(); i++) {
+
+            schemaElementt = ((com.ibm.wsdl.extensions.schema.SchemaReferenceImpl) includeElement.get(i)).getReferencedSchema()
+                    .getElement();
+            String documentBase = ((com.ibm.wsdl.extensions.schema.SchemaReferenceImpl) includeElement.get(i))
+                    .getReferencedSchema().getDocumentBaseURI();
+            XmlSchema schemaInclude = createschemafromtype(schemaElementt, wsdlDefinition, documentBase);
+            if (schemaInclude != null) {
+                schemas.add(schemaInclude);
+                if (schemaInclude.getTargetNamespace() != null) {
+                    schemaNames.add(schemaInclude.getTargetNamespace());
+                }
+            }
+        }
+    }
+
+    private void findImportSchema(Definition wsdlDefinition, Vector schemas, Map importElement, Set<String> imports)
+            throws WSDLException {
+        Element schemaElementt;
+        List includeElement = null;
+        Iterator keyIterator = importElement.keySet().iterator();
+        Boolean isHaveImport = false;
+        while (keyIterator.hasNext()) {
+            Object object = keyIterator.next();
+            if (object != null) {
+                String key = object.toString();
+                Vector importEle = (Vector) importElement.get(key);
+
+                for (int i = 0; i < importEle.size(); i++) {
+                    Map importChildElement = null;
+                    com.ibm.wsdl.extensions.schema.SchemaImportImpl importImpl = (com.ibm.wsdl.extensions.schema.SchemaImportImpl) importEle
+                            .elementAt(i);
+                    // to avoid import cycle
+                    String importLocation = importImpl.getSchemaLocationURI() + ":" + importImpl.getNamespaceURI();
+                    if (imports.contains(importLocation)) {
+                        continue;
+                    } else {
+                        imports.add(importLocation);
+                    }
+                    if (importImpl.getReferencedSchema() != null) {
+
+                        schemaElementt = importImpl.getReferencedSchema().getElement();
+                        String documentBase = importImpl.getReferencedSchema().getDocumentBaseURI();
+
+                        if ((com.ibm.wsdl.extensions.schema.SchemaImportImpl) importEle.elementAt(i) != null) {
+                            if (((com.ibm.wsdl.extensions.schema.SchemaImportImpl) importEle.elementAt(i)).getReferencedSchema() != null) {
+                                importChildElement = ((com.ibm.wsdl.extensions.schema.SchemaImportImpl) importEle.elementAt(i))
+                                        .getReferencedSchema().getImports();
+                                if (importChildElement != null && importChildElement.size() > 0 && !isIncludeSchema(documentBase)) {
+                                    isHaveImport = true;
+                                    documentBaseList.add(documentBase);
+                                    // validateImportUrlPath(importElement);
+                                }
+                            }
+                        }
+
+                        XmlSchema schemaImport = createschemafromtype(schemaElementt, wsdlDefinition, documentBase);
+                        if (schemaImport != null) {
+                            schemas.add(schemaImport);
+                            if (schemaImport.getTargetNamespace() != null) {
+                                schemaNames.add(schemaImport.getTargetNamespace());
+                            }
+                        }
+                    }
+
+                    if (isHaveImport) {
+                        findImportSchema(wsdlDefinition, schemas, importChildElement, imports);
+                    }
+
+                    if ((com.ibm.wsdl.extensions.schema.SchemaImportImpl) importEle.elementAt(i) != null) {
+                        if (((com.ibm.wsdl.extensions.schema.SchemaImportImpl) importEle.elementAt(i)).getReferencedSchema() != null) {
+                            includeElement = ((com.ibm.wsdl.extensions.schema.SchemaImportImpl) importEle.elementAt(i))
+                                    .getReferencedSchema().getIncludes();
+                            if (includeElement != null && includeElement.size() > 0) {
+
+                                findIncludesSchema(wsdlDefinition, schemas, includeElement);
+                            }
+                        }
+                    }
+
+                }
+            }
+        }
+    }
+
+    private List findExtensibilityElement(List extensibilityElements, String elementType) {
+        List elements = new ArrayList();
+        if (extensibilityElements != null) {
+            Iterator iter = extensibilityElements.iterator();
+            while (iter.hasNext()) {
+                ExtensibilityElement element = (ExtensibilityElement) iter.next();
+                if (element.getElementType().getLocalPart().equalsIgnoreCase(elementType)) {
+                    elements.add(element);
+                }
+            }
+        }
+        return elements;
+    }
+
+    private XmlSchema createschemafromtype(Element schemaElement, Definition wsdlDefinition, String documentBase)
+            throws WSDLException {
+        if (schemaElement == null) {
+            throw new WSDLException(WSDLException.INVALID_WSDL, "Unable to find schema extensibility element in WSDL");
+        }
+
+        XmlSchema xmlSchema = null;
+        XmlSchemaCollection xmlSchemaCollection = new XmlSchemaCollection();
+        xmlSchemaCollection.setBaseUri(fixDocumentBase(documentBase));
+
+        xmlSchema = xmlSchemaCollection.read(schemaElement);
+
+        return xmlSchema;
+    }
+
+    private String fixDocumentBase(String documentBase) {
+        String fixedPath = documentBase;
+        try {
+            URL url = new URL(documentBase);
+            File file = new File(url.getFile());
+            fixedPath = file.toURI().toString();
+        } catch (Exception e) {
+            fixedPath = documentBase;
+        }
+        return fixedPath;
+    }
+
+    private Boolean isIncludeSchema(String documentBase) {
+        Boolean isHaveSchema = false;
+        for (int i = 0; i < documentBaseList.size(); i++) {
+            String documentBaseTem = documentBaseList.get(i);
+            if (documentBaseTem.equals(documentBase)) {
+                isHaveSchema = true;
+            }
+        }
+        return isHaveSchema;
+    }
+
+    private List<OperationInfo> getOperations(Service service) {
+        currentService = service.getQName();
+        List<OperationInfo> result = new ArrayList<>();
+
+        Map ports = service.getPorts();
+        Iterator portIter = ports.values().iterator();
+        while (portIter.hasNext()) {
+            Port port = (Port) portIter.next();
+            Binding binding = port.getBinding();
+
+            currentPort = port.getName();
+
+            result.addAll(buildOperations(binding));
+        }
+
+        return result;
+    }
+
+    private List<OperationInfo> buildOperations(Binding binding) {
+        List<OperationInfo> result = new ArrayList<>();
+
+        List operations = binding.getBindingOperations();
+
+        if (operations != null && !operations.isEmpty()) {
+            List soapBindingElems = findExtensibilityElement(binding.getExtensibilityElements(), "binding");
+            String style = "document"; // default
+
+            ExtensibilityElement soapBindingElem = (ExtensibilityElement) soapBindingElems.get(0);
+            if (soapBindingElem != null && soapBindingElem instanceof SOAPBinding) {
+                SOAPBinding soapBinding = (SOAPBinding) soapBindingElem;
+                style = soapBinding.getStyle();
+            } else if (soapBindingElem != null && soapBindingElem instanceof SOAP12Binding) {
+                SOAP12Binding soapBinding = (SOAP12Binding) soapBindingElem;
+                style = soapBinding.getStyle();
+            }
+
+            Iterator opIter = operations.iterator();
+
+            while (opIter.hasNext()) {
+                BindingOperation oper = (BindingOperation) opIter.next();
+                List operElems = findExtensibilityElement(oper.getExtensibilityElements(), "operation");
+                ExtensibilityElement operElem = (ExtensibilityElement) operElems.get(0);
+
+                if(!targetOperationName.equals(oper.getName())) {
+                    continue;
+                }
+
+                OperationInfo operationInfo = new OperationInfo();
+                operationInfo.service = currentService;
+                operationInfo.port = new QName(currentService.getNamespaceURI(), currentPort);
+                operationInfo.operationName = oper.getName();
+
+                //TODO do different?
+                if (operElem != null && operElem instanceof SOAPOperation) {
+                    buildOperation(operationInfo, oper);
+                } else if (operElem != null && operElem instanceof SOAP12Operation) {
+                    buildOperation(operationInfo, oper);
+                }
+
+                result.add(operationInfo);
+            }
+        }
+
+        return result;
+    }
+
+    private void buildOperation(OperationInfo operationInfo, BindingOperation bindingOper) {
+        Operation oper = bindingOper.getOperation();
+
+        List operElems = findExtensibilityElement(bindingOper.getExtensibilityElements(), "operation");
+        ExtensibilityElement operElem = (ExtensibilityElement) operElems.get(0);
+        if (operElem != null && operElem instanceof SOAPOperation) {//TODO do different?
+            SOAPOperation soapOperation = (SOAPOperation) operElem;
+        } else if (operElem != null && operElem instanceof SOAP12Operation) {
+            SOAP12Operation soapOperation = (SOAP12Operation) operElem;
+        }
+        BindingInput bindingInput = bindingOper.getBindingInput();
+        BindingOutput bindingOutput = bindingOper.getBindingOutput();
+        List bodyElems = findExtensibilityElement(bindingInput.getExtensibilityElements(), "body");
+        ExtensibilityElement bodyElem = (ExtensibilityElement) bodyElems.get(0);
+
+        if (bodyElem != null && bodyElem instanceof SOAPBody) {
+            SOAPBody soapBody = (SOAPBody) bodyElem;
+            List styles = soapBody.getEncodingStyles();
+            String encodingStyle = null;
+            if (styles != null) {
+                encodingStyle = styles.get(0).toString();
+            }
+            if (encodingStyle == null) {
+                encodingStyle = DEFAULT_SOAP_ENCODING_STYLE;
+            }
+            //TODO get namespace uri here?
+            //soapBody.getNamespaceURI();
+        } else if (bodyElem != null && bodyElem instanceof SOAP12Body) {
+            SOAP12Body soapBody = (SOAP12Body) bodyElem;
+            String encodingStyle = null;
+            if (soapBody.getEncodingStyle() != null) {
+                encodingStyle = soapBody.getEncodingStyle().toString();
+            }
+            if (encodingStyle == null) {
+                encodingStyle = DEFAULT_SOAP_ENCODING_STYLE;
+            }
+            //TODO get namespace uri here?
+            //soapBody.getNamespaceURI();
+        }
+
+        Input inDef = oper.getInput();
+        if (inDef != null) {
+            Message inMsg = inDef.getMessage();
+            if (inMsg != null) {
+                getParameterFromMessage(operationInfo, inMsg, 1);
+            }
+        }
+
+        //don't need output parameter struct now
+        /*
+        Output outDef = oper.getOutput();
+        if (outDef != null) {
+            Message outMsg = outDef.getMessage();
+            if (outMsg != null) {
+                getParameterFromMessage(operationInfo, outMsg, 2);
+            }
+        }
+        */
+    }
+
+    private void getParameterFromMessage(OperationInfo operationInfo, Message msg, int manner) {
+        List msgParts = msg.getOrderedParts(null);
+        Iterator iter = msgParts.iterator();
+        while (iter.hasNext()) {
+            Part part = (Part) iter.next();
+            String partName = part.getName();
+            String partElement = null;
+            String namespace = null;
+            if (part.getElementName() != null) {
+                partElement = part.getElementName().getLocalPart();
+                namespace = part.getElementName().getNamespaceURI();
+            } else if (part.getTypeName() != null) {
+                partElement = part.getTypeName().getLocalPart();
+                namespace = part.getTypeName().getNamespaceURI();
+            }
+            // add root parameter from message.
+            ParameterInfo parameterRoot = new ParameterInfo();
+            parameterRoot.name = partName;
+            if (manner == 1) {
+                operationInfo.inputParameters.add(parameterRoot);
+            } else {
+                operationInfo.outputParameter.add(parameterRoot);
+            }
+            if (allXmlSchemaElement.size() > 0) {
+                buildParameterFromElements(partElement, parameterRoot, manner);
+            } else if (allXmlSchemaType.size() > 0) {
+                buileParameterFromTypes(namespace, partElement, parameterRoot, manner);
+            }
+        }
+    }
+
+    private void buildParameterFromElements(String partElement, ParameterInfo parameterRoot, int ioOrRecursion) {
+        if (ioOrRecursion < 3) {
+            parametersName.clear();
+            parametersName.add(parameterRoot.name);
+        } else if (ioOrRecursion == 3) {
+            parametersName.add(parameterRoot.name);
+        }
+        Iterator elementsItr = allXmlSchemaElement.iterator();
+        if (partElement != null) {
+            while (elementsItr.hasNext()) {
+                XmlSchemaElement xmlSchemaElement = (XmlSchemaElement) elementsItr.next();
+                if (partElement.equals(xmlSchemaElement.getName())) {
+                    if (xmlSchemaElement.getSchemaType() != null) {
+                        if (xmlSchemaElement.getSchemaType() instanceof XmlSchemaComplexType) {
+                            XmlSchemaComplexType xmlElementComplexType = (XmlSchemaComplexType) xmlSchemaElement.getSchemaType();
+                            XmlSchemaParticle xmlSchemaParticle = xmlElementComplexType.getParticle();
+                            if (xmlSchemaParticle instanceof XmlSchemaGroupParticle) {
+                                XmlSchemaGroupParticle xmlSchemaGroupBase = (XmlSchemaGroupParticle) xmlSchemaParticle;
+                                if (xmlSchemaGroupBase != null) {
+                                    buildParameterFromCollection(xmlSchemaGroupBase, parameterRoot, ioOrRecursion);
+                                }
+                            } else if (xmlSchemaElement.getSchemaTypeName() != null) {
+                                String paraTypeName = xmlSchemaElement.getSchemaTypeName().getLocalPart();
+                                String paraTypeNamespace = xmlSchemaElement.getSchemaTypeName().getNamespaceURI();
+                                if (paraTypeName != null) {
+                                    buileParameterFromTypes(paraTypeNamespace, paraTypeName, parameterRoot, ioOrRecursion);
+                                }
+                            }
+                        } else if (xmlSchemaElement.getSchemaType() instanceof XmlSchemaSimpleType) {
+                            XmlSchemaSimpleType xmlSchemaSimpleType = (XmlSchemaSimpleType) xmlSchemaElement.getSchemaType();
+                            String typeName = xmlSchemaSimpleType.getName();
+                            if (typeName != null && typeName.equals("anyType")) {
+                                ParameterInfo parameterSon = new ParameterInfo();
+                                parameterSon.name = "anyType";
+                                parameterRoot.childParameters.add(parameterSon);
+                            }
+                        }
+                    } else if (xmlSchemaElement.getSchemaTypeName() != null) {
+                        String paraTypeName = xmlSchemaElement.getSchemaTypeName().getLocalPart();
+                        String paraTypeNamespace = xmlSchemaElement.getSchemaTypeName().getNamespaceURI();
+                        if (paraTypeName != null) {
+                            buileParameterFromTypes(paraTypeNamespace, paraTypeName, parameterRoot, ioOrRecursion);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private void buileParameterFromTypes(String paraNamespace, String paraType, ParameterInfo parameter, int ioOrRecursion) {
+        if (ioOrRecursion < 3) {
+            parametersName.clear();
+            parametersName.add(parameter.name);
+        } else if (ioOrRecursion == 3) {
+            parametersName.add(parameter.name);
+        }
+
+        //twebserviceinput need auto metadata fetch for input parameters, but it only support very easy, not support custom defined type usage like this:
+        //<element type="tns="s:anyCustomDefinedSimpleOrComplexType"">
+        //so nothing to do here, TODO make sure it
+    }
+
+    private void buildParameterFromCollection(XmlSchemaGroupParticle xmlSchemaGroupParticle, ParameterInfo parameter,
+            int ioOrRecursion) {
+        if (!(xmlSchemaGroupParticle instanceof XmlSchemaSequence)) {
+            throw new RuntimeException("don't support that complex parameter type, only support xsd:sequence");
+        }
+
+        XmlSchemaSequence xmlSchemaSequence = (XmlSchemaSequence) xmlSchemaGroupParticle;
+        List<XmlSchemaSequenceMember> sequences = xmlSchemaSequence.getItems();
+
+        for (XmlSchemaSequenceMember sequence : sequences) {
+            if (sequence instanceof XmlSchemaAny) {//TODO remove it as not support too
+                ParameterInfo parameterSon = new ParameterInfo();
+                parameterSon.name = "_content_";
+                parameter.childParameters.add(parameterSon);
+            } else if (sequence instanceof XmlSchemaElement) {//this is the major part we support
+                XmlSchemaElement xmlSchemaElement = (XmlSchemaElement) sequence;
+                String elementName = xmlSchemaElement.getName();
+                ParameterInfo parameterSon = new ParameterInfo();
+                parameterSon.name= elementName;
+
+                parameter.childParameters.add(parameterSon);
+
+                Boolean isHave = false;
+                if (!parametersName.isEmpty() && parameterSon.name != null) {
+                    for (int p = 0; p < parametersName.size(); p++) {
+                        if (parameterSon.name.equals(parametersName.get(p))) {
+                            isHave = true;
+                        }
+                    }
+                }
+
+                if (xmlSchemaElement.getSchemaTypeName() != null) {
+                    String elementTypeName = xmlSchemaElement.getSchemaTypeName().getLocalPart();
+                    String elementTypeNamespace = xmlSchemaElement.getSchemaTypeName().getNamespaceURI();
+                    if (elementTypeName != null && elementTypeName.equals("anyType")) {//TODO remove it
+                        parameterSon.name = xmlSchemaElement.getName() + ":anyType";
+                    }
+                    if (!isHave && !WsdlTypeUtil.isJavaBasicType(elementTypeName)) {
+                        buileParameterFromTypes(elementTypeNamespace, elementTypeName, parameterSon, ioOrRecursion);
+                    }
+                } else if (xmlSchemaElement.getSchemaType() != null) {
+                    if (xmlSchemaElement.getSchemaType() instanceof XmlSchemaComplexType) {
+                        throw new RuntimeException("don't support nested or ref complex type in xsd:sequence");
+                    } else if (xmlSchemaElement.getSchemaType() instanceof XmlSchemaSimpleType) {
+                        XmlSchemaSimpleType xmlSchemaSimpleType = (XmlSchemaSimpleType) xmlSchemaElement.getSchemaType();
+                        String typeName = xmlSchemaSimpleType.getName();
+                        if (typeName != null && typeName.equals("anyType")) {
+                            ParameterInfo pSon = new ParameterInfo();
+                            pSon.name = "anyType";
+                            parameter.childParameters.add(pSon);
+                        }
+                    }
+                } else if (xmlSchemaElement.getRef() != null) {//TODO twebserviceinput support it before?
+                    String elementTypeName = xmlSchemaElement.getRef().getTargetQName().getLocalPart();
+                    if (!isHave && !WsdlTypeUtil.isJavaBasicType(elementTypeName)) {
+                        buildParameterFromElements(elementTypeName, parameterSon, ioOrRecursion);
+                    }
+                }
+            } else if (sequence instanceof XmlSchemaAttribute) {
+                XmlSchemaAttribute xmlSchemaAttribute = (XmlSchemaAttribute) sequence;
+                String elementName = xmlSchemaAttribute.getName();
+                ParameterInfo parameterSon = new ParameterInfo();
+                parameterSon.name = elementName;
+
+                parameter.childParameters.add(parameterSon);
+                Boolean isHave = false;
+                if (!parametersName.isEmpty() && parameterSon.name != null) {
+                    for (int p = 0; p < parametersName.size(); p++) {
+                        if (parameterSon.name.equals(parametersName.get(p))) {
+                            isHave = true;
+                        }
+                    }
+
+                }
+                if (xmlSchemaAttribute.getSchemaTypeName() != null) {
+                    String elementTypeName = xmlSchemaAttribute.getSchemaTypeName().getLocalPart();
+                    String elementTypeNamespace = xmlSchemaAttribute.getSchemaTypeName().getNamespaceURI();
+                    if (!isHave && !WsdlTypeUtil.isJavaBasicType(elementTypeName)) {
+                        buileParameterFromTypes(elementTypeNamespace, elementTypeName, parameterSon, ioOrRecursion);
+                    }
+                } else if (xmlSchemaAttribute.getRef() != null) {//TODO twebserviceinput support it before?
+                    String refName = xmlSchemaAttribute.getRef().getTargetQName().getLocalPart();
+                    if (!isHave) {
+                        buildParameterFromElements(refName, parameterSon, ioOrRecursion);
+                    }
+                }
+            } else {
+                throw new RuntimeException("don't support the nest type in xsd:sequence");
+            }
+        }
+
+    }
+
+}

main/plugins/org.talend.designer.components.libs/libs_src/talend-ws/src/main/java/org/talend/webservice/helper/WsdlTypeUtil.java

@@ -0,0 +1,39 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.webservice.helper;
+
+public class WsdlTypeUtil {
+
+    public static Boolean isJavaBasicType(String typeName) {
+        Boolean isJavaBasicType = false;
+        if (typeName == null) {
+            return false;
+        }
+        if ("String".equalsIgnoreCase(typeName)) {
+            isJavaBasicType = true;
+        } else if ("int".equalsIgnoreCase(typeName)) {
+            isJavaBasicType = true;
+        } else if ("long".equalsIgnoreCase(typeName)) {
+            isJavaBasicType = true;
+        } else if ("double".equalsIgnoreCase(typeName)) {
+            isJavaBasicType = true;
+        } else if ("float".equalsIgnoreCase(typeName)) {
+            isJavaBasicType = true;
+        } else if ("char".equalsIgnoreCase(typeName)) {
+            isJavaBasicType = true;
+        }
+
+        return isJavaBasicType;
+
+    }
+}

main/plugins/org.talend.designer.components.libs/libs_src/talend-ws/src/main/java/org/talend/webservice/helper/conf/WSDLLocatorImpl.java

@@ -15,12 +15,17 @@ import java.util.logging.Logger;
 
 import javax.wsdl.xml.WSDLLocator;
 
-import org.apache.commons.httpclient.Credentials;
-import org.apache.commons.httpclient.HostConfiguration;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.UsernamePasswordCredentials;
-import org.apache.commons.httpclient.auth.AuthScope;
-import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.http.HttpHost;
+import org.apache.http.HttpResponse;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpRequestBase;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;
 import org.xml.sax.InputSource;
 
 /**
@@ -49,10 +54,10 @@ public class WSDLLocatorImpl implements WSDLLocator {
     }
 
     public InputSource getBaseInputSource() {
-        GetMethod get = createGetMethod(wsdlUri);
+        HttpRequestBase get = createGetMethod(wsdlUri);
         try {
-            httpClient.executeMethod(get);
-            InputStream is = get.getResponseBodyAsStream();
+            HttpResponse response = httpClient.execute(get);
+            InputStream is = response.getEntity().getContent();
             inputStreams.add(is);
             return new InputSource(is);
         } catch (IOException ex) {
@@ -64,9 +69,9 @@ public class WSDLLocatorImpl implements WSDLLocator {
         try {
             URL url = getURL(parentLocation, importLocation);
             latestImportUri = url.toExternalForm();
-            GetMethod get = createGetMethod(latestImportUri);
-            httpClient.executeMethod(get);
-            InputStream is = get.getResponseBodyAsStream();
+            HttpRequestBase get = createGetMethod(latestImportUri);
+            HttpResponse response = httpClient.execute(get);
+            InputStream is = response.getEntity().getContent();
             inputStreams.add(is);
             return new InputSource(is);
         } catch (MalformedURLException ex) {
@@ -110,36 +115,44 @@ public class WSDLLocatorImpl implements WSDLLocator {
         inputStreams.clear();
     }
 
-    private GetMethod createGetMethod(String uri) {
-        GetMethod get = new GetMethod(uri);
+    private HttpRequestBase createGetMethod(String uri) {
+        HttpGet get = new HttpGet(uri);
         if (configuration.getCookie() != null) {
-            get.setRequestHeader(HTTP_HEADER_COOKIE, configuration.getCookie());
+            get.setHeader(HTTP_HEADER_COOKIE, configuration.getCookie());
         }
 
         return get;
     }
 
     private HttpClient createHttpClient() {
-        HttpClient httpClient = new HttpClient();
+        HttpClientBuilder builder = HttpClients.custom();
+        CredentialsProvider credentialsProvider = null;
         if (configuration.getProxyServer() != null) {
-            HostConfiguration hostConfiguration = new HostConfiguration();
-            hostConfiguration.setProxy(configuration.getProxyServer(), configuration.getProxyPort());
-            httpClient.setHostConfiguration(hostConfiguration);
+            builder.setProxy(new HttpHost(configuration.getProxyServer(), configuration.getProxyPort()));
         }
 
         if (configuration.getUsername() != null) {
-            Credentials credentials = new UsernamePasswordCredentials(configuration.getUsername(), configuration.getPassword());
-
-            httpClient.getState().setCredentials(AuthScope.ANY, credentials);
+            if (credentialsProvider == null) {
+                credentialsProvider = new BasicCredentialsProvider();
+            }
+            credentialsProvider
+                    .setCredentials(AuthScope.ANY,
+                            new UsernamePasswordCredentials(configuration.getUsername(), configuration.getPassword()));
         }
 
         if (configuration.getProxyUsername() != null) {
-            Credentials credentials = new UsernamePasswordCredentials(configuration.getProxyUsername(),
-                    configuration.getProxyPassword());
-
-            httpClient.getState().setProxyCredentials(AuthScope.ANY, credentials);
-            httpClient.getHostConfiguration().setProxy(configuration.getProxyServer(), configuration.getProxyPort());
+            if (credentialsProvider == null) {
+                credentialsProvider = new BasicCredentialsProvider();
+            }
+            credentialsProvider
+                    .setCredentials(new AuthScope(configuration.getProxyServer(), configuration.getProxyPort()),
+                            new UsernamePasswordCredentials(configuration.getProxyUsername(),
+                                    configuration.getProxyPassword()));
+            builder.setProxy(new HttpHost(configuration.getProxyServer(), configuration.getProxyPort()));
         }
-        return httpClient;
+        if (credentialsProvider != null) {
+            builder.setDefaultCredentialsProvider(credentialsProvider);
+        }
+        return builder.build();
     }
 }

main/plugins/org.talend.designer.components.libs/libs_src/talend-ws/src/main/java/org/talend/webservice/helper/map/MapConverter.java

@@ -4,15 +4,13 @@
  */
 package org.talend.webservice.helper.map;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.xml.namespace.QName;
 
 import org.talend.webservice.helper.PathUtil;
 import org.talend.webservice.mapper.AnyTypeMapper;
+import sun.awt.image.ImageWatched;
 
 /**
  *
@@ -24,35 +22,44 @@ public class MapConverter {
     public static final String LEFT_SQUARE_BRACKET = "[";
     public static final String RIGHT_SQUARE_BRACKET = "]";
 
+    private static Map<String, Object> newMap(boolean keepOrder) {
+        if(keepOrder) return new LinkedHashMap<>();
+        return new HashMap<>();
+    }
+
     public static Map<String, Object> deepMapToMap(Map<String, Object> map) {
-        return deepMapToMap(map, null, SEPARATOR);
+        return deepMapToMap(map, null, SEPARATOR, false);
+    }
+
+    public static Map<String, Object> deepMapToMap(Map<String, Object> map, boolean keepOrder) {
+        return deepMapToMap(map, null, SEPARATOR, keepOrder);
     }
 
     public static Map<String, Object> mapToDeepMap(Map<String, Object> map) {
         return mapToDeepMap(map, SEPARATOR);
     }
 
-    private static Map<String, Object> deepMapToMap(Object value, String k, String sep) {
+    private static Map<String, Object> deepMapToMap(Object value, String k, String sep, boolean keepOrder) {
         if (value instanceof Map) {
             Map<String, Object> map = (Map<String, Object>) value;
-            Map<String, Object> out = new HashMap<String, Object>();
+            Map<String, Object> out = newMap(keepOrder);
             for (Map.Entry<String, Object> entry : map.entrySet()) {
                 if (k == null) {
-                    out.putAll(deepMapToMap(entry.getValue(), entry.getKey(), sep));
+                    out.putAll(deepMapToMap(entry.getValue(), entry.getKey(), sep, keepOrder));
                 } else {
                     out.putAll(deepMapToMap(entry.getValue(), k + sep + entry.
-                            getKey(), sep));
+                            getKey(), sep, keepOrder));
                 }
             }
             return out;
         } else if (value instanceof List) {
             List<Object> list = (List<Object>) value;
-            Map<String, Object> out = new HashMap<String, Object>();
+            Map<String, Object> out = newMap(keepOrder);
             int i = 0;
             for (Object val : list) {
                 StringBuffer sb = new StringBuffer();
                 sb.append(k).append(LEFT_SQUARE_BRACKET).append(i).append(RIGHT_SQUARE_BRACKET);
-                out.putAll(deepMapToMap(val, sb.toString(), sep));
+                out.putAll(deepMapToMap(val, sb.toString(), sep, keepOrder));
                 i++;
             }
             out.put(k + ".size", list.size());

main/plugins/org.talend.designer.components.libs/libs_src/talend-ws/src/main/java/org/talend/webservice/jaxb/JAXBUtils.java

@@ -42,14 +42,18 @@ import javax.xml.transform.Result;
 import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.stream.StreamResult;
 
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.common.jaxb.JAXBBeanInfo;
 import org.apache.cxf.common.jaxb.JAXBContextProxy;
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.common.spi.ClassGeneratorClassLoader;
 import org.apache.cxf.common.util.ASMHelper;
 import org.apache.cxf.common.util.ASMHelper.ClassWriter;
 import org.apache.cxf.common.util.ASMHelper.FieldVisitor;
 import org.apache.cxf.common.util.ASMHelper.Label;
 import org.apache.cxf.common.util.ASMHelper.MethodVisitor;
+import org.apache.cxf.common.util.ASMHelperImpl;
 import org.apache.cxf.common.util.CachedClass;
 import org.apache.cxf.common.util.PackageUtils;
 import org.apache.cxf.common.util.ReflectionInvokationHandler;
@@ -578,7 +582,7 @@ public final class JAXBUtils {
     public static void setNamespaceWrapper(final Map<String, String> nspref, Marshaller marshaller) throws PropertyException {
         Object mapper = null;
         if (marshaller.getClass().getName().contains(".internal.")) {
-            mapper = createNamespaceWrapper(nspref);
+            mapper = createNamespaceWrapper(null, nspref);
             if (mapper == null) {
                 LOG.log(Level.INFO, "Could not create namespace mapper for JDK internal" + " JAXB implementation.");
             } else {
@@ -595,6 +599,31 @@ public final class JAXBUtils {
         }
     }
 
+    /*
+     * To avoid possible runtime collision.
+     */
+    public static Object setNamespaceMapper(Bus bus, final Map<String, String> nspref,
+            Marshaller marshaller) throws PropertyException {
+        Object mapper = null;
+        if (marshaller.getClass().getName().contains(".internal.")) {
+            mapper = createNamespaceWrapper(bus, nspref);
+            if (mapper == null) {
+                LOG.log(Level.INFO, "Could not create namespace mapper for JDK internal" + " JAXB implementation.");
+            } else {
+                marshaller.setProperty("com.sun.xml.internal.bind.namespacePrefixMapper", mapper);
+            }
+        } else {
+            try {
+                Class<?> cls = Class.forName("org.apache.cxf.common.jaxb.NamespaceMapper");
+                mapper = cls.getConstructor(Map.class).newInstance(nspref);
+            } catch (Exception ex) {
+                LOG.log(Level.INFO, "Could not create NamespaceMapper", ex);
+            }
+            marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper", mapper);
+        }
+        return mapper;
+    }
+
     public static BridgeWrapper createBridge(Set<Class<?>> ctxClasses, QName qname, Class<?> refcls, Annotation anns[])
             throws JAXBException {
         try {
@@ -1018,16 +1047,17 @@ public final class JAXBUtils {
         return false;
     }
 
-    private static synchronized Object createNamespaceWrapper(Map<String, String> map) {
-        ASMHelper helper = new ASMHelper();
+    private static synchronized Object createNamespaceWrapper(Bus bus, Map<String, String> map) {
+        ASMHelper helper = new ASMHelperImpl();
         String className = "org.apache.cxf.jaxb.NamespaceMapperInternal";
-        Class<?> cls = helper.findClass(className, JAXBUtils.class);
+        NamespaceMapperClassGenerator nmcg = new NamespaceMapperClassGenerator(bus);
+        Class<?> cls = nmcg.findClass(className, JAXBUtils.class);
         if (cls == null) {
             ClassWriter cw = helper.createClassWriter();
             if (cw == null) {
                 return null;
             }
-            cls = createNamespaceWrapperInternal(helper, cw);
+            cls = createNamespaceWrapperInternal(helper, cw, nmcg);
         }
         try {
             return cls.getConstructor(Map.class).newInstance(map);
@@ -1036,7 +1066,7 @@ public final class JAXBUtils {
         }
     }
 
-    private static Class<?> createNamespaceWrapperInternal(ASMHelper helper, ClassWriter cw) {
+    private static Class<?> createNamespaceWrapperInternal(ASMHelper helper, ClassWriter cw, NamespaceMapperClassGenerator nmcg) {
         String className = "org.apache.cxf.jaxb.NamespaceMapperInternal";
         FieldVisitor fv;
         MethodVisitor mv;
@@ -1127,7 +1157,7 @@ public final class JAXBUtils {
             }
         }
 
-        return helper.loadClass(className, cls, bts);
+        return nmcg.loadClass(className, cls, bts);
     }
 
     public static JAXBBeanInfo getBeanInfo(JAXBContextProxy context, Class<?> cls) {
@@ -1138,4 +1168,20 @@ public final class JAXBUtils {
         return ReflectionInvokationHandler.createProxyWrapper(o, JAXBBeanInfo.class);
     }
 
+    private static class NamespaceMapperClassGenerator extends ClassGeneratorClassLoader {
+
+        private NamespaceMapperClassGenerator(Bus bus) {
+            super(bus == null ? BusFactory.getDefaultBus() : bus);
+        }
+
+        @Override
+        protected Class<?> findClass(String className, Class<?> cls) {
+            return super.findClass(className, cls);
+        }
+
+        @Override
+        protected Class<?> loadClass(String className, Class<?> cls, byte[] bytes) {
+            return super.loadClass(className, cls, bytes);
+        }
+    }
 }

main/plugins/org.talend.designer.components.libs/libs_src/talend-ws/src/main/java/org/talend/webservice/mapper/ComplexTypeMapper.java

@@ -3,13 +3,12 @@
  */
 package org.talend.webservice.mapper;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import org.talend.webservice.exception.LocalizedException;
 
 import javax.xml.namespace.QName;
-
-import org.talend.webservice.exception.LocalizedException;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 
@@ -151,7 +150,7 @@ public class ComplexTypeMapper implements TypeMapper {
                 if (!clazz.getName().equals(beanName)) {
                     ComplexTypeMapper instanceComplexTypeMapper = findInstanceByClassName(beanName);
                     if (instanceComplexTypeMapper != null) {
-                        Map<String, Object> values = new HashMap<String, Object>();
+                        Map<String, Object> values = new LinkedHashMap<String, Object>();
                         values.put(ABSTRACT_TYPE_NAME, instanceComplexTypeMapper.typeName);
                         values.put(instanceComplexTypeMapper.typeName.getLocalPart(), instanceComplexTypeMapper.typeToValue(bean));
                         return values;
@@ -167,7 +166,7 @@ public class ComplexTypeMapper implements TypeMapper {
                     return null;
                 }
             } else {
-                Map<String, Object> values = new HashMap<String, Object>(mappers.size());
+                Map<String, Object> values = new LinkedHashMap<String, Object>(mappers.size());
                 for (Map.Entry<String, PropertyMapper> entry : mappers.entrySet()) {
                     Object value = entry.getValue().getValueFrom(bean);
                     if (value != null) {
@@ -198,7 +197,7 @@ public class ComplexTypeMapper implements TypeMapper {
         if (params == null) {
             return null;
         }
-        Map<String, Object> values = new HashMap<String, Object>(mappers.size());
+        Map<String, Object> values = new LinkedHashMap<String, Object>(mappers.size());
 
         int i = 0;
         for (Object param : params) {

main/plugins/org.talend.designer.components.libs/libs_src/talend-ws/src/main/java/org/talend/webservice/mapper/MapperFactory.java

@@ -4,6 +4,7 @@
 package org.talend.webservice.mapper;
 
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -336,7 +337,8 @@ public class MapperFactory {
         Class<?> clazz = classMapper.getClassForType(xmlSchemaComplexType.getQName(), orderedMap.keyList(), 1);
 
         // 3.create propertyMapper (propertyName,class,schemaTypeMap,typeMapperQname)
-        Map<String, PropertyMapper> mappers = new HashMap<String, PropertyMapper>();
+        //need to use the order map as the order is important for response auto parser by index
+        Map<String, PropertyMapper> mappers = new LinkedHashMap<>();
         for (String key : properties.keySet()) {
             Object xmlSchemaObject = properties.get(key);
             if (xmlSchemaObject == null) {

main/plugins/org.talend.designer.components.libs/libs_src/talend-ws/src/main/java/org/talend/webservice/mapper/MessageMapperImpl.java

@@ -5,6 +5,7 @@
 package org.talend.webservice.mapper;
 
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import javax.wsdl.Message;
@@ -152,7 +153,7 @@ public class MessageMapperImpl implements MessageMapper {
             return wrappedValue;
         } else {
             List<Part> orderedParts = message.getOrderedParts(null);
-            Map<String, Object> values = new HashMap<String, Object>(params.length);
+            Map<String, Object> values = new LinkedHashMap<String, Object>(params.length);
             int i = 0;
             for (Object param : params) {
                 Part part = orderedParts.get(i);

main/plugins/org.talend.designer.components.libs/libs_src/talend-ws/src/main/resources/messages_el.properties

@@ -1,7 +0,0 @@
-org.talend.ws.exception.IllegalPropertyAccessException=\u0391\u03B4\u03C5\u03BD\u03B1\u03BC\u03AF\u03B1 \u03C0\u03C1\u03CC\u03C3\u03B2\u03B1\u03C3\u03B7\u03C2 \u03C3\u03C4\u03B7\u03BD \u03B9\u03B4\u03B9\u03CC\u03C4\u03B7\u03C4\u03B1 {0} \u03C0\u03BF\u03C5 \u03B4\u03B5\u03BD \u03B5\u03AF\u03BD\u03B1\u03B9 \u03C0\u03C1\u03BF\u03C3\u03B2\u03AC\u03C3\u03B9\u03BC\u03B7 \u03B3\u03B9\u03B1 \u03C4\u03CD\u03C0\u03BF {1}
-org.talend.ws.exception.NoSuchPropertyException=\u0397 \u03B9\u03B4\u03B9\u03CC\u03C4\u03B7\u03C4\u03B1 {0} \u03B4\u03B5\u03BD \u03C5\u03C0\u03AC\u03C1\u03C7\u03B5\u03B9 \u03B3\u03B9\u03B1 \u03C4\u03BF\u03BD \u03C4\u03CD\u03C0\u03BF {1}
-org.talend.ws.exception.Instantiation=\u0391\u03B4\u03C5\u03BD\u03B1\u03BC\u03AF\u03B1 \u03BD\u03B1 \u03B4\u03BF\u03B8\u03B5\u03AF \u03C5\u03C0\u03CC\u03C3\u03C4\u03B1\u03C3\u03B7 \u03C3\u03B5 \u03BA\u03BB\u03AC\u03C3\u03B7 \u03C4\u03CD\u03C0\u03BF\u03C5 {0}
-org.talend.ws.exception.illegalAccessValueOf=\u0391\u03B4\u03C5\u03BD\u03B1\u03BC\u03AF\u03B1 \u03BA\u03BB\u03AE\u03C3\u03B7\u03C2 \u03BC\u03B5\u03B8\u03CC\u03B4\u03BF\u03C5 valueOf \u03B3\u03B9\u03B1 \u03C4\u03CD\u03C0\u03BF enum {0}
-org.talend.ws.exception.Unknown=\u039C\u03B9\u03B1 \u03AC\u03B3\u03BD\u03C9\u03C3\u03C4\u03B7 \u03B5\u03BE\u03B1\u03AF\u03C1\u03B5\u03C3\u03B7 \u03C0\u03C1\u03BF\u03AD\u03BA\u03C5\u03C8\u03B5
-org.talend.ws.exception.InvalidEnumValueException=\u0397 \u03C4\u03B9\u03BC\u03AE {0} \u03B4\u03B5\u03BD \u03B5\u03AF\u03BD\u03B1\u03B9 \u03AD\u03B3\u03BA\u03C5\u03C1\u03B7 \u03B3\u03B9\u03B1 enum {1}
-org.talend.ws.exception.InvalidParameterAnyType=\u03A0\u03C1\u03AD\u03C0\u03B5\u03B9 \u03BD\u03B1 \u03C0\u03C1\u03BF\u03C3\u03B4\u03B9\u03BF\u03C1\u03AF\u03C3\u03B5\u03C4\u03B5 \u03AD\u03BD\u03B1\u03BD \u03C7\u03AC\u03C1\u03C4\u03B7 \u03C3\u03B1\u03BD \u03B1\u03C5\u03C4\u03CC\u03BD \u03B3\u03B9\u03B1 anyTypes : {anyType: value, anyType_type: qname}

main/plugins/org.talend.designer.components.libs/libs_src/talend-ws/src/main/resources/messages_en.properties

@@ -1,8 +0,0 @@
-org.talend.ws.exception.IllegalPropertyAccessException=Unable to access property {0} which is not accessible for type {1}
-org.talend.ws.exception.NoSuchPropertyException=Property {0} does not exist for type {1}
-org.talend.ws.exception.Instantiation=Unable to instantiate class of type {0}
-org.talend.ws.exception.InvocationTargetPropertyAccessor=A property accessor has thrown an exception : property {0} of class {1}
-org.talend.ws.exception.illegalAccessValueOf=Unable to call method valueOf for enum type {0}
-org.talend.ws.exception.Unknown=An unknown exception has been thrown
-org.talend.ws.exception.InvalidEnumValueException=Value {0} is not valid for enum {1}
-org.talend.ws.exception.InvalidParameterAnyType=You must specify a map like this for anyTypes : {anyType: value, anyType_type: qname} pour les anyType

main/plugins/org.talend.designer.components.libs/libs_src/talend-ws/src/main/resources/messages_fr.properties

@@ -1,6 +1,8 @@
-org.talend.ws.exception.IllegalPropertyAccessException=Impossible d'acc\u00e9der \u00e0 la propri\u00e9t\u00e9 {0} qui est inaccessible pour le type {1}
-org.talend.ws.exception.NoSuchPropertyException=La propri\u00e9t\u00e9 {0} n'existe pas pour le type {1}
-org.talend.ws.exception.Instantiation=Impossible d'instancier la classe de type {0}
-org.talend.ws.exception.illegalAccessValueOf=Impossible d'appeler une m\u00e9thode valueOf pour le type enum {0}
-org.talend.ws.exception.Unknown=Une exception inconnue a \u00e9t\u00e9 rencontr\u00e9e
+org.talend.ws.exception.IllegalPropertyAccessException=Impossible d'acc\u00E9der \u00E0 la propri\u00E9t\u00E9 {0} qui est inaccessible pour le type {1}
+org.talend.ws.exception.NoSuchPropertyException=La propri\u00E9t\u00E9 {0} n'existe pas pour le type {1}
+org.talend.ws.exception.Instantiation=Impossible d'instancier le type de classe {0}
+org.talend.ws.exception.InvocationTargetPropertyAccessor=Un accesseur de propri\u00E9t\u00E9 a retourner une exception : propri\u00E9t\u00E9 {0} de classe {1}
+org.talend.ws.exception.illegalAccessValueOf=Impossible d'appeler une m\u00E9thode valueOf pour le type enum {0}
+org.talend.ws.exception.Unknown=Une exception inconnue a \u00E9t\u00E9 d\u00E9clench\u00E9e
 org.talend.ws.exception.InvalidEnumValueException=La valeur {0} n'est pas valide pour enum {1}
+org.talend.ws.exception.InvalidParameterAnyType=Vous devez sp\u00E9cifier une Map comme celle-ci pour anyTypes : {anyType: value, anyType_type: qname} pour les anyType

main/plugins/org.talend.designer.components.libs/libs_src/talend-ws/src/main/resources/messages_ja.properties

@@ -1,8 +1,8 @@
-org.talend.ws.exception.IllegalPropertyAccessException=\u30BF\u30A4\u30D7{1}\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u306A\u3044\u30D7\u30ED\u30D1\u30C6\u30A3{0}\u306B\u30A2\u30AF\u30BB\u30B9\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+org.talend.ws.exception.IllegalPropertyAccessException={0} \u30D7\u30ED\u30D1\u30C6\u30A3\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\u3002\u3053\u308C\u306F {1} \u578B\u306E\u305F\u3081\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\u3002
 org.talend.ws.exception.NoSuchPropertyException=\u30BF\u30A4\u30D7{1}\u306E\u30D7\u30ED\u30D1\u30C6\u30A3{0}\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
-org.talend.ws.exception.Instantiation=\u30BF\u30A4\u30D7{0}\u306E\u30AF\u30E9\u30B9\u3092\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
-org.talend.ws.exception.InvocationTargetPropertyAccessor=\u30D7\u30ED\u30D1\u30C6\u30A3\u30A2\u30AF\u30BB\u30C3\u30B5\u306F\u4F8B\u5916\u3092\u767A\u751F\u3055\u305B\u307E\u3057\u305F: \u30AF\u30E9\u30B9{1}\u306E\u30D7\u30ED\u30D1\u30C6\u30A3{0}
-org.talend.ws.exception.illegalAccessValueOf=enum\u578B{0}\u306E\u30E1\u30BD\u30C3\u30C9valueOf\u3092\u547C\u3073\u51FA\u3059\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093
-org.talend.ws.exception.Unknown=\u4E0D\u660E\u306A\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-org.talend.ws.exception.InvalidEnumValueException=\u5024{0}\u306F\u5217\u6319\u578B{1}\u3068\u3057\u3066\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
-org.talend.ws.exception.InvalidParameterAnyType=\u3053\u306E\u3088\u3046\u306AanyTypes\u306E\u30DE\u30C3\u30D7\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059: {anyType: value, anyType_type: qname}
+org.talend.ws.exception.Instantiation={0} \u578B\u306E\u30AF\u30E9\u30B9\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3002
+org.talend.ws.exception.InvocationTargetPropertyAccessor=\u30D7\u30ED\u30D1\u30C6\u30A3\u30A2\u30AF\u30BB\u30B9\u306B\u3088\u308A\u3001\u4F8B\u5916\u304C\u30B9\u30ED\u30FC\u3055\u308C\u307E\u3057\u305F\uFF1A\u30AF\u30E9\u30B9 {1} \u306E\u30D7\u30ED\u30D1\u30C6\u30A3 {0}
+org.talend.ws.exception.illegalAccessValueOf=\u5217\u6319\u578B {0} \u306EvalueOf\u30E1\u30BD\u30C3\u30C9\u3092\u547C\u3073\u51FA\u3059\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
+org.talend.ws.exception.Unknown=\u4E0D\u660E\u306A\u4F8B\u5916\u304C\u30B9\u30ED\u30FC\u3055\u308C\u307E\u3057\u305F
+org.talend.ws.exception.InvalidEnumValueException=\u5024 {0} \u306Fenum\u578B {1} \u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
+org.talend.ws.exception.InvalidParameterAnyType=\u30DE\u30C3\u30D7\u306F\u3069\u306E\u30BF\u30A4\u30D7\u306B\u3064\u3044\u3066\u3082\u4EE5\u4E0B\u306E\u3088\u3046\u306B\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059: {anyType: value, anyType_type: qname}

main/plugins/org.talend.designer.components.libs/libs_src/talend-ws/src/main/resources/messages_zh_CN.properties

@@ -3,6 +3,6 @@ org.talend.ws.exception.NoSuchPropertyException=\u5C5E\u6027 {0} \u5BF9\u4E8E\u7
 org.talend.ws.exception.Instantiation=\u65E0\u6CD5\u5B9E\u4F8B\u5316\u7C7B\u578B {0} \u7684\u7C7B
 org.talend.ws.exception.InvocationTargetPropertyAccessor=\u5C5E\u6027\u8BBF\u95EE\u5668\u629B\u51FA\u4E86\u4E00\u4E2A\u5F02\u5E38\uFF1A\u7C7B {1} \u7684\u5C5E\u6027 {0}
 org.talend.ws.exception.illegalAccessValueOf=\u65E0\u6CD5\u4E3A\u679A\u4E3E\u7C7B\u578B {0} \u8C03\u7528\u65B9\u6CD5 valueOf
-org.talend.ws.exception.Unknown=\u629B\u51FA\u4E86\u4E00\u4E2A\u672A\u77E5\u7684\u5F02\u5E38
+org.talend.ws.exception.Unknown=\u53D1\u751F\u4E00\u4E2A\u672A\u77E5\u5F02\u5E38
 org.talend.ws.exception.InvalidEnumValueException=\u503C {0} \u5BF9\u4E8E\u679A\u4E3E {1} \u65E0\u6548
 org.talend.ws.exception.InvalidParameterAnyType=\u60A8\u5FC5\u987B\u6309\u5982\u4E0B\u6240\u793A\u4E3A anyType \u6307\u5B9A\u6620\u5C04\uFF1A{anyType: value, anyType_type: qname}

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseBulkExec/tAzureSynapseBulkExec_java.xml

@@ -388,7 +388,7 @@
             <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-            <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
 		</IMPORTS>
 	</CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseConnection/tAzureSynapseConnection_java.xml

@@ -211,7 +211,7 @@
         <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
         <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
         <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
-        <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
+        <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
         <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
      </IMPORTS>
    </CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseInput/tAzureSynapseInput_java.xml

@@ -271,7 +271,7 @@
         <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
      </IMPORTS>
    </CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseOutput/tAzureSynapseOutput_java.xml

@@ -342,7 +342,7 @@
             <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-            <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
 		</IMPORTS>
 	</CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseRow/tAzureSynapseRow_java.xml

@@ -327,7 +327,7 @@
         <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
     </IMPORTS>
   </CODEGENERATION>

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

@@ -867,7 +867,7 @@
 		<IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
 		<IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
 		<IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
-		<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
+		<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
 		<IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
 		<IMPORT NAME="Driver-MYSQL5" MODULE="mysql-connector-java-5.1.49.jar" MVN="mvn:mysql/mysql-connector-java/5.1.49"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') and (DBTYPE=='MYSQL') and (DB_MYSQL_VERSION=='MYSQL_5')"/>
 		<IMPORT NAME="Driver-MYSQL8"  MODULE="mysql-connector-java-8.0.18.jar" MVN="mvn:mysql/mysql-connector-java/8.0.18" REQUIRED_IF="(DB_MYSQL_VERSION == 'MYSQL_8') AND (USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MYSQL')" />
@@ -879,7 +879,7 @@
         <IMPORT NAME="Driver-Oracle12c" MODULE="ojdbc7.jar" MVN="mvn:org.talend.libraries/ojdbc7/6.0.0"  REQUIRED_IF="(DBTYPE=='DBORACLE') AND (DB_VERSION == 'ORACLE_12') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="ORACLE_18"        MODULE="ojdbc8-19.3.0.0.jar" MVN="mvn:com.oracle.ojdbc/ojdbc8/19.3.0.0" REQUIRED_IF="(DBTYPE=='DBORACLE') AND (DB_VERSION == 'ORACLE_18') AND (USE_EXISTING_CONNECTION == 'false')" />
 		<IMPORT NAME="Driver-POSTGRESQL" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND ((((DBTYPE=='POSTGRE') or (DBTYPE=='POSTGREPLUS')) AND (DB_POSTGRE_VERSION =='PRIOR_TO_V9')) or (DBTYPE=='GREENPLUM'))" />
-		<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (((DBTYPE=='POSTGRE') or (DBTYPE=='POSTGREPLUS')) AND (DB_POSTGRE_VERSION =='V9_X'))" />
+		<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (((DBTYPE=='POSTGRE') or (DBTYPE=='POSTGREPLUS')) AND (DB_POSTGRE_VERSION =='V9_X'))" />
 		<IMPORT NAME="Driver-FIREBIRD" MODULE="jaybird-full-2.1.1.jar" MVN="mvn:org.talend.libraries/jaybird-full-2.1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.jdbc.firebird/lib/jaybird-full-2.1.1.jar" REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='FIREBIRD')" />
 		<IMPORT NAME="Driver-HSQLDb" MODULE="hsqldb.jar" MVN="mvn:org.talend.libraries/hsqldb/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.jdbc.hsql/lib/hsqldb.jar" REQUIRED_IF="DBTYPE=='HSQLDB'"/>
 		<IMPORT NAME="Driver-INFORMIX-JDBC" MODULE="ifxjdbc.jar" MVN="mvn:org.talend.libraries/ifxjdbc/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='INFORMIX')" />

main/plugins/org.talend.designer.components.localprovider/components/tELTMSSqlMap/tELTMSSqlMap_java.xml

@@ -201,7 +201,7 @@
             <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND     (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND     (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-            <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
 		</IMPORTS>
    </CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tELTPostgresqlMap/tELTPostgresqlMap_java.xml

@@ -189,7 +189,7 @@
   
    <CODEGENERATION>
       <IMPORTS>
-        <IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="DB_VERSION =='V9_X'" />
+        <IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="DB_VERSION =='V9_X'" />
         <IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="DB_VERSION =='PRIOR_TO_V9'" />
       </IMPORTS>
   </CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tMSSqlBulkExec/tMSSqlBulkExec_java.xml

@@ -413,7 +413,7 @@
         <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
     </IMPORTS>
   </CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tMSSqlConnection/tMSSqlConnection_java.xml

@@ -213,7 +213,7 @@
         <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP')" />
         <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP')" />
         <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP')" />
-        <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP')" />
+        <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP')" />
         <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP')" />
      </IMPORTS>
    </CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tMSSqlInput/tMSSqlInput_java.xml

@@ -287,7 +287,7 @@
         <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
      </IMPORTS>
    </CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tMSSqlOutput/tMSSqlOutput_java.xml

@@ -381,7 +381,7 @@
             <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-            <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
 		</IMPORTS>
 	</CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tMSSqlRow/tMSSqlRow_java.xml

@@ -345,7 +345,7 @@
         <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
     </IMPORTS>
   </CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tMSSqlSCD/tMSSqlSCD_java.xml

@@ -527,7 +527,7 @@
         <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
     </IMPORTS>
   </CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tMSSqlSP/tMSSqlSP_java.xml

@@ -267,7 +267,7 @@
         <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
     </IMPORTS>
   </CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tMap/tMap_main.inc.javajet

@@ -424,36 +424,57 @@
 			if(<%= mainInputTableName %> == null) {
 				<%= mainInputTableName %> = new <%= realMainConnection.getName() %>Struct();
 			}
-    	    <%
+			<%
 		} // T_TM_M_291
 		
+		if(!hasPersistentLookup)  {
+			for (int iInputTable = 1; iInputTable < sizeInputTables; iInputTable++) {
+				final ExternalMapperTable externalTable = inputTables.get(iInputTable);
+
+				final String tableName = externalTable.getName();
+				final IConnection connection = hNameToConnection.get(tableName);
+				if (connection == null) {
+					continue;
+				}
+
+				final EConnectionType connectionType = connection.getLineStyle();
+
+				if (connectionType == EConnectionType.FLOW_REF) {//lookup line
+					final List<ExternalMapperTableEntry> metadataTableEntries = externalTable.getMetadataTableEntries();
+					if (metadataTableEntries == null) {
+						continue;
+					}
+
+					if (!isVirtualIn) {
+					%>
+						<%=tableName %>Struct <%=tableName %> = null;
+					<%
+					}
+				}
+			}
+		}
 		
+		if (!dieonerror) {
+			tryOffset = stringBuffer.length();
+
+		} // close dieonerror if check
 		%>
+		// ###############################
+		// # Input tables (lookups)
+		<%
 
-            <%
-            if (!dieonerror) {
-			    tryOffset = stringBuffer.length();
+		ArrayList<ExternalMapperTable> inputTablesWithInnerJoin = new ArrayList<ExternalMapperTable>();
+		boolean hasValidLookupTables = false;
 
-            } // close dieonerror if check
+		int closeBracketCounter = 0;
 		%>
-        // ###############################
-        // # Input tables (lookups)
-        <%
-
-        ArrayList<ExternalMapperTable> inputTablesWithInnerJoin = new ArrayList<ExternalMapperTable>();
-        boolean hasValidLookupTables = false;
-
-		  int closeBracketCounter = 0;
-		%>
-		  boolean <%= rejectedInnerJoin %> = false;
-		  boolean <%= mainRowRejected %> = false;
-            				    								  
+		boolean <%= rejectedInnerJoin %> = false;
+		boolean <%= mainRowRejected %> = false;
 		<%
 
 		String previousLookupName = null;
 		String previousTableName = mainInputTableName;
 
-		
 		int previousJoinedTablesPersistentSortedDelimited = 0;
 		int nextJoinedTableIndex = currentJoinedTableIndex;
 
@@ -467,7 +488,7 @@
 		List<String> declarationsStructForNextSortedWhile = new ArrayList<String>();
 		List<String> closeAllRowsBlockCount = new ArrayList<String>();
 
-        for (int iInputTable = 0; iInputTable < sizeInputTables; iInputTable++) { // T_TM_M_261
+		for (int iInputTable = 0; iInputTable < sizeInputTables; iInputTable++) { // T_TM_M_261
 			ExternalMapperTable externalTable = inputTables.get(iInputTable);
 			
 			boolean isMultipleResultMode = false;
@@ -696,7 +717,7 @@
 
                     hasValidLookupTables = true;
                     
-                     String matchingMode = externalTable.getMatchingMode();
+                    String matchingMode = externalTable.getMatchingMode();
 					if(matchingMode == null) {
 						if(aKeysValues.length > 0) {
 							matchingMode = "UNIQUE_MATCH";
@@ -999,7 +1020,9 @@
 							} // T 52 
 							%>
 
-							<%= tableName %>Struct <%= tableName %> = null;
+							<%if(hasPersistentLookup) {%>
+							<%=tableName %>Struct <%=tableName %> = null;
+							<%}%>
                     		  	 
 							<%
 							if(isMultipleResultMode) { // T 60
@@ -1369,6 +1392,7 @@
         boolean atLeastOneInputTableWithInnerJoin = !inputTablesWithInnerJoin.isEmpty();
 
             if (!dieonerror) {
+				//here mean disable TDI-45732 for some special case, is a workaround fix
 			    if(gm.getBlocksCodeToClose()!=null && gm.getBlocksCodeToClose().size()>0){
             %>
                 try {

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

@@ -27544,7 +27544,7 @@
                 <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="xmlbeans" MODULE="xmlbeans-2.3.0.jar" MVN="mvn:org.talend.libraries/xmlbeans-2.3.0/6.0.0" 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')"/>
@@ -27558,7 +27558,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" 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')))" />
+                <IMPORT NAME="talend-mscrm" MODULE="talend-mscrm-3.13-20220701.jar" MVN="mvn:org.talend.components/talend-mscrm/3.13-20220701" 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')" />
@@ -27574,7 +27574,7 @@
                 <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="xmlbeans-2.6.0" MODULE="xmlbeans-2.6.0.jar" MVN="mvn:org.talend.libraries/xmlbeans-2.6.0/6.0.0" 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-httpclient-3.1" MODULE="commons-httpclient-3.1.jar" MVN="mvn:commons-httpclient/commons-httpclient/3.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')" />
@@ -27598,84 +27598,84 @@
                     MVN="mvn:org.ow2.asm/asm/9.1"
                     REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
                 <IMPORT
-                    NAME="cxf-core-3.3.10"
-                    MODULE="cxf-core-3.3.10.jar"
-                    MVN="mvn:org.apache.cxf/cxf-core/3.3.10"
+                    NAME="cxf-core-3.4.7"
+                    MODULE="cxf-core-3.4.7.jar"
+                    MVN="mvn:org.apache.cxf/cxf-core/3.4.7"
                     REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
                 <IMPORT
-                    NAME="cxf-rt-bindings-soap-3.3.10"
-                    MODULE="cxf-rt-bindings-soap-3.3.10.jar"
-                    MVN="mvn:org.apache.cxf/cxf-rt-bindings-soap/3.3.10"
+                    NAME="cxf-rt-bindings-soap-3.4.7"
+                    MODULE="cxf-rt-bindings-soap-3.4.7.jar"
+                    MVN="mvn:org.apache.cxf/cxf-rt-bindings-soap/3.4.7"
                     REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
                 <IMPORT
-                    NAME="cxf-rt-bindings-xml-3.3.10"
-                    MODULE="cxf-rt-bindings-xml-3.3.10.jar"
-                    MVN="mvn:org.apache.cxf/cxf-rt-bindings-xml/3.3.10"
+                    NAME="cxf-rt-bindings-xml-3.4.7"
+                    MODULE="cxf-rt-bindings-xml-3.4.7.jar"
+                    MVN="mvn:org.apache.cxf/cxf-rt-bindings-xml/3.4.7"
                     REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
                 <IMPORT
-                    NAME="cxf-rt-databinding-jaxb-3.3.10"
-                    MODULE="cxf-rt-databinding-jaxb-3.3.10.jar"
-                    MVN="mvn:org.apache.cxf/cxf-rt-databinding-jaxb/3.3.10"
+                    NAME="cxf-rt-databinding-jaxb-3.4.7"
+                    MODULE="cxf-rt-databinding-jaxb-3.4.7.jar"
+                    MVN="mvn:org.apache.cxf/cxf-rt-databinding-jaxb/3.4.7"
                     REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
                 <IMPORT
-                    NAME="cxf-rt-frontend-jaxws-3.3.10"
-                    MODULE="cxf-rt-frontend-jaxws-3.3.10.jar"
-                    MVN="mvn:org.apache.cxf/cxf-rt-frontend-jaxws/3.3.10"
+                    NAME="cxf-rt-frontend-jaxws-3.4.7"
+                    MODULE="cxf-rt-frontend-jaxws-3.4.7.jar"
+                    MVN="mvn:org.apache.cxf/cxf-rt-frontend-jaxws/3.4.7"
                     REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
                 <IMPORT
-                    NAME="cxf-rt-frontend-simple-3.3.10"
-                    MODULE="cxf-rt-frontend-simple-3.3.10.jar"
-                    MVN="mvn:org.apache.cxf/cxf-rt-frontend-simple/3.3.10"
+                    NAME="cxf-rt-frontend-simple-3.4.7"
+                    MODULE="cxf-rt-frontend-simple-3.4.7.jar"
+                    MVN="mvn:org.apache.cxf/cxf-rt-frontend-simple/3.4.7"
                     REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
                 <IMPORT
-                    NAME="cxf-rt-security-3.3.10"
-                    MODULE="cxf-rt-security-3.3.10.jar"
-                    MVN="mvn:org.apache.cxf/cxf-rt-security/3.3.10"
+                    NAME="cxf-rt-security-3.4.7"
+                    MODULE="cxf-rt-security-3.4.7.jar"
+                    MVN="mvn:org.apache.cxf/cxf-rt-security/3.4.7"
                     REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
                 <IMPORT
-                    NAME="cxf-rt-transports-http-3.3.10"
-                    MODULE="cxf-rt-transports-http-3.3.10.jar"
-                    MVN="mvn:org.apache.cxf/cxf-rt-transports-http/3.3.10"
+                    NAME="cxf-rt-transports-http-3.4.7"
+                    MODULE="cxf-rt-transports-http-3.4.7.jar"
+                    MVN="mvn:org.apache.cxf/cxf-rt-transports-http/3.4.7"
                     REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
                 <IMPORT
-                    NAME="cxf-rt-ws-addr-3.3.10"
-                    MODULE="cxf-rt-ws-addr-3.3.10.jar"
-                    MVN="mvn:org.apache.cxf/cxf-rt-ws-addr/3.3.10"
+                    NAME="cxf-rt-ws-addr-3.4.7"
+                    MODULE="cxf-rt-ws-addr-3.4.7.jar"
+                    MVN="mvn:org.apache.cxf/cxf-rt-ws-addr/3.4.7"
                     REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
                 <IMPORT
-                    NAME="cxf-rt-ws-mex-3.3.10"
-                    MODULE="cxf-rt-ws-mex-3.3.10.jar"
-                    MVN="mvn:org.apache.cxf/cxf-rt-ws-mex/3.3.10"
+                    NAME="cxf-rt-ws-mex-3.4.7"
+                    MODULE="cxf-rt-ws-mex-3.4.7.jar"
+                    MVN="mvn:org.apache.cxf/cxf-rt-ws-mex/3.4.7"
                     REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
                 <IMPORT
-                    NAME="cxf-rt-ws-policy-3.3.10"
-                    MODULE="cxf-rt-ws-policy-3.3.10.jar"
-                    MVN="mvn:org.apache.cxf/cxf-rt-ws-policy/3.3.10"
+                    NAME="cxf-rt-ws-policy-3.4.7"
+                    MODULE="cxf-rt-ws-policy-3.4.7.jar"
+                    MVN="mvn:org.apache.cxf/cxf-rt-ws-policy/3.4.7"
                     REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
                 <IMPORT
-                    NAME="cxf-rt-ws-rm-3.3.10"
-                    MODULE="cxf-rt-ws-rm-3.3.10.jar"
-                    MVN="mvn:org.apache.cxf/cxf-rt-ws-rm/3.3.10"
+                    NAME="cxf-rt-ws-rm-3.4.7"
+                    MODULE="cxf-rt-ws-rm-3.4.7.jar"
+                    MVN="mvn:org.apache.cxf/cxf-rt-ws-rm/3.4.7"
                     REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
                 <IMPORT
-                    NAME="cxf-rt-ws-security-3.3.10"
-                    MODULE="cxf-rt-ws-security-3.3.10.jar"
-                    MVN="mvn:org.apache.cxf/cxf-rt-ws-security/3.3.10"
+                    NAME="cxf-rt-ws-security-3.4.7"
+                    MODULE="cxf-rt-ws-security-3.4.7.jar"
+                    MVN="mvn:org.apache.cxf/cxf-rt-ws-security/3.4.7"
                     REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
                 <IMPORT
-                    NAME="cxf-rt-security-saml-3.3.10"
-                    MODULE="cxf-rt-security-saml-3.3.10.jar"
-                    MVN="mvn:org.apache.cxf/cxf-rt-security-saml/3.3.10"
+                    NAME="cxf-rt-security-saml-3.4.7"
+                    MODULE="cxf-rt-security-saml-3.4.7.jar"
+                    MVN="mvn:org.apache.cxf/cxf-rt-security-saml/3.4.7"
                     REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
                 <IMPORT
-                    NAME="cxf-rt-wsdl-3.3.10"
-                    MODULE="cxf-rt-wsdl-3.3.10.jar"
-                    MVN="mvn:org.apache.cxf/cxf-rt-wsdl/3.3.10"
+                    NAME="cxf-rt-wsdl-3.4.7"
+                    MODULE="cxf-rt-wsdl-3.4.7.jar"
+                    MVN="mvn:org.apache.cxf/cxf-rt-wsdl/3.4.7"
                     REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
                 <IMPORT
-                    NAME="cxf-services-sts-core-3.3.10"
-                    MODULE="cxf-services-sts-core-3.3.10.jar"
-                    MVN="mvn:org.apache.cxf.services.sts/cxf-services-sts-core/3.3.10"
+                    NAME="cxf-services-sts-core-3.4.7"
+                    MODULE="cxf-services-sts-core-3.4.7.jar"
+                    MVN="mvn:org.apache.cxf.services.sts/cxf-services-sts-core/3.4.7"
                     REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
                 <IMPORT
                     NAME="ehcache-2.10.5"
@@ -27876,8 +27876,8 @@
                 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')))" />
             <IMPORT
                 NAME="nimbus-jose-jwt"
-                MODULE="nimbus-jose-jwt-8.11.jar"
-                MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"
+                MODULE="nimbus-jose-jwt-9.22.jar"
+                MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"
                 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')))" />
             <IMPORT
                 NAME="oauth2-oidc-sdk"

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

@@ -38303,7 +38303,7 @@
             <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="xmlbeans" MODULE="xmlbeans-2.3.0.jar" MVN="mvn:org.talend.libraries/xmlbeans-2.3.0/6.0.0" 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')"/>
@@ -38317,7 +38317,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" 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'))" />
+            <IMPORT NAME="talend-mscrm" MODULE="talend-mscrm-3.13-20220701.jar" MVN="mvn:org.talend.components/talend-mscrm/3.13-20220701" 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')" />
@@ -38333,7 +38333,7 @@
             <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="xmlbeans-2.6.0" MODULE="xmlbeans-2.6.0.jar" MVN="mvn:org.talend.libraries/xmlbeans-2.6.0/6.0.0"  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-httpclient-3.1" MODULE="commons-httpclient-3.1.jar" MVN="mvn:commons-httpclient/commons-httpclient/3.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')" />
@@ -38357,84 +38357,84 @@
                 MVN="mvn:org.ow2.asm/asm/9.1"
                 REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
             <IMPORT
-                NAME="cxf-core-3.3.10"
-                MODULE="cxf-core-3.3.10.jar"
-                MVN="mvn:org.apache.cxf/cxf-core/3.3.10"
+                NAME="cxf-core-3.4.7"
+                MODULE="cxf-core-3.4.7.jar"
+                MVN="mvn:org.apache.cxf/cxf-core/3.4.7"
                 REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
             <IMPORT
-                NAME="cxf-rt-bindings-soap-3.3.10"
-                MODULE="cxf-rt-bindings-soap-3.3.10.jar"
-                MVN="mvn:org.apache.cxf/cxf-rt-bindings-soap/3.3.10"
+                NAME="cxf-rt-bindings-soap-3.4.7"
+                MODULE="cxf-rt-bindings-soap-3.4.7.jar"
+                MVN="mvn:org.apache.cxf/cxf-rt-bindings-soap/3.4.7"
                 REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
             <IMPORT
-                NAME="cxf-rt-bindings-xml-3.3.10"
-                MODULE="cxf-rt-bindings-xml-3.3.10.jar"
-                MVN="mvn:org.apache.cxf/cxf-rt-bindings-xml/3.3.10"
+                NAME="cxf-rt-bindings-xml-3.4.7"
+                MODULE="cxf-rt-bindings-xml-3.4.7.jar"
+                MVN="mvn:org.apache.cxf/cxf-rt-bindings-xml/3.4.7"
                 REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
             <IMPORT
-                NAME="cxf-rt-databinding-jaxb-3.3.10"
-                MODULE="cxf-rt-databinding-jaxb-3.3.10.jar"
-                MVN="mvn:org.apache.cxf/cxf-rt-databinding-jaxb/3.3.10"
+                NAME="cxf-rt-databinding-jaxb-3.4.7"
+                MODULE="cxf-rt-databinding-jaxb-3.4.7.jar"
+                MVN="mvn:org.apache.cxf/cxf-rt-databinding-jaxb/3.4.7"
                 REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
             <IMPORT
-                NAME="cxf-rt-frontend-jaxws-3.3.10"
-                MODULE="cxf-rt-frontend-jaxws-3.3.10.jar"
-                MVN="mvn:org.apache.cxf/cxf-rt-frontend-jaxws/3.3.10"
+                NAME="cxf-rt-frontend-jaxws-3.4.7"
+                MODULE="cxf-rt-frontend-jaxws-3.4.7.jar"
+                MVN="mvn:org.apache.cxf/cxf-rt-frontend-jaxws/3.4.7"
                 REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
             <IMPORT
-                NAME="cxf-rt-frontend-simple-3.3.10"
-                MODULE="cxf-rt-frontend-simple-3.3.10.jar"
-                MVN="mvn:org.apache.cxf/cxf-rt-frontend-simple/3.3.10"
+                NAME="cxf-rt-frontend-simple-3.4.7"
+                MODULE="cxf-rt-frontend-simple-3.4.7.jar"
+                MVN="mvn:org.apache.cxf/cxf-rt-frontend-simple/3.4.7"
                 REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
             <IMPORT
-                NAME="cxf-rt-security-3.3.10"
-                MODULE="cxf-rt-security-3.3.10.jar"
-                MVN="mvn:org.apache.cxf/cxf-rt-security/3.3.10"
+                NAME="cxf-rt-security-3.4.7"
+                MODULE="cxf-rt-security-3.4.7.jar"
+                MVN="mvn:org.apache.cxf/cxf-rt-security/3.4.7"
                 REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
             <IMPORT
-                NAME="cxf-rt-transports-http-3.3.10"
-                MODULE="cxf-rt-transports-http-3.3.10.jar"
-                MVN="mvn:org.apache.cxf/cxf-rt-transports-http/3.3.10"
+                NAME="cxf-rt-transports-http-3.4.7"
+                MODULE="cxf-rt-transports-http-3.4.7.jar"
+                MVN="mvn:org.apache.cxf/cxf-rt-transports-http/3.4.7"
                 REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
             <IMPORT
-                NAME="cxf-rt-ws-addr-3.3.10"
-                MODULE="cxf-rt-ws-addr-3.3.10.jar"
-                MVN="mvn:org.apache.cxf/cxf-rt-ws-addr/3.3.10"
+                NAME="cxf-rt-ws-addr-3.4.7"
+                MODULE="cxf-rt-ws-addr-3.4.7.jar"
+                MVN="mvn:org.apache.cxf/cxf-rt-ws-addr/3.4.7"
                 REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
             <IMPORT
-                NAME="cxf-rt-ws-mex-3.3.10"
-                MODULE="cxf-rt-ws-mex-3.3.10.jar"
-                MVN="mvn:org.apache.cxf/cxf-rt-ws-mex/3.3.10"
+                NAME="cxf-rt-ws-mex-3.4.7"
+                MODULE="cxf-rt-ws-mex-3.4.7.jar"
+                MVN="mvn:org.apache.cxf/cxf-rt-ws-mex/3.4.7"
                 REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
             <IMPORT
-                NAME="cxf-rt-ws-policy-3.3.10"
-                MODULE="cxf-rt-ws-policy-3.3.10.jar"
-                MVN="mvn:org.apache.cxf/cxf-rt-ws-policy/3.3.10"
+                NAME="cxf-rt-ws-policy-3.4.7"
+                MODULE="cxf-rt-ws-policy-3.4.7.jar"
+                MVN="mvn:org.apache.cxf/cxf-rt-ws-policy/3.4.7"
                 REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
             <IMPORT
-                NAME="cxf-rt-ws-rm-3.3.10"
-                MODULE="cxf-rt-ws-rm-3.3.10.jar"
-                MVN="mvn:org.apache.cxf/cxf-rt-ws-rm/3.3.10"
+                NAME="cxf-rt-ws-rm-3.4.7"
+                MODULE="cxf-rt-ws-rm-3.4.7.jar"
+                MVN="mvn:org.apache.cxf/cxf-rt-ws-rm/3.4.7"
                 REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
             <IMPORT
-                NAME="cxf-rt-ws-security-3.3.10"
-                MODULE="cxf-rt-ws-security-3.3.10.jar"
-                MVN="mvn:org.apache.cxf/cxf-rt-ws-security/3.3.10"
+                NAME="cxf-rt-ws-security-3.4.7"
+                MODULE="cxf-rt-ws-security-3.4.7.jar"
+                MVN="mvn:org.apache.cxf/cxf-rt-ws-security/3.4.7"
                 REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
             <IMPORT
-                NAME="cxf-rt-security-saml-3.3.10"
-                MODULE="cxf-rt-security-saml-3.3.10.jar"
-                MVN="mvn:org.apache.cxf/cxf-rt-security-saml/3.3.10"
+                NAME="cxf-rt-security-saml-3.4.7"
+                MODULE="cxf-rt-security-saml-3.4.7.jar"
+                MVN="mvn:org.apache.cxf/cxf-rt-security-saml/3.4.7"
                 REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
             <IMPORT
-                NAME="cxf-rt-wsdl-3.3.10"
-                MODULE="cxf-rt-wsdl-3.3.10.jar"
-                MVN="mvn:org.apache.cxf/cxf-rt-wsdl/3.3.10"
+                NAME="cxf-rt-wsdl-3.4.7"
+                MODULE="cxf-rt-wsdl-3.4.7.jar"
+                MVN="mvn:org.apache.cxf/cxf-rt-wsdl/3.4.7"
                 REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
             <IMPORT
-                NAME="cxf-services-sts-core-3.3.10"
-                MODULE="cxf-services-sts-core-3.3.10.jar"
-                MVN="mvn:org.apache.cxf.services.sts/cxf-services-sts-core/3.3.10"
+                NAME="cxf-services-sts-core-3.4.7"
+                MODULE="cxf-services-sts-core-3.4.7.jar"
+                MVN="mvn:org.apache.cxf.services.sts/cxf-services-sts-core/3.4.7"
                 REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
             <IMPORT
                 NAME="ehcache-2.10.5"
@@ -38641,8 +38641,8 @@
                 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'))" />
             <IMPORT
                 NAME="nimbus-jose-jwt"
-                MODULE="nimbus-jose-jwt-8.11.jar"
-                MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"
+                MODULE="nimbus-jose-jwt-9.22.jar"
+                MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"
                 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'))" />
             <IMPORT
                 NAME="oauth2-oidc-sdk"

main/plugins/org.talend.designer.components.localprovider/components/tPostgresPlusBulkExec/tPostgresPlusBulkExec_java.xml

@@ -216,7 +216,7 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="Postgres_Driver"
 				MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4"  REQUIRED_IF="(DB_VERSION =='PRIOR_TO_V9') AND (USE_EXISTING_CONNECTION == 'false')" />
 		</IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tPostgresPlusConnection/tPostgresPlusConnection_java.xml

@@ -170,7 +170,7 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="DB_VERSION =='V9_X'" />
+			<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="DB_VERSION =='V9_X'" />
 			<IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="DB_VERSION =='PRIOR_TO_V9'" />
 			<IMPORT NAME="slf4j-api-1.7.25.jar" MODULE="slf4j-api-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.25" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
 			<IMPORT NAME="slf4j-log4j12-1.7.25.jar" MODULE="slf4j-log4j12-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.25" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />

main/plugins/org.talend.designer.components.localprovider/components/tPostgresPlusInput/tPostgresPlusInput_java.xml

@@ -249,7 +249,7 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="(DB_VERSION =='PRIOR_TO_V9') AND (USE_EXISTING_CONNECTION == 'false')" />
 		</IMPORTS>
 	</CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tPostgresPlusOutput/tPostgresPlusOutput_java.xml

@@ -362,7 +362,7 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="(DB_VERSION =='PRIOR_TO_V9') AND (USE_EXISTING_CONNECTION == 'false')" />
 		</IMPORTS>
 	</CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tPostgresPlusRow/tPostgresPlusRow_java.xml

@@ -296,7 +296,7 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="(DB_VERSION =='PRIOR_TO_V9') AND (USE_EXISTING_CONNECTION == 'false')" />
 		</IMPORTS>
 	</CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tPostgresPlusSCD/tPostgresPlusSCD_java.xml

@@ -521,7 +521,7 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="(DB_VERSION =='PRIOR_TO_V9') AND (USE_EXISTING_CONNECTION == 'false')" />
 		</IMPORTS>
 	</CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tPostgresPlusSCDELT/tPostgresPlusSCDELT_java.xml

@@ -366,7 +366,7 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="(DB_VERSION =='PRIOR_TO_V9') AND (USE_EXISTING_CONNECTION == 'false')" />
 		</IMPORTS>
 	</CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tPostgresqlBulkExec/tPostgresqlBulkExec_java.xml

@@ -228,7 +228,7 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false') AND (DRIVER_IF_GREENPLUM == 'POSTGRESQL')" />
+			<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false') AND (DRIVER_IF_GREENPLUM == 'POSTGRESQL')" />
 			<IMPORT NAME="Postgres_Driver" 
 			MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4"  REQUIRED_IF="((DB_VERSION =='PRIOR_TO_V9') AND (USE_EXISTING_CONNECTION == 'false') AND (DRIVER_IF_GREENPLUM == 'POSTGRESQL'))" />
 			<IMPORT NAME="Greenplum-Driver" MODULE="greenplum-5.1.4.000275.jar" MVN="mvn:com.pivotal/greenplum/5.1.4.000275" REQUIRED_IF="(DRIVER_IF_GREENPLUM == 'GREENPLUM') AND (USE_EXISTING_CONNECTION == 'false')"/>

main/plugins/org.talend.designer.components.localprovider/components/tPostgresqlConnection/tPostgresqlConnection_java.xml

@@ -202,7 +202,7 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="DB_VERSION =='V9_X'" />
+			<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="DB_VERSION =='V9_X'" />
 			<IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="DB_VERSION =='PRIOR_TO_V9'" />
 			<IMPORT NAME="slf4j-api-1.7.25.jar" MODULE="slf4j-api-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.25" REQUIRED_IF="(USE_SHARED_CONNECTION == 'true' AND SPECIFY_DATASOURCE_ALIAS=='false')" />
 			<IMPORT NAME="slf4j-log4j12-1.7.25.jar" MODULE="slf4j-log4j12-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.25" REQUIRED_IF="(USE_SHARED_CONNECTION == 'true' AND SPECIFY_DATASOURCE_ALIAS=='false')" />

main/plugins/org.talend.designer.components.localprovider/components/tPostgresqlInput/tPostgresqlInput_java.xml

@@ -280,7 +280,7 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="(DB_VERSION =='PRIOR_TO_V9') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="Driver-Postgis" MODULE="postgis_1.4.0.jar" MVN="mvn:org.talend.libraries/postgis_1.4.0/6.0.0"  REQUIRED="false" />
 			<IMPORT NAME="org.talend.sdi" MODULE="org.talend.sdi.jar" MVN="mvn:org.talend.libraries/org.talend.sdi/6.0.0"  REQUIRED="false" />

main/plugins/org.talend.designer.components.localprovider/components/tPostgresqlOutput/tPostgresqlOutput_java.xml

@@ -441,7 +441,7 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="(DB_VERSION =='PRIOR_TO_V9') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="Driver-Postgis" MODULE="postgis_1.4.0.jar" MVN="mvn:org.talend.libraries/postgis_1.4.0/6.0.0"  REQUIRED="false" />
 		 	<IMPORT NAME="org.talend.sdi" MODULE="org.talend.sdi.jar" MVN="mvn:org.talend.libraries/org.talend.sdi/6.0.0"  REQUIRED="false" />

main/plugins/org.talend.designer.components.localprovider/components/tPostgresqlRow/tPostgresqlRow_java.xml

@@ -327,7 +327,7 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="(DB_VERSION =='PRIOR_TO_V9') AND (USE_EXISTING_CONNECTION == 'false')" />
 		</IMPORTS>
 	</CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tPostgresqlSCD/tPostgresqlSCD_java.xml

@@ -521,7 +521,7 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="(DB_VERSION =='PRIOR_TO_V9') AND (USE_EXISTING_CONNECTION == 'false')" />
 		</IMPORTS>
 	</CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tPostgresqlSCDELT/tPostgresqlSCDELT_java.xml

@@ -366,7 +366,7 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.14.jar" MVN="mvn:org.postgresql/postgresql/42.2.14" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
+			<IMPORT NAME="Driver-Postgres9" MODULE="postgresql-42.2.25.jar" MVN="mvn:org.postgresql/postgresql/42.2.25" REQUIRED_IF="(DB_VERSION =='V9_X') AND (USE_EXISTING_CONNECTION == 'false')" />
 			<IMPORT NAME="Driver-Postgres" MODULE="postgresql-8.4-703.jdbc4.jar" MVN="mvn:postgresql/postgresql/8.4-703.jdbc4" REQUIRED_IF="(DB_VERSION =='PRIOR_TO_V9') AND (USE_EXISTING_CONNECTION == 'false')" />
 		</IMPORTS>
 	</CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tWebService/tWebService_begin.javajet

@@ -63,10 +63,6 @@ if("".equals(tempPath))tempPath="\"\"";
 
     System.setProperty("javax.xml.accessExternalSchema", "all");
 
-	//shade the log level for DynamicClientFactory.class
-	java.util.logging.Logger LOG_<%=cid%> = org.apache.cxf.common.logging.LogUtils.getL7dLogger(org.apache.cxf.endpoint.dynamic.DynamicClientFactory.class);
-	LOG_<%=cid%>.setLevel(java.util.logging.Level.WARNING);
-
 	org.talend.webservice.helper.Utils util_<%=cid%> = new org.talend.webservice.helper.Utils();
 
     org.talend.webservice.helper.conf.ServiceHelperConfiguration config_<%=cid%> = new org.talend.webservice.helper.conf.ServiceHelperConfiguration();

main/plugins/org.talend.designer.components.localprovider/components/tWebService/tWebService_java.xml

@@ -208,15 +208,15 @@
     <CODEGENERATION>
         <IMPORTS>
             <IMPORT
-                NAME="cxf-core-3.3.10"
-                MODULE="cxf-core-3.3.10.jar"
-                MVN="mvn:org.apache.cxf/cxf-core/3.3.10"
+                NAME="cxf-core-3.4.7"
+                MODULE="cxf-core-3.4.7.jar"
+                MVN="mvn:org.apache.cxf/cxf-core/3.4.7"
                 REQUIRED="true"
             />
             <IMPORT
-                NAME="cxf-rt-frontend-simple-3.3.10"
-                MODULE="cxf-rt-frontend-simple-3.3.10.jar"
-                MVN="mvn:org.apache.cxf/cxf-rt-frontend-simple/3.3.10"
+                NAME="cxf-rt-frontend-simple-3.4.7"
+                MODULE="cxf-rt-frontend-simple-3.4.7.jar"
+                MVN="mvn:org.apache.cxf/cxf-rt-frontend-simple/3.4.7"
                 REQUIRED="true"
             />
             <IMPORT
@@ -226,15 +226,15 @@
                 REQUIRED="true"
             />
             <IMPORT
-                NAME="cxf-tools-common-3.3.10"
-                MODULE="cxf-tools-common-3.3.10.jar"
-                MVN="mvn:org.apache.cxf/cxf-tools-common/3.3.10"
+                NAME="cxf-tools-common-3.4.7"
+                MODULE="cxf-tools-common-3.4.7.jar"
+                MVN="mvn:org.apache.cxf/cxf-tools-common/3.4.7"
                 REQUIRED="true"
             />
             <IMPORT
-                NAME="cxf-rt-wsdl-3.3.10"
-                MODULE="cxf-rt-wsdl-3.3.10.jar"
-                MVN="mvn:org.apache.cxf/cxf-rt-wsdl/3.3.10"
+                NAME="cxf-rt-wsdl-3.4.7"
+                MODULE="cxf-rt-wsdl-3.4.7.jar"
+                MVN="mvn:org.apache.cxf/cxf-rt-wsdl/3.4.7"
                 REQUIRED="true"
             />
             <IMPORT
@@ -250,27 +250,27 @@
                 REQUIRED="true"
             />
             <IMPORT
-                NAME="cxf-rt-bindings-soap-3.3.10"
-                MODULE="cxf-rt-bindings-soap-3.3.10.jar"
-                MVN="mvn:org.apache.cxf/cxf-rt-bindings-soap/3.3.10"
+                NAME="cxf-rt-bindings-soap-3.4.7"
+                MODULE="cxf-rt-bindings-soap-3.4.7.jar"
+                MVN="mvn:org.apache.cxf/cxf-rt-bindings-soap/3.4.7"
                 REQUIRED="true"
             />
             <IMPORT
-                NAME="cxf-rt-databinding-jaxb-3.3.10"
-                MODULE="cxf-rt-databinding-jaxb-3.3.10.jar"
-                MVN="mvn:org.apache.cxf/cxf-rt-databinding-jaxb/3.3.10"
+                NAME="cxf-rt-databinding-jaxb-3.4.7"
+                MODULE="cxf-rt-databinding-jaxb-3.4.7.jar"
+                MVN="mvn:org.apache.cxf/cxf-rt-databinding-jaxb/3.4.7"
                 REQUIRED="true"
             />
             <IMPORT
-                NAME="cxf-rt-transports-http-jetty-3.3.10"
-                MODULE="cxf-rt-transports-http-jetty-3.3.10.jar"
-                MVN="mvn:org.apache.cxf/cxf-rt-transports-http-jetty/3.3.10"
+                NAME="cxf-rt-transports-http-jetty-3.4.7"
+                MODULE="cxf-rt-transports-http-jetty-3.4.7.jar"
+                MVN="mvn:org.apache.cxf/cxf-rt-transports-http-jetty/3.4.7"
                 REQUIRED="true"
             />
             <IMPORT
-                NAME="cxf-rt-transports-http-3.3.10"
-                MODULE="cxf-rt-transports-http-3.3.10.jar"
-                MVN="mvn:org.apache.cxf/cxf-rt-transports-http/3.3.10"
+                NAME="cxf-rt-transports-http-3.4.7"
+                MODULE="cxf-rt-transports-http-3.4.7.jar"
+                MVN="mvn:org.apache.cxf/cxf-rt-transports-http/3.4.7"
                 REQUIRED="true"
             />
 
@@ -327,8 +327,8 @@
             />
             <IMPORT
                 NAME="talend-ws"
-                MODULE="talend-ws-1.0.5-20210629.jar"
-                MVN="mvn:org.talend.components/talend-ws/1.0.5-20210629"
+                MODULE="talend-ws-1.0.7-20220526.jar"
+                MVN="mvn:org.talend.components/talend-ws/1.0.7-20220526"
                 REQUIRED="true"
             />
 

main/plugins/org.talend.designer.components.localprovider/components/tWebServiceInput/cxf_begin.javajet

@@ -55,10 +55,6 @@ if(("false").equals(ElementParameterParser.getValue(node,"__ADVANCED_USE__"))) {
 				
 				System.setProperty("javax.xml.accessExternalSchema", "all");
 				
-				//shade the log level for DynamicClientFactory.class
-				java.util.logging.Logger LOG_<%=cid%> = org.apache.cxf.common.logging.LogUtils.getL7dLogger(org.apache.cxf.endpoint.dynamic.DynamicClientFactory.class);
-				LOG_<%=cid%>.setLevel(java.util.logging.Level.WARNING);
-				
 				org.talend.webservice.helper.Utils util_<%=cid%> = new org.talend.webservice.helper.Utils();
 				
 				org.talend.webservice.helper.conf.ServiceHelperConfiguration config_<%=cid%> = new org.talend.webservice.helper.conf.ServiceHelperConfiguration();

main/plugins/org.talend.designer.components.localprovider/components/tWebServiceInput/tWebServiceInput_java.xml

@@ -254,15 +254,15 @@ for(int i = 0; i < result.length; i++){
 		
 			<!-- cxf api support -->
 			<IMPORT
-				NAME="cxf-core-3.3.10"
-				MODULE="cxf-core-3.3.10.jar"
-				MVN="mvn:org.apache.cxf/cxf-core/3.3.10"
+				NAME="cxf-core-3.4.7"
+				MODULE="cxf-core-3.4.7.jar"
+				MVN="mvn:org.apache.cxf/cxf-core/3.4.7"
 				REQUIRED_IF="(API=='CXF')"
 			/>
 			<IMPORT
-				NAME="cxf-rt-frontend-simple-3.3.10"
-				MODULE="cxf-rt-frontend-simple-3.3.10.jar"
-				MVN="mvn:org.apache.cxf/cxf-rt-frontend-simple/3.3.10"
+				NAME="cxf-rt-frontend-simple-3.4.7"
+				MODULE="cxf-rt-frontend-simple-3.4.7.jar"
+				MVN="mvn:org.apache.cxf/cxf-rt-frontend-simple/3.4.7"
 				REQUIRED_IF="(API=='CXF')"
 			/>
 			<IMPORT
@@ -272,15 +272,15 @@ for(int i = 0; i &lt; result.length; i++){
 				REQUIRED_IF="(API=='CXF')"
 			/>
 			<IMPORT
-				NAME="cxf-tools-common-3.3.10"
-				MODULE="cxf-tools-common-3.3.10.jar"
-				MVN="mvn:org.apache.cxf/cxf-tools-common/3.3.10"
+				NAME="cxf-tools-common-3.4.7"
+				MODULE="cxf-tools-common-3.4.7.jar"
+				MVN="mvn:org.apache.cxf/cxf-tools-common/3.4.7"
 				REQUIRED_IF="(API=='CXF')"
 			/>
 			<IMPORT
-				NAME="cxf-rt-wsdl-3.3.10"
-				MODULE="cxf-rt-wsdl-3.3.10.jar"
-				MVN="mvn:org.apache.cxf/cxf-rt-wsdl/3.3.10"
+				NAME="cxf-rt-wsdl-3.4.7"
+				MODULE="cxf-rt-wsdl-3.4.7.jar"
+				MVN="mvn:org.apache.cxf/cxf-rt-wsdl/3.4.7"
 				REQUIRED_IF="(API=='CXF')"
 			/>
 			<IMPORT
@@ -296,27 +296,27 @@ for(int i = 0; i &lt; result.length; i++){
 				REQUIRED_IF="(API=='CXF')"
 			/>
 			<IMPORT
-				NAME="cxf-rt-bindings-soap-3.3.10"
-				MODULE="cxf-rt-bindings-soap-3.3.10.jar"
-				MVN="mvn:org.apache.cxf/cxf-rt-bindings-soap/3.3.10"
+				NAME="cxf-rt-bindings-soap-3.4.7"
+				MODULE="cxf-rt-bindings-soap-3.4.7.jar"
+				MVN="mvn:org.apache.cxf/cxf-rt-bindings-soap/3.4.7"
 				REQUIRED_IF="(API=='CXF')"
 			/>
 			<IMPORT
-				NAME="cxf-rt-databinding-jaxb-3.3.10"
-				MODULE="cxf-rt-databinding-jaxb-3.3.10.jar"
-				MVN="mvn:org.apache.cxf/cxf-rt-databinding-jaxb/3.3.10"
+				NAME="cxf-rt-databinding-jaxb-3.4.7"
+				MODULE="cxf-rt-databinding-jaxb-3.4.7.jar"
+				MVN="mvn:org.apache.cxf/cxf-rt-databinding-jaxb/3.4.7"
 				REQUIRED_IF="(API=='CXF')"
 			/>
 			<IMPORT
-				NAME="cxf-rt-transports-http-jetty-3.3.10"
-				MODULE="cxf-rt-transports-http-jetty-3.3.10.jar"
-				MVN="mvn:org.apache.cxf/cxf-rt-transports-http-jetty/3.3.10"
+				NAME="cxf-rt-transports-http-jetty-3.4.7"
+				MODULE="cxf-rt-transports-http-jetty-3.4.7.jar"
+				MVN="mvn:org.apache.cxf/cxf-rt-transports-http-jetty/3.4.7"
 				REQUIRED_IF="(API=='CXF')"
 			/>
 			<IMPORT
-				NAME="cxf-rt-transports-http-3.3.10"
-				MODULE="cxf-rt-transports-http-3.3.10.jar"
-				MVN="mvn:org.apache.cxf/cxf-rt-transports-http/3.3.10"
+				NAME="cxf-rt-transports-http-3.4.7"
+				MODULE="cxf-rt-transports-http-3.4.7.jar"
+				MVN="mvn:org.apache.cxf/cxf-rt-transports-http/3.4.7"
 				REQUIRED_IF="(API=='CXF')"
 			/>
 			<IMPORT
@@ -359,8 +359,8 @@ for(int i = 0; i &lt; result.length; i++){
 			/>
 			<IMPORT
 				NAME="talend-ws"
-				MODULE="talend-ws-1.0.5-20210629.jar"
-				MVN="mvn:org.talend.components/talend-ws/1.0.5-20210629"
+				MODULE="talend-ws-1.0.7-20220526.jar"
+				MVN="mvn:org.talend.components/talend-ws/1.0.7-20220526"
 				REQUIRED_IF="(API=='CXF')"
 			/>
 			<IMPORT

main/plugins/org.talend.designer.components.localprovider/components/tXMLMap/tXMLMap_java.skeleton

@@ -141,13 +141,13 @@ public class CLASS {
 			
 			boolean end = false;
 			
-			if(expression.indexOf("[")>-1) {
-				strBuilder.append(expression.substring(0, expression.indexOf("[")));
-				currentExpression = currentExpression.substring(currentExpression.indexOf("["), currentExpression.length());
+			if(expression.contains("[")) {
+				strBuilder.append(expression, 0, expression.indexOf("["));
+				currentExpression = currentExpression.substring(currentExpression.indexOf("["));
 				
 				while(currentExpression.length()>0 && !end) {
 					expression = this.getXPathExpression(currentExpression);
-					currentExpression = currentExpression.substring(expression.length(), currentExpression.length());
+					currentExpression = currentExpression.substring(expression.length());
 					matcherFromDoc = expressionFromDoc.matcher(expression);
 					if(matcherFromDoc.matches()) {
 						tmpXpath = expression.substring(1, expression.length()-1);
@@ -167,9 +167,9 @@ public class CLASS {
 					} else {
 						strBuilder.append(expression);
 					}
-					if(currentExpression.indexOf("[")>-1) {
-						strBuilder.append(currentExpression.substring(0, currentExpression.indexOf("[")));
-						currentExpression = currentExpression.substring(currentExpression.indexOf("["), currentExpression.length());
+					if(currentExpression.contains("[")) {
+						strBuilder.append(currentExpression, 0, currentExpression.indexOf("["));
+						currentExpression = currentExpression.substring(currentExpression.indexOf("["));
 					} else {
 						strBuilder.append(currentExpression);
 						end=true;
@@ -191,13 +191,16 @@ public class CLASS {
 					count++;
 				}
 				if(']' == c) {
-					if(count==1) {
+					if(count--==1) {
 						break;
 					}
-					count--;
 				}
 			}
-			return currentExpression.substring(0,i+1);
+			if (count == 0) {
+				return currentExpression.substring(0, i + 1);
+			} else { //not a valid XPathExpression, returning as is
+				return currentExpression;
+			}
 		}
 		
 	}

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

@@ -148,7 +148,11 @@ imports="
 <%
 		if (("oracle_id".equalsIgnoreCase(dbms))) {
 %>
-			if("LONG".equals(rsmd_<%=cid%>.getColumnTypeName(i).toUpperCase())) {
+			if("NUMBER".equalsIgnoreCase(rsmd_<%=cid%>.getColumnTypeName(i))) {
+				<% // a way to fix TDI-47895 %>
+				int length = rsmd_<%=cid%>.getPrecision(i);
+				dcm_<%=cid%>.setLength(length > 38 ? 38 : length);
+			} else if("LONG".equals(rsmd_<%=cid%>.getColumnTypeName(i).toUpperCase())) {
 				String length = MetadataTalendType.getDefaultDBTypes("oracle_id", "LONG", MetadataTalendType.DEFAULT_LENGTH);
 				if(length!=null && !("".equals(length))) {
 					dcm_<%=cid%>.setLength(Integer.parseInt(length));

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

@@ -33,21 +33,21 @@
         <!-- hd insight common libraries -->
         <libraryNeeded
             context="plugin:org.talend.libraries.apache.cxf"
-            id="cxf-rt-bindings-xml-3.3.10.jar"
-            name="cxf-rt-bindings-xml-3.3.10.jar"
-            mvn_uri="mvn:org.apache.cxf/cxf-rt-bindings-xml/3.3.10">
+            id="cxf-rt-bindings-xml-3.4.7.jar"
+            name="cxf-rt-bindings-xml-3.4.7.jar"
+            mvn_uri="mvn:org.apache.cxf/cxf-rt-bindings-xml/3.4.7">
         </libraryNeeded>
         <libraryNeeded
             context="plugin:org.talend.libraries.apache.cxf"
-            id="cxf-rt-frontend-jaxrs-3.3.10.jar"
-            name="cxf-rt-frontend-jaxrs-3.3.10.jar"
-            mvn_uri="mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/3.3.10">
+            id="cxf-rt-frontend-jaxrs-3.4.7.jar"
+            name="cxf-rt-frontend-jaxrs-3.4.7.jar"
+            mvn_uri="mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/3.4.7">
         </libraryNeeded>
         <libraryNeeded
             context="plugin:org.talend.libraries.apache.cxf"
-            id="cxf-rt-transports-http-3.3.10.jar"
-            name="cxf-rt-transports-http-3.3.10.jar"
-            mvn_uri="mvn:org.apache.cxf/cxf-rt-transports-http/3.3.10">
+            id="cxf-rt-transports-http-3.4.7.jar"
+            name="cxf-rt-transports-http-3.4.7.jar"
+            mvn_uri="mvn:org.apache.cxf/cxf-rt-transports-http/3.4.7">
         </libraryNeeded>
         <libraryNeeded
             context="plugin:org.talend.libraries.jackson"
@@ -178,9 +178,9 @@
                 id="HD_INSIGHT_COMMON_LIBRARIES_LATEST"
                 name="HD_INSIGHT_COMMON_LIBRARIES_LATEST">
             <library id="talend-bigdata-launcher-1.1.0-20160405.jar" />
-            <library id="cxf-rt-bindings-xml-3.3.10.jar" />
-            <library id="cxf-rt-frontend-jaxrs-3.3.10.jar" />
-            <library id="cxf-rt-transports-http-3.3.10.jar" />
+            <library id="cxf-rt-bindings-xml-3.4.7.jar" />
+            <library id="cxf-rt-frontend-jaxrs-3.4.7.jar" />
+            <library id="cxf-rt-transports-http-3.4.7.jar" />
             <library id="json_simple-1.1.jar" />
             <library id="javax.ws.rs-api-2.0-m10.jar" />
             <library id="wsdl4j-1.6.3.jar" />

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

@@ -113,7 +113,7 @@
 								<artifactItem>
 									<groupId>org.talend.components</groupId>
 									<artifactId>talend-ws</artifactId>
-									<version>1.0.5-20210629</version>
+									<version>1.0.7-20220526</version>
 									<type>jar</type>
 									<overWrite>true</overWrite>
 									<outputDirectory>${webservicecore.dir}</outputDirectory>

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/DesignerCoreService.java

@@ -29,6 +29,7 @@ import org.eclipse.jdt.ui.JavadocContentAccess;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IEditorReference;
 import org.eclipse.ui.IViewPart;
@@ -38,6 +39,7 @@ import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.part.MultiPageEditorPart;
 import org.talend.commons.CommonsPlugin;
 import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.ui.gmf.util.DisplayUtils;
 import org.talend.core.CorePlugin;
 import org.talend.core.model.components.ComponentCategory;
 import org.talend.core.model.components.IComponent;
@@ -270,8 +272,16 @@ public class DesignerCoreService implements IDesignerCoreService {
      */
     @Override
     public IProcess getCurrentProcess() {
-        IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-        if (!(editor instanceof AbstractMultiPageTalendEditor)) {
+        IEditorPart editor;
+        if (Display.getCurrent() == null) {
+            List<IEditorPart> list = new ArrayList<>();
+            DisplayUtils.getDisplay().syncExec(
+                    () -> list.add(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor()));
+            editor = list.get(0);
+        } else {
+            editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+        }
+        if (editor == null || !(editor instanceof AbstractMultiPageTalendEditor)) {
             return null;
         }
         IProcess process = ((AbstractMultiPageTalendEditor) editor).getProcess();

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/cmd/ChangeValuesFromRepository.java

@@ -510,7 +510,7 @@ public class ChangeValuesFromRepository extends ChangeMetadataCommand {
                                 }
                             }
 
-                            JobSettingVersionUtil.setDbVersion(elementParameter, dbVersion, false);
+                            JobSettingVersionUtil.setDbVersion(elementParameter, dbType, dbVersion, false);
                             DesignerUtilities.setSchemaDB(elementParameter2, param.getValue());
                         } else if (param.getFieldType().equals(EParameterFieldType.CLOSED_LIST)
                                 && "FRAMEWORK_TYPE".equals(param.getRepositoryValue())) { //$NON-NLS-1$

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/update/UpdateManagerUtils.java

@@ -58,6 +58,7 @@ import org.talend.core.model.properties.JobletProcessItem;
 import org.talend.core.model.properties.ProcessItem;
 import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.model.update.EUpdateItemType;
+import org.talend.core.model.update.EUpdateResult;
 import org.talend.core.model.update.IUpdateItemType;
 import org.talend.core.model.update.RepositoryUpdateManager;
 import org.talend.core.model.update.UpdateManagerHelper;
@@ -290,6 +291,28 @@ public final class UpdateManagerUtils {
     private static boolean doExecuteUpdates(final List<UpdateResult> results, final boolean updateAllJobs) {
         return doExecuteUpdates(results, updateAllJobs, false);
     }
+    
+    private static boolean isJobletUpdate(List<UpdateResult> results, String jobId) {
+        ProxyRepositoryFactory factory = ProxyRepositoryFactory.getInstance();
+        for (UpdateResult result : results) {
+            String id = result.getObjectId();
+            if (StringUtils.isEmpty(id)) {
+                if (result.getJob() != null && result.getJob() instanceof IProcess) {
+                    IProcess process = (IProcess) result.getJob();
+                    if (!(process instanceof IProcess2 && ERepositoryStatus.LOCK_BY_OTHER.equals(factory.getStatus(((IProcess2) process).getProperty().getItem())))) {
+                        id = process.getId();
+                    }
+                }
+            }
+
+            if (StringUtils.equals(id, jobId)) {
+                if (result.getResultType() == EUpdateResult.JOBLET_UPDATE) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
 
     private static boolean doExecuteUpdates(final List<UpdateResult> results, final boolean updateAllJobs,
             final boolean executeWithoutShow) {
@@ -365,6 +388,13 @@ public final class UpdateManagerUtils {
                                 try {
                                     if (checkOnlyLastVersion || version == null) {
                                         currentObj = factory.getLastVersion(currentId);
+                                        // if it is joblet update, need to check whether lastest version is inside update requests.
+                                        if (isJobletUpdate(results, currentId)) {
+                                            if (!jobIdToVersion.get(currentId).contains(currentObj.getVersion())) {
+                                                currentObj = null;
+                                            }
+                                        }
+                                        
                                     } else {
                                         List<IRepositoryViewObject> allVersion = factory.getAllVersion(currentId);
                                         for (IRepositoryViewObject obj : allVersion) {

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

@@ -139,9 +139,9 @@ public class StatsAndLogsConstants {
             "jtds-1.3.1-patch-20190523.jar", "mssql-jdbc.jar"};//$NON-NLS-1$  //$NON-NLS-2$
 
 
-    public static final String[] DB_VERSION_DISPLAY = new String[] {"Oracle 18 and above", "Oracle 12", "Oracle 11", "Oracle 10", "Oracle 9",
-            "Oracle 8", "MySQL 5", "MariaDB", "Open source JTDS", "Microsoft", "Access 2003", "Access 2007", "Prior to v9",
-            "v9 +", "Sybase 16 (SQL Anywhere)", "Sybase 16", "Sybase 12/15" };
+    public static final String[] DB_VERSION_DISPLAY = new String[] { "Oracle 18 and above", "Oracle 12", "Oracle 11", "Oracle 10",
+            "Oracle 9", "Oracle 8", "MySQL 8", "MySQL 5", "MariaDB", "Open source JTDS", "Microsoft", "Access 2003",
+            "Access 2007", "Prior to v9", "v9 +", "Sybase 16 (SQL Anywhere)", "Sybase 16", "Sybase 12/15" };
 
 
     public static final String[] DB_VERSION_CODE = new String[] {"ORACLE_18", "ORACLE_12", "ORACLE_11", "ORACLE_10", "ORACLE_9", "ORACLE_8",
@@ -174,7 +174,7 @@ public class StatsAndLogsConstants {
     public static final String[] PSQL_VERSION_CODE = new String[] {  "V9_X","PRIOR_TO_V9" }; //$NON-NLS-1$ //$NON-NLS-2$
 
     public static final String[] PSQL_VERSION_DRIVER = new String[] {
-            "postgresql-42.2.14.jar", "postgresql-8.4-703.jdbc4.jar" }; //$NON-NLS-1$ //$NON-NLS-2$
+            "postgresql-42.2.25.jar", "postgresql-8.4-703.jdbc4.jar" }; //$NON-NLS-1$ //$NON-NLS-2$
 
     public static final String[][] DISPLAY_DBNAMES = new String[][] { PERL_DISPLAY_DBNAMES, JAVA_DISPLAY_DBNAMES };
 

main/plugins/org.talend.designer.dbmap/src/main/java/org/talend/designer/dbmap/language/oracle/OracleGenerationManager.java

@@ -389,6 +389,9 @@ public class OracleGenerationManager extends DbGenerationManager {
                 List<IMetadataColumn> lColumn = metadataTable.getListColumns();
                 for (IMetadataColumn co : lColumn) {
                     String columnLabel = co.getOriginalDbColumnName();
+                    if (columnLabel == null) {
+                        columnLabel = co.getLabel();
+                    }
                     String exp = MetadataToolHelper.validateValueNoLengthLimit(columnLabel);
                     if (!exp.equals(columnLabel)) {
                         specialList.add(columnLabel);

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

@@ -81,10 +81,8 @@ public class InputTable extends AbstractInOutTable {
      */
     @Override
     public void initFromExternalData(ExternalDbMapTable externalMapperTable) {
-        if(connection != null) {
-            setMetadataTable(connection.getTable());
-        }else {
-            setMetadataTable(this.metadataTable);
+        if(connection != null && connection.getTable() != null) {
+            setMetadataTable(connection.getTable().clone());
         }
         super.initFromExternalData(externalMapperTable);
 

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

@@ -323,5 +323,31 @@
 			    </plugins>
 			</build>
 		</profile>
+		<profile>
+		    <id>include-microservice-prometheus-dependencies</id>
+		    <activation>
+		        <property>
+		            <name>studio.prometheus.metrics</name>
+		            <value>true</value>
+		        </property>
+		    </activation>
+		    <dependencies>
+		        <dependency>
+		            <groupId>io.micrometer</groupId>
+		            <artifactId>micrometer-registry-prometheus</artifactId>
+		            <version>1.8.0</version>
+		            </dependency>
+		        <dependency>
+		            <groupId>io.prometheus.jmx</groupId>
+		            <artifactId>collector</artifactId>
+		            <version>0.16.1</version>
+		        </dependency>
+		        <dependency>
+		            <groupId>org.springframework.boot</groupId>
+		            <artifactId>spring-boot-starter-security</artifactId>
+		            <version>2.6.8</version>
+		        </dependency>
+		    </dependencies>
+		</profile>
 	</profiles>
 </project>

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

@@ -57,6 +57,7 @@ import org.talend.core.language.ICodeProblemsChecker;
 import org.talend.core.model.components.ComponentCategory;
 import org.talend.core.model.general.ModuleNeeded;
 import org.talend.core.model.general.Project;
+import org.talend.core.model.general.RetrieveResult;
 import org.talend.core.model.general.TalendJobNature;
 import org.talend.core.model.process.IContext;
 import org.talend.core.model.process.IProcess;
@@ -397,17 +398,21 @@ public class DefaultRunProcessService implements IRunProcessService {
      * org.talend.designer.runprocess.IRunProcessService#updateLibraries(org.talend.core.model.properties.RoutineItem)
      */
     @Override
-    public void updateLibraries(Item routineItem) {
+    public boolean updateLibraries(Item routineItem) {
         Set<ModuleNeeded> modulesForRoutine = ModulesNeededProvider.updateModulesNeededForRoutine(routineItem);
         File libDir = getJavaProjectLibFolder().getLocation().toFile();
         if (libDir == null) {
-            return;
+            return false;
         }
         ILibraryManagerService repositoryBundleService = CorePlugin.getDefault().getRepositoryBundleService();
-        repositoryBundleService.retrieve(ERepositoryObjectType.getItemType(routineItem), modulesForRoutine,
-                libDir.getAbsolutePath(), true);
+        RetrieveResult result = repositoryBundleService.retrieveModules(ERepositoryObjectType.getItemType(routineItem),
+                modulesForRoutine, libDir.getAbsolutePath(), true);
         repositoryBundleService.installModules(modulesForRoutine, null);
-        CorePlugin.getDefault().getLibrariesService().checkLibraries();
+        boolean updated = !result.getResovledModules().isEmpty();
+        if (updated) {
+            CorePlugin.getDefault().getLibrariesService().checkLibraries();
+        }
+        return updated;
     }
 
     /*

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

@@ -212,8 +212,8 @@ public class RunProcessService implements IRunProcessService {
      * org.talend.designer.runprocess.IRunProcessService#updateLibraries(org.talend.core.model.properties.RoutineItem)
      */
     @Override
-    public void updateLibraries(Item routineItem) {
-        delegateService.updateLibraries(routineItem);
+    public boolean updateLibraries(Item routineItem) {
+        return delegateService.updateLibraries(routineItem);
     }
 
     @Override

main/plugins/org.talend.designer.runprocess/src/main/java/org/talend/designer/runprocess/maven/MavenJavaProcessor.java

@@ -392,7 +392,7 @@ public class MavenJavaProcessor extends JavaProcessor {
         boolean isRoutelet =
             ERepositoryObjectType.PROCESS_ROUTELET != null && getProperty() != null && getProperty().getItem() != null
                         && ERepositoryObjectType.PROCESS_ROUTELET.equals(ERepositoryObjectType.getType(getProperty()));
-        if ((!isMainJob && isGoalInstall) || isRoutelet) {
+        if (!isMainJob && (isGoalInstall || isRoutelet)) {
             if (!buildCacheManager.isJobBuild(getProperty())) {
                 deleteExistedJobJarFile(talendJavaProject);
                 String buildType = getBuildType(getProperty());

main/plugins/org.talend.libraries.hadoop.mapr.5.0.0/plugin.xml

@@ -174,6 +174,12 @@
             id="talend-spark-assembly-1.3.1-hadoop2.5.1-mapr-1501.jar"       
             name="talend-spark-assembly-1.3.1-hadoop2.5.1-mapr-1501.jar" mvn_uri="mvn:org.talend.libraries/talend-spark-assembly-1.3.1-hadoop2.5.1-mapr-1501/6.0.0">
         </libraryNeeded>
+        <libraryNeeded
+            context="plugin:org.talend.libraries.hadoop.mapr.5.0.0"
+            id="reload4j-1.2.19.jar"
+            name="reload4j-1.2.19.jar" mvn_uri="mvn:ch.qos.reload4j/reload4j/1.2.19/jar">
+        </libraryNeeded>
+        
         <libraryNeededGroup
               description="The lastest HDFS libraries of MAPR50X"
               id="HDFS-LIB-MAPR50X_LASTEST"
@@ -200,7 +206,7 @@
                  id="protobuf-java-2.5.0.jar">
            </library>
            <library
-                 id="log4j-1.2.17.jar">
+                 id="reload4j-1.2.19.jar">
            </library>
            <library
                  id="slf4j-api-1.7.5.jar">

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

@@ -3710,6 +3710,15 @@
               name="XSLTCheckCacheFileInMemoryTask"
               version="7.3.1">
         </projecttask>
+        <projecttask
+              beforeLogon="false"
+              breaks="7.3.0"
+              class="org.talend.repository.model.migration.RenameTimeoutParameterstRESTClient"
+              description="Rename timeout parameters for tRESTClient"
+              id="org.talend.repository.model.migration.RenameTimeoutParameterstRESTClient"
+              name="RenameTimeoutParameterstRESTClient"
+              version="7.3.1">
+        </projecttask>
    </extension>
 
    <extension

main/plugins/org.talend.repository/resources/osgi-exclude.properties

@@ -24,6 +24,7 @@ woodstox-core-asl
 
 # MSSQL
 jtds
+mssql-jdbc
 
 # tdm-lib-di
 tdm-lib-di

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

@@ -0,0 +1,85 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+
+package org.talend.repository.model.migration;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+
+import org.eclipse.emf.common.util.EList;
+import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.exception.PersistenceException;
+import org.talend.core.model.migration.AbstractJobMigrationTask;
+import org.talend.core.model.properties.Item;
+import org.talend.core.repository.model.ProxyRepositoryFactory;
+import org.talend.designer.core.model.utils.emf.talendfile.ElementParameterType;
+import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
+import org.talend.designer.core.model.utils.emf.talendfile.ProcessType;
+
+/**
+ * Rename timeout parameters for tRESTClient
+ */
+public class RenameTimeoutParameterstRESTClient extends AbstractJobMigrationTask {
+
+	@Override
+	public ExecutionResult execute(Item item) {
+		ProcessType processType = getProcessType(item);
+		if (processType == null) {
+			return ExecutionResult.NOTHING_TO_DO;
+		}
+		try {
+			renameConnections(item, processType);
+			return ExecutionResult.SUCCESS_WITH_ALERT;
+		} catch (Exception e) {
+			ExceptionHandler.process(e);
+			return ExecutionResult.FAILURE;
+		}
+	}
+
+
+	private void renameConnections(Item item, ProcessType processType) throws PersistenceException {
+		
+        ProxyRepositoryFactory factory = ProxyRepositoryFactory.getInstance();
+        boolean modified = false;
+        EList nodes = processType.getNode();
+        for (Object n : nodes) {
+            NodeType type = (NodeType) n;
+            if (type.getComponentName().equals("tRESTClient")) {
+                EList elementParameterList = type.getElementParameter();
+                for (Object elem : elementParameterList) {
+                    ElementParameterType elemType = (ElementParameterType) elem;
+                    if (elemType.getName().equals("CONNECTION_TIMEOUT_DESC")) {
+                        elemType.setValue("");
+                        modified = true;
+                    }
+                    if (elemType.getName().equals("RECEIVE_TIMEOUT_DESC")) {
+                        elemType.setValue("(See tRESTClient doc. to configure timeouts for Talend Runtime)");
+                        modified = true;
+                    }
+                }
+            }
+        }
+        
+		if (modified) {
+			factory.save(item, true);
+		}
+
+	}
+	
+	public Date getOrder() {
+        GregorianCalendar gc = new GregorianCalendar(2022, Calendar.APRIL, 21, 17, 0, 0);
+		return gc.getTime();
+	}
+
+}

main/plugins/org.talend.repository/src/main/java/org/talend/repository/ui/actions/routines/AbstractRoutineAction.java

@@ -13,6 +13,9 @@
 package org.talend.repository.ui.actions.routines;
 
 import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.ui.IEditorPart;
@@ -26,11 +29,15 @@ import org.talend.core.context.Context;
 import org.talend.core.context.RepositoryContext;
 import org.talend.core.language.ECodeLanguage;
 import org.talend.core.model.properties.RoutineItem;
+import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.repository.model.ProxyRepositoryFactory;
 import org.talend.core.repository.ui.editor.RepositoryEditorInput;
 import org.talend.designer.codegen.ICodeGeneratorService;
 import org.talend.designer.codegen.ITalendSynchronizer;
+import org.talend.designer.maven.tools.AggregatorPomsHelper;
+import org.talend.designer.maven.tools.CodeM2CacheManager;
 import org.talend.repository.ProjectManager;
+import org.talend.repository.RepositoryPlugin;
 import org.talend.repository.i18n.Messages;
 import org.talend.repository.model.RepositoryNode;
 import org.talend.repository.ui.actions.AContextualAction;
@@ -138,4 +145,23 @@ public abstract class AbstractRoutineAction extends AContextualAction {
         repositoryNode = (RepositoryNode) o;
     }
 
+    void updateRoutineProject() {
+        Job job = new Job("Update Routine project") {
+            
+            @Override
+            protected IStatus run(IProgressMonitor monitor) {
+                try {
+                    new AggregatorPomsHelper().updateCodeProject(monitor, ERepositoryObjectType.ROUTINES, true, true, false);
+                    return org.eclipse.core.runtime.Status.OK_STATUS;
+                } catch (Exception e) {
+                    return new org.eclipse.core.runtime.Status(IStatus.ERROR, RepositoryPlugin.PLUGIN_ID, 1, e.getMessage(),
+                            e);
+                }
+            }
+            
+        };
+        job.setUser(false);
+        job.schedule();
+    }
+
 }

main/plugins/org.talend.repository/src/main/java/org/talend/repository/ui/actions/routines/EditRoutineAction.java

@@ -106,7 +106,9 @@ public class EditRoutineAction extends AbstractRoutineAction {
             openRoutineEditor(routineItem, false);
             refresh(repositoryNode);
             // CorePlugin.getDefault().getLibrariesService().resetModulesNeeded();
-            CorePlugin.getDefault().getRunProcessService().updateLibraries(routineItem);
+            if (CorePlugin.getDefault().getRunProcessService().updateLibraries(routineItem)) {
+                updateRoutineProject();
+            }
         } catch (PartInitException e) {
             MessageBoxExceptionHandler.process(e);
         } catch (SystemException e) {

main/plugins/org.talend.repository/src/main/java/org/talend/repository/ui/actions/routines/ReadRoutineAction.java

@@ -97,7 +97,9 @@ public class ReadRoutineAction extends AbstractRoutineAction {
         routineItem = (RoutineItem) repositoryNode.getObject().getProperty().getItem();
         try {
             openRoutineEditor(routineItem, true);
-            CorePlugin.getDefault().getRunProcessService().updateLibraries(routineItem);
+            if (CorePlugin.getDefault().getRunProcessService().updateLibraries(routineItem)) {
+                updateRoutineProject();
+            }
         } catch (PartInitException e) {
             MessageBoxExceptionHandler.process(e);
         } catch (SystemException e) {

main/plugins/org.talend.repository/src/main/java/org/talend/repository/ui/login/LoginComposite.java

@@ -2708,7 +2708,7 @@ public class LoginComposite extends Composite {
 
                 @Override
                 public void linkActivated(HyperlinkEvent e) {
-                    String url = "https://help.talend.com/pages/viewpage.action?pageId=14230347";
+                    String url = "https://document-link.us.cloud.talend.com/ts_ig_install-external-modules?version=73&lang=en&env=prd";
                     TalendBrowserLaunchHelper.openURL(url);
                 }
             });

main/plugins/org.talend.repository/src/main/java/org/talend/repository/ui/login/LoginProjectPage.java

@@ -2712,7 +2712,7 @@ public class LoginProjectPage extends AbstractLoginActionPage {
 
                 @Override
                 public void linkActivated(HyperlinkEvent e) {
-                    String url = "https://help.talend.com/pages/viewpage.action?pageId=14230347";
+                    String url = "https://document-link.us.cloud.talend.com/ts_ig_install-external-modules?version=73&lang=en&env=prd";
                     TalendBrowserLaunchHelper.openURL(url);
                 }
             });

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

@@ -13,6 +13,7 @@
 package org.talend.repository.ui.wizards.exportjob.handler;
 
 import java.io.File;
+import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -71,6 +72,7 @@ import org.talend.designer.maven.tools.BuildCacheManager;
 import org.talend.designer.runprocess.IProcessor;
 import org.talend.designer.runprocess.ProcessorUtilities;
 import org.talend.model.bridge.ReponsitoryContextBridge;
+import org.talend.repository.ProjectManager;
 import org.talend.repository.documentation.ExportFileResource;
 import org.talend.repository.local.ExportItemUtil;
 import org.talend.repository.model.IProxyRepositoryFactory;
@@ -88,7 +90,6 @@ public class BuildJobHandler extends AbstractBuildJobHandler {
 
     public BuildJobHandler(ProcessItem processItem, String version, String contextName, Map<ExportChoice, Object> exportChoiceMap) {
         super(processItem, version, contextName, exportChoiceMap);
-
         setProjectNameLowerCase(true);
         ProcessorUtilities.setExportConfig(JavaUtils.JAVA_APP_NAME, null, null);
     }
@@ -380,60 +381,70 @@ public class BuildJobHandler extends AbstractBuildJobHandler {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(ITDQItemService.class)) {
             ITDQItemService tdqItemService = (ITDQItemService) GlobalServiceRegister.getDefault().getService(
                     ITDQItemService.class);
+            List<Project> initProList = new ArrayList<>();
             for (Item item : items) {
-                if (tdqItemService != null && tdqItemService.hasProcessItemDependencies(Arrays.asList(new Item[] { item }))) {
-                    setNeedItemDependencies(true);
-                    // add .Talend.definition file
-                    String defIdxFolderName = "TDQ_Libraries"; //$NON-NLS-1$
-                    String defIdxFileName = ".Talend.definition"; //$NON-NLS-1$
-                    Project pro = getProject(processItem);
-                    IFolder itemsProjectFolder = parentFolder.getFolder(pro.getTechnicalLabel().toLowerCase());
-                    File itemsFolderDir = new File(parentFolder.getLocation().toFile().getAbsolutePath());
-                    IProject project = ReponsitoryContextBridge.getRootProject();
-                    String defIdxRelativePath = defIdxFolderName + PATH_SEPARATOR + defIdxFileName;
-                    IFile defIdxFile = project.getFile(defIdxRelativePath);
-                    if (defIdxFile.exists()) {
-                        File defIdxFileSource = new File(project.getLocation().makeAbsolute().append(defIdxFolderName)
-                                .append(defIdxFileName).toFile().toURI());
-                        File defIdxFileTarget = new File(itemsProjectFolder.getFile(defIdxRelativePath).getLocation().toFile()
-                                .getAbsolutePath());
-                        FilesUtils.copyFile(defIdxFileSource, defIdxFileTarget);
-                    }
-                    // add report header image & template files
-                    String reportingBundlePath = PluginChecker.getBundlePath("org.talend.dataquality.reporting"); //$NON-NLS-1$
-                    File imageFolder = new File(reportingBundlePath + PATH_SEPARATOR + "images"); //$NON-NLS-1$
-                    if (imageFolder.exists()) {
-                        FilesUtils.copyDirectory(imageFolder, itemsFolderDir);
-                    }
-                    File templateFolder = new File(reportingBundlePath + PATH_SEPARATOR + "reports"); //$NON-NLS-1$
-                    if (templateFolder.exists() && templateFolder.isDirectory()) {
-                        FilesUtils.copyDirectory(templateFolder, itemsFolderDir);
-                    }
-                    // TDQ-10842 msjian: consider user defined report template files
-                    String reportTemplateFolderName = "JRXML Template"; //$NON-NLS-1$
-                    String reportTemplateFolderPath = defIdxFolderName + PATH_SEPARATOR + reportTemplateFolderName;
-                    IFolder reportFolder = project.getFolder(reportTemplateFolderPath);
-                    if (reportFolder.exists()) {
-                        File reportFileSource = new File(project
-                                .getLocation()
-                                .makeAbsolute()
-                                .append(defIdxFolderName)
-                                .append(reportTemplateFolderName)
-                                .toFile()
-                                .toURI());
-                        File reportFileTarget = new File(itemsProjectFolder
-                                .getFile(defIdxFolderName)
-                                .getLocation()
-                                .toFile()
-                                .getAbsolutePath());
-                        FilesUtils.copyDirectory(reportFileSource, reportFileTarget);
-                    }
-                    // TDQ-10842~
+                if (PluginChecker.isRefProjectLoaded() && ProjectManager.getInstance().getAllReferencedProjects().size() > 0) {
+                    handleMulitProjectCase(parentFolder, initProList, item);
+                } else {
+                    handleSingleProjectCase(parentFolder, tdqItemService, item);
                 }
             }
         }
     }
 
+    private void handleMulitProjectCase(IFolder parentFolder, List<Project> initProList, Item item) throws IOException {
+        Project pro = ProjectManager.getInstance().getProject(item);
+        if (!initProList.contains(pro)) {
+            initProList.add(pro);
+            copyDQSystemFile(parentFolder, pro);
+        }
+
+    }
+
+    protected void copyDQSystemFile(IFolder parentFolder, Project pro) throws IOException {
+        setNeedItemDependencies(true);
+        // add .Talend.definition file
+        String defIdxFolderName = "TDQ_Libraries"; //$NON-NLS-1$
+        String defIdxFileName = ".Talend.definition"; //$NON-NLS-1$
+        IFolder itemsProjectFolder = parentFolder.getFolder(pro.getTechnicalLabel().toLowerCase());
+        File itemsFolderDir = new File(parentFolder.getLocation().toFile().getAbsolutePath());
+        IProject project = ReponsitoryContextBridge.findProject(pro.getTechnicalLabel());
+        String defIdxRelativePath = defIdxFolderName + PATH_SEPARATOR + defIdxFileName;
+        IFile defIdxFile = project.getFile(defIdxRelativePath);
+        if (defIdxFile.exists()) {
+            File defIdxFileSource = new File(project.getLocation().makeAbsolute().append(defIdxFolderName).append(defIdxFileName).toFile().toURI());
+            File defIdxFileTarget = new File(itemsProjectFolder.getFile(defIdxRelativePath).getLocation().toFile().getAbsolutePath());
+            FilesUtils.copyFile(defIdxFileSource, defIdxFileTarget);
+        }
+        // add report header image & template files
+        String reportingBundlePath = PluginChecker.getBundlePath("org.talend.dataquality.reporting"); //$NON-NLS-1$
+        File imageFolder = new File(reportingBundlePath + PATH_SEPARATOR + "images"); //$NON-NLS-1$
+        if (imageFolder.exists()) {
+            FilesUtils.copyDirectory(imageFolder, itemsFolderDir);
+        }
+        File templateFolder = new File(reportingBundlePath + PATH_SEPARATOR + "reports"); //$NON-NLS-1$
+        if (templateFolder.exists() && templateFolder.isDirectory()) {
+            FilesUtils.copyDirectory(templateFolder, itemsFolderDir);
+        }
+        // TDQ-10842 msjian: consider user defined report template files
+        String reportTemplateFolderName = "JRXML Template"; //$NON-NLS-1$
+        String reportTemplateFolderPath = defIdxFolderName + PATH_SEPARATOR + reportTemplateFolderName;
+        IFolder reportFolder = project.getFolder(reportTemplateFolderPath);
+        if (reportFolder.exists()) {
+            File reportFileSource = new File(project.getLocation().makeAbsolute().append(defIdxFolderName).append(reportTemplateFolderName).toFile().toURI());
+            File reportFileTarget = new File(itemsProjectFolder.getFile(defIdxFolderName).getLocation().toFile().getAbsolutePath());
+            FilesUtils.copyDirectory(reportFileSource, reportFileTarget);
+        }
+        // TDQ-10842~
+    }
+
+    private void handleSingleProjectCase(IFolder parentFolder, ITDQItemService tdqItemService, Item item) throws IOException {
+        Project pro = getProject(processItem);
+        if (tdqItemService != null && tdqItemService.hasProcessItemDependencies(Arrays.asList(new Item[] { item }))) {
+            copyDQSystemFile(parentFolder, pro);
+        }
+    }
+
     @Override
     public void build(IProgressMonitor monitor) throws Exception {
         final IWorkspaceRunnable runnable = new IWorkspaceRunnable() {

main/plugins/org.talend.repository/src/main/java/org/talend/repository/ui/wizards/exportjob/scriptsmanager/esb/JobJavaScriptOSGIForESBManager.java

@@ -81,6 +81,7 @@ import org.talend.core.runtime.maven.MavenArtifact;
 import org.talend.core.runtime.maven.MavenConstants;
 import org.talend.core.runtime.process.ITalendProcessJavaProject;
 import org.talend.core.runtime.process.LastGenerationInfo;
+import org.talend.core.runtime.process.TalendProcessOptionConstants;
 import org.talend.core.runtime.repository.build.BuildExportManager;
 import org.talend.core.service.ITaCoKitDependencyService;
 import org.talend.core.ui.branding.IBrandingService;
@@ -1242,6 +1243,13 @@ public class JobJavaScriptOSGIForESBManager extends JobJavaScriptsManager {
         return analyzer;
     }
 
+    private boolean usesMssql(ProcessItem processItem) {
+        IDesignerCoreService service = CorePlugin.getDefault().getDesignerCoreService();
+        return service.getProcessFromProcessItem(processItem, false)
+                .getNeededLibraries(TalendProcessOptionConstants.MODULES_DEFAULT).stream()
+                .anyMatch(lib -> lib.matches("mssql-jdbc.jar"));
+    }
+    
     protected void addOsgiDependencies(Analyzer analyzer, ExportFileResource libResource, ProcessItem processItem)
             throws IOException {
         analyzer.setProperty(Analyzer.EXPORT_SERVICE, "routines.system.api.TalendJob;name=" + processItem.getProperty().getLabel() + ";type=" + "job");
@@ -1305,7 +1313,10 @@ public class JobJavaScriptOSGIForESBManager extends JobJavaScriptsManager {
             importPackages.add("org.talend.cloud"); //$NON-NLS-1$
         }
 
-
+        if(usesMssql(processItem)) {
+            importPackages.add("com.microsoft.sqlserver.jdbc");
+        }
+        
         if (requireBundle != null && !requireBundle.isEmpty()) {
             requireBundle += (", org.ops4j.pax.logging.pax-logging-api");
         } else {

test/plugins/org.talend.designer.dbmap.test/src/org/talend/designer/dbmap/external/data/converter/ExternalDataConverterTest.java

@@ -0,0 +1,123 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.designer.dbmap.external.data.converter;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+import org.talend.core.model.components.ComponentCategory;
+import org.talend.core.model.components.IComponent;
+import org.talend.core.model.components.IODataComponent;
+import org.talend.core.model.metadata.IMetadataColumn;
+import org.talend.core.model.metadata.IMetadataTable;
+import org.talend.core.model.metadata.MetadataColumn;
+import org.talend.core.model.metadata.MetadataTable;
+import org.talend.core.model.process.EConnectionType;
+import org.talend.core.model.process.INodeConnector;
+import org.talend.core.ui.component.ComponentsFactoryProvider;
+import org.talend.designer.core.model.components.ElementParameter;
+import org.talend.designer.core.model.components.NodeConnector;
+import org.talend.designer.core.ui.editor.connections.Connection;
+import org.talend.designer.core.ui.editor.nodes.Node;
+import org.talend.designer.core.ui.editor.process.Process;
+import org.talend.designer.dbmap.DbMapComponent;
+import org.talend.designer.dbmap.external.connection.IOConnection;
+import org.talend.designer.dbmap.external.converter.ExternalDataConverter;
+import org.talend.designer.dbmap.external.data.ExternalDbMapData;
+import org.talend.designer.dbmap.external.data.ExternalDbMapEntry;
+import org.talend.designer.dbmap.external.data.ExternalDbMapTable;
+import org.talend.designer.dbmap.managers.MapperManager;
+import org.talend.designer.dbmap.managers.MapperManagerTest;
+import org.talend.designer.dbmap.model.table.InputTable;
+
+public class ExternalDataConverterTest {
+
+    private static final String SOURCE_COMPONENT_NAME = "tELTOracleInput";
+
+    private static final String TARGET_COMPONENT_NAME = "tELTOracleMap";
+
+    @Test
+    public void testPrepareInputTables() {
+        ExternalDbMapData data = new ExternalDbMapData();
+        ExternalDbMapTable externalDbMapTable = new ExternalDbMapTable();
+        externalDbMapTable.setName("table");
+
+        List<ExternalDbMapEntry> entrys = new ArrayList<ExternalDbMapEntry>();
+        externalDbMapTable.setMetadataTableEntries(entrys);
+        ExternalDbMapEntry c1Entry = new ExternalDbMapEntry();
+        c1Entry.setName("c1");
+        externalDbMapTable.getMetadataTableEntries().add(c1Entry);
+
+        ExternalDbMapEntry c3Entry = new ExternalDbMapEntry();
+        c3Entry.setName("c3");
+        externalDbMapTable.getMetadataTableEntries().add(c3Entry);
+        data.getInputTables().add(externalDbMapTable);
+
+        IComponent sourceComponent = ComponentsFactoryProvider.getInstance().get(SOURCE_COMPONENT_NAME,
+                ComponentCategory.CATEGORY_4_DI.getName());
+        IComponent targetComponent = ComponentsFactoryProvider.getInstance().get(TARGET_COMPONENT_NAME,
+                ComponentCategory.CATEGORY_4_DI.getName());
+
+        Process process = new Process(MapperManagerTest.createProperty());
+        Node sourceNode = new Node(sourceComponent, process);
+        INodeConnector connector = new NodeConnector(sourceNode);
+        connector.setName("connector");
+        connector.setDefaultConnectionType(EConnectionType.FLOW_MAIN);
+        ArrayList<INodeConnector> connectors = new ArrayList<INodeConnector>();
+        connectors.add(connector);
+        sourceNode.setListConnector(connectors);
+
+        Node targetNode = new Node(targetComponent, process);
+        DbMapComponent dbMapComponent = new DbMapComponent();
+
+        List<ElementParameter> elementParameters = new ArrayList<ElementParameter>();
+        ElementParameter ele = new ElementParameter(targetNode);
+        ele.setName("COMPONENT_NAME");
+        ele.setValue(TARGET_COMPONENT_NAME);
+        elementParameters.add(ele);
+        dbMapComponent.setElementParameters(elementParameters);
+
+        targetNode.setExternalNode(dbMapComponent);
+        Connection connection = new Connection(sourceNode, targetNode, EConnectionType.FLOW_MAIN, "connector", "meta", "table",
+                true);
+
+        IODataComponent component = new IODataComponent(connection);
+        IMetadataTable metadataTable = new MetadataTable();
+        metadataTable.setTableName("table");
+
+        IMetadataColumn c1 = new MetadataColumn();
+        c1.setLabel("c1");
+        metadataTable.getListColumns().add(c1);
+
+        IMetadataColumn c2 = new MetadataColumn();
+        c2.setLabel("c2");
+        metadataTable.getListColumns().add(c2);
+        component.setTable(metadataTable);
+
+        IOConnection ioConnection = new IOConnection(component);
+        List<IOConnection> inputConnections = new ArrayList<IOConnection>();
+        inputConnections.add(ioConnection);
+
+        MapperManager mapperManager = new MapperManager(dbMapComponent);
+        ExternalDataConverter converter = new ExternalDataConverter(mapperManager);
+
+        ArrayList<InputTable> inputTables = converter.prepareInputTables(inputConnections, data);
+
+        assertEquals(inputTables.size(), 1);
+        assertEquals(inputTables.get(0).getColumnEntries().size(), 3);
+        assertEquals(metadataTable.getListColumns().size(), 2);
+    }
+}

test/plugins/org.talend.designer.dbmap.test/src/org/talend/designer/dbmap/managers/MapperManagerTest.java

@@ -209,7 +209,7 @@ public class MapperManagerTest {
         assertEquals(expressionValue + ".column", outputs.get(0).getMetadataTableEntries().get(0).getExpression());
     }
 
-    private static Property createProperty() {
+    public static Property createProperty() {
         Property property = PropertiesFactory.eINSTANCE.createProperty();
         property.setAuthor(((RepositoryContext) CorePlugin.getContext().getProperty(Context.REPOSITORY_CONTEXT_KEY)).getUser());
         property.setVersion(VersionUtils.DEFAULT_VERSION);

test/plugins/org.talend.repository.test/src/org/talend/repository/handler/BuildJobHandlerTest.java

@@ -339,9 +339,9 @@ public class BuildJobHandlerTest {
                     }
                 }
                 assertTrue("Not TDM item", isTDM);
-
                 ZipEntry tdmSettingEntry = zip.getEntry(
-                        jobName + "/items/" + technicalLabel.toLowerCase() + "/.settings/com.oaklandsw.base.projectProps");
+                        jobName + "/items/" + technicalLabel.toLowerCase()
+                                + "/.settings/com.oaklandsw.base.projectProps");
                 assertNotNull("Can't export tdm rightly", tdmSettingEntry);
                 // the __tdm has been moved into job jar. so need test it in jar.
                 // testbuildWithXXX_0_1.jar!/__tdm/...