added bigger timeout

fix(TDQ-19435): fix a NPE (#7663 )
fix(TDQ-19623): make sure project name never force lowercase (#7661 )
2022-06-20 17:51:57 +03:00 · 2022-06-20 10:01:55 +08:00 · 2022-06-17 10:17:23 +08:00 · 2022-06-16 12:52:54 +03:00 · 2022-06-15 18:18:37 +08:00 · 2022-06-14 22:21:51 +03:00
198 changed files with 2447 additions and 596 deletions
--- a/main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/pom.xml
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.talend.components</groupId>
 	<artifactId>talend-mscrm</artifactId>
-	<version>3.11-20220401</version>
+	<version>3.12-20220513</version>
 	<packaging>jar</packaging>

 	<name>talend-mscrm</name>
@@ -34,7 +34,7 @@
 		<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
 		<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
 	</properties>
-	
+
 	<repositories>
 		<repository>
 			<id>talend_nexus_deployment</id>
@@ -69,7 +69,7 @@
 			</releases>
 		</repository>
 	</distributionManagement>
-	
+
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.axis2</groupId>
@@ -102,7 +102,7 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		
+
 		<dependency>
            <groupId>org.apache.olingo</groupId>
            <artifactId>odata-client-core</artifactId>
@@ -144,11 +144,6 @@
            <version>${junit.version}</version>
            <scope>test</scope>
        </dependency>
-        <dependency>
-	    <groupId>com.microsoft.azure</groupId>
-            <artifactId>adal4j</artifactId>
-            <version>${adal4j.version}</version>
-        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-core</artifactId>
@@ -164,6 +159,17 @@
            <artifactId>jackson-annotations</artifactId>
            <version>${jackson.version}</version>
        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>msal4j</artifactId>
+            <version>1.11.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.9.0</version>
+        </dependency>
+
 	</dependencies>
 	<build>
 		<resources>
--- a/main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/src/main/java/com/microsoft/aad/msal4j/OauthClientApplication.java
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/src/main/java/com/microsoft/aad/msal4j/OauthClientApplication.java
@@ -0,0 +1,164 @@
+package com.microsoft.aad.msal4j;
+
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import org.slf4j.LoggerFactory;
+import com.nimbusds.oauth2.sdk.ParseException;
+import com.nimbusds.oauth2.sdk.auth.ClientAuthentication;
+import com.nimbusds.oauth2.sdk.auth.ClientAuthenticationMethod;
+import com.nimbusds.oauth2.sdk.auth.ClientSecretPost;
+import com.nimbusds.oauth2.sdk.auth.PrivateKeyJWT;
+import com.nimbusds.oauth2.sdk.auth.Secret;
+import com.nimbusds.oauth2.sdk.id.ClientID;
+import static com.microsoft.aad.msal4j.ParameterValidationUtils.validateNotNull;
+
+public class OauthClientApplication extends AbstractClientApplicationBase implements IConfidentialClientApplication {
+
+    private ClientAuthentication clientAuthentication;
+    private CustomJWTAuthentication customJWTAuthentication;
+    private boolean clientCertAuthentication = false;
+    private ClientCertificate clientCertificate;
+    private boolean sendX5c;
+    private final String username;
+    private final String password;
+
+    private OauthClientApplication(OauthClientApplication.Builder builder) {
+        super(builder);
+        validateNotNull("username", builder.username);
+        validateNotNull("password", builder.password);
+        sendX5c = builder.sendX5c;
+        log = LoggerFactory.getLogger(ConfidentialClientApplication.class);
+        initClientAuthentication(builder.clientCredential);
+        this.username = builder.username;
+        this.password = builder.password;
+    }
+
+    @Override
+    public CompletableFuture<IAuthenticationResult> acquireToken(ClientCredentialParameters parameters) {
+        validateNotNull("parameters", parameters);
+
+        RequestContext context = new RequestContext(this, PublicApi.ACQUIRE_TOKEN_FOR_CLIENT, parameters);
+        OauthCredentialRequest clientCredentialRequest = new OauthCredentialRequest(parameters,
+                username, password,this, context);
+
+        return this.executeRequest(clientCredentialRequest);
+    }
+
+    @Override
+    public CompletableFuture<IAuthenticationResult> acquireToken(OnBehalfOfParameters parameters) {
+        throw new IllegalStateException("Use ConfidentialClientApplication instead");
+    }
+
+    private void initClientAuthentication(IClientCredential clientCredential) {
+        validateNotNull("clientCredential", clientCredential);
+        if (clientCredential instanceof ClientSecret) {
+            clientAuthentication = new ClientSecretPost(new ClientID(clientId()), new Secret(((ClientSecret) clientCredential).clientSecret()));
+        } else if (clientCredential instanceof ClientCertificate) {
+            this.clientCertAuthentication = true;
+            this.clientCertificate = (ClientCertificate) clientCredential;
+            clientAuthentication = buildValidClientCertificateAuthority();
+        } else if (clientCredential instanceof ClientAssertion) {
+            clientAuthentication = createClientAuthFromClientAssertion((ClientAssertion) clientCredential);
+        } else {
+            throw new IllegalArgumentException("Unsupported client credential");
+        }
+    }
+
+    @Override
+    protected ClientAuthentication clientAuthentication() {
+        if (clientCertAuthentication) {
+            final Date currentDateTime = new Date(System.currentTimeMillis());
+            final Date expirationTime = ((PrivateKeyJWT) clientAuthentication).getJWTAuthenticationClaimsSet().getExpirationTime();
+            if (expirationTime.before(currentDateTime)) {
+                //The asserted private jwt with the client certificate can expire so rebuild it when the
+                clientAuthentication = buildValidClientCertificateAuthority();
+            }
+        }
+        return clientAuthentication;
+    }
+
+    private ClientAuthentication buildValidClientCertificateAuthority() {
+        ClientAssertion clientAssertion = JwtHelper.buildJwt(clientId(), clientCertificate, this.authenticationAuthority.selfSignedJwtAudience(), sendX5c);
+        return createClientAuthFromClientAssertion(clientAssertion);
+    }
+
+    private ClientAuthentication createClientAuthFromClientAssertion(final ClientAssertion clientAssertion) {
+        final Map<String, List<String>> map = new HashMap<>();
+        try {
+            map.put("client_assertion_type", Collections.singletonList(ClientAssertion.assertionType));
+            map.put("client_assertion", Collections.singletonList(clientAssertion.assertion()));
+            return PrivateKeyJWT.parse(map);
+        } catch (final ParseException e) {
+            //This library is not supposed to validate Issuer and subject values.
+            //The next lines of code ensures that exception is not thrown.
+            if (e.getMessage().contains("Issuer and subject in client JWT assertion must designate the same client identifier")) {
+                return new CustomJWTAuthentication(ClientAuthenticationMethod.PRIVATE_KEY_JWT, clientAssertion, new ClientID(clientId()));
+            }
+            throw new MsalClientException(e);
+        }
+    }
+
+    /**
+     * Creates instance of Builder of ConfidentialClientApplication
+
+     *
+
+     * @param clientId         Client ID (Application ID) of the application as registered
+
+     *                         in the application registration portal (portal.azure.com)
+
+     * @param clientCredential The client credential to use for token acquisition.
+
+     * @return instance of Builder of ConfidentialClientApplication
+     */
+    public static OauthClientApplication.Builder builder(String clientId, IClientCredential clientCredential, String username, String password) {
+        return new OauthClientApplication.Builder(clientId, clientCredential, username, password);
+    }
+
+
+    public static class Builder extends AbstractClientApplicationBase.Builder<OauthClientApplication.Builder> {
+
+        private IClientCredential clientCredential;
+        private final String username;
+        private final String password;
+        private boolean sendX5c = true;
+
+        private Builder(String clientId, IClientCredential clientCredential, String username, String password) {
+            super(clientId);
+            this.clientCredential = clientCredential;
+            this.username = username;
+            this.password = password;
+        }
+
+        /**
+         * Specifies if the x5c claim (public key of the certificate) should be sent to the STS.
+         * Default value is true
+         *
+         * @param val true if the x5c should be sent. Otherwise false
+         * @return instance of the Builder on which method was called
+         */
+        public OauthClientApplication.Builder sendX5c(boolean val) {
+            this.sendX5c = val;
+            return self();
+        }
+
+        @Override
+        public OauthClientApplication build() {
+            return new OauthClientApplication(this);
+        }
+
+        @Override
+        protected OauthClientApplication.Builder self() {
+            return this;
+        }
+    }
+
+    @java.lang.SuppressWarnings("all")
+    public boolean sendX5c() {
+        return this.sendX5c;
+    }
+}
--- a/main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/src/main/java/com/microsoft/aad/msal4j/OauthCredentialRequest.java
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/src/main/java/com/microsoft/aad/msal4j/OauthCredentialRequest.java
@@ -0,0 +1,20 @@
+package com.microsoft.aad.msal4j;
+
+import com.nimbusds.oauth2.sdk.ResourceOwnerPasswordCredentialsGrant;
+import com.nimbusds.oauth2.sdk.auth.Secret;
+
+class OauthCredentialRequest extends MsalRequest {
+        ClientCredentialParameters parameters;
+    OauthCredentialRequest(ClientCredentialParameters parameters, String username, String password,
+                OauthClientApplication application, RequestContext requestContext) {
+            super(application, createMsalGrant(parameters, username, password), requestContext);
+            this.parameters = parameters;
+        }
+
+        private static OAuthAuthorizationGrant createMsalGrant(ClientCredentialParameters parameters,
+                String username, String password) {
+            return new OAuthAuthorizationGrant(new ResourceOwnerPasswordCredentialsGrant(username, new Secret(
+                    password)), parameters.scopes(), parameters.claims());
+        }
+
+}
--- a/main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/src/main/java/org/talend/ms/crm/odata/authentication/OAuthStrategyImpl.java
+++ b/main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/src/main/java/org/talend/ms/crm/odata/authentication/OAuthStrategyImpl.java
@@ -13,14 +13,12 @@
 package org.talend.ms.crm.odata.authentication;

 import java.net.Proxy;
+import java.util.Collections;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
-
 import javax.naming.AuthenticationException;
 import javax.naming.ServiceUnavailableException;
-
-import com.microsoft.aad.adal4j.ClientCredential;
 import org.apache.http.client.methods.HttpRequestBase;
 import org.apache.olingo.client.api.communication.request.ODataRequest;
 import org.apache.olingo.commons.api.http.HttpHeader;
@@ -28,15 +26,19 @@ import org.talend.ms.crm.odata.ClientConfiguration;
 import org.talend.ms.crm.odata.ProxyProvider;
 import org.talend.ms.crm.odata.httpclientfactory.IHttpclientFactoryObservable;
 import org.talend.ms.crm.odata.httpclientfactory.OAuthHttpClientFactory;
-
-import com.microsoft.aad.adal4j.AuthenticationContext;
-import com.microsoft.aad.adal4j.AuthenticationResult;
+import com.microsoft.aad.msal4j.ClientCredentialFactory;
+import com.microsoft.aad.msal4j.ClientCredentialParameters;
+import com.microsoft.aad.msal4j.ConfidentialClientApplication;
+import com.microsoft.aad.msal4j.IAuthenticationResult;
+import com.microsoft.aad.msal4j.OauthClientApplication;
+import com.microsoft.aad.msal4j.PublicClientApplication;
+import com.microsoft.aad.msal4j.UserNamePasswordParameters;

 public class OAuthStrategyImpl implements IAuthStrategy {

    private ClientConfiguration conf;

-    private AuthenticationResult authResult;
+    private IAuthenticationResult authResult;

    private IHttpclientFactoryObservable httpClientFactory;

@@ -71,12 +73,12 @@ public class OAuthStrategyImpl implements IAuthStrategy {

    @Override
    public void configureRequest(ODataRequest request) {
-        request.addCustomHeader(HttpHeader.AUTHORIZATION, "Bearer " + authResult.getAccessToken());
+        request.addCustomHeader(HttpHeader.AUTHORIZATION, "Bearer " + authResult.accessToken());
    }

    @Override
    public void configureRequest(HttpRequestBase request) {
-        request.addHeader(HttpHeader.AUTHORIZATION, "Bearer " + authResult.getAccessToken());
+        request.addHeader(HttpHeader.AUTHORIZATION, "Bearer " + authResult.accessToken());
    }

    @Override
@@ -115,34 +117,71 @@ public class OAuthStrategyImpl implements IAuthStrategy {
        }
    }

-    private Future<AuthenticationResult> acquireToken(AuthenticationContext context) throws Exception {
-        Future<AuthenticationResult> future;
+    private Future<IAuthenticationResult> acquireToken(PublicClientApplication context) throws Exception {
+        Future<IAuthenticationResult> future;
+            UserNamePasswordParameters parameters = UserNamePasswordParameters.builder(
+                    Collections.singleton(conf.getResource() + "/.default"), conf.getUserName(), conf.getPassword().toCharArray()).build();
+            future = context.acquireToken(parameters);
+            return future;

-        if(conf.getAppRegisteredType() == ClientConfiguration.AppRegisteredType.NATIVE_APP){
-            future = context.acquireToken(conf.getResource(), conf.getClientId(), conf.getUserName(), conf.getPassword(), null);
-        }
-        else if(conf.getAppRegisteredType() == ClientConfiguration.AppRegisteredType.WEB_APP && conf.getWebAppPermission() == ClientConfiguration.WebAppPermission.DELEGATED){
-            future = context.acquireToken(conf.getResource(), new ClientCredential(conf.getClientId(), conf.getClientSecret()), conf.getUserName(), conf.getPassword(), null);
-        }
-        else{
-            throw new Exception("Can't retrieve token with this configuration : registered application type: "+conf.getAppRegisteredType()+", Web application permission: "+conf.getWebAppPermission());
-        }
-
-        return future;
+    }
+    private Future<IAuthenticationResult> acquireToken(OauthClientApplication context) throws Exception {
+        ClientCredentialParameters parameters = ClientCredentialParameters.builder(
+                Collections.singleton(conf.getResource() + "/.default")).build();
+        return context.acquireToken(parameters);
    }

-    private AuthenticationResult getAccessToken() throws ServiceUnavailableException {
-        AuthenticationContext context = null;
-        AuthenticationResult result = null;
+    private IAuthenticationResult getAccessToken() throws ServiceUnavailableException {
+        if(conf.getAppRegisteredType() == ClientConfiguration.AppRegisteredType.NATIVE_APP){
+            return getAccessTokenNative();
+        } if(conf.getAppRegisteredType() == ClientConfiguration.AppRegisteredType.WEB_APP && conf.getWebAppPermission() == ClientConfiguration.WebAppPermission.DELEGATED){
+            return getAccessTokenWebApp();
+        } else {
+            throw new RuntimeException("Can't retrieve token with this configuration : registered application type: "+conf.getAppRegisteredType()+", Web application permission: "+conf.getWebAppPermission());
+        }
+    }
+
+    private IAuthenticationResult getAccessTokenNative() throws ServiceUnavailableException {
+        PublicClientApplication context = null;
+        IAuthenticationResult result = null;
        ExecutorService service = null;
        try {
            service = Executors.newFixedThreadPool(1);
-            context = new AuthenticationContext(conf.getAuthoryEndpoint(), false, service);
+            Proxy proxy = ProxyProvider.getProxy();
+            PublicClientApplication.Builder contextBuilder = PublicClientApplication.builder(conf.getClientId()).authority("https://login.microsoftonline.com/organizations");
+            if (proxy != null) {
+                contextBuilder = contextBuilder.proxy(proxy);
+            }
+            context = contextBuilder.build();
+            Future<IAuthenticationResult> future = this.acquireToken(context);
+            result = future.get();
+        } catch (Exception e) {
+            throw new ServiceUnavailableException(e.getMessage());
+        } finally {
+            service.shutdown();
+        }
+
+        if (result == null) {
+            throw new ServiceUnavailableException("Authenticated failed! Please check your configuration!");
+        }
+        return result;
+    }
+
+    private IAuthenticationResult getAccessTokenWebApp() throws ServiceUnavailableException {
+        OauthClientApplication context = null;
+        IAuthenticationResult result = null;
+        ExecutorService service = null;
+        try {
+            service = Executors.newFixedThreadPool(1);
+            OauthClientApplication.Builder contextBuilder = OauthClientApplication.builder(conf.getClientId(),
+                    ClientCredentialFactory.createFromSecret(conf.getClientSecret()), conf.getUserName(), conf.getPassword())
+                    .authority(conf.getAuthoryEndpoint());
            Proxy proxy = ProxyProvider.getProxy();
            if (proxy != null) {
-                context.setProxy(proxy);
+                contextBuilder.proxy(proxy);
            }
-            Future<AuthenticationResult> future = this.acquireToken(context);
+            context = contextBuilder.build();
+            Future<IAuthenticationResult> future = this.acquireToken(context);
            result = future.get();
        } catch (Exception e) {
            throw new ServiceUnavailableException(e.getMessage());
--- a/main/plugins/org.talend.designer.components.localprovider/components/tAmazonEMRManage/tAmazonEMRManage_messages_ja.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tAmazonEMRManage/tAmazonEMRManage_messages_ja.properties
@@ -126,9 +126,9 @@ SERVICE_ACCESS_SECURITY_GROUP.NAME=\u30B5\u30FC\u30D3\u30B9\u30A2\u30AF\u30BB\u3
 CLUSTER_FINAL_ID.NAME=\u30AF\u30E9\u30B9\u30BF\u30FCID
 CLUSTER_FINAL_NAME.NAME=\u30AF\u30E9\u30B9\u30BF\u30FC\u540D
 PREDICATES.NAME=\u8FF0\u8A9E
-PREDICATES.ITEM.RUNNING=\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u30BF\u30FC\u3092\u8D77\u52D5
-PREDICATES.ITEM.RUNNING_WITH_NAME=\u4E8B\u524D\u306B\u5B9A\u7FA9\u6E08\u307F\u306E\u540D\u524D\u3067\u30AF\u30E9\u30B9\u30BF\u30FC\u3092\u8D77\u52D5
-PREDICATES.ITEM.RUNNING_WITH_ID=\u4E8B\u524D\u306B\u5B9A\u7FA9\u6E08\u307F\u306EID\u3067\u30AF\u30E9\u30B9\u30BF\u30FC\u3092\u8D77\u52D5
+PREDICATES.ITEM.RUNNING=\u5B9F\u884C\u4E2D\u306E\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u30BF\u30FC
+PREDICATES.ITEM.RUNNING_WITH_NAME=\u4E8B\u524D\u5B9A\u7FA9\u6E08\u307F\u306E\u540D\u524D\u3067\u5B9F\u884C\u4E2D\u306E\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u30BF\u30FC
+PREDICATES.ITEM.RUNNING_WITH_ID=\u4E8B\u524D\u5B9A\u7FA9\u6E08\u307F\u306EID\u3067\u5B9F\u884C\u4E2D\u306E\u30AF\u30E9\u30B9\u30BF\u30FC
 NAME_OF_CLUSTER.NAME=\u30AF\u30E9\u30B9\u30BF\u30FC\u540D
 ID_OF_CLUSTER.NAME=\u30AF\u30E9\u30B9\u30BF\u30FCID
 WAIT_FOR_CLUSTER_READY.NAME=\u30AF\u30E9\u30B9\u30BF\u30FC\u306E\u6E96\u5099\u304C\u3067\u304D\u308B\u307E\u3067\u5F85\u6A5F
--- a/main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseBulkExec/tAzureSynapseBulkExec_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseBulkExec/tAzureSynapseBulkExec_java.xml
@@ -395,7 +395,7 @@
 			<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="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />

-			<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3"  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')" />
 		</IMPORTS>
 	</CODEGENERATION>

--- a/main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseInput/tAzureSynapseInput_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseInput/tAzureSynapseInput_java.xml
@@ -278,7 +278,7 @@
        <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="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />

-        <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3"  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')" />
     </IMPORTS>
   </CODEGENERATION>

--- a/main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseOutput/tAzureSynapseOutput_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseOutput/tAzureSynapseOutput_java.xml
@@ -349,7 +349,7 @@
 			<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="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />

-			<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3"  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')" />
 		</IMPORTS>
 	</CODEGENERATION>

--- a/main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseRow/tAzureSynapseRow_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseRow/tAzureSynapseRow_java.xml
@@ -334,7 +334,7 @@
        <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="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />

-        <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3"  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')" />
    </IMPORTS>
  </CODEGENERATION>

--- a/main/plugins/org.talend.designer.components.localprovider/components/tBigQueryBulkExec/tBigQueryBulkExec_messages_ja.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tBigQueryBulkExec/tBigQueryBulkExec_messages_ja.properties
@@ -14,7 +14,7 @@ ACCESS_TOKEN.NAME=OAuth\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3
 SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE
 DATASET.NAME=\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
-CREATE_TABLE_IF_NOT_EXIST.NAME=\u30C6\u30FC\u30D6\u30EB\u304C\u5B58\u5728\u3057\u306A\u3051\u308C\u3070\u4F5C\u6210
+CREATE_TABLE_IF_NOT_EXIST.NAME=\u30C6\u30FC\u30D6\u30EB\u304C\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u4F5C\u6210
 ACTION_ON_DATA.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 ACTION_ON_DATA.ITEM.APPEND=\u8FFD\u52A0
 ACTION_ON_DATA.ITEM.TRUNCATE=\u5168\u524A\u9664
--- a/main/plugins/org.talend.designer.components.localprovider/components/tBigQueryOutput/tBigQueryOutput_messages_ja.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tBigQueryOutput/tBigQueryOutput_messages_ja.properties
@@ -29,7 +29,7 @@ ACCESS_TOKEN.NAME=OAuth\u30A2\u30AF\u30BB\u30B9\u30C8\u30FC\u30AF\u30F3
 SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE
 DATASET.NAME=\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
-CREATE_TABLE_IF_NOT_EXIST.NAME=\u30C6\u30FC\u30D6\u30EB\u304C\u5B58\u5728\u3057\u306A\u3051\u308C\u3070\u4F5C\u6210
+CREATE_TABLE_IF_NOT_EXIST.NAME=\u30C6\u30FC\u30D6\u30EB\u304C\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u4F5C\u6210
 ACTION_ON_DATA.NAME=\u30C7\u30FC\u30BF\u3067\u306E\u30A2\u30AF\u30B7\u30E7\u30F3
 ACTION_ON_DATA.ITEM.APPEND=\u8FFD\u52A0
 ACTION_ON_DATA.ITEM.TRUNCATE=\u5168\u524A\u9664
--- a/main/plugins/org.talend.designer.components.localprovider/components/tCreateTable/tCreateTable_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tCreateTable/tCreateTable_java.xml
@@ -858,7 +858,7 @@
 		<IMPORT NAME="asm" MODULE="asm-9.1.jar" MVN="mvn:org.ow2.asm/asm/9.1"  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="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5"  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.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3"  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="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')" />
@@ -870,7 +870,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')" />
--- a/main/plugins/org.talend.designer.components.localprovider/components/tCreateTable/tCreateTable_messages.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tCreateTable/tCreateTable_messages.properties
@@ -132,7 +132,7 @@ MSSQL_DRIVER.ITEM.MSSQL_PROP=Microsoft
 DB_SYBASE_VERSION.NAME=DB Version
 DB_SYBASE_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
 DB_SYBASE_VERSION.ITEM.SYBSEIQ_16=Sybase 16
-DB_SYBASE_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
+DB_SYBASE_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) and above
 ACCOUNT.NAME=Account
 ROLE.NAME=Role
 ENFORCE_DELIMITED_IDENTIFIERS.NAME=Enforce database delimited identifiers
--- a/main/plugins/org.talend.designer.components.localprovider/components/tCreateTable/tCreateTable_messages_fr.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tCreateTable/tCreateTable_messages_fr.properties
@@ -132,7 +132,7 @@ MSSQL_DRIVER.ITEM.MSSQL_PROP=Microsoft
 DB_SYBASE_VERSION.NAME=Version de la base de donn\u00E9es
 DB_SYBASE_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
 DB_SYBASE_VERSION.ITEM.SYBSEIQ_16=Sybase 16
-DB_SYBASE_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
+DB_SYBASE_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) et sup\u00E9rieures
 ACCOUNT.NAME=Compte
 ROLE.NAME=R\u00F4le
 ENFORCE_DELIMITED_IDENTIFIERS.NAME=Impl\u00E9menter les identifiants d\u00E9limit\u00E9s de base de donn\u00E9es
--- a/main/plugins/org.talend.designer.components.localprovider/components/tCreateTable/tCreateTable_messages_ja.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tCreateTable/tCreateTable_messages_ja.properties
@@ -59,7 +59,7 @@ MSSQL_ACTIVE_DIR_AUTH.NAME=Azure Active Directory\u3092\u4F7F\u3063\u3066\u8A8D\
 RUNNING_MODE.ITEM.HSQLDB_INPROGRESS_PERSISTENT=\u51E6\u7406\u7D99\u7D9A\u4E2D\u306EHSQLD\uFF42
 RUNNING_MODE.ITEM.HSQLDB_SERVER=HSQLDb\u30B5\u30FC\u30D0
 RUNNING_MODE.ITEM.HSQLDB_WEBSERVER=HSQLDb Web\u30B5\u30FC\u30D0
-RUNNING_MODE.NAME=\u30E9\u30F3\u30CB\u30F3\u30B0\u30E2\u30FC\u30C9
+RUNNING_MODE.NAME=\u5B9F\u884C\u30E2\u30FC\u30C9
 LOCAL_SERVICE_NAME.NAME=\u30ED\u30FC\u30AB\u30EB\u30B5\u30FC\u30D3\u30B9\u540D
 SCHEMA_DB.NAME=\u30B9\u30AD\u30FC\u30DE
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB\u540D
@@ -132,7 +132,7 @@ MSSQL_DRIVER.ITEM.MSSQL_PROP=Microsoft
 DB_SYBASE_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
 DB_SYBASE_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
 DB_SYBASE_VERSION.ITEM.SYBSEIQ_16=Sybase 16
-DB_SYBASE_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
+DB_SYBASE_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)\u4EE5\u964D
 ACCOUNT.NAME=\u30A2\u30AB\u30A6\u30F3\u30C8
 ROLE.NAME=\u30ED\u30FC\u30EB
 ENFORCE_DELIMITED_IDENTIFIERS.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u533A\u5207\u308A\u4ED8\u304D\u8B58\u5225\u5B50\u306E\u5F37\u5236
--- a/main/plugins/org.talend.designer.components.localprovider/components/tCreateTable/tCreateTable_messages_zh_CN.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tCreateTable/tCreateTable_messages_zh_CN.properties
@@ -132,7 +132,7 @@ MSSQL_DRIVER.ITEM.MSSQL_PROP=Microsoft
 DB_SYBASE_VERSION.NAME=\u6570\u636E\u5E93\u7248\u672C
 DB_SYBASE_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
 DB_SYBASE_VERSION.ITEM.SYBSEIQ_16=Sybase 16
-DB_SYBASE_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
+DB_SYBASE_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) \u53CA\u66F4\u9AD8\u7248\u672C
 ACCOUNT.NAME=\u5E10\u6237
 ROLE.NAME=\u89D2\u8272
 ENFORCE_DELIMITED_IDENTIFIERS.NAME=\u6267\u884C\u6570\u636E\u5E93\u5206\u9694\u578B\u6807\u8BC6\u7B26
--- a/main/plugins/org.talend.designer.components.localprovider/components/tELTMSSqlMap/tELTMSSqlMap_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tELTMSSqlMap/tELTMSSqlMap_java.xml
@@ -212,7 +212,7 @@
 			<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="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5"  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.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3"  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')" />
 		</IMPORTS>
   </CODEGENERATION>

--- a/main/plugins/org.talend.designer.components.localprovider/components/tELTPostgresqlMap/tELTPostgresqlMap_java.xml
+++ b/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>
--- a/main/plugins/org.talend.designer.components.localprovider/components/tELTSybaseMap/tELTSybaseMap_messages.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tELTSybaseMap/tELTSybaseMap_messages.properties
@@ -20,4 +20,4 @@ CONNECTION.NAME=Component List
 DB_VERSION.NAME=DB Version
 DB_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
 DB_VERSION.ITEM.SYBSEIQ_16=Sybase 16
-DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
+DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) and above
--- a/main/plugins/org.talend.designer.components.localprovider/components/tELTSybaseMap/tELTSybaseMap_messages_fr.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tELTSybaseMap/tELTSybaseMap_messages_fr.properties
@@ -20,4 +20,4 @@ CONNECTION.NAME=Liste des composants
 DB_VERSION.NAME=Version de la base de donn\u00E9es
 DB_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
 DB_VERSION.ITEM.SYBSEIQ_16=Sybase 16
-DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
+DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) et sup\u00E9rieures
--- a/main/plugins/org.talend.designer.components.localprovider/components/tELTSybaseMap/tELTSybaseMap_messages_ja.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tELTSybaseMap/tELTSybaseMap_messages_ja.properties
@@ -20,4 +20,4 @@ CONNECTION.NAME=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30EA\u30B9\u30C8
 DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
 DB_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
 DB_VERSION.ITEM.SYBSEIQ_16=Sybase 16
-DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
+DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)\u4EE5\u964D
--- a/main/plugins/org.talend.designer.components.localprovider/components/tELTSybaseMap/tELTSybaseMap_messages_zh_CN.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tELTSybaseMap/tELTSybaseMap_messages_zh_CN.properties
@@ -20,4 +20,4 @@ CONNECTION.NAME=\u7EC4\u4EF6\u5217\u8868
 DB_VERSION.NAME=\u6570\u636E\u5E93\u7248\u672C
 DB_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
 DB_VERSION.ITEM.SYBSEIQ_16=Sybase 16
-DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
+DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) \u53CA\u66F4\u9AD8\u7248\u672C
--- a/main/plugins/org.talend.designer.components.localprovider/components/tExtractJSONFields/tExtractJSONFields_messages_ja.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tExtractJSONFields/tExtractJSONFields_messages_ja.properties
@@ -3,7 +3,7 @@ LIMIT.NAME=\u5236\u9650
 LONG_NAME=JSON\u30D5\u30A3\u30FC\u30EB\u30C9\u5185\u306E\u7279\u5B9A\u306E\u30AB\u30E9\u30E0\u304B\u3089\u8907\u6570\u306E\u30AB\u30E9\u30E0\u3092\u751F\u6210\u3057\u307E\u3059
 LOOP_QUERY.NAME=\u30EB\u30FC\u30D7 XPath\u30AF\u30A8\u30EA\u30FC
 MAPPING.ITEM.QUERY=XPath\u30AF\u30A8\u30EA\u30FC
-MAPPING.ITEM.NODECHECK=\u30CE\u30FC\u30C9\u306E\u53D6\u5F97
+MAPPING.ITEM.NODECHECK=\u30CE\u30FC\u30C9\u3092\u53D6\u5F97
 MAPPING.ITEM.ISARRAY=Array
 MAPPING.NAME=\u30DE\u30C3\u30D4\u30F3\u30B0
 NB_LINE.NAME=\u884C\u6570
--- a/main/plugins/org.talend.designer.components.localprovider/components/tExtractXMLField/tExtractXMLField_messages_ja.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tExtractXMLField/tExtractXMLField_messages_ja.properties
@@ -3,7 +3,7 @@ LIMIT.NAME=\u5236\u9650
 LONG_NAME=tFileInputXML\u3068\u3057\u3066\u5165\u529B\u884C\u30D5\u30A3\u30FC\u30EB\u30C9\u3092\u89E3\u6790\u3057\u307E\u3059
 LOOP_QUERY.NAME=\u30EB\u30FC\u30D7 XPath\u30AF\u30A8\u30EA\u30FC
 MAPPING.ITEM.QUERY=XPath\u30AF\u30A8\u30EA\u30FC
-MAPPING.ITEM.NODECHECK=\u30CE\u30FC\u30C9\u306E\u53D6\u5F97
+MAPPING.ITEM.NODECHECK=\u30CE\u30FC\u30C9\u3092\u53D6\u5F97
 MAPPING.NAME=\u30DE\u30C3\u30D4\u30F3\u30B0
 NB_LINE.NAME=\u884C\u6570
 REJECT.LINK=\u30EA\u30B8\u30A7\u30AF\u30C8
--- a/main/plugins/org.talend.designer.components.localprovider/components/tFTPConnection/tFTPConnection_messages_ja.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tFTPConnection/tFTPConnection_messages_ja.properties
@@ -35,4 +35,4 @@ SECURITY_MODE.ITEM.IMPLICIT=\u6697\u9ED9\u7684
 SECURITY_MODE.ITEM.EXPLICIT=\u660E\u793A\u7684
 USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
-USE_STRICT_REPLY_PARSING.NAME=\u8FD4\u4FE1\u89E3\u6790\u306E\u5236\u9650\u3092\u4F7F\u7528
+USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528
--- a/main/plugins/org.talend.designer.components.localprovider/components/tFTPDelete/tFTPDelete_messages_ja.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tFTPDelete/tFTPDelete_messages_ja.properties
@@ -50,4 +50,4 @@ PERL5_REGEX.NAME=Perl5\u6B63\u898F\u8868\u73FE\u5F0F\u3092\u30D5\u30A1\u30A4\u30
 MOVE_TO_THE_CURRENT_DIRECTORY.NAME=\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u306B\u79FB\u52D5
 USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
-USE_STRICT_REPLY_PARSING.NAME=\u8FD4\u4FE1\u89E3\u6790\u306E\u5236\u9650\u3092\u4F7F\u7528
+USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528
--- a/main/plugins/org.talend.designer.components.localprovider/components/tFTPFileExist/tFTPFileExist_messages_ja.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tFTPFileExist/tFTPFileExist_messages_ja.properties
@@ -46,4 +46,4 @@ CONNECT_MODE.ITEM.PASSIVE=\u4E0D\u6D3B\u6027
 IGNORE_FAILURE_AT_QUIT.NAME=\u7D42\u4E86\u6642\u306B\u30A8\u30E9\u30FC\u3092\u7121\u8996(FTP)
 USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
-USE_STRICT_REPLY_PARSING.NAME=\u8FD4\u4FE1\u89E3\u6790\u306E\u5236\u9650\u3092\u4F7F\u7528
+USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528
--- a/main/plugins/org.talend.designer.components.localprovider/components/tFTPFileList/tFTPFileList_messages_ja.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tFTPFileList/tFTPFileList_messages_ja.properties
@@ -47,4 +47,4 @@ FILES.ITEM.FILEMASK=\u30D5\u30A1\u30A4\u30EB\u30DE\u30B9\u30AF
 MOVE_TO_THE_CURRENT_DIRECTORY.NAME=\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u306B\u79FB\u52D5
 USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
-USE_STRICT_REPLY_PARSING.NAME=\u8FD4\u4FE1\u89E3\u6790\u306E\u5236\u9650\u3092\u4F7F\u7528
+USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528
--- a/main/plugins/org.talend.designer.components.localprovider/components/tFTPFileProperties/tFTPFileProperties_messages_ja.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tFTPFileProperties/tFTPFileProperties_messages_ja.properties
@@ -44,4 +44,4 @@ MODE.ITEM.BINARY=\u30D0\u30A4\u30CA\u30EA
 MODE.NAME=\u8EE2\u9001\u30E2\u30FC\u30C9
 USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
-USE_STRICT_REPLY_PARSING.NAME=\u8FD4\u4FE1\u89E3\u6790\u306E\u5236\u9650\u3092\u4F7F\u7528
+USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528
--- a/main/plugins/org.talend.designer.components.localprovider/components/tFTPGet/tFTPGet_messages_ja.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tFTPGet/tFTPGet_messages_ja.properties
@@ -62,4 +62,4 @@ PERL5_REGEX.NAME=Perl5\u6B63\u898F\u8868\u73FE\u5F0F\u3092\u30D5\u30A1\u30A4\u30
 MOVE_TO_THE_CURRENT_DIRECTORY.NAME=\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u306B\u79FB\u52D5
 USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
-USE_STRICT_REPLY_PARSING.NAME=\u8FD4\u4FE1\u89E3\u6790\u306E\u5236\u9650\u3092\u4F7F\u7528
+USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528
--- a/main/plugins/org.talend.designer.components.localprovider/components/tFTPPut/tFTPPut_messages_ja.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tFTPPut/tFTPPut_messages_ja.properties
@@ -66,4 +66,4 @@ FTPSOVERWRITE.ITEM.ALWAYS=\u5E38\u306B
 FTPSOVERWRITE.NAME=\u30D5\u30A1\u30A4\u30EB\u306E\u4E0A\u66F8\u304D
 USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
-USE_STRICT_REPLY_PARSING.NAME=\u8FD4\u4FE1\u89E3\u6790\u306E\u5236\u9650\u3092\u4F7F\u7528
+USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528
--- a/main/plugins/org.talend.designer.components.localprovider/components/tFTPRename/tFTPRename_messages_ja.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tFTPRename/tFTPRename_messages_ja.properties
@@ -51,4 +51,4 @@ IGNORE_FAILURE_AT_QUIT.NAME=\u7D42\u4E86\u6642\u306B\u30A8\u30E9\u30FC\u3092\u71
 MOVE_TO_THE_CURRENT_DIRECTORY.NAME=\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u306B\u79FB\u52D5
 USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
-USE_STRICT_REPLY_PARSING.NAME=\u8FD4\u4FE1\u89E3\u6790\u306E\u5236\u9650\u3092\u4F7F\u7528
+USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528
--- a/main/plugins/org.talend.designer.components.localprovider/components/tFTPTruncate/tFTPTruncate_messages_ja.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tFTPTruncate/tFTPTruncate_messages_ja.properties
@@ -46,4 +46,4 @@ PERL5_REGEX.NAME=Perl5\u6B63\u898F\u8868\u73FE\u5F0F\u3092\u30D5\u30A1\u30A4\u30
 MOVE_TO_THE_CURRENT_DIRECTORY.NAME=\u73FE\u5728\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u306B\u79FB\u52D5
 USE_ENCODING.NAME=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0
 CONNECTION_TIMEOUT.NAME=\u63A5\u7D9A\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8(\u30DF\u30EA\u79D2)
-USE_STRICT_REPLY_PARSING.NAME=\u8FD4\u4FE1\u89E3\u6790\u306E\u5236\u9650\u3092\u4F7F\u7528
+USE_STRICT_REPLY_PARSING.NAME=\u53B3\u5BC6\u306A\u8FD4\u4FE1\u89E3\u6790\u3092\u4F7F\u7528
--- a/main/plugins/org.talend.designer.components.localprovider/components/tFileCopy/tFileCopy_messages_ja.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tFileCopy/tFileCopy_messages_ja.properties
@@ -1,4 +1,4 @@
-CREATE_DIRECTORY.NAME=\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u3001\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u3092\u4F5C\u6210
+CREATE_DIRECTORY.NAME=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u304C\u5B58\u5728\u3057\u306A\u3044\u5834\u5408\u306F\u4F5C\u6210
 DESTINATION.NAME=\u30C7\u30B9\u30C6\u30A3\u30CD\u30FC\u30B7\u30E7\u30F3\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC
 FILENAME.NAME=\u30D5\u30A1\u30A4\u30EB\u540D
 HELP=org.talend.help.tFileCopy
--- a/main/plugins/org.talend.designer.components.localprovider/components/tFileFetch/tFileFetch_messages_fr.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tFileFetch/tFileFetch_messages_fr.properties
@@ -46,11 +46,11 @@ TRUST_ALL_SERVER.NAME=Faire confiance \u00E0 tous les serveurs
 SAVE_COOKIE.NAME=Sauvegarder le cookie
 READ_COOKIE.NAME=Lire le cookie
 COOKIE_DIR.NAME=R\u00E9pertoire des cookies
-COOKIE_POLICY.NAME=Politique relative aux cookies
+COOKIE_POLICY.NAME=Politique de cookies (d\u00E9pr\u00E9ci\u00E9e)
 COOKIE_POLICY.ITEM.DEFAULT=D\u00E9faut
-COOKIE_POLICY.ITEM.BROWSER_COMPATIBILITY=BROWSER_COMPATIBILITY
+COOKIE_POLICY.ITEM.BROWSER_COMPATIBILITY=BROWSER_COMPATIBILITY (d\u00E9pr\u00E9ci\u00E9e)
 COOKIE_POLICY.ITEM.NETSCAPE=NETSCAPE
-COOKIE_POLICY.ITEM.RFC_2109=RFC_2109
+COOKIE_POLICY.ITEM.RFC_2109=RFC_2109 (d\u00E9pr\u00E9ci\u00E9e)
 SINGLE_COOKIE.NAME=En-t\u00EAte du cookie
 ADD_HEADER.NAME=Ajouter un en-t\u00EAte
 HEADERS.NAME=En-t\u00EAtes
--- a/main/plugins/org.talend.designer.components.localprovider/components/tFileFetch/tFileFetch_messages_zh_CN.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tFileFetch/tFileFetch_messages_zh_CN.properties
@@ -46,11 +46,11 @@ TRUST_ALL_SERVER.NAME=\u4FE1\u4EFB\u6240\u6709\u670D\u52A1\u5668
 SAVE_COOKIE.NAME=\u4FDD\u5B58 cookie
 READ_COOKIE.NAME=\u8BFB\u53D6 cookie
 COOKIE_DIR.NAME=Cookie\u76EE\u5F55
-COOKIE_POLICY.NAME=Cookie\u7B56\u7565
+COOKIE_POLICY.NAME=Cookie \u7B56\u7565 (\u5DF2\u5F03\u7528)
 COOKIE_POLICY.ITEM.DEFAULT=\u9ED8\u8BA4
-COOKIE_POLICY.ITEM.BROWSER_COMPATIBILITY=\u6D4F\u89C8\u5668\u517C\u5BB9\u6027
+COOKIE_POLICY.ITEM.BROWSER_COMPATIBILITY=BROWSER_COMPATIBILITY (\u5DF2\u5F03\u7528)
 COOKIE_POLICY.ITEM.NETSCAPE=NETSCAPE
-COOKIE_POLICY.ITEM.RFC_2109=RFC_2109
+COOKIE_POLICY.ITEM.RFC_2109=RFC_2109 (\u5DF2\u5F03\u7528)
 SINGLE_COOKIE.NAME=\u5355\u4E2A cookie \u6807\u5934
 ADD_HEADER.NAME=\u6DFB\u52A0\u6807\u9898
 HEADERS.NAME=\u6587\u4EF6\u5934
--- a/main/plugins/org.talend.designer.components.localprovider/components/tFileInputJSON/tFileInputJSON_messages_ja.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tFileInputJSON/tFileInputJSON_messages_ja.properties
@@ -13,7 +13,7 @@ USEURL.NAME=Url\u3092\u4F7F\u7528
 URLPATH.NAME=URL
 LOOP_QUERY.NAME=\u30EB\u30FC\u30D7 XPath\u30AF\u30A8\u30EA\u30FC
 MAPPINGXPATH.ITEM.QUERY=XPath\u30AF\u30A8\u30EA\u30FC
-MAPPINGXPATH.ITEM.NODECHECK=\u30CE\u30FC\u30C9\u306E\u53D6\u5F97
+MAPPINGXPATH.ITEM.NODECHECK=\u30CE\u30FC\u30C9\u3092\u53D6\u5F97
 MAPPINGXPATH.NAME=\u30DE\u30C3\u30D4\u30F3\u30B0
 REJECT.LINK=\u30EA\u30B8\u30A7\u30AF\u30C8
 REJECT.MENU=\u30EA\u30B8\u30A7\u30AF\u30C8
--- a/main/plugins/org.talend.designer.components.localprovider/components/tFileInputXML/tFileInputXML_messages_ja.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tFileInputXML/tFileInputXML_messages_ja.properties
@@ -11,7 +11,7 @@ IGNORE_NS.NAME=\u30CD\u30FC\u30E0\u30B9\u30DA\u30FC\u30B9\u3092\u7121\u8996
 LIMIT.NAME=\u5236\u9650
 LONG_NAME=XML\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30D5\u30A3\u30FC\u30EB\u30C9\u3067\u5206\u5272\u3057\u305F\u884C\u3092\u62BD\u51FA\u3057\u307E\u3059\u3002
 LOOP_QUERY.NAME=\u30EB\u30FC\u30D7 XPath\u30AF\u30A8\u30EA\u30FC
-MAPPING.ITEM.NODECHECK=\u30CE\u30FC\u30C9\u306E\u53D6\u5F97
+MAPPING.ITEM.NODECHECK=\u30CE\u30FC\u30C9\u3092\u53D6\u5F97
 MAPPING.ITEM.QUERY=XPath\u30AF\u30A8\u30EA\u30FC
 MAPPING.NAME=\u30DE\u30C3\u30D4\u30F3\u30B0
 NB_LINE.NAME=\u884C\u6570
--- a/main/plugins/org.talend.designer.components.localprovider/components/tGreenplumBulkExec/tGreenplumBulkExec_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tGreenplumBulkExec/tGreenplumBulkExec_java.xml
@@ -118,6 +118,8 @@

 		<PARAMETER NAME="MAPPING" FIELD="MAPPING_TYPE" NUM_ROW="16"
 			SHOW="false">
+			<DEFAULT IF="DB_DRIVER=='GREENPLUM'">greenplum_id</DEFAULT>
+			<DEFAULT IF="DB_DRIVER=='POSTGRESQL'">postgres_id</DEFAULT>
 			<DEFAULT>postgres_id</DEFAULT>
 		</PARAMETER>

--- a/main/plugins/org.talend.designer.components.localprovider/components/tGreenplumGPLoad/tGreenplumGPLoad_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tGreenplumGPLoad/tGreenplumGPLoad_java.xml
@@ -42,6 +42,8 @@
 			NUM_ROW="18"
 			SHOW="false"
 		>
+			<DEFAULT IF="DB_DRIVER=='GREENPLUM'">greenplum_id</DEFAULT>
+			<DEFAULT IF="DB_DRIVER=='POSTGRESQL'">postgres_id</DEFAULT>
 			<DEFAULT>postgres_id</DEFAULT>
 		</PARAMETER>

--- a/main/plugins/org.talend.designer.components.localprovider/components/tGreenplumInput/tGreenplumInput_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tGreenplumInput/tGreenplumInput_java.xml
@@ -182,6 +182,8 @@
      NUM_ROW="10"
      SHOW="false"
    >
+      <DEFAULT IF="DB_DRIVER=='GREENPLUM'">greenplum_id</DEFAULT>
+      <DEFAULT IF="DB_DRIVER=='POSTGRESQL'">postgres_id</DEFAULT>
      <DEFAULT>postgres_id</DEFAULT>
    </PARAMETER>

--- a/main/plugins/org.talend.designer.components.localprovider/components/tGreenplumOutput/tGreenplumOutput_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tGreenplumOutput/tGreenplumOutput_java.xml
@@ -213,6 +213,8 @@
      NUM_ROW="10"
      SHOW="false"
    >
+      <DEFAULT IF="DB_DRIVER=='GREENPLUM'">greenplum_id</DEFAULT>
+      <DEFAULT IF="DB_DRIVER=='POSTGRESQL'">postgres_id</DEFAULT>
      <DEFAULT>postgres_id</DEFAULT>
    </PARAMETER>

--- a/main/plugins/org.talend.designer.components.localprovider/components/tGreenplumOutputBulkExec/tGreenplumOutputBulkExec_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tGreenplumOutputBulkExec/tGreenplumOutputBulkExec_java.xml
@@ -158,7 +158,9 @@
      FIELD="MAPPING_TYPE"
      NUM_ROW="18"
      SHOW="false"
-    >       
+    >
+      <DEFAULT IF="DB_DRIVER=='GREENPLUM'">greenplum_id</DEFAULT>
+      <DEFAULT IF="DB_DRIVER=='POSTGRESQL'">postgres_id</DEFAULT>
      <DEFAULT>postgres_id</DEFAULT>
    </PARAMETER>

--- a/main/plugins/org.talend.designer.components.localprovider/components/tHSQLDbInput/tHSQLDbInput_messages_ja.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tHSQLDbInput/tHSQLDbInput_messages_ja.properties
@@ -13,7 +13,7 @@ RUNNING_MODE.ITEM.HSQLDB_INPROGRESS_TRANSIENT=\u4E00\u6642\u51E6\u7406\u4E2D\u30
 RUNNING_MODE.ITEM.HSQLDB_IN_MEMORY=HSQLDb In Memory
 RUNNING_MODE.ITEM.HSQLDB_SERVER=HSQLDb\u30B5\u30FC\u30D0
 RUNNING_MODE.ITEM.HSQLDB_WEBSERVER=HSQLDb Web\u30B5\u30FC\u30D0
-RUNNING_MODE.NAME=\u30E9\u30F3\u30CB\u30F3\u30B0\u30E2\u30FC\u30C9
+RUNNING_MODE.NAME=\u5B9F\u884C\u30E2\u30FC\u30C9
 SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE
 TLS.NAME=TLS/SSL\u30BD\u30B1\u30C3\u30C8\u3092\u4F7F\u7528
 USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
--- a/main/plugins/org.talend.designer.components.localprovider/components/tHSQLDbOutput/tHSQLDbOutput_messages_ja.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tHSQLDbOutput/tHSQLDbOutput_messages_ja.properties
@@ -43,7 +43,7 @@ RUNNING_MODE.ITEM.HSQLDB_INPROGRESS_TRANSIENT=\u4E00\u6642\u51E6\u7406\u4E2D\u30
 RUNNING_MODE.ITEM.HSQLDB_IN_MEMORY=HSQLDb In Memory
 RUNNING_MODE.ITEM.HSQLDB_SERVER=HSQLDb\u30B5\u30FC\u30D0
 RUNNING_MODE.ITEM.HSQLDB_WEBSERVER=HSQLDb Web\u30B5\u30FC\u30D0
-RUNNING_MODE.NAME=\u30E9\u30F3\u30CB\u30F3\u30B0\u30E2\u30FC\u30C9
+RUNNING_MODE.NAME=\u5B9F\u884C\u30E2\u30FC\u30C9
 SCHEMA_FLOW.NAME=\u30B9\u30AD\u30FC\u30DE
 SCHEMA_REJECT.NAME=\u30B9\u30AD\u30FC\u30DE\u306E\u30EA\u30B8\u30A7\u30AF\u30C8
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB
--- a/main/plugins/org.talend.designer.components.localprovider/components/tHSQLDbRow/tHSQLDbRow_messages_ja.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tHSQLDbRow/tHSQLDbRow_messages_ja.properties
@@ -20,7 +20,7 @@ RUNNING_MODE.ITEM.HSQLDB_INPROGRESS_TRANSIENT=\u4E00\u6642\u51E6\u7406\u4E2D\u30
 RUNNING_MODE.ITEM.HSQLDB_IN_MEMORY=HSQLDb In Memory
 RUNNING_MODE.ITEM.HSQLDB_SERVER=HSQLDb\u30B5\u30FC\u30D0
 RUNNING_MODE.ITEM.HSQLDB_WEBSERVER=HSQLDb Web\u30B5\u30FC\u30D0
-RUNNING_MODE.NAME=\u30E9\u30F3\u30CB\u30F3\u30B0\u30E2\u30FC\u30C9
+RUNNING_MODE.NAME=\u5B9F\u884C\u30E2\u30FC\u30C9
 SCHEMA_DB.NAME=\u30B9\u30AD\u30FC\u30DE
 TLS.NAME=TLS/SSL\u30BD\u30B1\u30C3\u30C8\u3092\u4F7F\u7528
 USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
--- a/main/plugins/org.talend.designer.components.localprovider/components/tHiveConnection/tHiveConnection_begin.javajet
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tHiveConnection/tHiveConnection_begin.javajet
@@ -13,8 +13,8 @@ imports="
 	String theDistribution = ElementParameterParser.getValue(theNode, "__DISTRIBUTION__");
 	String theVersion = ElementParameterParser.getValue(theNode, "__HIVE_VERSION__");
    boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(theNode.getProcess(), "__LOG4J_ACTIVATE__"));
-
 	org.talend.hadoop.distribution.component.HiveComponent hiveDistrib = null;
+	
 	try {
 		hiveDistrib = (org.talend.hadoop.distribution.component.HiveComponent) org.talend.hadoop.distribution.DistributionFactory.buildDistribution(theDistribution, theVersion);
 	} catch (java.lang.Exception e) {
@@ -22,12 +22,13 @@ imports="
 		return "";
 	}
 	boolean isCustom = hiveDistrib instanceof org.talend.hadoop.distribution.custom.CustomDistribution;
-
+	
+	String connMode = ElementParameterParser.getValue(theNode, "__CONNECTION_MODE__");
    if (hiveDistrib.isExecutedThroughWebHCat()) { // Connection through WebHCat api
 %>
        <%@ include file="@{org.talend.designer.components.localprovider}/components/tHiveConnection/tHiveConnection_azure.javajet"%>
 <%
-    } else if (hiveDistrib.isGoogleDataprocDistribution()) { // Connection through Dataproc api
+    } else if("DATAPROC".equalsIgnoreCase(connMode)) { // Connection through Dataproc api
 %>
        <%@ include file="@{org.talend.designer.components.localprovider}/components/tHiveConnection/tHiveConnection_dataproc.javajet"%>
 <%
--- a/main/plugins/org.talend.designer.components.localprovider/components/tHiveConnection/tHiveConnection_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tHiveConnection/tHiveConnection_java.xml
@@ -63,6 +63,8 @@
 					SHOW_IF="(DISTRIBUTION=='CUSTOM') OR DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportEmbeddedMode[]" />
 				<ITEM NAME="STANDALONE" VALUE="STANDALONE"
 					SHOW_IF="(DISTRIBUTION=='CUSTOM') OR (HIVE_SERVER == 'HIVE2' AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportStandaloneMode[]) OR (HIVE_SERVER == 'HIVE' AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHive1Standalone[])" />
+				<ITEM NAME="DATAPROC" VALUE="DATAPROC"
+					SHOW_IF="DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportUniversalDataprocMode[]"/>
 			</ITEMS>
 		</PARAMETER>
 		<PARAMETER NAME="HIVE_SERVER" FIELD="CLOSED_LIST" NUM_ROW="15"
@@ -77,7 +79,7 @@

 		<PARAMETER NAME="HOST" FIELD="TEXT" NUM_ROW="20"
 			REPOSITORY_VALUE="SERVER_NAME" GROUP="CONNECTION"
-			SHOW_IF="!DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[]">
+			SHOW_IF="!DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[] AND (CONNECTION_MODE != 'DATAPROC')">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>

@@ -88,7 +90,7 @@

 		<PARAMETER NAME="PORT" FIELD="TEXT" NUM_ROW="20"
 			REPOSITORY_VALUE="PORT" GROUP="CONNECTION"
-			SHOW_IF="!DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[]">
+			SHOW_IF="!DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[] AND (CONNECTION_MODE != 'DATAPROC')">
 			<DEFAULT>"10000"</DEFAULT>
 		</PARAMETER>

@@ -100,13 +102,13 @@

 		<PARAMETER NAME="USER" FIELD="TEXT" NUM_ROW="28"
 			REPOSITORY_VALUE="USERNAME" REQUIRED="true" GROUP="CONNECTION"
-			SHOW_IF="!DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[]">
+			SHOW_IF="!DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[] AND (CONNECTION_MODE != 'DATAPROC')">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>

 		<PARAMETER NAME="PASS" FIELD="PASSWORD" NUM_ROW="28"
 			REPOSITORY_VALUE="PASSWORD" REQUIRED="true" GROUP="CONNECTION"
-			SHOW_IF="!DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[]">
+			SHOW_IF="!DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[] AND (CONNECTION_MODE != 'DATAPROC')">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>

@@ -125,7 +127,7 @@

 		<PARAMETER NAME="USE_KRB" FIELD="CHECK" NUM_ROW="31"
 			REQUIRED="true" REPOSITORY_VALUE="USE_KRB"
-			SHOW_IF="(CONFIGURATIONS_FROM_CLASSPATH == 'false') AND ((DISTRIBUTION=='CUSTOM') OR (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportKerberos[] AND ((DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHive1[] AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportEmbeddedMode[] AND HIVE_SERVER=='HIVE' AND CONNECTION_MODE=='EMBEDDED') OR (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHive2[] AND HIVE_SERVER=='HIVE2'))))"
+			SHOW_IF="(CONNECTION_MODE!='DATAPROC') AND (CONFIGURATIONS_FROM_CLASSPATH == 'false') AND ((DISTRIBUTION=='CUSTOM') OR (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportKerberos[] AND ((DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHive1[] AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportEmbeddedMode[] AND HIVE_SERVER=='HIVE' AND CONNECTION_MODE=='EMBEDDED') OR (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHive2[] AND HIVE_SERVER=='HIVE2'))))"
 			GROUP="AUTHENTICATION">
 			<DEFAULT>false</DEFAULT>
 		</PARAMETER>
@@ -239,7 +241,6 @@
        </PARAMETER>


-
 		<PARAMETER NAME="USE_SSL" FIELD="CHECK" NUM_ROW="49"
 			REPOSITORY_VALUE="USE_SSL" REQUIRED="true"
 			SHOW_IF="(CONFIGURATIONS_FROM_CLASSPATH == 'false') AND ((DISTRIBUTION=='CUSTOM' OR DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHive2[]) AND HIVE_SERVER=='HIVE2') AND (DISTRIBUTION=='CUSTOM' OR DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportSSL[])"
@@ -293,7 +294,7 @@
 			<DEFAULT>"localhost:8032"</DEFAULT>
 		</PARAMETER>
 		<PARAMETER NAME="SET_FS_DEFAULT_NAME" FIELD="CHECK" NUM_ROW="53"
-			SHOW_IF="(CONFIGURATIONS_FROM_CLASSPATH == 'false') AND !DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[]"
+			SHOW_IF="(CONFIGURATIONS_FROM_CLASSPATH == 'false') AND !DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[] AND (CONNECTION_MODE != 'DATAPROC')"
 			REQUIRED="true" GROUP="HADOOP_PROPS">
 			<DEFAULT IF="(CONNECTION_MODE == 'STANDALONE')">false</DEFAULT>
 			<DEFAULT IF="(CONNECTION_MODE == 'EMBEDDED')">true</DEFAULT>
@@ -424,44 +425,42 @@
 			SHOW_IF="DISTRIB[DISTRIBUTION, HIVE_VERSION].isExecutedThroughWebHCat[]">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
-
 		<!-- -->

 		<!-- GOOGLE DATAPROC -->
 		<PARAMETER NAME="GOOGLE_PROJECT_ID" REPOSITORY_VALUE="GOOGLE_PROJECT_ID" FIELD="TEXT" REQUIRED="true"
 			NUM_ROW="16" GROUP="CONNECTION"
-			SHOW_IF="DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[]">
+			SHOW_IF="CONNECTION_MODE=='DATAPROC'">
 			<DEFAULT>"my-google-project"</DEFAULT>
 		</PARAMETER>
 		<PARAMETER NAME="GOOGLE_CLUSTER_ID" REPOSITORY_VALUE="GOOGLE_CLUSTER_ID" FIELD="TEXT" REQUIRED="true"
 			NUM_ROW="17" GROUP="CONNECTION"
-			SHOW_IF="DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[]">
+			SHOW_IF="CONNECTION_MODE=='DATAPROC'">
 			<DEFAULT>"my-cluster-id"</DEFAULT>
 		</PARAMETER>
 		<PARAMETER NAME="GOOGLE_REGION" REPOSITORY_VALUE="GOOGLE_REGION" FIELD="TEXT" REQUIRED="true"
 			NUM_ROW="18" GROUP="CONNECTION"
-			SHOW_IF="DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[]">
+			SHOW_IF="CONNECTION_MODE=='DATAPROC'">
 			<DEFAULT>"global"</DEFAULT>
 		</PARAMETER>
 		<PARAMETER NAME="GOOGLE_JARS_BUCKET" REPOSITORY_VALUE="GOOGLE_JARS_BUCKET" FIELD="TEXT" REQUIRED="true"
 			NUM_ROW="19" GROUP="CONNECTION"
-			SHOW_IF="DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[]">
+			SHOW_IF="CONNECTION_MODE=='DATAPROC'">
 			<DEFAULT>"gs://my-bucket/talend/jars"</DEFAULT>
 		</PARAMETER>

 		<PARAMETER NAME="DEFINE_PATH_TO_GOOGLE_CREDENTIALS" REPOSITORY_VALUE="DEFINE_PATH_TO_GOOGLE_CREDENTIALS" FIELD="CHECK"
 			REQUIRED="true" NUM_ROW="50" GROUP="AUTHENTICATION"
-			SHOW_IF="DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[]">
+			SHOW_IF="CONNECTION_MODE=='DATAPROC'">
 			<DEFAULT>false</DEFAULT>
 		</PARAMETER>
 		<PARAMETER NAME="PATH_TO_GOOGLE_CREDENTIALS" REPOSITORY_VALUE="PATH_TO_GOOGLE_CREDENTIALS" FIELD="FILE" REQUIRED="true"
 			NUM_ROW="51" GROUP="AUTHENTICATION"
-			SHOW_IF="((isShow[DEFINE_PATH_TO_GOOGLE_CREDENTIALS]) AND DEFINE_PATH_TO_GOOGLE_CREDENTIALS=='true' AND DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[])">
+			SHOW_IF="(isShow[DEFINE_PATH_TO_GOOGLE_CREDENTIALS]) AND (DEFINE_PATH_TO_GOOGLE_CREDENTIALS=='true') AND (CONNECTION_MODE=='DATAPROC')">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
 		<!-- END GOOGLE DATAPROC -->

-
 		<PARAMETER NAME="USE_SHARED_CONNECTION" FIELD="CHECK"
 			NUM_ROW="60" REQUIRED="true"
 			SHOW_IF="(!DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[])">
@@ -484,7 +483,7 @@

 		<PARAMETER NAME="STORE_BY_HBASE" FIELD="CHECK" NUM_ROW="70"
 			REQUIRED="true"
-			SHOW_IF="(CONFIGURATIONS_FROM_CLASSPATH == 'true') OR ((CONNECTION_MODE != 'EMBEDDED' OR !DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportEmbeddedMode[]) AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHBaseForHive[])"
+			SHOW_IF="(CONFIGURATIONS_FROM_CLASSPATH == 'true') AND (CONNECTION_MODE!='DATAPROC') OR ((CONNECTION_MODE != 'EMBEDDED' OR !DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportEmbeddedMode[]) AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHBaseForHive[])"
 			GROUP="HBASE_GROUP">
 			<DEFAULT>false</DEFAULT>
 		</PARAMETER>
@@ -589,7 +588,7 @@

 		<PARAMETER NAME="HADOOP_ADVANCED_PROPERTIES"
 			REPOSITORY_VALUE="HADOOP_ADVANCED_PROPERTIES" FIELD="TABLE" REQUIRED="false"
-			SHOW_IF="!DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[]"
+			SHOW_IF="!DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[] AND (CONNECTION_MODE != 'DATAPROC')"
 			NUM_ROW="40" NB_LINES="3">
 			<ITEMS>
 				<ITEM NAME="PROPERTY" />
@@ -682,27 +681,22 @@
 			<IMPORT NAME="parquet-hive-bundle-1.5.0" MODULE="parquet-hive-bundle-1.5.0.jar"
 				MVN="mvn:org.talend.libraries/parquet-hive-bundle-1.5.0/6.0.0"
 				UrlPath="platform:/plugin/org.talend.libraries.hadoop/lib/parquet-hive-bundle-1.5.0.jar"
-				REQUIRED_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[] AND DISTRIBUTION!='PIVOTAL_HD' AND DISTRIBUTION!='CUSTOM' AND HIVE_VERSION!='MAPR2' AND HIVE_VERSION!='HDP_2_3' AND HIVE_VERSION!='APACHE_1_0_0' AND HIVE_VERSION!='APACHE_2_4_0_EMR_0_13_1')" />
+				REQUIRED_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[] AND DISTRIBUTION!='CUSTOM')" />
 			<IMPORT NAME="parquet-hive-bundle-1.3.2" MODULE="parquet-hive-bundle-1.3.2.jar"
 				MVN="mvn:org.talend.libraries/parquet-hive-bundle-1.3.2/6.0.0"
 				UrlPath="platform:/plugin/org.talend.libraries.hadoop/lib/parquet-hive-bundle-1.3.2.jar"
-				REQUIRED_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[] AND DISTRIBUTION=='PIVOTAL_HD' AND HIVE_VERSION!='PIVOTAL_HD_1_0_1')" />
+				REQUIRED_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[])" />
 			<IMPORT NAME="snappy-java-1.0.5.jar" MODULE="snappy-java-1.0.5.jar"
 				MVN="mvn:org.talend.libraries/snappy-java-1.0.5/6.0.0"
-				REQUIRED_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[] AND DISTRIBUTION!='CUSTOM' AND HIVE_VERSION!='MAPR2' AND HIVE_VERSION!='APACHE_1_0_0' AND HIVE_VERSION!='PIVOTAL_HD_1_0_1' AND HIVE_VERSION!='APACHE_2_4_0_EMR_0_13_1')" />
-			<!-- ############## -->
-			<IMPORT MODULE_GROUP="TEZ-LIB-HDP220"
-				REQUIRED_IF="(DISTRIBUTION == 'HORTONWORKS') AND (HIVE_VERSION == 'HDP_2_2') AND (EXECUTION_ENGINE == 'tez')" />
-			<IMPORT MODULE_GROUP="TEZ-SERVER-LIB-HDP220"
-				REQUIRED_IF="(DISTRIBUTION == 'HORTONWORKS') AND (HIVE_VERSION == 'HDP_2_2') AND (EXECUTION_ENGINE == 'tez') AND (TEZ_LIB == 'INSTALL')" />
-
-			<!-- Tez libraries for HDP_2_3 -->
-			<IMPORT MODULE_GROUP="TEZ-LIB-HDP_2_3"
-				REQUIRED_IF="(DISTRIBUTION == 'HORTONWORKS') AND (HIVE_VERSION == 'HDP_2_3') AND (EXECUTION_ENGINE == 'tez')" />
-
-			<!-- Tez Server libraries for HDP_2_3 -->
-			<IMPORT MODULE_GROUP="TEZ-SERVER-LIB-HDP_2_3"
-				REQUIRED_IF="(DISTRIBUTION == 'HORTONWORKS') AND (HIVE_VERSION == 'HDP_2_3') AND (EXECUTION_ENGINE == 'tez') AND (TEZ_LIB == 'INSTALL')" />
+				REQUIRED_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[] AND DISTRIBUTION!='CUSTOM')" />
+			
+			<!-- Dataproc 2.x -->	
+			<IMPORT MODULE_GROUP="DATAPROC-LAUNCHER-DI" 
+                   REQUIRED_IF="CONNECTION_MODE=='DATAPROC'" REQUIRED="false"/>
+            
+            <!-- Spark universal 3.1.x -->
+            <IMPORT MODULE_GROUP="UNIVERSAL-SPARK-3.1.X" 
+                   REQUIRED_IF="(CONNECTION_MODE=='STANDALONE') AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportUniversalLocalMode[]" REQUIRED="false"/>	
 		</IMPORTS>
 	</CODEGENERATION>

--- a/main/plugins/org.talend.designer.components.localprovider/components/tHiveConnection/tHiveConnection_messages.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tHiveConnection/tHiveConnection_messages.properties
@@ -36,6 +36,7 @@ HIVE_SERVER.ITEM.HIVE2=Hive 2
 CONNECTION_MODE.NAME=Connection mode
 CONNECTION_MODE.ITEM.EMBEDDED=Embedded
 CONNECTION_MODE.ITEM.STANDALONE=Standalone
+CONNECTION_MODE.ITEM.DATAPROC=Dataproc
 HIVE_ADDITIONAL_JDBC.NAME=Additional JDBC Settings
 SET_MAPRED_JT.NAME=Set Jobtracker URI
 SET_FS_DEFAULT_NAME.NAME=Set Namenode URI
--- a/main/plugins/org.talend.designer.components.localprovider/components/tHiveConnection/tHiveConnection_messages_fr.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tHiveConnection/tHiveConnection_messages_fr.properties
@@ -36,6 +36,7 @@ HIVE_SERVER.ITEM.HIVE2=Hive 2
 CONNECTION_MODE.NAME=Mode de connexion
 CONNECTION_MODE.ITEM.EMBEDDED=Embarqu\u00E9(e)
 CONNECTION_MODE.ITEM.STANDALONE=Standalone
+CONNECTION_MODE.ITEM.DATAPROC=Dataproc
 HIVE_ADDITIONAL_JDBC.NAME=Param\u00E8tres JDBC suppl\u00E9mentaires
 SET_MAPRED_JT.NAME=Configurer l'URI du JobTracker
 SET_FS_DEFAULT_NAME.NAME=D\u00E9finir l'URI du NameNode
--- a/main/plugins/org.talend.designer.components.localprovider/components/tHiveConnection/tHiveConnection_messages_ja.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tHiveConnection/tHiveConnection_messages_ja.properties
@@ -36,6 +36,7 @@ HIVE_SERVER.ITEM.HIVE2=Hive 2
 CONNECTION_MODE.NAME=\u63A5\u7D9A\u30E2\u30FC\u30C9
 CONNECTION_MODE.ITEM.EMBEDDED=\u7D44\u307F\u8FBC\u307F
 CONNECTION_MODE.ITEM.STANDALONE=\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3
+CONNECTION_MODE.ITEM.DATAPROC=Dataproc
 HIVE_ADDITIONAL_JDBC.NAME=JDBC\u8FFD\u52A0\u8A2D\u5B9A
 SET_MAPRED_JT.NAME=\u30B8\u30E7\u30D6\u30C8\u30E9\u30C3\u30AB\u30FCURI\u3092\u8A2D\u5B9A
 SET_FS_DEFAULT_NAME.NAME=\u30CD\u30FC\u30E0\u30CE\u30FC\u30C9URI\u3092\u8A2D\u5B9A
--- a/main/plugins/org.talend.designer.components.localprovider/components/tHiveConnection/tHiveConnection_messages_zh_CN.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tHiveConnection/tHiveConnection_messages_zh_CN.properties
@@ -36,6 +36,7 @@ HIVE_SERVER.ITEM.HIVE2=Hive 2
 CONNECTION_MODE.NAME=\u8FDE\u63A5\u6A21\u5F0F
 CONNECTION_MODE.ITEM.EMBEDDED=\u5D4C\u5165\u5F0F
 CONNECTION_MODE.ITEM.STANDALONE=\u72EC\u7ACB
+CONNECTION_MODE.ITEM.DATAPROC=Dataproc
 HIVE_ADDITIONAL_JDBC.NAME=\u9644\u52A0 JDBC \u8BBE\u7F6E
 SET_MAPRED_JT.NAME=\u8BBE\u7F6E Jobtracker URI
 SET_FS_DEFAULT_NAME.NAME=\u8BBE\u7F6E Namenode URI
--- a/main/plugins/org.talend.designer.components.localprovider/components/tHiveIn/tHiveIn_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tHiveIn/tHiveIn_java.xml
@@ -84,26 +84,30 @@


 		<!-- GOOGLE DATAPROC -->
-		<PARAMETER NAME="GOOGLE_PROJECT_ID" FIELD="TEXT" REQUIRED="true"
-			NUM_ROW="16" GROUP="CONN">
-			<DEFAULT>""</DEFAULT>
+		<PARAMETER NAME="GOOGLE_PROJECT_ID" REPOSITORY_VALUE="GOOGLE_PROJECT_ID" FIELD="TEXT" REQUIRED="true"
+			NUM_ROW="16" GROUP="CONN"
+			SHOW_IF="(USE_EXISTING_CONNECTION=='false') AND (CONNECTION_MODE=='DATAPROC')">
+			<DEFAULT>"my-google-project"</DEFAULT>
 		</PARAMETER>
-		<PARAMETER NAME="GOOGLE_CLUSTER_ID" FIELD="TEXT" REQUIRED="true"
-			NUM_ROW="17" GROUP="CONN">
-			<DEFAULT>""</DEFAULT>
+		<PARAMETER NAME="GOOGLE_CLUSTER_ID" REPOSITORY_VALUE="GOOGLE_CLUSTER_ID" FIELD="TEXT" REQUIRED="true"
+			NUM_ROW="17" GROUP="CONN"
+			SHOW_IF="(USE_EXISTING_CONNECTION=='false') AND (CONNECTION_MODE=='DATAPROC')">
+			<DEFAULT>"my-cluster-id"</DEFAULT>
 		</PARAMETER>
-		<PARAMETER NAME="GOOGLE_REGION" FIELD="TEXT" REQUIRED="true"
-			NUM_ROW="18" GROUP="CONN">
-			<DEFAULT>""</DEFAULT>
+		<PARAMETER NAME="GOOGLE_REGION" REPOSITORY_VALUE="GOOGLE_REGION" FIELD="TEXT" REQUIRED="true"
+			NUM_ROW="18" GROUP="CONN"
+			SHOW_IF="(USE_EXISTING_CONNECTION=='false') AND (CONNECTION_MODE=='DATAPROC')">
+			<DEFAULT>"global"</DEFAULT>
 		</PARAMETER>
-		<PARAMETER NAME="GOOGLE_JARS_BUCKET" FIELD="TEXT" REQUIRED="true"
-			NUM_ROW="19" GROUP="CONN">
-			<DEFAULT>""</DEFAULT>
+		<PARAMETER NAME="GOOGLE_JARS_BUCKET" REPOSITORY_VALUE="GOOGLE_JARS_BUCKET" FIELD="TEXT" REQUIRED="true"
+			NUM_ROW="19" GROUP="CONN"
+			SHOW_IF="(USE_EXISTING_CONNECTION=='false') AND (CONNECTION_MODE=='DATAPROC')">
+			<DEFAULT>"gs://my-bucket/talend/jars"</DEFAULT>
 		</PARAMETER>

 		<PARAMETER NAME="AUTH_TYPE" NUM_ROW="20" REQUIRED="true"
 				   FIELD="CLOSED_LIST" GROUP="CONN"
-				   SHOW_IF="((DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[]) AND USE_EXISTING_CONNECTION=='false') OR (USE_EXISTING_CONNECTION=='true' AND DISTRIB[#LINK@NODE.CONNECTION.DISTRIBUTION, #LINK@NODE.CONNECTION.HIVE_VERSION].isGoogleDataprocDistribution[])">
+				   SHOW_IF="(CONNECTION_MODE=='DATAPROC') AND (USE_EXISTING_CONNECTION=='false')">
 			<ITEMS DEFAULT="USER_ACCOUNT_HMAC">
 				<ITEM NAME="USER_ACCOUNT_HMAC" VALUE="USER_ACCOUNT_HMAC"/>
 				<ITEM NAME="SERVICE_ACCOUNT" VALUE="SERVICE_ACCOUNT"/>
@@ -113,22 +117,24 @@
 	    <PARAMETER
 			NAME="ACCESS_KEY" FIELD="TEXT" REQUIRED="true"
 			NUM_ROW="20"  GROUP="CONN"
-			SHOW_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[]) AND (AUTH_TYPE=='USER_ACCOUNT_HMAC')">
+			SHOW_IF="(isShow[AUTH_TYPE]) AND (AUTH_TYPE=='USER_ACCOUNT_HMAC') AND (CONNECTION_MODE=='DATAPROC')">
 	      <DEFAULT>""</DEFAULT>
 	    </PARAMETER>
 	    <PARAMETER
 			NAME="SECRET_KEY" FIELD="PASSWORD" REQUIRED="true"
 			NUM_ROW="21"  GROUP="CONN"
-			SHOW_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[]) AND (AUTH_TYPE=='USER_ACCOUNT_HMAC')">
+			SHOW_IF="(isShow[AUTH_TYPE]) AND (AUTH_TYPE=='USER_ACCOUNT_HMAC') AND (CONNECTION_MODE=='DATAPROC')">
 	        <DEFAULT>""</DEFAULT>
 	    </PARAMETER>

 		<PARAMETER NAME="DEFINE_PATH_TO_GOOGLE_CREDENTIALS" FIELD="CHECK" REQUIRED="true"
-			NUM_ROW="51" GROUP="AUTHENTICATION">
+			NUM_ROW="51" GROUP="AUTHENTICATION"
+			SHOW_IF="(USE_EXISTING_CONNECTION=='false') AND (CONNECTION_MODE=='DATAPROC')">
 			<DEFAULT>false</DEFAULT>
 		</PARAMETER>
 		<PARAMETER NAME="PATH_TO_GOOGLE_CREDENTIALS" FIELD="FILE" REQUIRED="true"
-			NUM_ROW="51" GROUP="AUTHENTICATION">
+			NUM_ROW="51" GROUP="AUTHENTICATION"
+			SHOW_IF="((isShow[DEFINE_PATH_TO_GOOGLE_CREDENTIALS]) AND DEFINE_PATH_TO_GOOGLE_CREDENTIALS=='true' AND CONNECTION_MODE=='DATAPROC')">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
 		<!-- END GOOGLE DATAPROC -->
@@ -180,35 +186,13 @@

 	<CODEGENERATION>
 		<IMPORTS>
-			<!-- MICROSOFT HD INSIGHT 3.1 -->
-            <IMPORT NAME="talend-bigdata-launcher-1.1.0-20160405" MODULE="talend-bigdata-launcher-1.1.0-20160405.jar" MVN="mvn:org.talend.libraries/talend-bigdata-launcher-1.1.0-20160405/6.0.0" 
-                REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (DISTRIBUTION=='MICROSOFT_HD_INSIGHT') AND (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[])" />
-            <IMPORT NAME="cxf-api-2.7.7" MODULE="cxf-api-2.7.7.jar" MVN="mvn:org.talend.libraries/cxf-api-2.7.7/6.0.0" 
-                UrlPath="platform:/plugin/org.talend.libraries.apache.cxf/lib/cxf-api-2.7.7.jar"
-                REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (DISTRIBUTION=='MICROSOFT_HD_INSIGHT') AND (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[])" />
-            <IMPORT NAME="cxf-rt-bindings-xml-2.7.7" MODULE="cxf-rt-bindings-xml-2.7.7.jar" MVN="mvn:org.talend.libraries/cxf-rt-bindings-xml-2.7.7/6.0.0" 
-                UrlPath="platform:/plugin/org.talend.libraries.apache.cxf/lib/cxf-rt-bindings-xml-2.7.7.jar"
-                REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (DISTRIBUTION=='MICROSOFT_HD_INSIGHT') AND (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[])" />
-            <IMPORT NAME="cxf-rt-core-2.7.7" MODULE="cxf-rt-core-2.7.7.jar" MVN="mvn:org.talend.libraries/cxf-rt-core-2.7.7/6.0.0" 
-                UrlPath="platform:/plugin/org.talend.libraries.apache.cxf/lib/cxf-rt-core-2.7.7.jar"
-                REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (DISTRIBUTION=='MICROSOFT_HD_INSIGHT') AND (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[])" />
-            <IMPORT NAME="cxf-rt-frontend-jaxrs-2.7.7" MODULE="cxf-rt-frontend-jaxrs-2.7.7.jar" MVN="mvn:org.talend.libraries/cxf-rt-frontend-jaxrs-2.7.7/6.0.0" 
-                UrlPath="platform:/plugin/org.talend.libraries.apache.cxf/lib/cxf-rt-frontend-jaxrs-2.7.7.jar"
-                REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (DISTRIBUTION=='MICROSOFT_HD_INSIGHT') AND (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[])" />
-            <IMPORT NAME="cxf-rt-transports-http-2.7.7" MODULE="cxf-rt-transports-http-2.7.7.jar" MVN="mvn:org.talend.libraries/cxf-rt-transports-http-2.7.7/6.0.0" 
-                UrlPath="platform:/plugin/org.talend.libraries.apache.cxf/lib/cxf-rt-transports-http-2.7.7.jar"
-                REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (DISTRIBUTION=='MICROSOFT_HD_INSIGHT') AND (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[])" />
-            <IMPORT NAME="json-simple" MODULE="json_simple-1.1.jar" MVN="mvn:org.talend.libraries/json_simple-1.1/6.0.0" 
-                UrlPath="platform:/plugin/org.talend.libraries.jackson/lib/json_simple-1.1.jar"
-                REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (DISTRIBUTION=='MICROSOFT_HD_INSIGHT') AND (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[])" />
-            <IMPORT NAME="javax.ws.rs-api-2.0-m10" MODULE="javax.ws.rs-api-2.0-m10.jar" MVN="mvn:org.talend.libraries/javax.ws.rs-api-2.0-m10/6.0.0" 
-                REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (DISTRIBUTION=='MICROSOFT_HD_INSIGHT') AND (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[])" />
-            <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="false"
-                REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (DISTRIBUTION=='MICROSOFT_HD_INSIGHT') AND (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[])" />
-            <IMPORT NAME="azure-storage-1.2.0" MODULE="azure-storage-1.2.0.jar" MVN="mvn:org.talend.libraries/azure-storage-1.2.0/6.0.0" 
-                REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (DISTRIBUTION=='MICROSOFT_HD_INSIGHT') AND (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[])" />
-			<!-- #################### -->
+			<!-- Dataproc 2.x -->	
+			<IMPORT MODULE_GROUP="DATAPROC-LAUNCHER-DI" 
+                   REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (CONNECTION_MODE=='DATAPROC')" REQUIRED="false"/>
+            
+            <!-- Spark universal 3.1.x -->
+            <IMPORT MODULE_GROUP="UNIVERSAL-SPARK-3.1.X" 
+                   REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (CONNECTION_MODE=='STANDALONE') AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportUniversalLocalMode[]" REQUIRED="false"/>	
 		</IMPORTS>
 	</CODEGENERATION>

--- a/main/plugins/org.talend.designer.components.localprovider/components/tHiveIn/tHiveIn_main.javajet
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tHiveIn/tHiveIn_main.javajet
@@ -33,7 +33,7 @@ imports="

    String theDistribution = ElementParameterParser.getValue(node, "__DISTRIBUTION__");
    String theVersion = ElementParameterParser.getValue(node, "__HIVE_VERSION__");
-
+    
 	final String studioVersion = org.talend.commons.utils.VersionUtils.getDisplayVersion();

    if ("true".equals(ElementParameterParser.getValue(node,"__USE_EXISTING_CONNECTION__"))) { //with connection
@@ -45,7 +45,7 @@ imports="
            }
        }
    }
-
+	
    org.talend.hadoop.distribution.component.HiveComponent hiveDistrib = null;
    try {
        hiveDistrib = (org.talend.hadoop.distribution.component.HiveComponent) org.talend.hadoop.distribution.DistributionFactory.buildDistribution(theDistribution, theVersion);
@@ -95,7 +95,7 @@ bw_<%=cid%>.write("!set showHeader false\n");
 <%
        }
    }
-    if (hiveDistrib.isGoogleDataprocDistribution()) {
+    if (hiveDistrib.doSupportUniversalDataprocMode()) {
 %>
        <%@ include file="@{org.talend.designer.components.localprovider}/components/templates/Hive/GetDataprocConnection.javajet"%>
 <%
@@ -193,7 +193,7 @@ bw_<%=cid%>.write("!set showHeader false\n");
 <%
    }

-    if (hiveDistrib.isGoogleDataprocDistribution()) {
+    if (hiveDistrib.doSupportUniversalDataprocMode()) {
        if (isLog4jEnabled) {
 %>
            log.debug("Query for <%=cid%>: " + <%=dbquery%>.replace("';'", "'\\;'") + ";");
--- a/main/plugins/org.talend.designer.components.localprovider/components/tHiveRow/tHiveRow_begin.javajet
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tHiveRow/tHiveRow_begin.javajet
@@ -30,17 +30,19 @@ imports="
 	boolean usePrepareStatement = "true".equals(ElementParameterParser.getValue(node,"__USE_PREPAREDSTATEMENT__"));

 	boolean useParquet = "true".equals(ElementParameterParser.getValue(node,"__USE_PARQUET__"));
-
+	String encryptedToken = null;
+	
    String theDistribution = ElementParameterParser.getValue(node, "__DISTRIBUTION__");
    String theVersion = ElementParameterParser.getValue(node, "__HIVE_VERSION__");
+	String connMode = ElementParameterParser.getValue(node, "__CONNECTION_MODE__");

-	String encryptedToken = null;
    if("true".equals(ElementParameterParser.getValue(node,"__USE_EXISTING_CONNECTION__"))) {
        String connection = ElementParameterParser.getValue(node, "__CONNECTION__");
        for (INode pNode : node.getProcess().getNodesOfType("tHiveConnection")) {
            if(connection!=null && connection.equals(pNode.getUniqueName())) {
                theDistribution = ElementParameterParser.getValue(pNode, "__DISTRIBUTION__");
                theVersion = ElementParameterParser.getValue(pNode, "__HIVE_VERSION__");
+                connMode = ElementParameterParser.getValue(pNode, "__CONNECTION_MODE__");
            }
        }
    }
@@ -89,12 +91,12 @@ imports="
 			}
 <%
 		}
-    } else if(hiveDistrib.isGoogleDataprocDistribution()) {
+    } else if ("DATAPROC".equalsIgnoreCase(connMode)) {
 		// Distribution: Google Dataproc
 %>
        <%@ include file="@{org.talend.designer.components.localprovider}/components/templates/Hive/GetDataprocConnection.javajet"%>
 <%
-	} else {
+	 } else {
 		// Distribution: other than WebHCat, Dataproc
 %>
 		<%@ include file="../templates/Hive/GetConnection.javajet"%>
@@ -231,7 +233,7 @@ imports="
 	    }
 	}

-	if(!hiveDistrib.useCloudLauncher()) {
+	if(!hiveDistrib.useCloudLauncher() && !"DATAPROC".equalsIgnoreCase(connMode)) {
 		if (usePrepareStatement) {
 		%>
 			java.sql.PreparedStatement pstmt_<%=cid %> = conn_<%=cid%>.prepareStatement(<%=dbquery%>);
@@ -244,3 +246,4 @@ imports="
 %>
 	String query_<%=cid %> = "";
 	boolean whetherReject_<%=cid%> = false;
+
--- a/main/plugins/org.talend.designer.components.localprovider/components/tHiveRow/tHiveRow_end.javajet
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tHiveRow/tHiveRow_end.javajet
@@ -17,6 +17,7 @@ imports="
 	
    String theDistribution = ElementParameterParser.getValue(node, "__DISTRIBUTION__");
    String theVersion = ElementParameterParser.getValue(node, "__HIVE_VERSION__");
+	String connMode = ElementParameterParser.getValue(node, "__CONNECTION_MODE__");

    if("true".equals(ElementParameterParser.getValue(node,"__USE_EXISTING_CONNECTION__"))) {
        String connection = ElementParameterParser.getValue(node, "__CONNECTION__");
@@ -24,6 +25,7 @@ imports="
            if(connection!=null && connection.equals(pNode.getUniqueName())) {
                theDistribution = ElementParameterParser.getValue(pNode, "__DISTRIBUTION__");
                theVersion = ElementParameterParser.getValue(pNode, "__HIVE_VERSION__");
+                connMode = ElementParameterParser.getValue(pNode, "__CONNECTION_MODE__");
            }
        }
    }
@@ -37,10 +39,10 @@ imports="
    }
    boolean isCustom = hiveDistrib instanceof org.talend.hadoop.distribution.custom.CustomDistribution;

-	if(!hiveDistrib.useCloudLauncher()) {
+	if(!hiveDistrib.useCloudLauncher() && !"DATAPROC".equalsIgnoreCase(connMode)) {
 		if (usePrepareStatement) {
 		%>
-			pstmt_<%=cid %>.close();	
+			pstmt_<%=cid %>.close();
 		<%
 		} 
 		%>
@@ -99,3 +101,4 @@ imports="
 <%
 	}
 %>
+
--- a/main/plugins/org.talend.designer.components.localprovider/components/tHiveRow/tHiveRow_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tHiveRow/tHiveRow_java.xml
@@ -17,12 +17,12 @@

 	<CONNECTORS>
 		<CONNECTOR CTYPE="FLOW" MAX_INPUT="1" MAX_OUTPUT="1" 
-			NOT_SHOW_IF="DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[]" />
+			NOT_SHOW_IF="CONNECTION_MODE=='DATAPROC'" />
 		<CONNECTOR NAME="REJECT" CTYPE="FLOW" MAX_INPUT="0"
 			MAX_OUTPUT="1" LINE_STYLE="2" COLOR="FF0000" BASE_SCHEMA="FLOW"
-			NOT_SHOW_IF="(DATA_ACTION == 'INSERT' OR DIE_ON_ERROR == 'true' OR DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[])" />
+			NOT_SHOW_IF="(DATA_ACTION == 'INSERT') OR (DIE_ON_ERROR=='true') OR (CONNECTION_MODE=='DATAPROC')" />
 		<CONNECTOR CTYPE="ITERATE" MAX_OUTPUT="1" MAX_INPUT="1" 
-			NOT_SHOW_IF="DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[]" />
+			NOT_SHOW_IF="CONNECTION_MODE=='DATAPROC'" />
 		<CONNECTOR CTYPE="SUBJOB_OK" MAX_INPUT="1" />
 		<CONNECTOR CTYPE="SUBJOB_ERROR" MAX_INPUT="1" />
 		<CONNECTOR CTYPE="COMPONENT_OK" />
@@ -74,6 +74,8 @@
 					SHOW_IF="(DISTRIBUTION=='CUSTOM') OR DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportEmbeddedMode[]" />
 				<ITEM NAME="STANDALONE" VALUE="STANDALONE"
 					SHOW_IF="(DISTRIBUTION=='CUSTOM') OR (HIVE_SERVER == 'HIVE2' AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportStandaloneMode[]) OR (HIVE_SERVER == 'HIVE' AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHive1Standalone[])" />
+				<ITEM NAME="DATAPROC" VALUE="DATAPROC"
+					SHOW_IF="DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportUniversalDataprocMode[]"/>
 			</ITEMS>
 		</PARAMETER>
 		<PARAMETER NAME="HIVE_SERVER" FIELD="CLOSED_LIST" NUM_ROW="13"
@@ -88,14 +90,14 @@

 		<PARAMETER NAME="HOST" FIELD="TEXT" NUM_ROW="20"
 			REPOSITORY_VALUE="SERVER_NAME" REQUIRED="true"
-			SHOW_IF="(USE_EXISTING_CONNECTION == 'false' AND !DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[])"
+			SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND !DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[] AND (CONNECTION_MODE!='DATAPROC')"
 			GROUP="CONN">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>

 		<PARAMETER NAME="PORT" FIELD="TEXT" NUM_ROW="20"
 			REPOSITORY_VALUE="PORT" REQUIRED="true"
-			SHOW_IF="(USE_EXISTING_CONNECTION == 'false' AND !DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[])"
+			SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND !DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[] AND (CONNECTION_MODE!='DATAPROC')"
 			GROUP="CONN">
 			<DEFAULT>"10000"</DEFAULT>
 		</PARAMETER>
@@ -113,28 +115,28 @@

 		<PARAMETER NAME="USER" FIELD="TEXT" NUM_ROW="28"
 			REPOSITORY_VALUE="USERNAME" REQUIRED="true"
-			SHOW_IF="(USE_EXISTING_CONNECTION == 'false' AND !DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[])"
+			SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND !DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[] AND (CONNECTION_MODE!='DATAPROC')"
 			GROUP="CONN">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>

 		<PARAMETER NAME="PASS" FIELD="PASSWORD" NUM_ROW="28"
 			REPOSITORY_VALUE="PASSWORD" REQUIRED="true"
-			SHOW_IF="(USE_EXISTING_CONNECTION == 'false' AND !DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[])"
+			SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND !DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[] AND (CONNECTION_MODE!='DATAPROC')"
 			GROUP="CONN">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>

 		<PARAMETER NAME="HIVE_ADDITIONAL_JDBC" FIELD="TEXT" NUM_ROW="29"
 			REPOSITORY_VALUE="HIVE_ADDITIONAL_JDBC" REQUIRED="false" GROUP="CONN"
-			SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND (!DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[] AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHive2[] AND HIVE_SERVER=='HIVE2' AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportStandaloneMode[] AND CONNECTION_MODE=='STANDALONE')">
+			SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND (!DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[] AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHive2[] AND HIVE_SERVER=='HIVE2' AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportStandaloneMode[] AND CONNECTION_MODE=='STANDALONE' AND CONNECTION_MODE!='DATAPROC')">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>


 		<PARAMETER NAME="USE_KRB" FIELD="CHECK" NUM_ROW="30"
 			REQUIRED="true" REPOSITORY_VALUE="USE_KRB"
-			SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND ((DISTRIBUTION=='CUSTOM') OR (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportKerberos[] AND ((DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHive1[] AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportEmbeddedMode[] AND HIVE_SERVER=='HIVE' AND CONNECTION_MODE=='EMBEDDED') OR (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHive2[] AND HIVE_SERVER=='HIVE2'))))"
+			SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND (CONNECTION_MODE!='DATAPROC') AND ((DISTRIBUTION=='CUSTOM') OR (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportKerberos[] AND ((DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHive1[] AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportEmbeddedMode[] AND HIVE_SERVER=='HIVE' AND CONNECTION_MODE=='EMBEDDED') OR (DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportHive2[] AND HIVE_SERVER=='HIVE2'))))"
 			GROUP="AUTHENTICATION">
 			<DEFAULT>false</DEFAULT>
 		</PARAMETER>
@@ -304,7 +306,7 @@

 		<PARAMETER NAME="SET_FS_DEFAULT_NAME" FIELD="CHECK" NUM_ROW="53"
 			REQUIRED="true"
-			SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND (!DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[])"
+			SHOW_IF="(USE_EXISTING_CONNECTION == 'false') AND (!DISTRIB[DISTRIBUTION, HIVE_VERSION].useCloudLauncher[]) AND (CONNECTION_MODE!='DATAPROC')"
 			GROUP="HADOOP_PROPS">
 			<DEFAULT IF="(CONNECTION_MODE == 'STANDALONE')">false</DEFAULT>
 			<DEFAULT IF="(CONNECTION_MODE == 'EMBEDDED')">true</DEFAULT>
@@ -439,43 +441,42 @@
 			SHOW_IF="(USE_EXISTING_CONNECTION == 'false' AND DISTRIB[DISTRIBUTION, HIVE_VERSION].isExecutedThroughWebHCat[])">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
-
 		<!-- -->

 		<!-- GOOGLE DATAPROC -->
 		<PARAMETER NAME="GOOGLE_PROJECT_ID" REPOSITORY_VALUE="GOOGLE_PROJECT_ID" FIELD="TEXT" REQUIRED="true"
 			NUM_ROW="16" GROUP="CONN"
-			SHOW_IF="(USE_EXISTING_CONNECTION=='false' AND DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[])">
+			SHOW_IF="(USE_EXISTING_CONNECTION=='false') AND (CONNECTION_MODE=='DATAPROC')">
 			<DEFAULT>"my-google-project"</DEFAULT>
 		</PARAMETER>
 		<PARAMETER NAME="GOOGLE_CLUSTER_ID" REPOSITORY_VALUE="GOOGLE_CLUSTER_ID" FIELD="TEXT" REQUIRED="true"
 			NUM_ROW="17" GROUP="CONN"
-			SHOW_IF="(USE_EXISTING_CONNECTION=='false' AND DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[])">
+			SHOW_IF="(USE_EXISTING_CONNECTION=='false') AND (CONNECTION_MODE=='DATAPROC')">
 			<DEFAULT>"my-cluster-id"</DEFAULT>
 		</PARAMETER>
 		<PARAMETER NAME="GOOGLE_REGION" REPOSITORY_VALUE="GOOGLE_REGION" FIELD="TEXT" REQUIRED="true"
 			NUM_ROW="18" GROUP="CONN"
-			SHOW_IF="(USE_EXISTING_CONNECTION=='false' AND DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[])">
+			SHOW_IF="(USE_EXISTING_CONNECTION=='false') AND (CONNECTION_MODE=='DATAPROC')">
 			<DEFAULT>"global"</DEFAULT>
 		</PARAMETER>
 		<PARAMETER NAME="GOOGLE_JARS_BUCKET" REPOSITORY_VALUE="GOOGLE_JARS_BUCKET" FIELD="TEXT" REQUIRED="true"
 			NUM_ROW="19" GROUP="CONN"
-			SHOW_IF="(USE_EXISTING_CONNECTION=='false' AND DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[])">
+			SHOW_IF="(USE_EXISTING_CONNECTION=='false') AND (CONNECTION_MODE=='DATAPROC')">
 			<DEFAULT>"gs://my-bucket/talend/jars"</DEFAULT>
 		</PARAMETER>

 		<PARAMETER NAME="DEFINE_PATH_TO_GOOGLE_CREDENTIALS" REPOSITORY_VALUE="DEFINE_PATH_TO_GOOGLE_CREDENTIALS" FIELD="CHECK"
 			REQUIRED="true" NUM_ROW="50" GROUP="AUTHENTICATION"
-			SHOW_IF="(USE_EXISTING_CONNECTION=='false' AND DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[])">
+			SHOW_IF="(USE_EXISTING_CONNECTION=='false') AND (CONNECTION_MODE=='DATAPROC')">
 			<DEFAULT>false</DEFAULT>
 		</PARAMETER>
 		<PARAMETER NAME="PATH_TO_GOOGLE_CREDENTIALS" REPOSITORY_VALUE="PATH_TO_GOOGLE_CREDENTIALS" FIELD="FILE" REQUIRED="true"
 			NUM_ROW="51" GROUP="AUTHENTICATION"
-			SHOW_IF="((isShow[DEFINE_PATH_TO_GOOGLE_CREDENTIALS]) AND DEFINE_PATH_TO_GOOGLE_CREDENTIALS=='true' AND DISTRIB[DISTRIBUTION, HIVE_VERSION].isGoogleDataprocDistribution[])">
+			SHOW_IF="(isShow[DEFINE_PATH_TO_GOOGLE_CREDENTIALS]) AND (DEFINE_PATH_TO_GOOGLE_CREDENTIALS=='true') AND (CONNECTION_MODE=='DATAPROC')">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
 		<!-- END GOOGLE DATAPROC -->
-
+		
 		<PARAMETER NAME="SCHEMA_FLOW" FIELD="SCHEMA_TYPE" NUM_ROW="60">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
@@ -759,15 +760,23 @@
 			<IMPORT NAME="parquet-hive-bundle-1.5.0" MODULE="parquet-hive-bundle-1.5.0.jar"
 				MVN="mvn:org.talend.libraries/parquet-hive-bundle-1.5.0/6.0.0"
 				UrlPath="platform:/plugin/org.talend.libraries.hadoop/lib/parquet-hive-bundle-1.5.0.jar"
-				REQUIRED_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[] AND USE_EXISTING_CONNECTION=='false' AND USE_PARQUET=='true' AND DISTRIBUTION!='PIVOTAL_HD' AND DISTRIBUTION!='CUSTOM' AND HIVE_VERSION!='HDP_2_3' AND HIVE_VERSION!='MAPR2' AND HIVE_VERSION!='APACHE_1_0_0')" />
+				REQUIRED_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[] AND USE_EXISTING_CONNECTION=='false' AND USE_PARQUET=='true' AND DISTRIBUTION!='CUSTOM')" />
 			<IMPORT NAME="parquet-hive-bundle-1.3.2" MODULE="parquet-hive-bundle-1.3.2.jar"
 				MVN="mvn:org.talend.libraries/parquet-hive-bundle-1.3.2/6.0.0"
 				UrlPath="platform:/plugin/org.talend.libraries.hadoop/lib/parquet-hive-bundle-1.3.2.jar"
-				REQUIRED_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[] AND USE_EXISTING_CONNECTION=='false' AND USE_PARQUET=='true' AND DISTRIBUTION=='PIVOTAL_HD' AND HIVE_VERSION!='PIVOTAL_HD_1_0_1')" />
+				REQUIRED_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[] AND USE_EXISTING_CONNECTION=='false' AND USE_PARQUET=='true')" />
 			<IMPORT NAME="snappy-java-1.0.5.jar" MODULE="snappy-java-1.0.5.jar"
 				MVN="mvn:org.talend.libraries/snappy-java-1.0.5/6.0.0"				
-				REQUIRED_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[] AND USE_EXISTING_CONNECTION=='false' AND USE_PARQUET=='true' AND DISTRIBUTION!='CUSTOM' AND HIVE_VERSION!='MAPR2' AND HIVE_VERSION!='APACHE_1_0_0' AND HIVE_VERSION!='PIVOTAL_HD_1_0_1')" />
+				REQUIRED_IF="(DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportOldImportMode[] AND USE_EXISTING_CONNECTION=='false' AND USE_PARQUET=='true' AND DISTRIBUTION!='CUSTOM')" />
 			
+			<!-- Dataproc 2.x -->	
+			<IMPORT MODULE_GROUP="DATAPROC-LAUNCHER-DI" 
+                   REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (CONNECTION_MODE=='DATAPROC')" REQUIRED="false"/>
+            
+            <!-- Spark universal 3.1.x -->
+            <IMPORT MODULE_GROUP="UNIVERSAL-SPARK-3.1.X" 
+                   REQUIRED_IF="(USE_EXISTING_CONNECTION=='false') AND (CONNECTION_MODE=='STANDALONE') AND DISTRIB[DISTRIBUTION, HIVE_VERSION].doSupportUniversalLocalMode[]" REQUIRED="false"/>
+                   
 		</IMPORTS>
 	</CODEGENERATION>

--- a/main/plugins/org.talend.designer.components.localprovider/components/tHiveRow/tHiveRow_main.javajet
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tHiveRow/tHiveRow_main.javajet
@@ -30,18 +30,20 @@ boolean usePrepareStatement = "true".equals(ElementParameterParser.getValue(node
 String dbquery= ElementParameterParser.getValue(node, "__QUERY__");
 dbquery = org.talend.core.model.utils.NodeUtil.replaceCRLFInMEMO_SQL(dbquery);

+final String studioVersion = org.talend.commons.utils.VersionUtils.getDisplayVersion();
+String encryptedToken = null;
+
 String theDistribution = ElementParameterParser.getValue(node, "__DISTRIBUTION__");
 String theVersion = ElementParameterParser.getValue(node, "__HIVE_VERSION__");
+String connMode = ElementParameterParser.getValue(node, "__CONNECTION_MODE__");

-final String studioVersion = org.talend.commons.utils.VersionUtils.getDisplayVersion();
-
-String encryptedToken = null;
 if("true".equals(ElementParameterParser.getValue(node,"__USE_EXISTING_CONNECTION__"))) {
    String connection = ElementParameterParser.getValue(node, "__CONNECTION__");
    for (INode pNode : node.getProcess().getNodesOfType("tHiveConnection")) {
        if(connection!=null && connection.equals(pNode.getUniqueName())) {
            theDistribution = ElementParameterParser.getValue(pNode, "__DISTRIBUTION__");
            theVersion = ElementParameterParser.getValue(pNode, "__HIVE_VERSION__");
+            connMode = ElementParameterParser.getValue(pNode, "__CONNECTION_MODE__");
        }
    }
 }
@@ -88,7 +90,7 @@ if(hiveDistrib.isExecutedThroughWebHCat()) {
 %>
 	}
 <%
-} else if (hiveDistrib.isGoogleDataprocDistribution()) {
+} else if("DATAPROC".equalsIgnoreCase(connMode)) { // Dataproc
    if(isLog4jEnabled) {
 %>
        log.debug("Query for <%=cid%>: " + query_<%=cid %>.replace("';'", "'\\;'") + ";");
@@ -120,7 +122,7 @@ if(hiveDistrib.isExecutedThroughWebHCat()) {
 %>
    }
 <%
-} else { // normal mode
+} else { //Standalone mode
 	List<Map<String, String>> prepareStatementParameters = (List<Map<String,String>>)ElementParameterParser.getObjectValue(node, "__SET_PREPAREDSTATEMENT_PARAMETERS__");  
 	
 	String incomingConnName = null;
@@ -331,3 +333,4 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
 	}
 }
 %>
+
--- a/main/plugins/org.talend.designer.components.localprovider/components/tHiveRow/tHiveRow_messages.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tHiveRow/tHiveRow_messages.properties
@@ -76,6 +76,7 @@ HIVE_SERVER.ITEM.HIVE2=Hive 2
 CONNECTION_MODE.NAME=Connection mode
 CONNECTION_MODE.ITEM.EMBEDDED=Embedded
 CONNECTION_MODE.ITEM.STANDALONE=Standalone
+CONNECTION_MODE.ITEM.DATAPROC=Dataproc
 SET_TEMP_PATH.NAME=Set temporary path
 TEMP_PATH.NAME=
 TEMP_PATH_GROUP.NAME=Temporary Path
--- a/main/plugins/org.talend.designer.components.localprovider/components/tHiveRow/tHiveRow_messages_fr.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tHiveRow/tHiveRow_messages_fr.properties
@@ -76,6 +76,7 @@ HIVE_SERVER.ITEM.HIVE2=Hive 2
 CONNECTION_MODE.NAME=Mode de connexion
 CONNECTION_MODE.ITEM.EMBEDDED=Embarqu\u00E9(e)
 CONNECTION_MODE.ITEM.STANDALONE=Standalone
+CONNECTION_MODE.ITEM.DATAPROC=Dataproc
 SET_TEMP_PATH.NAME=Configurer un chemin temporaire
 TEMP_PATH.NAME=
 TEMP_PATH_GROUP.NAME=Chemin temporaire
--- a/main/plugins/org.talend.designer.components.localprovider/components/tHiveRow/tHiveRow_messages_ja.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tHiveRow/tHiveRow_messages_ja.properties
@@ -76,6 +76,7 @@ HIVE_SERVER.ITEM.HIVE2=Hive 2
 CONNECTION_MODE.NAME=\u63A5\u7D9A\u30E2\u30FC\u30C9
 CONNECTION_MODE.ITEM.EMBEDDED=\u7D44\u307F\u8FBC\u307F
 CONNECTION_MODE.ITEM.STANDALONE=\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3
+CONNECTION_MODE.ITEM.DATAPROC=Dataproc
 SET_TEMP_PATH.NAME=\u4E00\u6642\u9818\u57DF\u30D1\u30B9\u3092\u8A2D\u5B9A
 TEMP_PATH.NAME=
 TEMP_PATH_GROUP.NAME=\u4E00\u6642\u9818\u57DF\u30D1\u30B9
--- a/main/plugins/org.talend.designer.components.localprovider/components/tHiveRow/tHiveRow_messages_zh_CN.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tHiveRow/tHiveRow_messages_zh_CN.properties
@@ -76,6 +76,7 @@ HIVE_SERVER.ITEM.HIVE2=Hive 2
 CONNECTION_MODE.NAME=\u8FDE\u63A5\u6A21\u5F0F
 CONNECTION_MODE.ITEM.EMBEDDED=\u5D4C\u5165\u5F0F
 CONNECTION_MODE.ITEM.STANDALONE=\u72EC\u7ACB
+CONNECTION_MODE.ITEM.DATAPROC=Dataproc
 SET_TEMP_PATH.NAME=\u8BBE\u7F6E\u4E34\u65F6\u8DEF\u5F84
 TEMP_PATH.NAME=
 TEMP_PATH_GROUP.NAME=\u4E34\u65F6\u8DEF\u5F84
--- a/main/plugins/org.talend.designer.components.localprovider/components/tMSSqlBulkExec/tMSSqlBulkExec_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tMSSqlBulkExec/tMSSqlBulkExec_java.xml
@@ -427,7 +427,7 @@
 		<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="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5"  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.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3"  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')" />
    </IMPORTS>
  </CODEGENERATION>

--- a/main/plugins/org.talend.designer.components.localprovider/components/tMSSqlConnection/tMSSqlConnection_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tMSSqlConnection/tMSSqlConnection_java.xml
@@ -220,7 +220,7 @@
        <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="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP')" />

-        <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3"  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')" />
     </IMPORTS>
   </CODEGENERATION>

--- a/main/plugins/org.talend.designer.components.localprovider/components/tMSSqlInput/tMSSqlInput_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tMSSqlInput/tMSSqlInput_java.xml
@@ -295,7 +295,7 @@
        <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="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5"  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.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3"  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')" />
     </IMPORTS>
   </CODEGENERATION>

--- a/main/plugins/org.talend.designer.components.localprovider/components/tMSSqlOutput/tMSSqlOutput_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tMSSqlOutput/tMSSqlOutput_java.xml
@@ -388,7 +388,7 @@
 			<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="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5"  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.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3"  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')" />
 		</IMPORTS>
 	</CODEGENERATION>

--- a/main/plugins/org.talend.designer.components.localprovider/components/tMSSqlRow/tMSSqlRow_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tMSSqlRow/tMSSqlRow_java.xml
@@ -352,7 +352,7 @@
        <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="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5"  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.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3"  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')" />
    </IMPORTS>
  </CODEGENERATION>

--- a/main/plugins/org.talend.designer.components.localprovider/components/tMSSqlSCD/tMSSqlSCD_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tMSSqlSCD/tMSSqlSCD_java.xml
@@ -534,7 +534,7 @@
        <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="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5"  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.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3"  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')" />
    </IMPORTS>
  </CODEGENERATION>

--- a/main/plugins/org.talend.designer.components.localprovider/components/tMSSqlSP/tMSSqlSP_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tMSSqlSP/tMSSqlSP_java.xml
@@ -274,7 +274,7 @@
        <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="lang-tag" MODULE="lang-tag-1.5.jar" MVN="mvn:com.nimbusds/lang-tag/1.5"  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.9.3.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.9.3"  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')" />
    </IMPORTS>
  </CODEGENERATION>

--- a/main/plugins/org.talend.designer.components.localprovider/components/tMap/tMap_main.inc.javajet
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tMap/tMap_main.inc.javajet
@@ -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 {
--- a/main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmInput/tMicrosoftCrmInput_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmInput/tMicrosoftCrmInput_java.xml
@@ -27565,7 +27565,7 @@

            <!-- 2011 -->
            <!-- crm client -->
-            <IMPORT NAME="talend-mscrm" MODULE="talend-mscrm-3.11-20220124.jar" MVN="mvn:org.talend.components/talend-mscrm/3.11-20220124" 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.12-20220513.jar" MVN="mvn:org.talend.components/talend-mscrm/3.12-20220513" REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION =='API_2016_ODATA' OR API_VERSION =='API_2018_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018'))" />
            <!-- axis2 1.8.0 -->
            <IMPORT NAME="jakarta.activation-api-1.2.1" MODULE="jakarta.activation-api-1.2.1.jar" MVN="mvn:jakarta.activation/jakarta.activation-api/1.2.1"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
            <IMPORT NAME="axiom-api-1.3.0" MODULE="axiom-api-1.3.0.jar" MVN="mvn:org.apache.ws.commons.axiom/axiom-api/1.3.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
@@ -27821,9 +27821,9 @@
                MVN="mvn:org.talend.libraries/aalto-xml-0.9.10/6.4.0"
                REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018')))" />
            <IMPORT
-                NAME="adal4j-1.6.4-20211021"
-                MODULE="adal4j-1.6.4-20211021.jar"
-                MVN="mvn:com.microsoft.azure/adal4j/1.6.4-20211021"
+                NAME="msal4j-1.11.2"
+                MODULE="msal4j-1.11.2.jar"
+                MVN="mvn:com.microsoft.azure/msal4j/1.11.2"
                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="commons-codec-1.14"
@@ -27841,9 +27841,9 @@
                MVN="mvn:org.apache.commons/commons-lang3/3.10"
                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="gson-2.8.6"
-                MODULE="gson-2.8.6.jar"
-                MVN="mvn:com.google.code.gson/gson/2.8.6"
+                NAME="gson-2.9.0"
+                MODULE="gson-2.9.0.jar"
+                MVN="mvn:com.google.code.gson/gson/2.9.0"
                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="commons-logging"
@@ -27893,8 +27893,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"
--- a/main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmOutput/tMicrosoftCrmOutput_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmOutput/tMicrosoftCrmOutput_java.xml
@@ -38325,7 +38325,7 @@

            <!-- 2011 -->
            <!-- crm client -->
-            <IMPORT NAME="talend-mscrm" MODULE="talend-mscrm-3.11-20220124.jar" MVN="mvn:org.talend.components/talend-mscrm/3.11-20220124" 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.12-20220513.jar" MVN="mvn:org.talend.components/talend-mscrm/3.12-20220513" REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION =='API_2016_ODATA' OR API_VERSION =='API_2018_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018'))" />
            <!-- axis2 1.8.0 -->
            <IMPORT NAME="jakarta.activation-api-1.2.1" MODULE="jakarta.activation-api-1.2.1.jar" MVN="mvn:jakarta.activation/jakarta.activation-api/1.2.1"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
            <IMPORT NAME="axiom-api-1.3.0" MODULE="axiom-api-1.3.0.jar" MVN="mvn:org.apache.ws.commons.axiom/axiom-api/1.3.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
@@ -38587,10 +38587,10 @@
                MVN="mvn:org.talend.libraries/aalto-xml-0.9.10/6.4.0"
                REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018'))" />
            <IMPORT
-                NAME="adal4j-1.6.4-20211021"
-                MODULE="adal4j-1.6.4-20211021.jar"
-                MVN="mvn:com.microsoft.azure/adal4j/1.6.4-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'))" />
+                NAME="msal4j-1.11.2"
+                MODULE="msal4j-1.11.2.jar"
+                MVN="mvn:com.microsoft.azure/msal4j/1.11.2"
+                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="commons-codec-1.14.jar"
                MODULE="commons-codec-1.14.jar"
@@ -38607,10 +38607,10 @@
                MVN="mvn:org.apache.commons/commons-lang3/3.10"
                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="gson"
-                MODULE="gson-2.8.6.jar"
-                MVN="mvn:com.google.code.gson/gson/2.8.6"
-                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'))" />
+                NAME="gson-2.9.0"
+                MODULE="gson-2.9.0.jar"
+                MVN="mvn:com.google.code.gson/gson/2.9.0"
+                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="commons-logging"
                MODULE="commons-logging-1.2.jar"
@@ -38659,8 +38659,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"
--- a/main/plugins/org.talend.designer.components.localprovider/components/tPostgresPlusBulkExec/tPostgresPlusBulkExec_java.xml
+++ b/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>
--- a/main/plugins/org.talend.designer.components.localprovider/components/tPostgresPlusConnection/tPostgresPlusConnection_java.xml
+++ b/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.29.jar" MODULE="slf4j-api-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.29" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
 			<IMPORT NAME="slf4j-log4j12-1.7.29.jar" MODULE="slf4j-log4j12-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.29" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
--- a/main/plugins/org.talend.designer.components.localprovider/components/tPostgresPlusInput/tPostgresPlusInput_java.xml
+++ b/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>
--- a/main/plugins/org.talend.designer.components.localprovider/components/tPostgresPlusOutput/tPostgresPlusOutput_java.xml
+++ b/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>
--- a/main/plugins/org.talend.designer.components.localprovider/components/tPostgresPlusRow/tPostgresPlusRow_java.xml
+++ b/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>
--- a/main/plugins/org.talend.designer.components.localprovider/components/tPostgresPlusSCD/tPostgresPlusSCD_java.xml
+++ b/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>
--- a/main/plugins/org.talend.designer.components.localprovider/components/tPostgresPlusSCDELT/tPostgresPlusSCDELT_java.xml
+++ b/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>
--- a/main/plugins/org.talend.designer.components.localprovider/components/tPostgresqlBulkExec/tPostgresqlBulkExec_java.xml
+++ b/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')"/>
--- a/main/plugins/org.talend.designer.components.localprovider/components/tPostgresqlConnection/tPostgresqlConnection_java.xml
+++ b/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.29.jar" MODULE="slf4j-api-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.29" REQUIRED_IF="(USE_SHARED_CONNECTION == 'true' AND SPECIFY_DATASOURCE_ALIAS=='false')" />
 			<IMPORT NAME="slf4j-log4j12-1.7.29.jar" MODULE="slf4j-log4j12-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.29" REQUIRED_IF="(USE_SHARED_CONNECTION == 'true' AND SPECIFY_DATASOURCE_ALIAS=='false')" />
--- a/main/plugins/org.talend.designer.components.localprovider/components/tPostgresqlInput/tPostgresqlInput_java.xml
+++ b/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" />
--- a/main/plugins/org.talend.designer.components.localprovider/components/tPostgresqlOutput/tPostgresqlOutput_java.xml
+++ b/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" />
--- a/main/plugins/org.talend.designer.components.localprovider/components/tPostgresqlRow/tPostgresqlRow_java.xml
+++ b/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>
--- a/main/plugins/org.talend.designer.components.localprovider/components/tPostgresqlSCD/tPostgresqlSCD_java.xml
+++ b/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>
--- a/main/plugins/org.talend.designer.components.localprovider/components/tPostgresqlSCDELT/tPostgresqlSCDELT_java.xml
+++ b/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>
--- a/main/plugins/org.talend.designer.components.localprovider/components/tRedshiftBulkExec/tRedshiftBulkExec_begin.javajet
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tRedshiftBulkExec/tRedshiftBulkExec_begin.javajet
@@ -33,7 +33,8 @@ skeleton="../templates/db_output_bulk.skeleton"
 	
 	boolean useExistingS3Connection = "true".equalsIgnoreCase(ElementParameterParser.getValue(node,"__USE_EXISTING_CONNECTION_S3__"));
 	String s3ConnectionCid = ElementParameterParser.getValue(node,"__CONNECTION_S3__");
-	int driveVersion = "DRIVER_V2".equals(ElementParameterParser.getValue(node, "__DRIVER_VERSION__"))? 2 : 1;
+	int driveVersion = ("DRIVER_V2".equals(ElementParameterParser.getValue(node, "__DRIVER_VERSION__")) || "DRIVER_VERSION".equals(ElementParameterParser.getValue(node, "__DRIVER_VERSION__")))
+     ? 2 : 1;
    boolean useStringProperties = "true".equals(ElementParameterParser.getValue(node, "__USE_STRING_PROPERTIES__"));

 	INode current_node = node;
@@ -113,7 +114,8 @@ skeleton="../templates/db_output_bulk.skeleton"
 		<%}%>
 		String dbUser_<%=cid %> = <%=userName%>;
 		String dbPwd_<%=cid %> = decryptedPass_<%=cid%>;
-<%      
+
+<%
        if(driveVersion == 2 && !useStringProperties){

 		        log4jCodeGenerateUtil.connectWithProperties(node);
@@ -121,7 +123,7 @@ skeleton="../templates/db_output_bulk.skeleton"
 		        log4jCodeGenerateUtil.connect(node);
 		}
 	}
-	
+
 	String tableAction = ElementParameterParser.getValue(node,"__TABLE_ACTION__");
 	String dbmsId = ElementParameterParser.getValue(node,"__MAPPING__");
 	List<Column> stmtStructure = null;
--- a/main/plugins/org.talend.designer.components.localprovider/components/tRedshiftBulkExec/tRedshiftBulkExec_java.xml
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tRedshiftBulkExec/tRedshiftBulkExec_java.xml
@@ -48,7 +48,7 @@
 				REPOSITORY_VALUE="DRIVER_VERSION">
 			<ITEMS DEFAULT="DRIVER_V2">
 				<ITEM NAME="DRIVER_V1" VALUE="DRIVER_V1" />
-				<ITEM NAME="DRIVER_V2" VALUE="DRIVER_VERSION" />
+				<ITEM NAME="DRIVER_V2" VALUE="DRIVER_V2" />
 			</ITEMS>
 		</PARAMETER>

--- a/main/plugins/org.talend.designer.components.localprovider/components/tRedshiftConnection/tRedshiftConnection_begin.javajet
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tRedshiftConnection/tRedshiftConnection_begin.javajet
@@ -11,21 +11,21 @@ imports="
 <%
 	class ConnectionUtil extends DefaultConnectionUtil{

-				int driveVersion;
-    			Boolean useStringProperties ;
-    			String logLevel;
-	
-		public void createURL(INode node) {
-			super.createURL(node);
+        int driveVersion;
+        Boolean useStringProperties;
+        String logLevel;
+        String jdbcUrl;
+
+        public void createURL(INode node) {
+            super.createURL(node);

            boolean useLogFile= "true".equals(ElementParameterParser.getValue(node, "__USE_LOG_FILE__"));
-			String logFile= ElementParameterParser.getValue(node, "__LOG_FILE__");
-			String jdbcUrl = ElementParameterParser.getValue(node, "__JDBC_URL__");
-			driveVersion = "DRIVER_V2".equals(ElementParameterParser.getValue(node, "__DRIVER_VERSION__"))? 2 : 1;
+            String logFile= ElementParameterParser.getValue(node, "__LOG_FILE__");
+            jdbcUrl = ElementParameterParser.getValue(node, "__JDBC_URL__");
+            driveVersion = "DRIVER_V2".equals(ElementParameterParser.getValue(node, "__DRIVER_VERSION__"))? 2 : 1;
            useStringProperties = "true".equals(ElementParameterParser.getValue(node, "__USE_STRING_PROPERTIES__"));
            logLevel= ElementParameterParser.getValue(node, "__LOG_LEVEL__");

-			
 		if(!logLevel.equals("0")){	
 			if (useLogFile) {
 %>
@@ -78,7 +78,21 @@ imports="

                    java.util.Properties properties_<%=cid%> = new java.util.Properties();
                                    properties_<%=cid%>.setProperty("user",dbUser_<%=cid%>);
-                                    properties_<%=cid%>.setProperty("password",dbPwd_<%=cid%>);
+<%
+                                            if ("SSO".equals(jdbcUrl)){
+%>
+                                                if (dbPwd_<%=cid%> != null) {
+<%
+                                            }
+%>
+                                                    properties_<%=cid%>.setProperty("password",dbPwd_<%=cid%>);
+<%
+                                            if ("SSO".equals(jdbcUrl)){
+%>
+                                                }
+<%
+                                            }
+%>
                                    <%
                                    for(Map<String, String> entry : properties){
                                    %>
--- a/main/plugins/org.talend.designer.components.localprovider/components/tRedshiftInput/tRedshiftInput_begin.javajet
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tRedshiftInput/tRedshiftInput_begin.javajet
@@ -17,20 +17,21 @@ imports="

 	class DBInputBeginUtil extends DefaultDBInputUtil{

-				int driveVersion;
-       			Boolean useStringProperties ;
-       			String logLevel;
+        int driveVersion;
+        Boolean useStringProperties;
+        String logLevel;
+        String jdbcUrl;

-		public void setURL(INode node) {
-			
-			boolean useLogFile= "true".equals(ElementParameterParser.getValue(node, "__USE_LOG_FILE__"));
-			String logLevel= ElementParameterParser.getValue(node, "__LOG_LEVEL__");
-			String logFile= ElementParameterParser.getValue(node, "__LOG_FILE__");
-			String jdbcUrl = ElementParameterParser.getValue(node, "__JDBC_URL__");
-			driveVersion = "DRIVER_V2".equals(ElementParameterParser.getValue(node, "__DRIVER_VERSION__"))? 2 : 1;
+        public void setURL(INode node) {
+
+            boolean useLogFile= "true".equals(ElementParameterParser.getValue(node, "__USE_LOG_FILE__"));
+            String logLevel= ElementParameterParser.getValue(node, "__LOG_LEVEL__");
+            String logFile= ElementParameterParser.getValue(node, "__LOG_FILE__");
+            jdbcUrl= ElementParameterParser.getValue(node, "__JDBC_URL__");
+            driveVersion = "DRIVER_V2".equals(ElementParameterParser.getValue(node, "__DRIVER_VERSION__"))? 2 : 1;
            useStringProperties = "true".equals(ElementParameterParser.getValue(node, "__USE_STRING_PROPERTIES__"));
            logLevel= ElementParameterParser.getValue(node, "__LOG_LEVEL__");
-			
+
 		if(!logLevel.equals("0")){	
 			if (useLogFile) {
 %>
@@ -92,7 +93,21 @@ imports="

                            java.util.Properties properties_<%=cid%> = new java.util.Properties();
                                            properties_<%=cid%>.setProperty("user",dbUser_<%=cid%>);
-                                            properties_<%=cid%>.setProperty("password",dbPwd_<%=cid%>);
+<%
+                                            if ("SSO".equals(jdbcUrl)){
+%>
+                                                if (dbPwd_<%=cid%> != null) {
+<%
+                                            }
+%>
+                                                    properties_<%=cid%>.setProperty("password",dbPwd_<%=cid%>);
+<%
+                                            if ("SSO".equals(jdbcUrl)){
+%>
+                                                }
+<%
+                                            }
+%>
                                            <%
                                            for(Map<String, String> entry : properties){
                                            %>
--- a/main/plugins/org.talend.designer.components.localprovider/components/tRedshiftOutput/tRedshiftOutput_begin.javajet
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tRedshiftOutput/tRedshiftOutput_begin.javajet
@@ -241,7 +241,21 @@ if(("true").equals(useExistingConn)) {

                        java.util.Properties properties_<%=cid%> = new java.util.Properties();
                                        properties_<%=cid%>.setProperty("user",dbUser_<%=cid%>);
-                                        properties_<%=cid%>.setProperty("password",dbPwd_<%=cid%>);
+<%
+                                            if ("SSO".equals(jdbcUrl)){
+%>
+                                                if (dbPwd_<%=cid%> != null) {
+<%
+                                            }
+%>
+                                                    properties_<%=cid%>.setProperty("password",dbPwd_<%=cid%>);
+<%
+                                            if ("SSO".equals(jdbcUrl)){
+%>
+                                                }
+<%
+                                            }
+%>
                                        <%
                                        for(Map<String, String> entry : properties){
                                        %>
--- a/main/plugins/org.talend.designer.components.localprovider/components/tRedshiftRow/tRedshiftRow_begin.javajet
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tRedshiftRow/tRedshiftRow_begin.javajet
@@ -13,9 +13,10 @@ imports="

 	class DBRowBeginUtil extends DefaultDBRowUtil{

-					int driveVersion;
-        			Boolean useStringProperties ;
-        			String logLevel;
+        int driveVersion;
+        Boolean useStringProperties;
+        String logLevel;
+        String jdbcUrl;
 	
 		public void beforeComponentProcess(INode node){
 			super.beforeComponentProcess(node);
@@ -23,8 +24,8 @@ imports="
 	    }
 	    
 		public void setURL(INode node) {
-			String jdbcUrl = ElementParameterParser.getValue(node, "__JDBC_URL__");
-			driveVersion = "DRIVER_V2".equals(ElementParameterParser.getValue(node, "__DRIVER_VERSION__"))? 2 : 1;
+            jdbcUrl = ElementParameterParser.getValue(node, "__JDBC_URL__");
+            driveVersion = "DRIVER_V2".equals(ElementParameterParser.getValue(node, "__DRIVER_VERSION__"))? 2 : 1;
            useStringProperties = "true".equals(ElementParameterParser.getValue(node, "__USE_STRING_PROPERTIES__"));

 %>
@@ -60,7 +61,21 @@ imports="
                %>
                            java.util.Properties properties_<%=cid%> = new java.util.Properties();
                                            properties_<%=cid%>.setProperty("user",dbUser_<%=cid%>);
-                                            properties_<%=cid%>.setProperty("password",dbPwd_<%=cid%>);
+<%
+                                            if ("SSO".equals(jdbcUrl)){
+%>
+                                                if (dbPwd_<%=cid%> != null) {
+<%
+                                            }
+%>
+                                                    properties_<%=cid%>.setProperty("password",dbPwd_<%=cid%>);
+<%
+                                            if ("SSO".equals(jdbcUrl)){
+%>
+                                                }
+<%
+                                            }
+%>
                                            <%
                                            for(Map<String, String> entry : properties){
                                            %>
--- a/main/plugins/org.talend.designer.components.localprovider/components/tSybaseBulkExec/tSybaseBulkExec_messages.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tSybaseBulkExec/tSybaseBulkExec_messages.properties
@@ -61,4 +61,4 @@ ENCODING.ITEM.AL16UTF16=AL16UTF16
 DB_VERSION.NAME=DB Version
 DB_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
 DB_VERSION.ITEM.SYBSEIQ_16=Sybase 16
-DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
+DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) and above
--- a/main/plugins/org.talend.designer.components.localprovider/components/tSybaseBulkExec/tSybaseBulkExec_messages_fr.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tSybaseBulkExec/tSybaseBulkExec_messages_fr.properties
@@ -61,4 +61,4 @@ ENCODING.ITEM.AL16UTF16=AL16UTF16
 DB_VERSION.NAME=Version de la base de donn\u00E9es
 DB_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
 DB_VERSION.ITEM.SYBSEIQ_16=Sybase 16
-DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
+DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) et sup\u00E9rieures
--- a/main/plugins/org.talend.designer.components.localprovider/components/tSybaseBulkExec/tSybaseBulkExec_messages_ja.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tSybaseBulkExec/tSybaseBulkExec_messages_ja.properties
@@ -61,4 +61,4 @@ ENCODING.ITEM.AL16UTF16=AL16UTF16
 DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
 DB_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
 DB_VERSION.ITEM.SYBSEIQ_16=Sybase 16
-DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
+DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)\u4EE5\u964D
--- a/main/plugins/org.talend.designer.components.localprovider/components/tSybaseBulkExec/tSybaseBulkExec_messages_zh_CN.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tSybaseBulkExec/tSybaseBulkExec_messages_zh_CN.properties
@@ -61,4 +61,4 @@ ENCODING.ITEM.AL16UTF16=AL16UTF16
 DB_VERSION.NAME=\u6570\u636E\u5E93\u7248\u672C
 DB_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
 DB_VERSION.ITEM.SYBSEIQ_16=Sybase 16
-DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
+DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) \u53CA\u66F4\u9AD8\u7248\u672C
--- a/main/plugins/org.talend.designer.components.localprovider/components/tSybaseConnection/tSybaseConnection_messages.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tSybaseConnection/tSybaseConnection_messages.properties
@@ -17,4 +17,4 @@ SCHEMA_DB.NAME=Schema
 DB_VERSION.NAME=DB Version
 DB_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
 DB_VERSION.ITEM.SYBSEIQ_16=Sybase 16
-DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
+DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) and above
--- a/main/plugins/org.talend.designer.components.localprovider/components/tSybaseConnection/tSybaseConnection_messages_fr.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tSybaseConnection/tSybaseConnection_messages_fr.properties
@@ -17,4 +17,4 @@ SCHEMA_DB.NAME=Sch\u00E9ma
 DB_VERSION.NAME=Version de la base de donn\u00E9es
 DB_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
 DB_VERSION.ITEM.SYBSEIQ_16=Sybase 16
-DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
+DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) et sup\u00E9rieures
--- a/main/plugins/org.talend.designer.components.localprovider/components/tSybaseConnection/tSybaseConnection_messages_ja.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tSybaseConnection/tSybaseConnection_messages_ja.properties
@@ -17,4 +17,4 @@ SCHEMA_DB.NAME=\u30B9\u30AD\u30FC\u30DE
 DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
 DB_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
 DB_VERSION.ITEM.SYBSEIQ_16=Sybase 16
-DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
+DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)\u4EE5\u964D
--- a/main/plugins/org.talend.designer.components.localprovider/components/tSybaseConnection/tSybaseConnection_messages_zh_CN.properties
+++ b/main/plugins/org.talend.designer.components.localprovider/components/tSybaseConnection/tSybaseConnection_messages_zh_CN.properties
@@ -17,4 +17,4 @@ SCHEMA_DB.NAME=Schema
 DB_VERSION.NAME=\u6570\u636E\u5E93\u7248\u672C
 DB_VERSION.ITEM.SYBSEIQ_12_15=Sybase 12/15
 DB_VERSION.ITEM.SYBSEIQ_16=Sybase 16
-DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere)
+DB_VERSION.ITEM.SYBSEIQ_16_SA=Sybase 16 (SQL Anywhere) \u53CA\u66F4\u9AD8\u7248\u672C
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
dochkas-talend	36c32b6437	added bigger timeout	2022-06-20 17:51:57 +03:00
msjian	b5f96496f4	fix(TDQ-19435): fix a NPE (#7663 )	2022-06-20 10:01:55 +08:00
zshen-talend	d0fbe0defa	fix(TDQ-19623): make sure project name never force lowercase (#7661 )	2022-06-17 10:17:23 +08:00
sponomarova	d9454a11ef	feat(TBD-13823): spark local 3.2.x GA (#7652 ) (#7656 )	2022-06-16 12:52:54 +03:00
zshen-talend	bca8dd8802	fix(TDQ-19623): make sure build job action work for reference project (#7654 )	2022-06-15 18:18:37 +08:00
Dmytro Sylaiev	45c4e32c2a	feat(TDI-47398): migrate adal4j to msal4j mscrm (#7556 ) * feat(TDI-47398): Change adal4j to msal4j for talend-mscrm * feat(TDI-47398): Change dependencies for tMicrosoftCRMXXX * feat(TDI-47398): Implement oauth token acquiring * chore(TDI-47398): Small microbes fix	2022-06-14 22:21:51 +03:00
hcyi	e637d53155	fix(TUP-35508):Better to improve context prompt for JDBC. (#7624 ) * fix(TUP-35508):Better to improve context prompt for JDBC. * fix(TUP-35508):Better to improve context prompt for JDBC. * fix(TUP-35508):Better to improve context prompt for JDBC. * fix(TUP-35508):Better to improve context prompt for JDBC. * fix(TUP-35508):Better to improve context prompt for JDBC.	2022-06-14 15:08:33 +08:00
wang wei	537bd1b73a	fix(TCOMP-2122): [JDBC TCK]: can't get user defined schema info in tck runtime in studio when no data outut line	2022-06-14 13:56:21 +08:00
Laurent BOURGEOIS	2fcf4be1e2	fix(TBD-13581):tHiveConnection doesn't support spark 3.1.x dataproc 2.0.x (#7646 )	2022-06-10 14:33:51 +02:00
Jane Ding	86ee3f4ad1	feat(TUP-33085):Add Icon(s) to open Help (#7571 ) (#7643 ) * feat(TUP-33085):Add Icon(s) to open Help https://jira.talendforge.org/browse/TUP-33085 * feat(TUP-33085):Add Icon(s) to open Help https://jira.talendforge.org/browse/TUP-33085 fix(TUP-35782):[bug] button 'Online help' can't work for some TCK components https://jira.talendforge.org/browse/TUP-35782	2022-06-10 17:25:55 +08:00
Xuwei ZHU	106c010d53	Add localized files (#7642 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2022-06-09 19:08:34 +08:00
Alexiane Yvonet	80917277a5	Add localized files (#7640 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2022-06-09 19:08:21 +08:00
Dmytro Sylaiev	f0fe150ec0	fix(TDI-47951): Don't set null passw for sso auth (#7580 ) * fix(TDI-47951): Don't set null passw for sso auth * fix(TDI-47951): Handle possible NPE * For tRedshiftUnload and tRedshiftBE/OBE	2022-06-09 13:44:22 +03:00
Dmytro Grygorenko	46523080d3	fix(TDI-47935): bump "nimbus-jose-jwt" lib to fix CVE. (#7522 )	2022-06-09 10:32:59 +03:00
jiezhang-tlnd	68b5e9e7c4	export dataset need with datastore (#7579 ) (#7639 ) * export dataset need with datastore * issue is that deleting datastore but dataset not be deleted * fix selection issue on export wizard * fomat code * format code * improve performance * improve performance by adding objectType * improve code and handle import issue * code format	2022-06-09 10:58:42 +08:00
Chao MENG	c3b1df17a0	item(TUP-35556): Handle demo feedbacks for update from TMC (#7595 ) https://jira.talendforge.org/browse/TUP-35556	2022-06-09 10:50:06 +08:00
msjian	d7af0fc449	Revert "fix(TDQ-20476): fix match analysis run get error (#7622 )" (#7633 ) This reverts commit `fd2c8b365b`.	2022-06-08 16:21:22 +08:00
jiezhang-tlnd	c2408e4223	fix(TUP-35683)doc use job for route, joblet for routelet (#7630 ) (#7636 ) https://jira.talendforge.org/browse/TUP-35683	2022-06-08 15:35:19 +08:00
sbieliaievl	2ec3561107	fix(APPINT-24774) - POST/PUT operations when importing API in tRESTRequest should declare a body parameter (#7518 ) * fix(APPINT-24774) - POST/PUT operations when importing API in tRESTRequest should declare a body parameter * fix(APPINT-24774) - POST/PUT operations when importing API in tRESTRequest should declare a body parameter	2022-06-08 08:46:55 +03:00
jiezhang-tlnd	acc3c15744	feat(TUP-34931)Support Sybase 17 (#7620 ) (#7632 )	2022-06-08 10:59:30 +08:00
msjian	fd2c8b365b	fix(TDQ-20476): fix match analysis run get error (#7622 )	2022-06-07 18:59:12 +08:00
wang wei	cb369968e9	fix(TDI-48037): CVE: org.postgresql:postgresql:42.2.14 (#7573 ) (#7629 )	2022-06-07 17:57:32 +08:00
jzhangbj	70f018b26f	Add localized files (#7611 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2022-06-06 09:32:59 +08:00
tsasada-talend	f6a4d9022f	Add localized files (#7610 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2022-06-06 09:31:59 +08:00
Alexiane Yvonet	616815d794	Add localized files (#7609 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2022-06-06 09:30:39 +08:00
pyzhou	8767e96bcd	fix(TDI-48069):tRedshiftBulkExec wrong version (#7608 )	2022-06-02 19:39:27 +08:00
Jill Yan	26dcedadef	fix compile error (#7605 ) Co-authored-by: jillyan <yan955599@gmail.com>	2022-06-02 11:00:48 +08:00
hcyi	58a39c8fb8	feat(TUP-34854):Setup custom JKS for signature by System Property (#7382 ) * feat(TUP-34854):Setup custom JKS for signature by System Property * feat(TUP-34854):improve for Setup custom JKS for signature by System Property * feat(TUP-34855):Setup custom JKS for job signature from GUI. * feat(TUP-34855):Setup custom JKS for job signature from GUI. * feat(TUP-34855):Setup custom JKS for job signature from GUI.	2022-06-02 10:58:37 +08:00
Chao MENG	7cf738b911	Cmeng/fix/tup 35585 zero install tck (#7568 ) * fix(TUP-35585): Zero install fail to install custom tck component in 801. https://jira.talendforge.org/browse/TUP-35585	2022-06-02 09:55:26 +08:00
Jill Yan	42b7a46dee	APPINT-34618 add mssql driver to import-package if used in child job (#7587 ) Co-authored-by: jillyan <yan955599@gmail.com>	2022-06-02 09:10:13 +08:00
Jane Ding	70314bd2b4	feat(TUP-35301):[JDBC TCK]: Support MODULE_LIST field for studio tck (#7517 ) (#7599 ) * feat(TUP-35301):[JDBC TCK]: Support MODULE_LIST field for studio tck plugin https://jira.talendforge.org/browse/TUP-35301 * feat(TUP-35301):[JDBC TCK]: Support MODULE_LIST field for studio tck plugin https://jira.talendforge.org/browse/TUP-35301 * feat(TUP-35301):[JDBC TCK]: Support MODULE_LIST field for studio tck plugin https://jira.talendforge.org/browse/TUP-35301 * feat(TUP-35301):[JDBC TCK]: Support MODULE_LIST field for studio tck plugin https://jira.talendforge.org/browse/TUP-35301 fix(TUP-35716):[bug] new JDBC driver column will be always set to mvn after reopen wizard https://jira.talendforge.org/browse/TUP-35716 driver table contains path=mvn:xxxx/xxxx * feat(TUP-35301):[JDBC TCK]: Support MODULE_LIST field for studio tck plugin https://jira.talendforge.org/browse/TUP-35301	2022-06-01 16:22:23 +08:00
zshen-talend	d42dc6e42e	test to avoid project name lowercase (#7598 )	2022-06-01 16:14:15 +08:00
wang wei	b824673188	fix(TDI-47803): Compile error after applying Patch_20220107_R2022-01_v1-7.3.1 (#7474 ) (#7597 )	2022-06-01 11:42:11 +08:00
jiezhang-tlnd	c34725bbef	feat(TUP-28853)tRunjob is ok, need handle joblet (#7484 ) (#7594 ) * feat(TUP-28853)tRunjob is ok, need handle joblet * generation document is ok from standard process * format code * reduce the same item to improve performance * Remove duplicates to improve performance and fix preview picture missing issue * handle latest version on tRunjob * handle version for joblet * hanlde version * improve performance with VersionList * handle BD process part * handle BD process * handle route process * code formate * format code	2022-05-31 17:41:50 +08:00
Dmytro Sylaiev	f517e56b83	feat(TDI-44884): Correct missing label change (#7593 )	2022-05-31 11:52:32 +03:00
Oleksandr Zhelezniak	9ed98d4f9d	fix(TDI-47895): oracle input float length (#7545 ) * force to use 38 as length for NUMBER (FLOAT) in oracle when getPrecision returns value bigger than 38 * getPrecision for Float Oracle returns 126. * It's expected binary precision for FLOAT Oracle type. The decimal precision for it is 38.	2022-05-31 11:03:01 +03:00
bhe-talendbj	7a9ff69e14	chore(TUP-35685): upgrade database driver version (#7576 ) (#7592 )	2022-05-31 14:35:00 +08:00
Chao MENG	8acb79fbd4	fix(TUP-35633): 'Use local Update settings' checkbox should not be (#7577 ) fix(TUP-35633): 'Use local Update settings' checkbox should not be displayed in studio update settings when TMC update config is not set for the project. https://jira.talendforge.org/browse/TUP-35633	2022-05-31 10:20:33 +08:00
Oleksandr Zhelezniak	04b7d3251e	fix(TDI-45946): greenplum mapping (#7514 ) * add mapping type in XML for input and output * migration task, replace mapping type from postgres_id to greenplum_id	2022-05-30 16:09:33 +03:00
Alexiane Yvonet	e64b5d2e23	Add localized files (#7588 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2022-05-30 15:41:58 +08:00
jzhangbj	ed74850972	Add localized files (#7583 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2022-05-30 10:12:14 +08:00
tsasada-talend	caed4cf474	Add localized files (#7582 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2022-05-30 09:41:38 +08:00
sponomarova	971e661a0e	feat(TBD-13581): Dataproc 2.x support for di jobs (#7488 ) (#7537 )	2022-05-27 13:29:11 +03:00
Zhiwei Xue	8a87f281f9	fix(TUP-35613):Can't display the dataset settings of AzureAdlsGen2 (#7581 ) metadata wizard with CSV format in default GUI size	2022-05-27 10:35:32 +08:00
Chao MENG	c54b8ed321	fix(TUP-35608): Stat and Logs screen - Database connection dropdown incorrect (#7559 ) * fix(TUP-35608): Stat and Logs screen - Database connection dropdown incorrect https://jira.talendforge.org/browse/TUP-35608	2022-05-27 09:52:15 +08:00
hcyi	62301ff268	fix(TUP-35326):[JDBC TCK]: can't pass table value to runtime when use existed connection (#7506 ) * fix(TUP-35326):[JDBC TCK]: can't pass table value to runtime when use existed connection * fix(TUP-35326):[JDBC TCK]: can't pass table value to runtime when use existed connection	2022-05-26 15:29:09 +08:00
Zhiwei Xue	1f2d1e0820	fix(TUP-31233):Routine pom is not updated after installed the required (#7548 ) * fix(TUP-31233):Routine pom is not updated after installed the required jar of user routine * fix(TUP-31233):Routine pom is not updated after installed the required jar of user routine * fix(TUP-31233):Routine pom is not updated after installed the required jar of user routine	2022-05-25 18:05:03 +08:00
hzhao-talendbj	9eb840b026	Revert "chore(TUP-34757): Add a getOriginalName() in IConnection (#7301 )" (#7563 ) This reverts commit `5c9a80937a`.	2022-05-25 17:28:19 +08:00
Dmytro Sylaiev	bc5d868c62	feat(TDI-44884): Change the label of Sybase SA (#7558 )	2022-05-24 15:53:43 +03:00