Update PATCH_RELEASE_NOTE.md

Fix TUP-38743 Dark Mode: Job editor color is still using light theme in Remote Project
https://jira.talendforge.org/browse/TUP-38743

PATCH_RELEASE_NOTE.md

@@ -0,0 +1,55 @@
+---
+version: 8.0.1
+module: https://talend.poolparty.biz/coretaxonomy/42
+product: 
+- https://talend.poolparty.biz/coretaxonomy/183
+- https://talend.poolparty.biz/coretaxonomy/23
+---
+
+# TPS-5573
+
+| Info             | Value |
+| ---------------- | ---------------- |
+| Patch Name       | Patch\_20231204\_TPS-5573\_v1-8.0.1 |
+| Release date     | 2023-12-04 |
+| Target version   | 20211109\_1610-8.0.1 |
+| Product affected | Talend Studio |
+
+## Introduction
+
+This is a self-contained patch.
+
+**NOTE**: For information on how to obtain this patch, reach out to your Support contact at Talend.
+
+## Fixed issues
+
+This patch contains the following fix:
+
+- TDI-50317 [8.0.1] tFileInputPositional don't parse properly when pattern units field is set to Symbols
+
+
+
+## Prerequisites
+
+Consider the following requirements for your system:
+
+- Must install Talend Studio 8.0.1 with the monthly released patch, Patch\_20230421\_R2023-04_v1-8.0.1.zip.
+- Or must update the Talend Studio 8.0.1 with the URL, https://update.talend.com/Studio/8/updates/R2023-04/.
+
+## Installation
+
+Installation On Studio:
+
+1. Shut down Talend studio if it is opened.
+2. Extract the zip.
+3. Merge the folder "plugins"  and its content to "{studio}/plugins" and overwrite the existing files. 
+4. remove the folder "{studio}/configuration/org.eclipse.osgi".
+5. Start the Talend studio.
+6. Rebuild your jobs.
+ 
+Installation On CI:
+
+1. put the patch in a location that can be reached in CI environment.
+2. copy the patch to <product.path>/patches folder between executions of org.talend.ci:builder-maven-plugin:8.0.x:install and org.talend.ci:builder-maven-plugin:8.0.x:generateAllPoms command.
+3. if it's an automation task for CI/CD, use scripts to do the copy action.
+4. Run the CI/CD task.

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

@@ -5,7 +5,6 @@
   <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
   <license url="http://www.example.com/license">[Enter License Description here.]</license>  
   <requires>
-    <import plugin="org.bouncycastle.bcprov" version="1.70.0" match="greaterOrEqual"/>
     <import plugin="com.cedarsoftware.json-io" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="com.fasterxml.jackson.core.jackson-annotations" version="2.9.0" match="greaterOrEqual"/>
     <import plugin="com.fasterxml.jackson.core.jackson-core" version="2.9.8" match="greaterOrEqual"/>

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

@@ -9,4 +9,7 @@
   </parent>
   <artifactId>org.talend.utils.feature</artifactId>
   <packaging>eclipse-feature</packaging>
+  <properties>
+    <tycho.buildtimestamp.format>${timestamp}</tycho.buildtimestamp.format>
+  </properties>
 </project>

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

@@ -37,6 +37,8 @@ public interface ColorConstants {
     static final Color YELLOW_COLOR = new Color(null, 255, 173, 37);// 254, 182, 84
 
     static final Color RED_COLOR = new Color(null, new RGB(204, 87, 89));// 255
+    
+    static final Color ERROR_FONT_COLOR = new Color(null, new RGB(255, 0, 0));// 255
 
     static final Color VERTICAL_SEPERATOR_LINE_COLOR = new Color(null, 162, 179, 195);
 
@@ -55,12 +57,17 @@ public interface ColorConstants {
 
     static Color getTableBackgroundColor() {
         return ITalendThemeService.getColor(ColorConstants.BUNDLE_ID_COMMON_UI_RUNTIME, ColorConstants.KEY_TABLE_BACKGROUND)
-                .orElse(WHITE_COLOR);
+                .orElse(Display.getDefault().getSystemColor(SWT.COLOR_LIST_BACKGROUND));
     }
 
     static Color getTableForegroundColor() {
         return ITalendThemeService.getColor(ColorConstants.BUNDLE_ID_COMMON_UI_RUNTIME, ColorConstants.KEY_TABLE_FOREGROUND)
-                .orElse(Display.getDefault().getSystemColor(SWT.COLOR_BLACK));
+                .orElse(Display.getDefault().getSystemColor(SWT.COLOR_LIST_FOREGROUND));
+    }
+    
+    static Color getTableReadOnlyForegroundColor() {
+        return ITalendThemeService.getColor("CONTEXT_TABLE_READONLY_FOREGROUND")
+                .orElse(Display.getDefault().getSystemColor(SWT.COLOR_WIDGET_DARK_SHADOW));
     }
 
 }

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

@@ -15,6 +15,7 @@ package org.talend.commons.ui.runtime;
 import java.util.Optional;
 
 import org.apache.commons.lang.StringUtils;
+import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.swt.graphics.Color;
 import org.osgi.framework.BundleContext;
@@ -29,6 +30,8 @@ public interface ITalendThemeService {
 
     public static String DEFAULT_PREFERENCE_ID = "org.eclipse.ui.workbench";
 
+    public static String THEME_PREFERENCE_ID = "org.eclipse.e4.ui.css.swt.theme";
+
     /**
      * Get color from instance scope preference of default bundleId, which managed by theme; the standard way eclipse
      * uses
@@ -132,6 +135,8 @@ public interface ITalendThemeService {
 
     void removePropertyChangeListenerFor(String bundleId, IPropertyChangeListener listener);
 
+    IPreferenceStore getThemePreferenceStore();
+
     static ITalendThemeService get() {
         try {
             BundleContext bc = FrameworkUtil.getBundle(ITalendThemeService.class).getBundleContext();

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

@@ -96,7 +96,7 @@ ProposalUtils.CtrlProposal.ErrorMsg=\u3053\u306E\u30BF\u30A4\u30D7\u306E\u5236\u
 RemovePushButton.RemoveButton.Tip=\u9078\u629E\u3057\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u524A\u9664
 ResetDBTypesButton.ResetDBTypesButton.Tip=DB\u30BF\u30A4\u30D7\u3092\u30EA\u30BB\u30C3\u30C8
 Rule.rule=\u30EB\u30FC\u30EB[{0}]
-SaveAsGenericSchemaPushButton.saveAsSchema=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u3068\u3057\u3066\u4FDD\u5B58
+SaveAsGenericSchemaPushButton.saveAsSchema=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE\u3068\u3057\u3066\u4FDD\u5B58
 SelectContextVariablesPushButton.Label=\u30B3\u30F3\u30C6\u30AF\u30B9\u30C8\u5909\u6570\u3092\u9078\u629E
 SWTCalendarWithTime.contentEvening=\u5915\u65B9
 SWTCalendarWithTime.contentHr=\u6642:

main/plugins/org.talend.commons.runtime/modes/tsql.xml

@@ -283,6 +283,7 @@
 			<KEYWORD1>smallint</KEYWORD1>
 			<KEYWORD1>smallmoney</KEYWORD1>
 			<KEYWORD1>text</KEYWORD1>
+			<KEYWORD1>TIME</KEYWORD1>
 			<KEYWORD1>timestamp</KEYWORD1>
 			<KEYWORD1>tinyint</KEYWORD1>
 			<KEYWORD1>uniqueidentifier</KEYWORD1>

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

@@ -36,6 +36,11 @@ public final class CommonExceptionHandler {
         Priority priority = getPriority(ex);
         process(ex, priority);
     }
+    
+    public static void process(Throwable ex, String msg) {
+        Priority priority = getPriority(ex);
+        process(ex, msg, priority);
+    }
 
     public static void process(Throwable ex, Priority priority) {
         String message = ex.getMessage();
@@ -43,6 +48,13 @@ public final class CommonExceptionHandler {
         log.log(priority, message, ex);
 
     }
+    
+    public static void process(Throwable ex, String msg, Priority priority) {
+        String message = ex.getMessage() + ": " + msg;
+        
+        log.log(priority, message, ex);
+        
+    }
 
     public static void log(String message) {
         log.log(Level.INFO, message);

main/plugins/org.talend.commons.runtime/src/org/talend/commons/runtime/model/emf/CustomXMIResource.java

@@ -0,0 +1,85 @@
+// ============================================================================
+//
+// 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.runtime.model.emf;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.StringJoiner;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.xmi.XMLHelper;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.ecore.xmi.XMLSave;
+import org.eclipse.emf.ecore.xmi.impl.XMISaveImpl;
+import org.eclipse.emf.ecore.xmi.impl.XMLString;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class CustomXMIResource extends TalendXMIResource {
+
+    public static final String ENCODING = "UTF-8"; //$NON-NLS-1$
+
+    CustomXMISave xmiSave;
+
+    public CustomXMIResource() {
+        super();
+    }
+
+    public CustomXMIResource(URI uri) {
+        super(uri);
+    }
+
+    @Override
+    protected void init() {
+        super.init();
+        encoding = ENCODING;
+    }
+
+    @Override
+    protected XMLSave createXMLSave() {
+        xmiSave = new CustomXMISave(createXMLHelper());
+        return xmiSave;
+    }
+
+    public String getResourceContent(Map<?, ?> options) {
+        if (xmiSave == null) {
+            createXMLSave();
+        }
+        return xmiSave.getXMLContent(this, options);
+    }
+
+}
+
+class CustomXMISave extends XMISaveImpl {
+
+    public CustomXMISave(XMLHelper helper) {
+        super(helper);
+    }
+
+    public String getXMLContent(XMLResource resource, Map<?, ?> options) {
+        StringJoiner strJoin = new StringJoiner("");
+        super.init(resource, options);
+        super.traverse(resource.getContents());
+        XMLString xmlString = this.doc;
+        Iterator<String> iterator = xmlString.stringIterator();
+        while (iterator.hasNext()) {
+            String string = (String) iterator.next();
+            if (string != null) {
+                strJoin.add(string);
+            }
+        }
+        return strJoin.toString();
+    }
+
+}

main/plugins/org.talend.commons.runtime/src/org/talend/commons/runtime/model/emf/EmfHelper.java

@@ -16,6 +16,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -263,4 +264,12 @@ public class EmfHelper {
         return result;
     }
 
+    public static String getEmfModelContent(EObject model) throws Exception {
+        String content = "";
+        CustomXMIResource xmiResource = new CustomXMIResource();
+        xmiResource.getContents().add(model);
+        content = xmiResource.getResourceContent(Collections.EMPTY_MAP);
+        return content;
+    }
+
 }

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/network/NetworkUtil.java

@@ -33,6 +33,7 @@ import java.util.regex.Pattern;
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.talend.commons.exception.CommonExceptionHandler;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.runtime.utils.io.FileCopyUtils;
 
@@ -108,6 +109,7 @@ public class NetworkUtil {
                 return true;
             }
         } catch (Exception e) {
+            CommonExceptionHandler.process(e, getCheckUrl());
             return false;
         } finally {
             conn.disconnect();
@@ -144,6 +146,7 @@ public class NetworkUtil {
             conn.setRequestMethod("HEAD"); //$NON-NLS-1$
             conn.getResponseMessage();
         } catch (Exception e) {
+            CommonExceptionHandler.process(e, urlString);
             // if not reachable , will throw exception(time out/unknown host) .So if catched exception, make it a
             // invalid server
             return false;

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

@@ -92,7 +92,7 @@ ProposalUtils.CtrlProposal.ErrorMsg=\u3053\u306E\u30BF\u30A4\u30D7\u306E\u5236\u
 RemovePushButton.RemoveButton.Tip=\u9078\u629E\u3057\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u524A\u9664
 ResetDBTypesButton.ResetDBTypesButton.Tip=DB\u30BF\u30A4\u30D7\u3092\u30EA\u30BB\u30C3\u30C8
 Rule.rule=\u30EB\u30FC\u30EB[{0}]
-SaveAsGenericSchemaPushButton.saveAsSchema=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u3068\u3057\u3066\u4FDD\u5B58
+SaveAsGenericSchemaPushButton.saveAsSchema=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE\u3068\u3057\u3066\u4FDD\u5B58
 SelectContextVariablesPushButton.Label=\u30B3\u30F3\u30C6\u30AF\u30B9\u30C8\u5909\u6570\u3092\u9078\u629E
 SWTCalendarWithTime.contentEvening=\u5915\u65B9
 SWTCalendarWithTime.contentHr=\u6642:

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

@@ -18,12 +18,12 @@ import java.util.Iterator;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.jface.resource.StringConverter;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.widgets.Display;
+import org.talend.commons.ui.runtime.ITalendThemeService;
 import org.talend.commons.ui.swt.colorstyledtext.scanner.ColoringScanner;
 
 /**
@@ -33,7 +33,7 @@ import org.talend.commons.ui.swt.colorstyledtext.scanner.ColoringScanner;
  *
  */
 public class ColorManager {
-
+    
     public static final RGB DEFAULT_STRING_COLOR = new RGB(0, 0, 0);
 
     public static final RGB DEFAULT_KEYWORD1_COLOR = new RGB(50, 32, 160);
@@ -106,15 +106,19 @@ public class ColorManager {
     }
 
     public Color getColor(String colorName) {
-        RGB prefColor = PreferenceConverter.getColor(store, colorName);
-        Color color = null;
-        if (colorMap.containsKey(colorName) && (colorMap.get(colorName)).getRGB().equals(prefColor)) {
-            color = (Color) colorMap.get(colorName);
+        Color prefColor = getThemeColor(colorName);
+        if (colorMap.containsKey(colorName) && (colorMap.get(colorName)).equals(prefColor)) {
+            return colorMap.get(colorName);
         } else {
-            color = new Color(Display.getDefault(), prefColor);
-            colorMap.put(colorName, color);
+            colorMap.put(colorName, prefColor);
         }
-        return color;
+        return prefColor;
+    }
+
+    private static Color getThemeColor(String colorName) {
+        Color c = ITalendThemeService.getColor(colorName)
+                .orElse(Display.getDefault().getSystemColor(SWT.COLOR_INFO_FOREGROUND));
+        return c;
     }
 
     public void dispose() {
@@ -164,20 +168,20 @@ public class ColorManager {
     }
 
     public static void initDefaultColors(IPreferenceStore store) {
-        store.setDefault(NULL_COLOR, StringConverter.asString(DEFAULT_STRING_COLOR));
-        store.setDefault(COMMENT1_COLOR, StringConverter.asString(DEFAULT_COMMENT1_COLOR));
-        store.setDefault(COMMENT2_COLOR, StringConverter.asString(DEFAULT_COMMENT2_COLOR));
-        store.setDefault(LITERAL1_COLOR, StringConverter.asString(DEFAULT_LITERAL1_COLOR));
-        store.setDefault(LITERAL2_COLOR, StringConverter.asString(DEFAULT_LITERAL2_COLOR));
-        store.setDefault(LABEL_COLOR, StringConverter.asString(DEFAULT_LABEL_COLOR));
-        store.setDefault(KEYWORD1_COLOR, StringConverter.asString(DEFAULT_KEYWORD1_COLOR));
-        store.setDefault(KEYWORD2_COLOR, StringConverter.asString(DEFAULT_KEYWORD2_COLOR));
-        store.setDefault(KEYWORD3_COLOR, StringConverter.asString(DEFAULT_KEYWORD3_COLOR));
-        store.setDefault(FUNCTION_COLOR, StringConverter.asString(DEFAULT_FUNCTION_COLOR));
-        store.setDefault(MARKUP_COLOR, StringConverter.asString(DEFAULT_MARKUP_COLOR));
-        store.setDefault(OPERATOR_COLOR, StringConverter.asString(DEFAULT_OPERATOR_COLOR));
-        store.setDefault(DIGIT_COLOR, StringConverter.asString(DEFAULT_DIGIT_COLOR));
-        store.setDefault(INVALID_COLOR, StringConverter.asString(DEFAULT_INVALID_COLOR));
+        store.setDefault(NULL_COLOR, StringConverter.asString(getThemeColor(NULL_COLOR).getRGB()));
+        store.setDefault(COMMENT1_COLOR, StringConverter.asString(getThemeColor(COMMENT1_COLOR).getRGB()));
+        store.setDefault(COMMENT2_COLOR, StringConverter.asString(getThemeColor(COMMENT2_COLOR).getRGB()));
+        store.setDefault(LITERAL1_COLOR, StringConverter.asString(getThemeColor(LITERAL1_COLOR).getRGB()));
+        store.setDefault(LITERAL2_COLOR, StringConverter.asString(getThemeColor(LITERAL2_COLOR).getRGB()));
+        store.setDefault(LABEL_COLOR, StringConverter.asString(getThemeColor(LABEL_COLOR).getRGB()));
+        store.setDefault(KEYWORD1_COLOR, StringConverter.asString(getThemeColor(KEYWORD1_COLOR).getRGB()));
+        store.setDefault(KEYWORD2_COLOR, StringConverter.asString(getThemeColor(KEYWORD2_COLOR).getRGB()));
+        store.setDefault(KEYWORD3_COLOR, StringConverter.asString(getThemeColor(KEYWORD3_COLOR).getRGB()));
+        store.setDefault(FUNCTION_COLOR, StringConverter.asString(getThemeColor(FUNCTION_COLOR).getRGB()));
+        store.setDefault(MARKUP_COLOR, StringConverter.asString(getThemeColor(MARKUP_COLOR).getRGB()));
+        store.setDefault(OPERATOR_COLOR, StringConverter.asString(getThemeColor(OPERATOR_COLOR).getRGB()));
+        store.setDefault(DIGIT_COLOR, StringConverter.asString(getThemeColor(DIGIT_COLOR).getRGB()));
+        store.setDefault(INVALID_COLOR, StringConverter.asString(getThemeColor(INVALID_COLOR).getRGB()));
 
         String bold = BOLD_SUFFIX;
         store.setDefault(COMMENT1_COLOR + bold, false);

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

@@ -1,368 +1,384 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.commons.ui.swt.colorstyledtext;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.rules.IToken;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ExtendedModifyEvent;
-import org.eclipse.swt.custom.ExtendedModifyListener;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-import org.talend.commons.runtime.xml.XmlUtil;
-import org.talend.commons.ui.runtime.i18n.Messages;
-import org.talend.commons.ui.runtime.image.ImageProvider;
-import org.talend.commons.ui.swt.colorstyledtext.jedit.Mode;
-import org.talend.commons.ui.swt.colorstyledtext.jedit.Modes;
-import org.talend.commons.ui.swt.colorstyledtext.rules.CToken;
-import org.talend.commons.ui.swt.colorstyledtext.scanner.ColoringScanner;
-import org.talend.commons.utils.threading.ExecutionLimiter;
-
-/**
- * This component is an adaptation of a Color Editor for a StyledText.
- *
- * The original editor can be found on http://www.gstaff.org/colorEditor/ <br/>
- *
- * <b>How to use it, example :</b> <br/>
- * ColorStyledText text = new ColorStyledText(parent, SWT.H_SCROLL | SWT.V_SCROLL,
- * CorePlugin.getDefault().getPreferenceStore(), ECodeLanguage.PERL.getName());</i> <br/>
- * <br/>
- *
- * $Id: ColorStyledText.java 7183 2007-11-23 11:03:36Z amaumont $
- *
- */
-public class ColorStyledText extends StyledText {
-
-    private final static int MAXIMUM_CHARACTERS_BEFORE_USE_TIMER = 1000;
-
-    private final ColorManager colorManager;
-
-    private final ColoringScanner scanner;
-
-    private final String languageMode;
-
-    private final MenuItem pasteItem;
-
-    private boolean coloring = true;
-
-    private UndoRedoManager undoRedoManager;
-
-    public ColorStyledText(Composite parent, int style, IPreferenceStore store, String languageMode) {
-        super(parent, style);
-        this.languageMode = languageMode;
-        this.colorManager = new ColorManager(store);
-
-        /*
-         * set the Shortcuts of the undo/redo
-         */
-        this.setKeyBinding('Z' | SWT.CTRL, ActionCode.UNDO);
-        this.setKeyBinding('Y' | SWT.CTRL, ActionCode.REDO);
-        UndoRedoManager undoManager = new UndoRedoManager(50);
-        undoManager.connect(this);
-        this.setUndoManager(undoManager);
-
-        ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages();
-        Menu popupMenu = new Menu(this);
-
-        MenuItem redoItem = new MenuItem(popupMenu, SWT.PUSH);
-        redoItem.setText(Messages.getString("ColorStyledText.RedoItem.Text")); //$NON-NLS-1$
-        redoItem.addListener(SWT.Selection, new Listener() {
-
-            public void handleEvent(Event event) {
-                redo();
-            }
-        });
-
-        MenuItem undoItem = new MenuItem(popupMenu, SWT.PUSH);
-        undoItem.setText(Messages.getString("ColorStyledText.UndoItem.Text")); //$NON-NLS-1$
-        undoItem.addListener(SWT.Selection, new Listener() {
-
-            public void handleEvent(Event event) {
-                undo();
-            }
-        });
-
-        Image image = ImageProvider.getImage(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_COPY));
-        MenuItem copyItem = new MenuItem(popupMenu, SWT.PUSH);
-        copyItem.setText(Messages.getString("ColorStyledText.CopyItem.Text")); //$NON-NLS-1$
-        copyItem.setImage(image);
-        copyItem.addListener(SWT.Selection, new Listener() {
-
-            public void handleEvent(Event event) {
-                copy();
-            }
-        });
-
-        image = ImageProvider.getImage(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE));
-        pasteItem = new MenuItem(popupMenu, SWT.PUSH);
-        pasteItem.setText(Messages.getString("ColorStyledText.PasteItem.Text")); //$NON-NLS-1$
-        pasteItem.setData(this);
-        pasteItem.setImage(image);
-        pasteItem.addListener(SWT.Selection, new Listener() {
-
-            public void handleEvent(Event event) {
-                paste();
-            }
-        });
-        pasteItem.setEnabled(getEditable());
-
-        this.setMenu(popupMenu);
-        MenuItem selectAllItem = new MenuItem(popupMenu, SWT.PUSH);
-        selectAllItem.setText(Messages.getString("ColorStyledText.SelectAllItem.Text")); //$NON-NLS-1$
-        selectAllItem.addListener(SWT.Selection, new Listener() {
-
-            public void handleEvent(Event event) {
-                selectAll();
-            }
-        });
-        this.setMenu(popupMenu);
-
-        Listener selectAllListener = new Listener() {
-
-            public void handleEvent(Event event) {
-                if (event.character == '\u0001') { // CTRL + A
-                    selectAll();
-                }
-            }
-        };
-
-        addListener(SWT.KeyDown, selectAllListener);
-
-        Mode mode = Modes.getMode(languageMode + XmlUtil.FILE_XML_SUFFIX);
-        scanner = new ColoringScanner(mode, colorManager);
-
-        addExtendedModifyListener(modifyListener);
-    }
-
-    /**
-     * DOC qli Comment method "invokeAction".
-     *
-     * @param action
-     *
-     * */
-    public void invokeAction(int action) {
-        super.invokeAction(action);
-
-        switch (action) {
-        case ActionCode.UNDO:
-            undo(); // ctrl+Z
-            break;
-        case ActionCode.REDO:
-            redo(); // ctrl+Y
-            break;
-        }
-    }
-
-    /**
-     * Getter for undoRedoManager.
-     *
-     * @return the undoRedoManager
-     */
-    public UndoRedoManager getUndoManager() {
-        return this.undoRedoManager;
-    }
-
-    /**
-     * Sets the undoRedoManager.
-     *
-     * @param undoRedoManager the undoRedoManager to set
-     */
-    public void setUndoManager(UndoRedoManager undoRedoManager) {
-        this.undoRedoManager = undoRedoManager;
-    }
-
-    public static class ActionCode {
-
-        public static final int UNDO = Integer.MAX_VALUE;
-
-        public static final int REDO = UNDO - 1;
-
-    }
-
-    private void undo() {
-        if (undoRedoManager != null) {
-            undoRedoManager.undo();
-        }
-    }
-
-    private void redo() {
-        if (undoRedoManager != null) {
-            undoRedoManager.redo();
-        }
-    }
-
-    protected void colorize(final ColoringScanner scanner) {
-        final ArrayList<StyleRange> styles = new ArrayList<StyleRange>();
-        if (this.coloring) {
-            IToken token;
-            if (this.isDisposed()) {
-                return;
-            }
-
-            scanner.parse(this.getText().replaceAll("\"", " ").replaceAll("'", " ")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-
-            do {
-                token = scanner.nextToken();
-                if (!token.isEOF()) {
-                    if (token instanceof CToken) {
-                        CToken ctoken = (CToken) token;
-                        StyleRange styleRange;
-                        styleRange = new StyleRange();
-                        styleRange.start = scanner.getTokenOffset();
-                        styleRange.length = scanner.getTokenLength();
-                        if (ctoken.getType() == null) {
-                            styleRange.fontStyle = colorManager.getStyleFor(ctoken.getColor());
-                            styleRange.foreground = colorManager.getColor(ctoken.getColor());
-                        } else {
-                            styleRange.fontStyle = colorManager.getStyleForType(ctoken.getColor());
-                            styleRange.foreground = colorManager.getColorForType(ctoken.getColor());
-                        }
-                        styles.add(styleRange);
-                    }
-                }
-            } while (!token.isEOF());
-            setStyles(styles);
-        } else {
-            StyleRange styleRange = new StyleRange();
-            styles.add(styleRange);
-            styleRange.start = 0;
-            styleRange.length = this.getText().getBytes().length;
-            styleRange.foreground = null;
-            setStyles(styles);
-        }
-    }
-
-    public void setStyles(final ArrayList<StyleRange> styles) {
-        if (ColorStyledText.this.isDisposed()) {
-            return;
-        }
-        int countChars = getCharCount();
-
-        for (int i = 0; i < styles.size(); i++) {
-            StyleRange styleRange = styles.get(i);
-            // System.out.println("styleRange.start=" + styleRange.start);
-            // System.out.println("styleRange.length=" + styleRange.length);
-            if (!(0 <= styleRange.start && styleRange.start + styleRange.length <= countChars)) {
-                continue;
-            }
-            setStyleRange(styleRange);
-        }
-    }
-
-    ExtendedModifyListener modifyListener = new ExtendedModifyListener() {
-
-        public void modifyText(ExtendedModifyEvent event) {
-            if (ColorStyledText.this.getCharCount() > MAXIMUM_CHARACTERS_BEFORE_USE_TIMER) {
-                colorizeLimiter.resetTimer();
-                colorizeLimiter.startIfExecutable(true, null);
-            } else {
-                getDisplay().asyncExec(new Runnable() {
-
-                    public void run() {
-                        colorize(scanner);
-                    }
-
-                });
-            }
-        }
-    };
-
-    public ColorManager getColorManager() {
-        return this.colorManager;
-    }
-
-    public String getLanguageMode() {
-        return this.languageMode;
-    }
-
-    public ColoringScanner getScanner() {
-        return this.scanner;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.eclipse.swt.custom.StyledText#setEditable(boolean)
-     */
-    @Override
-    public void setEditable(boolean editable) {
-        super.setEditable(editable);
-        if (pasteItem != null) {
-            pasteItem.setEnabled(editable);
-        }
-    }
-
-    /**
-     * Getter for coloring.
-     *
-     * @return the coloring
-     */
-    public boolean isColoring() {
-        return this.coloring;
-    }
-
-    /**
-     * Sets the coloring.
-     *
-     * @param coloring the coloring to set
-     */
-    public void setColoring(boolean coloring) {
-        boolean wasDifferent = this.coloring != coloring;
-        this.coloring = coloring;
-        if (!coloring) {
-            removeExtendedModifyListener(modifyListener);
-        } else if (wasDifferent) {
-            colorizeLimiter.resetTimer();
-            colorizeLimiter.startIfExecutable(true, null);
-            addExtendedModifyListener(modifyListener);
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.eclipse.swt.widgets.Widget#dispose()
-     */
-    @Override
-    public void dispose() {
-        super.dispose();
-        colorManager.dispose();
-    }
-
-    private final ExecutionLimiter colorizeLimiter = new ExecutionLimiter(1000, true) {
-
-        @Override
-        public void execute(final boolean isFinalExecution, Object data) {
-            if (!isDisposed()) {
-                getDisplay().asyncExec(new Runnable() {
-
-                    public void run() {
-                        colorize(scanner);
-                    }
-
-                });
-            }
-        }
-    };
-
-}
+// ============================================================================
+//
+// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.commons.ui.swt.colorstyledtext;
+
+import java.util.ArrayList;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.ExtendedModifyEvent;
+import org.eclipse.swt.custom.ExtendedModifyListener;
+import org.eclipse.swt.custom.StyleRange;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.MenuItem;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
+import org.talend.commons.runtime.xml.XmlUtil;
+import org.talend.commons.ui.runtime.ITalendThemeService;
+import org.talend.commons.ui.runtime.i18n.Messages;
+import org.talend.commons.ui.runtime.image.ImageProvider;
+import org.talend.commons.ui.swt.colorstyledtext.jedit.Mode;
+import org.talend.commons.ui.swt.colorstyledtext.jedit.Modes;
+import org.talend.commons.ui.swt.colorstyledtext.rules.CToken;
+import org.talend.commons.ui.swt.colorstyledtext.scanner.ColoringScanner;
+import org.talend.commons.utils.threading.ExecutionLimiter;
+
+/**
+ * This component is an adaptation of a Color Editor for a StyledText.
+ *
+ * The original editor can be found on http://www.gstaff.org/colorEditor/ <br/>
+ *
+ * <b>How to use it, example :</b> <br/>
+ * ColorStyledText text = new ColorStyledText(parent, SWT.H_SCROLL | SWT.V_SCROLL,
+ * CorePlugin.getDefault().getPreferenceStore(), ECodeLanguage.PERL.getName());</i> <br/>
+ * <br/>
+ *
+ * $Id: ColorStyledText.java 7183 2007-11-23 11:03:36Z amaumont $
+ *
+ */
+public class ColorStyledText extends StyledText {
+    
+
+    public static final String PREFERENCE_COLOR_FOREGROUND= "ColorStyledText.Color.Foreground"; //$NON-NLS-1$
+    public static final String PREFERENCE_COLOR_BACKGROUND= "ColorStyledText.Color.Background"; //$NON-NLS-1$
+    public static final String PREFERENCE_COLOR_SELECTION_FOREGROUND= "ColorStyledText.Color.SelectionForeground"; //$NON-NLS-1$
+    public static final String PREFERENCE_COLOR_SELECTION_BACKGROUND= "ColorStyledText.Color.SelectionBackground"; //$NON-NLS-1$
+
+    private final static int MAXIMUM_CHARACTERS_BEFORE_USE_TIMER = 1000;
+
+    private final ColorManager colorManager;
+
+    private final ColoringScanner scanner;
+
+    private final String languageMode;
+
+    private final MenuItem pasteItem;
+
+    private boolean coloring = true;
+
+    private UndoRedoManager undoRedoManager;
+
+    public ColorStyledText(Composite parent, int style, IPreferenceStore store, String languageMode) {
+        super(parent, style);
+        this.languageMode = languageMode;
+        this.colorManager = new ColorManager(store);
+
+        /*
+         * set the Shortcuts of the undo/redo
+         */
+        this.setKeyBinding('Z' | SWT.CTRL, ActionCode.UNDO);
+        this.setKeyBinding('Y' | SWT.CTRL, ActionCode.REDO);
+        UndoRedoManager undoManager = new UndoRedoManager(50);
+        undoManager.connect(this);
+        this.setUndoManager(undoManager);
+
+        ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages();
+        Menu popupMenu = new Menu(this);
+
+        MenuItem redoItem = new MenuItem(popupMenu, SWT.PUSH);
+        redoItem.setText(Messages.getString("ColorStyledText.RedoItem.Text")); //$NON-NLS-1$
+        redoItem.addListener(SWT.Selection, new Listener() {
+
+            public void handleEvent(Event event) {
+                redo();
+            }
+        });
+
+        MenuItem undoItem = new MenuItem(popupMenu, SWT.PUSH);
+        undoItem.setText(Messages.getString("ColorStyledText.UndoItem.Text")); //$NON-NLS-1$
+        undoItem.addListener(SWT.Selection, new Listener() {
+
+            public void handleEvent(Event event) {
+                undo();
+            }
+        });
+
+        Image image = ImageProvider.getImage(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_COPY));
+        MenuItem copyItem = new MenuItem(popupMenu, SWT.PUSH);
+        copyItem.setText(Messages.getString("ColorStyledText.CopyItem.Text")); //$NON-NLS-1$
+        copyItem.setImage(image);
+        copyItem.addListener(SWT.Selection, new Listener() {
+
+            public void handleEvent(Event event) {
+                copy();
+            }
+        });
+
+        image = ImageProvider.getImage(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE));
+        pasteItem = new MenuItem(popupMenu, SWT.PUSH);
+        pasteItem.setText(Messages.getString("ColorStyledText.PasteItem.Text")); //$NON-NLS-1$
+        pasteItem.setData(this);
+        pasteItem.setImage(image);
+        pasteItem.addListener(SWT.Selection, new Listener() {
+
+            public void handleEvent(Event event) {
+                paste();
+            }
+        });
+        pasteItem.setEnabled(getEditable());
+
+        this.setMenu(popupMenu);
+        MenuItem selectAllItem = new MenuItem(popupMenu, SWT.PUSH);
+        selectAllItem.setText(Messages.getString("ColorStyledText.SelectAllItem.Text")); //$NON-NLS-1$
+        selectAllItem.addListener(SWT.Selection, new Listener() {
+
+            public void handleEvent(Event event) {
+                selectAll();
+            }
+        });
+        this.setMenu(popupMenu);
+
+        Listener selectAllListener = new Listener() {
+
+            public void handleEvent(Event event) {
+                if (event.character == '\u0001') { // CTRL + A
+                    selectAll();
+                }
+            }
+        };
+
+        addListener(SWT.KeyDown, selectAllListener);
+
+        Mode mode = Modes.getMode(languageMode + XmlUtil.FILE_XML_SUFFIX);
+        scanner = new ColoringScanner(mode, colorManager);
+
+        addExtendedModifyListener(modifyListener);
+        initColorSetting();
+    }
+    
+
+    protected void initColorSetting() {       
+        this.setForeground(ITalendThemeService.getColor(PREFERENCE_COLOR_FOREGROUND).orElse(null));
+        this.setBackground(ITalendThemeService.getColor(PREFERENCE_COLOR_BACKGROUND).orElse(null));
+        this.setSelectionBackground(ITalendThemeService.getColor(PREFERENCE_COLOR_SELECTION_BACKGROUND).orElse(null));
+        this.setSelectionForeground(ITalendThemeService.getColor(PREFERENCE_COLOR_SELECTION_FOREGROUND).orElse(null));
+    }
+
+    /**
+     * DOC qli Comment method "invokeAction".
+     *
+     * @param action
+     *
+     * */
+    public void invokeAction(int action) {
+        super.invokeAction(action);
+
+        switch (action) {
+        case ActionCode.UNDO:
+            undo(); // ctrl+Z
+            break;
+        case ActionCode.REDO:
+            redo(); // ctrl+Y
+            break;
+        }
+    }
+
+    /**
+     * Getter for undoRedoManager.
+     *
+     * @return the undoRedoManager
+     */
+    public UndoRedoManager getUndoManager() {
+        return this.undoRedoManager;
+    }
+
+    /**
+     * Sets the undoRedoManager.
+     *
+     * @param undoRedoManager the undoRedoManager to set
+     */
+    public void setUndoManager(UndoRedoManager undoRedoManager) {
+        this.undoRedoManager = undoRedoManager;
+    }
+
+    public static class ActionCode {
+
+        public static final int UNDO = Integer.MAX_VALUE;
+
+        public static final int REDO = UNDO - 1;
+
+    }
+
+    private void undo() {
+        if (undoRedoManager != null) {
+            undoRedoManager.undo();
+        }
+    }
+
+    private void redo() {
+        if (undoRedoManager != null) {
+            undoRedoManager.redo();
+        }
+    }
+
+    protected void colorize(final ColoringScanner scanner) {
+        final ArrayList<StyleRange> styles = new ArrayList<StyleRange>();
+        if (this.coloring) {
+            IToken token;
+            if (this.isDisposed()) {
+                return;
+            }
+
+            scanner.parse(this.getText().replaceAll("\"", " ").replaceAll("'", " ")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+
+            do {
+                token = scanner.nextToken();
+                if (!token.isEOF()) {
+                    if (token instanceof CToken) {
+                        CToken ctoken = (CToken) token;
+                        StyleRange styleRange;
+                        styleRange = new StyleRange();
+                        styleRange.start = scanner.getTokenOffset();
+                        styleRange.length = scanner.getTokenLength();
+                        if (ctoken.getType() == null) {
+                            styleRange.fontStyle = colorManager.getStyleFor(ctoken.getColor());
+                            styleRange.foreground = colorManager.getColor(ctoken.getColor());
+                        } else {
+                            styleRange.fontStyle = colorManager.getStyleForType(ctoken.getColor());
+                            styleRange.foreground = colorManager.getColorForType(ctoken.getColor());
+                        }
+                        styles.add(styleRange);
+                    }
+                }
+            } while (!token.isEOF());
+            setStyles(styles);
+        } else {
+            StyleRange styleRange = new StyleRange();
+            styles.add(styleRange);
+            styleRange.start = 0;
+            styleRange.length = this.getText().getBytes().length;
+            styleRange.foreground = null;
+            setStyles(styles);
+        }
+    }
+
+    public void setStyles(final ArrayList<StyleRange> styles) {
+        if (ColorStyledText.this.isDisposed()) {
+            return;
+        }
+        int countChars = getCharCount();
+
+        for (int i = 0; i < styles.size(); i++) {
+            StyleRange styleRange = styles.get(i);
+            // System.out.println("styleRange.start=" + styleRange.start);
+            // System.out.println("styleRange.length=" + styleRange.length);
+            if (!(0 <= styleRange.start && styleRange.start + styleRange.length <= countChars)) {
+                continue;
+            }
+            setStyleRange(styleRange);
+        }
+    }
+
+    ExtendedModifyListener modifyListener = new ExtendedModifyListener() {
+
+        public void modifyText(ExtendedModifyEvent event) {
+            if (ColorStyledText.this.getCharCount() > MAXIMUM_CHARACTERS_BEFORE_USE_TIMER) {
+                colorizeLimiter.resetTimer();
+                colorizeLimiter.startIfExecutable(true, null);
+            } else {
+                getDisplay().asyncExec(new Runnable() {
+
+                    public void run() {
+                        colorize(scanner);
+                    }
+
+                });
+            }
+        }
+    };
+
+    public ColorManager getColorManager() {
+        return this.colorManager;
+    }
+
+    public String getLanguageMode() {
+        return this.languageMode;
+    }
+
+    public ColoringScanner getScanner() {
+        return this.scanner;
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.eclipse.swt.custom.StyledText#setEditable(boolean)
+     */
+    @Override
+    public void setEditable(boolean editable) {
+        super.setEditable(editable);
+        if (pasteItem != null) {
+            pasteItem.setEnabled(editable);
+        }
+    }
+
+    /**
+     * Getter for coloring.
+     *
+     * @return the coloring
+     */
+    public boolean isColoring() {
+        return this.coloring;
+    }
+
+    /**
+     * Sets the coloring.
+     *
+     * @param coloring the coloring to set
+     */
+    public void setColoring(boolean coloring) {
+        boolean wasDifferent = this.coloring != coloring;
+        this.coloring = coloring;
+        if (!coloring) {
+            removeExtendedModifyListener(modifyListener);
+        } else if (wasDifferent) {
+            colorizeLimiter.resetTimer();
+            colorizeLimiter.startIfExecutable(true, null);
+            addExtendedModifyListener(modifyListener);
+        }
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.eclipse.swt.widgets.Widget#dispose()
+     */
+    @Override
+    public void dispose() {
+        super.dispose();
+        colorManager.dispose();
+    }
+
+    private final ExecutionLimiter colorizeLimiter = new ExecutionLimiter(1000, true) {
+
+        @Override
+        public void execute(final boolean isFinalExecution, Object data) {
+            if (!isDisposed()) {
+                getDisplay().asyncExec(new Runnable() {
+
+                    public void run() {
+                        colorize(scanner);
+                    }
+
+                });
+            }
+        }
+    };
+
+}

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/tableviewer/celleditor/DialogErrorForCellEditorListener.java

@@ -16,8 +16,10 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ICellEditorListener;
 import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Text;
+import org.talend.commons.ui.runtime.ColorConstants;
 import org.talend.commons.ui.runtime.i18n.Messages;
 import org.talend.commons.ui.runtime.swt.tableviewer.data.ModifiedObjectInfo;
 import org.talend.commons.ui.runtime.thread.AsynchronousThreading;
@@ -39,6 +41,8 @@ public abstract class DialogErrorForCellEditorListener implements ICellEditorLis
     protected TableViewerCreatorColumn column;
 
     protected TableViewerCreator tableViewerCreator;
+    
+    private Color tableBackground = ColorConstants.getTableBackgroundColor();
 
     /**
      * DOC amaumont CellEditorListener constructor comment.
@@ -89,7 +93,7 @@ public abstract class DialogErrorForCellEditorListener implements ICellEditorLis
         final String errorMessage = validateValue(newValue, beanPosition);
         if (errorMessage == null) {
             newValidValueTyped(beanPosition, lastValidValue, newValue, state);
-            text.setBackground(text.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+            text.setBackground(tableBackground);
             lastValidValue = newValue;
         } else {
             text.setBackground(text.getDisplay().getSystemColor(SWT.COLOR_RED));

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/utils/workbench/gef/SimpleHtmlFigure.java

@@ -31,6 +31,7 @@ import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.widgets.Display;
 import org.talend.commons.ui.gmf.util.DisplayUtils;
+import org.talend.commons.ui.runtime.ITalendThemeService;
 
 /**
  * Figure managing some simple HTML styles. <br/>
@@ -77,6 +78,8 @@ public class SimpleHtmlFigure extends Figure {
     private static Font boldFont = null;
 
     private static Font boldItalicFont = null;
+    
+    private static final Color DEFAULT_LABEL_COLOR = ITalendThemeService.getColor("NODE_FIGURE_LABEL_FORCEGROUND").orElse(Display.getDefault().getSystemColor(SWT.COLOR_BLACK));
 
     /**
      * Constructs a new SimpleHtmlFigure.
@@ -262,6 +265,8 @@ public class SimpleHtmlFigure extends Figure {
             label.setFont(fontToUse);
             if (colorStack.size() > 0) {
                 label.setForegroundColor(colorStack.get(colorStack.size() - 1));
+            } else {
+                label.setForegroundColor(DEFAULT_LABEL_COLOR); // Set label default foreground color
             }
             horizContainer.add(label);
         }

main/plugins/org.talend.core.repository/plugin.xml

@@ -285,6 +285,30 @@
                 type="INFORMIX">
           </DBType>
        </RepositoryComponent>
+       <RepositoryComponent
+             name="INGRES"
+             withSchema="true"
+             input="tIngresInput"
+             output="tIngresOutput">
+          <Item
+                clazz="org.talend.core.model.properties.DatabaseConnectionItem">
+          </Item>
+          <DBType
+                type="INGRES">
+          </DBType>
+       </RepositoryComponent>
+       <RepositoryComponent
+             name="VECTORWISE"
+             withSchema="true"
+             input="tVectorWiseInput"
+             output="tVectorWiseOutput">
+          <Item
+                clazz="org.talend.core.model.properties.DatabaseConnectionItem">
+          </Item>
+          <DBType
+                type="VECTORWISE">
+          </DBType>
+       </RepositoryComponent>
        <RepositoryComponent
              name="JAVADB"
              withSchema="true"

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

@@ -204,3 +204,4 @@ RenameFolderAction.warning.cannotFind.title=Action not available
 ConvertJobsUtil.warning.title=Warning
 ConvertJobsUtil.warning.message=The target framework is not fully supported for this release.
 SyncLibrariesLoginTask.createStatsLogAndImplicitParamter=Create stats log and implicit parameters
+WizardPageAPIDefinition_operationIdMissing=API is missing operationIds. operationIds are used to initialize tRESTRequest/cRest output flows. See tRESTRequest/cRest online help.

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

@@ -204,3 +204,4 @@ RenameFolderAction.warning.cannotFind.title=Action non disponible
 ConvertJobsUtil.warning.title=Avertissement
 ConvertJobsUtil.warning.message=Le framework cible n'est pas totalement support\u00E9 dans cette version.
 SyncLibrariesLoginTask.createStatsLogAndImplicitParamter=Cr\u00E9er des logs de stat et des param\u00E8tres implicites.
+WizardPageAPIDefinition_operationIdMissing=Des operationIds manquent dans l'API. Ces operationIds sont utilis\u00E9s pour initialiser les flux de sortie du tRESTRequest/cRest. Consultez l'aide en ligne des composants tRESTRequest/cRest.

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

@@ -156,7 +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.genericSchema=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE
+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
 ProjectRepositoryNode.calculationViewSchemas=\u8A08\u7B97\u30D3\u30E5\u30FC\u30B9\u30AD\u30FC\u30DE
@@ -204,3 +204,4 @@ RenameFolderAction.warning.cannotFind.title=\u4F7F\u7528\u3067\u304D\u306A\u3044
 ConvertJobsUtil.warning.title=\u8B66\u544A
 ConvertJobsUtil.warning.message=\u3053\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u306F\u3001\u30BF\u30FC\u30B2\u30C3\u30C8\u30D5\u30EC\u30FC\u30E0\u30EF\u30FC\u30AF\u304C\u5B8C\u5168\u306B\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
 SyncLibrariesLoginTask.createStatsLogAndImplicitParamter=\u7D71\u8A08\u30ED\u30B0\u3068\u6697\u9ED9\u7684\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u4F5C\u6210
+WizardPageAPIDefinition_operationIdMissing=API\u3067operationIds\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002operationIds\u306F\u3001tRESTRequest/cRest\u51FA\u529B\u30D5\u30ED\u30FC\u3092\u521D\u671F\u5316\u3059\u308B\u305F\u3081\u306B\u4F7F\u308F\u308C\u307E\u3059\u3002tRESTRequest/cRest\u306E\u30AA\u30F3\u30E9\u30A4\u30F3\u30D8\u30EB\u30D7\u3092\u3054\u89A7\u304F\u3060\u3055\u3044\u3002

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

@@ -204,3 +204,4 @@ RenameFolderAction.warning.cannotFind.title=\u64CD\u4F5C\u4E0D\u53EF\u7528
 ConvertJobsUtil.warning.title=\u8B66\u544A
 ConvertJobsUtil.warning.message=\u6B64\u7248\u672C\u4E0D\u5B8C\u5168\u652F\u6301\u76EE\u6807\u6846\u67B6.
 SyncLibrariesLoginTask.createStatsLogAndImplicitParamter=\u521B\u5EFA\u7EDF\u8BA1\u65E5\u5FD7\u548C\u9690\u5F0F\u53C2\u6570
+WizardPageAPIDefinition_operationIdMissing=API \u7F3A\u5931 operationId \u53C2\u6570\uFF0C\u8FD9\u4E9B operationId \u53C2\u6570\u7528\u6765\u521D\u59CB\u5316 tRESTRequest \u6216 cRest \u8F93\u51FA\u6D41\u3002\u8BF7\u53C2\u89C1 tRESTRequest \u6216 cRest \u5728\u7EBF\u5E2E\u52A9\u6587\u6863\u3002

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

@@ -153,6 +153,7 @@ import org.talend.core.runtime.services.IMavenUIService;
 import org.talend.core.runtime.util.ItemDateParser;
 import org.talend.core.runtime.util.JavaHomeUtil;
 import org.talend.core.runtime.util.SharedStudioUtils;
+import org.talend.core.service.IComponentJsonformGeneratorService;
 import org.talend.core.service.ICoreUIService;
 import org.talend.core.service.IDetectCVEService;
 import org.talend.core.utils.CodesJarResourceCache;
@@ -239,14 +240,14 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         return singleton;
     }
 
-    private ICoreService getCoreService() {
+    public ICoreService getCoreService() {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(ICoreService.class)) {
             return GlobalServiceRegister.getDefault().getService(ICoreService.class);
         }
         return null;
     }
 
-    private IRunProcessService getRunProcessService() {
+    public IRunProcessService getRunProcessService() {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IRunProcessService.class)) {
             return GlobalServiceRegister.getDefault().getService(IRunProcessService.class);
         }
@@ -351,7 +352,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * @param project
      * @throws LoginException
      */
-    private void checkProjectCompatibility(Project project) throws LoginException {
+    public void checkProjectCompatibility(Project project) throws LoginException {
         IMigrationToolService migrationToolService = GlobalServiceRegister.getDefault().getService(
                 IMigrationToolService.class);
         // update migration system.
@@ -1848,7 +1849,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * @param project
      * @throws PersistenceException
      */
-    private void emptyTempFolder(Project project) throws PersistenceException {
+    public void emptyTempFolder(Project project) throws PersistenceException {
     	try {
             String str = SharedStudioUtils.getTempFolderPath().toPortableString();
             FilesUtils.deleteFolder(new File(str), false);
@@ -2379,6 +2380,15 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
             }
             String str[] = new String[] { getRepositoryContext().getUser() + "", projectManager.getCurrentProject() + "" }; //$NON-NLS-1$ //$NON-NLS-2$
             log.info(Messages.getString("ProxyRepositoryFactory.log.loggedOn", str)); //$NON-NLS-1$
+            
+            // no performance impact for studio or commandline
+            if (GlobalServiceRegister.getDefault().isServiceRegistered(IComponentJsonformGeneratorService.class)) {
+                IComponentJsonformGeneratorService jsonformSvc = GlobalServiceRegister.getDefault().getService(IComponentJsonformGeneratorService.class);
+                if (jsonformSvc != null && IComponentJsonformGeneratorService.isEnabled()) {
+                    jsonformSvc.generate(null);
+                }
+            }
+            
         } catch (LoginException e) {
             if (!LoginException.RESTART.equals(e.getKey())) {
                 try {
@@ -2518,7 +2528,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         }
     }
 
-    private void checkReferenceProjectsProblems(Project project) throws BusinessException, PersistenceException {
+    public void checkReferenceProjectsProblems(Project project) throws BusinessException, PersistenceException {
         if (ReferenceProjectProblemManager.getInstance().getAllInvalidProjectReferenceSet().size() > 0) {
             StringBuffer sb = new StringBuffer();
             for (String technicalLabel : ReferenceProjectProblemManager.getInstance().getAllInvalidProjectReferenceSet()) {
@@ -3016,4 +3026,11 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         this.repositoryFactoryFromProvider.saveProject(project);
     }
     
+    public void setCancelled(boolean cancelled) {
+        this.isCancelled = cancelled;
+    }
+
+    public boolean isCancelled() {
+        return this.isCancelled;
+    }
 }

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

@@ -139,3 +139,5 @@ Bundle-ClassPath: .,
  lib/delight-rhino-sandbox-0.0.15.jar,
  lib/rhino-1.7.13.jar
 Eclipse-RegisterBuddy: org.talend.testutils
+Import-Package: org.eclipse.equinox.p2.repository,
+ org.eclipse.equinox.security.storage

main/plugins/org.talend.core.runtime/mappings/mapping_Ingres.xml

@@ -0,0 +1,216 @@
+<?xml version="1.0"?>
+<mapping>
+	<dbms product="INGRES" id="ingres_id" label="Mapping Ingres"
+		default="true">
+		<dbTypes>
+			<dbType type="ANSIDATE" ignoreLen="true" ignorePre="true" />
+			<dbType type="BOOLEAN" ignoreLen="true" ignorePre="true" />
+			<dbType type="BIGINT" ignoreLen="true" ignorePre="true" />
+			<dbType type="BYTE" ignoreLen="true" ignorePre="true" />
+			<dbType type="BYTE VARYING" ignoreLen="true" ignorePre="true" />
+			<dbType type="C" ignoreLen="true" ignorePre="true" />
+			<dbType type="CHAR" ignorePre="true" />
+			<dbType type="DECIMAL" defaultLength="20" defaultPrecision="10" />
+			<dbType type="DATE" ignoreLen="true" ignorePre="true" />
+			<dbType type="FLOAT" ignoreLen="true" ignorePre="true" />
+			<dbType type="FLOAT4" ignoreLen="true" ignorePre="true" />
+			<dbType type="INTEGER" ignoreLen="true" ignorePre="true" />
+			<dbType type="INGRESDATE" ignoreLen="true" ignorePre="true" />
+			<dbType type="INTERVAL" ignoreLen="true" ignorePre="true" />
+			<dbType type="LONG NVARCHAR" ignorePre="true" />
+			<dbType type="LONG VARCHAR" ignoreLen="true" ignorePre="true" />
+			<dbType type="MONEY" ignoreLen="true" ignorePre="true" />
+			<dbType type="NCHAR" ignorePre="true" defaultLength="10"/>
+			<dbType type="NVARCHAR" ignorePre="true" defaultLength="10"/>
+			<dbType type="OBJECT_KEY"  ignoreLen="true" ignorePre="true"/>
+			<dbType type="SMALLINT"  ignoreLen="true" ignorePre="true"/>
+			<dbType type="TEXT" ignoreLen="true" ignorePre="true" />
+			<dbType type="TINYINT" ignoreLen="true" ignorePre="true" />
+			<dbType type="TIME" ignoreLen="true" ignorePre="true" />
+			<dbType type="TIMESTAMP" ignoreLen="true" ignorePre="true"/>
+			<dbType type="TABLE_KEY" ignoreLen="true" ignorePre="true" />
+			<dbType type="VARCHAR" default="true" defaultLength="1200" ignorePre="true"/>
+		</dbTypes>
+
+		<language name="java">
+			<talendToDbTypes><!-- Adviced mappings  -->
+				<talendType type="id_List"/>
+				<talendType type="id_Boolean">
+					<dbType type="BOOLEAN" default="true" />
+				</talendType>
+				<talendType type="id_Byte">
+					<dbType type="BYTE" default="true" />
+					<dbType type="BYTE VARYING" />
+				</talendType>
+				<talendType type="id_byte[]">
+				</talendType>
+				<talendType type="id_Character">
+					<dbType type="CHAR" default="true" />
+					<dbType type="VARCHAR"/>
+					<dbType type="C"/>
+					<dbType type="TEXT"/>
+					<dbType type="LONG VARCHAR"/>
+					<dbType type="NCHAR"/>
+					<dbType type="NVARCHAR"/>
+					<dbType type="LONG NVARCHAR"/>
+				</talendType>
+				<talendType type="id_Date">
+					<dbType type="DATE" default="true" />
+					<dbType type="ANSIDATE" />	
+					<dbType type="INGRESDATE" />
+					<dbType type="TIME" />
+					<dbType type="TIMESTAMP" />		
+					<dbType type="INTERVAL"/>		
+				</talendType>
+				<talendType type="id_BigDecimal">
+					<dbType type="DECIMAL" default="true" />
+					<dbType type="FLOAT4" />
+					<dbType type="FLOAT"/>
+					<dbType type="MONEY"/>
+				</talendType>
+				<talendType type="id_Double">
+					<dbType type="FLOAT" default="true" />
+					<dbType type="FLOAT4" />
+					<dbType type="DECIMAL"/>
+					<dbType type="MONEY"/>
+				</talendType>
+				<talendType type="id_Float">
+					<dbType type="FLOAT4" default="true" />
+					<dbType type="FLOAT"/>
+					<dbType type="DECIMAL" />
+					<dbType type="MONEY"/>
+				</talendType>
+				<talendType type="id_Integer">
+					<dbType type="INTEGER" default="true" />
+					<dbType type="BIGINT" />
+					<dbType type="SMALLINT"/>
+					<dbType type="TINYINT"/>
+				</talendType>
+				<talendType type="id_Long">
+					<dbType type="BIGINT" default="true" />	
+					<dbType type="INTEGER"/>
+					<dbType type="SMALLINT"/>
+					<dbType type="TINYINT"/>	
+				</talendType>
+				<talendType type="id_Object">
+					<dbType type="MONEY" default="true"/>
+					<dbType type="OBJECT_KEY" />
+					<dbType type="TABLE_KEY" />
+				</talendType>
+				<talendType type="id_Short">
+					<dbType type="SMALLINT" default="true" />
+					<dbType type="INTEGER" />
+					<dbType type="BIGINT"/>
+					<dbType type="TINYINT" />
+				</talendType>
+				<talendType type="id_String">
+					<dbType type="VARCHAR" default="true" />
+					<dbType type="LONG VARCHAR" />
+					<dbType type="NCHAR"/>
+					<dbType type="NVARCHAR" />
+					<dbType type="LONG NVARCHAR" />		
+					<dbType type="TEXT" />
+					<dbType type="C"/>
+					<dbType type="CHAR"/>
+				</talendType>
+			</talendToDbTypes>
+			<dbToTalendTypes>
+				<dbType type="ANSIDATE">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="BOOLEAN">
+					<talendType type="id_Boolean" default="true" />
+				</dbType>
+				<dbType type="BIGINT">
+					<talendType type="id_Long" default="true" />
+				</dbType>
+				<dbType type="BYTE">
+					<talendType type="id_Byte" default="true" />
+				</dbType>
+				<dbType type="BYTE VARYING">
+					<talendType type="id_Byte" default="true" />
+				</dbType>
+				<dbType type="C">
+					<talendType type="id_String" default="true" />
+					<talendType type="id_Character"/>
+				</dbType>
+				<dbType type="CHAR">
+					<talendType type="id_String" default="true" />
+					<talendType type="id_Character"/>
+				</dbType>
+				<dbType type="DECIMAL">
+					<talendType type="id_Float"/>
+					<talendType type="id_BigDecimal" default="true"/>
+				</dbType>
+				<dbType type="DATE">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="FLOAT">
+					<talendType type="id_Double" default="true" />
+					<talendType type="id_BigDecimal"/>
+				</dbType>
+				<dbType type="FLOAT4">
+					<talendType type="id_Float" default="true" />
+					<talendType type="id_BigDecimal"/>
+				</dbType>
+				<dbType type="INTEGER">
+					<talendType type="id_Integer" default="true" />
+					<talendType type="id_Long"/>
+					<talendType type="id_Short"/>
+				</dbType>
+				<dbType type="INGRESDATE">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="INTERVAL">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="LONG NVARCHAR">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="LONG VARCHAR">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="MONEY">
+					<talendType type="id_Float" default="true" />
+					<talendType type="id_BigDecimal"/>
+				</dbType>
+				<dbType type="NCHAR">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="NVARCHAR">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="OBJECT_KEY">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="SMALLINT">
+					<talendType type="id_Short" default="true" />
+					<talendType type="id_Integer" />
+					<talendType type="id_Long"/>
+				</dbType>
+				<dbType type="TEXT">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="TINYINT">
+					<talendType type="id_Byte" default="true" />
+					<talendType type="id_Integer" />
+					<talendType type="id_Short"/>
+					<talendType type="id_Long" />
+				</dbType>
+				<dbType type="TIME">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="TIMESTAMP">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="TABLE_KEY">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="VARCHAR">
+					<talendType type="id_String" default="true" />
+				</dbType>
+			</dbToTalendTypes>
+		</language>
+	</dbms>
+
+</mapping>

main/plugins/org.talend.core.runtime/mappings/mapping_VectorWise.xml

@@ -0,0 +1,211 @@
+<?xml version="1.0"?>
+<mapping>
+	<dbms product="VECTORWISE" id="vectorwise_id" label="Mapping VectorWise"
+		default="true">
+		<dbTypes>
+			<dbType type="ANSIDATE" ignoreLen="true" ignorePre="true" />
+			<dbType type="BIGINT" ignoreLen="true" ignorePre="true" />
+			<dbType type="BYTE" ignoreLen="true" ignorePre="true" />
+			<dbType type="BYTE VARYING" ignoreLen="true" ignorePre="true" />
+			<dbType type="C" ignoreLen="true" ignorePre="true" />
+			<dbType type="CHAR" ignorePre="true" />
+			<dbType type="DECIMAL" defaultLength="20" defaultPrecision="10" />
+			<dbType type="DATE" ignoreLen="true" ignorePre="true" />
+			<dbType type="FLOAT" ignoreLen="true" ignorePre="true" />
+			<dbType type="FLOAT4" ignoreLen="true" ignorePre="true" />
+			<dbType type="INTEGER" ignoreLen="true" ignorePre="true" />
+			<dbType type="INGRESDATE" ignoreLen="true" ignorePre="true" />
+			<dbType type="INTERVAL" ignoreLen="true" ignorePre="true" />
+			<dbType type="LONG NVARCHAR" ignorePre="true" />
+			<dbType type="LONG VARCHAR" ignoreLen="true" ignorePre="true" />
+			<dbType type="MONEY" ignoreLen="true" ignorePre="true" />
+			<dbType type="NCHAR" ignorePre="true" defaultLength="10"/>
+			<dbType type="NVARCHAR" ignorePre="true" defaultLength="10"/>
+			<dbType type="OBJECT_KEY"  ignoreLen="true" ignorePre="true"/>
+			<dbType type="SMALLINT"  ignoreLen="true" ignorePre="true"/>
+			<dbType type="TEXT" ignoreLen="true" ignorePre="true" />
+			<dbType type="TINYINT" ignoreLen="true" ignorePre="true" />
+			<dbType type="TIME" ignoreLen="true" ignorePre="true" />
+			<dbType type="TIMESTAMP" ignoreLen="true" ignorePre="true"/>
+			<dbType type="TABLE_KEY" ignoreLen="true" ignorePre="true" />
+			<dbType type="VARCHAR" default="true" defaultLength="1200" ignorePre="true"/>
+		</dbTypes>
+
+		<language name="java">
+			<talendToDbTypes><!-- Adviced mappings  -->
+				<talendType type="id_List"/>
+				<talendType type="id_Boolean">	
+				</talendType>
+				<talendType type="id_Byte">
+					<dbType type="BYTE" default="true" />
+					<dbType type="BYTE VARYING" />
+				</talendType>
+				<talendType type="id_byte[]">
+				</talendType>
+				<talendType type="id_Character">
+					<dbType type="CHAR" default="true" />
+					<dbType type="VARCHAR"/>
+					<dbType type="C"/>
+					<dbType type="TEXT"/>
+					<dbType type="LONG VARCHAR"/>
+					<dbType type="NCHAR"/>
+					<dbType type="NVARCHAR"/>
+					<dbType type="LONG NVARCHAR"/>
+				</talendType>
+				<talendType type="id_Date">					
+					<dbType type="ANSIDATE" default="true"/>
+					<dbType type="DATE"/>
+					<dbType type="INGRESDATE" />
+					<dbType type="TIME" />
+					<dbType type="TIMESTAMP" />		
+					<dbType type="INTERVAL"/>		
+				</talendType>
+				<talendType type="id_BigDecimal">
+					<dbType type="DECIMAL" default="true" />
+					<dbType type="FLOAT4" />
+					<dbType type="FLOAT"/>
+					<dbType type="MONEY"/>
+				</talendType>
+				<talendType type="id_Double">
+					<dbType type="FLOAT" default="true" />
+					<dbType type="FLOAT4" />
+					<dbType type="DECIMAL"/>
+					<dbType type="MONEY"/>
+				</talendType>
+				<talendType type="id_Float">
+					<dbType type="FLOAT4" default="true" />
+					<dbType type="FLOAT"/>
+					<dbType type="DECIMAL" />
+					<dbType type="MONEY"/>
+				</talendType>
+				<talendType type="id_Integer">
+					<dbType type="INTEGER" default="true" />
+					<dbType type="BIGINT" />
+					<dbType type="SMALLINT"/>
+					<dbType type="TINYINT"/>
+				</talendType>
+				<talendType type="id_Long">
+					<dbType type="BIGINT" default="true" />	
+					<dbType type="INTEGER"/>
+					<dbType type="SMALLINT"/>
+					<dbType type="TINYINT"/>	
+				</talendType>
+				<talendType type="id_Object">
+					<dbType type="MONEY" default="true"/>
+					<dbType type="OBJECT_KEY" />
+					<dbType type="TABLE_KEY" />
+				</talendType>
+				<talendType type="id_Short">
+					<dbType type="SMALLINT" default="true" />
+					<dbType type="INTEGER" />
+					<dbType type="BIGINT"/>
+					<dbType type="TINYINT" />
+				</talendType>
+				<talendType type="id_String">
+					<dbType type="VARCHAR" default="true" />
+					<dbType type="LONG VARCHAR" />
+					<dbType type="NCHAR"/>
+					<dbType type="NVARCHAR" />
+					<dbType type="LONG NVARCHAR" />		
+					<dbType type="TEXT" />
+					<dbType type="C"/>
+					<dbType type="CHAR"/>
+				</talendType>
+			</talendToDbTypes>
+			<dbToTalendTypes>
+				<dbType type="ANSIDATE">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="BIGINT">
+					<talendType type="id_Long" default="true" />
+				</dbType>
+				<dbType type="BYTE">
+					<talendType type="id_Byte" default="true" />
+				</dbType>
+				<dbType type="BYTE VARYING">
+					<talendType type="id_Byte" default="true" />
+				</dbType>
+				<dbType type="C">
+					<talendType type="id_String" default="true" />
+					<talendType type="id_Character"/>
+				</dbType>
+				<dbType type="CHAR">
+					<talendType type="id_String" default="true" />
+					<talendType type="id_Character"/>
+				</dbType>
+				<dbType type="DECIMAL">
+					<talendType type="id_Float"/>
+					<talendType type="id_BigDecimal" default="true"/>
+				</dbType>
+				<dbType type="DATE">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="FLOAT">
+					<talendType type="id_Double" default="true" />
+					<talendType type="id_BigDecimal"/>
+				</dbType>
+				<dbType type="FLOAT4">
+					<talendType type="id_Float" default="true" />
+					<talendType type="id_BigDecimal"/>
+				</dbType>
+				<dbType type="INTEGER">
+					<talendType type="id_Integer" default="true" />
+					<talendType type="id_Long"/>
+					<talendType type="id_Short"/>
+				</dbType>
+				<dbType type="INGRESDATE">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="INTERVAL">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="LONG NVARCHAR">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="LONG VARCHAR">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="MONEY">
+					<talendType type="id_Float" default="true" />
+					<talendType type="id_BigDecimal"/>
+				</dbType>
+				<dbType type="NCHAR">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="NVARCHAR">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="OBJECT_KEY">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="SMALLINT">
+					<talendType type="id_Short" default="true" />
+					<talendType type="id_Integer" />
+					<talendType type="id_Long"/>
+				</dbType>
+				<dbType type="TEXT">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="TINYINT">
+					<talendType type="id_Byte" default="true" />
+					<talendType type="id_Integer" />
+					<talendType type="id_Short"/>
+					<talendType type="id_Long" />
+				</dbType>
+				<dbType type="TIME">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="TIMESTAMP">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="TABLE_KEY">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="VARCHAR">
+					<talendType type="id_String" default="true" />
+				</dbType>
+			</dbToTalendTypes>
+		</language>
+	</dbms>
+
+</mapping>

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

@@ -34,6 +34,9 @@ public enum EDatabase4DriverClassName {
 
     INFORMIX(EDatabaseTypeName.INFORMIX, "com.informix.jdbc.IfxDriver"), //$NON-NLS-1$
 
+    INGRES(EDatabaseTypeName.INGRES, "com.ingres.jdbc.IngresDriver"),
+    VECTORWISE(EDatabaseTypeName.VECTORWISE, "com.ingres.jdbc.IngresDriver"),
+    
     JAVADB_DERBYCLIENT(EDatabaseTypeName.JAVADB_DERBYCLIENT, "org.apache.derby.jdbc.ClientDriver"), //$NON-NLS-1$
     JAVADB_EMBEDED(EDatabaseTypeName.JAVADB_EMBEDED, "org.apache.derby.jdbc.EmbeddedDriver"), //$NON-NLS-1$
     JAVADB_JCCJDBC(EDatabaseTypeName.JAVADB_JCCJDBC, "com.ibm.db2.jcc.DB2Driver"), //$NON-NLS-1$

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

@@ -347,8 +347,7 @@ public enum EDatabaseTypeName {
             isSupport = isSupportODBC;
         } else if (EDatabaseTypeName.SAS == this) {
             isSupport = false;
-        } else if (EDatabaseTypeName.INGRES == this || EDatabaseTypeName.INTERBASE == this || EDatabaseTypeName.VECTORWISE == this
-                || EDatabaseTypeName.PARACCEL == this) {
+        } else if (EDatabaseTypeName.INTERBASE == this || EDatabaseTypeName.PARACCEL == this) {
             return false;
         }
 

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

@@ -366,7 +366,57 @@ public class ConnParameterKeys {
     public static final String CONN_PARA_KEY_DATABRICKS_RUNTIME_VERSION="CONN_PARA_KEY_DATABRICKS_RUNTIME_VERSION";
 
     public static final String CONN_PARA_KEY_DATABRICKS_DBFS_DEP_FOLDER="CONN_PARA_KEY_DATABRICKS_DBFS_DEP_FOLDER";
+    
+    /**kubernetes*/
 
+    public static final String CONN_PARA_KEY_K8S_SUBMIT_MODE="CONN_PARA_KEY_K8S_SUBMIT_MODE";
+    
+    public static final String CONN_PARA_KEY_K8S_MASTER="CONN_PARA_KEY_K8S_MASTER";
+    
+    public static final String CONN_PARA_KEY_K8S_INSTANCES="CONN_PARA_KEY_K8S_INSTANCES";
+    
+    public static final String CONN_PARA_KEY_K8S_REGISTRYSECRET_CHECK="CONN_PARA_KEY_K8S_REGISTRYSECRET_CHECK";
+    
+    public static final String CONN_PARA_KEY_K8S_REGISTRYSECRET="CONN_PARA_KEY_K8S_REGISTRYSECRET";
+    
+    public static final String CONN_PARA_KEY_K8S_IMAGE="CONN_PARA_KEY_K8S_IMAGE";
+    
+    public static final String CONN_PARA_KEY_K8S_NAMESPACE="CONN_PARA_KEY_K8S_NAMESPACE";
+    
+    public static final String CONN_PARA_KEY_K8S_SERVICEACCOUNT="CONN_PARA_KEY_K8S_SERVICEACCOUNT";
+    
+    public static final String CONN_PARA_KEY_K8S_DISTUPLOAD="CONN_PARA_KEY_K8S_DISTUPLOAD";
+    
+    public static final String CONN_PARA_KEY_K8S_S3BUCKET="CONN_PARA_KEY_K8S_S3BUCKET";
+    
+    public static final String CONN_PARA_KEY_K8S_S3FOLDER="CONN_PARA_KEY_K8S_S3FOLDER";
+    
+    public static final String CONN_PARA_KEY_K8S_S3CREDENTIALS="CONN_PARA_KEY_K8S_S3CREDENTIALS";
+    
+    public static final String CONN_PARA_KEY_K8S_S3ACCESSKEY="CONN_PARA_KEY_K8S_S3ACCESSKEY";
+    
+    public static final String CONN_PARA_KEY_K8S_S3SECRETKEY="CONN_PARA_KEY_K8S_S3SECRETKEY";
+    
+    public static final String CONN_PARA_KEY_K8S_BLOBACCOUNT="CONN_PARA_KEY_K8S_BLOBACCOUNT";
+    
+    public static final String CONN_PARA_KEY_K8S_BLOBCONTAINER="CONN_PARA_KEY_K8S_BLOBCONTAINER";
+    
+    public static final String CONN_PARA_KEY_K8S_BLOBSECRETKEY="CONN_PARA_KEY_K8S_BLOBSECRETKEY";
+    
+    public static final String CONN_PARA_KEY_K8S_AZUREACCOUNT="CONN_PARA_KEY_K8S_AZUREACCOUNT";
+    
+    public static final String CONN_PARA_KEY_K8S_AZURECREDENTIALS="CONN_PARA_KEY_K8S_AZURECREDENTIALS";
+    
+    public static final String CONN_PARA_KEY_K8S_AZURECONTAINER="CONN_PARA_KEY_K8S_AZURECONTAINER";
+    
+    public static final String CONN_PARA_KEY_K8S_AZURESECRETKEY="CONN_PARA_KEY_K8S_AZURESECRETKEY";
+    
+    public static final String CONN_PARA_KEY_K8S_AZUREAADKEY="CONN_PARA_KEY_K8S_AZUREAADKEY";
+    
+    public static final String CONN_PARA_KEY_K8S_AZUREAADCLIENTID="CONN_PARA_KEY_K8S_AZUREAADCLIENTID";
+    
+    public static final String CONN_PARA_KEY_K8S_AZUREAADDIRECTORYID="CONN_PARA_KEY_K8S_AZUREAADDIRECTORYID";
+    
     /**
      * Override hadoop configuration
      */

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

@@ -112,6 +112,13 @@ public enum EDatabaseConnTemplate {
     SQLITE(new DbConnStr(EDatabaseTypeName.SQLITE, //
             "jdbc:sqlite:/<filename>")), //$NON-NLS-1$
 
+    INGRES(new DbConnStr(EDatabaseTypeName.INGRES, //
+            "jdbc:ingres://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
+            "II7")), //$NON-NLS-1$
+    VECTORWISE(new DbConnStr(EDatabaseTypeName.VECTORWISE, //
+            "jdbc:ingres://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
+            "II7")),
+    
     FIREBIRD(new DbConnStr(EDatabaseTypeName.FIREBIRD, //
             "jdbc:firebirdsql:<host>/<port>:<filename>?<property>", //$NON-NLS-1$
             "3050")), //$NON-NLS-1$
@@ -421,6 +428,8 @@ public enum EDatabaseConnTemplate {
             case PSQL:
             case PLUSPSQL:
             case GREENPLUM:
+            case INGRES:
+            case VECTORWISE:
             case FIREBIRD:
             case JAVADB_EMBEDED:
             case JAVADB_JCCJDBC:
@@ -447,6 +456,8 @@ public enum EDatabaseConnTemplate {
             case SYBASEASE_16_SA:
             case IBMDB2:
             case IBMDB2_ZOS:
+            case INGRES:
+            case VECTORWISE:
             case MSSQL:
             case INFORMIX:
             case TERADATA:

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

@@ -108,6 +108,8 @@ public enum EDatabaseVersion4Drivers {
     EXASOL(new DbVersion4Drivers(EDatabaseTypeName.EXASOL, "exajdbc-6.0.9302.jar")), //$NON-NLS-1$
     MAXDB(new DbVersion4Drivers(EDatabaseTypeName.MAXDB, "sapdbc.jar")), //$NON-NLS-1$
 
+    INGRES(new DbVersion4Drivers(EDatabaseTypeName.INGRES, "iijdbc-10.2-4.1.10.jar")),
+    VECTORWISE(new DbVersion4Drivers(EDatabaseTypeName.VECTORWISE, "iijdbc-10.2-4.1.10.jar")),
     // HIVE(new DbVersion4Drivers(EDatabaseTypeName.HIVE, "STANDALONE", "STANDALONE", new String[] {
     // "hive-jdbc-0.8.1.jar",
     // "hive-metastore-0.8.1.jar", "hive-exec-0.8.1.jar", "hive-service-0.8.1.jar", "libfb303_new.jar",
@@ -148,10 +150,11 @@ public enum EDatabaseVersion4Drivers {
     REDSHIFT(new DbVersion4Drivers(EDatabaseTypeName.REDSHIFT, "redshift", "REDSHIFT", //$NON-NLS-1$ //$NON-NLS-2$
             new String[]{ "redshift-jdbc42-no-awssdk-1.2.55.1083.jar", "antlr4-runtime-4.8-1.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
     REDSHIFT_SSO(new DbVersion4Drivers(EDatabaseTypeName.REDSHIFT_SSO, "redshift sso", "REDSHIFT_SSO", //$NON-NLS-1$ //$NON-NLS-2$
-            new String[] { "redshift-jdbc42-no-awssdk-1.2.55.1083.jar", "antlr4-runtime-4.8-1.jar", "aws-java-sdk-1.11.848.jar", "jackson-core-2.13.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-                    "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$
-                    "joda-time-2.8.1.jar", "commons-logging-1.2.jar", "commons-codec-1.14.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                    "aws-java-sdk-redshift-internal-1.12.x.jar" })), //$NON-NLS-1$
+            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", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                    "httpclient-4.5.13.jar", "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$//$NON-NLS-4$
+                    "aws-java-sdk-redshift-internal-1.12.x.jar", "aws-java-sdk-core-1.12.315.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                    "aws-java-sdk-sts-1.12.315.jar", "aws-java-sdk-redshift-1.12.315.jar", "jmespath-java-1.12.315.jar" })), //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
 
     AMAZON_AURORA(new DbVersion4Drivers(EDatabaseTypeName.AMAZON_AURORA, "mysql-connector-java-5.1.49.jar")); //$NON-NLS-1$
 

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

@@ -28,6 +28,8 @@ public class HadoopConstants {
     public static final String SPARK_MODE_YARN_CLUSTER = "YARN_CLUSTER";
     
     public static final String SPARK_MODE_DATAPROC = "DATAPROC";
+    
+    public static final String SPARK_MODE_SYNAPSE = "SYNAPSE";
 
     public static final String FRAMEWORK = "FRAMEWORK";
 

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

@@ -153,6 +153,52 @@ public enum EHadoopProperties {
     DATABRICKS_TOKEN,
     
     DATABRICKS_DBFS_DEP_FOLDER,
+
+    K8S_SUBMIT_MODE,
+    
+    K8S_MASTER,
+    
+    K8S_INSTANCES,
+    
+    K8S_REGISTRYSECRET,
+    
+    K8S_IMAGE,
+    
+    K8S_NAMESPACE,
+    
+    K8S_SERVICEACCOUNT,
+    
+    K8S_DISTUPLOAD,
+    
+    K8S_S3BUCKET,
+    
+    K8S_S3FOLDER,
+    
+    K8S_S3CREDENTIALS,
+    
+    K8S_S3ACCESSKEY,
+    
+    K8S_S3SECRETKEY,
+    
+    K8S_BLOBACCOUNT,
+    
+    K8S_BLOBCONTAINER,
+    
+    K8S_BLOBSECRETKEY,
+    
+    K8S_AZUREACCOUNT,
+    
+    K8S_AZURECREDENTIALS,
+    
+    K8S_AZURECONTAINER,
+    
+    K8S_AZURESECRETKEY,
+    
+    K8S_AZUREAADKEY,
+    
+    K8S_AZUREAADCLIENTID,
+    
+    K8S_AZUREAADDIRECTORYID,
     
     DATABRICKS_NODE_TYPE,
     

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

@@ -984,6 +984,14 @@ public class ContextUtils {
 
         }
 
+        public boolean remove(Item item, String param) {
+            Set<String> params = map.get(item);
+            if (params != null && params.contains(param)) {
+                return params.remove(param);
+            }
+            return false;
+        }
+
         public boolean isEmpty() {
             return map.isEmpty();
         }

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

@@ -293,7 +293,8 @@ public final class MetadataToolHelper {
         boolean isKeyword = KeywordsValidator.isKeyword(originalColumnName);
 
         StringBuilder sb = new StringBuilder();
-        int[] charBit = new int[columnName.length()];
+        // keep charBit length align with the length of originalColumnName (StringBuilder)
+        int[] charBit = new int[originalColumnName.length()];
         if (!isKeyword) {
             boolean isAllowSpecific = isAllowSpecificCharacters();
 

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

@@ -433,6 +433,16 @@ public class ComponentToRepositoryProperty {
             connection.setDatabaseType(EDatabaseTypeName.IBMDB2.getDisplayName());
             connection.setProductId(EDatabaseTypeName.IBMDB2.getProduct());
         }
+        // Ingres
+        else if (EDatabaseTypeName.INGRES.getProduct().equalsIgnoreCase((String) parameter.getValue())) {
+            connection.setDatabaseType(EDatabaseTypeName.INGRES.getDisplayName());
+            connection.setProductId(EDatabaseTypeName.INGRES.getProduct());
+        }
+        // VECTORWISE
+        else if (EDatabaseTypeName.VECTORWISE.getProduct().equalsIgnoreCase((String) parameter.getValue())) {
+            connection.setDatabaseType(EDatabaseTypeName.VECTORWISE.getDisplayName());
+            connection.setProductId(EDatabaseTypeName.VECTORWISE.getProduct());
+        }
         // Sqlite
         else if (EDatabaseTypeName.SQLITE.getProduct().equalsIgnoreCase((String) parameter.getValue())) {
             connection.setDatabaseType(EDatabaseTypeName.SQLITE.getDisplayName());

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

@@ -18,6 +18,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.StringTokenizer;
 
+import org.apache.commons.codec.binary.StringUtils;
 import org.talend.components.api.properties.ComponentProperties;
 import org.talend.core.model.components.IComponent;
 import org.talend.core.model.components.IMultipleComponentManager;
@@ -509,7 +510,7 @@ public abstract class AbstractNode implements INode {
             }
             for (String key : childParameters.keySet()) {
                 IElementParameter param = childParameters.get(key);
-                if (param.getName().equals(name)) {
+                if (StringUtils.equals(name, param.getName())) {
                     return param;
                 }
             }
@@ -676,7 +677,8 @@ public abstract class AbstractNode implements INode {
             return null;
         }
         for (IMetadataTable table : metadataList) {
-            if (table.getAttachedConnector().equals(connector)) {
+            String attachedConnector = table.getAttachedConnector();
+            if (attachedConnector != null && attachedConnector.equals(connector)) {
                 return table;
             }
         }

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

@@ -38,6 +38,7 @@ public enum EParameterFieldType {
     SCHEMA_XPATH_QUERYS,
     QUERYSTORE_TYPE,
     GUESS_SCHEMA,
+    DYNAMIC_GUESS_SCHEMA,
     PROPERTY_TYPE,
     EXTERNAL,
     FILE,

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

@@ -1477,12 +1477,8 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
         return allTypes;
     }
 
-    public static List<ERepositoryObjectType> getAllTypesOfJoblet() {
+    public static List<ERepositoryObjectType> getAllBigDataTypesOfJoblet(){
         List<ERepositoryObjectType> allTypes = new ArrayList<ERepositoryObjectType>();
-
-        if (ERepositoryObjectType.JOBLET != null) {
-            allTypes.add(ERepositoryObjectType.JOBLET);
-        }
         if (ERepositoryObjectType.SPARK_JOBLET != null) {
             allTypes.add(ERepositoryObjectType.SPARK_JOBLET);
         }
@@ -1492,6 +1488,15 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
         return allTypes;
     }
 
+    public static List<ERepositoryObjectType> getAllTypesOfJoblet() {
+        List<ERepositoryObjectType> allTypes = new ArrayList<ERepositoryObjectType>();
+        allTypes.addAll(getAllBigDataTypesOfJoblet());
+        if (ERepositoryObjectType.JOBLET != null) {
+            allTypes.add(ERepositoryObjectType.JOBLET);
+        }
+        return allTypes;
+    }
+
     public static List<ERepositoryObjectType> getAllTypesOfTestContainer() {
         List<ERepositoryObjectType> allTypes = new ArrayList<ERepositoryObjectType>();
 

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

@@ -79,4 +79,8 @@ public final class TalendPropertiesUtil {
     public static String getProductApp() {
         return System.getProperty(PROD_APP);
     }
+
+    public static boolean isEnabledUseShortJobletName() {
+        return isEnabled("talend.job.build.useShortJobletName"); //$NON-NLS-1$
+    }
 }

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

@@ -13,7 +13,7 @@
 package org.talend.core.pendo;
 
 import org.talend.core.pendo.properties.IPendoDataProperties;
-import org.talend.core.service.IRemoteService;
+import org.talend.core.service.ICoreTisRuntimeService;
 
 /**
  * DOC jding  class global comment. Detailled comment
@@ -22,11 +22,11 @@ public class PendoDataTrackFactory {
 
     private static PendoDataTrackFactory instance;
 
-    private static IRemoteService remoteService;
+    private static ICoreTisRuntimeService coreRuntimeService;
 
     static {
         instance = new PendoDataTrackFactory();
-        remoteService = IRemoteService.get();
+        coreRuntimeService = ICoreTisRuntimeService.get();
     }
 
     private PendoDataTrackFactory() {
@@ -37,35 +37,35 @@ public class PendoDataTrackFactory {
     }
 
     public boolean isTrackSendAvailable() throws Exception {
-        if (remoteService != null) {
-            return remoteService.isPendoTrackAvailable();
+        if (coreRuntimeService != null) {
+            return coreRuntimeService.isPendoTrackAvailable();
         }
         return false;
     }
 
     public void sendTrackData(TrackEvent event, IPendoDataProperties properties) throws Exception {
-        if (remoteService != null) {
-            remoteService.sendPendoTrackData(event, properties);
+        if (coreRuntimeService != null) {
+            coreRuntimeService.sendPendoTrackData(event, properties);
         }
     }
 
     public void sendProjectLoginTrack() {
-        if (remoteService != null) {
-            AbstractPendoTrackManager pendoProjectLoginManager = remoteService.getPendoProjectLoginManager();
+        if (coreRuntimeService != null) {
+            AbstractPendoTrackManager pendoProjectLoginManager = coreRuntimeService.getPendoProjectLoginManager();
             pendoProjectLoginManager.sendTrackToPendo();
         }
     }
 
     public void sendGenericTrack(TrackEvent event, IPendoDataProperties properties) {
-        if (remoteService != null) {
-            AbstractPendoTrackManager genericManager = remoteService.getPendoGenericManager(event, properties);
+        if (coreRuntimeService != null) {
+            AbstractPendoTrackManager genericManager = coreRuntimeService.getPendoGenericManager(event, properties);
             genericManager.sendTrackToPendo();
         }
     }
 
     public String getTmcUser(String url, String token) {
-        if (remoteService != null) {
-            return remoteService.getTmcUser(url, token);
+        if (coreRuntimeService != null) {
+            return coreRuntimeService.getTmcUser(url, token);
         }
         return "";
     }

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

@@ -655,4 +655,9 @@ ItemAnalysisReportManager.Warning.message=Can't run a new analysis now. Wait for
 AnalysisReportAccessDialog.shellTitle=Project analysis
 AnalysisReportAccessDialog.generateSuccess=Project analysis completed successfully.
 AnalysisReportAccessDialog.completeReportAvailable=Check the report
-AnalysisReportAccessDialog.accessReport=here
+AnalysisReportAccessDialog.accessReport=here
+AbstractPomTemplateProjectSettingPage.defaultTabLabel=Default
+AbstractPomTemplateProjectSettingPage.customTabLabel=Custom
+AbstractPomTemplateProjectSettingPage.previewButton=Preview
+AbstractPomTemplateProjectSettingPage.previewButtonTip=Preview the complete customized project POM settings.
+AbstractPomTemplateProjectSettingPage.learnMoreLink=Learn more

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

@@ -620,7 +620,7 @@ ProgressMonitorDialogWithCancel.executeTimeout=Suspension de l'ex\u00E9cution, l
 ProgressMonitorDialogWithCancel.CheckingConnectionJob.waitingFinish=en attente de la fin de {0}...
 ProgressMonitorDialogWithCancel.CheckingConnectionJob.emptyWaitingfinish=en attente de la fin...
 OverTimePopupDialogTask.title=Ex\u00E9cution...
-OverTimePopupDialogTask.message=T\u00E2che d'ex\u00E9cution en arri\u00E8re plan, patientez...
+OverTimePopupDialogTask.message=T\u00E2che d'ex\u00E9cution en arri\u00E8re-plan, patientez...
 OverTimePopupDialogTask.executeTimeout=Suspension de l'ex\u00E9cution, le Studio a essay\u00E9 d'interrompre la v\u00E9rification en t\u00E2che de fond.
 OverTimePopupDialogTask.killed=Ex\u00E9cution arr\u00EAt\u00E9e
 OverTimePopupDialogTask.waitingFinishMessage.default=Interruption impossible de la t\u00E2che en fond,\n
@@ -656,3 +656,7 @@ AnalysisReportAccessDialog.shellTitle=Analyse du projet
 AnalysisReportAccessDialog.generateSuccess=Analyse du projet termin\u00E9e.
 AnalysisReportAccessDialog.completeReportAvailable=Consulter le rapport
 AnalysisReportAccessDialog.accessReport=ici
+AbstractPomTemplateProjectSettingPage.defaultTabLabel=Par d\u00E9faut
+AbstractPomTemplateProjectSettingPage.customTabLabel=Personnalis\u00E9
+AbstractPomTemplateProjectSettingPage.previewButton=Aper\u00E7u
+AbstractPomTemplateProjectSettingPage.learnMoreLink=En savoir plus

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

@@ -637,8 +637,8 @@ DynamicPlugin.addExtension.empty=ExtensionPoint\u307E\u305F\u306FID\u304C\u7A7A\
 BigDataBasicUtil.loadDynamicDistribution.IDynamicDistributionManager.notFound={0}\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
 TalendLibsServerManager.connectUserLibraryFailureMessage=\u7BA1\u7406\u8005\u30E2\u30FC\u30C9\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u30E6\u30FC\u30B6\u30FC\u30E9\u30A4\u30D6\u30E9\u30EA\u30FC\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u304C\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093\u3002{0}\u3078\u306E\u63A5\u7D9A\u304C\u62D2\u5426\u3055\u308C\u307E\u3057\u305F
 TalendLibsServerManager.cannotGetUserLibraryServer=\u30EA\u30E2\u30FC\u30C8\u7BA1\u7406\u8005\u304B\u3089\u30E6\u30FC\u30B6\u30FC\u30E9\u30A4\u30D6\u30E9\u30EA\u30FC\u30B5\u30FC\u30D0\u30FC\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093
-MigrationReportAccessDialog.title=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30A2\u30A4\u30C6\u30E0\u3092\u79FB\u884C
-MigrationReportAccessDialog.migrateSuccess=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30A2\u30A4\u30C6\u30E0\u304C\u6B63\u3057\u304F\u79FB\u884C\u3055\u308C\u307E\u3057\u305F\u3002
+MigrationReportAccessDialog.title=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u9805\u76EE\u3092\u79FB\u884C
+MigrationReportAccessDialog.migrateSuccess=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u9805\u76EE\u304C\u6B63\u3057\u304F\u79FB\u884C\u3055\u308C\u307E\u3057\u305F\u3002
 MigrationReportAccessDialog.completeReportAvailable=\u30EC\u30DD\u30FC\u30C8\u3092\u30C1\u30A7\u30C3\u30AF
 MigrationReportAccessDialog.accessReport=\u3053\u3061\u3089
 MigrationReportAccessDialog.provideAnalysisTool=\u4ECA\u3059\u3050\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u5206\u6790\u3092\u5B9F\u884C\u3057\u3066\u3001\u79FB\u884C\u3055\u308C\u305F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u5206\u6790\u3067\u304D\u307E\u3059\u3002\u3053\u306E\u8A66\u9A13\u7684\u306A\u30C4\u30FC\u30EB\u306B\u3088\u3063\u3066\u3001\u4EE5\u4E0B\u304C\u542B\u307E\u308C\u308B\u30EC\u30DD\u30FC\u30C8\u304C\u751F\u6210\u3055\u308C\u307E\u3059:
@@ -656,3 +656,7 @@ AnalysisReportAccessDialog.shellTitle=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u5206
 AnalysisReportAccessDialog.generateSuccess=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u5206\u6790\u304C\u6B63\u3057\u304F\u5B8C\u4E86\u3057\u307E\u3057\u305F\u3002
 AnalysisReportAccessDialog.completeReportAvailable=\u30EC\u30DD\u30FC\u30C8\u3092\u30C1\u30A7\u30C3\u30AF
 AnalysisReportAccessDialog.accessReport=\u3053\u3061\u3089
+AbstractPomTemplateProjectSettingPage.defaultTabLabel=\u30C7\u30D5\u30A9\u30EB\u30C8
+AbstractPomTemplateProjectSettingPage.customTabLabel=\u30AB\u30B9\u30BF\u30E0
+AbstractPomTemplateProjectSettingPage.previewButton=\u30D7\u30EC\u30D3\u30E5\u30FC
+AbstractPomTemplateProjectSettingPage.learnMoreLink=\u8A73\u7D30

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

@@ -656,3 +656,7 @@ AnalysisReportAccessDialog.shellTitle=\u5DE5\u7A0B\u5206\u6790
 AnalysisReportAccessDialog.generateSuccess=\u5DE5\u7A0B\u5206\u6790\u6210\u529F\u5B8C\u6210\u3002
 AnalysisReportAccessDialog.completeReportAvailable=\u8BF7\u68C0\u67E5\u62A5\u544A
 AnalysisReportAccessDialog.accessReport=\u6B64\u5904
+AbstractPomTemplateProjectSettingPage.defaultTabLabel=\u9ED8\u8BA4
+AbstractPomTemplateProjectSettingPage.customTabLabel=\u81EA\u5B9A\u4E49
+AbstractPomTemplateProjectSettingPage.previewButton=\u9884\u89C8
+AbstractPomTemplateProjectSettingPage.learnMoreLink=\u4E86\u89E3\u66F4\u591A

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/maven/MavenConstants.java

@@ -41,6 +41,8 @@ public interface MavenConstants {
     static final String DEFAULT_VERSION = "6.0.0";
 
     static final String SNAPSHOT = "-SNAPSHOT";
+    
+    static final String DOT_SNAPSHOT = ".SNAPSHOT";
 
     static final String POM_FILTER = "POM_FILTER";
 

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

@@ -0,0 +1,183 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.runtime.projectsetting;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.program.Program;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.forms.events.HyperlinkAdapter;
+import org.eclipse.ui.forms.events.HyperlinkEvent;
+import org.eclipse.ui.forms.widgets.Hyperlink;
+import org.talend.core.runtime.CoreRuntimePlugin;
+import org.talend.core.runtime.i18n.Messages;
+import org.talend.repository.model.IProxyRepositoryFactory;
+
+public abstract class AbstractPomTemplateProjectSettingPage extends AbstractProjectSettingPage {
+
+    private static final Color COLOR_LINK = new Color(null, 0, 0, 255);
+
+    protected StyledText defaultText;
+
+    protected StyledText customText;
+
+    private boolean isDefaultPresentedForScriptTxt = false;
+
+    private boolean readonly;
+
+    public AbstractPomTemplateProjectSettingPage() {
+        super();
+        IProxyRepositoryFactory factory = CoreRuntimePlugin.getInstance().getProxyRepositoryFactory();
+        readonly = factory.isUserReadOnlyOnCurrentProject();
+    }
+
+    protected boolean isReadonly() {
+        return readonly;
+    }
+
+    public void setReadonly(boolean readonly) {
+        this.readonly = readonly;
+    }
+
+    protected abstract String getPreferenceKey();
+
+    protected StyledText getScriptTxt() {
+        return customText;
+    }
+
+    @Override
+    protected Control createContents(Composite p) {
+        Composite parent = (Composite) super.createContents(p);
+
+        Composite noteComposite = new Composite(parent, SWT.NONE);
+        noteComposite.setLayout(new GridLayout(2, false));
+
+        Label scriptLabel = new Label(noteComposite, SWT.NONE);
+        String headerMessages = getHeaderMessage();
+        scriptLabel.setText(headerMessages);
+
+        Hyperlink link = new Hyperlink(noteComposite, SWT.NONE);
+        link.setText(Messages.getString("AbstractPomTemplateProjectSettingPage.learnMoreLink")); //$NON-NLS-1$
+        link.setUnderlined(true);
+        link.setForeground(COLOR_LINK);
+        link.addHyperlinkListener(new HyperlinkAdapter() {
+
+            @Override
+            public void linkActivated(HyperlinkEvent e) {
+                Program.launch(getMoreInfoUrl());
+            }
+        });
+
+        CTabFolder tabFolder = new CTabFolder(parent, SWT.BORDER);
+        // tabFolder.setTabPosition(SWT.BOTTOM);
+        tabFolder.setSimple(false);
+
+        GridData data = new GridData(GridData.FILL, GridData.FILL, true, true);
+        tabFolder.setLayoutData(data);
+        data.heightHint = 280;
+        data.minimumHeight = 280;
+        data.widthHint = 500;
+        data.minimumWidth = 500;
+
+        CTabItem defaultTabItem = new CTabItem(tabFolder, SWT.NULL);
+        defaultTabItem.setText(Messages.getString("AbstractPomTemplateProjectSettingPage.defaultTabLabel")); //$NON-NLS-1$
+        CTabItem customTabItem = new CTabItem(tabFolder, SWT.NULL);
+        customTabItem.setText(Messages.getString("AbstractPomTemplateProjectSettingPage.customTabLabel")); //$NON-NLS-1$
+
+        tabFolder.setSelection(defaultTabItem);
+
+        int style = SWT.MULTI | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL;
+        defaultText = new StyledText(tabFolder, style);
+        defaultText.setText(getDefaultText());
+        defaultText.setBackground(new Color(null, 233, 233, 233));
+        defaultText.setEditable(false);
+        defaultTabItem.setControl(defaultText);
+
+        customText = new StyledText(tabFolder, style);
+        customText.setText(getCustomText());
+        customText.setEditable(!isReadonly());
+        customTabItem.setControl(customText);
+        customText.addModifyListener(new ModifyListener() {
+
+            @Override
+            public void modifyText(ModifyEvent e) {
+                isDefaultPresentedForScriptTxt = false;
+            }
+
+        });
+
+        Button preview = new Button(parent, SWT.NONE);
+        preview.setText(Messages.getString("AbstractPomTemplateProjectSettingPage.previewButton")); //$NON-NLS-1$
+        preview.setToolTipText(Messages.getString("AbstractPomTemplateProjectSettingPage.previewButtonTip")); //$NON-NLS-1$
+        preview.addSelectionListener(new SelectionAdapter() {
+
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                checkModel(true);
+            }
+
+        });
+
+        return parent;
+    }
+
+    protected abstract String getHeaderMessage();
+
+    protected abstract String getDefaultText();
+
+    protected String getCustomText() {
+        return getPreferenceStore().getString(getPreferenceKey());
+    }
+
+    protected abstract boolean checkModel(boolean preview);
+
+    protected abstract String getMoreInfoUrl();
+
+    @Override
+    protected void performDefaults() {
+        super.performDefaults();
+        if (customText != null && !customText.isDisposed()) {
+            isDefaultPresentedForScriptTxt = true;
+            customText.setText(getPreferenceStore().getDefaultString(getPreferenceKey()));
+        }
+    }
+
+    @Override
+    public boolean performOk() {
+        boolean ok = super.performOk();
+        if (customText != null && !customText.isDisposed()) {
+            if (isDefaultPresentedForScriptTxt) {
+                getPreferenceStore().setToDefault(getPreferenceKey());
+                return ok;
+            }
+            if (!checkModel(false)) {
+                return false;
+            }
+            getPreferenceStore().setValue(getPreferenceKey(), customText.getText());
+        }
+        return ok;
+    }
+
+}

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

@@ -60,6 +60,8 @@ public interface IProjectSettingTemplateConstants {
 
     final static String PROJECT_TEMPLATE_FILE_NAME = "pom_project_template.xml";
 
+    final static String PROJECT_CUSTOM_TEMPLATE_FILE_NAME = "pom_project_custom_template.xml";
+
     final static String MAVEN_USER_SETTING_TEMPLATE_FILE_NAME = "maven_user_settings.xml";
 
     /*

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

@@ -0,0 +1,66 @@
+// ============================================================================
+//
+// 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.runtime.projectsetting;
+
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+
+public class PomPreviewDialog extends Dialog {
+
+    private String title;
+
+    private String content;
+
+    public PomPreviewDialog(Shell parentShell, String title, String content) {
+        super(parentShell);
+        this.title = title;
+        this.content = content;
+        setShellStyle(getShellStyle() | SWT.RESIZE);
+    }
+
+    @Override
+    protected void configureShell(Shell newShell) {
+        super.configureShell(newShell);
+        newShell.setText(title);
+    }
+
+    @Override
+    protected Control createDialogArea(Composite parent) {
+        Composite composite = (Composite) super.createDialogArea(parent);
+        GridData data = new GridData(GridData.FILL, GridData.FILL, true, true);
+        data.heightHint = 280;
+        data.minimumHeight = 1000;
+        data.widthHint = 500;
+        data.minimumWidth = 1100;
+        composite.setLayoutData(data);
+
+        StyledText text = new StyledText(composite, SWT.MULTI | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
+        text.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
+        text.setText(content);
+        text.setEditable(false);
+
+        return composite;
+    }
+
+    @Override
+    protected void createButtonsForButtonBar(Composite parent) {
+        createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
+    }
+
+}

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

@@ -21,10 +21,6 @@ public interface ICloudSignOnService extends IService {
 
     TokenMode getToken(String authCode, String codeVerifier, String dataCenter) throws Exception;
 
-    void startHeartBeat() throws Exception;
-
-    void stopHeartBeat();
-
     String generateCodeVerifier();
 
     String getCodeChallenge(String seed) throws Exception;
@@ -43,11 +39,13 @@ public interface ICloudSignOnService extends IService {
     
     boolean isNeedShowSSOPage();
     
-    public void showReloginDialog();
+    public boolean showReloginDialog();
     
     public boolean isReloginDialogRunning();
     
     public void reload();
+    
+    public boolean isRelogined4CurrentTask(String clazz);
 
     public static ICloudSignOnService get() {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(ICloudSignOnService.class)) {

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

@@ -0,0 +1,64 @@
+// ============================================================================
+//
+// 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.io.File;
+
+import org.talend.commons.CommonsPlugin;
+import org.talend.core.IService;
+
+/**
+ * @author bhe created on Jan 19, 2023
+ *
+ */
+public interface IComponentJsonformGeneratorService extends IService {
+
+    /**
+     * System property to enable whether to generate jsonform or not, not enabled by default
+     */
+    public static final String JSONFORM_GENERATE_PROP = "jsonform.generate";
+    
+    public static final String JSONFORM_GENERATE_FOLDER_PROP = "jsonform.generate.dir";
+    
+    public static final String JSONFORM_GENERATE_FOLDER_NAME_PROP = "jsonforms";
+
+    /**
+     * Generate jsonform json files for all of components
+     * 
+     * <pre>
+     * Folder structure
+     * 
+     * targetFolder
+     * --Category
+     * ----tRowgenerator.json
+     * ----tLogRow.json
+     * 
+     * </pre>
+     * 
+     * @param targetFolder all of jsonform jsons will be saved into the targetFolder
+     */
+    void generate(File targetFolder);
+
+    /**
+     * If enabled by -Djsonform.generate or by running junit, then generate jsonform for components, otherwise will not generate.
+     * 
+     * @return enabled or not
+     */
+    public static boolean isEnabled() {
+        return Boolean.getBoolean(JSONFORM_GENERATE_PROP) || CommonsPlugin.isJUnitTest() || CommonsPlugin.isJunitWorking();
+    }
+    
+    public static String getDirectoryFromProperty() {
+        return System.getProperty(JSONFORM_GENERATE_FOLDER_PROP);
+    }
+}

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

@@ -0,0 +1,45 @@
+// ============================================================================
+//
+// 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 org.talend.core.GlobalServiceRegister;
+import org.talend.core.IService;
+import org.talend.core.pendo.AbstractPendoTrackManager;
+import org.talend.core.pendo.TrackEvent;
+import org.talend.core.pendo.properties.IPendoDataProperties;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public interface ICoreTisRuntimeService extends IService {
+
+    String getTmcUser(String url, String token);
+
+    AbstractPendoTrackManager getPendoProjectLoginManager();
+
+    AbstractPendoTrackManager getPendoGenericManager(TrackEvent event, IPendoDataProperties peoperties);
+
+    boolean isPendoTrackAvailable() throws Exception;
+
+    void sendPendoTrackData(TrackEvent event, IPendoDataProperties properties) throws Exception;
+
+    void sendPTPTrackData(String componentName, String componentUniqName, String jobId, String data);
+
+    static ICoreTisRuntimeService get() {
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(ICoreTisRuntimeService.class)) {
+            return GlobalServiceRegister.getDefault().getService(ICoreTisRuntimeService.class);
+        }
+        return null;
+    }
+
+}

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

@@ -75,4 +75,6 @@ public interface IESBMicroService extends IService {
      * @return
      */
     IBuildJobHandler createBuildJobHandler(ProcessItem itemToExport, String version, String context, Map exportChoiceMap);
+    
+    public List<String> getExternalizedDependencies();
 }

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

@@ -17,9 +17,6 @@ import org.talend.commons.exception.PersistenceException;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
 import org.talend.core.nexus.ArtifactRepositoryBean;
-import org.talend.core.pendo.AbstractPendoTrackManager;
-import org.talend.core.pendo.TrackEvent;
-import org.talend.core.pendo.properties.IPendoDataProperties;
 import org.talend.utils.json.JSONException;
 import org.talend.utils.json.JSONObject;
 
@@ -39,16 +36,6 @@ public interface IRemoteService extends IService {
 
     boolean isAuthorized(String value);
     
-    boolean isPendoTrackAvailable() throws Exception;
-
-    void sendPendoTrackData(TrackEvent event, IPendoDataProperties properties) throws Exception;
-
-    AbstractPendoTrackManager getPendoProjectLoginManager();
-
-    AbstractPendoTrackManager getPendoGenericManager(TrackEvent event, IPendoDataProperties peoperties);
-
-    String getTmcUser(String url, String token);
-
     public boolean isCloudConnection();
     
     public static IRemoteService get() {

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

@@ -12,14 +12,23 @@
 // ============================================================================
 package org.talend.core.service;
 
+import java.net.HttpURLConnection;
 import java.net.URI;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.equinox.p2.repository.IRepository;
+import org.eclipse.equinox.security.storage.ISecurePreferences;
+import org.eclipse.equinox.security.storage.SecurePreferencesFactory;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
 import org.talend.core.model.general.Project;
@@ -201,6 +210,12 @@ public interface IStudioLiteP2Service extends IService {
     }
 
     public static interface UpdateSiteConfig {
+        
+        public static final int DEFAULT_TIMEOUT = 4000;
+
+        public static final String PROTOCOL_HTTP = "http";
+
+        public static final String PROTOCOL_HTTPS = "https";
 
         boolean isReleaseEditable();
 
@@ -239,6 +254,83 @@ public interface IStudioLiteP2Service extends IService {
         boolean isOverwriteTmcUpdateSettings(IProgressMonitor monitor) throws Exception;
 
         void overwriteTmcUpdateSettings(IProgressMonitor monitor, boolean overwrite) throws Exception;
+        
+        void enableBasicAuth(String uri, boolean enable) throws Exception;
+        
+        boolean isEnabledBasicAuth(String uri) throws Exception;
+        
+        public static boolean requireCredentials(URI uri, String nameAndPwd) throws Exception {
+            String scheme = uri.getScheme();
+            if (StringUtils.isEmpty(scheme) || (!StringUtils.equals(scheme, PROTOCOL_HTTP) && !StringUtils.equals(scheme, PROTOCOL_HTTPS))) {
+                return false;
+            }
+            URL url = new URL(uri.toString() + "/p2.index");
+            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+            conn.setConnectTimeout(DEFAULT_TIMEOUT);
+            conn.setReadTimeout(DEFAULT_TIMEOUT);
+            conn.setRequestMethod("HEAD");
+            if (!StringUtils.isEmpty(nameAndPwd)) {
+                nameAndPwd = Base64.encodeBase64String(nameAndPwd.getBytes());
+                conn.addRequestProperty("Authorization", "Basic " + nameAndPwd);
+            }
+
+            int responseCode = conn.getResponseCode();
+            if (responseCode == HttpURLConnection.HTTP_UNAUTHORIZED || responseCode == HttpURLConnection.HTTP_FORBIDDEN) {
+                return true;
+            }
+
+            if (responseCode != HttpURLConnection.HTTP_OK) {
+                throw new Exception("status code: " + responseCode);
+            }
+            
+            return false;
+        }
+
+        public static void saveCredentialsIntoSecureStore(URI uri, String uname, String pwd) throws Exception {
+            ISecurePreferences securePreferences = SecurePreferencesFactory.getDefault();
+            String nodeKey = URLEncoder.encode(uri.getHost(), StandardCharsets.UTF_8.name());
+
+            String nodeName = IRepository.PREFERENCE_NODE + '/' + nodeKey;
+            ISecurePreferences prefNode = null;
+
+            prefNode = securePreferences.node(nodeName);
+            prefNode.put(IRepository.PROP_USERNAME, uname, true);
+            prefNode.put(IRepository.PROP_PASSWORD, pwd, true);
+            securePreferences.flush();
+        }
+        
+        public static String[] loadCredentialsFromSecureStore(URI uri) throws Exception {
+            ISecurePreferences securePreferences = SecurePreferencesFactory.getDefault();
+            String nodeKey = URLEncoder.encode(uri.getHost(), StandardCharsets.UTF_8.name());
+
+            String nodeName = IRepository.PREFERENCE_NODE + '/' + nodeKey;
+            ISecurePreferences prefNode = null;
+
+            String[] namePwd = new String[2];
+
+            if (!securePreferences.nodeExists(nodeName)) {
+                return null;
+            }
+            prefNode = securePreferences.node(nodeName);
+
+            namePwd[0] = prefNode.get(IRepository.PROP_USERNAME, "");
+            namePwd[1] = prefNode.get(IRepository.PROP_PASSWORD, "");
+
+            return namePwd;
+        }
+        
+        public static void deleteCredentialsFromSecureStore(URI uri) throws Exception {
+            ISecurePreferences securePreferences = SecurePreferencesFactory.getDefault();
+            String nodeKey = URLEncoder.encode(uri.getHost(), StandardCharsets.UTF_8.name());
+
+            String nodeName = IRepository.PREFERENCE_NODE + '/' + nodeKey;
+
+            if (securePreferences.nodeExists(nodeName)) {
+                securePreferences.node(nodeName).removeNode();
+                securePreferences.flush();
+            }
+        }
+
 
     }
     

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

@@ -438,6 +438,8 @@ public final class TalendQuoteUtils {
             return QUOTATION_MARK;
         case IBMDB2:
             return QUOTATION_MARK;
+        case INGRES:
+            return QUOTATION_MARK;
         case MSODBC:
             return QUOTATION_MARK;
         case MSSQL:

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

@@ -560,6 +560,7 @@ ContextNebulaComposite.ContextsUnAvailable=Context view is not available.
 ContextNebulaComposite.ContextGroupLabel=Default context environment
 ContextTreeTable.PromptToolTips=activate prompt on variable
 ContextValidator.ParameterNotValid=parameter name is not valid
+ContextValidator.ParameterValueNotMatch=Type/value mismatch: the value of a variable must match its type
 WorkspaceMnu.switch.text=Switch &Workspace
 WorkspaceMnu.switch.tooltip=Open Workspace
 WorkspaceMnu.choose.text=&Choose...

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

@@ -560,6 +560,7 @@ ContextNebulaComposite.ContextsUnAvailable=La vue Contextes n'est pas disponible
 ContextNebulaComposite.ContextGroupLabel=Environnement du contexte par d\u00E9faut
 ContextTreeTable.PromptToolTips=activer le prompt sur variable
 ContextValidator.ParameterNotValid=le nom du param\u00E8tre n'est pas valide
+ContextValidator.ParameterValueNotMatch=Mauvaise correspondance de type/valeur\u00A0: la valeur d'une variable doit correspondre \u00E0 son type
 WorkspaceMnu.switch.text=Changer de r\u00E9pertoire &Workspace
 WorkspaceMnu.switch.tooltip=Ouvrir le r\u00E9pertoire Workspace
 WorkspaceMnu.choose.text=&Choisir...

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

@@ -321,7 +321,7 @@ repository.metadataFileRegexp=\u6B63\u898F\u8868\u73FE\u30D5\u30A1\u30A4\u30EB
 repository.metadataFileRegexp.alias=REGX
 repository.metadataFileXml=XML\u30D5\u30A1\u30A4\u30EB
 repository.metadataFileXml.alias=XML
-repository.metadataGenericSchema=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE
+repository.metadataGenericSchema=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE
 repository.metadataGenericSchema.alias=GENERIC
 repository.metadataLDAPSchema=LDAP
 repository.metadataLDAPSchema.alias=LDAP
@@ -560,6 +560,7 @@ ContextNebulaComposite.ContextsUnAvailable=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\
 ContextNebulaComposite.ContextGroupLabel=\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u74B0\u5883
 ContextTreeTable.PromptToolTips=\u5909\u6570\u306E\u30D7\u30ED\u30F3\u30D7\u30C8\u3092\u6709\u52B9\u5316
 ContextValidator.ParameterNotValid=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u540D\u304C\u7121\u52B9\u3067\u3059\u3002
+ContextValidator.ParameterValueNotMatch=\u578B\u3068\u5024\u306E\u4E0D\u4E00\u81F4: \u5909\u6570\u306E\u5024\u306F\u305D\u306E\u578B\u3068\u4E00\u81F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 WorkspaceMnu.switch.text=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u3092\u5207\u308A\u63DB\u3048(&W)
 WorkspaceMnu.switch.tooltip=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u3092\u958B\u304F
 WorkspaceMnu.choose.text=\u9078\u629E(&C)...
@@ -579,6 +580,6 @@ I18nPreferencePage.restart=\u518D\u8D77\u52D5
 I18nPreferencePage.restartButton=\u6709\u52B9\u5316\u306B\u306F\u518D\u8D77\u52D5\u304C\u5FC5\u8981\u3067\u3059\u3002
 I18nPreferencePage.restoreDefault=\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u5FA9\u5143
 I18nPreferencePage.wait_process=\u3053\u306E\u51E6\u7406\u306B\u306F\u6570\u5206\u304B\u304B\u308A\u307E\u3059\u3002\u3057\u3070\u3089\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044...
-MetadataPreferencePage.EnableBasic.name=\u57FA\u672C\u8A8D\u8A3C\u30D8\u30C3\u30C0\u30FC\u3092\u6709\u52B9\u306B\u3059\u308B
+MetadataPreferencePage.EnableBasic.name=\u57FA\u672C\u8A8D\u8A3C\u30D8\u30C3\u30C0\u30FC\u3092\u6709\u52B9\u5316
 MetadataPreferencePage.MessageDialog.Restart=\u3053\u306E\u8A2D\u5B9A\u304C\u6709\u52B9\u306B\u306A\u308B\u3088\u3046\u3001Studio\u3092\u518D\u8D77\u52D5\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n\u7D9A\u884C\u3057\u307E\u3059\u304B?
 TalendTabbedPropertyTitle.componentHelpTooltip=\u30AA\u30F3\u30E9\u30A4\u30F3\u30D8\u30EB\u30D7\u3092\u958B\u304F

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

@@ -560,6 +560,7 @@ ContextNebulaComposite.ContextsUnAvailable=\u4E0A\u4E0B\u6587\u89C6\u56FE\u4E0D\
 ContextNebulaComposite.ContextGroupLabel=\u9ED8\u8BA4\u4E0A\u4E0B\u6587\u73AF\u5883
 ContextTreeTable.PromptToolTips=\u6FC0\u6D3B\u63D0\u793A\u53D8\u91CF
 ContextValidator.ParameterNotValid=\u53C2\u6570\u540D\u65E0\u6548
+ContextValidator.ParameterValueNotMatch=\u7C7B\u578B/\u503C\u4E0D\u5339\u914D\uFF1A\u53D8\u91CF\u7684\u503C\u4E0E\u5176\u7C7B\u578B\u4E0D\u5339\u914D
 WorkspaceMnu.switch.text=\u5207\u6362\u5DE5\u4F5C\u533A(&W)
 WorkspaceMnu.switch.tooltip=\u6253\u5F00\u5DE5\u4F5C\u533A
 WorkspaceMnu.choose.text=\u9009\u62E9(&C)...

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

@@ -59,6 +59,7 @@ import org.eclipse.nebula.widgets.nattable.hideshow.RowHideShowLayer;
 import org.eclipse.nebula.widgets.nattable.hideshow.command.ColumnHideCommand;
 import org.eclipse.nebula.widgets.nattable.layer.DataLayer;
 import org.eclipse.nebula.widgets.nattable.layer.cell.ColumnOverrideLabelAccumulator;
+import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
 import org.eclipse.nebula.widgets.nattable.layer.config.DefaultColumnHeaderStyleConfiguration;
 import org.eclipse.nebula.widgets.nattable.painter.cell.TextPainter;
 import org.eclipse.nebula.widgets.nattable.painter.layer.NatGridLayerPainter;
@@ -111,6 +112,7 @@ import org.talend.core.ui.context.nattableTree.ContextNatTableStyleConfiguration
 import org.talend.core.ui.context.nattableTree.ContextNatTableUtils;
 import org.talend.core.ui.context.nattableTree.ContextParaModeChangeMenuConfiguration;
 import org.talend.core.ui.context.nattableTree.ContextRowDataListFixture;
+import org.talend.core.ui.context.nattableTree.ContextValueLabelAccumulator;
 import org.talend.core.ui.context.nattableTree.ExtendedContextColumnPropertyAccessor;
 import org.talend.core.ui.i18n.Messages;
 import org.talend.repository.ProjectManager;
@@ -130,7 +132,7 @@ public class ContextTreeTable {
 
     private NatTable natTable;
 
-    // for bug TDI-32821， use LinkedList to keep the original order of context parameter list.
+    // for bug TDI-32821锛<EFBFBD> use LinkedList to keep the original order of context parameter list.
     private List<ContextTreeNode> treeNodes = new LinkedList<ContextTreeNode>();
 
     private static Map<String, Boolean> expandMap = new HashMap<>();
@@ -272,7 +274,7 @@ public class ContextTreeTable {
             final GridLayer gridLayer = new GridLayer(viewportLayer, sortHeaderLayer, rowHeaderLayer, cornerLayer);
 
             // config the column edit configuration
-            ColumnOverrideLabelAccumulator labelAccumulator = new ColumnOverrideLabelAccumulator(bodyDataLayer);
+            ContextValueLabelAccumulator labelAccumulator = new ContextValueLabelAccumulator(bodyDataLayer, bodyDataProvider, manager.getContextManager(), columnGroupModel);
             bodyDataLayer.setConfigLabelAccumulator(labelAccumulator);
             registerColumnLabels(labelAccumulator, ContextRowDataListFixture.getContexts(manager.getContextManager()));
 
@@ -804,12 +806,32 @@ public class ContextTreeTable {
             if (cellValue instanceof Boolean) {
                 return new Point(col, row);
             }
+            ILayerCell cell = this.nt.getCellByPosition(col, row);
+            if (cell != null && cell.getConfigLabels() != null
+                    && cell.getConfigLabels().contains(ContextTableConstants.LABEL_VALUE_NOT_MATCH_TYPE)
+                    && cell.getConfigLabels().contains(ContextTableConstants.COLUMN_CONTEXT_VALUE)) {
+                return new Point(col, row);
+            }
             return null;
         }
 
         @Override
         protected String getText(Event event) {
-            return Messages.getString("ContextTreeTable.PromptToolTips"); //$NON-NLS-1$
+            int col = this.nt.getColumnPositionByX(event.x);
+            int row = this.nt.getRowPositionByY(event.y);
+
+            Object cellValue = this.nt.getDataValueByPosition(col, row);
+
+            if (cellValue instanceof Boolean) {
+                return Messages.getString("ContextTreeTable.PromptToolTips");
+            }
+            ILayerCell cell = this.nt.getCellByPosition(col, row);
+            if (cell != null && cell.getConfigLabels() != null
+                    && cell.getConfigLabels().contains(ContextTableConstants.LABEL_VALUE_NOT_MATCH_TYPE)
+                    && cell.getConfigLabels().contains(ContextTableConstants.COLUMN_CONTEXT_VALUE)) {
+                return Messages.getString("ContextValidator.ParameterValueNotMatch");
+            }
+            return null;
         }
 
         @Override

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/model/table/ContextTableConstants.java

@@ -28,6 +28,10 @@ public class ContextTableConstants {
     public static final String COLUMN_PROMPT_PROPERTY = "Prompt label"; //$NON-NLS-1$
 
     public static final String COLUMN_CONTEXT_VALUE = "Value"; //$NON-NLS-1$
-
+    
+    public static final String LABEL_CHANGED_FORCEGROUND = "LABEL_CHANGED_FORCEGROUND";
+    
+    public static final String LABEL_VALUE_NOT_MATCH_TYPE = "LABEL_VALUE_NOT_MATCH_TYPE";
+
     public static final int DEFAULT_COLUMN_COUNT = 8;
 }

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

@@ -16,6 +16,7 @@ import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
 import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
 import org.eclipse.nebula.widgets.nattable.painter.cell.TextPainter;
 import org.eclipse.nebula.widgets.nattable.style.CellStyleAttributes;
+import org.eclipse.nebula.widgets.nattable.style.CellStyleProxy;
 import org.eclipse.nebula.widgets.nattable.style.IStyle;
 import org.eclipse.nebula.widgets.nattable.util.GUIHelper;
 import org.eclipse.swt.graphics.GC;
@@ -43,12 +44,8 @@ public class ContextAutoResizeTextPainter extends TextPainter {
     @Override
     public void setupGCFromConfig(GC gc, IStyle cellStyle) {
         super.setupGCFromConfig(gc, cellStyle);
-        if (cellStyle.getAttributeValue(CellStyleAttributes.FOREGROUND_COLOR).equals(GUIHelper.COLOR_RED)) {
-            gc.setForeground(GUIHelper.COLOR_BLACK);
-        } else if (containsRowName) {
+        if (containsRowName) {
             gc.setForeground(GUIHelper.COLOR_RED);
-        } else if (changeBackgroundColor) {
-            gc.setForeground(GUIHelper.COLOR_WIDGET_DARK_SHADOW);
         }
     }
 

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

@@ -23,12 +23,15 @@ import org.eclipse.nebula.widgets.nattable.extension.glazedlists.GlazedListsData
 import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
 import org.eclipse.nebula.widgets.nattable.painter.cell.BackgroundPainter;
 import org.eclipse.nebula.widgets.nattable.painter.cell.ICellPainter;
+import org.eclipse.nebula.widgets.nattable.util.GUIHelper;
+import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Rectangle;
 import org.talend.core.ui.context.ContextTreeTable.ContextTreeNode;
 import org.talend.core.ui.context.model.ContextTabChildModel;
 import org.talend.core.ui.context.model.ContextTabParentModel;
+import org.talend.core.ui.context.model.table.ContextTableConstants;
 import org.talend.core.ui.context.model.table.ContextTableTabParentModel;
 
 /**
@@ -49,18 +52,9 @@ public class ContextNatTableBackGroudPainter extends BackgroundPainter {
     @Override
     public void paintCell(ILayerCell cell, GC gc, Rectangle bounds, IConfigRegistry configRegistry) {
         ContextTreeNode rowNode = ((GlazedListsDataProvider<ContextTreeNode>) dataProvider).getRowObject(cell.getRowIndex());
-        if (rowNode.getTreeData() instanceof ContextTableTabParentModel) {
-            ContextTableTabParentModel rowModel = (ContextTableTabParentModel) rowNode.getTreeData();
-            Boolean isRepositoryContext = rowModel.hasChildren();
-            if (isRepositoryContext) {
-                ((ContextAutoResizeTextPainter) getWrappedPainter()).setChangeBackgroundColor(true);
-            } else {
-                ((ContextAutoResizeTextPainter) getWrappedPainter()).setChangeBackgroundColor(false);
-            }
-        } else {
+        if (rowNode.getTreeData() instanceof ContextTabChildModel) {
             ContextTabChildModel rowChildModel = (ContextTabChildModel) rowNode.getTreeData();
             if (rowChildModel != null) {
-                ((ContextAutoResizeTextPainter) getWrappedPainter()).setChangeBackgroundColor(true);
                 checkContainsRowName(rowNode, rowChildModel);
             }
         }

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

@@ -137,7 +137,6 @@ public class ContextNatTableConfiguration extends AbstractRegistryConfiguration
 
         Style cellStyleSelect = new Style();
         cellStyleSelect.setAttributeValue(CellStyleAttributes.BACKGROUND_COLOR, GUIHelper.COLOR_TITLE_INACTIVE_BACKGROUND);
-        cellStyleSelect.setAttributeValue(CellStyleAttributes.FOREGROUND_COLOR, GUIHelper.COLOR_RED);
         cellStyleSelect.setAttributeValue(CellStyleAttributes.FONT, GUIHelper.DEFAULT_FONT);
         configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleSelect, DisplayMode.SELECT,
                 ContextTableConstants.COLUMN_TYPE_PROPERTY);
@@ -161,11 +160,15 @@ public class ContextNatTableConfiguration extends AbstractRegistryConfiguration
     private void registerValidateRules(IConfigRegistry configRegistry) {
         configRegistry.registerConfigAttribute(EditConfigAttributes.DATA_VALIDATOR,
                 new EventDataValidator(dataProvider, manager), DisplayMode.EDIT, ContextTableConstants.COLUMN_NAME_PROPERTY);
+        configRegistry.registerConfigAttribute(EditConfigAttributes.DATA_VALIDATOR,
+                new EventDataValueValidator(dataProvider, manager, columnGroupModel), DisplayMode.EDIT, ContextTableConstants.COLUMN_CONTEXT_VALUE);
     }
 
     private void registerErrorHandlingStrategies(IConfigRegistry configRegistry) {
         configRegistry.registerConfigAttribute(EditConfigAttributes.VALIDATION_ERROR_HANDLER, new DialogErrorHandling(),
                 DisplayMode.EDIT, ContextTableConstants.COLUMN_NAME_PROPERTY);
+        configRegistry.registerConfigAttribute(EditConfigAttributes.VALIDATION_ERROR_HANDLER, new DialogErrorHandling(),
+                DisplayMode.EDIT, ContextTableConstants.COLUMN_CONTEXT_VALUE);
     }
 
     private IEditableRule getEditRule() {

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

@@ -21,6 +21,7 @@ import org.eclipse.nebula.widgets.nattable.painter.cell.TextPainter;
 import org.eclipse.nebula.widgets.nattable.painter.cell.decorator.LineBorderDecorator;
 import org.eclipse.nebula.widgets.nattable.style.BorderStyle;
 import org.eclipse.nebula.widgets.nattable.style.CellStyleAttributes;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
 import org.eclipse.nebula.widgets.nattable.style.HorizontalAlignmentEnum;
 import org.eclipse.nebula.widgets.nattable.style.Style;
 import org.eclipse.nebula.widgets.nattable.style.VerticalAlignmentEnum;
@@ -28,6 +29,7 @@ import org.eclipse.nebula.widgets.nattable.util.GUIHelper;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
 import org.talend.commons.ui.runtime.ColorConstants;
+import org.talend.core.ui.context.model.table.ContextTableConstants;
 
 /**
  * created by ldong on Aug 26, 2014 Detailled comment
@@ -70,9 +72,17 @@ public class ContextNatTableStyleConfiguration extends AbstractRegistryConfigura
         cellStyle.setAttributeValue(CellStyleAttributes.HORIZONTAL_ALIGNMENT, hAlign);
         cellStyle.setAttributeValue(CellStyleAttributes.VERTICAL_ALIGNMENT, vAlign);
         cellStyle.setAttributeValue(CellStyleAttributes.BORDER_STYLE, borderStyle);
-
         configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyle);
-
+        
+        Style cellStyleValueError = new Style();
+        cellStyleValueError.setAttributeValue(CellStyleAttributes.FOREGROUND_COLOR, ColorConstants.ERROR_FONT_COLOR);
+        configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleValueError, DisplayMode.NORMAL, ContextTableConstants.LABEL_VALUE_NOT_MATCH_TYPE);
+        configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleValueError, DisplayMode.SELECT, ContextTableConstants.LABEL_VALUE_NOT_MATCH_TYPE);
+        
+        Style cellStyleChangedForceGround = new Style();
+        cellStyleChangedForceGround.setAttributeValue(CellStyleAttributes.FOREGROUND_COLOR, ColorConstants.getTableReadOnlyForegroundColor());
+        configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleChangedForceGround, DisplayMode.NORMAL, ContextTableConstants.LABEL_CHANGED_FORCEGROUND);        
+        
         configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, new DefaultDisplayConverter());
 
     }

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

@@ -0,0 +1,81 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.ui.context.nattableTree;
+
+import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
+import org.eclipse.nebula.widgets.nattable.extension.glazedlists.GlazedListsDataProvider;
+import org.eclipse.nebula.widgets.nattable.group.ColumnGroupModel;
+import org.eclipse.nebula.widgets.nattable.layer.ILayer;
+import org.eclipse.nebula.widgets.nattable.layer.LabelStack;
+import org.eclipse.nebula.widgets.nattable.layer.cell.ColumnOverrideLabelAccumulator;
+import org.talend.core.model.process.IContextManager;
+import org.talend.core.model.process.IContextParameter;
+import org.talend.core.ui.context.ContextTreeTable.ContextTreeNode;
+import org.talend.core.ui.context.model.ContextTabChildModel;
+import org.talend.core.ui.context.model.table.ContextTableConstants;
+import org.talend.core.ui.context.model.table.ContextTableTabParentModel;
+import org.talend.core.ui.utils.ContextTypeValidator;
+
+
+public class ContextValueLabelAccumulator extends ColumnOverrideLabelAccumulator {
+
+    private IDataProvider dataProvider;
+    private ColumnGroupModel columnGroupModel;
+    private IContextManager manager;
+
+    public ContextValueLabelAccumulator(ILayer layer, IDataProvider dataProvider, IContextManager manager, ColumnGroupModel columnGroupModel) {
+        super(layer);
+        this.dataProvider = dataProvider;
+        this.manager = manager;
+        this.columnGroupModel = columnGroupModel;
+    }
+
+   
+    @Override
+    public void accumulateConfigLabels(LabelStack configLabels, int columnPosition, int rowPosition) {
+        super.accumulateConfigLabels(configLabels, columnPosition, rowPosition);
+        boolean isAddedValueNotMatchStyle = false;        
+        ContextTreeNode rowNode = ((GlazedListsDataProvider<ContextTreeNode>) dataProvider).getList().get(rowPosition);
+        if (configLabels.contains(ContextTableConstants.COLUMN_CONTEXT_VALUE)) {
+            if (columnGroupModel != null && columnGroupModel.isPartOfAGroup(columnPosition)) {
+                String columnGroupName = columnGroupModel.getColumnGroupByIndex(columnPosition).getName();
+                IContextParameter realPara = ContextNatTableUtils.getRealParameter(manager, columnGroupName, rowNode.getTreeData());
+                if (realPara != null) {
+                    boolean isValid = ContextTypeValidator.isMatchType(realPara.getType(), realPara.getValue());
+                    if (isValid) {
+                        configLabels.remove(ContextTableConstants.LABEL_VALUE_NOT_MATCH_TYPE);
+                    } else {
+                        configLabels.addLabel(ContextTableConstants.LABEL_VALUE_NOT_MATCH_TYPE);
+                        isAddedValueNotMatchStyle = true;
+                    }
+                }
+            }
+        }
+        
+        if (!isAddedValueNotMatchStyle) {
+            if (rowNode.getTreeData() instanceof ContextTableTabParentModel) {
+                ContextTableTabParentModel rowModel = (ContextTableTabParentModel) rowNode.getTreeData();
+                Boolean isRepositoryContext = rowModel.hasChildren();
+                if (isRepositoryContext) {
+                    configLabels.addLabel(ContextTableConstants.LABEL_CHANGED_FORCEGROUND);
+                } else {
+                }
+            } else {
+                ContextTabChildModel rowChildModel = (ContextTabChildModel) rowNode.getTreeData();
+                if (rowChildModel != null) {
+                    configLabels.addLabel(ContextTableConstants.LABEL_CHANGED_FORCEGROUND);
+                }
+            }
+        }
+    }
+}

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

@@ -26,6 +26,8 @@ import org.eclipse.swt.events.KeyListener;
 import org.eclipse.swt.events.MouseAdapter;
 import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.MouseListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -272,4 +274,28 @@ public class ContextValuesNatText extends Composite {
     public Button getButton() {
         return this.button;
     }
+
+    @Override
+    public void setBackground(Color color) {
+        super.setBackground(color);
+        if (text != null && !text.isDisposed()) {
+            text.setBackground(color);
+        }
+    }
+
+    @Override
+    public void setFont(Font font) {
+        super.setFont(font);
+        if (text != null && !text.isDisposed()) {
+            text.setFont(font);
+        }
+    }
+
+    @Override
+    public void setForeground(Color color) {
+        super.setForeground(color);
+        if (text != null && !text.isDisposed()) {
+            text.setForeground(color);
+        }
+    }
 }

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

@@ -12,9 +12,17 @@
 // ============================================================================
 package org.talend.core.ui.context.nattableTree;
 
+import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.edit.config.RenderErrorHandling;
 import org.eclipse.nebula.widgets.nattable.edit.editor.AbstractCellEditor;
+import org.eclipse.nebula.widgets.nattable.edit.editor.ControlDecorationProvider;
+import org.eclipse.nebula.widgets.nattable.edit.editor.IEditErrorHandler;
 import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer.MoveDirectionEnum;
+import org.eclipse.nebula.widgets.nattable.style.CellStyleAttributes;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
 import org.eclipse.nebula.widgets.nattable.style.IStyle;
+import org.eclipse.nebula.widgets.nattable.style.Style;
+import org.eclipse.nebula.widgets.nattable.util.GUIHelper;
 import org.eclipse.nebula.widgets.nattable.widget.EditModeEnum;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyAdapter;
@@ -52,6 +60,18 @@ public class CustomTextCellEditor extends AbstractCellEditor {
      * if password, the value will be * always. should find out the real value.
      */
     private Object recordOriginalCanonicalValue;
+    
+    protected final ControlDecorationProvider decorationProvider = new ControlDecorationProvider();
+
+    /**
+     * The {@link IEditErrorHandler} that is used for showing conversion errors
+     * on typing into this editor. By default this is the
+     * {@link RenderErrorHandling} which will render the content in the editor
+     * red to indicate a conversion error.
+     */
+    private IEditErrorHandler inputConversionErrorHandler = new RenderErrorHandling(this.decorationProvider);
+    
+    private IEditErrorHandler inputValidationErrorHandler = new RenderErrorHandling(this.decorationProvider);
 
     public CustomTextCellEditor(IContextParameter realPara, IStyle cellStyle, boolean commitOnUpDown, boolean moveSelectionOnEnter) {
         this.realPara = realPara;
@@ -106,9 +126,26 @@ public class CustomTextCellEditor extends AbstractCellEditor {
                     }
                 }
             }
-
+            @Override
+            public void keyReleased(KeyEvent e) {
+                try {
+                    // always do the conversion
+                    Object canonicalValue = getCanonicalValue(CustomTextCellEditor.this.inputConversionErrorHandler);
+                    // and always do the validation, even if for committing the
+                    // validation should be skipped, on editing
+                    // a validation failure should be made visible
+                    // otherwise there would be no need for validation!
+                    validateCanonicalValue(canonicalValue, CustomTextCellEditor.this.inputValidationErrorHandler);
+                } catch (Exception ex) {
+                    // do nothing as exceptions caused by conversion or
+                    // validation are handled already we just need this catch
+                    // block for stopping the process if conversion failed with
+                    // an exception
+                }
+            }
         });
 
+        
         // text.addFocusListener(new FocusAdapter() {
         //
         // @Override
@@ -164,6 +201,30 @@ public class CustomTextCellEditor extends AbstractCellEditor {
         }
 
         this.buttonText = (ContextValuesNatText) createEditorControl(parentComp);
+        if (this.inputConversionErrorHandler instanceof RenderErrorHandling) {
+            IStyle conversionErrorStyle = this.configRegistry.getConfigAttribute(
+                    EditConfigAttributes.CONVERSION_ERROR_STYLE,
+                    DisplayMode.EDIT,
+                    this.labelStack);
+
+            ((RenderErrorHandling) this.inputConversionErrorHandler).setErrorStyle(conversionErrorStyle);
+        }
+
+        if (this.inputValidationErrorHandler instanceof RenderErrorHandling) {
+            IStyle validationErrorStyle = this.configRegistry.getConfigAttribute(
+                    EditConfigAttributes.VALIDATION_ERROR_STYLE,
+                    DisplayMode.EDIT,
+                    this.labelStack);
+
+            if (validationErrorStyle == null) {
+                validationErrorStyle = new Style();
+                validationErrorStyle.setAttributeValue(
+                        CellStyleAttributes.FOREGROUND_COLOR,
+                        GUIHelper.COLOR_RED);
+            }
+
+            ((RenderErrorHandling) this.inputValidationErrorHandler).setErrorStyle(validationErrorStyle);
+        }
         // use the real value.
         setCanonicalValue(this.recordOriginalCanonicalValue);
 
@@ -194,4 +255,24 @@ public class CustomTextCellEditor extends AbstractCellEditor {
         this.freeEdit = freeEdit;
     }
 
+    
+    public IEditErrorHandler getInputConversionErrorHandler() {
+        return inputConversionErrorHandler;
+    }
+
+    
+    public void setInputConversionErrorHandler(IEditErrorHandler inputConversionErrorHandler) {
+        this.inputConversionErrorHandler = inputConversionErrorHandler;
+    }
+
+    
+    public IEditErrorHandler getInputValidationErrorHandler() {
+        return inputValidationErrorHandler;
+    }
+
+    
+    public void setInputValidationErrorHandler(IEditErrorHandler inputValidationErrorHandler) {
+        this.inputValidationErrorHandler = inputValidationErrorHandler;
+    }
+    
 }

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

@@ -0,0 +1,55 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.ui.context.nattableTree;
+
+import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
+import org.eclipse.nebula.widgets.nattable.data.validate.DataValidator;
+import org.eclipse.nebula.widgets.nattable.data.validate.ValidationFailedException;
+import org.eclipse.nebula.widgets.nattable.extension.glazedlists.GlazedListsDataProvider;
+import org.eclipse.nebula.widgets.nattable.group.ColumnGroupModel;
+import org.talend.core.model.process.IContextManager;
+import org.talend.core.model.process.IContextParameter;
+import org.talend.core.ui.context.ContextTreeTable.ContextTreeNode;
+import org.talend.core.ui.i18n.Messages;
+import org.talend.core.ui.utils.ContextTypeValidator;
+
+public class EventDataValueValidator extends DataValidator {
+
+    private ColumnGroupModel columnGroupModel;
+    private IDataProvider dataProvider;
+
+    private IContextManager manager;
+
+    EventDataValueValidator(IDataProvider bodyDataProvider, IContextManager manager, ColumnGroupModel columnGroupModel) {
+        this.dataProvider = bodyDataProvider;
+        this.manager = manager;
+        this.columnGroupModel = columnGroupModel;
+    }
+
+    @Override
+    public boolean validate(int columnIndex, int rowIndex, Object newValue) {
+        boolean isValid = true;
+        ContextTreeNode rowNode = ((GlazedListsDataProvider<ContextTreeNode>) dataProvider).getList().get(rowIndex);
+        if (columnGroupModel != null && columnGroupModel.isPartOfAGroup(columnIndex)) {
+            String columnGroupName = columnGroupModel.getColumnGroupByIndex(columnIndex).getName();
+            IContextParameter realPara = ContextNatTableUtils.getRealParameter(manager, columnGroupName, rowNode.getTreeData());
+            if (realPara != null) {
+                isValid = ContextTypeValidator.isMatchType(realPara.getType(), newValue);
+                if (!isValid) {
+                    throw new ValidationFailedException(Messages.getString("ContextValidator.ParameterValueNotMatch")); //$NON-NLS-1$
+                }   
+            }
+        }
+        return isValid;
+    }
+}

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

@@ -425,6 +425,7 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
                             && jobContextManager.isOriginalParameter(param.getName())) {
                         jobContextManager.setModified(true);
                         manager.fireContextsChangedEvent();
+                        modelManager.refresh();
                     }
                 }
             }
@@ -507,6 +508,7 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
                             && jobContextManager.isOriginalParameter(param.getName())) {
                         jobContextManager.setModified(true);
                         manager.fireContextsChangedEvent();
+                        modelManager.refresh();
                     }
                 }
             }
@@ -588,6 +590,7 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
                             && jobContextManager.isOriginalParameter(param.getName())) {
                         jobContextManager.setModified(true);
                         manager.fireContextsChangedEvent();
+                        modelManager.refresh();
                     }
                 }
             }
@@ -684,6 +687,7 @@ 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/proposal/RoutinesFunctionProposal.java

@@ -78,6 +78,7 @@ public class RoutinesFunctionProposal implements IContentProposal {
         message += Messages.getString("RoutinesFunctionProposal.CreatedBy.v1");
         message += Messages.getString("RoutinesFunctionProposal.ReturnType.v1");
         message += Messages.getString("RoutinesFunctionProposal.VariableName.v1");
+        message = message.replaceAll("\n", System.getProperty("line.separator", "\n")); // for display on Windows platform
 
         MessageFormat format = new MessageFormat(message);
         Object[] args = new Object[] { function.getDescription(),

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/utils/ContextTypeValidator.java

@@ -0,0 +1,89 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.ui.utils;
+
+import org.apache.commons.lang3.StringUtils;
+import org.talend.designer.core.model.utils.emf.talendfile.ContextParameterType;
+
+public class ContextTypeValidator {
+
+    public static boolean isMatchType(ContextParameterType contextParam) {
+        return isMatchType(contextParam.getType(), contextParam.getValue());
+    }
+
+    public static boolean isMatchType(String type, Object objValue) {
+        String strValue = null;
+        if (objValue == null) {
+            return true;
+        }
+        if (objValue instanceof String) {
+            strValue = (String) objValue;
+        }
+        if (StringUtils.isEmpty(strValue)) {
+            return true;
+        }
+        boolean isValid = true;
+        switch (type) {
+        case "id_Integer": {
+            try {
+                ParserUtils.parseTo_int(strValue);
+            } catch (NumberFormatException ex) {
+                isValid = false;
+            }
+            break;
+        }
+        case "id_Double": {
+            try {
+                ParserUtils.parseTo_double(strValue);
+            } catch (NumberFormatException ex) {
+                isValid = false;
+            }
+            break;
+        }
+        case "id_Float": {
+            try {
+                ParserUtils.parseTo_float(strValue);
+            } catch (NumberFormatException ex) {
+                isValid = false;
+            }
+            break;
+        }
+        case "id_BigDecimal": {
+            try {
+                ParserUtils.parseTo_BigDecimal(strValue);
+            } catch (NumberFormatException ex) {
+                isValid = false;
+            }
+            break;
+        }
+        case "id_Long": {
+            try {
+                ParserUtils.parseTo_long(strValue);
+            } catch (NumberFormatException ex) {
+                isValid = false;
+            }
+            break;
+        }
+
+        case "id_Short": {
+            try {
+                ParserUtils.parseTo_short(strValue);
+            } catch (NumberFormatException ex) {
+                isValid = false;
+            }
+            break;
+        }
+        }
+        return isValid;
+    }
+}

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/utils/ParserUtils.java

@@ -0,0 +1,244 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.ui.utils;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ParserUtils {
+
+    public static List<String> parseTo_List(String s) {
+        return parseTo_List(s, null);
+    }
+
+    /**
+     * the source should be a string wrapped in chars[ ] which stands for it is a collection
+     *
+     * @param stSrc
+     * @param fieldSep
+     * @return
+     */
+    public static List<String> parseTo_List(final String strSrc, String fieldSep) {
+        if (strSrc == null) {
+            return null;
+        }
+        List<String> list = new ArrayList<String>();
+
+        // the source string is wrap in [] which means it is a collection
+        if ((fieldSep == null || "".equals(fieldSep)) || !(strSrc.startsWith("[") && strSrc.endsWith("]"))) {
+            list.add(strSrc);
+            return list;
+        }
+        String strTemp = strSrc.substring(1, strSrc.length() - 1); // remove the [ ]
+        for (String str : strTemp.split(fieldSep, -1)) {
+            list.add(str);
+        }
+        return list;
+    }
+
+    public static Character parseTo_Character(String s) {
+        if (s == null) {
+            return null;
+        }
+        return s.charAt(0);
+    }
+
+    public static char parseTo_char(String s) {
+        return parseTo_Character(s);
+    }
+
+    public static Byte parseTo_Byte(String s) {
+        if (s == null) {
+            return null;
+        }
+        return Byte.decode(s).byteValue();
+    }
+
+    public static Byte parseTo_Byte(String s, boolean isDecode) {
+        if (s == null) {
+            return null;
+        }
+        if (isDecode) {
+            return Byte.decode(s).byteValue();
+        } else {
+            return Byte.parseByte(s);
+        }
+    }
+
+    public static byte parseTo_byte(String s) {
+        return parseTo_Byte(s);
+    }
+
+    public static byte parseTo_byte(String s, boolean isDecode) {
+        return parseTo_Byte(s, isDecode);
+    }
+
+    public static Double parseTo_Double(String s) {
+        if (s == null) {
+            return null;
+        }
+        return Double.parseDouble(s);
+    }
+
+    public static double parseTo_double(String s) {
+        return parseTo_Double(s);
+    }
+
+    public static float parseTo_float(String s) {
+        return Float.parseFloat(s);
+    }
+
+    public static Float parseTo_Float(String s) {
+        if (s == null) {
+            return null;
+        }
+        return parseTo_float(s);
+    }
+
+    public static int parseTo_int(String s) {
+        return Integer.parseInt(s);
+    }
+
+    public static int parseTo_int(String s, boolean isDecode) {
+        if (isDecode) {
+            return Integer.decode(s).intValue();
+        } else {
+            return Integer.parseInt(s);
+        }
+    }
+
+    public static Integer parseTo_Integer(String s) {
+        if (s == null) {
+            return null;
+        }
+        return parseTo_int(s);
+    }
+
+    public static Integer parseTo_Integer(String s, boolean isDecode) {
+        if (s == null) {
+            return null;
+        }
+        return parseTo_int(s, isDecode);
+    }
+
+    public static short parseTo_short(String s) {
+        return Short.parseShort(s);
+    }
+
+    public static short parseTo_short(String s, boolean isDecode) {
+        if (isDecode) {
+            return Short.decode(s).shortValue();
+        } else {
+            return Short.parseShort(s);
+        }
+    }
+
+    public static Short parseTo_Short(String s) {
+        if (s == null) {
+            return null;
+        }
+        return parseTo_short(s);
+    }
+
+    public static Short parseTo_Short(String s, boolean isDecode) {
+        if (s == null) {
+            return null;
+        }
+        return parseTo_short(s, isDecode);
+    }
+
+    public static long parseTo_long(String s) {
+        return Long.parseLong(s);
+    }
+
+    public static long parseTo_long(String s, boolean isDecode) {
+        if (isDecode) {
+            return Long.decode(s).longValue();
+        } else {
+            return Long.parseLong(s);
+        }
+    }
+
+    public static Long parseTo_Long(String s) {
+        if (s == null) {
+            return null;
+        }
+        return parseTo_long(s);
+    }
+
+    public static Long parseTo_Long(String s, boolean isDecode) {
+        if (s == null) {
+            return null;
+        }
+        return parseTo_long(s, isDecode);
+    }
+
+    public static Boolean parseTo_Boolean(String s) {
+        if (s == null) {
+            return null;
+        }
+        if (s.equals("1")) { //$NON-NLS-1$
+            return Boolean.parseBoolean("true"); //$NON-NLS-1$
+        }
+        return Boolean.parseBoolean(s);
+    }
+
+    public static boolean parseTo_boolean(String s) {
+        return parseTo_Boolean(s);
+    }
+
+    public static String parseTo_String(String s) {
+        return s;
+    }
+
+    public static String parseTo_String(final List<String> s, String fieldSep) {
+        if (s == null) {
+            return null;
+        }
+        StringBuffer result = new StringBuffer();
+        result.append("[");
+        for (int i = 0; i < s.size(); i++) {
+            if (i != 0) {
+                result.append(fieldSep);
+            }
+            result.append(s.get(i));
+        }
+        result.append("]");
+
+        return result.toString();
+    }
+
+    public static BigDecimal parseTo_BigDecimal(String s) {
+        if (s == null) {
+            return null;
+        }
+        try {
+            return new BigDecimal(s);
+
+        } catch (NumberFormatException nfe) {
+
+            if (nfe.getMessage() == null) {
+
+                throw new NumberFormatException("Incorrect input \"" + s + "\" for BigDecimal.");
+
+            } else {
+
+                throw nfe;
+            }
+        }
+    }
+
+  
+
+}

main/plugins/org.talend.core/src/main/java/org/talend/core/model/metadata/query/GenerateQueryFactory.java

@@ -63,6 +63,7 @@ public final class GenerateQueryFactory {
         case IBMDB2ZOS:
         case MYSQL:
         case AMAZON_AURORA:
+        case INGRES:
             return new NonDatabaseDefaultQueryGenerator(dbType);
         case ORACLE_OCI:
         case ORACLEFORSID:

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

@@ -26,6 +26,7 @@ import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.exception.SystemException;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
+import org.talend.core.model.general.ConnectionBean;
 import org.talend.core.model.general.Project;
 import org.talend.core.model.process.INode;
 import org.talend.core.model.properties.Property;
@@ -108,6 +109,8 @@ public interface ICoreTisService extends IService {
     void syncProjectUpdateSettingsFromServer(IProgressMonitor monitor, Project proj) throws Exception;
 
     void refreshPatchesFolderCache();
+    
+    boolean hasValidToken(ConnectionBean conn) throws Exception;
 
     static ICoreTisService get() {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(ICoreTisService.class)) {

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

@@ -63,6 +63,12 @@ public interface IGITProviderService extends IService {
      */
     boolean isStandardMode();
     
+    /**
+     * Whether git storage mode is set in preference or not
+     * @return
+     */
+    boolean isGitModeInPreference();
+    
     /**
      * Set git mode
      * @param standardMode

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

@@ -16,14 +16,14 @@
 		<jcache.version>1.0.5</jcache.version>
 		<jcache_spec.version>1.0-alpha-1</jcache_spec.version>
 		<johnzon.version>1.2.19</johnzon.version>
-		<meecrowave.version>1.2.14</meecrowave.version>
+		<meecrowave.version>1.2.15</meecrowave.version>
 		<microprofile.version>1.2.1</microprofile.version>
 		<owb.version>2.0.27</owb.version>
 		<slf4j.version>1.7.34</slf4j.version>
-		<tomcat.version>9.0.68</tomcat.version>
+		<tomcat.version>9.0.73</tomcat.version>
 		<xbean.version>4.20</xbean.version>
 		<reload4j.version>1.2.22</reload4j.version>
-		<log4j2.version>2.17.2</log4j2.version>
+		<log4j2.version>2.20.0</log4j2.version>
 		<tycho.buildtimestamp.format>${timestamp}</tycho.buildtimestamp.format>
 	</properties>
 	<repositories>

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

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

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

@@ -94,6 +94,15 @@
             name="RemoveConfigMavenRepository"
             version="6.0.2">
       </projecttask>
+      <projecttask
+            beforeLogon="true"
+            breaks="8.0.0"
+            class="org.talend.designer.maven.ui.setting.migration.ProjectPomTemplateMigrationTask"
+            description="Migrate custom project pom template"
+            id="org.talend.designer.maven.ui.setting.migration.ProjectPomTemplateMigrationTask"
+            name="ProjectPomTemplateMigrationTask"
+            version="8.0.1">
+      </projecttask>
    </extension>
 
 </plugin>

main/plugins/org.talend.designer.maven.ui/src/main/java/messages.properties

@@ -11,6 +11,11 @@ ProjectPomProjectSettingPage_FilterPomLabel=Filter to use to generate poms:
 ProjectPomProjectSettingPage_FilterErrorMessage=Filter is invalid.
 ProjectPomProjectSettingPage.syncAllPomsButtonText=Force full re-synchronize POMs
 ProjectPomProjectSettingPage.syncBuildTypesButtonText=Force full re-synchronize build types
+ProjectPomProjectSettingPage.validateTitle=Customization result
+ProjectPomProjectSettingPage.warningTip=The following default settings will be overwritten.\n
+ProjectPomProjectSettingPage.errorTip=The following default settings can't be overwritten.\n
+ProjectPomProjectSettingPage.headerMessage=Customize the project POM settings by adding your custom settings on the Custom tab.
+ProjectPomProjectSettingPage.preview=Preview
 AbstractPersistentProjectSettingPage.syncAllPoms=Do you want to update all poms? \n This operation might take long time depends on your project size.
 MavenProjectSettingPage.filterExampleMessage=Filter examples:\nlabel=myJob       \t\t\t\t=> Generate only the job named "myJob"\n!(label=myJob)    \t\t\t\t=> Generate any job except the one named "myJob"\n(path=folder1/folder2)  \t\t\t=> Generate any job in the folder "folder1/folder2"\n(path=folder1/folder2)or(label=myJob)\t=> Generate any job in the folder "folder1/folder2" or named "myJob"\n(label=myJob)and(version=0.2)\t\t=> Generate only the job named "myJob" with version 0.2\n!((label=myJob)and(version=0.1))\t\t=> Generate every jobs except the "myJob" version 0.1
 MavenProjectSettingPage.refModuleText=Set reference project modules in profile

main/plugins/org.talend.designer.maven.ui/src/main/java/messages_fr.properties

@@ -11,6 +11,10 @@ ProjectPomProjectSettingPage_FilterPomLabel=Filtrer pour utiliser la g\u00E9n\u0
 ProjectPomProjectSettingPage_FilterErrorMessage=Le filtre n'est pas valide.
 ProjectPomProjectSettingPage.syncAllPomsButtonText=Forcer la resynchronisation compl\u00E8te des POM
 ProjectPomProjectSettingPage.syncBuildTypesButtonText=Forcer la resynchronisation compl\u00E8te des types de build
+ProjectPomProjectSettingPage.validateTitle=R\u00E9sultat de la validation
+ProjectPomProjectSettingPage.warningTip=La configuration par d\u00E9faut sera \u00E9cras\u00E9e.\n
+ProjectPomProjectSettingPage.errorTip=Impossible d'\u00E9craser la configuration par d\u00E9faut.\n
+ProjectPomProjectSettingPage.preview=Aper\u00E7u
 AbstractPersistentProjectSettingPage.syncAllPoms=Mettre \u00E0 jour tous les POM ? \n Cette op\u00E9ration peut prendre un moment, selon la taille de votre projet.
 MavenProjectSettingPage.filterExampleMessage=Exemples de filtres\u00A0:\nlibell\u00E9=monJob       \t\t\t\t=> G\u00E9n\u00E9rer uniquement le Job nomm\u00E9 "monJob"\n!(libell\u00E9=monJob)    \t\t\t\t=> G\u00E9n\u00E9rer tous les Jobs sauf celui nomm\u00E9 "monJob"\n(path=folder1/folder2)  \t\t\t=> G\u00E9n\u00E9rer tous Jobs dans le dossier "dossier1/dossier2"\n(chemin=dossier1/dossier2)ou(libell\u00E9=monJob)\t=> G\u00E9n\u00E9rer tous Jobs dans le dossier "dossier1/dossier2" ou nomm\u00E9 "monJob"\n(libell\u00E9=monJob)et(version=0.2)\t\t=> G\u00E9n\u00E9rer uniquement le Job nomm\u00E9 "monJob" avec une version 0.2\n!((libell\u00E9=monJob)et(version=0.1))\t\t=> G\u00E9n\u00E9rer tous les Jobs sauf "monJob" version 0.1
 MavenProjectSettingPage.refModuleText=Configurer les modules du projet de r\u00E9f\u00E9rence dans le profil

main/plugins/org.talend.designer.maven.ui/src/main/java/messages_ja.properties

@@ -11,6 +11,10 @@ ProjectPomProjectSettingPage_FilterPomLabel=POM\u306E\u751F\u6210\u306B\u4F7F\u7
 ProjectPomProjectSettingPage_FilterErrorMessage=\u30D5\u30A3\u30EB\u30BF\u30FC\u304C\u7121\u52B9\u3067\u3059\u3002
 ProjectPomProjectSettingPage.syncAllPomsButtonText=\u5B8C\u5168\u306A\u518D\u540C\u671FPOM\u3092\u5F37\u5236
 ProjectPomProjectSettingPage.syncBuildTypesButtonText=\u5B8C\u5168\u306A\u518D\u540C\u671F\u30D3\u30EB\u30C9\u30BF\u30A4\u30D7\u3092\u5F37\u5236
+ProjectPomProjectSettingPage.validateTitle=\u691C\u8A3C\u7D50\u679C
+ProjectPomProjectSettingPage.warningTip=\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u8A2D\u5B9A\u306F\u4E0A\u66F8\u304D\u3055\u308C\u307E\u3059\u3002\n
+ProjectPomProjectSettingPage.errorTip=\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u8A2D\u5B9A\u3092\u4E0A\u66F8\u304D\u3067\u304D\u307E\u305B\u3093\u3002\n
+ProjectPomProjectSettingPage.preview=\u30D7\u30EC\u30D3\u30E5\u30FC
 AbstractPersistentProjectSettingPage.syncAllPoms=POM\u3092\u3059\u3079\u3066\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059\u304B? \n \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30B5\u30A4\u30BA\u306B\u3088\u3063\u3066\u306F\u3053\u306E\u64CD\u4F5C\u3067\u9577\u3044\u6642\u9593\u304C\u304B\u304B\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002
 MavenProjectSettingPage.filterExampleMessage=\u30D5\u30A3\u30EB\u30BF\u30FC\u306E\u4F8B:\nlabel=myJob       \t\t\t\t=> "myJob"\u3068\u3044\u3046\u540D\u524D\u306E\u30B8\u30E7\u30D6\u3060\u3051\u3092\u751F\u6210\n!(label=myJob)    \t\t\t\t=> "myJob"\u3068\u3044\u3046\u540D\u524D\u4EE5\u5916\u306E\u30B8\u30E7\u30D6\u3092\u3059\u3079\u3066\u751F\u6210\n(path=folder1/folder2)  \t\t\t=> "folder1/folder2"\u3068\u3044\u3046\u30D5\u30A3\u30EB\u30C0\u30FC\u306B\u3042\u308B\u30B8\u30E7\u30D6\u3092\u3059\u3079\u3066\u751F\u6210\n(path=folder1/folder2)or(label=myJob)\t=> "folder1/folder2"\u3068\u3044\u3046\u30D5\u30A9\u30EB\u30C0\u30FC\u306B\u3042\u308B\u3059\u3079\u3066\u306E\u30B8\u30E7\u30D6\u3001\u307E\u305F\u306F"myJob"\u3068\u3044\u3046\u540D\u524D\u306E\u30B8\u30E7\u30D6\u3092\u751F\u6210\n(label=myJob)and(version=0.2)\t\t=> \u30D0\u30FC\u30B8\u30E7\u30F30.2\u3067"myJob"\u3068\u3044\u3046\u540D\u524D\u306E\u30B8\u30E7\u30D6\u306E\u307F\u751F\u6210\n!((label=myJob)and(version=0.1))\t\t=> \u30D0\u30FC\u30B8\u30E7\u30F30.1\u3067"myJob"\u3068\u3044\u3046\u540D\u524D\u4EE5\u5916\u306E\u30B8\u30E7\u30D6\u3092\u3059\u3079\u3066\u751F\u6210
 MavenProjectSettingPage.refModuleText=\u30D7\u30ED\u30D5\u30A1\u30A4\u30EB\u3067\u53C2\u7167\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u8A2D\u5B9A

main/plugins/org.talend.designer.maven.ui/src/main/java/messages_zh_CN.properties

@@ -11,6 +11,10 @@ ProjectPomProjectSettingPage_FilterPomLabel=\u7528\u4E8E\u751F\u6210 pom \u7684\
 ProjectPomProjectSettingPage_FilterErrorMessage=\u7B5B\u9009\u5668\u65E0\u6548\u3002
 ProjectPomProjectSettingPage.syncAllPomsButtonText=\u5F3A\u5236\u5B8C\u5168\u91CD\u65B0\u540C\u6B65 POM
 ProjectPomProjectSettingPage.syncBuildTypesButtonText=\u5F3A\u5236\u91CD\u65B0\u540C\u6B65\u6784\u5EFA\u7C7B\u578B
+ProjectPomProjectSettingPage.validateTitle=\u9A8C\u8BC1\u7ED3\u679C
+ProjectPomProjectSettingPage.warningTip=\u9ED8\u8BA4\u8BBE\u7F6E\u5C06\u88AB\u8986\u76D6\u3002\n
+ProjectPomProjectSettingPage.errorTip=\u65E0\u6CD5\u8986\u76D6\u9ED8\u8BA4\u8BBE\u7F6E\u3002\n
+ProjectPomProjectSettingPage.preview=\u9884\u89C8
 AbstractPersistentProjectSettingPage.syncAllPoms=\u662F\u5426\u66F4\u65B0\u6240\u6709 POM \u6587\u4EF6? \n \u6B64\u64CD\u4F5C\u53EF\u80FD\u9700\u8981\u5F88\u957F\u65F6\u95F4\uFF0C\u5177\u4F53\u53D6\u51B3\u4E8E\u60A8\u7684\u5DE5\u7A0B\u5927\u5C0F\u3002
 MavenProjectSettingPage.filterExampleMessage=\u7B5B\u9009\u5668\u793A\u4F8B\uFF1A\nlabel=myJob       \t\t\t\t=> \u4EC5\u751F\u6210\u540D\u4E3A "myJob" \u7684\u4F5C\u4E1A\n!(label=myJob)    \t\t\t\t=> \u751F\u6210\u540D\u4E3A "myJob" \u9664\u5916\u7684\u4EFB\u610F\u4F5C\u4E1A\n(path=folder1/folder2)  \t\t\t=> \u751F\u6210\u6587\u4EF6\u5939 "folder1/folder2" \u4E2D\u4EFB\u610F\u4F5C\u4E1A\n(path=folder1/folder2)or(label=myJob)\t=> \u751F\u6210\u6587\u4EF6\u5939 "folder1/folder2" \u4E2D\u7684\u4EFB\u610F\u4F5C\u4E1A\u6216\u4EFB\u610F\u540D\u4E3A "myJob" \u7684\u4F5C\u4E1A\n(label=myJob)and(version=0.2)\t\t=> \u4EC5\u751F\u6210\u7248\u672C 0.2 \u4E14\u540D\u4E3A "myJob" \u7684\u4F5C\u4E1A\n!((label=myJob)and(version=0.1))\t\t=> \u751F\u6210\u4EFB\u610F\u540D\u79F0\u4E0D\u4E3A "myJob" \u4E14\u7248\u672C\u4E0D\u4E3A 0.1 \u7684\u4F5C\u4E1A
 MavenProjectSettingPage.refModuleText=\u5728\u914D\u7F6E\u6587\u4EF6\u4E2D\u8BBE\u7F6E\u5F15\u7528\u5DE5\u7A0B\u6A21\u5757

main/plugins/org.talend.designer.maven.ui/src/main/java/org/talend/designer/maven/ui/setting/migration/ProjectPomTemplateMigrationTask.java

@@ -0,0 +1,66 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.designer.maven.ui.setting.migration;
+
+import java.io.ByteArrayOutputStream;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.maven.model.Model;
+import org.eclipse.m2e.core.MavenPlugin;
+import org.talend.commons.exception.ExceptionHandler;
+import org.talend.core.model.general.Project;
+import org.talend.core.model.migration.AbstractProjectMigrationTask;
+import org.talend.core.runtime.projectsetting.IProjectSettingPreferenceConstants;
+import org.talend.core.runtime.projectsetting.ProjectPreferenceManager;
+import org.talend.designer.maven.model.TalendMavenConstants;
+import org.talend.designer.maven.template.MavenTemplateManager;
+import org.talend.designer.maven.tools.MergeModelTool;
+import org.talend.designer.maven.ui.DesignerMavenUiPlugin;
+import org.talend.repository.ProjectManager;
+
+public class ProjectPomTemplateMigrationTask extends AbstractProjectMigrationTask {
+
+    @Override
+    public Date getOrder() {
+        GregorianCalendar gc = new GregorianCalendar(2023, 1, 9, 12, 0, 0);
+        return gc.getTime();
+    }
+
+    @Override
+    public ExecutionResult execute(Project project) {
+        try {
+            Map<String, Object> parameters = new HashMap<String, Object>();
+            parameters.put(MavenTemplateManager.KEY_PROJECT_NAME,
+                    ProjectManager.getInstance().getCurrentProject().getTechnicalLabel());
+            Model defaultModel = MavenTemplateManager.getDefaultProjectModel(parameters);
+            Model customModel = MavenTemplateManager.getCustomProjectModel(parameters);
+            Model model = new MergeModelTool().migrateCustomModel(defaultModel, customModel);
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            MavenPlugin.getMaven().writeModel(model, out);
+            String content = out.toString(TalendMavenConstants.DEFAULT_ENCODING);
+            if (content != null) {
+                ProjectPreferenceManager prefManager = DesignerMavenUiPlugin.getDefault().getProjectPreferenceManager();
+                prefManager.setValue(IProjectSettingPreferenceConstants.TEMPLATE_PROJECT_POM, content);
+                prefManager.save();
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+            return ExecutionResult.FAILURE;
+        }
+        return ExecutionResult.SUCCESS_NO_ALERT;
+    }
+
+}

main/plugins/org.talend.designer.maven.ui/src/main/java/org/talend/designer/maven/ui/setting/project/initializer/MavenScriptsProjectSettingInitializer.java

@@ -12,25 +12,19 @@
 // ============================================================================
 package org.talend.designer.maven.ui.setting.project.initializer;
 
-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
-import java.util.Iterator;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.model.Model;
-import org.apache.maven.model.Profile;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.m2e.core.MavenPlugin;
 import org.talend.commons.exception.ExceptionHandler;
-import org.talend.core.PluginChecker;
 import org.talend.core.runtime.projectsetting.IProjectSettingPreferenceConstants;
 import org.talend.core.runtime.projectsetting.IProjectSettingTemplateConstants;
 import org.talend.designer.maven.DesignerMavenPlugin;
 import org.talend.designer.maven.model.TalendMavenConstants;
 import org.talend.designer.maven.template.AbstractMavenTemplateManager;
 import org.talend.designer.maven.template.MavenTemplateManager;
-import org.talend.designer.maven.tools.extension.PomExtensionRegistry;
 import org.talend.designer.maven.ui.DesignerMavenUiPlugin;
 import org.talend.designer.maven.utils.PomUtil;
 
@@ -51,7 +45,7 @@ public class MavenScriptsProjectSettingInitializer extends AbstractProjectPrefer
         try {
             setDefault(preferenceStore, IProjectSettingPreferenceConstants.TEMPLATE_PROJECT_POM, DesignerMavenPlugin.PLUGIN_ID,
                     IProjectSettingTemplateConstants.PATH_GENERAL + '/'
-                            + IProjectSettingTemplateConstants.PROJECT_TEMPLATE_FILE_NAME);
+                            + IProjectSettingTemplateConstants.PROJECT_CUSTOM_TEMPLATE_FILE_NAME);
 
         } catch (Exception e) {
             ExceptionHandler.process(e);
@@ -67,7 +61,6 @@ public class MavenScriptsProjectSettingInitializer extends AbstractProjectPrefer
             if (templateManager != null) {
                 InputStream stream = templateManager.readBundleStream(bundleTemplatePath);
                 Model model = MavenPlugin.getMavenModelManager().readMavenModel(stream);
-                PomExtensionRegistry.getInstance().updatePomTemplate(model);
                 ByteArrayOutputStream out = new ByteArrayOutputStream();
                 PomUtil.sortModules(model);
                 MavenPlugin.getMaven().writeModel(model, out);
@@ -76,31 +69,6 @@ public class MavenScriptsProjectSettingInitializer extends AbstractProjectPrefer
                     preferenceStore.setDefault(key, content);
                 }
             }
-            // if license change to NON-TP, check to remove docker profile
-            if (!PluginChecker.isDockerPluginLoaded()) {
-                String content = preferenceStore.getString(key);
-                if (!StringUtils.isBlank(content)) {
-                    InputStream stream = new ByteArrayInputStream(content.getBytes(TalendMavenConstants.DEFAULT_ENCODING));
-                    Model model = MavenPlugin.getMavenModelManager().readMavenModel(stream);
-                    Iterator<Profile> iterator = model.getProfiles().iterator();
-                    boolean isModified = false;
-                    while(iterator.hasNext()) {
-                        Profile profile = iterator.next();
-                        if ("docker".equals(profile.getId())) { //$NON-NLS-1$
-                            iterator.remove();
-                            isModified = true;
-                        }
-                    }
-                    if (isModified) {
-                        ByteArrayOutputStream out = new ByteArrayOutputStream();
-                        MavenPlugin.getMaven().writeModel(model, out);
-                        content = out.toString(TalendMavenConstants.DEFAULT_ENCODING);
-                        if (content != null) {
-                            preferenceStore.setValue(key, content);
-                        }
-                    }
-                }
-            }
         } catch (Exception e) {
             ExceptionHandler.process(e);
         }

main/plugins/org.talend.designer.maven.ui/src/main/java/org/talend/designer/maven/ui/setting/project/page/ProjectPomProjectSettingPage.java

@@ -12,27 +12,39 @@
 // ============================================================================
 package org.talend.designer.maven.ui.setting.project.page;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.maven.model.Model;
+import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.m2e.core.MavenPlugin;
 import org.talend.commons.exception.ExceptionHandler;
-import org.talend.core.GlobalServiceRegister;
-import org.talend.core.runtime.process.ITalendProcessJavaProject;
+import org.talend.core.runtime.projectsetting.AbstractPomTemplateProjectSettingPage;
 import org.talend.core.runtime.projectsetting.IProjectSettingPreferenceConstants;
-import org.talend.designer.maven.tools.ProjectPomManager;
+import org.talend.core.runtime.projectsetting.PomPreviewDialog;
+import org.talend.designer.maven.model.MergedModel;
+import org.talend.designer.maven.model.TalendMavenConstants;
+import org.talend.designer.maven.template.MavenTemplateManager;
+import org.talend.designer.maven.tools.AggregatorPomsHelper;
+import org.talend.designer.maven.tools.MergeModelTool;
 import org.talend.designer.maven.ui.DesignerMavenUiPlugin;
 import org.talend.designer.maven.ui.i18n.Messages;
-import org.talend.designer.runprocess.IRunProcessService;
+import org.talend.repository.ProjectManager;
 
 /**
  * DOC ggu class global comment. Detailled comment
  */
-public class ProjectPomProjectSettingPage extends AbstractPersistentProjectSettingPage {
+public class ProjectPomProjectSettingPage extends AbstractPomTemplateProjectSettingPage {
 
     private String oldScriptContent;
 
     public ProjectPomProjectSettingPage() {
         super();
-        this.oldScriptContent = this.getScriptContent();
+        this.oldScriptContent = getCustomText();
     }
 
     @Override
@@ -45,42 +57,122 @@ public class ProjectPomProjectSettingPage extends AbstractPersistentProjectSetti
         return IProjectSettingPreferenceConstants.TEMPLATE_PROJECT_POM;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.talend.repository.preference.AbstractScriptPreferencePage#getHeadTitle()
-     */
     @Override
-    protected String getHeadTitle() {
-        return Messages.getString("ProjectPomProjectSettingPage_Titile"); //$NON-NLS-1$
+    protected String getHeaderMessage() {
+        return Messages.getString("ProjectPomProjectSettingPage.headerMessage"); //$NON-NLS-1$
+    }
+
+    @Override
+    protected String getDefaultText() {
+        Map<String, Object> parameters = new HashMap<String, Object>();
+        parameters.put(MavenTemplateManager.KEY_PROJECT_NAME,
+                ProjectManager.getInstance().getCurrentProject().getTechnicalLabel());
+        Model model = MavenTemplateManager.getDefaultProjectModel(parameters);
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        try {
+            MavenPlugin.getMaven().writeModel(model, out);
+            return out.toString(TalendMavenConstants.DEFAULT_ENCODING);
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+        return "Error loading default project pom template!"; //$NON-NLS-1$
+    }
+
+    @Override
+    protected String getMoreInfoUrl() {
+        return "https://document-link.us.cloud.talend.com/ts_ug_customize_project_pom_settings?version=80&lang=en&env=prd"; //$NON-NLS-1$
+    }
+
+    @Override
+    protected boolean checkModel(boolean preview) {
+        if (customText == null || customText.isDisposed()) {
+            return false;
+        }
+        Model model = null;
+        try {
+            Model defaultModel = MavenPlugin.getMavenModelManager()
+                    .readMavenModel(new ByteArrayInputStream(defaultText.getText().getBytes()));
+            Model customModel = MavenPlugin.getMavenModelManager()
+                    .readMavenModel(new ByteArrayInputStream(customText.getText().getBytes()));
+            MergedModel mergedModel = new MergeModelTool().mergeModel(defaultModel, customModel);
+            model = mergedModel.getModel();
+
+            StringBuilder msgBuilder = new StringBuilder();
+            if (model != null) {
+                String propertiesInfo = mergedModel.getIllegalPropertiesInfo();
+                if (propertiesInfo != null) {
+                    // validated with warning
+                    msgBuilder.append(Messages.getString("ProjectPomProjectSettingPage.warningTip")); //$NON-NLS-1$
+                    msgBuilder.append(propertiesInfo);
+                    MessageDialog.openWarning(getShell(), Messages.getString("ProjectPomProjectSettingPage.validateTitle"), //$NON-NLS-1$
+                            msgBuilder.toString());
+                }
+            } else {
+                msgBuilder.append(Messages.getString("ProjectPomProjectSettingPage.errorTip")); //$NON-NLS-1$
+                String pluginManagementInfo = mergedModel.getIllegalPluginManagementInfo();
+                if (pluginManagementInfo != null) {
+                    msgBuilder.append(pluginManagementInfo);
+                }
+                String pluginsInfo = mergedModel.getIllegalPluginsInfo();
+                if (pluginsInfo != null) {
+                    msgBuilder.append(pluginsInfo);
+                }
+                String profilesInfo = mergedModel.getIllegalProfilesInfo();
+                if (profilesInfo != null) {
+                    msgBuilder.append(profilesInfo);
+                }
+                MessageDialog.openError(getShell(), Messages.getString("ProjectPomProjectSettingPage.validateTitle"), //$NON-NLS-1$
+                        msgBuilder.toString());
+            }
+
+            if (model == null) {
+                return false;
+            }
+            if (preview) {
+                ByteArrayOutputStream out = new ByteArrayOutputStream();
+                MavenPlugin.getMaven().writeModel(model, out);
+                String content = out.toString(TalendMavenConstants.DEFAULT_ENCODING);
+                new PomPreviewDialog(getShell(), Messages.getString("ProjectPomProjectSettingPage.preview"), content).open(); //$NON-NLS-1$
+            }
+            return true;
+        } catch (Exception e) {
+            MessageDialog.openError(getShell(), Messages.getString("ProjectPomProjectSettingPage.validateTitle"), //$NON-NLS-1$
+                    e.getCause() == null ? e.getMessage() : e.getCause().getMessage());
+            ExceptionHandler.process(e);
+            return false;
+        }
     }
 
     @Override
     protected void performApply() {
-        super.performApply();
-        // reset from modification
-        this.oldScriptContent = this.getScriptContent();
+        if (performOk()) {
+            // reset from modification
+            this.oldScriptContent = getCustomText();
+        }
     }
 
     @Override
     public boolean performOk() {
-        boolean performOk = super.performOk();
-
-        String newContent = this.getScriptContent();
-        if (!newContent.equals(oldScriptContent)) { // not same
-            MessageDialog.openWarning(this.getShell(), Messages.getString("ProjectPomProjectSettingPage_ConfirmTitle"), //$NON-NLS-1$
-                    Messages.getString("ProjectPomProjectSettingPage_ConfirmMessage")); //$NON-NLS-1$
-
-            // Update project pom file.
-            ProjectPomManager projectPomManager = new ProjectPomManager();
+        boolean ok = super.performOk();
+        if (ok && getScriptTxt() != null && !getScriptTxt().isDisposed()) {
             try {
-                projectPomManager.updateFromTemplate(null);
+                if (MessageDialog.openQuestion(getShell(), "Question", //$NON-NLS-1$
+                        Messages.getString("AbstractPersistentProjectSettingPage.syncAllPoms"))) { //$NON-NLS-1$
+                    new AggregatorPomsHelper().syncAllPoms();
+                } else {
+                    String newContent = getCustomText();
+                    if (!newContent.equals(oldScriptContent)) { // not same
+                        MessageDialog.openWarning(this.getShell(),
+                                Messages.getString("ProjectPomProjectSettingPage_ConfirmTitle"), //$NON-NLS-1$
+                                Messages.getString("ProjectPomProjectSettingPage_ConfirmMessage")); //$NON-NLS-1$
+                        new AggregatorPomsHelper().createRootPom(new NullProgressMonitor());
+                    }
+                }
             } catch (Exception e) {
                 ExceptionHandler.process(e);
             }
         }
-
-        return performOk;
+        return ok;
     }
 
 }

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

@@ -0,0 +1,12 @@
+<project
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>@ProjectGroupId@</groupId>
+    <artifactId>@ProjectArtifactId@</artifactId>
+    <version>@ProjectVersion@</version>
+    <packaging>pom</packaging>
+    <name>@ProjectName@ Codes Master</name>
+    <url>http://www.talend.org/</url>
+</project>

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/model/MergedModel.java

@@ -0,0 +1,98 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.designer.maven.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.maven.model.Model;
+import org.apache.maven.model.Plugin;
+import org.apache.maven.model.Profile;
+
+public class MergedModel {
+
+    private Model model;
+
+    private List<String> illegalProperties = new ArrayList<>();
+
+    private List<Profile> illegalProfiles = new ArrayList<>();
+
+    private List<Plugin> illegalPluginManagement = new ArrayList<>();
+
+    private List<Plugin> illegalPlugins = new ArrayList<>();
+
+    public Model getModel() {
+        return model;
+    }
+
+    public void setModel(Model model) {
+        this.model = model;
+    }
+
+    public List<String> getIllegalProperties() {
+        return illegalProperties;
+    }
+
+    public List<Profile> getIllegalProfiles() {
+        return illegalProfiles;
+    }
+
+    public List<Plugin> getIllegalPluginManagement() {
+        return illegalPluginManagement;
+    }
+
+    public List<Plugin> getIllegalPlugins() {
+        return illegalPlugins;
+    }
+
+    public String getIllegalPropertiesInfo() {
+        if (!illegalProperties.isEmpty()) {
+            StringBuilder msgBuilder = new StringBuilder();
+            msgBuilder.append("Properties:\n");
+            illegalProperties.forEach(property -> msgBuilder.append("    ").append(property).append("\n"));
+            return msgBuilder.toString();
+        }
+        return null;
+    }
+
+    public String getIllegalPluginManagementInfo() {
+        if (!illegalPluginManagement.isEmpty()) {
+            StringBuilder msgBuilder = new StringBuilder();
+            msgBuilder.append("PluginManagement:\n");
+            illegalPluginManagement.forEach(plugin -> msgBuilder.append("    ").append(plugin.getKey()).append("\n"));
+            return msgBuilder.toString();
+        }
+        return null;
+    }
+
+    public String getIllegalPluginsInfo() {
+        if (!illegalPlugins.isEmpty()) {
+            StringBuilder msgBuilder = new StringBuilder();
+            msgBuilder.append("Plugins:\n"); //$NON-NLS-1$
+            illegalPlugins.forEach(plugin -> msgBuilder.append("    ").append(plugin.getKey()).append("\n"));
+            return msgBuilder.toString();
+        }
+        return null;
+    }
+
+    public String getIllegalProfilesInfo() {
+        if (!illegalProfiles.isEmpty()) {
+            StringBuilder msgBuilder = new StringBuilder();
+            msgBuilder.append("Profiles:\n");
+            illegalProfiles.forEach(profile -> msgBuilder.append("    ").append(profile.getId()).append("\n"));
+            return msgBuilder.toString();
+        }
+        return null;
+    }
+
+}

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/template/MavenTemplateManager.java

@@ -38,8 +38,10 @@ import org.talend.core.model.routines.CodesJarInfo;
 import org.talend.core.runtime.projectsetting.IProjectSettingPreferenceConstants;
 import org.talend.core.runtime.projectsetting.IProjectSettingTemplateConstants;
 import org.talend.designer.maven.DesignerMavenPlugin;
+import org.talend.designer.maven.model.MergedModel;
 import org.talend.designer.maven.model.TalendMavenConstants;
 import org.talend.designer.maven.setting.project.IProjectSettingManagerProvider;
+import org.talend.designer.maven.tools.MergeModelTool;
 import org.talend.designer.maven.tools.extension.PomExtensionRegistry;
 import org.talend.designer.maven.utils.PomIdsHelper;
 import org.talend.designer.maven.utils.PomUtil;
@@ -211,49 +213,67 @@ public class MavenTemplateManager {
         }
     }
 
-    public static Model getCodeProjectTemplateModel() {
-        return getCodeProjectTemplateModel(null); // by default will be current project.
-    }
-
     /**
      * Try to load the project template from bundle, if load failed, use default instead.
      */
     public static Model getCodeProjectTemplateModel(Map<String, Object> parameters) {
-        final String projectTechName = PomUtil.getProjectNameFromTemplateParameter(parameters);
-        Model defaultModel = getDefaultCodeProjectTemplateModel(projectTechName);
+        Model basicModel = getBasicProjectPomTemplateModel(parameters);
+        Model defaultModel = getDefaultProjectModel(parameters);
+        if (defaultModel == null) {
+            defaultModel = basicModel;
+        }
+        Model customModel = getCustomProjectModel(parameters);
+        MergedModel mergedModel = new MergeModelTool().mergeModel(defaultModel, customModel);
+        Model model = mergedModel.getModel();
+        if (model != null) {
+            Map<ETalendMavenVariables, String> variablesValuesMap = new HashMap<>();
+            variablesValuesMap.put(ETalendMavenVariables.ProjectGroupId, basicModel.getGroupId());
+            variablesValuesMap.put(ETalendMavenVariables.ProjectArtifactId, basicModel.getArtifactId());
+            variablesValuesMap.put(ETalendMavenVariables.ProjectVersion, basicModel.getVersion());
+            variablesValuesMap.put(ETalendMavenVariables.ProjectName, PomUtil.getProjectNameFromTemplateParameter(parameters));
+
+            model.setGroupId(ETalendMavenVariables.replaceVariables(model.getGroupId(), variablesValuesMap));
+            model.setArtifactId(ETalendMavenVariables.replaceVariables(model.getArtifactId(), variablesValuesMap));
+            model.setVersion(ETalendMavenVariables.replaceVariables(model.getVersion(), variablesValuesMap));
+            model.setName(ETalendMavenVariables.replaceVariables(model.getName(), variablesValuesMap));
+
+            setJavaVersionForModel(model, variablesValuesMap);
+        }
+
+        return model;
+    }
+
+    public static Model getDefaultProjectModel(Map<String, Object> parameters) {
         try {
-            InputStream stream = MavenTemplateManager.getTemplateStream(null,
-                    IProjectSettingPreferenceConstants.TEMPLATE_PROJECT_POM, DesignerMavenPlugin.PLUGIN_ID,
+            InputStream stream = MavenTemplateManager.getTemplateStream(null, null, DesignerMavenPlugin.PLUGIN_ID,
                     IProjectSettingTemplateConstants.PATH_GENERAL + '/'
-                            + IProjectSettingTemplateConstants.PROJECT_TEMPLATE_FILE_NAME, parameters);
+                            + IProjectSettingTemplateConstants.PROJECT_TEMPLATE_FILE_NAME,
+                    parameters);
             if (stream != null) {
                 Model model = MavenPlugin.getMavenModelManager().readMavenModel(stream);
-
-                Map<ETalendMavenVariables, String> variablesValuesMap = new HashMap<ETalendMavenVariables, String>();
-                variablesValuesMap.put(ETalendMavenVariables.ProjectGroupId, defaultModel.getGroupId());
-                variablesValuesMap.put(ETalendMavenVariables.ProjectArtifactId, defaultModel.getArtifactId());
-                variablesValuesMap.put(ETalendMavenVariables.ProjectVersion, defaultModel.getVersion());
-
-                variablesValuesMap.put(ETalendMavenVariables.ProjectName, projectTechName);
-
-                model.setGroupId(ETalendMavenVariables.replaceVariables(model.getGroupId(), variablesValuesMap));
-                model.setArtifactId(ETalendMavenVariables.replaceVariables(model.getArtifactId(), variablesValuesMap));
-                model.setVersion(ETalendMavenVariables.replaceVariables(model.getVersion(), variablesValuesMap));
-                model.setName(ETalendMavenVariables.replaceVariables(model.getName(), variablesValuesMap));
-
-                setJavaVersionForModel(model, variablesValuesMap);
-
                 PomExtensionRegistry.getInstance().updateProjectPom(model);
-
+                PomExtensionRegistry.getInstance().updatePomTemplate(model);
                 Properties properties = model.getProperties();
-                properties.put("talend.project.name", projectTechName); //$NON-NLS-1$
-
+                properties.put("talend.project.name", PomUtil.getProjectNameFromTemplateParameter(parameters)); //$NON-NLS-1$
                 return model;
             }
         } catch (Exception e) {
-            // ExceptionHandler.process(e);
+            ExceptionHandler.process(e);
         }
-        return defaultModel; // if error, try to use default model
+        return null;
+    }
+
+    public static Model getCustomProjectModel(Map<String, Object> parameters) {
+        try {
+            InputStream stream = MavenTemplateManager.getTemplateStream(null,
+                    IProjectSettingPreferenceConstants.TEMPLATE_PROJECT_POM, null, null, parameters);
+            if (stream != null) {
+                return MavenPlugin.getMavenModelManager().readMavenModel(stream);
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+        return null;
     }
 
     private static void setJavaVersionForModel(Model model, Map<ETalendMavenVariables, String> variablesValuesMap) {
@@ -275,7 +295,8 @@ public class MavenTemplateManager {
         }
     }
 
-    private static Model getDefaultCodeProjectTemplateModel(String projectTechName) {
+    private static Model getBasicProjectPomTemplateModel(Map<String, Object> parameters) {
+        String projectTechName = PomUtil.getProjectNameFromTemplateParameter(parameters);
         Model templateCodeProjectMOdel = new Model();
         templateCodeProjectMOdel.setGroupId(PomIdsHelper.getProjectGroupId(projectTechName));
         templateCodeProjectMOdel.setArtifactId(PomIdsHelper.getProjectArtifactId());

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

@@ -0,0 +1,182 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.designer.maven.tools;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import org.apache.maven.model.Build;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.Plugin;
+import org.apache.maven.model.Profile;
+import org.talend.designer.maven.model.MergedModel;
+
+public class MergeModelTool {
+
+    public MergedModel mergeModel(Model defaultModel, Model customModel) {
+        MergedModel mergedModel = new MergedModel();
+        mergedModel.setModel(defaultModel);
+        if (customModel == null) {
+            return mergedModel;
+        }
+        // basic info
+        mergeBasicInfo(defaultModel, customModel);
+
+        // Properties
+        if (customModel.getProperties() != null) {
+            Properties defaultProperties = defaultModel.getProperties();
+            customModel.getProperties().keySet().stream().filter(key -> defaultProperties.containsKey(key))
+                    .forEach(key -> mergedModel.getIllegalProperties().add((String) key));
+            defaultProperties.putAll(customModel.getProperties());
+        }
+
+        Build build = customModel.getBuild();
+        if (build != null) {
+            // PluginManagement
+            if (build.getPluginManagement() != null) {
+                Map<String, Plugin> customPluginsManageMap = build.getPluginManagement().getPluginsAsMap();
+                Map<String, Plugin> defaultPluginsManageMap = defaultModel.getBuild().getPluginManagement().getPluginsAsMap();
+                customPluginsManageMap.keySet().stream().filter(key -> defaultPluginsManageMap.containsKey(key))
+                        .forEach(key -> mergedModel.getIllegalPluginManagement().add(customPluginsManageMap.get(key)));
+                if (mergedModel.getIllegalPluginManagement().isEmpty()) {
+                    build.getPluginManagement().getPlugins()
+                            .forEach(plugin -> defaultModel.getBuild().getPluginManagement().addPlugin(plugin));
+                }
+            }
+
+            // Plugins
+            Map<String, Plugin> customPluginsMap = build.getPluginsAsMap();
+            Map<String, Plugin> defaultPluginsMap = defaultModel.getBuild().getPluginsAsMap();
+            customPluginsMap.keySet().stream().filter(key -> defaultPluginsMap.containsKey(key))
+                    .forEach(key -> mergedModel.getIllegalPlugins().add(customPluginsMap.get(key)));
+            if (mergedModel.getIllegalPlugins().isEmpty()) {
+                defaultModel.getBuild().getPlugins().addAll(build.getPlugins());
+            }
+        }
+        
+        // Profiles
+        Map<String, Profile> customProfileMap = customModel.getProfiles().stream()
+                .collect(Collectors.toMap(Profile::getId, Function.identity()));
+        Map<String, Profile> defaultProfileMap = defaultModel.getProfiles().stream()
+                .collect(Collectors.toMap(Profile::getId, Function.identity()));
+        customProfileMap.keySet().stream().filter(key -> defaultProfileMap.containsKey(key))
+                .forEach(key -> mergedModel.getIllegalProfiles().add(customProfileMap.get(key)));
+        if (mergedModel.getIllegalProfiles().isEmpty()) {
+            defaultModel.getProfiles().addAll(customModel.getProfiles());
+        }
+
+        mergeOtherSetup(defaultModel, customModel);
+
+        if (!mergedModel.getIllegalPluginManagement().isEmpty() || !mergedModel.getIllegalPlugins().isEmpty()
+                || !mergedModel.getIllegalProfiles().isEmpty()) {
+            mergedModel.setModel(null);
+        }
+
+        return mergedModel;
+    }
+
+    public Model migrateCustomModel(Model defaultModel, Model customModel) {
+        // Properties
+        Iterator<Entry<Object, Object>> iterator = customModel.getProperties().entrySet().iterator();
+        while (iterator.hasNext()) {
+            Entry<Object, Object> entry = iterator.next();
+            Object key = entry.getKey();
+            Object value = entry.getValue();
+            if (defaultModel.getProperties().containsKey(key) && value != null
+                    && value.equals(defaultModel.getProperties().get(key))) {
+                iterator.remove();
+            }
+        }
+
+        Build build = customModel.getBuild();
+        if (build != null) {
+            // PluginManagement
+            if (build.getPluginManagement() != null) {
+                Map<String, Plugin> defaultPluginsManageMap = defaultModel.getBuild().getPluginManagement().getPluginsAsMap();
+                build.getPluginManagement().getPlugins().removeIf(p -> defaultPluginsManageMap.containsKey(p.getKey()));
+                if (build.getPluginManagement().getPlugins().isEmpty()) {
+                    build.setPluginManagement(null);
+                }
+            }
+            // Plugins
+            Map<String, Plugin> defaultPluginsMap = defaultModel.getBuild().getPluginsAsMap();
+            customModel.getBuild().getPlugins().removeIf(p -> defaultPluginsMap.containsKey(p.getKey()));
+        }
+
+        // Profiles
+        Map<String, Profile> defaultProfileMap = defaultModel.getProfiles().stream()
+                .collect(Collectors.toMap(Profile::getId, Function.identity()));
+        customModel.getProfiles().removeIf(profile -> defaultProfileMap.containsKey(profile.getId()));
+
+        return customModel;
+    }
+
+    private void mergeBasicInfo(Model defaultModel, Model customModel) {
+        if (customModel.getModelVersion() != null && !customModel.getModelVersion().equals(defaultModel.getModelVersion())) {
+            defaultModel.setModelVersion(customModel.getModelVersion());
+        }
+        if (customModel.getGroupId() != null && !customModel.getGroupId().equals(defaultModel.getGroupId())) {
+            defaultModel.setGroupId(customModel.getGroupId());
+        }
+        if (customModel.getArtifactId() != null && !customModel.getArtifactId().equals(defaultModel.getArtifactId())) {
+            defaultModel.setArtifactId(customModel.getArtifactId());
+        }
+        if (customModel.getVersion() != null && !customModel.getVersion().equals(defaultModel.getVersion())) {
+            defaultModel.setVersion(customModel.getVersion());
+        }
+        if (customModel.getPackaging() != null && !customModel.getPackaging().equals(defaultModel.getPackaging())) {
+            defaultModel.setPackaging(customModel.getPackaging());
+        }
+        if (customModel.getName() != null && !customModel.getName().equals(defaultModel.getName())) {
+            defaultModel.setName(customModel.getName());
+        }
+        if (customModel.getUrl() != null && !customModel.getUrl().equals(defaultModel.getUrl())) {
+            defaultModel.setUrl(customModel.getUrl());
+        }
+    }
+
+    private void mergeOtherSetup(Model defaultModel, Model customModel) {
+        // default model doesn't have those setup so can merge directly if exists
+        // FIXME add more if needed: https://maven.apache.org/ref/3.8.6/maven-model/maven.html
+
+        // DependencyManagement
+        if (customModel.getDependencyManagement() != null) {
+            defaultModel.setDependencyManagement(customModel.getDependencyManagement());
+        }
+        // Dependencies
+        if (!customModel.getDependencies().isEmpty()) {
+            defaultModel.setDependencies(customModel.getDependencies());
+        }
+        // Repositories
+        if (!customModel.getRepositories().isEmpty()) {
+            defaultModel.setRepositories(customModel.getRepositories());
+        }
+        // PluginRepositories
+        if (!customModel.getPluginRepositories().isEmpty()) {
+            defaultModel.setPluginRepositories(customModel.getPluginRepositories());
+        }
+        // DistributionManagement
+        if (customModel.getDistributionManagement() != null) {
+            defaultModel.setDistributionManagement(customModel.getDistributionManagement());
+        }
+        // SCM
+        if (customModel.getScm() != null) {
+            defaultModel.setScm(customModel.getScm());
+        }
+    }
+
+}

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

@@ -1,99 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.designer.maven.tools;
-
-import java.util.Map;
-
-import org.apache.maven.model.Model;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.m2e.core.MavenPlugin;
-import org.eclipse.m2e.core.embedder.MavenModelManager;
-import org.talend.core.model.general.Project;
-import org.talend.designer.maven.model.TalendJavaProjectConstants;
-import org.talend.designer.maven.model.TalendMavenConstants;
-import org.talend.designer.maven.template.MavenTemplateManager;
-import org.talend.designer.maven.utils.PomUtil;
-import org.talend.designer.runprocess.IProcessor;
-import org.talend.repository.ProjectManager;
-
-/**
- * DOC ggu class global comment. Detailled comment
- */
-public class ProjectPomManager {
-
-    protected static final MavenModelManager MODEL_MANAGER = MavenPlugin.getMavenModelManager();
-
-    private IFile projectPomFile;
-
-    /**
-     * true by default, update all
-     */
-
-    public ProjectPomManager() {
-        projectPomFile = getTalendProjectPom();
-    }
-
-    public void update(IProgressMonitor monitor, IProcessor processor) throws Exception {
-        if (monitor == null) {
-            monitor = new NullProgressMonitor();
-        }
-        if (!projectPomFile.exists()) {// delete by user manually?
-            // create it or nothing to do?
-            return;
-        }
-        Model projectModel = MODEL_MANAGER.readMavenModel(projectPomFile);
-
-        // attributes
-        updateAttributes(monitor, processor, projectModel);
-
-        PomUtil.savePom(monitor, projectModel, projectPomFile);
-    }
-
-    public void updateFromTemplate(IProgressMonitor monitor) throws Exception {
-        if (monitor == null) {
-            monitor = new NullProgressMonitor();
-        }
-        new AggregatorPomsHelper().createRootPom(monitor);
-    }
-
-    /**
-     *
-     * update the main attributes for project pom.
-     *
-     */
-    protected void updateAttributes(IProgressMonitor monitor, IProcessor processor, Model projectModel) throws Exception {
-        final Map<String, Object> templateParameters = PomUtil.getTemplateParameters(processor);
-        Model templateModel = MavenTemplateManager.getCodeProjectTemplateModel(templateParameters);
-        projectModel.setGroupId(templateModel.getGroupId());
-        projectModel.setArtifactId(templateModel.getArtifactId());
-        projectModel.setVersion(templateModel.getVersion());
-        projectModel.setName(templateModel.getName());
-        projectModel.setPackaging(templateModel.getPackaging());
-    }
-
-    public IFile getTalendProjectPom() {
-        Project project = ProjectManager.getInstance().getCurrentProject();
-        IWorkspace workspace = ResourcesPlugin.getWorkspace();
-        IFolder pomsFolder = workspace.getRoot()
-                .getFolder(new Path(project.getTechnicalLabel() + "/" + TalendJavaProjectConstants.DIR_POMS)); //$NON-NLS-1$
-        IFile pomFile = pomsFolder.getFile(TalendMavenConstants.POM_FILE_NAME);
-        return pomFile;
-    }
-
-}

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

@@ -377,8 +377,8 @@ public class PomIdsHelper {
             if (version == null) {
                 version = VersionUtils.getPublishVersion(property.getVersion());
             }
-            if (useSnapshot && version != null && !version.contains(MavenConstants.SNAPSHOT)) {
-                version += MavenConstants.SNAPSHOT;
+            if (useSnapshot && version != null && !version.contains(MavenConstants.DOT_SNAPSHOT)) {
+                version += MavenConstants.DOT_SNAPSHOT;
             }
         }
         return version;

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

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="lib/apache-mime4j-0.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/castor-1.0.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jakarta-oro-2.0.8.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry exported="true" kind="lib" path="lib/apache-mime4j-core-0.8.9.jar" sourcepath="lib/apache-mime4j-core-0.8.9.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/castor-1.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jakarta-oro-2.0.8.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

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

@@ -4,7 +4,7 @@ Bundle-Name: Apache Plug-in
 Bundle-SymbolicName: org.talend.libraries.apache
 Bundle-Version: 8.0.1.qualifier
 Bundle-ClassPath: .,
- lib/apache-mime4j-0.6.jar,
+ lib/apache-mime4j-core-0.8.9.jar,
  lib/castor-1.0.3.jar,
  lib/jakarta-oro-2.0.8.jar
 Bundle-Vendor: .Talend SA.
@@ -16,21 +16,8 @@ Require-Bundle: org.apache.log4j;resolution:=optional,
 Export-Package: 
  org.apache.james.mime4j,
  org.apache.james.mime4j.codec,
- org.apache.james.mime4j.descriptor,
- org.apache.james.mime4j.field,
- org.apache.james.mime4j.field.address,
- org.apache.james.mime4j.field.address.parser,
- org.apache.james.mime4j.field.contentdisposition.parser,
- org.apache.james.mime4j.field.contenttype.parser,
- org.apache.james.mime4j.field.datetime,
- org.apache.james.mime4j.field.datetime.parser,
- org.apache.james.mime4j.field.language.parser,
- org.apache.james.mime4j.field.mimeversion.parser,
- org.apache.james.mime4j.field.structured.parser,
  org.apache.james.mime4j.io,
- org.apache.james.mime4j.message,
  org.apache.james.mime4j.parser,
- org.apache.james.mime4j.storage,
  org.apache.james.mime4j.util,
  org.apache.oro.io,
  org.apache.oro.text,

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

@@ -81,6 +81,11 @@
 			<artifactId>log4j-1.2-api</artifactId>
 			<version>${log4j2.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.james</groupId>
+			<artifactId>apache-mime4j-core</artifactId>
+			<version>0.8.9</version>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
@@ -109,7 +114,7 @@
 							<excludeTypes>pom</excludeTypes>
 							<excludeTransitive>true</excludeTransitive>
 							<outputDirectory>${project.basedir}/lib</outputDirectory>
-							<includeGroupIds>ch.qos.reload4j,org.slf4j,org.apache.logging.log4j</includeGroupIds>
+							<includeGroupIds>ch.qos.reload4j,org.slf4j,org.apache.logging.log4j,org.apache.james</includeGroupIds>
 						</configuration>
 					</execution>
 				</executions>

main/plugins/org.talend.libraries.csv/.classpath

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

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

@@ -5,7 +5,8 @@ Bundle-SymbolicName: org.talend.libraries.csv
 Bundle-Version: 8.0.1.qualifier
 Bundle-ClassPath: .,
  lib/csv-1.0.jar,
- lib/talendcsv-1.0.0.jar
+ lib/talendcsv-1.1.0.jar
+Require-Bundle: org.slf4j.api
 Export-Package: com.talend.csv,
  org.skife.csv
 Bundle-ActivationPolicy: lazy

main/plugins/org.talend.libraries.csv/build.properties

@@ -2,4 +2,4 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                lib/csv-1.0.jar,\
-               lib/talendcsv-1.0.0.jar
+               lib/talendcsv-1.1.0.jar