Test: bump component-runtime to 1.60.0

Co-authored-by: build-talend-doc <build-talend-doc@talend.com>

main/features/org.talend.utils.feature/feature.xml

@@ -16,7 +16,7 @@
     <import plugin="org.apache.commons.lang" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.apache.commons.lang3" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.apache.log4j" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.apache.servicemix.bundles.avro" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="avro" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.junit" version="4.13.2" match="greaterOrEqual"/>
     <import plugin="org.slf4j.api" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.slf4j.binding.log4j12" version="0.0.0" match="greaterOrEqual"/>

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

@@ -11,7 +11,9 @@ Require-Bundle: org.eclipse.core.runtime,
  org.talend.libraries.apache,
  org.talend.commons.runtime,
  org.talend.libraries.ui,
- org.apache.ant
+ org.apache.ant,
+ org.eclipse.jface,
+ org.apache.commons.lang3
 Export-Package: 
  org.talend.commons.ui.runtime,
  org.talend.commons.ui.runtime.custom,
@@ -35,7 +37,8 @@ Export-Package:
  org.talend.commons.ui.runtime.update,
  org.talend.commons.ui.runtime.utils,
  org.talend.commons.ui.runtime.ws
-Import-Package: org.eclipse.jface.bindings.keys,
+Import-Package: org.eclipse.gef.commands,
+ org.eclipse.jface.bindings.keys,
  org.eclipse.jface.dialogs,
  org.eclipse.jface.fieldassist,
  org.eclipse.jface.resource,

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

@@ -63,7 +63,7 @@ public class TalendUI {
      * should try to refactor them to different fragment
      */
     @Deprecated
-    public <T extends IBusinessHandler<?>> T run(IStudioRunnable<T> studioRun, ICustomUI<T> stigmaRun) {
+    public <T extends IBusinessHandler> T run(IStudioRunnable<T> studioRun, ICustomUI<T> stigmaRun) {
         if (isStudio()) {
             return run(studioRun);
         } else {
@@ -75,11 +75,11 @@ public class TalendUI {
      * should try to refactor them to different fragment
      */
     @Deprecated
-    public <T extends IBusinessHandler<?>> T run(IStudioRunnable<T> run) {
+    public <T extends IBusinessHandler> T run(IStudioRunnable<T> run) {
         return run.run();
     }
 
-    public <T extends IBusinessHandler<?>> T run(ICustomUI<T> ui) {
+    public <T extends IBusinessHandler> T run(ICustomUI<T> ui) {
         if (ui == null) {
             throw new RuntimeException("Custom ui is not defined!");
         }
@@ -87,14 +87,14 @@ public class TalendUI {
     }
 
     @Deprecated
-    public static interface IStudioRunnable<T extends IBusinessHandler<?>> {
+    public static interface IStudioRunnable<T extends IBusinessHandler> {
 
         T run();
 
     }
 
     @Deprecated
-    public static abstract class AbsStudioRunnable<T extends IBusinessHandler<?>> implements IStudioRunnable<T> {
+    public static abstract class AbsStudioRunnable<T extends IBusinessHandler> implements IStudioRunnable<T> {
 
         @Override
         public T run() {

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/custom/AbsBusinessHandler.java

@@ -17,7 +17,7 @@ import org.eclipse.jface.dialogs.Dialog;
 /**
  * DOC cmeng  class global comment. Detailled comment
  */
-public abstract class AbsBusinessHandler<T extends IBusinessHandler<?>> implements IBusinessHandler<T> {
+public abstract class AbsBusinessHandler implements IBusinessHandler {
 
     private Object openResult = Dialog.CANCEL;
 

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/custom/AbstractCustomUI.java

@@ -12,6 +12,7 @@
 // ============================================================================
 package org.talend.commons.ui.runtime.custom;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
@@ -25,7 +26,17 @@ import org.talend.commons.ui.runtime.TalendUI;
 /**
  * DOC cmeng class global comment. Detailled comment
  */
-public abstract class AbstractCustomUI<T extends IBusinessHandler<?>> implements ICustomUI<T> {
+public abstract class AbstractCustomUI<T extends IBusinessHandler> implements ICustomUI<T> {
+
+    public static final String NONE = "none";
+
+    public static final String UI_OK = "ok";
+
+    public static final String UI_APPLY = "apply";
+
+    public static final String UI_CANCEL = "cancel";
+
+    public static final String UI_CLOSE = "close";
 
     private Semaphore modalLock = new Semaphore(1);
 
@@ -41,6 +52,8 @@ public abstract class AbstractCustomUI<T extends IBusinessHandler<?>> implements
 
     private Map<String, IUIEventHandler> eventMap = new HashMap<>();
 
+    private String selectedButton = NONE;
+
     public AbstractCustomUI(T businessHandler) {
         this.businessHandler = businessHandler;
         this.uiId = UUID.randomUUID().toString();
@@ -76,12 +89,16 @@ public abstract class AbstractCustomUI<T extends IBusinessHandler<?>> implements
         String eventKey = event.getKey();
         boolean closeDialog = false;
         if (BuiltinEvent.ok.name().equals(eventKey)) {
+            setSelectedButton(UI_OK);
             closeDialog = onOk(event);
         } else if (BuiltinEvent.apply.name().equals(eventKey)) {
+            setSelectedButton(UI_APPLY);
             closeDialog = onApply(event);
         } else if (BuiltinEvent.close.name().equals(eventKey)) {
+            setSelectedButton(UI_CLOSE);
             closeDialog = onClose(event);
         } else if (BuiltinEvent.cancel.name().equals(eventKey)) {
+            setSelectedButton(UI_CANCEL);
             closeDialog = onCancel(event);
         } else {
             IUIEventHandler eventListener = eventMap.get(eventKey);
@@ -93,6 +110,16 @@ public abstract class AbstractCustomUI<T extends IBusinessHandler<?>> implements
         }
         if (closeDialog) {
             closeDialog();
+        } else {
+            setSelectedButton(NONE);
+        }
+    }
+
+    protected int getOpenResult() {
+        if (isCancelled()) {
+            return CANCEL;
+        } else {
+            return OK;
         }
     }
 
@@ -200,8 +227,20 @@ public abstract class AbstractCustomUI<T extends IBusinessHandler<?>> implements
     protected void registerEventHandlers() {
     }
 
+    public String getSelectedButton() {
+        return selectedButton;
+    }
+
+    public void setSelectedButton(String selectedButton) {
+        this.selectedButton = selectedButton;
+    }
+
+    public boolean isCancelled() {
+        return Arrays.asList(UI_CANCEL, UI_CLOSE).contains(getSelectedButton());
+    }
+
     protected boolean onOk(IUIEvent event) {
-        return true;
+        return onApply(event);
     }
 
     protected boolean onApply(IUIEvent event) {
@@ -209,7 +248,7 @@ public abstract class AbstractCustomUI<T extends IBusinessHandler<?>> implements
     }
 
     protected boolean onClose(IUIEvent event) {
-        return true;
+        return onCancel(event);
     }
 
     protected boolean onCancel(IUIEvent event) {

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/custom/AbstractCustomUIEngine.java

@@ -37,11 +37,11 @@ public abstract class AbstractCustomUIEngine implements ICustomUIEngine {
     }
 
     @Override
-    public <T extends IBusinessHandler<?>> T run(ICustomUI<T> ui) {
+    public <T extends IBusinessHandler> T run(ICustomUI<T> ui) {
         return doRun(ui);
     }
 
-    protected <T extends IBusinessHandler<?>> T doRun(ICustomUI<T> ui) {
+    protected <T extends IBusinessHandler> T doRun(ICustomUI<T> ui) {
         return ui.run();
     }
 

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/custom/IBusinessHandler.java

@@ -15,11 +15,7 @@ package org.talend.commons.ui.runtime.custom;
 /**
  * DOC cmeng  class global comment. Detailled comment
  */
-public interface IBusinessHandler<T extends IBusinessHandler<?>> {
-
-    public static final int OK = 0;
-
-    public static final int CANCEL = 1;
+public interface IBusinessHandler {
 
     String getUiKey();
 

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/custom/ICommonUIHandler.java

@@ -0,0 +1,100 @@
+// ============================================================================
+//
+// 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.commons.ui.runtime.custom;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public interface ICommonUIHandler extends IUIHandler {
+
+    /**
+     * Constant for no image (value 0).
+     *
+     * @see #MessageDialog(Shell, String, Image, String, int, int, String...)
+     */
+    static final int NONE = 0;
+
+    /**
+     * Constant for the error image, or a simple dialog with the error image and
+     * a single OK button (value 1).
+     *
+     * @see #MessageDialog(Shell, String, Image, String, int, int, String...)
+     * @see #open(int, Shell, String, String, int)
+     */
+    static final int ERROR = 1;
+
+    /**
+     * Constant for the info image, or a simple dialog with the info image and a
+     * single OK button (value 2).
+     *
+     * @see #MessageDialog(Shell, String, Image, String, int, int, String...)
+     * @see #open(int, Shell, String, String, int)
+     */
+    static final int INFORMATION = 2;
+
+    /**
+     * Constant for the question image, or a simple dialog with the question
+     * image and Yes/No buttons (value 3).
+     *
+     * @see #MessageDialog(Shell, String, Image, String, int, int, String...)
+     * @see #open(int, Shell, String, String, int)
+     */
+    static final int QUESTION = 3;
+
+    /**
+     * Constant for the warning image, or a simple dialog with the warning image
+     * and a single OK button (value 4).
+     *
+     * @see #MessageDialog(Shell, String, Image, String, int, int, String...)
+     * @see #open(int, Shell, String, String, int)
+     */
+    static final int WARNING = 4;
+
+    /**
+     * Constant for a simple dialog with the question image and OK/Cancel buttons (value 5).
+     *
+     * @see #open(int, Shell, String, String, int)
+     * @since 3.5
+     */
+    static final int CONFIRM = 5;
+
+    /**
+     * Constant for a simple dialog with the question image and Yes/No/Cancel buttons (value 6).
+     *
+     * @see #open(int, Shell, String, String, int)
+     * @since 3.5
+     */
+    static final int QUESTION_WITH_CANCEL = 6;
+
+    static final String CONTEXT_COMMAND_STACK = "COMMAND_STACK";
+
+    boolean execute(Command cmd);
+
+    boolean openQuestion(String title, String msg);
+
+    boolean openConfirm(String title, String msg);
+
+    void openWarning(String title, String msg);
+
+    MessageDialogWithToggleBusinessHandler openToggle(MessageDialogWithToggleBusinessHandler bh);
+
+    void openError(String title, String msg);
+
+    static ICommonUIHandler get() {
+        return UIHandlerFactories.inst().getUIHandler(ICommonUIHandler.class);
+    }
+
+}

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/custom/ICrossPlatformPreferenceStore.java

@@ -0,0 +1,28 @@
+// ============================================================================
+//
+// 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.commons.ui.runtime.custom;
+
+
+public interface ICrossPlatformPreferenceStore {
+
+    boolean getBoolean(String key);
+
+    boolean getDefaultBoolean(String key);
+
+    void setValue(String key, boolean value);
+
+    void setValue(String key, String value);
+
+    Object getOriginStore();
+
+}

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/custom/ICustomUI.java

@@ -19,7 +19,11 @@ import org.talend.commons.ui.runtime.TalendUI;
 /**
  * DOC cmeng  class global comment. Detailled comment
  */
-public interface ICustomUI<T extends IBusinessHandler<?>> extends IUIEventHandler {
+public interface ICustomUI<T extends IBusinessHandler> extends IUIEventHandler {
+
+    public static final int OK = 0;
+
+    public static final int CANCEL = 1;
 
     String getId();
 

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/custom/ICustomUIEngine.java

@@ -19,7 +19,9 @@ import java.util.concurrent.CompletableFuture;
  */
 public interface ICustomUIEngine {
 
-    <T extends IBusinessHandler<?>> T run(ICustomUI<T> ui);
+    static final String CONTEXT_PROCESS = "PROCESS";
+
+    <T extends IBusinessHandler> T run(ICustomUI<T> ui);
 
     /**
      * Handle event from stigma
@@ -34,12 +36,12 @@ public interface ICustomUIEngine {
     /**
      * Send event to stigma
      */
-    <T extends IBusinessHandler<?>> void dispatchUIEvent(ICustomUI<T> ui, IUIEvent event);
+    <T extends IBusinessHandler> void dispatchUIEvent(ICustomUI<T> ui, IUIEvent event);
 
     /**
      * Request data from stigma
      */
-    <T extends IBusinessHandler<?>> CompletableFuture<Object> requestUIData(ICustomUI<T> ui, IUIData uiData);
+    <T extends IBusinessHandler> CompletableFuture<Object> requestUIData(ICustomUI<T> ui, IUIData uiData);
 
     <M> M convertValue(Object value, Class<M> clz);
 
@@ -47,6 +49,8 @@ public interface ICustomUIEngine {
 
     void registerThreadLocalContext(String key, Object value);
 
+    Object getThreadLocalContext(String key);
+
     void registerUIEventHandler(String uiId, IUIEventHandler handler);
 
     void unregisterUIEventHandler(String uiId);

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/custom/InputDialogBusinessCustomUI.java

@@ -0,0 +1,77 @@
+// ============================================================================
+//
+// 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.commons.ui.runtime.custom;
+
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.talend.commons.exception.ExceptionHandler;
+
+public class InputDialogBusinessCustomUI extends AbstractCustomUI<InputDialogBusinessHandler> {
+
+    public InputDialogBusinessCustomUI(InputDialogBusinessHandler businessHandler) {
+        super(businessHandler);
+    }
+
+    @Override
+    protected IUIEvent createOpenEvent() {
+        IUIEvent openEvent = super.createOpenEvent();
+        Map<String, Object> params = openEvent.getParams();
+        InputDialogBusinessHandler bh = getBusinessHandler();
+        params.put(BuiltinParams.title.name(), bh.getTitle());
+        params.put(BuiltinParams.message.name(), bh.getMessage());
+        params.put("defaultValue", bh.getDefaultValue());
+        return openEvent;
+    }
+
+    @Override
+    protected boolean onApply(IUIEvent event) {
+        DefaultUIData valueEvent = createUIDataEvent("value");
+        String errMsg = null;
+        try {
+            Object value = requestUIData(valueEvent).get();
+            InputDialogBusinessHandler bh = getBusinessHandler();
+            if (value == null) {
+                value = "";
+            }
+            errMsg = bh.getValidator().isValid((String) value);
+            if (StringUtils.isBlank(errMsg)) {
+                return true;
+            }
+        } catch (Exception e) {
+            errMsg = e.getLocalizedMessage();
+            ExceptionHandler.process(e);
+        }
+        DefaultUIEvent errorEvent = new DefaultUIEvent("error", getId());
+        errorEvent.getParams().put("message", errMsg);
+        dispatchUIEvent(errorEvent);
+        return false;
+    }
+
+    @Override
+    protected InputDialogBusinessHandler collectDialogData() {
+        DefaultUIData valueEvent = createUIDataEvent("value");
+        InputDialogBusinessHandler businessHandler = getBusinessHandler();
+        try {
+            Object value = requestUIData(valueEvent).get();
+            businessHandler.setOpenResult(getOpenResult());
+            if (value != null) {
+                businessHandler.setResult(value.toString());
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+        return businessHandler;
+    }
+
+}

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/custom/InputDialogBusinessHandler.java

@@ -0,0 +1,72 @@
+// ============================================================================
+//
+// 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.commons.ui.runtime.custom;
+
+public class InputDialogBusinessHandler extends AbsBusinessHandler {
+
+    private static final String UI_KEY = "InputDialog";
+
+    private String title;
+
+    private String message;
+
+    private String defaultValue;
+
+    private String result;
+
+    private IInputDialogInputValidator validator;
+
+    public InputDialogBusinessHandler(String title, String message, String defaultValue, IInputDialogInputValidator validator) {
+        super();
+        this.title = title;
+        this.message = message;
+        this.defaultValue = defaultValue;
+        this.validator = validator;
+    }
+
+    @Override
+    public String getUiKey() {
+        return UI_KEY;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public String getDefaultValue() {
+        return defaultValue;
+    }
+
+    public String getResult() {
+        return result;
+    }
+
+    public void setResult(String result) {
+        this.result = result;
+    }
+
+    public IInputDialogInputValidator getValidator() {
+        return validator;
+    }
+
+    public interface IInputDialogInputValidator {
+
+        public String isValid(String newText);
+
+    }
+
+}

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/custom/MessageDialogBusinessHandler.java

@@ -12,17 +12,19 @@
 // ============================================================================
 package org.talend.commons.ui.runtime.custom;
 
+import org.eclipse.swt.widgets.Shell;
+
 /**
  * DOC cmeng class global comment. Detailled comment
  */
-public class MessageDialogBusinessHandler extends AbsBusinessHandler<MessageDialogBusinessHandler> {
+public class MessageDialogBusinessHandler extends AbsBusinessHandler {
 
     /**
      * Constant for no image (value 0).
      *
      * @see #MessageDialog(Shell, String, Image, String, int, int, String...)
      */
-    public static final int NONE = 0;
+    public static final int NONE = ICommonUIHandler.NONE;
 
     /**
      * Constant for the error image, or a simple dialog with the error image and
@@ -31,7 +33,7 @@ public class MessageDialogBusinessHandler extends AbsBusinessHandler<MessageDial
      * @see #MessageDialog(Shell, String, Image, String, int, int, String...)
      * @see #open(int, Shell, String, String, int)
      */
-    public static final int ERROR = 1;
+    public static final int ERROR = ICommonUIHandler.ERROR;
 
     /**
      * Constant for the info image, or a simple dialog with the info image and a
@@ -40,7 +42,7 @@ public class MessageDialogBusinessHandler extends AbsBusinessHandler<MessageDial
      * @see #MessageDialog(Shell, String, Image, String, int, int, String...)
      * @see #open(int, Shell, String, String, int)
      */
-    public static final int INFORMATION = 2;
+    public static final int INFORMATION = ICommonUIHandler.INFORMATION;
 
     /**
      * Constant for the question image, or a simple dialog with the question
@@ -49,7 +51,7 @@ public class MessageDialogBusinessHandler extends AbsBusinessHandler<MessageDial
      * @see #MessageDialog(Shell, String, Image, String, int, int, String...)
      * @see #open(int, Shell, String, String, int)
      */
-    public static final int QUESTION = 3;
+    public static final int QUESTION = ICommonUIHandler.QUESTION;
 
     /**
      * Constant for the warning image, or a simple dialog with the warning image
@@ -58,7 +60,7 @@ public class MessageDialogBusinessHandler extends AbsBusinessHandler<MessageDial
      * @see #MessageDialog(Shell, String, Image, String, int, int, String...)
      * @see #open(int, Shell, String, String, int)
      */
-    public static final int WARNING = 4;
+    public static final int WARNING = ICommonUIHandler.WARNING;
 
     /**
      * Constant for a simple dialog with the question image and OK/Cancel buttons (value 5).
@@ -66,7 +68,7 @@ public class MessageDialogBusinessHandler extends AbsBusinessHandler<MessageDial
      * @see #open(int, Shell, String, String, int)
      * @since 3.5
      */
-    public static final int CONFIRM = 5;
+    public static final int CONFIRM = ICommonUIHandler.CONFIRM;
 
     /**
      * Constant for a simple dialog with the question image and Yes/No/Cancel buttons (value 6).
@@ -74,7 +76,7 @@ public class MessageDialogBusinessHandler extends AbsBusinessHandler<MessageDial
      * @see #open(int, Shell, String, String, int)
      * @since 3.5
      */
-    public static final int QUESTION_WITH_CANCEL = 6;
+    public static final int QUESTION_WITH_CANCEL = ICommonUIHandler.QUESTION_WITH_CANCEL;
 
     private static final String UI_KEY = "MessageDialog";
 

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/custom/MessageDialogCustomUI.java

@@ -22,10 +22,6 @@ import org.talend.commons.exception.ExceptionHandler;
  */
 public class MessageDialogCustomUI extends AbstractCustomUI<MessageDialogBusinessHandler> {
 
-    private static final String OK = "ok";
-
-    private static final String CANCEL = "cancel";
-
     public MessageDialogCustomUI(MessageDialogBusinessHandler businessHandler) {
         super(businessHandler);
     }
@@ -62,46 +58,45 @@ public class MessageDialogCustomUI extends AbstractCustomUI<MessageDialogBusines
 
     @Override
     protected MessageDialogBusinessHandler collectDialogData() {
-        DefaultUIData uiData = createUIDataEvent("openResult");
         MessageDialogBusinessHandler businessHandler = getBusinessHandler();
         try {
-            Object openResult = requestUIData(uiData).get();
-            openResult = mapOpenResult(openResult);
-            businessHandler.setOpenResult(openResult);
+            businessHandler.setOpenResult(getDialogOpenResult());
         } catch (Exception e) {
             ExceptionHandler.process(e);
         }
         return businessHandler;
     }
 
-    private Object mapOpenResult(Object data) {
-        Object result = data;
+    private Object getDialogOpenResult() {
+        Object result = null;
+        boolean isCancelled = isCancelled();
         switch (getBusinessHandler().getDialogType()) {
         case MessageDialog.CONFIRM:
         case MessageDialog.ERROR:
         case MessageDialog.INFORMATION:
         case MessageDialog.WARNING:
-            if (OK.equals(data)) {
-                result = Boolean.TRUE;
-            } else {
+            if (isCancelled) {
                 result = Boolean.FALSE;
+            } else {
+                result = Boolean.TRUE;
             }
             break;
         case MessageDialog.QUESTION:
-            if (OK.equals(data)) {
-                result = Boolean.TRUE;
-            } else {
+            if (isCancelled) {
                 result = Boolean.FALSE;
+            } else {
+                result = Boolean.TRUE;
             }
             break;
         case MessageDialog.QUESTION_WITH_CANCEL:
-            if (OK.equals(data)) {
-                result = Boolean.TRUE;
-            } else {
+            if (isCancelled) {
                 result = Boolean.FALSE;
+            } else {
+                result = Boolean.TRUE;
             }
             break;
         default:
+            result = getOpenResult();
             break;
         }
         return result;

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/custom/MessageDialogWithToggleBusinessHandler.java

@@ -0,0 +1,95 @@
+// ============================================================================
+//
+// 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.commons.ui.runtime.custom;
+
+public class MessageDialogWithToggleBusinessHandler extends MessageDialogBusinessHandler {
+
+    private static final String UI_KEY = "MessageDialogWithToggle";
+
+    private String toggleMessage;
+
+    private boolean toggleState;
+
+    private ICrossPlatformPreferenceStore preferenceStore;
+
+    private String prefKey;
+
+    private String[] buttonLabels;
+
+    private int defaultBtnIndex = 0;
+
+    public MessageDialogWithToggleBusinessHandler(int dialogType, String title, String message, String[] buttonLabels,
+            int defaultBtnIndex, String toggleMessage, boolean toggleState) {
+        super(dialogType);
+        this.setTitle(title);
+        this.setMessage(message);
+        this.buttonLabels = buttonLabels;
+        this.defaultBtnIndex = defaultBtnIndex;
+        this.toggleMessage = toggleMessage;
+        this.toggleState = toggleState;
+    }
+
+    @Override
+    public String getUiKey() {
+        return UI_KEY;
+    }
+
+    public String getToggleMessage() {
+        return toggleMessage;
+    }
+
+    public void setToggleMessage(String toggleMessage) {
+        this.toggleMessage = toggleMessage;
+    }
+
+    public boolean getToggleState() {
+        return toggleState;
+    }
+
+    public void setToggleState(boolean toggleState) {
+        this.toggleState = toggleState;
+    }
+
+    public ICrossPlatformPreferenceStore getPreferenceStore() {
+        return preferenceStore;
+    }
+
+    public void setPreferenceStore(ICrossPlatformPreferenceStore preferenceStore) {
+        this.preferenceStore = preferenceStore;
+    }
+
+    public String getPrefKey() {
+        return prefKey;
+    }
+
+    public void setPrefKey(String prefKey) {
+        this.prefKey = prefKey;
+    }
+
+    public String[] getButtonLabels() {
+        return buttonLabels;
+    }
+
+    public void setButtonLabels(String[] buttonLabels) {
+        this.buttonLabels = buttonLabels;
+    }
+
+    public int getDefaultBtnIndex() {
+        return defaultBtnIndex;
+    }
+
+    public void setDefaultBtnIndex(int defaultBtnIndex) {
+        this.defaultBtnIndex = defaultBtnIndex;
+    }
+
+}

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/custom/MessageDialogWithToggleCustomUI.java

@@ -0,0 +1,78 @@
+// ============================================================================
+//
+// 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.commons.ui.runtime.custom;
+
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.talend.commons.exception.ExceptionHandler;
+
+public class MessageDialogWithToggleCustomUI extends AbstractCustomUI<MessageDialogWithToggleBusinessHandler> {
+
+    public MessageDialogWithToggleCustomUI(MessageDialogWithToggleBusinessHandler businessHandler) {
+        super(businessHandler);
+    }
+
+    @Override
+    protected IUIEvent createOpenEvent() {
+        IUIEvent openEvent = super.createOpenEvent();
+        Map<String, Object> params = openEvent.getParams();
+        MessageDialogWithToggleBusinessHandler bh = getBusinessHandler();
+        params.put(BuiltinParams.title.name(), bh.getTitle());
+        params.put(BuiltinParams.message.name(), bh.getMessage());
+        params.put("toggleMsg", bh.getToggleMessage());
+        params.put("toggleState", bh.getToggleState());
+        params.put("dialogImageType", mapDialogImageType(bh.getDialogType()));
+        params.put("buttons", bh.getButtonLabels());
+        params.put("defaultBtnIndex", bh.getDefaultBtnIndex());
+        return openEvent;
+    }
+
+    private String mapDialogImageType(int type) {
+        switch (type) {
+        case MessageDialog.CONFIRM:
+            return "confirm";
+        case MessageDialog.ERROR:
+            return "error";
+        case MessageDialog.INFORMATION:
+            return "info";
+        case MessageDialog.QUESTION:
+            return "question";
+        case MessageDialog.QUESTION_WITH_CANCEL:
+            return "questionWithCancel";
+        case MessageDialog.WARNING:
+            return "warning";
+        default:
+            return "none";
+        }
+    }
+
+    @Override
+    protected MessageDialogWithToggleBusinessHandler collectDialogData() {
+        DefaultUIData toggleStateReq = createUIDataEvent("toggleState");
+        MessageDialogWithToggleBusinessHandler businessHandler = getBusinessHandler();
+        try {
+            CompletableFuture<Object> toggleStateResp = requestUIData(toggleStateReq);
+            businessHandler.setOpenResult(getOpenResult());
+            boolean toggleState = Boolean.valueOf(toggleStateResp.get().toString());
+            if (toggleState != businessHandler.getToggleState()) {
+                businessHandler.setToggleState(toggleState);
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+        return businessHandler;
+    }
+
+}

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/custom/UIHandlerFactories.java

@@ -66,4 +66,8 @@ public class UIHandlerFactories implements IUIHandlerFactory {
         return null;
     }
 
+    public ICommonUIHandler getCommonUIHandler() {
+        return getUIHandler(ICommonUIHandler.class);
+    }
+
 }

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/custom/UnsupportedCustomUI.java

@@ -19,7 +19,7 @@ import java.util.Map;
 /**
  * DOC cmeng  class global comment. Detailled comment
  */
-public class UnsupportedCustomUI<T extends IBusinessHandler<?>> extends AbstractCustomUI<T> {
+public class UnsupportedCustomUI<T extends IBusinessHandler> extends AbstractCustomUI<T> {
 
     UnsupportedBusinessHandler realHandler;
 
@@ -47,7 +47,7 @@ public class UnsupportedCustomUI<T extends IBusinessHandler<?>> extends Abstract
         return getBusinessHandler();
     }
 
-    public static class UnsupportedBusinessHandler extends AbsBusinessHandler<UnsupportedBusinessHandler> {
+    public static class UnsupportedBusinessHandler extends AbsBusinessHandler {
 
         private static final String UI_KEY = "UnsupportedDialog";
 

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.commons.runtime/META-INF/MANIFEST.MF

@@ -2,12 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common Runtime Plug-in
 Bundle-SymbolicName: org.talend.commons.runtime;singleton:=true
+Automatic-Module-Name: org.talend.commons.runtime
 Bundle-Version: 8.8.8.qualifier
-Require-Bundle: org.apache.log4j;visibility:=reexport,
+Require-Bundle: org.apache.log4j,
  org.apache.commons.commons-beanutils,
  org.apache.commons.collections,
  org.apache.commons.httpclient,
- org.apache.commons.lang;visibility:=reexport,
+ org.apache.commons.lang,
  org.eclipse.core.runtime,
  org.eclipse.emf.ecore.xmi,
  org.talend.libraries.apache,
@@ -17,7 +18,11 @@ Require-Bundle: org.apache.log4j;visibility:=reexport,
  org.eclipse.core.net,
  org.eclipse.m2e.core,
  org.eclipse.m2e.maven.runtime,
- org.eclipse.core.resources
+ org.eclipse.core.resources,
+ org.talend.studio.studio-utils,
+ org.talend.daikon,
+ org.apache.commons.codec,
+ org.apache.commons.lang3
 Export-Package: org.talend.commons,
  org.talend.commons.exception,
  org.talend.commons.i18n,

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

@@ -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/OsgiServices.java

@@ -0,0 +1,35 @@
+// ============================================================================
+//
+// 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.commons.utils;
+
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
+import org.talend.commons.exception.ExceptionHandler;
+
+public class OsgiServices {
+
+    public static <T> T get(Class<T> clz) {
+        try {
+            BundleContext bc = FrameworkUtil.getBundle(OsgiServices.class).getBundleContext();
+            ServiceReference<T> serviceReference = bc.getServiceReference(clz);
+            if (serviceReference != null) {
+                return bc.getService(serviceReference);
+            }
+        } catch (Throwable e) {
+            ExceptionHandler.process(e);
+        }
+        return null;
+    }
+
+}

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

@@ -2,6 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common UI Plug-in
 Bundle-SymbolicName: org.talend.commons.ui;singleton:=true
+Automatic-Module-Name: org.talend.commons.ui
 Bundle-Version: 8.8.8.qualifier
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
@@ -10,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui.intro,
  org.eclipse.ui.ide,
  org.eclipse.gef,
- org.eclipse.jface;visibility:=reexport,
+ org.eclipse.jface,
  org.apache.log4j,
  org.apache.xalan,
  org.apache.commons.lang,
@@ -18,9 +19,11 @@ Require-Bundle: org.eclipse.core.runtime,
  org.talend.libraries.dom4j-jaxen,
  org.talend.utils,
  org.talend.commons.runtime,
- org.talend.common.ui.runtime;visibility:=reexport,
- org.talend.libraries.ui;visibility:=reexport,
- org.eclipse.ui.workbench
+ org.talend.common.ui.runtime,
+ org.talend.libraries.ui,
+ org.eclipse.ui.workbench,
+ org.talend.studio.studio-utils,
+ org.apache.commons.lang3
 Eclipse-LazyStart: true
 Bundle-Vendor: .Talend SA.
 Export-Package: org.talend.commons.ui.command,

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/dialogs/ModelSelectionBusinessHandler.java

@@ -19,7 +19,7 @@ import org.talend.commons.ui.swt.dialogs.ModelSelectionDialog.ESelectionType;
 /**
  * DOC cmeng  class global comment. Detailled comment
  */
-public class ModelSelectionBusinessHandler extends AbsBusinessHandler<ModelSelectionBusinessHandler> {
+public class ModelSelectionBusinessHandler extends AbsBusinessHandler {
 
     private static final String UI_KEY = "ModelSelectionDialog";
 

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

@@ -15,7 +15,26 @@ Require-Bundle: org.eclipse.ui,
  org.talend.libraries.apache,
  org.eclipse.osgi.services,
  org.eclipse.ui.navigator,
- org.talend.libraries.jackson
+ org.talend.libraries.jackson,
+ org.eclipse.emf.ecore,
+ org.talend.commons.runtime,
+ org.eclipse.equinox.common,
+ org.eclipse.core.jobs,
+ org.eclipse.core.resources,
+ org.eclipse.osgi,
+ org.eclipse.emf.ecore.xmi,
+ org.eclipse.equinox.registry,
+ org.talend.common.ui.runtime,
+ org.talend.cwm.mip,
+ org.eclipse.swt,
+ org.talend.studio.studio-utils,
+ org.eclipse.core.runtime,
+ org.eclipse.gmf.runtime.notation,
+ org.talend.utils,
+ org.apache.commons.lang3,
+ com.fasterxml.jackson.core.jackson-annotations,
+ com.fasterxml.jackson.core.jackson-core,
+ com.fasterxml.jackson.core.jackson-databind
 Export-Package: org.talend.core.repository,
  org.talend.core.repository.constants,
  org.talend.core.repository.document,

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

@@ -156,6 +156,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

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=CDC Foundation (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

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

@@ -130,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) {

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

@@ -1350,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) {
@@ -1701,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());

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

@@ -2207,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.runtime/META-INF/MANIFEST.MF

@@ -2,10 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Core Runtime Plug-in
 Bundle-SymbolicName: org.talend.core.runtime;singleton:=true
+Automatic-Module-Name: org.talend.core.runtime
 Bundle-Version: 8.8.8.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.
-Export-Package: org.talend.analysistask,
+Export-Package: org.json.simple,
+ org.talend.analysistask,
  org.talend.commons.utils.generation,
  org.talend.commons.utils.io,
  org.talend.commons.utils.workbench.resources,
@@ -117,20 +119,33 @@ Require-Bundle: org.eclipse.jdt.core,
  org.apache.commons.lang,
  org.apache.log4j,
  org.talend.model,
- org.talend.utils;visibility:=reexport,
+ org.talend.utils,
  org.talend.libraries.dom4j-jaxen,
  org.talend.libraries.csv,
  org.talend.libraries.apache.http,
- org.talend.commons.runtime;visibility:=reexport,
+ org.talend.commons.runtime,
  org.talend.commons.ui,
  org.ops4j.pax.url.mvn,
  org.talend.components.api,
- org.apache.servicemix.bundles.avro,
  jackson-core-asl,
  org.talend.libraries.jackson,
  org.eclipse.m2e.core,
  org.talend.libraries.apache.common,
- org.talend.signon.util
+ org.talend.signon.util,
+ org.eclipse.core.runtime,
+ org.talend.studio.studio-utils,
+ org.eclipse.emf.ecore,
+ org.eclipse.core.resources,
+ org.eclipse.emf.ecore.xmi,
+ org.talend.common.ui.runtime,
+ org.talend.cwm.mip,
+ org.talend.daikon,
+ org.talend.libraries.apache,
+ org.apache.commons.lang3,
+ com.fasterxml.jackson.core.jackson-annotations,
+ com.fasterxml.jackson.core.jackson-databind,
+ com.fasterxml.jackson.core.jackson-core,
+ avro;bundle-version="1.11.2"
 Bundle-Activator: org.talend.core.runtime.CoreRuntimePlugin
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,

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);
@@ -268,7 +274,7 @@ public class PluginChecker {
     }
 
     public static boolean isExchangeSystemLoaded() {
-        return isPluginLoaded(EXCHANGE_SYSTEM_PLUGIN_ID);
+        return false;
     }
 
     public static boolean isRulesPluginLoaded() { // added by hyWang

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

@@ -88,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

@@ -455,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")),
@@ -79,12 +79,15 @@ public enum EDatabaseVersion4Drivers {
     MSSQL_PROP(new DbVersion4Drivers(EDatabaseTypeName.MSSQL,
             "Microsoft", "MSSQL_PROP", //$NON-NLS-1$ //$NON-NLS-2$
             new String[] { "mssql-jdbc-actual.jar", "slf4j-api-1.7.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",
+                    "oauth2-oidc-sdk-9.7.jar", "reload4j-1.2.22.jar", "jackson-core-2.14.3.jar",
+                    "jackson-databind-2.14.3.jar", "jackson-annotations-2.14.3.jar", "jcip-annotations-1.0-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$
@@ -150,8 +153,8 @@ public enum EDatabaseVersion4Drivers {
     REDSHIFT(new DbVersion4Drivers(EDatabaseTypeName.REDSHIFT, "redshift", "REDSHIFT", //$NON-NLS-1$ //$NON-NLS-2$
             new String[]{ "redshift-jdbc42-no-awssdk-1.2.55.1083.jar", "antlr4-runtime-4.8-1.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
     REDSHIFT_SSO(new DbVersion4Drivers(EDatabaseTypeName.REDSHIFT_SSO, "redshift sso", "REDSHIFT_SSO", //$NON-NLS-1$ //$NON-NLS-2$
-            new String[] { "redshift-jdbc42-no-awssdk-1.2.55.1083.jar", "antlr4-runtime-4.8-1.jar", "jackson-core-2.13.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                    "jackson-databind-2.13.4.2.jar", "jackson-annotations-2.13.4.jar", "httpcore-4.4.13.jar", "httpclient-4.5.13.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$//$NON-NLS-4$
+            new String[] { "redshift-jdbc42-no-awssdk-1.2.55.1083.jar", "antlr4-runtime-4.8-1.jar", "jackson-core-2.14.3.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                    "jackson-databind-2.14.3.jar", "jackson-annotations-2.14.3.jar", "httpcore-4.4.13.jar", "httpclient-4.5.13.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$//$NON-NLS-4$
                     "joda-time-2.8.1.jar", "commons-logging-1.2.jar", "commons-codec-1.14.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                     "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$

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

@@ -214,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/metadata/MetadataToolAvroHelper.java

@@ -209,6 +209,8 @@ public final class MetadataToolAvroHelper {
             		// FIXME - this one should go away
             		type = AvroUtils._date();
             	}
+            	
+            	defaultValue = null;
             }
             // String-ish types.
             else if (JavaTypesManager.STRING.getId().equals(tt) || JavaTypesManager.FILE.getId().equals(tt)
@@ -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());
             }
@@ -462,7 +466,7 @@ public final class MetadataToolAvroHelper {
             TaggedValue tv = TaggedValueHelper.createTaggedValue(DiSchemaConstants.TALEND6_IS_READ_ONLY, prop);
             table.getTaggedValue().add(tv);
         }
-        for (String key : in.getJsonProps().keySet()) {
+        for (String key : in.getObjectProps().keySet()) {
             if (key.startsWith(DiSchemaConstants.TALEND6_ADDITIONAL_PROPERTIES)) {
                 String originalKey = key.substring(DiSchemaConstants.TALEND6_ADDITIONAL_PROPERTIES.length());
                 TaggedValue tv = TaggedValueHelper.createTaggedValue(originalKey, in.getProp(key));
@@ -508,7 +512,7 @@ public final class MetadataToolAvroHelper {
             TaggedValue tv = TaggedValueHelper.createTaggedValue(DiSchemaConstants.TALEND6_IS_READ_ONLY, prop);
             col.getTaggedValue().add(tv);
         }
-        for (String key : schema.getJsonProps().keySet()) {
+        for (String key : schema.getObjectProps().keySet()) {
             if (key.startsWith(DiSchemaConstants.TALEND6_ADDITIONAL_PROPERTIES)) {
                 String originalKey = key.substring(DiSchemaConstants.TALEND6_ADDITIONAL_PROPERTIES.length());
                 TaggedValue tv = TaggedValueHelper.createTaggedValue(originalKey, schema.getProp(key));
@@ -637,6 +641,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());
           	    }
@@ -681,7 +687,7 @@ public final class MetadataToolAvroHelper {
             TaggedValue tv = TaggedValueHelper.createTaggedValue(DiSchemaConstants.TALEND6_IS_READ_ONLY, prop);
             col.getTaggedValue().add(tv);
         }
-        for (String key : field.getJsonProps().keySet()) {
+        for (String key : field.getObjectProps().keySet()) {
             if (key.startsWith(DiSchemaConstants.TALEND6_ADDITIONAL_PROPERTIES)) {
                 String originalKey = key.substring(DiSchemaConstants.TALEND6_ADDITIONAL_PROPERTIES.length());
                 TaggedValue tv = TaggedValueHelper.createTaggedValue(originalKey, field.getProp(key));

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".

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;
@@ -360,10 +361,10 @@ 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);
@@ -508,6 +509,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");
 
@@ -868,6 +871,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) {
@@ -1079,6 +1084,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

@@ -35,7 +35,7 @@ public final class TalendPropertiesUtil {
      * @return
      */
     public static boolean isHideExchange() {
-        return isEnabled("talend.hide.exchange") || isEnabled("talend.disable.internet"); //$NON-NLS-1$ //$NON-NLS-2$
+        return true; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**

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/";

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ui/ISparkJobletProviderService.java

@@ -46,6 +46,8 @@ public interface ISparkJobletProviderService extends IService{
 
     public IAdaptable createEditorPart(Object model);
 
+    public Object createCrossPlatformEditorPart(Object model);
+
     public IRepositoryEditorInput createJobletEditor(JobletProcessItem processItem, Boolean load, Boolean lastVersion, Boolean readonly,Boolean openedInJob) throws PersistenceException;
 
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ui/ISparkStreamingJobletProviderService.java

@@ -46,6 +46,8 @@ public interface ISparkStreamingJobletProviderService extends IService{
 
     public IAdaptable createEditorPart(Object model);
 
+    public Object createCrossPlatformEditorPart(Object model);
+
     public IRepositoryEditorInput createJobletEditor(JobletProcessItem processItem, Boolean load, Boolean lastVersion, Boolean readonly,Boolean openedInJob) throws PersistenceException;
 
 }

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/META-INF/MANIFEST.MF

@@ -2,10 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Core UI Plug-in
 Bundle-SymbolicName: org.talend.core.ui;singleton:=true
+Automatic-Module-Name: org.talend.core.ui
 Bundle-Version: 8.8.8.qualifier
 Require-Bundle: org.apache.commons.lang,
  org.apache.commons.collections,
- org.eclipse.gef;visibility:=reexport,
+ org.eclipse.gef,
  org.eclipse.jface.text,
  org.eclipse.ui.views.properties.tabbed,
  org.eclipse.ui.editors,
@@ -36,7 +37,22 @@ Require-Bundle: org.apache.commons.lang,
  org.apache.httpcomponents.httpclient,
  org.slf4j.api,
  org.apache.ant,
- org.eclipse.m2e.maven.runtime
+ org.eclipse.m2e.maven.runtime,
+ org.eclipse.equinox.common,
+ org.eclipse.emf.common,
+ org.eclipse.osgi,
+ org.eclipse.core.runtime,
+ org.talend.libraries.ui,
+ org.eclipse.emf.ecore,
+ org.eclipse.core.resources,
+ org.apache.log4j,
+ org.talend.cwm.mip,
+ org.talend.libraries.apache,
+ org.talend.studio.studio-utils,
+ org.talend.daikon,
+ org.apache.commons.logging,
+ org.apache.commons.lang3,
+ org.apache.commons.codec
 Import-Package: org.eclipse.jdt.internal.ui.workingsets
 Export-Package: org.talend.core.ui,
  org.talend.core.ui.actions,

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

@@ -411,6 +411,7 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
 
             if (modified) {
                 updateRelation();
+                modelManager.refresh();
             }
         }
 
@@ -425,7 +426,6 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
                             && jobContextManager.isOriginalParameter(param.getName())) {
                         jobContextManager.setModified(true);
                         manager.fireContextsChangedEvent();
-                        modelManager.refresh();
                     }
                 }
             }
@@ -494,6 +494,7 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
             }
             if (modified) {
                 updateRelation();
+                modelManager.refresh();
             }
         }
 
@@ -508,7 +509,6 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
                             && jobContextManager.isOriginalParameter(param.getName())) {
                         jobContextManager.setModified(true);
                         manager.fireContextsChangedEvent();
-                        modelManager.refresh();
                     }
                 }
             }
@@ -576,6 +576,7 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
             }
             if (modified) {
                 updateRelation();
+                modelManager.refresh();
             }
         }
 
@@ -590,7 +591,6 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
                             && jobContextManager.isOriginalParameter(param.getName())) {
                         jobContextManager.setModified(true);
                         manager.fireContextsChangedEvent();
-                        modelManager.refresh();
                     }
                 }
             }
@@ -673,6 +673,7 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
             if (modified) {
                 // it is undo, so the order changed
                 updateRelation(newName, originalName);
+                modelManager.refresh();
             }
         }
 
@@ -687,7 +688,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/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/dialog/MetadataDialogBusinessHandler.java

@@ -20,7 +20,7 @@ import org.talend.core.model.process.INode;
 /**
  * DOC cmeng  class global comment. Detailled comment
  */
-public class MetadataDialogBusinessHandler extends AbsBusinessHandler<MetadataDialogBusinessHandler> {
+public class MetadataDialogBusinessHandler extends AbsBusinessHandler {
 
     private static final String UI_KEY = "MetadataDialog";
 

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/metadata/dialog/MetadataDialogCustomUI.java

@@ -16,10 +16,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
-import org.apache.commons.lang3.StringUtils;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.ui.runtime.custom.AbstractCustomUI;
-import org.talend.commons.ui.runtime.custom.IBusinessHandler;
+import org.talend.commons.ui.runtime.custom.ICustomUI;
 import org.talend.commons.ui.runtime.custom.IUIEvent;
 import org.talend.core.model.metadata.IMetadataColumn;
 import org.talend.core.model.metadata.IMetadataTable;
@@ -51,17 +50,15 @@ public class MetadataDialogCustomUI extends AbstractCustomUI<MetadataDialogBusin
 
     @Override
     protected MetadataDialogBusinessHandler collectDialogData() {
-        CompletableFuture<Object> openResultRequest = requestUIData(createUIDataEvent("openResult"));
         CompletableFuture<Object> outputMetaDataRequest = requestUIData(createUIDataEvent("output"));
         CompletableFuture<Object> inputMetaDataRequest = requestUIData(createUIDataEvent("input"));
         MetadataDialogBusinessHandler bh = getBusinessHandler();
         try {
-            Object openResult = openResultRequest.get();
-            if (StringUtils.equals("cancel", openResult.toString())) {
-                bh.setOpenResult(IBusinessHandler.CANCEL);
+            if (isCancelled()) {
+                bh.setOpenResult(ICustomUI.CANCEL);
                 return bh;
             }
-            bh.setOpenResult(IBusinessHandler.OK);
+            bh.setOpenResult(ICustomUI.OK);
             List<Object> output = (List<Object>) outputMetaDataRequest.get();
             IMetadataTable outputMetaTable = bh.getOutputMetaTable();
             if (outputMetaTable != null) {

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/metadata/dialog/MetadataDialogForMergeBusinessHandler.java

@@ -22,7 +22,7 @@ import org.talend.core.model.process.INode;
 /**
  * DOC cmeng  class global comment. Detailled comment
  */
-public class MetadataDialogForMergeBusinessHandler extends AbsBusinessHandler<MetadataDialogForMergeBusinessHandler> {
+public class MetadataDialogForMergeBusinessHandler extends AbsBusinessHandler {
 
     private static final String UI_KEY = "MetadataDialogForMerge";
 

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

@@ -22,7 +22,13 @@ Require-Bundle: org.eclipse.debug.core,
  org.talend.libraries.apache,
  org.talend.core.runtime,
  org.talend.utils,
- org.talend.libraries.dom4j-jaxen
+ org.talend.libraries.dom4j-jaxen,
+ org.eclipse.core.runtime,
+ org.talend.commons.runtime,
+ org.talend.studio.studio-utils,
+ org.eclipse.emf.ecore,
+ org.talend.cwm.mip,
+ org.apache.commons.lang3
 Bundle-Vendor: .Talend SA.
 Export-Package: org.talend.core,
  org.talend.core.branding,

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.cwm.mip.edit/META-INF/MANIFEST.MF

@@ -40,6 +40,6 @@ Export-Package: orgomg.cwm.analysis.businessnomenclature.provider,
  orgomg.cwmx.resource.imsdatabase.provider,
  orgomg.mof.model.provider
 Require-Bundle: org.eclipse.core.runtime,
- org.talend.cwm.mip;visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport
+ org.talend.cwm.mip,
+ org.eclipse.emf.edit
 Bundle-ActivationPolicy: lazy

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.editor/META-INF/MANIFEST.MF

@@ -40,9 +40,10 @@ Export-Package: orgomg.cwm.analysis.businessnomenclature.presentation,
  orgomg.cwmx.resource.imsdatabase.presentation,
  orgomg.mof.model.presentation
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources;visibility:=reexport,
- org.talend.cwm.mip.edit;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.emf.edit.ui;visibility:=reexport,
- org.eclipse.ui.ide;visibility:=reexport
+ org.eclipse.core.resources,
+ org.talend.cwm.mip.edit,
+ org.eclipse.emf.ecore.xmi,
+ org.eclipse.emf.edit.ui,
+ org.eclipse.ui.ide,
+ org.talend.cwm.mip
 Bundle-ActivationPolicy: lazy

main/plugins/org.talend.cwm.mip/META-INF/MANIFEST.MF

@@ -109,6 +109,6 @@ Export-Package: orgomg.cwm.analysis.businessnomenclature,
  orgomg.mof.model.impl,
  orgomg.mof.model.util
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore,
  org.apache.log4j
 Bundle-ActivationPolicy: lazy

main/plugins/org.talend.datatools.xml/META-INF/MANIFEST.MF

@@ -9,6 +9,8 @@ Require-Bundle: org.eclipse.xsd,
  javax.wsdl;bundle-version="1.6.2",
  org.talend.libraries.apache.axis2,
  org.talend.core.runtime,
- org.apache.xerces
+ org.apache.xerces,
+ org.talend.commons.runtime,
+ org.talend.utils
 Export-Package: org.talend.datatools.xml.utils
 Bundle-Vendor: .Talend SA.

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

@@ -8,7 +8,10 @@ Require-Bundle: org.eclipse.core.runtime,
  org.talend.libraries.jackson,
  org.talend.core.runtime,
  org.eclipse.m2e.core,
- org.eclipse.m2e.maven.runtime
+ org.eclipse.m2e.maven.runtime,
+ org.talend.commons.runtime,
+ org.talend.studio.studio-utils,
+ org.apache.commons.lang3
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
  lib/maven-aether-provider-3.2.1.jar,

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

@@ -82,7 +82,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.codehaus.plexus</groupId>
+			<artifactId>plexus-xml</artifactId>
+			<version>4.0.0</version>
 		</dependency>
 		<dependency>
 		    <groupId>org.codehaus.plexus</groupId>
@@ -132,7 +137,7 @@
 		<dependency>
 		    <groupId>com.fasterxml.jackson.core</groupId>
 		    <artifactId>jackson-databind</artifactId>
-		    <version>2.13.4.2</version>
+		    <version>2.14.3</version>
 		</dependency>
 		<dependency>
 		    <groupId>org.apache.httpcomponents</groupId>

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

@@ -103,7 +103,7 @@
 		<dependency>
 		    <groupId>com.fasterxml.jackson.core</groupId>
 		    <artifactId>jackson-databind</artifactId>
-		    <version>2.13.4.2</version>
+		    <version>2.14.3</version>
 		</dependency>
 		<dependency>
 		    <groupId>com.thoughtworks.xstream</groupId>

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

@@ -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/tcompv1/pom.xml

@@ -11,7 +11,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <tcomp.version>1.58.0</tcomp.version>
+        <tcomp.version>1.60.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

@@ -31,11 +31,11 @@
                 </exclusion>
             </exclusions>
         </dependency>	
-        <!--crypto-utils 7.0.5 dependencies begin -->
+        <!--crypto-utils 7.1.16 dependencies begin -->
         <dependency>
         	<groupId>org.springframework.boot</groupId>
         	<artifactId>spring-boot-dependencies</artifactId>
-        	<version>2.7.3</version>
+        	<version>2.7.7</version>
         	<type>pom</type>
         </dependency>
         <dependency>
@@ -47,13 +47,13 @@
 		<dependency>
         	<groupId>org.codehaus.groovy</groupId>
         	<artifactId>groovy-bom</artifactId>
-        	<version>3.0.12</version>
+        	<version>3.0.13</version>
         	<type>pom</type>
       	</dependency>
 		<dependency>
         	<groupId>com.fasterxml.jackson</groupId>
         	<artifactId>jackson-bom</artifactId>
-        	<version>2.13.3</version>
+        	<version>2.14.3</version>
         	<type>pom</type>
       	</dependency>
 		<dependency>
@@ -65,7 +65,7 @@
 		<dependency>
         	<groupId>org.eclipse.jetty</groupId>
         	<artifactId>jetty-bom</artifactId>
-        	<version>9.4.48.v20220622</version>
+        	<version>9.4.50.v20221201</version>
         	<type>pom</type>
       	</dependency>
 		<dependency>
@@ -89,13 +89,13 @@
 		<dependency>
         	<groupId>io.micrometer</groupId>
         	<artifactId>micrometer-bom</artifactId>
-        	<version>1.9.3</version>
+        	<version>1.9.6</version>
         	<type>pom</type>
       	</dependency>
 		<dependency>
         	<groupId>io.netty</groupId>
         	<artifactId>netty-bom</artifactId>
-        	<version>4.1.79.Final</version>
+        	<version>4.1.86.Final</version>
         	<type>pom</type>
       	</dependency>
 		<dependency>
@@ -119,43 +119,43 @@
 		<dependency>
         	<groupId>io.r2dbc</groupId>
         	<artifactId>r2dbc-bom</artifactId>
-        	<version>Borca-SR1</version>
+        	<version>Borca-SR2</version>
         	<type>pom</type>
       	</dependency>
 		<dependency>
         	<groupId>io.projectreactor</groupId>
         	<artifactId>reactor-bom</artifactId>
-        	<version>2020.0.22</version>
+        	<version>2020.0.26</version>
         	<type>pom</type>
       	</dependency>
 		<dependency>
         	<groupId>io.rsocket</groupId>
         	<artifactId>rsocket-bom</artifactId>
-        	<version>1.1.2</version>
+        	<version>1.1.3</version>
         	<type>pom</type>
       	</dependency>
 		<dependency>
         	<groupId>org.springframework.data</groupId>
         	<artifactId>spring-data-bom</artifactId>
-        	<version>2021.2.2</version>
+        	<version>2021.2.6</version>
         	<type>pom</type>
       	</dependency>
 		<dependency>
         	<groupId>org.springframework</groupId>
         	<artifactId>spring-framework-bom</artifactId>
-        	<version>5.3.22</version>
+        	<version>5.3.24</version>
         	<type>pom</type>
       	</dependency>
 		<dependency>
         	<groupId>org.springframework.integration</groupId>
         	<artifactId>spring-integration-bom</artifactId>
-        	<version>5.5.14</version>
+        	<version>5.5.16</version>
         	<type>pom</type>
       	</dependency>
 		<dependency>
         	<groupId>org.springframework.security</groupId>
         	<artifactId>spring-security-bom</artifactId>
-        	<version>5.7.3</version>
+        	<version>5.7.6</version>
         	<type>pom</type>
       	</dependency>
 		<dependency>
@@ -167,25 +167,25 @@
       	<dependency>
         	<groupId>io.dropwizard.metrics</groupId>
         	<artifactId>metrics-bom</artifactId>
-        	<version>4.2.11</version>
+        	<version>4.2.14</version>
         	<type>pom</type>
       	</dependency>
       	<dependency>
 			<groupId>io.dropwizard.metrics</groupId>
         	<artifactId>metrics-parent</artifactId>
-        	<version>4.2.11</version>
+        	<version>4.2.14</version>
 			<type>pom</type>
 		</dependency>
 		<dependency>
         	<groupId>org.infinispan</groupId>
         	<artifactId>infinispan-bom</artifactId>
-        	<version>13.0.10.Final</version>
+        	<version>13.0.14.Final</version>
         	<type>pom</type>
       	</dependency>
       	<dependency>
 			<groupId>org.infinispan</groupId>
 			<artifactId>infinispan-build-configuration-parent</artifactId>
-			<version>13.0.10.Final</version>
+			<version>13.0.14.Final</version>
 			<type>pom</type>
 		</dependency>
 		<dependency>
@@ -212,7 +212,7 @@
 			<version>4.5.1</version>
 			<type>pom</type>
 		</dependency>
-        <!--crypto-utils 7.0.5 dependencies end -->
+        <!--crypto-utils 7.1.16 dependencies end -->
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-configuration2</artifactId>
@@ -319,7 +319,7 @@
 								<extraArtifact>org.junit:junit-bom:5.7.1:pom</extraArtifact>
 								<extraArtifact>org.junit:junit-bom:5.8.2:pom</extraArtifact>
 								<extraArtifact>org.junit:junit-bom:5.9.1:pom</extraArtifact>
-								<extraArtifact>com.fasterxml.jackson:jackson-bom:2.13.3:pom</extraArtifact>
+								<extraArtifact>com.fasterxml.jackson:jackson-bom:2.14.3:pom</extraArtifact>
 							</extraArtifacts>
 							<pomIncludes>
 								<pomInclude>*/*.pom</pomInclude>

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

@@ -15,7 +15,16 @@ Require-Bundle: org.eclipse.ui,
  org.talend.core.runtime,
  org.talend.designer.maven,
  org.talend.repository.view,
- org.talend.core
+ org.talend.core,
+ org.talend.commons.runtime,
+ org.talend.studio.studio-utils,
+ org.talend.common.ui.runtime,
+ org.eclipse.emf.ecore,
+ org.eclipse.ui.navigator,
+ org.eclipse.ui.views.properties.tabbed,
+ org.apache.log4j,
+ org.apache.commons.lang3,
+ org.talend.utils
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: .Talend SA.
 Bundle-Localization: plugin

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

@@ -24,7 +24,13 @@ Require-Bundle: org.eclipse.core.runtime,
  org.talend.core.runtime,
  org.eclipse.jface,
  org.talend.core.repository,
- org.talend.core
+ org.talend.core,
+ org.apache.log4j,
+ org.eclipse.emf.ecore,
+ org.apache.commons.lang3,
+ org.talend.utils,
+ org.apache.commons.lang,
+ org.talend.studio.studio-utils
 Bundle-ActivationPolicy: lazy
 Export-Package: org.talend.designer.maven,
  org.talend.designer.maven.launch,

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,7 +59,7 @@
 						<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>
@@ -74,7 +79,7 @@
 						<dependency>
 							<groupId>com.google.guava</groupId>
 							<artifactId>guava</artifactId>
-							<version>30.0-jre</version>
+							<version>32.0.1-jre</version>
 						</dependency>
 					</dependencies>
 				</plugin>
@@ -106,7 +111,7 @@
 						<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,12 +148,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.codehaus.plexus</groupId>
 							<artifactId>plexus-io</artifactId>
-							<version>3.0.1</version>
+							<version>3.4.1</version>
 						</dependency>
 						<dependency>
 							<groupId>org.apache.maven</groupId>
@@ -153,7 +163,7 @@
 						<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,7 +215,7 @@
 						<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>
@@ -210,14 +230,14 @@
 						<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");

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

@@ -60,8 +60,8 @@ Export-Package: org.apache.commons.cli2,
  org.apache.commons.io.monitor;version="2.10.0",
  org.apache.commons.io.output;version="2.10.0",
  org.apache.commons.io.serialization;version="2.10.0"
-Require-Bundle: org.apache.commons.commons-beanutils;visibility:=reexport,
- org.apache.commons.logging;bundle-version="1.2.0";visibility:=reexport,
- org.apache.commons.lang3;bundle-version="3.4.0";visibility:=reexport
+Require-Bundle: org.apache.commons.commons-beanutils,
+ org.apache.commons.logging,
+ org.apache.commons.lang3
 Bundle-ActivationPolicy: lazy
 Eclipse-BundleShape: dir

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

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.talend.studio</groupId>
@@ -10,186 +12,182 @@
 	<artifactId>org.talend.libraries.apache.cxf</artifactId>
 	<packaging>eclipse-plugin</packaging>
 	<properties>
-    	<cxf.version>3.5.5</cxf.version>
-  	</properties>
+		<cxf.version>3.5.5</cxf.version>
+	</properties>
 	<repositories>
 		<repository>
 			<id>talend-update</id>
-			<url>https://talend-update.talend.com/nexus/content/repositories/libraries/</url>
+			<url>
+				https://talend-update.talend.com/nexus/content/repositories/libraries/</url>
 		</repository>
 	</repositories>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-core</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-bindings-xml</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-frontend-jaxrs</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-rs-client</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-transports-http</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-wsdl</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-bindings-soap</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-databinding-jaxb</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-features-clustering</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-frontend-jaxws</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-frontend-simple</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-security</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-security-saml</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-ws-addr</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-ws-policy</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-ws-security</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.sun.activation</groupId>
-			<artifactId>jakarta.activation</artifactId>
-			<version>1.2.2</version>
-		</dependency>
-		<dependency>
-			<groupId>jakarta.activation</groupId>
-			<artifactId>jakarta.activation-api</artifactId>
-			<version>1.2.2</version>
-		</dependency>
-		<dependency>
-			<groupId>jakarta.ws.rs</groupId>
-			<artifactId>jakarta.ws.rs-api</artifactId>
-			<version>2.1.6</version>
-		</dependency>
-		<dependency>
-			<groupId>jakarta.annotation</groupId>
-			<artifactId>jakarta.annotation-api</artifactId>
-			<version>1.3.5</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.neethi</groupId>
-			<artifactId>neethi</artifactId>
-			<version>3.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.woodstox</groupId>
-			<artifactId>stax2-api</artifactId>
-			<version>4.2.1</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.woodstox</groupId>
-			<artifactId>woodstox-core</artifactId>
-			<version>6.4.0</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.ws.rs</groupId>
-			<artifactId>javax.ws.rs-api</artifactId>
-			<version>2.0-m10</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ws.xmlschema</groupId>
-			<artifactId>xmlschema-core</artifactId>
-			<version>2.2.5</version>
-		</dependency>
-		<dependency>
-			<groupId>jakarta.jws</groupId>
-			<artifactId>jakarta.jws-api</artifactId>
-			<version>2.1.0</version>
-		</dependency>
-		<dependency>
-			<groupId>jakarta.xml.bind</groupId>
-			<artifactId>jakarta.xml.bind-api</artifactId>
-			<version>2.3.3</version>
-		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jaxb</groupId>
-			<artifactId>jaxb-runtime</artifactId>
-			<version>2.3.3</version>
-		</dependency>
-        <dependency>
-            <groupId>com.sun.istack</groupId>
-            <artifactId>istack-commons-runtime</artifactId>
-            <version>3.0.11</version>
-        </dependency>
-        <dependency>
-		    <groupId>jakarta.xml.soap</groupId>
-		    <artifactId>jakarta.xml.soap-api</artifactId>
-		    <version>1.4.2</version>
-		</dependency>
-	</dependencies>
-
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.8</version>
 				<executions>
 					<execution>
 						<id>copy-dependencies</id>
 						<phase>generate-sources</phase>
 						<goals>
-							<goal>copy-dependencies</goal>
+							<goal>copy</goal>
 						</goals>
 						<configuration>
-							<includeGroupIds>org.apache.cxf,com.sun.activation,jakarta.activation,jakarta.xml.soap,com.sun.istack,org.glassfish.jaxb,jakarta.xml.bind,jakarta.jws,org.apache.ws.xmlschema,javax.ws.rs,com.fasterxml.woodstox,org.codehaus.woodstox,org.apache.neethi,jakarta.annotation,jakarta.ws.rs</includeGroupIds>
-							<excludeTypes>pom</excludeTypes>
-							<excludeTransitive>true</excludeTransitive>
 							<outputDirectory>${project.basedir}/lib</outputDirectory>
+							<artifactItems>
+								<artifactItem>
+									<groupId>org.apache.cxf</groupId>
+									<artifactId>cxf-core</artifactId>
+									<version>${cxf.version}</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.apache.cxf</groupId>
+									<artifactId>cxf-rt-bindings-xml</artifactId>
+									<version>${cxf.version}</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.apache.cxf</groupId>
+									<artifactId>cxf-rt-frontend-jaxrs</artifactId>
+									<version>${cxf.version}</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.apache.cxf</groupId>
+									<artifactId>cxf-rt-rs-client</artifactId>
+									<version>${cxf.version}</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.apache.cxf</groupId>
+									<artifactId>cxf-rt-transports-http</artifactId>
+									<version>${cxf.version}</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.apache.cxf</groupId>
+									<artifactId>cxf-rt-wsdl</artifactId>
+									<version>${cxf.version}</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.apache.cxf</groupId>
+									<artifactId>cxf-rt-bindings-soap</artifactId>
+									<version>${cxf.version}</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.apache.cxf</groupId>
+									<artifactId>cxf-rt-databinding-jaxb</artifactId>
+									<version>${cxf.version}</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.apache.cxf</groupId>
+									<artifactId>cxf-rt-features-clustering</artifactId>
+									<version>${cxf.version}</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.apache.cxf</groupId>
+									<artifactId>cxf-rt-frontend-jaxws</artifactId>
+									<version>${cxf.version}</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.apache.cxf</groupId>
+									<artifactId>cxf-rt-frontend-simple</artifactId>
+									<version>${cxf.version}</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.apache.cxf</groupId>
+									<artifactId>cxf-rt-security</artifactId>
+									<version>${cxf.version}</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.apache.cxf</groupId>
+									<artifactId>cxf-rt-security-saml</artifactId>
+									<version>${cxf.version}</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.apache.cxf</groupId>
+									<artifactId>cxf-rt-ws-addr</artifactId>
+									<version>${cxf.version}</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.apache.cxf</groupId>
+									<artifactId>cxf-rt-ws-policy</artifactId>
+									<version>${cxf.version}</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.apache.cxf</groupId>
+									<artifactId>cxf-rt-ws-security</artifactId>
+									<version>${cxf.version}</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>com.sun.activation</groupId>
+									<artifactId>jakarta.activation</artifactId>
+									<version>1.2.2</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>jakarta.activation</groupId>
+									<artifactId>jakarta.activation-api</artifactId>
+									<version>1.2.2</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>jakarta.ws.rs</groupId>
+									<artifactId>jakarta.ws.rs-api</artifactId>
+									<version>2.1.6</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>jakarta.annotation</groupId>
+									<artifactId>jakarta.annotation-api</artifactId>
+									<version>1.3.5</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.apache.neethi</groupId>
+									<artifactId>neethi</artifactId>
+									<version>3.1.1</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.codehaus.woodstox</groupId>
+									<artifactId>stax2-api</artifactId>
+									<version>4.2.1</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>com.fasterxml.woodstox</groupId>
+									<artifactId>woodstox-core</artifactId>
+									<version>6.4.0</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>javax.ws.rs</groupId>
+									<artifactId>javax.ws.rs-api</artifactId>
+									<version>2.0-m10</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.apache.ws.xmlschema</groupId>
+									<artifactId>xmlschema-core</artifactId>
+									<version>2.2.5</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>jakarta.jws</groupId>
+									<artifactId>jakarta.jws-api</artifactId>
+									<version>2.1.0</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>jakarta.xml.bind</groupId>
+									<artifactId>jakarta.xml.bind-api</artifactId>
+									<version>2.3.3</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.glassfish.jaxb</groupId>
+									<artifactId>jaxb-runtime</artifactId>
+									<version>2.3.3</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>com.sun.istack</groupId>
+									<artifactId>istack-commons-runtime</artifactId>
+									<version>3.0.11</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>jakarta.xml.soap</groupId>
+									<artifactId>jakarta.xml.soap-api</artifactId>
+									<version>1.4.2</version>
+								</artifactItem>
+							</artifactItems>
 						</configuration>
 					</execution>
 				</executions>

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

@@ -9,10 +9,11 @@ Bundle-ClassPath: .,
  lib/jakarta-oro-2.0.8.jar
 Bundle-Vendor: .Talend SA.
 Require-Bundle: org.apache.log4j;resolution:=optional,
- org.talend.libraries.apache.common;visibility:=reexport,
+ org.talend.libraries.apache.common,
  jackson-core-asl;bundle-version="1.9.13",
  jackson-mapper-asl;bundle-version="1.9.13",
- org.apache.xerces
+ org.apache.xerces,
+ org.apache.commons.logging
 Export-Package: 
  org.apache.james.mime4j,
  org.apache.james.mime4j.codec,

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

@@ -33,10 +33,10 @@ Require-Bundle: org.apache.commons.lang,
  org.apache.commons.logging,
  org.apache.commons.collections,
  org.apache.commons.commons-beanutils,
- jackson-core-asl;bundle-version="1.9.13";visibility:=reexport,
- jackson-mapper-asl;bundle-version="1.9.13";visibility:=reexport,
- com.fasterxml.jackson.core.jackson-annotations;bundle-version="2.9.0";visibility:=reexport,
- com.fasterxml.jackson.core.jackson-core;bundle-version="2.9.5";visibility:=reexport,
- com.fasterxml.jackson.core.jackson-databind;bundle-version="2.9.5";visibility:=reexport
+ jackson-core-asl,
+ jackson-mapper-asl,
+ com.fasterxml.jackson.core.jackson-annotations,
+ com.fasterxml.jackson.core.jackson-core,
+ com.fasterxml.jackson.core.jackson-databind
 Bundle-ActivationPolicy: lazy
 Eclipse-BundleShape: dir

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

@@ -9,6 +9,6 @@ Eclipse-ExtensibleAPI: true
 Eclipse-BundleShape: dir
 Export-Package: org.talend.mdm.webservice
 Require-Bundle: org.eclipse.core.runtime,
- org.talend.libraries.apache.cxf;visibility:=reexport
+ org.talend.libraries.apache.cxf
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.talend.libraries.mdm.MdmLibPlugin

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

@@ -19,7 +19,17 @@ Require-Bundle: org.eclipse.core.runtime,
  org.talend.designer.maven,
  org.apache.commons.io,
  org.eclipse.m2e.core,
- org.eclipse.m2e.maven.runtime
+ org.eclipse.m2e.maven.runtime,
+ org.apache.log4j,
+ org.eclipse.jface,
+ org.talend.commons.runtime,
+ org.talend.common.ui.runtime,
+ org.apache.commons.lang,
+ org.apache.commons.lang3,
+ org.talend.studio.studio-utils,
+ org.apache.commons.codec,
+ org.talend.utils,
+ org.talend.libraries.apache
 Bundle-ActivationPolicy: lazy
 Export-Package: org.talend.librariesmanager.ui,
  org.talend.librariesmanager.ui.dialogs,

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

@@ -16,14 +16,23 @@ Require-Bundle: org.eclipse.core.runtime,
  org.talend.libraries.dom4j-jaxen,
  org.talend.libraries.apache.http,
  org.talend.libraries.jackson,
- org.talend.core.runtime;visibility:=reexport,
+ org.talend.core.runtime,
  org.talend.metadata.managment,
  org.apache.log4j,
  org.talend.designer.maven,
  org.talend.components.api,
  org.talend.designer.maven.aether,
  javax.xml.bind,
- org.talend.model
+ org.talend.model,
+ org.talend.commons.runtime,
+ org.eclipse.core.resources,
+ org.talend.studio.studio-utils,
+ com.fasterxml.jackson.core.jackson-annotations,
+ com.fasterxml.jackson.core.jackson-core,
+ com.fasterxml.jackson.core.jackson-databind,
+ org.apache.commons.lang3,
+ org.apache.commons.codec,
+ jackson-mapper-asl
 Eclipse-LazyStart: true
 Export-Package: org.jboss.marshalling,
  org.talend.librariesmanager.emf.librariesindex,

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

@@ -812,8 +812,6 @@ public class ModulesNeededProvider {
         if (importNeedsListForBeans == null) {
             importNeedsListForBeans = getModulesNeededForRoutes(processItem);
 
-            importNeedsListForBeans.add(getComponentModuleById("CAMEL", "camel-cxf"));
-
             importNeedsListForBeans.add(getComponentModuleById("CAMEL", "cxf-core"));
             importNeedsListForBeans.add(getComponentModuleById("CAMEL", "javax.ws.rs-api"));
             for (ModuleNeeded need : importNeedsListForBeans) {

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

@@ -1478,9 +1478,7 @@ public class LocalLibraryManager implements ILibraryManagerService, IChangedLibr
     
     public static boolean isExtComponentProvider(String id) {
        if ("org.talend.designer.components.model.UserComponentsProvider".equals(id)
-               || "org.talend.designer.codegen.components.model.SharedStudioUserComponentProvider".equals(id)
-               || "org.talend.designer.components.exchange.ExchangeComponentsProvider".equals(id)
-               || "org.talend.designer.components.exchange.SharedStudioExchangeComponentsProvider".equals(id)) {
+               || "org.talend.designer.codegen.components.model.SharedStudioUserComponentProvider".equals(id)) {
            return true;
        }
        return false;

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

@@ -23,7 +23,18 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jdt.core,
  org.talend.core.ui,
  org.talend.components.api,
- org.apache.servicemix.bundles.avro
+ org.talend.commons.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.equinox.common,
+ org.eclipse.core.jobs,
+ org.eclipse.osgi,
+ org.talend.common.ui.runtime,
+ org.eclipse.core.runtime,
+ org.talend.cwm.mip,
+ org.talend.daikon,
+ org.talend.libraries.apache,
+ org.talend.studio.studio-utils,
+ avro;bundle-version="1.11.2"
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: .Talend SA.
 Bundle-Localization: plugin

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

@@ -142,7 +142,7 @@ DatabaseTableForm.retreiveButtonIsAccessible=[Retrieve] (\u53D6\u5F97)\u30DC\u30
 DatabaseTableForm.retreiveButtonTip=\u30B9\u30AD\u30FC\u30DE\u3092\u5B9A\u7FA9\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u300C\u30B9\u30AD\u30FC\u30DE\u60C5\u5831\u3092\u53D6\u5F97\u300D\u304C\u4F7F\u7528\u3067\u304D\u307E\u3059!
 DatabaseTableForm.retreiveButtonUse=[\u30B9\u30AD\u30FC\u30DE\u3092\u53D6\u5F97]\u30DC\u30BF\u30F3\u3092\u4F7F\u3063\u3066\u3001\u73FE\u5728\u306E\u30B9\u30AD\u30FC\u30DE\u3092\u30C6\u30FC\u30D6\u30EB\u57FA\u672C\u30B9\u30AD\u30FC\u30DE\u306B\u7F6E\u63DB
 DatabaseTableForm.retreiveSchema=\u30B9\u30AD\u30FC\u30DE\u3092\u53D6\u5F97
-DatabaseTableForm.guessSchema=\u30B9\u30AD\u30FC\u30DE\u3092\u63A8\u6E2C
+DatabaseTableForm.guessSchema=\u63A8\u6E2C\u30B9\u30AD\u30FC\u30DE
 DatabaseTableForm.streamDetach=\u30B9\u30C8\u30EA\u30FC\u30E0\u5206\u96E2
 DatabaseTableForm.table=\u30C6\u30FC\u30D6\u30EB\u306B\u57FA\u3065\u3044\u305F
 DatabaseTableForm.tableColumnText.talbe=\u30C6\u30FC\u30D6\u30EB

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

@@ -30,6 +30,7 @@ import org.talend.core.database.conn.ConnParameterKeys;
 import org.talend.core.database.conn.DatabaseConnStrUtil;
 import org.talend.core.database.conn.template.DbConnStrForHive;
 import org.talend.core.database.conn.template.EDatabaseConnTemplate;
+import org.talend.core.database.conn.version.EDatabaseVersion4Drivers;
 import org.talend.core.hadoop.IHadoopClusterService;
 import org.talend.core.hadoop.repository.HadoopRepositoryUtil;
 import org.talend.core.language.ECodeLanguage;
@@ -53,7 +54,6 @@ import org.talend.core.utils.TalendQuoteUtils;
 import org.talend.cwm.helper.CatalogHelper;
 import org.talend.cwm.helper.ConnectionHelper;
 import org.talend.cwm.helper.SchemaHelper;
-import org.talend.cwm.helper.StudioEncryptionHelper;
 import org.talend.designer.core.model.utils.emf.talendfile.ContextType;
 import org.talend.metadata.managment.repository.ManagerConnection;
 import org.talend.metadata.managment.ui.model.IConnParamName;
@@ -869,6 +869,11 @@ public final class DBConnectionContextUtils {
 
         filePath = TalendQuoteUtils.removeQuotes(filePath);
         dbRootPath = TalendQuoteUtils.removeQuotes(dbRootPath);
+        
+        //
+        if (EDatabaseTypeName.VERTICA.getDisplayName().equals(dbConn.getDatabaseType())) {
+            dbVersionString = EDatabaseVersion4Drivers.VERTICA_12.getVersionValue();
+        }
         // url
 
         String urlConnection;

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

@@ -214,7 +214,10 @@ public class ExtendedNodeConnectionContextUtils {
         StandaloneMaster,
         StandaloneConfigureExecutors,
         StandaloneExecutorMemory,
-        StandaloneExecutorCore
+        StandaloneExecutorCore,
+        
+        //spark submit script
+        SparkSubmitScriptHome
     }
 
     static List<IContextParameter> getContextVariables(final String prefixName, Connection conn, Set<IConnParamName> paramSet) {

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

@@ -16,7 +16,18 @@ Require-Bundle: org.eclipse.ui,
  org.apache.log4j,
  javax.xml.rpc,
  org.eclipse.xsd,
- javax.xml.ws
+ javax.xml.ws,
+ org.talend.cwm.mip,
+ org.apache.commons.codec,
+ org.apache.commons.lang3,
+ org.eclipse.core.resources,
+ org.talend.commons.runtime,
+ org.talend.studio.studio-utils,
+ org.eclipse.equinox.common,
+ org.eclipse.equinox.registry,
+ org.eclipse.core.jobs,
+ org.eclipse.core.runtime,
+ org.talend.libraries.apache.cxf
 Bundle-ActivationPolicy: lazy
 Eclipse-RegisterBuddy: org.talend.testutils
 Export-Package: metadata.managment.i18n,

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

@@ -202,6 +202,14 @@
            name="asm-9.5.jar"
            required="true">
      </libraryNeeded>
+     <libraryNeeded
+          context="Vertica 12.x dbwizard"
+          language="java"
+          message="Vertica 12.x dbwizard for TOP"
+          mvn_uri="mvn:com.vertica.jdbc/vertica-jdbc/12.0.4-0"
+          name="vertica-jdbc-12.0.4-0.jar"
+          required="true">
+    </libraryNeeded>
    </extension>
    <extension
          point="org.talend.core.migrationTask">

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

@@ -94,7 +94,8 @@ public final class DqRepositoryViewService {
 
     public static final String[] TABLE_TYPES = new String[] { ETableTypes.TABLETYPE_TABLE.getName(),
             ETableTypes.EXTERNAL_TABLE.getName(), ETableTypes.MANAGED_TABLE.getName(), ETableTypes.INDEX_TABLE.getName(),
-            ETableTypes.SYSTEM_TABLE.getName() };
+            ETableTypes.SYSTEM_TABLE.getName(), ETableTypes.FOREIGN_TABLE.getName(),
+            ETableTypes.EXTERNAL_TABLE_SPACE.getName() };
 
     public static final String[] VIEW_TYPES = new String[] { ETableTypes.TABLETYPE_VIEW.getName(),
             ETableTypes.VIRTUAL_VIEW.getName() };