fix(TUP-34595):we are trying to access api.eu.cloud.talend.com without (#5010)

passing through a proxy.

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

@@ -5,7 +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.68.0" match="greaterOrEqual"/>
+    <import plugin="org.bouncycastle.bcprov" version="1.69.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"/>
@@ -20,7 +20,7 @@
     <import plugin="org.apache.servicemix.bundles.avro" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.junit" version="4.13.2" match="greaterOrEqual"/>
     <import plugin="org.slf4j.api" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.slf4j.impl.log4j12" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.slf4j.binding.log4j12" version="0.0.0" match="greaterOrEqual"/>
   </requires>  
   <plugin id="org.talend.daikon" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
   <plugin id="org.talend.daikon.exception" download-size="0" install-size="0" version="0.0.0" unpack="false"/>

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

@@ -65,7 +65,7 @@ EventUtil.typeNull=NULL
 EventUtil.UnknowDetail=\u30A4\u30D9\u30F3\u30C8\u8A73\u7D30\u306E\u4E0D\u660E\u306A???\u5024:
 EventUtil.UnknowType=\u30A4\u30D9\u30F3\u30C8\u30BF\u30A4\u30D7\u306E\u4E0D\u660E\u306A???\u5024:
 EventUtil.verify=\u78BA\u8A8D
-ExceptionHandler.Parameter.BeNull=ex \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306B\u306Fnull\u3092\u8A2D\u5B9A\u51FA\u6765\u307E\u305B\u3093
+ExceptionHandler.Parameter.BeNull=ex \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306B\u306Fnull\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093
 ExceptionMessageDialog.Cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
 ExceptionMessageDialog.log=\u30ED\u30B0
 ExceptionMessageDialog.No=\u3044\u3044\u3048
@@ -73,12 +73,12 @@ ExceptionMessageDialog.OK=OK
 ExceptionMessageDialog.Yes=\u306F\u3044
 ExportPushButton.ExportButton.Tip=\u3059\u3079\u3066\u306E\u884C\u3092XML\u30D5\u30A1\u30A4\u30EB\u306B\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
 ExportPushButtonForExtendedTable.ErrorMsg.Text=\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-ExtendedTableAddCommand.Add.Label=\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30921\u3064\u4EE5\u4E0A\u8FFD\u52A0
-ExtendedTableCopyCommand.Copy.Label=\u5185\u90E8\u30AF\u30EA\u30FC\u30F3\u30DC\u30FC\u30C9\u306B\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30921\u3064\u4EE5\u4E0A\u30B3\u30D4\u30FC
+ExtendedTableAddCommand.Add.Label=\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30FC\u30921\u3064\u4EE5\u4E0A\u8FFD\u52A0
+ExtendedTableCopyCommand.Copy.Label=\u5185\u90E8\u30AF\u30EA\u30FC\u30F3\u30DC\u30FC\u30C9\u306B\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30FC\u30921\u3064\u4EE5\u4E0A\u30B3\u30D4\u30FC
 ExtendedTableModel.ModifiedObject.Error=\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u4F7F\u7528\u3059\u308B\u524D\u306BModifiedBeanListenable\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3092\u8A2D\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-ExtendedTableMoveCommand.MoveLabel=\u8907\u6570\u306E\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u3092\u4E0A\u4E0B\u306B\u79FB\u52D5
+ExtendedTableMoveCommand.MoveLabel=\u8907\u6570\u306E\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u4E0A\u4E0B\u306B\u79FB\u52D5
 ExtendedTablePasteCommand.Paste.Label=\u5185\u90E8\u30AF\u30EA\u30C3\u30D7\u30DC\u30FC\u30C9\u304B\u3089\u30C7\u30FC\u30BF\u3092\u8CBC\u308A\u4ED8\u3051\u308B
-ExtendedTableRemoveCommand.Romve.Label=\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u3092\u524A\u9664
+ExtendedTableRemoveCommand.Romve.Label=\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u524A\u9664
 ExtendedTableResetDBTypesCommand.ResetDBTypes.Label=DB\u30BF\u30A4\u30D7\u3092\u3059\u3079\u3066\u30EA\u30BB\u30C3\u30C8\u3057\u3066\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u53D6\u5F97
 ImportPushButton.ImportButton.Tip=\u884C\u3092\u3059\u3079\u3066XML\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u306B\u7F6E\u63DB
 ImportPushButtonForExtendedTable.ErrorMsg.Text=\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F

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

@@ -74,6 +74,7 @@ public enum ECoreImage implements IImage {
     CONTEXT_WIZ("/icons1/context_wiz.png"), //$NON-NLS-1$
     CODE_ICON("/icons1/code.png"), //$NON-NLS-1$
     ROUTES_ICON("/icons1/routes_icon.png"), //$NON-NLS-1$
+    ROUTELET_ICON("/icons1/routelet.png"), //$NON-NLS-1$
     ROUTINE_ICON("/icons1/routine.png"), //$NON-NLS-1$
     ROUTINE_EDITOR_ICON("/icons1/routine_editor.png"), //$NON-NLS-1$
     ROUTINESJAR_ICON("/icons1/routinesjar.png"), //$NON-NLS-1$

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

@@ -127,7 +127,6 @@ public enum EImage implements IImage {
     FILL_COLOR_ICON("/icons/fill_color.gif"), //$NON-NLS-1$
 
     OPEN_IN_BROWSER("/icons/open.gif"), //$NON-NLS-1$
-    DOWNLOAD_MODULE("/icons/download.gif"), //$NON-NLS-1$
 
     COMPONENT_MISSING("/icons/component_missing.png"), //$NON-NLS-1$
 

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

@@ -38,6 +38,12 @@ public class ExceptionHandler {
         CommonExceptionHandler.log(message);
     }
 
+    public static void logDebug(String message) {
+        if (CommonsPlugin.isDebugMode() || CommonsPlugin.isDevMode()) {
+            CommonExceptionHandler.log(message);
+        }
+    }
+    
     public static void process(Throwable ex, Priority priority) {
         CommonExceptionHandler.process(ex, priority);
 

main/plugins/org.talend.commons.runtime/src/org/talend/commons/i18n/internal/messages_ja.properties

@@ -11,7 +11,7 @@ SybaseResultSet.unknowCloumn=\u7121\u52B9\u306A\u5F15\u6570: \u30AB\u30E9\u30E0\
 AbstractFakeResultSet.unknowCloumn=\u7121\u52B9\u306A\u5F15\u6570: {0}\u304C\u4E0D\u660E\u306A\u30AB\u30E9\u30E0\u540D
 AbstractFakeResultSet.parameterIndexOutOfRange=\u7121\u52B9\u306A\u5F15\u6570: \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9{0}\u304C\u7BC4\u56F2\u5916
 EntryLocation.returnTableName={tableName={0}, \u30AB\u30E9\u30E0\u540D={1}}
-ExceptionHandler.Parameter.BeNull=ex \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306B\u306Fnull\u3092\u8A2D\u5B9A\u51FA\u6765\u307E\u305B\u3093
+ExceptionHandler.Parameter.BeNull=ex \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306B\u306Fnull\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093
 ExtensionImplementationProviders.ExtensionPointError=\u62E1\u5F35\u30DD\u30A4\u30F3\u30C8\u306F1\u3064\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u8A8D\u8A3C\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 ListenableList.IndexSameLength.Error=indexOrigin\u3068indexDestination\u304C\u540C\u3058\u9577\u3055\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 ReflectionPropertyException.Access.ErrorMsg3=\u30AF\u30E9\u30B9'{2}'\u306E\u30D7\u30ED\u30D1\u30C6\u30A3'{1}'\u306E{0}\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/VersionUtils.java

@@ -36,6 +36,7 @@ import org.osgi.framework.FrameworkUtil;
 import org.talend.commons.CommonsPlugin;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.i18n.internal.Messages;
+import org.talend.utils.format.PresentableBox;
 
 /**
  * Represents a version. Contents a major and a minor version.<br/>
@@ -367,10 +368,14 @@ public class VersionUtils {
     }
 
     public static String getDisplayPatchVersion(String patchName) {
-        if (Integer.parseInt(StringUtils.substringAfterLast(patchName, "v")) > 1) { //$NON-NLS-1$
+        try {
+            if (Integer.parseInt(StringUtils.substringAfterLast(patchName, "v")) > 1) { //$NON-NLS-1$
+                return patchName;
+            }
+            return StringUtils.substringBefore(patchName, "v"); //$NON-NLS-1$
+        } catch (NumberFormatException e) {
             return patchName;
         }
-        return StringUtils.substringBefore(patchName, "v"); //$NON-NLS-1$
     }
 
     public static void clearCache() {
@@ -405,5 +410,15 @@ public class VersionUtils {
         }
         return null;
     }
+    
+    public static String getProductVersionLog() {
+            Object version = getDisplayVersion();
+            String mess = "Starting Talend's platform log system."; //$NON-NLS-1$
+            if (version != null) {
+                mess += ("VERSION= " + version); //$NON-NLS-1$
+            }
+            PresentableBox box = new PresentableBox("TALEND", mess, 0); //$NON-NLS-1$
+            return box.getFullBox();
+    }
 
 }

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

@@ -50,8 +50,6 @@ public class NetworkUtil {
 
     private static final String TALEND_DISABLE_INTERNET = "talend.disable.internet";//$NON-NLS-1$
 
-    private static final String HTTP_NETWORK_URL = "https://talend-update.talend.com";
-
     private static final int DEFAULT_TIMEOUT = 4000;
 
     private static final int DEFAULT_NEXUS_TIMEOUT = 20000;// same as preference value
@@ -89,7 +87,7 @@ public class NetworkUtil {
         }
         HttpURLConnection conn = null;
         try {
-            URL url = new URL(HTTP_NETWORK_URL);
+            URL url = new URL(getCheckUrl());
             conn = (HttpURLConnection) url.openConnection();
             conn.setDefaultUseCaches(false);
             conn.setUseCaches(false);
@@ -112,6 +110,15 @@ public class NetworkUtil {
         return true;
     }
 
+    private static String getCheckUrl() {
+        String customUrl = System.getProperty("talend.studio.network.checkUrlPath");
+        if (StringUtils.isNotBlank(customUrl)) {
+            return customUrl;
+        } else {
+            return "https://talend-update.talend.com/nexus/content/repositories/libraries/";
+        }
+    }
+
     public static boolean isNetworkValid(String url, Integer timeout) {
         if (url == null) {
             return isNetworkValid(timeout);

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

@@ -21,10 +21,29 @@
 // ============================================================================
 package org.talend.commons.utils.system;
 
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.Set;
+import java.util.StringTokenizer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.osgi.service.datalocation.Location;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Filter;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.util.tracker.ServiceTracker;
+import org.talend.commons.exception.ExceptionHandler;
 
 /**
  * Creates and updates properties for the eclipse commandline in case of relaunch <br/>
@@ -41,6 +60,8 @@ public class EclipseCommandLine {
     static final String PROP_COMMANDS = "eclipse.commands"; //$NON-NLS-1$
 
     static final String CMD_VMARGS = "-vmargs"; //$NON-NLS-1$
+    
+    static final String CMD_VM = "-vm"; //$NON-NLS-1$
 
     static final String NEW_LINE = "\n"; //$NON-NLS-1$
 
@@ -106,6 +127,21 @@ public class EclipseCommandLine {
      * later.
      */
     static public final String TALEND_SHOW_JOB_TYPE_COMMAND = "--showJobType"; //$NON-NLS-1$
+    
+    private static final String HEX_STRING = "0123456789ABCDEF";
+    
+    public static final String SCHEME_FILE = "file"; //$NON-NLS-1$
+
+    private static final String UNC_PREFIX = "//"; //$NON-NLS-1$
+    
+    static private final Set<String> TALEND_ARGS = new HashSet<String>();
+    
+    static {
+        TALEND_ARGS.add(TALEND_CLEAN_UNINSTALLED_BUNDLES);
+        TALEND_ARGS.add(ARG_TALEND_BUNDLES_CLEANED);
+        TALEND_ARGS.add(PROP_TALEND_BUNDLES_DO_CLEAN);
+        TALEND_ARGS.add(TALEND_RELOAD_COMMAND);
+    }
 
     static public void updateOrCreateExitDataPropertyWithCommand(String command, String value, boolean delete) {
         updateOrCreateExitDataPropertyWithCommand(command, value, delete, false);
@@ -115,6 +151,16 @@ public class EclipseCommandLine {
         if (argName == null || argName.trim().isEmpty()) {
             return null;
         }
+
+        try {
+            if (isWindows() && TALEND_ARGS.contains(argName) && !isPoweredByTalend()) {
+                ExceptionHandler.logDebug("argName: " + argName + ", sysProp: " + argName + ", value: " + System.getProperty(argName));
+                Properties p = loadConfigIni();
+                return p.getProperty(argName);
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
         String[] commandLineArgs = Platform.getCommandLineArgs();
         if (commandLineArgs == null || commandLineArgs.length <= 0) {
             return null;
@@ -128,6 +174,152 @@ public class EclipseCommandLine {
         return null;
     }
 
+    private static boolean isPoweredByTalend() {
+        return !Platform.getProduct().getId().equals("org.talend.rcp.branding.jetl.product") && !Platform.getProduct().getId().equals("org.talend.rcp.branding.jetl.bigdata.product");
+    }
+    
+    private static boolean isWindows() {
+        return EnvironmentUtils.isWindowsSystem();
+    }
+    
+    private static void updateConfigIni(String command, String value, boolean delete) {
+        Properties p = loadConfigIni();
+
+        if (delete) {
+            p.remove(command);
+        } else {
+            p.put(command, value);
+        }
+        try {
+            File f = getConfigFile();
+            try (FileOutputStream fos = new FileOutputStream(f)) {
+                p.store(fos, "updated " + command);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+    
+    private static Properties loadConfigIni() {
+        Properties p = new Properties();
+        try {
+            File f = getConfigFile();
+            try (FileInputStream fis = new FileInputStream(f)) {
+                p.load(fis);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return p;
+    }
+    
+    private static String decode(String bytes) {
+        if (bytes == null) {
+            return null;
+        }
+        ByteArrayOutputStream baos = new ByteArrayOutputStream(bytes.length() / 2);
+        for (int i = 0; i < bytes.length(); i += 2) {
+            baos.write((HEX_STRING.indexOf(bytes.charAt(i)) << 4 | HEX_STRING.indexOf(bytes.charAt(i + 1))));
+        }
+        return new String(baos.toByteArray());
+    }
+    
+    private static File getConfigFile() throws URISyntaxException {
+        // configuration/config.ini
+        File iniFile = new File(getConfigurationFolder(), decode("636F6E6669672E696E69")); //$NON-NLS-1$
+
+        return iniFile;
+    }
+
+    private static Location getConfigLocation(BundleContext context) {
+        Filter filter = null;
+        try {
+            filter = context.createFilter(Location.CONFIGURATION_FILTER);
+        } catch (InvalidSyntaxException e) {
+            // should not happen
+        }
+        ServiceTracker configLocationTracker = new ServiceTracker(context, filter, null);
+        configLocationTracker.open();
+        try {
+            return (Location) configLocationTracker.getService();
+        } finally {
+            configLocationTracker.close();
+        }
+    }
+    
+    /**
+     * Returns the URL as a URI. This method will handle broken URLs that are not properly encoded (for example they
+     * contain unencoded space characters).
+     */
+    private static URI toURI(URL url) throws URISyntaxException {
+        // URL behaves differently across platforms so for file: URLs we parse from string form
+        if (SCHEME_FILE.equals(url.getProtocol())) {
+            String pathString = url.toExternalForm().substring(5);
+            // ensure there is a leading slash to handle common malformed URLs such as file:c:/tmp
+            if (pathString.indexOf('/') != 0)
+                pathString = '/' + pathString;
+            else if (pathString.startsWith(UNC_PREFIX) && !pathString.startsWith(UNC_PREFIX, 2)) {
+                // URL encodes UNC path with two slashes, but URI uses four (see bug 207103)
+                pathString = UNC_PREFIX + pathString;
+            }
+            return new URI(SCHEME_FILE, null, pathString, null);
+        }
+        try {
+            return new URI(url.toExternalForm());
+        } catch (URISyntaxException e) {
+            // try multi-argument URI constructor to perform encoding
+            return new URI(url.getProtocol(), url.getUserInfo(), url.getHost(), url.getPort(), url.getPath(), url.getQuery(),
+                    url.getRef());
+        }
+    }
+
+    private static File toFile(URI uri) {
+        try {
+            if (!SCHEME_FILE.equalsIgnoreCase(uri.getScheme()))
+                return null;
+            // assume all illegal characters have been properly encoded, so use URI class to unencode
+            return new File(uri);
+        } catch (IllegalArgumentException e) {
+            // File constructor does not support non-hierarchical URI
+            String path = uri.getPath();
+            // path is null for non-hierarchical URI such as file:c:/tmp
+            if (path == null)
+                path = uri.getSchemeSpecificPart();
+            return new File(path);
+        }
+    }
+    
+    private static File getConfigurationFolder() {
+        BundleContext configuratorBundleContext = getCurrentBundleContext();
+        final URL url = getConfigLocation(configuratorBundleContext).getURL();
+        try {
+            return toFile(toURI(url));
+        } catch (URISyntaxException e) {
+            //
+        }
+        return null;
+    }
+    
+ // always return a valid bundlesContext or throw a runtimeException
+    private static BundleContext getCurrentBundleContext() {
+        Bundle bundle = FrameworkUtil.getBundle(EclipseCommandLine.class);
+        if (bundle != null) {
+            BundleContext bundleContext = bundle.getBundleContext();
+            if (bundleContext != null) {
+                return bundleContext;
+            } else {
+                throw new RuntimeException(
+                        "could not find current BundleContext, this should never happen, check that the bunlde is activated when this class is accessed");
+            }
+        } else {
+            throw new RuntimeException(
+                    "could not find current Bundle, this should never happen, check that the bunlde is activated when this class is accessed");
+        }
+    }
+    
     /**
      * this creates or updates the org.eclipse.equinox.app.IApplicationContext.EXIT_DATA_PROPERTY by adding or changing
      * the command with value, except if value is null then the command shall be removed.
@@ -138,6 +330,17 @@ public class EclipseCommandLine {
      * @param isOption this flag used to trigger for the option command without any arguments.
      */
     static public void updateOrCreateExitDataPropertyWithCommand(String command, String value, boolean delete, boolean isOption) {
+        try {
+            if (isWindows() && TALEND_ARGS.contains(command) && !isPoweredByTalend()) {
+                ExceptionHandler.logDebug("command: " + command + ", prop: " + command + ", value: " + value + ", delete: " + delete);
+                updateConfigIni(command, value, delete);
+                return;
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+       
+        
         boolean isValueNull = false;
         if (value == null || "".equals(value)) { //$NON-NLS-1$
             isValueNull = true;
@@ -191,9 +394,9 @@ public class EclipseCommandLine {
                                 + (isValueNull ? "" : value + EclipseCommandLine.NEW_LINE)
                                 + currentProperty.substring(indexOfVmArgs);
                     } else {// vmargs command not found so don't know where to set it to throw Exception
-                        throw new IllegalArgumentException("the property :"
-                                + org.eclipse.equinox.app.IApplicationContext.EXIT_DATA_PROPERTY + "must constain "
-                                + EclipseCommandLine.CMD_VMARGS);
+                        currentProperty = currentProperty + command + EclipseCommandLine.NEW_LINE
+                                + (isValueNull ? "" : value + EclipseCommandLine.NEW_LINE);
+//                        throw new IllegalArgumentException("the property :" + org.eclipse.equinox.app.IApplicationContext.EXIT_DATA_PROPERTY + "must constain " + EclipseCommandLine.CMD_VMARGS);
                     }
                 }
             }
@@ -262,6 +465,44 @@ public class EclipseCommandLine {
                 result.append(vmargs);
             }
         }
-        System.setProperty(org.eclipse.equinox.app.IApplicationContext.EXIT_DATA_PROPERTY, result.toString());
+        
+        String exitData = result.toString();
+        
+        ExceptionHandler.logDebug("exitData before duplicated: " + exitData);
+        
+        if (isWindows() && !isPoweredByTalend()) {
+            exitData = removeDuplicated(result).toString();
+        }
+        ExceptionHandler.logDebug("exitData: " + exitData);
+        System.setProperty(org.eclipse.equinox.app.IApplicationContext.EXIT_DATA_PROPERTY, exitData);
+        
+    }
+    
+    private static StringBuilder removeDuplicated(StringBuffer sb) {
+        StringBuilder ret = new StringBuilder();
+        StringTokenizer t = new StringTokenizer(sb.toString(), EclipseCommandLine.NEW_LINE);
+        while (t.hasMoreElements()) {
+            String ele = (String) t.nextElement();
+            boolean add = true;
+            if (ele.equals("-launcher")) {
+                if (ret.indexOf(ele) > 0) {
+                    // dump value of launcher
+                    t.nextElement();
+                    add = false;
+                }
+            } else if (ele.equals(EclipseCommandLine.CMD_VMARGS)) {
+                add = false;
+                break;
+            }
+
+            if (add) {
+                ret.append(ele);
+                ret.append(EclipseCommandLine.NEW_LINE);
+            }
+
+        }
+        
+        return ret;
+
     }
 }

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

@@ -63,16 +63,16 @@ EventUtil.typeNull=NULL
 EventUtil.UnknowDetail=\u30A4\u30D9\u30F3\u30C8\u8A73\u7D30\u306E\u4E0D\u660E\u306A???\u5024:
 EventUtil.UnknowType=\u30A4\u30D9\u30F3\u30C8\u30BF\u30A4\u30D7\u306E\u4E0D\u660E\u306A???\u5024:
 EventUtil.verify=\u78BA\u8A8D
-ExceptionHandler.Parameter.BeNull=ex \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306B\u306Fnull\u3092\u8A2D\u5B9A\u51FA\u6765\u307E\u305B\u3093
+ExceptionHandler.Parameter.BeNull=ex \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306B\u306Fnull\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093
 ExceptionMessageDialog.log=\u30ED\u30B0
 ExportPushButton.ExportButton.Tip=\u3059\u3079\u3066\u306E\u884C\u3092XML\u30D5\u30A1\u30A4\u30EB\u306B\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
 ExportPushButtonForExtendedTable.ErrorMsg.Text=\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-ExtendedTableAddCommand.Add.Label=\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30921\u3064\u4EE5\u4E0A\u8FFD\u52A0
-ExtendedTableCopyCommand.Copy.Label=\u5185\u90E8\u30AF\u30EA\u30FC\u30F3\u30DC\u30FC\u30C9\u306B\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30921\u3064\u4EE5\u4E0A\u30B3\u30D4\u30FC
+ExtendedTableAddCommand.Add.Label=\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30FC\u30921\u3064\u4EE5\u4E0A\u8FFD\u52A0
+ExtendedTableCopyCommand.Copy.Label=\u5185\u90E8\u30AF\u30EA\u30FC\u30F3\u30DC\u30FC\u30C9\u306B\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30FC\u30921\u3064\u4EE5\u4E0A\u30B3\u30D4\u30FC
 ExtendedTableModel.ModifiedObject.Error=\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u4F7F\u7528\u3059\u308B\u524D\u306BModifiedBeanListenable\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3092\u8A2D\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-ExtendedTableMoveCommand.MoveLabel=\u8907\u6570\u306E\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u3092\u4E0A\u4E0B\u306B\u79FB\u52D5
+ExtendedTableMoveCommand.MoveLabel=\u8907\u6570\u306E\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u4E0A\u4E0B\u306B\u79FB\u52D5
 ExtendedTablePasteCommand.Paste.Label=\u5185\u90E8\u30AF\u30EA\u30C3\u30D7\u30DC\u30FC\u30C9\u304B\u3089\u30C7\u30FC\u30BF\u3092\u8CBC\u308A\u4ED8\u3051\u308B
-ExtendedTableRemoveCommand.Romve.Label=\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u3092\u524A\u9664
+ExtendedTableRemoveCommand.Romve.Label=\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u524A\u9664
 ExtendedTableResetDBTypesCommand.ResetDBTypes.Label=DB\u30BF\u30A4\u30D7\u3092\u3059\u3079\u3066\u30EA\u30BB\u30C3\u30C8\u3057\u3066\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u53D6\u5F97
 ExtendedTableCaseCommand.case.Label=\u9078\u629E\u3055\u308C\u305FDB\u30AB\u30E9\u30E0\u3092\u5927\u6587\u5B57/\u5C0F\u6587\u5B57\u306B\u5909\u66F4
 ExtendedTableQuoteCommand.Quote.Label=\u9078\u629E\u3055\u308C\u305FDB\u30AB\u30E9\u30E0\u3092\u56F2\u3080

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

@@ -285,30 +285,6 @@
                 type="INFORMIX">
           </DBType>
        </RepositoryComponent>
-       <RepositoryComponent
-             name="INGRES"
-             withSchema="true"
-             input="tIngresInput"
-             output="tIngresOutput">
-          <Item
-                clazz="org.talend.core.model.properties.DatabaseConnectionItem">
-          </Item>
-          <DBType
-                type="INGRES">
-          </DBType>
-       </RepositoryComponent>
-       <RepositoryComponent
-             name="INTERBASE"
-             withSchema="true"
-             input="tInterbaseInput"
-             output="tInterbaseOutput">
-          <Item
-                clazz="org.talend.core.model.properties.DatabaseConnectionItem">
-          </Item>
-          <DBType
-                type="INTERBASE">
-          </DBType>
-       </RepositoryComponent>
        <RepositoryComponent
              name="JAVADB"
              withSchema="true"
@@ -420,18 +396,6 @@
                 type="ORACLESN">
           </DBType>
        </RepositoryComponent>
-       <RepositoryComponent
-             name="PARACCEL"
-             withSchema="true"
-             input="tParAccelInput"
-             output="tParAccelOutput">
-          <Item
-                clazz="org.talend.core.model.properties.DatabaseConnectionItem">
-          </Item>
-          <DBType
-                type="PARACCEL">
-          </DBType>
-       </RepositoryComponent>
        <RepositoryComponent
              name="PLUSPSQL"
              withSchema="true"
@@ -530,18 +494,6 @@
                 type="TERADATA">
           </DBType>
        </RepositoryComponent>
-       <RepositoryComponent
-             name="VECTORWISE"
-             withSchema="true"
-             input="tVectorWiseInput"
-             output="tVectorWiseOutput">
-          <Item
-                clazz="org.talend.core.model.properties.DatabaseConnectionItem">
-          </Item>
-          <DBType
-                type="VECTORWISE">
-          </DBType>
-       </RepositoryComponent>
        <RepositoryComponent
              name="VERTICA"
              withSchema="true"

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

@@ -72,7 +72,7 @@ PropertiesWizardPage.Version.Major=M
 PropertiesWizardPage.Version.Minor=m
 PropertiesWizardPage.ImageSizeError=S\u00E9lectionnez une image de taille 32*32.
 EAuthenticationMethod.anonymousAuth=Authentification anonyme
-EAuthenticationMethod.simpleAuth=Authentification simple
+EAuthenticationMethod.simpleAuth=Authentification basique
 AdvancedSocketFactory.failedInitial=Erreur : impossible d'initialiser :
 LDAPCATruster.failedCreateCert=Impossible de cr\u00E9er le stockage du certificat
 LDAPCATruster.failedCreateTmp=Impossible de cr\u00E9er le

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

@@ -75,10 +75,10 @@ EAuthenticationMethod.anonymousAuth=\u533F\u540D\u8A8D\u8A3C
 EAuthenticationMethod.simpleAuth=\u5358\u7D14\u306A\u8A8D\u8A3C
 AdvancedSocketFactory.failedInitial=\u30A8\u30E9\u30FC : \u521D\u671F\u5316\u306B\u5931\u6557\u3057\u307E\u3057\u305F :
 LDAPCATruster.failedCreateCert=\u8A3C\u660E\u66F8\u30B9\u30C8\u30A2\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
-LDAPCATruster.failedCreateTmp=tmp\u4FE1\u983C\u30B9\u30C8\u30A2\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
+LDAPCATruster.failedCreateTmp=\u4E00\u6642\u30C8\u30E9\u30B9\u30C8\u30B9\u30C8\u30A2\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
 LDAPCATruster.failedInitialTrust=\u521D\u671F\u4FE1\u983C\u30DE\u30CD\u30FC\u30B8\u30E3\u30FC\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
 LDAPCATruster.failedLoadCert=\u8A3C\u660E\u66F8\u30B9\u30C8\u30A2\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-LDAPCATruster.failedSaveTrust=\u4FE1\u983C\u30B9\u30C8\u30A2\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
+LDAPCATruster.failedSaveTrust=\u30C8\u30E9\u30B9\u30C8\u30B9\u30C8\u30A2\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
 LDAPCATruster.locationInvalid=\u8A3C\u660E\u66F8\u30B9\u30C8\u30A2\u30D5\u30A1\u30A4\u30EB\u306E\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3\u304C\u7121\u52B9\u3067\u3059:
 LDAPCATruster.noCertificate=\n\u30AD\u30FC\u30C4\u30FC\u30EB\u30B3\u30DE\u30F3\u30C9\u3092\u4F7F\u3063\u3066\u3001\u30B5\u30FC\u30D0\u30FC\u8A3C\u660E\u66F8\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 LDAPCATruster.sslError1=SSL\u30A8\u30E9\u30FC\uFF1A\u30B5\u30FC\u30D0\u30FC\u8A3C\u660E\u66F8\u3092\u691C\u8A3C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002

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

@@ -59,6 +59,8 @@ 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;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
@@ -133,6 +135,8 @@ import org.talend.core.model.repository.RepositoryContentManager;
 import org.talend.core.model.repository.RepositoryObject;
 import org.talend.core.model.repository.RepositoryViewObject;
 import org.talend.core.model.routines.CodesJarInfo;
+import org.talend.core.model.routines.RoutinesUtil;
+import org.talend.core.model.utils.RepositoryManagerHelper;
 import org.talend.core.repository.CoreRepositoryPlugin;
 import org.talend.core.repository.constants.Constant;
 import org.talend.core.repository.constants.FileConstants;
@@ -163,6 +167,7 @@ import org.talend.repository.RepositoryWorkUnit;
 import org.talend.repository.documentation.ERepositoryActionName;
 import org.talend.repository.model.IProxyRepositoryFactory;
 import org.talend.repository.model.RepositoryConstants;
+import org.talend.repository.ui.views.IRepositoryView;
 import org.talend.utils.io.FilesUtils;
 
 import orgomg.cwm.objectmodel.core.ModelElement;
@@ -2495,8 +2500,8 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
 
             };
             job.setUser(false);
-            job.setPriority(Job.LONG);
             job.schedule();
+            RoutinesUtil.setSyncCodesjob(job);
         }
     }
 
@@ -2566,6 +2571,21 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 root.setEnableDisposed(true);
                 root.dispose();
             }
+            
+            /*Dispose the tree nodes after log off project*/
+            Display.getDefault().syncExec(new Runnable() {
+
+                @Override
+                public void run() {
+                    IRepositoryView repositoryView = RepositoryManagerHelper.findRepositoryView();
+                    if (repositoryView instanceof CommonNavigator) {
+                        ProjectRepositoryNode.getInstance().cleanup();
+                        CommonViewer commonViewer = ((CommonNavigator) repositoryView).getCommonViewer();
+                        Object input = commonViewer.getInput();
+                        commonViewer.setInput(input);
+                    }
+                }
+            });
         }
         IRunProcessService runProcessService = getRunProcessService();
         if (runProcessService != null) {

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/recyclebin/RecycleBinManager.java

@@ -108,46 +108,48 @@ public class RecycleBinManager {
     }
 
     public List<IRepositoryViewObject> getDeletedObjects(Project project) {
-        loadRecycleBin(project.getEmfProject(), true);
         List<IRepositoryViewObject> deletedObjects = new ArrayList<IRepositoryViewObject>();
-        final EList<TalendItem> deletedItems = projectRecyclebins.get(project.getTechnicalLabel()).getDeletedItems();
-        List<TalendItem> notDeletedItems = new ArrayList<TalendItem>();
-        List<TalendItem> dup_deletedItems = new ArrayList<>(deletedItems);
-        for (TalendItem deletedItem : dup_deletedItems) {
-            try {
-                final ERepositoryObjectType type = ERepositoryObjectType.getType(deletedItem.getType());
-                // ignore the generated doc in recycle bin
-                if (type != null && (type.equals(ERepositoryObjectType.JOB_DOC) || type.equals(ERepositoryObjectType.JOBLET_DOC)
-                        || type.equals(ERepositoryObjectType.valueOf("ROUTE_DOC")))) { //$NON-NLS-1$
-                    continue;
-                }
-                IRepositoryViewObject object = ProxyRepositoryFactory.getInstance().getLastVersion(project, deletedItem.getId(),
-                        deletedItem.getPath(), type);
-                if (object == null) {
-                    object = ProxyRepositoryFactory.getInstance().getLastVersion(project, deletedItem.getId());
-                }
-                if (object != null) {
-                    Item item = object.getProperty().getItem();
-                    boolean hasSubItem = false;
-                    if (item instanceof ConnectionItem) {
-                        hasSubItem = ProjectRepositoryNode.getInstance().hasDeletedSubItem((ConnectionItem) item);
+        if (project != null) {
+            loadRecycleBin(project.getEmfProject(), true);
+            final EList<TalendItem> deletedItems = projectRecyclebins.get(project.getTechnicalLabel()).getDeletedItems();
+            List<TalendItem> notDeletedItems = new ArrayList<TalendItem>();
+            List<TalendItem> dup_deletedItems = new ArrayList<>(deletedItems);
+            for (TalendItem deletedItem : dup_deletedItems) {
+                try {
+                    final ERepositoryObjectType type = ERepositoryObjectType.getType(deletedItem.getType());
+                    // ignore the generated doc in recycle bin
+                    if (type != null && (type.equals(ERepositoryObjectType.JOB_DOC) || type.equals(ERepositoryObjectType.JOBLET_DOC)
+                            || type.equals(ERepositoryObjectType.valueOf("ROUTE_DOC")))) { //$NON-NLS-1$
+                        continue;
                     }
-                    if (object.isDeleted() || hasSubItem) {
-                        deletedObjects.add(object);
+                    IRepositoryViewObject object = ProxyRepositoryFactory.getInstance().getLastVersion(project, deletedItem.getId(),
+                            deletedItem.getPath(), type);
+                    if (object == null) {
+                        object = ProxyRepositoryFactory.getInstance().getLastVersion(project, deletedItem.getId());
+                    }
+                    if (object != null) {
+                        Item item = object.getProperty().getItem();
+                        boolean hasSubItem = false;
+                        if (item instanceof ConnectionItem) {
+                            hasSubItem = ProjectRepositoryNode.getInstance().hasDeletedSubItem((ConnectionItem) item);
+                        }
+                        if (object.isDeleted() || hasSubItem) {
+                            deletedObjects.add(object);
+                        } else {
+                            // need remove it.
+                            notDeletedItems.add(deletedItem);
+                        }
                     } else {
                         // need remove it.
                         notDeletedItems.add(deletedItem);
                     }
-                } else {
-                    // need remove it.
-                    notDeletedItems.add(deletedItem);
+                } catch (PersistenceException e) {
+                    ExceptionHandler.process(e);
                 }
-            } catch (PersistenceException e) {
-                ExceptionHandler.process(e);
             }
-        }
-        // clean
-        deletedItems.removeAll(notDeletedItems);
+            // clean
+            deletedItems.removeAll(notDeletedItems);
+        }       
         return deletedObjects;
     }
 

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/services/IGitInfoService.java

@@ -15,6 +15,7 @@ package org.talend.core.repository.services;
 import java.util.Map;
 
 import org.eclipse.core.runtime.IPath;
+import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
 import org.talend.core.model.general.Project;
 import org.talend.core.model.properties.Property;
@@ -50,5 +51,13 @@ public interface IGitInfoService extends IService {
      */
     public Map<String, String> getGitInfo(Property property) throws Exception;
 
+    public boolean isPushedToRemote(Property property) throws Exception;
+
+    public static IGitInfoService get() {
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(IGitInfoService.class)) {
+            return GlobalServiceRegister.getDefault().getService(IGitInfoService.class);
+        }
+        return null;
+    }
 
 }

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/ui/view/RepositoryLabelProvider.java

@@ -525,9 +525,6 @@ public class RepositoryLabelProvider extends LabelProvider implements IColorProv
         RepositoryNode node = (RepositoryNode) element;
         switch (node.getType()) {
         case STABLE_SYSTEM_FOLDER:
-            if (node.getLabel().equals(ERepositoryObjectType.SNIPPETS.toString())) {
-                return JFaceResources.getFontRegistry().defaultFont();
-            }
         case SYSTEM_FOLDER:
             return JFaceResources.getFontRegistry().getBold(JFaceResources.DEFAULT_FONT);
         default:

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

@@ -14,10 +14,13 @@ package org.talend.core.repository.utils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 
 import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.ui.internal.navigator.NavigatorContentServiceContentProvider;
+import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.runtime.service.ITaCoKitService;
 import org.talend.commons.ui.runtime.image.ECoreImage;
 import org.talend.core.model.metadata.builder.connection.Connection;
 import org.talend.core.model.metadata.builder.connection.MetadataColumn;
@@ -139,4 +142,17 @@ public class RepositoryNodeManager {
         return new Object[0];
     }
 
+    public static boolean isTacokit(ERepositoryObjectType repoType) {
+        if (repoType == null) {
+            return false;
+        }
+        boolean isTacokit = false;
+        try {
+            isTacokit = Optional.ofNullable(ITaCoKitService.getInstance()).map(s -> s.isTaCoKitType(repoType)).orElse(false);
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+        return isTacokit;
+    }
+
 }

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

@@ -51,6 +51,7 @@ Export-Package: org.talend.analysistask,
  org.talend.core.model.utils,
  org.talend.core.model.xml,
  org.talend.core.nexus,
+ org.talend.core.pendo,
  org.talend.core.prefs,
  org.talend.core.repository,
  org.talend.core.runtime,

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

@@ -1,280 +1,304 @@
-<?xml version="1.0"?>
-<mapping>
-	<dbms product="AMAZON_AURORA" id="amazon_aurora_id" label="Mapping AMAZON_AURORA"
-		default="true">
-		<dbTypes>
-			<dbType type="BIGINT" ignorePre="true"/>
-			<dbType type="BIGINT UNSIGNED" ignoreLen="true" ignorePre="true" />
-			<dbType type="BINARY" ignorePre="true"/>
-			<dbType type="BIT" ignorePre="true" />
-			<dbType type="BLOB" ignoreLen="true" ignorePre="true" />
-			<dbType type="CHAR" defaultLength="200" ignorePre="true"/>
-			<dbType type="DATE" ignoreLen="true" ignorePre="true" />
-			<dbType type="DATETIME" ignoreLen="true" ignorePre="true" />
-			<dbType type="DECIMAL" defaultLength="20" defaultPrecision="10" preBeforelen="false"/>
-			<dbType type="DOUBLE" defaultLength="20" defaultPrecision="10"/>
-			<dbType type="DOUBLE UNSIGNED" ignoreLen="true" ignorePre="true" />
-			<dbType type="ENUM" ignoreLen="true" ignorePre="true" />
-			<dbType type="FLOAT" defaultPrecision="2"/>
-			<dbType type="FLOAT UNSIGNED" ignoreLen="true" ignorePre="true" />
-			<dbType type="GEOMETRY" ignoreLen="true" ignorePre="true" />
-			<dbType type="GEOMETRYCOLLECTION" ignoreLen="true" ignorePre="true" />
-			<dbType type="INT" ignorePre="true" />
-			<dbType type="INT UNSIGNED" ignoreLen="true" ignorePre="true" />
-			<dbType type="LINESTRING" ignoreLen="true" ignorePre="true" />
-			<dbType type="LONGTEXT" ignoreLen="true" ignorePre="true" />
-			<dbType type="LONGBLOB" ignoreLen="true" ignorePre="true"/>
-			<dbType type="MEDIUMBLOB" ignoreLen="true" ignorePre="true" />
-			<dbType type="MEDIUMINT" ignorePre="true" />
-			<dbType type="MEDIUMINT UNSIGNED" ignoreLen="true" ignorePre="true" />
-			<dbType type="MEDIUMTEXT" ignoreLen="true" ignorePre="true" />
-			<dbType type="MULTILINESTRING" ignoreLen="true" ignorePre="true" />
-			<dbType type="MULTIPOINT" ignoreLen="true" ignorePre="true" />
-			<dbType type="MULTIPOLYGON" ignoreLen="true" ignorePre="true" />
-			<dbType type="POINT" ignoreLen="true" ignorePre="true" />
-			<dbType type="POLYGON" ignoreLen="true" ignorePre="true" />
-			<dbType type="SMALLINT" ignorePre="true" />
-			<dbType type="SMALLINT UNSIGNED" ignoreLen="true" ignorePre="true" />
-			<dbType type="SET" ignoreLen="true" ignorePre="true" />
-			<dbType type="TEXT" ignoreLen="true" ignorePre="true" />
-			<dbType type="TIME" ignoreLen="true" ignorePre="true" />
-			<dbType type="TIMESTAMP" ignoreLen="true" ignorePre="true" />
-			<dbType type="TINYBLOB" ignoreLen="true" ignorePre="true" />
-			<dbType type="TINYINT" ignorePre="true" />
-			<dbType type="TINYINT UNSIGNED" ignoreLen="true" ignorePre="true" />
-			<dbType type="TINYTEXT" ignoreLen="true" ignorePre="true" />
-			<dbType type="VARBINARY" ignorePre="true" />
-			<dbType type="VARCHAR" default="true" defaultLength="100" ignorePre="true"/>
-			<dbType type="YEAR" ignorePre="true"/>
-		</dbTypes>
-
-		<language name="java">
-			<talendToDbTypes><!-- Adviced mappings  -->
-				<talendType type="id_List"/>
-				<talendType type="id_Boolean">	
-					<dbType type="BIT" default="true" />				
-				</talendType>
-				<talendType type="id_Byte">
-					<dbType type="TINYINT" default="true" />
-					<dbType type="BIGINT" />
-					<dbType type="INT" />
-					<dbType type="MEDIUMINT" />
-					<dbType type="SMALLINT" />				
-				</talendType>
-				<talendType type="id_byte[]">
-				</talendType>
-				<talendType type="id_Character">
-					<dbType type="CHAR" default="true" />
-					<dbType type="VARCHAR"/>
-				</talendType>
-				<talendType type="id_Date">
-					<dbType type="DATE" />
-					<dbType type="DATETIME" default="true" />	
-					<dbType type="TIME" />
-					<dbType type="YEAR" />
-					<dbType type="TIMESTAMP" />				
-				</talendType>
-				<talendType type="id_BigDecimal">
-					<dbType type="DECIMAL" default="true" />
-					<dbType type="FLOAT"/>
-					<dbType type="DOUBLE" />				
-				</talendType>
-				<talendType type="id_Double">
-					<dbType type="DOUBLE" default="true" />
-					<dbType type="FLOAT"/>
-					<dbType type="DECIMAL" />				
-				</talendType>
-				<talendType type="id_Float">
-					<dbType type="FLOAT" default="true" />
-					<dbType type="DOUBLE"/>
-					<dbType type="DECIMAL" />
-				</talendType>
-				<talendType type="id_Integer">
-					<dbType type="INT" default="true" />
-					<dbType type="BIGINT" />
-				</talendType>
-				<talendType type="id_Long">
-					<dbType type="BIGINT" default="true" />		
-				</talendType>
-				<talendType type="id_Object">
-					<dbType type="BLOB" default="true"/>
-					<dbType type="ENUM" />
-					<dbType type="GEOMETRY" />
-					<dbType type="GEOMETRYCOLLECTION" />
-					<dbType type="MEDIUMINT" />
-					<dbType type="LONGBLOB" />
-					<dbType type="MEDIUMBLOB" />
-					<dbType type="MULTIPOINT" />
-					<dbType type="MULTIPOLYGON" />
-					<dbType type="POINT" />
-					<dbType type="POLYGON" />
-					<dbType type="SET" />
-					<dbType type="TINYBLOB" />
-				</talendType>
-				<talendType type="id_Short">
-					<dbType type="SMALLINT" default="true" />
-					<dbType type="INT" />
-					<dbType type="BIGINT"/>
-					<dbType type="MEDIUMINT" />
-				</talendType>
-				<talendType type="id_String">
-					<dbType type="VARCHAR" default="true" />
-					<dbType type="LINESTRING" />
-					<dbType type="LONGTEXT"/>
-					<dbType type="MEDIUMTEXT" />
-					<dbType type="MULTILINESTRING" />		
-					<dbType type="TEXT" />
-					<dbType type="TINYTEXT" />
-				</talendType>
-			</talendToDbTypes>
-			<dbToTalendTypes>
-				<dbType type="BIGINT">
-					<talendType type="id_Long" default="true" />
-				</dbType>
-				<dbType type="BINARY">
-					<talendType type="id_Boolean" default="true" />
-				</dbType>
-				<dbType type="BIT">
-					<talendType type="id_Boolean" default="true" />
-				</dbType>
-				<dbType type="BLOB">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="CHAR">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="DATE">
-					<talendType type="id_Date" default="true" />
-				</dbType>
-				<dbType type="DATETIME">
-					<talendType type="id_Date" default="true" />
-				</dbType>
-				<dbType type="DECIMAL">
-					<talendType type="id_Float"/>
-					<talendType type="id_Double"/>
-					<talendType type="id_BigDecimal" default="true"/>
-				</dbType>
-				<dbType type="DOUBLE">
-					<talendType type="id_Double" default="true" />
-					<talendType type="id_BigDecimal"/>
-				</dbType>
-				<dbType type="ENUM">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="FLOAT">
-					<talendType type="id_Float" default="true" />
-					<talendType type="id_Double"/>
-					<talendType type="id_BigDecimal"/>
-				</dbType>
-				<dbType type="GEOMETRY">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="GEOMETRYCOLLECTION">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="INT">
-					<talendType type="id_Integer" default="true" />
-					<talendType type="id_Long"/>
-				</dbType>
-				<dbType type="LINESTRING">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="LONGTEXT">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="LONGBLOB">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="MEDIUMBLOB">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="MEDIUMINT">
-					<talendType type="id_Integer" default="true" />
-					<talendType type="id_Long"/>
-				</dbType>
-				<dbType type="MEDIUMTEXT">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="MULTILINESTRING">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="MULTIPOINT">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="MULTIPOLYGON">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="POINT">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="POLYGON">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="SMALLINT">
-					<talendType type="id_Short" default="true" />
-					<talendType type="id_Long"/>
-					<talendType type="id_Integer"/>
-				</dbType>
-				<dbType type="SET">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="TEXT">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="TIME">
-					<talendType type="id_Date" default="true" />
-				</dbType>
-				<dbType type="TIMESTAMP">
-					<talendType type="id_Date" default="true" />
-				</dbType>
-				<dbType type="TINYBLOB">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="TINYINT">
-					<talendType type="id_Byte" default="true" />
-					<talendType type="id_Integer"/>
-					<talendType type="id_Long"/>
-					<talendType type="id_Short"/>
-				</dbType>
-				<dbType type="TINYTEXT">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="VARBINARY">
-				</dbType>
-				<dbType type="VARCHAR">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="YEAR">
-					<talendType type="id_Date" default="true" />
-				</dbType>		
-				<dbType type="BIGINT UNSIGNED" >
-				</dbType>
-				<dbType type="DOUBLE UNSIGNED" >		
-					<talendType type="id_Double" default="true" />
-					<talendType type="id_BigDecimal"/>
-				</dbType>
-				<dbType type="FLOAT UNSIGNED" >
-					<talendType type="id_Double" default="true" />
-					<talendType type="id_BigDecimal"/>
-				</dbType>
-				<dbType type="INT UNSIGNED" >
-					<talendType type="id_Long" default="true" />
-				</dbType>
-				<dbType type="MEDIUMINT UNSIGNED" >
-					<talendType type="id_Integer" default="true" />
-					<talendType type="id_Long" />
-				</dbType>
-				<dbType type="SMALLINT UNSIGNED" >
-					<talendType type="id_Integer" default="true" />
-					<talendType type="id_Long" />
-				</dbType>
-				<dbType type="TINYINT UNSIGNED" >
-					<talendType type="id_Short" default="true" />
-					<talendType type="id_Integer" />
-					<talendType type="id_Long" />
-				</dbType>
-			</dbToTalendTypes>
-		</language>
-	</dbms>
-
-</mapping>
+<?xml version="1.0"?>
+<mapping>
+	<dbms product="AMAZON_AURORA" id="amazon_aurora_id" label="Mapping AMAZON_AURORA"
+		default="true">
+		<dbTypes>
+			<dbType type="BIGINT" ignorePre="true"/>
+			<dbType type="BIGINT UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="BINARY" ignorePre="true"/>
+			<dbType type="BIT" ignorePre="true" />
+			<dbType type="BLOB" ignoreLen="true" ignorePre="true" />
+			<dbType type="CHAR" defaultLength="200" ignorePre="true"/>
+			<dbType type="DATE" ignoreLen="true" ignorePre="true" />
+			<dbType type="DATETIME" ignoreLen="true" ignorePre="true" />
+			<dbType type="DECIMAL" defaultLength="20" defaultPrecision="10" preBeforelen="false"/>
+			<dbType type="DOUBLE" defaultLength="20" defaultPrecision="10"/>
+			<dbType type="DOUBLE UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="ENUM" ignoreLen="true" ignorePre="true" />
+			<dbType type="FLOAT" defaultPrecision="2"/>
+			<dbType type="FLOAT UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="GEOMETRY" ignoreLen="true" ignorePre="true" />
+			<dbType type="GEOMETRYCOLLECTION" ignoreLen="true" ignorePre="true" />
+			<dbType type="INT" ignorePre="true" />
+			<dbType type="INT UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="INTEGER" ignorePre="true" />
+			<dbType type="INTEGER UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="LINESTRING" ignoreLen="true" ignorePre="true" />
+			<dbType type="LONGTEXT" ignoreLen="true" ignorePre="true" />
+			<dbType type="LONGBLOB" ignoreLen="true" ignorePre="true"/>
+			<dbType type="MEDIUMBLOB" ignoreLen="true" ignorePre="true" />
+			<dbType type="MEDIUMINT" ignorePre="true" />
+			<dbType type="MEDIUMINT UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="MEDIUMTEXT" ignoreLen="true" ignorePre="true" />
+			<dbType type="MULTILINESTRING" ignoreLen="true" ignorePre="true" />
+			<dbType type="MULTIPOINT" ignoreLen="true" ignorePre="true" />
+			<dbType type="MULTIPOLYGON" ignoreLen="true" ignorePre="true" />
+			<dbType type="POINT" ignoreLen="true" ignorePre="true" />
+			<dbType type="POLYGON" ignoreLen="true" ignorePre="true" />
+			<dbType type="SMALLINT" ignorePre="true" />
+			<dbType type="SMALLINT UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="SET" ignoreLen="true" ignorePre="true" />
+			<dbType type="TEXT" ignoreLen="true" ignorePre="true" />
+			<dbType type="TIME" ignoreLen="true" ignorePre="true" />
+			<dbType type="TIMESTAMP" ignoreLen="true" ignorePre="false" />
+			<dbType type="TINYBLOB" ignoreLen="true" ignorePre="true" />
+			<dbType type="TINYINT" ignorePre="true" />
+			<dbType type="TINYINT UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="TINYTEXT" ignoreLen="true" ignorePre="true" />
+			<dbType type="VARBINARY" ignorePre="true" />
+			<dbType type="VARCHAR" default="true" defaultLength="100" ignorePre="true"/>
+			<dbType type="YEAR" ignorePre="true"/>
+		</dbTypes>
+
+		<language name="java">
+			<talendToDbTypes><!-- Adviced mappings  -->
+				<talendType type="id_List"/>
+				<talendType type="id_Boolean">	
+					<dbType type="BIT" default="true" />				
+				</talendType>
+				<talendType type="id_Byte">
+					<dbType type="TINYINT" default="true" />
+					<dbType type="BIGINT" />
+					<dbType type="INT" />
+					<dbType type="MEDIUMINT" />
+					<dbType type="SMALLINT" />				
+				</talendType>
+				<talendType type="id_byte[]">
+				    <dbType type="VARBINARY" default="true" />
+				    <dbType type="BINARY" />
+				    <dbType type="BIT" />
+				    <dbType type="BLOB" />
+				    <dbType type="LONGBLOB" />
+				    <dbType type="MEDIUMBLOB" />
+				    <dbType type="TINYBLOB" />
+				</talendType>
+				<talendType type="id_Character">
+					<dbType type="CHAR" default="true" />
+					<dbType type="VARCHAR"/>
+				</talendType>
+				<talendType type="id_Date">
+					<dbType type="DATE" />
+					<dbType type="DATETIME" default="true" />	
+					<dbType type="TIME" />
+					<dbType type="YEAR" />
+					<dbType type="TIMESTAMP" />				
+				</talendType>
+				<talendType type="id_BigDecimal">
+					<dbType type="DECIMAL" default="true" />
+					<dbType type="FLOAT"/>
+					<dbType type="DOUBLE" />				
+				</talendType>
+				<talendType type="id_Double">
+					<dbType type="DOUBLE" default="true" />
+					<dbType type="FLOAT"/>
+					<dbType type="DECIMAL" />				
+				</talendType>
+				<talendType type="id_Float">
+					<dbType type="FLOAT" default="true" />
+					<dbType type="DOUBLE"/>
+					<dbType type="DECIMAL" />
+				</talendType>
+				<talendType type="id_Integer">
+					<dbType type="INT" default="true" />
+					<dbType type="BIGINT" />
+				</talendType>
+				<talendType type="id_Long">
+					<dbType type="BIGINT" default="true" />		
+				</talendType>
+				<talendType type="id_Object">
+					<dbType type="BLOB" default="true"/>
+					<dbType type="ENUM" />
+					<dbType type="GEOMETRY" />
+					<dbType type="GEOMETRYCOLLECTION" />
+					<dbType type="MEDIUMINT" />
+					<dbType type="LONGBLOB" />
+					<dbType type="MEDIUMBLOB" />
+					<dbType type="MULTIPOINT" />
+					<dbType type="MULTIPOLYGON" />
+					<dbType type="POINT" />
+					<dbType type="POLYGON" />
+					<dbType type="SET" />
+					<dbType type="TINYBLOB" />
+				</talendType>
+				<talendType type="id_Short">
+					<dbType type="SMALLINT" default="true" />
+					<dbType type="INT" />
+					<dbType type="BIGINT"/>
+					<dbType type="MEDIUMINT" />
+				</talendType>
+				<talendType type="id_String">
+					<dbType type="VARCHAR" default="true" />
+					<dbType type="LINESTRING" />
+					<dbType type="LONGTEXT"/>
+					<dbType type="MEDIUMTEXT" />
+					<dbType type="MULTILINESTRING" />		
+					<dbType type="TEXT" />
+					<dbType type="TINYTEXT" />
+					<dbType type="CHAR" />
+				</talendType>
+			</talendToDbTypes>
+			<dbToTalendTypes>
+				<dbType type="BIGINT">
+					<talendType type="id_Long" default="true" />
+				</dbType>
+				<dbType type="BINARY">
+					<talendType type="id_byte[]" />
+					<talendType type="id_Boolean" default="true" />
+				</dbType>
+				<dbType type="BIT">
+					<talendType type="id_byte[]" />
+					<talendType type="id_Boolean" default="true" />
+				</dbType>
+				<dbType type="BLOB">
+					<talendType type="id_byte[]" default="true" />
+					<talendType type="id_Object" />
+				</dbType>
+				<dbType type="CHAR">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="DATE">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="DATETIME">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="DECIMAL">
+					<talendType type="id_Float"/>
+					<talendType type="id_Double"/>
+					<talendType type="id_BigDecimal" default="true"/>
+				</dbType>
+				<dbType type="DOUBLE">
+					<talendType type="id_Double" default="true" />
+					<talendType type="id_BigDecimal"/>
+				</dbType>
+				<dbType type="ENUM">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="FLOAT">
+					<talendType type="id_Float" default="true" />
+					<talendType type="id_Double"/>
+					<talendType type="id_BigDecimal"/>
+				</dbType>
+				<dbType type="GEOMETRY">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="GEOMETRYCOLLECTION">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="INT">
+					<talendType type="id_Integer" default="true" />
+					<talendType type="id_Long"/>
+				</dbType>
+				<dbType type="INTEGER">
+					<talendType type="id_Integer" default="true" />
+					<talendType type="id_Long"/>
+				</dbType>
+				<dbType type="LINESTRING">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="LONGTEXT">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="LONGBLOB">
+					<talendType type="id_byte[]" default="true" />
+					<talendType type="id_Object" />
+				</dbType>
+				<dbType type="MEDIUMBLOB">
+					<talendType type="id_byte[]" default="true" />
+					<talendType type="id_Object" />
+				</dbType>
+				<dbType type="MEDIUMINT">
+					<talendType type="id_Integer" default="true" />
+					<talendType type="id_Long"/>
+				</dbType>
+				<dbType type="MEDIUMTEXT">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="MULTILINESTRING">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="MULTIPOINT">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="MULTIPOLYGON">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="POINT">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="POLYGON">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="SMALLINT">
+					<talendType type="id_Short" default="true" />
+					<talendType type="id_Long"/>
+					<talendType type="id_Integer"/>
+				</dbType>
+				<dbType type="SET">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="TEXT">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="TIME">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="TIMESTAMP">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="TINYBLOB">
+					<talendType type="id_byte[]" default="true" />
+					<talendType type="id_Object" />
+				</dbType>
+				<dbType type="TINYINT">
+					<talendType type="id_Byte" default="true" />
+					<talendType type="id_Integer"/>
+					<talendType type="id_Long"/>
+					<talendType type="id_Short"/>
+				</dbType>
+				<dbType type="TINYTEXT">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="VARBINARY">
+				    <talendType type="id_byte[]" default="true" />
+				</dbType>
+				<dbType type="VARCHAR">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="YEAR">
+					<talendType type="id_Date" default="true" />
+				</dbType>		
+				<dbType type="BIGINT UNSIGNED" >
+				</dbType>
+				<dbType type="DOUBLE UNSIGNED" >		
+					<talendType type="id_Double" default="true" />
+					<talendType type="id_BigDecimal"/>
+				</dbType>
+				<dbType type="FLOAT UNSIGNED" >
+					<talendType type="id_Double" default="true" />
+					<talendType type="id_BigDecimal"/>
+				</dbType>
+				<dbType type="INT UNSIGNED" >
+					<talendType type="id_Long" default="true" />
+				</dbType>
+				<dbType type="INTEGER UNSIGNED" >
+					<talendType type="id_Long" default="true" />
+				</dbType>
+				<dbType type="MEDIUMINT UNSIGNED" >
+					<talendType type="id_Integer" default="true" />
+					<talendType type="id_Long" />
+				</dbType>
+				<dbType type="SMALLINT UNSIGNED" >
+					<talendType type="id_Integer" default="true" />
+					<talendType type="id_Long" />
+				</dbType>
+				<dbType type="TINYINT UNSIGNED" >
+					<talendType type="id_Short" default="true" />
+					<talendType type="id_Integer" />
+					<talendType type="id_Long" />
+				</dbType>
+			</dbToTalendTypes>
+		</language>
+	</dbms>
+
+</mapping>

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

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

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

@@ -1,129 +0,0 @@
-<?xml version="1.0"?>
-<mapping>
-	<dbms product="INTERBASE" id="interbase_id" label="Mapping Interbase"
-		default="true">
-		<dbTypes>
-			<dbType type="BLOB" ignorePre="true" />
-			<dbType type="BOOLEAN" ignoreLen="true" ignorePre="true" />
-			<dbType type="CHAR" defaultLength="50" ignorePre="true"/>
-			<dbType type="DATE" ignoreLen="true" ignorePre="true" />
-			<dbType type="DECIMAL" defaultLength="20" defaultPrecision="10" />
-			<dbType type="DOUBLE PRECISION" />
-			<dbType type="FLOAT" ignoreLen="true" ignorePre="true" />
-			<dbType type="INTEGER" ignoreLen="true" ignorePre="true" />
-			<dbType type="NUMERIC" defaultLength="20" defaultPrecision="10" />
-			<dbType type="SMALLINT" ignoreLen="true" ignorePre="true" />
-			<dbType type="TIME" ignoreLen="true" ignorePre="true" />
-			<dbType type="TIMESTAMP" ignoreLen="true" ignorePre="true" />
-			<dbType type="VARCHAR" default="true" defaultLength="200" ignorePre="true"/>
-		</dbTypes>
-
-		<language name="java">
-			<talendToDbTypes>
-				<!-- Adviced mappings  -->
-				<talendType type="id_List"/>
-				<talendType type="id_Boolean">	
-					<dbType type="BOOLEAN" default="true" />				
-				</talendType>
-				<talendType type="id_Byte">				
-				</talendType>
-				<talendType type="id_byte[]">
-				</talendType>
-				<talendType type="id_Character">
-					<dbType type="CHAR" default="true"/>
-					<dbType type="VARCHAR"/>
-				</talendType>
-				<talendType type="id_Date">
-					<dbType type="DATE" default="true"/>
-					<dbType type="TIME" />
-					<dbType type="TIMESTAMP" />			
-				</talendType>
-				<talendType type="id_BigDecimal">
-					<dbType type="DECIMAL" default="true"/>
-					<dbType type="FLOAT" />
-					<dbType type="DOUBLE PRECISION" />
-					<dbType type="NUMERIC" />				
-				</talendType>
-				<talendType type="id_Double">
-					<dbType type="DOUBLE PRECISION" default="true"/>
-					<dbType type="FLOAT" />
-					<dbType type="DECIMAL" />
-					<dbType type="NUMERIC" />				
-				</talendType>
-				<talendType type="id_Float">
-					<dbType type="FLOAT" default="true"/>
-					<dbType type="DOUBLE PRECISION" />
-					<dbType type="DECIMAL" />
-					<dbType type="NUMERIC" />
-				</talendType>
-				<talendType type="id_Integer">
-					<dbType type="INTEGER" default="true"/>
-				</talendType>
-				<talendType type="id_Long">
-					<dbType type="INTEGER" default="true"/>	
-				</talendType>
-				<talendType type="id_Object">
-					<dbType type="BLOB" default="true"/>
-				</talendType>
-				<talendType type="id_Short">
-					<dbType type="SMALLINT" default="true"/>
-				</talendType>
-				<talendType type="id_String">
-					<dbType type="VARCHAR" default="true"/>
-					<dbType type="CHAR"/>	
-				</talendType>
-			</talendToDbTypes>
-			<dbToTalendTypes>
-				<dbType type="BLOB">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="BOOLEAN">
-					<talendType type="id_Boolean" default="true" />
-				</dbType>
-				<dbType type="CHAR">
-					<talendType type="id_String" default="true" />
-					<talendType type="id_Character"/>
-				</dbType>
-				<dbType type="DATE">
-					<talendType type="id_Date" default="true" />
-				</dbType>
-				<dbType type="DECIMAL">
-					<talendType type="id_Double"/>
-					<talendType type="id_BigDecimal" default="true"/>
-					<talendType type="id_Float"/>
-				</dbType>
-				<dbType type="DOUBLE PRECISION">
-					<talendType type="id_Double" default="true" />
-					<talendType type="id_BigDecimal"/>
-					<talendType type="id_Float"/>
-				</dbType>
-				<dbType type="FLOAT">
-					<talendType type="id_Float" default="true" />
-					<talendType type="id_BigDecimal"/>
-					<talendType type="id_Double"/>
-				</dbType>
-				<dbType type="INTEGER">
-					<talendType type="id_Integer" default="true" />
-				</dbType>
-				<dbType type="NUMERIC">
-					<talendType type="id_Double"/>
-					<talendType type="id_BigDecimal" default="true"/>
-					<talendType type="id_Float"/>
-				</dbType>
-				<dbType type="SMALLINT">
-					<talendType type="id_Short" default="true" />
-				</dbType>
-				<dbType type="TIME">
-					<talendType type="id_Date" default="true" />
-				</dbType>
-				<dbType type="TIMESTAMP">
-					<talendType type="id_Date" default="true" />
-				</dbType>
-				<dbType type="VARCHAR">
-					<talendType type="id_String" default="true" />
-				</dbType>
-			</dbToTalendTypes>
-		</language>
-	</dbms>
-
-</mapping>

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

@@ -22,7 +22,7 @@
 			<dbType type="INT" ignorePre="true" />
 			<dbType type="INT UNSIGNED" ignoreLen="true" ignorePre="true" />
 			<dbType type="INTEGER" ignorePre="true" />
-            <dbType type="INTEGER UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="INTEGER UNSIGNED" ignoreLen="true" ignorePre="true" />
 			<dbType type="LINESTRING" ignoreLen="true" ignorePre="true" />
 			<dbType type="LONGTEXT" ignoreLen="true" ignorePre="true" />
 			<dbType type="LONGBLOB" ignoreLen="true" ignorePre="true"/>
@@ -190,9 +190,9 @@
 					<talendType type="id_Long"/>
 				</dbType>
 				<dbType type="INTEGER">
-                    <talendType type="id_Integer" default="true" />
-                    <talendType type="id_Long"/>
-                </dbType>
+					<talendType type="id_Integer" default="true" />
+					<talendType type="id_Long"/>
+				</dbType>
 				<dbType type="LINESTRING">
 					<talendType type="id_String" default="true" />
 				</dbType>
@@ -282,8 +282,8 @@
 					<talendType type="id_Long" default="true" />
 				</dbType>
 				<dbType type="INTEGER UNSIGNED" >
-                    <talendType type="id_Long" default="true" />
-                </dbType>
+					<talendType type="id_Long" default="true" />
+				</dbType>
 				<dbType type="MEDIUMINT UNSIGNED" >
 					<talendType type="id_Integer" default="true" />
 					<talendType type="id_Long" />

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

@@ -1,567 +0,0 @@
-<?xml version="1.0"?>
-<mapping>
-	<dbms product="PARACCEL" id="paraccel_id" label="Mapping ParAccel"
-		default="true">
-		<dbTypes>
-			<dbType type="ABSTIME" ignoreLen="true" ignorePre="true" />
-			<dbType type="ACLITEM" ignoreLen="true" ignorePre="true" />
-			<dbType type="BIGSERIAL" ignoreLen="true" ignorePre="true" />
-			<dbType type="BIT" ignorePre="true" />
-			<dbType type="BOOL" ignoreLen="true" ignorePre="true" />
-			<dbType type="BOX" ignoreLen="true" ignorePre="true" />
-			<dbType type="BPCHAR" ignoreLen="true" ignorePre="true" />
-			<dbType type="BYTEA" ignoreLen="true" ignorePre="true" />	
-			<dbType type="CHAR" defaultLength="50" ignorePre="true"/>
-			<dbType type="CID" ignoreLen="true" ignorePre="true" />
-			<dbType type="CIDR" ignoreLen="true" ignorePre="true" />
-			<dbType type="CIRCLE" ignoreLen="true" ignorePre="true" />
-			<dbType type="DATE" ignoreLen="true" ignorePre="true" />
-			<dbType type="FLOAT4" ignoreLen="true" ignorePre="true" />
-			<dbType type="FLOAT8" ignoreLen="true" ignorePre="true" />
-			<dbType type="INET" ignoreLen="true" ignorePre="true" />
-			<dbType type="INT2" ignoreLen="true" ignorePre="true" />
-			<dbType type="INT2VECTOR" ignoreLen="true" ignorePre="true" />
-			<dbType type="INT4" ignoreLen="true" ignorePre="true" />
-			<dbType type="INT8" ignoreLen="true" ignorePre="true" />
-			<dbType type="INTERVAL" ignorePre="true" />
-			<dbType type="LINE" ignoreLen="true" ignorePre="true" />
-			<dbType type="LSEG" ignoreLen="true" ignorePre="true" />
-			<dbType type="MACADDR" ignoreLen="true" ignorePre="true" />
-			<dbType type="MONEY" ignoreLen="true" ignorePre="true" />	
-			<dbType type="NAME" ignoreLen="true" ignorePre="true" />
-			<dbType type="NUMERIC" defaultLength="20" defaultPrecision="10"/>
-			<dbType type="OID" ignoreLen="true" ignorePre="true"  />
-			<dbType type="OIDVECTOR" ignoreLen="true" ignorePre="true" />
-			<dbType type="PATH" ignoreLen="true" ignorePre="true" />
-			<dbType type="POINT" ignoreLen="true" ignorePre="true"  />
-			<dbType type="POLYGON" ignoreLen="true" ignorePre="true"/>
-			<dbType type="REFCURSOR" ignoreLen="true" ignorePre="true" />
-			<dbType type="RELTIME" ignoreLen="true" ignorePre="true" />			
-			<dbType type="REGCLASS" ignoreLen="true" ignorePre="true" />
-			<dbType type="REGOPER" ignoreLen="true" ignorePre="true" />
-			<dbType type="REGOPERATOR" ignoreLen="true" ignorePre="true" />
-			<dbType type="REGPROC" ignoreLen="true" ignorePre="true" />
-			<dbType type="REGPROCEDURE" ignoreLen="true" ignorePre="true" />
-			<dbType type="REGTYPE" ignoreLen="true" ignorePre="true" />
-			<dbType type="SERIAL" ignoreLen="true" ignorePre="true" />
-			<dbType type="SMGR" ignoreLen="true" ignorePre="true" />
-			<dbType type="TEXT" ignoreLen="true" ignorePre="true" />
-			<dbType type="TID" ignoreLen="true" ignorePre="true" />
-			<dbType type="TIME" ignorePre="true" />
-			<dbType type="TINTERVAL" ignoreLen="true" ignorePre="true"  />
-			<dbType type="TIMESTAMPTZ" ignoreLen="true" ignorePre="true"  />
-			<dbType type="TIMESTAMP" ignorePre="true"  />
-			<dbType type="TIMETZ" ignoreLen="true" ignorePre="true"  />
-			<dbType type="VARBIT" ignoreLen="true" ignorePre="true"  />			
-			<dbType type="VARCHAR" defaultLength="200" ignorePre="true" />
-			<dbType type="XID" ignoreLen="true" ignorePre="true"  />
-			
-			<dbType type="_ABSTIME" ignoreLen="true" ignorePre="true" />
-			<dbType type="_ACLITEM" ignoreLen="true" ignorePre="true" />
-			<dbType type="_BIT" ignoreLen="true" ignorePre="true" />
-			<dbType type="_BOX" ignoreLen="true" ignorePre="true" />
-			<dbType type="_BOOL" ignoreLen="true" ignorePre="true" />
-			<dbType type="_BPCHAR" ignoreLen="true" ignorePre="true" />
-			<dbType type="_BYTEA" ignoreLen="true" ignorePre="true" />
-			<dbType type="_CHAR" ignoreLen="true" ignorePre="true" />
-			<dbType type="_CID" ignoreLen="true" ignorePre="true" />
-			<dbType type="_CIDR" ignoreLen="true" ignorePre="true" />
-			<dbType type="_CIRCLE" ignoreLen="true" ignorePre="true" />
-			<dbType type="_DATE" ignoreLen="true" ignorePre="true" />
-			<dbType type="_FLOAT4" ignoreLen="true" ignorePre="true" />
-			<dbType type="_FLOAT8" ignoreLen="true" ignorePre="true" />
-			<dbType type="_INET" ignoreLen="true" ignorePre="true" />
-			<dbType type="_INT2VECTOR" ignoreLen="true" ignorePre="true" />
-			<dbType type="_INT4" ignoreLen="true" ignorePre="true" />
-			<dbType type="_INT8" ignoreLen="true" ignorePre="true" />
-			<dbType type="_INTERVAL" ignoreLen="true" ignorePre="true" />
-			<dbType type="_LINE" ignoreLen="true" ignorePre="true" />
-			<dbType type="_LSEG" ignoreLen="true" ignorePre="true" />
-			<dbType type="_MACADDR" ignoreLen="true" ignorePre="true" />
-			<dbType type="_MONEY" ignoreLen="true" ignorePre="true" />
-			<dbType type="_NAME" ignoreLen="true" ignorePre="true" />
-			<dbType type="_NUMERIC" ignoreLen="true" ignorePre="true" />
-			<dbType type="_OID" ignoreLen="true" ignorePre="true" />
-			<dbType type="_OIDVECTOR" ignoreLen="true" ignorePre="true" />
-			<dbType type="_PATH" ignoreLen="true" ignorePre="true"/>
-			<dbType type="_POINT" ignoreLen="true" ignorePre="true" />
-			<dbType type="_POLYGON" ignoreLen="true" ignorePre="true" />
-			<dbType type="_REFCURSOR" ignoreLen="true" ignorePre="true" />
-			<dbType type="_REGCLASS" ignoreLen="true" ignorePre="true" />
-			<dbType type="_REGOPER" ignoreLen="true" ignorePre="true" />
-			<dbType type="_REGOPERATOR" ignoreLen="true" ignorePre="true" />
-			<dbType type="_REGPROC" ignoreLen="true" ignorePre="true" />
-			<dbType type="_REGPROCEDURE" ignoreLen="true" ignorePre="true" />
-			<dbType type="_REGTYPE" ignoreLen="true" ignorePre="true" />
-			<dbType type="_RELTIME" ignoreLen="true" ignorePre="true" />
-			<dbType type="_TEXT" ignoreLen="true" ignorePre="true" />
-			<dbType type="_TID" ignoreLen="true" ignorePre="true" />
-			<dbType type="_TIME" ignoreLen="true" ignorePre="true" />
-			<dbType type="_TIMESTAMP" ignoreLen="true" ignorePre="true" />
-			<dbType type="_TIMESTAMPTZ" ignoreLen="true" ignorePre="true" />
-			<dbType type="_TIMETZ" ignoreLen="true" ignorePre="true" />
-			<dbType type="_TINTERVAL" ignoreLen="true" ignorePre="true" />
-			<dbType type="_VARBIT" ignoreLen="true" ignorePre="true" />
-			<dbType type="_VARCHAR" ignoreLen="true" ignorePre="true" />
-			<dbType type="_XID" ignoreLen="true" ignorePre="true" />
-		</dbTypes>
-
-		<language name="java">
-			<talendToDbTypes><!-- Adviced mappings  -->
-				<talendType type="id_List"/>
-				<talendType type="id_Boolean">	
-					<dbType type="BOOL" default="true" />				
-				</talendType>
-				<talendType type="id_Byte">		
-				</talendType>
-				<talendType type="id_byte[]">
-					<dbType type="BIT" default="true" />
-					<dbType type="VARBIT" />				
-				</talendType>
-				<talendType type="id_Character">
-					<dbType type="CHAR" default="true" />
-					<dbType type="BPCHAR" />
-					<dbType type="VARCHAR" />
-					<dbType type="TEXT" />							
-				</talendType>
-				<talendType type="id_Date">
-					<dbType type="DATE" default="true" />				
-					<dbType type="ABSTIME" />
-					<dbType type="TIMETZ" />
-					<dbType type="TIME" />
-					<dbType type="TIMESTAMPTZ" />
-					<dbType type="TIMESTAMP" />
-					<dbType type="INTERVAL" />
-					<dbType type="TINTERVAL" />
-					<dbType type="RELTIME" />						
-				</talendType>
-				<talendType type="id_BigDecimal">
-					<dbType type="NUMERIC" default="true" />							
-					<dbType type="FLOAT4" />
-					<dbType type="FLOAT8"/>
-				</talendType>
-				<talendType type="id_Double">
-					<dbType type="FLOAT4" />
-					<dbType type="FLOAT8" default="true" />
-					<dbType type="NUMERIC" />							
-				</talendType>
-				<talendType type="id_Float">
-					<dbType type="FLOAT4" default="true" />
-					<dbType type="FLOAT8" />
-					<dbType type="NUMERIC" />				
-				</talendType>
-				<talendType type="id_Integer">
-					<dbType type="INT2" />
-					<dbType type="INT4" default="true" />
-					<dbType type="SERIAL" />
-					<dbType type="INT8" />
-					<dbType type="BIGSERIAL" />										
-				</talendType>
-				<talendType type="id_Long">
-					<dbType type="INT2" />
-					<dbType type="INT4" />
-					<dbType type="SERIAL" />
-					<dbType type="INT8"  default="true" />
-					<dbType type="BIGSERIAL" />							
-				</talendType>
-				<talendType type="id_Object">
-					<dbType type="_POINT" />
-					<dbType type="_POLYGON" />
-					<dbType type="_FLOAT4" />
-					<dbType type="_REFCURSOR" />
-					<dbType type="_REGCLASS" />
-					<dbType type="_REGOPER" />
-					<dbType type="_REGOPERATOR" />
-					<dbType type="_REGPROC" />
-					<dbType type="_REGPROCEDURE" />
-					<dbType type="_REGTYPE" />
-					<dbType type="_RELTIME" />
-					<dbType type="_TEXT" />
-					<dbType type="_TID" />
-					<dbType type="_TIMETZ" />
-					<dbType type="_TIME" />
-					<dbType type="_TIMESTAMPTZ" />
-					<dbType type="_TIMESTAMP" />
-					<dbType type="_TINTERVAL" />
-					<dbType type="_XID" />						
-					<dbType type="ACLITEM" />			
-					<dbType type="BYTEA" />						
-					<dbType type="CID" />
-					<dbType type="CIDR" />
-					<dbType type="CIRCLE" />						
-					<dbType type="INET" />			
-					<dbType type="MACADDR" />
-					<dbType type="MONEY" />			
-					<dbType type="OID" />
-					<dbType type="PATH" />
-					<dbType type="POLYGON" />			
-					<dbType type="REFCURSOR" />
-					<dbType type="REGCLASS" />
-					<dbType type="REGOPER" />
-					<dbType type="REGOPERATOR" />
-					<dbType type="REGPROC" />
-					<dbType type="REGPROCEDURE" />
-					<dbType type="REGTYPE" />						
-					<dbType type="SMGR" />			
-					<dbType type="TID" />
-					<dbType type="XID" />
-					<dbType type="_CHAR" />
-					<dbType type="_ABSTIME" />
-					<dbType type="_ACLITEM" />
-					<dbType type="_INT8" />
-					<dbType type="_VARBIT" />
-					<dbType type="_BIT" />			
-					<dbType type="_BOOL" />
-					<dbType type="BOX" />
-					<dbType type="_BOX" />
-					<dbType type="_BYTEA" />
-					<dbType type="_VARCHAR" />
-					<dbType type="_BPCHAR" />
-					<dbType type="_CID" />
-					<dbType type="_CIDR" />
-					<dbType type="_CIRCLE" />
-					<dbType type="_DATE" />
-					<dbType type="_FLOAT8" />
-					<dbType type="_INET" />
-					<dbType type="INT2VECTOR" />
-					<dbType type="_INT2VECTOR" />
-					<dbType type="_INT4" />
-					<dbType type="_INTERVAL" />
-					<dbType type="LINE" />
-					<dbType type="_LINE" />
-					<dbType type="LSEG" />
-					<dbType type="_LSEG" />
-					<dbType type="_MACADDR" />
-					<dbType type="_MONEY" />
-					<dbType type="NAME" />
-					<dbType type="_NAME" />
-					<dbType type="_NUMERIC" />
-					<dbType type="_OID" />
-					<dbType type="OIDVECTOR" />
-					<dbType type="_OIDVECTOR" />
-					<dbType type="_PATH" />
-					<dbType type="POINT" default="true" />				
-				</talendType>
-				<talendType type="id_Short">
-					<dbType type="INT2"   default="true" />
-					<dbType type="INT4" />
-					<dbType type="SERIAL" />
-					<dbType type="INT8" />
-					<dbType type="BIGSERIAL" />					
-				</talendType>
-				<talendType type="id_String">
-					<dbType type="BPCHAR" />
-					<dbType type="VARCHAR" default="true" />
-					<dbType type="TEXT" />				
-				</talendType>
-			</talendToDbTypes>
-			<dbToTalendTypes>
-				<dbType type="INT2" >
-					<talendType type="id_Short" default="true" />				
-				</dbType>				
-				<dbType type="INT4" >
-					<talendType type="id_Integer" default="true" />
-				</dbType>				
-				<dbType type="SERIAL" >
-					<talendType type="id_Integer" default="true" />				
-				</dbType>				
-				<dbType type="INT8" >
-					<talendType type="id_Long" default="true" />				
-				</dbType>				
-				<dbType type="BIGSERIAL" >
-					<talendType type="id_Long" default="true" />				
-				</dbType>				
-				<dbType type="FLOAT4" >
-					<talendType type="id_Float" default="true" />				
-					<talendType type="id_BigDecimal"/>			
-				</dbType>				
-				<dbType type="FLOAT8" >
-					<talendType type="id_Double" default="true" />				
-					<talendType type="id_BigDecimal"/>			
-				</dbType>
-				<dbType type="NUMERIC">
-					<talendType type="id_Double"/>
-					<talendType type="id_BigDecimal" default="true"/>			
-				</dbType>				
-				<dbType type="BOOL" >
-					<talendType type="id_Boolean" default="true" />				
-				</dbType>				
-				<dbType type="BIT" >
-					<talendType type="id_byte[]" default="true" />	
-				</dbType>				
-				<dbType type="VARBIT" >
-					<talendType type="id_byte[]" default="true" />				
-				</dbType>							
-				<dbType type="CHAR" >
-					<talendType type="id_String" default="true" />				
-				</dbType>				
-				<dbType type="BPCHAR" >
-					<talendType type="id_String" default="true" />				
-				</dbType>				
-				<dbType type="VARCHAR" >
-					<talendType type="id_String" default="true" />				
-				</dbType>				
-				<dbType type="TEXT" >
-					<talendType type="id_String" default="true" />				
-				</dbType>				
-				<dbType type="DATE" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>				
-				<dbType type="ABSTIME" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>				
-				<dbType type="TIMETZ" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>				
-				<dbType type="TIME" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>				
-				<dbType type="TIMESTAMPTZ" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>				
-				<dbType type="TIMESTAMP" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>
-				<dbType type="INTERVAL" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>								
-				<dbType type="TINTERVAL" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>				
-				<dbType type="RELTIME" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>							
-				<dbType type="ACLITEM" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>							
-				<dbType type="BYTEA" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>										
-				<dbType type="CID" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="CIDR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="CIRCLE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>										
-				<dbType type="INET" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>							
-				<dbType type="MACADDR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="MONEY" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>							
-				<dbType type="OID" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="PATH" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="POLYGON" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>							
-				<dbType type="REFCURSOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="REGCLASS" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="REGOPER" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="REGOPERATOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="REGPROC" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="REGPROCEDURE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="REGTYPE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>										
-				<dbType type="SMGR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>							
-				<dbType type="TID" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="XID" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="BOX" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="INT2VECTOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="LINE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="LSEG" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="NAME" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="OIDVECTOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="POINT" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>	
-				<!-- object -->
-				<dbType type="_OIDVECTOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_PATH" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>
-				<dbType type="_NAME" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_NUMERIC" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_OID" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>
-				<dbType type="_LSEG" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_MACADDR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_MONEY" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>
-				<dbType type="_LINE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>
-				<dbType type="_INT2VECTOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_INT4" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_INTERVAL" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>
-				<dbType type="_BOX" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_BYTEA" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_VARCHAR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_BPCHAR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_CID" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_CIDR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_CIRCLE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_DATE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_FLOAT8" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_INET" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>
-				<dbType type="_CHAR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_ABSTIME" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_ACLITEM" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_INT8" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_VARBIT" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_BIT" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>							
-				<dbType type="_BOOL" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>
-				<dbType type="_POINT" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_POLYGON" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_FLOAT4" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_REFCURSOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_REGCLASS" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_REGOPER" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_REGOPERATOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_REGPROC" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_REGPROCEDURE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_REGTYPE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_RELTIME" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_TEXT" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_TID" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_TIMETZ" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_TIME" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_TIMESTAMPTZ" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_TIMESTAMP" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_TINTERVAL" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_XID" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>									
-			</dbToTalendTypes>
-		</language>
-	</dbms>
-
-</mapping>

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

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

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

@@ -77,6 +77,8 @@ public interface ILibraryManagerService extends IService {
     public void saveMavenIndex(Map<String, String> libsToMavenUri, IProgressMonitor... monitorWrap);
 
     public void createModulesIndexFromComponentAndExtension(IProgressMonitor... monitorWrap);
+    
+    public Map<String,String> buildModulesIndexFromComponentAndExtension(IProgressMonitor... monitorWrap);
 
     /**
      * DOC ycbai Comment method "retrieve".

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

@@ -33,9 +33,6 @@ public enum EDatabase4DriverClassName {
     IBMDB2ZOS(EDatabaseTypeName.IBMDB2ZOS, "COM.ibm.db2os390.sqlj.jdbc.DB2SQLJDriver"), //$NON-NLS-1$
 
     INFORMIX(EDatabaseTypeName.INFORMIX, "com.informix.jdbc.IfxDriver"), //$NON-NLS-1$
-    INGRES(EDatabaseTypeName.INGRES, "com.ingres.jdbc.IngresDriver"), //$NON-NLS-1$
-    INTERBASE(EDatabaseTypeName.INTERBASE, "interbase.interclient.Driver"), //$NON-NLS-1$
-    VECTORWISE(EDatabaseTypeName.VECTORWISE, "com.ingres.jdbc.IngresDriver"), //$NON-NLS-1$
 
     JAVADB_DERBYCLIENT(EDatabaseTypeName.JAVADB_DERBYCLIENT, "org.apache.derby.jdbc.ClientDriver"), //$NON-NLS-1$
     JAVADB_EMBEDED(EDatabaseTypeName.JAVADB_EMBEDED, "org.apache.derby.jdbc.EmbeddedDriver"), //$NON-NLS-1$
@@ -59,7 +56,6 @@ public enum EDatabase4DriverClassName {
     ORACLE_OCI(EDatabaseTypeName.ORACLE_OCI, "oracle.jdbc.OracleDriver", "oracle.jdbc.driver.OracleDriver"), //$NON-NLS-1$ //$NON-NLS-2$
     ORACLE_CUSTOM(EDatabaseTypeName.ORACLE_CUSTOM, "oracle.jdbc.OracleDriver", "oracle.jdbc.driver.OracleDriver"), //$NON-NLS-1$ //$NON-NLS-2$
 
-    PARACCEL(EDatabaseTypeName.PARACCEL, "com.paraccel.Driver"), //$NON-NLS-1$
     REDSHIFT(EDatabaseTypeName.REDSHIFT, "com.amazon.redshift.jdbc42.Driver"), //$NON-NLS-1$
     REDSHIFT_SSO(EDatabaseTypeName.REDSHIFT_SSO, "com.amazon.redshift.jdbc42.Driver"),
 

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

@@ -146,7 +146,9 @@ public enum EDatabaseTypeName {
             "HBase", "HBase", Boolean.FALSE, "HBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
     MAPRDB(
-            "MapRDB", "MapRDB", Boolean.FALSE, "MAPRDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true);//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "MapRDB", "MapRDB", Boolean.FALSE, "MAPRDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true),//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    SNOWFLAKE(
+            "SNOWFLAKE","SNOWFLAKE",Boolean.TRUE,"SNOWFLAKE",EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.None);
 
     // displayName is used in Java code.
     private String displayName;
@@ -338,6 +340,9 @@ public enum EDatabaseTypeName {
             isSupport = isSupportODBC;
         } else if (EDatabaseTypeName.SAS == this) {
             isSupport = false;
+        } else if (EDatabaseTypeName.INGRES == this || EDatabaseTypeName.INTERBASE == this || EDatabaseTypeName.VECTORWISE == this
+                || EDatabaseTypeName.PARACCEL == this) {
+            return false;
         }
 
         return isSupport;

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

@@ -112,15 +112,6 @@ public enum EDatabaseConnTemplate {
     SQLITE(new DbConnStr(EDatabaseTypeName.SQLITE, //
             "jdbc:sqlite:/<filename>")), //$NON-NLS-1$
 
-    INGRES(new DbConnStr(EDatabaseTypeName.INGRES, //
-            "jdbc:ingres://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
-            "II7")), //$NON-NLS-1$
-    VECTORWISE(new DbConnStr(EDatabaseTypeName.VECTORWISE, //
-            "jdbc:ingres://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
-            "II7")), //$NON-NLS-1$
-    INTERBASE(new DbConnStr(EDatabaseTypeName.INTERBASE, //
-            "jdbc:interbase://<host>/<sid>?<property>")), //$NON-NLS-1$
-
     FIREBIRD(new DbConnStr(EDatabaseTypeName.FIREBIRD, //
             "jdbc:firebirdsql:<host>/<port>:<filename>?<property>", //$NON-NLS-1$
             "3050")), //$NON-NLS-1$
@@ -174,11 +165,6 @@ public enum EDatabaseConnTemplate {
             "jdbc:sap://<host>:<port>?<property>", //$NON-NLS-1$
             "30015", //$NON-NLS-1$
             "")), //$NON-NLS-1$
-
-    PARACCEL(new DbConnStr(EDatabaseTypeName.PARACCEL, //
-            "jdbc:paraccel://<host>:<port>/<sid>?<property>", //$NON-NLS-1$
-            "5439")), //$NON-NLS-1$
-
     REDSHIFT(new DbConnStr(EDatabaseTypeName.REDSHIFT, //
             "jdbc:redshift://<host>:<port>/<sid>?<property>", //$NON-NLS-1$
             "5439",//$NON-NLS-1$
@@ -385,7 +371,6 @@ public enum EDatabaseConnTemplate {
             case PSQL:
             case PLUSPSQL:
             case GREENPLUM:
-            case PARACCEL:
             case REDSHIFT:
             case REDSHIFT_SSO:
             case IBMDB2:
@@ -430,10 +415,6 @@ public enum EDatabaseConnTemplate {
             case PSQL:
             case PLUSPSQL:
             case GREENPLUM:
-            case PARACCEL:
-            case INGRES:
-            case VECTORWISE:
-            case INTERBASE:
             case FIREBIRD:
             case JAVADB_EMBEDED:
             case JAVADB_JCCJDBC:
@@ -460,8 +441,6 @@ public enum EDatabaseConnTemplate {
             case SYBASEASE_16_SA:
             case IBMDB2:
             case IBMDB2_ZOS:
-            case INGRES:
-            case INTERBASE:
             case MSSQL:
             case INFORMIX:
             case TERADATA:

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

@@ -47,10 +47,6 @@ public enum EDatabaseVersion4Drivers {
     // AS400
     AS400_V7R1_V7R3(new DbVersion4Drivers(EDatabaseTypeName.AS400, "V7R1 to V7R3", "AS400_V7R1_V7R3", "jt400-9.8.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     AS400_V6R1_V7R2(new DbVersion4Drivers(EDatabaseTypeName.AS400, "V6R1 to V7R2", "AS400_V6R1_V7R2", "jt400_V6R1.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    AS400_V5R3_V6R1(new DbVersion4Drivers(EDatabaseTypeName.AS400, "V5R3 to V6R1", "AS400_V5R3_V6R1", "jt400_V5R3.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    AS400_V5R2_V5R4(new DbVersion4Drivers(EDatabaseTypeName.AS400, "V5R2 to V5R4", "AS400_V5R2_V5R4", "jt400_V5R2.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    //
-    INTERBASE(new DbVersion4Drivers(EDatabaseTypeName.INTERBASE, "interclient.jar")), //$NON-NLS-1$
 
     //
     HSQLDB(new DbVersion4Drivers(EDatabaseTypeName.HSQLDB, "hsqldb.jar")), //$NON-NLS-1$
@@ -85,22 +81,12 @@ public enum EDatabaseVersion4Drivers {
             "Microsoft SQL Server 2012", "Microsoft SQL Server 2012", "jtds-1.3.1-patch-20190523.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     MSSQL_PROP(new DbVersion4Drivers(EDatabaseTypeName.MSSQL,
             "Microsoft", "MSSQL_PROP", //$NON-NLS-1$ //$NON-NLS-2$
-            new String[] { "mssql-jdbc.jar", "slf4j-api-1.7.29.jar", "slf4j-log4j12-1.7.29.jar", "adal4j-1.6.5.jar", //$NON-NLS-1$
-                    "commons-lang3-3.10.jar", "commons-codec-1.14.jar", "gson-2.8.6.jar", "oauth2-oidc-sdk-6.5.jar",
+            new String[] { "mssql-jdbc.jar", "slf4j-api-1.7.29.jar", "slf4j-log4j12-1.7.29.jar", "adal4j-1.6.7.jar", //$NON-NLS-1$
+                    "commons-lang3-3.10.jar", "commons-codec-1.14.jar", "gson-2.8.6.jar", "oauth2-oidc-sdk-9.7.jar",
                     "json-smart-2.4.7.jar", "nimbus-jose-jwt-8.11.jar", "javax.mail-1.6.2.jar", "log4j-1.2.17.jar",
-                    "accessors-smart-2.4.7.jar", "asm-9.1.jar" })),
+                    "accessors-smart-2.4.7.jar", "asm-9.1.jar","content-type-2.1.jar" })),
 
     VERTICA_9(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 9.X", "VERTICA_9_0", "vertica-jdbc-9.3.1-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    VERTICA_7_1_X(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 7.1.X (Deprecated)", "VERTICA_7_1_X", "vertica-jdbc-7.1.2-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    VERTICA_7(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 7.0.X (Deprecated)", "VERTICA_7_0_X", "vertica-jdbc-7.0.1-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    VERTICA_6_1_X(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 6.1.X (Deprecated)", "VERTICA_6_1_X", "vertica-jdk5-6.1.2-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    VERTICA_6(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 6.0 (Deprecated)", "VERTICA_6_0", "vertica-jdk5-6.0.0-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    VERTICA_5_1(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 5.1 (Deprecated)", "VERTICA_5_1", "vertica_5.1.6_jdk_5.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    VERTICA_5(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 5.0 (Deprecated)", "VERTICA_5", "vertica_4.1.14_jdk_5.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    VERTICA_4_1(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 4.1 (Deprecated)", "VERTICA_4_1", "vertica_4.1.7_jdk_5.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    VERTICA_4(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 4 (Deprecated)", "VERTICA_4", "vertica_4.0_jdk_5.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    VERTICA_3_5(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 3.5 (Deprecated)", "VERTICA_3.5", "vertica_3.5_jdk_5.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    VERTICA_3(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 3 (Deprecated)", "VERTICA_3", "vertica_3.0_jdk_5.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
     // for bug 0017930
     GREENPLUM_PSQL(new DbVersion4Drivers(EDatabaseTypeName.GREENPLUM,"PostgreSQL", "POSTGRESQL", "postgresql-8.4-703.jdbc4.jar")), //$NON-NLS-1$
@@ -121,15 +107,9 @@ public enum EDatabaseVersion4Drivers {
     SYBASEIQ_16_SA(new DbVersion4Drivers(EDatabaseTypeName.SYBASEASE, "Sybase 16 (SQL Anywhere)", "SYBSEIQ_16_SA", "sajdbc4-17.0.0.jar")),
     SYBASEIQ(new DbVersion4Drivers(EDatabaseTypeName.SYBASEIQ, "jconn3.jar")), //$NON-NLS-1$
 
-    // for bug 0013127
-    PARACCEL(new DbVersion4Drivers(EDatabaseTypeName.PARACCEL, "paraccel-jdbc.jar")), //$NON-NLS-1$
-    VECTORWISE(new DbVersion4Drivers(EDatabaseTypeName.VECTORWISE, "iijdbc.jar")), //$NON-NLS-1$
-
     EXASOL(new DbVersion4Drivers(EDatabaseTypeName.EXASOL, "exajdbc-6.0.9302.jar")), //$NON-NLS-1$
     MAXDB(new DbVersion4Drivers(EDatabaseTypeName.MAXDB, "sapdbc.jar")), //$NON-NLS-1$
 
-    INGRES(new DbVersion4Drivers(EDatabaseTypeName.INGRES, "iijdbc.jar")), //$NON-NLS-1$
-
     // HIVE(new DbVersion4Drivers(EDatabaseTypeName.HIVE, "STANDALONE", "STANDALONE", new String[] {
     // "hive-jdbc-0.8.1.jar",
     // "hive-metastore-0.8.1.jar", "hive-exec-0.8.1.jar", "hive-service-0.8.1.jar", "libfb303_new.jar",

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

@@ -16,7 +16,9 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import org.apache.commons.lang.StringUtils;
 import org.talend.commons.exception.ExceptionHandler;
+import org.talend.core.pendo.PendoTrackSender;
 import org.talend.core.runtime.i18n.Messages;
 import org.talend.repository.model.RepositoryConstants;
 import org.talend.utils.json.JSONException;
@@ -215,7 +217,15 @@ public class ConnectionBean implements Cloneable {
     public String getUser() {
         try {
             if (conDetails.has(USER)) {
-                return conDetails.getString(USER);
+                String user = conDetails.getString(USER);
+                if (isToken()) {
+                    String url = getDynamicFields().get(RepositoryConstants.REPOSITORY_URL);
+                    user = PendoTrackSender.getInstance().getTmcUser(url, getPassword());
+                    if (StringUtils.isNotBlank(user)) {
+                        setUser(user);
+                    }
+                }
+                return user;
             }
         } catch (JSONException e) {
             ExceptionHandler.process(e);

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

@@ -13,10 +13,13 @@
 package org.talend.core.model.general;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.core.runtime.Path;
@@ -45,6 +48,8 @@ public class ModuleNeeded {
 
     public static final String ATTR_USED_BY_DYNAMIC_DISTRIBUTION = "dynamicDistribution";
 
+    public static final String ATTR_DYNAMIC_DISTRIBUTION_VERSION = "distributionVersion";
+    
     private String id;
 
     private String context;
@@ -105,6 +110,7 @@ public class ModuleNeeded {
 
     ILibraryManagerService libManagerService = (ILibraryManagerService) GlobalServiceRegister.getDefault()
             .getService(ILibraryManagerService.class);
+    
 
     /**
      * DOC smallet ModuleNeeded class global comment. Detailled comment <br/>
@@ -753,5 +759,12 @@ public class ModuleNeeded {
     public void setUseReleaseVersion(boolean useReleaseVersion) {
         this.useReleaseVersion = useReleaseVersion;
     }
-
+    
+    public String getDynamicDistributionVersion() {
+        return attributes.get(ATTR_DYNAMIC_DISTRIBUTION_VERSION);
+    }
+    
+    public void setDynamicDistributionVersion(String distribution) {
+        attributes.put(ATTR_DYNAMIC_DISTRIBUTION_VERSION, distribution);
+    }
 }

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

@@ -94,6 +94,8 @@ public interface ISAPConstant {
 
     public static final String OUTPUT_XML_META_NAME = PARAM_OUTPUT + SCHEMA_SUFIX;
 
+    public static final String ADSO_CONNECTION_TYPE = "adsoConnectionType";//$NON-NLS-1$
+
     // Hana database properties
     public static final String PROP_USE_HANA = "db.useHana";//$NON-NLS-1$
 
@@ -108,4 +110,9 @@ public interface ISAPConstant {
     public static final String PROP_DB_PASSWORD = "db.password";//$NON-NLS-1$
 
     public static final String PROP_DB_ADDITIONAL_PROPERTIES = "db.additionalProperties";//$NON-NLS-1$
+
+    public static final String SAP_JCO = "SAP_JCO"; //$NON-NLS-1$
+
+    public static final String HANA_JDBC = "HANA_JDBC";//$NON-NLS-1$
+
 }

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

@@ -300,6 +300,9 @@ public class MetadataTable implements IMetadataTable, Cloneable {
                 // no matter if this one is custom or not (all custom must be propagated too)
                 for (int i = 0; i < inputColumnListWithUnselected.size(); i++) {
                     IMetadataColumn inputColumn = inputColumnListWithUnselected.get(i);
+                    if(inputColumn.isCustom()) {
+                        continue;
+                    }
                     IMetadataColumn myColumn = this.getColumn(inputColumn.getLabel());
                     outputColumnsNotTested.remove(myColumn);
                     if (!inputColumn.sameMetacolumnAs(myColumn, options)) {

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

@@ -433,16 +433,6 @@ public class ComponentToRepositoryProperty {
             connection.setDatabaseType(EDatabaseTypeName.IBMDB2.getDisplayName());
             connection.setProductId(EDatabaseTypeName.IBMDB2.getProduct());
         }
-        // Ingres
-        else if (EDatabaseTypeName.INGRES.getProduct().equalsIgnoreCase((String) parameter.getValue())) {
-            connection.setDatabaseType(EDatabaseTypeName.INGRES.getDisplayName());
-            connection.setProductId(EDatabaseTypeName.INGRES.getProduct());
-        }
-        // Interbase
-        else if (EDatabaseTypeName.INTERBASE.getProduct().equalsIgnoreCase((String) parameter.getValue())) {
-            connection.setDatabaseType(EDatabaseTypeName.INTERBASE.getDisplayName());
-            connection.setProductId(EDatabaseTypeName.INTERBASE.getProduct());
-        }
         // Sqlite
         else if (EDatabaseTypeName.SQLITE.getProduct().equalsIgnoreCase((String) parameter.getValue())) {
             connection.setDatabaseType(EDatabaseTypeName.SQLITE.getDisplayName());
@@ -488,11 +478,6 @@ public class ComponentToRepositoryProperty {
             connection.setDatabaseType(EDatabaseTypeName.MAXDB.getDisplayName());
             connection.setProductId(EDatabaseTypeName.MAXDB.getProduct());
         }
-        // Paraccel
-        else if (EDatabaseTypeName.PARACCEL.getProduct().equalsIgnoreCase((String) parameter.getValue())) {
-            connection.setDatabaseType(EDatabaseTypeName.PARACCEL.getDisplayName());
-            connection.setProductId(EDatabaseTypeName.PARACCEL.getProduct());
-        }
         // Redshift
         else if (EDatabaseTypeName.REDSHIFT.getProduct().equalsIgnoreCase((String) parameter.getValue())) {
             connection.setProductId(EDatabaseTypeName.REDSHIFT.getProduct());
@@ -600,11 +585,6 @@ public class ComponentToRepositoryProperty {
             connection.setDatabaseType(EDatabaseTypeName.SAPHana.getDisplayName());
             connection.setProductId(EDatabaseTypeName.SAPHana.getProduct());
         }
-        // VECTORWISE
-        else if (EDatabaseTypeName.VECTORWISE.getProduct().equalsIgnoreCase((String) parameter.getValue())) {
-            connection.setDatabaseType(EDatabaseTypeName.VECTORWISE.getDisplayName());
-            connection.setProductId(EDatabaseTypeName.VECTORWISE.getProduct());
-        }
         // SAX
         // can not find corresponding component. also not exist in EDatabaseType.java.
 

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

@@ -86,6 +86,7 @@ import org.talend.core.model.update.UpdatesConstants;
 import org.talend.core.model.utils.IDragAndDropServiceHandler;
 import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.runtime.services.IGenericWizardService;
+import org.talend.core.runtime.util.SAPUtils;
 import org.talend.core.service.IMetadataManagmentService;
 import org.talend.core.service.IMetadataManagmentUiService;
 import org.talend.core.utils.KeywordsValidator;
@@ -406,6 +407,8 @@ public class RepositoryToComponentProperty {
                 }
             }
             return values;
+        } else if ("CONNECTION_TYPE".equals(value)) { //$NON-NLS-1$
+            return SAPUtils.isHana(connection) ? ISAPConstant.HANA_JDBC : ISAPConstant.SAP_JCO;
         } else if ("SAPHANA_HOST".equals(value)) { //$NON-NLS-1$
             String dbHost = TaggedValueHelper.getValueString(ISAPConstant.PROP_DB_HOST, connection);
             if (isContextMode(connection, dbHost)) {
@@ -2286,7 +2289,7 @@ public class RepositoryToComponentProperty {
                 for (int j = 0; j < schemaTargets.size(); j++) {
                     SchemaTarget schemaTarget = schemaTargets.get(j);
                     if (schemaTarget.getTagName() != null && !schemaTarget.getTagName().equals("")) { //$NON-NLS-1$
-                        tagName = "" + schemaTarget.getTagName().trim(); //$NON-NLS-1$ //$NON-NLS-2$
+                        tagName = "" + schemaTarget.getTagName().trim(); //$NON-NLS-1$
                         tagName = MetadataToolHelper.validateColumnName(tagName, j);
                         Map<String, Object> map = new HashMap<String, Object>();
                         map.put("SCHEMA_COLUMN", tagName); //$NON-NLS-1$

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

@@ -1084,6 +1084,7 @@ public abstract class AbstractNode implements INode {
     @Override
     public void setLabel(String label) {
         // TODO Auto-generated method stub
+    	this.label = label;
 
     }
 

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

@@ -98,6 +98,7 @@ public enum EParameterFieldType {
     HADOOP_LIBRARIES,
     DATA_PREP_ID, // wchen added for TDI-33791
     DP_VERSION, // hwang added for TUP-16686
+    TDS_VERSION, // zshen added for TDQ-19814
     FETCH_SCHEMA, // TDI-33791
     DATA_SET_ID,
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/routines/RoutinesUtil.java

@@ -22,6 +22,7 @@ import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.jobs.Job;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.exception.SystemException;
@@ -51,6 +52,8 @@ import org.talend.repository.model.IProxyRepositoryFactory;
  */
 public final class RoutinesUtil {
 
+    private static Job syncCodesjob;
+
     private RoutinesUtil() {
     }
 
@@ -304,7 +307,7 @@ public final class RoutinesUtil {
         }
         ICodeGeneratorService codegenService = null;
         if (GlobalServiceRegister.getDefault().isServiceRegistered(ICodeGeneratorService.class)) {
-            codegenService = (ICodeGeneratorService) GlobalServiceRegister.getDefault().getService(ICodeGeneratorService.class);
+            codegenService = GlobalServiceRegister.getDefault().getService(ICodeGeneratorService.class);
         }
         if (codegenService == null) {
             return errorItems;
@@ -328,7 +331,7 @@ public final class RoutinesUtil {
             return;
         }
         if (synchronizer == null && GlobalServiceRegister.getDefault().isServiceRegistered(ICodeGeneratorService.class)) {
-            ICodeGeneratorService codegenService = (ICodeGeneratorService) GlobalServiceRegister.getDefault().getService(
+            ICodeGeneratorService codegenService = GlobalServiceRegister.getDefault().getService(
                     ICodeGeneratorService.class);
             synchronizer = codegenService.createRoutineSynchronizer();
         }
@@ -409,4 +412,12 @@ public final class RoutinesUtil {
         return routinesParameters;
     }
 
+    public static Job getSyncCodesjob() {
+        return syncCodesjob;
+    }
+
+    public static void setSyncCodesjob(Job syncCodesjob) {
+        RoutinesUtil.syncCodesjob = syncCodesjob;
+    }
+
 }

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

@@ -27,6 +27,7 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.commons.text.StringEscapeUtils;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.model.components.ComponentCategory;
 import org.talend.core.model.components.IComponent;
@@ -1522,4 +1523,14 @@ public class NodeUtil {
         }
         return isDatabaseFamily;
     }
+    
+    public static String getLabel(INode node) {
+        String label = node.getLabel();
+		if (label == null) {
+			label = node.getUniqueName();
+		} else {
+			label = StringEscapeUtils.escapeJava(label);
+		}
+		return label;
+    }
 }

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

@@ -0,0 +1,147 @@
+// ============================================================================
+//
+// 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.pendo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class PendoEventEntity {
+
+    @JsonProperty("type")
+    private String type;
+
+    @JsonProperty("event")
+    private String event;
+
+    @JsonProperty("visitorId")
+    private String visitorId;
+
+    @JsonProperty("accountId")
+    private String accountId;
+
+    @JsonProperty("timestamp")
+    private long timestamp;
+
+    @JsonProperty("properties")
+    private Object properties;
+
+    /**
+     * Getter for type.
+     * 
+     * @return the type
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * Sets the type.
+     * 
+     * @param type the type to set
+     */
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    /**
+     * Getter for event.
+     * 
+     * @return the event
+     */
+    public String getEvent() {
+        return event;
+    }
+
+    /**
+     * Sets the event.
+     * 
+     * @param event the event to set
+     */
+    public void setEvent(String event) {
+        this.event = event;
+    }
+
+    /**
+     * Getter for visitorId.
+     * 
+     * @return the visitorId
+     */
+    public String getVisitorId() {
+        return visitorId;
+    }
+
+    /**
+     * Sets the visitorId.
+     * 
+     * @param visitorId the visitorId to set
+     */
+    public void setVisitorId(String visitorId) {
+        this.visitorId = visitorId;
+    }
+
+    /**
+     * Getter for accountId.
+     * 
+     * @return the accountId
+     */
+    public String getAccountId() {
+        return accountId;
+    }
+
+    /**
+     * Sets the accountId.
+     * 
+     * @param accountId the accountId to set
+     */
+    public void setAccountId(String accountId) {
+        this.accountId = accountId;
+    }
+
+    /**
+     * Getter for timestamp.
+     * 
+     * @return the timestamp
+     */
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    /**
+     * Sets the timestamp.
+     * 
+     * @param timestamp the timestamp to set
+     */
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+
+    /**
+     * Getter for properties.
+     * @return the properties
+     */
+    public Object getProperties() {
+        return properties;
+    }
+
+
+    /**
+     * Sets the properties.
+     * @param properties the properties to set
+     */
+    public void setProperties(Object properties) {
+        this.properties = properties;
+    }
+}

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

@@ -0,0 +1,87 @@
+// ============================================================================
+//
+// 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.pendo;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class PendoLoginProperties {
+
+    @JsonProperty("studio_version")
+    private String studioVersion;
+
+    @JsonProperty("studio_patch")
+    private String studioPatch;
+
+    @JsonProperty("enabled_features")
+    private List<String> enabledFeatures;
+
+    /**
+     * Getter for studio_version.
+     * 
+     * @return the studio_version
+     */
+    public String getStudioVersion() {
+        return studioVersion;
+    }
+
+    /**
+     * Sets the studio_version.
+     * 
+     * @param studio_version the studio_version to set
+     */
+    public void setStudioVersion(String studioVersion) {
+        this.studioVersion = studioVersion;
+    }
+
+    /**
+     * Getter for studio_patch.
+     * 
+     * @return the studio_patch
+     */
+    public String getStudioPatch() {
+        return studioPatch;
+    }
+
+    /**
+     * Sets the studio_patch.
+     * 
+     * @param studio_patch the studio_patch to set
+     */
+    public void setStudioPatch(String studioPatch) {
+        this.studioPatch = studioPatch;
+    }
+
+    /**
+     * Getter for enabled_features.
+     * 
+     * @return the enabled_features
+     */
+    public List<String> getEnabledFeatures() {
+        return enabledFeatures;
+    }
+
+    /**
+     * Sets the enabled_features.
+     * 
+     * @param enabled_features the enabled_features to set
+     */
+    public void setEnabledFeatures(List<String> enabledFeatures) {
+        this.enabledFeatures = enabledFeatures;
+    }
+
+}

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

@@ -0,0 +1,342 @@
+// ============================================================================
+//
+// 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.pendo;
+
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.StatusLine;
+import org.apache.http.client.entity.EntityBuilder;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.entity.ContentType;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.util.EntityUtils;
+import org.apache.log4j.Level;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.utils.VersionUtils;
+import org.talend.commons.utils.network.IProxySelectorProvider;
+import org.talend.commons.utils.network.NetworkUtil;
+import org.talend.core.GlobalServiceRegister;
+import org.talend.core.context.Context;
+import org.talend.core.context.RepositoryContext;
+import org.talend.core.nexus.HttpClientTransport;
+import org.talend.core.runtime.CoreRuntimePlugin;
+import org.talend.core.service.IRemoteService;
+import org.talend.core.service.IStudioLiteP2Service;
+import org.talend.core.ui.IInstalledPatchService;
+import org.talend.repository.model.RepositoryConstants;
+import org.talend.utils.json.JSONObject;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class PendoTrackSender {
+    
+    private static final String PREFIX_API = "api";
+
+    private static final String PENDO_INFO = "/monitoring/pendo/info";
+
+    private static final String PENDO_TRACK = "/monitoring/pendo/track";
+
+    private static final String HEAD_AUTHORIZATION = "Authorization";
+
+    private static final String HEAD_CONTENT_TYPE = "Content-Type";
+
+    private static final String HEAD_PENDO_KEY = "x-pendo-integration-key";
+
+    private static final String FEATURE_PREFIX = "org.talend.lite.";
+
+    private static final String FEATURE_TAIL = ".feature.feature.group";
+
+    private static PendoTrackSender instance;
+
+    private static String adminUrl;
+
+    private static String apiBaseUrl;
+
+    public static PendoTrackSender getInstance() {
+        if (instance == null) {
+            instance = new PendoTrackSender();
+        }
+        if (StringUtils.isBlank(adminUrl)) {
+            RepositoryContext repositoryContext = getRepositoryContext();
+            if (repositoryContext != null) {
+                adminUrl = repositoryContext.getFields().get(RepositoryConstants.REPOSITORY_URL);
+            }
+        }
+        return instance;
+    }
+
+    public void sendToPendo() {
+        Job job = new Job("send pendo track") {
+
+            @Override
+            protected IStatus run(IProgressMonitor monitor) {
+                try {
+                    sendTrackData();
+                } catch (Exception e) {
+                    // warning only
+                    ExceptionHandler.process(e, Level.WARN);
+                }
+                return Status.OK_STATUS;
+            }
+        };
+        job.setUser(false);
+        job.setPriority(Job.INTERACTIVE);
+        job.schedule();
+    }
+
+    public void sendTrackData() throws Exception {
+        if (!checkTokenUsed(adminUrl) || !NetworkUtil.isNetworkValid()) {
+            return;
+        }
+
+        DefaultHttpClient client = null;
+        CloseableHttpResponse response = null;
+        IProxySelectorProvider proxySelectorProvider = null;
+        try {
+            String pendoInfo = getPendoInfo();
+            if (StringUtils.isBlank(pendoInfo)) {
+                throw new Exception("Pendo information is empty");
+            }
+            String pendoKey = getPendoKeyFromLicense();
+            if (StringUtils.isBlank(pendoKey)) {
+                throw new Exception("Pendo key is empty");
+            }
+            
+            client = new DefaultHttpClient();
+            String url = getBaseUrl() + PENDO_TRACK;
+            HttpPost httpPost = new HttpPost(url);
+            httpPost.setHeader(HEAD_CONTENT_TYPE, ContentType.APPLICATION_JSON.getMimeType());
+            httpPost.setHeader(HEAD_PENDO_KEY, pendoKey);
+
+            proxySelectorProvider = HttpClientTransport.addProxy(client, new URI(url));
+
+            EntityBuilder entityBuilder = EntityBuilder.create();
+            entityBuilder.setText(generateTrackData(pendoInfo)).setContentType(ContentType.APPLICATION_JSON);
+            HttpEntity entity = entityBuilder.build();
+            httpPost.setEntity(entity);
+            response = client.execute(httpPost, HttpClientContext.create());
+            StatusLine statusLine = response.getStatusLine();
+            String responseStr = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
+            if (HttpURLConnection.HTTP_OK != statusLine.getStatusCode()) {
+                throw new Exception(statusLine.toString() + ", server message: [" + responseStr + "]");
+            }
+        } finally {
+            HttpClientTransport.removeProxy(proxySelectorProvider);
+            client.getConnectionManager().shutdown();
+            if (response != null) {
+                try {
+                    response.close();
+                } catch (Throwable e) {
+                    ExceptionHandler.process(e);
+                }
+            }
+            if (client != null) {
+                try {
+                    client.close();
+                } catch (Throwable e) {
+                    ExceptionHandler.process(e);
+                }
+            }
+        }
+    }
+
+    // TODO maybe we will have more event handler later
+    private String generateTrackData(String pendoInfo) throws Exception {
+        JSONObject infoJson = new JSONObject(pendoInfo);
+        String visitorId = ((JSONObject) infoJson.get("visitor")).getString("id");
+        String accountId = ((JSONObject) infoJson.get("account")).getString("id");
+
+        String studioPatch = null;
+        Date date = new Date();
+        IInstalledPatchService installedPatchService = IInstalledPatchService.get();
+        if (installedPatchService != null) {
+            studioPatch = installedPatchService.getLatestInstalledPatchVersion();
+        }
+        List<String> enabledFeatures = new ArrayList<String>();
+        IStudioLiteP2Service studioLiteP2Service = IStudioLiteP2Service.get();
+        if (studioLiteP2Service != null) {
+            List<String> enabledFeaturesList = studioLiteP2Service.getCurrentProjectEnabledFeatures();
+            enabledFeaturesList.stream().forEach(feature -> {
+                String result = feature;
+                if (result.startsWith(FEATURE_PREFIX)) {
+                    result = result.substring(FEATURE_PREFIX.toCharArray().length);
+                }
+                if (result.endsWith(FEATURE_TAIL)) {
+                    result = result.substring(0, result.lastIndexOf(FEATURE_TAIL));
+                }
+                enabledFeatures.add(result);
+            });
+        }
+        PendoLoginProperties loginEvent = new PendoLoginProperties();
+        loginEvent.setStudioVersion(VersionUtils.getInternalMajorVersion());
+        loginEvent.setStudioPatch(studioPatch);
+        loginEvent.setEnabledFeatures(enabledFeatures);
+
+        PendoEventEntity entity = new PendoEventEntity();
+        entity.setType("track");
+        entity.setEvent("Project Login");
+        entity.setVisitorId(visitorId);
+        entity.setAccountId(accountId);
+        entity.setTimestamp(date.getTime());
+        entity.setProperties(loginEvent);
+
+        ObjectMapper mapper = new ObjectMapper();
+        String content = mapper.writeValueAsString(entity);
+        return content;
+    }
+
+    private String getPendoInfo() throws Exception {
+        return getPendoInfo(getBaseUrl(), getToken());
+    }
+
+    private String getPendoInfo(String baseUrl, String token) throws Exception {
+        DefaultHttpClient client = null;
+        CloseableHttpResponse response = null;
+        IProxySelectorProvider proxySelectorProvider = null;
+        try {
+            client = new DefaultHttpClient();
+
+            String url = baseUrl + PENDO_INFO;
+
+            HttpGet httpGet = new HttpGet(url);
+            httpGet.setHeader(HEAD_AUTHORIZATION, "Bearer " + token);
+            proxySelectorProvider = HttpClientTransport.addProxy(client, new URI(url));
+
+            response = client.execute(httpGet, HttpClientContext.create());
+            StatusLine statusLine = response.getStatusLine();
+            String responseStr = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
+            if (HttpURLConnection.HTTP_OK != statusLine.getStatusCode()) {
+                throw new Exception(statusLine.toString() + ", server message: [" + responseStr + "]");
+            }
+            return responseStr;
+        } finally {
+            HttpClientTransport.removeProxy(proxySelectorProvider);
+            client.getConnectionManager().shutdown();
+            if (response != null) {
+                try {
+                    response.close();
+                } catch (Throwable e) {
+                    ExceptionHandler.process(e);
+                }
+            }
+            if (client != null) {
+                try {
+                    client.close();
+                } catch (Throwable e) {
+                    ExceptionHandler.process(e);
+                }
+            }
+        }
+    }
+
+    private boolean checkTokenUsed(String adminUrl) throws Exception {
+        if (StringUtils.isNotBlank(adminUrl) && GlobalServiceRegister.getDefault().isServiceRegistered(IRemoteService.class)) {
+            IRemoteService service = GlobalServiceRegister.getDefault().getService(IRemoteService.class);
+            return service.isTokenUsed(adminUrl);
+        }
+        return false;
+    }
+
+    public String getBaseUrl() throws Exception {
+        return getBaseUrl(adminUrl, false);
+    }
+
+    public String getBaseUrl(String adminUrl, boolean token) throws Exception {
+        if (StringUtils.isNotBlank(apiBaseUrl) && !token) {
+            return apiBaseUrl;
+        }
+
+        try {
+            URL url = new URL(adminUrl);
+            // tmc.int.cloud.talend.com
+            String authority = url.getAuthority();
+            String regex = "(\\w*\\-*\\w*\\.?){2}\\.(talend.com)";
+            Pattern  pattern= Pattern.compile(regex);
+            Matcher match = pattern.matcher(authority);
+            if (match.find()) {
+                // int.cloud.talend.com
+                authority = match.group(0);
+                URL apiURL = new URL(url.getProtocol(), PREFIX_API + "." + authority, "");
+                // https://api.int.cloud.talend.com
+                apiBaseUrl = apiURL.toString();
+            } else {
+                throw new Exception("Can't match pendo url from " + adminUrl);
+            }
+        } catch (MalformedURLException e) {
+            throw new Exception("Invalid url " + adminUrl, e.getCause());
+        }
+
+        return apiBaseUrl;
+    }
+
+    private String getToken() {
+        return getRepositoryContext().getClearPassword();
+    }
+
+    public String getTmcUser(String url, String token) {
+        try {
+            String pendoInfo = getPendoInfo(getBaseUrl(url, true), token);
+            if (StringUtils.isNotBlank(pendoInfo)) {
+                JSONObject infoJson = new JSONObject(pendoInfo);
+                return ((JSONObject) infoJson.get("visitor")).getString("id"); //$NON-NLS-1$ //$NON-NLS-2$
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+        return ""; //$NON-NLS-1$
+    }
+
+    private String getPendoKeyFromLicense() throws Exception {
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(IRemoteService.class)) {
+            IRemoteService service = GlobalServiceRegister.getDefault().getService(IRemoteService.class);
+            return service.getPendoKeyFromLicense();
+        }
+        return null;
+    }
+
+    private static RepositoryContext getRepositoryContext() {
+        RepositoryContext repositoryContext = (RepositoryContext) CoreRuntimePlugin.getInstance().getContext()
+                .getProperty(Context.REPOSITORY_CONTEXT_KEY);
+        return repositoryContext;
+    }
+
+    public void setAdminUrl(String adminUrl) {
+        PendoTrackSender.adminUrl = adminUrl;
+    }
+
+    public void setApiBaseUrl(String apiBaseUrl) {
+        PendoTrackSender.apiBaseUrl = apiBaseUrl;
+    }
+
+}

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

@@ -190,10 +190,10 @@ JavaTypesManager.integer=INTEGER\u306F\u6570\u5024\u3067\u3059:
 JavaTypesManager.list=LIST\u306F\u6570\u5024\u3067\u3059:
 JavaTypesManager.string=STRING\u306F\u6570\u5024\u3067\u3059:
 LDAPCATruster.failedCreateCert=\u8A3C\u660E\u66F8\u30B9\u30C8\u30A2\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
-LDAPCATruster.failedCreateTmp=tmp\u4FE1\u983C\u30B9\u30C8\u30A2\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
+LDAPCATruster.failedCreateTmp=\u4E00\u6642\u30C8\u30E9\u30B9\u30C8\u30B9\u30C8\u30A2\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
 LDAPCATruster.failedInitialTrust=\u521D\u671F\u4FE1\u983C\u30DE\u30CD\u30FC\u30B8\u30E3\u30FC\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
 LDAPCATruster.failedLoadCert=\u8A3C\u660E\u66F8\u30B9\u30C8\u30A2\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-LDAPCATruster.failedSaveTrust=\u4FE1\u983C\u30B9\u30C8\u30A2\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
+LDAPCATruster.failedSaveTrust=\u30C8\u30E9\u30B9\u30C8\u30B9\u30C8\u30A2\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
 LDAPCATruster.locationInvalid=\u8A3C\u660E\u66F8\u30B9\u30C8\u30A2\u30D5\u30A1\u30A4\u30EB\u306E\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3\u304C\u7121\u52B9\u3067\u3059:
 LDAPCATruster.noCertificate=\n\u30AD\u30FC\u30C4\u30FC\u30EB\u30B3\u30DE\u30F3\u30C9\u3092\u4F7F\u3063\u3066\u3001\u30B5\u30FC\u30D0\u30FC\u8A3C\u660E\u66F8\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 LDAPCATruster.sslError1=SSL\u30A8\u30E9\u30FC\uFF1A\u30B5\u30FC\u30D0\u30FC\u8A3C\u660E\u66F8\u3092\u691C\u8A3C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
@@ -635,7 +635,7 @@ DynamicPlugin.addExtension.empty=ExtensionPoint\u307E\u305F\u306FID\u304C\u7A7A\
 BigDataBasicUtil.loadDynamicDistribution.IDynamicDistributionManager.notFound={0}\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
 TalendLibsServerManager.connectUserLibraryFailureMessage=\u7BA1\u7406\u8005\u30E2\u30FC\u30C9\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u30E6\u30FC\u30B6\u30FC\u30E9\u30A4\u30D6\u30E9\u30EA\u30FC\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u304C\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093\u3002{0}\u3078\u306E\u63A5\u7D9A\u304C\u62D2\u5426\u3055\u308C\u307E\u3057\u305F
 TalendLibsServerManager.cannotGetUserLibraryServer=\u30EA\u30E2\u30FC\u30C8\u7BA1\u7406\u8005\u304B\u3089\u30E6\u30FC\u30B6\u30FC\u30E9\u30A4\u30D6\u30E9\u30EA\u30FC\u30B5\u30FC\u30D0\u30FC\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093
-MigrationReportAccessDialog.title=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30A2\u30A4\u30C6\u30E0\u306E\u79FB\u884C
+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
@@ -649,7 +649,7 @@ MigrationReportAccessDialog.notNowButton=\u5F8C\u3067
 ItemAnalysisReportManager.Information.title=\u60C5\u5831
 ItemAnalysisReportManager.Information.message=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u5206\u6790\u304C\u6B63\u3057\u304F\u5B8C\u4E86\u3057\u307E\u3057\u305F\u3002\u4F8B\u5916\u30EC\u30B3\u30FC\u30C9\u306F\u751F\u6210\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002
 ItemAnalysisReportManager.Warning.title=\u8B66\u544A
-ItemAnalysisReportManager.Warning.message=\u65B0\u3057\u3044\u5206\u6790\u3092\u5B9F\u884C\u3067\u304D\u307E\u305B\u3093\u3002\u73FE\u5728\u306E\u5206\u6790\u304C\u5B8C\u4E86\u3057\u3066\u304B\u3089\u3001\u3082\u3046\u4E00\u5EA6\u8A66\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+ItemAnalysisReportManager.Warning.message=\u65B0\u3057\u3044\u5206\u6790\u3092\u5B9F\u884C\u3067\u304D\u307E\u305B\u3093\u3002\u73FE\u5728\u306E\u5206\u6790\u304C\u5B8C\u4E86\u3057\u3066\u304B\u3089\u3001\u3084\u308A\u76F4\u3057\u3066\u307F\u3066\u304F\u3060\u3055\u3044\u3002
 AnalysisReportAccessDialog.shellTitle=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u5206\u6790
 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

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

@@ -12,6 +12,11 @@
 // ============================================================================
 package org.talend.core.runtime.services;
 
+import java.util.List;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jdt.core.IClasspathEntry;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
 import org.talend.core.model.properties.RoutineItem;
@@ -24,6 +29,10 @@ public interface IDesignerMavenService extends IService {
     String getImportGAVPackageForCodesJar(CodesJarInfo info);
 
     void updateCodeJarMavenProject(CodesJarInfo info, boolean needReSync) throws Exception;
+    
+    void enableMavenNature(IProgressMonitor monitor, IProject project);
+
+    void addProjectClasspathEntry(IProgressMonitor monitor, IProject project, List<IClasspathEntry> entries);
 
     String getLocalRepositoryPath() throws Exception;
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/util/SAPUtils.java

@@ -0,0 +1,42 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.runtime.util;
+
+import org.apache.commons.lang.StringUtils;
+import org.talend.core.model.metadata.ISAPConstant;
+import org.talend.core.model.metadata.builder.connection.SAPConnection;
+import org.talend.cwm.helper.TaggedValueHelper;
+
+/**
+ * created by hcyi on Nov 29, 2021
+ * Detailled comment
+ *
+ */
+public class SAPUtils {
+
+    public static boolean isHana(SAPConnection connection) {
+        if (connection != null) {
+            String connectionType = TaggedValueHelper.getValueString(ISAPConstant.ADSO_CONNECTION_TYPE, connection);
+            if (StringUtils.isBlank(connectionType)) {
+                String dbHost = TaggedValueHelper.getValueString(ISAPConstant.PROP_DB_HOST, connection);
+                if (StringUtils.isNotBlank(dbHost)) {
+                    return true;
+                }
+            } else if (ISAPConstant.HANA_JDBC.equals(connectionType)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+}

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

@@ -0,0 +1,27 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.service;
+
+import org.talend.core.IService;
+
+/**
+ * Manage the download of sqlexplorer and top.chart jar files.
+ */
+public interface IDQJarManagementService extends IService {
+
+    /**
+     * check and show the download page, this method should be called in TOP only.
+     */
+    public void checkSqlexplorerTopchartLibraries();
+
+}

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

@@ -34,4 +34,8 @@ public interface IRemoteService extends IService {
             LoginException, JSONException;
 
     boolean isAuthorized(String value);
+
+    boolean isTokenUsed(String adminUrl) throws Exception;
+
+    String getPendoKeyFromLicense() throws Exception;
 }

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

@@ -118,6 +118,10 @@ public interface IStudioLiteP2Service extends IService {
 
     void closingStudioGUI(boolean restart);
 
+    List<String> getCurrentProjectEnabledFeatures() throws Exception;
+
+    boolean checkProjectCompatibility(IProgressMonitor monitor, Project proj) throws Exception;
+
     public static IStudioLiteP2Service get() {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IStudioLiteP2Service.class)) {
             return GlobalServiceRegister.getDefault().getService(IStudioLiteP2Service.class);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/sqlbuilder/util/TextUtil.java

@@ -262,9 +262,8 @@ public class TextUtil {
     public static boolean isDoubleQuotesNeededDbType(String dbType) {
         boolean isPostgresql = dbType.equalsIgnoreCase(EDatabaseTypeName.PSQL.getXmlName());
         boolean isGreenplum = dbType.equalsIgnoreCase(EDatabaseTypeName.GREENPLUM.getXmlName());
-        boolean isParaccel = dbType.equalsIgnoreCase(EDatabaseTypeName.PARACCEL.getXmlName());
         boolean isH2 = dbType.equalsIgnoreCase(EDatabaseTypeName.H2.getXmlName());
-        return isPostgresql || isGreenplum || isParaccel || isH2;
+        return isPostgresql || isGreenplum || isH2;
     }
 
     /**

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

@@ -30,6 +30,8 @@ public interface IInstalledPatchService extends IService {
 
     void updatePatchInstalled(String installedName, String installedVersion, String comment) throws IOException;
 
+    String getLatestInstalledPatchVersion();
+
     public static IInstalledPatchService get() {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IInstalledPatchService.class)) {
             return GlobalServiceRegister.getDefault().getService(IInstalledPatchService.class);

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

@@ -438,8 +438,6 @@ public final class TalendQuoteUtils {
             return QUOTATION_MARK;
         case IBMDB2:
             return QUOTATION_MARK;
-        case INGRES:
-            return QUOTATION_MARK;
         case MSODBC:
             return QUOTATION_MARK;
         case MSSQL:
@@ -453,15 +451,12 @@ public final class TalendQuoteUtils {
             return QUOTATION_MARK;
         case PSQL:
         case GREENPLUM:
-        case PARACCEL:
         case PLUSPSQL:
             return QUOTATION_MARK;
         case SYBASEASE:
             return QUOTATION_MARK;
         case SYBASEIQ:
             return QUOTATION_MARK;
-        case INTERBASE:
-            return QUOTATION_MARK;
         case SQLITE:
             return QUOTATION_MARK;
         case FIREBIRD:
@@ -474,6 +469,8 @@ public final class TalendQuoteUtils {
             return QUOTATION_MARK;
         case H2:
             return QUOTATION_ESC_MARK;
+        case SNOWFLAKE:
+            return QUOTATION_MARK;
             // case JAVADB_DERBYCLIENT:
             // return QUOTATION_MARK;
             // case JAVADB_JCCJDBC:

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

@@ -234,6 +234,8 @@ public interface IRunProcessService extends IService {
 
     void clearProjectRelatedSettings();
 
+    void clearAllBuildCaches();
+
     void batchDeleteAllVersionTalendJobProject(List<String> idList);
 
     boolean isExportConfig();

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

@@ -40,7 +40,6 @@ import org.talend.repository.IRepositoryChangedListener;
 import org.talend.repository.IRepositoryElementDelta;
 import org.talend.repository.ui.actions.AContextualAction;
 import org.talend.repository.ui.views.IRepositoryView;
-import org.talend.utils.json.JSONException;
 
 /**
  * DOC qian class global comment. Interface for RepositoryService. <br/>
@@ -134,9 +133,9 @@ public interface IRepositoryService extends IService {
      * @param project
      * @param onlyLocalIfPossible try to only get branches from local repository to improve performance
      * @return
-     * @throws JSONException
+     * @throws Exception
      */
-    public List<String> getProjectBranch(Project project, boolean onlyLocalIfPossible) throws JSONException;
+    public List<String> getProjectBranch(Project project, boolean onlyLocalIfPossible) throws Exception;
 
     public boolean askRetryForNetworkIssue(Throwable ex);
 

main/plugins/org.talend.core.ui/pom.xml

@@ -30,17 +30,17 @@
 								<artifactItem>
 									<groupId>com.github.oshi</groupId>
 									<artifactId>oshi-core</artifactId>
-									<version>5.2.5</version>
+									<version>5.8.3</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>net.java.dev.jna</groupId>
 									<artifactId>jna</artifactId>
-									<version>5.6.0</version>
+									<version>5.9.0</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>net.java.dev.jna</groupId>
 									<artifactId>jna-platform</artifactId>
-									<version>5.6.0</version>
+									<version>5.9.0</version>
 								</artifactItem>
 							</artifactItems>
 						</configuration>

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

@@ -579,5 +579,5 @@ I18nPreferencePage.restart=Red\u00E9marrer
 I18nPreferencePage.restartButton=Red\u00E9marrage requis pour prendre en compte les modifications.
 I18nPreferencePage.restoreDefault=Restaurer les param\u00E8tres par d\u00E9faut
 I18nPreferencePage.wait_process=Le processus va prendre plusieurs minutes, patientez...
-MetadataPreferencePage.EnableBasic.name=Autorise l'en-t\u00EAte d'authentification simple
+MetadataPreferencePage.EnableBasic.name=Autorise l'en-t\u00EAte d'authentification basique
 MetadataPreferencePage.MessageDialog.Restart=Le Studio doit red\u00E9marrer pour que ce param\u00E8tre soit pris en compte.\n\u00CAtes-vous s\u00FBr(e)\u00A0?

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

@@ -139,10 +139,10 @@ JavaTypesManager.integer=INTEGER\u306F\u6570\u5024\u3067\u3059:
 JavaTypesManager.list=LIST\u306F\u6570\u5024\u3067\u3059:
 JavaTypesManager.string=STRING\u306F\u6570\u5024\u3067\u3059:
 LDAPCATruster.failedCreateCert=\u8A3C\u660E\u66F8\u30B9\u30C8\u30A2\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
-LDAPCATruster.failedCreateTmp=tmp\u4FE1\u983C\u30B9\u30C8\u30A2\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
+LDAPCATruster.failedCreateTmp=\u4E00\u6642\u30C8\u30E9\u30B9\u30C8\u30B9\u30C8\u30A2\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
 LDAPCATruster.failedInitialTrust=\u521D\u671F\u4FE1\u983C\u30DE\u30CD\u30FC\u30B8\u30E3\u30FC\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
 LDAPCATruster.failedLoadCert=\u8A3C\u660E\u66F8\u30B9\u30C8\u30A2\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-LDAPCATruster.failedSaveTrust=\u4FE1\u983C\u30B9\u30C8\u30A2\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
+LDAPCATruster.failedSaveTrust=\u30C8\u30E9\u30B9\u30C8\u30B9\u30C8\u30A2\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
 LDAPCATruster.locationInvalid=\u8A3C\u660E\u66F8\u30B9\u30C8\u30A2\u30D5\u30A1\u30A4\u30EB\u306E\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3\u304C\u7121\u52B9\u3067\u3059:
 LDAPCATruster.noCertificate=\n\u30AD\u30FC\u30C4\u30FC\u30EB\u30B3\u30DE\u30F3\u30C9\u3092\u4F7F\u3063\u3066\u3001\u30B5\u30FC\u30D0\u30FC\u8A3C\u660E\u66F8\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 LDAPCATruster.sslError1=SSL\u30A8\u30E9\u30FC\uFF1A\u30B5\u30FC\u30D0\u30FC\u8A3C\u660E\u66F8\u3092\u691C\u8A3C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/services/IGitUIProviderService.java

@@ -6,6 +6,7 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
+import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
 import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.ui.properties.tab.IDynamicProperty;
@@ -21,4 +22,16 @@ public interface IGitUIProviderService extends IService {
 
     public String[] changeCredentials(Shell parent, Serializable uriIsh, String initUser, boolean canStoreCredentials);
 
+    boolean checkPendingChanges();
+
+    public void openPushFailedDialog(Object pushResult);
+
+    public static IGitUIProviderService get() {
+        GlobalServiceRegister register = GlobalServiceRegister.getDefault();
+        if (!register.isServiceRegistered(IGitUIProviderService.class)) {
+            return null;
+        }
+        return register.getService(IGitUIProviderService.class);
+    }
+
 }

main/plugins/org.talend.core/.classpath

@@ -1,13 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="lib/log4j-api-2.13.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/log4j-core-2.13.2.jar"/>
-	<classpathentry kind="src" path="src/main/java/"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry exported="true" kind="lib" path="lib/log4j-api-2.17.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/log4j-core-2.17.1.jar"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

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

@@ -59,6 +59,6 @@ Import-Package: org.eclipse.m2e.core,
  org.eclipse.m2e.core.embedder,
  org.slf4j,
  org.slf4j.spi
-Bundle-ClassPath: lib/log4j-api-2.13.2.jar,
- lib/log4j-core-2.13.2.jar,
+Bundle-ClassPath: lib/log4j-api-2.17.1.jar,
+ lib/log4j-core-2.17.1.jar,
  .

main/plugins/org.talend.core/pom.xml

@@ -13,7 +13,7 @@
   		<dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.13.2</version>
+            <version>2.17.1</version>
         </dependency>
   </dependencies>
   <build>

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

@@ -251,12 +251,12 @@ HTMLDocGenerator.label=LABEL
 HTMLDocGenerator.language=\u8A00\u8A9E
 HTMLDocGenerator.length=\u9577\u3055
 HTMLDocGenerator.mapper.alias=\u30A8\u30A4\u30EA\u30A2\u30B9
-HTMLDocGenerator.mapper.entries=\u30AB\u30B9\u30BF\u30E0\u6761\u4EF6\u30A8\u30F3\u30C8\u30EA
+HTMLDocGenerator.mapper.entries=\u30AB\u30B9\u30BF\u30E0\u6761\u4EF6\u30A8\u30F3\u30C8\u30EA\u30FC
 HTMLDocGenerator.mapper.expression=\u5F0F
 HTMLDocGenerator.mapper.iaminimized=isMinimized
 HTMLDocGenerator.mapper.isjoin=isJoin
 HTMLDocGenerator.mapper.join.type=\u30B8\u30E7\u30A4\u30F3\u30BF\u30A4\u30D7
-HTMLDocGenerator.mapper.metadatatable.entries=\u30E1\u30BF\u30C7\u30FC\u30BF\u30C6\u30FC\u30D7\u30EB\u30A8\u30F3\u30C8\u30EA
+HTMLDocGenerator.mapper.metadatatable.entries=\u30E1\u30BF\u30C7\u30FC\u30BF\u30C6\u30FC\u30D7\u30EB\u30A8\u30F3\u30C8\u30EA\u30FC
 HTMLDocGenerator.mapper.operator=\u6F14\u7B97\u5B50
 HTMLDocGenerator.mapper.table.for=\u30DE\u30C3\u30D1\u30FC\u30C6\u30FC\u30D6\u30EB
 HTMLDocGenerator.mapper.table.name=\u30C6\u30FC\u30D6\u30EB\u540D
@@ -283,7 +283,7 @@ HTMLDocGenerator.source_code=\u30BD\u30FC\u30B9\u30B3\u30FC\u30C9
 HTMLDocGenerator.stats_logs=\u7D71\u8A08\u3068\u30ED\u30B0
 HTMLDocGenerator.status=\u30B9\u30C6\u30FC\u30BF\u30B9
 HTMLDocGenerator.summary=\u30B5\u30DE\u30EA\u30FC
-HTMLDocGenerator.tmap.constraint.entries=\u5236\u7D04\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA
+HTMLDocGenerator.tmap.constraint.entries=\u5236\u7D04\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30FC
 HTMLDocGenerator.tmap.isinnerjoin=isInnerJoin
 HTMLDocGenerator.tmap.expressionfilter=expressionFilter
 HTMLDocGenerator.tmap.isnullable=isNullable

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

@@ -519,7 +519,7 @@ public class CoreService implements ICoreService {
         List<IComponentInstallerTask> tasks = ComponentInstallerTaskRegistryReader.getInstance().getTasks();
         tasks.forEach(task -> {
             try {
-                ExceptionHandler.log(task.getClass().getCanonicalName() + ", " + task.getComponentType() + "" + task.getComponentGAV().toString());
+                ExceptionHandler.logDebug(task.getClass().getCanonicalName() + ", " + task.getComponentType() + "" + task.getComponentGAV().toString());
                 task.install(monitor);
             } catch (Exception e) {
                 ExceptionHandler.process(e);

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

@@ -63,7 +63,6 @@ public final class GenerateQueryFactory {
         case IBMDB2ZOS:
         case MYSQL:
         case AMAZON_AURORA:
-        case INGRES:
             return new NonDatabaseDefaultQueryGenerator(dbType);
         case ORACLE_OCI:
         case ORACLEFORSID:
@@ -81,7 +80,6 @@ public final class GenerateQueryFactory {
         case HSQLDB_SERVER:
         case HSQLDB_WEBSERVER:
         case INFORMIX:
-        case INTERBASE:
         case JAVADB:
         case JAVADB_DERBYCLIENT:
         case JAVADB_EMBEDED:
@@ -89,7 +87,6 @@ public final class GenerateQueryFactory {
         case MAXDB:
         case MSODBC:
         case MSSQL:
-        case PARACCEL:
         case REDSHIFT:
         case REDSHIFT_SSO:
         case SQLITE:

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

@@ -47,7 +47,7 @@ abstract public class BaseComponentInstallerTask implements IComponentInstallerT
     private static final Logger LOGGER = LoggerFactory.getLogger(BaseComponentInstallerTask.class);
     private static final String SYS_PROP_TCOMPV0 = "tcompv0.update";
     private static final String SYS_PROP_OVERWRITE = "m2.overwrite";
-    private static final String SYS_PROP_OVERWRITE_DEFAULT = "false";
+    private static final String SYS_PROP_OVERWRITE_DEFAULT = Boolean.FALSE.toString();
 
     private static final String SYS_CUSTOM_MAVEN_REPO = "maven.local.repository";
     
@@ -58,7 +58,10 @@ abstract public class BaseComponentInstallerTask implements IComponentInstallerT
     private Set<ComponentGAV> gavs = new HashSet<ComponentGAV>();
     
     protected boolean overWriteM2() {
-        String prop = System.getProperty(SYS_PROP_OVERWRITE, SYS_PROP_OVERWRITE_DEFAULT);
+        /**
+         * force to overwrite, since need to sync maven-metadata-local.xml
+         */
+        String prop = System.getProperty(SYS_PROP_OVERWRITE, Boolean.TRUE.toString());
         return Boolean.valueOf(prop);
     }
     

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

@@ -79,7 +79,7 @@ public class ComponentInstallerTaskRegistryReader extends RegistryReader {
             readRegistry();
             Collections.sort(ret, new TaskComparator());
         }
-        ExceptionHandler.log("ComponentInstallerTaskRegistryReader, num of tasks: " + ret.size());
+        ExceptionHandler.logDebug("ComponentInstallerTaskRegistryReader, num of tasks: " + ret.size());
         return ret;
     }
 

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

@@ -614,7 +614,7 @@ public class TalendTextUtils {
      */
     private static boolean isPSQLSimilar(EDatabaseTypeName name) {
         return !name.equals(EDatabaseTypeName.PSQL) && !name.equals(EDatabaseTypeName.PLUSPSQL)
-                && !name.equals(EDatabaseTypeName.GREENPLUM) && !name.equals(EDatabaseTypeName.PARACCEL);
+                && !name.equals(EDatabaseTypeName.GREENPLUM);
     }
 
     /**

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

@@ -41,7 +41,7 @@ public interface IGITProviderService extends IService {
      * @param onlyLocalIfPossible try to only get branches from local repository to improve performance
      * @return
      */
-    public String[] getBranchList(Project project, boolean onlyLocalIfPossible);
+    public String[] getBranchList(Project project, boolean onlyLocalIfPossible) throws Exception;
 
     public boolean isGITProject(Project p) throws PersistenceException;
 

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

@@ -34,4 +34,11 @@ public interface IClasspathAdjuster {
     {
         return adjustClassPath(modulesToAjust);//modulesToAjust;
     };
+
+    /**
+     * Have a chance to add some modules when generate pom file
+     */
+    default public Set<ModuleNeeded> adjustPomGeneration(IProcess process, Set<ModuleNeeded> modulesToAjust) {
+        return modulesToAjust;
+    };
 }

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

@@ -34,6 +34,7 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.IWorkspaceDescription;
@@ -44,13 +45,15 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.jdt.core.IClasspathAttribute;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.ui.IEditorPart;
 import org.talend.commons.CommonsPlugin;
 import org.talend.commons.exception.CommonExceptionHandler;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.runtime.model.repository.ERepositoryStatus;
-import org.talend.commons.runtime.utils.io.FileCopyUtils;
 import org.talend.commons.utils.PasswordEncryptUtil;
 import org.talend.commons.utils.generation.JavaUtils;
 import org.talend.commons.utils.time.TimeMeasure;
@@ -106,6 +109,7 @@ import org.talend.core.runtime.process.TalendProcessArgumentConstant;
 import org.talend.core.runtime.process.TalendProcessOptionConstants;
 import org.talend.core.runtime.projectsetting.ProjectPreferenceManager;
 import org.talend.core.runtime.repository.build.BuildExportManager;
+import org.talend.core.runtime.services.IDesignerMavenService;
 import org.talend.core.service.IResourcesDependenciesService;
 import org.talend.core.services.ICoreTisService;
 import org.talend.core.services.IGITProviderService;
@@ -1263,39 +1267,6 @@ public class ProcessorUtilities {
         }
     }
 
-    private static void syncContextResourcesForParentJob(IProcess currentProcess, IProgressMonitor progressMonitor) {
-        ITalendProcessJavaProject processJavaProject = mainJobInfo.getProcessor().getTalendJavaProject();
-
-        final IFolder mainResourcesFolder = processJavaProject.getExternalResourcesFolder();
-        final File targetFolder = mainResourcesFolder.getLocation().toFile();
-
-        final Set<JobInfo> dependenciesItems = mainJobInfo.getProcessor().getBuildChildrenJobs();
-
-        final IRunProcessService runProcessService = (IRunProcessService) GlobalServiceRegister.getDefault().getService(
-                IRunProcessService.class);
-
-        List<ProcessItem> dependenciesItemsFiltered = dependenciesItems.stream().filter(jobInfo -> !jobInfo.isJoblet())
-                .map(JobInfo::getProcessItem).collect(Collectors.toList());
-        
-        if (dependenciesItemsFiltered.size() > 0) {
-            dependenciesItemsFiltered.forEach(item -> {
-                ITalendProcessJavaProject childJavaProject = runProcessService.getTalendJobJavaProject(item.getProperty());
-                if (childJavaProject != null) {
-                    final IFolder childResourcesFolder = childJavaProject.getExternalResourcesFolder();
-                    if (childResourcesFolder.exists()) {
-                        FileCopyUtils.syncFolder(childResourcesFolder.getLocation().toFile(), targetFolder, false);
-                    }
-                }
-            });
-
-            try {
-                mainResourcesFolder.refreshLocal(IResource.DEPTH_INFINITE, progressMonitor);
-            } catch (CoreException e) {
-                ExceptionHandler.process(e);
-            }
-        }
-    }
-
     private static Set<ModuleNeeded> getAllJobTestcaseModules(ProcessItem selectedProcessItem) {
         Set<ModuleNeeded> neededLibraries = new HashSet<>();
         if (GlobalServiceRegister.getDefault().isServiceRegistered(ITestContainerProviderService.class)) {
@@ -1499,7 +1470,6 @@ public class ProcessorUtilities {
                 }
             }
         }
-        syncContextResourcesForParentJob(currentProcess, null);
     }
 
     /**
@@ -1555,6 +1525,7 @@ public class ProcessorUtilities {
         }
         jobInfo.setProcessItem(null);
         if (!BitwiseOptionUtils.containOption(option, GENERATE_MAIN_ONLY)) {
+            List<JobInfo> firstSubjobs = new ArrayList<JobInfo>();
             // handle subjob in joblet. see bug 004937: tRunJob in a Joblet
             for (INode node : currentProcess.getGeneratingNodes()) {
                 String componentName = node.getComponent().getName();
@@ -1643,6 +1614,8 @@ public class ProcessorUtilities {
 
                                 if (!BitwiseOptionUtils.containOption(option, GENERATE_WITH_FIRST_CHILD)) {
                                     currentProcess.setNeedRegenerateCode(true);
+                                } else {
+                                    firstSubjobs.add(subJobInfo);
                                 }
                             }
 
@@ -1651,6 +1624,9 @@ public class ProcessorUtilities {
                     }
                 }
             }
+            if (BitwiseOptionUtils.containOption(option, GENERATE_WITH_FIRST_CHILD)) {
+                handleGenerateFirstChildOnlyClasspath(progressMonitor, jobInfo, firstSubjobs);
+            }
         }
     }
 
@@ -1659,6 +1635,32 @@ public class ProcessorUtilities {
         includeESBFlag |= esbIncludingOption;
         jobInfo.setIncludeESBFlag(includeESBFlag);
     }
+    
+    private static void handleGenerateFirstChildOnlyClasspath(IProgressMonitor progressMonitor, JobInfo jobInfo,
+            List<JobInfo> subjobInfoList) {
+        IDesignerMavenService mavenService = IDesignerMavenService.get();
+        if (mavenService == null || jobInfo == null || subjobInfoList.isEmpty()) {
+            return;
+        }
+        List<IClasspathEntry> classpathEntries = new ArrayList<IClasspathEntry>();
+        for (JobInfo subJobInfo : subjobInfoList) {
+            if (subJobInfo.getProcessor() != null) {
+                IProject codeProject = subJobInfo.getProcessor().getCodeProject();
+                if (codeProject != null) {
+                    mavenService.enableMavenNature(progressMonitor, codeProject);
+                    IClasspathEntry classpathEntry = JavaCore.newSourceEntry(codeProject.getFullPath(), new IPath[0],
+                            new IPath[0], null, new IClasspathAttribute[] {});
+                    classpathEntries.add(classpathEntry);
+                }
+            }
+        }
+        if (jobInfo.getProcessor() != null) {
+            IProject codeProject = jobInfo.getProcessor().getCodeProject();
+            if (codeProject != null) {
+                mavenService.addProjectClasspathEntry(progressMonitor, codeProject, classpathEntries);
+            }
+        }
+    }
 
     static void setGenerationInfoWithChildrenJob(INode node, JobInfo jobInfo, final JobInfo subJobInfo) {
         final LastGenerationInfo generationInfo = LastGenerationInfo.getInstance();
@@ -2040,13 +2042,12 @@ public class ProcessorUtilities {
     }
 
     public static IProcessor generateCode(IProcess process, IContext context, boolean statistics, boolean trace,
-            boolean properties, int option) throws ProcessorException {
+            boolean properties, int option, IProgressMonitor monitor) throws ProcessorException {
         updateCodeSources();
         // achen modify to fix 0006107
         JobInfo jobInfo = new JobInfo(process, context);
         resetBuildFlagsAndCaches();
-        IProcessor genCode = generateCode(jobInfo, context.getName(), statistics, trace, properties, option,
-                new NullProgressMonitor());
+        IProcessor genCode = generateCode(jobInfo, context.getName(), statistics, trace, properties, option, monitor);
         resetBuildFlagsAndCaches();
         return genCode;
     }

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

@@ -992,7 +992,7 @@ _UI_PCB_list_feature=\u30EA\u30B9\u30C8
 _UI_PCB_keyLength_feature=\u30AD\u30FC\u306E\u9577\u3055
 _UI_PCB_processingOptions_feature=\u51E6\u7406\u30AA\u30D7\u30B7\u30E7\u30F3
 _UI_PCB_positioning_feature=\u4F4D\u7F6E\u6C7A\u3081
-_UI_PCB_sequentialBuffering_feature=\u30B7\u30FC\u30B1\u30F3\u30B7\u30E3\u30EB\u30D0\u30C3\u30D5\u30A1\u30FC\u30EA\u30F3\u30B0
+_UI_PCB_sequentialBuffering_feature=\u30B7\u30FC\u30B1\u30F3\u30B7\u30E3\u30EB\u30D0\u30C3\u30D5\u30A1\u30EA\u30F3\u30B0
 _UI_PCB_alternateResponse_feature=\u4E92\u3044\u9055\u3044\u306E\u5FDC\u7B54
 _UI_PCB_express_feature=\u8868\u73FE
 _UI_PCB_modify_feature=\u5909\u66F4

main/plugins/org.talend.designer.maven.aether/.classpath

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+
 	<classpathentry exported="true" kind="lib" path="lib/wagon-http-lightweight.jar" sourcepath="D:/.m2/repository/org/apache/maven/wagon/wagon-http-lightweight/3.0.0/wagon-http-lightweight-3.0.0-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-transport-file.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-transport-http.jar"/>

main/plugins/org.talend.designer.maven.aether/pom.xml

@@ -63,6 +63,10 @@
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </exclusion>
+        <exclusion>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -75,6 +79,11 @@
 	    <artifactId>commons-io</artifactId>
 	    <version>2.8.0</version>
     </dependency>
+    <dependency>
+        <groupId>commons-codec</groupId>
+        <artifactId>commons-codec</artifactId>
+        <version>1.15</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-http-lightweight</artifactId>

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

@@ -1,190 +1,191 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.talend.studio</groupId>
-		<artifactId>tcommon-studio-se</artifactId>
-		<version>8.0.1-SNAPSHOT</version>
-		<relativePath>../../../</relativePath>
-	</parent>
-	<artifactId>org.talend.designer.maven.repo.tck</artifactId>
-	<packaging>eclipse-plugin</packaging>
-	<properties>
-		<jackson.version>2.12.1</jackson.version>
-		<slf4j.version>1.7.32</slf4j.version>
-	</properties>
-	<repositories>
-		<repository>
-			<id>talend_open</id>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-			<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
-		</repository>
-		<repository>
-			<id>talend_open_snapshots</id>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
-		</repository>
-	</repositories>
-
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.talend.components</groupId>
-				<artifactId>connectors-se</artifactId>
-				<version>${tacokit.components.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-			<!-- following dependencies fix provided scope to compile for dependencies from connectors-se -->
-			<dependency>
-				<groupId>com.fasterxml.jackson.core</groupId>
-				<artifactId>jackson-annotations</artifactId>
-				<version>${jackson.version}</version>
-				<scope>compile</scope>
-			</dependency>
-			<dependency>
-				<groupId>com.fasterxml.jackson.core</groupId>
-				<artifactId>jackson-core</artifactId>
-				<version>${jackson.version}</version>
-				<scope>compile</scope>
-			</dependency>
-			<dependency>
-				<groupId>com.fasterxml.jackson.core</groupId>
-				<artifactId>jackson-databind</artifactId>
-				<version>${jackson.version}</version>
-				<scope>compile</scope>
-			</dependency>
-			<dependency>
-				<groupId>com.google.code.findbugs</groupId>
-				<artifactId>jsr305</artifactId>
-				<version>3.0.1</version>
-				<scope>compile</scope>
-			</dependency>
-			<dependency>
-				<groupId>com.thoughtworks.paranamer</groupId>
-				<artifactId>paranamer</artifactId>
-				<version>2.7</version>
-				<scope>compile</scope>
-			</dependency>
-			<dependency>
-				<groupId>javax.inject</groupId>
-				<artifactId>javax.inject</artifactId>
-				<version>1</version>
-				<scope>compile</scope>
-			</dependency>
-			<dependency>
-				<groupId>javax.servlet</groupId>
-				<artifactId>javax.servlet-api</artifactId>
-				<version>3.1.0</version>
-				<scope>compile</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.avro</groupId>
-				<artifactId>avro</artifactId>
-				<version>1.8.2</version>
-				<scope>compile</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.tukaani</groupId>
-				<artifactId>xz</artifactId>
-				<version>1.5</version>
-				<scope>compile</scope>
-			</dependency>
-			<!-- end dependencies which fix provided scope to compile -->
-		</dependencies>
-	</dependencyManagement>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>${slf4j.version}</version>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.8.2</version>
-				<executions>
-					<execution>
-						<id>default-deploy</id>
-						<phase>deploy</phase>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-clean-plugin</artifactId>
-				<version>3.1.0</version>
-				<configuration>
-					<filesets>
-						<fileset>
-							<directory>${project.basedir}/repository</directory>
-							<includes>
-								<include>**/*</include>
-							</includes>
-							<followSymlinks>false</followSymlinks>
-						</fileset>
-						<fileset>
-							<directory>${project.basedir}/tmp</directory>
-							<includes>
-								<include>**/*</include>
-							</includes>
-							<followSymlinks>false</followSymlinks>
-						</fileset>
-					</filesets>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-dependencies-jar</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.basedir}/tmp</outputDirectory>
-							<includeScope>runtime</includeScope>
-							<useRepositoryLayout>true</useRepositoryLayout>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.8</version>
-				<executions>
-					<execution>
-						<id>zip-maven-repository</id>
-						<phase>generate-sources</phase>
-						<configuration>
-							<tasks>
-								<zip destfile="${project.basedir}/repository/maven_repository.zip" basedir="${project.basedir}/tmp/" />
-								<delete dir="${project.basedir}/tmp/" />
-							</tasks>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.talend.studio</groupId>
+		<artifactId>tcommon-studio-se</artifactId>
+		<version>8.0.1-SNAPSHOT</version>
+		<relativePath>../../../</relativePath>
+	</parent>
+	<artifactId>org.talend.designer.maven.repo.tck</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	<properties>
+		<jackson.version>2.12.1</jackson.version>
+		<slf4j.version>1.7.32</slf4j.version>
+        <tycho.buildtimestamp.format>${timestamp}</tycho.buildtimestamp.format>
+	</properties>
+	<repositories>
+		<repository>
+			<id>talend_open</id>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+			<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
+		</repository>
+		<repository>
+			<id>talend_open_snapshots</id>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+		</repository>
+	</repositories>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.talend.components</groupId>
+				<artifactId>connectors-se</artifactId>
+				<version>${tacokit.components.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<!-- following dependencies fix provided scope to compile for dependencies from connectors-se -->
+			<dependency>
+				<groupId>com.fasterxml.jackson.core</groupId>
+				<artifactId>jackson-annotations</artifactId>
+				<version>${jackson.version}</version>
+				<scope>compile</scope>
+			</dependency>
+			<dependency>
+				<groupId>com.fasterxml.jackson.core</groupId>
+				<artifactId>jackson-core</artifactId>
+				<version>${jackson.version}</version>
+				<scope>compile</scope>
+			</dependency>
+			<dependency>
+				<groupId>com.fasterxml.jackson.core</groupId>
+				<artifactId>jackson-databind</artifactId>
+				<version>${jackson.version}</version>
+				<scope>compile</scope>
+			</dependency>
+			<dependency>
+				<groupId>com.google.code.findbugs</groupId>
+				<artifactId>jsr305</artifactId>
+				<version>3.0.1</version>
+				<scope>compile</scope>
+			</dependency>
+			<dependency>
+				<groupId>com.thoughtworks.paranamer</groupId>
+				<artifactId>paranamer</artifactId>
+				<version>2.7</version>
+				<scope>compile</scope>
+			</dependency>
+			<dependency>
+				<groupId>javax.inject</groupId>
+				<artifactId>javax.inject</artifactId>
+				<version>1</version>
+				<scope>compile</scope>
+			</dependency>
+			<dependency>
+				<groupId>javax.servlet</groupId>
+				<artifactId>javax.servlet-api</artifactId>
+				<version>3.1.0</version>
+				<scope>compile</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.avro</groupId>
+				<artifactId>avro</artifactId>
+				<version>1.8.2</version>
+				<scope>compile</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.tukaani</groupId>
+				<artifactId>xz</artifactId>
+				<version>1.5</version>
+				<scope>compile</scope>
+			</dependency>
+			<!-- end dependencies which fix provided scope to compile -->
+		</dependencies>
+	</dependencyManagement>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j.version}</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.8.2</version>
+				<executions>
+					<execution>
+						<id>default-deploy</id>
+						<phase>deploy</phase>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-clean-plugin</artifactId>
+				<version>3.1.0</version>
+				<configuration>
+					<filesets>
+						<fileset>
+							<directory>${project.basedir}/repository</directory>
+							<includes>
+								<include>**/*</include>
+							</includes>
+							<followSymlinks>false</followSymlinks>
+						</fileset>
+						<fileset>
+							<directory>${project.basedir}/tmp</directory>
+							<includes>
+								<include>**/*</include>
+							</includes>
+							<followSymlinks>false</followSymlinks>
+						</fileset>
+					</filesets>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-dependencies-jar</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.basedir}/tmp</outputDirectory>
+							<includeScope>runtime</includeScope>
+							<useRepositoryLayout>true</useRepositoryLayout>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.8</version>
+				<executions>
+					<execution>
+						<id>zip-maven-repository</id>
+						<phase>generate-sources</phase>
+						<configuration>
+							<tasks>
+								<zip destfile="${project.basedir}/repository/maven_repository.zip" basedir="${project.basedir}/tmp/" />
+								<delete dir="${project.basedir}/tmp/" />
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

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

@@ -1,426 +1,469 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.talend.studio</groupId>
-		<artifactId>tcommon-studio-se</artifactId>
-		<version>8.0.1-SNAPSHOT</version>
-		<relativePath>../../../</relativePath>
-	</parent>
-	<artifactId>org.talend.designer.maven.repo.tcksdk</artifactId>
-	<packaging>eclipse-plugin</packaging>
-	<properties>
-		<tcomp.version>${component-runtime.version}</tcomp.version>
-		<cxf.version>3.4.4</cxf.version>
-		<geronimo.version>1.0.2</geronimo.version>
-		<jackson.version>2.12.1</jackson.version>
-		<jcache.version>1.0.5</jcache.version>
-		<jcache_spec.version>1.0-alpha-1</jcache_spec.version>
-		<johnzon.version>1.2.10</johnzon.version>
-		<meecrowave.version>1.2.12</meecrowave.version>
-		<microprofile.version>1.2.1</microprofile.version>
-		<owb.version>2.0.23</owb.version>
-		<slf4j.version>1.7.32</slf4j.version>
-		<tomcat.version>9.0.50</tomcat.version>
-		<xbean.version>4.20</xbean.version>
-	</properties>
-	<repositories>
-		<repository>
-			<id>talend_open</id>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-			<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
-		</repository>
-		<repository>
-			<id>talend_open_snapshots</id>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
-		</repository>
-		<repository>
-			<id>sonatype_snapshots</id>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-		</repository>
-	</repositories>
-
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.talend.sdk.component</groupId>
-				<artifactId>component-runtime</artifactId>
-				<version>${component-runtime.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-core</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-integration-cdi</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-frontend-jaxrs</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-rs-client</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-security</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-transports-http</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo</groupId>
-			<artifactId>geronimo-jcache-simple</artifactId>
-			<version>${jcache.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo</groupId>
-			<artifactId>geronimo-opentracing-common</artifactId>
-			<version>${geronimo.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo</groupId>
-			<artifactId>geronimo-opentracing</artifactId>
-			<version>${geronimo.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jcache_1.0_spec</artifactId>
-			<version>${jcache_spec.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.johnzon</groupId>
-			<artifactId>johnzon-core</artifactId>
-			<version>${johnzon.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.johnzon</groupId>
-			<artifactId>johnzon-jaxrs</artifactId>
-			<version>${johnzon.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.johnzon</groupId>
-			<artifactId>johnzon-jsonb</artifactId>
-			<version>${johnzon.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.johnzon</groupId>
-			<artifactId>johnzon-mapper</artifactId>
-			<version>${johnzon.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.meecrowave</groupId>
-			<artifactId>meecrowave-core</artifactId>
-			<version>${meecrowave.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-el22</artifactId>
-			<version>${owb.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-impl</artifactId>
-			<version>${owb.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-se</artifactId>
-			<version>${owb.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-spi</artifactId>
-			<version>${owb.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-web</artifactId>
-			<version>${owb.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat</groupId>
-			<artifactId>tomcat-api</artifactId>
-			<version>${tomcat.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat</groupId>
-			<artifactId>tomcat-catalina</artifactId>
-			<version>${tomcat.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat</groupId>
-			<artifactId>tomcat-coyote</artifactId>
-			<version>${tomcat.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat</groupId>
-			<artifactId>tomcat-jaspic-api</artifactId>
-			<version>${tomcat.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat</groupId>
-			<artifactId>tomcat-jni</artifactId>
-			<version>${tomcat.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat</groupId>
-			<artifactId>tomcat-juli</artifactId>
-			<version>${tomcat.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat</groupId>
-			<artifactId>tomcat-servlet-api</artifactId>
-			<version>${tomcat.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat</groupId>
-			<artifactId>tomcat-util-scan</artifactId>
-			<version>${tomcat.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat</groupId>
-			<artifactId>tomcat-util</artifactId>
-			<version>${tomcat.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat</groupId>
-			<artifactId>tomcat-websocket-api</artifactId>
-			<version>${tomcat.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat</groupId>
-			<artifactId>tomcat-websocket</artifactId>
-			<version>${tomcat.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.xbean</groupId>
-			<artifactId>xbean-asm9-shaded</artifactId>
-			<version>${xbean.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.xbean</groupId>
-			<artifactId>xbean-finder-shaded</artifactId>
-			<version>${xbean.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.xbean</groupId>
-			<artifactId>xbean-finder</artifactId>
-			<version>${xbean.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.xbean</groupId>
-			<artifactId>xbean-reflect</artifactId>
-			<version>${xbean.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.microprofile.opentracing</groupId>
-			<artifactId>microprofile-opentracing-api</artifactId>
-			<version>${microprofile.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.sdk.component</groupId>
-			<artifactId>component-api</artifactId>
-			<version>${component-runtime.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.sdk.component</groupId>
-			<artifactId>component-runtime-design-extension</artifactId>
-			<version>${component-runtime.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.sdk.component</groupId>
-			<artifactId>component-runtime-di</artifactId>
-			<version>${component-runtime.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.sdk.component</groupId>
-			<artifactId>component-runtime-impl</artifactId>
-			<version>${component-runtime.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.sdk.component</groupId>
-			<artifactId>component-runtime-manager</artifactId>
-			<version>${component-runtime.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.sdk.component</groupId>
-			<artifactId>component-server</artifactId>
-			<version>${component-runtime.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.sdk.component</groupId>
-			<artifactId>component-server-api</artifactId>
-			<version>${component-runtime.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.sdk.component</groupId>
-			<artifactId>component-server-extension-api</artifactId>
-			<version>${component-runtime.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.sdk.component</groupId>
-			<artifactId>component-server-model</artifactId>
-			<version>${component-runtime.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.sdk.component</groupId>
-			<artifactId>component-spi</artifactId>
-			<version>${component-runtime.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.sdk.component</groupId>
-			<artifactId>container-core</artifactId>
-			<version>${component-runtime.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.sdk.component</groupId>
-			<artifactId>slf4j-standard</artifactId>
-			<version>${component-runtime.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.sdk.component</groupId>
-			<artifactId>vault-client</artifactId>
-			<version>${component-runtime.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>${slf4j.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-jdk14</artifactId>
-			<version>${slf4j.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<version>${slf4j.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-simple</artifactId>
-			<version>${slf4j.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-cli</groupId>
-			<artifactId>commons-cli</artifactId>
-			<version>1.4</version>
-		</dependency>
-		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-text -->
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-text</artifactId>
-			<version>1.4</version>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.8.2</version>
-				<executions>
-					<execution>
-						<id>default-deploy</id>
-						<phase>deploy</phase>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-clean-plugin</artifactId>
-				<version>3.1.0</version>
-				<configuration>
-					<filesets>
-						<fileset>
-							<directory>${project.basedir}/repository</directory>
-							<includes>
-								<include>**/*</include>
-							</includes>
-							<followSymlinks>false</followSymlinks>
-						</fileset>
-						<fileset>
-							<directory>${project.basedir}/tmp</directory>
-							<includes>
-								<include>**/*</include>
-							</includes>
-							<followSymlinks>false</followSymlinks>
-						</fileset>
-					</filesets>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-dependencies-jar</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.basedir}/tmp</outputDirectory>
-							<includeScope>runtime</includeScope>
-							<useRepositoryLayout>true</useRepositoryLayout>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.8</version>
-				<executions>
-					<execution>
-						<id>zip-maven-repository</id>
-						<phase>generate-sources</phase>
-						<configuration>
-							<tasks>
-								<zip destfile="${project.basedir}/repository/maven_repository.zip" basedir="${project.basedir}/tmp/" />
-								<delete dir="${project.basedir}/tmp/" />
-							</tasks>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.talend.studio</groupId>
+		<artifactId>tcommon-studio-se</artifactId>
+		<version>8.0.1-SNAPSHOT</version>
+		<relativePath>../../../</relativePath>
+	</parent>
+	<artifactId>org.talend.designer.maven.repo.tcksdk</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	<properties>
+		<tcomp.version>${component-runtime.version}</tcomp.version>
+		<cxf.version>3.4.5</cxf.version>
+		<geronimo.version>1.0.2</geronimo.version>
+		<jackson.version>2.12.1</jackson.version>
+		<jcache.version>1.0.5</jcache.version>
+		<jcache_spec.version>1.0-alpha-1</jcache_spec.version>
+		<johnzon.version>1.2.15</johnzon.version>
+		<meecrowave.version>1.2.12</meecrowave.version>
+		<microprofile.version>1.2.1</microprofile.version>
+		<owb.version>2.0.23</owb.version>
+		<slf4j.version>1.7.32</slf4j.version>
+		<tomcat.version>9.0.54</tomcat.version>
+		<xbean.version>4.20</xbean.version>
+		<log4j2.version>2.17.1</log4j2.version>
+        <tycho.buildtimestamp.format>${timestamp}</tycho.buildtimestamp.format>
+	</properties>
+	<repositories>
+		<repository>
+			<id>talend_open</id>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+			<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
+		</repository>
+		<repository>
+			<id>talend_open_snapshots</id>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+		</repository>
+		<repository>
+			<id>sonatype_snapshots</id>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+		</repository>
+	</repositories>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-core</artifactId>
+				<version>${log4j2.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-api</artifactId>
+				<version>${log4j2.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-slf4j-impl</artifactId>
+				<version>${log4j2.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-jul</artifactId>
+				<version>${log4j2.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-jcl</artifactId>
+				<version>${log4j2.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-1.2-api</artifactId>
+				<version>${log4j2.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-to-slf4j</artifactId>
+				<version>${log4j2.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-web</artifactId>
+				<version>${log4j2.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.talend.sdk.component</groupId>
+				<artifactId>component-runtime</artifactId>
+				<version>${component-runtime.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-core</artifactId>
+			<version>${cxf.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-integration-cdi</artifactId>
+			<version>${cxf.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-frontend-jaxrs</artifactId>
+			<version>${cxf.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-rs-client</artifactId>
+			<version>${cxf.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-security</artifactId>
+			<version>${cxf.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-transports-http</artifactId>
+			<version>${cxf.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo</groupId>
+			<artifactId>geronimo-jcache-simple</artifactId>
+			<version>${jcache.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo</groupId>
+			<artifactId>geronimo-opentracing-common</artifactId>
+			<version>${geronimo.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo</groupId>
+			<artifactId>geronimo-opentracing</artifactId>
+			<version>${geronimo.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jcache_1.0_spec</artifactId>
+			<version>${jcache_spec.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.johnzon</groupId>
+			<artifactId>johnzon-core</artifactId>
+			<version>${johnzon.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.johnzon</groupId>
+			<artifactId>johnzon-jaxrs</artifactId>
+			<version>${johnzon.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.johnzon</groupId>
+			<artifactId>johnzon-jsonb</artifactId>
+			<version>${johnzon.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.johnzon</groupId>
+			<artifactId>johnzon-mapper</artifactId>
+			<version>${johnzon.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.meecrowave</groupId>
+			<artifactId>meecrowave-core</artifactId>
+			<version>${meecrowave.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.openwebbeans</groupId>
+			<artifactId>openwebbeans-el22</artifactId>
+			<version>${owb.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.openwebbeans</groupId>
+			<artifactId>openwebbeans-impl</artifactId>
+			<version>${owb.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.openwebbeans</groupId>
+			<artifactId>openwebbeans-se</artifactId>
+			<version>${owb.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.openwebbeans</groupId>
+			<artifactId>openwebbeans-spi</artifactId>
+			<version>${owb.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.openwebbeans</groupId>
+			<artifactId>openwebbeans-web</artifactId>
+			<version>${owb.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-api</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-catalina</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-coyote</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-jaspic-api</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-jni</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-juli</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-servlet-api</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-util-scan</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-util</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-websocket-api</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-websocket</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.xbean</groupId>
+			<artifactId>xbean-asm9-shaded</artifactId>
+			<version>${xbean.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.xbean</groupId>
+			<artifactId>xbean-finder-shaded</artifactId>
+			<version>${xbean.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.xbean</groupId>
+			<artifactId>xbean-finder</artifactId>
+			<version>${xbean.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.xbean</groupId>
+			<artifactId>xbean-reflect</artifactId>
+			<version>${xbean.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.microprofile.opentracing</groupId>
+			<artifactId>microprofile-opentracing-api</artifactId>
+			<version>${microprofile.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.sdk.component</groupId>
+			<artifactId>component-api</artifactId>
+			<version>${component-runtime.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.sdk.component</groupId>
+			<artifactId>component-runtime-design-extension</artifactId>
+			<version>${component-runtime.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.sdk.component</groupId>
+			<artifactId>component-runtime-di</artifactId>
+			<version>${component-runtime.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.sdk.component</groupId>
+			<artifactId>component-runtime-impl</artifactId>
+			<version>${component-runtime.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.sdk.component</groupId>
+			<artifactId>component-runtime-manager</artifactId>
+			<version>${component-runtime.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.sdk.component</groupId>
+			<artifactId>component-server</artifactId>
+			<version>${component-runtime.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.sdk.component</groupId>
+			<artifactId>component-server-api</artifactId>
+			<version>${component-runtime.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.sdk.component</groupId>
+			<artifactId>component-server-extension-api</artifactId>
+			<version>${component-runtime.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.sdk.component</groupId>
+			<artifactId>component-server-model</artifactId>
+			<version>${component-runtime.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.sdk.component</groupId>
+			<artifactId>component-spi</artifactId>
+			<version>${component-runtime.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.sdk.component</groupId>
+			<artifactId>container-core</artifactId>
+			<version>${component-runtime.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.sdk.component</groupId>
+			<artifactId>slf4j-standard</artifactId>
+			<version>${component-runtime.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.sdk.component</groupId>
+			<artifactId>vault-client</artifactId>
+			<version>${component-runtime.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-jdk14</artifactId>
+			<version>${slf4j.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<version>${slf4j.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+			<version>${slf4j.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-cli</groupId>
+			<artifactId>commons-cli</artifactId>
+			<version>1.4</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-text -->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-text</artifactId>
+			<version>1.4</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.8.2</version>
+				<executions>
+					<execution>
+						<id>default-deploy</id>
+						<phase>deploy</phase>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-clean-plugin</artifactId>
+				<version>3.1.0</version>
+				<configuration>
+					<filesets>
+						<fileset>
+							<directory>${project.basedir}/repository</directory>
+							<includes>
+								<include>**/*</include>
+							</includes>
+							<followSymlinks>false</followSymlinks>
+						</fileset>
+						<fileset>
+							<directory>${project.basedir}/tmp</directory>
+							<includes>
+								<include>**/*</include>
+							</includes>
+							<followSymlinks>false</followSymlinks>
+						</fileset>
+					</filesets>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-dependencies-jar</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.basedir}/tmp</outputDirectory>
+							<includeScope>runtime</includeScope>
+							<useRepositoryLayout>true</useRepositoryLayout>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.8</version>
+				<executions>
+					<execution>
+						<id>zip-maven-repository</id>
+						<phase>generate-sources</phase>
+						<configuration>
+							<tasks>
+								<zip destfile="${project.basedir}/repository/maven_repository.zip" basedir="${project.basedir}/tmp/" />
+								<delete dir="${project.basedir}/tmp/" />
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

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

@@ -1,245 +1,246 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.talend.studio</groupId>
-		<artifactId>tcommon-studio-se</artifactId>
-		<version>8.0.1-SNAPSHOT</version>
-		<relativePath>../../../</relativePath>
-	</parent>
-	<artifactId>org.talend.designer.maven.repo.tcompv0</artifactId>
-	<packaging>eclipse-plugin</packaging>
-	<properties>
-		<!-- Might be removed because parent-pom contains property -->
-		<junit.version>4.13.2</junit.version>
-		<!-- Maven repository urls -->
-		<talend_snapshots>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</talend_snapshots>
-		<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>
-	</properties>
-	<repositories>
-		<repository>
-			<id>talend_open</id>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-			<url>${talend_releases}</url>
-		</repository>
-		<repository>
-			<id>talend_open_snapshots</id>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<url>${talend_snapshots}</url>
-		</repository>
-		<repository>
-			<id>releases</id>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-			<url>${talend_releases_ee}</url>
-		</repository>
-		<repository>
-			<id>snapshots</id>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<url>${talend_snapshots_ee}</url>
-		</repository>
-	</repositories>
-
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>com.sun.mail</groupId>
-				<artifactId>javax.mail</artifactId>
-				<version>1.6.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.json</groupId>
-				<artifactId>json</artifactId>
-				<version>20140107</version>
-			</dependency>
-			<dependency>
-				<groupId>com.fasterxml.jackson.dataformat</groupId>
-				<artifactId>jackson-dataformat-cbor</artifactId>
-				<version>${m2.fasterxml.jackson.version}</version>
-			</dependency>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.talend.studio</groupId>
+		<artifactId>tcommon-studio-se</artifactId>
+		<version>8.0.1-SNAPSHOT</version>
+		<relativePath>../../../</relativePath>
+	</parent>
+	<artifactId>org.talend.designer.maven.repo.tcompv0</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	<properties>
+		<!-- Might be removed because parent-pom contains property -->
+		<junit.version>4.13.2</junit.version>
+		<!-- Maven repository urls -->
+		<talend_snapshots>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</talend_snapshots>
+		<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>
+	</properties>
+	<repositories>
+		<repository>
+			<id>talend_open</id>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+			<url>${talend_releases}</url>
+		</repository>
+		<repository>
+			<id>talend_open_snapshots</id>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<url>${talend_snapshots}</url>
+		</repository>
+		<repository>
+			<id>releases</id>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+			<url>${talend_releases_ee}</url>
+		</repository>
+		<repository>
+			<id>snapshots</id>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<url>${talend_snapshots_ee}</url>
+		</repository>
+	</repositories>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>com.sun.mail</groupId>
+				<artifactId>javax.mail</artifactId>
+				<version>1.6.0</version>
+			</dependency>
+			<dependency>
+				<groupId>org.json</groupId>
+				<artifactId>json</artifactId>
+				<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
-				 include all: compile, runtime and provided dependencies -->
-			<dependency>
-				<groupId>biz.aQute.bnd</groupId>
-				<artifactId>annotation</artifactId>
-				<version>2.4.0</version>
-				<scope>compile</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.talend.components</groupId>
-				<artifactId>components-bom</artifactId>
-				<version>${components.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
-	<dependencies>
+				 include all: compile, runtime and provided dependencies -->
+			<dependency>
+				<groupId>biz.aQute.bnd</groupId>
+				<artifactId>annotation</artifactId>
+				<version>2.4.0</version>
+				<scope>compile</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.talend.components</groupId>
+				<artifactId>components-bom</artifactId>
+				<version>${components.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<dependencies>
 		<!-- Dependencies in provided scope should be explicitly added as dependency in this module,
-				because provided scope is not transitive -->
-		<dependency>
-			<groupId>org.osgi</groupId>
-			<artifactId>org.osgi.service.component.annotations</artifactId>
-			<version>1.3.0</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.sisu</groupId>
-			<artifactId>org.eclipse.sisu.inject</artifactId>
-			<version>0.0.0.M2a</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.enterprise</groupId>
-			<artifactId>cdi-api</artifactId>
-			<version>1.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>1.7.12</version>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>${junit.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-core-asl</artifactId>
-			<version>${jackson-codehaus.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-mapper-asl</artifactId>
-			<version>${jackson-codehaus.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.daikon-ee</groupId>
-			<artifactId>format-detection-csv</artifactId>
-			<version>${daikon-ee.format.verison}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.bouncycastle</groupId>
-					<artifactId>bcmail-jdk15on</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.apache.tika</groupId>
-					<artifactId>tika-core</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.apache.tika</groupId>
-					<artifactId>tika-parsers</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.daikon-ee</groupId>
-			<artifactId>format-detection-core</artifactId>
-			<version>${daikon-ee.format.verison}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.daikon-ee</groupId>
-			<artifactId>format-type-detection-csv</artifactId>
-			<version>${daikon-ee.format.verison}</version>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.8.2</version>
-				<executions>
-					<execution>
-						<id>default-deploy</id>
-						<phase>deploy</phase>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-clean-plugin</artifactId>
-				<version>3.1.0</version>
-				<configuration>
-					<filesets>
-						<fileset>
-							<directory>${project.basedir}/repository</directory>
-							<includes>
-								<include>**/*</include>
-							</includes>
-							<followSymlinks>false</followSymlinks>
-						</fileset>
-						<fileset>
-							<directory>${project.basedir}/tmp</directory>
-							<includes>
-								<include>**/*</include>
-							</includes>
-							<followSymlinks>false</followSymlinks>
-						</fileset>
-					</filesets>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-dependencies-jar</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.basedir}/tmp</outputDirectory>
-							<includeScope>runtime</includeScope>
-							<useRepositoryLayout>true</useRepositoryLayout>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.8</version>
-				<executions>
-					<execution>
-						<id>zip-maven-repository</id>
-						<phase>generate-sources</phase>
-						<configuration>
-							<tasks>
-								<zip destfile="${project.basedir}/repository/maven_repository.zip" basedir="${project.basedir}/tmp/" />
-								<delete dir="${project.basedir}/tmp/" />
-							</tasks>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
+				because provided scope is not transitive -->
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>org.osgi.service.component.annotations</artifactId>
+			<version>1.3.0</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.sisu</groupId>
+			<artifactId>org.eclipse.sisu.inject</artifactId>
+			<version>0.0.0.M2a</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.enterprise</groupId>
+			<artifactId>cdi-api</artifactId>
+			<version>1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.7.12</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.jackson</groupId>
+			<artifactId>jackson-core-asl</artifactId>
+			<version>${jackson-codehaus.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.jackson</groupId>
+			<artifactId>jackson-mapper-asl</artifactId>
+			<version>${jackson-codehaus.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.daikon-ee</groupId>
+			<artifactId>format-detection-csv</artifactId>
+			<version>${daikon-ee.format.verison}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.bouncycastle</groupId>
+					<artifactId>bcmail-jdk15on</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.tika</groupId>
+					<artifactId>tika-core</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.tika</groupId>
+					<artifactId>tika-parsers</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.daikon-ee</groupId>
+			<artifactId>format-detection-core</artifactId>
+			<version>${daikon-ee.format.verison}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.daikon-ee</groupId>
+			<artifactId>format-type-detection-csv</artifactId>
+			<version>${daikon-ee.format.verison}</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.8.2</version>
+				<executions>
+					<execution>
+						<id>default-deploy</id>
+						<phase>deploy</phase>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-clean-plugin</artifactId>
+				<version>3.1.0</version>
+				<configuration>
+					<filesets>
+						<fileset>
+							<directory>${project.basedir}/repository</directory>
+							<includes>
+								<include>**/*</include>
+							</includes>
+							<followSymlinks>false</followSymlinks>
+						</fileset>
+						<fileset>
+							<directory>${project.basedir}/tmp</directory>
+							<includes>
+								<include>**/*</include>
+							</includes>
+							<followSymlinks>false</followSymlinks>
+						</fileset>
+					</filesets>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-dependencies-jar</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.basedir}/tmp</outputDirectory>
+							<includeScope>runtime</includeScope>
+							<useRepositoryLayout>true</useRepositoryLayout>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.8</version>
+				<executions>
+					<execution>
+						<id>zip-maven-repository</id>
+						<phase>generate-sources</phase>
+						<configuration>
+							<tasks>
+								<zip destfile="${project.basedir}/repository/maven_repository.zip" basedir="${project.basedir}/tmp/" />
+								<delete dir="${project.basedir}/tmp/" />
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

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

@@ -103,7 +103,7 @@
 		<dependency>
 		    <groupId>org.apache.ant</groupId>
 		    <artifactId>ant</artifactId>
-		    <version>1.10.9</version>
+		    <version>1.10.11</version>
 		</dependency>
 		<dependency>
 		    <groupId>org.apache.maven.shared</groupId>

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

@@ -69,7 +69,7 @@
 		<dependency>
 		    <groupId>org.apache.ant</groupId>
 		    <artifactId>ant</artifactId>
-		    <version>1.10.9</version>
+		    <version>1.10.11</version>
 		</dependency>
 		<dependency>
 		    <groupId>org.apache.maven.shared</groupId>

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

@@ -29,7 +29,7 @@
 		<dependency>
 		    <groupId>org.apache.ant</groupId>
 		    <artifactId>ant</artifactId>
-		    <version>1.10.9</version>
+		    <version>1.10.11</version>
 		</dependency>
 		<dependency>
 		    <groupId>org.bouncycastle</groupId>

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

@@ -13,7 +13,7 @@
         <dependency>
             <groupId>org.talend.ci</groupId>
             <artifactId>osgihelper-maven-plugin</artifactId>
-            <version>${project.version}</version>
+            <version>8.0.1</version>
             <exclusions>
 				<exclusion>
 					<groupId>commons-codec</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.1</version>
+            <version>3.8.3</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.1</version>
+            <version>3.8.3</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-io</groupId>
@@ -123,7 +123,7 @@
 		<dependency>
 			<groupId>org.apache.maven</groupId>
 			<artifactId>maven-compat</artifactId>
-			<version>3.8.1</version>
+			<version>3.8.3</version>
 		</dependency>
 		<dependency>
             <groupId>commons-codec</groupId>
@@ -145,6 +145,16 @@
 			<artifactId>commons-compress</artifactId>
 			<version>1.21</version>
 		</dependency>
+		 <dependency>
+			<groupId>org.jboss.marshalling</groupId>
+			<artifactId>jboss-marshalling</artifactId>
+			<version>2.0.12.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.plexus</groupId>
+			<artifactId>plexus-utils</artifactId>
+			<version>3.3.0</version>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

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

@@ -56,8 +56,8 @@
                 <version>17</version>
                 <type>pom</type>
             </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>
@@ -76,7 +76,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/log4j/pom.xml

@@ -14,17 +14,17 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.13.2</version>
+            <version>2.17.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.13.2</version>
+            <version>2.17.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.13.2</version>
+            <version>2.17.1</version>
         </dependency>
 	</dependencies>
 	<build>

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

@@ -1,134 +1,134 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.talend.studio</groupId>
-        <artifactId>studio-maven-repository-tos</artifactId>
-        <version>8.0.1-SNAPSHOT</version>
-        <relativePath>../</relativePath>
-    </parent>
-    <artifactId>studio-tcompv1-dependencies</artifactId>
-    <packaging>pom</packaging>
-    
-    <properties>
-        <tcomp.version>1.37.0</tcomp.version>
-        <slf4j.version>1.7.32</slf4j.version>
-    </properties>
-    
-    <repositories>
-        <repository>
-            <id>talend_open</id>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
-        </repository>
-        <repository>
-            <id>talend_open_snapshots</id>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
-        </repository>
-        <repository>
-            <id>sonatype_releases</id>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <url>https://oss.sonatype.org/content/repositories/releases/</url>
-        </repository>
-        <repository>
-            <id>sonatype_snapshots</id>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-        </repository>
-    </repositories>
-    
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.talend.sdk.component</groupId>
-                <artifactId>component-runtime</artifactId>
-                <version>${tcomp.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-    
-    <dependencies>
-        <dependency>
-            <groupId>org.talend.sdk.component</groupId>
-            <artifactId>component-server</artifactId>
-            <version>${tcomp.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.talend.sdk.component</groupId>
-            <artifactId>component-runtime-di</artifactId>
-            <version>${tcomp.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.talend.sdk.component</groupId>
-            <artifactId>component-api</artifactId>
-            <version>${tcomp.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.talend.sdk.component</groupId>
-            <artifactId>slf4j-standard</artifactId>
-            <version>${tcomp.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-jdk14</artifactId>
-            <version>${slf4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>${slf4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>${slf4j.version}</version>
-        </dependency>
-    </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.10</version>
-                <executions>
-                    <execution>
-                        <id>copy-dependencies</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <includeScope>runtime</includeScope>
-                            <outputDirectory>${basedir}/../tmp/repository</outputDirectory>
-                            <useRepositoryLayout>true</useRepositoryLayout>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.talend.studio</groupId>
+        <artifactId>studio-maven-repository-tos</artifactId>
+        <version>8.0.1-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+    <artifactId>studio-tcompv1-dependencies</artifactId>
+    <packaging>pom</packaging>
+    
+    <properties>
+        <tcomp.version>1.40.0</tcomp.version>
+        <slf4j.version>1.7.32</slf4j.version>
+    </properties>
+    
+    <repositories>
+        <repository>
+            <id>talend_open</id>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
+        </repository>
+        <repository>
+            <id>talend_open_snapshots</id>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+        </repository>
+        <repository>
+            <id>sonatype_releases</id>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <url>https://oss.sonatype.org/content/repositories/releases/</url>
+        </repository>
+        <repository>
+            <id>sonatype_snapshots</id>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+        </repository>
+    </repositories>
+    
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.talend.sdk.component</groupId>
+                <artifactId>component-runtime</artifactId>
+                <version>${tcomp.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.talend.sdk.component</groupId>
+            <artifactId>component-server</artifactId>
+            <version>${tcomp.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.talend.sdk.component</groupId>
+            <artifactId>component-runtime-di</artifactId>
+            <version>${tcomp.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.talend.sdk.component</groupId>
+            <artifactId>component-api</artifactId>
+            <version>${tcomp.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.talend.sdk.component</groupId>
+            <artifactId>slf4j-standard</artifactId>
+            <version>${tcomp.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.10</version>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <includeScope>runtime</includeScope>
+                            <outputDirectory>${basedir}/../tmp/repository</outputDirectory>
+                            <useRepositoryLayout>true</useRepositoryLayout>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

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

@@ -20,6 +20,12 @@
 			<groupId>org.talend.daikon</groupId>
 			<artifactId>crypto-utils</artifactId>
 			<version>${org.talend.daikon.crypto-utils.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-codec</groupId>
+                    <artifactId>commons-codec</artifactId>
+                </exclusion>
+            </exclusions>
 		</dependency>
 		<dependency>
             <groupId>com.fasterxml.jackson</groupId>

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

@@ -16,4 +16,4 @@ MavenProjectSettingPage.refModuleText=Configurer les modules du projet de r\u00E
 MavenProjectSettingPage.excludeDeletedItems=Exclure les \u00E9l\u00E9ments supprim\u00E9s
 MavenProjectSettingPage.syncAllPomsWarning=Cliquez sur Forcer la nouvelle synchronisation compl\u00E8te des POM pour appliquer les nouveaux param\u00E8tres.
 MavenProjectSettingPage.skipFolders=Ignorer les dossiers
-BuildProjectSettingPage.allowRecursiveJobs=Autoriser les Jobs r\u00E9cursifs (Non support\u00E9 - pour compatibilit\u00E9 uniquement)
+BuildProjectSettingPage.allowRecursiveJobsJoblets=Autorise les Jobs et Joblets r\u00E9cursifs (non support\u00E9 - pour des raisons de compatibilit\u00E9)

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

@@ -16,4 +16,4 @@ MavenProjectSettingPage.refModuleText=\u30D7\u30ED\u30D5\u30A1\u30A4\u30EB\u3067
 MavenProjectSettingPage.excludeDeletedItems=\u524A\u9664\u3055\u308C\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u9664\u5916
 MavenProjectSettingPage.syncAllPomsWarning=[\u5B8C\u5168\u306A\u518D\u540C\u671FPOM\u3092\u5F37\u5236]\u30DC\u30BF\u30F3\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u3001\u65B0\u3057\u3044\u8A2D\u5B9A\u3092\u9069\u7528\u3057\u307E\u3059\u3002
 MavenProjectSettingPage.skipFolders=\u30D5\u30A9\u30EB\u30C0\u30FC\u3092\u30B9\u30AD\u30C3\u30D7
-BuildProjectSettingPage.allowRecursiveJobs=\u518D\u5E30\u7684\u30B8\u30E7\u30D6\u3092\u8A31\u53EF (\u30B5\u30DD\u30FC\u30C8\u306A\u3057 - \u4E92\u63DB\u6027\u7528\u306E\u307F)
+BuildProjectSettingPage.allowRecursiveJobsJoblets=\u518D\u5E30\u7684\u30B8\u30E7\u30D6\u3068\u30B8\u30E7\u30D6\u30EC\u30C3\u30C8\u3092\u8A31\u53EF(\u30B5\u30DD\u30FC\u30C8\u306A\u3057 - \u4E92\u63DB\u6027\u306E\u76EE\u7684\u306E\u307F)

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

@@ -16,4 +16,4 @@ MavenProjectSettingPage.refModuleText=\u5728\u914D\u7F6E\u6587\u4EF6\u4E2D\u8BBE
 MavenProjectSettingPage.excludeDeletedItems=\u6392\u9664\u5DF2\u5220\u9664\u9879
 MavenProjectSettingPage.syncAllPomsWarning=\u5355\u51FB \u201C\u5F3A\u5236\u5B8C\u5168\u91CD\u65B0\u540C\u6B65 POM\u201D \u6309\u94AE\u4EE5\u5E94\u7528\u65B0\u7684\u8BBE\u7F6E\u3002
 MavenProjectSettingPage.skipFolders=\u8DF3\u8FC7\u6587\u4EF6\u5939
-BuildProjectSettingPage.allowRecursiveJobs=\u5141\u8BB8\u9012\u5F52\u4F5C\u4E1A (\u4E0D\u652F\u6301 - \u4EC5\u7528\u4E8E\u517C\u5BB9\u6027)
+BuildProjectSettingPage.allowRecursiveJobsJoblets=\u5141\u8BB8\u9012\u5F52\u4F5C\u4E1A\u548C\u5C0F\u4F5C\u4E1A (\u4E0D\u652F\u6301 - \u4EC5\u7528\u4E8E\u517C\u5BB9\u6027)

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

@@ -58,7 +58,7 @@
 						<dependency>
 							<groupId>org.apache.maven</groupId>
 							<artifactId>maven-compat</artifactId>
-							<version>3.8.1</version>
+							<version>3.8.3</version>
 						</dependency>
 						<dependency>
 							<groupId>org.apache.commons</groupId>
@@ -68,7 +68,7 @@
 						<dependency>
 							<groupId>org.apache.maven</groupId>
 							<artifactId>maven-core</artifactId>
-							<version>3.8.1</version>
+							<version>3.8.3</version>
 						</dependency>
 					</dependencies>
 				</plugin>
@@ -95,7 +95,7 @@
 						<dependency>
 							<groupId>org.apache.maven</groupId>
 							<artifactId>maven-core</artifactId>
-							<version>3.8.1</version>
+							<version>3.8.3</version>
 						</dependency>
 					</dependencies>
 				</plugin>
@@ -137,7 +137,7 @@
 						<dependency>
 							<groupId>org.apache.maven</groupId>
 							<artifactId>maven-core</artifactId>
-							<version>3.8.1</version>
+							<version>3.8.3</version>
 						</dependency>
 					</dependencies>
 					<configuration>
@@ -184,12 +184,12 @@
 						<dependency>
 							<groupId>org.apache.maven</groupId>
 							<artifactId>maven-compat</artifactId>
-							<version>3.8.1</version>
+							<version>3.8.3</version>
 						</dependency>
 						<dependency>
 							<groupId>org.apache.maven</groupId>
 							<artifactId>maven-core</artifactId>
-							<version>3.8.1</version>
+							<version>3.8.3</version>
 						</dependency>
 					</dependencies>
 				</plugin>

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/DesignerMavenService.java

@@ -12,7 +12,12 @@
 // ============================================================================
 package org.talend.designer.maven;
 
+import java.util.List;
+
 import org.apache.maven.settings.Settings;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.m2e.core.MavenPlugin;
 import org.eclipse.m2e.core.embedder.IMaven;
 import org.talend.core.model.properties.RoutineItem;
@@ -20,6 +25,7 @@ import org.talend.core.model.routines.CodesJarInfo;
 import org.talend.core.runtime.services.IDesignerMavenService;
 import org.talend.designer.maven.tools.CodesJarM2CacheManager;
 import org.talend.designer.maven.utils.CodesJarMavenUtil;
+import org.talend.designer.maven.utils.MavenProjectUtils;
 
 public class DesignerMavenService implements IDesignerMavenService {
 
@@ -37,6 +43,16 @@ public class DesignerMavenService implements IDesignerMavenService {
     public void updateCodeJarMavenProject(CodesJarInfo info, boolean needReSync) throws Exception {
         CodesJarM2CacheManager.updateCodesJarProject(info, needReSync);
     }
+    
+    @Override
+    public void enableMavenNature(IProgressMonitor monitor, IProject project) {
+        MavenProjectUtils.enableMavenNature(monitor, project);
+    }
+
+    @Override
+    public void addProjectClasspathEntry(IProgressMonitor monitor, IProject project, List<IClasspathEntry> entries) {
+        MavenProjectUtils.addProjectClasspathEntry(monitor, project, entries);
+    }
 
     @Override
     public String getLocalRepositoryPath() throws Exception {

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

@@ -47,6 +47,7 @@ import org.eclipse.m2e.core.MavenPlugin;
 import org.eclipse.swt.widgets.Display;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.PersistenceException;
+import org.talend.commons.utils.workbench.resources.ResourceUtils;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IESBService;
 import org.talend.core.ILibraryManagerService;
@@ -154,7 +155,15 @@ public class AggregatorPomsHelper {
 
     public IFolder getProjectPomsFolder() {
         IWorkspace workspace = ResourcesPlugin.getWorkspace();
-        return workspace.getRoot().getFolder(new Path(projectTechName + "/" + DIR_POMS)); //$NON-NLS-1$
+        IFolder pomsFolder = workspace.getRoot().getFolder(new Path(projectTechName + "/" + DIR_POMS)); //$NON-NLS-1$
+        if (!pomsFolder.exists()) {
+            try {
+                ResourceUtils.createFolder(pomsFolder);
+            } catch (PersistenceException e) {
+                ExceptionHandler.process(e);
+            }
+        }
+        return pomsFolder;
     }
 
     public void updateCodeProjects(IProgressMonitor monitor, boolean forceBuild) {

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

@@ -22,10 +22,12 @@ import java.util.Properties;
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.m2e.core.MavenPlugin;
 import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.utils.VersionUtils;
 import org.talend.core.model.general.Project;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.designer.maven.utils.PomIdsHelper;
 import org.talend.repository.ProjectManager;
+import org.talend.utils.io.FilesUtils;
 
 public class CodeM2CacheManager {
 
@@ -65,7 +67,15 @@ public class CodeM2CacheManager {
 
     public static void updateCacheStatus(String projectTechName, ERepositoryObjectType codeType, boolean isUpdated) {
         if (projectTechName == null) {
-            projectTechName = ProjectManager.getInstance().getCurrentProject().getTechnicalLabel();
+            Project currentProject = ProjectManager.getInstance().getCurrentProject();
+            if (currentProject == null) {
+                if (cacheFolder.exists()) {
+                    FilesUtils.deleteFolder(cacheFolder, true);
+                }
+                cacheFolder.mkdirs();
+                return;
+            }
+            projectTechName = currentProject.getTechnicalLabel();
         }
         File cacheFile = getCacheFile(projectTechName, codeType);
         try (OutputStream out = new FileOutputStream(cacheFile)) {
@@ -79,7 +89,7 @@ public class CodeM2CacheManager {
 
     public static File getCacheFile(String projectTechName, ERepositoryObjectType codeType) {
         String cacheFileName = PomIdsHelper.getProjectGroupId(projectTechName) + "." + codeType.name().toLowerCase() + "-" //$NON-NLS-1$ //$NON-NLS-2$
-                + PomIdsHelper.getCodesVersion(projectTechName) + ".cache"; // $NON-NLS-1$
+                + PomIdsHelper.getCodesVersion(projectTechName) + "-" + VersionUtils.getInternalVersion() + ".cache"; // $NON-NLS-1$
         return new File(cacheFolder, cacheFileName);
     }
 

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

@@ -97,6 +97,10 @@ public class ProcessorDependenciesManager {
             if (uniqueDependencies.contains(mavenUri)) {
                 continue; // must be same GAV, avoid the different other attrs for modules
             }
+            Object object = module.getExtraAttributes().get("ROUTINE_EXCLUDE");
+            if (object != null && Boolean.valueOf(object.toString())) {
+                continue;
+            }
             uniqueDependencies.add(mavenUri);
             Dependency dependency = PomUtil.createModuleDependency(mavenUri);
             if (dependency != null) {

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

@@ -19,7 +19,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Exclusion;
 import org.apache.maven.model.Model;
 import org.eclipse.core.resources.IFile;
 import org.talend.core.GlobalServiceRegister;
@@ -130,6 +132,13 @@ public abstract class AbstractMavenCodesTemplatePom extends AbstractMavenGeneral
                         dependency.setScope("provided");
                 }
                 if (dependency != null) {
+                    if (StringUtils.equals(dependency.getGroupId(), "org.talend.daikon")//$NON-NLS-1$
+                            && StringUtils.equals(dependency.getArtifactId(), "crypto-utils")) {//$NON-NLS-1$
+                        Exclusion exclusion = new Exclusion();
+                        exclusion.setGroupId("commons-codec"); //$NON-NLS-1$
+                        exclusion.setArtifactId("commons-codec"); //$NON-NLS-1$
+                        dependency.addExclusion(exclusion);
+                    }
                     existedDependencies.add(dependency);
                 }
             }

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

@@ -207,6 +207,38 @@ public abstract class AbstractMavenProcessorPom extends CreateMavenBundleTemplat
                 shade.setGroupId("org.apache.maven.plugins"); //$NON-NLS-1$
                 shade.setArtifactId("maven-shade-plugin"); //$NON-NLS-1$
                 shade.setVersion("3.1.0"); //$NON-NLS-1$
+                
+                Dependency codecDep = new Dependency();
+                codecDep.setGroupId("commons-codec");
+                codecDep.setArtifactId("commons-codec");
+                codecDep.setVersion("1.15");
+                
+                Dependency guavaDep = new Dependency();
+                guavaDep.setGroupId("com.google.guava");
+                guavaDep.setArtifactId("guava");
+                guavaDep.setVersion("30.0-jre");
+                
+                Dependency ioDep = new Dependency();
+                ioDep.setGroupId("commons-io");
+                ioDep.setArtifactId("commons-io");
+                ioDep.setVersion("2.8.0");
+                
+                Dependency sharedUtilsDep = new Dependency();
+                sharedUtilsDep.setGroupId("org.apache.maven.shared");
+                sharedUtilsDep.setArtifactId("maven-shared-utils");
+                sharedUtilsDep.setVersion("3.3.3");
+                
+                Dependency mavenCoreDep = new Dependency();
+                mavenCoreDep.setGroupId("org.apache.maven");
+                mavenCoreDep.setArtifactId("maven-core");
+                mavenCoreDep.setVersion("3.8.3");
+                
+                shade.getDependencies().add(guavaDep);
+                shade.getDependencies().add(codecDep);
+                shade.getDependencies().add(ioDep);
+                shade.getDependencies().add(sharedUtilsDep);
+                shade.getDependencies().add(mavenCoreDep);
+                              
                 List<PluginExecution> executions = shade.getExecutions();
                 PluginExecution execution = new PluginExecution();
                 executions.add(execution);

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

@@ -12,6 +12,7 @@
 // ============================================================================
 package org.talend.designer.maven.tools.creator;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
@@ -40,6 +41,8 @@ public abstract class CreateMaven {
 
     private Map<String, Object> argumentsMap;
 
+    protected Map<String, String> additionalProperties = new HashMap<>();
+
     public String getVersion() {
         return this.version;
     }

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

@@ -274,6 +274,37 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
         checkPomProperty(properties, "talend.job.type", ETalendMavenVariables.JobType,
                 jobInfoProp.getProperty(JobInfoProperties.JOB_TYPE));
 
+        org.talend.core.model.general.Project currentProject = ProjectManager.getInstance()
+                .getProjectFromProjectTechLabel(project.getTechnicalLabel());
+        String branchName = ProjectManager.getInstance().getMainProjectBranch(project);
+        try {
+            if (branchName == null) {
+                ProjectPreferenceManager preferenceManager =
+                        new ProjectPreferenceManager(currentProject, "org.talend.repository", false);
+                branchName = preferenceManager.getValue(RepositoryConstants.PROJECT_BRANCH_ID);
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+        if (null != branchName && branchName.startsWith("branches/")) {
+            branchName = branchName.substring(9);
+            properties.setProperty("talend.project.branch.name", branchName);
+        }
+
+        try {
+            if ((ProcessorUtilities.isCIMode() || !currentProject.isLocal()) && IGITProviderService.get() != null
+                    && IGITProviderService.get().isGITProject(currentProject) && IGitInfoService.get() != null) {
+                additionalProperties.clear();
+                additionalProperties.putAll(IGitInfoService.get().getGitInfo(property));
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+        properties.setProperty("talend.job.git.author", additionalProperties.getOrDefault(IGitInfoService.GIT_AUTHOR, ""));
+        properties.setProperty("talend.job.git.commit.id", additionalProperties.getOrDefault(IGitInfoService.GIT_COMMIT_ID, ""));
+        properties.setProperty("talend.job.git.commit.date",
+                additionalProperties.getOrDefault(IGitInfoService.GIT_COMMIT_DATE, ""));
+
         boolean publishAsSnapshot = BooleanUtils
                 .toBoolean((String) property.getAdditionalProperties().get(MavenConstants.NAME_PUBLISH_AS_SNAPSHOT));
 
@@ -543,7 +574,7 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
                                 "${talend.job.bat.addition}" },
                         new String[] { jvmArgsStr.toString().trim(), getWindowsClasspath(), jobClass,
                                 windowsScriptAdditionValue.toString() });
-        batContent = normalizeSpaces(batContent);
+        batContent = normalizeSpaces(batContent, "\r\n");
         String shContent = MavenTemplateManager.getProjectSettingValue(IProjectSettingPreferenceConstants.TEMPLATE_SH,
                 templateParameters);
         shContent = StringUtils
@@ -583,32 +614,13 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
         if (!isOptionChecked(TalendProcessArgumentConstant.ARG_AVOID_BRANCH_NAME)) {
             jobInfoContent = StringUtils.replace(jobInfoContent, "${talend.project.branch}", mainProjectBranch);
         }
-        String gitAuthor = "";
-        String gitCommitId = "";
-        String gitCommitDate = "";
-        Map<String, String> gitInfo = null;
-        GlobalServiceRegister serviceRegister = GlobalServiceRegister.getDefault();
-        IGITProviderService gitProviderService = null;
-        if (serviceRegister.isServiceRegistered(IGITProviderService.class)) {
-            gitProviderService = (IGITProviderService) GlobalServiceRegister.getDefault().getService(IGITProviderService.class);
-        }
-        if (!ProcessorUtilities.isCIMode() && !project.isLocal() && gitProviderService != null
-                && gitProviderService.isGITProject(project)) {
-            try {
-                if (serviceRegister.isServiceRegistered(IGitInfoService.class)) {
-                    IGitInfoService gitInfoService = serviceRegister.getService(IGitInfoService.class);
-                    gitInfo = gitInfoService.getGitInfo(property);
-                    gitAuthor = gitInfo.get(IGitInfoService.GIT_AUTHOR);
-                    gitCommitId = gitInfo.get(IGitInfoService.GIT_COMMIT_ID);
-                    gitCommitDate = gitInfo.get(IGitInfoService.GIT_COMMIT_DATE);
-                }
-            } catch (Exception e) {
-                ExceptionHandler.process(e);
-            }
-        }
-        jobInfoContent = StringUtils.replace(jobInfoContent, "${talend.git.author}", gitAuthor);
-        jobInfoContent = StringUtils.replace(jobInfoContent, "${talend.git.commitId}", gitCommitId);
-        jobInfoContent = StringUtils.replace(jobInfoContent, "${talend.git.commitDate}", gitCommitDate);
+
+        jobInfoContent = StringUtils.replace(jobInfoContent, "${talend.git.author}",
+                additionalProperties.getOrDefault(IGitInfoService.GIT_AUTHOR, ""));
+        jobInfoContent = StringUtils.replace(jobInfoContent, "${talend.git.commitId}",
+                additionalProperties.getOrDefault(IGitInfoService.GIT_COMMIT_ID, ""));
+        jobInfoContent = StringUtils.replace(jobInfoContent, "${talend.git.commitDate}",
+                additionalProperties.getOrDefault(IGitInfoService.GIT_COMMIT_DATE, ""));
 
         IFolder templateFolder = codeProject.getTemplatesFolder();
         IFile shFile = templateFolder.getFile(IProjectSettingTemplateConstants.JOB_RUN_SH_TEMPLATE_FILE_NAME);
@@ -936,7 +948,6 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
         
         IMaven maven = MavenPlugin.getMaven();
         ArtifactRepository repository = maven.getLocalRepository();
-        boolean isDIJob = ERepositoryObjectType.getItemType(getJobProcessor().getProperty().getItem()) == ERepositoryObjectType.PROCESS;
         for (Dependency dependency : duplicateDependencies) {
             if (((SortableDependency) dependency).isAssemblyOptional()) {
                 continue;
@@ -947,7 +958,7 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
             sourceLocation = path.toString();
             
             boolean latestVersionOrLowerVersionInChildJob = isLatestVersionOrLowerVersionInChildJob(parentJobDependencies, childJobDependencies, duplicateLibs, dependency);
-            if (isDIJob && !latestVersionOrLowerVersionInChildJob && !new File(sourceLocation).exists()) {
+            if (!latestVersionOrLowerVersionInChildJob && !new File(sourceLocation).exists()) {
                 CommonExceptionHandler.warn("Job dependency [" + sourceLocation + "] does not exist!");
                 continue;
             }
@@ -1049,6 +1060,10 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
 
     // https://jira.talendforge.org/browse/TUP-27053
     public static String normalizeSpaces(String src) {
+        return normalizeSpaces(src,"\n");
+    }
+    
+    public static String normalizeSpaces(String src, String lineSeparator) {
         StringBuffer sb = new StringBuffer();
         try (Scanner scanner = new Scanner(src)) {
             while (scanner.hasNextLine()) {
@@ -1057,7 +1072,7 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
                 if (!line.isEmpty()) {
                     sb.append(line);
                 }
-                sb.append('\n');
+                sb.append(lineSeparator);
             }
         } catch (Exception e) {