feat(TUP-37353):Guess Schema for tBigQueryInput (#5953)

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

@@ -5,6 +5,7 @@
   <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/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/ColorConstants.java

@@ -37,8 +37,6 @@ 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);
 
@@ -57,17 +55,12 @@ public interface ColorConstants {
 
     static Color getTableBackgroundColor() {
         return ITalendThemeService.getColor(ColorConstants.BUNDLE_ID_COMMON_UI_RUNTIME, ColorConstants.KEY_TABLE_BACKGROUND)
-                .orElse(Display.getDefault().getSystemColor(SWT.COLOR_LIST_BACKGROUND));
+                .orElse(WHITE_COLOR);
     }
 
     static Color getTableForegroundColor() {
         return ITalendThemeService.getColor(ColorConstants.BUNDLE_ID_COMMON_UI_RUNTIME, ColorConstants.KEY_TABLE_FOREGROUND)
-                .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));
+                .orElse(Display.getDefault().getSystemColor(SWT.COLOR_BLACK));
     }
 
 }

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

@@ -15,7 +15,6 @@ 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;
@@ -30,8 +29,6 @@ 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
@@ -135,8 +132,6 @@ 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=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE\u3068\u3057\u3066\u4FDD\u5B58
+SaveAsGenericSchemaPushButton.saveAsSchema=\u6C4E\u7528\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.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/image/EImage.java

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

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

@@ -92,7 +92,7 @@
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
-            <version>2.12.2</version>
+            <version>2.12.0</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.reload4j</groupId>

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

@@ -36,11 +36,6 @@ 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();
@@ -48,13 +43,6 @@ 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

@@ -1,85 +0,0 @@
-// ============================================================================
-//
-// 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,7 +16,6 @@ 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;
@@ -264,12 +263,4 @@ 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/database/DB2ForZosDataBaseMetadata.java

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

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

@@ -33,7 +33,6 @@ 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;
 
@@ -109,7 +108,6 @@ public class NetworkUtil {
                 return true;
             }
         } catch (Exception e) {
-            CommonExceptionHandler.process(e, getCheckUrl());
             return false;
         } finally {
             conn.disconnect();
@@ -146,7 +144,6 @@ 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=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE\u3068\u3057\u3066\u4FDD\u5B58
+SaveAsGenericSchemaPushButton.saveAsSchema=\u6C4E\u7528\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,19 +106,15 @@ public class ColorManager {
     }
 
     public Color getColor(String colorName) {
-        Color prefColor = getThemeColor(colorName);
-        if (colorMap.containsKey(colorName) && (colorMap.get(colorName)).equals(prefColor)) {
-            return colorMap.get(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);
         } else {
-            colorMap.put(colorName, prefColor);
+            color = new Color(Display.getDefault(), prefColor);
+            colorMap.put(colorName, color);
         }
-        return prefColor;
-    }
-
-    private static Color getThemeColor(String colorName) {
-        Color c = ITalendThemeService.getColor(colorName)
-                .orElse(Display.getDefault().getSystemColor(SWT.COLOR_INFO_FOREGROUND));
-        return c;
+        return color;
     }
 
     public void dispose() {
@@ -168,20 +164,20 @@ public class ColorManager {
     }
 
     public static void initDefaultColors(IPreferenceStore store) {
-        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()));
+        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));
 
         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,384 +1,368 @@
-// ============================================================================
-//
-// 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);
-                    }
-
-                });
-            }
-        }
-    };
-
-}
+// ============================================================================
+//
+// 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);
+                    }
+
+                });
+            }
+        }
+    };
+
+}

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

@@ -16,10 +16,8 @@ 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;
@@ -41,8 +39,6 @@ public abstract class DialogErrorForCellEditorListener implements ICellEditorLis
     protected TableViewerCreatorColumn column;
 
     protected TableViewerCreator tableViewerCreator;
-    
-    private Color tableBackground = ColorConstants.getTableBackgroundColor();
 
     /**
      * DOC amaumont CellEditorListener constructor comment.
@@ -93,7 +89,7 @@ public abstract class DialogErrorForCellEditorListener implements ICellEditorLis
         final String errorMessage = validateValue(newValue, beanPosition);
         if (errorMessage == null) {
             newValidValueTyped(beanPosition, lastValidValue, newValue, state);
-            text.setBackground(tableBackground);
+            text.setBackground(text.getDisplay().getSystemColor(SWT.COLOR_WHITE));
             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,7 +31,6 @@ 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/>
@@ -78,8 +77,6 @@ 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.
@@ -265,8 +262,6 @@ 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/src/main/java/org/talend/core/repository/i18n/messages.properties

@@ -175,7 +175,6 @@ ProjectRepositoryNode.sapBWDataStoreObject=SAP DSO
 ProjectRepositoryNode.sapBWInfoCube=SAP InfoCube
 ProjectRepositoryNode.sapBWInfoObject=SAP InfoObject
 ProjectRepositoryNode.sapContentExtractor=SAP BI Content Extractor
-ProjectRepositoryNode.sapCDSView=SAP CDS View
 RepositoryDropAdapter_copyingItems=Copying items...
 RepositoryDropAdapter_errorMsg=This directory contains the locked item,it can not be moved now
 RepositoryDropAdapter_lockedByOthers=This item is locked by other users, it can not be moved now.
@@ -205,4 +204,3 @@ 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,4 +204,3 @@ 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=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE
+ProjectRepositoryNode.genericSchema=\u6C4E\u7528\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,4 +204,3 @@ 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,4 +204,3 @@ 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/ProjectRepositoryNode.java

@@ -102,7 +102,6 @@ import org.talend.cwm.helper.ConnectionHelper;
 import org.talend.cwm.helper.SAPBWTableHelper;
 import org.talend.cwm.helper.SubItemHelper;
 import org.talend.cwm.helper.TableHelper;
-import org.talend.cwm.helper.TaggedValueHelper;
 import org.talend.designer.core.IDesignerCoreService;
 import org.talend.repository.ProjectManager;
 import org.talend.repository.model.BinRepositoryNode;
@@ -1752,9 +1751,6 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
 
             // 10. BW Business Content Extractor:
             createSAPContentExtractorNodes(repObj, metadataConnection, node, validationRules);
-
-            // 11. CDS views:
-            createSAPCDSViewNodes(repObj, metadataConnection, node, validationRules);
         } else if (metadataConnection instanceof SalesforceSchemaConnection) {
             createSalesforceModuleNodes(repObj, metadataConnection, node, validationRules);
         } else {
@@ -1788,9 +1784,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
         for (MetadataTable tablesWithOrder : tablesWithOrders) {
             EMap<String, String> properties = tablesWithOrder.getAdditionalProperties();
             String partitionKey = properties.get(EProperties.CONTENT_TYPE.name());
-            String cdsType = TaggedValueHelper.getValueString(EProperties.CONTENT_TYPE.name(), tablesWithOrder);
-            if (!ERepositoryObjectType.METADATA_SAP_CONTENT_EXTRACTOR.name().equals(partitionKey)
-                    && !ERepositoryObjectType.METADATA_SAP_CDS_VIEW.name().equals(cdsType)) {
+            if (!ERepositoryObjectType.METADATA_SAP_CONTENT_EXTRACTOR.name().equals(partitionKey)) {
                 tables.add(tablesWithOrder);
             }
         }
@@ -1973,32 +1967,6 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
         createTables(tableContainer, repObj, tables, ERepositoryObjectType.METADATA_CON_TABLE, validationRules);
     }
 
-    private void createSAPCDSViewNodes(IRepositoryViewObject repObj, Connection metadataConnection, RepositoryNode node,
-            List<IRepositoryViewObject> validationRules) {
-        StableRepositoryNode tableContainer = new StableRepositoryNode(node,
-                Messages.getString("ProjectRepositoryNode.sapCDSView"), ECoreImage.FOLDER_CLOSE_ICON); //$NON-NLS-1$
-        tableContainer.setChildrenObjectType(ERepositoryObjectType.METADATA_CON_TABLE);
-        tableContainer.setProperties(EProperties.CONTENT_TYPE, ERepositoryObjectType.METADATA_SAP_CDS_VIEW);
-        IRepositoryNode cacheNode = nodeCache.getCache(tableContainer);
-        if (cacheNode != null && cacheNode instanceof StableRepositoryNode) {
-            tableContainer = (StableRepositoryNode) cacheNode;
-            tableContainer.getChildren().clear();
-        } else {
-            nodeCache.addCache(tableContainer, true);
-        }
-
-        node.getChildren().add(tableContainer);
-        List<MetadataTable> tablesWithOrders = ConnectionHelper.getTablesWithOrders(metadataConnection);
-        EList<MetadataTable> tables = new BasicEList<>();
-        for (MetadataTable tablesWithOrder : tablesWithOrders) {
-            String cdsType = TaggedValueHelper.getValueString(EProperties.CONTENT_TYPE.name(), tablesWithOrder);
-            if (ERepositoryObjectType.METADATA_SAP_CDS_VIEW.name().equals(cdsType)) {
-                tables.add(tablesWithOrder);
-            }
-        }
-        createTables(tableContainer, repObj, tables, ERepositoryObjectType.METADATA_CON_TABLE, validationRules);
-    }
-
     private void createSalesforceModuleNodes(IRepositoryViewObject rebObj, Connection metadataConnection,
             RepositoryNode connectionNode, List<IRepositoryViewObject> validationRules) {
         EList modules = ((SalesforceSchemaConnection) metadataConnection).getModules();

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

@@ -54,7 +54,9 @@ import org.eclipse.jface.dialogs.InputDialog;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.osgi.internal.serviceregistry.ServiceReferenceImpl;
 import org.eclipse.osgi.internal.serviceregistry.ServiceRegistrationImpl;
+import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.navigator.CommonNavigator;
 import org.eclipse.ui.navigator.CommonViewer;
@@ -238,14 +240,14 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         return singleton;
     }
 
-    public ICoreService getCoreService() {
+    private ICoreService getCoreService() {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(ICoreService.class)) {
             return GlobalServiceRegister.getDefault().getService(ICoreService.class);
         }
         return null;
     }
 
-    public IRunProcessService getRunProcessService() {
+    private IRunProcessService getRunProcessService() {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IRunProcessService.class)) {
             return GlobalServiceRegister.getDefault().getService(IRunProcessService.class);
         }
@@ -350,7 +352,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * @param project
      * @throws LoginException
      */
-    public void checkProjectCompatibility(Project project) throws LoginException {
+    private void checkProjectCompatibility(Project project) throws LoginException {
         IMigrationToolService migrationToolService = GlobalServiceRegister.getDefault().getService(
                 IMigrationToolService.class);
         // update migration system.
@@ -445,10 +447,12 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                             if (currentShell == null) {
                                 currentShell = DisplayUtils.getDefaultShell(false);
                             }
-                            if (MessageDialog.openQuestion(currentShell,
-                                    Messages.getString("ProxyRepositoryFactory.JobNameErroe"), //$NON-NLS-1$
-                                    Messages.getString("ProxyRepositoryFactory.Label") + " " + name + " " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                                            + Messages.getString("ProxyRepositoryFactory.ReplaceJob"))) { //$NON-NLS-1$
+                            MessageBox box = new MessageBox(currentShell, SWT.ICON_WARNING | SWT.OK | SWT.CANCEL);
+                            box.setText(Messages.getString("ProxyRepositoryFactory.JobNameErroe")); //$NON-NLS-1$
+                            box.setMessage(Messages.getString("ProxyRepositoryFactory.Label") + " " + name + " " + Messages.getString("ProxyRepositoryFactory.ReplaceJob")); //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$
+
+                            if (box.open() == SWT.OK) {
+
                                 ok[0] = true;
                             }
                         }
@@ -1845,7 +1849,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * @param project
      * @throws PersistenceException
      */
-    public void emptyTempFolder(Project project) throws PersistenceException {
+    private void emptyTempFolder(Project project) throws PersistenceException {
     	try {
             String str = SharedStudioUtils.getTempFolderPath().toPortableString();
             FilesUtils.deleteFolder(new File(str), false);
@@ -2524,7 +2528,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         }
     }
 
-    public void checkReferenceProjectsProblems(Project project) throws BusinessException, PersistenceException {
+    private void checkReferenceProjectsProblems(Project project) throws BusinessException, PersistenceException {
         if (ReferenceProjectProblemManager.getInstance().getAllInvalidProjectReferenceSet().size() > 0) {
             StringBuffer sb = new StringBuffer();
             for (String technicalLabel : ReferenceProjectProblemManager.getInstance().getAllInvalidProjectReferenceSet()) {
@@ -3022,11 +3026,4 @@ 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.repository/src/main/java/org/talend/core/repository/utils/StandaloneConnectionContextUtils.java

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

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

@@ -139,5 +139,3 @@ 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/src/main/java/org/talend/core/database/EDatabase4DriverClassName.java

@@ -52,7 +52,6 @@ public enum EDatabase4DriverClassName {
     MYSQL8(EDatabaseTypeName.MYSQL, "com.mysql.cj.jdbc.Driver"), //$NON-NLS-1$
     MARIADB(EDatabaseTypeName.MYSQL, "org.mariadb.jdbc.Driver"), //$NON-NLS-1$
     AMAZON_AURORA(EDatabaseTypeName.AMAZON_AURORA, "org.gjt.mm.mysql.Driver"), //$NON-NLS-1$
-    AMAZON_AURORA_3(EDatabaseTypeName.AMAZON_AURORA, "com.mysql.cj.jdbc.Driver"), //$NON-NLS-1$
     NETEZZA(EDatabaseTypeName.NETEZZA, "org.netezza.Driver"), //$NON-NLS-1$
 
     ORACLEFORSID(EDatabaseTypeName.ORACLEFORSID, "oracle.jdbc.OracleDriver", "oracle.jdbc.driver.OracleDriver"), //$NON-NLS-1$ //$NON-NLS-2$

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

@@ -252,8 +252,6 @@ public class ConnParameterKeys {
     
     public static final String CONN_PARA_KEY_EXECUTOR_MEMORY = "CONN_PARA_KEY_EXECUTOR_MEMORY"; //$NON-NLS-1$
     
-    public static final String CONN_PARA_KEY_EXECUTOR_CORES = "CONN_PARA_KEY_EXECUTOR_CORES";
-    
     public static final String CONN_PARA_KEY_TUNING_PROPERTIES = "CONN_PARA_KEY_TUNING_PROPERTIES"; //$NON-NLS-1$
 
     /******************************************/
@@ -368,57 +366,7 @@ 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/version/EDatabaseVersion4Drivers.java

@@ -69,7 +69,7 @@ public enum EDatabaseVersion4Drivers {
             "SAS 9.2", "SAS_9.2", new String[] { "sas.core.jar", "sas.security.sspi.jar", "sas.svc.connection.jar", "reload4j-1.2.22.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
     SAPHana(new DbVersion4Drivers(EDatabaseTypeName.SAPHana, "HDB 1.0", "HDB_1_0", "ngdbc.jar")), //$NON-NLS-1$
     // MYSQL, add for 9594
-    MYSQL_8(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MySQL 8", "MYSQL_8", "mysql-connector-j-8.0.33.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    MYSQL_8(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MySQL 8", "MYSQL_8", "mysql-connector-java-8.0.18.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     MYSQL_5(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MySQL 5", "MYSQL_5", "mysql-connector-java-5.1.49.jar")), //$NON-NLS-1$  //$NON-NLS-2$ //$NON-NLS-3$
     MARIADB(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MariaDB", "MARIADB", "mariadb-java-client-2.5.3.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     // add for 9594
@@ -81,7 +81,7 @@ public enum EDatabaseVersion4Drivers {
             new String[] { "mssql-jdbc.jar", "slf4j-api-1.7.34.jar", "slf4j-reload4j-1.7.34.jar", "msal4j-1.11.0.jar", //$NON-NLS-1$
                     "oauth2-oidc-sdk-9.7.jar", "reload4j-1.2.22.jar", "jackson-core-2.13.4.jar",
                     "jackson-databind-2.13.4.2.jar", "jackson-annotations-2.13.4.jar", "jcip-annotations-1.0-1.jar",
-                    "json-smart-2.4.9.jar", "nimbus-jose-jwt-9.22.jar", "accessors-smart-2.4.9.jar", "asm-9.5.jar",
+                    "json-smart-2.4.7.jar", "nimbus-jose-jwt-9.22.jar", "accessors-smart-2.4.7.jar", "asm-9.1.jar",
                     "content-type-2.1.jar", "lang-tag-1.5.jar" })),
 
     VERTICA_9(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 9.X", "VERTICA_9_0", "vertica-jdbc-9.3.1-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -150,16 +150,12 @@ public enum EDatabaseVersion4Drivers {
     REDSHIFT(new DbVersion4Drivers(EDatabaseTypeName.REDSHIFT, "redshift", "REDSHIFT", //$NON-NLS-1$ //$NON-NLS-2$
             new String[]{ "redshift-jdbc42-no-awssdk-1.2.55.1083.jar", "antlr4-runtime-4.8-1.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
     REDSHIFT_SSO(new DbVersion4Drivers(EDatabaseTypeName.REDSHIFT_SSO, "redshift sso", "REDSHIFT_SSO", //$NON-NLS-1$ //$NON-NLS-2$
-            new String[] { "redshift-jdbc42-no-awssdk-1.2.55.1083.jar", "antlr4-runtime-4.8-1.jar", "jackson-core-2.13.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                    "jackson-databind-2.13.4.2.jar", "jackson-annotations-2.13.4.jar", "httpcore-4.4.13.jar", //$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$
+            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$
 
-    AMAZON_AURORA(new DbVersion4Drivers(EDatabaseTypeName.AMAZON_AURORA, "MySQL 5", "MYSQL_5", //$NON-NLS-1$
-            "mysql-connector-java-5.1.49.jar")),
-    AMAZON_AURORA_3(new DbVersion4Drivers(EDatabaseTypeName.AMAZON_AURORA, "MySQL 8", "MYSQL_8", //$NON-NLS-1$
-            "mysql-connector-j-8.0.33.jar"));
+    AMAZON_AURORA(new DbVersion4Drivers(EDatabaseTypeName.AMAZON_AURORA, "mysql-connector-java-5.1.49.jar")); //$NON-NLS-1$
 
     private DbVersion4Drivers dbVersionBean;
 

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

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

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

@@ -28,10 +28,6 @@ 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 SPARK_MODE_HDI = "HDI";
 
     public static final String FRAMEWORK = "FRAMEWORK";
 

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

@@ -142,8 +142,6 @@ public enum EHadoopProperties {
     
     SPARK_EXECUTOR_MEMORY,
     
-    SPARK_EXECUTOR_CORES,
-    
     DATABRICKS_ENDPOINT,
     
     DATABRICKS_CLOUD_PROVIDER,
@@ -155,52 +153,6 @@ 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,14 +984,6 @@ 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/context/JobContextManager.java

@@ -33,7 +33,6 @@ import org.talend.core.model.properties.ContextItem;
 import org.talend.core.model.properties.Item;
 import org.talend.core.model.utils.ContextParameterUtils;
 import org.talend.cwm.helper.ResourceHelper;
-import org.talend.cwm.helper.StudioEncryptionHelper;
 import org.talend.designer.core.model.utils.emf.talendfile.ContextParameterType;
 import org.talend.designer.core.model.utils.emf.talendfile.ContextType;
 import org.talend.designer.core.model.utils.emf.talendfile.TalendFileFactory;
@@ -336,8 +335,6 @@ public class JobContextManager implements IContextManager {
                 } else {
                     contextParam.setType(MetadataTalendType.getDefaultTalendType());
                 }
-                //To avoid encrypt the same value}
-                contextParam.setOriginEncryptedValue(contextParamType.getValue());
                 contextParam.setValue(contextParamType.getRawValue());
 
                 contextParam.setPromptNeeded(contextParamType.isPromptNeeded());
@@ -563,10 +560,7 @@ public class JobContextManager implements IContextManager {
                     contextParamType.setName(contextParam.getName());
                     contextParamType.setPrompt(contextParam.getPrompt());
                     contextParamType.setType(contextParam.getType());
-                    //To avoid encrypt the same value
-                    contextParamType.setValue(contextParam.getOriginEncryptedValue()); 
                     contextParamType.setRawValue(contextParam.getValue());
-                    contextParam.setOriginEncryptedValue(contextParamType.getValue()); // For origin encrypted value is null or encryption key upgrade
                     contextParamType.setPromptNeeded(contextParam.isPromptNeeded());
                     contextParamType.setComment(contextParam.getComment());
                     if (!contextParam.isBuiltIn()) {

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

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

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

@@ -1091,10 +1091,6 @@ public class RepositoryToComponentProperty {
                 if (dbVersionString != null) {
                     return dbVersionString.toUpperCase();
                 }
-            } else if (EDatabaseConnTemplate.AMAZON_AURORA.getDBDisplayName().equals(databaseType)) {
-                if (dbVersionString != null) {
-                    return dbVersionString.toUpperCase();
-                }
             } else if (EDatabaseTypeName.HIVE.getDisplayName().equals(databaseType)) {
                 return connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HIVE_VERSION);
             } else if (EDatabaseTypeName.HBASE.getDisplayName().equals(databaseType)) {

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

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

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

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

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

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

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

@@ -368,9 +368,6 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
             "repository.metadataCalculationView", "METADATA_CON_CALCULATION_VIEW", 106, true, true, new String[] { PROD_DI },
             new String[] {}, false);
 
-    public final static ERepositoryObjectType METADATA_SAP_CDS_VIEW = new ERepositoryObjectType("repository.SAPTable", //$NON-NLS-1$
-            "METADATA_SAP_CDS_VIEW", 107, true, true, new String[] { PROD_DI }, new String[] {}, false);
-
     private String label;
 
     private String alias;
@@ -1480,8 +1477,12 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
         return allTypes;
     }
 
-    public static List<ERepositoryObjectType> getAllBigDataTypesOfJoblet(){
+    public static List<ERepositoryObjectType> getAllTypesOfJoblet() {
         List<ERepositoryObjectType> allTypes = new ArrayList<ERepositoryObjectType>();
+
+        if (ERepositoryObjectType.JOBLET != null) {
+            allTypes.add(ERepositoryObjectType.JOBLET);
+        }
         if (ERepositoryObjectType.SPARK_JOBLET != null) {
             allTypes.add(ERepositoryObjectType.SPARK_JOBLET);
         }
@@ -1491,15 +1492,6 @@ 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,8 +79,4 @@ 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.ICoreTisRuntimeService;
+import org.talend.core.service.IRemoteService;
 
 /**
  * DOC jding  class global comment. Detailled comment
@@ -22,11 +22,11 @@ public class PendoDataTrackFactory {
 
     private static PendoDataTrackFactory instance;
 
-    private static ICoreTisRuntimeService coreRuntimeService;
+    private static IRemoteService remoteService;
 
     static {
         instance = new PendoDataTrackFactory();
-        coreRuntimeService = ICoreTisRuntimeService.get();
+        remoteService = IRemoteService.get();
     }
 
     private PendoDataTrackFactory() {
@@ -37,35 +37,35 @@ public class PendoDataTrackFactory {
     }
 
     public boolean isTrackSendAvailable() throws Exception {
-        if (coreRuntimeService != null) {
-            return coreRuntimeService.isPendoTrackAvailable();
+        if (remoteService != null) {
+            return remoteService.isPendoTrackAvailable();
         }
         return false;
     }
 
     public void sendTrackData(TrackEvent event, IPendoDataProperties properties) throws Exception {
-        if (coreRuntimeService != null) {
-            coreRuntimeService.sendPendoTrackData(event, properties);
+        if (remoteService != null) {
+            remoteService.sendPendoTrackData(event, properties);
         }
     }
 
     public void sendProjectLoginTrack() {
-        if (coreRuntimeService != null) {
-            AbstractPendoTrackManager pendoProjectLoginManager = coreRuntimeService.getPendoProjectLoginManager();
+        if (remoteService != null) {
+            AbstractPendoTrackManager pendoProjectLoginManager = remoteService.getPendoProjectLoginManager();
             pendoProjectLoginManager.sendTrackToPendo();
         }
     }
 
     public void sendGenericTrack(TrackEvent event, IPendoDataProperties properties) {
-        if (coreRuntimeService != null) {
-            AbstractPendoTrackManager genericManager = coreRuntimeService.getPendoGenericManager(event, properties);
+        if (remoteService != null) {
+            AbstractPendoTrackManager genericManager = remoteService.getPendoGenericManager(event, properties);
             genericManager.sendTrackToPendo();
         }
     }
 
     public String getTmcUser(String url, String token) {
-        if (coreRuntimeService != null) {
-            return coreRuntimeService.getTmcUser(url, token);
+        if (remoteService != null) {
+            return remoteService.getTmcUser(url, token);
         }
         return "";
     }

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,7 +656,3 @@ 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\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.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.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,7 +656,3 @@ 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,7 +656,3 @@ 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,8 +41,6 @@ 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/service/ICloudSignOnService.java

@@ -21,6 +21,10 @@ 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;
@@ -39,13 +43,11 @@ public interface ICloudSignOnService extends IService {
     
     boolean isNeedShowSSOPage();
     
-    public boolean showReloginDialog();
+    public void 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/ICoreTisRuntimeService.java

@@ -1,45 +0,0 @@
-// ============================================================================
-//
-// 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/IRemoteService.java

@@ -17,6 +17,9 @@ 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;
 
@@ -36,6 +39,16 @@ 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,23 +12,14 @@
 // ============================================================================
 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;
@@ -137,10 +128,6 @@ public interface IStudioLiteP2Service extends IService {
 
     void setupTmcUpdate(IProgressMonitor monitor, IStudioUpdateConfig updateConfig) throws Exception;
 
-    void handleTmcUpdateObserve(boolean trunOn);
-
-    boolean isUpdateManagedByTmc(IProgressMonitor monitor);
-
     boolean removeM2() throws Exception;
     
     void saveRemoveM2(boolean remove) throws Exception;
@@ -214,12 +201,6 @@ 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();
 
@@ -258,83 +239,6 @@ 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.ui/src/main/java/messages.properties

@@ -560,7 +560,6 @@ 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,7 +560,6 @@ 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=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE
+repository.metadataGenericSchema=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE
 repository.metadataGenericSchema.alias=GENERIC
 repository.metadataLDAPSchema=LDAP
 repository.metadataLDAPSchema.alias=LDAP
@@ -560,7 +560,6 @@ 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)...
@@ -580,6 +579,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\u5316
+MetadataPreferencePage.EnableBasic.name=\u57FA\u672C\u8A8D\u8A3C\u30D8\u30C3\u30C0\u30FC\u3092\u6709\u52B9\u306B\u3059\u308B
 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,7 +560,6 @@ 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,7 +59,6 @@ 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;
@@ -112,7 +111,6 @@ 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;
@@ -132,7 +130,7 @@ public class ContextTreeTable {
 
     private NatTable natTable;
 
-    // for bug TDI-32821锛<EFBFBD> use LinkedList to keep the original order of context parameter list.
+    // for bug TDI-32821， 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<>();
@@ -274,7 +272,7 @@ public class ContextTreeTable {
             final GridLayer gridLayer = new GridLayer(viewportLayer, sortHeaderLayer, rowHeaderLayer, cornerLayer);
 
             // config the column edit configuration
-            ContextValueLabelAccumulator labelAccumulator = new ContextValueLabelAccumulator(bodyDataLayer, bodyDataProvider, manager.getContextManager(), columnGroupModel);
+            ColumnOverrideLabelAccumulator labelAccumulator = new ColumnOverrideLabelAccumulator(bodyDataLayer);
             bodyDataLayer.setConfigLabelAccumulator(labelAccumulator);
             registerColumnLabels(labelAccumulator, ContextRowDataListFixture.getContexts(manager.getContextManager()));
 
@@ -806,32 +804,12 @@ 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) {
-            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;
+            return Messages.getString("ContextTreeTable.PromptToolTips"); //$NON-NLS-1$
         }
 
         @Override

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

@@ -28,10 +28,6 @@ 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,7 +16,6 @@ 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;
@@ -44,8 +43,12 @@ public class ContextAutoResizeTextPainter extends TextPainter {
     @Override
     public void setupGCFromConfig(GC gc, IStyle cellStyle) {
         super.setupGCFromConfig(gc, cellStyle);
-        if (containsRowName) {
+        if (cellStyle.getAttributeValue(CellStyleAttributes.FOREGROUND_COLOR).equals(GUIHelper.COLOR_RED)) {
+            gc.setForeground(GUIHelper.COLOR_BLACK);
+        } else 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,15 +23,12 @@ 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;
 
 /**
@@ -52,9 +49,18 @@ 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 ContextTabChildModel) {
+        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 {
             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,6 +137,7 @@ 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);
@@ -160,15 +161,11 @@ 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,7 +21,6 @@ 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;
@@ -29,7 +28,6 @@ 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
@@ -72,17 +70,9 @@ 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

@@ -1,81 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.core.ui.context.nattableTree;
-
-import org.eclipse.nebula.widgets.nattable.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,8 +26,6 @@ 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;
@@ -274,28 +272,4 @@ 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,17 +12,9 @@
 // ============================================================================
 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;
@@ -60,18 +52,6 @@ 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;
@@ -126,26 +106,9 @@ 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
@@ -201,30 +164,6 @@ 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);
 
@@ -255,24 +194,4 @@ 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

@@ -1,55 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.core.ui.context.nattableTree;
-
-import org.eclipse.nebula.widgets.nattable.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,7 +425,6 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
                             && jobContextManager.isOriginalParameter(param.getName())) {
                         jobContextManager.setModified(true);
                         manager.fireContextsChangedEvent();
-                        modelManager.refresh();
                     }
                 }
             }
@@ -508,7 +507,6 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
                             && jobContextManager.isOriginalParameter(param.getName())) {
                         jobContextManager.setModified(true);
                         manager.fireContextsChangedEvent();
-                        modelManager.refresh();
                     }
                 }
             }
@@ -590,7 +588,6 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
                             && jobContextManager.isOriginalParameter(param.getName())) {
                         jobContextManager.setModified(true);
                         manager.fireContextsChangedEvent();
-                        modelManager.refresh();
                     }
                 }
             }
@@ -687,7 +684,6 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
                             && jobContextManager.isOriginalParameter(param.getName())) {
                         jobContextManager.setModified(true);
                         manager.fireContextsChangedEvent();
-                        modelManager.refresh();
                     }
                 }
             }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/proposal/RoutinesFunctionProposal.java

@@ -78,7 +78,6 @@ 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/token/TokenInforUtil.java

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

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

@@ -1,89 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.core.ui.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

@@ -1,244 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.core.ui.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/messages.properties

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

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

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

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

@@ -1,86 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2023 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.core.model.utils;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.talend.commons.exception.PersistenceException;
-import org.talend.commons.utils.VersionUtils;
-import org.talend.core.CorePlugin;
-import org.talend.core.GlobalServiceRegister;
-import org.talend.core.context.Context;
-import org.talend.core.context.RepositoryContext;
-import org.talend.core.i18n.Messages;
-import org.talend.core.model.general.Project;
-import org.talend.core.repository.model.ProxyRepositoryFactory;
-import org.talend.core.service.IRemoteService;
-import org.talend.core.service.IStudioLiteP2Service;
-import org.talend.core.ui.IInstalledPatchService;
-import org.talend.core.ui.branding.IBrandingService;
-import org.talend.repository.ui.login.connections.ConnectionUserPerReader;
-
-/**
- * DOC jding  class global comment. Detailled comment
- */
-public class TalendWorkbenchUtil {
-
-    public static final String MANAGED_BY_ADMIN = " Managed by administrator"; //$NON-NLS-1$
-
-    public static String getWorkbenchWindowTitle() {
-        String title = "";
-        RepositoryContext repositoryContext = (RepositoryContext) CorePlugin.getContext()
-                .getProperty(Context.REPOSITORY_CONTEXT_KEY);
-        Project project = repositoryContext.getProject();
-        String appName = IBrandingService.get().getFullProductName();
-        // TDI-18644
-        ProxyRepositoryFactory factory = ProxyRepositoryFactory.getInstance();
-        boolean localProvider = false;
-        try {
-            localProvider = factory.isLocalConnectionProvider();
-        } catch (PersistenceException e) {
-            localProvider = true;
-        }
-
-        String buildIdField = " (" + VersionUtils.getVersion() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-        if (GlobalServiceRegister.getDefault().isServiceRegistered(IInstalledPatchService.class)) {
-            IInstalledPatchService pachService = (IInstalledPatchService) GlobalServiceRegister.getDefault()
-                    .getService(IInstalledPatchService.class);
-            if (pachService != null) {
-                String patchVersion = pachService.getLatestInstalledVersion(true);
-                if (patchVersion != null) {
-                    buildIdField = " (" + patchVersion + ")"; //$NON-NLS-1$ //$NON-NLS-2$ ;
-                    if (IRemoteService.get() != null && IRemoteService.get().isCloudConnection()) {
-                        IStudioLiteP2Service liteP2Service = IStudioLiteP2Service.get();
-                        if (liteP2Service != null && liteP2Service.isUpdateManagedByTmc(new NullProgressMonitor())) {
-                            buildIdField += MANAGED_BY_ADMIN;
-                        }
-                    }
-                }
-            }
-        }
-
-        if (TalendPropertiesUtil.isHideBuildNumber()) {
-            buildIdField = ""; //$NON-NLS-1$
-        }
-        if (localProvider) {
-            title = appName + buildIdField + " | " + project.getLabel() + " (" //$NON-NLS-1$ //$NON-NLS-2$
-                    + Messages.getString("ApplicationWorkbenchWindowAdvisor.repositoryConnection") + ": " //$NON-NLS-1$ //$NON-NLS-2$
-                    + ConnectionUserPerReader.getInstance().readLastConncetion() + ")"; //$NON-NLS-1$
-        } else {
-            title = appName + buildIdField + " | " + repositoryContext.getUser() + " | " + project.getLabel() + " (" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                    + Messages.getString("ApplicationWorkbenchWindowAdvisor.repositoryConnection") + ": " //$NON-NLS-1$ //$NON-NLS-2$
-                    + ConnectionUserPerReader.getInstance().readLastConncetion() + ")"; //$NON-NLS-1$
-        }
-        return title;
-    }
-
-}

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

@@ -63,12 +63,6 @@ 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
@@ -95,6 +89,4 @@ public interface IGITProviderService extends IService {
         }
         return register.getService(IGITProviderService.class);
     }
-
-    public void clearOldStorage(IProgressMonitor monitor, Project project) throws PersistenceException;
 }

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

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

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

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

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

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

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.15</meecrowave.version>
+		<meecrowave.version>1.2.14</meecrowave.version>
 		<microprofile.version>1.2.1</microprofile.version>
 		<owb.version>2.0.27</owb.version>
 		<slf4j.version>1.7.34</slf4j.version>
-		<tomcat.version>9.0.73</tomcat.version>
+		<tomcat.version>9.0.68</tomcat.version>
 		<xbean.version>4.20</xbean.version>
 		<reload4j.version>1.2.22</reload4j.version>
-		<log4j2.version>2.20.0</log4j2.version>
+		<log4j2.version>2.18.0</log4j2.version>
 		<tycho.buildtimestamp.format>${timestamp}</tycho.buildtimestamp.format>
 	</properties>
 	<repositories>

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

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

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

@@ -52,17 +52,8 @@
 					<groupId>org.jsoup</groupId>
 					<artifactId>jsoup</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>org.apache.velocity</groupId>
-					<artifactId>velocity</artifactId>
-				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.velocity</groupId>
-			<artifactId>velocity-engine-core</artifactId>
-			<version>2.3</version>
-		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>
@@ -76,7 +67,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-framework-bom</artifactId>
-			<version>5.2.9.RELEASE</version>
+			<version>5.2.7.RELEASE</version>
 			<type>pom</type>
 		</dependency>
 		<dependency>

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

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

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

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

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

@@ -32,7 +32,7 @@
 		<dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
-            <version>3.8.8</version>
+            <version>3.8.6</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-io</groupId>
@@ -123,7 +123,7 @@
 		<dependency>
 			<groupId>org.apache.maven</groupId>
 			<artifactId>maven-compat</artifactId>
-			<version>3.8.8</version>
+			<version>3.8.6</version>
 		</dependency>
 		<dependency>
             <groupId>commons-codec</groupId>

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

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

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

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

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

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

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

@@ -11,10 +11,6 @@ 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,10 +11,6 @@ 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,10 +11,6 @@ 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/META-INF/MANIFEST.MF

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

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

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

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

@@ -59,7 +59,7 @@
 						<dependency>
 							<groupId>org.apache.maven</groupId>
 							<artifactId>maven-compat</artifactId>
-							<version>3.8.8</version>
+							<version>3.8.6</version>
 						</dependency>
 						<dependency>
 							<groupId>org.apache.commons</groupId>
@@ -69,7 +69,7 @@
 						<dependency>
 							<groupId>org.apache.maven</groupId>
 							<artifactId>maven-core</artifactId>
-							<version>3.8.8</version>
+							<version>3.8.6</version>
 						</dependency>
 						<dependency>
 							<groupId>com.google.guava</groupId>
@@ -101,7 +101,7 @@
 						<dependency>
 							<groupId>org.apache.maven</groupId>
 							<artifactId>maven-core</artifactId>
-							<version>3.8.8</version>
+							<version>3.8.6</version>
 						</dependency>
 						<dependency>
 							<groupId>com.google.guava</groupId>
@@ -148,7 +148,7 @@
 						<dependency>
 							<groupId>org.apache.maven</groupId>
 							<artifactId>maven-core</artifactId>
-							<version>3.8.8</version>
+							<version>3.8.6</version>
 						</dependency>
 						<dependency>
 							<groupId>com.google.guava</groupId>
@@ -200,12 +200,12 @@
 						<dependency>
 							<groupId>org.apache.maven</groupId>
 							<artifactId>maven-compat</artifactId>
-							<version>3.8.8</version>
+							<version>3.8.6</version>
 						</dependency>
 						<dependency>
 							<groupId>org.apache.maven</groupId>
 							<artifactId>maven-core</artifactId>
-							<version>3.8.8</version>
+							<version>3.8.6</version>
 						</dependency>
 						<dependency>
 							<groupId>com.google.guava</groupId>

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

@@ -231,7 +231,7 @@ public abstract class AbstractMavenProcessorPom extends CreateMavenBundleTemplat
                 Dependency mavenCoreDep = new Dependency();
                 mavenCoreDep.setGroupId("org.apache.maven");
                 mavenCoreDep.setArtifactId("maven-core");
-                mavenCoreDep.setVersion("3.8.8");
+                mavenCoreDep.setVersion("3.8.6");
                 
                 shade.getDependencies().add(guavaDep);
                 shade.getDependencies().add(codecDep);

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.DOT_SNAPSHOT)) {
-                version += MavenConstants.DOT_SNAPSHOT;
+            if (useSnapshot && version != null && !version.contains(MavenConstants.SNAPSHOT)) {
+                version += MavenConstants.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-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>
+<?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>

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-core-0.8.9.jar,
+ lib/apache-mime4j-0.6.jar,
  lib/castor-1.0.3.jar,
  lib/jakarta-oro-2.0.8.jar
 Bundle-Vendor: .Talend SA.
@@ -16,8 +16,21 @@ 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,