fix(TUP-38042):fix a context display problem on Mac. (#6397)

* fix(TUP-38042):fix a display problem on Mac.

* fix(TUP-38042):update a message

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

@@ -115,6 +115,8 @@ public enum ECoreImage implements IImage {
 
     METADATA_SAPCONNECTION_ICON("/icons1/sapconnection.png"), //$NON-NLS-1$
     METADATA_SAPCONNECTION_WIZ("/icons1/connection_wiz.gif"), //$NON-NLS-1$
+    
+    METADATA_BIGQUERYCONNECTION_ICON("/icons1/bigqueryconnection.png"), //$NON-NLS-1$
 
     METADATA_HEADERFOOTER_ICON("/icons1/headerfooter_icon32.png"), //$NON-NLS-1$
 

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

@@ -40,8 +40,8 @@ public enum EImage implements IImage {
     READ_ICON("/icons/read_obj.gif"), //$NON-NLS-1$
 
     QUESTION_ICON("/icons/question.gif"), //$NON-NLS-1$
-
     HELP_ICON("/icons/help.png"), //$NON-NLS-1$
+    MOREINFO_ICON("/icons/moreInfo.png"), //$NON-NLS-1$
 
     CREATE_CONNECTION_ICON("/icons/connection.gif"), //$NON-NLS-1$
 

main/plugins/org.talend.commons.runtime/pom_server.xml

@@ -92,7 +92,7 @@
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
-            <version>2.12.0</version>
+            <version>2.12.2</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.reload4j</groupId>
@@ -125,7 +125,7 @@
                  <dependency>
                   <groupId>com.google.guava</groupId>
                   <artifactId>guava</artifactId>
-                  <version>30.0-jre</version>
+                  <version>32.0.1-jre</version>
                  </dependency>
                 </dependencies>
                 <configuration>

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/database/DB2ForZosDataBaseMetadata.java

@@ -145,7 +145,30 @@ public class DB2ForZosDataBaseMetadata extends PackageFakeDatabaseMetadata {
      */
     @Override
     public ResultSet getPrimaryKeys(String catalog, String schema, String table) throws SQLException {
-        return new DB2ForZosResultSet();
+        ResultSet rs = super.getPrimaryKeys(catalog, schema, table);
+        if (rs == null) {
+            rs = new DB2ForZosResultSet();
+        }
+        return rs;
+    }
+    
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.talend.commons.utils.database.FakeDatabaseMetaData#getExportedKeys(java.lang.String, java.lang.String,
+     * java.lang.String)
+     */
+    @Override
+    public ResultSet getExportedKeys(String catalog, String schema, String table) throws SQLException {
+        ResultSet rs = super.getExportedKeys(catalog, schema, table);
+        if (rs == null) {
+            if (this.metaData != null) {
+                rs = this.metaData.getExportedKeys(catalog, schema, table);
+            } else {
+                rs = new DB2ForZosResultSet();
+            }
+        }
+        return rs;
     }
 
     /*
@@ -174,17 +197,6 @@ public class DB2ForZosDataBaseMetadata extends PackageFakeDatabaseMetadata {
         return tableResultSet;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.talend.commons.utils.database.FakeDatabaseMetaData#getExportedKeys(java.lang.String, java.lang.String,
-     * java.lang.String)
-     */
-    @Override
-    public ResultSet getExportedKeys(String catalog, String schema, String table) throws SQLException {
-        return new DB2ForZosResultSet();
-    }
-
     /*
      * (non-Javadoc)
      *

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/advanced/dataeditor/button/ExportPushButtonForExtendedTable.java

@@ -130,11 +130,10 @@ public abstract class ExportPushButtonForExtendedTable extends ExportPushButton
         AbstractExtendedTableViewer extendedTableViewer = (AbstractExtendedTableViewer) extendedControlViewer;
         ExtendedTableModel extendedTableModel = extendedTableViewer.getExtendedTableModel();
         boolean enabled = false;
-        if (extendedTableModel != null && extendedTableModel.isDataRegistered()
-                && extendedTableModel.getBeansList().size() > 0) {
+        if (extendedTableModel != null && extendedTableModel.isDataRegistered() && extendedTableModel.getBeansList().size() > 0) {
             enabled = true;
         }
-        return super.getEnabledState() && enabled;
+        return extendedTableModel != null || enabled;
     }
 
 }

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/advanced/dataeditor/button/SaveAsGenericSchemaPushButton.java

@@ -19,6 +19,7 @@ import org.talend.commons.ui.runtime.image.EImage;
 import org.talend.commons.ui.runtime.image.ImageProvider;
 import org.talend.commons.ui.swt.advanced.dataeditor.control.ExtendedPushButton;
 import org.talend.commons.ui.swt.extended.table.AbstractExtendedTableViewer;
+import org.talend.commons.ui.swt.extended.table.ExtendedTableModel;
 
 /**
  * DOC Administrator class global comment. Detailled comment <br/>
@@ -33,4 +34,11 @@ public abstract class SaveAsGenericSchemaPushButton extends ExtendedPushButton {
 
     @Override
     protected abstract Command getCommandToExecute();
+
+    @Override
+    public boolean getEnabledState() {
+        AbstractExtendedTableViewer extendedTableViewer = (AbstractExtendedTableViewer) extendedControlViewer;
+        ExtendedTableModel extendedTableModel = extendedTableViewer.getExtendedTableModel();
+        return extendedTableModel != null;
+    }
 }

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/colorstyledtext/ColorManager.java

@@ -18,7 +18,6 @@ import java.util.Iterator;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.jface.resource.StringConverter;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
@@ -94,8 +93,6 @@ public class ColorManager {
     public static final String BOLD_SUFFIX = "Bold"; //$NON-NLS-1$
 
     private Map<String, Color> colorMap;
-    
-    private static Map<String, Color> THEME_COLOR_MAP = new HashMap<String, Color>();
 
     private IPreferenceStore store;
 
@@ -119,12 +116,9 @@ public class ColorManager {
     }
 
     private static Color getThemeColor(String colorName) {
-        if (!THEME_COLOR_MAP.containsKey(colorName)) {
-            Color c = ITalendThemeService.getColor(colorName)
-                    .orElse(Display.getDefault().getSystemColor(SWT.COLOR_INFO_FOREGROUND));
-            THEME_COLOR_MAP.put(colorName, c);
-        }
-        return THEME_COLOR_MAP.get(colorName);
+        Color c = ITalendThemeService.getColor(colorName)
+                .orElse(Display.getDefault().getSystemColor(SWT.COLOR_INFO_FOREGROUND));
+        return c;
     }
 
     public void dispose() {
@@ -135,7 +129,6 @@ public class ColorManager {
             color.dispose();
         }
         colorMap = null;
-        THEME_COLOR_MAP.clear();
     }
 
     /**

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

@@ -127,14 +127,13 @@ JobletReferenceDialog.NodeTotalsTip=The totals of node reference
 JobletReferenceDialog.project=Project
 JobletReferenceDialog.ReferenceJob=Reference Job
 JobletReferenceDialog.Title=Delete the joblet failure
-ContextReferenceDialog.Title=Delete Context Group
+ContextReferenceDialog.DeleteContext.Title=Delete Context
 ContextReferenceDialog.Recycle=in Recycle Bin
 ContextReferenceDialog.ReferenceJob=Reference Objects
 ContextReferenceDialog.Types=Type
 ContextReferenceDialog.NodeTypeTip=The type of node reference
 ContextReferenceDialog.Messages=Context({0} {1}) is referenced from\:\n
-ContextReferenceDialog.kindMessages=The context group of {0} {1} is referred by the following list, if you really want to delete it, the context group is used in job will be changed to built-in when job is opened again. Would you still like to delete it?
-ContextReferenceDialog.kindMessages1=The context group of {0} {1} is referred by the following list, Would you still like to delete it?
+ContextReferenceDialog.kindMessages2=The context of {0} {1} is referred by the following list, would you still like to delete it?
 CopyToGenericSchemaHelper.cannotGenarateItem=Cannot generate pasted item label.
 ProxyRepositoryFactory.ReplaceJobHazardDescription=\nDependence on the original connection may be lost\!
 ItemReferenceDialog.title=Items which cannot be deleted
@@ -156,6 +155,7 @@ ProjectRepositoryNode.invalidItem=Invalid item
 ProjectRepositoryNode.columns=Columns
 ProjectRepositoryNode.validationRules=Validation Rules
 ProjectRepositoryNode.cdcFoundation=CDC Foundation
+ProjectRepositoryNode.cdcFoundation.deprecated=CDC Foundation (deprecated)
 ProjectRepositoryNode.genericSchema=Generic schemas
 ProjectRepositoryNode.queries=Queries
 ProjectRepositoryNode.synonymSchemas=Synonym schemas
@@ -175,6 +175,7 @@ ProjectRepositoryNode.sapBWDataStoreObject=SAP DSO
 ProjectRepositoryNode.sapBWInfoCube=SAP InfoCube
 ProjectRepositoryNode.sapBWInfoObject=SAP InfoObject
 ProjectRepositoryNode.sapContentExtractor=SAP BI Content Extractor
+ProjectRepositoryNode.sapCDSView=SAP CDS View
 RepositoryDropAdapter_copyingItems=Copying items...
 RepositoryDropAdapter_errorMsg=This directory contains the locked item,it can not be moved now
 RepositoryDropAdapter_lockedByOthers=This item is locked by other users, it can not be moved now.

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

@@ -156,6 +156,7 @@ ProjectRepositoryNode.invalidItem=\u00C9l\u00E9ment invalide
 ProjectRepositoryNode.columns=Colonnes
 ProjectRepositoryNode.validationRules=R\u00E8gles de validation
 ProjectRepositoryNode.cdcFoundation=Fondation CDC
+ProjectRepositoryNode.cdcFoundation.deprecated=Fondation CDC (d\u00E9pr\u00E9ci\u00E9)
 ProjectRepositoryNode.genericSchema=Sch\u00E9mas g\u00E9n\u00E9riques
 ProjectRepositoryNode.queries=Requ\u00EAtes
 ProjectRepositoryNode.synonymSchemas=Sch\u00E9mas synonymes
@@ -175,6 +176,7 @@ ProjectRepositoryNode.sapBWDataStoreObject=Objet Data Store SAP
 ProjectRepositoryNode.sapBWInfoCube=InfoCube SAP
 ProjectRepositoryNode.sapBWInfoObject=InfoObject SAP
 ProjectRepositoryNode.sapContentExtractor=Extracteur SAP BI Content
+ProjectRepositoryNode.sapCDSView=Vue SAP CDS
 RepositoryDropAdapter_copyingItems=Copie des \u00E9l\u00E9ments...
 RepositoryDropAdapter_errorMsg=Ce r\u00E9pertoire contient l'\u00E9l\u00E9ment verrouill\u00E9, il ne peut \u00EAtre d\u00E9plac\u00E9
 RepositoryDropAdapter_lockedByOthers=Cet \u00E9l\u00E9ment est verrouill\u00E9 par d'autres utilisateurs, impossible de le d\u00E9placer.

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

@@ -156,6 +156,7 @@ ProjectRepositoryNode.invalidItem=\u7121\u52B9\u306A\u30A2\u30A4\u30C6\u30E0
 ProjectRepositoryNode.columns=\u30AB\u30E9\u30E0
 ProjectRepositoryNode.validationRules=\u691C\u8A3C\u30EB\u30FC\u30EB
 ProjectRepositoryNode.cdcFoundation=CDC Foundation
+ProjectRepositoryNode.cdcFoundation.deprecated=CDC Foundation (\u975E\u63A8\u5968)
 ProjectRepositoryNode.genericSchema=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE
 ProjectRepositoryNode.queries=\u30AF\u30A8\u30EA\u30FC
 ProjectRepositoryNode.synonymSchemas=\u30B7\u30CE\u30CB\u30E0\u30B9\u30AD\u30FC\u30DE
@@ -175,6 +176,7 @@ ProjectRepositoryNode.sapBWDataStoreObject=SAP DSO
 ProjectRepositoryNode.sapBWInfoCube=SAP InfoCube
 ProjectRepositoryNode.sapBWInfoObject=SAP InfoObject
 ProjectRepositoryNode.sapContentExtractor=SAP BI\u30B3\u30F3\u30C6\u30F3\u30C4\u30A8\u30AF\u30B9\u30C8\u30E9\u30AF\u30BF\u30FC
+ProjectRepositoryNode.sapCDSView=SAP CDS\u30D3\u30E5\u30FC
 RepositoryDropAdapter_copyingItems=\u30A2\u30A4\u30C6\u30E0\u3092\u30B3\u30D4\u30FC\u4E2D...
 RepositoryDropAdapter_errorMsg=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u306B\u30ED\u30C3\u30AF\u3055\u308C\u305F\u30A2\u30A4\u30C6\u30E0\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002\u73FE\u5728\u3001\u79FB\u52D5\u3067\u304D\u307E\u305B\u3093,
 RepositoryDropAdapter_lockedByOthers=\u3053\u306E\u30A2\u30A4\u30C6\u30E0\u304C\u4ED6\u306E\u30E6\u30FC\u30B6\u30FC\u306B\u3088\u3063\u3066\u30ED\u30C3\u30AF\u3055\u308C\u307E\u3057\u305F\u3002\u73FE\u5728\u3001\u79FB\u52D5\u3067\u304D\u307E\u305B\u3093\u3002

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

@@ -156,6 +156,7 @@ ProjectRepositoryNode.invalidItem=\u65E0\u6548\u9879\u76EE
 ProjectRepositoryNode.columns=\u5217
 ProjectRepositoryNode.validationRules=\u9A8C\u8BC1\u89C4\u5219
 ProjectRepositoryNode.cdcFoundation=CDC Foundation
+ProjectRepositoryNode.cdcFoundation.deprecated=CDC Foundation (\u5DF2\u5F03\u7528)
 ProjectRepositoryNode.genericSchema=\u901A\u7528 schema
 ProjectRepositoryNode.queries=\u67E5\u8BE2
 ProjectRepositoryNode.synonymSchemas=\u540C\u4E49\u5B57 schema
@@ -175,6 +176,7 @@ ProjectRepositoryNode.sapBWDataStoreObject=SAP DSO
 ProjectRepositoryNode.sapBWInfoCube=SAP InfoCube
 ProjectRepositoryNode.sapBWInfoObject=SAP InfoObject
 ProjectRepositoryNode.sapContentExtractor=SAP BI \u5185\u5BB9\u63D0\u53D6\u5668
+ProjectRepositoryNode.sapCDSView=SAP CDS \u89C6\u56FE
 RepositoryDropAdapter_copyingItems=\u6B63\u5728\u590D\u5236\u9879\u76EE...
 RepositoryDropAdapter_errorMsg=\u6B64\u76EE\u5F55\u5305\u542B\u9501\u5B9A\u7684\u9879\u76EE\uFF0C\u73B0\u5728\u65E0\u6CD5\u79FB\u52A8
 RepositoryDropAdapter_lockedByOthers=\u6B64\u9879\u76EE\u88AB\u5176\u4ED6\u7528\u6237\u9501\u5B9A\uFF0C\u73B0\u5728\u65E0\u6CD5\u79FB\u52A8\u3002

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

@@ -67,7 +67,6 @@ import org.talend.core.model.repository.Folder;
 import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.model.repository.LockInfo;
 import org.talend.core.model.repository.RepositoryViewObject;
-import org.talend.core.model.routines.RoutinesUtil;
 import org.talend.core.repository.i18n.Messages;
 import org.talend.core.repository.utils.XmiResourceManager;
 import org.talend.core.runtime.CoreRuntimePlugin;
@@ -131,7 +130,7 @@ public abstract class AbstractEMFRepositoryFactory extends AbstractRepositoryFac
                 ERepositoryObjectType.METADATA_FILE_RULES, ERepositoryObjectType.METADATA_FILE_HL7,
                 ERepositoryObjectType.METADATA_FILE_FTP, ERepositoryObjectType.METADATA_FILE_BRMS,
                 ERepositoryObjectType.METADATA_MDMCONNECTION, ERepositoryObjectType.METADATA_HEADER_FOOTER,
-                ERepositoryObjectType.JOB_SCRIPT };
+                ERepositoryObjectType.JOB_SCRIPT, ERepositoryObjectType.METADATA_BIGQUERYCONNECTIONS };
 
         List<IRepositoryViewObject> deletedItems = new ArrayList<IRepositoryViewObject>();
         for (ERepositoryObjectType type : types) {
@@ -874,25 +873,38 @@ public abstract class AbstractEMFRepositoryFactory extends AbstractRepositoryFac
     @Override
     public IRepositoryViewObject getLastVersion(Project project, String id, String relativeFolder, ERepositoryObjectType type)
             throws PersistenceException {
-        List<IRepositoryViewObject> serializableAllVersion = null;
-        Object fullFolder = getFullFolder(project, type, relativeFolder);
-        serializableAllVersion = getSerializableFromFolder(project, fullFolder, id, type, false, false, true, true);
+        List<IRepositoryViewObject> serializableAllVersion = new ArrayList<>();
+        if (lastFolderForItemMap.containsKey(id)) {
+            ERepositoryObjectType itemType = lastRepositoryTypeForItemMap.get(id);
+            String currentPath = lastFolderForItemMap.get(id);
+            Object fullFolder = getFullFolder(project, itemType, currentPath);
+            try {
+                if (fullFolder != null && (fullFolder instanceof FolderItem || ((IFolder) fullFolder).exists())) {
+                    serializableAllVersion.addAll(getSerializableFromFolder(project, fullFolder, id, itemType, false, false, true, true));
+                }
+            } catch (PersistenceException e) {
+                // do nothing.
+                // if any exception happen or can't find the item, just try to look for it everywhere.
+            }
+        }
         if (serializableAllVersion.isEmpty()) {
-            // look in all folders for this item type
-            serializableAllVersion = getSerializableFromFolder(project, fullFolder, id, type, false, true, true, true, true);
+            Object fullFolder = getFullFolder(project, type, relativeFolder);
+            serializableAllVersion = getSerializableFromFolder(project, fullFolder, id, type, false, false, true, true);
+            if (serializableAllVersion.isEmpty()) {
+                // look in all folders for this item type
+                serializableAllVersion = getSerializableFromFolder(project, fullFolder, id, type, false, true, true, true, true);
+            }
         }
         int size = serializableAllVersion.size();
-
         if (size > 1) {
             String message = getItemsMessages(serializableAllVersion, size);
-
             throw new PersistenceException(Messages.getString(
                     "AbstractEMFRepositoryFactory.presistenceException.OnlyOneOccurenceMustbeFound", message)); //$NON-NLS-1$
-        } else if (size == 1) {
-            return serializableAllVersion.get(0);
-        } else {
-            return null;
         }
+        if (size == 1) {
+            return serializableAllVersion.get(0);
+        }
+        return null;
     }
 
     protected void computePropertyMaxInformationLevel(Property property) {

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

@@ -184,6 +184,7 @@ public abstract class AbstractRepositoryFactory implements IRepositoryFactory {
         collect(getMetadata(project, ERepositoryObjectType.METADATA_FILE_LDIF), result);
         collect(getMetadata(project, ERepositoryObjectType.METADATA_CONNECTIONS), result);
         collect(getMetadata(project, ERepositoryObjectType.METADATA_SAPCONNECTIONS), result);
+        collect(getMetadata(project, ERepositoryObjectType.METADATA_BIGQUERYCONNECTIONS), result);
         collect(getMetadata(project, ERepositoryObjectType.METADATA_HEADER_FOOTER), result);
         collect(getMetadata(project, ERepositoryObjectType.METADATA_LDAP_SCHEMA), result);
         collect(getMetadata(project, ERepositoryObjectType.METADATA_GENERIC_SCHEMA), result);

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

@@ -102,6 +102,7 @@ import org.talend.cwm.helper.ConnectionHelper;
 import org.talend.cwm.helper.SAPBWTableHelper;
 import org.talend.cwm.helper.SubItemHelper;
 import org.talend.cwm.helper.TableHelper;
+import org.talend.cwm.helper.TaggedValueHelper;
 import org.talend.designer.core.IDesignerCoreService;
 import org.talend.repository.ProjectManager;
 import org.talend.repository.model.BinRepositoryNode;
@@ -1349,6 +1350,8 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
             connection = dbMetadataConnection;
         } else if (type == ERepositoryObjectType.METADATA_SAPCONNECTIONS) {
             connection = ((ConnectionItem) repositoryObject.getProperty().getItem()).getConnection();
+        } else if (type == ERepositoryObjectType.METADATA_BIGQUERYCONNECTIONS) {
+            connection = ((ConnectionItem) repositoryObject.getProperty().getItem()).getConnection();
         } else if (type == ERepositoryObjectType.METADATA_FILE_DELIMITED) {
             connection = ((ConnectionItem) repositoryObject.getProperty().getItem()).getConnection();
         } else if (type == ERepositoryObjectType.METADATA_FILE_POSITIONAL) {
@@ -1700,11 +1703,11 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
                 DatabaseConnectionItem connectionItem = (DatabaseConnectionItem) item;
                 DatabaseConnection connection = (DatabaseConnection) connectionItem.getConnection();
                 if (PluginChecker.isCDCPluginLoaded()) {
-                    ICDCProviderService service = GlobalServiceRegister.getDefault()
-                            .getService(ICDCProviderService.class);
+                    ICDCProviderService service = GlobalServiceRegister.getDefault().getService(ICDCProviderService.class);
+
                     if (service != null && service.canCreateCDCConnection(connection)) {
                         RepositoryNode cdcNode = new StableRepositoryNode(node,
-                                Messages.getString("ProjectRepositoryNode.cdcFoundation"), //$NON-NLS-1$
+                                Messages.getString("ProjectRepositoryNode.cdcFoundation.deprecated"), //$NON-NLS-1$
                                 ECoreImage.FOLDER_CLOSE_ICON);
                         node.getChildren().add(cdcNode);
                         service.createCDCTypes(recBinNode, cdcNode, connection.getCdcConns());
@@ -1751,6 +1754,9 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
 
             // 10. BW Business Content Extractor:
             createSAPContentExtractorNodes(repObj, metadataConnection, node, validationRules);
+
+            // 11. CDS views:
+            createSAPCDSViewNodes(repObj, metadataConnection, node, validationRules);
         } else if (metadataConnection instanceof SalesforceSchemaConnection) {
             createSalesforceModuleNodes(repObj, metadataConnection, node, validationRules);
         } else {
@@ -1784,7 +1790,9 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
         for (MetadataTable tablesWithOrder : tablesWithOrders) {
             EMap<String, String> properties = tablesWithOrder.getAdditionalProperties();
             String partitionKey = properties.get(EProperties.CONTENT_TYPE.name());
-            if (!ERepositoryObjectType.METADATA_SAP_CONTENT_EXTRACTOR.name().equals(partitionKey)) {
+            String cdsType = TaggedValueHelper.getValueString(EProperties.CONTENT_TYPE.name(), tablesWithOrder);
+            if (!ERepositoryObjectType.METADATA_SAP_CONTENT_EXTRACTOR.name().equals(partitionKey)
+                    && !ERepositoryObjectType.METADATA_SAP_CDS_VIEW.name().equals(cdsType)) {
                 tables.add(tablesWithOrder);
             }
         }
@@ -1967,6 +1975,32 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
         createTables(tableContainer, repObj, tables, ERepositoryObjectType.METADATA_CON_TABLE, validationRules);
     }
 
+    private void createSAPCDSViewNodes(IRepositoryViewObject repObj, Connection metadataConnection, RepositoryNode node,
+            List<IRepositoryViewObject> validationRules) {
+        StableRepositoryNode tableContainer = new StableRepositoryNode(node,
+                Messages.getString("ProjectRepositoryNode.sapCDSView"), ECoreImage.FOLDER_CLOSE_ICON); //$NON-NLS-1$
+        tableContainer.setChildrenObjectType(ERepositoryObjectType.METADATA_CON_TABLE);
+        tableContainer.setProperties(EProperties.CONTENT_TYPE, ERepositoryObjectType.METADATA_SAP_CDS_VIEW);
+        IRepositoryNode cacheNode = nodeCache.getCache(tableContainer);
+        if (cacheNode != null && cacheNode instanceof StableRepositoryNode) {
+            tableContainer = (StableRepositoryNode) cacheNode;
+            tableContainer.getChildren().clear();
+        } else {
+            nodeCache.addCache(tableContainer, true);
+        }
+
+        node.getChildren().add(tableContainer);
+        List<MetadataTable> tablesWithOrders = ConnectionHelper.getTablesWithOrders(metadataConnection);
+        EList<MetadataTable> tables = new BasicEList<>();
+        for (MetadataTable tablesWithOrder : tablesWithOrders) {
+            String cdsType = TaggedValueHelper.getValueString(EProperties.CONTENT_TYPE.name(), tablesWithOrder);
+            if (ERepositoryObjectType.METADATA_SAP_CDS_VIEW.name().equals(cdsType)) {
+                tables.add(tablesWithOrder);
+            }
+        }
+        createTables(tableContainer, repObj, tables, ERepositoryObjectType.METADATA_CON_TABLE, validationRules);
+    }
+
     private void createSalesforceModuleNodes(IRepositoryViewObject rebObj, Connection metadataConnection,
             RepositoryNode connectionNode, List<IRepositoryViewObject> validationRules) {
         EList modules = ((SalesforceSchemaConnection) metadataConnection).getModules();

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

@@ -54,9 +54,7 @@ import org.eclipse.jface.dialogs.InputDialog;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.osgi.internal.serviceregistry.ServiceReferenceImpl;
 import org.eclipse.osgi.internal.serviceregistry.ServiceRegistrationImpl;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.navigator.CommonNavigator;
 import org.eclipse.ui.navigator.CommonViewer;
@@ -447,12 +445,10 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                             if (currentShell == null) {
                                 currentShell = DisplayUtils.getDefaultShell(false);
                             }
-                            MessageBox box = new MessageBox(currentShell, SWT.ICON_WARNING | SWT.OK | SWT.CANCEL);
-                            box.setText(Messages.getString("ProxyRepositoryFactory.JobNameErroe")); //$NON-NLS-1$
-                            box.setMessage(Messages.getString("ProxyRepositoryFactory.Label") + " " + name + " " + Messages.getString("ProxyRepositoryFactory.ReplaceJob")); //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$
-
-                            if (box.open() == SWT.OK) {
-
+                            if (MessageDialog.openQuestion(currentShell,
+                                    Messages.getString("ProxyRepositoryFactory.JobNameErroe"), //$NON-NLS-1$
+                                    Messages.getString("ProxyRepositoryFactory.Label") + " " + name + " " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                                            + Messages.getString("ProxyRepositoryFactory.ReplaceJob"))) { //$NON-NLS-1$
                                 ok[0] = true;
                             }
                         }
@@ -2211,6 +2207,13 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                     ExceptionHandler.process(e);
                 }
                 
+                if (IHadoopDistributionService.get() != null) {
+                    try {
+                        IHadoopDistributionService.get().checkAndMigrateDistributionProxyCredential(project);
+                    } catch (Exception e) {
+                        ExceptionHandler.process(e);
+                    }
+                }
                 // init dynamic distirbution after `beforeLogon`, before loading libraries.
                 initDynamicDistribution(monitor);
                 

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/ui/actions/DuplicateAction.java

@@ -606,6 +606,8 @@ public class DuplicateAction extends AContextualAction {
                     item = PropertiesFactory.eINSTANCE.createSalesforceSchemaConnectionItem();
                 } else if (repositoryType == ERepositoryObjectType.METADATA_SAPCONNECTIONS) {
                     item = PropertiesFactory.eINSTANCE.createSAPConnectionItem();
+                } else if (repositoryType == ERepositoryObjectType.METADATA_BIGQUERYCONNECTIONS) {
+                    item = PropertiesFactory.eINSTANCE.createBigQueryConnectionItem();
                 } else if (repositoryType == ERepositoryObjectType.METADATA_WSDL_SCHEMA) {
                     item = PropertiesFactory.eINSTANCE.createWSDLSchemaConnectionItem();
                 } else if (repositoryType == ERepositoryObjectType.PROCESS) {

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/ui/dialog/ContextReferenceDialog.java

@@ -129,7 +129,7 @@ public class ContextReferenceDialog extends SelectionDialog {
             Item item = objToDelete.getProperty().getItem();
             if (item != null) {
                 setMessage(Messages.getString(
-                        "ContextReferenceDialog.kindMessages1", item.getProperty().getLabel(), item.getProperty().getVersion())); //$NON-NLS-1$
+                        "ContextReferenceDialog.kindMessages2", item.getProperty().getLabel(), item.getProperty().getVersion())); //$NON-NLS-1$
             }
         }
         setHelpAvailable(false);
@@ -138,7 +138,7 @@ public class ContextReferenceDialog extends SelectionDialog {
     @Override
     protected void configureShell(Shell newShell) {
         super.configureShell(newShell);
-        newShell.setText(Messages.getString("ContextReferenceDialog.Title")); //$NON-NLS-1$
+        newShell.setText(Messages.getString("ContextReferenceDialog.DeleteContext.Title")); //$NON-NLS-1$
         newShell.setSize(650, 250);
     }
 

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/utils/StandaloneConnectionContextUtils.java

@@ -40,6 +40,7 @@ import org.talend.core.model.utils.CloneConnectionUtils;
 import org.talend.core.model.utils.ContextParameterUtils;
 import org.talend.core.utils.TalendQuoteUtils;
 import org.talend.cwm.helper.ConnectionHelper;
+import org.talend.cwm.helper.StudioEncryptionHelper;
 import org.talend.designer.core.model.utils.emf.talendfile.ContextType;
 import org.talend.model.bridge.ReponsitoryContextBridge;
 
@@ -67,6 +68,7 @@ public class StandaloneConnectionContextUtils {
         String server = getOriginalValue(contextProperties, dbConn.getServerName());
         String username = getOriginalValue(contextProperties, dbConn.getUsername());
         String password = getOriginalValue(contextProperties, dbConn.getRawPassword());
+        String originEncryptedPassword = getOriginalValue(contextProperties, dbConn.getPassword());
         String port = getOriginalValue(contextProperties, dbConn.getPort());
         String sidOrDatabase = getOriginalValue(contextProperties, dbConn.getSID());
         String datasource = getOriginalValue(contextProperties, dbConn.getDatasourceName());
@@ -87,6 +89,8 @@ public class StandaloneConnectionContextUtils {
         cloneConn.setDatasourceName(datasource);
         cloneConn.setDBRootPath(dbRootPath);
         cloneConn.setFileFieldName(filePath);
+        //To avoid encrypt the same value
+        cloneConn.setPassword(originEncryptedPassword);
         cloneConn.setRawPassword(password); // the password is raw.
         cloneConn.setPort(port);
         cloneConn.setUiSchema(schemaOracle);

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

@@ -43,6 +43,8 @@ public class PluginChecker {
     private static final String CDC_PLUGIN_ID = "org.talend.designer.cdc"; //$NON-NLS-1$
 
     private static final String SAP_WZIARD_PLUGIN_ID = "org.talend.repository.sap"; //$NON-NLS-1$
+    
+    private static final String BIGQUERY_WZIARD_PLUGIN_ID = "org.talend.repository.bigquery"; //$NON-NLS-1$
 
     private static final String EBCDIC_PLUGIN_ID = "org.talend.repository.ebcdic"; //$NON-NLS-1$
 
@@ -246,6 +248,10 @@ public class PluginChecker {
     public static boolean isSAPWizardPluginLoaded() {
         return isPluginLoaded(SAP_WZIARD_PLUGIN_ID);
     }
+    
+    public static boolean isBigQueryWizardPluginLoaded() {
+        return isPluginLoaded(BIGQUERY_WZIARD_PLUGIN_ID);
+    }
 
     public static boolean isEBCDICPluginLoaded() {
         return isPluginLoaded(EBCDIC_PLUGIN_ID);
@@ -267,10 +273,6 @@ public class PluginChecker {
         return isPluginLoaded(MDM_PLUGIN_ID);
     }
 
-    public static boolean isExchangeSystemLoaded() {
-        return isPluginLoaded(EXCHANGE_SYSTEM_PLUGIN_ID);
-    }
-
     public static boolean isRulesPluginLoaded() { // added by hyWang
         return isPluginLoaded(RULES_PLUGIN_ID);
     }

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

@@ -52,6 +52,7 @@ public enum EDatabase4DriverClassName {
     MYSQL8(EDatabaseTypeName.MYSQL, "com.mysql.cj.jdbc.Driver"), //$NON-NLS-1$
     MARIADB(EDatabaseTypeName.MYSQL, "org.mariadb.jdbc.Driver"), //$NON-NLS-1$
     AMAZON_AURORA(EDatabaseTypeName.AMAZON_AURORA, "org.gjt.mm.mysql.Driver"), //$NON-NLS-1$
+    AMAZON_AURORA_3(EDatabaseTypeName.AMAZON_AURORA, "com.mysql.cj.jdbc.Driver"), //$NON-NLS-1$
     NETEZZA(EDatabaseTypeName.NETEZZA, "org.netezza.Driver"), //$NON-NLS-1$
 
     ORACLEFORSID(EDatabaseTypeName.ORACLEFORSID, "oracle.jdbc.OracleDriver", "oracle.jdbc.driver.OracleDriver"), //$NON-NLS-1$ //$NON-NLS-2$
@@ -87,8 +88,8 @@ public enum EDatabase4DriverClassName {
     // MOD klliu 2010-06-04 bug 12819: upgrade jdbc driver class used in sql explorer
     TERADATA(EDatabaseTypeName.TERADATA, "com.teradata.jdbc.TeraDriver"), //$NON-NLS-1$
 
-    VERTICA(EDatabaseTypeName.VERTICA, "com.vertica.Driver"), //$NON-NLS-1$
-    VERTICA2(EDatabaseTypeName.VERTICA, "com.vertica.jdbc.Driver"), //$NON-NLS-1$
+//    VERTICA(EDatabaseTypeName.VERTICA, "com.vertica.Driver"), //$NON-NLS-1$
+    VERTICA(EDatabaseTypeName.VERTICA, "com.vertica.jdbc.Driver"), //$NON-NLS-1$
 
     HIVE(EDatabaseTypeName.HIVE, "org.apache.hadoop.hive.jdbc.HiveDriver"), //$NON-NLS-1$
 

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

@@ -252,6 +252,8 @@ public class ConnParameterKeys {
     
     public static final String CONN_PARA_KEY_EXECUTOR_MEMORY = "CONN_PARA_KEY_EXECUTOR_MEMORY"; //$NON-NLS-1$
     
+    public static final String CONN_PARA_KEY_EXECUTOR_CORES = "CONN_PARA_KEY_EXECUTOR_CORES";
+    
     public static final String CONN_PARA_KEY_TUNING_PROPERTIES = "CONN_PARA_KEY_TUNING_PROPERTIES"; //$NON-NLS-1$
 
     /******************************************/
@@ -453,6 +455,9 @@ public class ConnParameterKeys {
     public static final String CONN_PARA_KEY_UNIV_STANDALONE_EXEC_MEMORY="CONN_PARA_KEY_UNIV_STANDALONE_EXEC_MEMORY";
     public static final String CONN_PARA_KEY_UNIV_STANDALONE_EXEC_CORE="CONN_PARA_KEY_UNIV_STANDALONE_EXEC_CORE";
     
+    
+    // Spark Submit Scripts
+    public static final String CONN_PARA_KEY_UNIV_SPARK_SUBMIT_SCRIPT_HOME="CONN_PARA_KEY_UNIV_SPARK_SUBMIT_SCRIPT_HOME";
     /**
      * Redshift
      */

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

@@ -33,7 +33,7 @@ public enum EDatabaseVersion4Drivers {
     ACCESS_2007(new DbVersion4Drivers(EDatabaseTypeName.ACCESS, "Access 2007", "Access_2007")), //$NON-NLS-1$ //$NON-NLS-2$
     // oracle
     ORACLE_18(new DbVersion4Drivers(new EDatabaseTypeName[] { EDatabaseTypeName.ORACLEFORSID, EDatabaseTypeName.ORACLESN,
-            EDatabaseTypeName.ORACLE_OCI, EDatabaseTypeName.ORACLE_CUSTOM }, "Oracle 18 and above", "ORACLE_18", "ojdbc8-19.3.0.0.jar")),
+            EDatabaseTypeName.ORACLE_OCI, EDatabaseTypeName.ORACLE_CUSTOM }, "Oracle 18 and above", "ORACLE_18", "ojdbc8-19.19.0.0.jar")),
     ORACLE_12(new DbVersion4Drivers(new EDatabaseTypeName[] { EDatabaseTypeName.ORACLEFORSID, EDatabaseTypeName.ORACLESN,
             EDatabaseTypeName.ORACLE_OCI, EDatabaseTypeName.ORACLE_CUSTOM }, "Oracle 12 (Deprecated)", "ORACLE_12",
             "ojdbc7.jar")),
@@ -69,9 +69,9 @@ public enum EDatabaseVersion4Drivers {
             "SAS 9.2", "SAS_9.2", new String[] { "sas.core.jar", "sas.security.sspi.jar", "sas.svc.connection.jar", "reload4j-1.2.22.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
     SAPHana(new DbVersion4Drivers(EDatabaseTypeName.SAPHana, "HDB 1.0", "HDB_1_0", "ngdbc.jar")), //$NON-NLS-1$
     // MYSQL, add for 9594
-    MYSQL_8(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MySQL 8", "MYSQL_8", "mysql-connector-java-8.0.18.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    MYSQL_8(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MySQL 8", "MYSQL_8", "mysql-connector-j-8.0.33.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     MYSQL_5(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MySQL 5", "MYSQL_5", "mysql-connector-java-5.1.49.jar")), //$NON-NLS-1$  //$NON-NLS-2$ //$NON-NLS-3$
-    MARIADB(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MariaDB", "MARIADB", "mariadb-java-client-2.5.3.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    MARIADB(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MariaDB", "MARIADB", "mariadb-java-client-3.1.4.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     // add for 9594
     MSSQL(new DbVersion4Drivers(EDatabaseTypeName.MSSQL,"Open source JTDS", "JTDS", "jtds-1.3.1-patch-20190523.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     MSSQL_2012(new DbVersion4Drivers(EDatabaseTypeName.MSSQL,
@@ -81,21 +81,24 @@ public enum EDatabaseVersion4Drivers {
             new String[] { "mssql-jdbc.jar", "slf4j-api-1.7.34.jar", "slf4j-reload4j-1.7.34.jar", "msal4j-1.11.0.jar", //$NON-NLS-1$
                     "oauth2-oidc-sdk-9.7.jar", "reload4j-1.2.22.jar", "jackson-core-2.13.4.jar",
                     "jackson-databind-2.13.4.2.jar", "jackson-annotations-2.13.4.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",
+                    "json-smart-2.4.11.jar", "nimbus-jose-jwt-9.22.jar", "accessors-smart-2.4.11.jar", "asm-9.5.jar",
                     "content-type-2.1.jar", "lang-tag-1.5.jar" })),
 
-    VERTICA_9(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 9.X", "VERTICA_9_0", "vertica-jdbc-9.3.1-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+//    VERTICA_9(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 9.X  (Deprecated)", "VERTICA_9_0", "vertica-jdbc-9.3.1-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    
+    //https://mvnrepository.com/artifact/com.vertica.jdbc/vertica-jdbc/12.0.4-0
+    VERTICA_12(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 12.X", "VERTICA_12_0", "vertica-jdbc-12.0.4-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
     // for bug 0017930
     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.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$
+    PSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "v9 and later", "V9_X", "postgresql-42.6.0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    PSQL_PRIOR_TO_V9(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "Prior to v9 (Deprecated)", "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.26.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "Prior to v9 (Deprecated)", "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.6.0.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$
@@ -156,7 +159,10 @@ public enum EDatabaseVersion4Drivers {
                     "aws-java-sdk-redshift-internal-1.12.x.jar", "aws-java-sdk-core-1.12.315.jar", //$NON-NLS-1$ //$NON-NLS-2$
                     "aws-java-sdk-sts-1.12.315.jar", "aws-java-sdk-redshift-1.12.315.jar", "jmespath-java-1.12.315.jar" })), //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
 
-    AMAZON_AURORA(new DbVersion4Drivers(EDatabaseTypeName.AMAZON_AURORA, "mysql-connector-java-5.1.49.jar")); //$NON-NLS-1$
+    AMAZON_AURORA(new DbVersion4Drivers(EDatabaseTypeName.AMAZON_AURORA, "MySQL 5", "MYSQL_5", //$NON-NLS-1$
+            "mysql-connector-java-5.1.49.jar")),
+    AMAZON_AURORA_3(new DbVersion4Drivers(EDatabaseTypeName.AMAZON_AURORA, "MySQL 8", "MYSQL_8", //$NON-NLS-1$
+            "mysql-connector-j-8.0.33.jar"));
 
     private DbVersion4Drivers dbVersionBean;
 

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

@@ -15,8 +15,10 @@ package org.talend.core.hadoop;
 import java.util.Collection;
 import java.util.HashSet;
 
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.EMap;
 import org.talend.commons.exception.CommonExceptionHandler;
 import org.talend.commons.exception.ExceptionHandler;
@@ -25,6 +27,9 @@ import org.talend.core.model.properties.Item;
 import org.talend.core.model.properties.Property;
 import org.talend.core.runtime.hd.IDynamicDistributionManager;
 import org.talend.core.runtime.i18n.Messages;
+import org.talend.designer.core.model.utils.emf.talendfile.ElementParameterType;
+import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
+import org.talend.designer.core.model.utils.emf.talendfile.TalendFileFactory;
 
 /**
  * created by cmeng on Jul 20, 2015 Detailled comment
@@ -145,4 +150,58 @@ public class BigDataBasicUtil {
         return null;
     }
 
+
+    public static String getDistributionByVersion(String version) {
+        if (StringUtils.isEmpty(version))
+            return null;
+        if (version.startsWith("EMR")) {
+            return "AMAZON_EMR";
+        } else if (version.equals("SYNAPSE")) {
+            return "AZURE_SYNAPSE";
+        } else if (version.contains("CDH") || version.contains("CDP")) {
+            return "CLOUDERA";
+        } else if (version.startsWith("Databricks")) {
+            return "DATABRICKS";
+        } else if (version.contains("HDP")) {
+            return "HORTONWORKS";
+        } else if (version.startsWith("MICROSOFT_HD_INSIGHT")) {
+            return "MICROSOFT_HD_INSIGHT";
+        } else if (version.startsWith("SPARK")) {
+            return "SPARK";
+        }
+        return null;
+    }
+
+    public static void setDistribution(NodeType node, String dbVersionName) {
+        if (node == null || dbVersionName == null) {
+            return;
+        }
+        EList<ElementParameterType> elementParameters = node.getElementParameter();
+        String distribution = null;
+        String dbVersion = null;
+        // Iterate over the item elementParameters in order to find the "DISTRIBUTION" and "SPARK_VERSION"
+        // parameters values.
+        for (int i = 0; i < elementParameters.size(); i++) {
+            ElementParameterType param = elementParameters.get(i);
+            if (dbVersionName.equals(param.getName())) {
+                dbVersion = param.getValue();
+                break;
+            }
+        }
+        try {
+            ElementParameterType property = TalendFileFactory.eINSTANCE.createElementParameterType();
+            distribution = BigDataBasicUtil.getDistributionByVersion(dbVersion);
+            if (distribution != null) {
+                property.setName("DISTRIBUTION"); //$NON-NLS-1$
+                property.setField("CLOSED_LIST"); //$NON-NLS-1$
+                property.setValue(distribution);
+                elementParameters.add(property);
+            } else {
+                ExceptionHandler.log("no matched distribution for version " + dbVersion);//$NON-NLS-1$
+            }
+
+        } catch (Exception e) {
+            ExceptionHandler.log(e.getMessage());
+        }
+    }
 }

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

@@ -30,6 +30,8 @@ public class HadoopConstants {
     public static final String SPARK_MODE_DATAPROC = "DATAPROC";
     
     public static final String SPARK_MODE_SYNAPSE = "SYNAPSE";
+    
+    public static final String SPARK_MODE_HDI = "HDI";
 
     public static final String FRAMEWORK = "FRAMEWORK";
 

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

@@ -16,6 +16,7 @@ import java.util.Map;
 
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
+import org.talend.core.model.general.Project;
 import org.talend.core.runtime.hd.IDistributionsManager;
 import org.talend.core.runtime.hd.IDynamicDistributionManager;
 import org.talend.core.runtime.hd.IHDistribution;
@@ -132,6 +133,8 @@ public interface IHadoopDistributionService extends IService {
 
     IDynamicDistributionManager getDynamicDistributionManager();
 
+    void checkAndMigrateDistributionProxyCredential(Project project) throws Exception;
+
     public static IHadoopDistributionService get() {
         GlobalServiceRegister gsr = GlobalServiceRegister.getDefault();
         if (gsr.isServiceRegistered(IHadoopDistributionService.class)) {

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

@@ -142,6 +142,8 @@ public enum EHadoopProperties {
     
     SPARK_EXECUTOR_MEMORY,
     
+    SPARK_EXECUTOR_CORES,
+    
     DATABRICKS_ENDPOINT,
     
     DATABRICKS_CLOUD_PROVIDER,
@@ -212,7 +214,9 @@ public enum EHadoopProperties {
     
     UNIV_STANDALONE_EXEC_MEMORY,
     
-    UNIV_STANDALONE_EXEC_CORE;
+    UNIV_STANDALONE_EXEC_CORE,
+    
+    UNIV_SPARK_SUBMIT_SCRIPT_HOME;
 
     public String getName() {
         return this.name();

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

@@ -522,10 +522,16 @@ public class ContextUtils {
         return itemMap;
     }
 
+
+    private static Set<String> missingContexts = new HashSet<>();
+
+    public static void clearMissingContextCache() {
+        missingContexts.clear();
+    }
+
     /**
-     *
-     * get the repository context item,now contextId can be either joblet node or context node.
-     */
+    * get the repository context item, now contextId can be either joblet node or context node.
+    */
     public static Item getRepositoryContextItemById(String contextId) {
         if (IContextParameter.BUILT_IN.equals(contextId)) {
             return null;
@@ -533,6 +539,9 @@ public class ContextUtils {
         if (checkObject(contextId)) {
             return null;
         }
+        if (missingContexts.contains(contextId)) {
+            return null;
+        }
 
         List<ERepositoryObjectType> possibleTypes = new ArrayList<ERepositoryObjectType>();
         possibleTypes.add(ERepositoryObjectType.CONTEXT);
@@ -547,6 +556,8 @@ public class ContextUtils {
                     return item;
                 }
             }
+            missingContexts.add(contextId);
+            ExceptionHandler.log("Can't find Context item[id=" + contextId + "].");
         } catch (PersistenceException e) {
             ExceptionHandler.process(e);
         }
@@ -857,6 +868,7 @@ public class ContextUtils {
             ItemContextLink itemContextLink) {
         Map<String, String> renamedMap = new HashMap<String, String>();
         Map<String, Item> tempItemMap = new HashMap<String, Item>();
+        clearMissingContextCache();
         for (ContextType contextType : contextTypeList) {
             for (Object obj : contextType.getContextParameter()) {
                 if (obj instanceof ContextParameterType) {
@@ -919,6 +931,7 @@ public class ContextUtils {
      */
     public static Map<String, String> calculateRenamedMapFromLinkFile(String projectLabel, String itemId,
             List<IContext> contextList) {
+        clearMissingContextCache();
         Map<String, String> renamedMap = new HashMap<String, String>();
         Map<String, Item> idToItemMap = new HashMap<String, Item>();
         try {
@@ -1194,5 +1207,23 @@ public class ContextUtils {
         }
         return jobContext;
     }
+
+    public static boolean isPromptNeeded(List<IContext> contexts, String contextParaName) {
+        for (IContext context : contexts) {
+            List<IContextParameter> list = context.getContextParameterList();
+            if (list != null && list.size() > 0) {
+                for (IContextParameter contextPara : list) {
+                    String tempContextParaName = contextPara.getName();
+                    if (tempContextParaName.equals(contextParaName)) {
+                        if (contextPara.isPromptNeeded()) {
+                            return true;
+                        }
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
 }
 

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

@@ -30,6 +30,8 @@ public class JobContext implements IContext, Cloneable {
 
     boolean confirmationNeeded;
 
+    boolean hide;
+
     public JobContext(String name) {
         this.name = name;
         if (this.name == null) {
@@ -66,6 +68,14 @@ public class JobContext implements IContext, Cloneable {
         this.confirmationNeeded = confirmationNeeded;
     }
 
+    public boolean isHide() {
+        return this.hide;
+    }
+
+    public void setHide(boolean hide) {
+        this.hide = hide;
+    }
+
     public IContext clone() {
         IContext clonedContext = null;
         try {
@@ -131,14 +141,16 @@ public class JobContext implements IContext, Cloneable {
      * @return
      */
     public IContextParameter getContextParameter(String sourceId, String paraName) {
-        if (sourceId == null || paraName == null)
+        if (sourceId == null || paraName == null) {
             return null;
+        }
         if (contextParameterList != null && contextParameterList.size() > 0) {
             for (IContextParameter contextParam : contextParameterList) {
                 String tempSouceId = contextParam.getSource();
                 String tempParaName = contextParam.getName();
-                if (sourceId.equals(tempSouceId) && paraName.equals(tempParaName))
+                if (sourceId.equals(tempSouceId) && paraName.equals(tempParaName)) {
                     return contextParam;
+                }
             }
         }
         return null;
@@ -156,8 +168,9 @@ public class JobContext implements IContext, Cloneable {
         if (contextParameterList != null && contextParameterList.size() > 0) {
             for (IContextParameter contextParam : contextParameterList) {
                 String tempParaName = contextParam.getName();
-                if (tempParaName.equals(paraName))
+                if (tempParaName.equals(paraName)) {
                     list.add(contextParam);
+                }
             }
         }
         return list;

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

@@ -299,6 +299,7 @@ public class JobContextManager implements IContextManager {
         }
         List<ContextItem> contextItemList = ContextUtils.getAllContextItem();
         boolean setDefault = false;
+        ContextUtils.clearMissingContextCache();
         for (int i = 0; i < contextTypeList.size(); i++) {
             contextType = (ContextType) contextTypeList.get(i);
             String name = contextType.getName();
@@ -307,6 +308,7 @@ public class JobContextManager implements IContextManager {
             }
             context = new JobContext(name);
             context.setConfirmationNeeded(contextType.isConfirmationNeeded());
+            context.setHide(contextType.isHide());
             contextParamList = new ArrayList<IContextParameter>();
             contextTypeParamList = contextType.getContextParameter();
             Set<String> paramNamesInCurrentContext = new HashSet<String>();
@@ -335,6 +337,8 @@ public class JobContextManager implements IContextManager {
                 } else {
                     contextParam.setType(MetadataTalendType.getDefaultTalendType());
                 }
+                //To avoid encrypt the same value}
+                contextParam.setOriginEncryptedValue(contextParamType.getValue());
                 contextParam.setValue(contextParamType.getRawValue());
 
                 contextParam.setPromptNeeded(contextParamType.isPromptNeeded());
@@ -526,6 +530,7 @@ public class JobContextManager implements IContextManager {
 
         EList newcontextTypeList = new BasicEList();
         Map<String, Item> idToItemMap = new HashMap<String, Item>();
+        ContextUtils.clearMissingContextCache();
         for (int i = 0; i < listContext.size(); i++) {
             IContext context = listContext.get(i);
             String contextGroupName = renameGroupContext.get(context);
@@ -538,6 +543,7 @@ public class JobContextManager implements IContextManager {
             }
             contextType.setName(context.getName());
             contextType.setConfirmationNeeded(context.isConfirmationNeeded());
+            contextType.setHide(context.isHide());
             newcontextTypeList.add(contextType);
 
             EList contextTypeParamList = contextType.getContextParameter();
@@ -560,7 +566,10 @@ public class JobContextManager implements IContextManager {
                     contextParamType.setName(contextParam.getName());
                     contextParamType.setPrompt(contextParam.getPrompt());
                     contextParamType.setType(contextParam.getType());
+                    //To avoid encrypt the same value
+                    contextParamType.setValue(contextParam.getOriginEncryptedValue()); 
                     contextParamType.setRawValue(contextParam.getValue());
+                    contextParam.setOriginEncryptedValue(contextParamType.getValue()); // For origin encrypted value is null or encryption key upgrade
                     contextParamType.setPromptNeeded(contextParam.isPromptNeeded());
                     contextParamType.setComment(contextParam.getComment());
                     if (!contextParam.isBuiltIn()) {

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

@@ -46,6 +46,9 @@ public class JobContextParameter implements IContextParameter, Cloneable {
     String[] valueList;
 
     String internalId;
+    
+    /*This value may dirty, only use to cache encrypted value*/
+    String originEncryptedValue;
 
     /**
      * change to save id always for bug 13184.
@@ -301,6 +304,15 @@ public class JobContextParameter implements IContextParameter, Cloneable {
         this.source = source;
     }
 
+    public String getOriginEncryptedValue() {
+        return originEncryptedValue;
+    }
+
+    
+    public void setOriginEncryptedValue(String originEncryptedValue) {
+        this.originEncryptedValue = originEncryptedValue;
+    }
+
     /*
      * (non-Javadoc)
      *

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

@@ -51,6 +51,7 @@ public abstract class AbstractItemContextLinkService implements IItemContextLink
         itemContextLink.setItemId(itemId);
         Map<String, Item> tempCache = new HashMap<String, Item>();
         if (contextTypeList != null && contextTypeList.size() > 0) {
+            ContextUtils.clearMissingContextCache();
             for (Object object : contextTypeList) {
                 if (object instanceof ContextType) {
                     ContextType jobContextType = (ContextType) object;

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

@@ -206,6 +206,7 @@ public class ContextLinkService {
             Map<String, Map<String, String>> changedContextParameterId) throws PersistenceException {
         List<Relation> relationList = RelationshipItemBuilder.getInstance()
                 .getItemsHaveRelationWith(sourceId, RelationshipItemBuilder.LATEST_VERSION, false);
+        ContextUtils.clearMissingContextCache();
         for (Relation relation : relationList) {
             String id = relation.getId();
             IFile linkFile = calContextLinkFile(ProjectManager.getInstance().getCurrentProject().getTechnicalLabel(), id);

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

@@ -463,29 +463,31 @@ public final class MetadataTalendType {
         return list;
     }
 
-    public static URL getSystemFolderURLOfMappingsFile() throws SystemException {
+    public static File getSystemFolderURLOfMappingsFile() throws SystemException {
         String dirPath = "/" + INTERNAL_MAPPINGS_FOLDER; //$NON-NLS-1$
-        URL url = null;
         Path filePath = new Path(dirPath);
         Bundle b = Platform.getBundle(CoreRuntimePlugin.PLUGIN_ID);
         if (b != null) {
             try {
                 // Enumeration<URL> entries = b.findEntries(dirPath, "mapping_*.xml", false);
-                url = FileLocator.toFileURL(FileLocator.find(b, filePath, null));
+                return new File(FileLocator.toFileURL(FileLocator.find(b, filePath, null)).getFile());
             } catch (IOException e) {
                 throw new SystemException(e);
             }
         }
-        return url;
+        return null;
     }
 
-    public static URL getProjectFolderURLOfMappingsFile() throws SystemException {
+    public static File getProjectFolderURLOfMappingsFile() throws SystemException {
         try {
             String dirPath = "/" + INTERNAL_MAPPINGS_FOLDER; //$NON-NLS-1$
             IProject project = ResourceUtils.getProject(ProjectManager.getInstance().getCurrentProject());
             IPath settingPath = new ProjectScope(project).getLocation();
             File mappingFolder = settingPath.append(dirPath).toFile();
-            return mappingFolder.toURI().toURL();
+            if (!mappingFolder.exists()) {
+                mappingFolder.mkdirs();
+            }
+            return mappingFolder;
         } catch (Exception e) {
             throw new SystemException(e);
         }
@@ -592,8 +594,7 @@ public final class MetadataTalendType {
 
     public static JSONObject getRevisionObject() {
         try {
-            File revisonFile = new File(MetadataTalendType.getSystemFolderURLOfMappingsFile().getFile(),
-                    MetadataTalendType.FILE_MAPPING_REVISION);
+            File revisonFile = new File(getSystemFolderURLOfMappingsFile(), FILE_MAPPING_REVISION);
             String jsonStr = new String(Files.readAllBytes(revisonFile.toPath()));
             return new JSONObject(jsonStr);
         } catch (Exception e) {
@@ -605,13 +606,13 @@ public final class MetadataTalendType {
     public static boolean restoreMappingFiles() throws Exception {
         List<File> toDelete = new ArrayList<>();
         JSONObject revision = getRevisionObject();
-        File projectMappingFolder = new File(getProjectFolderURLOfMappingsFile().getFile());
+        File projectMappingFolder = getProjectFolderURLOfMappingsFile();
         if (projectMappingFolder.exists()) {
             File[] projectMappingFiles = projectMappingFolder.listFiles(f -> f.getName().matches(MAPPING_FILE_PATTERN));
             if (projectMappingFiles != null) {
                 for (File file : projectMappingFiles) {
                     if (revision.has(file.getName())) {
-                        String sha1 = MetadataTalendType.getSha1OfFile(file);
+                        String sha1 = getSha1OfFile(file);
                         if (revision.getJSONObject(file.getName()).has(sha1)) {
                             toDelete.add(file);
                         }
@@ -668,9 +669,9 @@ public final class MetadataTalendType {
     }
 
     public static List<File> getWorkingMappingFiles() throws SystemException {
-        File projectMappingFolder = new File(getProjectFolderURLOfMappingsFile().getFile());
+        File projectMappingFolder = getProjectFolderURLOfMappingsFile();
         File[] projectMappingFiles = projectMappingFolder.listFiles(f -> f.getName().matches(MAPPING_FILE_PATTERN));
-        File systemMappingFolder = new File(getSystemFolderURLOfMappingsFile().getFile());
+        File systemMappingFolder = getSystemFolderURLOfMappingsFile();
         File[] systemMappingFiles = systemMappingFolder.listFiles(f -> f.getName().matches(MAPPING_FILE_PATTERN));
         if (projectMappingFiles == null || projectMappingFiles.length == 0) {
             return Arrays.asList(systemMappingFiles);
@@ -686,7 +687,7 @@ public final class MetadataTalendType {
 
     public static String getSha1OfSystemMappingFile(String fileName) {
         try {
-            return getSha1OfFile(new File(getSystemFolderURLOfMappingsFile().getFile(), fileName));
+            return getSha1OfFile(new File(getSystemFolderURLOfMappingsFile(), fileName));
         } catch (SystemException e) {
             ExceptionHandler.process(e);
             return null;

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

@@ -156,6 +156,7 @@ public final class MetadataToolAvroHelper {
         copyColumnProperties(fb, in);
 
         fb.prop(DiSchemaConstants.TALEND6_LABEL, label);
+        
 
         Object defaultValue = null;
         Expression initialValue = in.getInitialValue();
@@ -369,6 +370,7 @@ public final class MetadataToolAvroHelper {
      */
     private static <T extends PropBuilder<T>> PropBuilder<T> copyColumnProperties(PropBuilder<T> builder,
             org.talend.core.model.metadata.builder.connection.MetadataColumn in) {
+    	
         // Properties common to tables and columns.
         if (in.getId() != null) {
             builder.prop(DiSchemaConstants.TALEND6_ID, in.getId());
@@ -385,6 +387,8 @@ public final class MetadataToolAvroHelper {
                 builder.prop(DiSchemaConstants.TALEND6_IS_READ_ONLY, tv.getValue());
             }else if(DiSchemaConstants.AVRO_TECHNICAL_KEY.equals(additionalTag)){
                 builder.prop(DiSchemaConstants.AVRO_TECHNICAL_KEY, tv.getValue());
+            }else if(DiSchemaConstants.LOGICAL_TIME_TYPE_AS.equals(additionalTag)) {
+            	builder.prop(DiSchemaConstants.LOGICAL_TIME_TYPE_AS, tv.getValue());
             }else if (tv.getValue() != null) {
                 builder.prop(DiSchemaConstants.TALEND6_ADDITIONAL_PROPERTIES + additionalTag, tv.getValue());
             }
@@ -626,6 +630,7 @@ public final class MetadataToolAvroHelper {
         } else if (AvroUtils.isSameType(nonnullable, AvroUtils._float())) {
             col.setTalendType(JavaTypesManager.FLOAT.getId());
         } else if (AvroUtils.isSameType(nonnullable, AvroUtils._int())) {
+        	
             if (logicalType == LogicalTypes.date()) {
                	col.setTalendType(JavaTypesManager.DATE.getId());
                 TaggedValue tv = TaggedValueHelper.createTaggedValue(DiSchemaConstants.TALEND6_COLUMN_DATE_DATE, "true");
@@ -637,6 +642,8 @@ public final class MetadataToolAvroHelper {
           	    String logical_time_type_as = field.getProp(DiSchemaConstants.LOGICAL_TIME_TYPE_AS);
           	    if(DiSchemaConstants.AS_TALEND_DATE.equals(logical_time_type_as)) {
                 	  col.setTalendType(JavaTypesManager.DATE.getId());
+                      TaggedValue tv2 = TaggedValueHelper.createTaggedValue(DiSchemaConstants.LOGICAL_TIME_TYPE_AS, DiSchemaConstants.AS_TALEND_DATE);
+                      col.getTaggedValue().add(tv2);
           	    } else {
           	        col.setTalendType(JavaTypesManager.INTEGER.getId());
           	    }

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

@@ -33,6 +33,7 @@ import org.talend.core.database.EDatabaseTypeName;
 import org.talend.core.database.ERedshiftDriver;
 import org.talend.core.database.conn.ConnParameterKeys;
 import org.talend.core.database.conn.template.EDatabaseConnTemplate;
+import org.talend.core.database.conn.version.EDatabaseVersion4Drivers;
 import org.talend.core.model.metadata.Dbms;
 import org.talend.core.model.metadata.DiSchemaConstants;
 import org.talend.core.model.metadata.IConvertionConstants;
@@ -272,7 +273,7 @@ public final class ConvertionHelper {
 
     }
 
-    private static String getDriverVersionString(DatabaseConnection dbConn) {
+    public static String getDriverVersionString(DatabaseConnection dbConn) {
         String dbVersionString = dbConn.getDbVersionString();
         if (EDatabaseTypeName.REDSHIFT.getDisplayName().equals(dbConn.getDatabaseType())
                 || EDatabaseTypeName.REDSHIFT_SSO.getDisplayName().equals(dbConn.getDatabaseType())) {
@@ -286,6 +287,9 @@ public final class ConvertionHelper {
                 }
             }
         }
+        if (EDatabaseTypeName.VERTICA.getDisplayName().equals(dbConn.getDatabaseType())) {
+            dbVersionString = EDatabaseVersion4Drivers.VERTICA_12.getVersionValue();
+        }
         return dbVersionString;
     }
 

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

@@ -36,6 +36,7 @@ import org.talend.core.model.metadata.IMetadataTable;
 import org.talend.core.model.metadata.MetadataTalendType;
 import org.talend.core.model.metadata.builder.ConvertionHelper;
 import org.talend.core.model.metadata.builder.connection.BRMSConnection;
+import org.talend.core.model.metadata.builder.connection.BigQueryConnection;
 import org.talend.core.model.metadata.builder.connection.Connection;
 import org.talend.core.model.metadata.builder.connection.ConnectionFactory;
 import org.talend.core.model.metadata.builder.connection.DatabaseConnection;
@@ -213,6 +214,8 @@ public class ComponentToRepositoryProperty {
             setFileExcelValue((FileExcelConnection) connection, node, param);
         } else if (connection instanceof SAPConnection) {
             setSAPValue((SAPConnection) connection, node, param);
+        } else if (connection instanceof BigQueryConnection) {
+            setBigQueryValue((BigQueryConnection) connection, node, param);
         } else if (connection instanceof SalesforceSchemaConnection) {
             setSalesforceSchema((SalesforceSchemaConnection) connection, node, param);
         } else if (connection instanceof MDMConnection) {
@@ -1793,6 +1796,30 @@ public class ComponentToRepositoryProperty {
             }
         }
     }
+    
+    private static void setBigQueryValue(BigQueryConnection connection, INode node, IElementParameter param) {
+        if ("SERVICE_ACCOUNT_CREDENTIALS_FILE".equals(param.getRepositoryValue())) {
+            String value = getParameterValue(connection, node, param);
+            if (value != null) {
+                connection.setServiceAccountCredentialsFile(value);
+            }
+        } else if ("PROJECT_ID".equals(param.getRepositoryValue())) {
+            String value = getParameterValue(connection, node, param);
+            if (value != null) {
+                connection.setProjectId(value);
+            }
+        } else if ("USE_REGION_ENDPOINT".equals(param.getRepositoryValue())) {
+            String value = getParameterValue(connection, node, param);
+            if (value != null) {
+                connection.setUseRegionEndpoint(Boolean.valueOf(value));
+            }
+        } else if ("REGION_ENDPOINT_BQ".equals(param.getRepositoryValue())) {
+            String value = getParameterValue(connection, node, param);
+            if (value != null) {
+                connection.setRegionEndpoint(value);
+            }
+        }
+    }
 
     /**
      *

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

@@ -20,6 +20,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.core.runtime.Path;
@@ -47,6 +48,7 @@ import org.talend.core.model.metadata.MultiSchemasUtil;
 import org.talend.core.model.metadata.builder.ConvertionHelper;
 import org.talend.core.model.metadata.builder.connection.AdditionalConnectionProperty;
 import org.talend.core.model.metadata.builder.connection.BRMSConnection;
+import org.talend.core.model.metadata.builder.connection.BigQueryConnection;
 import org.talend.core.model.metadata.builder.connection.Concept;
 import org.talend.core.model.metadata.builder.connection.ConceptTarget;
 import org.talend.core.model.metadata.builder.connection.Connection;
@@ -148,6 +150,10 @@ public class RepositoryToComponentProperty {
         if (connection instanceof SAPConnection) {
             return getSAPValue((SAPConnection) connection, value);
         }
+        
+        if (connection instanceof BigQueryConnection) {
+            return getBigQueryValue((BigQueryConnection) connection, value, table);
+        }
 
         if (connection instanceof SalesforceSchemaConnection) {
             return getSalesforceSchemaValue((SalesforceSchemaConnection) connection, value, table);
@@ -456,6 +462,62 @@ public class RepositoryToComponentProperty {
         }
         return null;
     }
+    
+    public static Object getBigQueryValue(BigQueryConnection connection, String value, IMetadataTable table) {
+        if ("SERVICE_ACCOUNT_CREDENTIALS_FILE".equals(value)) {
+            if (isContextMode(connection, connection.getServiceAccountCredentialsFile())) {
+                return connection.getServiceAccountCredentialsFile();
+            } else {
+                return TalendQuoteUtils.addQuotes(connection.getServiceAccountCredentialsFile());
+            }
+        } else if ("PROJECT_ID".equals(value)) {
+            if (isContextMode(connection, connection.getProjectId())) {
+                return connection.getProjectId();
+            } else {
+                return TalendQuoteUtils.addQuotes(connection.getProjectId());
+            }
+        } else if ("USE_REGION_ENDPOINT".equals(value)) {
+            return connection.isUseRegionEndpoint();
+        } else if ("REGION_ENDPOINT_BQ".equals(value)) {
+            if (isContextMode(connection, connection.getRegionEndpoint())) {
+                return connection.getRegionEndpoint();
+            } else {
+                return TalendQuoteUtils.addQuotes(connection.getRegionEndpoint());
+            }
+        } else if ("DATASET".equals(value)) {
+            if(table!=null) {
+                Map<String, String> properties = table.getAdditionalProperties();
+                if(properties!=null) {
+                    String dataSet = properties.get("dataSet");
+                    if (isContextMode(connection, dataSet)) {
+                        return dataSet;
+                    } else {
+                        return TalendQuoteUtils.addQuotes(dataSet);
+                    }
+                }
+            }
+        } else if ("QUERY".equals(value)) {
+            if(table!=null) {
+                Map<String, String> properties = table.getAdditionalProperties();
+                if(properties!=null) {
+                    String dataSet = properties.get("dataSet");
+                    String tableName = table.getLabel();
+                    if(dataSet!=null && tableName!=null) {
+                        List<IMetadataColumn> columns = table.getListColumns();
+                        StringBuilder strBuilder = new StringBuilder();
+                        strBuilder.append("SELECT");
+                        if(columns!=null) {
+                            strBuilder.append(columns.stream().map(column -> column.getOriginalDbColumnName()).collect(Collectors.joining(",", " ", " ")));
+                        }
+                        strBuilder.append("FROM ").append(dataSet).append('.').append(tableName);
+                        return TalendQuoteUtils.addQuotes(strBuilder.toString());
+                    }
+                }
+            }
+        }
+        
+        return null;
+    }
 
     /**
      * DOC gcui Comment method "getHL7Value".
@@ -1091,6 +1153,10 @@ public class RepositoryToComponentProperty {
                 if (dbVersionString != null) {
                     return dbVersionString.toUpperCase();
                 }
+            } else if (EDatabaseConnTemplate.AMAZON_AURORA.getDBDisplayName().equals(databaseType)) {
+                if (dbVersionString != null) {
+                    return dbVersionString.toUpperCase();
+                }
             } else if (EDatabaseTypeName.HIVE.getDisplayName().equals(databaseType)) {
                 return connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HIVE_VERSION);
             } else if (EDatabaseTypeName.HBASE.getDisplayName().equals(databaseType)) {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/IContext.java

@@ -32,6 +32,10 @@ public interface IContext {
 
     public void setConfirmationNeeded(boolean confirmationNeeded);
 
+    public boolean isHide();
+
+    public void setHide(boolean hide);
+
     public List<IContextParameter> getContextParameterList();
 
     public void setContextParameterList(List<IContextParameter> contextParameterList);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/IContextParameter.java

@@ -75,4 +75,9 @@ public interface IContextParameter {
     public String getInternalId();
 
     public void setInternalId(String internalId);
+    
+    /*This value may dirty, only use to cache encrypted value*/
+    public String getOriginEncryptedValue();
+    
+    public void setOriginEncryptedValue(String originEncryptedValue);
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/IElementParameter.java

@@ -234,4 +234,9 @@ public interface IElementParameter {
     public void setSerialized(boolean isSerialized);
 
     public boolean isSelectedFromItemValue();
+    
+    /*This value may dirty, only use to cache encrypted value*/
+    public String getOrignEncryptedValue();
+    
+    public void setOrignEncryptedValue(String value);
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/IProcess2.java

@@ -71,6 +71,9 @@ public interface IProcess2 extends IRepositoryObject, IProcess {
     @Override
     void setActivate(boolean b);
 
+    public boolean isRefactoringToJoblet();
+
+    public void refactoringToJoblet(boolean isRefactoring);
     /**
      * DOC qzhang Comment method "checkStartNodes".
      */

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/repository/ERepositoryObjectType.java

@@ -31,6 +31,7 @@ import org.talend.core.IESBService;
 import org.talend.core.PluginChecker;
 import org.talend.core.model.general.Project;
 import org.talend.core.model.properties.BRMSConnectionItem;
+import org.talend.core.model.properties.BigQueryConnectionItem;
 import org.talend.core.model.properties.CSVFileConnectionItem;
 import org.talend.core.model.properties.ConnectionItem;
 import org.talend.core.model.properties.ContextItem;
@@ -334,10 +335,6 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
             "SYSTEM_INDICATORS_TEXT_STATISTICS", 97, true, "repository.systemIndicators.textStatistics.alias",
             new String[] { PROD_DQ }, new String[] {}, false);
 
-    public final static ERepositoryObjectType TDQ_EXCHANGE = new ERepositoryObjectType("repository.tdqExchange", //$NON-NLS-1$
-            "TDQ_Libraries/Exchange", "TDQ_EXCHANGE", 98, true, "repository.tdqExchange.alias", new String[] { PROD_DQ }, //$NON-NLS-1$
-            new String[] {});
-
     public final static ERepositoryObjectType METADATA_SALESFORCE_MODULE = new ERepositoryObjectType(
             "repository.metadataSalesforceModule", "METADATA_SALESFORCE_MODULE", 99, true, true, new String[] { PROD_DI }, //$NON-NLS-1$ //$NON-NLS-2$
             new String[] {}, false);
@@ -360,14 +357,17 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
 
     public final static ERepositoryObjectType METADATA_SAP_TABLE = new ERepositoryObjectType("repository.SAPTable", //$NON-NLS-1$
             "METADATA_SAP_TABLE", 104, true, true, new String[] { PROD_DI }, new String[] {}, false);
-
+    
     public final static ERepositoryObjectType METADATA_SAP_CONTENT_EXTRACTOR = new ERepositoryObjectType("repository.SAPTable", //$NON-NLS-1$
             "METADATA_SAP_CONTENT_EXTRACTOR", 105, true, true, new String[] { PROD_DI }, new String[] {}, false);
-
+    
     public final static ERepositoryObjectType METADATA_CON_CALCULATION_VIEW = new ERepositoryObjectType(
             "repository.metadataCalculationView", "METADATA_CON_CALCULATION_VIEW", 106, true, true, new String[] { PROD_DI },
             new String[] {}, false);
 
+    public final static ERepositoryObjectType METADATA_SAP_CDS_VIEW = new ERepositoryObjectType("repository.SAPTable", //$NON-NLS-1$
+            "METADATA_SAP_CDS_VIEW", 107, true, true, new String[] { PROD_DI }, new String[] {}, false);
+
     private String label;
 
     private String alias;
@@ -505,6 +505,8 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
     public final static ERepositoryObjectType METADATA_FILE_FTP = ERepositoryObjectType.valueOf("METADATA_FILE_FTP");
 
     public final static ERepositoryObjectType METADATA_SAPCONNECTIONS = ERepositoryObjectType.valueOf("METADATA_SAPCONNECTIONS");
+    
+    public final static ERepositoryObjectType METADATA_BIGQUERYCONNECTIONS = ERepositoryObjectType.valueOf("METADATA_BIGQUERYCONNECTIONS");
 
     public final static ERepositoryObjectType METADATA_FILE_EBCDIC = ERepositoryObjectType.valueOf("METADATA_FILE_EBCDIC");
 
@@ -865,6 +867,8 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
             return "DB connection"; //$NON-NLS-1$
         } else if (type == METADATA_SAPCONNECTIONS) {
             return "SAPconnection"; //$NON-NLS-1$
+        } else if (type == METADATA_BIGQUERYCONNECTIONS) {
+            return "BigQueryconnection"; //$NON-NLS-1$
         } else if (type == METADATA_FILE_EBCDIC) {
             return "fileEBCDIC"; //$NON-NLS-1$
         } else if (type == METADATA_FILE_HL7) {
@@ -1076,6 +1080,11 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
             public Object caseSAPConnectionItem(SAPConnectionItem object) {
                 return METADATA_SAPCONNECTIONS;
             }
+            
+            @Override
+            public Object caseBigQueryConnectionItem(BigQueryConnectionItem object) {
+                return METADATA_BIGQUERYCONNECTIONS;
+            }
 
             @Override
             public Object caseDelimitedFileConnectionItem(DelimitedFileConnectionItem object) {

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

@@ -770,6 +770,15 @@ public abstract class RepositoryUpdateManager {
                 updateConnectionContextParam((ConnectionItem) item, citem, valueMap);
             }
         }
+        
+        List<IRepositoryViewObject> bigqueryConnList = FACTORY.getAll(ERepositoryObjectType.METADATA_BIGQUERYCONNECTIONS, true);
+        for (IRepositoryViewObject obj : bigqueryConnList) {
+            Item item = obj.getProperty().getItem();
+            if (item instanceof ConnectionItem) {
+                updateConnectionContextParam((ConnectionItem) item, citem, valueMap);
+            }
+        }
+        
         for (String updateType : UpdateRepositoryHelper.getAllHadoopConnectionTypes()) {
             List<IRepositoryViewObject> hadoopConnList = FACTORY
                     .getAll(ERepositoryObjectType.valueOf(ERepositoryObjectType.class, updateType), true);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/utils/TalendPropertiesUtil.java

@@ -27,17 +27,6 @@ public final class TalendPropertiesUtil {
         return Boolean.parseBoolean(value);
     }
 
-    /**
-     *
-     * DOC ggu Comment method "isHideExchange".
-     *
-     *
-     * @return
-     */
-    public static boolean isHideExchange() {
-        return isEnabled("talend.hide.exchange") || isEnabled("talend.disable.internet"); //$NON-NLS-1$ //$NON-NLS-2$
-    }
-
     /**
      *
      * DOC ggu Comment method "isHideBuildNumber".

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/nexus/TalendLibsServerManager.java

@@ -12,7 +12,9 @@
 // ============================================================================
 package org.talend.core.nexus;
 
+import java.net.URLEncoder;
 import java.util.Date;
+import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
 import org.talend.commons.exception.ExceptionHandler;
@@ -25,9 +27,9 @@ import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.runtime.i18n.Messages;
 import org.talend.core.runtime.projectsetting.ProjectPreferenceManager;
 import org.talend.core.service.IRemoteService;
+import org.talend.core.utils.SecurityStorageUtil;
 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
@@ -81,6 +83,8 @@ public class TalendLibsServerManager {
 
     public static final String ENABLE_PROXY_SETTING = "nexus.proxy.enable";
 
+    public static final String NEXUS_PROXY_STORAGE_CATEGORY = "org.talend.artifact.proxy.setting";
+
     public static final String TALEND_LIB_USER = "";//$NON-NLS-1$
 
     public static final String TALEND_LIB_PASSWORD = "";//$NON-NLS-1$
@@ -255,10 +259,14 @@ public class TalendLibsServerManager {
             boolean enableProxyFlag = prefManager.getBoolean(TalendLibsServerManager.ENABLE_PROXY_SETTING);
             if (enableProxyFlag) {
                 serverBean.setServer(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_URL));
-                serverBean.setUserName(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_USERNAME));
-                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));
+                String[] credentials = getProxyArtifactCredentials(serverBean.getServer(), serverBean.getRepositoryId(),
+                        NEXUS_PROXY_USERNAME, NEXUS_PROXY_PASSWORD);
+                if (credentials != null) {
+                    serverBean.setUserName(credentials[0]);
+                    serverBean.setPassword(credentials[1]);
+                }
             }
         }
         if (StringUtils.isNotEmpty(serverBean.getServer())) {
@@ -267,6 +275,89 @@ public class TalendLibsServerManager {
         return null;
     }
 
+    public String[] getProxyArtifactCredentials(String url, String repositoryId, String usernameKey, String passwordKey) {
+        if (StringUtils.isBlank(url)) {
+            return null;
+        }
+        try {
+            String path = getStoragePath(url, repositoryId);
+            Map<String, String> storageNodePairs = SecurityStorageUtil.getSecurityStorageNodePairs(path);
+            if (storageNodePairs != null) {
+                String username = storageNodePairs.get(usernameKey);
+                String password = storageNodePairs.get(passwordKey);
+                if (username == null && password == null) {
+                    return null;
+                }
+                return new String[] { username, password };
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+        return null;
+    }
+
+    public void saveProxyArtifactCredentials(String url, String repositoryId, String usernameKey, String username,
+            String passwordKey, String password) {
+        if (StringUtils.isBlank(url)) {
+            return;
+        }
+        try {
+            String path = getStoragePath(url, repositoryId);
+            SecurityStorageUtil.saveToSecurityStorage(path, usernameKey, username, false, false);
+            SecurityStorageUtil.saveToSecurityStorage(path, passwordKey, password, true, false);
+            SecurityStorageUtil.flushSecurityStorage();
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+    }
+
+    public void saveProxyArtifactCredentialsUserName(String url, String repositoryId, String usernameKey, String username,
+            boolean flush) {
+        if (StringUtils.isBlank(url)) {
+            return;
+        }
+        try {
+            String path = getStoragePath(url, repositoryId);
+            SecurityStorageUtil.saveToSecurityStorage(path, usernameKey, username, false, flush);
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+    }
+
+    public void saveProxyArtifactCredentialsPassword(String url, String repositoryId, String passwordKey, String password,
+            boolean flush) {
+        if (StringUtils.isBlank(url)) {
+            return;
+        }
+        try {
+            String path = getStoragePath(url, repositoryId);
+            SecurityStorageUtil.saveToSecurityStorage(path, passwordKey, password, true, flush);
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+    }
+
+    public void flushSecurityStorage() {
+        try {
+            SecurityStorageUtil.flushSecurityStorage();
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+    }
+
+    private String getStoragePath(String url, String repositoryId) throws Exception {
+        String node = url;
+        if (StringUtils.isNotBlank(repositoryId)) {
+            if (!url.endsWith("/")) {
+                node = node + "/";
+            }
+            node = node + repositoryId;
+        }
+        node = URLEncoder.encode(node, "UTF-8");
+        String path = NEXUS_PROXY_STORAGE_CATEGORY + "/" + node;
+        return path;
+    }
+
     public ArtifactRepositoryBean getTalentArtifactServer() {
         ArtifactRepositoryBean serverBean = getProxyArtifactServer();
         if (serverBean == null) {

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

@@ -0,0 +1,31 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2023 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 java.util.Map;
+
+import org.talend.core.IProviderService;
+import org.talend.core.model.process.INode;
+import org.talend.core.model.properties.BigQueryConnectionItem;
+import org.talend.repository.model.RepositoryNode;
+
+public interface IBigQueryProviderService extends IProviderService {
+
+    public BigQueryConnectionItem getRepositoryItem(final INode node);
+
+    public boolean isBigQueryNode(final INode node);
+
+    public boolean isBigQueryNode(final RepositoryNode node);
+
+    public boolean isRepositorySchemaLine(INode node, Map<String, Object> lineValue);
+}

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

@@ -39,6 +39,8 @@ import org.talend.core.model.update.IStudioUpdateConfig;
  */
 public interface IStudioLiteP2Service extends IService {
 
+    public static final String PROP_CLEARPERSISTEDSTATE = "talend.studio.switchProject.clearPersistedState";
+
     public static final String CONFIG_STORAGE_FOLDER = "talend/studioLite/";
 
     public static final String BUNDLES_INFOS_STORAGE_FOLDER = CONFIG_STORAGE_FOLDER + "bundlesInfo/";
@@ -137,6 +139,10 @@ public interface IStudioLiteP2Service extends IService {
 
     void setupTmcUpdate(IProgressMonitor monitor, IStudioUpdateConfig updateConfig) throws Exception;
 
+    void handleTmcUpdateObserve(boolean trunOn);
+
+    boolean isUpdateManagedByTmc(IProgressMonitor monitor);
+
     boolean removeM2() throws Exception;
     
     void saveRemoveM2(boolean remove) throws Exception;

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ui/images/RepositoryImageProvider.java

@@ -53,6 +53,8 @@ public class RepositoryImageProvider {
             return ECoreImage.METADATA_CONNECTION_ICON;
         } else if (type == ERepositoryObjectType.METADATA_SAPCONNECTIONS || type == ERepositoryObjectType.METADATA_SAP_FUNCTION) {
             return ECoreImage.METADATA_SAPCONNECTION_ICON;
+        } else if (type == ERepositoryObjectType.METADATA_BIGQUERYCONNECTIONS) {
+            return ECoreImage.METADATA_BIGQUERYCONNECTION_ICON;
         } else if (type == ERepositoryObjectType.SQLPATTERNS) {
             return ECoreImage.METADATA_SQLPATTERN_ICON;
         } else if (type == ERepositoryObjectType.METADATA_CON_TABLE || type == ERepositoryObjectType.METADATA_SAP_IDOC) {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/utils/SecurityStorageUtil.java

@@ -0,0 +1,67 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2023 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.utils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.equinox.security.storage.ISecurePreferences;
+import org.eclipse.equinox.security.storage.SecurePreferencesFactory;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class SecurityStorageUtil {
+
+    public static void saveToSecurityStorage(String pathName, String key, String value, boolean encrypt) throws Exception {
+        saveToSecurityStorage(pathName, key, value, encrypt, true);
+    }
+
+    public static void saveToSecurityStorage(String pathName, String key, String value, boolean encrypt, boolean flush)
+            throws Exception {
+        ISecurePreferences securePreferences = SecurePreferencesFactory.getDefault();
+        ISecurePreferences node = securePreferences.node(pathName);
+        node.put(key, value, encrypt);
+        if (flush) {
+            securePreferences.flush();
+        }
+    }
+
+    public static void flushSecurityStorage() throws Exception {
+        ISecurePreferences securePreferences = SecurePreferencesFactory.getDefault();
+        securePreferences.flush();
+    }
+
+    public static String getValueFromSecurityStorage(String pathName, String key) throws Exception {
+        ISecurePreferences securePreferences = SecurePreferencesFactory.getDefault();
+        if (!securePreferences.nodeExists(pathName)) {
+            return null;
+        }
+        ISecurePreferences node = securePreferences.node(pathName);
+        return node.get(key, null);
+    }
+
+    public static Map<String, String> getSecurityStorageNodePairs(String pathName) throws Exception {
+        ISecurePreferences securePreferences = SecurePreferencesFactory.getDefault();
+        if (!securePreferences.nodeExists(pathName)) {
+            return null;
+        }
+        Map<String, String> keyValuePair = new HashMap<String, String>();
+        ISecurePreferences node = securePreferences.node(pathName);
+        for (String key : node.keys()) {
+            keyValuePair.put(key, node.get(key, null));
+        }
+        return keyValuePair;
+    }
+
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/rowgenerator/data/FunctionManager.java

@@ -37,8 +37,6 @@ public class FunctionManager {
 
     public static final String PURE_PERL_DESC = Messages.getString("FunctionManager.PurePerl.Desc"); //$NON-NLS-1$
 
-    public static final String PURE_PERL_PARAM = Messages.getString("FunctionManager.PurePerl.ParaName"); //$NON-NLS-1$
-
     private List<TalendType> talendTypes = null;
 
     public static final String PERL_FUN_PREFIX = "sub{"; //$NON-NLS-1$
@@ -55,6 +53,37 @@ public class FunctionManager {
 
     public static final String EMPTY_STRING = " "; //$NON-NLS-1$
 
+    public static enum EFunctionParameter {
+
+        CUSTOMIZE_PARAM("customize parameter", Messages.getString("FunctionManager.PurePerl.ParaName")); //$NON-NLS-1$ //$NON-NLS-2$
+
+        private String paramName;
+
+        private String paramDisplayName;
+
+        EFunctionParameter(String paramName, String paramDisplayName) {
+            this.paramName = paramName;
+            this.paramDisplayName = paramDisplayName;
+        }
+
+        public String getParamName() {
+            return paramName;
+        }
+
+        public String getParamDisplayName() {
+            return paramDisplayName;
+        }
+
+        public static String getDisplayNameByName(String name) {
+            for (EFunctionParameter eParameter : values()) {
+                if (eParameter.getParamName().equals(name)) {
+                    return eParameter.getParamDisplayName();
+                }
+            }
+            return null;
+        }
+
+    }
     /**
      * qzhang Comment method "getFunctionByName".
      *
@@ -80,7 +109,7 @@ public class FunctionManager {
         function.setDescription(PURE_PERL_DESC);
         StringParameter param = new StringParameter();
         List<Parameter> params = new ArrayList<Parameter>();
-        param.setName(PURE_PERL_PARAM);
+        param.setName(EFunctionParameter.CUSTOMIZE_PARAM.getParamName());
         params.add(param);
         function.setParameters(params);
         return function;

main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/rowgenerator/data/RoutineJarsFunctionParser.java

@@ -86,43 +86,47 @@ public class RoutineJarsFunctionParser extends AbstractTalendFunctionParser {
             Set<RoutinesParameterType> rps = new HashSet<RoutinesParameterType>();
             if (processItem instanceof ProcessItem) {
                 ProcessType pt = ((ProcessItem) processItem).getProcess();
+                if (pt != null) {
+                    if (pt.getParameters() != null) {
+                        rps.addAll(pt.getParameters().getRoutinesParameter());
+                    }
+                    // if it is test process
+                    int pidFeature = TalendFilePackage.PROCESS_TYPE_FEATURE_COUNT + 2;
+                    int versionFeature = TalendFilePackage.PROCESS_TYPE_FEATURE_COUNT + 4;
+                    ProcessTypeImpl pi = (ProcessTypeImpl) pt;
+                    if (pi.eClass() != null && StringUtils.equals(pi.eClass().getName(), "TestContainer")) {
 
-                rps.addAll(pt.getParameters().getRoutinesParameter());
-
-                // if it is test process
-                int pidFeature = TalendFilePackage.PROCESS_TYPE_FEATURE_COUNT + 2;
-                int versionFeature = TalendFilePackage.PROCESS_TYPE_FEATURE_COUNT + 4;
-                ProcessTypeImpl pi = (ProcessTypeImpl) pt;
-                if (pi.eClass() != null && StringUtils.equals(pi.eClass().getName(), "TestContainer")) {
-
-                    try {
-                        Object pid = pi.eGet(pidFeature, true, false);
-                        Object version = pi.eGet(versionFeature, true, false);
-                        if (pid != null) {
-                            IProxyRepositoryService svc = IProxyRepositoryService.get();
-                            try {
-                                List<IRepositoryViewObject> vos = svc.getProxyRepositoryFactory().getAllVersion(pid.toString());
-                                for (IRepositoryViewObject vo : vos) {
-                                    if (StringUtils.equals(vo.getVersion(), String.valueOf(version))) {
-                                        Item parentProcessItem = vo.getProperty().getItem();
-                                        if (parentProcessItem instanceof ProcessItem) {
-                                            pt = ((ProcessItem) parentProcessItem).getProcess();
-                                            rps.addAll(pt.getParameters().getRoutinesParameter());
+                        try {
+                            Object pid = pi.eGet(pidFeature, true, false);
+                            Object version = pi.eGet(versionFeature, true, false);
+                            if (pid != null) {
+                                IProxyRepositoryService svc = IProxyRepositoryService.get();
+                                try {
+                                    List<IRepositoryViewObject> vos = svc.getProxyRepositoryFactory().getAllVersion(pid.toString());
+                                    for (IRepositoryViewObject vo : vos) {
+                                        if (StringUtils.equals(vo.getVersion(), String.valueOf(version))) {
+                                            Item parentProcessItem = vo.getProperty().getItem();
+                                            if (parentProcessItem instanceof ProcessItem) {
+                                                pt = ((ProcessItem) parentProcessItem).getProcess();
+                                                rps.addAll(pt.getParameters().getRoutinesParameter());
+                                            }
                                         }
                                     }
+                                } catch (PersistenceException e) {
+                                    // ignore
                                 }
-                            } catch (PersistenceException e) {
-                                // ignore
                             }
+                        } catch (Exception e) {
+                            // ignore
                         }
-                    } catch (Exception e) {
-                        // ignore
                     }
                 }
 
             } else if (processItem instanceof JobletProcessItem) {
                 ProcessType pt = ((JobletProcessItem) processItem).getJobletProcess();
-                rps.addAll(pt.getParameters().getRoutinesParameter());
+                if (pt != null && pt.getParameters() != null) {
+                    rps.addAll(pt.getParameters().getRoutinesParameter());
+                }
             }
 
             if (!rps.isEmpty()) {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/repository/model/RepositoryNodeUtilities.java

@@ -512,6 +512,7 @@ public class RepositoryNodeUtilities {
                     || curType == ERepositoryObjectType.METADATA_FILE_RULES
                     || curType == ERepositoryObjectType.METADATA_FILE_LINKRULES
                     || curType == ERepositoryObjectType.METADATA_SAPCONNECTIONS
+                    || curType == ERepositoryObjectType.METADATA_BIGQUERYCONNECTIONS
                     || curType == ERepositoryObjectType.METADATA_HEADER_FOOTER) {
                 tmpType = ERepositoryObjectType.METADATA;
             } else if (curType == ERepositoryObjectType.ROUTINES || curType == ERepositoryObjectType.SNIPPETS) {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/repository/ui/properties/StatusHelper.java

@@ -77,6 +77,7 @@ public class StatusHelper {
             case PropertiesPackage.CSV_FILE_CONNECTION_ITEM:
             case PropertiesPackage.DATABASE_CONNECTION_ITEM:
             case PropertiesPackage.SAP_CONNECTION_ITEM:
+            case PropertiesPackage.BIG_QUERY_CONNECTION_ITEM:
             case PropertiesPackage.DELIMITED_FILE_CONNECTION_ITEM:
             case PropertiesPackage.POSITIONAL_FILE_CONNECTION_ITEM:
             case PropertiesPackage.CONTEXT_ITEM:

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

@@ -19,8 +19,8 @@ ContextComposite.treeValue=Values as tree
 ContextComposite.variable=Variables
 ContextValueErrorChecker.ErrorTitile=Context value error:
 ContextProcessSection.1=menuTable
-ContextProcessSection.12=Rename Context
-ContextProcessSection.13=Give a new name for the context {0}
+ContextProcessSection.renameEnvironment.Title=Rename context environment
+ContextProcessSection.renameEnvironment.Text=New environment name
 ContextProcessSection.2=Ask for confirmation?
 ContextProcessSection.29=Error
 ContextProcessSection.30=This name already exists
@@ -28,15 +28,15 @@ ContextProcessSection.4=Add New Context based on ->(
 ContextProcessSection.49=Default Context
 ContextProcessSection.50=ContextProcessSection.14
 ContextProcessSection.51=ContextProcessSection.15
-ContextProcessSection.6=New Context
-ContextProcessSection.7=Give a name for the new context
+ContextProcessSection.createEnvironment.Title=Create context environment
+ContextProcessSection.createEnvironment.Text=Environment name
 ContextProcessSection.ParameterNameIsNotValid=Parameter name is not valid.
 ContextProcessSection.RemoveInformation={0} is default context, it can not be removed.
 ContextProcessSection.errorTitle=Error
 ConextTableValuesComposite.nameLabel=Name
 ConextTemplateComposite.OrderMessages=If you want reorder the variables, it must be selected.
 ConextTemplateComposite.OrderText=Original order
-ContextSetConfigurationDialog.nameNotValid=the name is not valid
+ContextSetConfigurationDialog.required.validName=A valid name is required.
 ContextTemplateComposite.CommentLabel=Comment
 ContextTemplateComposite.nameLabel=Name
 ContextTemplateComposite.scriptCodeLabel=Script code
@@ -267,8 +267,8 @@ SelectRepositoryContextDialog.ExpandAll=Expand All
 SelectRepositoryContextDialog.Title=Select Context Variables
 SelectRepositoryContextDialog.View=View...
 SelectRepositoryContextGroupDialog.Default=default
-SelectRepositoryContextGroupDialog.Messages=In the Job, add a nonexistent context group from the repository context
-SelectRepositoryContextGroupDialog.Title=Add Context Group
+SelectRepositoryContextGroupDialog.defaultMessages=In the Job, add a nonexistent context from the repository context
+SelectRepositoryContextGroupDialog.addTitle=Add Context
 TalendTabbedPropertyComposite.compactButton.toolTip=compact view
 TalendTabbedPropertyComposite.tableButton.toolTip=table view
 TalendType.TypeName=Type name {0}
@@ -540,8 +540,8 @@ ContextParameterProposal.ContextVariable.v1=Default context environment: {1}
 ContextParameterProposal.Type.v1=Type: {2}
 ContextParameterProposal.VariableName.v1=Value: {3}
 ArchiveFileExportOperationFullPath.cannotCreateDir=unable to create directory '{0}'
-WorkingSetConfigurationDialog_new_label=&New...
-WorkingSetConfigurationDialog_edit_label=&Edit...
+WorkingSetConfigurationDialog_create_label=&Create...
+WorkingSetConfigurationDialog_rename_label=&Rename...
 WorkingSetConfigurationDialog_remove_label=&Remove
 WorkingSetConfigurationDialog_up_label=&Up
 WorkingSetConfigurationDialog_down_label=&Down
@@ -558,6 +558,9 @@ ContextTreeTable.AddToBuildIn_label=Add to build-in
 ContextTreeTable.AddToRepository_label=Add to repository context
 ContextNebulaComposite.ContextsUnAvailable=Context view is not available.
 ContextNebulaComposite.ContextGroupLabel=Default context environment
+ContextNebulaComposite.ManageVariablesButtonLabel=Manage variables
+ContextNebulaComposite.ViewEnvironmentsGroupLabel=View environments
+ContextNebulaComposite.ManageEnvironmentsGroupLabel=Manage environments
 ContextTreeTable.PromptToolTips=activate prompt on variable
 ContextValidator.ParameterNotValid=parameter name is not valid
 ContextValidator.ParameterValueNotMatch=Type/value mismatch: the value of a variable must match its type

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/ContextNebulaGridComposite.java

@@ -20,16 +20,26 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.commons.lang3.StringUtils;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CCombo;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
@@ -39,6 +49,7 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Menu;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PlatformUI;
 import org.talend.commons.ui.runtime.image.ECoreImage;
@@ -56,7 +67,14 @@ import org.talend.core.model.metadata.types.ContextParameterJavaTypeManager;
 import org.talend.core.model.process.IContext;
 import org.talend.core.model.process.IContextManager;
 import org.talend.core.model.process.IContextParameter;
+import org.talend.core.model.process.IProcess2;
 import org.talend.core.model.properties.Item;
+import org.talend.core.model.update.EUpdateItemType;
+import org.talend.core.model.update.IUpdateItemType;
+import org.talend.core.model.update.IUpdateManager;
+import org.talend.core.model.update.UpdateManagerHelper;
+import org.talend.core.model.update.UpdateResult;
+import org.talend.core.model.update.extension.UpdateManagerProviderDetector;
 import org.talend.core.prefs.ITalendCorePrefConstants;
 import org.talend.core.ui.CoreUIPlugin;
 import org.talend.core.ui.context.ContextTreeTable.ContextTreeNode;
@@ -77,15 +95,19 @@ public class ContextNebulaGridComposite extends AbstractContextTabEditComposite
 
     public static final String NEW_PARAM_NAME = "new"; //$NON-NLS-1$
 
+    public static final String CONTEXT_DEFAULT = "(Default)";//$NON-NLS-1$
+
     private TreeViewer viewer;
 
     private IContextModelManager modelManager = null;
 
-    private ConfigureContextAction configContext;
+    private ConfigureContextAction manageEnvironmentsContext;
 
     private Combo contextsCombo;
 
-    private Button contextConfigButton;
+    private CCombo viewEnvironmentsCombo;
+
+    private Button manageEnvironmentsButton;
 
     private ContextManagerHelper helper;
 
@@ -99,7 +121,7 @@ public class ContextNebulaGridComposite extends AbstractContextTabEditComposite
 
     private Button moveDownButton;
 
-    private Button selectContextVariablesButton;
+    private Button manageVariablesButton;
 
     private Composite contextTableComp;
 
@@ -107,12 +129,11 @@ public class ContextNebulaGridComposite extends AbstractContextTabEditComposite
 
     private Composite messageComp;
 
-    private Composite contextsSelectComp;
-
     private Composite buttonsComp;
 
     private ContextTreeTable treeTable;
 
+
     /**
      * Constructor.
      *
@@ -157,12 +178,20 @@ public class ContextNebulaGridComposite extends AbstractContextTabEditComposite
             if (!ContextNatTableUtils.checkIsInstallExternalJar()) {
                 createMessageGroup(this);
             } else {
-                createNatTableGroup(this);
+                boolean isRepositoryContext = (modelManager instanceof ContextComposite)
+                        && ((ContextComposite) modelManager).isRepositoryContext();
+                if (isRepositoryContext) {
+                    createNatTableGroup(this);
+
+                    createButtonsGroup(this);
+                } else {
+                    createButtonsGroup(this);
+
+                    createNatTableGroup(this);
+                }
 
                 createNatTable();
 
-                createButtonsGroup(this);
-
                 addListener(SWT.Resize, resizeListener);
             }
         }
@@ -198,26 +227,11 @@ public class ContextNebulaGridComposite extends AbstractContextTabEditComposite
     private void createNatTable() {
         ContextTreeTable.TControl tControl = treeTable.createTable(contextTableComp);
         GridDataFactory.fillDefaults().grab(true, true).applyTo(tControl.getControl());
-
-        configContext = new ConfigureContextAction(modelManager, this.getShell());
-        contextConfigButton = new Button(contextTableComp, SWT.NULL);
-        GridData addContextGridData = new GridData();
-        addContextGridData.verticalAlignment = SWT.TOP;
-        contextConfigButton.setLayoutData(addContextGridData);
-        contextConfigButton.setImage(ImageProvider.getImage(EImage.ADD_ICON));
-        contextConfigButton.setToolTipText(configContext.getText());
-        contextConfigButton.addSelectionListener(new SelectionAdapter() {
-
-            @Override
-            public void widgetSelected(SelectionEvent e) {
-                configContext.run();
-            }
-        });
     }
 
     private void createButtonsGroup(Composite parentComposite) {
         buttonsComp = new Composite(parentComposite, SWT.NULL);
-        buttonsComp.setLayout(GridLayoutFactory.swtDefaults().spacing(0, 0).margins(0, 0).numColumns(7).create());
+        buttonsComp.setLayout(GridLayoutFactory.swtDefaults().spacing(5, 0).margins(5, 0).numColumns(7).create());
         GridDataFactory.swtDefaults().align(SWT.FILL, SWT.DOWN).grab(true, false).applyTo(buttonsComp);
         buttonList.clear();
         addButton = createAddPushButton(buttonsComp);
@@ -233,59 +247,150 @@ public class ContextNebulaGridComposite extends AbstractContextTabEditComposite
             moveDownButton = createMoveDownPushButton(buttonsComp);
             buttonList.add(moveDownButton);
         }
-
         if ((modelManager instanceof ContextComposite) && !((ContextComposite) modelManager).isRepositoryContext()
                 && !PluginChecker.isOnlyTopLoaded()) {
-            selectContextVariablesButton = createSelectContextVariablesPushButton(buttonsComp);
-            buttonList.add(selectContextVariablesButton);
+            manageVariablesButton = createManageVariablesPushButton(buttonsComp);
+            buttonList.add(manageVariablesButton);
         }
-        // move the context group from the top to the bottom
-        Composite layoutComposite = new Composite(buttonsComp, SWT.NULL);
-        layoutComposite.setLayout(GridLayoutFactory.swtDefaults().spacing(0, 0).numColumns(1).create());
-        GridDataFactory.swtDefaults().align(SWT.CENTER, SWT.DOWN).grab(true, false).applyTo(layoutComposite);
 
-        createContextsGroup(layoutComposite);
+        createEnvironmentsGroup(buttonsComp);
     }
 
-    private void createContextsGroup(Composite parentComposite) {
-        contextsSelectComp = new Composite(parentComposite, SWT.NULL);
-        contextsSelectComp.setLayout(GridLayoutFactory.swtDefaults().spacing(10, 0).margins(0, 0).numColumns(2).create());
-        GridDataFactory.swtDefaults().align(SWT.RIGHT, SWT.DOWN).grab(true, false).applyTo(contextsSelectComp);
-        GridLayout layout2 = (GridLayout) contextsSelectComp.getLayout();
-        layout2.marginHeight = 0;
-        layout2.marginTop = 0;
-        layout2.marginBottom = 0;
+    private void createEnvironmentsGroup(Composite parentComposite) {
+        Composite environmentsComp = new Composite(parentComposite, SWT.NULL);
+        environmentsComp.setLayout(new GridLayout(2, false));
+        GridData contextComboData = new GridData();
+        contextComboData.grabExcessHorizontalSpace = true;
+        contextComboData.horizontalAlignment = GridData.END;
+        environmentsComp.setLayoutData(contextComboData);
 
-        Label contextSeletLabel = new Label(contextsSelectComp, SWT.NULL);
-        contextSeletLabel.setText(Messages.getString("ContextNebulaComposite.ContextGroupLabel")); //$NON-NLS-1$
-        contextsCombo = new Combo(contextsSelectComp, SWT.READ_ONLY);
-        contextsCombo.addSelectionListener(new SelectionListener() {
+        viewEnvironmentsCombo = new CCombo(environmentsComp, SWT.BORDER);
+        viewEnvironmentsCombo.setVisibleItemCount(0);
+        viewEnvironmentsCombo.setText(Messages.getString("ContextNebulaComposite.ViewEnvironmentsGroupLabel")); //$NON-NLS-1$
+        viewEnvironmentsCombo.addMouseListener(new MouseListener() {
+
+            @Override
+            public void mouseDoubleClick(MouseEvent e) {
+                updateViewEnvironments(viewEnvironmentsCombo);
+            }
+
+            @Override
+            public void mouseDown(MouseEvent e) {
+                updateViewEnvironments(viewEnvironmentsCombo);
+            }
+
+            @Override
+            public void mouseUp(MouseEvent e) {
+            }
+        });
+        
+        manageEnvironmentsContext = new ConfigureContextAction(modelManager, this.getShell());
+        manageEnvironmentsButton = new Button(environmentsComp, SWT.NULL);
+        manageEnvironmentsButton.setText(Messages.getString("ContextNebulaComposite.ManageEnvironmentsGroupLabel")); //$NON-NLS-1$
+        manageEnvironmentsButton.addSelectionListener(new SelectionAdapter() {
 
             @Override
             public void widgetSelected(SelectionEvent e) {
-                Object obj = e.getSource();
-                String selectContext = ((Combo) obj).getText();
-                IContext defaultContext = modelManager.getContextManager().getDefaultContext();
-                if (selectContext.equals(defaultContext.getName())) {
-                } else {
-                    IContext newSelContext = null;
-                    for (IContext enviroContext : modelManager.getContextManager().getListContext()) {
-                        if (selectContext.equals(enviroContext.getName())) {
-                            newSelContext = enviroContext;
-                        }
-                    }
-                    modelManager.onContextChangeDefault(modelManager.getContextManager(), newSelContext);
-                    refresh();
-                }
-
+                manageEnvironmentsContext.run();
             }
+        });
+    }
+
+    private void updateViewEnvironments(CCombo combo) {
+        MenuManager menuMgr = new MenuManager(""); //$NON-NLS-1$
+        List<IContext> contexts = modelManager.getContextManager().getListContext();
+        IContext defaultContext = modelManager.getContextManager().getDefaultContext();
+        for (IContext context : contexts) {
+            String contextName = context.getName();
+            if (contextName.equalsIgnoreCase(defaultContext.getName())) {
+                contextName = contextName + CONTEXT_DEFAULT;
+            }
+            StagingAction action = new StagingAction(contextName, IAction.AS_CHECK_BOX) {
+
+                @Override
+                public void run() {
+                    String name = getText();
+                    if (StringUtils.isNotBlank(name)) {
+                        updateContextStatus(name, isChecked());
+                    }
+                }
+            };
+            action.setChecked(!context.isHide());
+            menuMgr.add(action);
+        }
+        Menu menu = menuMgr.createContextMenu(combo);
+        combo.setMenu(menu);
+        Rectangle bounds = combo.getBounds();
+        Point point = combo.getParent().toDisplay(bounds.x, bounds.y + bounds.height);
+        menu.setLocation(point);
+        menu.setVisible(true);
+    }
+
+    private void updateContextStatus(String name, boolean isChecked) {
+        List<IContext> contexts = modelManager.getContextManager().getListContext();
+        for (IContext context : contexts) {
+            if (name.equalsIgnoreCase(context.getName()) || name.equalsIgnoreCase(context.getName() + CONTEXT_DEFAULT)) {
+                context.setHide(!isChecked);
+                break;
+            }
+        }
+        refreshContextView();
+    }
+
+    private void refreshContextView() {
+        Command command = new Command() {
 
             @Override
-            public void widgetDefaultSelected(SelectionEvent e) {
-
+            public void execute() {
+                if (modelManager.getProcess() != null && modelManager.getProcess() instanceof IProcess2) {
+                    IUpdateManager updateManager = modelManager.getProcess().getUpdateManager();
+                    if (updateManager != null) {
+                        List<UpdateResult> updatesNeeded = new ArrayList<UpdateResult>();
+                        updatesNeeded.addAll(updateManager.getUpdatesNeeded(EUpdateItemType.CONTEXT));
+                        final IUpdateItemType jobletContextType = UpdateManagerProviderDetector.INSTANCE
+                                .getUpdateItemType(UpdateManagerHelper.TYPE_JOBLET_CONTEXT);
+                        if (jobletContextType != null) {
+                            updatesNeeded.addAll(updateManager.getUpdatesNeeded(jobletContextType));
+                        }
+                        updateManager.executeUpdates(updatesNeeded);
+                    }
+                } else {
+                    // set the report editor dirty according to the manager(TdqContextViewComposite)
+                    IContextManager contextManager = modelManager.getContextManager();
+                    if (contextManager instanceof JobContextManager) {
+                        JobContextManager jobContextManager = (JobContextManager) contextManager;
+                        jobContextManager.setModified(true);
+                    }
+                }
+                // refresh both
+                modelManager.refresh();
             }
+        };
 
-        });
+        if (modelManager.getCommandStack() == null) {
+            command.execute();
+        } else {
+            modelManager.getCommandStack().execute(command);
+        }
+    }
+
+    private class StagingAction extends Action {
+
+        protected StagingAction() {
+            super();
+        }
+
+        protected StagingAction(String text, ImageDescriptor image) {
+            super(text, image);
+        }
+
+        protected StagingAction(String text) {
+            super(text);
+        }
+
+        protected StagingAction(String text, int style) {
+            super(text, style);
+        }
     }
 
     private Button createAddPushButton(final Composite parent) {
@@ -404,7 +509,7 @@ public class ContextNebulaGridComposite extends AbstractContextTabEditComposite
         return moveDownPushButton;
     }
 
-    private Button createSelectContextVariablesPushButton(final Composite parent) {
+    private Button createManageVariablesPushButton(final Composite parent) {
         Button selectContextVariablesPushButton = new Button(parent, SWT.PUSH);
         Image image = ImageProvider.getImage(ECoreImage.CONTEXT_ICON);
         selectContextVariablesPushButton.addSelectionListener(new SelectionAdapter() {
@@ -435,6 +540,7 @@ public class ContextNebulaGridComposite extends AbstractContextTabEditComposite
 
         });
         selectContextVariablesPushButton.setImage(image);
+        selectContextVariablesPushButton.setText(Messages.getString("ContextNebulaComposite.ManageVariablesButtonLabel")); //$NON-NLS-1$
         return selectContextVariablesPushButton;
     }
 
@@ -452,11 +558,11 @@ public class ContextNebulaGridComposite extends AbstractContextTabEditComposite
         if (this.moveDownButton != null) {
             this.moveDownButton.setEnabled(enableState);
         }
-        if (this.selectContextVariablesButton != null) {
-            this.selectContextVariablesButton.setEnabled(enableState);
+        if (this.manageVariablesButton != null) {
+            this.manageVariablesButton.setEnabled(enableState);
         }
-        if (contextConfigButton != null) {
-            this.contextConfigButton.setEnabled(enableState);
+        if (manageEnvironmentsButton != null) {
+            this.manageEnvironmentsButton.setEnabled(enableState);
         }
         if (contextsCombo != null) {
             this.contextsCombo.setEnabled(enableState);
@@ -542,8 +648,8 @@ public class ContextNebulaGridComposite extends AbstractContextTabEditComposite
 
     @Override
     public void setEnabled(boolean enabled) {
-        if (configContext != null) {
-            configContext.setEnabled(enabled);
+        if (manageEnvironmentsContext != null) {
+            manageEnvironmentsContext.setEnabled(enabled);
         }
         if (contextTableComp != null && !contextTableComp.isDisposed()) {
             contextTableComp.setEnabled(enabled);
@@ -708,9 +814,6 @@ public class ContextNebulaGridComposite extends AbstractContextTabEditComposite
     }
 
     private void disposeNatTableComp() {
-        if (contextsSelectComp != null && !contextsSelectComp.isDisposed()) {
-            contextsSelectComp.dispose();
-        }
         if (contextTableComp != null && !contextTableComp.isDisposed()) {
             contextTableComp.dispose();
         }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/ContextSetConfigurationDialog.java

@@ -48,7 +48,7 @@ import org.talend.repository.model.RepositoryConstants;
  */
 public class ContextSetConfigurationDialog extends ObjectSelectionDialog<IContext> {
 
-    private static String defaultMesage = "Configure Contexts for Job. Click to Set Default Context.         "; //$NON-NLS-1$
+    private static String defaultMesage = "Create as many environments as necessary and select a default one:"; //$NON-NLS-1$
 
     IContextModelManager manager = null;
 
@@ -77,7 +77,7 @@ public class ContextSetConfigurationDialog extends ObjectSelectionDialog<IContex
 
     @SuppressWarnings("restriction")
     public ContextSetConfigurationDialog(Shell parentShell, IContextModelManager manager) {
-        super(parentShell, "Configure Contexts", defaultMesage, null); //$NON-NLS-1$
+        super(parentShell, "Manage context environments", defaultMesage, null); //$NON-NLS-1$
         this.manager = manager;
         setLabelProvider(getLabelProvider());
         List<IContext> list = new ArrayList<IContext>(manager.getContextManager().getListContext());
@@ -135,7 +135,7 @@ public class ContextSetConfigurationDialog extends ObjectSelectionDialog<IContex
 
     private String toValid(String newText) {
         if (newText.equals("") || !newText.matches(RepositoryConstants.CODE_ITEM_PATTERN)) { //$NON-NLS-1$
-            return Messages.getString("ContextSetConfigurationDialog.nameNotValid"); //$NON-NLS-1$
+            return Messages.getString("ContextSetConfigurationDialog.required.validName"); //$NON-NLS-1$
         }
         for (IContext context : getAllContexts()) {
             if (context.getName().equalsIgnoreCase(newText)) {
@@ -156,8 +156,8 @@ public class ContextSetConfigurationDialog extends ObjectSelectionDialog<IContex
             }
         };
 
-        InputDialog inputDial = new InputDialog(getShell(), Messages.getString("ContextProcessSection.6"), //$NON-NLS-1$
-                Messages.getString("ContextProcessSection.7"), "", validator); //$NON-NLS-1$ //$NON-NLS-2$
+        InputDialog inputDial = new InputDialog(getShell(), Messages.getString("ContextProcessSection.createEnvironment.Title"), //$NON-NLS-1$
+                Messages.getString("ContextProcessSection.createEnvironment.Text"), "", validator); //$NON-NLS-1$ //$NON-NLS-2$
 
         inputDial.open();
         String returnValue = inputDial.getValue();
@@ -278,8 +278,8 @@ public class ContextSetConfigurationDialog extends ObjectSelectionDialog<IContex
 
         IContext selectedContext = (IContext) (getSelection()).getFirstElement();
         String contextName = selectedContext.getName();
-        InputDialog inputDial = new InputDialog(getShell(), Messages.getString("ContextProcessSection.12"), //$NON-NLS-1$
-                Messages.getString("ContextProcessSection.13", contextName), "", validator); //$NON-NLS-1$ //$NON-NLS-2$
+        InputDialog inputDial = new InputDialog(getShell(), Messages.getString("ContextProcessSection.renameEnvironment.Title"), //$NON-NLS-1$
+                Messages.getString("ContextProcessSection.renameEnvironment.Text"), "", validator); //$NON-NLS-1$ //$NON-NLS-2$
         inputDial.open();
         String returnValue = inputDial.getValue();
         if (returnValue == null || "".equals(returnValue)) {

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/ContextTreeTable.java

@@ -56,7 +56,6 @@ import org.eclipse.nebula.widgets.nattable.group.ColumnGroupModel.ColumnGroup;
 import org.eclipse.nebula.widgets.nattable.group.ColumnGroupReorderLayer;
 import org.eclipse.nebula.widgets.nattable.hideshow.ColumnHideShowLayer;
 import org.eclipse.nebula.widgets.nattable.hideshow.RowHideShowLayer;
-import org.eclipse.nebula.widgets.nattable.hideshow.command.ColumnHideCommand;
 import org.eclipse.nebula.widgets.nattable.layer.DataLayer;
 import org.eclipse.nebula.widgets.nattable.layer.cell.ColumnOverrideLabelAccumulator;
 import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
@@ -94,7 +93,6 @@ import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.ui.runtime.ColorConstants;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.model.process.IContext;
-import org.talend.core.model.process.IContextManager;
 import org.talend.core.model.process.IContextParameter;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.model.repository.IRepositoryViewObject;
@@ -104,7 +102,6 @@ import org.talend.core.ui.context.model.ContextTabChildModel;
 import org.talend.core.ui.context.model.table.ContextTableConstants;
 import org.talend.core.ui.context.model.table.ContextTableTabParentModel;
 import org.talend.core.ui.context.nattableTree.ContextAutoResizeTextPainter;
-import org.talend.core.ui.context.nattableTree.ContextColumnGroupConfiguration;
 import org.talend.core.ui.context.nattableTree.ContextColumnHeaderDecorator;
 import org.talend.core.ui.context.nattableTree.ContextNatTableBackGroudPainter;
 import org.talend.core.ui.context.nattableTree.ContextNatTableConfiguration;
@@ -148,11 +145,9 @@ public class ContextTreeTable {
 
     private IContextModelManager manager;
 
-    private final static int fixedCheckBoxWidth = 90;
+    private final static int fixedCheckBoxWidth = 100;
 
-    private final static int fixedTypeWidth = 90;
-
-    private final static int fixedHidePromptWidth = 1;
+    private final static int fixedTypeWidth = 100;
 
     public ContextTreeTable(IContextModelManager manager) {
         this.manager = manager;
@@ -172,14 +167,6 @@ public class ContextTreeTable {
         currentNatTabSel = null;
     }
 
-    public List<IContext> getContexts(IContextManager contextManger) {
-        List<IContext> contexts = new ArrayList<IContext>();
-        if (contextManger != null) {
-            contexts = contextManger.getListContext();
-        }
-        return contexts;
-    }
-
     public void refresh() {
         if (natTable == null) {
             return;
@@ -251,9 +238,6 @@ public class ContextTreeTable {
 
             ColumnGroupHeaderLayer columnGroupHeaderLayer = new ColumnGroupHeaderLayer(columnHeaderLayer, selectionLayer,
                     columnGroupModel);
-            addContextColumnGroupsBehaviour(columnGroupHeaderLayer,
-                    ContextRowDataListFixture.getContexts(manager.getContextManager()));
-            columnGroupHeaderLayer.addConfiguration(new ContextColumnGroupConfiguration(columnGroupModel));
 
             // Register labels
             SortHeaderLayer<ContextTreeNode> sortHeaderLayer = new SortHeaderLayer<ContextTreeNode>(columnGroupHeaderLayer,
@@ -293,8 +277,6 @@ public class ContextTreeTable {
 
             addCustomColumnHeaderStyleBehaviour();
 
-            List<Integer> hideColumnsPos = addCustomHideColumnsBehaviour(manager, columnGroupModel, bodyDataLayer);
-
             List<Integer> checkColumnPos = getAllCheckPosBehaviour(manager, columnGroupModel);
 
             int dataColumnsWidth = bodyDataLayer.getWidth();
@@ -303,7 +285,7 @@ public class ContextTreeTable {
 
             // for caculate the suitable column size for when maxmum or minmum the context tab
 
-            addCustomColumnsResizeBehaviour(bodyDataLayer, hideColumnsPos, checkColumnPos, cornerLayer.getWidth(), maxWidth);
+            addCustomColumnsResizeBehaviour(bodyDataLayer, checkColumnPos, cornerLayer.getWidth(), maxWidth);
 
             NatGridLayerPainter layerPainter = new NatGridLayerPainter(natTable);
             natTable.setLayerPainter(layerPainter);
@@ -352,7 +334,7 @@ public class ContextTreeTable {
     }
 
     private void constructContextTreeNodes() {
-        List<IContext> contextList = getContexts(manager.getContextManager());
+        List<IContext> contextList = ContextRowDataListFixture.getContexts(manager.getContextManager());
         List<IContextParameter> contextDatas = ContextTemplateComposite.computeContextTemplate(contextList);
         List<ContextTableTabParentModel> listofData = ContextNatTableUtils.constructContextDatas(contextDatas);
         contructContextTrees(listofData);
@@ -443,18 +425,19 @@ public class ContextTreeTable {
     private List<Integer> getAllCheckPosBehaviour(IContextModelManager manager, ColumnGroupModel contextGroupModel) {
         List<Integer> checkPos = new ArrayList<Integer>();
         if (manager.getContextManager() != null) {
-            List<IContext> contexts = manager.getContextManager().getListContext();
+            List<IContext> contexts = ContextRowDataListFixture.getContexts(manager.getContextManager());
             for (IContext envContext : contexts) {
                 ColumnGroup group = contextGroupModel.getColumnGroupByName(envContext.getName());
-                int checkIndex = group.getMembers().get(1);
-                checkPos.add(checkIndex);
+                if (group != null) {
+                    checkPos.add(3);
+                }
             }
         }
         return checkPos;
     }
 
-    private void addCustomColumnsResizeBehaviour(DataLayer dataLayer, List<Integer> hideColumnsPos,
-            List<Integer> checkColumnsPos, int cornerWidth, int maxWidth) {
+    private void addCustomColumnsResizeBehaviour(DataLayer dataLayer, List<Integer> checkColumnsPos, int cornerWidth,
+            int maxWidth) {
         dataLayer.setColumnsResizableByDefault(true);
         int dataColumnsCount = dataLayer.getPreferredColumnCount();
 
@@ -466,10 +449,9 @@ public class ContextTreeTable {
         } else {
             int typeColumnPos = dataLayer.getColumnPositionByIndex(1);
 
-            int leftWidth = maxWidth - fixedTypeWidth - fixedCheckBoxWidth * checkColumnsPos.size() - cornerWidth * 2
-                    - fixedHidePromptWidth;
+            int leftWidth = maxWidth - fixedTypeWidth - fixedCheckBoxWidth * checkColumnsPos.size() - cornerWidth * 2;
 
-            int currentColumnsCount = dataColumnsCount - hideColumnsPos.size() - checkColumnsPos.size() - 1;
+            int currentColumnsCount = dataColumnsCount - checkColumnsPos.size() - 1;
             int averageWidth = leftWidth / currentColumnsCount;
             for (int i = 0; i < dataLayer.getColumnCount(); i++) {
                 boolean findHide = false;
@@ -479,12 +461,6 @@ public class ContextTreeTable {
                     findType = true;
                     dataLayer.setColumnWidthByPosition(i, fixedTypeWidth);
                 }
-                for (int hidePos : hideColumnsPos) {
-                    if (hidePos == i) {
-                        findHide = true;
-                        dataLayer.setColumnWidthByPosition(i, fixedHidePromptWidth);
-                    }
-                }
                 for (int checkPos : checkColumnsPos) {
                     if (checkPos == i) {
                         findCheck = true;
@@ -523,35 +499,6 @@ public class ContextTreeTable {
         return colWidth > max ? colWidth : max;
     }
 
-    private List<Integer> addCustomHideColumnsBehaviour(IContextModelManager modelManager, ColumnGroupModel contextGroupModel,
-            DataLayer dataLayer) {
-        List<Integer> hidePos = new ArrayList<Integer>();
-        if (modelManager.getContextManager() != null) {
-            List<IContext> contexts = modelManager.getContextManager().getListContext();
-            for (IContext envContext : contexts) {
-                boolean needHidePrompt = true;
-                ColumnGroup group = contextGroupModel.getColumnGroupByName(envContext.getName());
-                // get every context's prompt to see if need to hide or not,decide by the check of prompt
-                int promptIndex = group.getMembers().get(2);
-                List<IContextParameter> list = envContext.getContextParameterList();
-                if (list != null && list.size() > 0) {
-                    for (IContextParameter contextPara : list) {
-                        if (contextPara.isPromptNeeded()) {
-                            needHidePrompt = false;
-                            break;
-                        }
-                    }
-                }
-                if (needHidePrompt) {
-                    int hidePosition = dataLayer.getColumnPositionByIndex(promptIndex);
-                    hidePos.add(hidePosition);
-                    natTable.doCommand(new ColumnHideCommand(dataLayer, hidePosition));
-                }
-            }
-        }
-        return hidePos;
-    }
-
     private void addCustomSelectionBehaviour(SelectionLayer layer) {
         // need control the selection style when select the rows.
         DefaultSelectionStyleConfiguration selectStyleConfig = new DefaultSelectionStyleConfiguration();
@@ -583,26 +530,14 @@ public class ContextTreeTable {
         natTable.addConfiguration(new ContextParaModeChangeMenuConfiguration(natTable, bodyDataProvider, selection));
     }
 
-    private void addContextColumnGroupsBehaviour(ColumnGroupHeaderLayer columnHeaderLayer, List<IContext> contexts) {
-        // 0=Name,1=Type,2=Comment.
-        int i = 2;
-        for (IContext context : contexts) {
-            String evnContext = context.getName();
-            columnHeaderLayer.addColumnsIndexesToGroup(evnContext, new int[] { ++i, ++i, ++i });
-        }
-    }
-
     private void registerColumnLabels(ColumnOverrideLabelAccumulator columnLabelAccumulator, List<IContext> contexts) {
         columnLabelAccumulator.registerColumnOverrides(0, new String[] { ContextTableConstants.COLUMN_NAME_PROPERTY });
         columnLabelAccumulator.registerColumnOverrides(1, new String[] { ContextTableConstants.COLUMN_TYPE_PROPERTY });
         columnLabelAccumulator.registerColumnOverrides(2, new String[] { ContextTableConstants.COLUMN_COMMENT_PROPERTY });
-        // the columns after "type" will caculated by the contexts
-        // 0=Name,1=Type,2=Comment.
-        int j = 3;
+        columnLabelAccumulator.registerColumnOverrides(3, new String[] { ContextTableConstants.COLUMN_CHECK_PROPERTY });
+        int j = 4;
         for (IContext context : contexts) {
             columnLabelAccumulator.registerColumnOverrides(j++, new String[] { ContextTableConstants.COLUMN_CONTEXT_VALUE });
-            columnLabelAccumulator.registerColumnOverrides(j++, new String[] { ContextTableConstants.COLUMN_CHECK_PROPERTY });
-            columnLabelAccumulator.registerColumnOverrides(j++, new String[] { ContextTableConstants.COLUMN_PROMPT_PROPERTY });
         }
     }
 

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/ObjectSelectionDialog.java

@@ -166,7 +166,8 @@ public abstract class ObjectSelectionDialog<B> extends SelectionDialog {
         // fNewButton = createButton(buttonComposite, nextButtonId++,
         // WorkingSetMessages.WorkingSetConfigurationDialog_new_label,
         // false);
-        fNewButton = createButton(buttonComposite, nextButtonId++, Messages.getString("WorkingSetConfigurationDialog_new_label"), //$NON-NLS-1$
+        fNewButton = createButton(buttonComposite, nextButtonId++,
+                Messages.getString("WorkingSetConfigurationDialog_create_label"), //$NON-NLS-1$
                 false);
         fNewButton.setFont(composite.getFont());
         fNewButton.addSelectionListener(new SelectionAdapter() {
@@ -181,7 +182,7 @@ public abstract class ObjectSelectionDialog<B> extends SelectionDialog {
         // WorkingSetMessages.WorkingSetConfigurationDialog_edit_label,
         // false);
         fEditButton = createButton(buttonComposite, nextButtonId++,
-                Messages.getString("WorkingSetConfigurationDialog_edit_label"), false); //$NON-NLS-1$
+                Messages.getString("WorkingSetConfigurationDialog_rename_label"), false); //$NON-NLS-1$
         fEditButton.setFont(composite.getFont());
         fEditButton.addSelectionListener(new SelectionAdapter() {
 

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/SelectRepositoryContextDialog.java

@@ -522,6 +522,7 @@ public class SelectRepositoryContextDialog extends SelectionDialog {
             // remove the params which is unchecked
             Set<String> jobletIds = new HashSet<String>();
             Set<String> chekedIds = new HashSet<String>();
+            ContextUtils.clearMissingContextCache();
             for (IContextParameter param : existParas) {
                 if (param.isBuiltIn()) {
                     continue;

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/SelectRepositoryContextGroupDialog.java

@@ -52,9 +52,9 @@ import org.talend.designer.core.model.utils.emf.talendfile.ContextType;
  */
 public class SelectRepositoryContextGroupDialog extends SelectionDialog {
 
-    private static final String DEFAULTMESAGE = Messages.getString("SelectRepositoryContextGroupDialog.Messages"); //$NON-NLS-1$
+    private static final String DEFAULTMESAGE = Messages.getString("SelectRepositoryContextGroupDialog.defaultMessages"); //$NON-NLS-1$
 
-    private static final String TITILE = Messages.getString("SelectRepositoryContextGroupDialog.Title"); //$NON-NLS-1$
+    private static final String TITILE = Messages.getString("SelectRepositoryContextGroupDialog.addTitle"); //$NON-NLS-1$
 
     private static final String LEFTBRACKET = " ("; //$NON-NLS-1$
 

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/cmd/AddRepositoryContextGroupCommand.java

@@ -184,6 +184,7 @@ public class AddRepositoryContextGroupCommand extends Command {
         // remove the params which is unchecked
         Set<String> nonContextIds = new HashSet<String>();
         Set<String> chekedIds = new HashSet<String>();
+        ContextUtils.clearMissingContextCache();
         for (IContextParameter param : existParas) {
             if (param.isBuiltIn()) {
                 continue;

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ContextColumnGroupConfiguration.java

@@ -1,92 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.core.ui.context.nattableTree;
-
-import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;
-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
-import org.eclipse.nebula.widgets.nattable.grid.GridRegion;
-import org.eclipse.nebula.widgets.nattable.group.ColumnGroupModel;
-import org.eclipse.nebula.widgets.nattable.group.action.ColumnGroupExpandCollapseAction;
-import org.eclipse.nebula.widgets.nattable.group.action.ColumnGroupHeaderReorderDragMode;
-import org.eclipse.nebula.widgets.nattable.group.action.ColumnHeaderReorderDragMode;
-import org.eclipse.nebula.widgets.nattable.group.action.CreateColumnGroupAction;
-import org.eclipse.nebula.widgets.nattable.group.action.UngroupColumnsAction;
-import org.eclipse.nebula.widgets.nattable.group.config.DefaultColumnGroupHeaderLayerConfiguration;
-import org.eclipse.nebula.widgets.nattable.group.painter.ColumnGroupHeaderTextPainter;
-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
-import org.eclipse.nebula.widgets.nattable.ui.action.AggregateDragMode;
-import org.eclipse.nebula.widgets.nattable.ui.action.CellDragMode;
-import org.eclipse.nebula.widgets.nattable.ui.action.NoOpMouseAction;
-import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;
-import org.eclipse.nebula.widgets.nattable.ui.matcher.KeyEventMatcher;
-import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;
-import org.eclipse.swt.SWT;
-
-/**
- * created by ldong on Sep 19, 2014 Detailled comment
- *
- */
-public class ContextColumnGroupConfiguration extends DefaultColumnGroupHeaderLayerConfiguration {
-
-    private final ColumnGroupModel columnGroupModel;
-
-    /**
-     * DOC ldong ContextColumnGroupConfiguration constructor comment.
-     *
-     * @param columnGroupModel
-     */
-    public ContextColumnGroupConfiguration(ColumnGroupModel columnGroupModel) {
-        super(columnGroupModel);
-        this.columnGroupModel = columnGroupModel;
-
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.eclipse.nebula.widgets.nattable.group.config.DefaultColumnGroupHeaderLayerConfiguration#configureRegistry
-     * (org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
-     */
-    @Override
-    public void configureRegistry(IConfigRegistry configRegistry) {
-        configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, new ContextColumnHeaderDecorator(
-                new ColumnGroupHeaderTextPainter()), DisplayMode.NORMAL, GridRegion.COLUMN_GROUP_HEADER);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.eclipse.nebula.widgets.nattable.group.config.DefaultColumnGroupHeaderLayerConfiguration#configureUiBindings
-     * (org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry)
-     */
-    @Override
-    public void configureUiBindings(UiBindingRegistry uiBindingRegistry) {
-        uiBindingRegistry.registerMouseDragMode(MouseEventMatcher.columnGroupHeaderLeftClick(SWT.NONE), new AggregateDragMode(
-                new CellDragMode(), new ColumnGroupHeaderReorderDragMode(columnGroupModel)));
-
-        uiBindingRegistry.registerMouseDragMode(MouseEventMatcher.columnHeaderLeftClick(SWT.NONE),
-                new ColumnHeaderReorderDragMode(columnGroupModel));
-
-        uiBindingRegistry.registerDoubleClickBinding(MouseEventMatcher.columnGroupHeaderLeftClick(SWT.NONE),
-                new NoOpMouseAction());
-        // just switch the action for the double click and single click
-        uiBindingRegistry.registerFirstSingleClickBinding(MouseEventMatcher.columnGroupHeaderLeftClick(SWT.NONE),
-                new ColumnGroupExpandCollapseAction());
-
-        uiBindingRegistry.registerKeyBinding(new KeyEventMatcher(SWT.CTRL, 'g'), new CreateColumnGroupAction());
-        uiBindingRegistry.registerKeyBinding(new KeyEventMatcher(SWT.CTRL, 'u'), new UngroupColumnsAction());
-    }
-
-}

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ContextNatTableConfiguration.java

@@ -107,8 +107,6 @@ public class ContextNatTableConfiguration extends AbstractRegistryConfiguration
                 ContextTableConstants.COLUMN_COMMENT_PROPERTY);
         configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITABLE_RULE, getEditRule(), DisplayMode.EDIT,
                 ContextTableConstants.COLUMN_CHECK_PROPERTY);
-        configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITABLE_RULE, getEditRule(), DisplayMode.EDIT,
-                ContextTableConstants.COLUMN_PROMPT_PROPERTY);
         configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITABLE_RULE, getEditRule(), DisplayMode.EDIT,
                 ContextTableConstants.COLUMN_CONTEXT_VALUE);
     }
@@ -123,15 +121,13 @@ public class ContextNatTableConfiguration extends AbstractRegistryConfiguration
         configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleDefault, DisplayMode.NORMAL,
                 ContextTableConstants.COLUMN_NAME_PROPERTY);
 
+
         configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleDefault, DisplayMode.NORMAL,
                 ContextTableConstants.COLUMN_COMMENT_PROPERTY);
 
         configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleDefault, DisplayMode.NORMAL,
                 ContextTableConstants.COLUMN_CHECK_PROPERTY);
 
-        configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleDefault, DisplayMode.NORMAL,
-                ContextTableConstants.COLUMN_PROMPT_PROPERTY);
-
         configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleDefault, DisplayMode.NORMAL,
                 ContextTableConstants.COLUMN_CONTEXT_VALUE);
 
@@ -150,9 +146,6 @@ public class ContextNatTableConfiguration extends AbstractRegistryConfiguration
         configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleSelect, DisplayMode.SELECT,
                 ContextTableConstants.COLUMN_CHECK_PROPERTY);
 
-        configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleSelect, DisplayMode.SELECT,
-                ContextTableConstants.COLUMN_PROMPT_PROPERTY);
-
         configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleSelect, DisplayMode.SELECT,
                 ContextTableConstants.COLUMN_CONTEXT_VALUE);
     }
@@ -176,7 +169,7 @@ public class ContextNatTableConfiguration extends AbstractRegistryConfiguration
 
             @Override
             public boolean isEditable(int columnIndex, int rowIndex) {
-                if (columnIndex == 4) {
+                if (columnIndex == 3) {
                     // active the prompt when export as context
                     return true;
                 }
@@ -204,7 +197,6 @@ public class ContextNatTableConfiguration extends AbstractRegistryConfiguration
         registerColumnThreeCheckBoxEditor(configRegistry);
         registerColumnFourTextEditor(configRegistry);
         registerColumnFiveTextEditor(configRegistry);
-        registerColumnSixTextEditor(configRegistry);
     }
 
     private void registerColumnFirstTextEditor(IConfigRegistry configRegistry) {
@@ -321,17 +313,12 @@ public class ContextNatTableConfiguration extends AbstractRegistryConfiguration
     }
 
     private void registerColumnFourTextEditor(IConfigRegistry configRegistry) {
-        configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, new TextCellEditor(true, true),
-                DisplayMode.NORMAL, ContextTableConstants.COLUMN_PROMPT_PROPERTY);
-    }
-
-    private void registerColumnFiveTextEditor(IConfigRegistry configRegistry) {
-        ProxyDynamicCellEditor cutomCellEditor = new ProxyDynamicCellEditor(dataProvider, columnGroupModel, manager);
+        ProxyDynamicCellEditor cutomCellEditor = new ProxyDynamicCellEditor(dataProvider, manager, modelManager);
         configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, cutomCellEditor, DisplayMode.EDIT,
                 ContextTableConstants.COLUMN_CONTEXT_VALUE);
     }
 
-    private void registerColumnSixTextEditor(IConfigRegistry configRegistry) {
+    private void registerColumnFiveTextEditor(IConfigRegistry configRegistry) {
         configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, new TextCellEditor(true, true),
                 DisplayMode.NORMAL, ContextTableConstants.COLUMN_COMMENT_PROPERTY);
     }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ContextNatTableUtils.java

@@ -92,6 +92,7 @@ public class ContextNatTableUtils {
         List<ContextTableTabParentModel> output = new ArrayList<ContextTableTabParentModel>();
         if (!contextDatas.isEmpty()) {
             int i = 0;
+            ContextUtils.clearMissingContextCache();
             for (IContextParameter para : contextDatas) {
                 String sourceId = para.getSource();
                 if (IContextParameter.BUILT_IN.equals(sourceId)) {

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ContextRowDataListFixture.java

@@ -40,24 +40,27 @@ public class ContextRowDataListFixture {
     public static List<IContext> getContexts(IContextManager contextManger) {
         List<IContext> contexts = new ArrayList<IContext>();
         if (contextManger != null) {
-            contexts = contextManger.getListContext();
+            for (IContext context : contextManger.getListContext()) {
+                if (!context.isHide()) {
+                    contexts.add(context);
+                }
+            }
         }
         return contexts;
     }
 
     public static String[] getPropertyNames(IContextModelManager manager) {
         List<IContext> contexts = getContexts(manager.getContextManager());
-        int columnCount = contexts.size() * 3 + 3;
+        int columnCount = contexts.size() + 4;
         String[] columnsName = new String[columnCount];
         int i = 0;
         columnsName[i++] = ContextTableConstants.COLUMN_NAME_PROPERTY;
         columnsName[i++] = ContextTableConstants.COLUMN_TYPE_PROPERTY;
         columnsName[i++] = ContextTableConstants.COLUMN_COMMENT_PROPERTY;
+        columnsName[i++] = ContextTableConstants.COLUMN_CHECK_PROPERTY;
         if (contexts.size() > 0) {
             for (IContext context : contexts) {
-                columnsName[i++] = ContextTableConstants.COLUMN_CONTEXT_VALUE;
-                columnsName[i++] = ContextTableConstants.COLUMN_CHECK_PROPERTY;
-                columnsName[i++] = ContextTableConstants.COLUMN_PROMPT_PROPERTY;
+                columnsName[i++] = context.getName();
             }
             return columnsName;
         }
@@ -69,7 +72,6 @@ public class ContextRowDataListFixture {
         List<IContext> contexts = getContexts(manager.getContextManager());
         propertyToLabelMap.put(ContextTableConstants.COLUMN_NAME_PROPERTY, ContextTableConstants.COLUMN_NAME_PROPERTY);
         propertyToLabelMap.put(ContextTableConstants.COLUMN_TYPE_PROPERTY, ContextTableConstants.COLUMN_TYPE_PROPERTY);
-        propertyToLabelMap.put(ContextTableConstants.COLUMN_PROMPT_PROPERTY, ContextTableConstants.COLUMN_PROMPT_PROPERTY);
         propertyToLabelMap.put(ContextTableConstants.COLUMN_CONTEXT_VALUE, ContextTableConstants.COLUMN_CONTEXT_VALUE);
         for (IContext context : contexts) {
             propertyToLabelMap.put(context.getName(), context.getName());

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ExtendedContextColumnPropertyAccessor.java

@@ -20,6 +20,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.eclipse.gef.commands.Command;
@@ -177,35 +178,31 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
                     } else {
                         return contextParaType;
                     }
+                } else if (currentColumnName.equals(ContextTableConstants.COLUMN_CHECK_PROPERTY)) {
+                    if (manager != null && manager.getContextManager() != null) {
+                        List<IContext> contexts = manager.getContextManager().getListContext();
+                        return ContextUtils.isPromptNeeded(contexts, contextParaName);
+                    }
+                    return currentParam.isPromptNeeded();
                 } else if (currentColumnName.equals(ContextTableConstants.COLUMN_COMMENT_PROPERTY)) {
                     return currentParam.getComment();
                 } else {
-                    if (this.groupModel.isPartOfAGroup(columnIndex)) {
-                        String columnGroupName = this.groupModel.getColumnGroupByIndex(columnIndex).getName();
-                        if (manager.getContextManager() != null) {
-                            List<IContext> contexts = manager.getContextManager().getListContext();
-                            IContextParameter currentPara = findContextPara(contexts, columnGroupName, contextParaName);
-                            if (currentPara == null) {
-                                return "";
-                            }
-                            if (currentColumnName.equals(ContextTableConstants.COLUMN_CHECK_PROPERTY)) {
-                                return currentPara.isPromptNeeded();
-                            } else if (currentColumnName.equals(ContextTableConstants.COLUMN_PROMPT_PROPERTY)) {
-                                return currentPara.getPrompt();
-                            } else if (currentColumnName.equals(ContextTableConstants.COLUMN_CONTEXT_VALUE)) {
-                                // because it's raw value, so need display * for password type.
-                                if (PasswordEncryptUtil.isPasswordType(currentPara.getType())) {
-                                    return PasswordEncryptUtil.getPasswordDisplay(currentPara.getValue());
-                                }
-                                String displayValue = ContextNatTableUtils.getSpecialTypeDisplayValue(currentPara.getType(),
-                                        currentPara.getValue());
-                                if (displayValue != null) {
-                                    return displayValue;
-                                }
-                                return currentPara.getDisplayValue();
-
-                            }
+                    if (manager.getContextManager() != null) {
+                        List<IContext> contexts = manager.getContextManager().getListContext();
+                        IContextParameter currentPara = findContextPara(contexts, currentColumnName, contextParaName);
+                        if (currentPara == null) {
+                            return "";
                         }
+                        // because it's raw value, so need display * for password type.
+                        if (PasswordEncryptUtil.isPasswordType(currentPara.getType())) {
+                            return PasswordEncryptUtil.getPasswordDisplay(currentPara.getValue());
+                        }
+                        String displayValue = ContextNatTableUtils.getSpecialTypeDisplayValue(currentPara.getType(),
+                                currentPara.getValue());
+                        if (displayValue != null) {
+                            return displayValue;
+                        }
+                        return currentPara.getDisplayValue();
                     }
                 }
             }
@@ -233,57 +230,71 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
     private void setPropertyValue(IContextModelManager manager, Object dataElement, String contextParaName, int columnIndex,
             Object newValue) {
         String currentColumnName = getColumnProperty(columnIndex);
-        if (this.groupModel.isPartOfAGroup(columnIndex)) {
-            String columnGroupName = this.groupModel.getColumnGroupByIndex(columnIndex).getName();
+        if (currentColumnName.equals(ContextTableConstants.COLUMN_TYPE_PROPERTY)) {
+            ContextTableTabParentModel parent = (ContextTableTabParentModel) dataElement;
+            IContextParameter contextPara = parent.getContextParameter();
+            if (contextPara.getType() == ((String) newValue)) {
+                return;
+            }
+            String newType = getRealType((String) newValue);
+
+            Command cmd = new SetContextTypeCommand(manager, contextPara, newType);
+            runCommand(cmd, manager);
+        } else if (currentColumnName.equals(ContextTableConstants.COLUMN_NAME_PROPERTY)) {
+            ContextTableTabParentModel parent = (ContextTableTabParentModel) dataElement;
+            IContextParameter contextPara = parent.getContextParameter();
+            String sourceId = contextPara.getSource();
+            String newParaName = (String) newValue;
+
+            if (manager.getContextManager() instanceof JobContextManager) {
+                // in case joblet rename will propagate to the job,just record it
+                JobContextManager contextManager = (JobContextManager) manager.getContextManager();
+                contextManager.addNewName(newParaName, contextPara.getName());
+                contextManager.setModified(true);
+            }
+            Command cmd = new SetContextNameCommand(manager, contextPara, newParaName, sourceId);
+            runCommand(cmd, manager);
+        } else if (currentColumnName.equals(ContextTableConstants.COLUMN_COMMENT_PROPERTY)) {
+            ContextTableTabParentModel parent = (ContextTableTabParentModel) dataElement;
+            IContextParameter contextPara = parent.getContextParameter();
+            if (contextPara.getComment() == ((String) newValue)) {
+                return;
+            }
+            Command cmd = new setContextCommentCommand(manager, contextPara, (String) newValue);
+            runCommand(cmd, manager);
+        } else if (currentColumnName.equals(ContextTableConstants.COLUMN_CHECK_PROPERTY)) {
+            IContextParameter contextPara = null;
+            if (dataElement instanceof ContextTableTabChildModel) {
+                contextPara = ((ContextTableTabChildModel) dataElement).getContextParameter();
+            } else if (dataElement instanceof ContextTableTabParentModel) {
+                contextPara = ((ContextTableTabParentModel) dataElement).getContextParameter();
+            }
+            if (contextPara == null) {
+                return;
+            }
+            boolean isPromptNeeded = contextPara.isPromptNeeded();
+            if (manager != null && manager.getContextManager() != null) {
+                List<IContext> contexts = manager.getContextManager().getListContext();
+                isPromptNeeded = ContextUtils.isPromptNeeded(contexts, contextParaName);
+            }
+            if (isPromptNeeded == ((boolean) newValue)) {
+                return;
+            }
+            Command cmd = new setContextEnablePromptCommand(manager, contextPara, ((boolean) newValue));
+            runCommand(cmd, manager);
+        } else {
+            String columnGroupName = currentColumnName;
             IContextManager contextManger = manager.getContextManager();
             if (contextManger != null) {
-                // change the property of context such as prompt,promptyNeeded,value etc.
+                // change the property of context value.
                 List<Object> list = new ArrayList<Object>();
                 list.add(dataElement);
-
                 IContextParameter para = null;
                 para = getRealParameter(contextManger, columnGroupName, dataElement);
-                if (para == null) {
+                if (para == null || (StringUtils.isBlank(para.getValue()) && newValue == null)) {
                     return;
                 }
-                Command cmd = new SetContextGroupParameterCommand(manager, para, currentColumnName, newValue);
-                runCommand(cmd, manager);
-                if (currentColumnName.equals(ContextTableConstants.COLUMN_CHECK_PROPERTY)) {
-                    manager.refresh();
-                }
-            }
-        } else {
-            if (currentColumnName.equals(ContextTableConstants.COLUMN_TYPE_PROPERTY)) {
-                ContextTableTabParentModel parent = (ContextTableTabParentModel) dataElement;
-                IContextParameter contextPara = parent.getContextParameter();
-                if (contextPara.getType() == ((String) newValue)) {
-                    return;
-                }
-                String newType = getRealType((String) newValue);
-
-                Command cmd = new SetContextTypeCommand(manager, contextPara, newType);
-                runCommand(cmd, manager);
-            } else if (currentColumnName.equals(ContextTableConstants.COLUMN_NAME_PROPERTY)) {
-                ContextTableTabParentModel parent = (ContextTableTabParentModel) dataElement;
-                IContextParameter contextPara = parent.getContextParameter();
-                String sourceId = contextPara.getSource();
-                String newParaName = (String) newValue;
-
-                if (manager.getContextManager() instanceof JobContextManager) {
-                    // in case joblet rename will propagate to the job,just record it
-                    JobContextManager contextManager = (JobContextManager) manager.getContextManager();
-                    contextManager.addNewName(newParaName, contextPara.getName());
-                    contextManager.setModified(true);
-                }
-                Command cmd = new SetContextNameCommand(manager, contextPara, newParaName, sourceId);
-                runCommand(cmd, manager);
-            } else if (currentColumnName.equals(ContextTableConstants.COLUMN_COMMENT_PROPERTY)) {
-                ContextTableTabParentModel parent = (ContextTableTabParentModel) dataElement;
-                IContextParameter contextPara = parent.getContextParameter();
-                if (contextPara.getComment() == ((String) newValue)) {
-                    return;
-                }
-                Command cmd = new setContextCommentCommand(manager, contextPara, (String)newValue);
+                Command cmd = new SetContextParameterValueCommand(manager, para, currentColumnName, newValue);
                 runCommand(cmd, manager);
             }
         }
@@ -334,7 +345,7 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
         return para;
     }
 
-    class SetContextGroupParameterCommand extends Command {
+    class SetContextParameterValueCommand extends Command {
 
         IContextParameter param;
 
@@ -344,7 +355,7 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
 
         String property;
 
-        public SetContextGroupParameterCommand(IContextModelManager modelManager, IContextParameter param, String property,
+        public SetContextParameterValueCommand(IContextModelManager modelManager, IContextParameter param, String property,
                 Object newValue) {
             super();
             this.modelManager = modelManager;
@@ -360,34 +371,12 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
          */
         @Override
         public void execute() {
-            boolean modified = false;
-            if (property.equals(ContextTableConstants.COLUMN_CHECK_PROPERTY)) {
-                if (param.isPromptNeeded() == (Boolean) newValue) {
-                    return;
-                }
-                oldValue = param.isPromptNeeded();
-                param.setPromptNeeded((Boolean) newValue);
-                modified = true;
-            } else if (property.equals(ContextTableConstants.COLUMN_PROMPT_PROPERTY)) {
-                if (param.getPrompt() != null && param.getPrompt().equals(newValue)) {
-                    return;
-                }
-                oldValue = param.getPrompt();
-                param.setPrompt((String) newValue);
-                modified = true;
-            } else if (property.equals(ContextTableConstants.COLUMN_CONTEXT_VALUE)) {
-                if (param.getValue() != null && param.getValue().equals(newValue)) {
-                    return;
-                }
-                oldValue = param.getValue();
-                // if (newValue != null) {
-                param.setValue(newValue == null ? "" : (String) newValue);
-                modified = true;
-                // }
-            }
-            if (modified) {
-                updateRelation();
+            if (param.getValue() != null && param.getValue().equals(newValue)) {
+                return;
             }
+            oldValue = param.getValue();
+            param.setValue(newValue == null ? "" : (String) newValue);
+            updateRelation();
         }
 
         /*
@@ -397,21 +386,9 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
          */
         @Override
         public void undo() {
-            boolean modified = false;
-            if (property.equals(ContextTableConstants.COLUMN_CHECK_PROPERTY)) {
-                param.setPromptNeeded((Boolean) oldValue);
-                modified = true;
-            } else if (property.equals(ContextTableConstants.COLUMN_PROMPT_PROPERTY)) {
-                param.setPrompt((String) oldValue);
-                modified = true;
-            } else if (property.equals(ContextTableConstants.COLUMN_CONTEXT_VALUE)) {
-                param.setValue((String) oldValue);
-                modified = true;
-            }
-
-            if (modified) {
-                updateRelation();
-            }
+            param.setValue((String) oldValue);
+            updateRelation();
+            modelManager.refresh();
         }
 
         private void updateRelation() {
@@ -425,7 +402,6 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
                             && jobContextManager.isOriginalParameter(param.getName())) {
                         jobContextManager.setModified(true);
                         manager.fireContextsChangedEvent();
-                        modelManager.refresh();
                     }
                 }
             }
@@ -494,6 +470,7 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
             }
             if (modified) {
                 updateRelation();
+                modelManager.refresh();
             }
         }
 
@@ -508,7 +485,6 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
                             && jobContextManager.isOriginalParameter(param.getName())) {
                         jobContextManager.setModified(true);
                         manager.fireContextsChangedEvent();
-                        modelManager.refresh();
                     }
                 }
             }
@@ -516,6 +492,83 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
 
     }
 
+    class setContextEnablePromptCommand extends Command {
+
+        IContextParameter param;
+
+        IContextModelManager modelManager;
+
+        boolean newValue, oldValue;
+
+        public setContextEnablePromptCommand(IContextModelManager modelManager, IContextParameter param, boolean newValue) {
+            super();
+            this.modelManager = modelManager;
+            this.param = param;
+            this.newValue = newValue;
+        }
+
+        @Override
+        public void execute() {
+            boolean modified = false;
+            if (modelManager.getContextManager() != null) {
+                for (IContext context : modelManager.getContextManager().getListContext()) {
+                    for (IContextParameter contextParameter : context.getContextParameterList()) {
+                        if (param.getName().equals(contextParameter.getName())) {
+                            oldValue = param.isPromptNeeded();
+                            param.setPromptNeeded(newValue);
+                            contextParameter.setPromptNeeded(newValue);
+                            modified = true;
+                        }
+                    }
+                }
+            }
+            if (modified) {
+                updateRelation();
+            }
+        }
+
+        /*
+         * (non-Javadoc)
+         *
+         * @see org.eclipse.gef.commands.Command#undo()
+         */
+        @Override
+        public void undo() {
+            boolean modified = false;
+            if (modelManager.getContextManager() != null) {
+                for (IContext context : modelManager.getContextManager().getListContext()) {
+                    for (IContextParameter contextParameter : context.getContextParameterList()) {
+                        if (param.getName().equals(contextParameter.getName())) {
+                            param.setPromptNeeded(oldValue);
+                            contextParameter.setPromptNeeded(oldValue);
+                            modified = true;
+                        }
+                    }
+                }
+            }
+            if (modified) {
+                updateRelation();
+                modelManager.refresh();
+            }
+        }
+
+        private void updateRelation() {
+            // set updated flag.
+            if (param != null) {
+                IContextManager manager = modelManager.getContextManager();
+                if (manager != null && manager instanceof JobContextManager) {
+                    JobContextManager jobContextManager = (JobContextManager) manager;
+                    // not added new
+                    if (!modelManager.isRepositoryContext()
+                            || modelManager.isRepositoryContext() && jobContextManager.isOriginalParameter(param.getName())) {
+                        jobContextManager.setModified(true);
+                        manager.fireContextsChangedEvent();
+                    }
+                }
+            }
+        }
+    }
+
     class setContextCommentCommand extends Command {
 
 
@@ -576,6 +629,7 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
             }
             if (modified) {
                 updateRelation();
+                modelManager.refresh();
             }
         }
 
@@ -590,7 +644,6 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
                             && jobContextManager.isOriginalParameter(param.getName())) {
                         jobContextManager.setModified(true);
                         manager.fireContextsChangedEvent();
-                        modelManager.refresh();
                     }
                 }
             }
@@ -673,6 +726,7 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
             if (modified) {
                 // it is undo, so the order changed
                 updateRelation(newName, originalName);
+                modelManager.refresh();
             }
         }
 
@@ -687,7 +741,6 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
                             && jobContextManager.isOriginalParameter(param.getName())) {
                         jobContextManager.setModified(true);
                         manager.fireContextsChangedEvent();
-                        modelManager.refresh();
                     }
                 }
             }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ProxyDynamicCellEditor.java

@@ -22,13 +22,13 @@ import org.eclipse.nebula.widgets.nattable.edit.editor.AbstractCellEditor;
 import org.eclipse.nebula.widgets.nattable.edit.editor.ComboBoxCellEditor;
 import org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor;
 import org.eclipse.nebula.widgets.nattable.extension.glazedlists.GlazedListsDataProvider;
-import org.eclipse.nebula.widgets.nattable.group.ColumnGroupModel;
 import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer.MoveDirectionEnum;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.talend.core.model.process.IContextManager;
 import org.talend.core.model.process.IContextParameter;
 import org.talend.core.ui.context.ContextTreeTable.ContextTreeNode;
+import org.talend.core.ui.context.IContextModelManager;
 
 /**
  *
@@ -40,22 +40,15 @@ public class ProxyDynamicCellEditor extends AbstractCellEditor {
 
     private IDataProvider dataProvider;
 
-    private ColumnGroupModel columnGroupModel;
-
     private IContextManager manager;
 
-    /**
-     * DOC ldong ProxyDynamicCellEditor constructor comment.
-     *
-     * @param dataProvider
-     * @param columnGroupModel
-     * @param manager
-     */
-    public ProxyDynamicCellEditor(IDataProvider dataProvider, ColumnGroupModel columnGroupModel, IContextManager manager) {
+    private IContextModelManager modelManager;
+
+    public ProxyDynamicCellEditor(IDataProvider dataProvider, IContextManager manager, IContextModelManager modelManager) {
         super();
         this.dataProvider = dataProvider;
-        this.columnGroupModel = columnGroupModel;
         this.manager = manager;
+        this.modelManager = modelManager;
     }
 
     /*
@@ -117,32 +110,26 @@ public class ProxyDynamicCellEditor extends AbstractCellEditor {
                 this.layerCell.getRowPosition());
         int cellColumnIndex = this.layerCell.getColumnIndex();
         int cellRowIndex = this.layerCell.getRowIndex();
-        if (columnGroupModel != null && columnGroupModel.isPartOfAGroup(cellColumnIndex)) {
-            String columnGroupName = columnGroupModel.getColumnGroupByIndex(cellColumnIndex).getName();
-
-            ContextTreeNode rowNode = ((GlazedListsDataProvider<ContextTreeNode>) dataProvider).getRowObject(cellRowIndex);
-
-            IContextParameter realPara = ContextNatTableUtils.getRealParameter(manager, columnGroupName, rowNode.getTreeData());
-
-            if (NatTableCellEditorFactory.isBoolean(realPara.getType())) {
-                final List<String> list = Arrays.asList(NatTableCellEditorFactory.BOOLEANS);
-                ComboBoxCellEditor comboBoxCellEditor = new ComboBoxCellEditor(list);
-                comboBoxCellEditor.setFreeEdit(false);
-                dynamicEditor = comboBoxCellEditor;
-                Object displayDefaultValue = false;
-                // the combox need a default value at least
-                if (!originalCanonicalValue.equals("")) {
-                    displayDefaultValue = originalCanonicalValue;
-                }
-                return dynamicEditor.activateCell(parent, displayDefaultValue, editMode, editHandler, layerCell, configRegistry);
-            } else {
-                dynamicEditor = new CustomTextCellEditor(realPara, this.cellStyle, true, true);
-                ((CustomTextCellEditor) dynamicEditor).setFreeEdit(true);
-                return dynamicEditor.activateCell(parent, originalCanonicalValue, editMode, editHandler, layerCell,
-                        configRegistry);
+        String[] propertyNames = ContextRowDataListFixture.getPropertyNames(modelManager);
+        String currentColumnName = Arrays.asList(propertyNames).get(cellColumnIndex);
+        ContextTreeNode rowNode = ((GlazedListsDataProvider<ContextTreeNode>) dataProvider).getRowObject(cellRowIndex);
+        IContextParameter realPara = ContextNatTableUtils.getRealParameter(manager, currentColumnName, rowNode.getTreeData());
+        if (NatTableCellEditorFactory.isBoolean(realPara.getType())) {
+            final List<String> list = Arrays.asList(NatTableCellEditorFactory.BOOLEANS);
+            ComboBoxCellEditor comboBoxCellEditor = new ComboBoxCellEditor(list);
+            comboBoxCellEditor.setFreeEdit(false);
+            dynamicEditor = comboBoxCellEditor;
+            Object displayDefaultValue = false;
+            // the combox need a default value at least
+            if (!originalCanonicalValue.equals("")) {
+                displayDefaultValue = originalCanonicalValue;
             }
+            return dynamicEditor.activateCell(parent, displayDefaultValue, editMode, editHandler, layerCell, configRegistry);
+        } else {
+            dynamicEditor = new CustomTextCellEditor(realPara, this.cellStyle, true, true);
+            ((CustomTextCellEditor) dynamicEditor).setFreeEdit(true);
+            return dynamicEditor.activateCell(parent, originalCanonicalValue, editMode, editHandler, layerCell, configRegistry);
         }
-        return null;
     }
 
     /*

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/view/AbstractContextView.java

@@ -319,10 +319,10 @@ public abstract class AbstractContextView extends ViewPart {
 
     @Override
     public void setPartName(String title) {
-        String viewName = "Contexts"; //$NON-NLS-1$
+        String viewName = "Context"; //$NON-NLS-1$
 
         if (!title.equals("")) { //$NON-NLS-1$
-            viewName = viewName + "(" + title + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+            viewName = viewName + " (" + title + ")"; //$NON-NLS-1$ //$NON-NLS-2$
             super.setTitleToolTip(title);
         }
         super.setPartName(viewName);

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/view/Contexts.java

@@ -21,6 +21,7 @@ import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.PlatformUI;
+import org.talend.core.model.context.ContextUtils;
 import org.talend.core.ui.branding.IBrandingConfiguration;
 
 /**
@@ -51,6 +52,7 @@ public class Contexts {
             public void run() {
                 if (cxtView != null) {
                     updateTitle(cxtView);
+                    ContextUtils.clearMissingContextCache();
                     cxtView.refresh(part);
                 }
             }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/documentation/generation/ExternalNodeComponentHandler.java

@@ -175,9 +175,28 @@ public class ExternalNodeComponentHandler extends AbstractComponentHandler {
                 generateComponentSchemaInfo(externalNode, componentElement);
                 generateComponentElementParamInfo(parametersElement, elementParameterList);
             } else {
+                boolean isSCDComponent = externalNode.getComponent().getName().endsWith("SCD");
+                if (isSCDComponent) {
+                    Element parametersElement = componentElement.addElement("parameters"); //$NON-NLS-1$
+                    List elementParameterList = externalNode.getElementParameters();
+                    generateComponentSchemaInfo(externalNode, componentElement);
+                    generateComponentElementParamInfo(parametersElement, elementParameterList);
+                }
                 URL fileURL = componentDocumentation.getHTMLFile();
                 if (fileURL != null) {
                     this.externalNodeHTMLMap.put(componentName, fileURL);
+                    if (isSCDComponent) {
+                        // add extra check and uncheck icon for SCDComponent
+                        File picPath = new File(
+                                HTMLDocUtils.getTmpFolder() + File.separatorChar + IHTMLDocConstants.PICTUREFOLDERPATH);
+                        if (picPath.exists()) {
+                            for (File f : picPath.listFiles()) {
+                                if (!picFilePathMap.containsKey(f.getName())) {
+                                    picFilePathMap.put(f.getName(), f.getAbsolutePath());
+                                }
+                            }
+                        }
+                    }
                 }
             }
             componentElement.addComment(componentName);

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/metadata/command/RepositoryChangeMetadataForSAPBapi.java

@@ -124,7 +124,10 @@ public class RepositoryChangeMetadataForSAPBapi extends Command {
                         if (properties != null) {
                             properties.put(ISINPUT, TRUE);
                         }
-                        createNewSchema(paramValues, ConvertionHelper.convert(table), MetadataSchemaType.INPUT.name());
+                        IMetadataTable convertTable = ConvertionHelper.convert(table);
+                        // escape "-"
+                        convertTable.setLabel(MetadataToolHelper.validateValue(convertTable.getLabel()));
+                        createNewSchema(paramValues, convertTable, MetadataSchemaType.INPUT.name());
                     }
                 }
             }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/token/TokenInforUtil.java

@@ -134,7 +134,7 @@ public final class TokenInforUtil {
                     targetArray = new JSONArray();
                     Map<String,List<JSONObject>> objectMap = new HashMap<String,List<JSONObject>>();
                     for (Object obj : data) {
-                        if((obj instanceof JSONObject) && ((JSONObject)obj).get("component_name")!=null){//$NON-NLS-1$
+                        if((obj instanceof JSONObject) && ((JSONObject)obj).has("component_name") && ((JSONObject)obj).get("component_name")!=null){//$NON-NLS-1$
                             List<JSONObject> dataList = new ArrayList<JSONObject>();
                             String componentName = (String) ((JSONObject)obj).get("component_name");//$NON-NLS-1$
                             if(objectMap.containsKey(componentName)){

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

@@ -317,3 +317,4 @@ ActionBarBuildHelper.SaveAll_toolTip=Save All
 ContextOrderProperty.BuiltInComment=Built-in context variables
 ContextOrderProperty.RepositoryComment=Context variables from repository context:
 BaseComponentInstallerTask.installComponent=Installing component {0}
+ApplicationWorkbenchWindowAdvisor.repositoryConnection=Connection

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

@@ -317,3 +317,4 @@ ActionBarBuildHelper.SaveAll_toolTip=Sauvegarder tout
 ContextOrderProperty.BuiltInComment=Variables de contexte built-in
 ContextOrderProperty.RepositoryComment=Variables de contexte du contexte du r\u00E9f\u00E9rentiel :
 BaseComponentInstallerTask.installComponent=Installation du composant {0}
+ApplicationWorkbenchWindowAdvisor.repositoryConnection=Connexion

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

@@ -317,3 +317,4 @@ ActionBarBuildHelper.SaveAll_toolTip=\u3059\u3079\u3066\u4FDD\u5B58
 ContextOrderProperty.BuiltInComment=\u7D44\u307F\u8FBC\u307F\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u5909\u6570
 ContextOrderProperty.RepositoryComment=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u304B\u3089\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u5909\u6570:
 BaseComponentInstallerTask.installComponent=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8{0}\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u4E2D
+ApplicationWorkbenchWindowAdvisor.repositoryConnection=\u63A5\u7D9A

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

@@ -317,3 +317,4 @@ ActionBarBuildHelper.SaveAll_toolTip=\u4FDD\u5B58\u5168\u90E8
 ContextOrderProperty.BuiltInComment=\u5185\u7F6E\u4E0A\u4E0B\u6587\u53D8\u91CF
 ContextOrderProperty.RepositoryComment=\u6765\u81EA\u5B58\u50A8\u5E93\u4E0A\u4E0B\u6587\u7684\u4E0A\u4E0B\u6587\u53D8\u91CF\uFF1A
 BaseComponentInstallerTask.installComponent=\u6B63\u5728\u5B89\u88C5\u7EC4\u4EF6 {0}
+ApplicationWorkbenchWindowAdvisor.repositoryConnection=\u8FDE\u63A5

main/plugins/org.talend.core/src/main/java/org/talend/core/model/param/ERepositoryCategoryType.java

@@ -30,6 +30,7 @@ public enum ERepositoryCategoryType {
     DATABASE,
     SAP,
     SAPIDOC,
+    BIGQUERY,
     EBCDIC,
     HL7,
     FTP,

main/plugins/org.talend.core/src/main/java/org/talend/core/model/runprocess/shadow/ObjectElementParameter.java

@@ -47,6 +47,8 @@ public class ObjectElementParameter implements IElementParameter {
 
     private boolean enable = true;
 
+    private String originEncryptedValue;
+
     /**
      * Constructs a new TextElementParameter.
      */
@@ -1052,4 +1054,15 @@ public class ObjectElementParameter implements IElementParameter {
         // TODO Auto-generated method stub
         return false;
     }
+    
+    @Override
+    public String getOrignEncryptedValue() {
+        return originEncryptedValue;
+    }
+
+    @Override
+    public void setOrignEncryptedValue(String value) {
+        this.originEncryptedValue = value;
+        
+    }
 }

main/plugins/org.talend.core/src/main/java/org/talend/core/model/utils/TalendWorkbenchUtil.java

@@ -0,0 +1,86 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2023 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.utils;
+
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.talend.commons.exception.PersistenceException;
+import org.talend.commons.utils.VersionUtils;
+import org.talend.core.CorePlugin;
+import org.talend.core.GlobalServiceRegister;
+import org.talend.core.context.Context;
+import org.talend.core.context.RepositoryContext;
+import org.talend.core.i18n.Messages;
+import org.talend.core.model.general.Project;
+import org.talend.core.repository.model.ProxyRepositoryFactory;
+import org.talend.core.service.IRemoteService;
+import org.talend.core.service.IStudioLiteP2Service;
+import org.talend.core.ui.IInstalledPatchService;
+import org.talend.core.ui.branding.IBrandingService;
+import org.talend.repository.ui.login.connections.ConnectionUserPerReader;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class TalendWorkbenchUtil {
+
+    public static final String MANAGED_BY_ADMIN = " Managed by administrator"; //$NON-NLS-1$
+
+    public static String getWorkbenchWindowTitle() {
+        String title = "";
+        RepositoryContext repositoryContext = (RepositoryContext) CorePlugin.getContext()
+                .getProperty(Context.REPOSITORY_CONTEXT_KEY);
+        Project project = repositoryContext.getProject();
+        String appName = IBrandingService.get().getFullProductName();
+        // TDI-18644
+        ProxyRepositoryFactory factory = ProxyRepositoryFactory.getInstance();
+        boolean localProvider = false;
+        try {
+            localProvider = factory.isLocalConnectionProvider();
+        } catch (PersistenceException e) {
+            localProvider = true;
+        }
+
+        String buildIdField = " (" + VersionUtils.getVersion() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(IInstalledPatchService.class)) {
+            IInstalledPatchService pachService = (IInstalledPatchService) GlobalServiceRegister.getDefault()
+                    .getService(IInstalledPatchService.class);
+            if (pachService != null) {
+                String patchVersion = pachService.getLatestInstalledVersion(true);
+                if (patchVersion != null) {
+                    buildIdField = " (" + patchVersion + ")"; //$NON-NLS-1$ //$NON-NLS-2$ ;
+                    if (IRemoteService.get() != null && IRemoteService.get().isCloudConnection()) {
+                        IStudioLiteP2Service liteP2Service = IStudioLiteP2Service.get();
+                        if (liteP2Service != null && liteP2Service.isUpdateManagedByTmc(new NullProgressMonitor())) {
+                            buildIdField += MANAGED_BY_ADMIN;
+                        }
+                    }
+                }
+            }
+        }
+
+        if (TalendPropertiesUtil.isHideBuildNumber()) {
+            buildIdField = ""; //$NON-NLS-1$
+        }
+        if (localProvider) {
+            title = appName + buildIdField + " | " + project.getLabel() + " (" //$NON-NLS-1$ //$NON-NLS-2$
+                    + Messages.getString("ApplicationWorkbenchWindowAdvisor.repositoryConnection") + ": " //$NON-NLS-1$ //$NON-NLS-2$
+                    + ConnectionUserPerReader.getInstance().readLastConncetion() + ")"; //$NON-NLS-1$
+        } else {
+            title = appName + buildIdField + " | " + repositoryContext.getUser() + " | " + project.getLabel() + " (" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                    + Messages.getString("ApplicationWorkbenchWindowAdvisor.repositoryConnection") + ": " //$NON-NLS-1$ //$NON-NLS-2$
+                    + ConnectionUserPerReader.getInstance().readLastConncetion() + ")"; //$NON-NLS-1$
+        }
+        return title;
+    }
+
+}

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

@@ -95,4 +95,6 @@ public interface IGITProviderService extends IService {
         }
         return register.getService(IGITProviderService.class);
     }
+
+    public void clearOldStorage(IProgressMonitor monitor, Project project) throws PersistenceException;
 }

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

@@ -1076,6 +1076,21 @@ public class ProcessorUtilities {
             }
             progressMonitor.subTask(Messages.getString("ProcessorUtilities.loadingJob") + currentJobName); //$NON-NLS-1$
 
+            //APPINT-35554 correct build type for child job of Route
+            JobInfo parentJobInfo = jobInfo.getFatherJobInfo();
+            if (selectedProcessItem != null && parentJobInfo != null 
+            		&& parentJobInfo.getProcessor() != null && parentJobInfo.getProcessor().getProperty() != null ) {
+            	Property childProperty = selectedProcessItem.getProperty();
+                String childBuildType = (String)childProperty.getAdditionalProperties().get(TalendProcessArgumentConstant.ARG_BUILD_TYPE);
+                if (childBuildType == null) {
+                    Property parentProperty = parentJobInfo.getProcessor().getProperty();
+                    String parentBuildType = (String)parentProperty.getAdditionalProperties().get(TalendProcessArgumentConstant.ARG_BUILD_TYPE);
+                    if ("ROUTE".equalsIgnoreCase(parentBuildType)) {
+                    	childProperty.getAdditionalProperties().put(TalendProcessArgumentConstant.ARG_BUILD_TYPE, "OSGI");
+                    }
+                }
+            }
+            
             if (jobInfo.getProcess() == null) {
                 if (selectedProcessItem != null) {
                     IDesignerCoreService service = CorePlugin.getDefault().getDesignerCoreService();

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

@@ -553,7 +553,7 @@ _UI_Column_length_feature=Longueur
 _UI_Column_collationName_feature=Nom de l'interclassement
 _UI_Column_characterSetName_feature=Nom du jeu de caract\u00E8res
 _UI_Column_referencedTableType_feature=Type de la table r\u00E9f\u00E9renc\u00E9e
-_UI_Column_optionScopeColumnSet_feature=Scope des options sur le jeu de colonnes
+_UI_Column_optionScopeColumnSet_feature=P\u00E9rim\u00E8tre des options sur le jeu de colonnes
 _UI_Procedure_type_feature=Type
 _UI_Trigger_eventManipulation_feature=Manipulation d'\u00E9v\u00E9nement
 _UI_Trigger_actionCondition_feature=Condition d'action

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

@@ -22,7 +22,7 @@ _UI_Dependency_type=\u4F9D\u5B58\u9805\u76EE
 _UI_Expression_type=\u5F0F
 _UI_BooleanExpression_type=\u30D6\u30FC\u30EB\u5024\u306E\u5F0F
 _UI_ProcedureExpression_type=\u30D7\u30ED\u30B7\u30FC\u30B8\u30E3\u30FC\u30A8\u30AF\u30B9\u30D7\u30EC\u30C3\u30B7\u30E7\u30F3
-_UI_Multiplicity_type=\u591A\u69D8\u6027
+_UI_Multiplicity_type=\u591A\u91CD\u5EA6
 _UI_MultiplicityRange_type=\u591A\u69D8\u6027\u30EC\u30F3\u30B8
 _UI_Stereotype_type=\u30B9\u30C6\u30EC\u30AA\u30BF\u30A4\u30D7
 _UI_TaggedValue_type=\u30BF\u30B0\u4ED8\u3051\u3055\u308C\u305F\u5024
@@ -151,7 +151,7 @@ _UI_ApplicationInputSpecification_type=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E
 _UI_AttributeUsageRelation_type=\u5C5E\u6027\u7528\u6CD5\u95A2\u4FC2
 _UI_Category_type=\u30AB\u30C6\u30B4\u30EA\u30FC
 _UI_CategoryHierarchy_type=\u30AB\u30C6\u30B4\u30EA\u30FC\u968E\u5C64
-_UI_CostMatrix_type=\u30B3\u30B9\u30C8\u30DE\u30C8\u30EA\u30C3\u30AF\u30B9
+_UI_CostMatrix_type=\u30B3\u30B9\u30C8\u30DE\u30C8\u30EA\u30AF\u30B9
 _UI_MiningAttribute_type=\u30DE\u30A4\u30CB\u30F3\u30B0\u5C5E\u6027
 _UI_MiningDataSpecification_type=\u30DE\u30A4\u30CB\u30F3\u30B0\u30C7\u30FC\u30BF\u4ED5\u69D8
 _UI_MiningModel_type=\u30DE\u30A4\u30CB\u30F3\u30B0\u30E2\u30C7\u30EB
@@ -207,7 +207,7 @@ _UI_ForeignKey_type=\u5916\u90E8\u30AD\u30FC
 _UI_Domain_type=\u30C9\u30E1\u30A4\u30F3
 _UI_Attribute_type=\u5C5E\u6027
 _UI_Relationship_type=\u95A2\u4FC2
-_UI_RelationshipEnd_type=\u95A2\u4FC2\u7D42\u4E86
+_UI_RelationshipEnd_type=\u30EA\u30EC\u30FC\u30B7\u30E7\u30F3\u30B7\u30C3\u30D7\u30A8\u30F3\u30C9
 _UI_ModelLibrary_type=\u30E2\u30C7\u30EB\u30E9\u30A4\u30D6\u30E9\u30EA\u30FC
 _UI_SubjectArea_type=\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\u30A8\u30EA\u30A2
 _UI_COBOLFD_type=COBOLFD
@@ -367,7 +367,7 @@ _UI_Feature_featureNode_feature=\u6A5F\u80FD\u30CE\u30FC\u30C9
 _UI_Feature_featureMap_feature=\u6A5F\u80FD\u30DE\u30C3\u30D7
 _UI_Feature_cfMap_feature=Cf\u30DE\u30C3\u30D7
 _UI_StructuralFeature_changeability_feature=\u53EF\u5909\u6027
-_UI_StructuralFeature_multiplicity_feature=\u591A\u69D8\u6027
+_UI_StructuralFeature_multiplicity_feature=\u591A\u91CD\u5EA6
 _UI_StructuralFeature_ordering_feature=\u9806\u5E8F\u4ED8\u3051
 _UI_StructuralFeature_targetScope_feature=\u30BF\u30FC\u30B2\u30C3\u30C8\u30B9\u30B3\u30FC\u30D7
 _UI_StructuralFeature_type_feature=\u30BF\u30A4\u30D7
@@ -390,7 +390,7 @@ _UI_Expression_language_feature=\u8A00\u8A9E
 _UI_Multiplicity_range_feature=\u7BC4\u56F2
 _UI_MultiplicityRange_lower_feature=\u4E0B\u65B9
 _UI_MultiplicityRange_upper_feature=\u4E0A\u65B9
-_UI_MultiplicityRange_multiplicity_feature=\u591A\u69D8\u6027
+_UI_MultiplicityRange_multiplicity_feature=\u591A\u91CD\u5EA6
 _UI_Stereotype_baseClass_feature=\u30D9\u30FC\u30B9\u30AF\u30E9\u30B9
 _UI_Stereotype_stereotypeConstraint_feature=\u30B9\u30C6\u30EC\u30AA\u30BF\u30A4\u30D7\u5236\u7D04
 _UI_Stereotype_extendedElement_feature=\u62E1\u5F35\u3055\u308C\u305F\u30A8\u30EC\u30E1\u30F3\u30C8
@@ -418,7 +418,7 @@ _UI_Parameter_behavioralFeature_feature=\u52D5\u4F5C\u6A5F\u80FD
 _UI_Parameter_event_feature=\u30A4\u30D9\u30F3\u30C8
 _UI_Parameter_type_feature=\u30BF\u30A4\u30D7
 _UI_AssociationEnd_aggregation_feature=\u96C6\u7D04
-_UI_AssociationEnd_isNavigable_feature=Navigable\u3067\u3042\u308B
+_UI_AssociationEnd_isNavigable_feature=\u8A98\u5C0E\u53EF\u80FD\u3067\u3042\u308B
 _UI_Generalization_child_feature=\u5B50
 _UI_Generalization_parent_feature=\u89AA
 _UI_Instance_valueSlot_feature=\u5024\u30BB\u30C3\u30C8
@@ -552,7 +552,7 @@ _UI_Column_isNullable_feature=NULL\u53EF\u80FD
 _UI_Column_length_feature=\u9577\u3055
 _UI_Column_collationName_feature=\u7167\u5408\u540D
 _UI_Column_characterSetName_feature=\u6587\u5B57\u30BB\u30C3\u30C8\u540D
-_UI_Column_referencedTableType_feature=\u53C2\u7167\u3055\u308C\u308B\u30C6\u30FC\u30D6\u30EB\u30BF\u30A4\u30D7
+_UI_Column_referencedTableType_feature=\u53C2\u7167\u30C6\u30FC\u30D6\u30EB\u30BF\u30A4\u30D7
 _UI_Column_optionScopeColumnSet_feature=\u30AA\u30D7\u30B7\u30E7\u30F3\u30B9\u30B3\u30FC\u30D7\u30AB\u30E9\u30E0\u30BB\u30C3\u30C8
 _UI_Procedure_type_feature=\u30BF\u30A4\u30D7
 _UI_Trigger_eventManipulation_feature=\u30A4\u30D9\u30F3\u30C8\u64CD\u4F5C
@@ -743,7 +743,7 @@ _UI_ClusteringSettings_clusterIdAttributeName_feature=\u30AF\u30E9\u30B9\u30BF\u
 _UI_SupervisedMiningSettings_confidenceAttributeName_feature=\u4FE1\u7528\u5C5E\u6027\u540D
 _UI_SupervisedMiningSettings_predictedAttributeName_feature=\u4E88\u6E2C\u3055\u308C\u308B\u5C5E\u6027\u540D
 _UI_SupervisedMiningSettings_costFunction_feature=\u30B3\u30B9\u30C8\u95A2\u6570
-_UI_ClassificationSettings_costMatrix_feature=\u30B3\u30B9\u30C8\u30DE\u30C8\u30EA\u30C3\u30AF\u30B9
+_UI_ClassificationSettings_costMatrix_feature=\u30B3\u30B9\u30C8\u30DE\u30C8\u30EA\u30AF\u30B9
 _UI_AssociationRulesSettings_minimumSupport_feature=\u6700\u5C0F\u30B5\u30DD\u30FC\u30C8
 _UI_AssociationRulesSettings_minimumConfidence_feature=\u6700\u5C0F\u306E\u4FE1\u7528
 _UI_AssociationRulesSettings_itemId_feature=\u30A2\u30A4\u30C6\u30E0ID
@@ -840,7 +840,7 @@ _UI_ActivityExecution_stepExecution_feature=\u30B9\u30C6\u30C3\u30D7\u5B9F\u884C
 _UI_StepExecution_transformationStep_feature=\u5909\u63DB\u30B9\u30C6\u30C3\u30D7
 _UI_StepExecution_activityExecution_feature=\u30A2\u30AF\u30C6\u30A3\u30D3\u30C6\u30A3\u5B9F\u884C
 _UI_StepExecution_callAction_feature=\u547C\u3073\u51FA\u3057\u30A2\u30AF\u30B7\u30E7\u30F3
-_UI_ForeignKey_relationshipEnd_feature=\u95A2\u4FC2\u7D42\u4E86
+_UI_ForeignKey_relationshipEnd_feature=\u30EA\u30EC\u30FC\u30B7\u30E7\u30F3\u30B7\u30C3\u30D7\u30A8\u30F3\u30C9
 _UI_Domain_default_feature=\u30C7\u30D5\u30A9\u30EB\u30C8
 _UI_Domain_validationRule_feature=\u691C\u8A3C\u30EB\u30FC\u30EB
 _UI_Domain_baseType_feature=\u30D9\u30FC\u30B9\u30BF\u30A4\u30D7

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

@@ -184,10 +184,10 @@ _UI_RecordEditor_label = \u30EC\u30B3\u30FC\u30C9\u30E2\u30C7\u30EB\u30A8\u30C7\
 _UI_RecordEditorFilenameDefaultBase = My
 _UI_RecordEditorFilenameExtension = \u30EC\u30B3\u30FC\u30C9
 
-_UI_MultidimensionalModelWizard_label = \u591A\u6B21\u5143\u7684\u30E2\u30C7\u30EB
-_UI_MultidimensionalModelWizard_description = \u65B0\u898F\u306E\u591A\u6B21\u5143\u7684\u30E2\u30C7\u30EB\u3092\u4F5C\u6210
+_UI_MultidimensionalModelWizard_label = \u591A\u6B21\u5143\u30E2\u30C7\u30EB
+_UI_MultidimensionalModelWizard_description = \u65B0\u898F\u306E\u591A\u6B21\u5143\u30E2\u30C7\u30EB\u3092\u4F5C\u6210
 
-_UI_MultidimensionalEditor_label = \u591A\u6B21\u5143\u7684\u30E2\u30C7\u30EB\u30A8\u30C7\u30A3\u30BF
+_UI_MultidimensionalEditor_label = \u591A\u6B21\u5143\u30E2\u30C7\u30EB\u30A8\u30C7\u30A3\u30BF\u30FC
 
 _UI_MultidimensionalEditorFilenameDefaultBase = My
 _UI_MultidimensionalEditorFilenameExtension = \u591A\u6B21\u5143\u7684

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

@@ -15,12 +15,12 @@
 		<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.19</johnzon.version>
+		<johnzon.version>1.2.20</johnzon.version>
 		<meecrowave.version>1.2.15</meecrowave.version>
 		<microprofile.version>1.2.1</microprofile.version>
 		<owb.version>2.0.27</owb.version>
 		<slf4j.version>1.7.34</slf4j.version>
-		<tomcat.version>9.0.73</tomcat.version>
+		<tomcat.version>9.0.75</tomcat.version>
 		<xbean.version>4.20</xbean.version>
 		<reload4j.version>1.2.22</reload4j.version>
 		<log4j2.version>2.20.0</log4j2.version>

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

@@ -17,7 +17,7 @@
 		<talend_releases>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</talend_releases>
 		<talend_snapshots_ee>https://artifacts-zl.talend.com/nexus/content/repositories/snapshots/</talend_snapshots_ee>
 		<talend_releases_ee>https://artifacts-zl.talend.com/nexus/content/repositories/releases/</talend_releases_ee>
-        <tycho.buildtimestamp.format>${timestamp}</tycho.buildtimestamp.format>
+        <tycho.buildtimestamp.format>${timestamp}</tycho.buildtimestamp.format>
 	</properties>
 	<repositories>
 		<repository>
@@ -72,15 +72,15 @@
 			<dependency>
 				<groupId>org.json</groupId>
 				<artifactId>json</artifactId>
-				<version>20140107</version>
+				<version>20230227</version>
 			</dependency>
 			<dependency>
 				<groupId>com.fasterxml.jackson.dataformat</groupId>
 				<artifactId>jackson-dataformat-cbor</artifactId>
 				<version>${m2.fasterxml.jackson.version}</version>
 			</dependency>
-			<!-- It fixes provided dependency scope to compile, because maven-dependency-plugin is setup to include
-				 only compile and runtime scopes, but provided is also required. It's not possible to setup plugin to
+			<!-- It fixes provided dependency scope to compile, because maven-dependency-plugin is setup to include
+				 only compile and runtime scopes, but provided is also required. It's not possible to setup plugin to
 				 include all: compile, runtime and provided dependencies -->
 			<dependency>
 				<groupId>biz.aQute.bnd</groupId>
@@ -99,7 +99,7 @@
 	</dependencyManagement>
 
 	<dependencies>
-		<!-- Dependencies in provided scope should be explicitly added as dependency in this module,
+		<!-- Dependencies in provided scope should be explicitly added as dependency in this module,
 				because provided scope is not transitive -->
 		<dependency>
 			<groupId>org.osgi</groupId>

main/plugins/org.talend.designer.maven.tos/resources/build/plugins/karaf-maven-plugin-4-2-10/pom.xml

@@ -52,8 +52,17 @@
 					<groupId>org.jsoup</groupId>
 					<artifactId>jsoup</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.apache.velocity</groupId>
+					<artifactId>velocity</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.velocity</groupId>
+			<artifactId>velocity-engine-core</artifactId>
+			<version>2.3</version>
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>
@@ -67,13 +76,18 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-framework-bom</artifactId>
-			<version>5.2.7.RELEASE</version>
+			<version>5.2.9.RELEASE</version>
 			<type>pom</type>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.plexus</groupId>
 			<artifactId>plexus-archiver</artifactId>
-			<version>3.6.0</version>
+			<version>4.8.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.plexus</groupId>
+			<artifactId>plexus-xml</artifactId>
+			<version>4.0.0</version>
 		</dependency>
 		<dependency>
 		    <groupId>org.codehaus.plexus</groupId>

main/plugins/org.talend.designer.maven.tos/resources/build/plugins/maven-bundle-plugin-5-1-1/pom.xml

@@ -59,8 +59,17 @@
 					<groupId>org.apache.commons</groupId>
 					<artifactId>commons-compress</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.apache.velocity</groupId>
+					<artifactId>velocity</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.velocity</groupId>
+			<artifactId>velocity-engine-core</artifactId>
+			<version>2.3</version>
+		</dependency>
 		<dependency>
 			<groupId>org.codehaus.plexus</groupId>
 			<artifactId>plexus-utils</artifactId>
@@ -99,7 +108,7 @@
 		<dependency>
 		    <groupId>com.thoughtworks.xstream</groupId>
 		    <artifactId>xstream</artifactId>
-		    <version>1.4.16</version>
+		    <version>1.4.20</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.maven</groupId>

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

@@ -13,7 +13,7 @@
 	 	<dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
-            <version>3.8.6</version>
+            <version>3.8.8</version>
         </dependency>
 		<dependency>
 			<groupId>org.eclipse.tycho</groupId>

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

@@ -32,7 +32,7 @@
 		<dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
-            <version>3.8.6</version>
+            <version>3.8.8</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-io</groupId>
@@ -123,7 +123,7 @@
 		<dependency>
 			<groupId>org.apache.maven</groupId>
 			<artifactId>maven-compat</artifactId>
-			<version>3.8.6</version>
+			<version>3.8.8</version>
 		</dependency>
 		<dependency>
             <groupId>commons-codec</groupId>
@@ -133,7 +133,7 @@
 		<dependency>
 			<groupId>org.apache.maven.plugins</groupId>
 			<artifactId>maven-surefire-plugin</artifactId>
-			<version>2.20</version>
+			<version>2.22.2</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.sonatype.plexus</groupId>
@@ -141,6 +141,21 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+        <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-booter</artifactId>
+            <version>2.22.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-api</artifactId>
+            <version>2.22.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-junit4</artifactId>
+            <version>2.22.2</version>
+        </dependency>
 		<dependency>
 			<groupId>org.codehaus.plexus</groupId>
 			<artifactId>plexus-cipher</artifactId>

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

@@ -42,7 +42,7 @@
 			<dependency>
                 <groupId>org.json</groupId>
                 <artifactId>json</artifactId>
-                <version>20140107</version>
+                <version>20230227</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.dataformat</groupId>

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

@@ -28,7 +28,7 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
-			<version>4.2.6</version>
+			<version>4.5.13</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.tycho</groupId>

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

@@ -11,7 +11,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <tcomp.version>1.55.2</tcomp.version>
+        <tcomp.version>1.59.0</tcomp.version>
         <slf4j.version>1.7.34</slf4j.version>
         <reload4j.version>1.2.22</reload4j.version>
     </properties>

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

@@ -220,7 +220,7 @@
 		<dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-configuration2</artifactId>
-            <version>2.8.0</version>
+            <version>2.9.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

main/plugins/org.talend.designer.maven/META-INF/MANIFEST.MF

@@ -37,3 +37,4 @@ Export-Package: org.talend.designer.maven,
  org.talend.designer.maven.tools.extension,
  org.talend.designer.maven.utils
 Import-Package: org.slf4j
+

main/plugins/org.talend.designer.maven/plugin.xml

@@ -26,5 +26,4 @@
             serviceId="IDesignerMavenService">
       </Service>
    </extension>
-
 </plugin>

main/plugins/org.talend.designer.maven/resources/templates/general/pom_project_template.xml

@@ -44,7 +44,12 @@
 						<dependency>
 							<groupId>org.codehaus.plexus</groupId>
 							<artifactId>plexus-utils</artifactId>
-							<version>3.0.24</version>
+							<version>4.0.0</version>
+						</dependency>
+						<dependency>
+							<groupId>org.codehaus.plexus</groupId>
+							<artifactId>plexus-xml</artifactId>
+							<version>4.0.0</version>
 						</dependency>
 						<dependency>
 							<groupId>commons-io</groupId>
@@ -54,12 +59,12 @@
 						<dependency>
 							<groupId>org.codehaus.plexus</groupId>
 							<artifactId>plexus-archiver</artifactId>
-							<version>3.6.0</version>
+							<version>4.8.0</version>
 						</dependency>
 						<dependency>
 							<groupId>org.apache.maven</groupId>
 							<artifactId>maven-compat</artifactId>
-							<version>3.8.6</version>
+							<version>3.8.8</version>
 						</dependency>
 						<dependency>
 							<groupId>org.apache.commons</groupId>
@@ -69,12 +74,12 @@
 						<dependency>
 							<groupId>org.apache.maven</groupId>
 							<artifactId>maven-core</artifactId>
-							<version>3.8.6</version>
+							<version>3.8.8</version>
 						</dependency>
 						<dependency>
 							<groupId>com.google.guava</groupId>
 							<artifactId>guava</artifactId>
-							<version>30.0-jre</version>
+							<version>32.0.1-jre</version>
 						</dependency>
 					</dependencies>
 				</plugin>
@@ -101,12 +106,12 @@
 						<dependency>
 							<groupId>org.apache.maven</groupId>
 							<artifactId>maven-core</artifactId>
-							<version>3.8.6</version>
+							<version>3.8.8</version>
 						</dependency>
 						<dependency>
 							<groupId>com.google.guava</groupId>
 							<artifactId>guava</artifactId>
-							<version>30.0-jre</version>
+							<version>32.0.1-jre</version>
 						</dependency>
 					</dependencies>
 				</plugin>
@@ -123,7 +128,12 @@
 						<dependency>
 							<groupId>org.codehaus.plexus</groupId>
 							<artifactId>plexus-utils</artifactId>
-							<version>3.0.24</version>
+							<version>4.0.0</version>
+						</dependency>
+						<dependency>
+							<groupId>org.codehaus.plexus</groupId>
+							<artifactId>plexus-xml</artifactId>
+							<version>4.0.0</version>
 						</dependency>
 						<dependency>
 							<groupId>org.apache.commons</groupId>
@@ -138,22 +148,22 @@
 						<dependency>
 							<groupId>org.codehaus.plexus</groupId>
 							<artifactId>plexus-archiver</artifactId>
-							<version>3.6.0</version>
+							<version>4.8.0</version>
 						</dependency>
 						<dependency>
 							<groupId>org.codehaus.plexus</groupId>
 							<artifactId>plexus-io</artifactId>
-							<version>3.0.1</version>
+							<version>3.4.1</version>
 						</dependency>
 						<dependency>
 							<groupId>org.apache.maven</groupId>
 							<artifactId>maven-core</artifactId>
-							<version>3.8.6</version>
+							<version>3.8.8</version>
 						</dependency>
 						<dependency>
 							<groupId>com.google.guava</groupId>
 							<artifactId>guava</artifactId>
-							<version>30.0-jre</version>
+							<version>32.0.1-jre</version>
 						</dependency>
 					</dependencies>
 					<configuration>
@@ -165,7 +175,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-assembly-plugin</artifactId>
-					<version>3.0.0</version>
+					<version>3.6.0</version>
 					<dependencies>
 						<dependency>
 							<groupId>org.apache.maven.shared</groupId>
@@ -175,7 +185,17 @@
 						<dependency>
 							<groupId>org.codehaus.plexus</groupId>
 							<artifactId>plexus-utils</artifactId>
-							<version>3.0.24</version>
+							<version>4.0.0</version>
+						</dependency>
+						<dependency>
+							<groupId>org.codehaus.plexus</groupId>
+							<artifactId>plexus-io</artifactId>
+							<version>3.4.1</version>
+						</dependency>
+						<dependency>
+							<groupId>org.codehaus.plexus</groupId>
+							<artifactId>plexus-xml</artifactId>
+							<version>4.0.0</version>
 						</dependency>
 						<dependency>
 							<groupId>commons-codec</groupId>
@@ -195,29 +215,29 @@
 						<dependency>
 							<groupId>org.codehaus.plexus</groupId>
 							<artifactId>plexus-archiver</artifactId>
-							<version>3.6.0</version>
+							<version>4.8.0</version>
 						</dependency>
 						<dependency>
 							<groupId>org.apache.maven</groupId>
 							<artifactId>maven-compat</artifactId>
-							<version>3.8.6</version>
+							<version>3.8.8</version>
 						</dependency>
 						<dependency>
 							<groupId>org.apache.maven</groupId>
 							<artifactId>maven-core</artifactId>
-							<version>3.8.6</version>
+							<version>3.8.8</version>
 						</dependency>
 						<dependency>
 							<groupId>com.google.guava</groupId>
 							<artifactId>guava</artifactId>
-							<version>30.0-jre</version>
+							<version>32.0.1-jre</version>
 						</dependency>
 					</dependencies>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.20</version>
+					<version>2.22.2</version>
 					<dependencies>
 						<dependency>
 							<groupId>org.sonatype.plexus</groupId>

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

@@ -216,7 +216,7 @@ public abstract class AbstractMavenProcessorPom extends CreateMavenBundleTemplat
                 Dependency guavaDep = new Dependency();
                 guavaDep.setGroupId("com.google.guava");
                 guavaDep.setArtifactId("guava");
-                guavaDep.setVersion("30.0-jre");
+                guavaDep.setVersion("32.0.1-jre");
                 
                 Dependency ioDep = new Dependency();
                 ioDep.setGroupId("commons-io");
@@ -231,7 +231,7 @@ public abstract class AbstractMavenProcessorPom extends CreateMavenBundleTemplat
                 Dependency mavenCoreDep = new Dependency();
                 mavenCoreDep.setGroupId("org.apache.maven");
                 mavenCoreDep.setArtifactId("maven-core");
-                mavenCoreDep.setVersion("3.8.6");
+                mavenCoreDep.setVersion("3.8.8");
                 
                 shade.getDependencies().add(guavaDep);
                 shade.getDependencies().add(codecDep);