feat(TUP-36683):Selective generateAllPoms (#5772)

* feat(TUP-36683):Selective generateAllPoms (#5753)

* feat(TUP-36683):Selective generateAllPoms (#5676)

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/exception/MessageBoxExceptionHandler.java

@@ -72,12 +72,27 @@ public final class MessageBoxExceptionHandler {
         }
     }
 
+    public static void process(Throwable ex, Shell shell, boolean wrapMessage) {
+        CommonExceptionHandler.process(ex);
+
+        if (CommonsPlugin.isHeadless() || CommonsPlugin.isJUnitTest()) {
+            return;
+        }
+
+        if (shell != null) {
+            showMessage(ex, shell, wrapMessage);
+        }
+    }
+
+    public static void showMessage(Throwable ex, Shell shell) {
+        showMessage(ex, shell, true);
+    }
     /**
      * Open a message box showing a generic message and exception message.
      *
      * @param ex - exception to show
      */
-    public static void showMessage(Throwable ex, Shell shell) {
+    public static void showMessage(Throwable ex, Shell shell, boolean wrapMessage) {
         if (ex.equals(lastShowedAction)) {
             return;
         }
@@ -85,10 +100,14 @@ public final class MessageBoxExceptionHandler {
 
         // TODO smallet use ErrorDialogWidthDetailArea ?
         String title = Messages.getString("commons.error"); //$NON-NLS-1$
-        String msg = Messages.getString("exception.errorOccured", ex.getMessage()); //$NON-NLS-1$
+        String excepMsg = ex.getMessage();
         //add for tup-19726/19790, as for exception detailMessage will show more details on log area.
         if(ex.getCause()!=null) {
-        	msg = Messages.getString("exception.errorOccured", ex.getCause().getMessage()); //$NON-NLS-1$
+            excepMsg = ex.getCause().getMessage();
+        }
+        String msg = Messages.getString("exception.errorOccured", excepMsg); //$NON-NLS-1$
+        if (!wrapMessage) {
+            msg = Messages.getString("exception.message", excepMsg); //$NON-NLS-1$
         }
         Priority priority = CommonExceptionHandler.getPriority(ex);
 

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/i18n/messages.properties

@@ -114,6 +114,7 @@ TableViewerCreator.Table.BeNull=table is null
 TableViewerCreator.TableColumn.AssertMsg=The TableColumn of TableEditorColumn with idProperty '{0}' has not the correct Table parent
 TreeToTablesLinker.Type.Unsupported=This type of currentControl is unsupported
 commons.error=Error
+exception.message={0}\nSee log for more details.
 exception.errorOccured=An error occured ({0}).\nSee log for more details.
 ModelSelectionDialog.Message=Please choose one option, or cancel.
 ModelSelectionDialog.Option=option

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/image/ImageUtils.java

@@ -16,8 +16,14 @@ import java.io.BufferedOutputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.SWT;
@@ -158,8 +164,35 @@ public class ImageUtils {
         return imageDes;
     }
 
-    private static Map<byte[], ImageDataProvider> imageFromDataCachedImages = new HashMap<byte[], ImageDataProvider>();
+    private static Map<byte[], ImageDataProvider> imageFromDataCachedImages = Collections.synchronizedMap(new HashMap<byte[], ImageDataProvider>());
+    private static Map<Long, byte[]> cachedImagesTimeKeeping = Collections.synchronizedMap(new HashMap<Long, byte[]>());
+    
+    private static Thread clearImageFromDataCachedImages = new Thread() {
+        @SuppressWarnings("static-access")
+        public void run() {
+            long timeout = 5 * 60 * 1000;
+            while(true) {//remove older than 5 mins
+                Set<Entry<Long, byte[]>> collect = cachedImagesTimeKeeping.entrySet().stream()
+                        .filter(entry -> (System.currentTimeMillis() - entry.getKey()) > timeout).collect(Collectors.toSet());
+                for(Entry<Long, byte[]> entry: collect) {
+                    Long key = entry.getKey();
+                    cachedImagesTimeKeeping.remove(key);
+                    imageFromDataCachedImages.remove(entry.getValue());
+                }
+                
+                try {
+                    sleep(timeout);
+                } catch (InterruptedException e) {//
+                }
+            }
+        };
+    };
 
+    static {
+        clearImageFromDataCachedImages.setDaemon(true);
+        clearImageFromDataCachedImages.start();
+    }
+    
     /**
      * By default, keep in memory the .
      *
@@ -169,12 +202,17 @@ public class ImageUtils {
      */
     public static ImageDescriptor createImageFromData(byte[] data, boolean... keepInMemory) {
         if (data != null) {
-            ImageDataProvider imageProvider = imageFromDataCachedImages.get(data);
+            ImageDataProvider imageProvider = null;
+            Optional<byte[]> findKey = imageFromDataCachedImages.keySet().stream().filter(key->Arrays.equals(key, data)).findAny();
+            if(findKey.isPresent()) {
+                imageProvider = imageFromDataCachedImages.get(findKey.get());
+            }
             if (imageProvider == null) {
                 ByteArrayInputStream bais = new ByteArrayInputStream(data);
                 ImageData img = new ImageData(bais);
                 imageProvider = new TalendImageProvider(img);
                 imageFromDataCachedImages.put(data, imageProvider);
+                cachedImagesTimeKeeping.put(System.currentTimeMillis(), data);
             }
             return ImageDescriptor.createFromImageDataProvider(imageProvider);
         }
@@ -183,8 +221,9 @@ public class ImageUtils {
 
     public static void disposeImages(byte[] data) {
         if (data != null) {
-            if (imageFromDataCachedImages.get(data) != null) {
-                imageFromDataCachedImages.remove(data);
+            Optional<byte[]> findKey = imageFromDataCachedImages.keySet().stream().filter(key->Arrays.equals(key, data)).findAny();
+            if(findKey.isPresent()) {
+                imageFromDataCachedImages.remove(findKey.get());
             }
         }
     }

main/plugins/org.talend.commons.runtime/src/org/talend/commons/exception/CommonExceptionHandler.java

@@ -52,10 +52,6 @@ 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.
      *

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/system/EclipseCommandLine.java

@@ -88,13 +88,17 @@ 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";
 
     static public final String PROP_KEY_PROFILE_ID = "eclipse.p2.profile";
 
     static public final String ARG_BRANCH = "-branch";
-
+    
+    static public final String ARG_PROJECT = "-project";
+    
     static public final String LOGIN_ONLINE_UPDATE = "--loginOnlineUpdate";
 
     static public final String ARG_TALEND_BUNDLES_CLEANED = "-talend.studio.bundles.cleaned"; //$NON-NLS-1$

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/constants/Constant.java

@@ -39,6 +39,19 @@ 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).
@@ -56,6 +69,11 @@ public final class Constant {
      */
     public static final String PROJECT_RELOAD_EVENT_SUFFIX = "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$
+
 
     /**
      * key used to get/set the property of an event related to a list of files modified in the repository

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/constants/FileConstants.java

@@ -19,6 +19,8 @@ import org.talend.repository.model.RepositoryConstants;
  */
 public interface FileConstants {
 
+    String DOT = ".";
+
     String OLD_TALEND_PROJECT_FILENAME = "talendProject"; //$NON-NLS-1$
 
     String LOCAL_PROJECT_FILENAME = "talend.project"; //$NON-NLS-1$
@@ -112,5 +114,4 @@ public interface FileConstants {
     String TALEND_FOLDER_NAME = "TALEND-INF"; //$NON-NLS-1$
     
     String MAVEN_FOLDER_NAME = "MAVEN-INF";
-
 }

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();
+    }
+
+}

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/ProxyRepositoryFactory.java

@@ -2319,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()

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/RepositoryFactoryProvider.java

@@ -1,125 +1,127 @@
-// ============================================================================
-//
-// 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.core.repository.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.lang.ArrayUtils;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.swt.events.SelectionListener;
-import org.talend.commons.ui.runtime.exception.ExceptionHandler;
-import org.talend.commons.utils.workbench.extensions.ExtensionImplementationProvider;
-import org.talend.commons.utils.workbench.extensions.ExtensionPointLimiterImpl;
-import org.talend.commons.utils.workbench.extensions.IExtensionPointLimiter;
-import org.talend.core.GlobalServiceRegister;
-import org.talend.core.ui.branding.IBrandingService;
-
-/**
- * Provides, using extension points, implementation of many factories.
- *
- * <ul>
- * <li>IProcessFactory</li>
- * </ul>
- *
- * $Id: RepositoryFactoryProvider.java 38013 2010-03-05 14:21:59Z mhirt $
- */
-public class RepositoryFactoryProvider {
-
-    private static List<IRepositoryFactory> list = null;
-
-    public static final IExtensionPointLimiter REPOSITORY_PROVIDER = new ExtensionPointLimiterImpl(
-            "org.talend.core.repository.repository_provider", //$NON-NLS-1$
-            "RepositoryFactory", 1, -1); //$NON-NLS-1$
-
-    public static List<IRepositoryFactory> getAvailableRepositories() {
-        if (list == null) {
-            list = new ArrayList<IRepositoryFactory>();
-            List<IConfigurationElement> extension = ExtensionImplementationProvider.getInstanceV2(REPOSITORY_PROVIDER);
-            String hiddenRepos = System.getProperty("hidden.repositories"); //$NON-NLS-1$
-            String hiddenRepository[] = new String[]{};
-            if (hiddenRepos != null) {
-                hiddenRepository = hiddenRepos.split(";"); //$NON-NLS-1$
-            }
-
-            boolean isPoweredByTalend = false;
-            IBrandingService brandingService = (IBrandingService) GlobalServiceRegister.getDefault()
-                    .getService(IBrandingService.class);
-            isPoweredByTalend = brandingService.isPoweredbyTalend();
-            for (IConfigurationElement current : extension) {
-                try {
-                    String only4TalendStr = current.getAttribute("only4Talend"); //$NON-NLS-1$
-                    if (Boolean.valueOf(only4TalendStr) && !isPoweredByTalend) {
-                        continue;
-                    }
-                    String only4OemStr = current.getAttribute("only4Oem"); //$NON-NLS-1$
-                    if (Boolean.valueOf(only4OemStr) && isPoweredByTalend) {
-                        continue;
-                    }
-                    IRepositoryFactory currentAction = (IRepositoryFactory) current.createExecutableExtension("class"); //$NON-NLS-1$
-                    currentAction.setId(current.getAttribute("id")); //$NON-NLS-1$
-                    currentAction.setName(current.getAttribute("name")); //$NON-NLS-1$
-                    currentAction.setAuthenticationNeeded(new Boolean(current.getAttribute("authenticationNeeded"))); //$NON-NLS-1$
-                    currentAction.setDisplayToUser(new Boolean(current.getAttribute("displayToUser")).booleanValue()); //$NON-NLS-1$
-
-                    // Getting dynamic login fields:
-                    for (IConfigurationElement currentLoginField : current.getChildren("loginField")) { //$NON-NLS-1$
-                        DynamicFieldBean key = new DynamicFieldBean(currentLoginField.getAttribute("id"), //$NON-NLS-1$
-                                currentLoginField.getAttribute("name"), //$NON-NLS-1$
-                                currentLoginField.getAttribute("defaultValue"), //$NON-NLS-1$
-                                new Boolean(currentLoginField.getAttribute("required")), //$NON-NLS-1$
-                                new Boolean(currentLoginField.getAttribute("password")), //$NON-NLS-1$
-                                Boolean.valueOf(currentLoginField.getAttribute("readonly"))); //$NON-NLS-1$
-                        currentAction.getFields().add(key);
-                    }
-
-                    for (IConfigurationElement currentLoginField : current.getChildren("button")) { //$NON-NLS-1$
-                        DynamicButtonBean key = new DynamicButtonBean(currentLoginField.getAttribute("id"), //$NON-NLS-1$
-                                currentLoginField.getAttribute("name"), //$NON-NLS-1$
-                                (SelectionListener) currentLoginField.createExecutableExtension("selectionListener")); //$NON-NLS-1$
-                        currentAction.getButtons().add(key);
-                    }
-
-                    for (IConfigurationElement currentLoginField : current.getChildren("choiceField")) { //$NON-NLS-1$
-                        DynamicChoiceBean key = new DynamicChoiceBean(currentLoginField.getAttribute("id"), //$NON-NLS-1$
-                                currentLoginField.getAttribute("name")); //$NON-NLS-1$
-                        for (IConfigurationElement currentChoice : currentLoginField.getChildren("choice")) { //$NON-NLS-1$
-                            String value = currentChoice.getAttribute("value"); //$NON-NLS-1$
-                            String label = currentChoice.getAttribute("label"); //$NON-NLS-1$
-                            key.addChoice(value, label);
-                        }
-                        currentAction.getChoices().add(key);
-                    }
-                    if (ArrayUtils.contains(hiddenRepository, currentAction.getId())) {
-                        continue;
-                    }
-                    list.add(currentAction);
-                } catch (CoreException e) {
-                    // e.printStackTrace();
-                    ExceptionHandler.process(e);
-                }
-            }
-        }
-        return list;
-    }
-
-    public static IRepositoryFactory getRepositoriyById(String id) {
-        for (IRepositoryFactory current : getAvailableRepositories()) {
-            if (current.getId().equals(id)) {
-                return current;
-            }
-        }
-        return null;
-    }
-}
+// ============================================================================
+//
+// 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.core.repository.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang.ArrayUtils;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.swt.events.SelectionListener;
+import org.talend.commons.CommonsPlugin;
+import org.talend.commons.ui.runtime.exception.ExceptionHandler;
+import org.talend.commons.utils.workbench.extensions.ExtensionImplementationProvider;
+import org.talend.commons.utils.workbench.extensions.ExtensionPointLimiterImpl;
+import org.talend.commons.utils.workbench.extensions.IExtensionPointLimiter;
+import org.talend.core.GlobalServiceRegister;
+import org.talend.core.ui.branding.IBrandingService;
+
+/**
+ * Provides, using extension points, implementation of many factories.
+ *
+ * <ul>
+ * <li>IProcessFactory</li>
+ * </ul>
+ *
+ * $Id: RepositoryFactoryProvider.java 38013 2010-03-05 14:21:59Z mhirt $
+ */
+public class RepositoryFactoryProvider {
+
+    private static List<IRepositoryFactory> list = null;
+
+    public static final IExtensionPointLimiter REPOSITORY_PROVIDER = new ExtensionPointLimiterImpl(
+            "org.talend.core.repository.repository_provider", //$NON-NLS-1$
+            "RepositoryFactory", 1, -1); //$NON-NLS-1$
+
+    public static synchronized List<IRepositoryFactory> getAvailableRepositories() {
+        if (list == null) {
+            list = new ArrayList<IRepositoryFactory>();
+            List<IConfigurationElement> extension = ExtensionImplementationProvider.getInstanceV2(REPOSITORY_PROVIDER);
+            String hiddenRepos = System.getProperty("hidden.repositories"); //$NON-NLS-1$
+            String hiddenRepository[] = new String[]{};
+            if (hiddenRepos != null) {
+                hiddenRepository = hiddenRepos.split(";"); //$NON-NLS-1$
+            }
+
+            boolean isPoweredByTalend = false;
+            IBrandingService brandingService = (IBrandingService) GlobalServiceRegister.getDefault()
+                    .getService(IBrandingService.class);
+            isPoweredByTalend = brandingService.isPoweredbyTalend();
+            for (IConfigurationElement current : extension) {
+                try {
+                    String only4TalendStr = current.getAttribute("only4Talend"); //$NON-NLS-1$
+                    if (Boolean.valueOf(only4TalendStr) && !isPoweredByTalend) {
+                        continue;
+                    }
+                    String only4OemStr = current.getAttribute("only4Oem"); //$NON-NLS-1$
+                    if (Boolean.valueOf(only4OemStr) && isPoweredByTalend) {
+                        continue;
+                    }
+                    IRepositoryFactory currentAction = (IRepositoryFactory) current.createExecutableExtension("class"); //$NON-NLS-1$
+                    currentAction.setId(current.getAttribute("id")); //$NON-NLS-1$
+                    currentAction.setName(current.getAttribute("name")); //$NON-NLS-1$
+                    currentAction.setAuthenticationNeeded(new Boolean(current.getAttribute("authenticationNeeded"))); //$NON-NLS-1$
+                    currentAction.setDisplayToUser(new Boolean(current.getAttribute("displayToUser")).booleanValue()); //$NON-NLS-1$
+
+                    // Getting dynamic login fields:
+                    for (IConfigurationElement currentLoginField : current.getChildren("loginField")) { //$NON-NLS-1$
+                        DynamicFieldBean key = new DynamicFieldBean(currentLoginField.getAttribute("id"), //$NON-NLS-1$
+                                currentLoginField.getAttribute("name"), //$NON-NLS-1$
+                                currentLoginField.getAttribute("defaultValue"), //$NON-NLS-1$
+                                new Boolean(currentLoginField.getAttribute("required")), //$NON-NLS-1$
+                                new Boolean(currentLoginField.getAttribute("password")), //$NON-NLS-1$
+                                Boolean.valueOf(currentLoginField.getAttribute("readonly"))); //$NON-NLS-1$
+                        currentAction.getFields().add(key);
+                    }
+
+                    for (IConfigurationElement currentLoginField : current.getChildren("button")) { //$NON-NLS-1$
+                        DynamicButtonBean key = new DynamicButtonBean(currentLoginField.getAttribute("id"), //$NON-NLS-1$
+                                currentLoginField.getAttribute("name"), //$NON-NLS-1$
+                                (SelectionListener) currentLoginField.createExecutableExtension("selectionListener")); //$NON-NLS-1$
+                        currentAction.getButtons().add(key);
+                    }
+
+                    for (IConfigurationElement currentLoginField : current.getChildren("choiceField")) { //$NON-NLS-1$
+                        DynamicChoiceBean key = new DynamicChoiceBean(currentLoginField.getAttribute("id"), //$NON-NLS-1$
+                                currentLoginField.getAttribute("name")); //$NON-NLS-1$
+                        for (IConfigurationElement currentChoice : currentLoginField.getChildren("choice")) { //$NON-NLS-1$
+                            String value = currentChoice.getAttribute("value"); //$NON-NLS-1$
+                            String label = currentChoice.getAttribute("label"); //$NON-NLS-1$
+                            key.addChoice(value, label);
+                        }
+                        currentAction.getChoices().add(key);
+                    }
+                    if (ArrayUtils.contains(hiddenRepository, currentAction.getId())) {
+                        continue;
+                    }
+                    list.add(currentAction);
+                } catch (CoreException e) {
+                    // e.printStackTrace();
+                    ExceptionHandler.process(e);
+                }
+            }
+        }
+        return list;
+    }
+
+    public static IRepositoryFactory getRepositoriyById(String id) {
+        for (IRepositoryFactory current : getAvailableRepositories()) {
+            if (current.getId().equals(id)) {
+                return current;
+            }
+        }
+        ExceptionHandler.log("Can't find repository factory for: " + id);
+        return null;
+    }
+}

main/plugins/org.talend.core.runtime/META-INF/MANIFEST.MF

@@ -129,7 +129,8 @@ Require-Bundle: org.eclipse.jdt.core,
  jackson-core-asl,
  org.talend.libraries.jackson,
  org.eclipse.m2e.core,
- org.talend.libraries.apache.common
+ org.talend.libraries.apache.common,
+ org.talend.signon.util
 Bundle-Activator: org.talend.core.runtime.CoreRuntimePlugin
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,

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;
@@ -134,6 +135,12 @@ 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);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/context/RepositoryContext.java

@@ -15,8 +15,10 @@ package org.talend.core.context;
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
+import org.talend.commons.exception.ExceptionHandler;
 import org.talend.core.model.general.Project;
 import org.talend.core.model.properties.User;
+import org.talend.core.service.ICloudSignOnService;
 
 /**
  * DOC smallet class global comment. Detailled comment <br/>
@@ -139,6 +141,14 @@ public class RepositoryContext {
      * @return the clearPassword
      */
     public String getClearPassword() {
+        try {
+            if (ICloudSignOnService.get() != null && ICloudSignOnService.get().isSignViaCloud()) {
+                return ICloudSignOnService.get().getLatestToken().getAccessToken();
+            }
+        }catch (Exception ex) {
+            ExceptionHandler.process(ex);
+        }
+
         return clearPassword;
     }
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/EDatabaseTypeName.java

@@ -147,8 +147,15 @@ public enum EDatabaseTypeName {
 
     MAPRDB(
             "MapRDB", "MapRDB", Boolean.FALSE, "MAPRDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true),//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
     SNOWFLAKE(
-            "SNOWFLAKE","SNOWFLAKE",Boolean.TRUE,"SNOWFLAKE",EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.None);
+            "SNOWFLAKE",
+            "SNOWFLAKE",
+            Boolean.TRUE,
+            "SNOWFLAKE",
+            EDatabaseSchemaOrCatalogMapping.None,
+            EDatabaseSchemaOrCatalogMapping.None,
+            true);
 
     // displayName is used in Java code.
     private String displayName;

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

@@ -351,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";
 
@@ -379,6 +387,8 @@ public class ConnParameterKeys {
     
     public static final String CONN_PARA_KEY_KNOX_DIRECTORY="CONN_PARA_KEY_KNOX_DIRECTORY";
 
+    public static final String CONN_PARA_KEY_KNOX_TIMEOUT="CONN_PARA_KEY_KNOX_TIMEOUT";
+
     // CDE
     public static final String CONN_PARA_KEY_CDE_API_ENDPOINT="CONN_PARA_KEY_CDE_API_ENDPOINT";
     public static final String CONN_PARA_KEY_CDE_TOKEN="CONN_PARA_KEY_CDE_TOKEN";

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;
 

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

@@ -56,14 +56,14 @@ 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$
@@ -83,8 +83,7 @@ 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-actual.jar", "slf4j-api-1.7.29.jar", "slf4j-log4j12-1.7.29.jar", //$NON-NLS-1$
-                    "msal4j-1.11.0.jar", 
+            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", "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",
@@ -96,12 +95,12 @@ 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.25.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.25.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$

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/conf/EHadoopProperties.java

@@ -154,6 +154,14 @@ public enum EHadoopProperties {
     
     DATABRICKS_DBFS_DEP_FOLDER,
     
+    DATABRICKS_NODE_TYPE,
+    
+    DATABRICKS_DRIVER_NODE_TYPE,
+    
+    DATABRICKS_RUNTIME_VERSION,
+    
+    DATABRICKS_CLUSTER_TYPE,
+    
     UNIV_STANDALONE_MASTER,
     
     UNIV_STANDALONE_EXEC_MEMORY,

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/context/ContextUtils.java

@@ -222,6 +222,32 @@ public class ContextUtils {
         }
         return parameterType;
     }
+    
+    // TUP-36519:For possible duplicate internalid scenario(TUP-36667) after several times' renaming in joblet. Loop all and find the nearest
+    // one.
+    public static ContextParameterType getContextParameterTypeById(ContextType contextType, final String uuId,
+            boolean isFromContextItem, String paraName) {
+        if (contextType == null || uuId == null) {
+            return null;
+        }
+
+        ContextParameterType parameterType = null;
+        for (ContextParameterType param : (List<ContextParameterType>) contextType.getContextParameter()) {
+            String paramId = null;
+            if (isFromContextItem) {
+                paramId = ResourceHelper.getUUID(param);
+            } else {
+                paramId = param.getInternalId();
+            }
+            if (uuId.equals(paramId)) {
+                parameterType = param;
+                if (paraName != null && StringUtils.equals(paraName, param.getName())) {
+                    break;
+                }
+            }
+        }
+        return parameterType;
+    }
 
     public static ContextParameterType getContextParameterTypeById(ContextType contextType, final String uuId,
             boolean isFromContextItem) {
@@ -846,7 +872,7 @@ public class ContextUtils {
                         if (item != null) {
                             final ContextType repoContextType = ContextUtils.getContextTypeByName(item, contextType.getName());
                             ContextParameterType repoContextParam = ContextUtils.getContextParameterTypeById(repoContextType,
-                                    paramLink.getId(), item instanceof ContextItem);
+                                    paramLink.getId(), item instanceof ContextItem, contextParameterType.getName());
                             if (repoContextParam != null
                                     && !StringUtils.equals(repoContextParam.getName(), contextParameterType.getName())) {
                                 renamedMap.put(repoContextParam.getName(), contextParameterType.getName());
@@ -915,7 +941,7 @@ public class ContextUtils {
                                 if (item != null) {
                                     ContextType contextType = ContextUtils.getContextTypeByName(item, context.getName());
                                     ContextParameterType repoParameterType = ContextUtils.getContextParameterTypeById(contextType,
-                                            parameterLink.getId(), item instanceof ContextItem);
+                                            parameterLink.getId(), item instanceof ContextItem, parameterType.getName());
                                     if (repoParameterType != null
                                             && !StringUtils.equals(repoParameterType.getName(), parameterType.getName())) {
                                         renamedMap.put(repoParameterType.getName(), parameterType.getName());
@@ -975,7 +1001,7 @@ public class ContextUtils {
         ContextParameterType contextParameterType = null;
         if (paramLink != null && paramLink.getId() != null && contextType != null) {
             contextParameterType = getContextParameterTypeById(contextType, paramLink.getId(),
-                    contextItem instanceof ContextItem);
+                    contextItem instanceof ContextItem, paramName);
         }
         if (contextParameterType != null) {// Compare use UUID
             if (!StringUtils.equals(contextParameterType.getName(), paramName)) {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/general/ConnectionBean.java

@@ -17,10 +17,15 @@ import java.util.Iterator;
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.core.pendo.PendoTrackSender;
 import org.talend.core.runtime.i18n.Messages;
+import org.talend.core.service.ICloudSignOnService;
 import org.talend.repository.model.RepositoryConstants;
+import org.talend.signon.util.TMCRepositoryUtil;
+import org.talend.signon.util.TokenMode;
 import org.talend.utils.json.JSONException;
 import org.talend.utils.json.JSONObject;
 
@@ -58,12 +63,14 @@ public class ConnectionBean implements Cloneable {
 
     private static final String TOKEN = "token"; //$NON-NLS-1$
 
-    private static final String URL = "url"; //$NON-NLS-1$
-
     private static final String STORECREDENTIALS = "storeCredentials"; //$NON-NLS-1$
 
     private String credentials = ""; //$NON-NLS-1$
 
+    public static final String CLOUD_TOKEN_ID ="cloud_token"; //$NON-NLS-1$
+    
+    private static final String LOGIN_VIA_CLOUD = "login_via_cloud"; //$NON-NLS-1$
+    
     /**
      * DOC smallet ConnectionBean constructor comment.
      */
@@ -89,6 +96,24 @@ public class ConnectionBean implements Cloneable {
         newConnection.setPassword(""); //$NON-NLS-1$
         return newConnection;
     }
+    
+    public static ConnectionBean getDefaultCloudConnectionBean(String dataCenter) {
+        ConnectionBean newConnection = new ConnectionBean();
+        newConnection.setName(Messages.getString("ConnectionBean.Cloud.name", TMCRepositoryUtil.getDisplayNameByDatacenter(dataCenter))); //$NON-NLS-1$
+        newConnection.setDescription(Messages.getString("ConnectionBean.CloudConnection.description", TMCRepositoryUtil.getDisplayNameByDatacenter(dataCenter))); //$NON-NLS-1$
+        newConnection.setRepositoryId(TMCRepositoryUtil.getRepositoryId(dataCenter));
+        newConnection.setToken(true);
+        newConnection.setStoreCredentials(true);
+        newConnection.setComplete(true);
+        newConnection.setLoginViaCloud(true);
+        newConnection.setWorkSpace(getRecentWorkSpace());
+        return newConnection;
+    }
+    
+    protected static String getRecentWorkSpace() {
+        String filePath = new Path(Platform.getInstanceLocation().getURL().getPath()).toFile().getPath();
+        return filePath;
+    }
 
     /**
      * Getter for ID.
@@ -184,13 +209,22 @@ public class ConnectionBean implements Cloneable {
      */
     public String getPassword() {
         try {
+            
             if (conDetails.has(PASSWORD)) {
                 if (isStoreCredentials() && credentials != null) {
                     return this.credentials;
                 }
                 return conDetails.getString(PASSWORD);
+            }  else if (conDetails.has(CLOUD_TOKEN_ID)){ 
+                String object = conDetails.getString(CLOUD_TOKEN_ID);
+                TokenMode token = TokenMode.parseFromJson(object, null);
+                if (ICloudSignOnService.get() != null) {
+                    token = ICloudSignOnService.get().getLatestToken();
+                    this.setConnectionToken(token);
+                }
+                return token.getAccessToken();
             }
-        } catch (JSONException e) {
+        } catch (Exception e) {
             ExceptionHandler.process(e);
         }
         return "";
@@ -215,7 +249,7 @@ public class ConnectionBean implements Cloneable {
      * @return the user
      */
     public String getUser() {
-        try {
+        try {       
             if (conDetails.has(USER)) {
                 String user = conDetails.getString(USER);
                 if (isToken()) {
@@ -226,7 +260,7 @@ public class ConnectionBean implements Cloneable {
                     }
                 }
                 return user;
-            }
+            } 
         } catch (JSONException e) {
             ExceptionHandler.process(e);
         }
@@ -320,6 +354,25 @@ public class ConnectionBean implements Cloneable {
             ExceptionHandler.process(e);
         }
     }
+    
+    public boolean isLoginViaCloud() {
+        try {
+            if (conDetails.has(LOGIN_VIA_CLOUD)) {
+                return (Boolean) conDetails.get(LOGIN_VIA_CLOUD);
+            }
+        } catch (JSONException e) {
+            // do nothing
+        }
+        return false;
+    }
+    
+    public void setLoginViaCloud(boolean isLoginViaCloud) {
+        try {
+            conDetails.put(LOGIN_VIA_CLOUD, isLoginViaCloud);
+        } catch (JSONException e) {
+            // do nothing
+        }
+    }
 
     @Override
     public ConnectionBean clone() throws CloneNotSupportedException {
@@ -418,14 +471,21 @@ public class ConnectionBean implements Cloneable {
 
     public String getUrl() {
         try {
-            if (conDetails.has(URL)) {
-                return conDetails.getString(URL);
+            if (dynamicFields.containsKey(RepositoryConstants.REPOSITORY_URL)) {
+                return dynamicFields.get(RepositoryConstants.REPOSITORY_URL);
+            }
+            if (conDetails.has(RepositoryConstants.REPOSITORY_URL)) {
+                return conDetails.getString(RepositoryConstants.REPOSITORY_URL);
             }
         } catch (JSONException e) {
             ExceptionHandler.process(e);
         }
         return "";
     }
+    
+    public void setUrl(String url) {
+        dynamicFields.put(RepositoryConstants.REPOSITORY_URL, url);
+    }
 
     public boolean isStoreCredentials() {
         try {
@@ -453,4 +513,27 @@ public class ConnectionBean implements Cloneable {
     public void setCredentials(String credentials) {
         this.credentials = credentials;
     }
+
+    
+    public TokenMode getConnectionToken() {
+        try {
+            if (conDetails.has(CLOUD_TOKEN_ID)) {
+                String object = conDetails.getString(CLOUD_TOKEN_ID);
+                return TokenMode.parseFromJson(object, null);
+            }
+        } catch (JSONException e) {
+            ExceptionHandler.process(e);
+        }
+        return null;
+    }
+
+    
+    public void setConnectionToken(TokenMode connectionToken) {
+        try {
+            conDetails.put(CLOUD_TOKEN_ID, TokenMode.writeToJson(connectionToken));
+        } catch (JSONException e) {
+            ExceptionHandler.process(e);
+        }
+    }
+    
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/general/ModuleNeeded.java

@@ -13,16 +13,17 @@
 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;
@@ -107,7 +108,7 @@ public class ModuleNeeded {
 
     private Map<String, String> attributes;
 
-    ILibraryManagerService libManagerService = GlobalServiceRegister.getDefault()
+    ILibraryManagerService libManagerService = (ILibraryManagerService) GlobalServiceRegister.getDefault()
             .getService(ILibraryManagerService.class);
     
 
@@ -368,7 +369,7 @@ public class ModuleNeeded {
     }
 
     public ELibraryInstallStatus getStatus() {
-        ILibraryManagerService libManagerService = GlobalServiceRegister.getDefault()
+        ILibraryManagerService libManagerService = (ILibraryManagerService) GlobalServiceRegister.getDefault()
                 .getService(ILibraryManagerService.class);
         libManagerService.checkModuleStatus(this);
         String mvnUriStatusKey = getMavenUri();
@@ -377,7 +378,7 @@ public class ModuleNeeded {
     }
 
     public ELibraryInstallStatus getDeployStatus() {
-        ILibraryManagerService libManagerService = GlobalServiceRegister.getDefault()
+        ILibraryManagerService libManagerService = (ILibraryManagerService) GlobalServiceRegister.getDefault()
                 .getService(ILibraryManagerService.class);
         libManagerService.checkModuleStatus(this);
         String mvnUriStatusKey = getMavenUri();
@@ -714,19 +715,6 @@ 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() {

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

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

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

@@ -13,13 +13,15 @@ public class SparkBatchMetadataTalendTypeFilter extends SparkMetadataTalendTypeF
     public static List<String> dynamicTypeCompatibleComponents = Arrays.asList(
             "tDeltaLakeInput",
             "tDeltaLakeOutput",
+            "tFileInputDelimited",
             "tFileInputParquet",
             "tFileOutputParquet",
             "tJDBCInput",
             "tJDBCOutput",
             "tLogRow",
-            "tSqlRow",
-            "tFileInputDelimited"
+            "tMongoDBInput", 
+            "tMongoDBOutput",
+            "tSqlRow"
             );
 
     public SparkBatchMetadataTalendTypeFilter(INode node) {

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);

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

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

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

@@ -1250,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()));
         }

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);

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());

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/update/RepositoryUpdateManager.java

@@ -359,7 +359,9 @@ public abstract class RepositoryUpdateManager {
             List<UpdateResult> checkedResults = null;
 
             if (parameter == null) { // update all job
-                checkedResults = filterSpecialCheckedResult(results);
+                // TUP-36519: comment out the filter for only opening job
+                // checkedResults = filterSpecialCheckedResult(results);
+                checkedResults = results;
             } else { // filter
                 checkedResults = filterCheckedResult(results);
             }

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));
             }

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;
+        }
+    }
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/PendoTrackDataUtil.java

@@ -19,13 +19,17 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.utils.VersionUtils;
 import org.talend.core.model.general.Project;
 import org.talend.core.model.properties.ProjectReference;
 import org.talend.core.pendo.properties.IPendoDataProperties;
 import org.talend.core.pendo.properties.PendoLoginProperties;
+import org.talend.core.service.ICloudSignOnService;
 import org.talend.core.service.IStudioLiteP2Service;
+import org.talend.core.service.IStudioLiteP2Service.UpdateSiteConfig;
 import org.talend.core.ui.IInstalledPatchService;
 import org.talend.repository.ProjectManager;
 import org.talend.utils.json.JSONObject;
@@ -61,11 +65,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 {
@@ -85,6 +85,18 @@ public class PendoTrackDataUtil {
                 loginEvent.setEnabledFeatures(enabledFeatures);
             }
             setUpRefProjectsStructure(loginEvent);
+            loginEvent.setIsOneClickLogin(Boolean.FALSE.toString());
+            if (ICloudSignOnService.get() != null && ICloudSignOnService.get().isSignViaCloud()) {
+                loginEvent.setIsOneClickLogin(Boolean.TRUE.toString());
+            }
+            loginEvent.setManagedUpdate(Boolean.FALSE.toString());
+            if (IStudioLiteP2Service.get() != null) {
+                IProgressMonitor monitor = new NullProgressMonitor();
+                UpdateSiteConfig config = IStudioLiteP2Service.get().getUpdateSiteConfig(monitor);
+                if (config.isEnableTmcUpdateSettings(monitor) && !config.isOverwriteTmcUpdateSettings(monitor)) {
+                    loginEvent.setManagedUpdate(Boolean.TRUE.toString());
+                }
+            }
         } catch (Exception e) {
             ExceptionHandler.process(e);
         }
@@ -93,6 +105,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();
@@ -162,7 +183,9 @@ public class PendoTrackDataUtil {
         OPEN_IN_APITester("Open in API Tester"),
         OPEN_API_DOCUMENTATION("Open API Documentation"),
         AUTOMAP("tMap Automap"),
-        TMAP("Studio tMap");
+        TMAP("tMap"),
+        ITEM_IMPORT("Import items"),
+        ITEM_SIGNATURE("Item Signature");
 
         private String event;
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/PendoTrackSender.java

@@ -55,9 +55,9 @@ import org.talend.utils.json.JSONObject;
  */
 public class PendoTrackSender {
     
-    private static final String PROP_PENDO_LOCAL_CHECK = "talend.pendo.localDebug";
+    public static final String PROP_PENDO_LOCAL_CHECK = "talend.pendo.localDebug";
 
-    private static final String PROP_PENDO_LOG_DATA = "talend.pendo.logRuntimeData";
+    public static final String PROP_PENDO_LOG_DATA = "talend.pendo.logRuntimeData";
 
     private static final String PREFIX_API = "api";
 
@@ -79,13 +79,18 @@ public class PendoTrackSender {
 
     private static String pendoInfo;
 
-    public 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 (instance == null) {
-            instance = new PendoTrackSender();
-        }
         if (StringUtils.isBlank(adminUrl)) {
             RepositoryContext repositoryContext = getRepositoryContext();
             if (repositoryContext != null) {
@@ -118,7 +123,7 @@ public class PendoTrackSender {
 
     public void sendTrackData(TrackEvent event, IPendoDataProperties properties) throws Exception {
         if (isPendoLocalDebug()) {
-            ExceptionHandler.log(PendoTrackDataUtil.convertEntityJsonString(properties));
+            ExceptionHandler.log(event.getEvent() + ":" + PendoTrackDataUtil.convertEntityJsonString(properties));
             return;
         }
         DefaultHttpClient client = null;

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/properties/PendoLoginProperties.java

@@ -36,6 +36,12 @@ public class PendoLoginProperties implements IPendoDataProperties {
     @JsonProperty("referenced_projects")
     private List<String> refProjectList;
 
+    @JsonProperty("one_click_login")
+    private String isOneClickLogin;
+
+    @JsonProperty("managed_update")
+    private String managedUpdate;
+
     /**
      * Getter for studio_version.
      * 
@@ -126,4 +132,40 @@ public class PendoLoginProperties implements IPendoDataProperties {
         this.refProjectList = refProjectList;
     }
 
+    /**
+     * Getter for isOneClickLogin.
+     * 
+     * @return the isOneClickLogin
+     */
+    public String getIsOneClickLogin() {
+        return isOneClickLogin;
+    }
+
+    /**
+     * Sets the isOneClickLogin.
+     * 
+     * @param isOneClickLogin the isOneClickLogin to set
+     */
+    public void setIsOneClickLogin(String isOneClickLogin) {
+        this.isOneClickLogin = isOneClickLogin;
+    }
+
+    /**
+     * Getter for managedUpdate.
+     * 
+     * @return the managedUpdate
+     */
+    public String getManagedUpdate() {
+        return managedUpdate;
+    }
+
+    /**
+     * Sets the managedUpdate.
+     * 
+     * @param managedUpdate the managedUpdate to set
+     */
+    public void setManagedUpdate(String managedUpdate) {
+        this.managedUpdate = managedUpdate;
+    }
+
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/properties/PendoSignImportProperties.java

@@ -0,0 +1,232 @@
+// ============================================================================
+//
+// 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;
+
+    @JsonProperty("import_product")
+    private List<String> importProduct;
+
+    /**
+     * 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;
+    }
+
+
+    /**
+     * Getter for importProduct.
+     * @return the importProduct
+     */
+    public List<String> getImportProduct() {
+        return importProduct;
+    }
+
+
+    /**
+     * Sets the importProduct.
+     * @param importProduct the importProduct to set
+     */
+    public void setImportProduct(List<String> importProduct) {
+        this.importProduct = importProduct;
+    }
+
+
+}

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;
+    }
+
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/properties/PendoTMapProperties.java

@@ -91,13 +91,13 @@ public class PendoTMapProperties implements IPendoDataProperties {
      * 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")
+    @JsonProperty("mapping_1_to_n")
     private int oneToNMappings;
 
     /**
      * Number of output columns which have multiple source columns, either input columns or var columns
      */
-    @JsonProperty("n-to-1 mapping")
+    @JsonProperty("mapping_n_to_1")
     private int nToOneMappings;
 
     /**

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
@@ -552,6 +552,8 @@ BusinessAppearanceComposite.textAlignment.vertical.centre=Centre
 ConnectionBean.Local=Local
 ConnectionBean.Remote=Remote
 ConnectionBean.DefaultConnection=Default connection
+ConnectionBean.Cloud.name=Signed in: Cloud ({0})
+ConnectionBean.CloudConnection.description=Remote connection to Cloud - Signed in: Cloud ({0})
 InegerCellEditorListener.NegativeNumberMessage=The value of {0} can't be set by negative number.
 InegerCellEditorListener.NumeralMessage=The value of {0} should be numeral.
 OpenXSDFileDialog.cancel=Cancel

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages_fr.properties

@@ -552,6 +552,8 @@ BusinessAppearanceComposite.textAlignment.vertical.centre=Centre
 ConnectionBean.Local=Local
 ConnectionBean.Remote=Distant
 ConnectionBean.DefaultConnection=Connexion par d\u00E9faut
+ConnectionBean.Cloud.name=Connect\u00E9(e) \u00E0\u00A0: Cloud ({0})
+ConnectionBean.CloudConnection.description=Connexion distante au Cloud - Connect\u00E9(e) \u00E0\u00A0: Cloud ({0})
 InegerCellEditorListener.NegativeNumberMessage=La valeur de {0} ne peut \u00EAtre un nombre n\u00E9gatif.
 InegerCellEditorListener.NumeralMessage=La valeur de {0} doit \u00EAtre num\u00E9rique.
 OpenXSDFileDialog.cancel=Annuler
@@ -575,7 +577,7 @@ repository.servicesPort=Port
 BinRepositoryNode.label=Corbeille
 HDFS=HDFS
 HCAT=HCAT
-AbstractRepositoryContentHandler.deleteNode.exception=\u00C9chec de la suppression des pertinences de noeud\u00A0: {0}
+AbstractRepositoryContentHandler.deleteNode.exception=\u00C9chec de la suppression des pertinences de n\u0153ud\u00A0: {0}
 HadoopCustomVersionDialog.topTitle=D\u00E9finition de la version Hadoop personnalis\u00E9e
 HadoopCustomVersionDialog.title=D\u00E9finir la distribution Hadoop personnalis\u00E9e
 HadoopCustomVersionDialog.msg=Configurer les biblioth\u00E8ques n\u00E9cessaires \u00E0 la version personnalis\u00E9e de Hadoop

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages_ja.properties

@@ -184,7 +184,7 @@ AbstractTalendFunctionParser.checkMethod=\u30EB\u30FC\u30C1\u30F3: "{0}.{1}\\"\u
 JavaGlobalVariableProposal.Description=\u8AAC\u660E: {0}
 JavaGlobalVariableProposal.VariableName=\n\n\u5909\u6570\u540D: {1}
 JavaSimpleDateFormatProposalProvider.displaySingleQuote= ' : \u4E00\u91CD\u5F15\u7528\u7B26\u3092\u8868\u793A
-JavaSimpleDateFormatProposalProvider.quoteDisplayError=\uFF12\u3064\u306E\u30B7\u30F3\u30B0\u30EB\u30AF\u30A9\u30FC\u30C8\u3067\uFF11\u3064\u306E\u30B7\u30F3\u30B0\u30EB\u30AF\u30A9\u30FC\u30C8\u3092\u793A\u3057\u307E\u3059\u3002
+JavaSimpleDateFormatProposalProvider.quoteDisplayError=\uFF12\u3064\u306E\u4E00\u91CD\u5F15\u7528\u7B26\u3067\uFF11\u3064\u306E\u4E00\u91CD\u5F15\u7528\u7B26\u3092\u793A\u3057\u307E\u3059\u3002
 JavaTypesManager.bigDecimal=BIGDECIMAL\u306F\u6570\u5024\u3067\u3059:
 JavaTypesManager.integer=INTEGER\u306F\u6570\u5024\u3067\u3059:
 JavaTypesManager.list=LIST\u306F\u6570\u5024\u3067\u3059:
@@ -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
@@ -552,6 +552,8 @@ BusinessAppearanceComposite.textAlignment.vertical.centre=\u4E2D\u5FC3
 ConnectionBean.Local=\u30ED\u30FC\u30AB\u30EB
 ConnectionBean.Remote=\u30EA\u30E2\u30FC\u30C8
 ConnectionBean.DefaultConnection=\u30C7\u30D5\u30A9\u30EB\u30C8\u63A5\u7D9A
+ConnectionBean.Cloud.name=\u30B5\u30A4\u30F3\u30A4\u30F3\u6E08\u307F: \u30AF\u30E9\u30A6\u30C9({0})
+ConnectionBean.CloudConnection.description=\u30AF\u30E9\u30A6\u30C9\u3078\u306E\u30EA\u30E2\u30FC\u30C8\u63A5\u7D9A - \u30B5\u30A4\u30F3\u30A4\u30F3\u6E08\u307F: \u30AF\u30E9\u30A6\u30C9({0})
 InegerCellEditorListener.NegativeNumberMessage={0}\u306B\u306F\u8CA0\u306E\u5024\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
 InegerCellEditorListener.NumeralMessage={0}\u306B\u306F\u6570\u5024\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 OpenXSDFileDialog.cancel=\u30AD\u30E3\u30F3\u30BB\u30EB

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages_zh_CN.properties

@@ -552,6 +552,8 @@ BusinessAppearanceComposite.textAlignment.vertical.centre=\u4E2D\u592E
 ConnectionBean.Local=\u672C\u5730
 ConnectionBean.Remote=\u8FDC\u7A0B
 ConnectionBean.DefaultConnection=\u9ED8\u8BA4\u8FDE\u63A5
+ConnectionBean.Cloud.name=\u5DF2\u767B\u5F55: \u4E91\u7AEF ({0})
+ConnectionBean.CloudConnection.description=\u4E91\u7AEF\u8FDC\u7A0B\u8FDE\u63A5 - \u5DF2\u767B\u5F55: \u4E91\u7AEF ({0})
 InegerCellEditorListener.NegativeNumberMessage={0} \u7684\u503C\u4E0D\u80FD\u8BBE\u5B9A\u4E3A\u8D1F\u6570\u3002
 InegerCellEditorListener.NumeralMessage={0} \u7684\u503C\u5E94\u8BE5\u4E3A\u6570\u5B57\u3002
 OpenXSDFileDialog.cancel=\u53D6\u6D88

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
      */

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/projectsetting/IProjectSettingPreferenceConstants.java

@@ -78,5 +78,10 @@ public interface IProjectSettingPreferenceConstants {
     public static final String TEMPLATE_DOCKER_PROFILE_POM = "template_docker_profile_pom_script"; //$NON-NLS-1$
     
     public static final String USE_STRICT_REFERENCE_JOBLET = "use_strict_reference_joblet"; //$NON-NLS-1$
+    
+    /*
+     * Default microservices application properties
+     */
+    public static final String MS_APPLICATION_PROPERTIES = "ms_application_properties";
 
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/projectsetting/IProjectSettingTemplateConstants.java

@@ -19,6 +19,8 @@ package org.talend.core.runtime.projectsetting;
 public interface IProjectSettingTemplateConstants {
 
     final static String PATH_RESOURCES = "resources";
+    
+    final static String PATH_APPLICATION_PROPERTIES = PATH_RESOURCES + '/' + "application.properties";
 
     final static String PATH_RESOURCES_TEMPLATES = PATH_RESOURCES + '/' + "templates";
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/services/IFilterService.java

@@ -1,5 +1,6 @@
 package org.talend.core.runtime.services;
 
+import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
 import org.talend.core.model.properties.Item;
 
@@ -9,4 +10,11 @@ public interface IFilterService extends IService {
 
 	public boolean isFilterAccepted(Item item, String filter);
 
+    public static IFilterService get() {
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(IFilterService.class)) {
+            return GlobalServiceRegister.getDefault().getService(IFilterService.class);
+        }
+        return null;
+    }
+
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/ICloudSignOnService.java

@@ -0,0 +1,58 @@
+// ============================================================================
+//
+// 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.core.service;
+
+import org.talend.core.GlobalServiceRegister;
+import org.talend.core.IService;
+import org.talend.signon.util.TokenMode;
+import org.talend.signon.util.listener.LoginEventListener;
+
+public interface ICloudSignOnService extends IService {
+
+    TokenMode getToken(String authCode, String codeVerifier, String dataCenter) throws Exception;
+
+    void startHeartBeat() throws Exception;
+
+    void stopHeartBeat();
+
+    String generateCodeVerifier();
+
+    String getCodeChallenge(String seed) throws Exception;
+
+    boolean hasValidToken() throws Exception;
+
+    String getTokenUser(String url, TokenMode token) throws Exception;
+
+    void signonCloud(LoginEventListener listener) throws Exception;
+    
+    TokenMode getLatestToken() throws Exception;
+    
+    public boolean refreshToken() throws Exception;
+    
+    boolean isSignViaCloud();
+    
+    boolean isNeedShowSSOPage();
+    
+    public void showReloginDialog();
+    
+    public boolean isReloginDialogRunning();
+    
+    public void reload();
+
+    public static ICloudSignOnService get() {
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(ICloudSignOnService.class)) {
+            return GlobalServiceRegister.getDefault().getService(ICloudSignOnService.class);
+        }
+        return null;
+    }
+}

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);
+
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/IStudioLiteP2Service.java

@@ -128,6 +128,12 @@ public interface IStudioLiteP2Service extends IService {
 
     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);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/runprocess/IRunProcessService.java

@@ -160,6 +160,8 @@ public interface IRunProcessService extends IService {
 
     public void checkLastGenerationHasCompilationError(boolean updateProblemsView) throws ProcessorException;
 
+    public void checkLastGenerationHasCompilationError(boolean updateProblemsView, boolean isJob) throws ProcessorException;
+
     /**
      * DOC ycbai Comment method "getResourceFilePath".
      *

main/plugins/org.talend.core.runtime/src/main/java/org/talend/repository/ProjectManager.java

@@ -380,24 +380,27 @@ public final class ProjectManager {
         return null;
     }
 
+    /**
+     * @deprecated unable to get project when resource is unloaded, use {@link #getProject(EObject)} instead
+     */
     public org.talend.core.model.properties.Project getProject(Project project, EObject object) {
-        if (object != null) {
-            if (object instanceof org.talend.core.model.properties.Project) {
-                return (org.talend.core.model.properties.Project) object;
-            }
-            if (object instanceof Property) {
-                return getProject(project, ((Property) object).getItem());
-            }
-            if (object instanceof Item) {
-                return getProject(project, ((Item) object).getParent());
-            }
-        }
-
-        // default
-        if (project != null) {
-            return project.getEmfProject();
-        }
-        return null;
+        // if (object != null) {
+        // if (object instanceof org.talend.core.model.properties.Project) {
+        // return (org.talend.core.model.properties.Project) object;
+        // }
+        // if (object instanceof Property) {
+        // return getProject(project, ((Property) object).getItem());
+        // }
+        // if (object instanceof Item) {
+        // return getProject(project, ((Item) object).getParent());
+        // }
+        // }
+        //
+        // // default
+        // if (project != null) {
+        // return project.getEmfProject();
+        // }
+        return getProject(object);
     }
 
     public IProject getResourceProject(org.talend.core.model.properties.Project project) {
@@ -443,7 +446,7 @@ public final class ProjectManager {
 
     public boolean isInMainProject(Project mainProject, EObject object) {
         if (object != null) {
-            org.talend.core.model.properties.Project project = getProject(mainProject, object);
+            org.talend.core.model.properties.Project project = getProject(object);
             if (project != null && mainProject != null) {
                 return project.getTechnicalLabel().equals(mainProject.getEmfProject().getTechnicalLabel());
             }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/repository/ui/login/connections/ConnectionUserPerReader.java

@@ -32,6 +32,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.ui.PlatformUI;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.core.model.general.ConnectionBean;
+import org.talend.core.service.ICloudSignOnService;
 import org.talend.utils.json.JSONArray;
 import org.talend.utils.json.JSONException;
 import org.talend.utils.json.JSONObject;
@@ -158,6 +159,8 @@ public class ConnectionUserPerReader {
         }
         if (cons == null || cons.size() == 0) {
             proper.remove("connection.users");//$NON-NLS-1$
+            proper.remove("connection.define");//$NON-NLS-1$
+            proper.remove("connection.lastConnection");//$NON-NLS-1$
         } else {
             JSONArray usersJsonArray = new JSONArray();
             for (ConnectionBean currentConnection : cons) {
@@ -207,7 +210,6 @@ public class ConnectionUserPerReader {
         } catch (Exception e) {
             e.printStackTrace();
         }
-
     }
 
     public void createPropertyFile() {

main/plugins/org.talend.core.ui/src/main/java/messages_ja.properties

@@ -133,7 +133,7 @@ JavaFunctionParser.checkMethod=\u30EB\u30FC\u30C1\u30F3: "{0}.{1}"\u89E3\u6790\u
 JavaGlobalVariableProposal.Description=\u8AAC\u660E: {0}
 JavaGlobalVariableProposal.VariableName=\n\n\u5909\u6570\u540D: {1}
 JavaSimpleDateFormatProposalProvider.displaySingleQuote= ' : \u4E00\u91CD\u5F15\u7528\u7B26\u3092\u8868\u793A
-JavaSimpleDateFormatProposalProvider.quoteDisplayError=\uFF12\u3064\u306E\u30B7\u30F3\u30B0\u30EB\u30AF\u30A9\u30FC\u30C8\u3067\uFF11\u3064\u306E\u30B7\u30F3\u30B0\u30EB\u30AF\u30A9\u30FC\u30C8\u3092\u793A\u3057\u307E\u3059\u3002
+JavaSimpleDateFormatProposalProvider.quoteDisplayError=\uFF12\u3064\u306E\u4E00\u91CD\u5F15\u7528\u7B26\u3067\uFF11\u3064\u306E\u4E00\u91CD\u5F15\u7528\u7B26\u3092\u793A\u3057\u307E\u3059\u3002
 JavaTypesManager.bigDecimal=BIGDECIMAL\u306F\u6570\u5024\u3067\u3059:
 JavaTypesManager.integer=INTEGER\u306F\u6570\u5024\u3067\u3059:
 JavaTypesManager.list=LIST\u306F\u6570\u5024\u3067\u3059:

main/plugins/org.talend.core/src/main/java/messages_ja.properties

@@ -115,7 +115,7 @@ GlobalServiceRegister.ServiceNotRegistered=\u30B5\u30FC\u30D3\u30B9{0}\u304C\u76
 GroupByContextAction.groupContext=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3054\u3068\u306B\u30B0\u30EB\u30FC\u30D4\u30F3\u30B0
 GroupByVariableAction.groupVariable=\u5909\u6570\u3054\u3068\u306B\u30B0\u30EB\u30FC\u30D4\u30F3\u30B0
 JavaSimpleDateFormatProposalProvider.displaySingleQuote= ' : \u4E00\u91CD\u5F15\u7528\u7B26\u3092\u8868\u793A
-JavaSimpleDateFormatProposalProvider.quoteDisplayError=\uFF12\u3064\u306E\u30B7\u30F3\u30B0\u30EB\u30AF\u30A9\u30FC\u30C8\u3067\uFF11\u3064\u306E\u30B7\u30F3\u30B0\u30EB\u30AF\u30A9\u30FC\u30C8\u3092\u793A\u3057\u307E\u3059\u3002
+JavaSimpleDateFormatProposalProvider.quoteDisplayError=\uFF12\u3064\u306E\u4E00\u91CD\u5F15\u7528\u7B26\u3067\uFF11\u3064\u306E\u4E00\u91CD\u5F15\u7528\u7B26\u3092\u793A\u3057\u307E\u3059\u3002
 JavaTypesManager.bigDecimal=BIGDECIMAL\u306F\u6570\u5024\u3067\u3059:
 JavaTypesManager.integer=INTEGER\u306F\u6570\u5024\u3067\u3059:
 JavaTypesManager.list=LIST\u306F\u6570\u5024\u3067\u3059:

main/plugins/org.talend.core/src/main/java/org/talend/core/CoreService.java

@@ -42,6 +42,7 @@ import org.talend.core.model.metadata.builder.ConvertionHelper;
 import org.talend.core.model.metadata.builder.connection.MetadataTable;
 import org.talend.core.model.process.ElementParameterParser;
 import org.talend.core.model.properties.Item;
+import org.talend.core.model.properties.Property;
 import org.talend.core.model.relationship.RelationshipItemBuilder;
 import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.model.repository.RepositoryManager;
@@ -56,6 +57,7 @@ import org.talend.core.model.utils.TalendTextUtils;
 import org.talend.core.prefs.PreferenceManipulator;
 import org.talend.core.repository.model.ProxyRepositoryFactory;
 import org.talend.core.runtime.process.ITalendProcessJavaProject;
+import org.talend.core.services.ICoreTisService;
 import org.talend.core.services.IJobCheckService;
 import org.talend.core.utils.KeywordsValidator;
 import org.talend.designer.codegen.ICodeGeneratorService;
@@ -400,4 +402,31 @@ public class CoreService implements ICoreService {
             }
         });
     }
+
+    @Override
+    public Integer getSignatureVerifyResult(Property property, IPath resourcePath, boolean considerGP) throws Exception {
+        ICoreTisService coreTisService = ICoreTisService.get();
+        if (coreTisService != null) {
+            return coreTisService.getSignatureVerifyResult(property, resourcePath, considerGP);
+        }
+        return null;
+    }
+
+    @Override
+    public String getLicenseCustomer() {
+        ICoreTisService coreTisService = ICoreTisService.get();
+        if (coreTisService != null) {
+            return coreTisService.getLicenseCustomer();
+        }
+        return null;
+    }
+
+    @Override
+    public boolean isInValidGP() {
+        ICoreTisService coreTisService = ICoreTisService.get();
+        if (coreTisService != null) {
+            return coreTisService.isInValidGP();
+        }
+        return false;
+    }
 }

main/plugins/org.talend.core/src/main/java/org/talend/core/model/components/ModifyComponentsAction.java

@@ -21,6 +21,7 @@ import org.talend.commons.exception.PersistenceException;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.model.components.conversions.IComponentConversion;
 import org.talend.core.model.components.conversions.RenameComponentConversion;
+import org.talend.core.model.components.conversions.DefaultRenameComponentConversion;
 import org.talend.core.model.components.filters.IComponentFilter;
 import org.talend.core.model.components.filters.NameComponentFilter;
 import org.talend.core.model.properties.Item;
@@ -56,6 +57,20 @@ public class ModifyComponentsAction {
             throws PersistenceException {
         searchAndModify(item, item.getProcess(), filter, conversions);
     }
+    
+    /**
+     * Rename component name
+     * @param item job item
+     * @param processType Process type
+     * @param oldName old base name, for tck component, name does not include prefix "t", while for non tck components, name includes prefix "t".
+     * @param newName new base name, for tck component, name does not include prefix "t", while for non tck components, name includes prefix "t".
+     * @return
+     * @throws PersistenceException
+     */
+    public static boolean searchAndRenameComponent(Item item, ProcessType processType, String oldName, String newName) throws PersistenceException {
+        return searchAndModify(item, processType, new NameComponentFilter(oldName), Arrays.<IComponentConversion> asList(new DefaultRenameComponentConversion(oldName, newName)));
+
+    }
 
     public static boolean searchAndModify(Item item, ProcessType processType, IComponentFilter filter,
             List<IComponentConversion> conversions) throws PersistenceException {

main/plugins/org.talend.core/src/main/java/org/talend/core/model/components/conversions/DefaultRenameComponentConversion.java

@@ -0,0 +1,118 @@
+// ============================================================================
+//
+// 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.components.conversions;
+
+import org.eclipse.emf.common.util.EList;
+import org.talend.commons.runtime.model.components.IComponentConstants;
+import org.talend.core.model.components.ComponentUtilities;
+import org.talend.designer.core.model.utils.emf.talendfile.ConnectionType;
+import org.talend.designer.core.model.utils.emf.talendfile.ElementParameterType;
+import org.talend.designer.core.model.utils.emf.talendfile.MetadataType;
+import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
+import org.talend.designer.core.model.utils.emf.talendfile.ProcessType;
+import org.talend.designer.core.model.utils.emf.talendfile.SubjobType;
+
+/**
+ * @author bhe created on Jul 6, 2022
+ *
+ */
+public class DefaultRenameComponentConversion implements IComponentConversion {
+
+    private String newName;
+
+    private String oldName;
+
+    /**
+     * Rename component name
+     * 
+     * @param oldName old base name of the component, e.g. NetSuiteV2019Input
+     * @param newName new base name of the component, e.g. NetSuiteNewInput
+     */
+    public DefaultRenameComponentConversion(String oldName, String newName) {
+        super();
+        this.newName = newName;
+        this.oldName = oldName;
+    }
+
+    public void transform(NodeType node) {
+        node.setComponentName(newName);
+        ProcessType item = (ProcessType) node.eContainer();
+        String oldNodeUniqueName = ComponentUtilities.getNodeUniqueName(node);
+        ComponentUtilities.setNodeUniqueName(node, oldNodeUniqueName.replaceAll(oldName, newName));
+        replaceAllInAllNodesParameterValue(item, this.oldName, this.newName);
+    }
+
+    protected static void replaceAllInAllNodesParameterValue(ProcessType item, String oldName, String newName) {
+        for (Object o : item.getNode()) {
+            NodeType nt = (NodeType) o;
+            ComponentUtilities.replaceInNodeParameterValue(nt, oldName, newName);
+            EList metaList = nt.getMetadata();
+            if (metaList != null) {
+                if (!metaList.isEmpty()) {
+                    for (Object obj : metaList) {
+                        MetadataType meta = (MetadataType) obj;
+                        if (meta.getName().contains(oldName)) {
+                            meta.setName(meta.getName().replaceAll(oldName, newName));
+                        }
+                    }
+                }
+            }
+        }
+        for (Object o : item.getConnection()) {
+            ConnectionType currentConnection = (ConnectionType) o;
+            if (currentConnection.getSource().contains(oldName)) {
+                currentConnection.setSource(currentConnection.getSource().replaceAll(oldName, newName));
+            }
+            if (currentConnection.getTarget().contains(oldName)) {
+                currentConnection.setTarget(currentConnection.getTarget().replaceAll(oldName, newName));
+            }
+            if (currentConnection.getMetaname().contains(oldName)) {
+                currentConnection.setMetaname(currentConnection.getMetaname().replaceAll(oldName, newName));
+            }
+
+            if ("RUN_IF".equals(currentConnection.getConnectorName())) {
+                for (Object obj : currentConnection.getElementParameter()) {
+                    ElementParameterType type = (ElementParameterType) obj;
+                    if ("CONDITION".equals(type.getName())) {
+                        if (type.getValue() != null && type.getValue().contains(oldName)) {
+                            String replaceAll = type.getValue().replaceAll(oldName, newName);
+                            type.setValue(replaceAll);
+                        }
+                        break;
+                    }
+                }
+            }
+        }
+
+        for (Object o : item.getSubjob()) {
+            SubjobType sj = (SubjobType) o;
+            for (Object obj : sj.getElementParameter()) {
+                ElementParameterType p = (ElementParameterType) obj;
+                if (p.getName().equals(IComponentConstants.UNIQUE_NAME)) {
+                    if (p.getValue() != null && p.getValue().contains(oldName)) {
+                        String replaceAll = p.getValue().replaceAll(oldName, newName);
+                        p.setValue(replaceAll);
+                    }
+                }
+            }
+        }
+    }
+
+    public String getNewName() {
+        return this.newName;
+    }
+
+    public void setNewName(String newName) {
+        this.newName = newName;
+    }
+}

main/plugins/org.talend.core/src/main/java/org/talend/core/prefs/GeneralParametersProvider.java

@@ -1,86 +1,103 @@
-// ============================================================================
-//
-// 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.core.prefs;
-
-import java.util.Arrays;
-import java.util.ResourceBundle;
-
-import org.talend.commons.i18n.MessagesCore;
-
-/**
- * Use to retrieve general application parameters.<br/>
- *
- * $Id: Messages.java 1 2006-09-29 17:06:40 +0000 (ven., 29 sept. 2006) nrousseau $
- *
- */
-public class GeneralParametersProvider extends MessagesCore {
-
-    private static final String BUNDLE_NAME = "parameters"; //$NON-NLS-1$
-
-    private static final String PLUGIN_ID = "org.talend.core"; //$NON-NLS-1$
-
-    private static ResourceBundle resourceBundle;
-
-    private static ResourceBundle getBundle() {
-        if (resourceBundle == null) {
-            try {
-                resourceBundle = ResourceBundle.getBundle(BUNDLE_NAME);
-            } catch (Exception e) {
-                // Nothing to do (return null)
-            }
-        }
-        return resourceBundle;
-    }
-
-    /**
-     * Returns the value corresponding to the specified key.
-     */
-    public static String getString(GeneralParameters key) {
-        return getString(key.getParamName(), PLUGIN_ID, getBundle());
-    }
-
-    /**
-     * Returns a sorted string array containing values corresponding to the specified key.
-     */
-    public static String[] getStrings(GeneralParameters key) {
-        String value = getString(key);
-        String[] toReturn = value.split(","); //$NON-NLS-1$
-        Arrays.sort(toReturn);
-        return toReturn;
-    }
-
-    /**
-     * DOC smallet GeneralParametersProvider class global comment. Detailled comment <br/>
-     *
-     * $Id$
-     */
-    public enum GeneralParameters {
-        AUTHORIZED_LANGUAGE("param.authorizedlanguage"), //$NON-NLS-1$
-        DEFAULT_PERL_INTERPRETER_WIN32("param.defaultPerlInterpreterPath.win32"), //$NON-NLS-1$
-        DEFAULT_PERL_INTERPRETER_LINUX("param.defaultPerlInterpreterPath.linux"), //$NON-NLS-1$
-        DEFAULT_PERL_INTERPRETER_EMBEDDED_SUFFIX_WIN32("param.defaultPerlInterpreterEmbeddedSuffix.win32"), //$NON-NLS-1$
-        DEFAULT_JAVA_INTERPRETER_SUFFIX_WIN32("param.defaultJavaInterpreterSuffix.win32"), //$NON-NLS-1$
-        DEFAULT_JAVA_INTERPRETER_SUFFIX_LINUX("param.defaultJavaInterpreterSuffix.linux"), //$NON-NLS-1$
-        PROJECTS_EXCLUDED_FROM_EXPORT("param.projectsExcludedFromExport"); //$NON-NLS-1$
-
-        private String paramName;
-
-        GeneralParameters(String paramName) {
-            this.paramName = paramName;
-        }
-
-        public String getParamName() {
-            return this.paramName;
-        }
-    }
-}
+// ============================================================================
+//
+// 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.core.prefs;
+
+import java.util.Arrays;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+import org.apache.commons.lang3.StringUtils;
+import org.talend.commons.i18n.MessagesCore;
+import org.talend.core.CorePlugin;
+
+/**
+ * Use to retrieve general application parameters.<br/>
+ *
+ * $Id: Messages.java 1 2006-09-29 17:06:40 +0000 (ven., 29 sept. 2006) nrousseau $
+ *
+ */
+public class GeneralParametersProvider extends MessagesCore {
+
+    private static final String BUNDLE_NAME = "parameters"; //$NON-NLS-1$
+
+    private static final String PLUGIN_ID = "org.talend.core"; //$NON-NLS-1$
+
+    private static ResourceBundle resourceBundle;
+
+    private static ResourceBundle getBundle() {
+        if (resourceBundle == null) {
+            try {
+                resourceBundle = ResourceBundle.getBundle(BUNDLE_NAME);
+            } catch (Exception e) {
+                // Nothing to do (return null)
+            }
+        }
+        return resourceBundle;
+    }
+
+    /**
+     * Returns the value corresponding to the specified key.
+     */
+    public static String getString(GeneralParameters key) {
+        return getString(key.getParamName(), PLUGIN_ID, getBundle());
+    }
+
+    /**
+     * Returns a sorted string array containing values corresponding to the specified key.
+     */
+    public static String[] getStrings(GeneralParameters key) {
+        String value = getString(key);
+        String[] toReturn = value.split(","); //$NON-NLS-1$
+        Arrays.sort(toReturn);
+        return toReturn;
+    }
+    
+    public static String getOnLineHelpLanguageSetting() {
+        String language = CorePlugin.getDefault().getPluginPreferences().getString(ITalendCorePrefConstants.LANGUAGE_SELECTOR);
+        if (StringUtils.isBlank(language)) {
+            language = Locale.getDefault().getLanguage();
+        }
+        if (Locale.FRENCH.getLanguage().equals(language)) {
+            return "fr";
+        }
+        if (Locale.JAPAN.getLanguage().equals(language)) {
+            return "ja";
+        }
+        return "en"; //$NON-NLS-1$ //$NON-NLS-2$
+    }
+
+    /**
+     * DOC smallet GeneralParametersProvider class global comment. Detailled comment <br/>
+     *
+     * $Id$
+     */
+    public enum GeneralParameters {
+        AUTHORIZED_LANGUAGE("param.authorizedlanguage"), //$NON-NLS-1$
+        DEFAULT_PERL_INTERPRETER_WIN32("param.defaultPerlInterpreterPath.win32"), //$NON-NLS-1$
+        DEFAULT_PERL_INTERPRETER_LINUX("param.defaultPerlInterpreterPath.linux"), //$NON-NLS-1$
+        DEFAULT_PERL_INTERPRETER_EMBEDDED_SUFFIX_WIN32("param.defaultPerlInterpreterEmbeddedSuffix.win32"), //$NON-NLS-1$
+        DEFAULT_JAVA_INTERPRETER_SUFFIX_WIN32("param.defaultJavaInterpreterSuffix.win32"), //$NON-NLS-1$
+        DEFAULT_JAVA_INTERPRETER_SUFFIX_LINUX("param.defaultJavaInterpreterSuffix.linux"), //$NON-NLS-1$
+        PROJECTS_EXCLUDED_FROM_EXPORT("param.projectsExcludedFromExport"); //$NON-NLS-1$
+
+        private String paramName;
+
+        GeneralParameters(String paramName) {
+            this.paramName = paramName;
+        }
+
+        public String getParamName() {
+            return this.paramName;
+        }
+    }
+}

main/plugins/org.talend.core/src/main/java/org/talend/core/services/ICoreTisService.java

@@ -18,6 +18,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.common.util.URI;
 import org.osgi.service.prefs.BackingStoreException;
@@ -84,9 +85,25 @@ public interface ICoreTisService extends IService {
 
     public void afterImport (Property property) throws PersistenceException;  
 
+    Integer getSignatureVerifyResult(Property property, IPath resourcePath, boolean considerGP) throws Exception;
+
+    String getLicenseCustomer();
+    
+    void storeLicenseAndUpdateConfig(String licenseString) throws IOException;
+
+    boolean isInValidGP();
+
     boolean hasNewPatchInPatchesFolder();
 
     boolean isDefaultLicenseAndProjectType();
+    
+    String getLicenseProductName(String licenseString) throws Exception;
+    
+    String getLicenseProductEdition(String licenseString) throws Exception; 
+    
+    boolean isLicenseExpired(String licenseString) throws Exception;
+    
+    boolean isLicenseVersionCorrect(String licenseString) throws Exception;
 
     void syncProjectUpdateSettingsFromServer(IProgressMonitor monitor, Project proj) throws Exception;
 

main/plugins/org.talend.core/src/main/java/org/talend/designer/runprocess/ProcessorUtilities.java

@@ -278,6 +278,19 @@ public class ProcessorUtilities {
         needExportItemsForDQ = false;
     }
 
+    public static void resetExportConfig(boolean noResetDq) {
+        interpreter = null;
+        codeLocation = null;
+        libraryPath = null;
+        exportConfig = false;
+        exportAsOSGI = false;
+        exportTimeStamp = null;
+        exportJobAsMicroService = false;
+        if (!noResetDq) {
+            needExportItemsForDQ = false;
+        }
+    }
+
     public static String getInterpreter() {
         return interpreter;
     }
@@ -806,7 +819,8 @@ public class ProcessorUtilities {
             // TDI-36930, just after compile, need check the compile errors first.
             // only check current build
             if (isMainJob) {
-                CorePlugin.getDefault().getRunProcessService().checkLastGenerationHasCompilationError(true);
+                CorePlugin.getDefault().getRunProcessService().checkLastGenerationHasCompilationError(true,
+                        !ComponentCategory.CATEGORY_4_CAMEL.getName().equals(currentProcess.getComponentsType()));
             }
         }
 

main/plugins/org.talend.cwm.mip.edit/plugin_fr.properties

@@ -56,7 +56,7 @@ _UI_TypeAlias_type=Type Alias
 _UI_Union_type=Union
 _UI_UnionMember_type=Membre de l'union
 _UI_ExpressionNode_type=N\u0153ud d'expression
-_UI_ConstantNode_type=Noeud constant
+_UI_ConstantNode_type=N\u0153ud constant
 _UI_ElementNode_type=N\u0153ud d'\u00E9l\u00E9ment
 _UI_FeatureNode_type=N\u0153ud de fonctionnalit\u00E9
 _UI_UniqueKey_type=Cl\u00E9 unique

main/plugins/org.talend.cwm.mip.edit/plugin_ja.properties

@@ -788,7 +788,7 @@ _UI_Term_concept_feature=\u30B3\u30F3\u30BB\u30D7\u30C8
 _UI_Term_relatedTerm_feature=\u95A2\u9023\u7528\u8A9E
 _UI_Term_term_feature=\u7528\u8A9E
 _UI_Term_preferredTerm_feature=\u597D\u307E\u3057\u3044Term
-_UI_Term_synonym_feature=\u540C\u7FA9\u8A9E
+_UI_Term_synonym_feature=\u30B7\u30CE\u30CB\u30E0
 _UI_Term_widerTerm_feature=\u5E45\u5E83\u3044Term
 _UI_Term_narrowerTerm_feature=Narrower Term
 _UI_WarehouseProcess_staticDefinition_feature=\u9759\u7684\u5B9A\u7FA9

main/plugins/org.talend.designer.maven.repo.tcksdk/pom.xml

@@ -11,16 +11,16 @@
 	<packaging>eclipse-plugin</packaging>
 	<properties>
 		<tcomp.version>${component-runtime.version}</tcomp.version>
-		<cxf.version>3.5.1</cxf.version>
+		<cxf.version>3.5.2</cxf.version>
 		<geronimo.version>1.0.2</geronimo.version>
 		<jcache.version>1.0.5</jcache.version>
 		<jcache_spec.version>1.0-alpha-1</jcache_spec.version>
-		<johnzon.version>1.2.16</johnzon.version>
-		<meecrowave.version>1.2.13</meecrowave.version>
+		<johnzon.version>1.2.19</johnzon.version>
+		<meecrowave.version>1.2.14</meecrowave.version>
 		<microprofile.version>1.2.1</microprofile.version>
-		<owb.version>2.0.26</owb.version>
-		<slf4j.version>1.7.33</slf4j.version>
-		<tomcat.version>9.0.62</tomcat.version>
+		<owb.version>2.0.27</owb.version>
+		<slf4j.version>1.7.34</slf4j.version>
+		<tomcat.version>9.0.63</tomcat.version>
 		<xbean.version>4.20</xbean.version>
 		<reload4j.version>1.2.19</reload4j.version>
 		<log4j2.version>2.17.2</log4j2.version>

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

@@ -11,8 +11,8 @@
     <packaging>pom</packaging>
 
     <properties>
-        <tcomp.version>1.46.1</tcomp.version>
-        <slf4j.version>1.7.32</slf4j.version>
+        <tcomp.version>1.49.1</tcomp.version>
+        <slf4j.version>1.7.34</slf4j.version>
         <reload4j.version>1.2.19</reload4j.version>
     </properties>
 

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

@@ -29,8 +29,22 @@
                     <groupId>com.fasterxml.jackson.core</groupId>
                     <artifactId>jackson-databind</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-configuration2</artifactId>
+                </exclusion>
             </exclusions>
 		</dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-configuration2</artifactId>
+            <version>2.8.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>1.9</version>
+        </dependency>
 		<dependency>
             <groupId>com.fasterxml.jackson</groupId>
             <artifactId>jackson-bom</artifactId>

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/AggregatorPomsHelper.java

@@ -14,15 +14,16 @@ package org.talend.designer.maven.tools;
 
 import static org.talend.designer.maven.model.TalendJavaProjectConstants.*;
 
+import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.BufferedInputStream;
 import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -64,8 +65,10 @@ import org.talend.core.model.general.ILibrariesService;
 import org.talend.core.model.general.ModuleNeeded;
 import org.talend.core.model.general.ModuleNeeded.ELibraryInstallStatus;
 import org.talend.core.model.general.Project;
+import org.talend.core.model.process.JobInfo;
 import org.talend.core.model.process.ProcessUtils;
 import org.talend.core.model.properties.Item;
+import org.talend.core.model.properties.ProcessItem;
 import org.talend.core.model.properties.ProjectReference;
 import org.talend.core.model.properties.Property;
 import org.talend.core.model.relationship.Relation;
@@ -525,7 +528,7 @@ public class AggregatorPomsHelper {
                     @Override
                     public void run(final IProgressMonitor monitor) throws CoreException {
                         try {
-                            syncAllPomsWithoutProgress(monitor, PomIdsHelper.getPomFilter());
+                            syncAllPomsWithoutProgress(monitor, PomIdsHelper.getPomFilter(), false);
                         } catch (Exception e) {
                             ExceptionHandler.process(e);
                         }
@@ -620,10 +623,11 @@ public class AggregatorPomsHelper {
     }
 
     public void syncAllPomsWithoutProgress(IProgressMonitor monitor) throws Exception {
-        syncAllPomsWithoutProgress(monitor, PomIdsHelper.getPomFilter());
+        syncAllPomsWithoutProgress(monitor, PomIdsHelper.getPomFilter(), false);
     }
 
-    public void syncAllPomsWithoutProgress(IProgressMonitor monitor, String pomFilter) throws Exception {
+    public void syncAllPomsWithoutProgress(IProgressMonitor monitor, String pomFilter, boolean withDependencies)
+            throws Exception {
         LOGGER.info("syncAllPomsWithoutProgress, pomFilter: " + pomFilter);
         IRunProcessService runProcessService = IRunProcessService.get();
         if (runProcessService == null) {
@@ -634,11 +638,43 @@ public class AggregatorPomsHelper {
         Boolean isCIMode = IRunProcessService.get().isCIMode();
 
         List<IRepositoryViewObject> objects = new ArrayList<>();
+        List<ERepositoryObjectType> allJobletTypes = ERepositoryObjectType.getAllTypesOfJoblet();
         for (ERepositoryObjectType type : ERepositoryObjectType.getAllTypesOfProcess2()) {
+            if (isCIMode && withDependencies && allJobletTypes.contains(type)) {
+                continue;
+            }
             objects.addAll(ProxyRepositoryFactory.getInstance().getAll(type, true, true));
         }
+        Iterator<IRepositoryViewObject> iterator = objects.iterator();
+        while (iterator.hasNext()) {
+            IRepositoryViewObject object = iterator.next();
+            if (object.getProperty() == null || object.getProperty().getItem() == null) {
+                iterator.remove();
+                continue;
+            }
+            if (isCIMode && !allJobletTypes.contains(object.getRepositoryObjectType()) && IFilterService.get() != null
+                    && !IFilterService.get().isFilterAccepted(object.getProperty().getItem(), pomFilter)) {
+                iterator.remove();
+                continue;
+            }
+            if (isCIMode && object.isDeleted() && PomIdsHelper.getIfExcludeDeletedItems()) {
+                iterator.remove();
+            }
+        }
+        Set<Item> allItems;
+        if (withDependencies) {
+            allItems = objects.stream().flatMap(object -> {
+                ProcessItem item = (ProcessItem) object.getProperty().getItem();
+                Set<JobInfo> allJobInfos = ProcessorUtilities.getChildrenJobInfo(item, false, true);
+                allJobInfos.add(new JobInfo(item, item.getProcess().getDefaultContext()));
+                return allJobInfos.stream();
+            }).map(info -> info.getJobletProperty() != null ? info.getJobletProperty().getItem() : info.getProcessItem())
+                    .collect(Collectors.toSet());
+        } else {
+            allItems = objects.stream().map(object -> object.getProperty().getItem()).collect(Collectors.toSet());
+        }
 
-        int size = 3 + objects.size();
+        int size = 3 + allItems.size();
         monitor.setTaskName("Synchronize all poms"); //$NON-NLS-1$
         monitor.beginTask("", size); //$NON-NLS-1$
         // project pom
@@ -674,41 +710,17 @@ public class AggregatorPomsHelper {
         }
         // all jobs pom
         List<String> modules = new ArrayList<>();
-        IFilterService filterService = null;
-        if (GlobalServiceRegister.getDefault().isServiceRegistered(IFilterService.class)) {
-            filterService = (IFilterService) GlobalServiceRegister.getDefault().getService(IFilterService.class);
-        }
-
         List<Property> serviceRefJobs = getAllServiceReferencedJobs();
-        List<ERepositoryObjectType> allJobletTypes = ERepositoryObjectType.getAllTypesOfJoblet();
-        for (IRepositoryViewObject object : objects) {
-            if (filterService != null) {
-                if (isCIMode && !allJobletTypes.contains(object.getRepositoryObjectType())
-                        && !filterService.isFilterAccepted(object.getProperty().getItem(), pomFilter)) {
-                    continue;
-                }
-            }
-            if (object.getProperty() != null && object.getProperty().getItem() != null) {
-                if (isCIMode && object.isDeleted() && PomIdsHelper.getIfExcludeDeletedItems()) {
-                    continue;
-                }
-                Item item = object.getProperty().getItem();
-                if (ProjectManager.getInstance().isInCurrentMainProject(item)) {
-                    monitor.subTask("Synchronize job pom: " + item.getProperty().getLabel() //$NON-NLS-1$
-                            + "_" + item.getProperty().getVersion()); //$NON-NLS-1$
-                    if (runProcessService != null) {
-                        // already filtered
-                        runProcessService.generatePom(item, TalendProcessOptionConstants.GENERATE_POM_NO_FILTER);
-                    } else {
-                        ExceptionHandler.log("Cannot generate pom for " + object.getLabel()
-                                + " - Reason: RunProcessService is null.");
-                    }
-                    IFile pomFile = getItemPomFolder(item.getProperty()).getFile(TalendMavenConstants.POM_FILE_NAME);
-                    // TODO if not work, use serviceRefJobs.contains(object.getProperty()) to judge
-                    // filter esb data service node
-                    if (isCIMode && !isSOAPServiceProvider(object.getProperty()) && pomFile.exists()) {
-                        modules.add(getModulePath(pomFile));
-                    }
+        for (Item item : allItems) {
+            if (ProjectManager.getInstance().isInCurrentMainProject(item)) {
+                monitor.subTask("Synchronize job pom: " + item.getProperty().getLabel() //$NON-NLS-1$
+                        + "_" + item.getProperty().getVersion()); //$NON-NLS-1$
+                runProcessService.generatePom(item, TalendProcessOptionConstants.GENERATE_POM_NO_FILTER);
+                IFile pomFile = getItemPomFolder(item.getProperty()).getFile(TalendMavenConstants.POM_FILE_NAME);
+                // filter esb data service node
+                // FIXME use serviceRefJobs.contains(item.getProperty()) if isSOAPServiceProvider() doesn't work.
+                if (isCIMode && !isSOAPServiceProvider(item.getProperty()) && pomFile.exists()) {
+                    modules.add(getModulePath(pomFile));
                 }
             }
             monitor.worked(1);

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/BuildCacheManager.java

@@ -241,7 +241,8 @@ public class BuildCacheManager {
                     property.getVersion(), true);
             if (obj != null) {
 				IRunProcessService.get().generatePom(obj.getProperty().getItem(),
-						TalendProcessOptionConstants.GENERATE_POM_NOT_CLEAR_CACHE);
+                        TalendProcessOptionConstants.GENERATE_POM_NOT_CLEAR_CACHE
+                                | TalendProcessOptionConstants.GENERATE_NO_RESET_DQ);
             }
         }
     }
@@ -331,7 +332,7 @@ public class BuildCacheManager {
 
     private ITalendProcessJavaProject getTalendJobJavaProject(Property property) {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IRunProcessService.class)) {
-            IRunProcessService service = (IRunProcessService) GlobalServiceRegister.getDefault()
+            IRunProcessService service = GlobalServiceRegister.getDefault()
                     .getService(IRunProcessService.class);
             return service.getTalendJobJavaProject(property);
         }
@@ -347,7 +348,7 @@ public class BuildCacheManager {
 
     private boolean isBuildJob() {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IRunProcessService.class)) {
-            IRunProcessService service = (IRunProcessService) GlobalServiceRegister.getDefault()
+            IRunProcessService service = GlobalServiceRegister.getDefault()
                     .getService(IRunProcessService.class);
             return service.isExportConfig();
         }

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/creator/AbstractMavenCodesTemplatePom.java

@@ -140,8 +140,14 @@ public abstract class AbstractMavenCodesTemplatePom extends AbstractMavenGeneral
                         Exclusion jacksonExclusion = new Exclusion();
                         jacksonExclusion.setGroupId("com.fasterxml.jackson.core"); //$NON-NLS-1$
                         jacksonExclusion.setArtifactId("jackson-databind "); //$NON-NLS-1$
+
+                        Exclusion configuration2Exclusion = new Exclusion();
+                        configuration2Exclusion.setGroupId("org.apache.commons"); //$NON-NLS-1$
+                        configuration2Exclusion.setArtifactId("commons-configuration2"); //$NON-NLS-1$
+
                         dependency.addExclusion(exclusion);
                         dependency.addExclusion(jacksonExclusion);
+                        dependency.addExclusion(configuration2Exclusion);
                     }
                     existedDependencies.add(dependency);
                 }

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/utils/PomIdsHelper.java

@@ -300,6 +300,111 @@ public class PomIdsHelper {
         return filter;
     }
 
+	private static String getPublishCloudVersion(String latestVersion) {
+		if (null == latestVersion) {
+			return "0.1.0";
+		} else {
+			int i = latestVersion.lastIndexOf('.') + 1;
+			return latestVersion.substring(0, i) + (Long.parseLong(latestVersion.substring(i)) + 1);
+	  }
+	}
+	
+    /**
+     * @return "<bundleVersion>".
+     */
+    public static String getNotIteratedBundleVersion(Property property, String bundleVersion) {
+        String version = null;
+        if (property != null) {
+            boolean useSnapshot = false;
+            if (property.getAdditionalProperties() != null) {
+                version = (String) property.getAdditionalProperties().get(MavenConstants.NAME_USER_VERSION);
+                useSnapshot = property.getAdditionalProperties().containsKey(MavenConstants.NAME_PUBLISH_AS_SNAPSHOT);
+            }
+            if(version == null) {
+                version = bundleVersion;
+            }
+            if (version == null) {
+                version = VersionUtils.getPublishVersion(property.getVersion());
+            }
+            if (useSnapshot) {
+                version += MavenConstants.SNAPSHOT;
+            }
+        }
+        return version;
+    }
+
+    /**
+     * @return "<featureVersion>".
+     */
+    public static String getNotIteratedFeatureVersion(Property property, String featureVersion) {
+        String version = null;
+        if (property != null) {
+            boolean useSnapshot = false;
+            if (property.getAdditionalProperties() != null) {
+                version = (String) property.getAdditionalProperties().get(MavenConstants.NAME_USER_VERSION);
+                useSnapshot = property.getAdditionalProperties().containsKey(MavenConstants.NAME_PUBLISH_AS_SNAPSHOT);
+            }
+            if(version == null) {
+                version = featureVersion;
+            }
+            if (version == null) {
+                version = VersionUtils.getPublishVersion(property.getVersion());
+            }
+            if (useSnapshot) {
+                version += MavenConstants.SNAPSHOT;
+            }
+        }
+        return version;
+    }
+
+    /**
+     * @return "<bundleVersion>".
+     */
+    public static String getBundleVersion(Property property, String bundleVersion) {
+        String version = null;
+        if (property != null) {
+            boolean useSnapshot = false;
+            if (property.getAdditionalProperties() != null) {
+                version = (String) property.getAdditionalProperties().get(MavenConstants.NAME_USER_VERSION);
+                useSnapshot = property.getAdditionalProperties().containsKey(MavenConstants.NAME_PUBLISH_AS_SNAPSHOT);
+            }
+            if(version == null) {
+                version = getPublishCloudVersion(bundleVersion);
+            }
+            if (version == null) {
+                version = VersionUtils.getPublishVersion(property.getVersion());
+            }
+            if (useSnapshot) {
+                version += MavenConstants.SNAPSHOT;
+            }
+        }
+        return version;
+    }
+
+    /**
+     * @return "<featureVersion>".
+     */
+    public static String getFeatureVersion(Property property, String featureVersion) {
+        String version = null;
+        if (property != null) {
+            boolean useSnapshot = false;
+            if (property.getAdditionalProperties() != null) {
+                version = (String) property.getAdditionalProperties().get(MavenConstants.NAME_USER_VERSION);
+                useSnapshot = property.getAdditionalProperties().containsKey(MavenConstants.NAME_PUBLISH_AS_SNAPSHOT);
+            }
+            if(version == null) {
+                version = getPublishCloudVersion(featureVersion);
+            }
+            if (version == null) {
+                version = VersionUtils.getPublishVersion(property.getVersion());
+            }
+            if (useSnapshot) {
+                version += MavenConstants.SNAPSHOT;
+            }
+        }
+        return version;
+    }
+
     public static boolean useProfileModule() {
         String useProfileModule = System.getProperty("talend.profile.module");
         if (useProfileModule != null) {
@@ -426,4 +531,4 @@ public class PomIdsHelper {
         return preferenceManagers.get(projectTechName);
     }
 
-}
+}

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

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

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

@@ -4,22 +4,38 @@ Bundle-Name: Lucene plug-in
 Bundle-SymbolicName: org.talend.libraries.apache.lucene
 Bundle-Version: 8.0.1.qualifier
 Bundle-Vendor: .Talend SA.
-Bundle-ClassPath: lib/lucene-core-3.0.3.jar,
+Bundle-ClassPath: lib/lucene-core-8.11.2.jar,
  .
 Export-Package: org.apache.lucene,
  org.apache.lucene.analysis,
  org.apache.lucene.analysis.standard,
  org.apache.lucene.analysis.tokenattributes,
+ org.apache.lucene.codecs,
+ org.apache.lucene.codecs.blocktree,
+ org.apache.lucene.codecs.compressing,
+ org.apache.lucene.codecs.lucene50,
+ org.apache.lucene.codecs.lucene60,
+ org.apache.lucene.codecs.lucene80,
+ org.apache.lucene.codecs.lucene84,
+ org.apache.lucene.codecs.lucene86,
+ org.apache.lucene.codecs.lucene87,
+ org.apache.lucene.codecs.perfield,
  org.apache.lucene.document,
+ org.apache.lucene.geo,
  org.apache.lucene.index,
- org.apache.lucene.messages,
- org.apache.lucene.queryParser,
  org.apache.lucene.search,
- org.apache.lucene.search.function,
- org.apache.lucene.search.payloads,
+ org.apache.lucene.search.comparators,
+ org.apache.lucene.search.similarities,
  org.apache.lucene.search.spans,
  org.apache.lucene.store,
  org.apache.lucene.util,
- org.apache.lucene.util.cache
+ org.apache.lucene.util.automaton,
+ org.apache.lucene.util.bkd,
+ org.apache.lucene.util.compress,
+ org.apache.lucene.util.fst,
+ org.apache.lucene.util.graph,
+ org.apache.lucene.util.hppc,
+ org.apache.lucene.util.mutable,
+ org.apache.lucene.util.packed
 Bundle-ActivationPolicy: lazy
 Eclipse-BundleShape: dir

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

@@ -1,5 +1,4 @@
 output.. = class/
 bin.includes = META-INF/,\
                .,\
-               lib/lucene-core-2.9.3.jar,\
-               lib/lucene-core-3.0.3.jar
+               lib/lucene-core-8.11.2.jar

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

@@ -9,4 +9,36 @@
   </parent>
   <artifactId>org.talend.libraries.apache.lucene</artifactId>
   <packaging>eclipse-plugin</packaging>
+
+  <properties>
+    <lucene.version>8.11.2</lucene.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-core</artifactId>
+      <version>${lucene.version}</version>
+    </dependency>
+  </dependencies>
+  <build>
+  <plugins>
+   <plugin>
+    <groupId>org.apache.maven.plugins</groupId>
+    <artifactId>maven-dependency-plugin</artifactId>
+    <executions>
+        <execution>
+            <id>copy-dependencies</id>
+            <phase>generate-sources</phase>
+            <goals>
+                <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+                <outputDirectory>${project.basedir}/lib</outputDirectory>
+            </configuration>
+        </execution>
+    </executions>
+   </plugin>    
+  </plugins>
+ </build>
 </project>

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

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/lucene-analyzers-common-8.3.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/lucene-core-8.3.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/lucene-queries-8.3.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/lucene-queryparser-8.3.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/lucene-analyzers-common-8.11.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/lucene-backward-codecs-8.11.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/lucene-core-8.11.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/lucene-queries-8.11.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/lucene-queryparser-8.11.2.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>

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

@@ -5,10 +5,11 @@ Bundle-SymbolicName: org.talend.libraries.apache.lucene8
 Bundle-Version: 8.0.1.qualifier
 Bundle-Vendor: .Talend SA.
 Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: lib/lucene-analyzers-common-8.3.1.jar,
- lib/lucene-core-8.3.1.jar,
- lib/lucene-queries-8.3.1.jar,
- lib/lucene-queryparser-8.3.1.jar
+Bundle-ClassPath: lib/lucene-analyzers-common-8.11.2.jar,
+ lib/lucene-backward-codecs-8.11.2.jar,
+ lib/lucene-core-8.11.2.jar,
+ lib/lucene-queries-8.11.2.jar,
+ lib/lucene-queryparser-8.11.2.jar
 Export-Package: org.apache.lucene,
  org.apache.lucene.analysis,
  org.apache.lucene.analysis.ar,
@@ -78,6 +79,8 @@ Export-Package: org.apache.lucene,
  org.apache.lucene.codecs.lucene60,
  org.apache.lucene.codecs.lucene70,
  org.apache.lucene.codecs.lucene80,
+ org.apache.lucene.codecs.lucene84,
+ org.apache.lucene.codecs.lucene86,
  org.apache.lucene.codecs.perfield,
  org.apache.lucene.collation,
  org.apache.lucene.collation.tokenattributes,

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

@@ -1,7 +1,8 @@
 bin.includes = META-INF/,\
                .,\
-               lib/lucene-analyzers-common-8.3.1.jar,\
-               lib/lucene-core-8.3.1.jar,\
-               lib/lucene-queries-8.3.1.jar,\
-               lib/lucene-queryparser-8.3.1.jar
+               lib/lucene-analyzers-common-8.11.2.jar,\
+               lib/lucene-backward-codecs-8.11.2.jar,\
+               lib/lucene-core-8.11.2.jar,\
+               lib/lucene-queries-8.11.2.jar,\
+               lib/lucene-queryparser-8.11.2.jar
 

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

@@ -9,4 +9,57 @@
   </parent>  
   <artifactId>org.talend.libraries.apache.lucene8</artifactId>
   <packaging>eclipse-plugin</packaging>
+
+  <properties>
+    <lucene.version>8.11.2</lucene.version>
+  </properties>
+
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-analyzers-common</artifactId>
+      <version>${lucene.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-backward-codecs</artifactId>
+      <version>${lucene.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-core</artifactId>
+      <version>${lucene.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-queries</artifactId>
+      <version>${lucene.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-queryparser</artifactId>
+      <version>${lucene.version}</version>
+    </dependency>
+  </dependencies>
+  <build>
+  <plugins>
+   <plugin>
+    <groupId>org.apache.maven.plugins</groupId>
+    <artifactId>maven-dependency-plugin</artifactId>
+    <executions>
+        <execution>
+            <id>copy-dependencies</id>
+            <phase>generate-sources</phase>
+            <goals>
+                <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+                <outputDirectory>${project.basedir}/lib</outputDirectory>
+            </configuration>
+        </execution>
+    </executions>
+   </plugin>    
+  </plugins>
+ </build>
 </project>

main/plugins/org.talend.libraries.jdbc.h2/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="lib" path="lib/h2-2.1.210.jar"/>
+	<classpathentry kind="lib" path="lib/h2-2.1.214.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

main/plugins/org.talend.libraries.jdbc.h2/META-INF/MANIFEST.MF

@@ -4,7 +4,7 @@ Bundle-Name: H2
 Bundle-SymbolicName: org.talend.libraries.jdbc.h2
 Bundle-Version: 8.0.1.qualifier
 Bundle-ClassPath: .,
- lib/h2-2.1.210.jar
+ lib/h2-2.1.214.jar
 Export-Package: org.h2,
  org.h2.api;uses:="org.h2.command.ddl,org.h2.table",
  org.h2.bnf;uses:="org.h2.server.web",

main/plugins/org.talend.libraries.jdbc.h2/build.properties

@@ -1,4 +1,4 @@
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               lib/h2-2.1.210.jar
+               lib/h2-2.1.214.jar

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

@@ -28,7 +28,7 @@
 								<artifactItem>
 								    <groupId>com.h2database</groupId>
 								    <artifactId>h2</artifactId>
-								    <version>2.1.210</version>
+								    <version>2.1.214</version>
 								</artifactItem>
 							</artifactItems>
 						</configuration>

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

@@ -135,6 +135,8 @@ public class FastDateParser {
                 calendar.clear();
                 calendar.set(year, month, day);
                 return calendar.getTime();
+            } catch (NumberFormatException numberFormatException){
+                throw new RuntimeException("Unparseable date: \"" + source + "\""); //$NON-NLS-1$ //$NON-NLS-2$
             } catch (Exception e) {
                 pos.setErrorIndex(index);
                 e.printStackTrace();

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

@@ -268,11 +268,13 @@ public class JSONObject {
     public JSONObject(Object bean, Class<?> expectedClass) {
         this();
         
-        if(bean.getClass() != expectedClass) {
-            throw new JSONException("expectedClass doesn't match the bean or is null");
-        } 
+        Class<?> clazz = bean.getClass();
+        if((clazz == expectedClass) || (expectedClass!=null && expectedClass.isAssignableFrom(clazz))) {
+            populateMap(bean);
+            return;
+        }
         
-        populateMap(bean);
+        throw new JSONException("expectedClass doesn't match the bean or is null");
     }
 
     /**

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

@@ -193,11 +193,15 @@ public class ResumeUtil {
             }
         }
     }
-    
+
     public void flush() {
-    	if(csvWriter != null) {
-    		csvWriter.flush(true);
-    	}
+        if (csvWriter == null) {
+            return;
+        }
+
+        synchronized (csvWriter) {
+            csvWriter.flush(true);
+        }
     }
 
     // Util: invoke target check point

main/plugins/org.talend.librariesmanager/src/main/java/org/talend/librariesmanager/model/ExtensionModuleManager.java

@@ -25,7 +25,6 @@ import java.util.Set;
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IContributor;
-import org.talend.commons.exception.CommonExceptionHandler;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.utils.workbench.extensions.ExtensionImplementationProvider;
 import org.talend.commons.utils.workbench.extensions.ExtensionPointLimiterImpl;
@@ -110,7 +109,7 @@ public class ExtensionModuleManager {
 
     private ExtensionModuleManager() {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(ILibraryManagerService.class)) {
-            libManagerService = GlobalServiceRegister.getDefault().getService(
+            libManagerService = (ILibraryManagerService) GlobalServiceRegister.getDefault().getService(
                     ILibraryManagerService.class);
         }
         moduleGroupElementsCache = new ArrayList<>();
@@ -187,13 +186,6 @@ public class ExtensionModuleManager {
             if (!StringUtils.isEmpty(importType.getMVN())) {
                 moduleNeeded.setMavenUri(importType.getMVN());
             }
-            if (StringUtils.isBlank(importType.getMVN())) {
-                if (importType.getMODULE() != null) {
-
-                    CommonExceptionHandler.error("Missing module MVN_URI definition: " + importType.getMODULE());
-                }
-            }
-
             if (importType.getUrlPath() != null && libManagerService.checkJarInstalledFromPlatform(importType.getUrlPath())) {
                 moduleNeeded.setModuleLocaion(importType.getUrlPath());
             }

main/plugins/org.talend.librariesmanager/src/main/java/org/talend/librariesmanager/model/ModulesNeededProvider.java

@@ -30,7 +30,6 @@ import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.emf.common.util.EList;
-import org.talend.commons.CommonsPlugin;
 import org.talend.commons.exception.CommonExceptionHandler;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.PersistenceException;
@@ -130,10 +129,10 @@ public class ModulesNeededProvider {
 
     static {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IRepositoryService.class)) {
-            repositoryService = GlobalServiceRegister.getDefault().getService(IRepositoryService.class);
+            repositoryService = (IRepositoryService) GlobalServiceRegister.getDefault().getService(IRepositoryService.class);
         }
         if (GlobalServiceRegister.getDefault().isServiceRegistered(ILibraryManagerService.class)) {
-            libManagerService = GlobalServiceRegister.getDefault()
+            libManagerService = (ILibraryManagerService) GlobalServiceRegister.getDefault()
                     .getService(ILibraryManagerService.class);
         }
     }
@@ -331,17 +330,15 @@ public class ModulesNeededProvider {
                 .collect(Collectors.toList());
     }
 
-    public static void collectModuleNeeded(String context, IMPORTType importType, List<ModuleNeeded> importNeedsList,
-            boolean isExtComponentProvider) {
-        collectModuleNeeded(context, importType, importNeedsList, null, isExtComponentProvider);
+    public static void collectModuleNeeded(String context, IMPORTType importType, List<ModuleNeeded> importNeedsList) {
+        collectModuleNeeded(context, importType, importNeedsList, null);
     }
     
-    public static void collectModuleNeeded(String context, IMPORTType importType, List<ModuleNeeded> importNeedsList,
-            String distribution, boolean isExtComponentProvider) {
+    public static void collectModuleNeeded(String context, IMPORTType importType, List<ModuleNeeded> importNeedsList, String distribution) {
         List<ModuleNeeded> importModuleFromExtension = ExtensionModuleManager.getInstance().getModuleNeededForComponent(context, importType);
         boolean foundModule = importModuleFromExtension.size() > 0;
         if (!foundModule) { // If cannot find the jar from extension point then do it like before.
-            createModuleNeededForComponent(context, importType, importNeedsList, distribution, isExtComponentProvider);
+            createModuleNeededForComponent(context, importType, importNeedsList, distribution);
         } else {
             if (!StringUtils.isEmpty(distribution)) {
                 importModuleFromExtension.forEach(m -> m.setDynamicDistributionVersion(distribution));
@@ -351,29 +348,17 @@ public class ModulesNeededProvider {
     }
 
 
-    public static void createModuleNeededForComponent(String context, IMPORTType importType,
-            List<ModuleNeeded> importNeedsList, boolean isExtComponentProvider) {
-        createModuleNeededForComponent(context, importType, importNeedsList, null, isExtComponentProvider);
+    public static void createModuleNeededForComponent(String context, IMPORTType importType, List<ModuleNeeded> importNeedsList) {
+        createModuleNeededForComponent(context, importType, importNeedsList, null);
     }
-
-    public static void createModuleNeededForComponent(String context, IMPORTType importType,
-            List<ModuleNeeded> importNeedsList, String distribution, boolean isExtComponentProvider) {
+    
+    public static void createModuleNeededForComponent(String context, IMPORTType importType, List<ModuleNeeded> importNeedsList, String distribution) {
         if (importType.getMODULE() == null) {
             if (importType.getMODULEGROUP() != null) {
                 CommonExceptionHandler.warn("Missing module group definition: " + importType.getMODULEGROUP());
             }
             return;
         }
-        if (StringUtils.isBlank(importType.getMVN())) {
-            if (importType.getMODULE() != null) {
-                if (isExtComponentProvider) {
-
-                    CommonExceptionHandler.warn("Missing module MVN_URI definition: " + importType.getMODULE());
-                } else {
-                    CommonExceptionHandler.error("Missing module MVN_URI definition: " + importType.getMODULE());
-                }
-            }
-        }
         String msg = importType.getMESSAGE();
         if (msg == null) {
             msg = Messages.getString("modules.required"); //$NON-NLS-1$
@@ -717,7 +702,7 @@ public class ModulesNeededProvider {
         if (!GlobalServiceRegister.getDefault().isServiceRegistered(ILibrariesService.class)) {
             return null;
         }
-        service = GlobalServiceRegister.getDefault().getService(ILibrariesService.class);
+        service = (ILibrariesService) GlobalServiceRegister.getDefault().getService(ILibrariesService.class);
 
         if (importNeedsListForRoutes.isEmpty()) {
 
@@ -745,7 +730,7 @@ public class ModulesNeededProvider {
         if (!GlobalServiceRegister.getDefault().isServiceRegistered(ILibrariesService.class)) {
             return null;
         }
-        service = GlobalServiceRegister.getDefault().getService(ILibrariesService.class);
+        service = (ILibrariesService) GlobalServiceRegister.getDefault().getService(ILibrariesService.class);
         
         if (importNeedsListForCamelCore.isEmpty()) {
 
@@ -781,7 +766,7 @@ public class ModulesNeededProvider {
         importType.setMODULEGROUP("esb-java-11-group");
         importType.setREQUIRED(true);
 
-        collectModuleNeeded("tRESTClient", importType, importNeedsListForRoutes, false);
+        collectModuleNeeded("tRESTClient", importType, importNeedsListForRoutes);
     }
 
     /**
@@ -883,16 +868,6 @@ public class ModulesNeededProvider {
         if (!StringUtils.isEmpty(mvn_rui)) {
             module.setMavenUri(mvn_rui);
         }
-        if (CommonsPlugin.isDebugMode() && StringUtils.isBlank(mvn_rui)) {
-
-            if (StringUtils.isNotBlank(module.getModuleName())) {
-                if (StringUtils.isNotBlank(context)) {
-
-                    CommonExceptionHandler
-                            .error("Missing module MVN_URI definition: " + context + ": " + module.getModuleName());
-                }
-            }
-        }
         module.setMavenUri(mvn_rui);
         String excludeDependencies = current.getAttribute(ExtensionModuleManager.EXCLUDE_DEPENDENCIES_ATTR);
         module.setExcludeDependencies(Boolean.valueOf(excludeDependencies));

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

@@ -247,7 +247,6 @@ public class LocalLibraryManager implements ILibraryManagerService, IChangedLibr
         }
     }
 
-    @Override
     public void guessMavenRUIFromIndex(File jarFile, Map<String, String> sourceAndMavenUri) {
         guessMavenRUIFromIndex(jarFile, false, sourceAndMavenUri);
 
@@ -1302,7 +1301,6 @@ public class LocalLibraryManager implements ILibraryManagerService, IChangedLibr
         buildModulesIndexFromComponentAndExtension(monitorWrap);
     }
     
-    @Override
     public Map<String, String> buildModulesIndexFromComponentAndExtension(IProgressMonitor... monitorWrap) {
         // key: moduleName, value: platformURL
         Map<String, String> platformURLMap = new HashMap<>();
@@ -1417,7 +1415,7 @@ public class LocalLibraryManager implements ILibraryManagerService, IChangedLibr
         }
     }
     
-    public static boolean isExtComponentProvider(String id) {
+   private boolean isExtComponentProvider(String id) {
        if ("org.talend.designer.components.model.UserComponentsProvider".equals(id)
                || "org.talend.designer.codegen.components.model.SharedStudioUserComponentProvider".equals(id)
                || "org.talend.designer.components.exchange.ExchangeComponentsProvider".equals(id)
@@ -1747,7 +1745,6 @@ public class LocalLibraryManager implements ILibraryManagerService, IChangedLibr
         return isSameFile(jarFile, jarInLib);
     }
 
-    @Override
     public boolean isSameFile(File f1, File f2) {
         if (f1 == null || f2 == null) {
             return false;

main/plugins/org.talend.metadata.managment.ui/META-INF/MANIFEST.MF

@@ -29,6 +29,7 @@ Bundle-Vendor: .Talend SA.
 Bundle-Localization: plugin
 Export-Package: org.talend.metadata.managment.ui,
  org.talend.metadata.managment.ui.celleditor,
+ org.talend.metadata.managment.ui.convert.strategy,
  org.talend.metadata.managment.ui.dialog,
  org.talend.metadata.managment.ui.editor,
  org.talend.metadata.managment.ui.i18n,

main/plugins/org.talend.metadata.managment.ui/src/main/java/messages_fr.properties

@@ -510,10 +510,12 @@ InegerCellEditorListener.NumeralMessage=Valeur d'entr\u00E9e invalide
 MetadataTalendTypeEditor.button.edit=Mo&difier
 MetadataTalendTypeEditor.button.export=E&xporter
 MetadataTalendTypeEditor.button.import=I&mporter
+MetadataTalendTypeEditor.button.restore=R&estaurer
 MetadataTalendTypeEditor.column1.Name=Fichier de mapping de m\u00E9tadonn\u00E9es
 MetadataTalendTypeEditor.editMappingDialog.title=Modifier le fichier de mapping
 MetadataTalendTypeEditor.error.message=Message d'erreur
 MetadataTalendTypeEditor.fileIsImported=Le fichier a d\u00E9j\u00E0 \u00E9t\u00E9 import\u00E9.
+MetadataTalendTypeEditor.fileOverwrite=Ce fichier existe d\u00E9j\u00E0. L'\u00E9craser\u00A0?
 MetadataTalendTypeEditor.fileIsInvalid=Le fichier de m\u00E9tadonn\u00E9es import\u00E9 n'est pas valide.
 MetadataTalendTypeEditor.fileNameStartRule=Le nom de fichier doit commencer par 'mapping_'.
 ContextModeSelectPage.contextModes=Cr\u00E9er un contexte ou r\u00E9utiliser le contexte existant
@@ -549,5 +551,5 @@ MetadataTalendTypeEditor.confirmMessage=Voulez-vous remplacer les param\u00E8tre
 PromptDialog.title=Ex\u00E9cuter le contexte {0} avec les param\u00E8tres\u00A0:
 PromptDialog.stringTip=Le texte d'entr\u00E9e doit \u00EAtre entour\u00E9 par des guillemets.
 PromptDialog.choose.title=Choisissez un contexte
-PromptDialog.variablePrompts.name=Variables
+PromptDialog.variablePrompts.name=Variables \u00E0 compl\u00E9ter
 PromptDialog.context.environments.name=Environnement

main/plugins/org.talend.metadata.managment.ui/src/main/java/org/talend/metadata/managment/ui/convert/strategy/AbstractSwitchContextStrategy.java

@@ -0,0 +1,106 @@
+// ============================================================================
+//
+// 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.metadata.managment.ui.convert.strategy;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.exception.PersistenceException;
+import org.talend.core.hadoop.IHadoopClusterService;
+import org.talend.core.hadoop.repository.HadoopRepositoryUtil;
+import org.talend.core.model.context.ContextUtils;
+import org.talend.core.model.metadata.builder.connection.Connection;
+import org.talend.core.model.properties.ConnectionItem;
+import org.talend.core.model.properties.ContextItem;
+import org.talend.core.model.properties.Item;
+import org.talend.core.model.repository.ERepositoryObjectType;
+import org.talend.core.model.repository.IRepositoryViewObject;
+import org.talend.core.repository.model.ProxyRepositoryFactory;
+import org.talend.metadata.managment.ui.utils.ConnectionContextHelper;
+import org.talend.metadata.managment.ui.utils.ISwitchContext;
+import org.talend.repository.ProjectManager;
+import org.talend.repository.model.IProxyRepositoryFactory;
+
+
+public abstract class AbstractSwitchContextStrategy implements ISwitchContext {
+
+    private static Logger log = Logger.getLogger(AbstractSwitchContextStrategy.class);
+
+    @Override
+    public boolean updateContextGroup(ConnectionItem connItem, String selectedContext) {
+        return updateContextGroup(connItem, selectedContext, null);
+    }
+
+    @Override
+    public boolean updateContextForConnectionItems(Map<String, String> contextGroupRanamedMap,
+            ContextItem contextItem) {
+        if (contextItem == null) {
+            return false;
+        }
+        IProxyRepositoryFactory factory = ProxyRepositoryFactory.getInstance();
+        try {
+            List<IRepositoryViewObject> allConnectionItem =
+                    factory.getAll(ProjectManager.getInstance().getCurrentProject(),
+                            ERepositoryObjectType.METADATA_CONNECTIONS);
+
+            for (IRepositoryViewObject connectionItem : allConnectionItem) {
+                Item item = connectionItem.getProperty().getItem();
+                if (item instanceof ConnectionItem
+                        && ConnectionContextHelper.checkContextMode((ConnectionItem) item) != null) {
+                    Connection con = ((ConnectionItem) item).getConnection();
+                    String contextId = con.getContextId();
+                    if (contextId != null && contextId.equals(contextItem.getProperty().getId())) {
+                        String oldContextGroup = con.getContextName();
+                        boolean modified = false;
+                        if (oldContextGroup != null && !"".equals(oldContextGroup)) { //$NON-NLS-1$
+                            String newContextGroup = contextGroupRanamedMap.get(oldContextGroup);
+                            if (newContextGroup != null) { // rename
+                                con.setContextName(newContextGroup);
+                                modified = true;
+                            }
+                        } else { // if not set, set default group
+                            ContextItem originalItem = ContextUtils.getContextItemById2(contextId);
+                            con.setContextName(originalItem.getDefaultContext());
+                            modified = true;
+                        }
+                        if (modified) {
+                            factory.save(item);
+                        }
+                    }
+                }
+            }
+
+            IHadoopClusterService hadoopClusterService = HadoopRepositoryUtil.getHadoopClusterService();
+            if (hadoopClusterService != null) {
+                hadoopClusterService.updateConfJarsByContextGroup(contextItem, contextGroupRanamedMap);
+            }
+
+            return true;
+        } catch (PersistenceException e) {
+            ExceptionHandler.process(e);
+        }
+        return false;
+    }
+
+    protected void saveConnection(ConnectionItem connItem, boolean... isMigrationTask) {
+        IProxyRepositoryFactory factory = ProxyRepositoryFactory.getInstance();
+        try {
+            factory.save(connItem, isMigrationTask);
+        } catch (PersistenceException e) {
+            log.error(e, e);
+        }
+    }
+
+}

main/plugins/org.talend.metadata.managment.ui/src/main/java/org/talend/metadata/managment/ui/convert/strategy/SwitchContextWithReplace.java

@@ -0,0 +1,224 @@
+// ============================================================================
+//
+// 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.metadata.managment.ui.convert.strategy;
+
+import org.apache.log4j.Logger;
+import org.talend.core.GlobalServiceRegister;
+import org.talend.core.ITDQRepositoryService;
+import org.talend.core.database.EDatabaseTypeName;
+import org.talend.core.database.conn.DatabaseConnStrUtil;
+import org.talend.core.model.metadata.builder.connection.Connection;
+import org.talend.core.model.metadata.builder.connection.DatabaseConnection;
+import org.talend.core.model.metadata.builder.connection.FileConnection;
+import org.talend.core.model.properties.ConnectionItem;
+import org.talend.cwm.helper.CatalogHelper;
+import org.talend.cwm.helper.ConnectionHelper;
+import org.talend.cwm.helper.SchemaHelper;
+import org.talend.designer.core.model.utils.emf.talendfile.ContextType;
+import org.talend.metadata.managment.ui.utils.ConnectionContextHelper;
+
+import orgomg.cwm.resource.relational.Catalog;
+import orgomg.cwm.resource.relational.Schema;
+
+/**
+ * default strategy work for except generic jdbc
+ */
+public class SwitchContextWithReplace extends AbstractSwitchContextStrategy {
+
+    private static Logger log = Logger.getLogger(SwitchContextWithReplace.class);
+
+
+
+    @Override
+    public boolean updateContextGroup(ConnectionItem connItem, String selectedContext, String originalContext,
+            boolean... isMigrationTask) {
+        if (connItem == null) {
+            return false;
+        }
+        Connection con = connItem.getConnection();
+        // MOD msjian 2012-2-13 TDQ-4559: make it support file/mdm connection
+        if (con != null) {
+            // TDQ-4559~
+            String oldContextName = originalContext == null ? con.getContextName() : originalContext;
+
+            String newContextName = selectedContext;
+            if (newContextName == null) {
+                ContextType newContextType =
+                        ConnectionContextHelper.getContextTypeForContextMode(con, selectedContext, false);
+                newContextName = newContextType == null ? null : newContextType.getName();
+            }
+
+            if (!isContextIsValid(newContextName, oldContextName, connItem) && hasDependency(connItem)) {
+                // can not update connection when context is invalid(catalog or schema is null) and has dependecy
+                return false;
+            }
+            con.setContextName(newContextName);
+            if (con instanceof DatabaseConnection) {
+                DatabaseConnection dbConn = (DatabaseConnection) connItem.getConnection();
+                String newURL = getChangedURL(dbConn, newContextName);
+                dbConn.setURL(newURL);
+                // do nothing when schema or catalog is null
+                updateConnectionForSidOrUiSchema(dbConn, oldContextName);
+            }
+
+            saveConnection(connItem);
+            return true;
+        }
+        return false;
+    }
+
+    private boolean hasDependency(ConnectionItem connItem) {
+        // Added TDQ-18565
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(ITDQRepositoryService.class)) {
+            ITDQRepositoryService tdqRepService =
+                    GlobalServiceRegister.getDefault().getService(ITDQRepositoryService.class);
+            if (tdqRepService.hasClientDependences(connItem)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * DOC talend Comment method "checkContextIsValid".
+     *
+     * @param selectedContext
+     * @paramconn
+     */
+    private boolean isContextIsValid(String selectedContext, String oldContextName, ConnectionItem connItem) {
+        boolean retCode = false;
+        Connection conn = connItem.getConnection();
+        if (conn instanceof DatabaseConnection) {
+            EDatabaseTypeName dbType =
+                    EDatabaseTypeName.getTypeFromDbType(((DatabaseConnection) conn).getDatabaseType());
+
+            if (dbType == EDatabaseTypeName.GODBC) {// for ODBC
+                retCode = true;
+            } else if (dbType == EDatabaseTypeName.GENERAL_JDBC) {
+                retCode = true;
+            } else {
+                DatabaseConnection dbConn = (DatabaseConnection) conn;
+                boolean hasCatalog = ConnectionHelper.hasCatalog(dbConn);
+                boolean hasSchema = ConnectionHelper.hasSchema(dbConn);
+                ContextType newContextType = ConnectionContextHelper.getContextTypeForContextMode(dbConn,
+                        selectedContext, false);
+                ContextType oldContextType = ConnectionContextHelper.getContextTypeForContextMode(dbConn,
+                        oldContextName, false);
+                String newSidOrDatabase = ConnectionContextHelper.getOriginalValue(newContextType, dbConn.getSID());
+                String newUiShema = ConnectionContextHelper.getOriginalValue(newContextType, dbConn.getUiSchema());
+                String oldSidOrDatabase = ConnectionContextHelper.getOriginalValue(oldContextType, dbConn.getSID());
+                String oldUiShema = ConnectionContextHelper.getOriginalValue(oldContextType, dbConn.getUiSchema());
+                if (hasCatalog) {// for example mysql
+                    retCode = checkEmpty(newSidOrDatabase, oldSidOrDatabase);
+                    if (hasSchema) {// for example mssql
+                        retCode &= checkEmpty(newUiShema, oldUiShema);
+                    }
+                } else if (hasSchema) {// for example oracle
+                    retCode = checkEmpty(newUiShema, oldUiShema);
+                } else {// some db didnot have catelog and schema
+                    retCode = true;
+                }
+
+            }
+        } else if (conn instanceof FileConnection) {
+            retCode = true;
+        }
+
+        return retCode;
+
+    }
+
+    private boolean checkEmpty(String newSidOrDatabase, String oldSidOrDatabase) {
+        if (isEmptyString(oldSidOrDatabase) && isEmptyString(newSidOrDatabase)) {
+            return true;
+        }
+        return !isEmptyString(oldSidOrDatabase) && !isEmptyString(newSidOrDatabase);
+    }
+
+    /**
+     *
+     * check whether str is null or length is zero
+     *
+     * @param str
+     * @return
+     */
+    private boolean isEmptyString(final String str) {
+        return str == null || str.length() == 0;
+    }
+
+    /**
+     * change the URL according to selected context Added yyin 20120918 TDQ-5668
+     *
+     * @param connItem
+     * @param con
+     * @param selectedContext
+     */
+    private String getChangedURL(DatabaseConnection dbConn, String selectedContext) {
+        ContextType contextType = ConnectionContextHelper.getContextTypeForContextMode(dbConn, selectedContext, false);
+        String url = dbConn.getURL();
+        if (url != null) {
+            return url;
+        }
+        String server = ConnectionContextHelper.getOriginalValue(contextType, dbConn.getServerName());
+        String username = ConnectionContextHelper.getOriginalValue(contextType, dbConn.getUsername());
+        String password = ConnectionContextHelper.getOriginalValue(contextType, dbConn.getRawPassword());
+        String port = ConnectionContextHelper.getOriginalValue(contextType, dbConn.getPort());
+        String sidOrDatabase = ConnectionContextHelper.getOriginalValue(contextType, dbConn.getSID());
+        String datasource = ConnectionContextHelper.getOriginalValue(contextType, dbConn.getDatasourceName());
+        String filePath = ConnectionContextHelper.getOriginalValue(contextType, dbConn.getFileFieldName());
+        String dbRootPath = ConnectionContextHelper.getOriginalValue(contextType, dbConn.getDBRootPath());
+        String additionParam = ConnectionContextHelper.getOriginalValue(contextType, dbConn.getAdditionalParams());
+
+        return DatabaseConnStrUtil.getURLString(dbConn.getDatabaseType(), dbConn.getDbVersionString(), server, username,
+                password, port, sidOrDatabase, filePath.toLowerCase(), datasource, dbRootPath, additionParam);
+    }
+
+    /**
+     *
+     * change context Group need to synchronization name of catalog or schema
+     *
+     * @param dbConn
+     * @param oldContextName
+     */
+    private void updateConnectionForSidOrUiSchema(DatabaseConnection dbConn, String oldContextName) {
+        String selectedContext = dbConn.getContextName();
+        ContextType newContextType =
+                ConnectionContextHelper.getContextTypeForContextMode(dbConn, selectedContext, false);
+        ContextType oldContextType =
+                ConnectionContextHelper.getContextTypeForContextMode(dbConn, oldContextName, false);
+        String newSidOrDatabase = ConnectionContextHelper.getOriginalValue(newContextType, dbConn.getSID());
+        String newUiShema = ConnectionContextHelper.getOriginalValue(newContextType, dbConn.getUiSchema());
+        String oldSidOrDatabase = ConnectionContextHelper.getOriginalValue(oldContextType, dbConn.getSID());
+        String oldUiShema = ConnectionContextHelper.getOriginalValue(oldContextType, dbConn.getUiSchema());
+        if (!isEmptyString(newSidOrDatabase) && !isEmptyString(oldSidOrDatabase)) {// for example mysql or mssql
+            Catalog catalog = CatalogHelper.getCatalog(dbConn, oldSidOrDatabase);
+            if (catalog != null) {
+                catalog.setName(newSidOrDatabase);
+
+                Schema schema = SchemaHelper.getSchemaByName(CatalogHelper.getSchemas(catalog), oldUiShema);// for
+                                                                                                            // example
+                                                                                                            // mssql
+                if (schema != null) {
+                    schema.setName(newUiShema);
+                }
+            }
+        }
+        if (!isEmptyString(newUiShema) && !isEmptyString(oldUiShema)) {// for example oracle
+            Schema schema = SchemaHelper.getSchema(dbConn, oldUiShema);
+            if (schema != null) {
+                schema.setName(newUiShema);
+            }
+        }
+    }
+
+}

main/plugins/org.talend.metadata.managment.ui/src/main/java/org/talend/metadata/managment/ui/convert/strategy/SwitchContextWithTaggedValue.java

@@ -0,0 +1,216 @@
+// ============================================================================
+//
+// 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.metadata.managment.ui.convert.strategy;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.talend.core.model.metadata.builder.connection.DatabaseConnection;
+import org.talend.core.model.metadata.builder.database.jdbc.ExtractorFactory;
+import org.talend.core.model.metadata.builder.database.jdbc.IUrlDbNameExtractor;
+import org.talend.core.model.properties.ConnectionItem;
+import org.talend.core.model.properties.DatabaseConnectionItem;
+import org.talend.cwm.helper.TaggedValueHelper;
+
+/**
+ * generic jdbc connection will use this strategy
+ */
+public class SwitchContextWithTaggedValue extends AbstractSwitchContextStrategy {
+
+    private static Logger log = Logger.getLogger(SwitchContextWithTaggedValue.class);
+
+    @Override
+    public boolean updateContextGroup(ConnectionItem connItem, String selectedContext, String originalContext,
+            boolean... isMigrationTask) {
+        // judge database type by dbMetadata
+
+        IUrlDbNameExtractor extractorInstance =
+                ExtractorFactory.getExtractorInstance(connItem, selectedContext, originalContext);
+        if (extractorInstance == null) {
+            return false;
+        }
+
+        extractorInstance.initUiSchemaOrSID();
+        String sid = extractorInstance.getExtractResult().get(0);
+        String uiSchema = extractorInstance.getExtractResult().get(1);
+        DatabaseConnection dbConn = null;
+        if (connItem instanceof DatabaseConnectionItem) {
+            dbConn = (DatabaseConnection) connItem.getConnection();
+        } else {
+            return false;
+        }
+        // catalog never be null
+        if (extractorInstance.hasCatalog() && StringUtils.isEmpty(sid)) {
+            return false;
+        }
+        // schema can be null only when there are catalog
+        if (!extractorInstance.hasCatalog() && extractorInstance.hasSchema() && StringUtils.isEmpty(uiSchema)) {
+            return false;
+        }
+        boolean hasChanged = false;
+
+        // extract sid by different url try to create class structor to handle default case and special case
+        // setting sid or uischema by different databaseType
+        boolean isOriginalChanged = recordOriginalValue(connItem, selectedContext, originalContext, sid, uiSchema);
+
+        if (extractorInstance.hasBothSturctor()) {
+            if (sidIsValid(sid, dbConn) && uiSchemaIsValid(uiSchema, dbConn)) {
+                // change catalog and schema with same time when both structor exist and no one is empty
+                TaggedValueHelper.setTaggedValue(dbConn, TaggedValueHelper.TARGET_SID, sid);
+                TaggedValueHelper.setTaggedValue(dbConn, TaggedValueHelper.TARGET_UISCHEMA, uiSchema);
+                hasChanged = true;
+            }
+        } else {
+            if (extractorInstance.hasCatalog() && sidIsValid(sid, dbConn)) {
+                // only catalog case
+                TaggedValueHelper.setTaggedValue(dbConn, TaggedValueHelper.TARGET_SID, sid);
+                hasChanged = true;
+            }
+            if (extractorInstance.hasSchema() && uiSchemaIsValid(uiSchema, dbConn)) {
+                // only schema case
+                TaggedValueHelper.setTaggedValue(dbConn, TaggedValueHelper.TARGET_UISCHEMA, uiSchema);
+                hasChanged = true;
+            }
+        }
+        // special case when there are catalog and schema then schema can be set to null for switch between different
+        // catalog same schema case
+        if (isOriginalChanged && extractorInstance.hasBothSturctor() && StringUtils.isEmpty(uiSchema)) {
+            TaggedValueHelper.setTaggedValue(dbConn, TaggedValueHelper.TARGET_UISCHEMA, uiSchema);
+            TaggedValueHelper.setTaggedValue(dbConn, TaggedValueHelper.TARGET_SID, sid);
+            hasChanged = true;
+        }
+        if (hasChanged) {
+            dbConn.setContextName(selectedContext);
+            saveConnection(connItem, isMigrationTask);
+            return true;
+        }
+        return false;
+    }
+
+    private boolean recordOriginalValue(ConnectionItem connItem, String selectedContext, String originalContext,
+            String targetSid, String targetUiSchema) {
+        boolean hasChanged = false;
+        IUrlDbNameExtractor extractorInstance =
+                ExtractorFactory.getExtractorInstance(connItem, originalContext, selectedContext);
+        if (extractorInstance == null) {
+            return hasChanged;
+        }
+        extractorInstance.initUiSchemaOrSID();
+        String originalSid = extractorInstance.getExtractResult().get(0);
+        String originalUiSchema = extractorInstance.getExtractResult().get(1);
+        DatabaseConnection dbConn = null;
+        if (connItem instanceof DatabaseConnectionItem) {
+            dbConn = (DatabaseConnection) connItem.getConnection();
+        } else {
+            return hasChanged;
+        }
+        // catalog never be empty when catalog exist
+        if (extractorInstance.hasCatalog() && StringUtils.isEmpty(originalSid)) {
+            return false;
+        }
+        // schema can be empty only when catalog is exist
+        if (!extractorInstance.hasCatalog() && extractorInstance.hasSchema() && StringUtils.isEmpty(originalUiSchema)) {
+            return false;
+        }
+
+        String taggedOriSid = TaggedValueHelper.getValueString(TaggedValueHelper.ORIGINAL_SID, dbConn);
+        String taggedOriUiShchema = TaggedValueHelper.getValueString(TaggedValueHelper.ORIGINAL_UISCHEMA, dbConn);
+        // case1:catalog original value is empty then save original record(first time to switch)
+        if (extractorInstance.hasCatalog() && StringUtils.isEmpty(taggedOriSid)) {
+            if (!StringUtils.isEmpty(originalSid) && !StringUtils.isEmpty(targetSid)) {
+                TaggedValueHelper.setTaggedValue(dbConn, TaggedValueHelper.ORIGINAL_SID, originalSid);
+                hasChanged = true;
+
+            }
+        }
+        // case1:schema original value is empty then save original record(first time to switch)
+        if (extractorInstance.hasSchema() && StringUtils.isEmpty(taggedOriUiShchema)) {
+            if (!StringUtils.isEmpty(originalUiSchema) && !StringUtils.isEmpty(targetUiSchema)) {
+                TaggedValueHelper.setTaggedValue(dbConn, TaggedValueHelper.ORIGINAL_UISCHEMA, originalUiSchema);
+                hasChanged = true;
+            }
+        }
+        // case2 original value is in the context group then do nothing
+
+        // case3 originalContext same with selectedContext(
+        // .e.g. DQ->DQ2->DQ2 the second time switch will change original value to DQ2
+        // DQ->DQ2->DQ the second time switch will keep original value to DQ and switch target value as
+        // DQ
+
+        if (extractorInstance.hasCatalog() && !StringUtils.isEmpty(taggedOriSid) && originalContext.equals(selectedContext)) {
+            // change original catalog need to judge schema is not empty with same time
+            if (!StringUtils.isEmpty(originalSid)
+                    && (!extractorInstance.hasSchema() || !StringUtils.isEmpty(originalUiSchema))) {
+                TaggedValueHelper.setTaggedValue(dbConn, TaggedValueHelper.ORIGINAL_SID, originalSid);
+                hasChanged = true;
+            }
+        }
+        if (extractorInstance.hasSchema() && !StringUtils.isEmpty(taggedOriUiShchema)
+                && originalContext.equals(selectedContext)) {
+            // change original schema need to judge catalog is not empty with same time
+            if (!StringUtils.isEmpty(originalUiSchema)
+                    && (!extractorInstance.hasCatalog()
+                            || !StringUtils.isEmpty(originalSid) && !StringUtils.isEmpty(targetUiSchema))) {
+                TaggedValueHelper.setTaggedValue(dbConn, TaggedValueHelper.ORIGINAL_UISCHEMA, originalUiSchema);
+                hasChanged = true;
+            }
+        }
+
+        // case4 both has catalog and schema case then schema maybe set null when both original and target are null with
+        // same time
+        if (isSpecial4Case(targetUiSchema, extractorInstance, originalUiSchema, taggedOriUiShchema)) {
+            if (originalContext.equals(selectedContext)) {
+                TaggedValueHelper.setTaggedValue(dbConn, TaggedValueHelper.ORIGINAL_SID, originalSid);
+            }
+            TaggedValueHelper.setTaggedValue(dbConn, TaggedValueHelper.ORIGINAL_UISCHEMA, originalUiSchema);
+            hasChanged = true;
+        }
+        return hasChanged;
+
+    }
+
+    protected boolean isSpecial4Case(String targetUiSchema, IUrlDbNameExtractor extractorInstance,
+            String originalUiSchema, String taggedOriUiShchema) {
+        return extractorInstance.hasBothSturctor()
+                && StringUtils.isEmpty(originalUiSchema) && StringUtils.isEmpty(targetUiSchema);
+    }
+
+    private boolean originalValueExistInGroup(String taggedOriSid, String originalSid, String targetSid,
+            String taggedOriUiShchema, String originalUiSchema, String targetUiSchema) {
+        if (compareAllSameOrEmpty(taggedOriSid, originalSid)
+                && compareAllSameOrEmpty(taggedOriUiShchema, originalUiSchema)
+                || compareAllSameOrEmpty(taggedOriSid, targetSid)
+                        && compareAllSameOrEmpty(taggedOriUiShchema, targetUiSchema)) {
+            return true;
+        }
+        return false;
+    }
+
+    protected boolean compareAllSameOrEmpty(String taggedOriSid, String originalSid) {
+        return taggedOriSid == originalSid || StringUtils.isEmpty(taggedOriSid) && StringUtils.isEmpty(originalSid);
+    }
+
+    private boolean originalValueIsEmpty(String taggedOriSid, String taggedOriUiShchema) {
+        return StringUtils.isEmpty(taggedOriSid) || StringUtils.isEmpty(taggedOriUiShchema);
+    }
+
+    private boolean uiSchemaIsValid(String uiSchema, DatabaseConnection dbConn) {
+        return !StringUtils.isEmpty(uiSchema)
+                && !StringUtils.isEmpty(TaggedValueHelper.getValueString(TaggedValueHelper.ORIGINAL_UISCHEMA, dbConn));
+    }
+
+    private boolean sidIsValid(String sid, DatabaseConnection dbConn) {
+        return !StringUtils.isEmpty(sid)
+                && !StringUtils.isEmpty(TaggedValueHelper.getValueString(TaggedValueHelper.ORIGINAL_SID, dbConn));
+    }
+
+}

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

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

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

@@ -162,6 +162,10 @@ public class ExtendedNodeConnectionContextUtils {
         DataBricksClusterId,
         DataBricksToken,
         DataBricksDBFSDepFolder,
+        DataBricksClusterType,
+        DataBricksRuntimeVersion,
+        DataBricksDriverNodeType,
+        DataBricksNodeType,
         
         //Knox
         SparkMode,
@@ -170,6 +174,7 @@ public class ExtendedNodeConnectionContextUtils {
         KnoxUsername,
         KnoxPassword,
         KnoxDirectory,
+        KnoxTimeout,
         
         //Cde
         CdeApiEndPoint,