chore: support to export item

fix(TDQ-19700): fix the bug about second time switch change original value(#5597 )
feat(TBD-13647): allow switch from transient to interactive cluster (#5424 ) (#5586 )
2022-09-19 00:42:07 +08:00 · 2022-09-15 12:19:06 +08:00 · 2022-09-13 08:38:38 +02:00 · 2022-09-13 10:49:07 +08:00 · 2022-09-09 17:25:01 +08:00 · 2022-09-09 15:13:50 +08:00
495 changed files with 11849 additions and 3602 deletions
--- a/main/features/org.talend.commons.feature/feature.xml
+++ b/main/features/org.talend.commons.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.commons.feature" label="Commons Feature" version="8.0.1.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.commons.feature" label="Commons Feature" version="8.8.8.qualifier" provider-name=".Talend SA."> 
  <description url="http://www.talend.com/online/featuresdescription.html#commons-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#commons-feature</description>  
  <copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>  
  <license>The licence are describe in branding feature</license>  
--- a/main/features/org.talend.commons.feature/pom.xml
+++ b/main/features/org.talend.commons.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.commons.feature</artifactId>
--- a/main/features/org.talend.core.feature/feature.xml
+++ b/main/features/org.talend.core.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.core.feature" label="Core Feature" version="8.0.1.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.core.feature" label="Core Feature" version="8.8.8.qualifier" provider-name=".Talend SA."> 
  <description url="http://www.talend.com/online/featuresdescription.html#core-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#core-feature</description>  
  <copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>  
  <license>The licence are describe in branding feature</license>  
--- a/main/features/org.talend.core.feature/pom.xml
+++ b/main/features/org.talend.core.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.core.feature</artifactId>
--- a/main/features/org.talend.fragment.jars.common.feature/feature.xml
+++ b/main/features/org.talend.fragment.jars.common.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.fragment.jars.common.feature"
      label="Fragment Jars in Common"
-      version="8.0.1.qualifier">
+      version="8.8.8.qualifier">

   <description url="http://www.example.com/description">
      [Enter Feature Description here.]
--- a/main/features/org.talend.fragment.jars.common.feature/pom.xml
+++ b/main/features/org.talend.fragment.jars.common.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.fragment.jars.common.feature</artifactId>
--- a/main/features/org.talend.help.feature/feature.xml
+++ b/main/features/org.talend.help.feature/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.talend.help.feature" label="Help Feature" version="8.0.1.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.help.feature" label="Help Feature" version="8.8.8.qualifier" provider-name=".Talend SA."> 
  <description url="http://www.talend.com/online/featuresdescription.html#help-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#help-feature</description>  
  <copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>  
  <license>The licence are describe in branding feature</license>  
--- a/main/features/org.talend.help.feature/pom.xml
+++ b/main/features/org.talend.help.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.help.feature</artifactId>
--- a/main/features/org.talend.libraries.jdbc.feature/feature.xml
+++ b/main/features/org.talend.libraries.jdbc.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.libraries.jdbc.feature" label="Jdbc_feature Feature" version="8.0.1.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.libraries.jdbc.feature" label="Jdbc_feature Feature" version="8.8.8.qualifier" provider-name=".Talend SA."> 
  <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
  <license url="http://www.example.com/license">[Enter License Description here.]</license>  
--- a/main/features/org.talend.libraries.jdbc.feature/pom.xml
+++ b/main/features/org.talend.libraries.jdbc.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.libraries.jdbc.feature</artifactId>
--- a/main/features/org.talend.platform.feature/feature.xml
+++ b/main/features/org.talend.platform.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.platform.feature"
      label="Platform featrue"
-      version="8.0.1.qualifier"
+      version="8.8.8.qualifier"
      provider-name=".Talend SA.">

   <description url="http://www.talend.com/online/featuresdescription.html#platform-feature">
--- a/main/features/org.talend.platform.feature/pom.xml
+++ b/main/features/org.talend.platform.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.platform.feature</artifactId>
--- a/main/features/org.talend.rcp.feature/feature.xml
+++ b/main/features/org.talend.rcp.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.rcp.feature"
      label="RCP Feature"
-      version="8.0.1.qualifier"
+      version="8.8.8.qualifier"
      provider-name=".Talend SA.">

   <description url="http://www.talend.com/online/featuresdescription.html#rcp-feature">
--- a/main/features/org.talend.rcp.feature/pom.xml
+++ b/main/features/org.talend.rcp.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.rcp.feature</artifactId>
--- a/main/features/org.talend.update.p2.feature/feature.xml
+++ b/main/features/org.talend.update.p2.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.update.p2.feature" label="P2-feature" version="8.0.1.qualifier"> 
+<feature id="org.talend.update.p2.feature" label="P2-feature" version="8.8.8.qualifier"> 
  <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
  <license url="http://www.example.com/license">[Enter License Description here.]</license>  
--- a/main/features/org.talend.update.p2.feature/pom.xml
+++ b/main/features/org.talend.update.p2.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.update.p2.feature</artifactId>
--- a/main/features/org.talend.updates.feature/feature.xml
+++ b/main/features/org.talend.updates.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.updates.feature" label="Updates-feature" version="8.0.1.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.updates.feature" label="Updates-feature" version="8.8.8.qualifier" provider-name=".Talend SA."> 
  <copyright url="http://www.talend.com/about-us">[Enter Copyright Description here.]</copyright>  
  <plugin id="org.talend.updates.runtime" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 </feature>
--- a/main/features/org.talend.updates.feature/pom.xml
+++ b/main/features/org.talend.updates.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.updates.feature</artifactId>
--- a/main/features/org.talend.utils.feature/feature.xml
+++ b/main/features/org.talend.utils.feature/feature.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.utils.feature" label="Utils_feature Feature" version="8.0.1.qualifier"> 
+<feature id="org.talend.utils.feature" label="Utils_feature Feature" version="8.8.8.qualifier"> 
  <description url="http://www.example.com/description">This feature contains the Talend utilities plugin and its dependencies.</description>  
  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
  <license url="http://www.example.com/license">[Enter License Description here.]</license>  
  <requires>
-    <import plugin="org.bouncycastle.bcprov" version="1.69.0" match="greaterOrEqual"/>
+    <import plugin="org.bouncycastle.bcprov" version="1.70.0" match="greaterOrEqual"/>
    <import plugin="com.cedarsoftware.json-io" version="0.0.0" match="greaterOrEqual"/>
    <import plugin="com.fasterxml.jackson.core.jackson-annotations" version="2.9.0" match="greaterOrEqual"/>
    <import plugin="com.fasterxml.jackson.core.jackson-core" version="2.9.8" match="greaterOrEqual"/>
@@ -21,11 +21,11 @@
    <import plugin="org.junit" version="4.13.2" match="greaterOrEqual"/>
    <import plugin="org.slf4j.api" version="0.0.0" match="greaterOrEqual"/>
    <import plugin="org.slf4j.binding.log4j12" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.talend.studio.studio-utils" version="0.0.0" match="greaterOrEqual"/>
  </requires>  
  <plugin id="org.talend.daikon" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
  <plugin id="org.talend.daikon.exception" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
  <plugin id="org.talend.daikon.crypto.utils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.studio.studio-utils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
  <plugin id="org.talend.utils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
  <plugin id="org.talend.platform.logging" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 </feature>
--- a/main/features/org.talend.utils.feature/pom.xml
+++ b/main/features/org.talend.utils.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.utils.feature</artifactId>
--- a/main/plugins/org.talend.common.ui.runtime/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.common.ui.runtime/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common UI runtime Plug-in
 Bundle-SymbolicName: org.talend.common.ui.runtime;singleton:=true
-Bundle-Version: 8.0.1.qualifier
+Bundle-Version: 8.8.8.qualifier
 Require-Bundle: org.eclipse.core.runtime,
 org.apache.commons.collections,
 org.talend.libraries.dom4j-jaxen,
--- a/main/plugins/org.talend.common.ui.runtime/icons/help.png
+++ b/main/plugins/org.talend.common.ui.runtime/icons/help.png
--- a/main/plugins/org.talend.common.ui.runtime/icons/question.gif
+++ b/main/plugins/org.talend.common.ui.runtime/icons/question.gif
--- a/main/plugins/org.talend.common.ui.runtime/pom.xml
+++ b/main/plugins/org.talend.common.ui.runtime/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.common.ui.runtime</artifactId>
--- a/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/i18n/messages_ja.properties
+++ b/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/i18n/messages_ja.properties
@@ -121,7 +121,7 @@ ModelSelectionDialog.BuiltIn=\u7D44\u307F\u8FBC\u307F\u30D7\u30ED\u30D1\u30C6\u3
 ModelSelectionDialog.ViewSchema=\u30B9\u30AD\u30FC\u30DE\u3092\u8868\u793A\u3057\u307E\u3059(\u8AAD\u307F\u53D6\u308A\u5C02\u7528)\u3002
 ModelSelectionDialog.newViewSchema=\u30B9\u30AD\u30FC\u30DE\u3092\u8868\u793A
 ModelSelectionDialog.ViewQuery=\u30AF\u30A8\u30EA\u30FC\u3046\u3092\u8868\u793A\u3057\u307E\u3059(\u8AAD\u307F\u53D6\u308A\u5C02\u7528)\u3002
-ModelSelectionDialog.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u63A5\u7D9A\u3092\u66F4\u65B0\u3057\u307E\u3059\u3002
+ModelSelectionDialog.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u63A5\u7D9A\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059\u3002
 SSLConfirmDialog.KeyStore=KeyStore\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
 SSLConfirmDialog.TrustStore=TrustStore\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
 SSLConfirmDialog.Password=\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
--- a/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/image/EImage.java
+++ b/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/image/EImage.java
@@ -39,6 +39,10 @@ public enum EImage implements IImage {
    EDIT_ICON("/icons/write_obj.gif"), //$NON-NLS-1$
    READ_ICON("/icons/read_obj.gif"), //$NON-NLS-1$

+    QUESTION_ICON("/icons/question.gif"), //$NON-NLS-1$
+
+    HELP_ICON("/icons/help.png"), //$NON-NLS-1$
+
    CREATE_CONNECTION_ICON("/icons/connection.gif"), //$NON-NLS-1$

    RESET_DBTYPES_ICON("/icons/reset_dbtypes.jpg"), //$NON-NLS-1$
--- a/main/plugins/org.talend.commons.runtime/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.commons.runtime/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common Runtime Plug-in
 Bundle-SymbolicName: org.talend.commons.runtime;singleton:=true
-Bundle-Version: 8.0.1.qualifier
+Bundle-Version: 8.8.8.qualifier
 Require-Bundle: org.apache.log4j;visibility:=reexport,
 org.apache.commons.commons-beanutils,
 org.apache.commons.collections,
--- a/main/plugins/org.talend.commons.runtime/pom.xml
+++ b/main/plugins/org.talend.commons.runtime/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.commons.runtime</artifactId>
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/CommonsPlugin.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/CommonsPlugin.java
@@ -58,10 +58,14 @@ public class CommonsPlugin implements BundleActivator {
    // TESB-17856: For commandline builds ESB Micorservice bundle
    private static boolean isESBMicorservice = false;

+    private static Boolean isJunitWorking;
+
    private static Boolean isDevMode = null;

    private static ServiceTracker proxyTracker;

+    private static Boolean isDebugP2 = null;
+
    public static boolean isWorkbenchCreated() {
        return isWorkbenchCreated;
    }
@@ -124,6 +128,17 @@ public class CommonsPlugin implements BundleActivator {
        }
    }

+    public static boolean isDebugP2() {
+        try {
+            if (isDebugP2 == null) {
+                isDebugP2 = Boolean.getBoolean("talend.studio.lite.p2.debug");
+            }
+            return isDebugP2;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
    public static boolean isDebugMode() {
        return Boolean.getBoolean("talendDebug") //$NON-NLS-1$
                || ArrayUtils.contains(Platform.getApplicationArgs(), TalendDebugHandler.TALEND_DEBUG);
@@ -137,6 +152,35 @@ public class CommonsPlugin implements BundleActivator {
        return "org.talend.rcp.branding.tuj.product".equals(Platform.getProduct().getId()); //$NON-NLS-1$
    }

+    public static boolean isJunitWorking() {
+        if (isJunitWorking == null) {
+            try {
+                String[] args = Platform.getCommandLineArgs();
+                String applicationId = null;
+
+                for (int i = 0; i < args.length - 1; i++) {
+                    if (args[i].equalsIgnoreCase("-application")) { //$NON-NLS-1$
+                        applicationId = args[i + 1];
+                    }
+                }
+
+                if (applicationId != null
+                        && (applicationId.equals("org.eclipse.swtbot.eclipse.junit.headless.swtbottestapplication") //$NON-NLS-1$
+                                || applicationId.equals("org.eclipse.pde.junit.runtime.uitestapplication"))) { //$NON-NLS-1$
+                    isJunitWorking = true;
+                } else {
+                    isJunitWorking = false;
+                }
+            } catch (Throwable e) {
+                isJunitWorking = false;
+            }
+        }
+        if (isJunitWorking == null) {
+            isJunitWorking = false;
+        }
+        return isJunitWorking;
+    }
+
    /**
     * Answer the file associated with name. This handles the case of running as a plugin and running standalone which
     * happens during testing.
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/exception/CommonExceptionHandler.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/exception/CommonExceptionHandler.java
@@ -52,6 +52,10 @@ public final class CommonExceptionHandler {
        log.log(Level.WARN, message);
    }

+    public static void error(String message) {
+        log.log(Level.ERROR, message);
+    }
+
    /**
     * Return priority corresponding to the exception implementation.
     *
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/runtime/service/ITaCoKitService.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/runtime/service/ITaCoKitService.java
@@ -46,6 +46,12 @@ public interface ITaCoKitService {

    boolean isTaCoKitType(Object repoType);

+    Object getDatastoreFromDataset(Object repositoryViewObject);
+
+    String getParentItemIdFromItem(Object Item);
+
+    boolean isValueSelectionParameter(Object parameter);
+
    public static ITaCoKitService getInstance() {
        BundleContext bc = FrameworkUtil.getBundle(ITaCoKitService.class).getBundleContext();
        Collection<ServiceReference<ITaCoKitService>> tacokitServices = Collections.emptyList();
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/network/ITalendNexusPrefConstants.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/network/ITalendNexusPrefConstants.java
@@ -1,18 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.commons.utils.network;
-
-public interface ITalendNexusPrefConstants {
-
-    public static final String NEXUS_TIMEOUT = "NEXUS_TIMEOUT"; //$NON-NLS-1$
-}
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/network/NetworkUtil.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/network/NetworkUtil.java
@@ -55,6 +55,11 @@ public class NetworkUtil {
    private static final int DEFAULT_NEXUS_TIMEOUT = 20000;// same as preference value

    public static final String ORG_TALEND_DESIGNER_CORE = "org.talend.designer.core"; //$NON-NLS-1$
+    
+    /*
+     * see ITalendCorePrefConstants.PERFORMANCE_TAC_READ_TIMEOUT
+     */
+    private static final String PERFORMANCE_TAC_READ_TIMEOUT = "PERFORMANCE_TAC_READ_TIMEOUT"; //$NON-NLS-1$

    private static final String PROP_DISABLEDSCHEMES_USE_DEFAULT = "talend.studio.jdk.http.auth.tunneling.disabledSchemes.useDefault";

@@ -149,10 +154,10 @@ public class NetworkUtil {
    }

    public static int getNexusTimeout() {
-        int timeout = DEFAULT_NEXUS_TIMEOUT;
+        int timeout = Integer.getInteger("nexus.timeout.min", DEFAULT_NEXUS_TIMEOUT);
        try {
            IEclipsePreferences node = InstanceScope.INSTANCE.getNode(ORG_TALEND_DESIGNER_CORE);
-            timeout = node.getInt(ITalendNexusPrefConstants.NEXUS_TIMEOUT, DEFAULT_NEXUS_TIMEOUT);
+            timeout = Math.max(timeout, node.getInt(PERFORMANCE_TAC_READ_TIMEOUT, 0) * 1000);
        } catch (Throwable e) {
            ExceptionHandler.process(e);
        }
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/system/EclipseCommandLine.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/system/EclipseCommandLine.java
@@ -88,6 +88,8 @@ public class EclipseCommandLine {
    static public final String TALEND_CONTINUE_LOGON = "-talendContinueLogon";

    static public final String TALEND_CONTINUE_UPDATE = "-talendContinueUpdate";
+    
+    static public final String TALEND_CLEAN_M2 = "-talendCleanM2";

    static public final String TALEND_CLEAN_UNINSTALLED_BUNDLES = "-talendCleanUninstalledBundles";

--- a/main/plugins/org.talend.commons.runtime/talend.properties
+++ b/main/plugins/org.talend.commons.runtime/talend.properties
@@ -1 +1 @@
-talend.version=8.0.1
+talend.version=8.8.8
--- a/main/plugins/org.talend.commons.ui/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.commons.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common UI Plug-in
 Bundle-SymbolicName: org.talend.commons.ui;singleton:=true
-Bundle-Version: 8.0.1.qualifier
+Bundle-Version: 8.8.8.qualifier
 Require-Bundle: org.eclipse.core.runtime,
 org.eclipse.core.resources,
 org.eclipse.jface.text,
--- a/main/plugins/org.talend.commons.ui/pom.xml
+++ b/main/plugins/org.talend.commons.ui/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.commons.ui</artifactId>
--- a/main/plugins/org.talend.commons.ui/src/main/java/messages_ja.properties
+++ b/main/plugins/org.talend.commons.ui/src/main/java/messages_ja.properties
@@ -116,7 +116,7 @@ ModelSelectionDialog.Option=\u30AA\u30D7\u30B7\u30E7\u30F3
 ModelSelectionDialog.BuiltIn=\u7D44\u307F\u8FBC\u307F\u30D7\u30ED\u30D1\u30C6\u30A3\u306B\u5909\u66F4\u3057\u307E\u3059\u3002
 ModelSelectionDialog.ViewSchema=\u30B9\u30AD\u30FC\u30DE\u3092\u8868\u793A\u3057\u307E\u3059(\u8AAD\u307F\u53D6\u308A\u5C02\u7528)\u3002
 ModelSelectionDialog.ViewQuery=\u30AF\u30A8\u30EA\u30FC\u3046\u3092\u8868\u793A\u3057\u307E\u3059(\u8AAD\u307F\u53D6\u308A\u5C02\u7528)\u3002
-ModelSelectionDialog.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u63A5\u7D9A\u3092\u66F4\u65B0\u3057\u307E\u3059\u3002
+ModelSelectionDialog.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u63A5\u7D9A\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059\u3002
 FileStep2.previewFailure=\u30D7\u30EC\u30D3\u30E5\u30FC\u30A8\u30E9\u30FC\u3002\u4E00\u90E8\u306E\u8A2D\u5B9A\u3092\u5909\u66F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n\u6CE8: \u30D7\u30EC\u30D3\u30E5\u30FC\u30A8\u30E9\u30FC\u306F\u4E00\u822C\u7684\u306B\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u8A2D\u5B9A\u306E\u8AA4\u308A\u304C\u539F\u56E0\u3067\u3059\u3002
 StateComposite.FLL_DB_INFOR=DB\u60C5\u5831\u3092\u5165\u529B
 StateComposite.HELP_MESSAGE=\u30D8\u30EB\u30D7\u30E1\u30C3\u30BB\u30FC\u30B8
--- a/main/plugins/org.talend.core.repository/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.core.repository/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.talend.core.repository
 Bundle-ManifestVersion: 2
 Bundle-Name: Core Repository Plug-in
 Bundle-SymbolicName: org.talend.core.repository;singleton:=true
-Bundle-Version: 8.0.1.qualifier
+Bundle-Version: 8.8.8.qualifier
 Require-Bundle: org.eclipse.ui,
 org.eclipse.ui.ide,
 org.apache.commons.collections,
@@ -15,6 +15,7 @@ Require-Bundle: org.eclipse.ui,
 org.talend.libraries.apache,
 org.eclipse.osgi.services,
 org.eclipse.ui.navigator,
+ org.eclipse.e4.ui.css.swt.theme,
 org.talend.libraries.jackson
 Export-Package: org.talend.core.repository,
 org.talend.core.repository.constants,
--- a/main/plugins/org.talend.core.repository/pom.xml
+++ b/main/plugins/org.talend.core.repository/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.core.repository</artifactId>
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/constants/Constant.java
+++ b/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/constants/Constant.java
@@ -39,6 +39,18 @@ public final class Constant {
     */
    public static final String ITEM_EVENT_PROPERTY_KEY = "item"; //$NON-NLS-1$

+    /**
+     * key used to get/set the property of an event related to an item (REPOSITORY_ITEM_EVENT_PREFIX). The value is the
+     * cloudVersion string.
+     */
+    public static final String VERSION_EVENT_CLOUD_KEY = "cloudVersion"; //$NON-NLS-1$
+
+    /**
+     * key used to get/set the property of an event related to an item (REPOSITORY_ITEM_EVENT_PREFIX). The value is the
+     * cloudName string.
+     */
+    public static final String VERSION_EVENT_CLOUD_NAME = "cloudName"; //$NON-NLS-1$
+
    /**
     * key used to get/set the property of an event related to a list of files modified in the repository
     * (REPOSITORY_ITEM_EVENT_PREFIX). The value is the Collection of String (list of all files modified).
@@ -62,4 +74,9 @@ public final class Constant {
     * (REPOSITORY_ITEM_EVENT_PREFIX). The value is the Collection of String (list of all files modified).
     */
    public static final String PROJECT_RELOAD_PROPERTY_KEY = "project"; //$NON-NLS-1$
+    
+    /**
+     * suffix used when issuing an event on the OSGI event bus when published to cloud.
+     */
+    public static final String CLOUD_PUBLISH_EVENT_SUFFIX = "cloud"; //$NON-NLS-1$
 }
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages_fr.properties
+++ b/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages_fr.properties
@@ -168,7 +168,8 @@ ProjectRepositoryNode.sapFunctions.inputSchema=Lecture
 ProjectRepositoryNode.sapFunctions.outputSchema=Sortie
 ProjectRepositoryNode.sapIDocs=SAP IDoc
 ProjectRepositoryNode.sapTables=Tables SAP
-ProjectRepositoryNode.sapBWAdvancedDataStoreObject=ADSO SAP
+ProjectRepositoryNode.sapBWAdvancedDataStoreObject.input=SAP ADSO (Entr\u00E9e) 
+ProjectRepositoryNode.sapBWAdvancedDataStoreObject.output=SAP ADSO (Sortie)
 ProjectRepositoryNode.sapBWDataSource=Source des donn\u00E9es SAP
 ProjectRepositoryNode.sapBWDataStoreObject=Objet Data Store SAP
 ProjectRepositoryNode.sapBWInfoCube=InfoCube SAP
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages_ja.properties
+++ b/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages_ja.properties
@@ -168,7 +168,8 @@ ProjectRepositoryNode.sapFunctions.inputSchema=\u5165\u529B
 ProjectRepositoryNode.sapFunctions.outputSchema=\u51FA\u529B
 ProjectRepositoryNode.sapIDocs=SAP iDocs
 ProjectRepositoryNode.sapTables=SAP\u30C6\u30FC\u30D6\u30EB
-ProjectRepositoryNode.sapBWAdvancedDataStoreObject=SAP ADSO
+ProjectRepositoryNode.sapBWAdvancedDataStoreObject.input=SAP ADSO (\u5165\u529B) 
+ProjectRepositoryNode.sapBWAdvancedDataStoreObject.output=SAP ADSO (\u51FA\u529B)
 ProjectRepositoryNode.sapBWDataSource=SAP DataSource
 ProjectRepositoryNode.sapBWDataStoreObject=SAP DSO
 ProjectRepositoryNode.sapBWInfoCube=SAP InfoCube
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages_zh_CN.properties
+++ b/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages_zh_CN.properties
@@ -168,7 +168,8 @@ ProjectRepositoryNode.sapFunctions.inputSchema=\u8F93\u5165
 ProjectRepositoryNode.sapFunctions.outputSchema=\u8F93\u51FA
 ProjectRepositoryNode.sapIDocs=SAP iDocs
 ProjectRepositoryNode.sapTables=SAP \u8868
-ProjectRepositoryNode.sapBWAdvancedDataStoreObject=SAP ADSO
+ProjectRepositoryNode.sapBWAdvancedDataStoreObject.input=SAP ADSO (\u8F93\u5165) 
+ProjectRepositoryNode.sapBWAdvancedDataStoreObject.output=SAP ADSO (\u8F93\u51FA)
 ProjectRepositoryNode.sapBWDataSource=SAP DataSource
 ProjectRepositoryNode.sapBWDataStoreObject=SAP DSO
 ProjectRepositoryNode.sapBWInfoCube=SAP InfoCube
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/PendoItemSignatureManager.java
+++ b/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/PendoItemSignatureManager.java
@@ -0,0 +1,280 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.repository.model;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Level;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.talend.commons.exception.ExceptionHandler;
+import org.talend.core.ICoreService;
+import org.talend.core.PluginChecker;
+import org.talend.core.model.properties.Property;
+import org.talend.core.model.properties.RoutineItem;
+import org.talend.core.model.properties.SQLPatternItem;
+import org.talend.core.model.repository.ERepositoryObjectType;
+import org.talend.core.model.repository.IRepositoryViewObject;
+import org.talend.core.pendo.PendoItemSignatureUtil;
+import org.talend.core.pendo.PendoItemSignatureUtil.SignatureStatus;
+import org.talend.core.pendo.PendoItemSignatureUtil.TOSProdNameEnum;
+import org.talend.core.pendo.PendoItemSignatureUtil.ValueEnum;
+import org.talend.core.pendo.PendoTrackDataUtil;
+import org.talend.core.pendo.PendoTrackDataUtil.TrackEvent;
+import org.talend.core.pendo.PendoTrackSender;
+import org.talend.core.pendo.properties.PendoSignLogonProperties;
+import org.talend.utils.migration.MigrationTokenUtil;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class PendoItemSignatureManager {
+
+    private PendoSignLogonProperties itemSignProperties = new PendoSignLogonProperties();
+
+    private static PendoItemSignatureManager manager;
+
+    private static boolean isTrackAvailable;
+
+    static {
+        manager = new PendoItemSignatureManager();
+        try {
+            isTrackAvailable = PluginChecker.isTIS() && PendoTrackSender.getInstance().isTrackSendAvailable();
+        } catch (Exception e) {
+            ExceptionHandler.process(e, Level.WARN);
+        }
+    }
+
+    private PendoItemSignatureManager() {
+    }
+
+    public static PendoItemSignatureManager getInstance() {
+        return manager;
+    }
+
+    private Set<String> signByLoginMigrationItems = new HashSet<String>();
+
+    public void countItemSignByMigration(String file) {
+        if (!isTrackAvailable) {
+            return;
+        }
+        if (!ProxyRepositoryFactory.getInstance().isFullLogonFinished()) {
+            signByLoginMigrationItems.add(file);
+        }
+    }
+
+    public void collectProperties() {
+        ICoreService coreService = ICoreService.get();
+        if (coreService == null || !isTrackAvailable) {
+            return;
+        }
+        try {
+            itemSignProperties.setSignByMigration(signByLoginMigrationItems.size());
+
+            String seperator = "@";
+            Map<String, Integer> tosUnsignItemMap = new HashMap<String, Integer>();
+            Map<String, Integer> invalidItemVersionMap = new HashMap<String, Integer>();
+            Set<String> checkedItem = new HashSet<String>();
+            ProxyRepositoryFactory proxyRepositoryFactory = ProxyRepositoryFactory.getInstance();
+            ERepositoryObjectType[] types = (ERepositoryObjectType[]) ERepositoryObjectType.values();
+            for (ERepositoryObjectType type : types) {
+                List<IRepositoryViewObject> allObjectList = proxyRepositoryFactory.getAll(type);
+                for (IRepositoryViewObject repositoryObject : allObjectList) {
+                    Property property = repositoryObject.getProperty();
+                    if (property == null || property.eResource() == null) {
+                        continue;
+                    }
+                    String itemKey = repositoryObject.getRepositoryObjectType() + seperator + property.getId() + seperator
+                            + property.getVersion();
+                    if (isBuiltInItem(repositoryObject) || checkedItem.contains(itemKey)) {
+                        continue;
+                    }
+                    checkedItem.add(itemKey);
+                    Integer verifyResult = null;
+                    try {
+                        verifyResult = coreService.getSignatureVerifyResult(property, null, false);
+                        if (verifyResult != null) {
+                            switch (verifyResult) {
+                            case SignatureStatus.V_VALID:
+                                itemSignProperties.setValidItems(itemSignProperties.getValidItems() + 1);
+                                break;
+                            case SignatureStatus.V_UNSIGNED:
+                                String itemProductName = PendoItemSignatureUtil
+                                        .getItemProductName(property);
+                                if (StringUtils.isNotBlank(itemProductName)) {
+                                    String tosCategory = TOSProdNameEnum.getTOSCategoryByProdName(itemProductName);
+                                    if (StringUtils.isBlank(tosCategory)) {
+                                        itemSignProperties.setUnsignEEItems(itemSignProperties.getUnsignEEItems() + 1);
+                                    } else {
+                                        if (tosUnsignItemMap.get(tosCategory) == null) {
+                                            tosUnsignItemMap.put(tosCategory, 0);
+                                        }
+                                        tosUnsignItemMap.put(tosCategory, tosUnsignItemMap.get(tosCategory) + 1);
+                                    }
+                                }
+                                addInvalidItemVersion(property, invalidItemVersionMap);
+                                break;
+                            default:
+                                addInvalidItemVersion(property, invalidItemVersionMap);
+                                itemSignProperties.setInvalidSignItems(itemSignProperties.getInvalidSignItems() + 1);
+                            }
+
+                        }
+                    } catch (Exception e) {
+                        ExceptionHandler.process(e, Level.WARN);
+                        if (verifyResult == null) {
+                            // exception during verify
+                            addInvalidItemVersion(property, invalidItemVersionMap);
+                            itemSignProperties.setInvalidSignItems(itemSignProperties.getInvalidSignItems() + 1);
+                        }
+                    }
+                }
+            }
+
+            itemSignProperties.setInvalidItemSourceVersion(getSortInvalidItems(invalidItemVersionMap));
+            itemSignProperties.setUnsignSEItems(getSortTOSUnsignItems(tosUnsignItemMap));
+
+            itemSignProperties.setStudioVersion(PendoItemSignatureUtil.getStudioVersion());
+            if (coreService.isInValidGP()) {
+                itemSignProperties.setGracePeriod(ValueEnum.YES.getDisplayValue());
+            } else {
+                itemSignProperties.setGracePeriod(ValueEnum.NO.getDisplayValue());
+            }
+            String prodDate = PendoItemSignatureUtil.formatDate(System.getProperty(PendoItemSignatureUtil.PROD_DATE_ID),
+                    "yyyy-MM-dd");
+            itemSignProperties.setInstallDate(prodDate);
+            String projectCreateDate = PendoItemSignatureUtil.getCurrentProjectCreateDate();
+            itemSignProperties.setProjectCreateDate(PendoItemSignatureUtil.formatDate(projectCreateDate, "yyyy-MM-dd"));
+
+            String value = System.getProperty(PendoItemSignatureUtil.MIGRATION_TOKEN_KEY);
+            Map<String, Date> tokenTime = MigrationTokenUtil.getMigrationTokenTime(value);
+            if (tokenTime == null || tokenTime.isEmpty()) {
+                itemSignProperties.setValidMigrationToken(ValueEnum.NOT_APPLICATE.getDisplayValue());
+            } else {
+                String customer = coreService.getLicenseCustomer();
+                Date tokenDate = tokenTime.get(customer);
+                Date currentDate = new Date();
+                if (tokenDate != null && tokenDate.after(currentDate)) {
+                    itemSignProperties.setValidMigrationToken(ValueEnum.YES.getDisplayValue());
+                } else {
+                    itemSignProperties.setValidMigrationToken(ValueEnum.NO.getDisplayValue());
+                }
+            }
+
+        } catch (Exception e) {
+            ExceptionHandler.process(e, Level.WARN);
+        }
+
+    }
+
+    private void addInvalidItemVersion(Property property, Map<String, Integer> invalidItemVersionMap) {
+        String itemProductVersion = PendoItemSignatureUtil.getItemProductVersion(property);
+        if (StringUtils.isNotBlank(itemProductVersion)) {
+            if (invalidItemVersionMap.get(itemProductVersion) == null) {
+                invalidItemVersionMap.put(itemProductVersion, 0);
+            }
+            invalidItemVersionMap.put(itemProductVersion, invalidItemVersionMap.get(itemProductVersion) + 1);
+        }
+    }
+
+    private boolean isBuiltInItem(IRepositoryViewObject repositoryObject) {
+        if (repositoryObject.getProperty().getItem() instanceof SQLPatternItem) {
+            SQLPatternItem sqlPatternItem = (SQLPatternItem) repositoryObject.getProperty().getItem();
+            if (sqlPatternItem.isSystem()) {
+                return true;
+            }
+        }
+        if (repositoryObject.getProperty().getItem() instanceof RoutineItem) {
+            RoutineItem routineItem = (RoutineItem) repositoryObject.getProperty().getItem();
+            if (routineItem.isBuiltIn()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private String getSortTOSUnsignItems(Map<String, Integer> tosUnsignItemMap) {
+        List<Map.Entry<String, Integer>> resultMapList = new ArrayList<Map.Entry<String, Integer>>(tosUnsignItemMap.entrySet());
+        Collections.sort(resultMapList, new Comparator<Map.Entry<String, Integer>>() {
+
+            @Override
+            public int compare(Entry<String, Integer> o1, Entry<String, Integer> o2) {
+                List<TOSProdNameEnum> categoryList = Arrays.asList(TOSProdNameEnum.values());
+                TOSProdNameEnum category1 = TOSProdNameEnum.valueOf(o1.getKey());
+                TOSProdNameEnum category2 = TOSProdNameEnum.valueOf(o2.getKey());
+                return categoryList.indexOf(category1) - categoryList.indexOf(category2);
+            }
+        });
+        Map<String, Integer> tosUnsignMap = new LinkedHashMap<String, Integer>();
+        resultMapList.forEach(entry -> {
+            tosUnsignMap.put(entry.getKey(), entry.getValue());
+        });
+        return PendoTrackDataUtil.convertEntityJsonString(tosUnsignMap);
+    }
+
+    private String getSortInvalidItems(Map<String, Integer> invalidItemVersionMap) {
+        List<Map.Entry<String, Integer>> resultMapList = new ArrayList<Map.Entry<String, Integer>>(
+                invalidItemVersionMap.entrySet());
+        Collections.sort(resultMapList, new Comparator<Map.Entry<String, Integer>>(){
+
+            @Override
+            public int compare(Entry<String, Integer> o1, Entry<String, Integer> o2) {
+                return o1.getKey().compareTo(o2.getKey());
+            }
+            
+        });
+        Map<String, Integer> invalidMap = new LinkedHashMap<String, Integer>();
+        resultMapList.forEach(entry -> {
+            invalidMap.put(entry.getKey(), entry.getValue());
+        });
+        return PendoTrackDataUtil.convertEntityJsonString(invalidMap);
+    }
+
+    public void sendTrackToPendo() {
+        if (!isTrackAvailable) {
+            return;
+        }
+        Job job = new Job("send pendo track") {
+
+            @Override
+            protected IStatus run(IProgressMonitor monitor) {
+                try {
+                    collectProperties();
+                    PendoTrackSender.getInstance().sendTrackData(TrackEvent.ITEM_SIGNATURE, itemSignProperties);
+                } catch (Exception e) {
+                    // warning only
+                    ExceptionHandler.process(e, Level.WARN);
+                }
+                return Status.OK_STATUS;
+            }
+        };
+        job.setUser(false);
+        job.setPriority(Job.INTERACTIVE);
+        job.schedule();
+    }
+
+}
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/ProxyRepositoryFactory.java
+++ b/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/ProxyRepositoryFactory.java
@@ -16,7 +16,6 @@ import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Dictionary;
@@ -94,12 +93,12 @@ import org.talend.core.context.CommandLineContext;
 import org.talend.core.context.Context;
 import org.talend.core.context.RepositoryContext;
 import org.talend.core.exception.TalendInternalPersistenceException;
+import org.talend.core.hadoop.BigDataBasicUtil;
 import org.talend.core.hadoop.IHadoopDistributionService;
 import org.talend.core.model.components.IComponentsService;
 import org.talend.core.model.general.ILibrariesService;
 import org.talend.core.model.general.ModuleNeeded;
 import org.talend.core.model.general.Project;
-import org.talend.core.model.metadata.MetadataTalendType;
 import org.talend.core.model.metadata.builder.connection.AbstractMetadataObject;
 import org.talend.core.model.metadata.builder.connection.MetadataTable;
 import org.talend.core.model.migration.IMigrationToolService;
@@ -2211,6 +2210,9 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                    ExceptionHandler.process(e);
                }
                
+                // init dynamic distirbution after `beforeLogon`, before loading libraries.
+                initDynamicDistribution(monitor);
+                
                // need to set m2
                LoginTaskRegistryReader loginTaskRegistryReader = new LoginTaskRegistryReader();
                ILoginTask[] allLoginTasks = loginTaskRegistryReader.getAllCommandlineTaskListInstance();
@@ -2278,14 +2280,6 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                    
                }

-                try {
-                    // for new added mapping file, sync to project mapping folder
-                    MetadataTalendType.syncNewMappingFileToProject();
-                } catch (SystemException e) {
-                    // ignore
-                    ExceptionHandler.process(e);
-                }
-
                currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
                currentMonitor.beginTask("Execute before logon migrations tasks", 1); //$NON-NLS-1$
                ProjectManager.getInstance().getMigrationRecords().clear();
@@ -2325,6 +2319,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                if (monitor != null && monitor.isCanceled()) {
                    throw new OperationCanceledException(""); //$NON-NLS-1$
                }
+                PendoItemSignatureManager.getInstance().sendTrackToPendo();

                boolean isCommandLineLocalRefProject = false;
                CommandLineContext commandLineContext = (CommandLineContext) CoreRuntimePlugin.getInstance().getContext()
@@ -2363,17 +2358,6 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                    TimeMeasurePerformance.step("logOnProject", "sync log4j"); //$NON-NLS-1$ //$NON-NLS-2$
                }

-                try {
-                    URL url = MetadataTalendType.getProjectForderURLOfMappingsFile();
-                    if (url != null) {
-                        // set the project mappings url
-                        System.setProperty("talend.mappings.url", url.toString()); // $NON-NLS-1$
-                    }
-                } catch (SystemException e) {
-                    // ignore
-                    ExceptionHandler.process(e);
-                }
-
                if (GlobalServiceRegister.getDefault().isServiceRegistered(ITDQRepositoryService.class)) {
                    ITDQRepositoryService tdqRepositoryService = GlobalServiceRegister.getDefault()
                            .getService(ITDQRepositoryService.class);
@@ -2425,6 +2409,18 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
            throw e;
        }
    }
+    
+    private void initDynamicDistribution(IProgressMonitor monitor) {
+        try {
+            if (BigDataBasicUtil.isDynamicDistributionLoaded(monitor)) {
+                BigDataBasicUtil.reloadAllDynamicDistributions(monitor);
+            } else {
+                BigDataBasicUtil.loadDynamicDistribution(monitor);
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+    }

    // to fix the ops4j and m2e.core maven handler conflict issue TUP-31484
    private void unregisterM2EServiceBeforeLogon() {
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/ui/view/RepositoryLabelProvider.java
+++ b/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/ui/view/RepositoryLabelProvider.java
@@ -15,6 +15,10 @@ package org.talend.core.repository.ui.view;
 import java.util.HashMap;
 import java.util.Map;

+import org.eclipse.core.runtime.Platform;
+import org.eclipse.e4.ui.css.swt.theme.ITheme;
+import org.eclipse.e4.ui.css.swt.theme.IThemeEngine;
+import org.eclipse.e4.ui.css.swt.theme.IThemeManager;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.viewers.IColorProvider;
@@ -23,6 +27,11 @@ import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
 import org.talend.commons.runtime.model.repository.ECDCStatus;
 import org.talend.commons.runtime.model.repository.ERepositoryStatus;
 import org.talend.commons.ui.runtime.image.ECoreImage;
@@ -49,6 +58,7 @@ import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.model.repository.RepositoryContentManager;
 import org.talend.core.model.repository.RepositoryNodeProviderRegistryReader;
 import org.talend.core.model.repository.RepositoryViewObject;
+import org.talend.core.repository.CoreRepositoryPlugin;
 import org.talend.core.repository.model.ProxyRepositoryFactory;
 import org.talend.core.repository.model.repositoryObject.MetadataTableRepositoryObject;
 import org.talend.core.runtime.CoreRuntimePlugin;
@@ -87,6 +97,8 @@ public class RepositoryLabelProvider extends LabelProvider implements IColorProv

    private static final Color MERGED_REFERENCED_ITEMS_COLOR = new Color(null, 120, 120, 120);

+    private static final Color WHITE = new Color(null, 255, 255, 255);
+
    private IRepositoryView view;

    private static boolean refreshProperty = true;
@@ -480,6 +492,21 @@ public class RepositoryLabelProvider extends LabelProvider implements IColorProv
    @Override
    public Color getForeground(Object element) {
        RepositoryNode node = (RepositoryNode) element;
+        try {
+            Bundle bundle = Platform.getBundle(CoreRepositoryPlugin.PLUGIN_ID);
+            BundleContext context = bundle.getBundleContext();
+            ServiceReference ref = context.getServiceReference(IThemeManager.class.getName());
+            IThemeManager manager = (IThemeManager) context.getService(ref);
+            IThemeEngine engine = manager
+                    .getEngineForDisplay(PlatformUI.getWorkbench().getActiveWorkbenchWindow() == null ? Display.getCurrent()
+                            : PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell().getDisplay());
+            ITheme curTheme = engine.getActiveTheme();
+            if (curTheme.getId().contains("dark")) {
+                return null;
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
        switch (node.getType()) {
        case REFERENCED_PROJECT:
            return STABLE_PRIMARY_ENTRY_COLOR;
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/utils/AbstractResourceRepositoryContentHandler.java
+++ b/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/utils/AbstractResourceRepositoryContentHandler.java
@@ -25,6 +25,7 @@ import org.talend.core.model.properties.ProcessItem;
 import org.talend.core.model.properties.RoutinesJarItem;
 import org.talend.core.model.repository.AbstractRepositoryContentHandler;
 import org.talend.core.model.repository.ERepositoryObjectType;
+import java.io.IOException;

 public abstract class AbstractResourceRepositoryContentHandler extends AbstractRepositoryContentHandler {

@@ -83,6 +84,10 @@ public abstract class AbstractResourceRepositoryContentHandler extends AbstractR
        }
        return itemResource;
    }
+    
+    protected void copyScreenshotFile(Item originalItem, Item newItem) throws IOException {
+    	getXmiResourceManager().copyScreenshotFile(originalItem, newItem);
+    }

    protected XmiResourceManager getXmiResourceManager() {
        if (null == xmiResourceManager) {
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/utils/XmiResourceManager.java
+++ b/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/utils/XmiResourceManager.java
@@ -349,7 +349,7 @@ public class XmiResourceManager {
        return itemResource;
    }

-    private Resource createItemResource(boolean byteArrayResource, URI itemResourceURI) {
+    public Resource createItemResource(boolean byteArrayResource, URI itemResourceURI) {
        Resource itemResource;
        itemResource = getResourceSet().getResource(itemResourceURI, false);
        if (itemResource != null) {
--- a/main/plugins/org.talend.core.runtime/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.core.runtime/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Core Runtime Plug-in
 Bundle-SymbolicName: org.talend.core.runtime;singleton:=true
-Bundle-Version: 8.0.1.qualifier
+Bundle-Version: 8.8.8.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.
 Export-Package: org.talend.analysistask,
@@ -52,6 +52,7 @@ Export-Package: org.talend.analysistask,
 org.talend.core.model.xml,
 org.talend.core.nexus,
 org.talend.core.pendo,
+ org.talend.core.pendo.mapper,
 org.talend.core.pendo.properties,
 org.talend.core.prefs,
 org.talend.core.repository,
--- a/main/plugins/org.talend.core.runtime/build.properties
+++ b/main/plugins/org.talend.core.runtime/build.properties
@@ -16,6 +16,7 @@ bin.includes = META-INF/,\
               lib/delight-rhino-sandbox-0.0.15.jar,\
               lib/rhino-1.7.13.jar,\
               plugin_de.properties,\
+               plugin_en.properties,\
               plugin_fr.properties,\
               plugin_it.properties,\
               plugin_ja.properties,\
--- a/main/plugins/org.talend.core.runtime/mappings/mapping_Greenplum.xml
+++ b/main/plugins/org.talend.core.runtime/mappings/mapping_Greenplum.xml
@@ -10,7 +10,7 @@
 			<dbType type="BOOL" ignoreLen="true" ignorePre="true" />
 			<dbType type="BOX" ignoreLen="true" ignorePre="true" />
 			<dbType type="BPCHAR" ignoreLen="true" ignorePre="true" />
-			<dbType type="BYTEA" ignoreLen="true" ignorePre="true" />	
+			<dbType type="BYTEA" ignoreLen="true" ignorePre="true" />
 			<dbType type="CHAR" defaultLength="50" ignorePre="true"/>
 			<dbType type="CHARACTER" defaultLength="50" ignorePre="true"/>
 			<dbType type="CID" ignoreLen="true" ignorePre="true" />
@@ -36,7 +36,7 @@
 			<dbType type="LINE" ignoreLen="true" ignorePre="true" />
 			<dbType type="LSEG" ignoreLen="true" ignorePre="true" />
 			<dbType type="MACADDR" ignoreLen="true" ignorePre="true" />
-			<dbType type="MONEY" ignoreLen="true" ignorePre="true" />	
+			<dbType type="MONEY" ignoreLen="true" ignorePre="true" />
 			<dbType type="NAME" ignoreLen="true" ignorePre="true" />
 			<dbType type="NUMERIC" defaultLength="20" defaultPrecision="10"/>
 			<dbType type="DECIMAL" defaultLength="20" defaultPrecision="10"/>
@@ -46,7 +46,7 @@
 			<dbType type="POINT" ignoreLen="true" ignorePre="true"  />
 			<dbType type="POLYGON" ignoreLen="true" ignorePre="true"/>
 			<dbType type="REFCURSOR" ignoreLen="true" ignorePre="true" />
-			<dbType type="RELTIME" ignoreLen="true" ignorePre="true" />			
+			<dbType type="RELTIME" ignoreLen="true" ignorePre="true" />
 			<dbType type="REGCLASS" ignoreLen="true" ignorePre="true" />
 			<dbType type="REGOPER" ignoreLen="true" ignorePre="true" />
 			<dbType type="REGOPERATOR" ignoreLen="true" ignorePre="true" />
@@ -60,12 +60,14 @@
 			<dbType type="TIME" ignorePre="true" />
 			<dbType type="TINTERVAL" ignoreLen="true" ignorePre="true"  />
 			<dbType type="TIMESTAMPTZ" ignoreLen="true" ignorePre="true"  />
+			<dbType type="TIMESTAMP WITH TIME ZONE" ignoreLen="true" ignorePre="true"  />
 			<dbType type="TIMESTAMP" ignorePre="true"  />
 			<dbType type="TIMETZ" ignoreLen="true" ignorePre="true"  />
-			<dbType type="VARBIT" ignoreLen="true" ignorePre="true"  />			
+			<dbType type="TIME WITH TIME ZONE" ignoreLen="true" ignorePre="true"  />
+			<dbType type="VARBIT" ignoreLen="true" ignorePre="true"  />
 			<dbType type="VARCHAR" defaultLength="200" ignorePre="true" />
 			<dbType type="XID" ignoreLen="true" ignorePre="true"  />
-			
+
 			<dbType type="_ABSTIME" ignoreLen="true" ignorePre="true" />
 			<dbType type="_ACLITEM" ignoreLen="true" ignorePre="true" />
 			<dbType type="_BIT" ignoreLen="true" ignorePre="true" />
@@ -119,38 +121,40 @@
 		<language name="java">
 			<talendToDbTypes><!-- Adviced mappings  -->
 				<talendType type="id_List"/>
-				<talendType type="id_Boolean">	
+				<talendType type="id_Boolean">
 					<dbType type="BOOL" default="true" />
-					<dbType type="BOOLEAN" />					
+					<dbType type="BOOLEAN" />
 				</talendType>
-				<talendType type="id_Byte">		
+				<talendType type="id_Byte">
 				</talendType>
 				<talendType type="id_byte[]">
 					<dbType type="BIT" default="true" />
 					<dbType type="VARBIT" />
-					<dbType type="BIT VARYING" />				
+					<dbType type="BIT VARYING" />
 				</talendType>
 				<talendType type="id_Character">
 					<dbType type="CHAR" default="true" />
 					<dbType type="CHARACTER" />
 					<dbType type="BPCHAR" />
 					<dbType type="VARCHAR" />
-					<dbType type="TEXT" />							
+					<dbType type="TEXT" />
 				</talendType>
 				<talendType type="id_Date">
-					<dbType type="DATE" default="true" />				
+					<dbType type="DATE" default="true" />
 					<dbType type="ABSTIME" />
 					<dbType type="TIMETZ" />
+					<dbType type="TIME WITH TIME ZONE" />
 					<dbType type="TIME" />
 					<dbType type="TIMESTAMPTZ" />
+					<dbType type="TIMESTAMP WITH TIME ZONE" />
 					<dbType type="TIMESTAMP" />
 					<dbType type="INTERVAL" />
 					<dbType type="TINTERVAL" />
-					<dbType type="RELTIME" />						
+					<dbType type="RELTIME" />
 				</talendType>
 				<talendType type="id_BigDecimal">
 					<dbType type="NUMERIC" default="true" />
-					<dbType type="DECIMAL" />							
+					<dbType type="DECIMAL" />
 					<dbType type="FLOAT4" />
 					<dbType type="REAL" />
 					<dbType type="FLOAT8"/>
@@ -161,8 +165,8 @@
 					<dbType type="REAL" />
 					<dbType type="FLOAT8" default="true" />
 					<dbType type="NUMERIC" />
-					<dbType type="DECIMAL" />	
-					<dbType type="DOUBLE PRECISION"/>						
+					<dbType type="DECIMAL" />
+					<dbType type="DOUBLE PRECISION"/>
 				</talendType>
 				<talendType type="id_Float">
 					<dbType type="FLOAT4" default="true" />
@@ -170,7 +174,7 @@
 					<dbType type="REAL" />
 					<dbType type="NUMERIC" />
 					<dbType type="DECIMAL" />
-					<dbType type="DOUBLE PRECISION"/>				
+					<dbType type="DOUBLE PRECISION"/>
 				</talendType>
 				<talendType type="id_Integer">
 					<dbType type="INT2" />
@@ -180,7 +184,7 @@
 					<dbType type="INT8" />
 					<dbType type="BIGINT" />
 					<dbType type="BIGSERIAL" />
-					<dbType type="INTEGER" />										
+					<dbType type="INTEGER" />
 				</talendType>
 				<talendType type="id_Long">
 					<dbType type="INT2" />
@@ -188,8 +192,8 @@
 					<dbType type="SERIAL" />
 					<dbType type="INT8"  default="true" />
 					<dbType type="BIGINT" />
-					<dbType type="BIGSERIAL" />	
-					<dbType type="SMALLINT" />						
+					<dbType type="BIGSERIAL" />
+					<dbType type="SMALLINT" />
 				</talendType>
 				<talendType type="id_Object">
 					<dbType type="_POINT" />
@@ -210,26 +214,26 @@
 					<dbType type="_TIMESTAMPTZ" />
 					<dbType type="_TIMESTAMP" />
 					<dbType type="_TINTERVAL" />
-					<dbType type="_XID" />						
-					<dbType type="ACLITEM" />			
-					<dbType type="BYTEA" />						
+					<dbType type="_XID" />
+					<dbType type="ACLITEM" />
+					<dbType type="BYTEA" />
 					<dbType type="CID" />
 					<dbType type="CIDR" />
-					<dbType type="CIRCLE" />						
-					<dbType type="INET" />			
+					<dbType type="CIRCLE" />
+					<dbType type="INET" />
 					<dbType type="MACADDR" />
-					<dbType type="MONEY" />			
+					<dbType type="MONEY" />
 					<dbType type="OID" />
 					<dbType type="PATH" />
-					<dbType type="POLYGON" />			
+					<dbType type="POLYGON" />
 					<dbType type="REFCURSOR" />
 					<dbType type="REGCLASS" />
 					<dbType type="REGOPER" />
 					<dbType type="REGOPERATOR" />
 					<dbType type="REGPROC" />
 					<dbType type="REGPROCEDURE" />
-					<dbType type="REGTYPE" />						
-					<dbType type="SMGR" />			
+					<dbType type="REGTYPE" />
+					<dbType type="SMGR" />
 					<dbType type="TID" />
 					<dbType type="XID" />
 					<dbType type="_CHAR" />
@@ -239,7 +243,7 @@
 					<dbType type="BIGINT" />
 					<dbType type="BIT VARYING" />
 					<dbType type="_VARBIT" />
-					<dbType type="_BIT" />			
+					<dbType type="_BIT" />
 					<dbType type="_BOOL" />
 					<dbType type="BOOLEAN" />
 					<dbType type="BOX" />
@@ -276,7 +280,7 @@
 					<dbType type="OIDVECTOR" />
 					<dbType type="_OIDVECTOR" />
 					<dbType type="_PATH" />
-					<dbType type="POINT" default="true" />				
+					<dbType type="POINT" default="true" />
 				</talendType>
 				<talendType type="id_Short">
 					<dbType type="INT2"   default="true" />
@@ -285,22 +289,22 @@
 					<dbType type="INT8" />
 					<dbType type="BIGINT" />
 					<dbType type="BIGSERIAL" />
-					<dbType type="SMALLINT" />					
+					<dbType type="SMALLINT" />
 				</talendType>
 				<talendType type="id_String">
 					<dbType type="BPCHAR" />
 					<dbType type="VARCHAR" default="true" />
 					<dbType type="CHARACTER VARYING" />
-					<dbType type="TEXT" />				
+					<dbType type="TEXT" />
 				</talendType>
 			</talendToDbTypes>
 			<dbToTalendTypes>
 				<dbType type="INT2" >
-					<talendType type="id_Short" default="true" />				
+					<talendType type="id_Short" default="true" />
 				</dbType>
 				<dbType type="SMALLINT" >
-					<talendType type="id_Short" default="true" />				
-				</dbType>				
+					<talendType type="id_Short" default="true" />
+				</dbType>
 				<dbType type="INT4" >
 					<talendType type="id_Integer" default="true" />
 				</dbType>
@@ -308,330 +312,336 @@
     				<talendType type="id_Integer" default="true" />
    			</dbType>
    			<dbType type="CHARACTER VARYING" >
-					<talendType type="id_String" default="true" />				
+					<talendType type="id_String" default="true" />
 				</dbType>
 				<dbType type="BOOLEAN" >
-					<talendType type="id_Boolean" default="true" />				
-				</dbType> 				
+					<talendType type="id_Boolean" default="true" />
+				</dbType>
 				<dbType type="SERIAL" >
-					<talendType type="id_Integer" default="true" />				
-				</dbType>				
+					<talendType type="id_Integer" default="true" />
+				</dbType>
 				<dbType type="INT8" >
-					<talendType type="id_Long" default="true" />				
+					<talendType type="id_Long" default="true" />
 				</dbType>
 				<dbType type="BIGINT" >
-					<talendType type="id_Long" default="true" />				
-				</dbType>				
+					<talendType type="id_Long" default="true" />
+				</dbType>
 				<dbType type="BIGSERIAL" >
-					<talendType type="id_Long" default="true" />				
-				</dbType>				
+					<talendType type="id_Long" default="true" />
+				</dbType>
 				<dbType type="FLOAT4" >
-					<talendType type="id_Float" default="true" />				
-					<talendType type="id_BigDecimal"/>			
+					<talendType type="id_Float" default="true" />
+					<talendType type="id_BigDecimal"/>
 				</dbType>
 				<dbType type="REAL" >
-					<talendType type="id_Float" default="true" />				
-					<talendType type="id_BigDecimal"/>			
-				</dbType>			
+					<talendType type="id_Float" default="true" />
+					<talendType type="id_BigDecimal"/>
+				</dbType>
 				<dbType type="FLOAT8" >
-					<talendType type="id_Double" default="true" />				
-					<talendType type="id_BigDecimal"/>			
+					<talendType type="id_Double" default="true" />
+					<talendType type="id_BigDecimal"/>
 				</dbType>
 				<dbType type="DOUBLE PRECISION" >
-					<talendType type="id_Double" default="true" />				
-					<talendType type="id_BigDecimal"/>			
+					<talendType type="id_Double" default="true" />
+					<talendType type="id_BigDecimal"/>
 				</dbType>
 				<dbType type="NUMERIC">
 					<talendType type="id_Double"/>
-					<talendType type="id_BigDecimal" default="true" />			
+					<talendType type="id_BigDecimal" default="true" />
 				</dbType>
 				<dbType type="DECIMAL">
 					<talendType type="id_Double"/>
-					<talendType type="id_BigDecimal" default="true" />			
-				</dbType>				
+					<talendType type="id_BigDecimal" default="true" />
+				</dbType>
 				<dbType type="BOOL" >
-					<talendType type="id_Boolean" default="true" />				
-				</dbType>				
+					<talendType type="id_Boolean" default="true" />
+				</dbType>
 				<dbType type="BIT" >
-					<talendType type="id_byte[]" default="true" />	
-				</dbType>				
+					<talendType type="id_byte[]" default="true" />
+				</dbType>
 				<dbType type="VARBIT" >
-					<talendType type="id_byte[]" default="true" />				
-				</dbType>	
+					<talendType type="id_byte[]" default="true" />
+				</dbType>
 				<dbType type="BIT VARYING" >
-					<talendType type="id_byte[]" default="true" />				
-				</dbType>						
+					<talendType type="id_byte[]" default="true" />
+				</dbType>
 				<dbType type="CHAR" >
-					<talendType type="id_String" default="true" />				
+					<talendType type="id_String" default="true" />
 				</dbType>
 				<dbType type="CHARACTER" >
-					<talendType type="id_String" default="true" />				
-				</dbType>				
+					<talendType type="id_String" default="true" />
+				</dbType>
 				<dbType type="BPCHAR" >
-					<talendType type="id_String" default="true" />				
-				</dbType>				
+					<talendType type="id_String" default="true" />
+				</dbType>
 				<dbType type="VARCHAR" >
-					<talendType type="id_String" default="true" />				
-				</dbType>				
+					<talendType type="id_String" default="true" />
+				</dbType>
 				<dbType type="TEXT" >
-					<talendType type="id_String" default="true" />				
-				</dbType>				
+					<talendType type="id_String" default="true" />
+				</dbType>
 				<dbType type="DATE" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>				
+					<talendType type="id_Date" default="true" />
+				</dbType>
 				<dbType type="ABSTIME" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>				
+					<talendType type="id_Date" default="true" />
+				</dbType>
 				<dbType type="TIMETZ" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>				
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="TIME WITH TIME ZONE" >
+					<talendType type="id_Date" default="true" />
+				</dbType>
 				<dbType type="TIME" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>				
+					<talendType type="id_Date" default="true" />
+				</dbType>
 				<dbType type="TIMESTAMPTZ" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>				
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="TIMESTAMP WITH TIME ZONE" >
+					<talendType type="id_Date" default="true" />
+				</dbType>
 				<dbType type="TIMESTAMP" >
-					<talendType type="id_Date" default="true" />				
+					<talendType type="id_Date" default="true" />
 				</dbType>
 				<dbType type="INTERVAL" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>								
+					<talendType type="id_Date" default="true" />
+				</dbType>
 				<dbType type="TINTERVAL" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>				
+					<talendType type="id_Date" default="true" />
+				</dbType>
 				<dbType type="RELTIME" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>							
+					<talendType type="id_Date" default="true" />
+				</dbType>
 				<dbType type="ACLITEM" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>							
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="BYTEA" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>										
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="CID" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="CIDR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="CIRCLE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>										
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="INET" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>							
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="MACADDR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="MONEY" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>							
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="OID" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="PATH" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="POLYGON" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>							
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="REFCURSOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="REGCLASS" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="REGOPER" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="REGOPERATOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="REGPROC" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="REGPROCEDURE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="REGTYPE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>										
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="SMGR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>							
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="TID" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="XID" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="BOX" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="INT2VECTOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="LINE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="LSEG" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="NAME" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="OIDVECTOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="POINT" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>	
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<!-- object -->
 				<dbType type="_OIDVECTOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_PATH" >
-					<talendType type="id_Object" default="true" />				
+					<talendType type="id_Object" default="true" />
 				</dbType>
 				<dbType type="_NAME" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_NUMERIC" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_OID" >
-					<talendType type="id_Object" default="true" />				
+					<talendType type="id_Object" default="true" />
 				</dbType>
 				<dbType type="_LSEG" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_MACADDR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_MONEY" >
-					<talendType type="id_Object" default="true" />				
+					<talendType type="id_Object" default="true" />
 				</dbType>
 				<dbType type="_LINE" >
-					<talendType type="id_Object" default="true" />				
+					<talendType type="id_Object" default="true" />
 				</dbType>
 				<dbType type="_INT2VECTOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_INT4" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_INTERVAL" >
-					<talendType type="id_Object" default="true" />				
+					<talendType type="id_Object" default="true" />
 				</dbType>
 				<dbType type="_BOX" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_BYTEA" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_VARCHAR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_BPCHAR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_CID" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_CIDR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_CIRCLE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_DATE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_FLOAT8" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_INET" >
-					<talendType type="id_Object" default="true" />				
+					<talendType type="id_Object" default="true" />
 				</dbType>
 				<dbType type="_CHAR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_ABSTIME" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_ACLITEM" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_INT8" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_VARBIT" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_BIT" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>							
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_BOOL" >
-					<talendType type="id_Object" default="true" />				
+					<talendType type="id_Object" default="true" />
 				</dbType>
 				<dbType type="_POINT" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_POLYGON" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_FLOAT4" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_REFCURSOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_REGCLASS" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_REGOPER" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_REGOPERATOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_REGPROC" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_REGPROCEDURE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_REGTYPE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_RELTIME" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_TEXT" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_TID" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_TIMETZ" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_TIME" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_TIMESTAMPTZ" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_TIMESTAMP" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_TINTERVAL" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_XID" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>									
+					<talendType type="id_Object" default="true" />
+				</dbType>
 			</dbToTalendTypes>
 		</language>
 	</dbms>
--- a/main/plugins/org.talend.core.runtime/mappings/mapping_revision.json
+++ b/main/plugins/org.talend.core.runtime/mappings/mapping_revision.json
@@ -0,0 +1,238 @@
+{
+	"mapping_AS400.xml": {
+		"28fe6b6c94e4e486d431873ba556c1c18ae09140": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"3d4845af057220e02773029683a0fd99dee489e5": "a9861e98b581dfdafa7839238710bd930989960a",
+		"458d597928478f43c94098dfe47d9bb8d07e89e2": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"76a4aa354d986ed5682797337817a8ddbb80ae89": "d568bf814d7b27fc7c63cbd07ea6b4a3b0ad3ff8"
+	},
+	"mapping_Access.xml": {
+		"55d314ed9708263bfcec193abb57a1e25806626e": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"718db25f8e86d6b61284a4ffdc1fd19faffb98a9": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8"
+	},
+	"mapping_AmazonAurora.xml": {
+		"a93c809bdf8e5df8095580e3f23b29658e044302": "ebc9394c2728a3f3850fcbafac4156ef15aab37f",
+		"ba16c203a8a993e13ebab0da5cccb7a5e1c01e56": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_BigQuery.xml": {
+		"db723e5b4a38bbc8316593be33ab9d74f57776e6": "e1770847f656589810753c19d420228326462f34",
+		"e12df204d9f5081971d03c64b43de2456557e02e": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"e9c02d3e9bc3a3649fd33803353e61db6fcd2ea8": "01749151dcc171ebb6457ba872ee352d58a1dfd4"
+	},
+	"mapping_Cassandra.xml": {
+		"20ed188f8824c14852304920cf82ca7119eb1be0": "ab7b23e6c94946ca2358cc0cfd82c4d77a4c5839",
+		"692353c474569bafd44854b7f7343929beddee83": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"e42bdadd0009e7595773edcc1652f181a8fdf151": "76ed27054255165c23d8c0c8db081a41a50430c9",
+		"ff005c2bfc47789e5715e949f98bd6d72c934b54": "ebe76b0edd0eda3488527b95f2a6d925d091a408"
+	},
+	"mapping_Cassandra22_datastax.xml": {
+		"2ddd561eac2a04a7b08949c0764c5e76f80c89f5": "b0378fb45ae238b884417db468872341e156f138",
+		"33b483680a44a8229b09698df3803f5834987f18": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Cassandra40.xml": {
+		"e92b373950021eb425db9e3eba8391f98ce7e4a8": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Cassandra_datastax.xml": {
+		"3cb6b5cf167fb5ba82b3ebdc602f22ecdacdafb5": "56fad9370b27d03a9636d8368350274480fc2bce",
+		"ca09b169eee6e6dcfa81f976bd98ef4aae81cdf2": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"e1620c54d6793c6d1885e3e2fcdf242c0e3a4059": "df28e2b92f57ba0486215f334edb649a58788712"
+	},
+	"mapping_Databricks_Delta_Lake.xml": {
+		"d48793d7173ea7d07090f5e683045c3f60cc12c8": "21f5ac777158fc55288af7337737aa675e20bdf3",
+		"dcbe4533fe16fee70f24702edddec78b81e26463": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Exasol.xml": {
+		"21ff2b1a69b7242fa48a1218b0d5f8a6b0ba607e": "a0d36282ff5d6825b206ab6f794d13e048ac2192",
+		"3768b1e7a941e66f8a70ad7e1a65aa7d2b598daa": "7ef9ede0f988f10489c1f5ffe16ea24d2d14ecdd",
+		"6babf3080a3baa05bcd8a2815d2f31a0b15e1550": "02a98e53d3b6457272768ce0ae5c82992b403465",
+		"7de8a81bc2eb7c4da639af148c2c67b5c6de4bc0": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"a728306274b817e8afa0101d3b7621398addc2f3": "b5b116b3758f58e7500058e1805bf93bf5a2f0c1",
+		"dc2eba14e50ce7c413fb7696355e67d26fe5fb9b": "57bacf1f97951fcf6f650f1afdec35b5ea22638c",
+		"f670268dfd5a8f80fbdbe6fe4ad668cb6c8f25d6": "ead0fb11f124cf05ad0f7fde21cdedbb3cf2160b"
+	},
+	"mapping_Firebird.xml": {
+		"51a041d0b43678433f6303aebac5f92bfdb7b8a6": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"d504ece6ca9e10e23f5e0f05660e5f49e7d999ff": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8"
+	},
+	"mapping_Greenplum.xml": {
+		"16418522006e4505c7fb7d44c4d06928de20eaf8": "ec04f46618ef0586081fd3b17ad7b85239958194",
+		"4f3e1b53baca729eef796979e97592c8724a2d91": "caf54e3d2b6c6d685cdcf2a243c28c408a9cd652",
+		"525a7ca1a48599a840b1feca641ef6a413d7384b": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"c4ed635e67d7d82c24008677f313e17df98f5d08": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8"
+	},
+	"mapping_H2.xml": {
+		"4e3ed630d3133326a0cf4728865b3efa4cbecc63": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"84b0b863c0532f93bffc0ab54d98a449f331e319": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"cb093084dc1dc3f999707a1b9d1474f87bbf6d17": "341b1220b6bc6bf59eef81e97c694d06134bd8a2"
+	},
+	"mapping_HSQLDB.xml": {
+		"0a37e2aec423d0c401aff092e4fda9e01c5dd4ff": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"73af8e3e8646ea58f4cfe60fe4905e90340b3e12": "890a391388725c112ffbbd2dd8b8d267305df4a7",
+		"98819a80cd8994a02579ea1d9b0992a0b68a5403": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Hive.xml": {
+		"0265c6f16ab2c9eea7da660e4e1c8a3ec7bc0ab3": "37ef13c438cda4cd1c3e091d99a00036b328e57f",
+		"1f5811f41b2836cd7baeb23daef91d2ea313f2c6": "3646a1bcd980a3209501a5c846338823f55d74b2",
+		"21a44cd9d32a5478a4de61a86b398a9ef80401ac": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"5444fa9a484704d774259430623e0db1495a867f": "ef872732cde37c6c7684dc773641be0b78f5c57c",
+		"e7f128915578dd29538a7debeb5f47528b5a6e59": "86ba7c19d9300a02dbcb0801852e728acd261132"
+	},
+	"mapping_IBMDB2.xml": {
+		"dc42cf143f3a0f10ad8c280f16ef44ae1f907123": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"f8aea23cc5b48ebb3cdd229be3f66b28890ff4f8": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Impala.xml": {
+		"55ed99aa28c989bd5777f41b7c87ed4eb9f245a8": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Informix.xml": {
+		"40da9213cf85b1712f38474dea4f2ec3447dfe3c": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"938e41f3719c29248d4f58c303464bbfb50e343a": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8"
+	},
+	"mapping_Ingres.xml": {
+		"811e8bf4e7bc2e6b9c3fcb5f074601a873f15e1d": "15afc1b074c8a6e4aee39c1d5a3347555dbe36a0",
+		"95873faa81ee3de2eea02efab5c127e6188df796": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"9c5682f564e861e1db3b5184fd40e718e0912a4a": "d51edc7e08871897572c9b1f1cd2d2d2df347dfb"
+	},
+	"mapping_Interbase.xml": {
+		"4d37474d07991154aa0148e7a030c4725d45ef0d": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"71e8386c3e21f726550234c52d3ca50dcfa655de": "d51edc7e08871897572c9b1f1cd2d2d2df347dfb"
+	},
+	"mapping_JavaDB.xml": {
+		"652fd7f2f11fc27903d333e1699cc419804caa66": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"66dbe13a0043798498f37b6e5495bc3aaa8fb90b": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8"
+	},
+	"mapping_MSSQL.xml": {
+		"305eeb294ae8bb07bee7d1e182e431e2e7f6273d": "d7761630e63b399f89eaaeb9e19e775bf1579dde",
+		"b93c0825ffd799d89608239385d7e4b60de96209": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_MaxDB.xml": {
+		"586fc7ac94a9abec8a76a587dc6aa0fae0079bf3": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_MicrosoftCrm.xml": {
+		"e1c5e77e19adea1406e5bb511a1c6adb8b610bfe": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_MicrosoftCrm_odata.xml": {
+		"1166b9ce6ce163d11a57046db5ee2dc9d5e496df": "e86fd3fd5c3b4ba9ff613155fba014a80c40cf01",
+		"3f25ced1039b99d1c07b23e3d27cac1562e52a6f": "c1190dfa35e839496745516dbcfeb8a309fa49d0",
+		"750541f00f3c5da6007623f3514add6dc3417a5f": "54331fa4ec501557eb9c32d434c332cf3d121349",
+		"9612a2611bd29461dd46fc70f0e2841892f3f096": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_MsOdbc.xml": {
+		"01561cb7b5630a4a6aed576215ccdb3991d2db52": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"a9c94a6255061e8100b15590da35196464b77d46": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Mysql.xml": {
+		"128d7d66eb994a032128949fcbe0c953c158beaa": "956802047d6623ba61e2da68aba2db8f38bca48a",
+		"522654fad6fa3d008ef386fc9360ae51df910729": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"5dfc7b71e1f6a9fad6ebf47a1d748893c85bbe5e": "341b1220b6bc6bf59eef81e97c694d06134bd8a2",
+		"894b0d1d2c23c98f2e14920013b82524334dd255": "74b3640e2923d4c60c92042ff03d15b4ac4e9341",
+		"8cb3d2b06d8a2b12e8673e6e9519f85ec08b35ec": "f22d442cbde13623a1b96c15ea2df8dd1a7d755e",
+		"a94341e5bd6c4ba0eef57f9d6d3cc6c0006c785b": "ebc9394c2728a3f3850fcbafac4156ef15aab37f",
+		"d7e74c8e9f8a47ab258472ec43236d2933c70838": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"edc9d1453c8f9ac8548822ff2f90a4defcd02094": "fd4d974c755ced1969b27126844b3f462bca1a52"
+	},
+	"mapping_Netezza.xml": {
+		"0c769aa277190990fb33a918cc57189b9ba6306f": "c8ca64da55ceb677fd97169f6a924ec80f01b2fc",
+		"0f5e9677f936a5414ce6593229aa47ea5b757276": "3074a57eee1407a413e460ed27e31d48d21d609b",
+		"b3e25e55f8281cb616b3f549e6a2e5a83d4ad62a": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Oracle.xml": {
+		"0407cea7e87144cb601bc9a3f039121feca79b65": "cb6b87dabdc71be0f1db4bdca694bcb61b679c05",
+		"064d2a5940379346638412dd7f4cb7dbcc30e672": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"26a2295f6401de6e17feb61b261f7fbdfc4d609d": "e7604a488f339028a3cf14ae4031b0fb3fd50bcc",
+		"9b0306aacec772d9d82be49ab702254ce1e08bea": "912702dc8ea921a34ea0522235db65f8655bf8e9",
+		"df2537b329d0b09828c281e62208daf379f7b60a": "544faa63bbe63dd070a94c84139c705ac6432314"
+	},
+	"mapping_ParAccel.xml": {
+		"1ba71027d3a60773c7c008143c2146e4db2ef112": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"5085a1e922f77895a2f7c85e2347acfe03034493": "d51edc7e08871897572c9b1f1cd2d2d2df347dfb"
+	},
+	"mapping_Postgres.xml": {
+		"ce8b7f58644b8f7814a5522d172b4192ff89bd4f": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"e1c1f04f95222bcadda336d6a4f0ea07c6ebb08e": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8"
+	},
+	"mapping_PostgresPlus.xml": {
+		"69b7d7f722538a322fb0bf867177d1ce5a0d7ad6": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"f576a7bb0327eeff1fd63a9a09106ae33f3ec90e": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8"
+	},
+	"mapping_Redshift.xml": {
+		"0cc6e153fe35041a009cb222e0276e35ddbc92f1": "2023289b9965fc14b959463ba5050be6aead361a",
+		"3b941be88a5f13bd8fd905fb1fa5f2a241e89ed9": "915a307b629c7a75bcbedc86267db1e8995b77f3",
+		"85ba89fdadfca4a2d755856a75e904f6015926a9": "de08533f6561319fc2914181a2705ccd75e29c40",
+		"8f3eda24c1f413b17b2b8c48695dbd786fa29b6b": "93112768d7eea6df44d92a3efbd4f1dfa20e06b6",
+		"ab86d7fda94e0b368f739f73994ce2a2147be12d": "0fd3f58b7aa78aaae6fb40d042780bec64da75e6",
+		"ad0eecc7e9f25c3b904cc11b062a8185456478ee": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Redshift_new.xml": {
+		"43085952e178e2c570ab7d2a262278dd2896dd96": "699efe42a33aab3ca0bbaa7a1abee23368e61606"
+	},
+	"mapping_SAPHana.xml": {
+		"1a07a8174468a5a1d55378dd0e21d7c1f9e531bc": "48ea42be6b348a3c993760e7f2c94c58ac08fdae",
+		"331ae8a035e6b1f2cd722be6411df4ae4a95bb33": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_SQLite.xml": {
+		"0a97b6e8acf8bd16aa34a3c01707f1e2a9eeff1f": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"b7b7b7c690efacc208316c911571a8513b5ea713": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8"
+	},
+	"mapping_SingleStore.xml": {
+		"9da7d92af5e9b0697436f74fffd190e8af061567": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Snowflake.xml": {
+		"d459c6be3786f9358615eaf692a1c7920b4c6e74": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Sybase.xml": {
+		"081038547cac8342cf5cadf8bfd02fe4d2929323": "1ff9877dce90e2ef39b267ea60de534796035a95",
+		"09a0f4dc71ff9a844e1162600409317e92e1ff18": "28534ffb4ae599adec53853776856e82c23c815a",
+		"4ee2c12f372953e77404481a962b3aca14abadb0": "f02b1b6902098b2da90cde6b22a9a49ec328970a",
+		"5752dcfa409e903af77587f151d580c68c9e4ac7": "3db0fa1fbed8ae378d52aa8c36b6fed55d184e5b",
+		"6f4e7913b4b31e8fb4e097690c8b903a58842283": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"7676e2d94473564322ce37cad92b7f8b09751b1b": "1cc6237de63892e097c77637ac8457cf8fefbf6f",
+		"8bbad7895713f3a399ddb195c40353e18d3e83b9": "984ca27e4ee0177793b2111797700390424cb746",
+		"bbc091c50a7bd8a8fe630d99a9c2e3f2f878ac88": "67a9b521c9d698b3411fb49410ac61a15f4bc7db",
+		"d841719dcf79a12d0189301e40c0e9e973a45c4f": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"e103a9671d9bcf360fd2e61ee97f4547d0d52241": "e19031add3dc54bf9d0e731f3a05738af48ebb6d",
+		"e1c42d74cc0dc3681b5bd45a901a3bedeb53ec68": "75df15acaa5c8d1dcd4a8e855e0df969fdea25d5",
+		"e30d1f01e88bdaf926855e00d1aef3a37a7eb6e4": "c91dd79086a42dce5417de77bb7ce61c0bd6cbbf",
+		"ee5d7f5f9510f63c340f87862327b869bf4cb743": "607764748cdbff669d2ccfcbaafdaa0d83598f32"
+	},
+	"mapping_Teradata.xml": {
+		"10ed107c1d66b38d51739ffdd0820db676c42cef": "45dbf10541f6dd32283038bcc5b04b10e305770a",
+		"55e6a511c2cb39aca11de302a3850eb2d1f6e3a5": "fc652f1cc70f6caa05d5c65e57115f86653f7841",
+		"ac9ffae887ab4d20d4eca0eddc83163e99507ec8": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"f9b0367424f721cd8029d3540c9a82f39d74a6b4": "c002b50a69b8a0193780e7c0d1788bbd9a5145c3"
+	},
+	"mapping_VectorWise.xml": {
+		"06f86121a9492b3104047691b19718a5d9d49be9": "d51edc7e08871897572c9b1f1cd2d2d2df347dfb",
+		"edf255202bcfad77ff6f3fac11714891934225c4": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8"
+	},
+	"mapping_Vertica.xml": {
+		"28153eaab1c47b8718ca3c49553ec40b047d2878": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"2ee78d7679d4201ad29adba4cc0a48084f161e25": "eecc481d671d330bfb46406ab2533830c668bf22",
+		"819be4680c04a7f77c51fc65ebd1d964a714aa78": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"9218d5e7b682513ddf1b891f5f0467ab9938fec3": "341b1220b6bc6bf59eef81e97c694d06134bd8a2",
+		"d9745a57d9f1b6c638ebd57cd5281be020e0614c": "e8f788c5c260f9b82eaaa88d0402423d86a5680d",
+		"dec55a19094d1bcc20f12a8888b27460e83c2e67": "3b582b21fc5ac7ccfb05321c7923591433ced716"
+	},
+	"mapping_XSD.xml": {
+		"1ef837521e274c5b93f5f228955204285b3dd28a": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"9c454252343dfe1400d356cbf41bf88e842b4e1e": "c615b3a622e2f6ba8577e812e71977d9f1b1930d"
+	},
+	"mapping_dynamodb.xml": {
+		"891099e88d8074570dc029f9b7d8b04bbc241383": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_ebcdic.xml": {
+		"b47b25edc9e40d312b548270dbb3f978475be4e7": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_sap.xml": {
+		"0339bc60ae47e3796c343eee7e2fb1cb1869cefa": "ee49a27e5c3ba3217ab497b1cd4467c088e59f5e",
+		"1f41a55f6f7f1d6d2118e766daf7e3dbfd77551d": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"64c23be0c363ab703528677c999e4ef707d54497": "27908d5685066221f02cd3890a5319838215eb8b",
+		"83688cf3134e60d9f5a08b316643a41246717e92": "740c431e0b623cc7d41166588961028ad3efab80",
+		"9df72b6a1f1a72d9be1a4a7fd428873ad9b75bff": "94804b5e96a71d63a294eb9bcfbbb5290824009f",
+		"a300fcd290aa65c254c44d683d30a9fa6ae14a2f": "45e5d88e9c49cb87b47413468073c571f60c0117",
+		"b74c01dff88a52afca5f8c84fbe41d71a34eb6b5": "32832fe0edfbd10d50ed85528481e5c9ca2ec8e0",
+		"c814f616005e1637ec107dd8c0f269bd69661d2e": "7d07608dceb06f7364b5bb8babc0f6e921fc443a"
+	},
+	"mapping_sas.xml": {
+		"4aeb0deb41f61dbe69e85e780fb1e985c9f3d758": "fd44bfb0ee3fc8288465507b937c53619f43c0ec"
+	}
+}
--- a/main/plugins/org.talend.core.runtime/pom.xml
+++ b/main/plugins/org.talend.core.runtime/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.core.runtime</artifactId>
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ICoreService.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ICoreService.java
@@ -31,6 +31,7 @@ import org.talend.core.model.metadata.ColumnNameChanged;
 import org.talend.core.model.metadata.IMetadataTable;
 import org.talend.core.model.metadata.builder.connection.MetadataTable;
 import org.talend.core.model.properties.Item;
+import org.talend.core.model.properties.Property;
 import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.runtime.process.ITalendProcessJavaProject;
 import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
@@ -116,6 +117,7 @@ public interface ICoreService extends IService {

    public String validateValueForDBType(String columnName);

+    @Deprecated
    public void synchronizeMapptingXML(ITalendProcessJavaProject talendJavaProject);

    public IPreferenceStore getPreferenceStore();
@@ -124,6 +126,7 @@ public interface ICoreService extends IService {

    public IMetadataTable convert(MetadataTable originalTable);

+    @Deprecated
    public void syncMappingsFileFromSystemToProject();
    
    /**
@@ -132,4 +135,17 @@ public interface ICoreService extends IService {
     */
    void installComponents(IProgressMonitor monitor);

+    Integer getSignatureVerifyResult(Property property, IPath resourcePath, boolean considerGP) throws Exception;
+
+    String getLicenseCustomer();
+
+    boolean isInValidGP();
+
+    public static ICoreService get() {
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(ICoreService.class)) {
+            return GlobalServiceRegister.getDefault().getService(ICoreService.class);
+        }
+        return null;
+    }
+
 }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ILibraryManagerService.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ILibraryManagerService.java
@@ -21,6 +21,7 @@ import java.util.Set;

 import org.eclipse.core.runtime.IProgressMonitor;
 import org.talend.core.model.general.ModuleNeeded;
+import org.talend.core.model.general.RetrieveResult;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.nexus.ArtifactRepositoryBean;
 import org.talend.core.nexus.TalendLibsServerManager;
@@ -109,6 +110,8 @@ public interface ILibraryManagerService extends IService {

    public boolean retrieve(ModuleNeeded module, String pathToStore, boolean showDialog, IProgressMonitor... monitorWrap);

+    RetrieveResult retrieveModules(ERepositoryObjectType codeType, Set<ModuleNeeded> modulesNeeded, String pathToStore,
+            boolean showDialog, IProgressMonitor... monitorWrap);
    /**
     *
     * Resolve the jar from custom nexus
@@ -151,6 +154,10 @@ public interface ILibraryManagerService extends IService {
    public boolean contains(String jarName);

    public void clearCache();
+    
+    public void clearCache(boolean cleanIndex);
+    
+    public void deployLibsFromCustomComponents();

    @Deprecated
    public Set<String> list(boolean withComponent, IProgressMonitor... monitorWrap);
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ITDQComponentService.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ITDQComponentService.java
@@ -12,12 +12,12 @@
 // ============================================================================
 package org.talend.core;

-import org.talend.core.model.process.AbstractExternalNode;
+import org.talend.core.model.process.IExternalNode;
 import org.talend.core.model.process.INode;

 public interface ITDQComponentService extends IService {

    public boolean isTDQExternalComponent(String componentName);

-    public AbstractExternalNode createExternalComponent(INode node);
+    public IExternalNode createExternalComponent(INode node);
 }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ITDQCryptoFileService.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ITDQCryptoFileService.java
@@ -38,10 +38,11 @@ public interface ITDQCryptoFileService extends IService {
     * Generate Encrypty file
     */
    public void generateCryptoFile(String passwordM1, String cryptoMethod, String cryptoFilePath);
-
+    
    /**
     * Generate Encrypty file
     */
    public void generateCryptoFile(String passwordM1, String cryptoMethod, String cryptoFilePath, int algoVersion);

+
 }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/ERedshiftDriver.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/ERedshiftDriver.java
@@ -17,23 +17,23 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;

+import org.talend.core.database.conn.version.EDatabaseVersion4Drivers;
+
 /**
 * DOC jding  class global comment. Detailled comment
 */
 public enum ERedshiftDriver {

-    DRIVER_V2("Driver v2", new String[] { "redshift-jdbc42-2.1.0.3.jar", "antlr4-runtime-4.8-1.jar" }),
-    DRIVER_V1("Driver v1", new String[] { "redshift-jdbc42-no-awssdk-1.2.55.1083.jar", "antlr4-runtime-4.8-1.jar" });
+    DRIVER_V2("Driver v2", new String[] { "redshift-jdbc42-2.1.0.3.jar" }),
+    DRIVER_V1("Driver v1", new String[] { "redshift-jdbc42-no-awssdk-1.2.55.1083.jar" });

    private String displayName;

-    private Set<String> drivers = new HashSet<String>();
+    private String[] drivers = new String[] {};

-    private ERedshiftDriver(String displayName, String[] driverStr) {
+    private ERedshiftDriver(String displayName, String[] drivers) {
        this.displayName = displayName;
-        for (String driver : driverStr) {
-            drivers.add(driver);
-        }
+        this.drivers = drivers;
    }

    public String getDisplayName() {
@@ -44,19 +44,36 @@ public enum ERedshiftDriver {
        this.displayName = displayName;
    }

-    public Set<String> getDrivers() {
+    public String[] getDrivers() {
        return drivers;
    }

-    public void setDrivers(Set<String> drivers) {
+    public void setDrivers(String[] drivers) {
        this.drivers = drivers;
    }

-    public static Set<String> getDriversByVersion(String version) {
+    public static Set<String> getDriversByVersion(EDatabaseVersion4Drivers v4d, String version) {
        Set<String> drivers = new HashSet<String>();
+        Set<String> providerDrivers = v4d.getProviderDrivers();
        ERedshiftDriver redshiftDriver = ERedshiftDriver.valueOf(version);
-        if (redshiftDriver != null) {
-            return redshiftDriver.getDrivers();
+        if (redshiftDriver != null && DRIVER_V1 != redshiftDriver) {
+            // to replace default one
+            String[] v1Drivers = DRIVER_V1.getDrivers();
+            for (String driver : providerDrivers) {
+                boolean replaced = false;
+                for (int i = 0; i < v1Drivers.length; i++) {
+                    if (driver.equals(v1Drivers[i])) {
+                        drivers.add(redshiftDriver.getDrivers()[i]);
+                        replaced = true;
+                        break;
+                    }
+                }
+                if (!replaced) {
+                    drivers.add(driver);
+                }
+            }
+        } else {
+            drivers.addAll(providerDrivers);
        }
        return drivers;
    }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/ConnParameterKeys.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/ConnParameterKeys.java
@@ -238,6 +238,10 @@ public class ConnParameterKeys {

    public static final String CONN_PARA_KEY_SYNAPSE_CLIENT_KEY = "CONN_PARA_KEY_SYNAPSE_CLIENT_KEY"; //$NON-NLS-1$
    
+    public static final String CONN_PARA_KEY_USE_SYNAPSE_CLIENT_CERTIFICATE = "CONN_PARA_KEY_USE_SYNAPSE_CLIENT_CERTIFICATE"; //$NON-NLS-1$
+    
+    public static final String CONN_PARA_KEY_SYNAPSE_CLIENT_CERTIFICATE = "CONN_PARA_KEY_SYNAPSE_CLIENT_CERTIFICATE"; //$NON-NLS-1$
+    
    public static final String CONN_PARA_KEY_SYNAPSE_FS_STORAGE = "CONN_PARA_KEY_SYNAPSE_FS_STORAGE"; //$NON-NLS-1$

    public static final String CONN_PARA_KEY_SYNAPSE_DEPLOY_BLOB = "CONN_PARA_KEY_SYNAPSE_DEPLOY_BLOB"; //$NON-NLS-1$
@@ -347,11 +351,19 @@ public class ConnParameterKeys {

    public static final String CONN_PARA_KEY_DATABRICKS_CLOUD_PROVIDER = "CONN_PARA_KEY_DATABRICKS_CLOUD_PROVIDER";
    
+    public static final String CONN_PARA_KEY_DATABRICKS_CLUSTER_TYPE = "CONN_PARA_KEY_DATABRICKS_CLUSTER_TYPE";
+    
    public static final String CONN_PARA_KEY_DATABRICKS_RUN_MODE = "CONN_PARA_KEY_DATABRICKS_RUN_MODE";

    public static final String CONN_PARA_KEY_DATABRICKS_CLUSTER_ID="CONN_PARA_KEY_DATABRICKS_CLUSTER_ID";

    public static final String CONN_PARA_KEY_DATABRICKS_TOKEN="CONN_PARA_KEY_DATABRICKS_TOKEN";
+    
+    public static final String CONN_PARA_KEY_DATABRICKS_NODE_TYPE="CONN_PARA_KEY_DATABRICKS_NODE_TYPE";
+    
+    public static final String CONN_PARA_KEY_DATABRICKS_DRIVER_NODE_TYPE="CONN_PARA_KEY_DATABRICKS_DRIVER_NODE_TYPE";
+    
+    public static final String CONN_PARA_KEY_DATABRICKS_RUNTIME_VERSION="CONN_PARA_KEY_DATABRICKS_RUNTIME_VERSION";

    public static final String CONN_PARA_KEY_DATABRICKS_DBFS_DEP_FOLDER="CONN_PARA_KEY_DATABRICKS_DBFS_DEP_FOLDER";

@@ -383,6 +395,12 @@ public class ConnParameterKeys {
    public static final String CONN_PARA_KEY_CDE_WORKLOAD_USER="CONN_PARA_KEY_CDE_WORKLOAD_USER";
    public static final String CONN_PARA_KEY_CDE_WORKLOAD_PASSWORD = "CONN_PARA_KEY_CDE_WORKLOAD_PASSWORD";
    
+    // STANDALONE
+    public static final String CONN_PARA_KEY_UNIV_STANDALONE_MASTER="CONN_PARA_KEY_UNIV_STANDALONE_MASTER";
+    public static final String CONN_PARA_KEY_UNIV_STANDALONE_CONFIGURE_EXEC="CONN_PARA_KEY_UNIV_STANDALONE_CONFIGURE_EXEC";
+    public static final String CONN_PARA_KEY_UNIV_STANDALONE_EXEC_MEMORY="CONN_PARA_KEY_UNIV_STANDALONE_EXEC_MEMORY";
+    public static final String CONN_PARA_KEY_UNIV_STANDALONE_EXEC_CORE="CONN_PARA_KEY_UNIV_STANDALONE_EXEC_CORE";
+    
    /**
     * Redshift
     */
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/template/EDatabaseConnTemplate.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/template/EDatabaseConnTemplate.java
@@ -207,7 +207,13 @@ public enum EDatabaseConnTemplate {
            "2181")), //$NON-NLS-1$

    MAPRDB(new DbConnStr(EDatabaseTypeName.MAPRDB, "127.0.0.1", //$NON-NLS-1$
-            "5181")); //$NON-NLS-1$
+            "5181")), //$NON-NLS-1$
+
+    SNOWFLAKE(
+            new DbConnStr(EDatabaseTypeName.SNOWFLAKE, //
+                    "jdbc:snowflake://<host>:<port>/?<property>",
+                    "3306" //$NON-NLS-1$
+            )); // $NON-NLS-1$

    private DbConnStr connStr;

--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/version/EDatabaseVersion4Drivers.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/version/EDatabaseVersion4Drivers.java
@@ -56,22 +56,22 @@ public enum EDatabaseVersion4Drivers {
    HSQLDB_SERVER(new DbVersion4Drivers(EDatabaseTypeName.HSQLDB_SERVER, "hsqldb.jar")), //$NON-NLS-1$
    HSQLDB_WEBSERVER(new DbVersion4Drivers(EDatabaseTypeName.HSQLDB_WEBSERVER, "hsqldb.jar")), //$NON-NLS-1$

-    H2(new DbVersion4Drivers(EDatabaseTypeName.H2, "h2-2.1.210.jar")), //$NON-NLS-1$
+    H2(new DbVersion4Drivers(EDatabaseTypeName.H2, "h2-2.1.214.jar")), //$NON-NLS-1$

    //
    JAVADB_EMBEDED(new DbVersion4Drivers(EDatabaseTypeName.JAVADB_EMBEDED, "derby.jar")), //$NON-NLS-1$
    SQLITE(new DbVersion4Drivers(EDatabaseTypeName.SQLITE, "sqlitejdbc-v056.jar")), //$NON-NLS-1$
    FIREBIRD(new DbVersion4Drivers(EDatabaseTypeName.FIREBIRD, "jaybird-full-2.1.1.jar")), //$NON-NLS-1$
    TERADATA(new DbVersion4Drivers(EDatabaseTypeName.TERADATA,
-            new String[] { "terajdbc4-17.10.00.27.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
+            new String[] { "terajdbc4-17.10.00.27.jar" })), //$NON-NLS-1$
    JAVADB_DERBYCLIENT(new DbVersion4Drivers(EDatabaseTypeName.JAVADB_DERBYCLIENT, "derbyclient.jar")), //$NON-NLS-1$
    NETEZZA(new DbVersion4Drivers(EDatabaseTypeName.NETEZZA, "nzjdbc.jar")), //$NON-NLS-1$
    INFORMIX(new DbVersion4Drivers(EDatabaseTypeName.INFORMIX, "ifxjdbc.jar")), //$NON-NLS-1$

    SAS_9_1(new DbVersion4Drivers(EDatabaseTypeName.SAS, "SAS 9.1", "SAS_9.1", new String[] { "sas.core.jar", //$NON-NLS-1$
-            "sas.intrnet.javatools.jar", "sas.svc.connection.jar", "org.apache.log4j_1.2.15.v201012070815.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
+            "sas.intrnet.javatools.jar", "sas.svc.connection.jar", "reload4j-1.2.19.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
    SAS_9_2(new DbVersion4Drivers(EDatabaseTypeName.SAS,
-            "SAS 9.2", "SAS_9.2", new String[] { "sas.core.jar", "sas.security.sspi.jar", "sas.svc.connection.jar", "org.apache.log4j_1.2.15.v201012070815.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
+            "SAS 9.2", "SAS_9.2", new String[] { "sas.core.jar", "sas.security.sspi.jar", "sas.svc.connection.jar", "reload4j-1.2.19.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
    SAPHana(new DbVersion4Drivers(EDatabaseTypeName.SAPHana, "HDB 1.0", "HDB_1_0", "ngdbc.jar")), //$NON-NLS-1$
    // MYSQL, add for 9594
    MYSQL_8(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MySQL 8", "MYSQL_8", "mysql-connector-java-8.0.18.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -83,10 +83,11 @@ public enum EDatabaseVersion4Drivers {
            "Microsoft SQL Server 2012", "Microsoft SQL Server 2012", "jtds-1.3.1-patch-20190523.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    MSSQL_PROP(new DbVersion4Drivers(EDatabaseTypeName.MSSQL,
            "Microsoft", "MSSQL_PROP", //$NON-NLS-1$ //$NON-NLS-2$
-            new String[] { "mssql-jdbc.jar", "slf4j-api-1.7.29.jar", "slf4j-log4j12-1.7.29.jar", "msal4j-1.11.0.jar", //$NON-NLS-1$
-                    "oauth2-oidc-sdk-9.7.jar", "log4j-1.2.17.jar", "jackson-core-2.12.1.jar",
-                    "jackson-databind-2.12.1.jar", "jackson-annotations-2.12.1.jar", "jcip-annotations-1.0-1.jar",
-                    "json-smart-2.4.7.jar", "nimbus-jose-jwt-9.9.3.jar", "accessors-smart-2.4.7.jar", "asm-9.1.jar",
+            new String[] { "mssql-jdbc-actual.jar", "slf4j-api-1.7.29.jar", "slf4j-log4j12-1.7.29.jar", //$NON-NLS-1$
+                    "msal4j-1.11.0.jar", 
+                    "oauth2-oidc-sdk-9.7.jar", "reload4j-1.2.19.jar", "jackson-core-2.13.2.jar",
+                    "jackson-databind-2.13.2.2.jar", "jackson-annotations-2.13.2.jar", "jcip-annotations-1.0-1.jar",
+                    "json-smart-2.4.7.jar", "nimbus-jose-jwt-9.22.jar", "accessors-smart-2.4.7.jar", "asm-9.1.jar",
                    "content-type-2.1.jar", "lang-tag-1.5.jar" })),

    VERTICA_9(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 9.X", "VERTICA_9_0", "vertica-jdbc-9.3.1-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -95,19 +96,19 @@ public enum EDatabaseVersion4Drivers {
    GREENPLUM_PSQL(new DbVersion4Drivers(EDatabaseTypeName.GREENPLUM,"PostgreSQL", "POSTGRESQL", "postgresql-8.4-703.jdbc4.jar")), //$NON-NLS-1$
    GREENPLUM(new DbVersion4Drivers(EDatabaseTypeName.GREENPLUM,"Greenplum", "GREENPLUM", "greenplum-5.1.4.000275.jar")), //$NON-NLS-1$
 //    PSQL_V10(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "v10", "V10", "postgresql-42.2.5.jar")),
-    PSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "v9 and later", "V9_X", "postgresql-42.2.14.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    PSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "v9 and later", "V9_X", "postgresql-42.2.26.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    PSQL_PRIOR_TO_V9(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "Prior to v9", "PRIOR_TO_V9", "postgresql-8.4-703.jdbc4.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

    PLUSPSQL_PRIOR_TO_V9(new DbVersion4Drivers(EDatabaseTypeName.PLUSPSQL,
            "Prior to v9", "PRIOR_TO_V9", "postgresql-8.4-703.jdbc4.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    PLUSPSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PLUSPSQL, "v9 and later", "V9_X", "postgresql-42.2.14.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    PLUSPSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PLUSPSQL, "v9 and later", "V9_X", "postgresql-42.2.26.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    IBMDB2(new DbVersion4Drivers(EDatabaseTypeName.IBMDB2, new String[] { "db2jcc4.jar", "db2jcc_license_cu.jar", //$NON-NLS-1$ //$NON-NLS-2$
            "db2jcc_license_cisuz.jar" })), //$NON-NLS-1$
    IBMDB2ZOS(new DbVersion4Drivers(EDatabaseTypeName.IBMDB2ZOS, new String[] { "db2jcc4.jar", "db2jcc_license_cu.jar", //$NON-NLS-1$ //$NON-NLS-2$
            "db2jcc_license_cisuz.jar" })), //$NON-NLS-1$
    SYBASEASE(new DbVersion4Drivers(EDatabaseTypeName.SYBASEASE, "Sybase 12/15", "SYBSEIQ_12_15", "jconn3.jar")), //$NON-NLS-1$
    SYBASEIQ_16(new DbVersion4Drivers(EDatabaseTypeName.SYBASEASE, "Sybase 16", "SYBSEIQ_16", "jconn4.jar")), //$NON-NLS-1$
-    SYBASEIQ_16_SA(new DbVersion4Drivers(EDatabaseTypeName.SYBASEASE, "Sybase 16 (SQL Anywhere)", "SYBSEIQ_16_SA", "sajdbc4-17.0.0.jar")),
+    SYBASEIQ_16_SA(new DbVersion4Drivers(EDatabaseTypeName.SYBASEASE, "Sybase 16 (SQL Anywhere) and above", "SYBSEIQ_16_SA", "sajdbc4-17.0.0.jar")),
    SYBASEIQ(new DbVersion4Drivers(EDatabaseTypeName.SYBASEIQ, "jconn3.jar")), //$NON-NLS-1$

    EXASOL(new DbVersion4Drivers(EDatabaseTypeName.EXASOL, "exajdbc-6.0.9302.jar")), //$NON-NLS-1$
@@ -155,7 +156,8 @@ public enum EDatabaseVersion4Drivers {
    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.11.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
                    "jackson-databind-2.11.4.jar", "jackson-annotations-2.11.4.jar", "httpcore-4.4.13.jar", "httpclient-4.5.13.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$//$NON-NLS-4$
-                    "joda-time-2.8.1.jar", "commons-logging-1.2.jar", "commons-codec-1.14.jar" })), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                    "joda-time-2.8.1.jar", "commons-logging-1.2.jar", "commons-codec-1.14.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                    "aws-java-sdk-redshift-internal-1.12.x.jar" })), //$NON-NLS-1$

    AMAZON_AURORA(new DbVersion4Drivers(EDatabaseTypeName.AMAZON_AURORA, "mysql-connector-java-5.1.49.jar")); //$NON-NLS-1$

@@ -311,8 +313,8 @@ public enum EDatabaseVersion4Drivers {

    private static Set<String> getDriversByDriverVersion(EDatabaseVersion4Drivers v4d, String version) {
        Set<String> drivers = new HashSet<String>();
-        if (REDSHIFT == v4d) {
-            drivers = ERedshiftDriver.getDriversByVersion(version);
+        if (REDSHIFT == v4d || REDSHIFT_SSO == v4d) {
+            drivers = ERedshiftDriver.getDriversByVersion(v4d, version);
        }
        return drivers;
    }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/conf/EHadoopProperties.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/conf/EHadoopProperties.java
@@ -130,6 +130,10 @@ public enum EHadoopProperties {
    
    SYNAPSE_CLIENT_KEY,
    
+    SYNAPSE_USE_CERTIFICATE,
+    
+    SYNAPSE_CLIENT_CERTIFICATE,
+    
    DEPLOY_FOLDER,
    
    SPARK_DRIVER_MEM,
@@ -148,7 +152,21 @@ public enum EHadoopProperties {
    
    DATABRICKS_TOKEN,
    
-    DATABRICKS_DBFS_DEP_FOLDER;
+    DATABRICKS_DBFS_DEP_FOLDER,
+    
+    DATABRICKS_NODE_TYPE,
+    
+    DATABRICKS_DRIVER_NODE_TYPE,
+    
+    DATABRICKS_RUNTIME_VERSION,
+    
+    DATABRICKS_CLUSTER_TYPE,
+    
+    UNIV_STANDALONE_MASTER,
+    
+    UNIV_STANDALONE_EXEC_MEMORY,
+    
+    UNIV_STANDALONE_EXEC_CORE;

    public String getName() {
        return this.name();
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/context/ContextUtils.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/context/ContextUtils.java
@@ -766,11 +766,11 @@ public class ContextUtils {
            return ContextUtils.getContextTypeByName(contextItem, contextName, true);
        } else if (item instanceof JobletProcessItem) {
            JobletProcessItem jobletProcessItem = (JobletProcessItem) item;
-            return ContextUtils.getContextTypeByName((List<ContextType>) jobletProcessItem.getJobletProcess().getContext(),
+            return ContextUtils.getContextTypeByName(jobletProcessItem.getJobletProcess().getContext(),
                    contextName, jobletProcessItem.getJobletProcess().getDefaultContext());
        } else if (item instanceof ProcessItem) {
            ProcessItem processItem = (ProcessItem) item;
-            return ContextUtils.getContextTypeByName((List<ContextType>) processItem.getProcess().getContext(), contextName,
+            return ContextUtils.getContextTypeByName(processItem.getProcess().getContext(), contextName,
                    processItem.getProcess().getDefaultContext());
        }
        return null;
@@ -1134,5 +1134,31 @@ public class ContextUtils {
        }
        return list;
    }
+
+    public static IContext convert2IContext(ContextType contextType) {
+        return convert2IContext(contextType, null);
+    }
+
+    public static IContext convert2IContext(ContextType contextType, String repositoryContextId) {
+        if (contextType == null) {
+            return null;
+        }
+        IContext jobContext = new JobContext(contextType.getName());
+        List<ContextParameterType> repoParams = contextType.getContextParameter();
+        for (ContextParameterType repoParam : repoParams) {
+            IContextParameter jobParam = new JobContextParameter();
+            jobParam.setName(repoParam.getName());
+            jobParam.setContext(jobContext);
+            jobParam.setComment(repoParam.getComment());
+            jobParam.setPrompt(repoParam.getPrompt());
+            jobParam.setPromptNeeded(repoParam.isPromptNeeded());
+            jobParam.setSource(repositoryContextId != null ? repositoryContextId : repoParam.getRepositoryContextId());
+            jobParam.setType(repoParam.getType());
+            jobParam.setValue(repoParam.getValue());
+            jobParam.setInternalId(repoParam.getInternalId());
+            jobContext.getContextParameterList().add(jobParam);
+        }
+        return jobContext;
+    }
 }

--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/general/ModuleNeeded.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/general/ModuleNeeded.java
@@ -13,17 +13,16 @@
 package org.talend.core.model.general;

 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;

 import org.apache.commons.lang.StringUtils;
 import org.eclipse.core.runtime.Path;
 import org.osgi.framework.Version;
+import org.talend.commons.CommonsPlugin;
+import org.talend.commons.exception.CommonExceptionHandler;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.ILibraryManagerService;
@@ -108,7 +107,7 @@ public class ModuleNeeded {

    private Map<String, String> attributes;

-    ILibraryManagerService libManagerService = (ILibraryManagerService) GlobalServiceRegister.getDefault()
+    ILibraryManagerService libManagerService = GlobalServiceRegister.getDefault()
            .getService(ILibraryManagerService.class);
    

@@ -369,7 +368,7 @@ public class ModuleNeeded {
    }

    public ELibraryInstallStatus getStatus() {
-        ILibraryManagerService libManagerService = (ILibraryManagerService) GlobalServiceRegister.getDefault()
+        ILibraryManagerService libManagerService = GlobalServiceRegister.getDefault()
                .getService(ILibraryManagerService.class);
        libManagerService.checkModuleStatus(this);
        String mvnUriStatusKey = getMavenUri();
@@ -378,7 +377,7 @@ public class ModuleNeeded {
    }

    public ELibraryInstallStatus getDeployStatus() {
-        ILibraryManagerService libManagerService = (ILibraryManagerService) GlobalServiceRegister.getDefault()
+        ILibraryManagerService libManagerService = GlobalServiceRegister.getDefault()
                .getService(ILibraryManagerService.class);
        libManagerService.checkModuleStatus(this);
        String mvnUriStatusKey = getMavenUri();
@@ -715,6 +714,21 @@ public class ModuleNeeded {
        if (!StringUtils.isEmpty(mavenUriFromConfiguration)) {
            this.mavenUri = mavenUriFromConfiguration;
        }
+        String generateModuleName = MavenUrlHelper.generateModuleNameByMavenURI(this.mavenUri);
+        if (StringUtils.isNotBlank(generateModuleName)) {
+
+            if (!StringUtils.equals(getModuleName(), generateModuleName)) {
+
+                if (CommonsPlugin.isDebugMode() && StringUtils.isNotBlank(this.context)) {
+
+                    CommonExceptionHandler
+                            .warn("module name definition should be " + generateModuleName + ", not " + getModuleName()
+                                    + " :" + this.context);
+                }
+
+                setModuleName(generateModuleName);
+            }
+        }
    }

    public boolean usedByDynamicDistribution() {
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/general/RetrieveResult.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/general/RetrieveResult.java
@@ -0,0 +1,42 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.model.general;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class RetrieveResult {
+
+    private boolean allResolved;
+
+    private Set<ModuleNeeded> resovledModules = new HashSet<>();
+
+    private Set<ModuleNeeded> unresolvedModules = new HashSet<>();
+
+    public boolean isAllResolved() {
+        return allResolved;
+    }
+
+    public void setAllResolved(boolean allResolved) {
+        this.allResolved = allResolved;
+    }
+
+    public Set<ModuleNeeded> getResovledModules() {
+        return resovledModules;
+    }
+
+    public Set<ModuleNeeded> getUnresolvedModules() {
+        return unresolvedModules;
+    }
+
+}
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/IMetadataConnection.java
+++ b/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
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataTalendType.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataTalendType.java
@@ -16,6 +16,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.net.URL;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -24,18 +25,20 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;

 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;

 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang.StringUtils;
 import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ProjectScope;
 import org.eclipse.core.runtime.CoreException;
@@ -46,9 +49,9 @@ import org.eclipse.core.runtime.Platform;
 import org.osgi.framework.Bundle;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.SystemException;
+import org.talend.commons.runtime.xml.XmlUtil;
+import org.talend.commons.utils.io.FilesUtils;
 import org.talend.commons.utils.workbench.resources.ResourceUtils;
-import org.talend.core.GlobalServiceRegister;
-import org.talend.core.ICoreService;
 import org.talend.core.database.EDatabaseTypeName;
 import org.talend.core.language.ECodeLanguage;
 import org.talend.core.language.LanguageManager;
@@ -59,6 +62,8 @@ import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.runtime.i18n.Messages;
 import org.talend.core.utils.TalendQuoteUtils;
 import org.talend.repository.ProjectManager;
+import org.talend.repository.model.RepositoryConstants;
+import org.talend.utils.json.JSONObject;
 import org.talend.utils.xml.XmlUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
@@ -75,14 +80,13 @@ import org.xml.sax.SAXException;
 */
 public final class MetadataTalendType {

-    /**
-     *
-     */
    public static final String INTERNAL_MAPPINGS_FOLDER = "mappings"; //$NON-NLS-1$

    public static final String PROJECT_MAPPING_FOLDER = ".settings/mappings"; //$NON-NLS-1$

-    public static final String UPDATED_MAPPING_FILES = "updated.mapping.files"; //$NON-NLS-1$
+    public static final String FILE_MAPPING_REVISION = "mapping_revision.json"; //$NON-NLS-1$
+
+    public static final String MAPPING_FILE_PATTERN = "^mapping_.*\\.xml$"; //$NON-NLS-1$

    private static ECodeLanguage codeLanguage;

@@ -459,13 +463,14 @@ public final class MetadataTalendType {
        return list;
    }

-    public static URL getSystemForderURLOfMappingsFile() throws SystemException {
+    public static URL getSystemFolderURLOfMappingsFile() throws SystemException {
        String dirPath = "/" + INTERNAL_MAPPINGS_FOLDER; //$NON-NLS-1$
        URL url = null;
        Path filePath = new Path(dirPath);
        Bundle b = Platform.getBundle(CoreRuntimePlugin.PLUGIN_ID);
        if (b != null) {
            try {
+                // Enumeration<URL> entries = b.findEntries(dirPath, "mapping_*.xml", false);
                url = FileLocator.toFileURL(FileLocator.find(b, filePath, null));
            } catch (IOException e) {
                throw new SystemException(e);
@@ -474,46 +479,169 @@ public final class MetadataTalendType {
        return url;
    }

-    public static URL getProjectForderURLOfMappingsFile() throws SystemException {
+    public static URL getProjectFolderURLOfMappingsFile() throws SystemException {
        try {
            String dirPath = "/" + INTERNAL_MAPPINGS_FOLDER; //$NON-NLS-1$
            IProject project = ResourceUtils.getProject(ProjectManager.getInstance().getCurrentProject());
            IPath settingPath = new ProjectScope(project).getLocation();
-            IPath mappingPath = settingPath.append(dirPath);
-            File mappingFolder = mappingPath.toFile();
-            if (!mappingFolder.exists() || mappingFolder.listFiles().length < 1) {
-                ICoreService service = null;
-                if (GlobalServiceRegister.getDefault().isServiceRegistered(ICoreService.class)) {
-                    service = GlobalServiceRegister.getDefault().getService(ICoreService.class);
-                    service.syncMappingsFileFromSystemToProject();
-                }
-            }
-            return mappingFolder.toURL();
+            File mappingFolder = settingPath.append(dirPath).toFile();
+            return mappingFolder.toURI().toURL();
        } catch (Exception e) {
            throw new SystemException(e);
        }
    }

-    private static String getSha1OfFile(File file) {
-        String sha1 = null;
-        FileInputStream fileInputStream = null;
+    public static URL getProjectTempMappingFolder() {
        try {
-            fileInputStream = new FileInputStream(file);
-            sha1 = DigestUtils.shaHex(fileInputStream);
+            IProject project = ResourceUtils.getProject(ProjectManager.getInstance().getCurrentProject());
+            File folder = ResourceUtils
+                    .getFolder(project, RepositoryConstants.TEMP_DIRECTORY + "/" + INTERNAL_MAPPINGS_FOLDER, false).getLocation()
+                    .toFile();
+            syncMappingFiles(folder, false);
+            return folder.toURI().toURL();
        } catch (Exception e) {
            ExceptionHandler.process(e);
-        } finally {
-            if (fileInputStream != null) {
-                try {
-                    fileInputStream.close();
-                } catch (IOException e) {
-                    e.printStackTrace(); // Just print the exception for debug.
+            return null;
+        }
+    }
+
+    public static void syncMappingFiles(File target, boolean rename) {
+        if (!target.exists()) {
+            target.mkdir();
+        }
+        File[] arr = target.listFiles(f -> f.getName().matches(MAPPING_FILE_PATTERN));
+        if (arr == null) {
+            arr = new File[0];
+        }
+        try {
+            Map<String, File> targetFileMap = Stream.of(arr).collect(Collectors.toMap(File::getName, Function.identity()));
+            Map<String, File> workingFileMap = getWorkingMappingFiles().stream()
+                    .collect(Collectors.toMap(f -> getTargetName(f, rename), Function.identity(), (f1, f2) -> f1));
+
+            targetFileMap.entrySet().stream().filter(entry -> !workingFileMap.containsKey(entry.getKey()))
+                    .forEach(entry -> entry.getValue().delete());
+
+            for (Entry<String, File> entry : workingFileMap.entrySet()) {
+                String targetName = entry.getKey();
+                File workingMappingFile = entry.getValue();
+                boolean needUpdate = false;
+                File targetMappingFile = targetFileMap.get(targetName);
+                if (targetMappingFile == null) {
+                    targetMappingFile = new File(target, targetName);
+                    needUpdate = true;
+                } else if (!getSha1OfFile(workingMappingFile).equals(getSha1OfFile(targetMappingFile))) {
+                    needUpdate = true;
+                }
+                if (needUpdate) {
+                    if (targetMappingFile.exists()) {
+                        targetMappingFile.delete();
+                    }
+                    FilesUtils.copyFile(workingMappingFile, targetMappingFile);
                }
            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
        }
-        return sha1;
+    }
+
+    public static String getTargetName(File file, boolean rename) {
+        String targetName = file.getName();
+        if (!rename) {
+            return targetName;
+        }
+        try {
+            DocumentBuilderFactory documentBuilderFactory = XmlUtils.getSecureDocumentBuilderFactory();
+            DocumentBuilder analyser = documentBuilderFactory.newDocumentBuilder();
+            Document document = analyser.parse(file);
+            NodeList dbmsNodes = document.getElementsByTagName("dbms"); //$NON-NLS-1$
+            String dbmsIdValue = "";
+            for (int iDbms = 0; iDbms < dbmsNodes.getLength(); iDbms++) {
+                Node dbmsNode = dbmsNodes.item(iDbms);
+                NamedNodeMap dbmsAttributes = dbmsNode.getAttributes();
+                dbmsIdValue = dbmsAttributes.getNamedItem("id").getNodeValue(); //$NON-NLS-1$
+
+            }
+            if (dbmsIdValue != null && !"".equals(dbmsIdValue)) {
+                final String[] fileNameSplit = targetName.split("_");
+                String idA = "_id";
+                String idB = "id_";
+                final int indexA = dbmsIdValue.indexOf(idA);
+                final int indexB = dbmsIdValue.indexOf(idB);
+                String secondeName = "";
+                if (indexA > 0) {
+                    secondeName = dbmsIdValue.substring(0, dbmsIdValue.length() - idA.length());
+                } else if (indexB == 0) {
+                    secondeName = dbmsIdValue.substring(idB.length(), dbmsIdValue.length());
+                } else if (indexA == -1 && indexB == -1) {
+                    secondeName = dbmsIdValue;
+                }
+                if (secondeName != null && !"".equals(secondeName)) {
+                    targetName = fileNameSplit[0] + "_" + secondeName.toLowerCase() + XmlUtil.FILE_XML_SUFFIX;
+                }
+
+            }
+        } catch (ParserConfigurationException e) {
+            ExceptionHandler.process(e);
+        } catch (SAXException e) {
+            ExceptionHandler.process(e);
+        } catch (IOException e) {
+            ExceptionHandler.process(e);
+        }
+        return targetName;
+    }
+
+    public static JSONObject getRevisionObject() {
+        try {
+            File revisonFile = new File(MetadataTalendType.getSystemFolderURLOfMappingsFile().getFile(),
+                    MetadataTalendType.FILE_MAPPING_REVISION);
+            String jsonStr = new String(Files.readAllBytes(revisonFile.toPath()));
+            return new JSONObject(jsonStr);
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+        return new JSONObject();
+    }
+
+    public static boolean restoreMappingFiles() throws Exception {
+        List<File> toDelete = new ArrayList<>();
+        JSONObject revision = getRevisionObject();
+        File projectMappingFolder = new File(getProjectFolderURLOfMappingsFile().getFile());
+        if (projectMappingFolder.exists()) {
+            File[] projectMappingFiles = projectMappingFolder.listFiles(f -> f.getName().matches(MAPPING_FILE_PATTERN));
+            if (projectMappingFiles != null) {
+                for (File file : projectMappingFiles) {
+                    if (revision.has(file.getName())) {
+                        String sha1 = MetadataTalendType.getSha1OfFile(file);
+                        if (revision.getJSONObject(file.getName()).has(sha1)) {
+                            toDelete.add(file);
+                        }
+                    }
+                }
+            }
+            File xsd = new File(projectMappingFolder, "mapping_validate.xsd"); //$NON-NLS-1$
+            if (xsd.exists()) {
+                xsd.delete();
+            }
+        }
+        toDelete.forEach(File::delete);
+        return !toDelete.isEmpty();
+    }
+
+    public static String getSha1OfFile(File file) {
+        try {
+            String text = new String(Files.readAllBytes(file.toPath()));
+            return getSha1OfText(text);
+        } catch (IOException e) {
+            ExceptionHandler.process(e);
+        }
+        return null;
    }
    
+    public static String getSha1OfText(String text) {
+        text = text.replace("\r\n", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
+        return DigestUtils.sha1Hex(text);
+    }
+
    public static void copyFile(File in, IFile out) throws CoreException, IOException {
        FileInputStream fis = new FileInputStream(in);
        if (out.exists()) {
@@ -524,49 +652,6 @@ public final class MetadataTalendType {
        fis.close();
    }

-    public static void syncNewMappingFileToProject() throws SystemException {
-        try {
-            File sysMappingFiles = new File(MetadataTalendType.getSystemForderURLOfMappingsFile().getPath());
-            IFolder projectMappingFolder = ResourceUtils.getProject(ProjectManager.getInstance().getCurrentProject())
-                    .getFolder(MetadataTalendType.PROJECT_MAPPING_FOLDER);
-            File projectMappingFiles = new File(projectMappingFolder.getLocationURI());
-            if (!sysMappingFiles.exists() || !projectMappingFiles.exists()) {
-                return;
-            }
-            for (File sysMapping : sysMappingFiles.listFiles()) {
-                IFile projectMapping = projectMappingFolder.getFile(sysMapping.getName());
-                if (projectMapping.exists() && StringUtils.equals(sysMapping.getName(), "mapping_Greenplum.xml")) {
-
-                    String sha1OfFile = DigestUtils.shaHex(projectMapping.getContents());
-                    String shalOfOldSystem = "8431f19215dacb3caa126778ae695954552cce2a";
-                    if (StringUtils.equals(sha1OfFile, shalOfOldSystem)) {
-                        copyFile(sysMapping, projectMapping);
-                    }
-                }
-                if (!projectMapping.exists()) {
-                    FileInputStream fis = null;
-                    try {
-                        fis = new FileInputStream(sysMapping);
-                        projectMapping.create(fis, true, null);
-                    } catch (CoreException coreExc) {
-                        throw new SystemException(coreExc);
-                    } finally {
-                        if (fis != null) {
-                            try {
-                                fis.close();
-                            } catch (IOException ioExc) {
-                                throw new SystemException(ioExc);
-                            }
-                        }
-                    }
-                }
-            }
-
-        } catch (Exception e) {
-            throw new SystemException(e);
-        }
-    }
-
    /**
     *
     * Load db types and mapping with the current activated language (Java, Perl, ...).
@@ -574,20 +659,38 @@ public final class MetadataTalendType {
     * @throws SystemException
     */
    public static void loadCommonMappings() throws SystemException {
-        URL url = getProjectForderURLOfMappingsFile();
-        File dir = new File(url.getPath());
        metadataMappingFiles = new ArrayList<File>();
        dbmsSet.clear();
-        if (dir.isDirectory()) {
-            File[] files = dir.listFiles();
-            for (File file : files) {
-                if (file.getName().matches("^mapping_.*\\.xml$")) { //$NON-NLS-1$
-                    loadMapping(file);
-                    metadataMappingFiles.add(file);
-                }
-            }
+        for (File file : getWorkingMappingFiles()) {
+            loadMapping(file);
+            metadataMappingFiles.add(file);
        }
+    }

+    public static List<File> getWorkingMappingFiles() throws SystemException {
+        File projectMappingFolder = new File(getProjectFolderURLOfMappingsFile().getFile());
+        File[] projectMappingFiles = projectMappingFolder.listFiles(f -> f.getName().matches(MAPPING_FILE_PATTERN));
+        File systemMappingFolder = new File(getSystemFolderURLOfMappingsFile().getFile());
+        File[] systemMappingFiles = systemMappingFolder.listFiles(f -> f.getName().matches(MAPPING_FILE_PATTERN));
+        if (projectMappingFiles == null || projectMappingFiles.length == 0) {
+            return Arrays.asList(systemMappingFiles);
+        }
+        List<File> workingMappingFiles = new ArrayList<>();
+        Map<String, File> projectMappingFilesMap = Stream.of(projectMappingFiles)
+                .collect(Collectors.toMap(File::getName, Function.identity()));
+        workingMappingFiles.addAll(projectMappingFilesMap.values());
+        Stream.of(systemMappingFiles).filter(f -> !projectMappingFilesMap.containsKey(f.getName()))
+                .forEach(f -> workingMappingFiles.add(f));
+        return workingMappingFiles;
+    }
+
+    public static String getSha1OfSystemMappingFile(String fileName) {
+        try {
+            return getSha1OfFile(new File(getSystemFolderURLOfMappingsFile().getFile(), fileName));
+        } catch (SystemException e) {
+            ExceptionHandler.process(e);
+            return null;
+        }
    }

    private static void loadMapping(File file) throws SystemException {
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/builder/ConvertionHelper.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/builder/ConvertionHelper.java
@@ -260,6 +260,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);
@@ -273,7 +274,8 @@ public final class ConvertionHelper {

    private static String getDriverVersionString(DatabaseConnection dbConn) {
        String dbVersionString = dbConn.getDbVersionString();
-        if (EDatabaseTypeName.REDSHIFT.getDisplayName().equals(dbConn.getDatabaseType())) {
+        if (EDatabaseTypeName.REDSHIFT.getDisplayName().equals(dbConn.getDatabaseType())
+                || EDatabaseTypeName.REDSHIFT_SSO.getDisplayName().equals(dbConn.getDatabaseType())) {
            EMap<String, String> parameters = dbConn.getParameters();
            if (parameters != null) {
                String driverString = parameters.get(ConnParameterKeys.CONN_PARA_KEY_REDSHIFT_DRIVER);
@@ -727,7 +729,8 @@ public final class ConvertionHelper {
                            origValueConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_SSL_KEY_STORE_PASSWORD), false));
                }
            }
-        } else if (EDatabaseTypeName.REDSHIFT.getDisplayName().equals(origValueConn.getDatabaseType())) {
+        } else if (EDatabaseTypeName.REDSHIFT.getDisplayName().equals(origValueConn.getDatabaseType())
+                || EDatabaseTypeName.REDSHIFT_SSO.getDisplayName().equals(origValueConn.getDatabaseType())) {
            Properties info = new Properties();
            EMap<String, String> parameters = origValueConn.getParameters();
            if (parameters != null
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/builder/MetadataConnection.java
+++ b/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)
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/designerproperties/ComponentToRepositoryProperty.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/designerproperties/ComponentToRepositoryProperty.java
@@ -489,6 +489,11 @@ public class ComponentToRepositoryProperty {
            }
        }

+        else if (EDatabaseTypeName.REDSHIFT_SSO.getDbType().equals((String) parameter.getValue())) {
+            connection.setProductId(EDatabaseTypeName.REDSHIFT_SSO.getProduct());
+            connection.setDatabaseType(EDatabaseTypeName.REDSHIFT_SSO.getDisplayName());
+        }
+
        // NeTezza
        else if (EDatabaseTypeName.NETEZZA.getProduct().equalsIgnoreCase((String) parameter.getValue())) {
            connection.setDatabaseType(EDatabaseTypeName.NETEZZA.getDisplayName());
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/designerproperties/RepositoryToComponentProperty.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/designerproperties/RepositoryToComponentProperty.java
@@ -1045,8 +1045,13 @@ public class RepositoryToComponentProperty {
            return Boolean.valueOf(connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_REDSHIFT_STRINGPARA));
        }
        if (value.equals("ENTRY_PROPERTIES")) {
-            return ConvertionHelper
-                    .getEntryProperties(connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_REDSHIFT_PARATABLE));
+            List<Map<String, Object>> tableProperties = new ArrayList<Map<String, Object>>();
+            String propertiesInfo = connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_REDSHIFT_PARATABLE);
+            if (org.apache.commons.lang.StringUtils.isNotBlank(propertiesInfo)) {
+                tableProperties = ConvertionHelper
+                        .getEntryProperties(connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_REDSHIFT_PARATABLE));
+            }
+            return tableProperties;
        }
        if (value.equals("DRIVER_VERSION")) {
            String driverVersion = connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_REDSHIFT_DRIVER);
@@ -1245,6 +1250,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()));
        }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/ElementParameterParser.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/ElementParameterParser.java
@@ -24,6 +24,7 @@ import org.eclipse.ui.preferences.ScopedPreferenceStore;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.utils.PasswordEncryptUtil;
 import org.talend.commons.utils.generation.CodeGenerationUtils;
+import org.talend.core.GlobalServiceRegister;
 import org.talend.core.language.ECodeLanguage;
 import org.talend.core.language.LanguageManager;
 import org.talend.core.model.metadata.types.JavaType;
@@ -37,6 +38,7 @@ import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.model.utils.JavaResourcesHelper;
 import org.talend.core.model.utils.SQLPatternUtils;
 import org.talend.core.runtime.CoreRuntimePlugin;
+import org.talend.core.service.IDesignerXMLMapperService;
 import org.talend.core.utils.TalendQuoteUtils;
 import org.talend.designer.core.model.utils.emf.talendfile.ContextType;
 import org.talend.designer.core.model.utils.emf.talendfile.ElementParameterType;
@@ -293,8 +295,7 @@ public final class ElementParameterParser {

        List<IElementParameter> params = (List<IElementParameter>) element.getElementParametersWithChildrens();
        if (params != null && !params.isEmpty()) {
-            for (int i = 0; i < params.size(); i++) {
-                IElementParameter param = params.get(i);
+            for (IElementParameter param : params) {
                if (text.indexOf(param.getVariableName()) != -1
                        || (param.getVariableName() != null && param.getVariableName().contains(text))) {
                    if (param.getFieldType() == EParameterFieldType.TABLE) {
@@ -422,8 +423,8 @@ public final class ElementParameterParser {
        }
        IElementParameter param;

-        for (int i = 0; i < element.getElementParameters().size(); i++) {
-            param = element.getElementParameters().get(i);
+        for (IElementParameter element2 : element.getElementParameters()) {
+            param = element2;
            if (text.indexOf(param.getVariableName()) != -1) {
                if (param.getFieldType() == EParameterFieldType.TABLE) {
                    return createTableValuesXML((List<Map<String, Object>>) param.getValue(), param);
@@ -483,7 +484,21 @@ public final class ElementParameterParser {
        if (element instanceof INode) {
            INode node = (INode) element;
            if (node.getExternalNode() != null) {
-                return EcoreUtil.copy(node.getExternalNode().getExternalEmfData());
+                Object obj = null;
+                if (node.isVirtualGenerateNode()) {
+                    if (GlobalServiceRegister.getDefault().isServiceRegistered(IDesignerXMLMapperService.class)) {
+                        final IDesignerXMLMapperService service = GlobalServiceRegister.getDefault()
+                                .getService(IDesignerXMLMapperService.class);
+                        if (service != null) {
+                            obj = service.rebuildXmlMapData(node.getExternalNode());
+                        }
+                    }
+                }
+                if (obj != null) {
+                    return obj;
+                } else {
+                    return EcoreUtil.copy(node.getExternalNode().getExternalEmfData());
+                }
            }
        }
        return null;
@@ -496,8 +511,8 @@ public final class ElementParameterParser {
        }
        IElementParameter param;
        newText = text;
-        for (int i = 0; i < element.getElementParameters().size(); i++) {
-            param = element.getElementParameters().get(i);
+        for (IElementParameter element2 : element.getElementParameters()) {
+            param = element2;
            if (newText.contains(param.getVariableName())) {
                String value = getDisplayValue(param);
                newText = newText.replace(param.getVariableName(), value);
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/ElementParameterValueModel.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/ElementParameterValueModel.java
@@ -0,0 +1,86 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.model.process;
+
+import java.util.Objects;
+
+import org.apache.commons.lang.StringUtils;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class ElementParameterValueModel {
+
+    private String label;
+
+    private String value;
+
+    /**
+     * Getter for lebel.
+     * 
+     * @return the lebel
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the lebel.
+     * 
+     * @param lebel the lebel to set
+     */
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    /**
+     * Getter for value.
+     * 
+     * @return the value
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value.
+     * 
+     * @param value the value to set
+     */
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return StringUtils.isNotBlank(this.label) ? this.label : this.value;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(label, value);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        ElementParameterValueModel other = (ElementParameterValueModel) obj;
+        return Objects.equals(label, other.label) && Objects.equals(value, other.value);
+    }
+
+}
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/relationship/AbstractJobParameterInRepositoryRelationshipHandler.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/relationship/AbstractJobParameterInRepositoryRelationshipHandler.java
@@ -37,7 +37,7 @@ public abstract class AbstractJobParameterInRepositoryRelationshipHandler extend
        Set<Relation> relationSet = new HashSet<Relation>();

        for (ElementParameterType paramType : parametersMap.values()) {
-            if (paramType.getName().endsWith(":" + getRepositoryTypeName())) { //$NON-NLS-1$
+            if (paramType.getName() != null && paramType.getName().endsWith(":" + getRepositoryTypeName())) { //$NON-NLS-1$
                String name = paramType.getName().split(":")[0]; //$NON-NLS-1$
                ElementParameterType repositoryTypeParam = parametersMap.get(name + ":" //$NON-NLS-1$
                        + getRepositoryTypeName());
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/update/IStudioUpdateConfig.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/update/IStudioUpdateConfig.java
@@ -0,0 +1,52 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.model.update;
+
+import java.util.Date;
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public interface IStudioUpdateConfig {
+
+    Boolean isEnabled();
+
+    IStudioUpdate getStudioUpdate();
+
+    public interface IStudioUpdate {
+
+        String getName();
+
+        String getStudioVersion();
+
+        Date getReleaseDate();
+
+        Date getApprovedDate();
+
+        String getInfoUrl();
+
+        String getBaseUrl();
+
+        String getUpdateUrl();
+
+        String getApprovedBy();
+
+        String getApprovedName();
+
+        String getProjectId();
+
+        Boolean isCustom();
+
+    }
+
+}
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/update/StudioUpdateConfig.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/update/StudioUpdateConfig.java
@@ -0,0 +1,169 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.model.update;
+
+import java.util.Date;
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public class StudioUpdateConfig implements IStudioUpdateConfig {
+
+    private Boolean enabled;
+
+    private IStudioUpdate studioUpdate;
+
+    @Override
+    public Boolean isEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(Boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    @Override
+    public IStudioUpdate getStudioUpdate() {
+        return studioUpdate;
+    }
+
+    public void setStudioUpdate(IStudioUpdate studioUpdate) {
+        this.studioUpdate = studioUpdate;
+    }
+
+    public static class StudioUpdate implements IStudioUpdate {
+
+        private String name;
+
+        private String studioVersion;
+
+        private String updateUrl;
+
+        private Date releaseDate;
+
+        private String infoUrl;
+
+        private String baseUrl;
+
+        private String approvedBy;
+
+        private String approvedName;
+
+        private Date approvedDate;
+
+        private String projectId;
+
+        private Boolean custom;
+
+        @Override
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public String getStudioVersion() {
+            return studioVersion;
+        }
+
+        public void setStudioVersion(String studioVersion) {
+            this.studioVersion = studioVersion;
+        }
+
+        @Override
+        public String getUpdateUrl() {
+            return updateUrl;
+        }
+
+        public void setUpdateUrl(String updateUrl) {
+            this.updateUrl = updateUrl;
+        }
+
+        @Override
+        public Date getReleaseDate() {
+            return releaseDate;
+        }
+
+        public void setReleaseDate(Date releaseDate) {
+            this.releaseDate = releaseDate;
+        }
+
+        @Override
+        public String getInfoUrl() {
+            return infoUrl;
+        }
+
+        public void setInfoUrl(String infoUrl) {
+            this.infoUrl = infoUrl;
+        }
+
+        @Override
+        public String getBaseUrl() {
+            return baseUrl;
+        }
+
+        public void setBaseUrl(String baseUrl) {
+            this.baseUrl = baseUrl;
+        }
+
+        @Override
+        public String getApprovedBy() {
+            return approvedBy;
+        }
+
+        public void setApprovedBy(String approvedBy) {
+            this.approvedBy = approvedBy;
+        }
+
+        @Override
+        public String getApprovedName() {
+            return approvedName;
+        }
+
+        public void setApprovedName(String approvedName) {
+            this.approvedName = approvedName;
+        }
+
+        @Override
+        public Date getApprovedDate() {
+            return approvedDate;
+        }
+
+        public void setApprovedDate(Date approvedDate) {
+            this.approvedDate = approvedDate;
+        }
+
+        @Override
+        public String getProjectId() {
+            return projectId;
+        }
+
+        public void setProjectId(String projectId) {
+            this.projectId = projectId;
+        }
+
+        @Override
+        public Boolean isCustom() {
+            return custom;
+        }
+
+        public void setCustom(Boolean custom) {
+            this.custom = custom;
+        }
+
+    }
+
+}
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/nexus/TalendLibsServerManager.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/nexus/TalendLibsServerManager.java
@@ -27,6 +27,7 @@ import org.talend.core.runtime.projectsetting.ProjectPreferenceManager;
 import org.talend.core.service.IRemoteService;
 import org.talend.repository.model.IProxyRepositoryFactory;
 import org.talend.repository.model.RepositoryConstants;
+import org.talend.utils.security.StudioEncryption;

 /**
 * created by wchen on 2015年6月16日 Detailled comment
@@ -255,7 +256,7 @@ public class TalendLibsServerManager {
            if (enableProxyFlag) {
                serverBean.setServer(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_URL));
                serverBean.setUserName(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_USERNAME));
-                serverBean.setPassword(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_PASSWORD));
+                serverBean.setPassword(StudioEncryption.getStudioEncryption(StudioEncryption.EncryptionKeyName.SYSTEM).decrypt(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_PASSWORD)));
                serverBean.setRepositoryId(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_REPOSITORY_ID));
                serverBean.setType(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_TYPE));
            }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/PendoItemSignatureUtil.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/PendoItemSignatureUtil.java
@@ -0,0 +1,161 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.pendo;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.apache.commons.lang.StringUtils;
+import org.eclipse.emf.common.util.EMap;
+import org.talend.commons.utils.VersionUtils;
+import org.talend.core.model.general.Project;
+import org.talend.core.model.properties.Property;
+import org.talend.core.runtime.projectsetting.ProjectPreferenceManager;
+import org.talend.core.runtime.util.EmfResourceUtil;
+import org.talend.repository.ProjectManager;
+import org.talend.utils.security.CryptoMigrationUtil;
+import org.talend.utils.security.StudioEncryption;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class PendoItemSignatureUtil {
+
+    public static final String MIGRATION_TOKEN_KEY = "force_import_unsupported_job";
+
+    public static final String REPOSITORY_PLUGIN_ID = "org.talend.repository";
+
+    public static final String PROJ_DATE_ID = "repository.project.id";
+
+    public static final String PROD_DATE_ID = "product.date.id";
+
+    public static String getCurrentProjectCreateDate() {
+        Project currentProject = ProjectManager.getInstance().getCurrentProject();
+        if (currentProject != null) {
+            ProjectPreferenceManager projectPrefManager = new ProjectPreferenceManager(
+                    PendoItemSignatureUtil.REPOSITORY_PLUGIN_ID, false);
+            String projDate = projectPrefManager.getValue(PendoItemSignatureUtil.PROJ_DATE_ID);
+            if (StringUtils.isNotBlank(projDate)) {
+                String decrypt = null;
+                if (StudioEncryption.hasEncryptionSymbol(projDate)) {
+                    decrypt = StudioEncryption.getStudioEncryption(StudioEncryption.EncryptionKeyName.MIGRATION_TOKEN)
+                            .decrypt(projDate);
+                } else {
+                    decrypt = CryptoMigrationUtil.decrypt(projDate);
+                }
+                return decrypt;
+            }
+        }
+        return null;
+    }
+
+    public static String getStudioVersion() {
+        String studioVersion = VersionUtils.getDisplayVersion();
+        String patchInstalledVersion = PendoTrackDataUtil.getLatestPatchInstalledVersion();
+        if (StringUtils.isNotBlank(patchInstalledVersion)) {
+            studioVersion = patchInstalledVersion;
+        }
+        return studioVersion;
+    }
+
+    public static String getItemProductVersion(Property property) {
+        String productVersion = null;
+        EMap additionalProperties = property.getAdditionalProperties();
+        if (additionalProperties.get("modified_product_version") != null) {
+            productVersion = additionalProperties.get("modified_product_version").toString();
+        } else if (additionalProperties.get("created_product_version") != null) {
+            productVersion = additionalProperties.get("created_product_version").toString();
+        }
+        if (StringUtils.isNotBlank(productVersion)) {
+            productVersion = VersionUtils.getTalendPureVersion(productVersion);
+        }
+        return productVersion;
+    }
+
+    public static String getItemProductName(Property property) {
+        String productName = null;
+        EMap additionalProperties = property.getAdditionalProperties();
+        if (additionalProperties.get("modified_product_fullname") != null) {
+            productName = additionalProperties.get("modified_product_fullname").toString();
+        } else if (additionalProperties.get("created_product_fullname") != null) {
+            productName = additionalProperties.get("created_product_fullname").toString();
+        }
+        return productName;
+    }
+
+    public static String formatDate(String dateString, String pattern) {
+        String formattedDate = "";
+        if (StringUtils.isNotBlank(dateString)) {
+            Date date = new Date(Long.parseLong(dateString));
+            SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+            formattedDate = sdf.format(date);
+        }
+        return formattedDate;
+    }
+
+    public interface SignatureStatus {
+
+        public static final int V_VALID = 0;
+
+        public static final int V_INVALID = EmfResourceUtil.V_INVALID << 0;
+
+        public static final int V_UNSIGNED = V_INVALID << 1;
+    }
+
+    public enum TOSProdNameEnum {
+
+        TOS_DI("Talend Open Studio for Data Integration"),
+        TOS_BD("Talend Open Studio for Big Data"),
+        TOS_ESB("Talend Open Studio for ESB"),
+        TOS_TOP("Talend Open Studio for Data Quality");
+
+        private String prodName;
+
+        TOSProdNameEnum(String prodName) {
+            this.prodName = prodName;
+        }
+
+        public String getProdName() {
+            return prodName;
+        }
+
+        public static String getTOSCategoryByProdName(String prodName) {
+            String category = null;
+            for (TOSProdNameEnum tosProdNameEnum : TOSProdNameEnum.values()) {
+                if (tosProdNameEnum.getProdName().equals(prodName)) {
+                    category = tosProdNameEnum.name();
+                    break;
+                }
+            }
+            return category;
+        }
+
+    }
+
+    public enum ValueEnum {
+
+        YES("Y"),
+        NO("N"),
+        NOT_APPLICATE("N/A");
+
+        private String displayValue;
+
+        ValueEnum(String displayValue) {
+            this.displayValue = displayValue;
+        }
+
+        public String getDisplayValue() {
+            return displayValue;
+        }
+    }
+}
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/PendoTrackDataUtil.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/PendoTrackDataUtil.java
@@ -30,6 +30,7 @@ import org.talend.core.ui.IInstalledPatchService;
 import org.talend.repository.ProjectManager;
 import org.talend.utils.json.JSONObject;

+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;

 /**
@@ -60,11 +61,7 @@ public class PendoTrackDataUtil {
    }

    public static IPendoDataProperties getLoginEventProperties() {
-        String studioPatch = null;
-        IInstalledPatchService installedPatchService = IInstalledPatchService.get();
-        if (installedPatchService != null) {
-            studioPatch = installedPatchService.getLatestInstalledPatchVersion();
-        }
+        String studioPatch = getLatestPatchInstalledVersion();
        PendoLoginProperties loginEvent = new PendoLoginProperties();
        IStudioLiteP2Service studioLiteP2Service = IStudioLiteP2Service.get();
        try {
@@ -92,6 +89,15 @@ public class PendoTrackDataUtil {
        return loginEvent;
    }

+    public static String getLatestPatchInstalledVersion() {
+        String studioPatch = "";
+        IInstalledPatchService installedPatchService = IInstalledPatchService.get();
+        if (installedPatchService != null) {
+            studioPatch = installedPatchService.getLatestInstalledVersion(true);
+        }
+        return studioPatch;
+    }
+
    private static void setUpRefProjectsStructure(PendoLoginProperties loginEvent) {
        ProjectManager projectManager = ProjectManager.getInstance();
        Project currentProject = projectManager.getCurrentProject();
@@ -138,6 +144,19 @@ public class PendoTrackDataUtil {

    }

+    public static String convertEntityJsonString(Object entity) {
+        ObjectMapper mapper = new ObjectMapper();
+        try {
+            String content = mapper.writeValueAsString(entity);
+            if (StringUtils.isNotBlank(content)) {
+                return content;
+            }
+        } catch (JsonProcessingException e) {
+            ExceptionHandler.process(e);
+        }
+        return "";
+    }
+
    public enum TrackEvent {

        PROJECT_LOGIN("Project Login"),
@@ -146,7 +165,11 @@ public class PendoTrackDataUtil {
        USE_API_DEF("Use API Definition"),
        OPEN_IN_APIDesigner("Open in API Designer"),
        OPEN_IN_APITester("Open in API Tester"),
-        OPEN_API_DOCUMENTATION("Open API Documentation");
+        OPEN_API_DOCUMENTATION("Open API Documentation"),
+        AUTOMAP("tMap Automap"),
+        TMAP("tMap"),
+        ITEM_IMPORT("Import items"),
+        ITEM_SIGNATURE("Item Signature");

        private String event;

--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/PendoTrackSender.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/PendoTrackSender.java
@@ -55,6 +55,10 @@ import org.talend.utils.json.JSONObject;
 */
 public class PendoTrackSender {
    
+    public static final String PROP_PENDO_LOCAL_CHECK = "talend.pendo.localDebug";
+
+    public static final String PROP_PENDO_LOG_DATA = "talend.pendo.logRuntimeData";
+
    private static final String PREFIX_API = "api";

    private static final String PENDO_INFO = "/monitoring/pendo/info";
@@ -75,10 +79,18 @@ public class PendoTrackSender {

    private static String pendoInfo;

-    public static PendoTrackSender getInstance() {
-        if (instance == null) {
-            instance = new PendoTrackSender();
+    private PendoTrackSender() {
+    }
+
+    static {
+        instance = new PendoTrackSender();
+        RepositoryContext repositoryContext = getRepositoryContext();
+        if (repositoryContext != null) {
+            adminUrl = repositoryContext.getFields().get(RepositoryConstants.REPOSITORY_URL);
        }
+    }
+
+    public static PendoTrackSender getInstance() {
        if (StringUtils.isBlank(adminUrl)) {
            RepositoryContext repositoryContext = getRepositoryContext();
            if (repositoryContext != null) {
@@ -94,7 +106,9 @@ public class PendoTrackSender {
            @Override
            protected IStatus run(IProgressMonitor monitor) {
                try {
-                    sendTrackData(event, properties);
+                    if (isTrackSendAvailable()) {
+                        sendTrackData(event, properties);
+                    }
                } catch (Exception e) {
                    // warning only
                    ExceptionHandler.process(e, Level.WARN);
@@ -108,10 +122,10 @@ public class PendoTrackSender {
    }

    public void sendTrackData(TrackEvent event, IPendoDataProperties properties) throws Exception {
-        if (!checkTokenUsed(adminUrl) || !NetworkUtil.isNetworkValid()) {
+        if (isPendoLocalDebug()) {
+            ExceptionHandler.log(event.getEvent() + ":" + PendoTrackDataUtil.convertEntityJsonString(properties));
            return;
        }
-
        DefaultHttpClient client = null;
        CloseableHttpResponse response = null;
        IProxySelectorProvider proxySelectorProvider = null;
@@ -141,6 +155,9 @@ public class PendoTrackSender {
            response = client.execute(httpPost, HttpClientContext.create());
            StatusLine statusLine = response.getStatusLine();
            String responseStr = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
+            if (isLogPendoData()) {
+                ExceptionHandler.log(trackData);
+            }
            if (HttpURLConnection.HTTP_OK != statusLine.getStatusCode()) {
                throw new Exception(statusLine.toString() + ", server message: [" + responseStr + "]");
            }
@@ -164,6 +181,21 @@ public class PendoTrackSender {
        }
    }

+    public boolean isTrackSendAvailable() throws Exception {
+        if (isPendoLocalDebug() || checkTokenUsed(adminUrl) && NetworkUtil.isNetworkValid()) {
+            return true;
+        }
+        return false;
+    }
+
+    public boolean isPendoLocalDebug() {
+        return Boolean.TRUE.toString().equals(System.getProperty(PROP_PENDO_LOCAL_CHECK));
+    }
+
+    public boolean isLogPendoData() {
+        return Boolean.TRUE.toString().equals(System.getProperty(PROP_PENDO_LOG_DATA));
+    }
+
    private String getPendoInfo() throws Exception {
        if (StringUtils.isBlank(pendoInfo)) {
            pendoInfo = getPendoInfo(getBaseUrl(), getToken());
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/mapper/AbstractPendoTMapManager.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/mapper/AbstractPendoTMapManager.java
@@ -0,0 +1,54 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.pendo.mapper;
+
+import org.apache.log4j.Level;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.talend.commons.exception.ExceptionHandler;
+import org.talend.core.pendo.PendoTrackDataUtil.TrackEvent;
+import org.talend.core.pendo.PendoTrackSender;
+import org.talend.core.pendo.properties.PendoTMapProperties;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public abstract class AbstractPendoTMapManager {
+
+    protected abstract PendoTMapProperties calculateProperties();
+
+    public void sendTrackToPendo() {
+        Job job = new Job("send pendo track") {
+
+            @Override
+            protected IStatus run(IProgressMonitor monitor) {
+                try {
+                    if (PendoTrackSender.getInstance().isTrackSendAvailable()) {
+                        PendoTMapProperties properties = calculateProperties();
+                        PendoTrackSender.getInstance().sendTrackData(TrackEvent.TMAP, properties);
+                    }
+                } catch (Exception e) {
+                    // warning only
+                    ExceptionHandler.process(e, Level.WARN);
+                }
+                return Status.OK_STATUS;
+            }
+        };
+        job.setUser(false);
+        job.setPriority(Job.INTERACTIVE);
+        job.schedule();
+    }
+
+}
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/mapper/PendoAutoMapManager.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/mapper/PendoAutoMapManager.java
@@ -0,0 +1,53 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.pendo.mapper;
+
+import org.talend.core.pendo.PendoTrackDataUtil.TrackEvent;
+import org.talend.core.pendo.PendoTrackSender;
+import org.talend.core.pendo.properties.PendoAutoMapProperties;
+
+/**
+ * Assume no multiple thread, one AutoMapper one PendoAutoMapManager
+ * 
+ * DOC jding class global comment. Detailled comment
+ */
+public class PendoAutoMapManager {
+    
+    private int mappingChangeCount = 0;
+
+    public void setMappingChangeCount(int mappingChangeCount) {
+        this.mappingChangeCount = mappingChangeCount;
+    }
+
+    public void incrementMappingChangeCount() {
+        this.mappingChangeCount++;
+    }
+
+    public void resetMappingChangeCount() {
+        this.mappingChangeCount = 0;
+    }
+
+    public int getMappingChangeCount() {
+        return mappingChangeCount;
+    }
+
+    public void sendTrackToPendo() {
+        if (mappingChangeCount < 1) {
+            return;
+        }
+        PendoAutoMapProperties properties = new PendoAutoMapProperties();
+        properties.setAutoMappings(mappingChangeCount);
+        PendoTrackSender.getInstance().sendToPendo(TrackEvent.AUTOMAP, properties);
+    }
+
+}
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/properties/PendoAutoMapProperties.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/properties/PendoAutoMapProperties.java
@@ -0,0 +1,45 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.pendo.properties;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class PendoAutoMapProperties implements IPendoDataProperties {
+
+    @JsonProperty("auto_mapping")
+    private int autoMappings;
+
+    /**
+     * Getter for autoMappings.
+     * 
+     * @return the autoMappings
+     */
+    public int getAutoMappings() {
+        return autoMappings;
+    }
+
+
+    /**
+     * Sets the autoMappings.
+     * 
+     * @param autoMappings the autoMappings to set
+     */
+    public void setAutoMappings(int autoMappings) {
+        this.autoMappings = autoMappings;
+    }
+
+
+}
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/properties/PendoSignImportProperties.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/properties/PendoSignImportProperties.java
@@ -0,0 +1,211 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.pendo.properties;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class PendoSignImportProperties implements IPendoDataProperties {
+
+    @JsonProperty("source_version")
+    private List<String> sourceVersion;
+
+    @JsonProperty("studio_version")
+    private String studioVersion;
+
+    @JsonProperty("valid_items")
+    private int validItems;
+
+    @JsonProperty("unsigned_items_from_SE")
+    private String unsignSEItems;
+
+    @JsonProperty("unsigned_items_from_EE")
+    private int unsignEEItems;
+
+    @JsonProperty("grace_period")
+    private String gracePeriod;
+
+    @JsonProperty("installed_date")
+    private String installDate;
+
+    @JsonProperty("project_creation_date")
+    private String projectCreateDate;
+
+    @JsonProperty("valid_migration_token")
+    private String validMigrationToken;
+
+
+    /**
+     * Getter for sourceVersion.
+     * @return the sourceVersion
+     */
+    public List<String> getSourceVersion() {
+        return sourceVersion;
+    }
+
+
+    /**
+     * Sets the sourceVersion.
+     * @param sourceVersion the sourceVersion to set
+     */
+    public void setSourceVersion(List<String> sourceVersion) {
+        this.sourceVersion = sourceVersion;
+    }
+
+    /**
+     * Getter for studioVersion.
+     * 
+     * @return the studioVersion
+     */
+    public String getStudioVersion() {
+        return studioVersion;
+    }
+
+    /**
+     * Sets the studioVersion.
+     * 
+     * @param studioVersion the studioVersion to set
+     */
+    public void setStudioVersion(String studioVersion) {
+        this.studioVersion = studioVersion;
+    }
+
+    /**
+     * Getter for validItems.
+     * 
+     * @return the validItems
+     */
+    public int getValidItems() {
+        return validItems;
+    }
+
+    /**
+     * Sets the validItems.
+     * 
+     * @param validItems the validItems to set
+     */
+    public void setValidItems(int validItems) {
+        this.validItems = validItems;
+    }
+
+    /**
+     * Getter for unsignSEItems.
+     * @return the unsignSEItems
+     */
+    public String getUnsignSEItems() {
+        return unsignSEItems;
+    }
+
+    /**
+     * Sets the unsignSEItems.
+     * @param unsignSEItems the unsignSEItems to set
+     */
+    public void setUnsignSEItems(String unsignSEItems) {
+        this.unsignSEItems = unsignSEItems;
+    }
+
+    /**
+     * Getter for unsignEEItems.
+     * 
+     * @return the unsignEEItems
+     */
+    public int getUnsignEEItems() {
+        return unsignEEItems;
+    }
+
+    /**
+     * Sets the unsignEEItems.
+     * 
+     * @param unsignEEItems the unsignEEItems to set
+     */
+    public void setUnsignEEItems(int unsignEEItems) {
+        this.unsignEEItems = unsignEEItems;
+    }
+
+    /**
+     * Getter for gracePeriod.
+     * 
+     * @return the gracePeriod
+     */
+    public String getGracePeriod() {
+        return gracePeriod;
+    }
+
+    /**
+     * Sets the gracePeriod.
+     * 
+     * @param gracePeriod the gracePeriod to set
+     */
+    public void setGracePeriod(String gracePeriod) {
+        this.gracePeriod = gracePeriod;
+    }
+
+    /**
+     * Getter for installDate.
+     * 
+     * @return the installDate
+     */
+    public String getInstallDate() {
+        return installDate;
+    }
+
+    /**
+     * Sets the installDate.
+     * 
+     * @param installDate the installDate to set
+     */
+    public void setInstallDate(String installDate) {
+        this.installDate = installDate;
+    }
+
+    /**
+     * Getter for projectCreateDate.
+     * 
+     * @return the projectCreateDate
+     */
+    public String getProjectCreateDate() {
+        return projectCreateDate;
+    }
+
+    /**
+     * Sets the projectCreateDate.
+     * 
+     * @param projectCreateDate the projectCreateDate to set
+     */
+    public void setProjectCreateDate(String projectCreateDate) {
+        this.projectCreateDate = projectCreateDate;
+    }
+
+    /**
+     * Getter for validMigrationToken.
+     * 
+     * @return the validMigrationToken
+     */
+    public String getValidMigrationToken() {
+        return validMigrationToken;
+    }
+
+    /**
+     * Sets the validMigrationToken.
+     * 
+     * @param validMigrationToken the validMigrationToken to set
+     */
+    public void setValidMigrationToken(String validMigrationToken) {
+        this.validMigrationToken = validMigrationToken;
+    }
+
+}
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/properties/PendoSignLogonProperties.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/properties/PendoSignLogonProperties.java
@@ -0,0 +1,251 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.pendo.properties;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class PendoSignLogonProperties implements IPendoDataProperties {
+
+    @JsonProperty("studio_version")
+    private String studioVersion;
+
+    @JsonProperty("valid_items")
+    private int validItems;
+
+    @JsonProperty("signature_invalid_items")
+    private int invalidSignItems;
+
+    @JsonProperty("unsigned_items_from_SE")
+    private String unsignSEItems;
+
+    @JsonProperty("unsigned_items_from_EE")
+    private int unsignEEItems;
+
+    @JsonProperty("invalid_item_source_version")
+    private String invalidItemSourceVersion;
+
+    @JsonProperty("signed_by_migration")
+    private int signByMigration;
+
+    @JsonProperty("grace_period")
+    private String gracePeriod;
+
+    @JsonProperty("installed_date")
+    private String installDate;
+
+    @JsonProperty("project_creation_date")
+    private String projectCreateDate;
+
+    @JsonProperty("valid_migration_token")
+    private String validMigrationToken;
+
+    /**
+     * Getter for studioVersion.
+     * 
+     * @return the studioVersion
+     */
+    public String getStudioVersion() {
+        return studioVersion;
+    }
+
+    /**
+     * Sets the studioVersion.
+     * 
+     * @param studioVersion the studioVersion to set
+     */
+    public void setStudioVersion(String studioVersion) {
+        this.studioVersion = studioVersion;
+    }
+
+    /**
+     * Getter for validItems.
+     * 
+     * @return the validItems
+     */
+    public int getValidItems() {
+        return validItems;
+    }
+
+    /**
+     * Sets the validItems.
+     * 
+     * @param validItems the validItems to set
+     */
+    public void setValidItems(int validItems) {
+        this.validItems = validItems;
+    }
+
+    /**
+     * Getter for invalidSignItems.
+     * 
+     * @return the invalidSignItems
+     */
+    public int getInvalidSignItems() {
+        return invalidSignItems;
+    }
+
+    /**
+     * Sets the invalidSignItems.
+     * 
+     * @param invalidSignItems the invalidSignItems to set
+     */
+    public void setInvalidSignItems(int invalidSignItems) {
+        this.invalidSignItems = invalidSignItems;
+    }
+
+    /**
+     * Getter for unsignSEItems.
+     * @return the unsignSEItems
+     */
+    public String getUnsignSEItems() {
+        return unsignSEItems;
+    }
+
+    /**
+     * Sets the unsignSEItems.
+     * @param unsignSEItems the unsignSEItems to set
+     */
+    public void setUnsignSEItems(String unsignSEItems) {
+        this.unsignSEItems = unsignSEItems;
+    }
+
+    /**
+     * Getter for unsignEEItems.
+     * 
+     * @return the unsignEEItems
+     */
+    public int getUnsignEEItems() {
+        return unsignEEItems;
+    }
+
+    /**
+     * Sets the unsignEEItems.
+     * 
+     * @param unsignEEItems the unsignEEItems to set
+     */
+    public void setUnsignEEItems(int unsignEEItems) {
+        this.unsignEEItems = unsignEEItems;
+    }
+
+    /**
+     * Getter for invalidItemSourceVersion.
+     * 
+     * @return the invalidItemSourceVersion
+     */
+    public String getInvalidItemSourceVersion() {
+        return invalidItemSourceVersion;
+    }
+
+    /**
+     * Sets the invalidItemSourceVersion.
+     * 
+     * @param invalidItemSourceVersion the invalidItemSourceVersion to set
+     */
+    public void setInvalidItemSourceVersion(String invalidItemSourceVersion) {
+        this.invalidItemSourceVersion = invalidItemSourceVersion;
+    }
+
+    /**
+     * Getter for signByMigration.
+     * 
+     * @return the signByMigration
+     */
+    public int getSignByMigration() {
+        return signByMigration;
+    }
+
+    /**
+     * Sets the signByMigration.
+     * 
+     * @param signByMigration the signByMigration to set
+     */
+    public void setSignByMigration(int signByMigration) {
+        this.signByMigration = signByMigration;
+    }
+
+    /**
+     * Getter for gracePeriod.
+     * 
+     * @return the gracePeriod
+     */
+    public String getGracePeriod() {
+        return gracePeriod;
+    }
+
+    /**
+     * Sets the gracePeriod.
+     * 
+     * @param gracePeriod the gracePeriod to set
+     */
+    public void setGracePeriod(String gracePeriod) {
+        this.gracePeriod = gracePeriod;
+    }
+
+    /**
+     * Getter for installDate.
+     * 
+     * @return the installDate
+     */
+    public String getInstallDate() {
+        return installDate;
+    }
+
+    /**
+     * Sets the installDate.
+     * 
+     * @param installDate the installDate to set
+     */
+    public void setInstallDate(String installDate) {
+        this.installDate = installDate;
+    }
+
+    /**
+     * Getter for projectCreateDate.
+     * 
+     * @return the projectCreateDate
+     */
+    public String getProjectCreateDate() {
+        return projectCreateDate;
+    }
+
+    /**
+     * Sets the projectCreateDate.
+     * 
+     * @param projectCreateDate the projectCreateDate to set
+     */
+    public void setProjectCreateDate(String projectCreateDate) {
+        this.projectCreateDate = projectCreateDate;
+    }
+
+    /**
+     * Getter for validMigrationToken.
+     * 
+     * @return the validMigrationToken
+     */
+    public String getValidMigrationToken() {
+        return validMigrationToken;
+    }
+
+    /**
+     * Sets the validMigrationToken.
+     * 
+     * @param validMigrationToken the validMigrationToken to set
+     */
+    public void setValidMigrationToken(String validMigrationToken) {
+        this.validMigrationToken = validMigrationToken;
+    }
+
+}
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/properties/PendoTMapProperties.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/properties/PendoTMapProperties.java
@@ -0,0 +1,462 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.pendo.properties;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class PendoTMapProperties implements IPendoDataProperties {
+
+    /**
+     * Number of input columns
+     */
+    @JsonProperty("input_columns")
+    private int inputColumns;
+
+    /**
+     * Number of output columns
+     */
+    @JsonProperty("output_columns")
+    private int outputColumns;
+
+    /**
+     * Number of var columns
+     */
+    @JsonProperty("var_columns")
+    private int varColumns;
+
+    /**
+     * Number of input tables which have at least 1 mapping to an output table
+     */
+    @JsonProperty("number_of_sources")
+    private int sourceNumber;
+
+    /**
+     * Number of output tables have mapping from the main input table 
+     */
+    @JsonProperty("number_of_destinations")
+    private int destinationNumber;
+
+    /**
+     * Number of output tables
+     */
+    @JsonProperty("number_of_outputs")
+    private int outputNumber;
+
+    /**
+     * Number of expressions without java transformation(expressions in input_columns/var_columns/output_columns but not
+     * include filter expressions)
+     */
+    @JsonProperty("simple_expressions")
+    private int simpleExpressions;
+
+    /**
+     * Number of expressions with java transformation(expressions in input_columns/var_columns/output_columns but not
+     * include filter expressions)
+     */
+    @JsonProperty("transformed_expressions")
+    private int transformExpressions;
+
+    /**
+     * Number of mappings(links) between input and var
+     */
+    @JsonProperty("input_var_mapping")
+    private int inputVarMappings;
+
+    /**
+     * Number of mappings(links) between var and output
+     */
+    @JsonProperty("var_output_mapping")
+    private int varOutputMappings;
+
+    /**
+     * Number of mappings(links) between input and output
+     */
+    @JsonProperty("input_output_mapping")
+    private int inputOutputMappings;
+
+    /**
+     * Number of input columns which are mapped to multiple output columns, either mapped directly or mapped through the
+     * Var column
+     */
+    @JsonProperty("1-to-n mapping")
+    private int oneToNMappings;
+
+    /**
+     * Number of output columns which have multiple source columns, either input columns or var columns
+     */
+    @JsonProperty("n-to-1 mapping")
+    private int nToOneMappings;
+
+    /**
+     * Number of mappings(links) between main input table and join tables
+     */
+    @JsonProperty("join_mappings")
+    private int joinMappingCounts;
+
+    /**
+     * Number of left out join used in join table
+     */
+    @JsonProperty("left_joins")
+    private int leftJoinCounts;
+
+    /**
+     * Number of inner join used in join table
+     */
+    @JsonProperty("inner_joins")
+    private int innerJoinCounts;
+
+    /**
+     * Number of filter activated on input/output tables  
+     */
+    @JsonProperty("filters")
+    private int filterCounts;
+
+    /**
+     * Number of field types for each type in OUTPUT tables
+     */
+    @JsonProperty("field_types")
+    private String outputFieldTypes;
+
+
+    /**
+     * Getter for inputColumns.
+     * @return the inputColumns
+     */
+    public int getInputColumns() {
+        return inputColumns;
+    }
+
+
+    /**
+     * Sets the inputColumns.
+     * @param inputColumns the inputColumns to set
+     */
+    public void setInputColumns(int inputColumns) {
+        this.inputColumns = inputColumns;
+    }
+
+
+    /**
+     * Getter for outputColumns.
+     * @return the outputColumns
+     */
+    public int getOutputColumns() {
+        return outputColumns;
+    }
+
+
+    /**
+     * Sets the outputColumns.
+     * @param outputColumns the outputColumns to set
+     */
+    public void setOutputColumns(int outputColumns) {
+        this.outputColumns = outputColumns;
+    }
+
+
+    /**
+     * Getter for varColumns.
+     * @return the varColumns
+     */
+    public int getVarColumns() {
+        return varColumns;
+    }
+
+
+    /**
+     * Sets the varColumns.
+     * @param varColumns the varColumns to set
+     */
+    public void setVarColumns(int varColumns) {
+        this.varColumns = varColumns;
+    }
+
+
+    /**
+     * Getter for sourceNumber.
+     * @return the sourceNumber
+     */
+    public int getSourceNumber() {
+        return sourceNumber;
+    }
+
+
+    /**
+     * Sets the sourceNumber.
+     * @param sourceNumber the sourceNumber to set
+     */
+    public void setSourceNumber(int sourceNumber) {
+        this.sourceNumber = sourceNumber;
+    }
+
+
+    /**
+     * Getter for destinationNumber.
+     * @return the destinationNumber
+     */
+    public int getDestinationNumber() {
+        return destinationNumber;
+    }
+
+
+    /**
+     * Sets the destinationNumber.
+     * @param destinationNumber the destinationNumber to set
+     */
+    public void setDestinationNumber(int destinationNumber) {
+        this.destinationNumber = destinationNumber;
+    }
+
+
+    /**
+     * Getter for outputNumber.
+     * @return the outputNumber
+     */
+    public int getOutputNumber() {
+        return outputNumber;
+    }
+
+
+    /**
+     * Sets the outputNumber.
+     * @param outputNumber the outputNumber to set
+     */
+    public void setOutputNumber(int outputNumber) {
+        this.outputNumber = outputNumber;
+    }
+
+
+    /**
+     * Getter for simpleExpressions.
+     * 
+     * @return the simpleExpressions
+     */
+    public int getSimpleExpressions() {
+        return simpleExpressions;
+    }
+
+
+    /**
+     * Sets the simpleExpressions.
+     * 
+     * @param simpleExpressions the simpleExpressions to set
+     */
+    public void setSimpleExpressions(int simpleExpressions) {
+        this.simpleExpressions = simpleExpressions;
+    }
+
+
+    /**
+     * Getter for transformExpressions.
+     * 
+     * @return the transformExpressions
+     */
+    public int getTransformExpressions() {
+        return transformExpressions;
+    }
+
+
+    /**
+     * Sets the transformExpressions.
+     * 
+     * @param transformExpressions the transformExpressions to set
+     */
+    public void setTransformExpressions(int transformExpressions) {
+        this.transformExpressions = transformExpressions;
+    }
+
+
+    /**
+     * Getter for inputVarMappings.
+     * @return the inputVarMappings
+     */
+    public int getInputVarMappings() {
+        return inputVarMappings;
+    }
+
+
+    /**
+     * Sets the inputVarMappings.
+     * @param inputVarMappings the inputVarMappings to set
+     */
+    public void setInputVarMappings(int inputVarMappings) {
+        this.inputVarMappings = inputVarMappings;
+    }
+
+
+    /**
+     * Getter for varOutputMappings.
+     * @return the varOutputMappings
+     */
+    public int getVarOutputMappings() {
+        return varOutputMappings;
+    }
+
+
+    /**
+     * Sets the varOutputMappings.
+     * @param varOutputMappings the varOutputMappings to set
+     */
+    public void setVarOutputMappings(int varOutputMappings) {
+        this.varOutputMappings = varOutputMappings;
+    }
+
+
+    /**
+     * Getter for inputOutputMappings.
+     * @return the inputOutputMappings
+     */
+    public int getInputOutputMappings() {
+        return inputOutputMappings;
+    }
+
+
+    /**
+     * Sets the inputOutputMappings.
+     * @param inputOutputMappings the inputOutputMappings to set
+     */
+    public void setInputOutputMappings(int inputOutputMappings) {
+        this.inputOutputMappings = inputOutputMappings;
+    }
+
+
+    /**
+     * Getter for oneToNMappings.
+     * @return the oneToNMappings
+     */
+    public int getOneToNMappings() {
+        return oneToNMappings;
+    }
+
+
+    /**
+     * Sets the oneToNMappings.
+     * @param oneToNMappings the oneToNMappings to set
+     */
+    public void setOneToNMappings(int oneToNMappings) {
+        this.oneToNMappings = oneToNMappings;
+    }
+
+
+    /**
+     * Getter for nToOneMappings.
+     * @return the nToOneMappings
+     */
+    public int getnToOneMappings() {
+        return nToOneMappings;
+    }
+
+
+    /**
+     * Sets the nToOneMappings.
+     * @param nToOneMappings the nToOneMappings to set
+     */
+    public void setnToOneMappings(int nToOneMappings) {
+        this.nToOneMappings = nToOneMappings;
+    }
+
+
+    /**
+     * Getter for joinMappingCounts.
+     * @return the joinMappingCounts
+     */
+    public int getJoinMappingCounts() {
+        return joinMappingCounts;
+    }
+
+
+    /**
+     * Sets the joinMappingCounts.
+     * @param joinMappingCounts the joinMappingCounts to set
+     */
+    public void setJoinMappingCounts(int joinMappingCounts) {
+        this.joinMappingCounts = joinMappingCounts;
+    }
+
+
+    /**
+     * Getter for leftJoinCounts.
+     * @return the leftJoinCounts
+     */
+    public int getLeftJoinCounts() {
+        return leftJoinCounts;
+    }
+
+
+    /**
+     * Sets the leftJoinCounts.
+     * @param leftJoinCounts the leftJoinCounts to set
+     */
+    public void setLeftJoinCounts(int leftJoinCounts) {
+        this.leftJoinCounts = leftJoinCounts;
+    }
+
+
+    /**
+     * Getter for innerJoinCounts.
+     * @return the innerJoinCounts
+     */
+    public int getInnerJoinCounts() {
+        return innerJoinCounts;
+    }
+
+
+    /**
+     * Sets the innerJoinCounts.
+     * @param innerJoinCounts the innerJoinCounts to set
+     */
+    public void setInnerJoinCounts(int innerJoinCounts) {
+        this.innerJoinCounts = innerJoinCounts;
+    }
+
+
+    /**
+     * Getter for filterCounts.
+     * @return the filterCounts
+     */
+    public int getFilterCounts() {
+        return filterCounts;
+    }
+
+
+    /**
+     * Sets the filterCounts.
+     * @param filterCounts the filterCounts to set
+     */
+    public void setFilterCounts(int filterCounts) {
+        this.filterCounts = filterCounts;
+    }
+
+
+    /**
+     * Getter for outputFieldTypes.
+     * @return the outputFieldTypes
+     */
+    public String getOutputFieldTypes() {
+        return outputFieldTypes;
+    }
+
+
+    /**
+     * Sets the outputFieldTypes.
+     * @param outputFieldTypes the outputFieldTypes to set
+     */
+    public void setOutputFieldTypes(String outputFieldTypes) {
+        this.outputFieldTypes = outputFieldTypes;
+    }
+
+
+}
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/prefs/ITalendCorePrefConstants.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/prefs/ITalendCorePrefConstants.java
@@ -12,8 +12,6 @@
 // ============================================================================
 package org.talend.core.prefs;

-import org.talend.commons.utils.network.ITalendNexusPrefConstants;
-
 /**
 * Core preferences. Detailled comment <br/>
 *
@@ -187,8 +185,6 @@ public interface ITalendCorePrefConstants {

    public static final String PERFORMANCE_JAVA_PROCESS_CODE_FORMATE_TIMEOUT = "PERFORMANCE_JAVA_PROCESS_CODE_FORMATE_TIMEOUT"; //$NON-NLS-1$

-    public static final String NEXUS_TIMEOUT = ITalendNexusPrefConstants.NEXUS_TIMEOUT;
-
    public static final String NEXUS_REFRESH_FREQUENCY = "NEXUS_REFRESH_FREQUENCY"; //$NON-NLS-1$

    /**
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/prefs/SecurityPreferenceConstants.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/prefs/SecurityPreferenceConstants.java
@@ -0,0 +1,31 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.prefs;
+
+
+/**
+ * created by hcyi on May 17, 2022
+ * Detailled comment
+ *
+ */
+public class SecurityPreferenceConstants {
+
+    public static final String SIGNER_PATH = "signer.path"; //$NON-NLS-1$
+
+    public static final String SIGNER_KEYSTORE_PASSWORD = "signer.keystore.password"; //$NON-NLS-1$
+
+    public static final String SIGNER_KEY_PASSWORD = "signer.key.password"; //$NON-NLS-1$
+
+    public static final String SIGNER_KEY_ALIAS = "signer.key.alias"; //$NON-NLS-1$
+
+}
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages.properties
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages.properties
@@ -449,7 +449,7 @@ repository.rulesSql=SQL
 repository.rulesParser=Parser
 repository.rulesMatcher=Match
 repository.systemIndicators=System Indicators
-repository.userDefineIndicators=User Defined Indicators
+repository.userDefineIndicators=User-defined Indicators
 repository.userDefineIndicators.lib=lib
 repository.systemIndicators.advancedStatistics=Advanced Statistics
 repository.systemIndicators.businessRules=Business Rules
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages_ja.properties
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages_ja.properties
@@ -305,13 +305,13 @@ RepositoryUpdateManager.Check=\u30C1\u30A7\u30C3\u30AF\u4E2D...
 RepositoryUpdateManager.Messages=\u5909\u66F4\u3092\u3059\u3079\u3066\u306E\u30B8\u30E7\u30D6\u306B\u30D7\u30ED\u30D1\u30B2\u30FC\u30C8\u3057\u307E\u3059\u304B? \n \u3053\u306E\u64CD\u4F5C\u306B\u306F\u975E\u5E38\u306B\u9577\u3044\u6642\u9593\u304C\u304B\u304B\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002
 RepositoryUpdateManager.MessagesForTDQ=\u5909\u66F4\u3092\u3059\u3079\u3066\u306E\u30B8\u30E7\u30D6\u306B\u30D7\u30ED\u30D1\u30B2\u30FC\u30C8\u3057\u307E\u3059\u304B?\n\u307E\u305F\u3001\u4E00\u90E8\u306E\u5206\u6790\u4F9D\u5B58\u9805\u76EE\u3067\u60C5\u5831\u304C\u5931\u308F\u308C\u307E\u3059\u3002\n\u3053\u306E\u64CD\u4F5C\u306B\u306F\u975E\u5E38\u306B\u9577\u3044\u6642\u9593\u304C\u304B\u304B\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002
 RepositoryUpdateManager.NoModificationTitle=\u5909\u66F4\u4E0D\u8981
-RepositoryUpdateManager.NoModificationMessages=\u66F4\u65B0\u306B\u5FC5\u8981\u306A\u5909\u66F4\u304C\u3042\u308A\u307E\u305B\u3093\u3002
+RepositoryUpdateManager.NoModificationMessages=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306B\u5FC5\u8981\u306A\u5909\u66F4\u304C\u3042\u308A\u307E\u305B\u3093\u3002
 RepositoryUpdateManager.NotFoundMessages=\u95A2\u4FC2\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
 RepositoryUpdateManager.NotFoundTitle=\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-RepositoryUpdateManager.RenameContextMessagesNoBuiltIn=\u540D\u524D\u5909\u66F4\u5909\u6570\u3092\u4ECA\u3059\u3050\u3059\u3079\u3066\u306E\u30B8\u30E7\u30D6\u306B\u30D7\u30ED\u30D1\u30B2\u30FC\u30C8\u3057\u307E\u3059\u304B? \n\n [\u306F\u3044]\u3092\u9078\u629E\u3059\u308B\u3068\u3001\u66F4\u65B0\u306B\u975E\u5E38\u306B\u9577\u3044\u6642\u9593\u304C\u304B\u304B\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002
+RepositoryUpdateManager.RenameContextMessagesNoBuiltIn=\u540D\u524D\u5909\u66F4\u5909\u6570\u3092\u4ECA\u3059\u3050\u3059\u3079\u3066\u306E\u30B8\u30E7\u30D6\u306B\u30D7\u30ED\u30D1\u30B2\u30FC\u30C8\u3057\u307E\u3059\u304B? \n\n [\u306F\u3044]\u3092\u9078\u629E\u3059\u308B\u3068\u3001\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306B\u975E\u5E38\u306B\u9577\u3044\u6642\u9593\u304C\u304B\u304B\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002
 RepositoryUpdateManager.RenameContextTitle=\u540D\u524D\u5909\u66F4\u306E\u8CEA\u554F
-RepositoryUpdateManager.ItemsToUpdate=\u66F4\u65B0\u3059\u308B\u30A2\u30A4\u30C6\u30E0\u3092\u30C1\u30A7\u30C3\u30AF
-RepositoryUpdateManager.job.title=\u30A2\u30A4\u30C6\u30E0\u3092\u66F4\u65B0\u4E2D...
+RepositoryUpdateManager.ItemsToUpdate=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3059\u308B\u30A2\u30A4\u30C6\u30E0\u3092\u30C1\u30A7\u30C3\u30AF
+RepositoryUpdateManager.job.title=\u30A2\u30A4\u30C6\u30E0\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u4E2D...
 RoutinesFunctionProposal.CreatedBy=\u4F5C\u6210\u8005:
 RoutinesFunctionProposal.Description=\u8AAC\u660E:
 RoutinesFunctionProposal.Example=\u4F8B:
@@ -402,7 +402,7 @@ repository.SAPIDoc=SAP iDoc
 repository.SAPTable=SAP\u30C6\u30FC\u30D6\u30EB
 repository.metadataSQLPatterns=SQL\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8
 repository.metadataSQLPatterns.alias=SQLTemplates
-repository.metadataFileDelimited=\u533A\u5207\u308A\u6587\u5B57\u4ED8\u304D\u30D5\u30A1\u30A4\u30EB
+repository.metadataFileDelimited=\u533A\u5207\u308A\u4ED8\u304D\u30D5\u30A1\u30A4\u30EB
 repository.metadataFileDelimited.alias=DELIM
 repository.metadataTable=\u30E1\u30BF\u30C7\u30FC\u30BF\u30B9\u30AD\u30FC\u30DE
 repository.metadataColumn=\u30E1\u30BF\u30C7\u30FC\u30BF\u30AB\u30E9\u30E0
@@ -449,7 +449,7 @@ repository.rulesSql=SQL
 repository.rulesParser=\u30D1\u30FC\u30B5\u30FC
 repository.rulesMatcher=\u4E00\u81F4
 repository.systemIndicators=\u30B7\u30B9\u30C6\u30E0\u30A4\u30F3\u30C7\u30A3\u30B1\u30FC\u30BF\u30FC
-repository.userDefineIndicators=\u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u30A4\u30F3\u30B8\u30B1\u30FC\u30BF\u30FC
+repository.userDefineIndicators=\u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u306E\u30A4\u30F3\u30B8\u30B1\u30FC\u30BF\u30FC
 repository.userDefineIndicators.lib=lib
 repository.systemIndicators.advancedStatistics=\u8A73\u7D30\u7D71\u8A08
 repository.systemIndicators.businessRules=\u30D3\u30B8\u30CD\u30B9\u30EB\u30FC\u30EB
@@ -483,11 +483,11 @@ EUpdateItemType.Name=\u540D\u524D
 EUpdateItemType.JobVersion=\u30B8\u30E7\u30D6\u30D0\u30FC\u30B8\u30E7\u30F3
 EUpdateItemType.ValidationRule=\u691C\u8A3C\u30EB\u30FC\u30EB
 EUpdateResult.BuiltIn=\u7D44\u307F\u8FBC\u307F\u30E2\u30FC\u30C9\u306B\u5909\u66F4
-EUpdateResult.JobletUpdate=\u30B8\u30E7\u30D6\u30EC\u30C3\u30C8\u30CE\u30FC\u30C9\u306E\u66F4\u65B0
-EUpdateResult.JobUpdate=\u30B8\u30E7\u30D6\u30CE\u30FC\u30C9\u306E\u66F4\u65B0
-EUpdateResult.PathUpdate=\u30DE\u30C3\u30D7\u30D1\u30B9\u306E\u66F4\u65B0
-EUpdateResult.StructurePathUpdate=\u30B9\u30C8\u30E9\u30AF\u30C1\u30E3\u30FC\u30D1\u30B9\u306E\u66F4\u65B0
-EUpdateResult.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u304B\u3089\u66F4\u65B0
+EUpdateResult.JobletUpdate=\u30B8\u30E7\u30D6\u30EC\u30C3\u30C8\u30CE\u30FC\u30C9\u306E\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+EUpdateResult.JobUpdate=\u30B8\u30E7\u30D6\u30CE\u30FC\u30C9\u306E\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+EUpdateResult.PathUpdate=\u30DE\u30C3\u30D7\u30D1\u30B9\u306E\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+EUpdateResult.StructurePathUpdate=\u30B9\u30C8\u30E9\u30AF\u30C1\u30E3\u30FC\u30D1\u30B9\u306E\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+EUpdateResult.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u304B\u3089\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
 EUpdateResult.Reload=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30EA\u30ED\u30FC\u30C9
 EUpdateResult.Rename=\u540D\u524D\u3092\u5909\u66F4
 EUpdateResult.Add=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u304B\u3089\u8FFD\u52A0
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages_zh_CN.properties
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages_zh_CN.properties
@@ -1,6 +1,6 @@

-AbstractBrandingService_job_license_header_content=// ============================================================================\n//\n// \u7248\u6743\u6240\u6709 (c) 2005-2010, Talend Inc.\n//\n\u6B64\u6E90\u4EE3\u7801\u5DF2\u7531_{0} \u81EA\u52A8\u751F\u6210\n// / JobDesigner (CodeGenerator \u7248\u672C {1})\n// \u60A8\u53EF\u4EE5\u8BBF\u95EE www.talend.com \u4E86\u89E3 Talend \u4EA7\u54C1\u7684\u66F4\u591A\u4FE1\u606F\u3002\n// \u60A8\u53EF\u4EE5\u6839\u636E GNU LGPL \u8BB8\u53EF\u8BC1\u6761\u6B3E\u5206\u53D1\u6B64\u4EE3\u7801\n// http://www.gnu.org/licenses/lgpl.html)\u3002\n//\n// ============================================================================
-AbstractBrandingService.routines_license_header_content2014=\u7248\u6743\u6240\u6709 (c) 2006-2014, Talend Inc.\n//\n\u6B64\u6E90\u4EE3\u7801\u5DF2\u7531_{0} \u81EA\u52A8\u751F\u6210\n// CodeGenerator \u7248\u672C {1}\n// \u60A8\u53EF\u4EE5\u8BBF\u95EE www.talend.com \u4E86\u89E3 Talend \u4EA7\u54C1\u7684\u66F4\u591A\u4FE1\u606F\u3002\n// \u60A8\u53EF\u4EE5\u6839\u636E GNU LGPL \u8BB8\u53EF\u8BC1\u6761\u6B3E\u5206\u53D1\u6B64\u4EE3\u7801\n// http://www.gnu.org/licenses/lgpl.html)\u3002
+AbstractBrandingService_job_license_header_content=// ============================================================================\n//\n// \u7248\u6743\u6240\u6709 (c) 2005-2010, Talend Inc.\n//\n// \u6B64\u6E90\u4EE3\u7801\u5DF2\u7531_{0} \u81EA\u52A8\u751F\u6210\n// / JobDesigner (CodeGenerator \u7248\u672C {1})\n// \u60A8\u53EF\u4EE5\u8BBF\u95EE www.talend.com \u4E86\u89E3 Talend \u4EA7\u54C1\u7684\u66F4\u591A\u4FE1\u606F\u3002\n// \u60A8\u53EF\u4EE5\u6839\u636E GNU LGPL \u8BB8\u53EF\u8BC1\u6761\u6B3E\u5206\u53D1\u6B64\u4EE3\u7801\n// http://www.gnu.org/licenses/lgpl.html)\u3002\n//\n// ============================================================================
+AbstractBrandingService.routines_license_header_content2014=\u7248\u6743\u6240\u6709 (c) 2006-2014, Talend Inc.\n//\n// \u6B64\u6E90\u4EE3\u7801\u5DF2\u7531_{0} \u81EA\u52A8\u751F\u6210\n// CodeGenerator \u7248\u672C {1}\n// \u60A8\u53EF\u4EE5\u8BBF\u95EE www.talend.com \u4E86\u89E3 Talend \u4EA7\u54C1\u7684\u66F4\u591A\u4FE1\u606F\u3002\n// \u60A8\u53EF\u4EE5\u6839\u636E GNU LGPL \u8BB8\u53EF\u8BC1\u6761\u6B3E\u5206\u53D1\u6B64\u4EE3\u7801\n// http://www.gnu.org/licenses/lgpl.html)\u3002
 AbstractComponentsProvider.folderNotExist=\u6587\u4EF6\u5939 {0} \u4E0D\u5B58\u5728\u3002
 AbstractItemMigrationTask.taskFailed=\u8FC1\u79FB\u4EFB\u52A1 {0} \u5728\u8FC1\u79FB\u9879\u76EE {1} \u65F6\u5931\u8D25
 AdvancedSocketFactory.failedInitial=\u9519\u8BEF\uFF1A\u65E0\u6CD5\u521D\u59CB\u5316\uFF1A
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/maven/MavenConstants.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/maven/MavenConstants.java
@@ -19,7 +19,9 @@ package org.talend.core.runtime.maven;
 public interface MavenConstants {

    static final String NAME_GROUP_ID = "GROUP_ID";
-
+    
+    static final String CLOUD_VERSION = "CLOUD_VERSION";
+    
    static final String NAME_USER_VERSION = "USER_VERSION";

    static final String NAME_PUBLISH_AS_SNAPSHOT = "PUBLISH_AS_SNAPSHOT";
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/process/TalendProcessOptionConstants.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/process/TalendProcessOptionConstants.java
@@ -48,6 +48,10 @@ public interface TalendProcessOptionConstants {
    
    public static final int GENERATE_POM_NOT_CLEAR_CACHE = 1 << 11;

+    /**
+     * for DQ clean item
+     */
+    public static final int GENERATE_NO_RESET_DQ = 1 << 12;
    /**
     * clean options
     */
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/IDesignerXMLMapperService.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/IDesignerXMLMapperService.java
@@ -30,4 +30,6 @@ public interface IDesignerXMLMapperService extends IService {
     */
    public boolean isVirtualComponent(final INode node);

+    public Object rebuildXmlMapData(final INode node);
+
 }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/IDetectCVEService.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/IDetectCVEService.java
@@ -94,7 +94,11 @@ public interface IDetectCVEService extends IService {
            if (art == null) {
                return null;
            }
-            return String.format("%s:%s:%s", art.getGroupId(), art.getArtifactId(), art.getVersion());
+            String gavc = String.format("%s:%s:%s", art.getGroupId(), art.getArtifactId(), art.getVersion());
+            if (!StringUtils.isEmpty(art.getClassifier())) {
+                gavc += ":" + art.getClassifier();
+            }
+            return gavc;
        }
        return null;
    }
@@ -112,6 +116,8 @@ public interface IDetectCVEService extends IService {
        private String a;

        private String v;
+        
+        private String c;

        /**
         * @return the g
@@ -155,8 +161,28 @@ public interface IDetectCVEService extends IService {
            this.v = v;
        }

+        
+        /**
+         * @return the c
+         */
+        public String getC() {
+            return c;
+        }
+
+        
+        /**
+         * @param c the c to set
+         */
+        public void setC(String c) {
+            this.c = c;
+        }
+
        public String getGAVString() {
-            return String.format("%s:%s:%s", g, a, v);
+            String gav = String.format("%s:%s:%s", g, a, v);
+            if (!StringUtils.isEmpty(c)) {
+                gav += ":" + c;
+            }
+            return gav;
        }

        public String getGA() {
@@ -168,13 +194,16 @@ public interface IDetectCVEService extends IService {
                return null;
            }
            String[] gavs = gav.split(":");
-            if (gavs.length != 3) {
+            if (gavs.length < 3) {
                return null;
            }
            GAV ret = new GAV();
            ret.setG(gavs[0]);
            ret.setA(gavs[1]);
            ret.setV(gavs[2]);
+            if (gavs.length > 3) {
+                ret.setC(gavs[3]);
+            }
            return ret;
        }

@@ -184,19 +213,7 @@ public interface IDetectCVEService extends IService {
            }

            String gav = mavenUri2GAV(mavenURI);
-            if (StringUtils.isEmpty(gav)) {
-                return null;
-            }
-
-            String[] gavs = gav.split(":");
-            if (gavs.length != 3) {
-                return null;
-            }
-            GAV ret = new GAV();
-            ret.setG(gavs[0]);
-            ret.setA(gavs[1]);
-            ret.setV(gavs[2]);
-            return ret;
+            return parseFromGAV(gav);
        }

        public GAV clone() throws CloneNotSupportedException {
@@ -224,6 +241,12 @@ public interface IDetectCVEService extends IService {
                sb.append(v);
                sb.append(",");
            }
+            
+            if (!StringUtils.isEmpty(c)) {
+                sb.append("c:");
+                sb.append(c);
+                sb.append(",");
+            }

            if (sb.lastIndexOf(",") > 0) {
                sb.deleteCharAt(sb.length() - 1);
@@ -245,6 +268,9 @@ public interface IDetectCVEService extends IService {
            if (!StringUtils.isEmpty(v)) {
                hash += hash * 31 + v.hashCode();
            }
+            if (!StringUtils.isEmpty(c)) {
+                hash += hash * 31 + c.hashCode();
+            }
            return hash;
        }

@@ -267,8 +293,12 @@ public interface IDetectCVEService extends IService {
            if (!StringUtils.equals(a, gav.getA())) {
                return false;
            }
+            
+            if (!StringUtils.equals(v, gav.getV())) {
+                return false;
+            }

-            return StringUtils.equals(v, gav.getV());
+            return StringUtils.equals(c, gav.getC());

        }

--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/IMetadataManagmentUiService.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/IMetadataManagmentUiService.java
@@ -12,9 +12,14 @@
 // ============================================================================
 package org.talend.core.service;

+import java.util.List;
+
 import org.eclipse.core.runtime.Path;
+import org.eclipse.swt.widgets.Shell;
 import org.talend.core.IService;
 import org.talend.core.model.metadata.builder.connection.Connection;
+import org.talend.core.model.process.IContext;
+import org.talend.core.model.properties.ContextItem;
 import org.talend.designer.core.model.utils.emf.talendfile.ContextType;
 import org.talend.repository.model.RepositoryNode;

@@ -35,4 +40,12 @@ public interface IMetadataManagmentUiService extends IService {

    public boolean isContextMode(Connection connection, String value);

+    public boolean promptConfirmLauch(Shell shell, Connection connection, ContextItem contextItem);
+
+    public IContext promptConfirmLauch(Shell shell, List<IContext> contexts, IContext defaultContext);
+
+    public boolean promptConfirmLauch(Shell shell, IContext context);
+
+    public boolean isPromptNeeded(List<IContext> contexts);
+
 }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/IRemoteService.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/IRemoteService.java
@@ -14,6 +14,7 @@ package org.talend.core.service;

 import org.talend.commons.exception.LoginException;
 import org.talend.commons.exception.PersistenceException;
+import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
 import org.talend.core.nexus.ArtifactRepositoryBean;
 import org.talend.utils.json.JSONException;
@@ -38,4 +39,15 @@ public interface IRemoteService extends IService {
    boolean isTokenUsed(String adminUrl) throws Exception;

    String getPendoKeyFromLicense() throws Exception;
+    
+    public boolean isCloudConnection();
+    
+    public static IRemoteService get() {
+        GlobalServiceRegister gsr = GlobalServiceRegister.getDefault();
+        if (gsr.isServiceRegistered(IRemoteService.class)) {
+            return gsr.getService(IRemoteService.class);
+        }
+        return null;
+    }
+
 }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/IStudioLiteP2Service.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/IStudioLiteP2Service.java
@@ -15,6 +15,7 @@ package org.talend.core.service;
 import java.net.URI;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;

 import org.eclipse.core.resources.IProject;
@@ -22,9 +23,10 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
 import org.talend.core.model.general.Project;
+import org.talend.core.model.update.IStudioUpdateConfig;

 /**
- * DOC cmeng class global comment. Detailled comment
+ * DON'T remove/change existing API for patch!
 */
 public interface IStudioLiteP2Service extends IService {

@@ -122,6 +124,16 @@ public interface IStudioLiteP2Service extends IService {

    boolean checkProjectCompatibility(IProgressMonitor monitor, Project proj) throws Exception;

+    boolean adaptNewProjectVersion(IProgressMonitor monitor, Map<String, String> props) throws Exception;
+
+    void setupTmcUpdate(IProgressMonitor monitor, IStudioUpdateConfig updateConfig) throws Exception;
+
+    boolean removeM2() throws Exception;
+    
+    void saveRemoveM2(boolean remove) throws Exception;
+    
+    void cleanM2(IProgressMonitor monitor);
+    
    public static IStudioLiteP2Service get() {
        if (GlobalServiceRegister.getDefault().isServiceRegistered(IStudioLiteP2Service.class)) {
            return GlobalServiceRegister.getDefault().getService(IStudioLiteP2Service.class);
@@ -131,7 +143,9 @@ public interface IStudioLiteP2Service extends IService {

    public static abstract class AbsCheckUpdateListener {

-        abstract public void beforeCheckUpdate(IProgressMonitor monitor) throws Exception;
+        public void beforeCheckUpdate(IProgressMonitor monitor) throws Exception {
+            IStudioLiteP2Service.get().unregistCheckUpdateListener(this);
+        }

    }

@@ -190,18 +204,42 @@ public interface IStudioLiteP2Service extends IService {

        boolean isReleaseEditable();

+        @Deprecated
        URI getRelease(IProgressMonitor monitor) throws Exception;

+        @Deprecated
        void setRelease(IProgressMonitor monitor, URI uri) throws Exception;

+        URI getLocalRelease(IProgressMonitor monitor) throws Exception;
+
+        void setLocalRelease(IProgressMonitor monitor, URI uri) throws Exception;
+
+        String getTmcRelease(IProgressMonitor monitor) throws Exception;
+
        boolean isUpdateEditable();

+        @Deprecated
        Collection<URI> getUpdates(IProgressMonitor monitor) throws Exception;

+        @Deprecated
        void setUpdates(IProgressMonitor monitor, Collection<URI> uris) throws Exception;

+        Collection<URI> getLocalUpdates(IProgressMonitor monitor) throws Exception;
+
+        void setLocalUpdates(IProgressMonitor monitor, Collection<URI> uris) throws Exception;
+
+        String getTmcUpdate(IProgressMonitor monitor) throws Exception;
+
        void resetToDefault(IProgressMonitor monitor) throws Exception;

+        boolean isEnableTmcUpdateSettings(IProgressMonitor monitor) throws Exception;
+
+        void enableTmcUpdateSettings(IProgressMonitor monitor, boolean enable) throws Exception;
+
+        boolean isOverwriteTmcUpdateSettings(IProgressMonitor monitor) throws Exception;
+
+        void overwriteTmcUpdateSettings(IProgressMonitor monitor, boolean overwrite) throws Exception;
+
    }
    
    
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/sqlbuilder/util/ConnectionParameters.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/sqlbuilder/util/ConnectionParameters.java
@@ -173,6 +173,8 @@ public class ConnectionParameters {

    private Map<String, String> parameters;

+    private String selectContext = null;
+
    /**
     * Sets the connectionComment.
     *
@@ -907,4 +909,12 @@ public class ConnectionParameters {
        this.isFirstOpenSqlBuilder = isFirstOpenSqlBuilder;
    }

+    public String getSelectContext() {
+        return this.selectContext;
+    }
+
+    public void setSelectContext(String selectContext) {
+        this.selectContext = selectContext;
+    }
+
 }
--- a/Show More
+++ b/Show More