fix(TDI-49150) Upgrade tck in studio 7.3 (#5901)

* fix(TUP-37467):[8.0.1&7.3.1] custom component are no more build as
snapshot but releases since june/july patch
https://jira.talendforge.org/browse/TUP-37467

* fix(TUP-37467):[8.0.1&7.3.1] custom component are no more build as
snapshot but releases since june/july patch
https://jira.talendforge.org/browse/TUP-37467

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ILibraryManagerService.java

@@ -16,6 +16,7 @@ import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -154,6 +155,8 @@ public interface ILibraryManagerService extends IService {
     public boolean contains(String jarName);
 
     public void clearCache();
+    
+    public void deployLibsFromCustomComponents(File componentFolder, List<ModuleNeeded> modulesNeeded);
 
     @Deprecated
     public Set<String> list(boolean withComponent, IProgressMonitor... monitorWrap);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/ConnParameterKeys.java

@@ -380,5 +380,6 @@ public class ConnParameterKeys {
     
     public static final String CONN_PARA_KEY_KNOX_DIRECTORY="CONN_PARA_KEY_KNOX_DIRECTORY";
 
+    public static final String CONN_PARA_KEY_KNOX_TIMEOUT="CONN_PARA_KEY_KNOX_TIMEOUT";
 
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/version/EDatabaseVersion4Drivers.java

@@ -25,8 +25,8 @@ import org.talend.core.database.conn.DatabaseConnConstants;
 public enum EDatabaseVersion4Drivers {
     // access
     ACCESS_JDBC(new DbVersion4Drivers(EDatabaseTypeName.ACCESS, new String[] {
-            "jackcess-2.1.0.jar", "ucanaccess-2.0.9.5.jar", "commons-lang-2.6.jar", "commons-logging-1.1.1.jar", "hsqldb.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            "jackcess-encrypt-2.1.0.jar", "bcprov-jdk15on-1.51.jar", "talend-ucanaccess-utils-1.0.0.jar" })),
+            "jackcess-2.1.12.jar", "ucanaccess-2.0.9.5.jar", "commons-lang-2.6.jar", "commons-logging-1.1.3.jar", "hsqldb.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "jackcess-encrypt-2.1.4.jar", "bcprov-jdk15on-1.69.jar", "talend-ucanaccess-utils-1.0.0.jar" })),
     ACCESS_2003(new DbVersion4Drivers(EDatabaseTypeName.ACCESS, "Access 2003", "Access_2003")), //$NON-NLS-1$ //$NON-NLS-2$
     ACCESS_2007(new DbVersion4Drivers(EDatabaseTypeName.ACCESS, "Access 2007", "Access_2007")), //$NON-NLS-1$ //$NON-NLS-2$
     // oracle
@@ -171,8 +171,10 @@ public enum EDatabaseVersion4Drivers {
     REDSHIFT(new DbVersion4Drivers(EDatabaseTypeName.REDSHIFT, "redshift", "REDSHIFT", //$NON-NLS-1$ //$NON-NLS-2$
             new String[]{ "redshift-jdbc42-no-awssdk-1.2.55.1083.jar", "antlr4-runtime-4.8-1.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
     REDSHIFT_SSO(new DbVersion4Drivers(EDatabaseTypeName.REDSHIFT_SSO, "redshift sso", "REDSHIFT_SSO", //$NON-NLS-1$ //$NON-NLS-2$
-            new String[] { "redshift-jdbc42-no-awssdk-1.2.55.1083.jar", "antlr4-runtime-4.8-1.jar", "aws-java-sdk-1.11.848.jar", "jackson-core-2.10.1.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-                    "jackson-databind-2.10.1.jar", "jackson-annotations-2.10.1.jar", "httpcore-4.4.11.jar", "httpclient-4.5.9.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$//$NON-NLS-4$
+            new String[] { "redshift-jdbc42-no-awssdk-1.2.55.1083.jar", "antlr4-runtime-4.8-1.jar", "aws-java-sdk-1.11.848.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                    "jackson-core-2.13.4.jar", //$NON-NLS-1$
+                    "jackson-databind-2.13.4.2.jar", "jackson-annotations-2.13.4.jar", "httpcore-4.4.11.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                    "httpclient-4.5.9.jar", //$NON-NLS-1$
                     "joda-time-2.8.1.jar", "commons-logging-1.2.jar", "commons-codec-1.11.jar" })), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
     AMAZON_AURORA(new DbVersion4Drivers(EDatabaseTypeName.AMAZON_AURORA, "mysql-connector-java-5.1.49.jar")); //$NON-NLS-1$

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/HadoopClassLoaderFactory2.java

@@ -38,7 +38,10 @@ public class HadoopClassLoaderFactory2 {
     public static ClassLoader getHDFSClassLoader(String relatedClusterId, String distribution, String version, boolean useKrb) {
         return getClassLoader(relatedClusterId, EHadoopCategory.HDFS, distribution, version, useKrb);
     }
-
+    public static ClassLoader getHDFSKnoxClassLoader(String relatedClusterId, String distribution, String version, boolean useKrb) {
+        return HadoopClassLoaderFactory2.getClassLoader(relatedClusterId, EHadoopCategory.HDFS, distribution, version, useKrb,
+                IHadoopArgs.HDFS_ARG_KNOX);
+    }
     public static ClassLoader getMRClassLoader(String relatedClusterId, String distribution, String version, boolean useKrb) {
         return getClassLoader(relatedClusterId, EHadoopCategory.MAP_REDUCE, distribution, version, useKrb);
     }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/IHadoopArgs.java

@@ -22,4 +22,6 @@ public interface IHadoopArgs {
 
     public static final String HIVE_ARG_STANDALONE = "STANDALONE"; //$NON-NLS-1$
 
+    public static final String HDFS_ARG_KNOX = "USE_KNOX"; //$NON-NLS-1$
+
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/IMetadataConnection.java

@@ -194,6 +194,10 @@ public interface IMetadataConnection extends IMetadata {
     public String getContextName();
 
     public void setContextName(String contextName);
+    
+    public boolean isSupportNLS();
+    
+    public void setSupportNLS(boolean newSupportNLS);
 
     /**
      * Returns the value that you stored in the data collection by the key. Normally, it is like this key-value. For

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/builder/ConvertionHelper.java

@@ -254,6 +254,7 @@ public final class ConvertionHelper {
         result.setContentModel(connection.isContextMode());
         result.setContextId(sourceConnection.getContextId());
         result.setContextName(sourceConnection.getContextName());
+        result.setSupportNLS(sourceConnection.isSupportNLS());
         // handle oracle database connnection of general_jdbc.
         result.setSchema(getMeataConnectionSchema(result));
         convertOtherParameters(result, connection);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/builder/MetadataConnection.java

@@ -113,6 +113,7 @@ public class MetadataConnection implements IMetadataConnection {
 
     private String contextName;
 
+    private boolean supportNLS = false;
     // ~
 
     private String comment;
@@ -729,6 +730,14 @@ public class MetadataConnection implements IMetadataConnection {
     public void setContextName(String contextName) {
         this.contextName = contextName;
     }
+    
+    public boolean isSupportNLS() {
+        return supportNLS;
+    }
+    
+    public void setSupportNLS(boolean supportNLS) {
+        this.supportNLS = supportNLS;
+    }
 
     /*
      * (non-Javadoc)

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/designerproperties/RepositoryToComponentProperty.java

@@ -1225,6 +1225,11 @@ public class RepositoryToComponentProperty {
             return value2;
 
         }
+        
+        if(value.equals("SUPPORT_NLS")) {
+            return connection.isSupportNLS();
+        }
+        
         if (value.equals("CDC_TYPE_MODE")) { //$NON-NLS-1$
             return new Boolean(CDCTypeMode.LOG_MODE.getName().equals(connection.getCdcTypeMode()));
         }

main/plugins/org.talend.designer.maven.aether/src/main/java/org/talend/designer/maven/aether/RepositorySystemFactory.java

@@ -46,6 +46,8 @@ import org.talend.designer.maven.aether.util.TalendAetherProxySelector;
  */
 public class RepositorySystemFactory {
 
+    private static Boolean ignoreArtifactDescriptorRepositories;
+
     private static Map<LocalRepository, DefaultRepositorySystemSession> sessions = new HashMap<LocalRepository, DefaultRepositorySystemSession>();
 
     private static DefaultRepositorySystemSession newRepositorySystemSession(String localRepositoryPath)
@@ -61,6 +63,8 @@ public class RepositorySystemFactory {
             repositorySystemSession.setTransferListener(new ChainedTransferListener());
             repositorySystemSession.setRepositoryListener(new ChainedRepositoryListener());
             repositorySystemSession.setProxySelector(new TalendAetherProxySelector());
+            repositorySystemSession.setIgnoreArtifactDescriptorRepositories(
+                    RepositorySystemFactory.isIgnoreArtifactDescriptorRepositories());
             sessions.put(localRepo, repositorySystemSession);
         }
 
@@ -157,4 +161,13 @@ public class RepositorySystemFactory {
         doDeploy(content, pomFile, localRepository, repositoryId, repositoryUrl, userName, password, groupId, artifactId,
                 classifier, extension, version);
     }
+
+    public static boolean isIgnoreArtifactDescriptorRepositories() {
+        if (ignoreArtifactDescriptorRepositories == null) {
+            ignoreArtifactDescriptorRepositories = Boolean.valueOf(
+                    System.getProperty("talend.studio.aether.ignoreArtifactDescriptorRepositories", Boolean.TRUE.toString()));
+        }
+        return ignoreArtifactDescriptorRepositories;
+    }
+
 }

main/plugins/org.talend.designer.maven.aether/src/main/java/org/talend/designer/maven/aether/util/DynamicDistributionAetherUtils.java

@@ -63,6 +63,7 @@ import org.eclipse.m2e.core.MavenPlugin;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.designer.maven.aether.DummyDynamicMonitor;
 import org.talend.designer.maven.aether.IDynamicMonitor;
+import org.talend.designer.maven.aether.RepositorySystemFactory;
 import org.talend.designer.maven.aether.node.DependencyNode;
 import org.talend.designer.maven.aether.node.ExclusionNode;
 import org.talend.designer.maven.aether.selector.DynamicDependencySelector;
@@ -513,6 +514,7 @@ public class DynamicDistributionAetherUtils {
         LocalRepository localRepo = new LocalRepository(repositoryPath);
         session.setLocalRepositoryManager(system.newLocalRepositoryManager(session, localRepo));
         session.setProxySelector(new TalendAetherProxySelector());
+        session.setIgnoreArtifactDescriptorRepositories(RepositorySystemFactory.isIgnoreArtifactDescriptorRepositories());
 
         updateDependencySelector(session, monitor);
 

main/plugins/org.talend.designer.maven.aether/src/main/java/org/talend/designer/maven/aether/util/MavenLibraryResolverProvider.java

@@ -34,7 +34,6 @@ import org.codehaus.plexus.PlexusContainerException;
 import org.eclipse.aether.DefaultRepositorySystemSession;
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
 import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory;
 import org.eclipse.aether.impl.DefaultServiceLocator;
@@ -57,6 +56,7 @@ import org.talend.core.nexus.ArtifactRepositoryBean;
 import org.talend.core.nexus.NexusConstants;
 import org.talend.core.nexus.TalendLibsServerManager;
 import org.talend.core.runtime.maven.MavenArtifact;
+import org.talend.designer.maven.aether.RepositorySystemFactory;
 
 public class MavenLibraryResolverProvider {
 
@@ -283,8 +283,9 @@ public class MavenLibraryResolverProvider {
         LocalRepository localRepo = new LocalRepository( /* "target/local-repo" */target);
         session.setLocalRepositoryManager(system.newLocalRepositoryManager(session, localRepo));
         session.setProxySelector(new TalendAetherProxySelector());
+        session.setIgnoreArtifactDescriptorRepositories(RepositorySystemFactory.isIgnoreArtifactDescriptorRepositories());
 
-        return session;
+        return session; 
     }
 
     private String getLocalMVNRepository() {

main/plugins/org.talend.designer.maven.tos/resources/build/pom.xml

@@ -139,10 +139,15 @@
 			<version>1.21</version>
 		</dependency>
 		<dependency>
-            <groupId>org.apache-extras.beanshell</groupId>
-            <artifactId>bsh</artifactId>
-            <version>2.0b6</version>
-        </dependency>
+			<groupId>org.apache-extras.beanshell</groupId>
+			<artifactId>bsh</artifactId>
+			<version>2.0b6</version>
+		</dependency>
+		 <dependency>
+			<groupId>org.jboss.marshalling</groupId>
+			<artifactId>jboss-marshalling</artifactId>
+			<version>2.0.12.Final</version>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

main/plugins/org.talend.designer.maven.tos/resources/components/pom.xml

@@ -151,6 +151,12 @@
 			<groupId>org.talend.components</groupId>
 			<artifactId>components-marklogic-runtime</artifactId>
 			<version>${components.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.commons</groupId>
+                     <artifactId>commons-text</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
         <dependency>
             <groupId>org.talend.components</groupId>
@@ -210,6 +216,11 @@
 			<artifactId>commons-beanutils</artifactId>
 			<version>1.9.4</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-text</artifactId>
+			<version>1.10.0</version>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

main/plugins/org.talend.designer.maven.tos/resources/pom.xml

@@ -20,7 +20,7 @@
         <module>zip/pom.xml</module>
     </modules>
     <properties>
-        <m2.fasterxml.jackson.version>2.13.2</m2.fasterxml.jackson.version>
+        <m2.fasterxml.jackson.version>2.13.4</m2.fasterxml.jackson.version>
         <jackson-codehaus.version>1.9.16-TALEND</jackson-codehaus.version>
     </properties>
 </project>

main/plugins/org.talend.designer.maven.tos/resources/tacokit/pom.xml

@@ -10,7 +10,7 @@
 	<artifactId>studio-tacokit-dependencies</artifactId>
 	<packaging>pom</packaging>
 	<properties>
-		<tacokit.components.version>1.27.13</tacokit.components.version>
+		<tacokit.components.version>1.27.18</tacokit.components.version>
 	</properties>
 	<repositories>
 		<repository>

main/plugins/org.talend.designer.maven.tos/resources/tcompv1/pom.xml

@@ -11,7 +11,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <tcomp.version>1.38.6</tcomp.version>
+        <tcomp.version>1.38.8</tcomp.version>
         <slf4j.version>1.7.32</slf4j.version>
         <log4j2.version>2.17.1</log4j2.version>
         <reload4j.version>1.2.19</reload4j.version>

main/plugins/org.talend.libraries.apache.common/.classpath

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="lib/commons-text-1.10.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-pool2-2.4.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-validator-1.5.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-math3-3.3.jar"/>
@@ -8,6 +9,5 @@
 	<classpathentry exported="true" kind="lib" path="lib/commons-digester-2.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-cli-2.0-SNAPSHOT.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.15.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-text-1.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

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

@@ -10,7 +10,7 @@ Bundle-ClassPath: .,
  lib/commons-math3-3.3.jar,
  lib/commons-validator-1.5.1.jar,
  lib/commons-pool2-2.4.2.jar,
- lib/commons-text-1.1.jar
+ lib/commons-text-1.10.0.jar
 Export-Package: org.apache.commons.cli2,
  org.apache.commons.cli2.builder,
  org.apache.commons.cli2.commandline,

main/plugins/org.talend.libraries.apache.common/build.properties

@@ -7,4 +7,4 @@ bin.includes = META-INF/,\
                lib/commons-math3-3.3.jar,\
                lib/commons-validator-1.5.1.jar,\
                lib/commons-pool2-2.4.2.jar,\
-               lib/commons-text-1.1.jar
+               lib/commons-text-1.10.0.jar

main/plugins/org.talend.libraries.apache.common/pom.xml

@@ -62,6 +62,11 @@
 									<artifactId>commons-collections</artifactId>
 									<version>3.2.2</version>
 								</artifactItem>
+								<artifactItem>
+									<groupId>org.apache.commons</groupId>
+									<artifactId>commons-text</artifactId>
+									<version>1.10.0</version>
+								</artifactItem>
 								<artifactItem>
 									<groupId>commons-io</groupId>
 									<artifactId>commons-io</artifactId>

main/plugins/org.talend.libraries.apache.cxf/.classpath

@@ -6,23 +6,23 @@
 	<classpathentry exported="true" kind="lib" path="lib/wsdl4j-1.6.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/istack-commons-runtime-3.0.12.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jaxb-runtime-2.3.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/woodstox-core-6.2.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-core-3.4.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-bindings-soap-3.4.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-bindings-xml-3.4.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-databinding-jaxb-3.4.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-features-clustering-3.4.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-frontend-jaxrs-3.4.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-frontend-jaxws-3.4.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-frontend-simple-3.4.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-rs-client-3.4.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-security-3.4.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-security-saml-3.4.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-transports-http-3.4.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-ws-addr-3.4.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-wsdl-3.4.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-ws-policy-3.4.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-ws-security-3.4.7.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/woodstox-core-6.4.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-core-3.5.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-bindings-soap-3.5.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-bindings-xml-3.5.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-databinding-jaxb-3.5.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-features-clustering-3.5.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-frontend-jaxrs-3.5.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-frontend-jaxws-3.5.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-frontend-simple-3.5.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-rs-client-3.5.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-security-3.5.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-security-saml-3.5.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-transports-http-3.5.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-ws-addr-3.5.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-wsdl-3.5.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-ws-policy-3.5.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-ws-security-3.5.5.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jakarta.activation-1.2.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jakarta.activation-api-1.2.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jakarta.annotation-api-1.3.5.jar"/>

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

@@ -5,22 +5,22 @@ Bundle-SymbolicName: org.talend.libraries.apache.cxf;singleton:=true
 Bundle-Version: 7.3.1.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
- lib/cxf-core-3.4.7.jar,
- lib/cxf-rt-bindings-soap-3.4.7.jar,
- lib/cxf-rt-bindings-xml-3.4.7.jar,
- lib/cxf-rt-databinding-jaxb-3.4.7.jar,
- lib/cxf-rt-features-clustering-3.4.7.jar,
- lib/cxf-rt-frontend-jaxrs-3.4.7.jar,
- lib/cxf-rt-frontend-jaxws-3.4.7.jar,
- lib/cxf-rt-frontend-simple-3.4.7.jar,
- lib/cxf-rt-rs-client-3.4.7.jar,
- lib/cxf-rt-security-3.4.7.jar,
- lib/cxf-rt-security-saml-3.4.7.jar,
- lib/cxf-rt-transports-http-3.4.7.jar,
- lib/cxf-rt-ws-addr-3.4.7.jar,
- lib/cxf-rt-wsdl-3.4.7.jar,
- lib/cxf-rt-ws-security-3.4.7.jar,
- lib/cxf-rt-ws-policy-3.4.7.jar,
+ lib/cxf-core-3.5.5.jar,
+ lib/cxf-rt-bindings-soap-3.5.5.jar,
+ lib/cxf-rt-bindings-xml-3.5.5.jar,
+ lib/cxf-rt-databinding-jaxb-3.5.5.jar,
+ lib/cxf-rt-features-clustering-3.5.5.jar,
+ lib/cxf-rt-frontend-jaxrs-3.5.5.jar,
+ lib/cxf-rt-frontend-jaxws-3.5.5.jar,
+ lib/cxf-rt-frontend-simple-3.5.5.jar,
+ lib/cxf-rt-rs-client-3.5.5.jar,
+ lib/cxf-rt-security-3.5.5.jar,
+ lib/cxf-rt-security-saml-3.5.5.jar,
+ lib/cxf-rt-transports-http-3.5.5.jar,
+ lib/cxf-rt-ws-addr-3.5.5.jar,
+ lib/cxf-rt-wsdl-3.5.5.jar,
+ lib/cxf-rt-ws-security-3.5.5.jar,
+ lib/cxf-rt-ws-policy-3.5.5.jar,
  lib/istack-commons-runtime-3.0.12.jar,
  lib/jakarta.activation-1.2.2.jar,
  lib/jakarta.activation-api-1.2.2.jar,
@@ -35,7 +35,7 @@ Bundle-ClassPath: .,
  lib/stax2-api-4.2.1.jar,
  lib/txw2-2.3.4.jar,
  lib/xmlschema-core-2.2.5.jar,
- lib/woodstox-core-6.2.6.jar,
+ lib/woodstox-core-6.4.0.jar,
  lib/wsdl4j-1.6.3.jar
 Export-Package: javax.jws,
  javax.ws.rs,

main/plugins/org.talend.libraries.apache.cxf/pom.xml

@@ -11,7 +11,7 @@
   <packaging>eclipse-plugin</packaging>
   
   <properties>
-    <cxf.version>3.4.7</cxf.version>
+    <cxf.version>3.5.5</cxf.version>
   </properties>
   
   <repositories>
@@ -170,7 +170,7 @@
 		<dependency>
 			<groupId>com.fasterxml.woodstox</groupId>
 			<artifactId>woodstox-core</artifactId>
-			<version>6.2.6</version>
+			<version>6.4.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.ws.xmlschema</groupId>

main/plugins/org.talend.libraries.jdbc.hsql/licenses/license.txt

@@ -6,9 +6,42 @@ COPYRIGHTS AND LICENSES
 
 ORIGINAL LICENSE (a.k.a. "hypersonic_lic.txt")
 
-For content, code, and products originally developed by Thomas Mueller and the Hypersonic SQL Group:
+For work developed by the HSQL Development Group:
 
-Copyright (c) 1995-2000 by the Hypersonic SQL Group.
+Copyright (c) 2001-2022, The HSQL Development Group
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+Neither the name of the HSQL Development Group nor the names of its
+contributors may be used to endorse or promote products derived from this
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG,
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+For work originally developed by the Hypersonic SQL Group:
+
+Copyright (c) 1995-2000, The Hypersonic SQL Group.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -37,12 +70,12 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-This software consists of voluntary contributions made by many individuals on behalf of the
-Hypersonic SQL Group.
+This software consists of voluntary contributions made by many individuals
+on behalf of the Hypersonic SQL Group.
 
 For work added by the HSQL Development Group (a.k.a. hsqldb_lic.txt):
 
-Copyright (c) 2001-2005, The HSQL Development Group
+Copyright (c) 2001-2022, The HSQL Development Group
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

main/plugins/org.talend.libraries.jdbc.hsql/pom.xml

@@ -9,4 +9,33 @@
   </parent>
   <artifactId>org.talend.libraries.jdbc.hsql</artifactId>
   <packaging>eclipse-plugin</packaging>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.hsqldb</groupId>
+                  <artifactId>hsqldb</artifactId>
+                  <version>2.7.1</version>
+                  <classifier>jdk8</classifier>
+                  <outputDirectory>${project.basedir}/lib</outputDirectory>
+                  <destFileName>hsqldb.jar</destFileName>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>

main/plugins/org.talend.libraries.persist.lookup/.classpath

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

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

@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.libraries.persist.lookup
 Bundle-SymbolicName: org.talend.libraries.persist.lookup
 Bundle-Version: 7.3.1.qualifier
-Bundle-ClassPath: lib/advancedPersistentLookupLib-1.2.jar,
- .
+Bundle-ClassPath: .,
+ lib/advancedPersistentLookupLib-1.4.jar
 Export-Package: org.talend.commons.utils.data.map,
  org.talend.commons.utils.time,
  org.talend.core.model.process,

main/plugins/org.talend.libraries.persist.lookup/build.properties

@@ -2,4 +2,6 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
+               lib/advancedPersistentLookupLib-1.4.jar,\
+			   lib/advancedPersistentLookupLib-1.3.jar,\
                lib/advancedPersistentLookupLib-1.2.jar

main/plugins/org.talend.libraries.persist.lookup/export_advancedPersistentLookupLib.jardesc

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <jardesc>
-    <jar path="D:/studio_code/tcommon-studio-se/main/plugins/org.talend.libraries.persist.lookup/lib/advancedPersistentLookupLib-1.2.jar"/>
+    <jar path="D:/studio_code/tcommon-studio-se/main/plugins/org.talend.libraries.persist.lookup/lib/advancedPersistentLookupLib-1.4.jar"/>
     <options buildIfNeeded="true" compress="true" descriptionLocation="/org.talend.libraries.persist.lookup/export_advancedPersistentLookupLib.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="true" saveDescription="false" storeRefactorings="false" useSourceFolders="false"/>
     <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
     <selectedProjects/>

main/plugins/org.talend.librariesmanager/.classpath

@@ -2,6 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="resources/java"/>
+	<classpathentry exported="true" kind="lib" path="lib/jboss-marshalling-2.0.12.Final.jar"/>
 	<classpathentry kind="lib" path="lib/crypto-utils.jar"/>
 	<classpathentry kind="lib" path="lib/slf4j-api-1.7.25.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

main/plugins/org.talend.librariesmanager/META-INF/MANIFEST.MF

@@ -28,7 +28,8 @@ Eclipse-LazyStart: true
 Bundle-ClassPath: .,
  lib/crypto-utils.jar,
  lib/slf4j-api-1.7.25.jar
-Export-Package: org.talend.librariesmanager.emf.librariesindex,
+Export-Package: org.jboss.marshalling,
+ org.talend.librariesmanager.emf.librariesindex,
  org.talend.librariesmanager.librarydata,
  org.talend.librariesmanager.maven,
  org.talend.librariesmanager.model,
@@ -40,3 +41,5 @@ Export-Package: org.talend.librariesmanager.emf.librariesindex,
 Import-Package: org.eclipse.emf.ecore.xmi.impl,
  org.talend.osgi.hook.notification
 Eclipse-BundleShape: dir
+Bundle-ClassPath: lib/jboss-marshalling-2.0.12.Final.jar,
+ .

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

@@ -69,6 +69,12 @@
                name="crypto-utils-0.31.12.jar">
          </library>
       </systemRoutine>
+      <systemRoutine
+            name="IPersistableLookupRow">
+         <library
+               name="mvn:org.jboss.marshalling/jboss-marshalling/2.0.12.Final">
+         </library>
+      </systemRoutine>
    </extension>
    <extension
          point="org.talend.core.runtime.artifact_handler">

main/plugins/org.talend.librariesmanager/pom.xml

@@ -51,6 +51,11 @@
 									<version>1.7.25</version>
 									<overWrite>true</overWrite>
 								</artifactItem>
+								<artifactItem>
+									<groupId>org.jboss.marshalling</groupId>
+									<artifactId>jboss-marshalling</artifactId>
+									<version>2.0.12.Final</version>
+								</artifactItem>
 							</artifactItems>
 						</configuration>
 					</execution>

main/plugins/org.talend.librariesmanager/resources/java/routines/system/IPersistableLookupRow.java

@@ -5,6 +5,9 @@ import java.io.DataOutputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
+import org.jboss.marshalling.Marshaller;
+import org.jboss.marshalling.Unmarshaller;
+
 public interface IPersistableLookupRow<R> {
 
     public void writeKeysData(ObjectOutputStream out);
@@ -19,4 +22,25 @@ public interface IPersistableLookupRow<R> {
 
     public void copyKeysDataTo(R other);
 
+    default public void writeKeysData(Marshaller marshaller){
+        //sub-class need to override this method
+        throw new UnsupportedOperationException("Method need to be override");
+    }
+
+    default public void readKeysData(Unmarshaller in){
+        throw new UnsupportedOperationException("Method need to be override");
+    }
+
+    default public void writeValuesData(DataOutputStream dataOut, Marshaller objectOut){
+        throw new UnsupportedOperationException("Method need to be override");
+    }
+
+    default public void readValuesData(DataInputStream dataIn, Unmarshaller objectIn){
+        throw new UnsupportedOperationException("Method need to be override");
+    }
+
+    default public boolean supportMarshaller(){
+        //Override this method to return true after implement the Jboss methods above
+        return false;
+    }
 }

main/plugins/org.talend.librariesmanager/resources/java/routines/system/IPersistableRow.java

@@ -3,10 +3,28 @@ package routines.system;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
+import org.jboss.marshalling.Marshaller;
+import org.jboss.marshalling.Unmarshaller;
+
 public interface IPersistableRow<R> {
 
     public void writeData(ObjectOutputStream out);
 
     public void readData(ObjectInputStream in);
 
+
+    default public void writeData(Marshaller marshaller){
+        //sub-class need to override this method
+        throw new UnsupportedOperationException("Method need to be override");
+    }
+
+    default public void readData(Unmarshaller in){
+        throw new UnsupportedOperationException("Method need to be override");
+    }
+
+    default public boolean supportJboss(){
+        //Override this method to return true after implement the Jboss methods above
+        return false;
+    }
+
 }

main/plugins/org.talend.librariesmanager/resources/java/routines/system/ResumeUtil.java

@@ -520,9 +520,13 @@ public class ResumeUtil {
 
         private String lineSeparator = System.getProperty("line.separator");
         
-        private int capibility = 2 << 22; //8M
+        private final int capibility = 2 << 22; //8M
+        
+        private final int FLUSH_FACTOR = 6 *1024 *1024; //6M
+        
+        private final int SUBSTRING_SIZE = 2 << 20; //2M
+        
         
-        private int FLUSH_FACTOR = 6 *1024 *1024; //6M
         
 
         public SimpleCsvWriter(FileChannel channel) {
@@ -553,6 +557,16 @@ public class ResumeUtil {
                 content = replace(content, "" + TextQualifier, "" + TextQualifier + TextQualifier);
             }
             
+            if (content.length() > SUBSTRING_SIZE) { //2M
+                int index = 0;
+                for (; content.length() - index > SUBSTRING_SIZE; index += SUBSTRING_SIZE) {
+                    flush(true);
+                    final String substring = content.substring(index, index + SUBSTRING_SIZE);
+                    buf.put(substring.getBytes());
+                }
+                content = content.substring(index);
+            }
+            
             byte[] contentByte = content.getBytes();
             if(contentByte.length > capibility - buf.position()) {
             	flush(true);

main/plugins/org.talend.librariesmanager/src/main/java/org/talend/librariesmanager/model/service/LocalLibraryManager.java

@@ -1319,11 +1319,81 @@ public class LocalLibraryManager implements ILibraryManagerService, IChangedLibr
         saveMavenIndex(mavenURIMap, monitorWrap);
         savePlatfromURLIndex(platformURLMap, monitorWrap);
 
-        if (service != null) {
-            deployLibsFromCustomComponents(service, platformURLMap);
-        }
         return mavenURIMap;
     }
+    
+    public void deployLibsFromCustomComponents(File componentFolder, List<ModuleNeeded> modulesNeeded) {
+        if (modulesNeeded == null || modulesNeeded.isEmpty()) {
+            return;
+        }
+        Map<File, Set<MavenArtifact>> needToDeploy = new HashMap<File, Set<MavenArtifact>>();
+        modulesNeeded.forEach(module -> {
+            if (module != null) {
+                boolean needDeploy = false;
+                String mvnUri = module.getMavenUri();
+                String jarPathFromMaven = getJarPathFromMaven(StringUtils.isNotBlank(mvnUri) ? mvnUri : module.getModuleName());
+                if (StringUtils.isBlank(jarPathFromMaven)) {
+                    needDeploy = true;
+                } else {
+                    File jarFromMaven = new File(jarPathFromMaven);
+                    if (!jarFromMaven.exists()) {
+                        needDeploy = true;
+                    }
+                }
+
+                if (needDeploy) {
+                    File deployFile = getDeployJarFileByModule(componentFolder, module);
+                    if (deployFile != null) {
+
+                        install(deployFile, mvnUri, false, true, null);
+
+                        if (needToDeploy.get(deployFile) == null) {
+                            needToDeploy.put(deployFile, new HashSet<MavenArtifact>());
+                        }
+                        if (StringUtils.isNotBlank(mvnUri)) {
+                            MavenArtifact mavenArtifact = MavenUrlHelper.parseMvnUrl(mvnUri);
+                            needToDeploy.get(deployFile).add(mavenArtifact);
+                        } else {
+                            Map<String, String> sourceAndMavenUri = new HashMap<>();
+                            guessMavenRUIFromIndex(deployFile, true, sourceAndMavenUri);
+                            Set<MavenArtifact> MavenArtifactSet = new HashSet<MavenArtifact>();
+                            sourceAndMavenUri.keySet().forEach(mavenUri -> {
+                                if (StringUtils.isNotBlank(mvnUri)) {
+                                    MavenArtifactSet.add(MavenUrlHelper.parseMvnUrl(mavenUri));
+                                }
+                            });
+                            needToDeploy.get(deployFile).addAll(MavenArtifactSet);
+                        }
+                    }
+                }
+            }
+        });
+
+        if (!needToDeploy.isEmpty()) {
+            ShareComponentsLibsJob shareJob = new ShareComponentsLibsJob(
+                    Messages.getString("LocalLibraryManager.shareLibsForCustomponents"), needToDeploy, deployer);
+            shareJob.schedule();
+        }
+    }
+
+    private File getDeployJarFileByModule(File componentFolder, ModuleNeeded module) {
+        String mvnUri = module.getMavenUri();
+        if (StringUtils.isNotBlank(mvnUri)) {
+            MavenArtifact mavenArtifact = MavenUrlHelper.parseMvnUrl(mvnUri);
+            String fileName = mavenArtifact.getFileName();
+            File jarFile = new File(componentFolder, fileName);
+            if (jarFile.exists()) {
+                return jarFile;
+            }
+
+        }
+        // try module name
+        File jarFile = new File(componentFolder, module.getModuleName());
+        if (jarFile.exists()) {
+            return jarFile;
+        }
+        return null;
+    }
 
     /**
      *
@@ -1382,86 +1452,6 @@ public class LocalLibraryManager implements ILibraryManagerService, IChangedLibr
 		return false;
 	}
 
-    private void deployLibsFromCustomComponents(IComponentsService service, Map<String, String> platformURLMap) {
-        boolean deployToRemote = true;
-        if (!LibrariesManagerUtils.shareLibsAtStartup()) {
-            log.info("Skip deploying libs from custom components");
-            deployToRemote = false;
-        }
-
-        Map<File, Set<MavenArtifact>> needToDeploy = new HashMap<File, Set<MavenArtifact>>();
-        List<ComponentProviderInfo> componentsFolders = service.getComponentsFactory().getComponentsProvidersInfo();
-        for (ComponentProviderInfo providerInfo : componentsFolders) {
-            String id = providerInfo.getId();
-            try {
-                File file = new File(providerInfo.getLocation());
-                if (isExtComponentProvider(id)) {
-                    if (file.isDirectory()) {
-                        List<File> jarFiles = FilesUtils.getJarFilesFromFolder(file, null);
-                        if (jarFiles.size() > 0) {
-                            for (File jarFile : jarFiles) {
-                                String name = jarFile.getName();
-                                if (!canDeployFromCustomComponentFolder(name) || platformURLMap.get(name) != null) {
-                                    continue;
-                                }
-
-                                collectLibModules(jarFile, needToDeploy);
-                            }
-                        }
-                    } else {
-                        if (!canDeployFromCustomComponentFolder(file.getName()) || platformURLMap.get(file.getName()) != null) {
-                            continue;
-                        }
-                        collectLibModules(file, needToDeploy);
-                    }
-                }
-            } catch (Exception e) {
-                ExceptionHandler.process(e);
-                continue;
-            }
-        }
-
-        // first install them locally
-        needToDeploy.forEach((k, v) -> {
-            try {
-                // install as release version if can't find mvn url from index
-                install(k, null, false, true);
-            } catch (Exception e) {
-                ExceptionHandler.process(e);
-            }
-        });
-
-        if (!deployToRemote) {
-            return;
-        }
-
-        ShareComponentsLibsJob shareJob = new ShareComponentsLibsJob(
-                Messages.getString("LocalLibraryManager.shareLibsForCustomponents"), needToDeploy, deployer);
-        shareJob.schedule();
-    }
-
-    private void collectLibModules(File jarFile, Map<File, Set<MavenArtifact>> needToDeploy) {
-        Map<String,String> mavenUris = new HashMap<String,String>();
-        guessMavenRUIFromIndex(jarFile, true, mavenUris);
-        
-        Set<MavenArtifact> artifacts = new HashSet<MavenArtifact>();
-        for(String uri: mavenUris.keySet()) {
-            MavenArtifact art = MavenUrlHelper.parseMvnUrl(uri);
-            if(art!=null) {
-                artifacts.add(art);
-            }
-        }
-        
-        needToDeploy.put(jarFile, artifacts);
-    }
-
-    private boolean canDeployFromCustomComponentFolder(String fileName) {
-        if (isSystemCacheFile(fileName) || isComponentDefinitionFileType(fileName)) {
-            return false;
-        }
-        return true;
-    }
-
     private void warnDuplicated(List<ModuleNeeded> modules, Set<String> duplicates, String type) {
         for (String lib : duplicates) {
             Set<String> components = new HashSet<>();

main/plugins/org.talend.metadata.managment.ui/src/main/java/org/talend/metadata/managment/ui/utils/DBConnectionContextUtils.java

@@ -893,6 +893,7 @@ public final class DBConnectionContextUtils {
         managerConnection.setValue(0, dbType, urlConnection, server, username, password, sidOrDatabase, port, filePath,
                 datasource, schemaOracle, additionParam, driverClassName, driverJarPath, dbVersionString);
         managerConnection.setDbRootPath(dbRootPath);
+        managerConnection.setSupportNLS(dbConn.isSupportNLS());
 
         return urlConnection;
     }
@@ -1058,6 +1059,12 @@ public final class DBConnectionContextUtils {
             cloneConn.setSQLMode(true);
         }
 
+        if(dbConn.isSetSupportNLS()) {
+            cloneConn.setSupportNLS(dbConn.isSupportNLS());
+        } else {
+            cloneConn.setSupportNLS(false);
+        }
+        
         // cloneConn.setProperties(dbConn.getProperties());
         // cloneConn.setCdcConns(dbConn.getCdcConns());
         // cloneConn.setQueries(dbConn.getQueries());

main/plugins/org.talend.metadata.managment.ui/src/main/java/org/talend/metadata/managment/ui/utils/ExtendedNodeConnectionContextUtils.java

@@ -166,7 +166,8 @@ public class ExtendedNodeConnectionContextUtils {
         KnoxUrl,
         KnoxUsername,
         KnoxPassword,
-        KnoxDirectory
+        KnoxDirectory,
+        KnoxTimeout
     }
 
     static List<IContextParameter> getContextVariables(final String prefixName, Connection conn, Set<IConnParamName> paramSet) {

main/plugins/org.talend.metadata.managment/plugin.xml

@@ -132,6 +132,22 @@
             required="true"
             uripath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang-2.4.jar">
       </libraryNeeded>
+      <libraryNeeded
+                  context="plugin:org.talend.libraries.jdbc.oracle"
+                  language="java"
+                  message="Needed for Oracle jdbc plugin National Language Support (NLS)."
+                  mvn_uri="mvn:com.oracle.database.nls/orai18n/19.3.0.0/jar"
+                  name="orai18n-19.3.0.0.jar"
+                  required="true">
+      </libraryNeeded>
+      <libraryNeeded
+            context="plugin:org.talend.metadata.managment"
+            language="java"
+            message="Needed for plugin org.talend.metadata.managment"
+            name="hsqldb.jar" mvn_uri="mvn:org.hsqldb/hsqldb/2.7.1" 
+            required="true"
+            uripath="platform:/plugin/org.talend.libraries.jdbc.hsql/lib/hsqldb.jar">
+      </libraryNeeded>
    </extension>
    <extension
          point="org.talend.core.migrationTask">

main/plugins/org.talend.metadata.managment/src/main/java/org/talend/core/model/metadata/builder/database/ExtractMetaDataFromDataBase.java

@@ -291,6 +291,7 @@ public class ExtractMetaDataFromDataBase {
      * DOC cantoine. Method to test DataBaseConnection.
      *
      * @param dbVersionString
+     * @param supportNLS 
      *
      * @param String driverClass
      * @param String urlString pwd
@@ -299,14 +300,14 @@ public class ExtractMetaDataFromDataBase {
      * @return ConnectionStatus : the result of connection(boolean Result, String messageException)
      */
     public static ConnectionStatus testConnection(String dbType, String url, String username, String pwd, String schema,
-            final String driverClassName, final String driverJarPath, String dbVersionString, String additionalParam) {
+            final String driverClassName, final String driverJarPath, String dbVersionString, String additionalParam, boolean supportNLS) {
         return testConnection(dbType, url, username, pwd, schema, driverClassName, driverJarPath, dbVersionString,
-                additionalParam, null, null);
+                additionalParam, supportNLS, null, null);
     }
 
     public static ConnectionStatus testConnection(String dbType, String url, String username, String pwd, String schema,
             final String driverClassName, final String driverJarPath, String dbVersionString, String additionalParam,
-            StringBuffer retProposedSchema, String sidOrDatabase) {
+            boolean supportNLS, StringBuffer retProposedSchema, String sidOrDatabase) {
         Connection connection = null;
         ConnectionStatus connectionStatus = new ConnectionStatus();
         connectionStatus.setResult(false);
@@ -315,7 +316,7 @@ public class ExtractMetaDataFromDataBase {
             List list = new ArrayList();
 
             list = ExtractMetaDataUtils.getInstance().connect(dbType, url, username, pwd, driverClassName, driverJarPath,
-                    dbVersionString, additionalParam);
+                    dbVersionString, additionalParam, supportNLS);
             if (list != null && list.size() > 0) {
                 for (int i = 0; i < list.size(); i++) {
                     if (list.get(i) instanceof Connection) {
@@ -498,7 +499,7 @@ public class ExtractMetaDataFromDataBase {
         List list = metaData.getConnection(iMetadataConnection.getDbType(), url, iMetadataConnection.getUsername(),
                 iMetadataConnection.getPassword(), iMetadataConnection.getDatabase(), iMetadataConnection.getSchema(),
                 iMetadataConnection.getDriverClass(), iMetadataConnection.getDriverJarPath(),
-                iMetadataConnection.getDbVersionString(), iMetadataConnection.getAdditionalParams());
+                iMetadataConnection.getDbVersionString(), iMetadataConnection.getAdditionalParams(), iMetadataConnection.isSupportNLS());
         Connection conn = null;
         DriverShim wapperDriver = null;
 
@@ -582,7 +583,7 @@ public class ExtractMetaDataFromDataBase {
         List list = extractMeta.getConnection(iMetadataConnection.getDbType(), iMetadataConnection.getUrl(),
                 iMetadataConnection.getUsername(), iMetadataConnection.getPassword(), iMetadataConnection.getDatabase(),
                 iMetadataConnection.getSchema(), iMetadataConnection.getDriverClass(), iMetadataConnection.getDriverJarPath(),
-                iMetadataConnection.getDbVersionString(), iMetadataConnection.getAdditionalParams());
+                iMetadataConnection.getDbVersionString(), iMetadataConnection.getAdditionalParams(), iMetadataConnection.isSupportNLS());
         DriverShim wapperDriver = null;
         if (list != null && list.size() > 0) {
             for (int i = 0; i < list.size(); i++) {

main/plugins/org.talend.metadata.managment/src/main/java/org/talend/core/model/metadata/builder/database/ExtractMetaDataUtils.java

@@ -121,6 +121,8 @@ public class ExtractMetaDataUtils {
 
     private String[] ORACLE_SSL_JARS = new String[] { "oraclepki-12.2.0.1.jar", "osdt_cert-12.2.0.1.jar", //$NON-NLS-1$//$NON-NLS-2$
             "osdt_core-12.2.0.1.jar" }; //$NON-NLS-1$
+    
+    private String ORACLE_NLS_JARS = "orai18n-19.3.0.0.jar";
 
     public static final String SNOWFLAKE = "Snowflake"; //$NON-NLS-1$
 
@@ -829,6 +831,11 @@ public class ExtractMetaDataUtils {
      */
     public List getConnection(String dbType, String url, String username, String pwd, String dataBase, String schemaBase,
             final String driverClassName, final String driverJarPath, String dbVersion, String additionalParams) {
+        return getConnection(dbType, url, username, pwd, dataBase, schemaBase, driverClassName, driverJarPath, dbVersion, additionalParams, false);
+    }
+    
+    public List getConnection(String dbType, String url, String username, String pwd, String dataBase, String schemaBase,
+            final String driverClassName, final String driverJarPath, String dbVersion, String additionalParams, boolean supportNLS) {
         boolean isColsed = false;
         List conList = new ArrayList();
         try {
@@ -846,7 +853,7 @@ public class ExtractMetaDataUtils {
                 closeConnection(true); // colse before connection.
                 checkDBConnectionTimeout();
 
-                list = connect(dbType, url, username, pwd, driverClassName, driverJarPath, dbVersion, additionalParams);
+                list = connect(dbType, url, username, pwd, driverClassName, driverJarPath, dbVersion, additionalParams, supportNLS);
                 if (list != null && list.size() > 0) {
                     for (int i = 0; i < list.size(); i++) {
                         if (list.get(i) instanceof Connection) {
@@ -938,7 +945,7 @@ public class ExtractMetaDataUtils {
      * @throws Exception
      */
     public List connect(String dbType, String url, String username, String pwd, final String driverClassNameArg,
-            final String driverJarPathArg, String dbVersion, String additionalParams) throws Exception {
+            final String driverJarPathArg, String dbVersion, String additionalParams, boolean supportNLS) throws Exception {
         Connection connection = null;
         DriverShim wapperDriver = null;
         List conList = new ArrayList();
@@ -953,11 +960,18 @@ public class ExtractMetaDataUtils {
             if ((driverJarPathArg == null || driverJarPathArg.equals(""))) { //$NON-NLS-1$
                 List<String> driverNames = EDatabaseVersion4Drivers.getDrivers(dbType, dbVersion);
                 if (driverNames != null) {
+                    if(EDatabaseTypeName.ORACLEFORSID.getProduct().equals(EDatabaseTypeName.getTypeFromDbType(dbType).getProduct())) {
+                        if(supportNLS){
+                            driverNames.add(ORACLE_NLS_JARS);
+                        }
+                    }
+                    
                     if (EDatabaseTypeName.ORACLE_CUSTOM.getDisplayName().equals(dbType)
                             && StringUtils.isNotEmpty(additionalParams)) {
                         if (additionalParams.contains(SSLPreferenceConstants.TRUSTSTORE_TYPE)) {
                              driverNames.addAll(Arrays.asList(ORACLE_SSL_JARS));
                         }
+                        
                     } else if (SNOWFLAKE.equals(dbType)) { // $NON-NLS-1$
                         // TDQ-17294 msjian Support of Snowflake for DQ Datamart
                         driverNames.add(SNOWFLAKE_DRIVER_JAR);
@@ -1285,7 +1299,7 @@ public class ExtractMetaDataUtils {
         List list = getConnection(metadataConnection.getDbType(), metadataConnection.getUrl(), metadataConnection.getUsername(),
                 metadataConnection.getPassword(), metadataConnection.getDatabase(), metadataConnection.getSchema(),
                 metadataConnection.getDriverClass(), metadataConnection.getDriverJarPath(),
-                metadataConnection.getDbVersionString(), metadataConnection.getAdditionalParams());
+                metadataConnection.getDbVersionString(), metadataConnection.getAdditionalParams(), metadataConnection.isSupportNLS());
         return list;
     }
 

main/plugins/org.talend.metadata.managment/src/main/java/org/talend/core/model/metadata/builder/database/JDBCDriverLoader.java

@@ -17,6 +17,7 @@ import java.nio.charset.Charset;
 import java.security.Provider;
 import java.sql.Connection;
 import java.sql.Driver;
+import java.sql.ResultSet;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -166,6 +167,11 @@ public class JDBCDriverLoader {
                     info.put("charSet", systemCharset.displayName()); //$NON-NLS-1$
                 }
             }
+            
+            //TUP-37016:Upgrade hsqldb to 2.7.1
+            if (dbType.equals(EDatabaseTypeName.ACCESS.getXmlName()) || ConnectionUtils.isHsql(url)) {
+                System.setProperty("hsqldb.method_class_names", "net.ucanaccess.converters.*");
+            }
 
             if (additionalParams != null && !"".equals(additionalParams) && dbType.toUpperCase().contains("ORACLE")) {//$NON-NLS-1$//$NON-NLS-2$
                 if (additionalParams.contains(SSLPreferenceConstants.TRUSTSTORE_TYPE)) {
@@ -198,10 +204,20 @@ public class JDBCDriverLoader {
                 }
                 connection = wapperDriver.connect(url, info);
             }
+            
+            try {
+                ResultSet schemas = connection.getMetaData().getSchemas();
+                if(schemas.next()) {
+                    schemas.getString(1);
+                }
+            } catch (Exception e) {
+            }
+            
             // }
             // DriverManager.deregisterDriver(wapperDriver);
             // bug 9162
             list.add(connection);
+            
             list.add(wapperDriver);
             return list;
         } catch (Throwable e) {

main/plugins/org.talend.metadata.managment/src/main/java/org/talend/core/model/metadata/builder/database/manager/ExtractManager.java

@@ -470,7 +470,7 @@ public class ExtractManager {
                         metadataConnection.getUsername(), metadataConnection.getPassword(), metadataConnection.getDatabase(),
                         metadataConnection.getSchema(), metadataConnection.getDriverClass(),
                         metadataConnection.getDriverJarPath(), metadataConnection.getDbVersionString(),
-                        metadataConnection.getAdditionalParams());
+                        metadataConnection.getAdditionalParams(), metadataConnection.isSupportNLS());
                 if (list != null && list.size() > 0) {
                     for (int i = 0; i < list.size(); i++) {
                         if (list.get(i) instanceof Driver) {
@@ -574,7 +574,7 @@ public class ExtractManager {
                         metadataConnection.getUsername(), metadataConnection.getPassword(), metadataConnection.getDatabase(),
                         metadataConnection.getSchema(), metadataConnection.getDriverClass(),
                         metadataConnection.getDriverJarPath(), metadataConnection.getDbVersionString(),
-                        metadataConnection.getAdditionalParams());
+                        metadataConnection.getAdditionalParams(), metadataConnection.isSupportNLS());
                 if (list != null && list.size() > 0) {
                     for (int i = 0; i < list.size(); i++) {
                         if (list.get(i) instanceof DriverShim) {
@@ -1064,7 +1064,7 @@ public class ExtractManager {
         List connList = extractMeta.getConnection(metadataConnection.getDbType(), metadataConnection.getUrl(),
                 metadataConnection.getUsername(), metadataConnection.getPassword(), metadataConnection.getDatabase(),
                 metadataConnection.getSchema(), metadataConnection.getDriverClass(), metadataConnection.getDriverJarPath(),
-                metadataConnection.getDbVersionString(), metadataConnection.getAdditionalParams());
+                metadataConnection.getDbVersionString(), metadataConnection.getAdditionalParams(), metadataConnection.isSupportNLS());
         try {
             if (!tableInfoParameters.isUsedName()) {
                 if (tableInfoParameters.getSqlFiter() != null && !"".equals(tableInfoParameters.getSqlFiter())) { //$NON-NLS-1$

main/plugins/org.talend.metadata.managment/src/main/java/org/talend/metadata/managment/hive/EHiveWithTezJars.java

@@ -40,7 +40,7 @@ public enum EHiveWithTezJars {
             "api-asn1-api-1.0.0-M20.jar", "api-util-1.0.0-M20.jar", "asm-3.1.jar", "avro-1.7.4.jar",
             "commons-beanutils-1.7.0.jar", "commons-beanutils-core-1.8.0.jar", "commons-compress-1.4.1.jar",
             "commons-configuration-1.6.jar", "commons-digester-1.8.jar", "commons-net-3.1.jar", "curator-client-2.6.0.jar",
-            "curator-framework-2.6.0.jar", "curator-recipes-2.6.0.jar", "gson-2.2.4.jar", "guice-3.0.jar",
+            "curator-framework-2.6.0.jar", "curator-recipes-2.6.0.jar", "gson-2.9.0.jar", "guice-3.0.jar",
             "guice-servlet-3.0.jar", "hadoop-auth-2.6.0.2.2.0.0-2041.jar", "hadoop-common-2.6.0.2.2.0.0-2041.jar",
             "hadoop-hdfs-2.6.0.2.2.0.0-2041.jar", "hadoop-yarn-api-2.6.0.2.2.0.0-2041.jar",
             "hadoop-yarn-client-2.6.0.2.2.0.0-2041.jar", "hadoop-yarn-common-2.6.0.2.2.0.0-2041.jar", "htrace-core-3.0.4.jar",
@@ -56,7 +56,7 @@ public enum EHiveWithTezJars {
             "api-asn1-api-1.0.0-M20.jar", "api-util-1.0.0-M20.jar", "asm-3.2.jar", "avro-1.7.5.jar",
             "commons-beanutils-1.7.0.jar", "commons-beanutils-core-1.8.0.jar", "commons-compress-1.4.1.jar",
             "commons-configuration-1.6.jar", "commons-digester-1.8.jar", "commons-net-3.1.jar", "curator-client-2.7.1.jar",
-            "curator-framework-2.7.1.jar", "curator-recipes-2.7.1.jar", "gson-2.2.4.jar", "guice-3.0.jar",
+            "curator-framework-2.7.1.jar", "curator-recipes-2.7.1.jar", "gson-2.9.0.jar", "guice-3.0.jar",
             "guice-servlet-3.0.jar", "hadoop-auth-2.7.1.2.3.2.0-2950.jar", "hadoop-common-2.7.1.2.3.2.0-2950.jar",
             "hadoop-hdfs-2.7.1.2.3.2.0-2950.jar", "hadoop-yarn-api-2.7.1.2.3.2.0-2950.jar",
             "hadoop-yarn-client-2.7.1.2.3.2.0-2950.jar", "hadoop-yarn-common-2.7.1.2.3.2.0-2950.jar",

main/plugins/org.talend.metadata.managment/src/main/java/org/talend/metadata/managment/repository/ManagerConnection.java

@@ -90,6 +90,8 @@ public class ManagerConnection {
     Integer id = null;
 
     String additionalParams;
+    
+    private boolean supportNLS;
 
     private String schemaOracle;
 
@@ -288,7 +290,7 @@ public class ManagerConnection {
             }
             // test the connection
             testConnection = ExtractMetaDataFromDataBase.testConnection(dbTypeString, urlConnectionString, username, password,
-                    schemaName, driverClassName, driverJarPath, dbVersionString, additionalParams, retProposedSchema,
+                    schemaName, driverClassName, driverJarPath, dbVersionString, additionalParams, supportNLS, retProposedSchema,
                     sidOrDatabase);
             isValide = testConnection.getResult();
             messageException = testConnection.getMessageException();
@@ -388,7 +390,7 @@ public class ManagerConnection {
                         metadataConnection.getUrl(), metadataConnection.getUsername(), metadataConnection.getPassword(),
                         metadataConnection.getSchema(), metadataConnection.getDriverClass(),
                         metadataConnection.getDriverJarPath(), metadataConnection.getDbVersionString(),
-                        metadataConnection.getAdditionalParams(), retProposedSchema, metadataConnection.getDatabase());
+                        metadataConnection.getAdditionalParams(), metadataConnection.isSupportNLS(), retProposedSchema, metadataConnection.getDatabase());
             }
             // qli
             // record this metadataConnection as old connection.
@@ -475,4 +477,13 @@ public class ManagerConnection {
         this.isValide = isValide;
     }
 
+    
+    /**
+     * Sets the supportNLS.
+     * @param supportNLS the supportNLS to set
+     */
+    public void setSupportNLS(boolean supportNLS) {
+        this.supportNLS = supportNLS;
+    }
+
 }

main/plugins/org.talend.metadata.managment/src/main/java/org/talend/metadata/managment/utils/MetadataConnectionUtils.java

@@ -188,7 +188,7 @@ public class MetadataConnectionUtils {
                 }
                 list = ExtractMetaDataUtils.getInstance().connect(metadataBean.getDbType(), metadataBean.getUrl(),
                         metadataBean.getUsername(), metadataBean.getPassword(), metadataBean.getDriverClass(),
-                        metadataBean.getDriverJarPath(), metadataBean.getDbVersionString(), metadataBean.getAdditionalParams());
+                        metadataBean.getDriverJarPath(), metadataBean.getDbVersionString(), metadataBean.getAdditionalParams(), metadataBean.isSupportNLS());
             } catch (Exception e) {
                 rc.setMessage("fail to connect database!"); //$NON-NLS-1$
                 CommonExceptionHandler.process(e);
@@ -274,6 +274,7 @@ public class MetadataConnectionUtils {
             String dataBase = databaseConnection.getSID();
             String dbVersionString = databaseConnection.getDbVersionString();
             String additionalParams = databaseConnection.getAdditionalParams();
+            boolean supportNLS = databaseConnection.isSupportNLS();
 
             // MOD qiongli 2011-9-6,TDQ 3317.handle context mode
             if (databaseConnection.isContextMode()) {
@@ -313,6 +314,7 @@ public class MetadataConnectionUtils {
             metadataConnection.setUsername(userName);
             metadataConnection.setPassword(password);
             metadataConnection.setUrl(dbUrl);
+            metadataConnection.setSupportNLS(supportNLS);            
 
             // TDQ-12299: transfer the OtherParameters to metadataConnection, because create impala connection use that
             // values
@@ -1312,7 +1314,7 @@ public class MetadataConnectionUtils {
         return ExtractMetaDataUtils.getInstance().getConnection(metadataBean.getDbType(), metadataBean.getUrl(),
                 metadataBean.getUsername(), metadataBean.getPassword(), metadataBean.getDatabase(), metadataBean.getSchema(),
                 metadataBean.getDriverClass(), metadataBean.getDriverJarPath(), metadataBean.getDbVersionString(),
-                metadataBean.getAdditionalParams());
+                metadataBean.getAdditionalParams(), metadataBean.isSupportNLS());
     }
 
     /**

main/plugins/org.talend.model.edit/src/main/java/org/talend/core/model/metadata/builder/connection/provider/DatabaseConnectionItemProvider.java

@@ -80,6 +80,7 @@ public class DatabaseConnectionItemProvider extends ConnectionItemProvider imple
             addCdcTypeModePropertyDescriptor(object);
             addSQLModePropertyDescriptor(object);
             addUiSchemaPropertyDescriptor(object);
+            addSupportNLSPropertyDescriptor(object);
         }
         return itemPropertyDescriptors;
     }
@@ -468,6 +469,22 @@ public class DatabaseConnectionItemProvider extends ConnectionItemProvider imple
                 false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
+    /**
+     * This adds a property descriptor for the Support NLS feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addSupportNLSPropertyDescriptor(Object object) {
+        itemPropertyDescriptors
+                .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+                        getResourceLocator(), getString("_UI_DatabaseConnection_supportNLS_feature"),
+                        getString("_UI_PropertyDescriptor_description", "_UI_DatabaseConnection_supportNLS_feature",
+                                "_UI_DatabaseConnection_type"),
+                        ConnectionPackage.Literals.DATABASE_CONNECTION__SUPPORT_NLS, true, false, false,
+                        ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+    }
+
     /**
      * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
      * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
@@ -558,6 +575,7 @@ public class DatabaseConnectionItemProvider extends ConnectionItemProvider imple
         case ConnectionPackage.DATABASE_CONNECTION__CDC_TYPE_MODE:
         case ConnectionPackage.DATABASE_CONNECTION__SQL_MODE:
         case ConnectionPackage.DATABASE_CONNECTION__UI_SCHEMA:
+        case ConnectionPackage.DATABASE_CONNECTION__SUPPORT_NLS:
             fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
             return;
         case ConnectionPackage.DATABASE_CONNECTION__CDC_CONNS:

main/plugins/org.talend.model/model/metadata.ecore

@@ -348,6 +348,8 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="UiSchema" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1"
         eType="#//AdditionalProperties" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="supportNLS" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        defaultValueLiteral="false" unsettable="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="SAPConnection" eSuperTypes="#//Connection">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="Host" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

main/plugins/org.talend.model/model/metadata.genmodel

@@ -187,6 +187,7 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//DatabaseConnection/SQLMode"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//DatabaseConnection/UiSchema"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference metadata.ecore#//DatabaseConnection/parameters"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//DatabaseConnection/supportNLS"/>
     </genClasses>
     <genClasses ecoreClass="metadata.ecore#//SAPConnection">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//SAPConnection/Host"/>

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/ConnectionPackage.java

@@ -5238,6 +5238,15 @@ public interface ConnectionPackage extends EPackage {
      */
     int DATABASE_CONNECTION__PARAMETERS = CONNECTION_FEATURE_COUNT + 25;
 
+    /**
+     * The feature id for the '<em><b>Support NLS</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int DATABASE_CONNECTION__SUPPORT_NLS = CONNECTION_FEATURE_COUNT + 26;
+
     /**
      * The number of structural features of the '<em>Database Connection</em>' class.
      * <!-- begin-user-doc --> <!--
@@ -5245,7 +5254,7 @@ public interface ConnectionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DATABASE_CONNECTION_FEATURE_COUNT = CONNECTION_FEATURE_COUNT + 26;
+    int DATABASE_CONNECTION_FEATURE_COUNT = CONNECTION_FEATURE_COUNT + 27;
 
     /**
      * The meta object id for the '{@link org.talend.core.model.metadata.builder.connection.impl.SAPConnectionImpl <em>SAP Connection</em>}' class.
@@ -21887,6 +21896,17 @@ public interface ConnectionPackage extends EPackage {
      */
     EReference getDatabaseConnection_Parameters();
 
+    /**
+     * Returns the meta object for the attribute '{@link org.talend.core.model.metadata.builder.connection.DatabaseConnection#isSupportNLS <em>Support NLS</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Support NLS</em>'.
+     * @see org.talend.core.model.metadata.builder.connection.DatabaseConnection#isSupportNLS()
+     * @see #getDatabaseConnection()
+     * @generated
+     */
+    EAttribute getDatabaseConnection_SupportNLS();
+
     /**
      * Returns the meta object for class '{@link org.talend.core.model.metadata.builder.connection.SAPConnection <em>SAP Connection</em>}'.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -26439,6 +26459,14 @@ public interface ConnectionPackage extends EPackage {
          */
         EReference DATABASE_CONNECTION__PARAMETERS = eINSTANCE.getDatabaseConnection_Parameters();
 
+        /**
+         * The meta object literal for the '<em><b>Support NLS</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute DATABASE_CONNECTION__SUPPORT_NLS = eINSTANCE.getDatabaseConnection_SupportNLS();
+
         /**
          * The meta object literal for the '{@link org.talend.core.model.metadata.builder.connection.impl.SAPConnectionImpl <em>SAP Connection</em>}' class.
          * <!-- begin-user-doc --> <!-- end-user-doc -->

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/DatabaseConnection.java

@@ -755,4 +755,54 @@ public interface DatabaseConnection extends Connection {
      */
     EMap<String, String> getParameters();
 
+    /**
+     * Returns the value of the '<em><b>Support NLS</b></em>' attribute.
+     * The default value is <code>"false"</code>.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Support NLS</em>' attribute.
+     * @see #isSetSupportNLS()
+     * @see #unsetSupportNLS()
+     * @see #setSupportNLS(boolean)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getDatabaseConnection_SupportNLS()
+     * @model default="false" unsettable="true"
+     * @generated
+     */
+    boolean isSupportNLS();
+
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.DatabaseConnection#isSupportNLS <em>Support NLS</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Support NLS</em>' attribute.
+     * @see #isSetSupportNLS()
+     * @see #unsetSupportNLS()
+     * @see #isSupportNLS()
+     * @generated
+     */
+    void setSupportNLS(boolean value);
+
+    /**
+     * Unsets the value of the '{@link org.talend.core.model.metadata.builder.connection.DatabaseConnection#isSupportNLS <em>Support NLS</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #isSetSupportNLS()
+     * @see #isSupportNLS()
+     * @see #setSupportNLS(boolean)
+     * @generated
+     */
+    void unsetSupportNLS();
+
+    /**
+     * Returns whether the value of the '{@link org.talend.core.model.metadata.builder.connection.DatabaseConnection#isSupportNLS <em>Support NLS</em>}' attribute is set.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return whether the value of the '<em>Support NLS</em>' attribute is set.
+     * @see #unsetSupportNLS()
+     * @see #isSupportNLS()
+     * @see #setSupportNLS(boolean)
+     * @generated
+     */
+    boolean isSetSupportNLS();
+
 } // DatabaseConnection

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/impl/ConnectionPackageImpl.java

@@ -1562,6 +1562,15 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
         return (EReference) databaseConnectionEClass.getEStructuralFeatures().get(25);
     }
 
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getDatabaseConnection_SupportNLS() {
+        return (EAttribute) databaseConnectionEClass.getEStructuralFeatures().get(26);
+    }
+
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
@@ -4516,6 +4525,7 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
         createEAttribute(databaseConnectionEClass, DATABASE_CONNECTION__SQL_MODE);
         createEAttribute(databaseConnectionEClass, DATABASE_CONNECTION__UI_SCHEMA);
         createEReference(databaseConnectionEClass, DATABASE_CONNECTION__PARAMETERS);
+        createEAttribute(databaseConnectionEClass, DATABASE_CONNECTION__SUPPORT_NLS);
 
         sapConnectionEClass = createEClass(SAP_CONNECTION);
         createEAttribute(sapConnectionEClass, SAP_CONNECTION__HOST);
@@ -5294,6 +5304,9 @@ public class ConnectionPackageImpl extends EPackageImpl implements ConnectionPac
         initEReference(getDatabaseConnection_Parameters(), this.getAdditionalProperties(), null, "parameters", null, 0, -1,
                 DatabaseConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
                 !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getDatabaseConnection_SupportNLS(), ecorePackage.getEBoolean(), "supportNLS", "false", 0, 1,
+                DatabaseConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+                !IS_DERIVED, IS_ORDERED);
 
         initEClass(sapConnectionEClass, SAPConnection.class, "SAPConnection", !IS_ABSTRACT, !IS_INTERFACE,
                 IS_GENERATED_INSTANCE_CLASS);

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/impl/DatabaseConnectionImpl.java

@@ -51,6 +51,7 @@ import org.talend.core.model.metadata.builder.connection.DatabaseConnection;
  *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.DatabaseConnectionImpl#isSQLMode <em>SQL Mode</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.DatabaseConnectionImpl#getUiSchema <em>Ui Schema</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.DatabaseConnectionImpl#getParameters <em>Parameters</em>}</li>
+ *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.DatabaseConnectionImpl#isSupportNLS <em>Support NLS</em>}</li>
  * </ul>
  *
  * @generated
@@ -563,6 +564,35 @@ public class DatabaseConnectionImpl extends ConnectionImpl implements DatabaseCo
      */
     protected EMap<String, String> parameters;
 
+    /**
+     * The default value of the '{@link #isSupportNLS() <em>Support NLS</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #isSupportNLS()
+     * @generated
+     * @ordered
+     */
+    protected static final boolean SUPPORT_NLS_EDEFAULT = false;
+
+    /**
+     * The cached value of the '{@link #isSupportNLS() <em>Support NLS</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #isSupportNLS()
+     * @generated
+     * @ordered
+     */
+    protected boolean supportNLS = SUPPORT_NLS_EDEFAULT;
+
+    /**
+     * This is true if the Support NLS attribute has been set.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    protected boolean supportNLSESet = true;
+
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
@@ -1173,6 +1203,54 @@ public class DatabaseConnectionImpl extends ConnectionImpl implements DatabaseCo
         return parameters;
     }
 
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public boolean isSupportNLS() {
+        return supportNLS;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setSupportNLS(boolean newSupportNLS) {
+        boolean oldSupportNLS = supportNLS;
+        supportNLS = newSupportNLS;
+        boolean oldSupportNLSESet = supportNLSESet;
+        supportNLSESet = true;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, ConnectionPackage.DATABASE_CONNECTION__SUPPORT_NLS,
+                    oldSupportNLS, supportNLS, !oldSupportNLSESet));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void unsetSupportNLS() {
+        boolean oldSupportNLS = supportNLS;
+        boolean oldSupportNLSESet = supportNLSESet;
+        supportNLS = SUPPORT_NLS_EDEFAULT;
+        supportNLSESet = false;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.UNSET, ConnectionPackage.DATABASE_CONNECTION__SUPPORT_NLS,
+                    oldSupportNLS, SUPPORT_NLS_EDEFAULT, oldSupportNLSESet));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public boolean isSetSupportNLS() {
+        return supportNLSESet;
+    }
+
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
@@ -1267,6 +1345,8 @@ public class DatabaseConnectionImpl extends ConnectionImpl implements DatabaseCo
                 return getParameters();
             else
                 return getParameters().map();
+        case ConnectionPackage.DATABASE_CONNECTION__SUPPORT_NLS:
+            return isSupportNLS();
         }
         return super.eGet(featureID, resolve, coreType);
     }
@@ -1335,6 +1415,8 @@ public class DatabaseConnectionImpl extends ConnectionImpl implements DatabaseCo
                 return getParameters();
             else
                 return getParameters().map();
+        case ConnectionPackage.DATABASE_CONNECTION__SUPPORT_NLS:
+            return isSupportNLS();
         }
         return super.eGet(featureID, resolve, coreType);
     }
@@ -1424,6 +1506,9 @@ public class DatabaseConnectionImpl extends ConnectionImpl implements DatabaseCo
         case ConnectionPackage.DATABASE_CONNECTION__PARAMETERS:
             ((EStructuralFeature.Setting) getParameters()).set(newValue);
             return;
+        case ConnectionPackage.DATABASE_CONNECTION__SUPPORT_NLS:
+            setSupportNLS((Boolean) newValue);
+            return;
         }
         super.eSet(featureID, newValue);
     }
@@ -1513,6 +1598,9 @@ public class DatabaseConnectionImpl extends ConnectionImpl implements DatabaseCo
         case ConnectionPackage.DATABASE_CONNECTION__PARAMETERS:
             getParameters().clear();
             return;
+        case ConnectionPackage.DATABASE_CONNECTION__SUPPORT_NLS:
+            unsetSupportNLS();
+            return;
         }
         super.eUnset(featureID);
     }
@@ -1578,6 +1666,8 @@ public class DatabaseConnectionImpl extends ConnectionImpl implements DatabaseCo
             return UI_SCHEMA_EDEFAULT == null ? uiSchema != null : !UI_SCHEMA_EDEFAULT.equals(uiSchema);
         case ConnectionPackage.DATABASE_CONNECTION__PARAMETERS:
             return parameters != null && !parameters.isEmpty();
+        case ConnectionPackage.DATABASE_CONNECTION__SUPPORT_NLS:
+            return isSetSupportNLS();
         }
         return super.eIsSet(featureID);
     }
@@ -1643,6 +1733,11 @@ public class DatabaseConnectionImpl extends ConnectionImpl implements DatabaseCo
             result.append("<unset>");
         result.append(", UiSchema: ");
         result.append(uiSchema);
+        result.append(", supportNLS: ");
+        if (supportNLSESet)
+            result.append(supportNLS);
+        else
+            result.append("<unset>");
         result.append(')');
         return result.toString();
     }

main/plugins/org.talend.repository.items.importexport.ui/src/main/java/org/talend/repository/items/importexport/ui/wizard/imports/ImportItemsWizardPage.java

@@ -721,6 +721,10 @@ public class ImportItemsWizardPage extends WizardPage {
 
         ImportDependencyRelationsHelper.getInstance().checkImportRelationDependency(checkedNodeList, toSelectSet,
                 nodesBuilder.getAllImportItemNode());
+
+
+        // to make doCheckStateChanged execute from ContainerCheckedTreeViewer.setCheckedElements(Object[])
+        filteredCheckboxTree.getViewer().setCheckedElements(new Object[0]);
         filteredCheckboxTree.getViewer().setCheckedElements(toSelectSet.toArray());
     }
 

main/plugins/org.talend.repository.items.importexport/src/main/java/org/talend/repository/items/importexport/handlers/imports/ImportBasicHandler.java

@@ -23,6 +23,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -51,6 +52,8 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.ecore.xmi.impl.XMLParserPoolImpl;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.runtime.model.repository.ERepositoryStatus;
@@ -1121,6 +1124,13 @@ public class ImportBasicHandler extends AbstractImportExecutableHandler {
             }
             stream = manager.getStream(itemPath, importItem);
             Resource resource = createResource(importItem, itemPath, byteArray);
+            //TUP-36820:Add options for improving performance for deserialization (loading) of large XML resource
+            Map optionMap = new HashMap();
+            optionMap.put(XMLResource.OPTION_DEFER_ATTACHMENT, Boolean.TRUE);
+            optionMap.put(XMLResource.OPTION_DEFER_IDREF_RESOLUTION, Boolean.TRUE);
+            optionMap.put(XMLResource.OPTION_USE_PARSER_POOL, new XMLParserPoolImpl());
+            optionMap.put(XMLResource.OPTION_USE_XML_NAME_TO_FEATURE_MAP, new HashMap());
+            optionMap.put(XMLResource.OPTION_USE_DEPRECATED_METHODS, Boolean.FALSE);
 
             if (byteArray) {
                 // TDI-24612
@@ -1133,16 +1143,16 @@ public class ImportBasicHandler extends AbstractImportExecutableHandler {
                     baos.write(buf, 0, i);
                 }
                 ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-                resource.load(bais, null);
+                resource.load(bais, optionMap);
             } else {
-                resource.load(stream, null);
+                resource.load(stream, optionMap);
             }
 
             for (ReferenceFileItem rfItem : (List<ReferenceFileItem>) item.getReferenceResources()) {
                 itemPath = getReferenceItemPath(importItem.getPath(), rfItem);
                 stream = manager.getStream(itemPath, importItem);
                 Resource rfResource = createResource(importItem, itemPath, true);
-                rfResource.load(stream, null);
+                rfResource.load(stream, optionMap);
             }
 
             Iterator<EObject> itRef = item.eCrossReferences().iterator();

main/plugins/org.talend.repository.items.importexport/src/main/java/org/talend/repository/items/importexport/handlers/imports/ImportDependencyRelationsHelper.java

@@ -132,11 +132,12 @@ public class ImportDependencyRelationsHelper {
                     id = split[1];
                 }
             }
+            boolean isGlobalRoutine = RelationshipItemBuilder.ROUTINE_RELATION.equals(relation.getType());
             if (RelationshipItemBuilder.LATEST_VERSION.equals(relation.getVersion())) {
-                relatedNode = getLatestVersionItemImportNode(id, projectLabel, allImportItemNodesList);
+                relatedNode = getLatestVersionItemImportNode(id, projectLabel, allImportItemNodesList, isGlobalRoutine);
             } else {
-                relatedNode = getItemImportNodeByIdVersion(id, projectLabel, relation.getVersion(),
-                        allImportItemNodesList);
+                relatedNode = getItemImportNodeByIdVersion(id, relation.getVersion(), projectLabel,
+                        allImportItemNodesList, isGlobalRoutine);
             }
             if (relatedNode != null && !toSelectSet.contains(relatedNode)) {
                 // avoid loop
@@ -148,13 +149,14 @@ public class ImportDependencyRelationsHelper {
     }
 
     public ItemImportNode getLatestVersionItemImportNode(String id, String projectTecLabel,
-            List<ItemImportNode> allImportItemNodesList) {
+            List<ItemImportNode> allImportItemNodesList, boolean isGlobalRoutine) {
         List<ItemImportNode> allItemImportNodesById = getItemImportNode(allImportItemNodesList, node -> {
+            Property property = node.getItemRecord().getProperty();
             boolean projectFlag = true;
             if (StringUtils.isNotBlank(projectTecLabel)) {
                 projectFlag = node.getProjectNode().getProject().getTechnicalLabel().equals(projectTecLabel);
             }
-            return node.getItemRecord().getProperty().getId().equals(id) && projectFlag;
+            return (isGlobalRoutine ? property.getLabel().equals(id) : property.getId().equals(id)) && projectFlag;
         });
         Optional<ItemImportNode> optional = allItemImportNodesById.stream().max((node1, node2) -> VersionUtils
                 .compareTo(node1.getItemRecord().getProperty().getVersion(), node2.getItemRecord().getProperty().getVersion()));
@@ -162,14 +164,15 @@ public class ImportDependencyRelationsHelper {
     }
 
     public ItemImportNode getItemImportNodeByIdVersion(String id, String version, String projectTecLabel,
-            List<ItemImportNode> allImportItemNodesList) {
+            List<ItemImportNode> allImportItemNodesList, boolean isGlobalRoutine) {
         List<ItemImportNode> importNodeList = getItemImportNode(allImportItemNodesList, node -> {
             boolean projectFlag = true;
             if (StringUtils.isNotBlank(projectTecLabel)) {
                 projectFlag = node.getProjectNode().getProject().getTechnicalLabel().equals(projectTecLabel);
             }
             Property property = node.getItemRecord().getProperty();
-            return property.getId().equals(id) && property.getVersion().equals(version) && projectFlag;
+            return (isGlobalRoutine ? property.getLabel().equals(id) : property.getId().equals(id))
+                    && property.getVersion().equals(version) && projectFlag;
         });
         return importNodeList == null || importNodeList.isEmpty() ? null : importNodeList.get(0);
     }

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

@@ -1008,6 +1008,8 @@ DatabaseForm.hc.link.repository=Repository
 DatabaseForm.hc.link.title=Hadoop Cluster
 DatabaseForm.helpInfo.installDriverLink.url=https://document-link.us.cloud.talend.com/ts_ig_install-external-modules?version=73&lang=en&env=prd
 DatabaseForm.helpInfo.installDriverLink.label=How to install a driver
+DatabaseForm.supportnls=Support NLS
+DatabaseForm.supportnls.warntip=This setting takes effect only after restarting the Studio.
 DatabaseTableFilterForm.allSynonyms=All synonyms
 DatabaseTableFilterForm.edit=Edit...
 DatabaseTableFilterForm.editFilterName=Edit Filter Name

main/plugins/org.talend.repository.metadata/src/main/java/org/talend/repository/ui/wizards/metadata/connection/database/DatabaseForm.java

@@ -66,6 +66,7 @@ import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Text;
@@ -567,6 +568,8 @@ public class DatabaseForm extends AbstractForm {
 
     private LabelledFileField dataprocPathToCredentialsForHiveTxt;
 
+    private Button isOracleSupportNLS;
+
     /**
      * Constructor to use by a Wizard to create a new database connection.
      *
@@ -684,6 +687,8 @@ public class DatabaseForm extends AbstractForm {
         if (getConnection().getDbVersionString() != null) {
             dbVersionCombo.setText(getConnection().getDbVersionString());
         }
+        
+        isOracleSupportNLS.setSelection(getConnection().isSupportNLS());
 
         fileField.setText(getConnection().getFileFieldName());
         directoryField.setText(getConnection().getDBRootPath());
@@ -859,6 +864,7 @@ public class DatabaseForm extends AbstractForm {
         dbVersionCombo.setReadOnly(isReadOnly());
         datasourceText.setReadOnly(isReadOnly());
         additionParamText.setReadOnly(isReadOnly());
+        isOracleSupportNLS.setEnabled(!isReadOnly());
         fileField.setReadOnly(isReadOnly());
         mappingFileText.setReadOnly(isReadOnly());
         mappingSelectButton.setEnabled(isReadOnly());
@@ -1035,6 +1041,7 @@ public class DatabaseForm extends AbstractForm {
         additionParamText = new LabelledText(typeDbCompositeParent, Messages.getString("DatabaseForm.AddParams"), 2); //$NON-NLS-1$
         additionalJDBCSettingsText = new LabelledText(typeDbCompositeParent,
                 Messages.getString("DatabaseForm.hive.additionalJDBCSettings"), 2); //$NON-NLS-1$
+        createOracleUIForNLS(typeDbCompositeParent);
 
         String[] extensions = { "*.*" }; //$NON-NLS-1$
         fileField = new LabelledFileField(typeDbCompositeParent, Messages.getString("DatabaseForm.mdbFile"), extensions); //$NON-NLS-1$
@@ -1062,6 +1069,38 @@ public class DatabaseForm extends AbstractForm {
         createHivePropertiesFields(typeDbCompositeParent);
     }
 
+    private void createOracleUIForNLS(Composite parent) {
+        supportNLSContainer = new Composite(parent, SWT.NONE);
+        GridData containerLayoutData = new GridData();
+        containerLayoutData.exclude = true;
+        supportNLSContainer.setLayoutData(containerLayoutData);
+        supportNLSContainer.setVisible(false);
+        
+        GridLayout containerLayout = new GridLayout();
+        containerLayout.numColumns = 2;
+        containerLayout.marginWidth = 0;
+        containerLayout.marginHeight = 0;
+        containerLayout.horizontalSpacing = 0;
+        containerLayout.makeColumnsEqualWidth = false;
+        supportNLSContainer.setLayout(containerLayout);
+        
+        isOracleSupportNLS = new Button(supportNLSContainer, SWT.CHECK);
+        isOracleSupportNLS.setText(Messages.getString("DatabaseForm.supportnls"));//$NON-NLS-1$
+        GridData oracleSupportNLSLayoutData = new GridData();
+        isOracleSupportNLS.setLayoutData(oracleSupportNLSLayoutData);
+        isOracleSupportNLS.addSelectionListener(new SelectionAdapter() {
+
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                getConnection().setSupportNLS(isOracleSupportNLS.getSelection());
+            }
+        });
+        imageLabel = new Label(supportNLSContainer, SWT.NONE);
+        imageLabel.setImage(ImageProvider.getImage(EImage.WARNING_ICON));
+        imageLabel.setLayoutData(new GridData());
+        imageLabel.setToolTipText(Messages.getString("DatabaseForm.supportnls.warntip"));
+    }
+    
     private void createHiveDataprocField(Composite parent) {
         dataprocProjectIdForHiveTxt = new LabelledText(parent, Messages.getString("DatabaseForm.dataproc.projectId"), 2);//$NON-NLS-1$
         dataprocClusterIdForHiveTxt = new LabelledText(parent, Messages.getString("DatabaseForm.dataproc.clusterId"), 2); //$NON-NLS-1$
@@ -4464,6 +4503,7 @@ public class DatabaseForm extends AbstractForm {
                     enableDbVersion() ? versionStr : null, metadataconnection.getOtherParameters());
 
             managerConnection.setDbRootPath(directoryField.getText());
+            managerConnection.setSupportNLS(isOracleSupportNLS.getSelection());
 
         }
         IPreferenceStore store = CoreUIPlugin.getDefault().getPreferenceStore();
@@ -5071,6 +5111,10 @@ public class DatabaseForm extends AbstractForm {
 
                         getConnection().setDbVersionString(version.getVersionValue());
 
+                        boolean supportNLSOracleVersion = oracleVersionEnable()
+                                && isSupportNLSOracleVersion(dbVersionCombo.getText());
+                        showOracleSupportNLS(supportNLSOracleVersion, supportNLSOracleVersion);
+                        
                     }
                     urlConnectionStringText.setText(getStringConnection());
                     checkFieldsValue();
@@ -6508,6 +6552,10 @@ public class DatabaseForm extends AbstractForm {
 
     private static String DEFAULT_HIVE_METASTORE_PORT = "9083";
 
+    private Label imageLabel;
+
+    private Composite supportNLSContainer;
+
     /**
      * SetEditable fields.
      *
@@ -6665,6 +6713,7 @@ public class DatabaseForm extends AbstractForm {
             showIfHiveMetastore();
             showIfSupportEncryption();
             showIfAuthentication();
+            showOracleSupportNLS(oracleVersionEnable() && isSupportNLSOracleVersion(dbVersionCombo.getText()), visible);
             hideHiveExecutionFields(!doSupportTez());
 
             urlConnectionStringText.setEditable(!visible);
@@ -6969,6 +7018,34 @@ public class DatabaseForm extends AbstractForm {
         compositeGroupDbSettings.layout();
     }
 
+    private void showOracleSupportNLS(boolean show, boolean editable) {
+        GridData layoutData = (GridData) supportNLSContainer.getLayoutData();
+        layoutData.exclude = !show;
+        supportNLSContainer.setLayoutData(layoutData);
+        supportNLSContainer.setVisible(show);
+        imageLabel.setVisible(show);
+        if(!show) {
+            isOracleSupportNLS.setSelection(false);
+            getConnection().setSupportNLS(false);
+        } else {
+            isOracleSupportNLS.setEnabled(editable);
+        }
+        supportNLSContainer.getParent().layout();
+    }
+    
+    private boolean isSupportNLSOracleVersion(String dbVersionString) {
+        if (!EDatabaseVersion4Drivers.ORACLE_8.getVersionDisplay().equals(dbVersionString) 
+                && !EDatabaseVersion4Drivers.ORACLE_9.getVersionDisplay().equals(dbVersionString) 
+                && !EDatabaseVersion4Drivers.ORACLE_10.getVersionDisplay().equals(dbVersionString)
+                && !EDatabaseVersion4Drivers.ORACLE_11.getVersionDisplay().equals(dbVersionString)
+                && !EDatabaseVersion4Drivers.ORACLE_12.getVersionDisplay().equals(dbVersionString)
+                ) {
+            return true;
+        }
+        
+        return false;
+    }
+
     private void collectContextParams() {
         collectHiveContextParams();
         collectHBaseContextParams();
@@ -7365,6 +7442,7 @@ public class DatabaseForm extends AbstractForm {
 
         jDBCschemaText.setEditable(!isContextMode());
 
+        isOracleSupportNLS.setEnabled(!isContextMode());
         generalMappingFileText.setEditable(!isContextMode());
         mappingFileText.setEditable(!isContextMode());
         if (isContextMode()) {

main/plugins/org.talend.utils/pom_minimal.xml

@@ -60,7 +60,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
-            <version>1.1</version>
+            <version>1.10.0</version>
         </dependency>
 		<dependency>
   			<groupId>org.slf4j</groupId>

main/plugins/org.talend.utils/pom_server.xml

@@ -55,7 +55,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
-            <version>1.1</version>
+            <version>1.10.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>

test/plugins/org.talend.metadata.managment.test/src/org/talend/core/model/metadata/builder/database/manager/dbs/AbstractTest4ExtractManager.java

@@ -36,10 +36,6 @@ import java.util.Properties;
 import java.util.Set;
 
 import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Ignore;
@@ -60,6 +56,7 @@ import org.talend.core.model.metadata.builder.database.manager.ExtractManagerFac
 import org.talend.cwm.relational.RelationalFactory;
 import org.talend.cwm.relational.TdColumn;
 import org.talend.cwm.relational.TdTable;
+
 import orgomg.cwm.objectmodel.core.Feature;
 
 /**
@@ -650,7 +647,7 @@ public class AbstractTest4ExtractManager {
 
         List list = extractMeta.getConnection(metadataConn.getDbType(), metadataConn.getUrl(), metadataConn.getUsername(),
                 metadataConn.getPassword(), metadataConn.getDatabase(), metadataConn.getSchema(), metadataConn.getDriverClass(),
-                metadataConn.getDriverJarPath(), metadataConn.getDbVersionString(), metadataConn.getAdditionalParams());
+                metadataConn.getDriverJarPath(), metadataConn.getDbVersionString(), metadataConn.getAdditionalParams(), metadataConn.isSupportNLS());
         assertTrue(list.size() == 0);
         list.add(conn);
         assertTrue(list.size() != 0);

test/plugins/org.talend.repository.items.importexport.test/src/org/talend/repository/items/importexport/handlers/imports/ImportDependencyRelationsHelperTest.java

@@ -16,6 +16,7 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 
 import org.eclipse.core.resources.IProject;
@@ -41,6 +42,7 @@ import org.talend.core.model.properties.ItemRelations;
 import org.talend.core.model.properties.ProcessItem;
 import org.talend.core.model.properties.PropertiesFactory;
 import org.talend.core.model.properties.Property;
+import org.talend.core.model.properties.RoutineItem;
 import org.talend.core.model.properties.User;
 import org.talend.core.model.properties.impl.PropertiesFactoryImpl;
 import org.talend.core.model.relationship.Relation;
@@ -93,8 +95,10 @@ public class ImportDependencyRelationsHelperTest {
             allImportItemNodesList.add(importNode);
             propertyList.add(property);
         }
+        // test0 --> test1 --> test2
         createRelations(propertyList);
         Property property2 = propertyList.get(2);
+        // label test2 version 0.7
         Property property3 = PropertiesFactory.eINSTANCE.createProperty();
         property3.setId(property2.getId());
         property3.setLabel(property2.getLabel());
@@ -108,6 +112,34 @@ public class ImportDependencyRelationsHelperTest {
         projectNode.addChild(importNode);
         allImportItemNodesList.add(importNode);
         propertyList.add(property3);
+
+        Property routineProperty = PropertiesFactory.eINSTANCE.createProperty();
+        routineProperty.setId(ProxyRepositoryFactory.getInstance().getNextId());
+        routineProperty.setLabel("testRoutine");
+        routineProperty.setVersion("0.1");
+        RoutineItem routineItem = PropertiesFactory.eINSTANCE.createRoutineItem();
+        routineProperty.setItem(routineItem);
+        ImportItem routineItemRecord = new ImportItem(new Path(fakePath + "/" + technicalLabel + "/code/routines"
+                + routineProperty.getLabel() + "_" + routineProperty.getVersion() + ".item"));
+        routineItemRecord.setProperty(routineProperty);
+        ItemImportNode routineImportNode = new ItemImportNode(routineItemRecord);
+        projectNode.addChild(routineImportNode);
+        allImportItemNodesList.add(routineImportNode);
+        propertyList.add(routineProperty);
+        Property routineProperty1 = PropertiesFactory.eINSTANCE.createProperty();
+        routineProperty1.setId(routineProperty.getId());
+        routineProperty1.setLabel("testRoutine");
+        routineProperty1.setVersion("0.7");
+        RoutineItem routineItem1 = PropertiesFactory.eINSTANCE.createRoutineItem();
+        routineProperty1.setItem(routineItem1);
+        ImportItem routineItemRecord1 = new ImportItem(new Path(fakePath + "/" + technicalLabel + "/code/routines"
+                + routineProperty1.getLabel() + "_" + routineProperty1.getVersion() + ".item"));
+        routineItemRecord1.setProperty(routineProperty1);
+        ItemImportNode routineImportNode1 = new ItemImportNode(routineItemRecord1);
+        projectNode.addChild(routineImportNode1);
+        allImportItemNodesList.add(routineImportNode1);
+        propertyList.add(routineProperty1);
+
         ImportCacheHelper.getInstance().getPathWithProjects().put(fakeProjectPath, project.getEmfProject());
     }
 
@@ -131,7 +163,35 @@ public class ImportDependencyRelationsHelperTest {
         helperInstance.checkImportRelationDependency(checkedNodeList, toSelectSet, allImportItemNodesList);
         Assert.assertTrue(toSelectSet.size() == 3);
 
-        // to test loop dependency
+        Map<Relation, Set<Relation>> importItemsRelations = helperInstance.getImportItemsRelations(fakeProjectPath);
+        Property jobProperty = propertyList.get(3);
+        Relation baseRelation = new Relation();
+        baseRelation.setId(jobProperty.getId());
+        baseRelation.setType(RelationshipItemBuilder.JOB_RELATION);
+        baseRelation.setVersion(jobProperty.getVersion());
+        Relation relatedRelation = new Relation();
+        relatedRelation.setId(propertyList.get(4).getLabel());
+        relatedRelation.setType(RelationshipItemBuilder.ROUTINE_RELATION);
+        relatedRelation.setVersion(RelationshipItemBuilder.LATEST_VERSION);
+        Set<Relation> relationSet = new HashSet<Relation>();
+        relationSet.add(relatedRelation);
+        importItemsRelations.put(baseRelation, relationSet);
+        toSelectSet.clear();
+        toSelectSet.add(allImportItemNodesList.get(0));
+        helperInstance.checkImportRelationDependency(checkedNodeList, toSelectSet, allImportItemNodesList);
+        Assert.assertTrue(toSelectSet.size() == 4);
+
+    }
+
+    @Test
+    public void checkImportRelationWithLoopDependency() {
+        helperInstance.clear();
+        helperInstance.loadRelations(fakeProjectPath, project.getEmfProject().getItemsRelations());
+        Set<ItemImportNode> toSelectSet = new HashSet<ItemImportNode>();
+        List<ItemImportNode> checkedNodeList = new ArrayList<ItemImportNode>();
+        checkedNodeList.add(allImportItemNodesList.get(0));
+        toSelectSet.add(allImportItemNodesList.get(0));
+        // to test loop dependency test0 --> test1 --> test2 --> test0
         Map<Relation, Set<Relation>> importItemsRelations = helperInstance.getImportItemsRelations(fakeProjectPath);
         Property property3 = propertyList.get(3);
         Relation baseRelation = new Relation();
@@ -145,20 +205,87 @@ public class ImportDependencyRelationsHelperTest {
         Set<Relation> relationSet = new HashSet<Relation>();
         relationSet.add(relatedRelation);
         importItemsRelations.put(baseRelation, relationSet);
-        toSelectSet.clear();
-        toSelectSet.add(allImportItemNodesList.get(0));
         helperInstance.checkImportRelationDependency(checkedNodeList, toSelectSet, allImportItemNodesList);
         Assert.assertTrue(toSelectSet.size() == 3);
     }
 
+    @Test
+    public void checkImportRelationDependencyWithMultiVersion() {
+        helperInstance.clear();
+        helperInstance.loadRelations(fakeProjectPath, project.getEmfProject().getItemsRelations());
+        Set<ItemImportNode> toSelectSet = new HashSet<ItemImportNode>();
+        List<ItemImportNode> checkedNodeList = new ArrayList<ItemImportNode>();
+
+        // test1 --> test2 latest (0.7)
+        // test1 --> test2 0.1
+        Relation relatedRelation = new Relation();
+        relatedRelation.setId(propertyList.get(3).getId());
+        relatedRelation.setType(RelationshipItemBuilder.JOB_RELATION);
+        relatedRelation.setVersion("0.1");
+
+        Map<Relation, Set<Relation>> importItemsRelations = helperInstance.getImportItemsRelations(fakeProjectPath);
+        String test1_id = propertyList.get(1).getId();
+        Optional<Relation> optional = importItemsRelations.keySet().stream().filter(relation -> relation.getId().equals(test1_id))
+                .findFirst();
+        Assert.assertTrue(optional.isPresent());
+        importItemsRelations.get(optional.get()).add(relatedRelation);
+        checkedNodeList.add(allImportItemNodesList.get(1));
+        toSelectSet.add(allImportItemNodesList.get(1));
+        helperInstance.checkImportRelationDependency(checkedNodeList, toSelectSet, allImportItemNodesList);
+        Assert.assertTrue(toSelectSet.size() == 3);
+
+        toSelectSet.clear();
+        checkedNodeList.add(allImportItemNodesList.get(0));
+        toSelectSet.add(allImportItemNodesList.get(0));
+        helperInstance.checkImportRelationDependency(checkedNodeList, toSelectSet, allImportItemNodesList);
+        Assert.assertTrue(toSelectSet.size() == 4);
+    }
+
+    @Test
+    public void testGetItemImportNodeByIdVersion() {
+        ItemImportNode theVersionNode = helperInstance.getItemImportNodeByIdVersion(propertyList.get(2).getId(), "0.1", null,
+                allImportItemNodesList, false);
+        Property imporRecordProperty = theVersionNode.getItemRecord().getProperty();
+        Property property3 = propertyList.get(3);
+        Assert.assertEquals(property3.getId(), imporRecordProperty.getId());
+        Assert.assertEquals("0.1", imporRecordProperty.getVersion());
+        theVersionNode = helperInstance.getItemImportNodeByIdVersion(propertyList.get(2).getId(), "0.7", null,
+                allImportItemNodesList, false);
+        imporRecordProperty = theVersionNode.getItemRecord().getProperty();
+        Assert.assertEquals(property3.getId(), imporRecordProperty.getId());
+        Assert.assertEquals("0.7", imporRecordProperty.getVersion());
+
+        Property routineProperty = propertyList.get(4);
+        ItemImportNode routineImportNode = helperInstance.getItemImportNodeByIdVersion(routineProperty.getLabel(), "0.1", null,
+                allImportItemNodesList, true);
+        Property routineImportProperty = routineImportNode.getItemRecord().getProperty();
+        Assert.assertEquals(routineProperty.getId(), routineImportProperty.getId());
+        Assert.assertEquals(routineProperty.getLabel(), routineImportProperty.getLabel());
+        Assert.assertEquals("0.1", routineImportProperty.getVersion());
+        routineImportNode = helperInstance.getItemImportNodeByIdVersion(routineProperty.getLabel(), "0.7", null,
+                allImportItemNodesList, true);
+        routineImportProperty = routineImportNode.getItemRecord().getProperty();
+        Assert.assertEquals(routineProperty.getId(), routineImportProperty.getId());
+        Assert.assertEquals(routineProperty.getLabel(), routineImportProperty.getLabel());
+        Assert.assertEquals("0.7", routineImportProperty.getVersion());
+    }
+
     @Test
     public void testGetLatestVersionItemImportNode() {
         ItemImportNode latestVersionNode = helperInstance.getLatestVersionItemImportNode(propertyList.get(2).getId(),
-                null, allImportItemNodesList);
+                null, allImportItemNodesList, false);
         Property latestVersionProperty = latestVersionNode.getItemRecord().getProperty();
         Property property3 = propertyList.get(3);
         Assert.assertEquals(latestVersionProperty.getId(), property3.getId());
         Assert.assertEquals(latestVersionProperty.getVersion(), property3.getVersion());
+
+        ItemImportNode latestRoutineNode = helperInstance.getLatestVersionItemImportNode(propertyList.get(4).getLabel(), null,
+                allImportItemNodesList, true);
+        Property latestRoutineProperty = latestRoutineNode.getItemRecord().getProperty();
+        Property property5 = propertyList.get(5);
+        Assert.assertEquals(latestRoutineProperty.getId(), property5.getId());
+        Assert.assertEquals(latestRoutineProperty.getLabel(), property5.getLabel());
+        Assert.assertEquals(latestRoutineProperty.getVersion(), property5.getVersion());
     }
 
     private void createRelations(List<Property> propertyList) {

test/plugins/org.talend.repository.metadata.test/META-INF/MANIFEST.MF

@@ -5,3 +5,4 @@ Bundle-SymbolicName: org.talend.repository.metadata.test
 Bundle-Version: 7.3.1.qualifier
 Fragment-Host: org.talend.repository.metadata
 Require-Bundle: org.talend.testutils
+Import-Package: org.apache.commons.io

test/plugins/org.talend.repository.metadata.test/src/org/talend/repository/ui/wizards/metadata/table/database/ConnectionUUIDHelperTest.java

@@ -21,8 +21,10 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.Set;
 
+import org.apache.commons.io.FileUtils;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.emf.common.util.URI;
@@ -42,6 +44,7 @@ import org.talend.cwm.helper.ConnectionHelper;
 import org.talend.cwm.helper.PackageHelper;
 import org.talend.model.emf.CwmResource;
 import org.talend.utils.io.FilesUtils;
+
 import orgomg.cwm.objectmodel.core.Package;
 
 /**
@@ -170,7 +173,7 @@ public class ConnectionUUIDHelperTest {
 
         File testDataFile = getTestDataFile(TEST_DB_MYSQL_ITEM);
         assertNotNull(testDataFile);
-        assertEquals(FilesUtils.getChecksumAlder32(testDataFile), FilesUtils.getChecksumAlder32(copiedFile));
+        FileUtils.contentEqualsIgnoreEOL(testDataFile, copiedFile, StandardCharsets.UTF_8.toString());
     }
 
     @Test
@@ -196,7 +199,7 @@ public class ConnectionUUIDHelperTest {
 
         File testRemovedTableFile = getTestDataFile(TEST_DB_MYSQL_REMOVE_TABLE_ITEM);
         assertNotNull(testRemovedTableFile);
-        assertEquals(FilesUtils.getChecksumAlder32(testRemovedTableFile), FilesUtils.getChecksumAlder32(removedFile));
+        FileUtils.contentEqualsIgnoreEOL(testRemovedTableFile, removedFile, StandardCharsets.UTF_8.toString());
     }
 
     @Test
@@ -219,7 +222,7 @@ public class ConnectionUUIDHelperTest {
         originalItemResourse.save(changedFos, null);
 
         File testDataFile = getTestDataFile(TEST_DB_MYSQL_DIFF_LABEL_ITEM);
-        assertEquals(FilesUtils.getChecksumAlder32(testDataFile), FilesUtils.getChecksumAlder32(changedFile));
+        FileUtils.contentEqualsIgnoreEOL(testDataFile, changedFile, StandardCharsets.UTF_8.toString());
     }
 
 }