Merge branch 'maintenance/7.3' into undx/TCOMP-1752_JobServer

main/features/org.talend.libraries.jdbc.feature/feature.xml

@@ -13,6 +13,7 @@
   <plugin id="org.talend.libraries.jdbc.ingres" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.jdbc.mysql" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.jdbc.paraccel" download-size="0" install-size="0" version="0.0.0"/>
+  <plugin id="org.talend.libraries.jdbc.postgresql" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.jdbc.sqlite3" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.jdbc.teradata" download-size="0" install-size="0" version="0.0.0"/>
 </feature>

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

@@ -16,8 +16,7 @@ Require-Bundle: org.apache.log4j;visibility:=reexport,
  org.talend.utils,
  org.eclipse.core.net,
  org.eclipse.m2e.core,
- org.eclipse.m2e.maven.runtime,
- org.eclipse.core.resources
+ org.eclipse.m2e.maven.runtime
 Export-Package: org.talend.commons,
  org.talend.commons.exception,
  org.talend.commons.i18n,

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

@@ -232,50 +232,10 @@ public class VersionUtils {
      * Check if studio version < other studio version record in remote project.
      */
     public static boolean isInvalidProductVersion(String remoteFullProductVersion) {
-        String localProductVersion = getInternalVersion();
-        return isInvalidProductVersion(localProductVersion, remoteFullProductVersion);
-    }
-
-    protected static boolean isInvalidProductVersion(String localProductVersion, String remoteFullProductVersion) {
         if (remoteFullProductVersion == null) {
             return false;
         }
-        if (skipCheckingNightlyBuilds(localProductVersion, remoteFullProductVersion)) {
-            return false;
-        }
-        return localProductVersion.compareTo(getProductVersionWithoutBranding(remoteFullProductVersion)) < 0;
-    }
-
-    public static boolean productVersionIsNewer(String remoteFullProductVersion) {
-        String localProductVersion = getInternalVersion();
-        return productVersionIsNewer(localProductVersion, remoteFullProductVersion);
-    }
-
-    protected static boolean productVersionIsNewer(String localProductVersion, String remoteFullProductVersion) {
-        if (remoteFullProductVersion == null) {
-            return false;
-        }
-        if (skipCheckingNightlyBuilds(localProductVersion, remoteFullProductVersion)) {
-            return false;
-        }
-        return localProductVersion.compareTo(getProductVersionWithoutBranding(remoteFullProductVersion)) > 0;
-    }
-
-    private static boolean skipCheckingNightlyBuilds(String localProductVersion, String remoteFullProductVersion) {
-        String separator = "-"; //$NON-NLS-1$
-        String localSuffix = StringUtils.substringAfterLast(localProductVersion, separator);
-
-        String remoteProductVersion = getProductVersionWithoutBranding(remoteFullProductVersion);
-        String remoteSuffix = StringUtils.substringAfterLast(remoteProductVersion, separator);
-
-        String nightly = "SNAPSHOT"; //$NON-NLS-1$
-        String milestone = "M"; //$NON-NLS-1$
-        if ((localSuffix.equals(nightly) || localSuffix.startsWith(milestone))
-                && (remoteSuffix.equals(nightly) || remoteSuffix.startsWith(milestone))) {
-            // skip checking between nightly/milestone build.
-            return true;
-        }
-        return false;
+        return getInternalVersion().compareTo(getProductVersionWithoutBranding(remoteFullProductVersion)) < 0;
     }
 
     public static String getTalendVersion(String productVersion) {
@@ -350,24 +310,4 @@ public class VersionUtils {
         }
     }
 
-    public static String getSimplifiedPatchName(String projectPatchName) {
-
-        if (projectPatchName != null) {
-            String result = null;
-            if (projectPatchName.contains("_") && projectPatchName.split("_").length >= 3) {
-                result = projectPatchName.split("_")[2];
-                if (!result.startsWith("R")) {
-                    return null;
-                }
-            }
-            if (projectPatchName.contains("-")) {
-                String[] split = projectPatchName.split("-");
-                if (split != null && split.length > 0) {
-                    return result + "-" + split[split.length - 1];
-                }
-            }
-        }
-        return null;
-    }
-
 }

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

@@ -15,7 +15,6 @@ package org.talend.commons.utils.network;
 import java.lang.reflect.Field;
 import java.net.Authenticator;
 import java.net.HttpURLConnection;
-import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.net.PasswordAuthentication;
@@ -23,11 +22,7 @@ import java.net.SocketException;
 import java.net.URI;
 import java.net.URL;
 import java.net.UnknownHostException;
-import java.util.ArrayList;
 import java.util.Enumeration;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
 import java.util.regex.Pattern;
 
 import org.apache.commons.lang.StringUtils;
@@ -155,28 +150,6 @@ public class NetworkUtil {
 
                 @Override
                 protected PasswordAuthentication getPasswordAuthentication() {
-                    String httpProxyHost = System.getProperty("http.proxyHost"); //$NON-NLS-1$
-                    String httpProxyPort = System.getProperty("http.proxyPort"); //$NON-NLS-1$
-                    String httpsProxyHost = System.getProperty("https.proxyHost"); //$NON-NLS-1$
-                    String httpsProxyPort = System.getProperty("https.proxyPort"); //$NON-NLS-1$
-                    String requestingHost = getRequestingHost();
-                    int requestingPort = getRequestingPort();
-                    String proxyHost = null;
-                    String proxyPort = null;
-                    boolean isHttp = false;
-                    if ("http".equalsIgnoreCase(getRequestingScheme())) {
-                        isHttp = true;
-                    }
-                    if (isHttp && StringUtils.isNotBlank(httpProxyHost)) {
-                        proxyHost = httpProxyHost;
-                        proxyPort = httpProxyPort;
-                    } else {
-                        proxyHost = httpsProxyHost;
-                        proxyPort = httpsProxyPort;
-                    }
-                    if (!StringUtils.equals(proxyHost, requestingHost) || !StringUtils.equals(proxyPort, "" + requestingPort)) {
-                        return null;
-                    }
                     String httpProxyUser = System.getProperty("http.proxyUser"); //$NON-NLS-1$
                     String httpProxyPassword = System.getProperty("http.proxyPassword"); //$NON-NLS-1$
                     String httpsProxyUser = System.getProperty("https.proxyUser"); //$NON-NLS-1$
@@ -194,11 +167,7 @@ public class NetworkUtil {
                             proxyPassword = httpsProxyPassword.toCharArray();
                         }
                     }
-                    if (StringUtils.isBlank(proxyUser)) {
-                        return null;
-                    } else {
-                        return new PasswordAuthentication(proxyUser, proxyPassword);
-                    }
+                    return new PasswordAuthentication(proxyUser, proxyPassword);
                 }
 
             });
@@ -237,54 +206,6 @@ public class NetworkUtil {
         }
     }
 
-    public static List<String> getLocalLoopbackAddresses(boolean wrapIpV6) {
-        Set<String> addresses = new LinkedHashSet<>();
-        try {
-            addresses.add(getIp(InetAddress.getLoopbackAddress(), wrapIpV6));
-        } catch (Exception e) {
-            ExceptionHandler.process(e);
-        }
-
-        try {
-            Enumeration<NetworkInterface> networkInterfaces = NetworkInterface.getNetworkInterfaces();
-            while (networkInterfaces.hasMoreElements()) {
-                NetworkInterface networkInterface = networkInterfaces.nextElement();
-                Enumeration<InetAddress> inetAddresses = networkInterface.getInetAddresses();
-                while (inetAddresses.hasMoreElements()) {
-                    InetAddress inetAddress = inetAddresses.nextElement();
-                    if (inetAddress != null && inetAddress.isLoopbackAddress()) {
-                        addresses.add(getIp(inetAddress, wrapIpV6));
-                    }
-                }
-            }
-        } catch (Exception e) {
-            ExceptionHandler.process(e);
-        }
-
-        if (addresses.isEmpty()) {
-            addresses.add("127.0.0.1");
-            String ipv6Loopback = "::1";
-            if (wrapIpV6) {
-                ipv6Loopback = "[" + ipv6Loopback + "]";
-            }
-            addresses.add(ipv6Loopback);
-        }
-
-        return new ArrayList<>(addresses);
-    }
-
-    private static String getIp(InetAddress inetAddress, boolean wrapIpV6) {
-        if (wrapIpV6 && Inet6Address.class.isInstance(inetAddress)) {
-            String addr = inetAddress.getHostAddress();
-            if (!addr.startsWith("[") || !addr.endsWith("]")) {
-                addr = "[" + addr + "]";
-            }
-            return addr;
-        } else {
-            return inetAddress.getHostAddress();
-        }
-    }
-
     public static boolean isSelfAddress(String addr) {
         if (addr == null || addr.isEmpty()) {
             return false; // ?

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

@@ -25,7 +25,6 @@ import java.net.URISyntaxException;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -39,8 +38,6 @@ import java.util.Set;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Priority;
 import org.eclipse.core.internal.net.ProxyManager;
-import org.eclipse.core.internal.net.ProxyType;
-import org.eclipse.core.net.proxy.IProxyChangeEvent;
 import org.eclipse.core.net.proxy.IProxyService;
 import org.talend.commons.CommonsPlugin;
 import org.talend.commons.exception.ExceptionHandler;
@@ -80,14 +77,6 @@ public class TalendProxySelector extends ProxySelector {
 
     private static final String PROP_DISABLE_DEFAULT_SELECTOR_PROVIDER = "talend.studio.proxy.disableDefaultSelectorProvider";
 
-    private static final String PROP_PROXY_EXCLUDE_LOOPBACK_ADDRESS_AUTOMATICALLY = "talend.studio.proxy.excludeLoopbackAutomatically";
-
-    private static final String PROP_PROXY_EXCLUDE_LOOPBACK_ADDRESS_AUTOMATICALLY_DEFAULT = "true";
-
-    private static final String PROP_PROXY_HTTP_NON_PROXYHOSTS = "http.nonProxyHosts";
-
-    private static final String PROP_PROXY_HTTPS_NON_PROXYHOSTS = "https.nonProxyHosts";
-
     /**
      * Example: update.talend.com,socket:http,https:http;nexus.talend.com,socket,http;,socket:http
      */
@@ -115,8 +104,6 @@ public class TalendProxySelector extends ProxySelector {
 
     private EProxySelector eProxySelector;
 
-    private IProxyService proxyManager;
-
     final private Map<Object, Collection<IProxySelectorProvider>> selectorProviders;
 
     private Map<String, Map<String, String>> hostMap;
@@ -127,10 +114,6 @@ public class TalendProxySelector extends ProxySelector {
 
     private static Object instanceLock = new Object();
 
-    private List<String> localLoopbackAddresses;
-
-    private Object localLoopbackAddressesLock = new Object();
-
     private boolean printProxyLog = false;
 
     private boolean allowProxyRedirect = false;
@@ -143,8 +126,6 @@ public class TalendProxySelector extends ProxySelector {
 
     private boolean updateSystemPropertiesForJre = true;
 
-    private boolean excludeLoopbackAddressAutomatically = false;
-
     private TalendProxySelector(final ProxySelector eclipseDefaultSelector) {
         this.eclipseDefaultSelector = eclipseDefaultSelector;
         this.jreDefaultSelector = new DefaultProxySelector();
@@ -158,8 +139,6 @@ public class TalendProxySelector extends ProxySelector {
         executeConnectionFailed = Boolean.valueOf(System.getProperty(PROP_EXECUTE_CONNECTION_FAILED, Boolean.TRUE.toString()));
         updateSystemPropertiesForJre = Boolean
                 .valueOf(System.getProperty(PROP_UPDATE_SYSTEM_PROPERTIES_FOR_JRE, Boolean.TRUE.toString()));
-        excludeLoopbackAddressAutomatically = Boolean.valueOf(System.getProperty(
-                PROP_PROXY_EXCLUDE_LOOPBACK_ADDRESS_AUTOMATICALLY, PROP_PROXY_EXCLUDE_LOOPBACK_ADDRESS_AUTOMATICALLY_DEFAULT));
 
         switch (System.getProperty(PROP_PROXY_SELECTOR, PROP_PROXY_SELECTOR_DEFAULT).toLowerCase()) {
         case PROP_PROXY_SELECTOR_JRE:
@@ -169,83 +148,11 @@ public class TalendProxySelector extends ProxySelector {
             this.eProxySelector = EProxySelector.eclipse_default;
             break;
         }
-        proxyManager = ProxyManager.getProxyManager();
-        checkProxyManager(IProxyChangeEvent.PROXY_DATA_CHANGED);
-        proxyManager.addProxyChangeListener(event -> checkProxyManager(event.getChangeType()));
 
         initHostMap();
         initRedirectList();
     }
 
-    private void checkProxyManager(int changeEvent) {
-        try {
-            if (IProxyChangeEvent.PROXY_DATA_CHANGED == changeEvent
-                    || IProxyChangeEvent.NONPROXIED_HOSTS_CHANGED == changeEvent) {
-                if (this.excludeLoopbackAddressAutomatically && proxyManager.isProxiesEnabled()) {
-                    List<String> addresses = getLocalLoopbackAddresses();
-                    if (addresses != null && !addresses.isEmpty()) {
-                        if (org.eclipse.core.internal.net.ProxySelector
-                                .canSetBypassHosts(org.eclipse.core.internal.net.ProxySelector.getDefaultProvider())) {
-                            List<String> configuredProxies = Arrays.asList(proxyManager.getNonProxiedHosts());
-                            if (!configuredProxies.containsAll(addresses)) {
-                                Set<String> nonProxyHosts = new HashSet<>(addresses);
-                                nonProxyHosts.addAll(configuredProxies);
-                                ExceptionHandler.log(
-                                        this.getClass().getName() + ":" + "-D" + PROP_PROXY_EXCLUDE_LOOPBACK_ADDRESS_AUTOMATICALLY
-                                                + "=true, adding missing loopback addresses into eclipse nonProxyHosts: "
-                                                + nonProxyHosts);
-                                proxyManager.setNonProxiedHosts(nonProxyHosts.toArray(new String[0]));
-                            }
-                        } else {
-                            updateNonProxyHosts(addresses, PROP_PROXY_HTTP_NON_PROXYHOSTS);
-                            updateNonProxyHosts(addresses, PROP_PROXY_HTTPS_NON_PROXYHOSTS);
-                        }
-                    }
-                }
-            }
-        } catch (Exception e) {
-            ExceptionHandler.process(e);
-        }
-    }
-
-    private void updateNonProxyHosts(List<String> localLoopbackAddresses, final String nonProxyProperty) {
-        if (localLoopbackAddresses != null && !localLoopbackAddresses.isEmpty()) {
-            Set<String> nonProxyHosts = new HashSet<>(localLoopbackAddresses);
-            String property = System.getProperty(nonProxyProperty);
-            boolean update = true;
-            if (StringUtils.isNotBlank(property)) {
-                List<String> configuredProxies = Arrays.asList(ProxyType.convertPropertyStringToHosts(property));
-                if (configuredProxies.containsAll(localLoopbackAddresses)) {
-                    update = false;
-                } else {
-                    nonProxyHosts.addAll(configuredProxies);
-                }
-            }
-            if (update) {
-                ExceptionHandler.log(this.getClass().getName() + ":" + "-D" + PROP_PROXY_EXCLUDE_LOOPBACK_ADDRESS_AUTOMATICALLY
-                        + "=true, adding missing loopback addresses into " + nonProxyProperty + ": " + nonProxyHosts);
-                System.setProperty(nonProxyProperty,
-                        ProxyType.convertHostsToPropertyString(nonProxyHosts.toArray(new String[0])));
-            }
-        }
-    }
-
-    private List<String> getLocalLoopbackAddresses() {
-        if (this.localLoopbackAddresses == null) {
-            synchronized (localLoopbackAddressesLock) {
-                if (this.localLoopbackAddresses == null) {
-                    List<String> addresses = NetworkUtil.getLocalLoopbackAddresses(false);
-                    final String localhost = "localhost";
-                    if (!addresses.contains(localhost)) {
-                        addresses.add(localhost);
-                    }
-                    this.localLoopbackAddresses = addresses;
-                }
-            }
-        }
-        return this.localLoopbackAddresses;
-    }
-
     private void initHostMap() {
         try {
             hostMap = new HashMap<>();
@@ -375,27 +282,7 @@ public class TalendProxySelector extends ProxySelector {
             ExceptionHandler.log("TalendProxySelector.select " + uri);
         }
         if (uri == null) {
-            List<Proxy> result = new ArrayList<>();
-            result.add(Proxy.NO_PROXY);
-            return result;
-        }
-        try {
-            if (this.excludeLoopbackAddressAutomatically) {
-                List<String> addresses = getLocalLoopbackAddresses();
-                if (addresses != null) {
-                    String host = uri.getHost();
-                    if (addresses.contains(host)) {
-                        if (printProxyLog) {
-                            ExceptionHandler.log(uri + " is excluded from proxy");
-                        }
-                        List<Proxy> result = new ArrayList<>();
-                        result.add(Proxy.NO_PROXY);
-                        return result;
-                    }
-                }
-            }
-        } catch (Exception e) {
-            ExceptionHandler.process(e);
+            return Collections.EMPTY_LIST;
         }
         URI validatedUri = validateUri(uri);
         Set<Proxy> results = new LinkedHashSet<>();
@@ -445,9 +332,6 @@ public class TalendProxySelector extends ProxySelector {
             ExceptionHandler.log("Selected proxys for " + uri + ", " + proxys);
             ExceptionHandler.process(new Exception("Proxy call stacks"), Priority.INFO);
         }
-        if (results.isEmpty()) {
-            results.add(Proxy.NO_PROXY);
-        }
         return new LinkedList<Proxy>(results);
     }
 

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

@@ -49,17 +49,11 @@ public class EclipseCommandLine {
      */
     static public final String TALEND_PROJECT_TYPE_COMMAND = "-talendProjectType"; //$NON-NLS-1$
 
-    static public final String TALEND_LICENCE_PATH = "talend.licence.path"; //$NON-NLS-1$
-
-    static public final String ARG_TALEND_LICENCE_PATH = "-" + TALEND_LICENCE_PATH; //$NON-NLS-1$
-
     /**
      * for relaunch of the plugins when relaunching the Studio
      */
     static public final String TALEND_RELOAD_COMMAND = "-talendReload"; //$NON-NLS-1$
 
-    static public final String LOGIN_ONLINE_UPDATE = "--loginOnlineUpdate";
-
     static public final String ARG_TALEND_BUNDLES_CLEANED = "-talend.studio.bundles.cleaned"; //$NON-NLS-1$
 
     static public final String PROP_TALEND_BUNDLES_DO_CLEAN = "-talend.studio.bundles.doclean"; //$NON-NLS-1$

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/time/PerformanceLogManager.java

@@ -1,127 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2020 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.commons.utils.time;
-
-import java.util.Enumeration;
-import java.util.Properties;
-
-import org.apache.log4j.Hierarchy;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PropertyConfigurator;
-import org.apache.log4j.RollingFileAppender;
-import org.apache.log4j.spi.LoggerFactory;
-import org.apache.log4j.spi.RootLogger;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Platform;
-
-public class PerformanceLogManager {
-
-	private Hierarchy hierarchy;
-	
-	public PerformanceLogManager() {
-	    Properties properties = new Properties();
-	    properties.put("log4j.rootCategory", ", A1");
-	    properties.put("log4j.appender.A1", RollingFileAppender.class.getName());
-	    IPath performanceLogPath = Platform.getLogFileLocation().removeLastSegments(1).append("performance.log");
-	    properties.put("log4j.appender.A1.File", performanceLogPath.toOSString());
-	    properties.put("log4j.appender.A1.MaxBackupIndex", "10");// same as .log's max backup log file count
-	    properties.put("log4j.appender.A1.MaxFileSize", "1000000");//1000*1000 byte, same as .log's max file size
-	    properties.put("log4j.appender.A1.layout", "org.apache.log4j.PatternLayout");
-	    properties.put("log4j.appender.A1.layout.ConversionPattern", "%d %-5p %c %x - %m%n");
-	    
-		this.hierarchy = new Hierarchy(new RootLogger(Level.INFO));
-		new PropertyConfigurator().doConfigure(properties,hierarchy);	
-	}
-	
-	/**
-	 * Checks if this PluginLogManager is disabled for this level.
-	 * @param level level value
-	 * @return boolean true if it is disabled
-	 */
-	public boolean isDisabled(int level) {
-		return this.hierarchy.isDisabled(level);
-	}
-	
-	/**
-	 * Enable logging for logging requests with level l or higher.
-	 * By default all levels are enabled.
-	 * @param level level object
-	 */
-	public void setThreshold(Level level) {
-		this.hierarchy.setThreshold(level);
-	}
-	
-	/**
-	 * The string version of setThreshold(Level level)
-	 * @param level level string
-	 */
-	public void setThreshold(String level) {
-		this.hierarchy.setThreshold(level);
-	}
-
-	/**
-	 * Get the repository-wide threshold.
-	 * @return Level
-	 */
-	public Level getThreshold() {
-		return this.hierarchy.getThreshold();
-	}
-
-	/**
-	 * Returns a new logger instance named as the first parameter
-	 * using the default factory. If a logger of that name already exists,
-	 * then it will be returned. Otherwise, a new logger will be instantiated 
-	 * and then linked with its existing ancestors as well as children.
-	 * @param name logger name
-	 * @return Logger
-	 */
-	public Logger getLogger(String name) {
-		return this.hierarchy.getLogger(name);
-	}
-	
-	/**
-	 * The same as getLogger(String name) but using a factory instance instead of
-	 * a default factory.
-	 * @param name logger name
-	 * @param factory factory instance 
-	 * @return Logger
-	 */
-	public Logger getLogger(String name, LoggerFactory factory) {
-		return this.hierarchy.getLogger(name,factory);
-	}
-
-	public Logger getRootLogger() {
-		return this.hierarchy.getRootLogger();
-	}
-
-	public Logger exists(String name) {
-		return this.hierarchy.exists(name);
-	}
-	
-	public void shutdown() {
-	    this.hierarchy.shutdown();
-	}
-	
-	/**
-	 * Returns all the loggers in this manager.
-	 * @return Enumeration logger enumeration
-	 */
-	public Enumeration getCurrentLoggers() {
-		return this.hierarchy.getCurrentLoggers();
-	}
-
-	public void resetConfiguration() {
-		this.hierarchy.resetConfiguration();
-	}
-}

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/time/PerformanceStatisticUtil.java

@@ -1,371 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2020 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.commons.utils.time;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.Properties;
-import java.util.Random;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Platform;
-import org.talend.commons.exception.CommonExceptionHandler;
-
-/**
- * DOC sbliu class global comment. Detailled comment
- */
-public class PerformanceStatisticUtil {
-
-    private static final int MEGABYTE = 1024 * 1024;// MB = 1024*1024 byte
-
-    private static final int KILOBYTE = 1024;// kb=1024 byte
-
-    private static final int numOfBlocks = 256;
-
-    private static final int blockSizeKb = 512;
-
-    private static final String dataFile = "testio.data";
-
-    private static String recordingFileName = "performance_record";
-
-    private static File recordingFile = null;
-
-    private static enum BlockSequence {
-        SEQUENTIAL,
-        RANDOM;
-    }
-
-    public static enum StatisticKeys {
-
-        IO_COUNT("I/O.count"), // io count
-        IO_W_MB_SEC("I/O.write"), // write speed MB
-        IO_R_MB_SEC("I/O.read"), // read speed MB
-        IO_W_AVERAGE_MB_SEC("I/O.write.average"), // average speed of write MB
-        IO_R_AVERAGE_MB_SEC("I/O.read.average"), // average speed of read
-
-        STARTUP_AVERAGE("startup.average"),
-        STARTUP_MAX("startup.max"),
-        STARTUP_COUNT("startup.count");
-
-        private String key;
-
-        StatisticKeys(String _key) {
-            key = _key;
-        }
-
-        public String get() {
-            return key;
-        }
-    }
-
-    public static void recordStartupEpapsedTime(double elapsedTimeInSeconds) {
-        File file = getRecordingFile();
-
-        Properties props = read(file, true);
-        String propCount = props.getProperty(StatisticKeys.STARTUP_COUNT.get(), "0");
-        String propMax = props.getProperty(StatisticKeys.STARTUP_MAX.get(), "0");
-        String propAverage = props.getProperty(StatisticKeys.STARTUP_AVERAGE.get(), "0");
-
-        int iPropCount = Integer.parseInt(propCount);
-        double iPropMax = Double.parseDouble(propMax);
-        double iPropAverage = Double.parseDouble(propAverage);
-
-        iPropMax = iPropMax > elapsedTimeInSeconds ? iPropMax : elapsedTimeInSeconds;
-        iPropAverage = (iPropAverage * iPropCount + elapsedTimeInSeconds) / (iPropCount + 1);
-        iPropCount++;
-
-        props.setProperty(StatisticKeys.STARTUP_COUNT.get(), "" + iPropCount);
-        props.setProperty(StatisticKeys.STARTUP_MAX.get(), "" + iPropMax);
-        props.setProperty(StatisticKeys.STARTUP_AVERAGE.get(), "" + iPropAverage);
-
-        store(file, props);
-    }
-
-    public static File getRecordingFile() {
-        if (recordingFile != null) {
-            return recordingFile;
-        }
-
-        String configurationLocation = Platform.getConfigurationLocation().getURL().getPath();
-        File file = new File(configurationLocation + "/" + recordingFileName);
-        return file;
-    }
-
-    public static void setRecordingFile(File _recordingFile) {
-        recordingFile = _recordingFile;
-    }
-
-    public static synchronized Properties read(File recordFile, boolean createIfNotExist) {
-        Properties props = new Properties();
-        if (recordFile != null && exist(recordFile, createIfNotExist)) {
-            FileInputStream inStream = null;
-            try {
-                inStream = new FileInputStream(recordFile);
-                props.load(inStream);
-            } catch (Exception e) {
-                CommonExceptionHandler.log(e.getMessage());
-            } finally {
-                if (inStream != null) {
-                    try {
-                        inStream.close();
-                    } catch (IOException e) {//
-                    }
-                }
-            }
-        }
-
-        return props;
-    }
-
-    public static synchronized void store(File recordFile, Properties props) {
-        if (props == null) {
-            return;
-        }
-
-        if (recordFile != null && exist(recordFile, true)) {
-            FileOutputStream outputStream = null;
-            try {
-                outputStream = new FileOutputStream(recordFile);
-                props.store(outputStream, "");
-            } catch (IOException e) {
-                CommonExceptionHandler.log(e.getMessage());
-            } finally {
-                if (outputStream != null) {
-                    try {
-                        outputStream.close();
-                    } catch (IOException e) {
-                        //
-                    }
-                }
-            }
-        }
-    }
-
-    private static boolean exist(File recordFile, boolean createIfNotExist) {
-        boolean exists = recordFile.exists();
-        if (!exists && createIfNotExist) {
-            try {
-                exists = recordFile.createNewFile();
-                if (!exists) {
-                    throw new FileNotFoundException(recordFile.getName());
-                }
-            } catch (Exception e) {
-                CommonExceptionHandler.log(e.getMessage());
-                return false;
-            }
-        }
-
-        return exists;
-    }
-
-    private static Lock lock = new ReentrantLock();
-    private static Condition condition = lock.newCondition();
-    private static boolean measureIOFinished = true;
-    
-    public static void waitUntilFinish() throws InterruptedException {
-        lock.lock();
-
-        try {
-            if(!measureIOFinished) {
-                condition.await(20, TimeUnit.SECONDS);
-            }
-        } finally {
-            lock.unlock();
-        }
-    }
-    
-    public static void measureIO() {
-        new Thread()  {
-            public void run() {
-                measureIOFinished = false;
-                try {
-                    _measureIO();
-                } finally {
-                    measureIOFinished = true;
-                }
-            }
-        }.start();
-    }
-
-    private static void _measureIO() {
-        File file = getRecordingFile();
-        Properties props = read(file, true);
-
-        IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-        File workspace = root.getLocation().makeAbsolute().toFile();
-        File locationDir = new File(workspace, "temp"); // here is workspace/temp dir
-        File testFile = detectTestDataFile(locationDir);
-
-        if (testFile != null) {
-            measureWrite(props, testFile);
-            measureRead(props, testFile);
-
-            store(file, props);
-        }
-    }
-    
-    private static void measureWrite(Properties props, File testFile) {
-        int blockSize = blockSizeKb * KILOBYTE;
-
-        long startTime = System.nanoTime();
-        long totalBytesWrittenInMark = writeIO(numOfBlocks, BlockSequence.RANDOM, blockSize, testFile);
-        totalBytesWrittenInMark = totalBytesWrittenInMark + writeIO(numOfBlocks, BlockSequence.SEQUENTIAL, blockSize, testFile);
-        long endTime = System.nanoTime();
-
-        long elapsedTimeNs = endTime - startTime;
-        double sec = (double) elapsedTimeNs / (double) 1000000000;
-        double mbWritten = (double) totalBytesWrittenInMark / (double) MEGABYTE;
-        double bwMbSec = mbWritten / sec;
-
-        String ioCount = props.getProperty(StatisticKeys.IO_COUNT.get(), "0");
-        String ioWAverageMbSec = props.getProperty(StatisticKeys.IO_W_AVERAGE_MB_SEC.get(), "0");
-        String ioWMbSec = props.getProperty(StatisticKeys.IO_W_MB_SEC.get(), "0");
-
-        int digital_ioCount = Integer.parseInt(ioCount);
-        double digital_ioWAverageMbSec = Double.parseDouble(ioWAverageMbSec);
-        double digital_ioWMbSec = Double.parseDouble(ioWMbSec);
-
-        digital_ioWAverageMbSec = (digital_ioWAverageMbSec * digital_ioCount + bwMbSec) / (digital_ioCount + 1);
-        digital_ioWMbSec = bwMbSec;
-
-        props.setProperty(StatisticKeys.IO_W_AVERAGE_MB_SEC.get(), format(digital_ioWAverageMbSec));
-        props.setProperty(StatisticKeys.IO_W_MB_SEC.get(), format(digital_ioWMbSec));
-    }
-
-    private static long writeIO(int numOfBlocks, BlockSequence blockSequence, int blockSize, File testFile) {
-        byte[] blockArr = new byte[blockSize];
-        for (int b = 0; b < blockArr.length; b++) {
-            if (b % 2 == 0) {
-                blockArr[b] = (byte) 0xFF;
-            }
-        }
-        String mode = "rwd";// "rwd"
-
-        long totalBytesWrittenInMark = 0;
-        try {
-            try (RandomAccessFile rAccFile = new RandomAccessFile(testFile, mode)) {
-                for (int b = 0; b < numOfBlocks; b++) {
-                    if (blockSequence == BlockSequence.RANDOM) {
-                        int rLoc = randInt(0, numOfBlocks - 1);
-                        rAccFile.seek(rLoc * blockSize);
-                    } else {
-                        rAccFile.seek(b * blockSize);
-                    }
-                    rAccFile.write(blockArr, 0, blockSize);
-                    totalBytesWrittenInMark += blockSize;
-                }
-            }
-        } catch (IOException e) {
-            CommonExceptionHandler.log(e.getMessage());
-        }
-
-        return totalBytesWrittenInMark;
-    }
-
-    private static File detectTestDataFile(File location) {
-        if (!location.exists()) {
-            location.mkdirs();
-        }
-
-        File testFile = null;
-        try {
-            testFile = new File(location.getAbsolutePath() + File.separator + dataFile);
-            testFile.deleteOnExit();
-            testFile.createNewFile();
-        } catch (IOException e) {
-            CommonExceptionHandler.log(e.getMessage());
-        }
-
-        return testFile;
-    }
-
-    public static void measureRead(Properties props, File testFile) {
-        int blockSize = blockSizeKb * KILOBYTE;
-
-        long startTime = System.nanoTime();
-        long totalBytesReadInMark = readIO(numOfBlocks, BlockSequence.RANDOM, blockSize, testFile);
-        totalBytesReadInMark = totalBytesReadInMark + readIO(numOfBlocks, BlockSequence.SEQUENTIAL, blockSize, testFile);
-        long endTime = System.nanoTime();
-        long elapsedTimeNs = endTime - startTime;
-        double sec = (double) elapsedTimeNs / (double) 1000000000;
-        double mbRead = (double) totalBytesReadInMark / (double) MEGABYTE;
-        double bwMbSec = mbRead / sec;
-
-        String ioCount = props.getProperty(StatisticKeys.IO_COUNT.get(), "0");
-        String ioRAverageMbSec = props.getProperty(StatisticKeys.IO_R_AVERAGE_MB_SEC.get(), "0");
-        String ioRMbSec = props.getProperty(StatisticKeys.IO_R_MB_SEC.get(), "0");
-
-        int digital_ioCount = Integer.parseInt(ioCount);
-        double digital_ioRAverageMbSec = Double.parseDouble(ioRAverageMbSec);
-        double digital_ioRMbSec = Double.parseDouble(ioRMbSec);
-        digital_ioRAverageMbSec = (digital_ioRAverageMbSec * digital_ioCount + bwMbSec) / (digital_ioCount + 1);
-        digital_ioRMbSec = bwMbSec;
-        digital_ioCount++;
-
-        props.setProperty(StatisticKeys.IO_R_AVERAGE_MB_SEC.get(), format(digital_ioRAverageMbSec));
-        props.setProperty(StatisticKeys.IO_R_MB_SEC.get(), format(digital_ioRMbSec));
-        props.setProperty(StatisticKeys.IO_COUNT.get(), "" + digital_ioCount);
-    }
-
-    public static String format(double dvalue) {
-        return BigDecimal.valueOf(dvalue).setScale(2, RoundingMode.HALF_UP).toString();
-    }
-    
-    private static long readIO(int numOfBlocks, BlockSequence blockSequence, int blockSize, File testFile) {
-        long totalBytesReadInMark = 0;
-
-        byte[] blockArr = new byte[blockSize];
-        for (int b = 0; b < blockArr.length; b++) {
-            if (b % 2 == 0) {
-                blockArr[b] = (byte) 0xFF;
-            }
-        }
-        try {
-            try (RandomAccessFile rAccFile = new RandomAccessFile(testFile, "r")) {
-                for (int b = 0; b < numOfBlocks; b++) {
-                    if (blockSequence == BlockSequence.RANDOM) {
-                        int rLoc = randInt(0, numOfBlocks - 1);
-                        rAccFile.seek(rLoc * blockSize);
-                    } else {
-                        rAccFile.seek(b * blockSize);
-                    }
-                    rAccFile.readFully(blockArr, 0, blockSize);
-                    totalBytesReadInMark += blockSize;
-                }
-            }
-        } catch (IOException e) {
-            CommonExceptionHandler.log(e.getMessage());
-        }
-        return totalBytesReadInMark;
-    }
-
-    private static int randInt(int min, int max) {
-        // nextInt is normally exclusive of the top value,
-        // so add 1 to make it inclusive
-        int randomNum = new Random().nextInt((max - min) + 1) + min;
-
-        return randomNum;
-    }
-
-}

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/time/TimeMeasurePerformance.java

@@ -1,121 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2020 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.commons.utils.time;
-
-import java.util.HashMap;
-
-import org.apache.log4j.Logger;
-
-/**
- * DOC sbliu  class global comment. Detailled comment
- */
-public class TimeMeasurePerformance extends TimeMeasure{
-    static private Logger logger;
-    
-    private static HashMap<String, TimeStack> timers;
-    
-    private static long startTime = -1L;
-
-    private static int indent = 0;
-    
-    public static void begin(String idTimer, String description) {
-        startTime = System.nanoTime();
-        
-        init();
-        if (timers.containsKey(idTimer)) {
-            log(indent(indent) + "Warning (start): timer " + idTimer + " already exists"); //$NON-NLS-1$  //$NON-NLS-2$
-        } else {
-            indent++;
-            TimeStack times = new TimeStack();
-            timers.put(idTimer, times);
-            
-            String message = "Start '" + idTimer + "' ...";
-            if (description != null) {
-                message = "Start '" + idTimer + "', " + description + " ...";
-            }
-            log(indent(indent) + message); //$NON-NLS-1$  //$NON-NLS-2$
-        }
-    }
-    
-    private static void init() {
-        if (timers == null) {
-            timers = new HashMap<String, TimeStack>();
-        }
-        
-        if(logger == null) {
-            configureLogger();
-        }
-    }
-
-    private static void log (String message) {
-        logger.info(message);
-    }
-    
-    public static long end(String idTimer) {
-        init();
-        if (!timers.containsKey(idTimer)) {
-            log(indent(indent) + "Warning (end): timer " + idTimer + " doesn't exist"); //$NON-NLS-1$  //$NON-NLS-2$
-            return -1;
-        } else {
-            TimeStack timeStack = timers.get(idTimer);
-            timers.remove(idTimer);
-            long elapsedTimeSinceLastRequest = timeStack.getLastStepElapsedTime();
-            log(indent(indent) + "End '" + idTimer + "', elapsed time since last request: " //$NON-NLS-1$  //$NON-NLS-2$
-                    + elapsedTimeSinceLastRequest + " ms "); //$NON-NLS-1$
-            
-            long totalElapsedTime = timeStack.getTotalElapsedTime();
-            
-            log(indent(indent) + "End '" + idTimer + "', total elapsed time: " + totalElapsedTime + " ms "); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-            
-            indent--;
-            return totalElapsedTime;
-        }
-    }
-    
-    public static long step(String idTimer, String stepName) {
-        init();
-        if (!timers.containsKey(idTimer)) {
-            log(indent(indent) + "Warning (end): timer " + idTimer + " does'nt exist"); //$NON-NLS-1$  //$NON-NLS-2$
-            return -1;
-        } else {
-            TimeStack timeStack = timers.get(idTimer);
-            timeStack.addStep();
-            /*
-             * trace the timeline of every step,problem is that the code below " Calendar ca = Calendar.getInstance();
-             * Date now = ca.getTime();" will cost almost 13ms~15ms
-             */
-            long time = timeStack.getLastStepElapsedTime();
-            String timerStepName = idTimer + "', step name '" + stepName; //$NON-NLS-1$
-            
-            log(indent(indent)
-                    + "-> '" + timerStepName + "', elapsed time since previous step: " + time + " ms"); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-            
-            return time;
-        }
-    }
-    
-    private static void configureLogger() {
-        try {
-            PerformanceLogManager logManager = new PerformanceLogManager();
-            logger = logManager.getLogger(TimeMeasurePerformance.class.getName());
-        } catch (Exception e) {
-            throw new RuntimeException("Error while initializing log properties.", e);
-        }
-    }
-    
-    public static void afterStartup() {
-        double elapsedTimeInSeconds = (double)(System.nanoTime() - startTime)/1000000000;
-        PerformanceStatisticUtil.recordStartupEpapsedTime(elapsedTimeInSeconds);
-        PerformanceStatisticUtil.measureIO();
-    }
-}

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/proposal/CommonTextCellEditorWithProposal.java

@@ -212,8 +212,4 @@ public class CommonTextCellEditorWithProposal {
         return this.contentProposalAdapter;
     }
 
-    public int getPreviousActivatedIndex() {
-        return previousActivatedIndex;
-    }
-
 }

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/proposal/ExtendedTextCellEditorWithProposal.java

@@ -97,7 +97,4 @@ public class ExtendedTextCellEditorWithProposal extends ExtendedTextCellEditor i
         super.fireCancelEditor();
     }
 
-    public CommonTextCellEditorWithProposal getCommonTextEditor() {
-        return commonTextEditor;
-    }
 }

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/logintask/SyncLibrariesLoginTask.java

@@ -67,9 +67,4 @@ public class SyncLibrariesLoginTask extends AbstractLoginTask implements IRunnab
                 });
     }
 
-    @Override
-    public boolean isRequiredAlways() {
-        return true;
-    }
-
 }

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

@@ -837,8 +837,8 @@ public abstract class AbstractEMFRepositoryFactory extends AbstractRepositoryFac
         Object fullFolder = getFullFolder(project, type, relativeFolder);
         serializableAllVersion = getSerializableFromFolder(project, fullFolder, id, type, false, false, true, true);
         if (serializableAllVersion.isEmpty()) {
-            // look in all folders for this item type
-            serializableAllVersion = getSerializableFromFolder(project, fullFolder, id, type, false, true, true, true, true);
+            // look in all folders
+            serializableAllVersion = getSerializable(project, id, false, false);
         }
         int size = serializableAllVersion.size();
 

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

@@ -270,8 +270,6 @@ public interface IRepositoryFactory {
 
     public void create(Project project, Item item, IPath path, boolean... isImportItem) throws PersistenceException;
 
-    public void save(Project project, Item item, boolean isMigrationTask) throws PersistenceException;
-    
     public void save(Project project, Item item) throws PersistenceException;
 
     public void save(Project project, Property property) throws PersistenceException;

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

@@ -1064,9 +1064,6 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
         }
         if (newProject != null && newProject.getEmfProject() != null) {
             List<FolderItem> folderItems = ProjectManager.getInstance().getFolders(newProject.getEmfProject());
-            if (folderItems != null) {
-                folderItems = new ArrayList<>(folderItems);
-            }
             for (FolderItem folder : folderItems) {
                 String folderName = folder.getProperty().getLabel();
                 if (("process".equals(folderName) || "joblets".equals(folderName)) && folder.getChildren() != null

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

@@ -15,7 +15,6 @@ package org.talend.core.repository.model;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.io.File;
-import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Date;
@@ -72,7 +71,7 @@ import org.talend.commons.ui.gmf.util.DisplayUtils;
 import org.talend.commons.ui.runtime.exception.MessageBoxExceptionHandler;
 import org.talend.commons.utils.data.container.RootContainer;
 import org.talend.commons.utils.network.TalendProxySelector;
-import org.talend.commons.utils.time.TimeMeasurePerformance;
+import org.talend.commons.utils.time.TimeMeasure;
 import org.talend.commons.utils.workbench.resources.ResourceUtils;
 import org.talend.core.AbstractDQModelService;
 import org.talend.core.GlobalServiceRegister;
@@ -85,7 +84,6 @@ import org.talend.core.context.Context;
 import org.talend.core.context.RepositoryContext;
 import org.talend.core.exception.TalendInternalPersistenceException;
 import org.talend.core.hadoop.BigDataBasicUtil;
-import org.talend.core.model.general.ILibrariesService;
 import org.talend.core.model.general.ModuleNeeded;
 import org.talend.core.model.general.Project;
 import org.talend.core.model.metadata.MetadataTalendType;
@@ -126,13 +124,11 @@ import org.talend.core.repository.constants.Constant;
 import org.talend.core.repository.constants.FileConstants;
 import org.talend.core.repository.i18n.Messages;
 import org.talend.core.repository.recyclebin.RecycleBinManager;
-import org.talend.core.repository.utils.LoginTaskRegistryReader;
 import org.talend.core.repository.utils.ProjectDataJsonProvider;
 import org.talend.core.repository.utils.RepositoryPathProvider;
 import org.talend.core.repository.utils.XmiResourceManager;
 import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.runtime.repository.item.ItemProductKeys;
-import org.talend.core.runtime.services.IGenericWizardService;
 import org.talend.core.runtime.services.IMavenUIService;
 import org.talend.core.runtime.util.ItemDateParser;
 import org.talend.core.service.ICoreUIService;
@@ -140,7 +136,6 @@ import org.talend.core.service.IUpdateService;
 import org.talend.cwm.helper.SubItemHelper;
 import org.talend.cwm.helper.TableHelper;
 import org.talend.designer.runprocess.IRunProcessService;
-import org.talend.login.ILoginTask;
 import org.talend.repository.ProjectManager;
 import org.talend.repository.ReferenceProjectProblemManager;
 import org.talend.repository.ReferenceProjectProvider;
@@ -182,8 +177,6 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
 
     private boolean isCancelled;
 
-    private static final LoginTaskRegistryReader LOGIN_TASK_REGISTRY_READER = new LoginTaskRegistryReader();
-
     @Override
     public synchronized void addPropertyChangeListener(PropertyChangeListener l) {
         if (l == null) {
@@ -233,13 +226,6 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         return null;
     }
 
-    private ILibrariesService getLibrariesService() {
-        if (GlobalServiceRegister.getDefault().isServiceRegistered(ILibrariesService.class)) {
-            return GlobalServiceRegister.getDefault().getService(ILibrariesService.class);
-        }
-        return null;
-    }
-    
     /*
      * (non-Javadoc)
      *
@@ -1227,28 +1213,6 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         return this.repositoryFactoryFromProvider.getLastVersion(project, ProcessUtils.getPureItemId(id), folderPath, type);
     }
 
-
-    @Override
-    public IRepositoryViewObject getLastVersion(String id, ERepositoryObjectType type)
-            throws PersistenceException {
-        return getLastVersion(id , "", type);
-    }
-    
-    @Override
-    public IRepositoryViewObject getLastVersion(String id, List<ERepositoryObjectType> types) throws PersistenceException {
-        if (types != null) {
-            IRepositoryViewObject object = null;
-            for (ERepositoryObjectType type : types) {
-                object = getLastVersion(id, type);
-                if (object != null) {
-                    return object;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
     public IRepositoryViewObject getLastVersion(String id, String folderPath, ERepositoryObjectType type)
             throws PersistenceException {
         String objId = id;
@@ -1260,25 +1224,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 return this.repositoryFactoryFromProvider.getLastVersion(project, objId, folderPath, type);
             }
         }
-        return getLastRefVersion(projectManager.getCurrentProject(), objId , folderPath, type);
-    }
-    
-    @Override
-    public IRepositoryViewObject getLastRefVersion(Project project, String id, String folderPath, ERepositoryObjectType type) throws PersistenceException {
-        String projectLabel = ProcessUtils.getProjectLabelFromItemId(id);
-        IRepositoryViewObject lastVersion = getLastVersion(project, ProcessUtils.getPureItemId(id), folderPath, type);
-        if (lastVersion == null) {
-            for (Project p : projectManager.getReferencedProjects(project)) {
-                if (projectLabel != null && !projectLabel.equals(p.getTechnicalLabel())) {
-                    continue;
-                }
-                lastVersion = getLastRefVersion(p, id);
-                if (lastVersion != null) {
-                    break;
-                }
-            }
-        }
-        return lastVersion;
+        return this.repositoryFactoryFromProvider.getLastVersion(projectManager.getCurrentProject(), objId , folderPath, type);
     }
 
     @Override
@@ -1600,15 +1546,14 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
 
     @Override
     public void save(Project project, Item item, boolean... isMigrationTask) throws PersistenceException {
+        this.repositoryFactoryFromProvider.save(project, item);
         if (isMigrationTask == null || isMigrationTask.length == 0 || !isMigrationTask[0]) {
-            this.repositoryFactoryFromProvider.save(project, item);
             boolean avoidGenerateProm = false;
             if (isMigrationTask != null && isMigrationTask.length == 2) {
                 avoidGenerateProm = isMigrationTask[1];
             }
             fireRepositoryPropertyChange(ERepositoryActionName.SAVE.getName(), avoidGenerateProm, item);
-        } else {
-            this.repositoryFactoryFromProvider.save(project, item, true);
+
         }
     }
 
@@ -2090,7 +2035,11 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      */
     public void logOnProject(Project project, IProgressMonitor monitor) throws LoginException, PersistenceException {
         try {
-            TimeMeasurePerformance.begin("logOnProject", "logon project name '" + project.getLabel()+"'"); //$NON-NLS-1$ //$NON-NLS-2$
+            TimeMeasure.display = CommonsPlugin.isDebugMode();
+            TimeMeasure.displaySteps = CommonsPlugin.isDebugMode();
+            TimeMeasure.measureActive = CommonsPlugin.isDebugMode();
+
+            TimeMeasure.begin("logOnProject"); //$NON-NLS-1$
             try {
                 /**
                  * init/check proxy selector, in case default proxy selector is not registed yet
@@ -2134,35 +2083,12 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 this.repositoryFactoryFromProvider.beforeLogon(project);
                 ProjectManager.getInstance().getBeforeLogonRecords().clear();
                 ProjectManager.getInstance().getUpdatedRemoteHandlerRecords().clear();
-                ILibrariesService librariesService = getLibrariesService();
-                if (librariesService != null) {
-                	librariesService.setForceReloadCustomUri();
-                }
 
                 ProjectDataJsonProvider.checkAndRectifyRelationShipSetting(project.getEmfProject());
 
-                try {
-                    // load additional jdbc
-                    if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericWizardService.class)) {
-                        IGenericWizardService service = GlobalServiceRegister.getDefault()
-                                .getService(IGenericWizardService.class);
-                        if (service != null) {
-                            service.loadAdditionalJDBC();
-                        }
-                    }
-                } catch (Exception e) {
-                    // in case, to avoid block logon
-                    ExceptionHandler.process(e);
-                }
-
                 // init dynamic distirbution after `beforeLogon`, before loading libraries.
                 initDynamicDistribution(monitor);
 
-                if (GlobalServiceRegister.getDefault().isServiceRegistered(IUpdateService.class)) {
-                    IUpdateService updateService = GlobalServiceRegister.getDefault().getService(IUpdateService.class);
-                    updateService.syncComponentM2Jars(currentMonitor);
-                }
-
                 // init sdk component
                 try {
                     currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
@@ -2180,7 +2106,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                     throw new OperationCanceledException(""); //$NON-NLS-1$
                 }
                 // monitorWrap.worked(1);
-                TimeMeasurePerformance.step("logOnProject", "beforeLogon"); //$NON-NLS-1$ //$NON-NLS-2$
+                TimeMeasure.step("logOnProject", "beforeLogon"); //$NON-NLS-1$ //$NON-NLS-2$
 
                 // Check project compatibility
                 checkProjectCompatibility(project);
@@ -2198,7 +2124,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                     currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
                     currentMonitor.beginTask(Messages.getString("ProxyRepositoryFactory.synchronizeLibraries"), 1); //$NON-NLS-1$
                     coreService.syncLibraries(currentMonitor);
-                    TimeMeasurePerformance.step("logOnProject", "Sync components libraries"); //$NON-NLS-1$
+                    TimeMeasure.step("logOnProject", "Sync components libraries"); //$NON-NLS-1$
                 }
 
                 currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
@@ -2207,7 +2133,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 executeMigrations(project, true, currentMonitor);
                 ProjectManager.getInstance().getMigrationRecords().clear();
                 // monitorWrap.worked(1);
-                TimeMeasurePerformance.step("logOnProject", "executeMigrations(beforeLogonTasks)"); //$NON-NLS-1$ //$NON-NLS-2$
+                TimeMeasure.step("logOnProject", "executeMigrations(beforeLogonTasks)"); //$NON-NLS-1$ //$NON-NLS-2$
 
                 currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
                 currentMonitor.beginTask(Messages.getString("ProxyRepositoryFactory.logonInProgress"), 1); //$NON-NLS-1$
@@ -2215,7 +2141,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 this.repositoryFactoryFromProvider.logOnProject(project);
                 ProjectManager.getInstance().getLogonRecords().clear();
                 // monitorWrap.worked(1);
-                TimeMeasurePerformance.step("logOnProject", "logOnProject"); //$NON-NLS-1$ //$NON-NLS-2$
+                TimeMeasure.step("logOnProject", "logOnProject"); //$NON-NLS-1$ //$NON-NLS-2$
 
                 emptyTempFolder(project);
 
@@ -2231,6 +2157,11 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
 
                 fireRepositoryPropertyChange(ERepositoryActionName.PROJECT_PREFERENCES_RELOAD.getName(), null, null);
 
+                if (GlobalServiceRegister.getDefault().isServiceRegistered(IUpdateService.class)) {
+                    IUpdateService updateService = GlobalServiceRegister.getDefault().getService(IUpdateService.class);
+                    updateService.syncComponentM2Jars(currentMonitor);
+                }
+
                 IRunProcessService runProcessService = getRunProcessService();
                 if (runProcessService != null) {
                     runProcessService.initMavenJavaProject(monitor, project);
@@ -2241,7 +2172,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 ProjectManager.getInstance().getMigrationRecords().clear();
                 executeMigrations(project, false, currentMonitor);
                 ProjectManager.getInstance().getMigrationRecords().clear();
-                TimeMeasurePerformance.step("logOnProject", "executeMigrations(afterLogonTasks)"); //$NON-NLS-1$ //$NON-NLS-2$
+                TimeMeasure.step("logOnProject", "executeMigrations(afterLogonTasks)"); //$NON-NLS-1$ //$NON-NLS-2$
                 if (monitor != null && monitor.isCanceled()) {
                     throw new OperationCanceledException(""); //$NON-NLS-1$
                 }
@@ -2257,12 +2188,12 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                     // clean workspace
                     currentMonitor.beginTask(Messages.getString("ProxyRepositoryFactory.cleanWorkspace"), 1); //$NON-NLS-1$
 
-                    TimeMeasurePerformance.step("logOnProject", "clean Java project"); //$NON-NLS-1$ //$NON-NLS-2$
+                    TimeMeasure.step("logOnProject", "clean Java project"); //$NON-NLS-1$ //$NON-NLS-2$
 
                     if (workspace instanceof Workspace) {
                         ((Workspace) workspace).getFileSystemManager().getHistoryStore().clean(currentMonitor);
                     }
-                    TimeMeasurePerformance.step("logOnProject", "clean workspace history"); //$NON-NLS-1$ //$NON-NLS-2$
+                    TimeMeasure.step("logOnProject", "clean workspace history"); //$NON-NLS-1$ //$NON-NLS-2$
 
                     currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
                     currentMonitor.beginTask(Messages.getString("ProxyRepositoryFactory.synch.repo.items"), 1); //$NON-NLS-1$
@@ -2288,12 +2219,12 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 if (monitor != null && monitor.isCanceled()) {
                     throw new OperationCanceledException(""); //$NON-NLS-1$
                 }
-                TimeMeasurePerformance.step("logOnProject", "sync repository (routines/rules/beans)"); //$NON-NLS-1$ //$NON-NLS-2$
+                TimeMeasure.step("logOnProject", "sync repository (routines/rules/beans)"); //$NON-NLS-1$ //$NON-NLS-2$
 
                 // log4j prefs
                 if (coreUiService != null && coreService != null) {
                     coreService.syncLog4jSettings(null);
-                    TimeMeasurePerformance.step("logOnProject", "sync log4j"); //$NON-NLS-1$ //$NON-NLS-2$
+                    TimeMeasure.step("logOnProject", "sync log4j"); //$NON-NLS-1$ //$NON-NLS-2$
                 }
 
                 try {
@@ -2302,8 +2233,6 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                         // set the project mappings url
                         System.setProperty("talend.mappings.url", url.toString()); // $NON-NLS-1$
                     }
-                    // for new added mapping file, sync to project mapping folder
-                    MetadataTalendType.syncNewMappingFileToProject();
                 } catch (SystemException e) {
                     // ignore
                     ExceptionHandler.process(e);
@@ -2312,7 +2241,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 if (runProcessService != null && !isCommandLineLocalRefProject) {
                     runProcessService.initializeRootPoms(monitor);
 
-                    TimeMeasurePerformance.step("logOnProject", "install / setup root poms"); //$NON-NLS-1$ //$NON-NLS-2$
+                    TimeMeasure.step("logOnProject", "install / setup root poms"); //$NON-NLS-1$ //$NON-NLS-2$
                 }
                 if (GlobalServiceRegister.getDefault().isServiceRegistered(ITDQRepositoryService.class)) {
                     ITDQRepositoryService tdqRepositoryService = GlobalServiceRegister.getDefault()
@@ -2329,7 +2258,10 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 fullLogonFinished = true;
                 this.repositoryFactoryFromProvider.afterLogon(monitor);
             } finally {
-                TimeMeasurePerformance.end("logOnProject"); //$NON-NLS-1$
+                TimeMeasure.end("logOnProject"); //$NON-NLS-1$
+                TimeMeasure.display = false;
+                TimeMeasure.displaySteps = false;
+                TimeMeasure.measureActive = false;
             }
             String str[] = new String[] { getRepositoryContext().getUser() + "", projectManager.getCurrentProject() + "" }; //$NON-NLS-1$ //$NON-NLS-2$
             log.info(Messages.getString("ProxyRepositoryFactory.log.loggedOn", str)); //$NON-NLS-1$
@@ -2730,13 +2662,4 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
     public RepositoryWorkUnit getWorkUnitInProgress() {
         return repositoryFactoryFromProvider.getWorkUnitInProgress();
     }
-
-    public void executeRequiredLoginTasks(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-        ILoginTask[] allLoginTasks = LOGIN_TASK_REGISTRY_READER.getAllTaskListInstance();
-        for (ILoginTask task : allLoginTasks) {
-            if (task.isRequiredAlways()) {
-                task.run(monitor);
-            }
-        }
-    }
 }

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

@@ -14,7 +14,6 @@ package org.talend.core.repository.recyclebin;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
@@ -25,7 +24,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.lang3.StringUtils;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.emf.common.util.EList;
@@ -277,38 +275,6 @@ public class RecycleBinManager {
                 resource = createRecycleBinResource(project);
             }
             resource.getContents().clear();
-            EList<String> deletedFolders = recycleBin.getDeletedFolders();
-            if (deletedFolders != null) {
-                List<String> folders = new LinkedList<>(deletedFolders);
-                Collections.sort(folders);
-                deletedFolders.clear();
-                deletedFolders.addAll(folders);
-            }
-            EList<TalendItem> deletedItems = recycleBin.getDeletedItems();
-            if (deletedItems != null) {
-                List<TalendItem> items = new LinkedList<>(deletedItems);
-                items.sort((l, r) -> {
-                    if (l == null && r == null) {
-                        return 0;
-                    } else if (l == null) {
-                        return -1;
-                    } else if (r == null) {
-                        return 1;
-                    }
-                    int result = StringUtils.compare(l.getType(), r.getType());
-                    if (result != 0) {
-                        return result;
-                    }
-                    result = StringUtils.compare(l.getPath(), r.getPath());
-                    if (result != 0) {
-                        return result;
-                    }
-                    return StringUtils.compare(l.getId(), r.getId());
-                });
-                deletedItems.clear();
-                deletedItems.addAll(items);
-            }
-
             // set date to null to avoid timezone conflict
             recycleBin.setLastUpdate(null);
             resource.getContents().add(recycleBin);

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

@@ -26,7 +26,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Priority;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
@@ -38,7 +37,6 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
@@ -71,7 +69,6 @@ import org.talend.core.model.properties.ValidationRulesConnectionItem;
 import org.talend.core.model.properties.helper.ByteArrayResource;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.repository.constants.FileConstants;
-import org.talend.core.repository.model.ProxyRepositoryFactory;
 import org.talend.core.repository.utils.ResourceFilenameHelper.FileName;
 import org.talend.core.ui.ITestContainerProviderService;
 import org.talend.designer.core.model.utils.emf.talendfile.ProcessType;
@@ -650,23 +647,6 @@ public class XmiResourceManager {
     }
 
     public void saveResource(Resource resource) throws PersistenceException {
-        try {
-            if (resource != null) {
-                Object objectByType = EcoreUtil.getObjectByType(resource.getContents(), PropertiesPackage.eINSTANCE.getProject());
-                if (objectByType != null) {
-                    Project project = (Project) objectByType;
-                    EList migrationTasks = project.getMigrationTask();
-                    if (migrationTasks != null && 1 < migrationTasks.size()) {
-                        org.talend.commons.exception.ExceptionHandler.process(new Exception("Bad saving logic for Project"),
-                                Priority.WARN);
-                        ProxyRepositoryFactory.getInstance().saveProject(new org.talend.core.model.general.Project(project));
-                        return;
-                    }
-                }
-            }
-        } catch (Throwable e) {
-            org.talend.commons.exception.ExceptionHandler.process(e);
-        }
         EmfHelper.saveResource(resource);
     }
 

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

@@ -1,128 +0,0 @@
-<?xml version="1.0"?>
-<mapping>
-	<dbms product="DATABRICKS_DELTA_LAKE" id="databricks_delta_lake_id" label="Mapping Delta Lake" default="true">
-		<dbTypes>
-			<dbType type="SMALLINT" ignoreLen="true" ignorePre="true"/>
-			<dbType type="FLOAT" ignoreLen="true" ignorePre="true"/>
-			<dbType type="DOUBLE" ignoreLen="true" ignorePre="true"/>
-			<dbType type="BIGINT" ignoreLen="true" ignorePre="true"/>
-			<dbType type="INT" ignoreLen="true" ignorePre="true"/>
-			<dbType type="TINYINT" ignoreLen="true" ignorePre="true"/>
-			<dbType type="STRING" ignoreLen="true" ignorePre="true"/>
-			<dbType type="DECIMAL" ignoreLen="false" ignorePre="false"/>
-			<dbType type="BOOLEAN" ignoreLen="true" ignorePre="true"/>
-			<dbType type="STRUCT" ignoreLen="true" ignorePre="true"/>
-			<dbType type="MAP" ignoreLen="true" ignorePre="true"/>
-			<dbType type="ARRAY" ignoreLen="true" ignorePre="true"/>
-			<dbType type="TIMESTAMP" ignoreLen="true" ignorePre="true"/>
-			<dbType type="DATE" ignoreLen="true" 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="TINYINT" default="true"/>
-					<dbType type="BIGINT"/>
-					<dbType type="INT"/>
-					<dbType type="SMALLINT"/>				
-				</talendType>
-				<talendType type="id_byte[]"/>
-				<talendType type="id_Character">
-					<dbType type="STRING" default="true"/>
-				</talendType>
-				<talendType type="id_Date">
-				    <dbType type="TIMESTAMP" default="true"/>
-				    <dbType type="DATE"/>
-				</talendType>
-				<talendType type="id_BigDecimal">
-				    <dbType type="DECIMAL" default="true"/>
-					<dbType type="BIGINT"/>
-					<dbType type="FLOAT"/>
-					<dbType type="DOUBLE"/>
-				</talendType>
-				<talendType type="id_Double">
-					<dbType type="DOUBLE" default="true" />
-					<dbType type="FLOAT"/>
-				</talendType>
-				<talendType type="id_Float">
-					<dbType type="FLOAT" default="true" />
-					<dbType type="DOUBLE"/>
-				</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="STRUCT" default="true" />
-					<dbType type="MAP" />
-					<dbType type="ARRAY" />	
-				</talendType>
-				<talendType type="id_Short">
-					<dbType type="SMALLINT" default="true" />
-					<dbType type="INT" />
-				</talendType>
-				<talendType type="id_String">
-					<dbType type="STRING" default="true"/>
-				</talendType>
-			</talendToDbTypes>
-			<dbToTalendTypes><!-- Adviced mappings  -->
-				<dbType type="STRING">
-					<talendType type="id_String" default="true"/>
-				</dbType>
-				<dbType type="BOOLEAN">
-					<talendType type="id_Boolean" default="true"/>
-				</dbType>
-				<dbType type="DOUBLE">
-					<talendType type="id_Double" default="true"/>
-					<talendType type="id_BigDecimal"/>
-					<talendType type="id_Float"/>
-				</dbType>
-                <dbType type="DECIMAL">
-                    <talendType type="id_BigDecimal" default="true"/>
-                </dbType>
-				<dbType type="BIGINT">
-					<talendType type="id_Long" default="true"/>
-					<talendType type="id_Integer"/>
-				</dbType>
-				<dbType type="INT">
-					<talendType type="id_Integer" default="true"/>
-					<talendType type="id_Short"/>
-				</dbType>
-				<dbType type="SMALLINT">
-					<talendType type="id_Short" default="true"/>
-					<talendType type="id_Byte"/>
-				</dbType>
-				<dbType type="TINYINT">
-					<talendType type="id_Byte" default="true"/>
-				</dbType>
-				<dbType type="FLOAT">
-					<talendType type="id_Float" default="true"/>
-					<talendType type="id_Double"/>
-					<talendType type="id_BigDecimal"/>
-				</dbType>
-				<dbType type="STRUCT">
-					<talendType type="id_Object" default="true"/>
-				</dbType>
-				<dbType type="MAP">
-					<talendType type="id_Object" default="true"/>
-				</dbType>
-				<dbType type="ARRAY">
-					<talendType type="id_Object" default="true"/>
-				</dbType>
-                <dbType type="TIMESTAMP">
-                    <talendType type="id_Date" default="true"/>
-                </dbType>
-                <dbType type="DATE">
-                    <talendType type="id_Date" default="true"/>
-                </dbType>
-			</dbToTalendTypes>
-		</language>
-	</dbms>
-</mapping>

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

@@ -1,288 +0,0 @@
-<?xml version="1.0"?>
-<mapping>
-	<dbms product="SINGLESTORE" id="singlestore_id" label="Mapping SingleStore"
-		default="true">
-		<dbTypes>
-			<dbType type="BOOL" ignoreLen="true" ignorePre="true" />
-			<dbType type="BOOLEAN" ignoreLen="true" ignorePre="true" />
-			<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="false" />
-			<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="GEOGRAPHY" ignoreLen="true" ignorePre="true" />
-			<dbType type="GEOGRAPHYPOINT" 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="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="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"/>
-			<dbType type="JSON" 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">
-					<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="GEOGRAPHY" />
-					<dbType type="GEOGRAPHYPOINT" />
-					<dbType type="MEDIUMINT" />
-					<dbType type="LONGBLOB" />
-					<dbType type="MEDIUMBLOB" />
-					<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="LONGTEXT"/>
-					<dbType type="MEDIUMTEXT" />
-					<dbType type="TEXT" />
-					<dbType type="TINYTEXT" />
-					<dbType type="CHAR" />
-					<dbType type="JSON" />
-				</talendType>
-			</talendToDbTypes>
-			<dbToTalendTypes>
-				<dbType type="BOOL">
-					<talendType type="id_Boolean" 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="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="GEOGRAPHY">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="GEOGRAPHYPOINT">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="JSON">
-					<talendType type="id_String" default="true" />
-					<talendType type="id_Object" />
-				</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="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="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/src/main/java/org/talend/commons/utils/io/FilesUtils.java

@@ -42,7 +42,6 @@ import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
@@ -51,16 +50,11 @@ import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.core.runtime.jobs.Job;
 import org.osgi.framework.Bundle;
 import org.talend.commons.exception.CommonExceptionHandler;
 import org.talend.commons.exception.ExceptionHandler;
@@ -1179,33 +1173,4 @@ public class FilesUtils {
         }
     }
 
-    public static void executeFolderAction(IProgressMonitor monitor, IResource parentFolder, IWorkspaceRunnable run)
-            throws CoreException {
-        if (Job.getJobManager().currentRule() == null) {
-            IWorkspace workspace = ResourcesPlugin.getWorkspace();
-            ISchedulingRule defaultRule = workspace.getRuleFactory().modifyRule(parentFolder);
-            ISchedulingRule noBlockRule = new ISchedulingRule() {
-
-                @Override
-                public boolean isConflicting(ISchedulingRule rule) {
-                    return this.contains(rule);
-                }
-
-                @Override
-                public boolean contains(ISchedulingRule rule) {
-                    if (this.equals(rule)) {
-                        return true;
-                    }
-                    if (defaultRule.contains(rule)) {
-                        return true;
-                    }
-                    return false;
-                }
-            };
-            workspace.run(run, noBlockRule, IWorkspace.AVOID_UPDATE, monitor);
-        } else {
-            run.run(monitor);
-        }
-    }
-
 }

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

@@ -1,84 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2020 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.database;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.talend.core.runtime.hd.hive.HiveMetadataHelper;
-
-/**
- * DOC hzhao  class global comment. Detailled comment
- */
-public enum EImpalaDriver {
-
-    HIVE2("HIVE2", "HIVE2", "org.apache.hive.jdbc.HiveDriver"),
-    IMPALA40("IMPALA40", "IMPALA40", "com.cloudera.impala.jdbc4.Driver"),
-    IMPALA41("IMPALA41", "IMPALA41", "com.cloudera.impala.jdbc41.Driver");
-
-    EImpalaDriver(String displayName, String name, String driver) {
-        this.displayName = displayName;
-        this.name = name;
-        this.driver = driver;
-    }
-
-    private String displayName;
-
-    private String name;
-
-    private String driver;
-
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getDriver() {
-        return driver;
-    }
-
-    public static boolean isSupport(String distribution, String version, boolean byDisplay, String supportMethodName) {
-        return HiveMetadataHelper.doSupportMethod(distribution, version, byDisplay, supportMethodName);
-    }
-
-    public static String[] getImpalaDriverDisplay(String distribution, String version, boolean byDisplay) {
-        List<String> list = new ArrayList<>(0);
-        for (EImpalaDriver driver : EImpalaDriver.values()) {
-            if (isSupport(distribution, version, byDisplay, "doSupportImpalaConnector")) {
-                list.add(driver.getDisplayName());
-            }
-        }
-        return list.toArray(new String[0]);
-    }
-
-    public static EImpalaDriver getByDisplay(String display) {
-        for (EImpalaDriver driver : EImpalaDriver.values()) {
-            if (driver.getDisplayName().equals(display)) {
-                return driver;
-            }
-        }
-        return null;
-    }
-
-    public static EImpalaDriver getByName(String name) {
-        for (EImpalaDriver driver : EImpalaDriver.values()) {
-            if (driver.getName().equals(name)) {
-                return driver;
-            }
-        }
-        return null;
-    }
-}

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

@@ -267,8 +267,6 @@ public class ConnParameterKeys {
 
     public static final String IMPALA_AUTHENTICATION_PRINCIPLA = "IMPALA_AUTHENTICATION_PRINCIPLA";//$NON-NLS-1$
 
-    public static final String IMPALA_DRIVER = "IMPALA_DRIVER";
-
     /**
      * Google Dataproc keys.
      */

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

@@ -224,7 +224,6 @@ public class DatabaseConnStrUtil {
         if (template.startsWith(DbConnStrForHive.URL_HIVE_2_TEMPLATE)) {
             url = getImpalaURLString(false, server, port, sidOrDatabase, impalaPrincipal);
         }
-        url = attachAdditionalHiveParameters(url, dbConn, false);
         return url;
     }
 

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

@@ -23,7 +23,6 @@ import org.talend.core.database.EDatabaseTypeName;
 import org.talend.core.database.conn.version.EDatabaseVersion4Drivers;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.runtime.services.IGenericDBService;
-import org.talend.core.runtime.services.IGenericWizardService;
 
 /**
  * cli class global comment. Detailled comment
@@ -327,16 +326,6 @@ public enum EDatabaseConnTemplate {
                 databaseType.add(typeName);
             }
         }
-        // add additional jdbc (actually JDBC RepositoryObjectType)
-        if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericWizardService.class)) {
-            IGenericWizardService service = GlobalServiceRegister.getDefault().getService(IGenericWizardService.class);
-            if (service != null) {
-                List<String> allAdditionalJDBCTypes = service.getAllAdditionalJDBCTypes();
-                if (!allAdditionalJDBCTypes.isEmpty()) {
-                    databaseType.addAll(allAdditionalJDBCTypes);
-                }
-            }
-        }
         if (sort) {
             String[] sortedArray = databaseType.toArray(new String[0]);
             Arrays.sort(sortedArray, new Comparator<String>() {

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

@@ -102,12 +102,12 @@ public enum EDatabaseVersion4Drivers {
 
     GREENPLUM(new DbVersion4Drivers(EDatabaseTypeName.GREENPLUM, "postgresql-8.4-703.jdbc4.jar")), //$NON-NLS-1$
 //    PSQL_V10(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "v10", "V10", "postgresql-42.2.5.jar")),
-    PSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "v9 and later", "V9_X", "postgresql-42.2.14.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    PSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "v9 and later", "V9_X", "postgresql-42.2.9.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     PSQL_PRIOR_TO_V9(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "Prior to v9", "PRIOR_TO_V9", "postgresql-8.4-703.jdbc4.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
     PLUSPSQL_PRIOR_TO_V9(new DbVersion4Drivers(EDatabaseTypeName.PLUSPSQL,
             "Prior to v9", "PRIOR_TO_V9", "postgresql-8.4-703.jdbc4.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    PLUSPSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PLUSPSQL, "v9 and later", "V9_X", "postgresql-42.2.14.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    PLUSPSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PLUSPSQL, "v9 and later", "V9_X", "postgresql-9.4-1201.jdbc41.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     IBMDB2(new DbVersion4Drivers(EDatabaseTypeName.IBMDB2, new String[] { "db2jcc4.jar", "db2jcc_license_cu.jar", //$NON-NLS-1$ //$NON-NLS-2$
             "db2jcc_license_cisuz.jar" })), //$NON-NLS-1$
     IBMDB2ZOS(new DbVersion4Drivers(EDatabaseTypeName.IBMDB2ZOS, new String[] { "db2jcc4.jar", "db2jcc_license_cu.jar", //$NON-NLS-1$ //$NON-NLS-2$
@@ -166,7 +166,7 @@ public enum EDatabaseVersion4Drivers {
     REDSHIFT(new DbVersion4Drivers(EDatabaseTypeName.REDSHIFT, "redshift", "REDSHIFT", //$NON-NLS-1$ //$NON-NLS-2$
             "redshift-jdbc42-no-awssdk-1.2.37.1061.jar")), //$NON-NLS-1$
     REDSHIFT_SSO(new DbVersion4Drivers(EDatabaseTypeName.REDSHIFT_SSO, "redshift sso", "REDSHIFT_SSO", //$NON-NLS-1$ //$NON-NLS-2$
-            new String[] { "redshift-jdbc42-no-awssdk-1.2.37.1061.jar", "aws-java-sdk-1.11.848.jar", "jackson-core-2.10.1.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            new String[] { "redshift-jdbc42-no-awssdk-1.2.37.1061.jar", "aws-java-sdk-1.11.729.jar", "jackson-core-2.10.1.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                     "jackson-databind-2.10.1.jar", "jackson-annotations-2.10.1.jar", "httpcore-4.4.11.jar", "httpclient-4.5.9.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$//$NON-NLS-4$
                     "joda-time-2.8.1.jar", "commons-logging-1.2.jar", "commons-codec-1.11.jar" })), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/components/ComponentUtilities.java

@@ -81,11 +81,6 @@ public final class ComponentUtilities {
 
     public static void setNodeValue(NodeType node, String name, String value) {
         ElementParameterType property = getNodeProperty(node, name);
-        
-        if (property == null) {
-            throw new IllegalArgumentException( "The component node "+node.getComponentName()+" doesn't have the property "+name );
-        }
-        
         property.setValue(value);
     }
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/components/IComponentsFactory.java

@@ -111,6 +111,4 @@ public interface IComponentsFactory {
     public Map<String, File> getComponentsProvidersFolder();
 
     public List<ComponentProviderInfo> getComponentsProvidersInfo();
-    
-    public String getCustomComponentBundlePath();
 }

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

@@ -12,7 +12,6 @@
 // ============================================================================
 package org.talend.core.model.context;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -48,14 +47,12 @@ import org.talend.core.model.properties.ContextItem;
 import org.talend.core.model.properties.Item;
 import org.talend.core.model.properties.JobletProcessItem;
 import org.talend.core.model.properties.ProcessItem;
-import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.cwm.helper.ResourceHelper;
 import org.talend.designer.core.model.utils.emf.talendfile.ContextParameterType;
 import org.talend.designer.core.model.utils.emf.talendfile.ContextType;
 import org.talend.designer.core.model.utils.emf.talendfile.ProcessType;
-import org.talend.migration.IMigrationTask.ExecutionResult;
 import org.talend.repository.model.IProxyRepositoryFactory;
 
 /**
@@ -74,7 +71,6 @@ public class ContextUtils {
     private static final Set<String> SECURE_SENSITIVE_CONTEXT_NAMES_EXP = new HashSet<String>(Arrays.asList("resource_flow_temp_folder", "resource_webhook_payload", "resource_file_[\\w]+", 
            "resource_directory_[\\w]+", "connection_[a-zA-Z0-9]+_[\\w]"));
     
-
     /**
      *
      * ggu Comment method "isJavaKeyWords".
@@ -92,7 +88,7 @@ public class ContextUtils {
         }
         return false;
     }
-
+    
     /**
     *
     * ggu Comment method "isSecureSensitiveParam".
@@ -245,6 +241,7 @@ public class ContextUtils {
         return parameterType;
     }
 
+    @SuppressWarnings("unchecked")
     private static boolean checkObject(Object obj) {
         if (obj == null) {
             return true;
@@ -291,7 +288,7 @@ public class ContextUtils {
 
         IProxyRepositoryFactory factory = CoreRuntimePlugin.getInstance().getProxyRepositoryFactory();
         try {
-            final IRepositoryViewObject lastVersion = factory.getLastVersion(contextId, ERepositoryObjectType.CONTEXT);
+            final IRepositoryViewObject lastVersion = factory.getLastVersion(contextId);
             if (lastVersion != null) {
                 final Item item = lastVersion.getProperty().getItem();
                 if (item != null && item instanceof ContextItem) {
@@ -508,13 +505,9 @@ public class ContextUtils {
             return null;
         }
 
-        List<ERepositoryObjectType> possibleTypes = new ArrayList<ERepositoryObjectType>();
-        possibleTypes.add(ERepositoryObjectType.CONTEXT);
-        possibleTypes.addAll(ERepositoryObjectType.getAllTypesOfJoblet());
-        possibleTypes.addAll(ERepositoryObjectType.getAllTypesOfProcess());
+        IProxyRepositoryFactory factory = CoreRuntimePlugin.getInstance().getProxyRepositoryFactory();
         try {
-            IRepositoryViewObject lastVersion = CoreRuntimePlugin.getInstance().getProxyRepositoryFactory()
-                    .getLastVersion(contextId, possibleTypes);
+            final IRepositoryViewObject lastVersion = factory.getLastVersion(contextId);
             if (lastVersion != null) {
                 final Item item = lastVersion.getProperty().getItem();
                 if (item != null) {
@@ -594,7 +587,7 @@ public class ContextUtils {
                 return false;
             }
             // need check the raw value, because in sourceParam, it's raw
-            if (!StringUtils.equals(sourceParam.getValue(), targetParamType.getRawValue())) {
+            if (!sourceParam.getValue().equals(targetParamType.getRawValue())) {
                 return false;
             }
 
@@ -608,8 +601,7 @@ public class ContextUtils {
             return false;
         }
 
-        // preference name must match
-        // TalendDesignerPrefConstants.PROPAGATE_CONTEXT_VARIABLE
+        // preference name must match TalendDesignerPrefConstants.PROPAGATE_CONTEXT_VARIABLE
         return Boolean.parseBoolean(
                 CoreRuntimePlugin.getInstance().getDesignerCoreService().getPreferenceStore("propagateContextVariable")); //$NON-NLS-1$
     }
@@ -1064,70 +1056,4 @@ public class ContextUtils {
         }
         return false;
     }
-
-    public static ExecutionResult doCreateContextLinkMigration(Item item) {
-        IProxyRepositoryFactory proxyRepositoryFactory = CoreRuntimePlugin.getInstance().getProxyRepositoryFactory();
-        boolean modified = false, hasLinkFile = false;
-        try {
-            List<ContextType> contextTypeList = ContextUtils.getAllContextType(item);
-            if (contextTypeList != null && contextTypeList.size() > 0) {
-                for (ContextType contextType : contextTypeList) {
-                    for (Object obj : contextType.getContextParameter()) {
-                        if (obj instanceof ContextParameterType) {
-                            ContextParameterType paramType = (ContextParameterType) obj;
-                            if (ContextUtils.isBuildInParameter(paramType)) {
-                                if (StringUtils.isEmpty(paramType.getInternalId())) {
-                                    paramType.setInternalId(proxyRepositoryFactory.getNextId());
-                                    modified = true;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            hasLinkFile = ContextLinkService.getInstance().saveContextLink(item);
-        } catch (Exception ex) {
-            ExceptionHandler.process(ex);
-            return ExecutionResult.FAILURE;
-        }
-        if (modified || hasLinkFile) {
-            try {
-                if (modified) {
-                    proxyRepositoryFactory.save(item, true);
-                }
-                return ExecutionResult.SUCCESS_NO_ALERT;
-            } catch (Exception ex) {
-                ExceptionHandler.process(ex);
-                return ExecutionResult.FAILURE;
-            }
-        }
-        return ExecutionResult.NOTHING_TO_DO;
-    }
-
-    public static ExecutionResult doCreateContextLinkMigration(ERepositoryObjectType repositoryType, Item item) {
-        if (item != null && getAllSupportContextLinkTypes().contains(repositoryType)) {
-            return doCreateContextLinkMigration(item);
-        }
-        return ExecutionResult.NOTHING_TO_DO;
-    }
-
-    public static List<ERepositoryObjectType> getAllSupportContextLinkTypes() {
-        List<ERepositoryObjectType> toReturn = new ArrayList<ERepositoryObjectType>();
-        toReturn.addAll(ERepositoryObjectType.getAllTypesOfProcess());
-        toReturn.addAll(ERepositoryObjectType.getAllTypesOfProcess2());
-        toReturn.addAll(ERepositoryObjectType.getAllTypesOfTestContainer());
-        toReturn.addAll(getAllMetaDataType());
-        return toReturn;
-    }
-
-    private static List<ERepositoryObjectType> getAllMetaDataType() {
-        List<ERepositoryObjectType> list = new ArrayList<ERepositoryObjectType>();
-        ERepositoryObjectType[] allTypes = (ERepositoryObjectType[]) ERepositoryObjectType.values();
-        for (ERepositoryObjectType object : allTypes) {
-            if (object.isChildTypeOf(ERepositoryObjectType.METADATA)) {
-                list.add(object);
-            }
-        }
-        return list;
-    }
 }

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

@@ -320,8 +320,7 @@ public class JobContextManager implements IContextManager {
                 contextParam = new JobContextParameter();
                 contextParam.setContext(context);
                 contextParam.setName(contextParamType.getName());
-                contextParam.setPrompt(
-                        contextParamType.getPrompt() == null ? (contextParamType.getName() + "?") : contextParamType.getPrompt());
+                contextParam.setPrompt(contextParamType.getPrompt());
                 contextParam.setInternalId(contextParamType.getInternalId());
                 originalParamerters.add(contextParam.getName());
                 boolean exists = true;

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

@@ -18,18 +18,15 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
-import org.eclipse.emf.common.util.EList;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.model.context.ContextUtils;
 import org.talend.core.model.properties.ContextItem;
 import org.talend.core.model.properties.Item;
-import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.cwm.helper.ResourceHelper;
 import org.talend.designer.core.model.utils.emf.talendfile.ContextParameterType;
 import org.talend.designer.core.model.utils.emf.talendfile.ContextType;
-import org.talend.repository.ProjectManager;
 import org.talend.repository.model.IRepositoryService;
 
 
@@ -109,26 +106,16 @@ public abstract class AbstractItemContextLinkService implements IItemContextLink
         }
 
         Item contextItem = tempCache.get(repositoryContextId);
-        IRepositoryService repositoryService = GlobalServiceRegister.getDefault().getService(IRepositoryService.class);
         if (contextItem == null) {
             contextItem = ContextUtils.getRepositoryContextItemById(repositoryContextId);
             tempCache.put(repositoryContextId, contextItem);
-            if (contextItem != null && !(contextItem instanceof ContextItem)
-                    && ProjectManager.getInstance().isInCurrentMainProject(contextItem)
-                    && checkRepoItemContextParamInternalId(contextItem)) {
-                try {
-                    repositoryService.getProxyRepositoryFactory().save(contextItem, true); // This should only using for migration phase                                                         // case the internal id is null
-                } catch (Exception ex) {
-                    ExceptionHandler.process(ex);
-                }
-            }
         }
         if (contextItem != null) {
             ContextType contextType = ContextUtils.getContextTypeByName(contextItem, contextName);
             ContextParameterType repoContextParameterType = ContextUtils.getContextParameterTypeByName(contextType, paramName);
             if (repoContextParameterType != null && repoContextParameterType.eResource() == null) {
                 // processItem save before than contextItem, caused eResource null
-
+                IRepositoryService repositoryService = GlobalServiceRegister.getDefault().getService(IRepositoryService.class);
                 try {
                     repositoryService.getProxyRepositoryFactory().save(contextItem, false);
                 } catch (PersistenceException e) {
@@ -183,30 +170,6 @@ public abstract class AbstractItemContextLinkService implements IItemContextLink
         }
         return null;
     }
-    
-    protected boolean checkRepoItemContextParamInternalId(Item item) {
-        boolean isModified = false;
-        EList<?> contextTypeList = ContextUtils.getAllContextType(item);
-        if (contextTypeList != null) {
-            for (Object typeObj : contextTypeList) {
-                if (typeObj instanceof ContextType) {
-                    ContextType type = (ContextType) typeObj;
-                    for (Object obj : type.getContextParameter()) {
-                        if (obj instanceof ContextParameterType) {
-                            ContextParameterType contextParam = (ContextParameterType) obj;
-                            if (ContextUtils.isBuildInParameter(contextParam)
-                                    && StringUtils.isEmpty(contextParam.getInternalId())) {
-                                contextParam
-                                        .setInternalId(CoreRuntimePlugin.getInstance().getProxyRepositoryFactory().getNextId());
-                                isModified = true;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return isModified;
-    }
 }
 
 

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

@@ -20,7 +20,6 @@ import java.util.Set;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.talend.commons.exception.BusinessException;
-import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
 import org.talend.core.model.general.ModuleNeeded.ELibraryInstallStatus;
 import org.talend.core.model.process.IElement;
@@ -120,8 +119,6 @@ public interface ILibrariesService extends IService {
     List<ModuleNeeded> getModuleNeeded(String id, boolean isGroup);
 
     public void deployProjectLibrary(File source) throws IOException;
-    
-    public void setForceReloadCustomUri();
 
     /**
      * Listener used to fire that libraries status has been changed (new lib or new check install).
@@ -134,14 +131,4 @@ public interface ILibrariesService extends IService {
         public void afterChangingLibraries();
     }
 
-    public static ILibrariesService get() {
-        GlobalServiceRegister gsr = GlobalServiceRegister.getDefault();
-        if (gsr != null) {
-            if (gsr.isServiceRegistered(ILibrariesService.class)) {
-                return gsr.getService(ILibrariesService.class);
-            }
-        }
-        return null;
-    }
-
 }

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

@@ -28,7 +28,6 @@ import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.runtime.maven.MavenArtifact;
 import org.talend.core.runtime.maven.MavenConstants;
 import org.talend.core.runtime.maven.MavenUrlHelper;
-import org.talend.core.utils.TalendQuoteUtils;
 
 /**
  * This bean is use to manage needed moduless (perl) and libraries (java).<br/>
@@ -111,15 +110,6 @@ public class ModuleNeeded {
 
     }
 
-    public static ModuleNeeded newInstance(String context, String value, String informationMsg, boolean required) {
-        String val = TalendQuoteUtils.removeQuotesIfExist(value);
-        if (val.startsWith(MavenUrlHelper.MVN_PROTOCOL)) {
-            return new ModuleNeeded(context, informationMsg, required, val);
-        }
-        // won't do migration for old MODULE_LIST but still make it compatible
-        return new ModuleNeeded(context, val, informationMsg, required);
-    }
-
     /**
      * DOC smallet ModuleNeeded constructor comment.
      *

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

@@ -13,7 +13,6 @@
 package org.talend.core.model.metadata;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -32,11 +31,8 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
@@ -492,42 +488,6 @@ public final class MetadataTalendType {
         }
     }
 
-    public static void syncNewMappingFileToProject() throws SystemException {
-        try {
-            File sysMappingFiles = new File(MetadataTalendType.getSystemForderURLOfMappingsFile().getPath());
-            IFolder projectMappingFolder = ResourceUtils.getProject(ProjectManager.getInstance().getCurrentProject())
-                    .getFolder(MetadataTalendType.PROJECT_MAPPING_FOLDER);
-            File projectMappingFiles = projectMappingFolder.getFullPath().toFile();
-            if (sysMappingFiles.list().length == new File(projectMappingFolder.getLocationURI()).list().length) {
-                return;
-            }
-
-            for (File sysMapping : sysMappingFiles.listFiles()) {
-                IFile projectMapping = projectMappingFolder.getFile(sysMapping.getName());
-                if (!projectMapping.exists()) {
-                    FileInputStream fis = null;
-                    try {
-                        fis = new FileInputStream(sysMapping);
-                        projectMapping.create(fis, true, null);
-                    } catch (CoreException coreExc) {
-                        throw new SystemException(coreExc);
-                    } finally {
-                        if (fis != null) {
-                            try {
-                                fis.close();
-                            } catch (IOException ioExc) {
-                                throw new SystemException(ioExc);
-                            }
-                        }
-                    }
-                }
-            }
-
-        } catch (Exception e) {
-            throw new SystemException(e);
-        }
-    }
-
     /**
      *
      * Load db types and mapping with the current activated language (Java, Perl, ...).

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

@@ -18,7 +18,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.widgets.Display;
@@ -27,11 +26,9 @@ import org.talend.components.api.properties.ComponentProperties;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.database.EDatabase4DriverClassName;
 import org.talend.core.database.EDatabaseTypeName;
-import org.talend.core.database.conn.ConnParameterKeys;
 import org.talend.core.database.conn.DatabaseConnStrUtil;
 import org.talend.core.database.conn.version.EDatabaseVersion4Drivers;
 import org.talend.core.model.components.EComponentType;
-import org.talend.core.model.metadata.Dbms;
 import org.talend.core.model.metadata.IMetadataTable;
 import org.talend.core.model.metadata.MetadataTalendType;
 import org.talend.core.model.metadata.builder.ConvertionHelper;
@@ -73,7 +70,6 @@ import org.talend.core.model.utils.ContextParameterUtils;
 import org.talend.core.model.utils.IDragAndDropServiceHandler;
 import org.talend.core.runtime.i18n.Messages;
 import org.talend.core.runtime.services.IGenericDBService;
-import org.talend.core.runtime.services.IGenericWizardService;
 import org.talend.core.utils.TalendQuoteUtils;
 import org.talend.cwm.helper.ConnectionHelper;
 import org.talend.cwm.helper.PackageHelper;
@@ -156,17 +152,6 @@ public class ComponentToRepositoryProperty {
                     conn.setDbmsId(mapping);
                 }
             }
-            // set default mapping for additional jdbc
-            if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericWizardService.class)) {
-                IGenericWizardService service = GlobalServiceRegister.getDefault().getService(IGenericWizardService.class);
-                if (service != null) {
-                    Dbms dbms4AdditionalJDBC = service.getDbms4AdditionalJDBC(conn.getProductId());
-                    if (dbms4AdditionalJDBC != null) {
-                        conn.setDbmsId(dbms4AdditionalJDBC.getId());
-                    }
-                }
-            }
-
         }
         for (IElementParameter param : node.getElementParameters()) {
             String repositoryValue = param.getRepositoryValue();
@@ -380,20 +365,6 @@ public class ComponentToRepositoryProperty {
                 if (para.getRepositoryValue().endsWith(EDatabaseTypeName.GENERAL_JDBC.getProduct())) {
                     connection.setDatabaseType(EDatabaseTypeName.GENERAL_JDBC.getProduct());
                     connection.setProductId(EDatabaseTypeName.GENERAL_JDBC.getProduct());
-
-                    // additional JDBC e.g. Delta Lake
-                    if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericWizardService.class)) {
-                        IGenericWizardService service = GlobalServiceRegister.getDefault()
-                                .getService(IGenericWizardService.class);
-                        if (service != null) {
-                            String database = service.getDatabseNameByNode(node);
-                            if (StringUtils.isNotBlank(database) && service.getIfAdditionalJDBCDBType(database)) {
-                                connection.setProductId(database);
-                            }
-                        }
-
-                    }
-
                 }
                 // vertica output component have no TYPE ElementParameter .
                 if (para.getRepositoryValue().endsWith(EDatabaseTypeName.VERTICA.getProduct())) {
@@ -696,18 +667,6 @@ public class ComponentToRepositoryProperty {
                 connection.setServerName(value);
             }
         }
-        if ("IMPALA_DRIVER".equals(param.getRepositoryValue())) {
-            String value = getParameterValue(connection, node, param);
-            if (value != null) {
-                connection.getParameters().put(ConnParameterKeys.IMPALA_DRIVER, value);
-            }
-        }
-        if ("IMPALA_ADDITIONAL_JDBC".equals(param.getRepositoryValue())) {
-            String value = getParameterValue(connection, node, param);
-            if (value != null) {
-                connection.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HIVE_ADDITIONAL_JDBC_SETTINGS, value);
-            }
-        }
 
         if (connection.getDatabaseType().equals(EDatabaseTypeName.ORACLEFORSID.getDisplayName())) {
             setDatabaseValueForOracleSid(connection, node, param);

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

@@ -1490,24 +1490,21 @@ public class RepositoryToComponentProperty {
         }
 
         if (value.equals("USE_SSL") && (EDatabaseTypeName.HIVE.getDisplayName().equals(databaseType)
-                || EDatabaseTypeName.ORACLE_CUSTOM.getDisplayName().equals(databaseType)
-                || EDatabaseTypeName.IMPALA.getDisplayName().equals(databaseType))) {
+                || EDatabaseTypeName.ORACLE_CUSTOM.getDisplayName().equals(databaseType))) {
             String message = connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_USE_SSL);
             return Boolean.parseBoolean(message);
         }
 
         if ((value.equals("SSL_TRUST_STORE") || value.equals("SSL_TRUSTSERVER_TRUSTSTORE"))
                 && (EDatabaseTypeName.HIVE.getDisplayName().equals(databaseType)
-                        || EDatabaseTypeName.ORACLE_CUSTOM.getDisplayName().equals(databaseType)
-                        || EDatabaseTypeName.IMPALA.getDisplayName().equals(databaseType))) {
+                || EDatabaseTypeName.ORACLE_CUSTOM.getDisplayName().equals(databaseType))) {
             return getAppropriateValue(connection,
                     connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_SSL_TRUST_STORE_PATH));
         }
 
         if ((value.equals("SSL_TRUST_STORE_PASSWORD") || value.equals("SSL_TRUSTSERVER_PASSWORD"))
                 && (EDatabaseTypeName.HIVE.getDisplayName().equals(databaseType)
-                        || EDatabaseTypeName.ORACLE_CUSTOM.getDisplayName().equals(databaseType)
-                        || EDatabaseTypeName.IMPALA.getDisplayName().equals(databaseType))) {
+                || EDatabaseTypeName.ORACLE_CUSTOM.getDisplayName().equals(databaseType))) {
             return getAppropriateValue(connection, connection
                     .getValue(connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_SSL_TRUST_STORE_PASSWORD), false));
         }
@@ -1758,18 +1755,8 @@ public class RepositoryToComponentProperty {
         if (StringUtils.equals("MAPPING", value)) {//$NON-NLS-1$
             return connection.getDbmsId();
         }
-        if ("IMPALA_ADDITIONAL_JDBC".equals(value)) { //$NON-NLS-1$
-            String additionJdbc = connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HIVE_ADDITIONAL_JDBC_SETTINGS);
-            if (isContextMode(connection, additionJdbc)) {
-                return additionJdbc;
-            } else {
-                return TalendQuoteUtils.addQuotes(additionJdbc);
-            }
-        }
-        if ("IMPALA_DRIVER".equals(value)) {
-            return connection.getParameters().get(ConnParameterKeys.IMPALA_DRIVER);
-        }
         return null;
+
     }
 
     private static String getAppropriateValue(Connection connection, String rawValue) {

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

@@ -44,7 +44,6 @@ public enum EComponentCategory {
     DYNAMICS_SETTINGS(Messages.getString("EComponentCategory_dynamicSetting"), 13), //$NON-NLS-1$
     SQL_PATTERN(Messages.getString("EComponentCategory_sqlTemplate"), 14), //$NON-NLS-1$
     BREAKPOINT(Messages.getString("EComponentCategory.breakpoint"), 15), //$NON-NLS-1$
-    BREAKPOINT_CAMEL(Messages.getString("EComponentCategory.breakpoint"), 16), //$NON-NLS-1$
     BASICRUN(Messages.getString("EComponentCategory.basicRun"), 1), //$NON-NLS-1$
     DEBUGRUN(Messages.getString("EComponentCategory.debugRun"), 2), //$NON-NLS-1$
     ADVANCESETTING(Messages.getString("EComponentCategory.advancedSettings"), 3), //$NON-NLS-1$

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

@@ -113,6 +113,8 @@ public enum EParameterFieldType {
 
     GROUPING_CAMPAIGN_CHOOSER, // htyin added for DQ Matching components
     MULTI_PATTERN, // yyin added TDQ-13437
+    SYNC_NEXUS_BUTTON,
+    CHECK_NEXUS_BUTTON,
     PATTERN_PROPERTY, // yyin, added TDQ-13437
 
     UNIFIED_COMPONENTS,

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

@@ -1003,12 +1003,4 @@ public final class ProcessUtils {
         }
         return false;
     }
-    
-    public static boolean isChildRouteProcess(IProcess process) {
-        List n = process.getNodesOfType("tRouteInput");
-        if (n!=null && n.size()!=0) {
-            return true;
-        }
-        return false;
-    }
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/relationship/RelationshipItemBuilder.java

@@ -51,7 +51,6 @@ import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
 import org.talend.designer.core.model.utils.emf.talendfile.ProcessType;
 import org.talend.repository.ProjectManager;
 import org.talend.repository.model.IProxyRepositoryFactory;
-import org.talend.repository.model.IRepositoryNode;
 
 /**
  * This class store all relationships between jobs/joblets and other items from the repository. Be sure to update the
@@ -494,7 +493,7 @@ public class RelationshipItemBuilder {
     }
 
     private Set<Relation> getItemsRelatedTo(Map<Relation, Set<Relation>> itemsRelations, String itemId, String version,
-                String relationType) {
+            String relationType) {
 
         Relation itemToTest = new Relation();
         itemId = ProcessUtils.getPureItemId(itemId);
@@ -930,10 +929,7 @@ public class RelationshipItemBuilder {
         }
     }
 
-    public void addRelationShip(Item baseItem, String relatedId, String relatedVersion, String type) {
-        if (!loaded) {
-            loadRelations();
-        }
+    private void addRelationShip(Item baseItem, String relatedId, String relatedVersion, String type) {
         Relation relation = new Relation();
         relation.setId(baseItem.getProperty().getId());
         relation.setType(getTypeFromItem(baseItem));
@@ -949,32 +945,8 @@ public class RelationshipItemBuilder {
             itemRelations.put(relation, new HashSet<Relation>());
         }
         itemRelations.get(relation).add(addedRelation);
-        
-        autoSaveRelations();
     }
 
-	public Set<Relation> getBeanRelations(Collection<Item> items) {
-		Set<Relation> relationships = new HashSet<Relation>();
-		for (Item item : items) {
-	        Relation relation = new Relation();
-	        relation.setId(item.getProperty().getId());
-	        relation.setType(getTypeFromItem(item));
-	        relation.setVersion(item.getProperty().getVersion());
-	        
-	        Map<Relation, Set<Relation>> itemRelations = getRelatedRelations(item);
-	        
-	        Set<Relation> repositoryNode = (Set<Relation>) itemRelations.getOrDefault(relation,  new HashSet<Relation>());
-	        
-	        for (Relation rel : repositoryNode) {
-	        	if (rel.getType().equals("Beans")) {
-	        		relationships.add(rel);
-	        	}
-	        }
-		}
-		
-		return relationships;
-	}
-
     private Map<Relation, Set<Relation>> getRelatedRelations(Item baseItem) {
         Map<Relation, Set<Relation>> itemRelations = currentProjectItemsRelations;
         if (!ProjectManager.getInstance().isInMainProject(getAimProject(), baseItem)) {
@@ -1050,7 +1022,7 @@ public class RelationshipItemBuilder {
             ExceptionHandler.process(e);
         }
     }
-    
+
     private List<ERepositoryObjectType> allSupportedTypes() {
         List<ERepositoryObjectType> toReturn = new ArrayList<ERepositoryObjectType>();
         toReturn.addAll(ERepositoryObjectType.getAllTypesOfProcess());
@@ -1522,5 +1494,4 @@ public class RelationshipItemBuilder {
             return 0;
         }
     }
-
 }

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

@@ -1414,8 +1414,12 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
         return null;
     }
 
-    public static List<ERepositoryObjectType> getAllTypesOfBigDataProcess() {
+    public static List<ERepositoryObjectType> getAllTypesOfProcess() {
         List<ERepositoryObjectType> allTypes = new ArrayList<ERepositoryObjectType>();
+
+        if (ERepositoryObjectType.PROCESS != null) {
+            allTypes.add(ERepositoryObjectType.PROCESS);
+        }
         if (ERepositoryObjectType.PROCESS_MR != null) {
             allTypes.add(ERepositoryObjectType.PROCESS_MR);
         }
@@ -1428,17 +1432,6 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
         if (ERepositoryObjectType.PROCESS_SPARKSTREAMING != null) {
             allTypes.add(ERepositoryObjectType.PROCESS_SPARKSTREAMING);
         }
-        return allTypes;
-    }
-
-    public static List<ERepositoryObjectType> getAllTypesOfProcess() {
-        List<ERepositoryObjectType> allTypes = new ArrayList<ERepositoryObjectType>();
-
-        allTypes.addAll(getAllTypesOfBigDataProcess());
-
-        if (ERepositoryObjectType.PROCESS != null) {
-            allTypes.add(ERepositoryObjectType.PROCESS);
-        }
         if (ERepositoryObjectType.PROCESS_ROUTE != null) {
             allTypes.add(ERepositoryObjectType.PROCESS_ROUTE);
         }

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

@@ -27,8 +27,6 @@ public interface SVNConstant {
 
     public static final String NAME_MASTER = "master"; //$NON-NLS-1$
 
-    public static final String NAME_MAIN = "main"; //$NON-NLS-1$
-
     public static final String NAME_ORIGIN = "origin"; //$NON-NLS-1$
 
     /*

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

@@ -320,28 +320,24 @@ public class RepositoryUpdateManagerHelper {
 
         // all the jobs
         for (IRepositoryViewObject process : processRep) {
-            try {
-                Item item = process.getProperty().getItem();
-                boolean found = false;
-                for (IProcess2 open : openedProcessList) {
-                    if (open.getId().equals(item.getProperty().getId())) {
-                        found = true;
-                    }
+            Item item = process.getProperty().getItem();
+            boolean found = false;
+            for (IProcess2 open : openedProcessList) {
+                if (open.getId().equals(item.getProperty().getId())) {
+                    found = true;
                 }
-                if (found) {
-                    continue;
-                }
-                checkMonitorCanceled(parentMonitor);
-                parentMonitor.subTask(RepositoryUpdateManager.getUpdateJobInfor(item.getProperty()));
+            }
+            if (found) {
+                continue;
+            }
+            checkMonitorCanceled(parentMonitor);
+            parentMonitor.subTask(RepositoryUpdateManager.getUpdateJobInfor(item.getProperty()));
 
-                // List<UpdateResult> resultFromProcess = getResultFromProcess(process, types, onlySimpleShow);
+            // List<UpdateResult> resultFromProcess = getResultFromProcess(process, types, onlySimpleShow);
 
-                List<UpdateResult> resultFromProcess = getUpdatesNeededFromItems(parentMonitor, item, types);
-                if (resultFromProcess != null) {
-                    resultList.addAll(resultFromProcess);
-                }
-            } catch (Exception ex) {
-                ExceptionHandler.process(ex);
+            List<UpdateResult> resultFromProcess = getUpdatesNeededFromItems(parentMonitor, item, types);
+            if (resultFromProcess != null) {
+                resultList.addAll(resultFromProcess);
             }
             parentMonitor.worked(1);
         }

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

@@ -46,11 +46,7 @@ import org.talend.core.model.process.IElementParameter;
 import org.talend.core.model.process.INode;
 import org.talend.core.model.process.INodeConnector;
 import org.talend.core.model.process.IProcess;
-import org.talend.core.model.process.IProcess2;
-import org.talend.core.model.process.ProcessUtils;
-import org.talend.core.model.properties.Property;
 import org.talend.core.runtime.IAdditionalInfo;
-import org.talend.core.runtime.projectsetting.RuntimeLineageManager;
 import org.talend.designer.core.ICamelDesignerCoreService;
 
 /**
@@ -870,170 +866,6 @@ public class NodeUtil {
         }
         throw new IllegalArgumentException();
     }
-    
-    
-    public static String getRuntimeParameterValue(INode node, IElementParameter ep) {
-        if (EParameterFieldType.TABLE.equals(ep.getFieldType())) {
-            Map<String, IElementParameter> types = new HashMap<String, IElementParameter>();
-            Object[] itemsValue = ep.getListItemsValue();
-            if (itemsValue != null) {
-                for (Object o : itemsValue) {
-                    IElementParameter cep = (IElementParameter) o;
-                    if (cep.isShow(node.getElementParameters())) {
-                        types.put(cep.getName(), cep);
-                    }
-                }
-            }
-            List<Map<String, String>> lines = (List<Map<String, String>>) ElementParameterParser.getObjectValue(node,
-                    "__" + ep.getName() + "__");
-            StringBuilder value = new StringBuilder();
-            // implement List & Map toString(), different is the value of Map
-            Iterator<Map<String, String>> linesIter = lines.iterator();
-            if (!linesIter.hasNext()) {
-                return "\"[]\"";
-            }
-            value.append("new StringBuilder().append(\"[");
-            for (;;) {
-                Map<String, String> columns = linesIter.next();
-                Iterator<Entry<String, String>> columnsIter = columns.entrySet().iterator();
-
-                value.append("{");
-                Entry<String, String> column = null;
-                boolean printedColumnExist = false;
-                while (columnsIter.hasNext()) {
-                    column = columnsIter.next();
-                    if (types.get(column.getKey()) == null) {
-                        continue;
-                    }
-                    printedColumnExist = true;
-
-                    value.append(column.getKey());
-                    value.append("=\").append(");
-                    value.append(getRuntimeParameterValue(column.getValue(), types.get(column.getKey()), true));
-                    value.append(").append(\"");
-
-                    if (columnsIter.hasNext()) {
-                        value.append(", ");
-                    }
-                }
-                if (printedColumnExist && column != null && (types.get(column.getKey()) == null)) {
-                    value.setLength(value.length() - 2);
-                }
-                value.append("}");
-
-                if (!linesIter.hasNext()) {
-                    return value.append("]\").toString()").toString();
-                }
-                value.append(",").append(" ");
-            }
-        } else {
-            String value = ElementParameterParser.getValue(node, "__" + ep.getName() + "__");
-            if (EParameterFieldType.TABLE_BY_ROW.equals(ep.getFieldType())) {
-                value = ep.getValue().toString();
-            }
-            return getRuntimeParameterValue(value, ep, false);
-        }
-    }
-    
-    private static String getRuntimeParameterValue(String value, IElementParameter ep, boolean itemFromTable) {
-        if (value == null) {
-            value = "";
-        }
-        
-        value = value.trim();
-        
-        boolean isMemo = false;
-        
-        List<EParameterFieldType> needRemoveCRLFList = Arrays.asList(EParameterFieldType.MEMO, EParameterFieldType.MEMO_JAVA,
-                EParameterFieldType.MEMO_SQL, EParameterFieldType.MEMO_IMPORT, EParameterFieldType.MEMO_MESSAGE);
-        if (needRemoveCRLFList.contains(ep.getFieldType())) {
-            isMemo = true;
-            value = value.replaceAll("[\r\n]", " ");
-        }
-        
-        List<EParameterFieldType> needQuoteList = Arrays.asList(EParameterFieldType.CLOSED_LIST,
-                EParameterFieldType.COMPONENT_LIST, EParameterFieldType.COLUMN_LIST, EParameterFieldType.PREV_COLUMN_LIST,
-                EParameterFieldType.CONNECTION_LIST, EParameterFieldType.LOOKUP_COLUMN_LIST,
-                EParameterFieldType.CONTEXT_PARAM_NAME_LIST, EParameterFieldType.PROCESS_TYPE, EParameterFieldType.COLOR,
-                EParameterFieldType.TABLE_BY_ROW, EParameterFieldType.HADOOP_JARS_DIALOG, EParameterFieldType.UNIFIED_COMPONENTS);
-        List<EParameterFieldType> needQuoteListForItem = itemFromTable ? Arrays.asList(EParameterFieldType.SCHEMA_TYPE,
-                EParameterFieldType.SAP_SCHEMA_TYPE, EParameterFieldType.MODULE_LIST) : new ArrayList<EParameterFieldType>();
-        // TODO: add RAW attribute when SCHEMA_COLUMN generated by BASED_ON_SCHEMA
-        List<String> needQuoteListByName = Arrays.asList("SCHEMA_COLUMN");// SCHEMA_COLUMN for BASED_ON_SCHEMA="true"
-
-        if (needQuoteList.contains(ep.getFieldType()) || needQuoteListForItem.contains(ep.getFieldType())
-                || needQuoteListByName.contains(ep.getName()) || ep.isRaw()) {
-            value = value.replaceAll("\\\\", "\\\\\\\\");
-            value = value.replaceAll("\\\"", "\\\\\\\"");
-            return "\"" + value + "\"";
-        }
-
-        if (itemFromTable) {
-            if ("*".equals(value)) {
-                return "\"" + value + "\"";
-            }
-            if (value.endsWith(";")) {
-                value = value.substring(0, value.length() - 1);
-            }
-        }
-        
-        if("".equals(value) || "\"\"".equals(value)) {
-            return "\"\"";
-        } else if("null".equals(value)) {
-            return "(Object)null";
-        }
-        
-        // copied it from Log4jFileUtil.javajet but need more comment for this script
-        if ("\"\\n\"".equals(value) || "\"\\r\"".equals(value) || "\"\\r\\n\"".equals(value)) {
-            // for the value is "\n" "\r" "\r\n"
-            return value.replaceAll("\\\\", "\\\\\\\\");
-        } else if ("\"\"\"".equals(value)) {
-            return "\"" + "\\" + "\"" + "\"";
-        } else if ("\"\"\\r\\n\"\"".equals(value)) {
-            return "\"\\\\r\\\\n\"";
-        } else if ("\"\"\\r\"\"".equals(value)) {
-            return "\"\\\\r\"";
-        } else if ("\"\"\\n\"\"".equals(value)) {
-            return "\"\\\\n\"";
-        }
-        // ftom 20141008 - patch to fix javajet compilation errors due to hard-coded studio TableEditor mechanism
-        // linked to BUILDIN properties checks, this item is a boolean set to TRUE or FALSE
-        // fix is just transforming into true or false to make logging OK
-        else if ("BUILDIN".equals(ep.getName())) {
-            return value.toLowerCase();
-        }
-        
-        //suppose all memo fields are processed well already, no need to go though this with dangerous
-        if (!isMemo && !org.talend.core.model.utils.ContextParameterUtils.isDynamic(value)) {
-            if(value.length() > 1 && value.startsWith("\"") && value.endsWith("\"")) {
-                if(itemFromTable && "ARGS".equals(ep.getName())) {
-                    value = value.substring(1, value.length());
-                    value = value.substring(0, value.length() - 1);
-                    return "\"" + checkStringQuotationMarks(value) + "\"";
-                } else {
-                    //do nothing
-                    return value;
-                }
-            } else {
-            	return "\"" + checkStringQuotationMarks(value) + "\"";
-            }
-        }
-        
-        //TODO remove it
-        if (value.endsWith("*")) {
-            return value.substring(0, value.length() - 1) + "\"*\"";
-        }
-        
-        return value;
-    }
-    
-    private static String checkStringQuotationMarks(String str) {
-        String result = str;
-        if (result.contains("\"")) {
-            result = result.replace("\"", "\\\"");
-        }
-        return result;
-    }
 
     public static String getNormalizeParameterValue(INode node, IElementParameter ep) {
         if (EParameterFieldType.TABLE.equals(ep.getFieldType())) {
@@ -1357,7 +1189,7 @@ public class NodeUtil {
         } else if (ComponentCategory.CATEGORY_4_CAMEL.getName().equals(node.getComponent().getType())) {
             INodeConnector tmp = null;
             if (GlobalServiceRegister.getDefault().isServiceRegistered(ICamelDesignerCoreService.class)) {
-                ICamelDesignerCoreService camelService = GlobalServiceRegister.getDefault()
+                ICamelDesignerCoreService camelService = (ICamelDesignerCoreService) GlobalServiceRegister.getDefault()
                         .getService(ICamelDesignerCoreService.class);
                 tmp = node.getConnectorFromType(camelService.getTargetConnectionType(node));
             } else {
@@ -1400,37 +1232,4 @@ public class NodeUtil {
 
         return true;
     }
-
-    public static boolean isJobUsingRuntimeLineage(IProcess process) {
-        // Just support DI jobs now
-        boolean isSupport = isStandardJob(process) && !ProcessUtils.isTestContainer(process) && !isGuessSchemaJob(process);
-        if (!isSupport) {
-            return false;
-        }
-        RuntimeLineageManager runtimeLineageManager = new RuntimeLineageManager();
-        if (runtimeLineageManager.isUseRuntimeLineageAll()) {
-            return true;
-        }
-        if (runtimeLineageManager.getSelectedJobIds().isEmpty()) {
-            runtimeLineageManager.load();
-        }
-        return runtimeLineageManager.isRuntimeLineageSetting(process.getId());
-    }
-
-    public static boolean isStandardJob(IProcess process) {
-        if (process != null && process instanceof IProcess2) {
-            Property property = ((IProcess2) process).getProperty();
-            return property != null && property.getItem() != null
-                    && ComponentCategory.CATEGORY_4_DI.getName().equals(process.getComponentsType());
-        }
-        return false;
-    }
-
-    public static boolean isGuessSchemaJob(IProcess process) {
-        if (process != null && process instanceof IProcess2) {
-            Property property = ((IProcess2) process).getProperty();
-            return property != null && "ID".equals(property.getId()) && "Mock_job_for_Guess_schema".equals(property.getLabel()); //$NON-NLS-1$ //$NON-NLS-2$
-        }
-        return false;
-    }
 }

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

@@ -15,7 +15,6 @@ package org.talend.core.model.utils;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.talend.core.GlobalServiceRegister;
 import org.talend.core.model.metadata.builder.connection.Connection;
 import org.talend.core.model.metadata.builder.connection.DatabaseConnection;
 import org.talend.core.model.metadata.designerproperties.RepositoryToComponentProperty;
@@ -24,7 +23,6 @@ import org.talend.core.model.properties.ContextItem;
 import org.talend.core.model.properties.Item;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.model.update.UpdatesConstants;
-import org.talend.core.runtime.services.IGenericWizardService;
 
 /**
  * ggu class global comment. Detailled comment
@@ -49,14 +47,6 @@ public final class UpdateRepositoryHelper {
                 if (connection instanceof DatabaseConnection) {
                     String currentDbType = (String) RepositoryToComponentProperty.getValue(connection, UpdatesConstants.TYPE,
                             null);
-                    String productId = ((DatabaseConnection) connection).getProductId();
-                    if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericWizardService.class)) {
-                        IGenericWizardService service = GlobalServiceRegister.getDefault()
-                                .getService(IGenericWizardService.class);
-                        if (service != null && service.getIfAdditionalJDBCDBType(productId)) {
-                            currentDbType = productId;
-                        }
-                    }
                     aliasName += " (" + currentDbType + ")"; //$NON-NLS-1$ //$NON-NLS-2$
                 }
                 if (repositoryObjectType.getType().equals("SERVICES")) {

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

@@ -73,6 +73,4 @@ public interface IRepositoryArtifactHandler {
     
     public String resolveRemoteSha1(MavenArtifact artifact, boolean fromRelease) throws Exception;
 
-    public List<MavenArtifact> search(String name, boolean fromSnapshot) throws Exception;
-
 }

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

@@ -19,9 +19,7 @@ import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpEntity;
@@ -55,14 +53,6 @@ public class NexusServerUtils {
     // the max search result is 200 by defult from nexus
     private static final int MAX_SEARCH_COUNT = 200;
 
-    public static final Set<String> IGNORED_TYPES = new HashSet<String>();
-
-    static {
-        IGNORED_TYPES.add("pom");
-        IGNORED_TYPES.add("sha1");
-        IGNORED_TYPES.add("md5");
-    }
-
     /**
      *
      * DOC check if the repository exist or not
@@ -246,36 +236,36 @@ public class NexusServerUtils {
     private static int readDocument(Document document, List<MavenArtifact> artifacts) throws Exception {
         List<Node> list = document.selectNodes("/searchNGResponse/data/artifact");//$NON-NLS-1$
         for (Node arNode : list) {
+            MavenArtifact artifact = new MavenArtifact();
+            artifacts.add(artifact);
+            artifact.setGroupId(arNode.selectSingleNode("groupId").getText());//$NON-NLS-1$
+            artifact.setArtifactId(arNode.selectSingleNode("artifactId").getText());//$NON-NLS-1$
+            artifact.setVersion(arNode.selectSingleNode("version").getText());//$NON-NLS-1$
+            Node descNode = arNode.selectSingleNode("description");//$NON-NLS-1$
+            if (descNode != null) {
+                artifact.setDescription(descNode.getText());
+            }
+            Node urlNode = arNode.selectSingleNode("url");//$NON-NLS-1$
+            if (urlNode != null) {
+                artifact.setUrl(urlNode.getText());
+            }
+            Node licenseNode = arNode.selectSingleNode("license");//$NON-NLS-1$
+            if (licenseNode != null) {
+                artifact.setLicense(licenseNode.getText());
+            }
+
+            Node licenseUrlNode = arNode.selectSingleNode("licenseUrl");//$NON-NLS-1$
+            if (licenseUrlNode != null) {
+                artifact.setLicenseUrl(licenseUrlNode.getText());
+            }
 
             List<Node> artLinks = arNode.selectNodes("artifactHits/artifactHit/artifactLinks/artifactLink");//$NON-NLS-1$
             for (Node link : artLinks) {
-                MavenArtifact artifact = new MavenArtifact();
-
-                artifact.setGroupId(arNode.selectSingleNode("groupId").getText());//$NON-NLS-1$
-                artifact.setArtifactId(arNode.selectSingleNode("artifactId").getText());//$NON-NLS-1$
-                artifact.setVersion(arNode.selectSingleNode("version").getText());//$NON-NLS-1$
-                Node descNode = arNode.selectSingleNode("description");//$NON-NLS-1$
-                if (descNode != null) {
-                    artifact.setDescription(descNode.getText());
-                }
-                Node urlNode = arNode.selectSingleNode("url");//$NON-NLS-1$
-                if (urlNode != null) {
-                    artifact.setUrl(urlNode.getText());
-                }
-                Node licenseNode = arNode.selectSingleNode("license");//$NON-NLS-1$
-                if (licenseNode != null) {
-                    artifact.setLicense(licenseNode.getText());
-                }
-
-                Node licenseUrlNode = arNode.selectSingleNode("licenseUrl");//$NON-NLS-1$
-                if (licenseUrlNode != null) {
-                    artifact.setLicenseUrl(licenseUrlNode.getText());
-                }
                 Node extensionElement = link.selectSingleNode("extension");//$NON-NLS-1$
                 String extension = null;
                 String classifier = null;
                 if (extensionElement != null) {
-                    if (IGNORED_TYPES.contains(extensionElement.getText())) {// $NON-NLS-1$
+                    if ("pom".equals(extensionElement.getText())) {//$NON-NLS-1$
                         continue;
                     }
                     extension = extensionElement.getText();
@@ -286,7 +276,6 @@ public class NexusServerUtils {
                 }
                 artifact.setType(extension);
                 artifact.setClassifier(classifier);
-                artifacts.add(artifact);
             }
         }
         return list.size();
@@ -381,37 +370,4 @@ public class NexusServerUtils {
 
     }
 
-    public static List<MavenArtifact> search(String nexusUrl, String userName, String password, String repositoryId, String name)
-            throws Exception {
-        List<MavenArtifact> artifacts = new ArrayList<MavenArtifact>();
-
-        int totalCount = 0;
-        String service = NexusConstants.SERVICES_SEARCH + getSearchQuery(repositoryId, null, null, null, 0, MAX_SEARCH_COUNT)
-                + "&q=" + name;
-
-        URI requestURI = getSearchURI(nexusUrl, service);
-        Document document = downloadDocument(requestURI, userName, password);
-        if (document != null) {
-            Node countNode = document.selectSingleNode("/searchNGResponse/totalCount");
-            if (countNode != null) {
-                try {
-                    totalCount = Integer.parseInt(countNode.getText());
-                } catch (NumberFormatException e) {
-                    totalCount = 0;
-                }
-            }
-            int searchDone = readDocument(document, artifacts);
-            while (searchDone < totalCount) {
-                service = NexusConstants.SERVICES_SEARCH
-                        + getSearchQuery(repositoryId, null, null, null, searchDone, MAX_SEARCH_COUNT) + "&q=" + name;
-                requestURI = getSearchURI(nexusUrl, service);
-
-                document = downloadDocument(requestURI, userName, password);
-                searchDone = searchDone + readDocument(document, artifacts);
-            }
-        }
-
-        return artifacts;
-    }
-
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/evaluator/AbstractPropertyValueEvaluator.java

@@ -15,7 +15,6 @@ package org.talend.core.runtime.evaluator;
 import java.util.List;
 
 import org.apache.commons.lang3.StringEscapeUtils;
-import org.talend.core.model.utils.ContextParameterUtils;
 import org.talend.core.runtime.util.GenericTypeUtils;
 import org.talend.core.utils.TalendQuoteUtils;
 import org.talend.daikon.properties.property.Property;
@@ -29,10 +28,6 @@ import org.talend.daikon.properties.property.StringProperty;
 public abstract class AbstractPropertyValueEvaluator implements PropertyValueEvaluator {
 
     public Object getTypedValue(Property property, Object rawValue) {
-        return getTypedValue(property, null, rawValue);
-    }
-
-    public Object getTypedValue(Property property, Object storedValue, Object rawValue) {
         if (GenericTypeUtils.isSchemaType(property)) {
             return rawValue;
         }
@@ -110,12 +105,6 @@ public abstract class AbstractPropertyValueEvaluator implements PropertyValueEva
                 String stringStoredValue = TalendQuoteUtils.removeQuotes(stringValue);
                 for (Object possibleValue : possibleValues) {
                     if (possibleValue.toString().equals(stringStoredValue)) {
-                        // Update since enum type set as context for tcompv0 .
-                        String currentStoredValue = String.valueOf(storedValue);
-                        if (storedValue != null && ContextParameterUtils.isContainContextParam(currentStoredValue)) {
-                            property.setTaggedValue("IS_CONTEXT_MODE", false);
-                            property.setValue(possibleValue);
-                        }
                         return possibleValue;
                     }
                 }

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

@@ -174,7 +174,7 @@ public class MavenUrlHelper {
         if (jarName != null && jarName.length() > 0) {
             String artifactId = jarName;
             String type = null;
-            if (jarName.endsWith("." + MavenConstants.TYPE_JAR)) { // remove the extension .jar
+            if (jarName.endsWith(MavenConstants.TYPE_JAR)) { // remove the extension .jar
                 artifactId = jarName.substring(0, jarName.lastIndexOf(MavenConstants.TYPE_JAR) - 1);
                 if (withPackage) {
                     type = MavenConstants.TYPE_JAR;
@@ -380,14 +380,4 @@ public class MavenUrlHelper {
         }
         return buffer.toString();
     }
-
-    public static String getSNAPSHOTVersion(String rVersion) {
-        if (rVersion == null) {
-            return rVersion;
-        }
-        if (rVersion.contains("-")) {
-            return rVersion.substring(0, rVersion.indexOf("-") + 1) + MavenUrlHelper.VERSION_SNAPSHOT;
-        }
-        return rVersion;
-    }
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/process/ITalendProcessJavaProject.java

@@ -51,6 +51,11 @@ public interface ITalendProcessJavaProject {
      */
     IFolder getExternalResourcesFolder();
 
+    /**
+     * src/main/tacokit-resources as external resources folder
+     */
+    IFolder getTaCoKitResourcesFolder();
+
     /**
      * src/main/resources as internal resources folder
      */

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

@@ -1,156 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2020 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.core.runtime.projectsetting;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.talend.commons.exception.PersistenceException;
-import org.talend.commons.ui.runtime.exception.ExceptionHandler;
-import org.talend.commons.utils.workbench.resources.ResourceUtils;
-import org.talend.repository.ProjectManager;
-import org.talend.repository.model.RepositoryConstants;
-import org.talend.repository.model.RepositoryNode;
-import org.talend.utils.json.JSONObject;
-
-import us.monoid.json.JSONArray;
-
-/**
- * created by hcyi on Jul 27, 2020
- * Detailled comment
- *
- */
-public class RuntimeLineageManager {
-
-    public static final String RUNTIMELINEAGE_RESOURCES = "org.talend.runtimelineage"; //$NON-NLS-1$
-
-    public static final String RUNTIMELINEAGE_ALL = "runtimelineage.all"; //$NON-NLS-1$
-
-    public static final String RUNTIMELINEAGE_SELECTED = "runtimelineage.selected"; //$NON-NLS-1$
-
-    public static final String JOB_ID = "id"; //$NON-NLS-1$
-
-    public static final String RUNTIMELINEAGE_OUTPUT_PATH = "-Druntime.lineage.outputpath="; //$NON-NLS-1$
-
-    public static final String OUTPUT_PATH = "output.path"; //$NON-NLS-1$
-
-    private List<String> selectedJobIds = new ArrayList<String>();
-
-    private ProjectPreferenceManager prefManager = null;
-
-    private boolean useRuntimeLineageAll = false;
-
-    private String outputPath = null;
-
-    public RuntimeLineageManager() {
-        if (prefManager == null) {
-            prefManager = new ProjectPreferenceManager(RUNTIMELINEAGE_RESOURCES, true);
-        }
-        useRuntimeLineageAll = prefManager.getBoolean(RUNTIMELINEAGE_ALL);
-        outputPath = prefManager.getValue(OUTPUT_PATH);
-    }
-
-    public void load() {
-        try {
-            String jobsJsonStr = prefManager.getValue(RUNTIMELINEAGE_SELECTED);
-            if (StringUtils.isNotBlank(jobsJsonStr)) {
-                JSONArray jobsJsonArray = new JSONArray(jobsJsonStr);
-                for (int i = 0; i < jobsJsonArray.length(); i++) {
-                    Object jobJsonObj = jobsJsonArray.get(i);
-                    JSONObject jobJson = new JSONObject(String.valueOf(jobJsonObj));
-                    Iterator sortedKeys = jobJson.sortedKeys();
-                    String jobId = null;
-                    while (sortedKeys.hasNext()) {
-                        String key = (String) sortedKeys.next();
-                        if (JOB_ID.equals(key)) {
-                            jobId = jobJson.getString(key);
-                        }
-                    }
-                    if (jobId != null) {
-                        selectedJobIds.add(jobId);
-                    }
-                }
-            }
-        } catch (Exception e) {
-            ExceptionHandler.process(e);
-        }
-    }
-
-    public void save(List<RepositoryNode> checkedObjects, boolean all) {
-        try {
-            JSONArray jobsJson = new JSONArray();
-            if (!all) {
-                for (RepositoryNode node : checkedObjects) {
-                    JSONObject jobJson = new JSONObject();
-                    if (!jobsJson.toString().contains(node.getId())) {
-                        jobJson.put(JOB_ID, node.getId());
-                        jobsJson.put(jobJson);
-                    }
-                }
-            }
-            prefManager.setValue(RUNTIMELINEAGE_ALL, all);
-            prefManager.setValue(RUNTIMELINEAGE_SELECTED, jobsJson.toString());
-            prefManager.setValue(OUTPUT_PATH, outputPath);
-            prefManager.save();
-        } catch (Exception e) {
-            ExceptionHandler.process(e);
-        }
-    }
-
-    public boolean isRuntimeLineageSetting(String id) {
-        return selectedJobIds.contains(id);
-    }
-
-    public boolean isRuntimeLineagePrefsExist() {
-        try {
-            IProject project = ResourceUtils.getProject(ProjectManager.getInstance().getCurrentProject());
-            IFolder prefSettingFolder = ResourceUtils.getFolder(project, RepositoryConstants.SETTING_DIRECTORY, false);
-            IFile presRuntimeLineageFile = prefSettingFolder.getFile(RUNTIMELINEAGE_RESOURCES + ".prefs"); //$NON-NLS-1$
-            if (presRuntimeLineageFile.exists()) {
-                return true;
-            }
-        } catch (PersistenceException e) {
-            e.printStackTrace();
-        }
-        return false;
-    }
-
-    public boolean isUseRuntimeLineageAll() {
-        return this.useRuntimeLineageAll;
-    }
-
-    public ProjectPreferenceManager getPrefManager() {
-        return this.prefManager;
-    }
-
-    public List<String> getSelectedJobIds() {
-        return this.selectedJobIds;
-    }
-
-    public void setSelectedJobIds(List<String> selectedJobIds) {
-        this.selectedJobIds = selectedJobIds;
-    }
-
-    public String getOutputPath() {
-        return this.outputPath;
-    }
-
-    public void setOutputPath(String outputPath) {
-        this.outputPath = outputPath;
-    }
-}

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

@@ -18,7 +18,6 @@ import java.util.Map;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
 import org.talend.core.model.components.IComponent;
-import org.talend.core.model.metadata.builder.connection.Connection;
 import org.talend.core.model.process.IElementParameter;
 import org.talend.core.model.process.INode;
 
@@ -47,8 +46,6 @@ public interface IGenericService extends IService {
 
     public boolean isTcompv0(IComponent component);
 
-    public void validateGenericConnection(Connection conn) throws Exception;
-
     public static IGenericService getService() {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericService.class)) {
             return GlobalServiceRegister.getDefault().getService(IGenericService.class);

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

@@ -20,14 +20,11 @@ import org.eclipse.swt.widgets.Composite;
 import org.talend.commons.ui.swt.actions.ITreeContextualAction;
 import org.talend.components.api.properties.ComponentProperties;
 import org.talend.core.IService;
-import org.talend.core.model.metadata.Dbms;
 import org.talend.core.model.metadata.IMetadataTable;
 import org.talend.core.model.metadata.builder.connection.Connection;
-import org.talend.core.model.metadata.builder.connection.DatabaseConnection;
 import org.talend.core.model.metadata.builder.connection.MetadataTable;
 import org.talend.core.model.process.EComponentCategory;
 import org.talend.core.model.process.Element;
-import org.talend.core.model.process.IElement;
 import org.talend.core.model.process.INode;
 import org.talend.core.model.properties.Item;
 import org.talend.core.model.repository.ERepositoryObjectType;
@@ -149,19 +146,4 @@ public interface IGenericWizardService extends IService {
      * @return the default action which will be invoked when double click the node.
      */
     public ITreeContextualAction getDefaultAction(RepositoryNode node);
-
-    public void loadAdditionalJDBC();
-
-    public List<String> getAllAdditionalJDBCTypes();
-
-    public boolean getIfAdditionalJDBCDBType(String dbType);
-
-    public void initAdditonalJDBCConnectionValue(DatabaseConnection connection, Composite dynamicForm, String dbType,
-            String propertyId);
-
-    public String getDefinitionName4AdditionalJDBC(IElement element);
-
-    public String getDatabseNameByNode(IElement node);
-
-    public Dbms getDbms4AdditionalJDBC(String typeName);
 }

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

@@ -1,16 +0,0 @@
-package org.talend.core.runtime.util;
-//============================================================================
-//
-//Copyright (C) 2006-2019 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
-//
-//============================================================================
-
-public interface ComponentsLocationProvider {
-}

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

@@ -1,17 +0,0 @@
-package org.talend.core.runtime.util;
-//============================================================================
-//
-//Copyright (C) 2006-2019 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
-//
-//============================================================================
-
-public interface SharedStudioInfoProvider {
-	public boolean isSupportCurrentMode();
-}

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

@@ -1,111 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2019 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 java.io.File;
-import java.io.IOException;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.talend.commons.exception.ExceptionHandler;
-import org.talend.core.GlobalServiceRegister;
-import org.talend.core.model.components.IComponentsFactory;
-import org.talend.core.runtime.CoreRuntimePlugin;
-import org.talend.core.service.IUpdateService;
-import org.talend.utils.io.FilesUtils;
-
-public class SharedStudioUtils {
-
-    public static final String FILE_EXTRA_FEATURE_INDEX = "extra_feature.index"; //$NON-NLS-1$
-
-    public static final String SIGNATURE_FILE_NAME_SUFFIX = ".sig"; //$NON-NLS-1$
-    public static final String PROP_DEVMODE = "osgi.dev"; //$NON-NLS-1$
-    
-    public static boolean updateExtraFeatureFile() {
-        File userConfigFolder = new File(Platform.getConfigurationLocation().getURL().getPath());
-        File studioConfigFolder = new File(Platform.getInstallLocation().getURL().getPath(), "configuration");//$NON-NLS-1$
-        if (!userConfigFolder.getAbsolutePath().equals(studioConfigFolder.getAbsolutePath())) {
-            File studioExtraFile = new File(studioConfigFolder, FILE_EXTRA_FEATURE_INDEX);
-            File studioExtraSignFile = new File(studioConfigFolder, FILE_EXTRA_FEATURE_INDEX + SIGNATURE_FILE_NAME_SUFFIX);
-            File userExtraFile = new File(userConfigFolder, FILE_EXTRA_FEATURE_INDEX);
-            File userExtraSignFile = new File(userConfigFolder, FILE_EXTRA_FEATURE_INDEX + SIGNATURE_FILE_NAME_SUFFIX);
-            boolean isNeedUpdate = false;
-            if (!studioExtraSignFile.exists() && userExtraSignFile.exists()) {
-                userExtraSignFile.delete();
-                if (userExtraFile.exists()) {
-                    userExtraFile.delete();
-                }
-                return true;
-            } else if (studioExtraSignFile.exists()) {
-                isNeedUpdate = true;
-            } 
-            if (isNeedUpdate) {
-                try {
-                    FilesUtils.copyFile(studioExtraFile, userExtraFile);
-                    FilesUtils.copyFile(studioExtraSignFile, userExtraSignFile);
-                } catch (IOException ex) {
-                    ExceptionHandler.process(ex);
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-    
-    public static boolean isSharedStudioMode() {
-    	if (isDevEnvironment()) {
-    		return false;
-    	}
-        File configFolder = new File (Platform.getConfigurationLocation().getURL().getFile());
-        File studioFolder = new File (Platform.getInstallLocation().getURL().getFile());
-        if (configFolder != null && studioFolder != null && configFolder.getParentFile() != null
-                && configFolder.getParentFile().getAbsolutePath().equals(studioFolder.getAbsolutePath())) {
-            return false;
-        }
-        return true;
-    }
-    
-    private static boolean isDevEnvironment() {
-    	if (CoreRuntimePlugin.getInstance().getBundle().getBundleContext().getProperty(PROP_DEVMODE) != null) {
-    		return true;
-    	}
-    	return false;
-    }
-    
-    public static boolean installedPatch() {
-        if (GlobalServiceRegister.getDefault().isServiceRegistered(IUpdateService.class)) {
-            IUpdateService updateService = GlobalServiceRegister.getDefault().getService(IUpdateService.class);
-            try {
-                return updateService.syncSharedStudioLibraryInPatch(new NullProgressMonitor());
-            } catch (Exception e) {
-                ExceptionHandler.process(e);
-            }
-        }
-        return false;
-    }
-    
-	public static File getSharedStudioComponentsParentFolder() {
-		File configFolder = new File(Platform.getConfigurationLocation().getURL().getFile());
-		return configFolder;
-	}
-	
-	public static File getSharedStudioComponentsExtFolder() {
-		File componentFolder = SharedStudioUtils.getSharedStudioComponentsParentFolder();
-		IPath path = new Path(IComponentsFactory.COMPONENTS_INNER_FOLDER);
-        path = path.append(IComponentsFactory.EXTERNAL_COMPONENTS_INNER_FOLDER);
-        File extchangeFolder = new File (componentFolder, path.toOSString());
-		return extchangeFolder;
-	}
-}

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

@@ -20,9 +20,5 @@ public interface IUpdateService extends IService {
     boolean checkComponentNexusUpdate();
 
     void syncComponentM2Jars(IProgressMonitor monitor);
-    
-    public boolean syncSharedStudioLibraryInPatch(IProgressMonitor monitor) throws Exception;
-    
-    public String getSharedStudioMissingPatchVersion();
 
 }

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

@@ -13,7 +13,6 @@
 package org.talend.core.ui;
 
 import org.talend.core.IService;
-import org.talend.core.runtime.maven.MavenArtifact;
 
 /**
  * @author hwang
@@ -22,7 +21,5 @@ import org.talend.core.runtime.maven.MavenArtifact;
 public interface IInstalledPatchService extends IService {
 
 	public String getLatestInstalledVersion(boolean isBar);
-	
-    public MavenArtifact getLastIntalledP2Patch();
 
 }

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

@@ -1,60 +0,0 @@
-package org.talend.core.utils;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Display;
-import org.talend.commons.CommonsPlugin;
-
-public class DialogUtils {
-
-    private static ELoginInfoCase finalCase;
-
-    public static void setWarningInfo(ELoginInfoCase warnningInfo) {
-        finalCase = warnningInfo;
-    }
-
-    public static void syncOpenWarningDialog(String title) {
-        if (CommonsPlugin.isHeadless() || DialogUtils.finalCase == null) {
-            return;
-        }
-        int dialogType = DialogUtils.finalCase.getDialogType();
-        String[] contents = DialogUtils.finalCase.getContents();
-        List<String> asList = Arrays.asList(contents);
-        StringBuffer sb = new StringBuffer();
-        asList.forEach(w -> {
-            sb.append(w);
-            sb.append("\n");// $NON-NLS-1$
-        });
-        int[] selectIndex = new int[1];
-        Display.getDefault().syncExec(new Runnable() {
-
-            @Override
-            public void run() {
-
-                String[] dialogButtonLabels = new String[] { IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL, };
-
-                if (dialogType == MessageDialog.ERROR) {
-                    dialogButtonLabels = new String[] { IDialogConstants.CANCEL_LABEL };
-                }
-                int open = MessageDialog.open(dialogType, Display.getDefault().getActiveShell(), title, sb.toString(), SWT.NONE,
-                        dialogButtonLabels);
-                selectIndex[0] = open;
-
-            }
-
-
-        });
-        DialogUtils.finalCase = null;
-        if (dialogType == MessageDialog.ERROR) {
-            throw new OperationCanceledException(""); //$NON-NLS-1$
-        }
-        if (1 == selectIndex[0]) {
-            throw new OperationCanceledException(""); //$NON-NLS-1$
-        }
-    }
-}

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

@@ -1,40 +0,0 @@
-package org.talend.core.utils;
-
-import org.eclipse.jface.dialogs.MessageDialog;
-
-public enum ELoginInfoCase {
-
-    STUDIO_LOWER_THAN_PROJECT(MessageDialog.ERROR),
-
-    STUDIO_HIGHER_THAN_PROJECT(MessageDialog.WARNING);
-
-    private int dialogType;
-
-    private String[] contents;
-
-    ELoginInfoCase(int dialogType) {
-        this.dialogType = dialogType;
-    }
-
-    ELoginInfoCase(int dialogType, String[] contents) {
-        this.dialogType = dialogType;
-        this.contents = contents;
-    }
-
-    public int getDialogType() {
-        return dialogType;
-    }
-
-    public void setDialogType(int dialogType) {
-        this.dialogType = dialogType;
-    }
-
-    public String[] getContents() {
-        return contents;
-    }
-
-    public void setContents(String[] contents) {
-        this.contents = contents;
-    }
-
-}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/login/AbstractLoginTask.java

@@ -42,9 +42,4 @@ public abstract class AbstractLoginTask implements ILoginTask {
         return gc.getTime();
     }
 
-    @Override
-    public boolean isRequiredAlways() {
-        return false;
-    }
-
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/login/ILoginTask.java

@@ -27,10 +27,4 @@ public interface ILoginTask {
     public boolean isCommandlineTask();
 
     public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException;
-
-    /**
-     * Which indicates the task will be executed for each logon of a project, by default return false(execute only once
-     * at the time of logon studio).
-     */
-    boolean isRequiredAlways();
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/repository/ProjectManager.java

@@ -606,8 +606,7 @@ public final class ProjectManager {
            */
 
         if (!branchSelection.contains(NAME_TAGS) && !branchSelection.contains(NAME_BRANCHES)
-                && !branchSelection.contains(NAME_TRUNK) && !branchSelection.contains(SVNConstant.NAME_MASTER)
-                && !branchSelection.contains(SVNConstant.NAME_MAIN)) {
+                && !branchSelection.contains(NAME_TRUNK) && !branchSelection.contains("master")) { //$NON-NLS-1$
             branchSelection = NAME_BRANCHES + branchSelection;
         }
         return branchSelection;
@@ -650,8 +649,7 @@ public final class ProjectManager {
         if (!branchName.startsWith(SVNConstant.NAME_TAGS + SVNConstant.SEP_CHAR)
                 && !branchName.startsWith(SVNConstant.NAME_BRANCHES + SVNConstant.SEP_CHAR)
                 && !branchName.startsWith(SVNConstant.NAME_ORIGIN + SVNConstant.SEP_CHAR)
-                && !branchName.equals(SVNConstant.NAME_TRUNK) && !branchName.equals(SVNConstant.NAME_MASTER)
-                && !branchName.equals(SVNConstant.NAME_MAIN)) {
+                && !branchName.equals(SVNConstant.NAME_TRUNK) && !branchName.equals(SVNConstant.NAME_MASTER)) {
             formatedBranchName = SVNConstant.NAME_BRANCHES + SVNConstant.SEP_CHAR + branchName;
         }
         return formatedBranchName;

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

@@ -268,20 +268,12 @@ public interface IProxyRepositoryFactory {
 
     public abstract IRepositoryViewObject getLastVersion(Project project, String id, String relativeFolder,
             ERepositoryObjectType type) throws PersistenceException;
-    
-    public abstract IRepositoryViewObject getLastVersion(String id, String folderPath, ERepositoryObjectType type)  throws PersistenceException;
-    
-    public abstract IRepositoryViewObject getLastVersion(String id, ERepositoryObjectType type)  throws PersistenceException;
-    
-    public abstract IRepositoryViewObject getLastVersion(String id, List<ERepositoryObjectType> types)  throws PersistenceException;
 
     public abstract IRepositoryViewObject getLastVersion(Project project, String id) throws PersistenceException;
 
     public abstract IRepositoryViewObject getLastVersion(String id) throws PersistenceException;
 
     public IRepositoryViewObject getLastRefVersion(Project project, String id) throws PersistenceException;
-    
-    public IRepositoryViewObject getLastRefVersion(Project project, String id, String folderPath, ERepositoryObjectType type) throws PersistenceException;
 
     public abstract IRepositoryViewObject getSpecificVersion(Project project, String id, String version, boolean avoidSaveProject)
             throws PersistenceException;

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

@@ -125,16 +125,7 @@ public interface IRepositoryService extends IService {
 
     public void openProjectSettingDialog(final String pageId);
 
-    /**
-     * 
-     * get branches of project
-     * 
-     * @param project
-     * @param onlyLocalIfPossible try to only get branches from local repository to improve performance
-     * @return
-     * @throws JSONException
-     */
-    public List<String> getProjectBranch(Project project, boolean onlyLocalIfPossible) throws JSONException;
+    public List<String> getProjectBranch(Project project) throws JSONException;
 
     public boolean askRetryForNetworkIssue(Throwable ex);
 

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

@@ -47,8 +47,6 @@ public class RepositoryConstants {
 
     public static final String JOBLET_DOCUMENTATION_PATH = "documentations/generated/joblets"; //$NON-NLS-1$
 
-    public static final String PROJECT_SETTINGS_CUSTOM_URI_MAP = "custom_uri_mapping.json"; //$NON-NLS-1$
-
     public static final String SYSTEM_DIRECTORY = "system"; //$NON-NLS-1$
 
     public static final String USER_DEFINED = "UserDefined"; //$NON-NLS-1$

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

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/jna-platform.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jna.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/oshi-core.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/main/java"/>

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

@@ -31,10 +31,7 @@ Require-Bundle: org.apache.commons.lang,
  org.talend.themes.core,
  ca.odell.glazedlists,
  org.talend.core,
- org.apache.commons.io,
- org.apache.httpcomponents.httpcore,
- org.apache.httpcomponents.httpclient,
- org.slf4j.api
+ org.apache.commons.io
 Import-Package: org.eclipse.jdt.internal.ui.workingsets
 Export-Package: org.talend.core.ui,
  org.talend.core.ui.actions,
@@ -82,7 +79,3 @@ Bundle-Vendor: .Talend SA.
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.talend.core.ui.CoreUIPlugin
 Bundle-Localization: plugin
-Bundle-ClassPath: lib/jna-platform.jar,
- lib/jna.jar,
- lib/oshi-core.jar,
- .

main/plugins/org.talend.core.ui/build.properties

@@ -5,7 +5,4 @@ bin.includes = .,\
                icons/,\
                plugin.properties,\
                schema/,\
-               META-INF/,\
-               lib/jna-platform.jar,\
-               lib/jna.jar,\
-               lib/oshi-core.jar
+               META-INF/

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

@@ -24,12 +24,6 @@
             id="org.talend.core.runtime.defaultProvider"
             name="default">
       </provider>
-      <provider
-            collector="org.talend.core.ui.token.PerformanceTokenCollector"
-            description="collect such as hardware info, I/O info, startup time"
-            id="org.talend.core.ui.token.PerformanceProvider"
-            name="performance">
-      </provider>
    </extension>
    
       <extension

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

@@ -9,42 +9,4 @@
   </parent>
   <artifactId>org.talend.core.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
-  
-  <dependencies>
-  	<dependency>
-	  	<groupId>com.github.oshi</groupId>
-		<artifactId>oshi-core</artifactId>
-		<version>5.2.5</version>
-		<exclusions>
-			<exclusion>
-				<groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-			</exclusion>
-		</exclusions>
-	 </dependency>
-  </dependencies>
-  
-  <build>
-     	<plugins>
-	      <plugin>
-	        <groupId>org.apache.maven.plugins</groupId>
-	        <artifactId>maven-dependency-plugin</artifactId>
-	        <version>3.0.2</version>
-	        <executions>
-	          <execution>
-	            <id>copy-dependencies</id>
-	            <phase>generate-resources</phase>
-	            <goals>
-	              <goal>copy-dependencies</goal>
-	            </goals>
-	            <configuration>
-	              <includeScope>runtime</includeScope>
-	              <outputDirectory>${project.basedir}/lib</outputDirectory>
-	              <stripVersion>true</stripVersion>
-	            </configuration>
-	          </execution>
-	        </executions>
-	      </plugin>
-      </plugins>
-     </build>
 </project>

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/component/settings/ComponentsSettingsHelper.java

@@ -75,9 +75,9 @@ public class ComponentsSettingsHelper {
                 hiddenComponents.put(component.getPaletteType(), new HashMap<String, Set<String>>());
             }
             if (!component.isVisibleInComponentDefinition()) {
-                hiddenComponents.get(component.getPaletteType()).put(component.getDisplayName(), new HashSet<String>());
+                hiddenComponents.get(component.getPaletteType()).put(component.getName(), new HashSet<String>());
                 for (String family : component.getOriginalFamilyName().split(ComponentsFactoryProvider.FAMILY_SEPARATOR_REGEX)) {
-                    hiddenComponents.get(component.getPaletteType()).get(component.getDisplayName()).add(family);
+                    hiddenComponents.get(component.getPaletteType()).get(component.getName()).add(family);
                 }
             }
         }
@@ -168,8 +168,8 @@ public class ComponentsSettingsHelper {
         }
 
         if (hiddenComponents.containsKey(component.getPaletteType())) {
-            if (hiddenComponents.get(component.getPaletteType()).containsKey(component.getDisplayName())) {
-                if (hiddenComponents.get(component.getPaletteType()).get(component.getDisplayName()).contains(family)) {
+            if (hiddenComponents.get(component.getPaletteType()).containsKey(component.getName())) {
+                if (hiddenComponents.get(component.getPaletteType()).get(component.getName()).contains(family)) {
                     // not visible if in the hidden component list;
                     return false;
                 }
@@ -225,7 +225,7 @@ public class ComponentsSettingsHelper {
         EList list = emfProject.getComponentsSettings();
         if (!list.isEmpty()) {
             list.clear();
-            IRepositoryService service = GlobalServiceRegister.getDefault().getService(
+            IRepositoryService service = (IRepositoryService) GlobalServiceRegister.getDefault().getService(
                     IRepositoryService.class);
 
             IProxyRepositoryFactory prf = service.getProxyRepositoryFactory();

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

@@ -497,11 +497,7 @@ public class ContextTreeTable {
         int max = 0;
         String text = "";
         for (int i = 0; i < dataLayer.getPreferredRowCount(); i++) {
-            Object dataValueByPosition = dataLayer.getDataValueByPosition(colPos, i);
-            if (dataValueByPosition == null) {
-                continue;
-            }
-            text = dataValueByPosition.toString();
+            text = dataLayer.getDataValueByPosition(colPos, i).toString();
             Point size = gc.textExtent(text, SWT.DRAW_MNEMONIC);
             int temp = size.x;
             if (temp > max) {

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

@@ -29,8 +29,6 @@ public class ContextAutoResizeTextPainter extends TextPainter {
 
     private boolean changeBackgroundColor = false;
 
-    private boolean containsRowName = false;
-
     public ContextAutoResizeTextPainter(boolean wrapText, boolean paintBg, boolean calculate) {
         super(wrapText, paintBg, calculate);
     }
@@ -45,8 +43,6 @@ public class ContextAutoResizeTextPainter extends TextPainter {
         super.setupGCFromConfig(gc, cellStyle);
         if (cellStyle.getAttributeValue(CellStyleAttributes.FOREGROUND_COLOR).equals(GUIHelper.COLOR_RED)) {
             gc.setForeground(GUIHelper.COLOR_BLACK);
-        } else if (containsRowName) {
-            gc.setForeground(GUIHelper.COLOR_RED);
         } else if (changeBackgroundColor) {
             gc.setForeground(GUIHelper.COLOR_WIDGET_DARK_SHADOW);
         }
@@ -56,9 +52,6 @@ public class ContextAutoResizeTextPainter extends TextPainter {
         changeBackgroundColor = isChange;
     }
 
-    public void setContainsRowName(boolean containsRowName) {
-        this.containsRowName = containsRowName;
-    }
 
 	@Override
 	protected void setNewMinLength(ILayerCell cell, int contentWidth) {

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

@@ -12,11 +12,6 @@
 // ============================================================================
 package org.talend.core.ui.context.nattableTree;
 
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.apache.commons.lang.StringUtils;
 import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
 import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
 import org.eclipse.nebula.widgets.nattable.extension.glazedlists.GlazedListsDataProvider;
@@ -28,7 +23,6 @@ import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Rectangle;
 import org.talend.core.ui.context.ContextTreeTable.ContextTreeNode;
 import org.talend.core.ui.context.model.ContextTabChildModel;
-import org.talend.core.ui.context.model.ContextTabParentModel;
 import org.talend.core.ui.context.model.table.ContextTableTabParentModel;
 
 /**
@@ -39,8 +33,6 @@ public class ContextNatTableBackGroudPainter extends BackgroundPainter {
 
     private IDataProvider dataProvider;
 
-    private Map<String, String> rowNames = new HashMap<String, String>();
-
     public ContextNatTableBackGroudPainter(ICellPainter painter, IDataProvider dataProvider) {
         super(painter);
         this.dataProvider = dataProvider;
@@ -61,11 +53,9 @@ public class ContextNatTableBackGroudPainter extends BackgroundPainter {
             ContextTabChildModel rowChildModel = (ContextTabChildModel) rowNode.getTreeData();
             if (rowChildModel != null) {
                 ((ContextAutoResizeTextPainter) getWrappedPainter()).setChangeBackgroundColor(true);
-                checkContainsRowName(rowNode, rowChildModel);
             }
         }
         super.paintCell(cell, gc, bounds, configRegistry);
-        ((ContextAutoResizeTextPainter) getWrappedPainter()).setContainsRowName(false);
     }
 
     @Override
@@ -73,33 +63,4 @@ public class ContextNatTableBackGroudPainter extends BackgroundPainter {
         return super.getBackgroundColour(cell, configRegistry);
     }
 
-    private void checkContainsRowName(ContextTreeNode rowNode, ContextTabChildModel rowChildModel) {
-        // Check any duplicate / similar variable from different context to show in red .
-        String rowName = rowNode.getName();
-        String parentSourceName = null;
-        ContextTabParentModel rowTabParentModel = rowChildModel.getParent();
-        if (rowTabParentModel != null && rowTabParentModel instanceof ContextTableTabParentModel) {
-            ContextTableTabParentModel rowTableTabParentModel = (ContextTableTabParentModel) rowTabParentModel;
-            parentSourceName = rowTableTabParentModel.getSourceName();
-        }
-        if (StringUtils.isNotBlank(rowName) && StringUtils.isNotBlank(parentSourceName)) {
-            rowName = rowName.toUpperCase();
-            parentSourceName = parentSourceName.toUpperCase();
-            if (rowNames.containsValue(rowName)) {
-                Iterator<String> iterator = rowNames.keySet().iterator();
-                while (iterator.hasNext()) {
-                    String key = iterator.next();
-                    String value = rowNames.get(key);
-                    if (rowName.equalsIgnoreCase(value)) {
-                        if (!parentSourceName.equalsIgnoreCase(key)) {
-                            ((ContextAutoResizeTextPainter) getWrappedPainter()).setContainsRowName(true);
-                        }
-                        break;
-                    }
-                }
-            } else {
-                rowNames.put(parentSourceName, rowName);
-            }
-        }
-    }
 }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/metadata/celleditor/ModuleListCellEditor.java

@@ -20,6 +20,7 @@ import org.eclipse.gef.commands.Command;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.viewers.DialogCellEditor;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.window.Window;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.FocusAdapter;
 import org.eclipse.swt.events.FocusEvent;
@@ -36,6 +37,7 @@ import org.talend.core.model.process.IElement;
 import org.talend.core.model.process.IElementParameter;
 import org.talend.core.model.process.INode;
 import org.talend.core.model.process.IProcess2;
+import org.talend.core.runtime.services.IGenericDBService;
 import org.talend.core.ui.CoreUIPlugin;
 import org.talend.core.ui.process.IGEFProcess;
 import org.talend.core.ui.services.IDesignerCoreUIService;
@@ -169,7 +171,7 @@ public class ModuleListCellEditor extends DialogCellEditor {
                    ILibraryManagerUIService.class);
             IConfigModuleDialog dialog = libUiService.getConfigModuleDialog(cellEditorWindow.getShell(), "\"newLine\"".equals(value) ? "" : value);
             if (dialog.open() == IDialogConstants.OK_ID) {
-                String selecteModule = dialog.getMavenURI();
+                String selecteModule = dialog.getModuleName();
                 if (selecteModule != null && (value == null || !value.equals(selecteModule))) {
                     setModuleValue(selecteModule, null, null);
                     return selecteModule;
@@ -190,16 +192,24 @@ public class ModuleListCellEditor extends DialogCellEditor {
         }
         // enable to refresh component setting after change modules.
         IElement element = this.tableParam.getElement();
-        if (element != null) {
+        boolean isNotCConfig = element.getElementParameter("COMPONENT_NAME") == null ?
+                true : !"cConfig".equals(element.getElementParameter("COMPONENT_NAME").getValue());
+        if (element != null && isNotCConfig) {
             IElementParameter updateComponentsParam = element.getElementParameter("UPDATE_COMPONENTS"); //$NON-NLS-1$
             if (updateComponentsParam != null) {
                 updateComponentsParam.setValue(Boolean.TRUE);
             }
         }
-
         //
         executeCommand(new ModelChangeCommand(tableParam, param.getName(), newValue, index));
 
+        if (newVal != null) {
+            executeCommand(new ModelChangeCommand(tableParam, "JAR_PATH", newVal, index));
+        }
+        if (nexusVersion != null) {
+            executeCommand(new ModelChangeCommand(tableParam, "JAR_NEXUS_VERSION", nexusVersion, index));
+        }
+
         oldValue = newValue;
         if (getTableViewer() != null) {
             getTableViewer().refresh(true);

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

@@ -81,7 +81,7 @@ public class DefaultTokenCollector extends AbstractTokenCollector {
         jsonObject.put("os.arch", System.getProperty("os.arch"));
         jsonObject.put("os.version", System.getProperty("os.version"));
         tokenStudioObject.put(OS.getKey(), jsonObject);
-        
+
         final IPreferenceStore preferenceStore = CoreUIPlugin.getDefault().getPreferenceStore();
         long syncNb = preferenceStore.getLong(COLLECTOR_SYNC_NB);
         tokenStudioObject.put(SYNC_NB.getKey(), syncNb);
@@ -91,7 +91,6 @@ public class DefaultTokenCollector extends AbstractTokenCollector {
         } else {
             tokenStudioObject.put(STOP_COLLECTOR.getKey(), "0"); //$NON-NLS-1$
         }
-        
         return tokenStudioObject;
     }
 }

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

@@ -1,83 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2020 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.core.ui.token;
-
-import java.util.Properties;
-
-import org.talend.commons.exception.CommonExceptionHandler;
-import org.talend.commons.utils.time.PerformanceStatisticUtil;
-import org.talend.commons.utils.time.PerformanceStatisticUtil.StatisticKeys;
-
-import oshi.SystemInfo;
-import oshi.hardware.Baseboard;
-import oshi.hardware.CentralProcessor;
-import oshi.hardware.CentralProcessor.ProcessorIdentifier;
-import oshi.hardware.ComputerSystem;
-import oshi.hardware.GlobalMemory;
-import oshi.hardware.HardwareAbstractionLayer;
-import us.monoid.json.JSONObject;
-
-/**
- * DOC sbliu  class global comment. Detailled comment
- */
-public class PerformanceTokenCollector extends AbstractTokenCollector {
-
-    /* (non-Javadoc)
-     * @see org.talend.core.ui.token.AbstractTokenCollector#collect()
-     */
-    @Override
-    public JSONObject collect() throws Exception {
-        checkAndWait();
-        
-        JSONObject tokenStudioObject = new JSONObject();
-        //
-        JSONObject jsonObjectHDInfo = new JSONObject();
-        
-        SystemInfo si = new SystemInfo();
-        HardwareAbstractionLayer hal = si.getHardware();
-        CentralProcessor processor = hal.getProcessor();
-        ProcessorIdentifier processorIdentifier = processor.getProcessorIdentifier();
-        ComputerSystem cs = hal.getComputerSystem();//computer system
-        Baseboard baseboard = cs.getBaseboard();//motherboard
-        GlobalMemory memory = hal.getMemory();
-        
-        jsonObjectHDInfo.put("computer vendor", cs.getManufacturer());
-        jsonObjectHDInfo.put("board vendor", baseboard.getManufacturer());
-        jsonObjectHDInfo.put("board version", baseboard.getVersion());
-        jsonObjectHDInfo.put("processor", processorIdentifier.getName());
-        jsonObjectHDInfo.put("physical memory", Math.ceil((memory.getTotal() /(1024d*1024*1024))) + "GB");
-        tokenStudioObject.put("hardware", jsonObjectHDInfo);
-        
-        //
-        JSONObject jsonObjectIOInfo = new JSONObject();
-        Properties props = PerformanceStatisticUtil.read(PerformanceStatisticUtil.getRecordingFile(),false);
-        jsonObjectIOInfo.put(StatisticKeys.STARTUP_AVERAGE.get(), props.getProperty(StatisticKeys.STARTUP_AVERAGE.get()));
-        jsonObjectIOInfo.put(StatisticKeys.STARTUP_MAX.get(), props.getProperty(StatisticKeys.STARTUP_MAX.get()));
-        jsonObjectIOInfo.put(StatisticKeys.IO_R_MB_SEC.get(), props.getProperty(StatisticKeys.IO_R_MB_SEC.get()));
-        jsonObjectIOInfo.put(StatisticKeys.IO_R_AVERAGE_MB_SEC.get(), props.getProperty(StatisticKeys.IO_R_AVERAGE_MB_SEC.get()));
-        jsonObjectIOInfo.put(StatisticKeys.IO_W_MB_SEC.get(), props.getProperty(StatisticKeys.IO_W_MB_SEC.get()));
-        jsonObjectIOInfo.put(StatisticKeys.IO_W_AVERAGE_MB_SEC.get(), props.getProperty(StatisticKeys.IO_W_AVERAGE_MB_SEC.get()));
-        tokenStudioObject.put("performance", jsonObjectIOInfo);
-        
-        return tokenStudioObject;
-    }
-
-    private void checkAndWait() {
-        try {
-            PerformanceStatisticUtil.waitUntilFinish();
-        } catch (InterruptedException e) {
-            CommonExceptionHandler.log(e.getMessage());
-        }
-    }
-    
-}

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

@@ -14,39 +14,15 @@ package org.talend.core.ui.token;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.InetSocketAddress;
-import java.net.PasswordAuthentication;
-import java.net.Proxy;
-import java.net.Proxy.Type;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
+import java.lang.reflect.Field;
+import java.net.Authenticator;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.zip.GZIPOutputStream;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpHost;
-import org.apache.http.StatusLine;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.entity.mime.MultipartEntityBuilder;
-import org.apache.http.entity.mime.content.ByteArrayBody;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
 import org.apache.log4j.Logger;
 import org.apache.log4j.Priority;
 import org.eclipse.core.runtime.CoreException;
@@ -60,13 +36,17 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.ui.preferences.ScopedPreferenceStore;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.utils.network.NetworkUtil;
-import org.talend.commons.utils.network.TalendProxySelector;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.prefs.ITalendCorePrefConstants;
 import org.talend.core.ui.CoreUIPlugin;
 import org.talend.core.ui.branding.IBrandingService;
 
 import us.monoid.json.JSONObject;
+import us.monoid.web.AbstractContent;
+import us.monoid.web.FormData;
+import us.monoid.web.Resty;
+import us.monoid.web.TextResource;
+import us.monoid.web.mime.MultipartContent;
 
 /**
  * ggu class global comment. Detailled comment
@@ -234,18 +214,26 @@ public final class TokenCollectorFactory {
                 @Override
                 protected IStatus run(IProgressMonitor monitor) {
                     if (NetworkUtil.isNetworkValid()) {
+                        Authenticator defaultAuth = NetworkUtil.getDefaultAuthenticator();
                         try {
                             JSONObject tokenInfors = collectTokenInfors();
+                            Resty r = new Resty();
+                            // set back the rath for Resty.
+                            Field rathField = Resty.class.getDeclaredField("rath"); //$NON-NLS-1$
+                            rathField.setAccessible(true);
+                            Authenticator auth = (Authenticator) rathField.get(null);
+                            Authenticator.setDefault(auth);
 
                             ByteArrayOutputStream baos = new ByteArrayOutputStream();
                             GZIPOutputStream gzos = new GZIPOutputStream(baos);
                             gzos.write(tokenInfors.toString().getBytes());
                             gzos.close();
-                            byte[] data = baos.toByteArray();
+                            AbstractContent ac = Resty.content(baos.toByteArray());
                             baos.close();
+                            MultipartContent mpc = Resty.form(new FormData("data", ac)); //$NON-NLS-1$
 
-                            String responseString = sendData(data);
-                            String resultStr = new JSONObject(responseString).getString("result"); //$NON-NLS-1$
+                            TextResource result = r.text("https://www.talend.com/TalendRegisterWS/tokenstudio_v2.php", mpc); //$NON-NLS-1$
+                            String resultStr = new JSONObject(result.toString()).getString("result"); //$NON-NLS-1$
                             boolean okReturned = (resultStr != null && resultStr.endsWith("OK")); //$NON-NLS-1$
                             if (okReturned) {
                                 // set new days
@@ -265,6 +253,7 @@ public final class TokenCollectorFactory {
                         } catch (Exception e) {
                             ExceptionHandler.process(e);
                         } finally {
+                            Authenticator.setDefault(defaultAuth);
                         }
                     }
                     return org.eclipse.core.runtime.Status.OK_STATUS;
@@ -285,84 +274,4 @@ public final class TokenCollectorFactory {
             }
         }
     }
-
-    private void addProxy(String url, HttpClientBuilder clientBuilder) throws URISyntaxException {
-        TalendProxySelector proxySelector = TalendProxySelector.getInstance();
-        final List<Proxy> proxyList = proxySelector.getDefaultProxySelector().select(new URI(url));
-        Proxy usedProxy = null;
-        if (proxyList != null && !proxyList.isEmpty()) {
-            usedProxy = proxyList.get(0);
-        }
-
-        if (usedProxy != null) {
-            if (!Type.DIRECT.equals(usedProxy.type())) {
-                final Proxy finalProxy = usedProxy;
-                InetSocketAddress address = (InetSocketAddress) finalProxy.address();
-                String proxyServer = address.getHostString();
-                int proxyPort = address.getPort();
-                PasswordAuthentication proxyAuthentication = proxySelector.getHttpPasswordAuthentication();
-                if (proxyAuthentication != null) {
-                    String proxyUser = proxyAuthentication.getUserName();
-                    if (StringUtils.isNotBlank(proxyUser)) {
-                        String proxyPassword = "";
-                        char[] passwordChars = proxyAuthentication.getPassword();
-                        if (passwordChars != null) {
-                            proxyPassword = new String(passwordChars);
-                        }
-                        BasicCredentialsProvider credProvider = new BasicCredentialsProvider();
-                        credProvider.setCredentials(new AuthScope(proxyServer, proxyPort),
-                                new UsernamePasswordCredentials(proxyUser, proxyPassword));
-                        clientBuilder.setDefaultCredentialsProvider(credProvider);
-                    }
-                }
-                HttpHost proxyHost = new HttpHost(proxyServer, proxyPort);
-                clientBuilder.setProxy(proxyHost);
-            }
-        }
-    }
-
-    private String sendData(byte[] data) throws Exception {
-        CloseableHttpClient client = null;
-        CloseableHttpResponse response = null;
-        try {
-            final String url = "https://www.talend.com/TalendRegisterWS/tokenstudio_v2.php";
-
-            HttpClientBuilder clientBuilder = HttpClients.custom();
-            clientBuilder.disableCookieManagement();
-            addProxy(url, clientBuilder);
-            client = clientBuilder.build();
-
-            HttpPost httpPost = new HttpPost(url);
-            httpPost.setConfig(RequestConfig.DEFAULT);
-
-            MultipartEntityBuilder dataBuilder = MultipartEntityBuilder.create();
-            dataBuilder.addPart("data", new ByteArrayBody(data, null));
-            HttpEntity reqEntity = dataBuilder.build();
-            httpPost.setEntity(reqEntity);
-
-            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 + "]");
-            }
-            return responseStr;
-        } finally {
-            if (response != null) {
-                try {
-                    response.close();
-                } catch (Throwable e) {
-                    ExceptionHandler.process(e);
-                }
-            }
-            if (client != null) {
-                try {
-                    client.close();
-                } catch (Throwable e) {
-                    ExceptionHandler.process(e);
-                }
-            }
-        }
-    }
-
 }

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

@@ -91,10 +91,6 @@ public class PluginUtil {
         return "org.talend.camel.testcontainer.ui.editor.CamelTestContainerMultiPageEditor".equals(getActiveEditorId()); //$NON-NLS-1$
     }
 
-    public static boolean isRouteletEditor() {
-        return "org.talend.repository.routelets.editor.RouteletMultiPageTalendEditor".equals(getActiveEditorId()); //$NON-NLS-1$
-    }
-
     /**
      * DOC yyan Get active editor ID.
      *

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

@@ -23,11 +23,9 @@ import org.eclipse.emf.common.util.URI;
 import org.osgi.service.prefs.BackingStoreException;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.exception.SystemException;
-import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
 import org.talend.core.model.general.Project;
 import org.talend.core.model.process.INode;
-import org.talend.core.model.properties.Property;
 import org.talend.core.runtime.maven.MavenArtifact;
 
 /**
@@ -80,18 +78,4 @@ public interface ICoreTisService extends IService {
 
     Set<String> getComponentBlackList();
     
-    public void afterImport (Property property) throws PersistenceException;  
-
-    boolean hasNewPatchInPatchesFolder();
-
-    boolean isDefaultLicenseAndProjectType();
-
-    void refreshPatchesFolderCache();
-
-    static ICoreTisService get() {
-        if (GlobalServiceRegister.getDefault().isServiceRegistered(ICoreTisService.class)) {
-            return GlobalServiceRegister.getDefault().getService(ICoreTisService.class);
-        }
-        return null;
-    }
 }

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

@@ -34,14 +34,7 @@ public interface IGITProviderService extends IService {
 
     public String getCurrentGITRevision(Object process);
 
-    /**
-     * get project branches
-     * 
-     * @param project
-     * @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);
 
     public boolean isGITProject(Project p) throws PersistenceException;
 
@@ -55,8 +48,6 @@ public interface IGITProviderService extends IService {
 
     void createOrUpdateGitIgnoreFile(IProject eclipseProject) throws CoreException;
 
-    String getDefaultBranch(Project project);
-
     public static IGITProviderService get() {
         GlobalServiceRegister register = GlobalServiceRegister.getDefault();
         if (!register.isServiceRegistered(IGITProviderService.class)) {

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

@@ -1492,13 +1492,15 @@ public class ProcessorUtilities {
                     }
                     while (relativepath.hasNext()) {
                         String relativePath = relativepath.next();
-                        Set<URL> sources = resouece.getResourcesByRelativePath(relativePath);
-                        for (URL sourceUrl : sources) {
-                            File currentResource = new File(
-                                    org.talend.commons.utils.io.FilesUtils.getFileRealPath(sourceUrl.getPath()));
-                            if (currentResource.exists()) {
-                                FilesUtils.copyDirectory(currentResource, new File(
-                                        targetFolder.getLocation().toPortableString() + File.separator + pathStr));
+                        if (!(relativePath.startsWith("MAVEN-INF") || relativePath.startsWith("TALEND-INF"))) {
+                            Set<URL> sources = resouece.getResourcesByRelativePath(relativePath);
+                            for (URL sourceUrl : sources) {
+                                File currentResource = new File(
+                                        org.talend.commons.utils.io.FilesUtils.getFileRealPath(sourceUrl.getPath()));
+                                if (currentResource.exists()) {
+                                    FilesUtils.copyDirectory(currentResource, new File(
+                                            targetFolder.getLocation().toPortableString() + File.separator + pathStr));
+                                }
                             }
                         }
                     }

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

@@ -10,7 +10,7 @@
 	<artifactId>studio-tacokit-dependencies</artifactId>
 	<packaging>pom</packaging>
 	<properties>
-		<tacokit.components.version>1.15.0</tacokit.components.version>
+		<tacokit.components.version>1.9.0</tacokit.components.version>
 	</properties>
 	<repositories>
 		<repository>

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

@@ -11,7 +11,7 @@
     <packaging>pom</packaging>
     
     <properties>
-        <tcomp.version>1.1.25</tcomp.version>
+        <tcomp.version>1.1.15</tcomp.version>
         <slf4j.version>1.7.25</slf4j.version>
     </properties>
     
@@ -106,11 +106,6 @@
             <artifactId>slf4j-simple</artifactId>
             <version>${slf4j.version}</version>
         </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.14</version>
-        </dependency>
     </dependencies>
     
     <build>

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

@@ -27,6 +27,8 @@ public class MavenSystemFolders {
 
     public static final ProjectSystemFolder EXT_RESOURCES = new ProjectSystemFolder("src/main/ext-resources", "target/classes");
 
+    public static final ProjectSystemFolder TCK_RESOURCES = new ProjectSystemFolder("src/main/tacokit-resources", "target/classes");
+
     public static final ProjectSystemFolder BUNDLE_RESOURCES = new ProjectSystemFolder("src/main/bundle-resources", "target/classes");
 
     public static final ProjectSystemFolder RESOURCES_TEST = new ProjectSystemFolder("src/test/resources", "target/test-classes");

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

@@ -17,9 +17,7 @@ import static org.talend.designer.maven.model.TalendJavaProjectConstants.*;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -57,7 +55,6 @@ import org.talend.core.context.Context;
 import org.talend.core.context.RepositoryContext;
 import org.talend.core.model.general.ILibrariesService;
 import org.talend.core.model.general.ModuleNeeded;
-import org.talend.core.model.general.Project;
 import org.talend.core.model.process.ProcessUtils;
 import org.talend.core.model.properties.Item;
 import org.talend.core.model.properties.ProjectReference;
@@ -172,18 +169,9 @@ public class AggregatorPomsHelper {
 
             @Override
             protected void run() {
-                Project currentProject = ProjectManager.getInstance().getCurrentProject();
-                for (ERepositoryObjectType codeType : ERepositoryObjectType.getAllTypesOfCodes()) {
-                    try {
-                        if (CodeM2CacheManager.needUpdateCodeProject(currentProject, codeType)) {
-                            ITalendProcessJavaProject codeProject = getCodesProject(codeType);
-                            updateCodeProjectPom(monitor, codeType, codeProject.getProjectPom());
-                            buildAndInstallCodesProject(monitor, codeType, true, forceBuild);
-                            CodeM2CacheManager.updateCodeProjectCache(currentProject, codeType);
-                        }
-                    } catch (Exception e) {
-                        ExceptionHandler.process(e);
-                    }
+                updateCodeProject(monitor, ERepositoryObjectType.ROUTINES, forceBuild);
+                if (ProcessUtils.isRequiredBeans(null)) {
+                    updateCodeProject(monitor, ERepositoryObjectType.valueOf("BEANS"), forceBuild); //$NON-NLS-1$
                 }
             }
         };
@@ -191,6 +179,16 @@ public class AggregatorPomsHelper {
         ProxyRepositoryFactory.getInstance().executeRepositoryWorkUnit(workUnit);
     }
 
+    private void updateCodeProject(IProgressMonitor monitor, ERepositoryObjectType codeType, boolean forceBuild) {
+        try {
+            ITalendProcessJavaProject codeProject = getCodesProject(codeType);
+            updateCodeProjectPom(monitor, codeType, codeProject.getProjectPom());
+            buildAndInstallCodesProject(monitor, codeType, true, forceBuild);
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+    }
+
     public void updateCodeProjectPom(IProgressMonitor monitor, ERepositoryObjectType type, IFile pomFile)
             throws Exception {
         if (type != null) {
@@ -211,15 +209,27 @@ public class AggregatorPomsHelper {
     }
 
     public static void updateAllCodesProjectNeededModules(IProgressMonitor monitor) {
-        if (GlobalServiceRegister.getDefault().isServiceRegistered(ILibrariesService.class)
-                && GlobalServiceRegister.getDefault().isServiceRegistered(ILibraryManagerService.class)) {
-            Set<ModuleNeeded> neededModules = new HashSet<>();
-            ILibrariesService librariesService = GlobalServiceRegister.getDefault().getService(ILibrariesService.class);
-            ERepositoryObjectType.getAllTypesOfCodes()
-                    .forEach(c -> neededModules.addAll(librariesService.getCodesModuleNeededs(c)));
-            ILibraryManagerService repositoryBundleService = GlobalServiceRegister.getDefault()
-                    .getService(ILibraryManagerService.class);
-            repositoryBundleService.installModules(neededModules, monitor);
+        updateCodesProjectNeededModulesByType(ERepositoryObjectType.ROUTINES, monitor);
+        if (ProcessUtils.isRequiredBeans(null)) {
+            updateCodesProjectNeededModulesByType(ERepositoryObjectType.valueOf("BEANS"), monitor); //$NON-NLS-1$
+        }
+    }
+
+    private static void updateCodesProjectNeededModulesByType(ERepositoryObjectType codeType,
+            IProgressMonitor monitor) {
+        Set<ModuleNeeded> neededModules = null;
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(ILibrariesService.class)) {
+            ILibrariesService librariesService =
+                    (ILibrariesService) GlobalServiceRegister.getDefault().getService(ILibrariesService.class);
+            neededModules = librariesService.getCodesModuleNeededs(codeType);
+        }
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(ILibraryManagerService.class)) {
+            ILibraryManagerService repositoryBundleService =
+                    (ILibraryManagerService) GlobalServiceRegister.getDefault().getService(
+                            ILibraryManagerService.class);
+            if (neededModules != null && !neededModules.isEmpty()) {
+                repositoryBundleService.installModules(neededModules, monitor);
+            }
         }
     }
 
@@ -256,7 +266,7 @@ public class AggregatorPomsHelper {
         if (install) {
             Map<String, Object> argumentsMap = new HashMap<>();
             argumentsMap.put(TalendProcessArgumentConstant.ARG_GOAL, TalendMavenConstants.GOAL_INSTALL);
-            argumentsMap.put(TalendProcessArgumentConstant.ARG_PROGRAM_ARGUMENTS, TalendMavenConstants.ARG_MAIN_SKIP);
+            argumentsMap.put(TalendProcessArgumentConstant.ARG_PROGRAM_ARGUMENTS, "-Dmaven.main.skip=true"); //$NON-NLS-1$
             codeProject.buildModules(monitor, null, argumentsMap);
             BuildCacheManager.getInstance().updateCodeLastBuildDate(codeType);
         }
@@ -318,10 +328,26 @@ public class AggregatorPomsHelper {
     }
 
     public static void addToParentModules(IFile pomFile, Property property, boolean checkFilter) throws Exception {
-        if (!checkIfCanAddToParentModules(property, checkFilter)) {
-            return;
+        // Check relation for ESB service job, should not be added into main pom
+        if (property != null) {
+            List<Relation> relations = RelationshipItemBuilder.getInstance().getItemsRelatedTo(property.getId(),
+                    property.getVersion(), RelationshipItemBuilder.JOB_RELATION);
+            for (Relation relation : relations) {
+                if (RelationshipItemBuilder.SERVICES_RELATION.equals(relation.getType())) {
+                    return;
+                }
+            }
         }
 
+        if (checkFilter) {
+            if (GlobalServiceRegister.getDefault().isServiceRegistered(IFilterService.class)) {
+                IFilterService filterService = (IFilterService) GlobalServiceRegister.getDefault()
+                        .getService(IFilterService.class);
+                if (property != null && !filterService.isFilterAccepted(property.getItem(), PomIdsHelper.getPomFilter())) {
+                    return;
+                }
+            }
+        }
         IFile parentPom = getParentModulePomFile(pomFile);
         if (parentPom != null) {
             if (!parentPom.isSynchronized(IResource.DEPTH_ZERO)) {
@@ -341,36 +367,6 @@ public class AggregatorPomsHelper {
         }
     }
 
-    private static boolean checkIfCanAddToParentModules(Property property, boolean checkFilter) {
-        // Check relation for ESB service job, should not be added into main pom
-        if (property != null) {
-            List<Relation> relations = RelationshipItemBuilder.getInstance().getItemsRelatedTo(property.getId(),
-                    property.getVersion(), RelationshipItemBuilder.JOB_RELATION);
-            for (Relation relation : relations) {
-                if (RelationshipItemBuilder.SERVICES_RELATION.equals(relation.getType())) {
-                    return false;
-                }
-            }
-
-            // for import won't add for exclude option
-            if (property.getItem() != null && property.getItem().getState() != null && property.getItem().getState().isDeleted()
-                    && PomIdsHelper.getIfExcludeDeletedItems(property)) {
-                return false;
-            }
-        }
-
-        if (checkFilter) {
-            if (GlobalServiceRegister.getDefault().isServiceRegistered(IFilterService.class)) {
-                IFilterService filterService = (IFilterService) GlobalServiceRegister.getDefault()
-                        .getService(IFilterService.class);
-                if (property != null && !filterService.isFilterAccepted(property.getItem(), PomIdsHelper.getPomFilter())) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
     public static void removeFromParentModules(IFile pomFile) throws Exception {
         IFile parentPom = getParentModulePomFile(pomFile);
         if (parentPom != null) {
@@ -388,69 +384,6 @@ public class AggregatorPomsHelper {
         }
     }
 
-    public static void removeAllVersionsFromParentModules(Property property) throws Exception {
-        IFile parentPom = getParentModulePomFile(
-                AggregatorPomsHelper.getItemPomFolder(property).getFile(TalendMavenConstants.POM_FILE_NAME));
-        if (parentPom == null) {
-            return;
-        }
-
-        List<String> relativePathList = new ArrayList<String>();
-        List<IRepositoryViewObject> allVersion = ProxyRepositoryFactory.getInstance().getAllVersion(property.getId());
-        for (IRepositoryViewObject object : allVersion) {
-            IFile pomFile = AggregatorPomsHelper.getItemPomFolder(object.getProperty())
-                    .getFile(TalendMavenConstants.POM_FILE_NAME);
-            String relativePath = pomFile.getParent().getLocation().makeRelativeTo(parentPom.getParent().getLocation())
-                    .toPortableString();
-            if (StringUtils.isNotBlank(relativePath)) {
-                relativePathList.add(relativePath);
-            }
-        }
-
-        Model model = MavenPlugin.getMaven().readModel(parentPom.getContents());
-        List<String> modules = model.getModules();
-        if (modules != null && modules.size() > 0) {
-            modules.removeAll(relativePathList);
-            PomUtil.savePom(null, model, parentPom);
-        }
-    }
-    
-    public static void restoreAllVersionsFromParentModules(Property property) throws Exception {
-        IFile parentPom = getParentModulePomFile(
-                AggregatorPomsHelper.getItemPomFolder(property).getFile(TalendMavenConstants.POM_FILE_NAME));
-        if (parentPom == null) {
-            return;
-        }
-        
-        List<String> relativePathList = new ArrayList<String>();
-        Model model = MavenPlugin.getMaven().readModel(parentPom.getContents());
-        List<String> modules = model.getModules();
-        if (modules == null) {
-            modules = new ArrayList<>();
-            model.setModules(modules);
-        }
-
-        List<IRepositoryViewObject> allVersion = ProxyRepositoryFactory.getInstance().getAllVersion(property.getId());
-        for (IRepositoryViewObject object : allVersion) {
-            Property itemProperty = object.getProperty();
-            if (!checkIfCanAddToParentModules(itemProperty, true)) {
-                continue;
-            }
-            IFile pomFile = AggregatorPomsHelper.getItemPomFolder(object.getProperty(), object.getVersion())
-                    .getFile(TalendMavenConstants.POM_FILE_NAME);
-
-            String relativePath = pomFile.getParent().getLocation().makeRelativeTo(parentPom.getParent().getLocation())
-                    .toPortableString();
-            if (StringUtils.isNoneBlank(relativePath) && !modules.contains(relativePath)) {
-                relativePathList.add(relativePath);
-            }
-        }
-        Collections.sort(relativePathList);
-        modules.addAll(relativePathList);
-        PomUtil.savePom(null, model, parentPom);
-
-    }
-
     private static IFile getParentModulePomFile(IFile pomFile) {
         IFile parentPom = null;
         if (pomFile == null || pomFile.getParent() == null || pomFile.getParent().getParent() == null) {
@@ -605,10 +538,7 @@ public class AggregatorPomsHelper {
         String jobFolderName = getJobProjectFolderName(property.getLabel(), version);
         ERepositoryObjectType type = ERepositoryObjectType.getItemType(property.getItem());
         IFolder jobFolder = helper.getProcessFolder(type).getFolder(itemRelativePath).getFolder(jobFolderName);
-        List<ERepositoryObjectType> allTypesOfProcess2 = ERepositoryObjectType.getAllTypesOfProcess2();
-        if (allTypesOfProcess2.contains(type)) {
-            createFoldersIfNeeded(jobFolder);
-        }
+        createFoldersIfNeeded(jobFolder);
         return jobFolder;
     }
 

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

@@ -395,24 +395,4 @@ public class BuildCacheManager {
         return false;
     }
 
-    public boolean containsMultipleVersionModules() {
-        return containsMultipleVersionModules(currentJobletmodules) || containsMultipleVersionModules(currentJobmodules);
-    }
-
-    private static boolean containsMultipleVersionModules(Set<String> mods) {
-        Set<String> joblets = new HashSet<String>();
-        for (String mod : mods) {
-            int idx = mod.lastIndexOf('_');
-            if (idx == -1) {
-                continue;
-            }
-            String jobletWithoutVersion = mod.substring(0, idx);
-            if (joblets.contains(jobletWithoutVersion)) {
-                return true;
-            } else {
-                joblets.add(jobletWithoutVersion);
-            }
-        }
-        return false;
-    }
 }

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

@@ -1,119 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2020 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.designer.maven.tools;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.text.ParseException;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-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.exception.PersistenceException;
-import org.talend.core.model.general.Project;
-import org.talend.core.model.properties.Property;
-import org.talend.core.model.repository.ERepositoryObjectType;
-import org.talend.core.model.repository.IRepositoryViewObject;
-import org.talend.core.repository.model.ProxyRepositoryFactory;
-import org.talend.core.runtime.repository.item.ItemProductKeys;
-import org.talend.cwm.helper.ResourceHelper;
-import org.talend.designer.maven.utils.PomIdsHelper;
-
-public class CodeM2CacheManager {
-
-    private static final String KEY_SEPERATOR = "|"; //$NON-NLS-1$
-
-    private static final String EMPTY_DATE;
-
-    static {
-        Calendar c = Calendar.getInstance();
-        c.setTimeInMillis(0);
-        EMPTY_DATE = ResourceHelper.dateFormat().format(c.getTime());
-    }
-
-    public static boolean needUpdateCodeProject(Project project, ERepositoryObjectType codeType) {
-        try {
-            String projectTechName = project.getTechnicalLabel();
-            File cacheFile = getCacheFile(projectTechName, codeType);
-            if (!cacheFile.exists()) {
-                return true;
-            }
-            Properties cache = new Properties();
-            cache.load(new FileInputStream(cacheFile));
-            List<IRepositoryViewObject> allCodes = ProxyRepositoryFactory.getInstance().getAll(project, codeType, false);
-            // check A/D
-            if (allCodes.size() != cache.size()) {
-                return true;
-            }
-            // check M
-            for (IRepositoryViewObject codeItem : allCodes) {
-                Property property = codeItem.getProperty();
-                String key = getKey(projectTechName, property);
-                String cacheValue = cache.getProperty(key);
-                if (cacheValue != null) {
-                    Date currentDate = ResourceHelper.dateFormat().parse(getModifiedDate(projectTechName, property));
-                    Date cachedDate = ResourceHelper.dateFormat().parse(cacheValue);
-                    if (currentDate.compareTo(cachedDate) != 0) {
-                        return true;
-                    }
-                }
-            }
-        } catch (PersistenceException | IOException | ParseException e) {
-            ExceptionHandler.process(e);
-            // if any exception, still update in case breaking build job
-            return true;
-        }
-        return false;
-    }
-
-    public static void updateCodeProjectCache(Project project, ERepositoryObjectType codeType) {
-        String projectTechName = project.getTechnicalLabel();
-        File cacheFile = getCacheFile(projectTechName, codeType);
-        try (OutputStream out = new FileOutputStream(cacheFile)) {
-            List<IRepositoryViewObject> allCodes = ProxyRepositoryFactory.getInstance().getAll(project, codeType, false);
-            Properties cache = new Properties();
-            for (IRepositoryViewObject codeItem : allCodes) {
-                Property property = codeItem.getProperty();
-                String key = getKey(projectTechName, property);
-                String value = getModifiedDate(projectTechName, property);
-                cache.put(key, value);
-            }
-            cache.store(out, StringUtils.EMPTY);
-        } catch (PersistenceException | IOException e) {
-            ExceptionHandler.process(e);
-        }
-    }
-
-    private 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$
-        return new File(MavenPlugin.getMaven().getLocalRepositoryPath(), cacheFileName);
-    }
-
-    private static String getKey(String projectTechName, Property property) {
-        return projectTechName + KEY_SEPERATOR + property.getId() + KEY_SEPERATOR + property.getVersion(); // $NON-NLS-1$
-    }
-
-    private static String getModifiedDate(String projectTechName, Property property) {
-        String modifiedDate = (String) property.getAdditionalProperties().get(ItemProductKeys.DATE.getModifiedKey());
-        return StringUtils.isNotBlank(modifiedDate) ? modifiedDate : EMPTY_DATE;
-    }
-
-}

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

@@ -34,6 +34,7 @@ import org.talend.core.model.properties.ProcessItem;
 import org.talend.core.model.properties.Property;
 import org.talend.core.runtime.process.LastGenerationInfo;
 import org.talend.core.runtime.process.TalendProcessOptionConstants;
+import org.talend.core.service.ITaCoKitDependencyService;
 import org.talend.core.ui.ITestContainerProviderService;
 import org.talend.designer.maven.utils.PomUtil;
 import org.talend.designer.maven.utils.SortableDependency;
@@ -50,9 +51,16 @@ public class ProcessorDependenciesManager {
 
     private final Property property;
 
+    private final ITaCoKitDependencyService tckService;
+
     public ProcessorDependenciesManager(IProcessor processor) {
         this.processor = processor;
         property = processor.getProperty();
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(ITaCoKitDependencyService.class)) {
+            tckService = GlobalServiceRegister.getDefault().getService(ITaCoKitDependencyService.class);
+        } else {
+            tckService = null;
+        }
     }
 
     /**
@@ -61,10 +69,30 @@ public class ProcessorDependenciesManager {
     @SuppressWarnings({ "rawtypes", "unchecked" })
     public boolean updateDependencies(IProgressMonitor progressMonitor, Model model) throws ProcessorException {
         try {
+            Set<ModuleNeeded> jobModules = new HashSet<>();
+            Set<ModuleNeeded> testcaseModules = new HashSet<>();
+            //
+            if (tckService != null && tckService
+                    .hasTaCoKitComponents(tckService.getJobComponents(property.getItem()))) {
+                final Set<String> depsonly = tckService
+                        .getTaCoKitOnlyDependencies(tckService.getJobComponents(property.getItem()));
+                for (ModuleNeeded module : getProcessNeededModules()) {
+                    if (depsonly.stream().noneMatch(dep -> dep.equals(module.getModuleName()))) {
+                        jobModules.add(module);
+                    }
+                }
+                for (ModuleNeeded module : getTestcaseNeededModules(property)) {
+                    if (depsonly.stream().noneMatch(dep -> dep.equals(module.getModuleName()))) {
+                        testcaseModules.add(module);
+                    }
+                }
+            } else {
+                jobModules = getProcessNeededModules();
+                testcaseModules = getTestcaseNeededModules(property);
+            }
+            //
             Set<ModuleNeeded> neededLibraries = new HashSet<>();
             Set<String> uniqueDependencies = new HashSet<>();
-            Set<ModuleNeeded> jobModules = getProcessNeededModules();
-            Set<ModuleNeeded> testcaseModules = getTestcaseNeededModules(property);
             neededLibraries.addAll(jobModules);
             neededLibraries.addAll(testcaseModules);
             if (!neededLibraries.isEmpty()) {

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

@@ -45,7 +45,6 @@ import org.talend.core.model.utils.JavaResourcesHelper;
 import org.talend.core.runtime.maven.MavenArtifact;
 import org.talend.core.runtime.maven.MavenConstants;
 import org.talend.core.runtime.maven.MavenUrlHelper;
-import org.talend.core.runtime.process.LastGenerationInfo;
 import org.talend.core.runtime.process.TalendProcessArgumentConstant;
 import org.talend.core.runtime.projectsetting.IProjectSettingTemplateConstants;
 import org.talend.core.runtime.repository.build.IMavenPomCreator;
@@ -53,7 +52,6 @@ import org.talend.core.ui.ITestContainerProviderService;
 import org.talend.designer.maven.model.TalendMavenConstants;
 import org.talend.designer.maven.template.ETalendMavenVariables;
 import org.talend.designer.maven.tools.ProcessorDependenciesManager;
-import org.talend.designer.maven.utils.JobUtils;
 import org.talend.designer.maven.utils.PomIdsHelper;
 import org.talend.designer.maven.utils.PomUtil;
 import org.talend.designer.runprocess.IBigDataProcessor;
@@ -136,15 +134,9 @@ public abstract class AbstractMavenProcessorPom extends CreateMavenBundleTemplat
 
         Map<ETalendMavenVariables, String> variablesValuesMap = new HashMap<ETalendMavenVariables, String>();
         // no need check property is null or not, because if null, will get default ids.
-        JobInfo lastMainJob = LastGenerationInfo.getInstance().getLastMainJob(); 
-        if (JobUtils.isJob(property) && ProcessUtils.isChildRouteProcess(process) && lastMainJob != null) {
-            variablesValuesMap.put(ETalendMavenVariables.JobGroupId, PomIdsHelper.getJobGroupId(lastMainJob.getProcessor().getProperty()));
-            variablesValuesMap.put(ETalendMavenVariables.JobVersion, PomIdsHelper.getJobVersion(lastMainJob.getProcessor().getProperty()));	    	
-        }else {
-            variablesValuesMap.put(ETalendMavenVariables.JobGroupId, PomIdsHelper.getJobGroupId(property));
-            variablesValuesMap.put(ETalendMavenVariables.JobVersion, PomIdsHelper.getJobVersion(property));	    	
-        }
-        variablesValuesMap.put(ETalendMavenVariables.JobArtifactId, PomIdsHelper.getJobArtifactId(property));	 
+        variablesValuesMap.put(ETalendMavenVariables.JobGroupId, PomIdsHelper.getJobGroupId(property));
+        variablesValuesMap.put(ETalendMavenVariables.JobArtifactId, PomIdsHelper.getJobArtifactId(property));
+        variablesValuesMap.put(ETalendMavenVariables.JobVersion, PomIdsHelper.getJobVersion(property));
         variablesValuesMap.put(ETalendMavenVariables.TalendJobVersion, property.getVersion());
         final String jobName = JavaResourcesHelper.escapeFileName(process.getName());
         variablesValuesMap.put(ETalendMavenVariables.JobName, jobName);
@@ -318,18 +310,10 @@ public abstract class AbstractMavenProcessorPom extends CreateMavenBundleTemplat
                 String type = null;
                 if (!jobInfo.isJoblet()) {
                     property = jobInfo.getProcessItem().getProperty();
+                    groupId = PomIdsHelper.getJobGroupId(property);
                     artifactId = PomIdsHelper.getJobArtifactId(jobInfo);
-                    
-                    JobInfo lastMainJob = LastGenerationInfo.getInstance().getLastMainJob();
-                    if (lastMainJob != null && JobUtils.isJob(jobInfo)) {
-                        groupId = PomIdsHelper.getJobGroupId(lastMainJob.getProcessor().getProperty());
-                        version =  PomIdsHelper.getJobVersion(lastMainJob.getProcessor().getProperty()); 
-                    } else {
-                        groupId = PomIdsHelper.getJobGroupId(property);	
-                        version = PomIdsHelper.getJobVersion(property);
-                    }
 
-                    
+                    version = PomIdsHelper.getJobVersion(property);
                     // try to get the pom version of children job and load from the pom file.
                     String childPomFileName = PomUtil.getPomFileName(jobInfo.getJobName(), jobInfo.getJobVersion());
                     IProject codeProject = getJobProcessor().getCodeProject();

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

@@ -674,17 +674,13 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
         ERepositoryObjectType.getAllTypesOfCodes().forEach(t -> dependencies.addAll(PomUtil.getCodesDependencies(t)));
 
         // libraries of talend/3rd party
-        Set<Dependency> parentJobDependencies = processor.getNeededModules(TalendProcessOptionConstants.MODULES_EXCLUDE_SHADED).stream()
-                .filter(m -> !m.isExcluded()).map(m -> createDenpendency(m, false)).collect(Collectors.toSet());
-        dependencies.addAll(parentJobDependencies);
+        dependencies.addAll(processor.getNeededModules(TalendProcessOptionConstants.MODULES_EXCLUDE_SHADED).stream()
+                .filter(m -> !m.isExcluded()).map(m -> createDenpendency(m, false)).collect(Collectors.toSet()));
 
         // missing modules from the job generation of children
-        Map<String, Set<Dependency>> childjobDependencies = new HashMap<String, Set<Dependency>>();
-        childrenJobInfo.forEach(j -> {
-            Set<Dependency> collectDependency = LastGenerationInfo.getInstance().getModulesNeededPerJob(j.getJobId(), j.getJobVersion()).stream()
-                    .filter(m -> !m.isExcluded()).map(m -> createDenpendency(m, false)).collect(Collectors.toSet());
-            dependencies.addAll(collectDependency);
-            childjobDependencies.put(j.getJobId(), collectDependency);});
+        childrenJobInfo.forEach(j -> dependencies
+                .addAll(LastGenerationInfo.getInstance().getModulesNeededPerJob(j.getJobId(), j.getJobVersion()).stream()
+                        .filter(m -> !m.isExcluded()).map(m -> createDenpendency(m, false)).collect(Collectors.toSet())));
 
         Set<ModuleNeeded> modules = new HashSet<>();
         // testcase modules from current job (optional)
@@ -753,7 +749,7 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
             setupDependencySetNode(document, jobCoordinate, "${talend.job.name}",
                     "${artifact.build.finalName}.${artifact.extension}", true, false);
             // add duplicate dependencies if exists
-            setupFileNode(document, parentJobDependencies, childjobDependencies, duplicateLibs);
+            setupFileNode(document, duplicateLibs.values().stream().flatMap(s -> s.stream()).collect(Collectors.toSet()));
 
             PomUtil.saveAssemblyFile(assemblyFile, document);
         } catch (Exception e) {
@@ -890,18 +886,15 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
 
     }
 
-    private void setupFileNode(Document document, Set<Dependency> parentJobDependencies, Map<String, Set<Dependency>> childJobDependencies, Map<String, Set<Dependency>> duplicateLibs) throws CoreException {
+    private void setupFileNode(Document document, Set<Dependency> duplicateDependencies) throws CoreException {
         Node filesNode = document.getElementsByTagName("files").item(0);
         // TESB-27614:NPE while building a route
         if (filesNode == null) {
             return;
         }
-        
-        Set<Dependency> duplicateDependencies = duplicateLibs.values().stream().flatMap(s -> s.stream()).collect(Collectors.toSet());
         if (duplicateDependencies.isEmpty()) {
             return;
         }
-        
         IMaven maven = MavenPlugin.getMaven();
         ArtifactRepository repository = maven.getLocalRepository();
         boolean isDIJob = ERepositoryObjectType.getItemType(getJobProcessor().getProperty().getItem()) == ERepositoryObjectType.PROCESS;
@@ -913,13 +906,10 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
                     dependency.getVersion(), dependency.getType(), dependency.getClassifier());
             Path path = new File(repository.getBasedir()).toPath().resolve(sourceLocation);
             sourceLocation = path.toString();
-            
-            boolean latestVersionOrLowerVersionInChildJob = isLatestVersionOrLowerVersionInChildJob(parentJobDependencies, childJobDependencies, duplicateLibs, dependency);
-            if (isDIJob && !latestVersionOrLowerVersionInChildJob && !new File(sourceLocation).exists()) {
+            if (isDIJob && !new File(sourceLocation).exists()) {
                 CommonExceptionHandler.warn("Job dependency [" + sourceLocation + "] does not exist!");
                 continue;
             }
-            
             String destName = path.getFileName().toString();
             Node fileNode = document.createElement("file");
             filesNode.appendChild(fileNode);
@@ -936,49 +926,8 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
             destNameNode.setTextContent(destName);
             fileNode.appendChild(destNameNode);
         }
-
     }
 
-    protected boolean isLatestVersionOrLowerVersionInChildJob(Set<Dependency> parentJobDependencies,
-            Map<String, Set<Dependency>> childJobDependencies, Map<String, Set<Dependency>> duplicateLibs,
-            Dependency dependency) {
-        String coordinate = getCheckDupCoordinate(dependency);
-        Set<Dependency> dependencies = duplicateLibs.get(coordinate);
-        if (dependencies.size() == 1) {
-            return true; // latest version
-        }
-        
-        boolean latest = false;
-        if (parentJobDependencies.contains(dependency)) {
-            // keep if it's latest version in parent job
-            latest = isTheLatest(dependency, coordinate, parentJobDependencies);
-            if(!latest) {//check if it's the latest in any child job
-                latest = isLatestInAnyChild(dependency, coordinate, childJobDependencies);
-            }
-        } else {//only check if it's the latest in any child job
-            latest = isLatestInAnyChild(dependency, coordinate, childJobDependencies);
-        }
-        
-        
-        return latest;
-    }
-
-    private boolean isLatestInAnyChild(Dependency dependency, String coordinate,
-            Map<String, Set<Dependency>> childJobDependencies) {
-        return childJobDependencies.entrySet().stream().filter(entry -> entry.getValue().contains(dependency))
-                .anyMatch(entry -> isTheLatest(dependency, coordinate, entry.getValue()));
-    }
-
-    private boolean isTheLatest(Dependency dependency, String coordinate, Set<Dependency> targetSet) {
-        Optional<Dependency> latest = targetSet.stream().filter(d -> getCheckDupCoordinate(d).equals(coordinate))
-                .sorted((d1, d2) -> compareVersion(d2, d1)).findFirst();
-        return latest.isPresent() && dependency.equals(latest.get());
-    }
-
-    private int compareVersion(Dependency dependency, Dependency targetDependency) {
-        return new ComparableVersion(dependency.getVersion()).compareTo(new ComparableVersion(targetDependency.getVersion()));
-    }
-    
     protected Plugin addSkipDockerMavenPlugin() {
         Plugin plugin = new Plugin();
 

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

@@ -24,8 +24,6 @@ import org.talend.core.model.process.JobInfo;
 import org.talend.core.model.process.ProcessUtils;
 import org.talend.core.model.properties.Item;
 import org.talend.core.model.properties.ProcessItem;
-import org.talend.core.model.properties.Property;
-import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.model.utils.JavaResourcesHelper;
 import org.talend.core.runtime.CoreRuntimePlugin;
@@ -99,29 +97,5 @@ public class JobUtils {
         }
         return clonedJobInfos;
     }
-    
-    public static boolean isRoute(Property p) {
-        if (p != null) {
-            return ERepositoryObjectType.getType(p).equals(ERepositoryObjectType.PROCESS_ROUTE);
-        }
-        return false;
-    }
 
-    public static boolean isJob(JobInfo job) {
-        if (job != null && job.getProcessItem() != null) {
-            Property p = job.getProcessItem().getProperty();
-            if (p != null) {
-            	return isJob(p);
-            }
-        }
-        return false;
-    }
-
-    public static boolean isJob(Property p) {
-        if (p != null) {
-            return ERepositoryObjectType.getType(p).equals(ERepositoryObjectType.PROCESS);
-        }
-        return false;
-    }
-    
 }

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

@@ -98,7 +98,12 @@ public class MavenProjectUtils {
             IRunProcessService service = (IRunProcessService) GlobalServiceRegister.getDefault().getDefault()
                     .getService(IRunProcessService.class);
 
-            changeClasspath(monitor, project, MavenSystemFolders.ALL_DIRS_EXT);
+            if (service.isdebug()) {
+                changeClasspath(monitor, project, MavenSystemFolders.ALL_DIRS_EXT);
+            } else {
+
+                changeClasspath(monitor, project);
+            }
         }
 
         // only need this when pom has no parent.

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

@@ -20,7 +20,6 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.talend.commons.utils.VersionUtils;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IESBService;
-import org.talend.core.PluginChecker;
 import org.talend.core.model.general.Project;
 import org.talend.core.model.process.JobInfo;
 import org.talend.core.model.properties.Property;
@@ -347,9 +346,7 @@ public class PomIdsHelper {
             if (!preferenceManager.exist()
                     && StringUtils.isBlank(preferenceStore.getString(MavenConstants.EXCLUDE_DELETED_ITEMS))) {
                 // for new project, set EXCLUDE_DELETED_ITEMS=true as default
-                if (PluginChecker.isTIS()) {
-                    preferenceStore.setValue(MavenConstants.EXCLUDE_DELETED_ITEMS, true);
-                }
+                preferenceStore.setValue(MavenConstants.EXCLUDE_DELETED_ITEMS, true);
             }
             preferenceManager.save();
             preferenceManagers.put(projectTechName, preferenceManager);

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

@@ -64,6 +64,7 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.jobs.ISchedulingRule;
+import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.core.runtime.jobs.MultiRule;
 import org.eclipse.m2e.core.MavenPlugin;
 import org.eclipse.m2e.core.embedder.MavenModelManager;
@@ -72,7 +73,6 @@ import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.runtime.utils.io.IOUtils;
 import org.talend.commons.utils.VersionUtils;
 import org.talend.commons.utils.generation.JavaUtils;
-import org.talend.commons.utils.io.FilesUtils;
 import org.talend.commons.utils.workbench.resources.ResourceUtils;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.ILibraryManagerService;
@@ -583,7 +583,7 @@ public class PomUtil {
             IProject fsProject = ResourceUtils.getProject(project);
             IFolder tmpFolder = fsProject.getFolder("temp");
             if (!tmpFolder.exists()) {
-                FilesUtils.executeFolderAction(monitor, fsProject, new IWorkspaceRunnable() {
+                executeFolderAction(monitor, fsProject, new IWorkspaceRunnable() {
 
                     @Override
                     public void run(IProgressMonitor monitor) throws CoreException {
@@ -595,7 +595,7 @@ public class PomUtil {
             createTempFile.delete();
             String tmpFolderName = createTempFile.getName();
             IFolder folder = tmpFolder.getFolder(tmpFolderName);
-            FilesUtils.executeFolderAction(monitor, tmpFolder, new IWorkspaceRunnable() {
+            executeFolderAction(monitor, tmpFolder, new IWorkspaceRunnable() {
 
                 @Override
                 public void run(IProgressMonitor monitor) throws CoreException {
@@ -604,7 +604,7 @@ public class PomUtil {
             });
             IFile pomFile = folder.getFile(TalendMavenConstants.POM_FILE_NAME);
 
-            FilesUtils.executeFolderAction(monitor, folder, new IWorkspaceRunnable() {
+            executeFolderAction(monitor, folder, new IWorkspaceRunnable() {
 
                 @Override
                 public void run(IProgressMonitor monitor) throws CoreException {
@@ -622,6 +622,35 @@ public class PomUtil {
         return null;
     }
 
+    private static void executeFolderAction(IProgressMonitor monitor, IResource parentFolder, IWorkspaceRunnable run)
+            throws CoreException {
+        if (Job.getJobManager().currentRule() == null) {
+            IWorkspace workspace = ResourcesPlugin.getWorkspace();
+            ISchedulingRule defaultRule = workspace.getRuleFactory().modifyRule(parentFolder);
+            ISchedulingRule noBlockRule = new ISchedulingRule() {
+
+                @Override
+                public boolean isConflicting(ISchedulingRule rule) {
+                    return this.contains(rule);
+                }
+
+                @Override
+                public boolean contains(ISchedulingRule rule) {
+                    if (this.equals(rule)) {
+                        return true;
+                    }
+                    if (defaultRule.contains(rule)) {
+                        return true;
+                    }
+                    return false;
+                }
+            };
+            workspace.run(run, noBlockRule, IWorkspace.AVOID_UPDATE, monitor);
+        } else {
+            run.run(monitor);
+        }
+    }
+
     private static Model createModel(MavenArtifact artifact) {
         Model pomModel = new Model();
         pomModel.setModelVersion(TalendMavenConstants.POM_VERSION);

main/plugins/org.talend.libraries.jdbc.postgresql/.classpath

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

main/plugins/org.talend.libraries.jdbc.postgresql/.project

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.talend.libraries.jdbc.postgresql</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

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

@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Postgresql Plug-in
+Bundle-SymbolicName: org.talend.libraries.jdbc.postgresql
+Bundle-Version: 7.3.1.qualifier
+Bundle-Vendor: .Talend SA.
+Eclipse-BundleShape: dir

main/plugins/org.talend.libraries.jdbc.postgresql/META-INF/eclipse.inf

@@ -0,0 +1 @@
+jarprocessor.exclude.children=true