chore(TPS-4452): Add release note

PATCH_RELEASE_NOTE.md

@@ -0,0 +1,73 @@
+---
+version: 7.3.1
+module: https://talend.poolparty.biz/coretaxonomy/42
+product:
+- https://talend.poolparty.biz/coretaxonomy/23
+---
+
+# TPS-4452
+
+| Info             | Value |
+| ---------------- | ---------------- |
+| Patch Name       | Patch\_20201005\_TPS-4452\_v1-7.3.1 |
+| Release Date     | 2020-10-05 |
+| Target Version   | 20200219\_1130-V7.3.1 |
+| Product affected | Talend Studio |
+
+## Introduction
+
+This is a self-contained patch.
+
+**NOTE**: For information on how to obtain this patch, reach out to your Support contact at Talend.
+
+## Fixed issues
+
+This patch contains the following fixes:
+
+- TPS-4452 [7.3.1] Job fails with Stream closed exception when executed on Job server (TDI-44962)
+
+## Prerequisites
+
+Consider the following requirements for your system:
+
+- Talend Studio 7.3.1 with 7.3.1-R2020-09 patch must be installed.
+
+
+## Installation
+
+### Installing the patch using Software update
+
+1) Logon TAC and switch to Configuration->Software Update, then enter the correct values and save referring to the documentation: https://help.talend.com/reader/f7Em9WV_cPm2RRywucSN0Q/j9x5iXV~vyxMlUafnDejaQ
+
+2) Switch to Software update page, where the new patch will be listed. The patch can be downloaded from here into the nexus repository.
+
+3) On Studio Side: Logon Studio with remote mode, on the logon page the Update button is displayed: click this button to install the patch.
+
+### Installing the patch using Talend Studio
+
+1) Create a folder named "patches" under your studio installer directory and copy the patch .zip file to this folder.
+
+2) Restart your studio: a window pops up, then click OK to install the patch, or restart the commandline and the patch will be installed automatically.
+
+### Installing the patch using Commandline
+
+Execute the following commands:
+
+1. Talend-Studio-win-x86_64.exe -nosplash -application org.talend.commandline.CommandLine -consoleLog -data commandline-workspace startServer -p 8002 --talendDebug
+2. initRemote {tac_url} -ul {TAC login username} -up {TAC login password}
+3. checkAndUpdate -tu {TAC login username} -tup {TAC login password}
+
+## Uninstallation
+Backup the Affected files list below. Uninstall the patch by restore the backup files.
+
+## Affected files for this patch
+
+The following files are installed by this patch:
+
+- {Talend\_Studio\_path}/plugins/org.talend.librariesmanager\_7.3.1.20200924\_0610-patch/resources/java/routines/system/ResumeUtil.java
+- {Talend\_Studio\_path}/plugins/org.talend.librariesmanager\_7.3.1.20200924\_0610-patch/routines/system/ResumeUtil$JobLogItem.class
+- {Talend\_Studio\_path}/plugins/org.talend.librariesmanager\_7.3.1.20200924\_0610-patch/routines/system/ResumeUtil$LogPriority.class
+- {Talend\_Studio\_path}/plugins/org.talend.librariesmanager\_7.3.1.20200924\_0610-patch/routines/system/ResumeUtil$ResumeCommonInfo.class
+- {Talend\_Studio\_path}/plugins/org.talend.librariesmanager\_7.3.1.20200924\_0610-patch/routines/system/ResumeUtil$ResumeEventType.class
+- {Talend\_Studio\_path}/plugins/org.talend.librariesmanager\_7.3.1.20200924\_0610-patch/routines/system/ResumeUtil$SimpleCsvWriter.class
+- {Talend\_Studio\_path}/plugins/org.talend.librariesmanager\_7.3.1.20200924\_0610-patch/routines/system/ResumeUtil.class

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.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/image/ECoreImage.java

@@ -166,7 +166,6 @@ public enum ECoreImage implements IImage {
     RECYCLE_BIN_OVERLAY("/icons1/recycle_bin_overlay.gif"), //$NON-NLS-1$
     DELETED_OVERLAY("/icons1/deleted_overlay.gif"), //$NON-NLS-1$
     IMPORT_JAR("/icons1/importjar.gif"), //$NON-NLS-1$
-    SHARE_LIBS("/icons1/share.png"), //$NON-NLS-1$
     REFERENCED_ICON("/icons1/referenced.png"), //$NON-NLS-1$
 
     CDC_ADDED_OVERLAY("/icons1/cdc_added_overlay.png"), //$NON-NLS-1$

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

@@ -16,8 +16,6 @@ import org.eclipse.core.internal.runtime.InternalPlatform;
 import org.eclipse.core.runtime.Platform;
 import org.osgi.framework.BundleContext;
 
-
-
 /**
  *
  * DOC root class global comment. Detailled comment <br/>
@@ -54,9 +52,5 @@ public class WindowSystem {
     public static boolean isOSX() {
         return Platform.WS_CARBON.equals(ws) || Platform.WS_COCOA.equals(ws);
     }
-    
-    public static boolean isBigSurOrLater () {
-    	return isOSX() && ("10.16".compareTo(System.getProperty("os.version","0")) <= 0);
-    }
 
 }

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/database/SAPHanaDataBaseMetadata.java

@@ -148,7 +148,7 @@ public class SAPHanaDataBaseMetadata extends FakeDatabaseMetaData {
         }
 
         // For Calculation View
-        if (ArrayUtils.contains(neededTypes, NEEDED_TYPES[3]) && "_SYS_BIC".equalsIgnoreCase(schemaPattern)) { //$NON-NLS-1$
+        if (ArrayUtils.contains(neededTypes, NEEDED_TYPES[3])) {
             // check if the type is contained is in the types needed.
             String sqlcv = "SELECT OBJECT_NAME,PACKAGE_ID FROM _SYS_REPO.ACTIVE_OBJECT WHERE OBJECT_SUFFIX = 'calculationview'"; //$NON-NLS-1$
             if (tableNamePattern != null && !tableNamePattern.equals("%")) { //$NON-NLS-1$
@@ -171,7 +171,7 @@ public class SAPHanaDataBaseMetadata extends FakeDatabaseMetaData {
                         packageId = packageId.trim();
                     }
                     String name = packageId + "/" + objectName; //$NON-NLS-1$
-                    String[] r = new String[] { "", schemaPattern, name, NEEDED_TYPES[3], "", packageId }; //$NON-NLS-1$ //$NON-NLS-2$
+                    String[] r = new String[] { "", "_SYS_BIC", name, NEEDED_TYPES[3], "", packageId }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                     listcv.add(r);
                 }
             } catch (SQLException e) {
@@ -355,16 +355,4 @@ public class SAPHanaDataBaseMetadata extends FakeDatabaseMetaData {
         tableResultSet.setData(list);
         return tableResultSet;
     }
-
-    @Override
-    public String getDatabaseProductName() throws SQLException {
-        return this.connection.getMetaData().getDatabaseProductName();
-
-    }
-
-    @Override
-    public String getDatabaseProductVersion() throws SQLException {
-        return this.connection.getMetaData().getDatabaseProductVersion();
-    }
-
 }

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/time/PerformanceStatisticUtil.java

@@ -18,8 +18,7 @@ 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.text.DecimalFormat;
 import java.util.Properties;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
@@ -37,6 +36,8 @@ import org.talend.commons.exception.CommonExceptionHandler;
  */
 public class PerformanceStatisticUtil {
 
+    private static final DecimalFormat DF = new DecimalFormat("###.##");
+
     private static final int MEGABYTE = 1024 * 1024;// MB = 1024*1024 byte
 
     private static final int KILOBYTE = 1024;// kb=1024 byte
@@ -249,8 +250,8 @@ public class PerformanceStatisticUtil {
         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));
+        props.setProperty(StatisticKeys.IO_W_AVERAGE_MB_SEC.get(), "" + DF.format(digital_ioWAverageMbSec));
+        props.setProperty(StatisticKeys.IO_W_MB_SEC.get(), "" + DF.format(digital_ioWMbSec));
     }
 
     private static long writeIO(int numOfBlocks, BlockSequence blockSequence, int blockSize, File testFile) {
@@ -323,15 +324,11 @@ public class PerformanceStatisticUtil {
         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_R_AVERAGE_MB_SEC.get(), "" + DF.format(digital_ioRAverageMbSec));
+        props.setProperty(StatisticKeys.IO_R_MB_SEC.get(), "" + DF.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;
 

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

@@ -28,7 +28,7 @@ public class TimeMeasurePerformance extends TimeMeasure{
 
     private static int indent = 0;
     
-    public static void begin(String idTimer, String description) {
+    public static void begin(String idTimer) {
         startTime = System.nanoTime();
         
         init();
@@ -38,12 +38,7 @@ public class TimeMeasurePerformance extends TimeMeasure{
             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$
+            log(indent(indent) + "Start '" + idTimer + "' ..."); //$NON-NLS-1$  //$NON-NLS-2$
         }
     }
     

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/drawing/background/BackgroundRefresher.java

@@ -240,11 +240,7 @@ public class BackgroundRefresher implements IBackgroundRefresher {
 
             gc.dispose();
 
-            if (WindowSystem.isBigSurOrLater()) {
-                drawableComposite.refreshBgDrawableCompsite(newImage);
-            } else {
-                drawableComposite.getBgDrawableComposite().setBackgroundImage(newImage);
-            }
+            drawableComposite.getBgDrawableComposite().setBackgroundImage(newImage);
 
             clearImage(oldImage);
             oldImage = newImage;

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/drawing/background/IBgDrawableComposite.java

@@ -13,7 +13,6 @@
 package org.talend.commons.ui.swt.drawing.background;
 
 import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Composite;
 
@@ -29,8 +28,6 @@ public interface IBgDrawableComposite {
 
     public Composite getBgDrawableComposite();
 
-    public void refreshBgDrawableCompsite(Image image);
-
     public void setOffset(Point offsetPoint);
 
     public Point getOffset();

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/formtools/LabelledText.java

@@ -26,7 +26,6 @@ import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Text;
-import org.talend.commons.ui.runtime.ws.WindowSystem;
 
 /**
  * Create a Label and a Text.
@@ -154,14 +153,7 @@ public class LabelledText {
         });
         GridDataFactory.swtDefaults().applyTo(label);
 
-        // For Big Sur, to avoid the password autofill dialog.
-        if (WindowSystem.isBigSurOrLater() && ((styleField & SWT.PASSWORD) != 0)) {
-            styleField ^= SWT.PASSWORD;
-            text = new Text(composite, styleField);
-            text.setEchoChar('*');
-        } else {
-            text = new Text(composite, styleField);
-        }
+        text = new Text(composite, styleField);
         text.selectAll(); // enable fast erase use
         int gridDataStyle = SWT.NONE;
         if (isFill) {

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/linking/BgDrawableComposite.java

@@ -12,12 +12,7 @@
 // ============================================================================
 package org.talend.commons.ui.swt.linking;
 
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
 import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Composite;
 import org.talend.commons.ui.swt.drawing.background.IBgDrawableComposite;
@@ -33,8 +28,6 @@ public abstract class BgDrawableComposite implements IBgDrawableComposite {
     private Composite commonParent;
 
     private Point offsetPoint = new Point(0, 0);
-    
-    private Image backgroundImage;
 
     /**
      * DOC amaumont DrawableBackground constructor comment.
@@ -43,36 +36,9 @@ public abstract class BgDrawableComposite implements IBgDrawableComposite {
      */
     public BgDrawableComposite(Composite commonParent) {
         this.commonParent = commonParent;
-        this.commonParent.addPaintListener(new PaintListener() {
-
-            @Override
-            public void paintControl(PaintEvent arg0) {
-                if (backgroundImage != null) {
-                    arg0.gc.drawImage(backgroundImage, 0, 0);
-                }
-            }
-        });
-        this.commonParent.addDisposeListener(new DisposeListener() {
-
-            @Override
-            public void widgetDisposed(DisposeEvent arg0) {
-                if (backgroundImage != null && !backgroundImage.isDisposed()) {
-                    backgroundImage.dispose();
-                }
-            }
-        });
     }
 
-    @Override
-    public void refreshBgDrawableCompsite(Image image) {
-        if (backgroundImage != null) {
-            backgroundImage.dispose();
-        }
-        backgroundImage = image;
-        this.commonParent.redraw();
-    }
-
-	/*
+    /*
      * (non-Javadoc)
      *
      * @see org.talend.commons.ui.swt.drawing.background.IDrawableComposite#drawBackground(org.eclipse.swt.graphics.GC)

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/linking/TreeToTablesLinker.java

@@ -15,7 +15,6 @@ package org.talend.commons.ui.swt.linking;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -78,8 +77,6 @@ public class TreeToTablesLinker<D1, D2> extends BgDrawableComposite implements I
 
     private List<LinkableTable> linkableTableList;
 
-    private HashMap<Table, Point> tableToCommonPointMap = new HashMap<Table, Point>();
-
     /**
      * DOC amaumont TreeToTableLinker constructor comment.
      *
@@ -261,34 +258,8 @@ public class TreeToTablesLinker<D1, D2> extends BgDrawableComposite implements I
 
             Point offset = getOffset();
 
-            if (WindowSystem.isBigSurOrLater()) {
-                if (yStraight < tree.getBounds().y + treeItemHeight) {
-                    yStraight = tree.getBounds().y + treeItemHeight;
-                }
-                if (yStraight > tree.getBounds().height + tree.getBounds().y + treeItemHeight) {
-                    yStraight = tree.getBounds().height + tree.getBounds().y + treeItemHeight;
-                }
-                pointEndStraight = new Point(treeToCommonPoint.x + tree.getClientArea().width, yStraight);
-                if (tableToCommonPointMap.get(table) == null) {
-                    tableToCommonPointMap.put(table, display.map(table, getBgDrawableComposite(), new Point(0, 0)));
-                }
-                // scroll issue for table
-                if (tableToCommonPoint.y != tableToCommonPointMap.get(table).y) {
-                    pointEndCentralCurve.y = tableToCommonPoint.y + tableItemBounds.y 
-                            + table.getItemHeight() / 2;
-                }
-                if (pointEndCentralCurve.y < tableToCommonPointMap.get(table).y) {
-                    pointEndCentralCurve.y = tableToCommonPointMap.get(table).y;
-                }
-                if (pointEndCentralCurve.y > tableToCommonPointMap.get(table).y + tableBounds.height - table.getBorderWidth()
-                        - table.getHeaderHeight()) {
-                    pointEndCentralCurve.y = tableToCommonPointMap.get(table).y + tableBounds.height - table.getBorderWidth()
-                            - table.getHeaderHeight();
-                }
-            } else {
-                gc.drawLine(pointStartStraight.x + offset.x, pointStartStraight.y + offset.y, pointEndStraight.x + offset.x,
-                        pointEndStraight.y + offset.y);
-            }
+            gc.drawLine(pointStartStraight.x + offset.x, pointStartStraight.y + offset.y, pointEndStraight.x + offset.x,
+                    pointEndStraight.y + offset.y);
 
             pointEndStraight.x += offset.x;
             pointEndStraight.y += offset.y;

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/constants/FileConstants.java

@@ -109,8 +109,4 @@ public interface FileConstants {
 
     String SPRING_FOLDER_NAME = "META-INF/spring"; //$NON-NLS-1$
 
-    String TALEND_FOLDER_NAME = "TALEND-INF"; //$NON-NLS-1$
-
-    String MAVEN_FOLDER_NAME = "MAVEN-INF";
-
 }

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

@@ -132,10 +132,8 @@ 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.runtime.util.SharedStudioUtils;
 import org.talend.core.service.ICoreUIService;
 import org.talend.core.service.IUpdateService;
 import org.talend.cwm.helper.SubItemHelper;
@@ -1800,12 +1798,9 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * @throws PersistenceException
      */
     private void emptyTempFolder(Project project) throws PersistenceException {
-    	try {
-            String str = SharedStudioUtils.getTempFolderPath().toPortableString();
-            FilesUtils.deleteFolder(new File(str), false);
-    	}catch (Exception ex) {
-    		ExceptionHandler.process(ex);
-    	}
+        String str = (System.getProperty("eclipse.home.location") + "temp").substring(5);
+        FilesUtils.deleteFolder(new File(str), false);
+
         long start = System.currentTimeMillis();
         IProject fsProject = ResourceUtils.getProject(project);
         IFolder folder = ResourceUtils.getFolder(fsProject, RepositoryConstants.TEMP_DIRECTORY, false);
@@ -2094,7 +2089,7 @@ 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$
+            TimeMeasurePerformance.begin("logOnProject"); //$NON-NLS-1$
             try {
                 /**
                  * init/check proxy selector, in case default proxy selector is not registed yet
@@ -2145,20 +2140,6 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
 
                 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);
 
@@ -2205,14 +2186,6 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                     TimeMeasurePerformance.step("logOnProject", "Sync components libraries"); //$NON-NLS-1$
                 }
 
-                try {
-                    // for new added mapping file, sync to project mapping folder
-                    MetadataTalendType.syncNewMappingFileToProject();
-                } catch (SystemException e) {
-                    // ignore
-                    ExceptionHandler.process(e);
-                }
-
                 currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
                 currentMonitor.beginTask("Execute before logon migrations tasks", 1); //$NON-NLS-1$
                 ProjectManager.getInstance().getMigrationRecords().clear();
@@ -2314,6 +2287,8 @@ 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);

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

@@ -205,27 +205,6 @@ public class StandaloneConnectionContextUtils {
             cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HIVE_ADDITIONAL_JDBC_SETTINGS,
                     getOriginalValue(contextProperties, additionalJDBCSettings));
 
-            String dataprocProjectId = cloneConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HIVE_GOOGLE_PROJECT_ID);
-            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HIVE_GOOGLE_PROJECT_ID,
-                    getOriginalValue(contextProperties, dataprocProjectId));
-
-            String dataprocClusterId = cloneConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HIVE_GOOGLE_CLUSTER_ID);
-            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HIVE_GOOGLE_CLUSTER_ID,
-                    getOriginalValue(contextProperties, dataprocClusterId));
-
-            String dataprocRegion = cloneConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HIVE_GOOGLE_REGION);
-            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HIVE_GOOGLE_REGION,
-                    getOriginalValue(contextProperties, dataprocRegion));
-
-            String dataprocJarsBucket = cloneConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HIVE_GOOGLE_JARS_BUCKET);
-            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HIVE_GOOGLE_JARS_BUCKET,
-                    getOriginalValue(contextProperties, dataprocJarsBucket));
-
-            String dataprocPathToCredentials = cloneConn.getParameters()
-                    .get(ConnParameterKeys.CONN_PARA_KEY_HIVE_AUTHENTICATION_PATH_TO_GOOGLE_CREDENTIALS);
-            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HIVE_AUTHENTICATION_PATH_TO_GOOGLE_CREDENTIALS,
-                    getOriginalValue(contextProperties, dataprocPathToCredentials));
-
             String hiveEnableHa = cloneConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HIVE_ENABLE_HA);
             cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HIVE_ENABLE_HA,
                     getOriginalValue(contextProperties, hiveEnableHa));

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

@@ -122,8 +122,7 @@ Require-Bundle: org.eclipse.jdt.core,
  org.talend.components.api,
  org.apache.servicemix.bundles.avro,
  jackson-core-asl,
- org.talend.libraries.jackson,
- org.talend.libraries.apache.common
+ org.talend.libraries.jackson
 Bundle-Activator: org.talend.core.runtime.CoreRuntimePlugin
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,

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/IESBService.java

@@ -94,6 +94,4 @@ public interface IESBService extends IService {
      * @return
      */
     public IProcessor createOSGIJavaProcessor(IProcess process, Property property, boolean filenameFromLabel);
-    
-    public boolean isSOAPServiceProvider(Item item);
 }

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

@@ -126,8 +126,6 @@ public class PluginChecker {
 
     public static final String BDEE_PLUGIN_ID = "org.talend.designer.bigdata"; //$NON-NLS-1$
 
-    public static final String BD_ROUTINE_PLUGIN_ID = "org.talend.designer.routines.bigdata"; //$NON-NLS-1$
-
     public static final String DOCKER_PLUGIN_ID = "org.talend.designer.docker"; //$NON-NLS-1$
 
     public static final String HELP_DI_EE_PLUGIN_ID = "org.talend.help.dataprep"; //$NON-NLS-1$
@@ -366,10 +364,6 @@ public class PluginChecker {
         return isPluginLoaded(ESBSE_PLUGIN_ID);
     }
 
-    public static boolean isBigdataRoutineLoaded() {
-        return isPluginLoaded(BD_ROUTINE_PLUGIN_ID);
-    }
-
     public static String getBundlePath(String bundleName) {
         String bundlePath = ""; //$NON-NLS-1$
         Bundle refBundle = Platform.getBundle(bundleName);

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

@@ -163,18 +163,6 @@ public class ConnParameterKeys {
 
     public static final String CONN_PARA_KEY_HIVE_AUTHENTICATION_MAPRTICKET_DURATION = "CONN_PARA_KEY_HIVE_AUTHENTICATION_MAPRTICKET_DURATION";//$NON-NLS-1$
 
-    public static final String CONN_PARA_KEY_HIVE_GOOGLE_PROJECT_ID = "CONN_PARA_KEY_HIVE_GOOGLE_PROJECT_ID";//$NON-NLS-1$
-
-    public static final String CONN_PARA_KEY_HIVE_GOOGLE_CLUSTER_ID = "CONN_PARA_KEY_HIVE_GOOGLE_CLUSTER_ID";//$NON-NLS-1$
-
-    public static final String CONN_PARA_KEY_HIVE_GOOGLE_REGION = "CONN_PARA_KEY_HIVE_GOOGLE_REGION";//$NON-NLS-1$
-
-    public static final String CONN_PARA_KEY_HIVE_GOOGLE_JARS_BUCKET = "CONN_PARA_KEY_HIVE_GOOGLE_JARS_BUCKET";//$NON-NLS-1$
-
-    public static final String CONN_PARA_KEY_HIVE_AUTHENTICATION_DEFINE_PATH_TO_GOOGLE_CREDENTIALS = "CONN_PARA_KEY_HIVE_AUTHENTICATION_DEFINE_PATH_TO_GOOGLE_CREDENTIALS";//$NON-NLS-1$
-
-    public static final String CONN_PARA_KEY_HIVE_AUTHENTICATION_PATH_TO_GOOGLE_CREDENTIALS = "CONN_PARA_KEY_HIVE_AUTHENTICATION_PATH_TO_GOOGLE_CREDENTIALS";//$NON-NLS-1$
-
     /**
      * The key is for metastore server.
      */

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

@@ -58,7 +58,7 @@ public enum EDatabaseVersion4Drivers {
     HSQLDB_SERVER(new DbVersion4Drivers(EDatabaseTypeName.HSQLDB_SERVER, "hsqldb.jar")), //$NON-NLS-1$
     HSQLDB_WEBSERVER(new DbVersion4Drivers(EDatabaseTypeName.HSQLDB_WEBSERVER, "hsqldb.jar")), //$NON-NLS-1$
 
-    H2(new DbVersion4Drivers(EDatabaseTypeName.H2, "h2-1.4.198.jar")), //$NON-NLS-1$
+    H2(new DbVersion4Drivers(EDatabaseTypeName.H2, "h2-1.3.160.jar")), //$NON-NLS-1$
 
     //
     JAVADB_EMBEDED(new DbVersion4Drivers(EDatabaseTypeName.JAVADB_EMBEDED, "derby.jar")), //$NON-NLS-1$
@@ -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$

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

@@ -20,8 +20,6 @@ package org.talend.core.hadoop;
 public class HadoopConstants {
 
     public static final String SPARK_LOCAL_MODE = "SPARK_LOCAL_MODE";
-    
-    public static final String SPARK_LOCAL_VERSION = "SPARK_LOCAL_VERSION";
 
     public static final String SPARK_MODE = "SPARK_MODE";
 

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

@@ -72,7 +72,7 @@ public class ContextUtils {
             "static", "void", "class", "finally", "long", "strictfp", "volatile", "const", "float", "native", "super", "while")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
 
     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]+"));
+           "resource_directory_[\\w]+", "connection_[a-zA-Z0-9]+_[\\w]"));
     
 
     /**
@@ -594,7 +594,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;
             }
 

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/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;
@@ -134,14 +133,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/designerproperties/ComponentToRepositoryProperty.java

@@ -31,7 +31,6 @@ 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;
@@ -156,17 +155,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,18 +368,19 @@ 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);
+                    if (!node.getComponent().getDisplayName().equals(node.getComponent().getName())) {
+                        // 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)) {
+                                    connection.setProductId(database);
+                                }
                             }
-                        }
 
+                        }
                     }
 
                 }

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));
         }
@@ -1769,38 +1766,6 @@ public class RepositoryToComponentProperty {
         if ("IMPALA_DRIVER".equals(value)) {
             return connection.getParameters().get(ConnParameterKeys.IMPALA_DRIVER);
         }
-
-        if (value.equals("GOOGLE_PROJECT_ID")) {
-            String projectId = connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HIVE_GOOGLE_PROJECT_ID);
-            return getAppropriateValue(connection, projectId);
-        }
-
-        if (value.equals("GOOGLE_CLUSTER_ID")) {
-            String clusterId = connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HIVE_GOOGLE_CLUSTER_ID);
-            return getAppropriateValue(connection, clusterId);
-        }
-
-        if (value.equals("GOOGLE_REGION")) {
-            String region = connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HIVE_GOOGLE_REGION);
-            return getAppropriateValue(connection, region);
-        }
-
-        if (value.equals("GOOGLE_JARS_BUCKET")) {
-            String jarsBucket = connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HIVE_GOOGLE_JARS_BUCKET);
-            return getAppropriateValue(connection, jarsBucket);
-        }
-
-        if (value.equals("DEFINE_PATH_TO_GOOGLE_CREDENTIALS")) {
-            String usePathToCredentials = connection.getParameters()
-                    .get(ConnParameterKeys.CONN_PARA_KEY_HIVE_AUTHENTICATION_DEFINE_PATH_TO_GOOGLE_CREDENTIALS);
-            return Boolean.parseBoolean(usePathToCredentials);
-        }
-
-        if (value.equals("PATH_TO_GOOGLE_CREDENTIALS")) {
-            String pathToCredentials = connection.getParameters()
-                    .get(ConnParameterKeys.CONN_PARA_KEY_HIVE_AUTHENTICATION_PATH_TO_GOOGLE_CREDENTIALS);
-            return getAppropriateValue(connection, pathToCredentials);
-        }
         return null;
     }
 

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/IElementParameter.java

@@ -232,6 +232,4 @@ public interface IElementParameter {
     public boolean isSerialized();
 
     public void setSerialized(boolean isSerialized);
-
-    public boolean isSelectedFromItemValue();
 }

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

@@ -131,6 +131,4 @@ public interface IProcess extends IElement {
     public void checkStartNodes();
 
     public String getComponentsType();
-
-    public INode getNodeByUniqueName(String uniqueName);
 }

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

@@ -21,7 +21,6 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
-import org.eclipse.emf.common.util.EList;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.utils.VersionUtils;
@@ -54,7 +53,6 @@ import org.talend.core.utils.BitwiseOptionUtils;
 import org.talend.designer.core.IDesignerCoreService;
 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.ElementParameterType;
 import org.talend.designer.core.model.utils.emf.talendfile.MetadataType;
 import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
 import org.talend.designer.core.model.utils.emf.talendfile.ProcessType;
@@ -62,7 +60,6 @@ import org.talend.designer.core.model.utils.emf.talendfile.RoutinesParameterType
 import org.talend.designer.runprocess.ItemCacheManager;
 import org.talend.repository.ProjectManager;
 import org.talend.repository.model.IProxyRepositoryFactory;
-import org.apache.commons.text.StringEscapeUtils;
 
 /**
  * DOC bqian class global comment. Detailled comment
@@ -1006,49 +1003,4 @@ public final class ProcessUtils {
         }
         return false;
     }
-
-    public static boolean isChildRouteProcess(IProcess process) {
-        if (process != null)   {
-            for (INode node : process.getGraphicalNodes()) {
-                if ((node.getComponent().getName() != null) && 
-                        (node.getComponent().getName().compareTo("tRouteInput") == 0)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-	public static String escapeJava(String input) {
-        return StringEscapeUtils.escapeJava(input);
-    }
-
-    public static boolean hasJettyEndpoint(ProcessType process) {
-
-		EList<NodeType> nodesList = process.getNode();
-
-		boolean hasJettyEndpoint = hasJettyEndpoint(nodesList);
-
-		return hasJettyEndpoint;
-	}
-
-	private static boolean hasJettyEndpoint(EList<NodeType> nodesList) {
-		for (NodeType node : nodesList) {
-			if ("cMessagingEndpoint".equals(node.getComponentName())) {
-				for (Object elementParameter : node.getElementParameter()) {
-					ElementParameterType elementParameterType = (ElementParameterType)elementParameter;
-
-					String name = elementParameterType.getName();
-					String value = elementParameterType.getValue();
-
-					if ("URI".equals(name) && (value != null && StringUtils.startsWith(value.trim(), "\"jetty:"))) {
-						return true;
-					}
-				}
-			}
-		}
-
-		return false;
-	}
-
 }

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

@@ -963,7 +963,7 @@ public class RelationshipItemBuilder {
 	        
 	        Map<Relation, Set<Relation>> itemRelations = getRelatedRelations(item);
 	        
-	        Set<Relation> repositoryNode = (Set<Relation>) itemRelations.getOrDefault(relation,  new HashSet<Relation>());
+	        Set<Relation> repositoryNode = (Set<Relation>) itemRelations.get(relation);
 	        
 	        for (Relation rel : repositoryNode) {
 	        	if (rel.getType().equals("Beans")) {

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/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/nexus/TalendLibsServerManager.java

@@ -231,12 +231,7 @@ public class TalendLibsServerManager {
         return canConnect;
     }
 
-    public boolean isProxyArtifactRepoConfigured() {
-        ArtifactRepositoryBean serverBean = getProxyArtifactServer();
-        return serverBean == null ? false : true;
-    }
-
-    public ArtifactRepositoryBean getProxyArtifactServer() {
+    public ArtifactRepositoryBean getTalentArtifactServer() {
         ArtifactRepositoryBean serverBean = new ArtifactRepositoryBean();
         // get from ini file first
         String url = System.getProperty(NEXUS_PROXY_URL);
@@ -260,16 +255,9 @@ public class TalendLibsServerManager {
                 serverBean.setType(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_TYPE));
             }
         }
-        if (StringUtils.isNotEmpty(serverBean.getServer())) {
-            return serverBean;
-        }
-        return null;
-    }
-
-    public ArtifactRepositoryBean getTalentArtifactServer() {
-        ArtifactRepositoryBean serverBean = getProxyArtifactServer();
-        if (serverBean == null) {
-            serverBean = new ArtifactRepositoryBean();
+        hasProxySetting = StringUtils.isNotEmpty(serverBean.getServer());
+        // use default
+        if (!hasProxySetting) {
             serverBean.setServer(TALEND_LIB_SERVER);
             serverBean.setUserName(TALEND_LIB_USER);
             serverBean.setPassword(TALEND_LIB_PASSWORD);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/prefs/ITalendCorePrefConstants.java

@@ -208,8 +208,4 @@ public interface ITalendCorePrefConstants {
 
     public static final int ARTIFACT_PROXY_SETTING = 1;
 
-    public static final String NEXUS_SHARE_LIBS = "NEXUS_SHARE_LIBS";
-
-    public static final boolean NEXUS_SHARE_LIBS_DEFAULT = false;
-
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/hd/IHDistribution.java

@@ -30,7 +30,5 @@ public interface IHDistribution {
     IHDistributionVersion getHDVersion(String v, boolean byDisplay);
 
     boolean useCustom();
-    
-    boolean isSparkLocal();
 
 }

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

@@ -46,8 +46,6 @@ public interface MavenConstants {
 
     static final String EXCLUDE_DELETED_ITEMS = "EXCLUDE_DELETED_ITEMS";
 
-    static final String SKIP_FOLDERS = "SKIP_FOLDERS";
-
     /*
      * for lib
      */

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/TalendProcessArgumentConstant.java

@@ -51,8 +51,6 @@ public interface TalendProcessArgumentConstant {
     static final String ARG_NEED_XMLMAPPINGS = "NEED_XMLMAPPINGS";
 
     static final String ARG_NEED_RULES = "NEED_RULES";
-    
-    static final String ARG_NEED_JETTY_SERVER = "NEED_JETTY_SERVER";
 
     static final String ARG_ENABLE_WATCH = "ENABLE_WATCH";
 

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

@@ -20,7 +20,6 @@ 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;
@@ -150,18 +149,13 @@ public interface IGenericWizardService extends IService {
      */
     public ITreeContextualAction getDefaultAction(RepositoryNode node);
 
-    public void loadAdditionalJDBC();
-
-    public List<String> getAllAdditionalJDBCTypes();
+    public void initAdditionalJDBCRepositoryObjType();
 
     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,171 +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.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-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;
-import org.talend.utils.string.DigestUtil;
-
-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 isNeedCleanOnSharedMode() {
-        if (SharedStudioUtils.isSharedStudioMode()) {
-            boolean isNeedClean = installedPatch();
-            String studioArtifactsFileSha256Hex = getStudioArtifactsFileSha256Hex();
-            if (updateArtifactsFileSha256Hex(studioArtifactsFileSha256Hex)) {
-                isNeedClean = true;
-            }
-            return isNeedClean;
-        }
-        return false;
-    }
-    
-    public static boolean updateArtifactsFileSha256Hex(String studioArtifactsFileSha256Hex) {
-        if (GlobalServiceRegister.getDefault().isServiceRegistered(IUpdateService.class)) {
-            IUpdateService updateService = GlobalServiceRegister.getDefault().getService(IUpdateService.class);
-            try {
-                return updateService.updateArtifactsFileSha256Hex(new NullProgressMonitor(), studioArtifactsFileSha256Hex);
-            } catch (Exception e) {
-                ExceptionHandler.process(e);
-            }
-        }
-        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;
-	}
-	
-	public static IPath getTempFolderPath() {
-		if (SharedStudioUtils.isSharedStudioMode()) {
-			Path wsPath = new Path(Platform.getInstanceLocation().getURL().getPath());
-			return wsPath.append("temp");
-		} else {
-			return new Path(System.getProperty("user.dir")).append("temp");
-		}
-	}
-	
-    public static String getStudioArtifactsFileSha256Hex() {
-        File studioArtifactsFile = new File(Platform.getInstallLocation().getURL().getPath(), "artifacts.xml");//$NON-NLS-1$
-        if (studioArtifactsFile.exists()) {
-            InputStream inputStream = null;
-            try {
-                inputStream = new FileInputStream(studioArtifactsFile);
-                return DigestUtil.sha256Hex(inputStream);
-            } catch (FileNotFoundException e) {
-                ExceptionHandler.process(e);
-            } catch (IOException e) {
-                ExceptionHandler.process(e);
-            } finally {
-                if (inputStream != null) {
-                    try {
-                        inputStream.close();
-                    } catch (IOException ex) {
-                        ExceptionHandler.process(ex);
-                    }
-                }
-            }
-        }
-        return "";
-    }
-}

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

@@ -38,12 +38,4 @@ public interface IDQComponentService extends IService {
      * @param node The node which need to be modified
      */
     void correctlyCustomMatcherParameter(NodeType node);
-
-    /**
-     * Change the attribute of MatchingData and use Integer value instead of double value.
-     * 
-     * @param node The node which need to be modified
-     */
-    void covertConfindWeight2Int(NodeType node);
-
 }

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

@@ -17,11 +17,9 @@ import java.nio.file.Path;
 import java.util.Set;
 import java.util.stream.Stream;
 
-import org.eclipse.swt.graphics.Image;
 import org.talend.core.IService;
 import org.talend.core.model.components.IComponent;
 import org.talend.core.model.properties.Item;
-import org.talend.core.model.repository.ERepositoryObjectType;
 
 /**
  * For documentation, see implementation in org.talend.sdk.component.studio-integration plugin
@@ -35,6 +33,4 @@ public interface ITaCoKitDependencyService extends IService {
     Stream<IComponent> getJobComponents(Item item);
 
     Path findM2Path();
-
-    Image getTaCoKitImageByRepositoryType(ERepositoryObjectType repObjType);
 }

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

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

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/repository/ProjectManager.java

@@ -20,7 +20,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import java.util.WeakHashMap;
 
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.core.resources.IFile;
@@ -95,8 +94,6 @@ public final class ProjectManager {
 
     private Set<Project> tempProjects;
 
-    private WeakHashMap<IRepositoryViewObject, Boolean> cachedObjects = new WeakHashMap<IRepositoryViewObject, Boolean>();
-
     private ProjectManager() {
         beforeLogonRecords = new HashSet<String>();
         logonRecords = new HashSet<String>();
@@ -454,15 +451,9 @@ public final class ProjectManager {
                     if (object == null) {
                         return true;
                     }
-                    if (cachedObjects.containsKey(object)) {
-                        return cachedObjects.get(object);
-                    }
-
                     org.talend.core.model.properties.Project emfProject = getProject(object.getProperty().getItem());
                     org.talend.core.model.properties.Project curProject = curP.getEmfProject();
-                    boolean ret = emfProject.equals(curProject);
-                    cachedObjects.put(object, ret);
-                    return ret;
+                    return emfProject.equals(curProject);
 
                 } else {
                     IProjectRepositoryNode root = node.getRoot();
@@ -615,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;
@@ -659,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/IRepositoryService.java

@@ -24,7 +24,6 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IEditorPart;
 import org.talend.core.IService;
 import org.talend.core.model.components.IComponentsFactory;
-import org.talend.core.model.general.ModuleNeeded;
 import org.talend.core.model.general.Project;
 import org.talend.core.model.metadata.builder.connection.DatabaseConnection;
 import org.talend.core.model.process.IContextManager;
@@ -126,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);
 
@@ -145,8 +135,4 @@ public interface IRepositoryService extends IService {
 
     public void setShouldCheckRepoViewCommonNavigatorDirty(IRepositoryView repView, boolean shouldFlag);
 
-    boolean isProjectLevelLog4j2();
-
-    List<ModuleNeeded> getLog4j2Modules();
-
 }

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/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/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/preference/I18nPreferencePage.java

@@ -40,7 +40,6 @@ import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 import org.eclipse.ui.PlatformUI;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
-import org.talend.commons.ui.runtime.update.PreferenceKeys;
 import org.talend.commons.ui.runtime.utils.ZipFileUtils;
 import org.talend.commons.ui.swt.advanced.dataeditor.LabelFieldEditor;
 import org.talend.commons.ui.utils.workbench.preferences.OneLineComboFieldEditor;
@@ -541,7 +540,6 @@ public abstract class I18nPreferencePage extends FieldEditorPreferencePage imple
         boolean ok = super.performOk();
         saveLanguageType();
         CorePlugin.getDefault().savePluginPreferences();
-        PlatformUI.getPreferenceStore().setValue(PreferenceKeys.NEED_OSGI_CLEAN, true);
         if (isBabiliButtonClicked) {
             refreshAll();
         }
@@ -559,13 +557,6 @@ public abstract class I18nPreferencePage extends FieldEditorPreferencePage imple
     protected void performApply() {
         saveLanguageType();
         CorePlugin.getDefault().savePluginPreferences();
-        PlatformUI.getPreferenceStore().setValue(PreferenceKeys.NEED_OSGI_CLEAN, true);
-    }
-
-    @Override
-    protected void performDefaults() {
-        super.performDefaults();
-        PlatformUI.getPreferenceStore().setValue(PreferenceKeys.NEED_OSGI_CLEAN, true);
     }
 
     /**

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/properties/tab/HorizontalTabFactory.java

@@ -102,9 +102,7 @@ public class HorizontalTabFactory {
      * @param descriptors
      */
     public void setInput(List<TalendPropertyTabDescriptor> descriptors) {
-        if (tabbedPropertyViewer != null && tabbedPropertyViewer.getControl() != null && !tabbedPropertyViewer.getControl().isDisposed()) {
-            tabbedPropertyViewer.setInput(descriptors);
-        }
+        tabbedPropertyViewer.setInput(descriptors);
     }
 
     public List<TalendPropertyTabDescriptor> getInput() {

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/CorePlugin.java

@@ -12,7 +12,6 @@
 // ============================================================================
 package org.talend.core;
 
-import org.apache.logging.log4j.message.ThreadDumpMessage;
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.eclipse.jface.preference.IPreferenceStore;
@@ -209,8 +208,4 @@ public class CorePlugin extends Plugin {
         return (ICreateXtextProcessService) GlobalServiceRegister.getDefault().getService(ICreateXtextProcessService.class);
     }
 
-    public static String threadDump(String message) {
-        return new ThreadDumpMessage(message).toString();
-    }
-
 }

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

@@ -13,7 +13,6 @@
 package org.talend.core.model.metadata.query.generator;
 
 import org.talend.core.database.EDatabaseTypeName;
-import org.talend.core.model.metadata.QueryUtil;
 import org.talend.core.model.metadata.query.AbstractQueryGenerator;
 import org.talend.core.model.process.IElement;
 
@@ -39,23 +38,4 @@ public class PostgreQueryGenerator extends AbstractQueryGenerator {
         }
         return super.getSchema(elem);
     }
-
-    @Override
-    protected String getTableNameWithDBAndSchema(final String dbName, final String schema, String tableName) {
-        if (tableName == null || EMPTY.equals(tableName.trim())) {
-            tableName = QueryUtil.DEFAULT_TABLE_NAME;
-        }
-
-        final StringBuffer tableNameWithDBAndSchema = new StringBuffer();
-
-        // postgres do not support db.schema.table_name, so only need schema.table_name
-        if (schema != null && !EMPTY.equals(schema)) {
-            tableNameWithDBAndSchema.append(checkContextAndAddQuote(schema));
-            tableNameWithDBAndSchema.append(getSQLFieldConnector());
-        }
-        //
-        tableNameWithDBAndSchema.append(checkContextAndAddQuote(tableName));
-
-        return tableNameWithDBAndSchema.toString();
-    }
 }

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

@@ -1046,10 +1046,4 @@ public class ObjectElementParameter implements IElementParameter {
     public void setSerialized(boolean isSerialized) {
         // TODO Auto-generated method stub
     }
-
-    @Override
-    public boolean isSelectedFromItemValue() {
-        // TODO Auto-generated method stub
-        return false;
-    }
 }

main/plugins/org.talend.core/src/main/java/org/talend/core/prefs/CorePreferenceInitializer.java

@@ -16,13 +16,13 @@ import java.io.File;
 import java.util.Locale;
 
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import org.eclipse.core.runtime.preferences.DefaultScope;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.talend.core.CorePlugin;
 import org.talend.core.prefs.GeneralParametersProvider.GeneralParameters;
-import org.talend.core.runtime.util.SharedStudioUtils;
 
 /**
  * Intializer of core preferences. <br/>
@@ -54,7 +54,7 @@ public class CorePreferenceInitializer extends AbstractPreferenceInitializer {
         IEclipsePreferences node = new DefaultScope().getNode(CorePlugin.getDefault().getBundle().getSymbolicName());
 
         // Building temporary files directory path
-        IPath tempPath = SharedStudioUtils.getTempFolderPath();
+        IPath tempPath = new Path(System.getProperty("user.dir")).append("temp"); // NON-NLS-1$// NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-2$
         File tempFile = tempPath.toFile();
         if (!tempFile.exists()) {
             tempFile.mkdirs();

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

@@ -30,7 +30,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.jar.JarEntry;
 import java.util.jar.JarOutputStream;
-import java.util.stream.Collectors;
 
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
@@ -60,7 +59,6 @@ import org.talend.commons.exception.CommonExceptionHandler;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.runtime.model.repository.ERepositoryStatus;
-import org.talend.commons.runtime.utils.io.FileCopyUtils;
 import org.talend.commons.utils.PasswordEncryptUtil;
 import org.talend.commons.utils.generation.JavaUtils;
 import org.talend.commons.utils.time.TimeMeasure;
@@ -622,7 +620,7 @@ public class ProcessorUtilities {
          */
         generateBuildInfo(jobInfo, progressMonitor, isMainJob, currentProcess, currentJobName, processor, option);
 
-        copyDependenciedResources(currentProcess, progressMonitor);
+        copyDependenciedResources(currentProcess);
 
         return processor;
     }
@@ -1012,8 +1010,7 @@ public class ProcessorUtilities {
                         checkedContext = checkCleanSecureContextParameterValue(checkedContext, jobInfo);
                         processor.setContext(checkedContext); // generate current context.
                     } else {
-                        IContext checkedContext = checkCleanSecureContextParameterValue(context, jobInfo);
-                        processor.setContext(checkedContext);
+                        processor.setContext(context);
                     }
                     LastGenerationInfo.getInstance().getContextPerJob(jobInfo.getJobId(), jobInfo.getJobVersion()).add(
                             context.getName());
@@ -1085,8 +1082,8 @@ public class ProcessorUtilities {
     }
 	
     private static IContext checkCleanSecureContextParameterValue(IContext currentContext, JobInfo jobInfo) {
-        
-        JobInfo job = null;
+        
+        JobInfo job = null;
         
         if (jobInfo.getFatherJobInfo() == null) {
         	job = jobInfo;
@@ -1098,10 +1095,10 @@ public class ProcessorUtilities {
         		return currentContext;
         	}
         }
-        
-        if (job.getArgumentsMap() == null
-            || job.getArgumentsMap().get(TalendProcessArgumentConstant.ARG_CLEAR_PASSWORD_CONTEXT_PARAMETERS) == null 
-                || !Boolean.parseBoolean((ProcessUtils.getOptionValue(job.getArgumentsMap(), TalendProcessArgumentConstant.ARG_CLEAR_PASSWORD_CONTEXT_PARAMETERS,
+        
+        if (job.getArgumentsMap() == null
+            || job.getArgumentsMap().get(TalendProcessArgumentConstant.ARG_CLEAR_PASSWORD_CONTEXT_PARAMETERS) == null 
+                || !Boolean.parseBoolean((ProcessUtils.getOptionValue(job.getArgumentsMap(), TalendProcessArgumentConstant.ARG_CLEAR_PASSWORD_CONTEXT_PARAMETERS,
                     (String) null)))) {
             return currentContext;
         }
@@ -1372,7 +1369,7 @@ public class ProcessorUtilities {
             generateBuildInfo(jobInfo, progressMonitor, isMainJob, currentProcess, currentJobName, processor, option);
             TimeMeasure.step(idTimer, "generateBuildInfo");
 
-            copyDependenciedResources(currentProcess, progressMonitor);
+            copyDependenciedResources(currentProcess);
 
             return processor;
         } finally {
@@ -1385,40 +1382,7 @@ public class ProcessorUtilities {
         }
     }
 
-    private static void syncContextResourcesForParentJob(IProcess currentProcess, IProgressMonitor progressMonitor) {
-        ITalendProcessJavaProject processJavaProject = mainJobInfo.getProcessor().getTalendJavaProject();
-
-        final IFolder mainResourcesFolder = processJavaProject.getExternalResourcesFolder();
-        final File targetFolder = mainResourcesFolder.getLocation().toFile();
-
-        final Set<JobInfo> dependenciesItems = mainJobInfo.getProcessor().getBuildChildrenJobs();
-
-        final IRunProcessService runProcessService = (IRunProcessService) GlobalServiceRegister.getDefault().getService(
-                IRunProcessService.class);
-
-        List<ProcessItem> dependenciesItemsFiltered = dependenciesItems.stream().filter(jobInfo -> !jobInfo.isJoblet())
-                .map(JobInfo::getProcessItem).collect(Collectors.toList());
-        
-        if (dependenciesItemsFiltered.size() > 0) {
-            dependenciesItemsFiltered.forEach(item -> {
-                ITalendProcessJavaProject childJavaProject = runProcessService.getTalendJobJavaProject(item.getProperty());
-                if (childJavaProject != null) {
-                    final IFolder childResourcesFolder = childJavaProject.getExternalResourcesFolder();
-                    if (childResourcesFolder.exists()) {
-                        FileCopyUtils.syncFolder(childResourcesFolder.getLocation().toFile(), targetFolder, false);
-                    }
-                }
-            });
-
-            try {
-                mainResourcesFolder.refreshLocal(IResource.DEPTH_INFINITE, progressMonitor);
-            } catch (CoreException e) {
-                ExceptionHandler.process(e);
-            }
-        }
-    }
-
-	private static Set<ModuleNeeded> getAllJobTestcaseModules(ProcessItem selectedProcessItem) {
+    private static Set<ModuleNeeded> getAllJobTestcaseModules(ProcessItem selectedProcessItem) {
         Set<ModuleNeeded> neededLibraries = new HashSet<>();
         if (GlobalServiceRegister.getDefault().isServiceRegistered(ITestContainerProviderService.class)) {
             ITestContainerProviderService testcontainerService =
@@ -1552,7 +1516,7 @@ public class ProcessorUtilities {
      *
      * @param currentProcess
      */
-    private static void copyDependenciedResources(IProcess currentProcess, IProgressMonitor progressMonitor) {
+    private static void copyDependenciedResources(IProcess currentProcess) {
         if (!(currentProcess instanceof IProcess2)) {
             return;
         }
@@ -1609,7 +1573,6 @@ public class ProcessorUtilities {
                 }
             }
         }
-        syncContextResourcesForParentJob(currentProcess, progressMonitor);
     }
 
     /**

main/plugins/org.talend.designer.maven.aether/src/main/java/org/talend/designer/maven/aether/util/MavenLibraryResolverProvider.java

@@ -126,16 +126,16 @@ public class MavenLibraryResolverProvider {
 
     }
 
-    public ArtifactResult resolveArtifact(MavenArtifact artifact, boolean is4Parent) throws Exception {
+    public ArtifactResult resolveArtifact(MavenArtifact aritfact, boolean is4Parent) throws Exception {
         ArtifactRequest artifactRequest = new ArtifactRequest();
-        RemoteRepository remoteRepo = getRemoteRepositroy(artifact);
+        RemoteRepository remoteRepo = getRemoteRepositroy(aritfact);
         artifactRequest.addRepository(remoteRepo);
         if (is4Parent) {
             artifactRequest.addRepository(dynamicRemoteRepository);
         }
-        // Classifier must not be specified if type is pom
-        artifactRequest.setArtifact(new DefaultArtifact(artifact.getGroupId(), artifact.getArtifactId(), "pom".equals(artifact.getType()) ? "" : artifact.getClassifier(),
-                artifact.getType(), artifact.getVersion()));
+        Artifact artifact = new DefaultArtifact(aritfact.getGroupId(), aritfact.getArtifactId(), aritfact.getClassifier(),
+                aritfact.getType(), aritfact.getVersion());
+        artifactRequest.setArtifact(artifact);
         ArtifactResult result = null;
         if (is4Parent) {
             result = dynamicRepoSystem.resolveArtifact(dynamicRepoSystemSession, artifactRequest);

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

@@ -135,12 +135,6 @@
 			<groupId>org.talend.components</groupId>
 			<artifactId>components-marketo-runtime</artifactId>
 			<version>${components.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.glassfish.jaxb</groupId>
-					<artifactId>txw2</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.components</groupId>

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.17.1</tacokit.components.version>
+		<tacokit.components.version>1.13.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.29.1</tcomp.version>
+        <tcomp.version>1.1.25</tcomp.version>
         <slf4j.version>1.7.25</slf4j.version>
     </properties>
     

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

@@ -14,5 +14,4 @@ AbstractPersistentProjectSettingPage.syncAllPoms=Do you want to update all poms?
 MavenProjectSettingPage.filterExampleMessage=Filter examples:\nlabel=myJob       \t\t\t\t=> Generate only the job named "myJob"\n!(label=myJob)    \t\t\t\t=> Generate any job except the one named "myJob"\n(path=folder1/folder2)  \t\t\t=> Generate any job in the folder "folder1/folder2"\n(path=folder1/folder2)or(label=myJob)\t=> Generate any job in the folder "folder1/folder2" or named "myJob"\n(label=myJob)and(version=0.2)	\t=> Generate only the job named "myJob" with version 0.2\n!((label=myJob)and(version=0.1))	\t=> Generate every jobs except the "myJob" version 0.1
 MavenProjectSettingPage.refModuleText=Set reference project modules in profile
 MavenProjectSettingPage.excludeDeletedItems=Exclude deleted items
-MavenProjectSettingPage.syncAllPomsWarning=Click the Force full re-synchronize poms button to apply the new settings.
-MavenProjectSettingPage.skipFolders=Skip folders
+MavenProjectSettingPage.syncAllPomsWarning=Click the Force full re-synchronize poms button to apply the new settings.

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

@@ -55,8 +55,6 @@ public class MavenProjectSettingPage extends AbstractProjectSettingPage {
 
     private Button excludeDeletedItemsCheckbox;
 
-    private Button skipFoldersCheckbox;
-
 	public MavenProjectSettingPage() {
 		noDefaultAndApplyButton();
 	}
@@ -113,17 +111,6 @@ public class MavenProjectSettingPage extends AbstractProjectSettingPage {
             }
         });
 
-        skipFoldersCheckbox = new Button(parent, SWT.CHECK);
-        skipFoldersCheckbox.setText(Messages.getString("MavenProjectSettingPage.skipFolders")); //$NON-NLS-1$
-        skipFoldersCheckbox.setSelection(preferenceStore.getBoolean(MavenConstants.SKIP_FOLDERS));
-        skipFoldersCheckbox.addSelectionListener(new SelectionAdapter() {
-
-            @Override
-            public void widgetSelected(SelectionEvent e) {
-                addSyncWarning();
-            }
-        });
-
         filterText.setText(filter);
 		filterText.addModifyListener(new ModifyListener() {
 
@@ -182,7 +169,6 @@ public class MavenProjectSettingPage extends AbstractProjectSettingPage {
             preferenceStore.setValue(MavenConstants.POM_FILTER, getRealVersionFilter(filter));
             preferenceStore.setValue(MavenConstants.USE_PROFILE_MODULE, useProfileModuleCheckbox.getSelection());
             preferenceStore.setValue(MavenConstants.EXCLUDE_DELETED_ITEMS, excludeDeletedItemsCheckbox.getSelection());
-            preferenceStore.setValue(MavenConstants.SKIP_FOLDERS, skipFoldersCheckbox.getSelection());
 		}
 		return ok;
 	}

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

@@ -52,7 +52,6 @@ import org.eclipse.swt.widgets.Display;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.core.GlobalServiceRegister;
-import org.talend.core.IESBService;
 import org.talend.core.ILibraryManagerService;
 import org.talend.core.context.Context;
 import org.talend.core.context.RepositoryContext;
@@ -169,10 +168,6 @@ public class AggregatorPomsHelper {
     }
 
     public void updateCodeProjects(IProgressMonitor monitor, boolean forceBuild) {
-        updateCodeProjects(monitor, forceBuild, false);
-    }
-
-    public void updateCodeProjects(IProgressMonitor monitor, boolean forceBuild, boolean ignoreM2Cache) {
         RepositoryWorkUnit workUnit = new RepositoryWorkUnit<Object>("update code project") { //$NON-NLS-1$
 
             @Override
@@ -180,11 +175,8 @@ public class AggregatorPomsHelper {
                 Project currentProject = ProjectManager.getInstance().getCurrentProject();
                 for (ERepositoryObjectType codeType : ERepositoryObjectType.getAllTypesOfCodes()) {
                     try {
-                        ITalendProcessJavaProject codeProject = getCodesProject(codeType);
-                        if (ERepositoryObjectType.ROUTINES == codeType) {
-                            PomUtil.checkExistingLog4j2Dependencies4RoutinePom(projectTechName, codeProject.getProjectPom());
-                        }
-                        if (ignoreM2Cache || CodeM2CacheManager.needUpdateCodeProject(currentProject, codeType)) {
+                        if (CodeM2CacheManager.needUpdateCodeProject(currentProject, codeType)) {
+                            ITalendProcessJavaProject codeProject = getCodesProject(codeType);
                             updateCodeProjectPom(monitor, codeType, codeProject.getProjectPom());
                             buildAndInstallCodesProject(monitor, codeType, true, forceBuild);
                             CodeM2CacheManager.updateCodeProjectCache(currentProject, codeType);
@@ -352,9 +344,14 @@ 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) {
-            if (isSOAPServiceProvider(property)) {
-                return false;
+            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)) {
@@ -607,12 +604,7 @@ public class AggregatorPomsHelper {
         String version = realVersion == null ? property.getVersion() : realVersion;
         String jobFolderName = getJobProjectFolderName(property.getLabel(), version);
         ERepositoryObjectType type = ERepositoryObjectType.getItemType(property.getItem());
-        IFolder jobFolder = null;
-        if (PomIdsHelper.skipFolders()) {
-            jobFolder = helper.getProcessFolder(type).getFolder(jobFolderName);
-        } else {
-            jobFolder = helper.getProcessFolder(type).getFolder(itemRelativePath).getFolder(jobFolderName);
-        }
+        IFolder jobFolder = helper.getProcessFolder(type).getFolder(itemRelativePath).getFolder(jobFolderName);
         List<ERepositoryObjectType> allTypesOfProcess2 = ERepositoryObjectType.getAllTypesOfProcess2();
         if (allTypesOfProcess2.contains(type)) {
             createFoldersIfNeeded(jobFolder);
@@ -868,7 +860,7 @@ public class AggregatorPomsHelper {
         }
         // codes pom
         monitor.subTask("Synchronize code poms"); //$NON-NLS-1$
-        updateCodeProjects(monitor, true, true);
+        updateCodeProjects(monitor, true);
         monitor.worked(1);
         if (monitor.isCanceled()) {
             return;
@@ -904,7 +896,7 @@ public class AggregatorPomsHelper {
                     }
                     IFile pomFile = getItemPomFolder(item.getProperty()).getFile(TalendMavenConstants.POM_FILE_NAME);
                     // filter esb data service node
-                    if (!isSOAPServiceProvider(object.getProperty()) && pomFile.exists()) {
+                    if (!isDataServiceOperation(object.getProperty()) && pomFile.exists()) {
                         modules.add(getModulePath(pomFile));
                     }
                 }
@@ -945,7 +937,7 @@ public class AggregatorPomsHelper {
      * @param property
      * @return
      */
-    private static boolean isSOAPServiceProvider(Property property) {
+    private boolean isDataServiceOperation(Property property) {
         if (property != null) {
             List<Relation> relations = RelationshipItemBuilder.getInstance().getItemsRelatedTo(property.getId(),
                     property.getVersion(), RelationshipItemBuilder.JOB_RELATION);
@@ -954,14 +946,6 @@ public class AggregatorPomsHelper {
                     return true;
                 }
             }
-            if (GlobalServiceRegister.getDefault().isServiceRegistered(IESBService.class)) {
-                IESBService service = GlobalServiceRegister.getDefault().getService(IESBService.class);
-                if (service != null) {
-                    if (service.isSOAPServiceProvider(property.getItem())) {
-                        return true;
-                    }
-                }
-            }
         }
         return false;
     }

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

@@ -18,7 +18,6 @@ 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;
@@ -40,14 +39,6 @@ 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();
@@ -65,11 +56,11 @@ public class CodeM2CacheManager {
             // 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);
+                String key = getCacheKey(projectTechName, property);
+                String cachedTimestamp = cache.getProperty(key);
+                if (cachedTimestamp != null) {
+                    Date currentDate = ResourceHelper.dateFormat().parse(getCacheDate(projectTechName, property));
+                    Date cachedDate = ResourceHelper.dateFormat().parse(cachedTimestamp);
                     if (currentDate.compareTo(cachedDate) != 0) {
                         return true;
                     }
@@ -91,8 +82,8 @@ public class CodeM2CacheManager {
             Properties cache = new Properties();
             for (IRepositoryViewObject codeItem : allCodes) {
                 Property property = codeItem.getProperty();
-                String key = getKey(projectTechName, property);
-                String value = getModifiedDate(projectTechName, property);
+                String key = getCacheKey(projectTechName, property);
+                String value = getCacheDate(projectTechName, property);
                 cache.put(key, value);
             }
             cache.store(out, StringUtils.EMPTY);
@@ -101,19 +92,18 @@ public class CodeM2CacheManager {
         }
     }
 
-    public static File getCacheFile(String projectTechName, ERepositoryObjectType codeType) {
+    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) {
+    private static String getCacheKey(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;
+    private static String getCacheDate(String projectTechName, Property property) {
+        return (String) property.getAdditionalProperties().get(ItemProductKeys.DATE.getModifiedKey());
     }
 
 }

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

@@ -118,8 +118,6 @@ public abstract class AbstractMavenCodesTemplatePom extends AbstractMavenGeneral
                 }
                 if (isDeployed) {
                     dependency = PomUtil.createModuleDependency(module.getMavenUri());
-                    if (module.isExcluded())
-                        dependency.setScope("provided");
                 }
                 if (dependency != null) {
                     existedDependencies.add(dependency);

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

@@ -12,7 +12,6 @@
 // ============================================================================
 package org.talend.designer.maven.tools.creator;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -46,14 +45,13 @@ 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;
 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);
@@ -284,11 +276,6 @@ public abstract class AbstractMavenProcessorPom extends CreateMavenBundleTemplat
     }
 
     protected void addCodesDependencies(final List<Dependency> dependencies) {
-        dependencies.addAll(getCodesDependencies());
-    }
-
-    protected List<Dependency> getCodesDependencies() {
-        List<Dependency> dependencies = new ArrayList<Dependency>();
         String projectTechName = ProjectManager.getInstance().getProject(getJobProcessor().getProperty()).getTechnicalLabel();
         String codeVersion = PomIdsHelper.getCodesVersion(projectTechName);
 
@@ -305,7 +292,6 @@ public abstract class AbstractMavenProcessorPom extends CreateMavenBundleTemplat
             Dependency beansDependency = PomUtil.createDependency(beansGroupId, beansArtifactId, codeVersion, null);
             dependencies.add(beansDependency);
         }
-        return dependencies;
     }
 
     protected void addChildrenDependencies(final List<Dependency> dependencies) {
@@ -324,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) && JobUtils.isRoute(getJobProcessor().getProperty())) {
-                        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

@@ -668,25 +668,19 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
 
         List<Dependency> dependencies = new ArrayList<>();
         // codes
-        List<Dependency> codeDependencies = getCodesDependencies();
-        dependencies.addAll(codeDependencies);
+        addCodesDependencies(dependencies);
 
         // codes dependencies (optional)
         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)
@@ -707,7 +701,7 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
                     || _3rdLibCoordinate.contains(coordinate)) {
                 return;
             }
-            if (MavenConstants.DEFAULT_LIB_GROUP_ID.equals(groupId) || codeDependencies.contains(d)) {
+            if (MavenConstants.DEFAULT_LIB_GROUP_ID.equals(groupId) || groupId.startsWith(projectGroupId)) {
                 if (!optional) {
                     talendLibCoordinate.add(coordinate);
                 }
@@ -755,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) {
@@ -763,7 +757,6 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
         }
     }
 
-
     // remove duplicate job dependencies and only keep the latest one
     // keep high priority dependencies if set by tLibraryLoad
     // FIXME not used now since tacokit component use specific dependency version. so we must include all job dependencies.
@@ -893,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;
@@ -916,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);
@@ -939,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/tools/creator/CreateMavenRoutinePom.java

@@ -12,18 +12,16 @@
 // ============================================================================
 package org.talend.designer.maven.tools.creator;
 
-import java.util.HashSet;
+import java.util.Collections;
 import java.util.Set;
 
 import org.apache.maven.model.Model;
 import org.eclipse.core.resources.IFile;
 import org.talend.core.GlobalServiceRegister;
-import org.talend.core.PluginChecker;
 import org.talend.core.model.general.ILibrariesService;
 import org.talend.core.model.general.ModuleNeeded;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.designer.maven.template.MavenTemplateManager;
-import org.talend.repository.model.IRepositoryService;
 
 /**
  * DOC ggu class global comment. Detailled comment
@@ -48,18 +46,13 @@ public class CreateMavenRoutinePom extends AbstractMavenCodesTemplatePom {
         // Set<ModuleNeeded> runningModules = routiensService.getRunningModules();
         // return runningModules;
         // }
-        Set<ModuleNeeded> runningModules = new HashSet<>();
         if (GlobalServiceRegister.getDefault().isServiceRegistered(ILibrariesService.class)) {
             ILibrariesService libService = (ILibrariesService) GlobalServiceRegister.getDefault().getService(
                     ILibrariesService.class);
-            runningModules.addAll(libService.getCodesModuleNeededs(ERepositoryObjectType.ROUTINES));
+            Set<ModuleNeeded> runningModules = libService.getCodesModuleNeededs(ERepositoryObjectType.ROUTINES);
+            return runningModules;
         }
-        if (GlobalServiceRegister.getDefault().isServiceRegistered(IRepositoryService.class)) {
-            IRepositoryService repositoryService = GlobalServiceRegister.getDefault().getService(IRepositoryService.class);
-            if (PluginChecker.isBigdataRoutineLoaded() && repositoryService.isProjectLevelLog4j2()) {
-                runningModules.addAll(repositoryService.getLog4j2Modules());
-            }
-        }
-        return runningModules;
+        return Collections.emptySet();
+
     }
 }

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;
@@ -317,12 +316,6 @@ public class PomIdsHelper {
         return PREFIX_DEFAULT_GROUPID + projectName.toLowerCase();
     }
 
-    public static boolean skipFolders() {
-        String projectTechName = ProjectManager.getInstance().getCurrentProject().getTechnicalLabel();
-        ProjectPreferenceManager manager = getPreferenceManager(projectTechName);
-        return manager.getBoolean(MavenConstants.SKIP_FOLDERS);
-    }
-
     public static boolean isValidGroupId(String text) {
         if (text != null && text.matches("[\\w\\.]+")) { //$NON-NLS-1$
             return true;
@@ -353,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,11 +73,9 @@ 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;
-import org.talend.core.PluginChecker;
 import org.talend.core.model.general.Project;
 import org.talend.core.model.process.IProcess;
 import org.talend.core.model.process.JobInfo;
@@ -99,12 +98,10 @@ import org.talend.designer.maven.model.TalendJavaProjectConstants;
 import org.talend.designer.maven.model.TalendMavenConstants;
 import org.talend.designer.maven.template.MavenTemplateManager;
 import org.talend.designer.maven.tools.AggregatorPomsHelper;
-import org.talend.designer.maven.tools.CodeM2CacheManager;
 import org.talend.designer.maven.tools.ProcessorDependenciesManager;
 import org.talend.designer.runprocess.IProcessor;
 import org.talend.designer.runprocess.IRunProcessService;
 import org.talend.repository.ProjectManager;
-import org.talend.repository.model.IRepositoryService;
 import org.talend.utils.xml.XmlUtils;
 import org.w3c.dom.Attr;
 import org.w3c.dom.DOMImplementation;
@@ -586,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 {
@@ -598,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 {
@@ -607,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 {
@@ -625,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);
@@ -1181,7 +1207,7 @@ public class PomUtil {
             IRunProcessService runProcessService = GlobalServiceRegister.getDefault().getService(IRunProcessService.class);
             try {
                 Model model = MODEL_MANAGER.readMavenModel(runProcessService.getTalendCodeJavaProject(codeType).getProjectPom());
-                return model.getDependencies().stream().filter(d -> !"provided".equals(d.getScope())).map(
+                return model.getDependencies().stream().map(
                         d -> createDependency(d.getGroupId(), d.getArtifactId(), d.getVersion(), d.getType(), d.getClassifier()))
                         .peek(d -> ((SortableDependency) d).setAssemblyOptional(true)).collect(Collectors.toSet());
             } catch (CoreException e) {
@@ -1191,49 +1217,4 @@ public class PomUtil {
         return Collections.emptySet();
     }
 
-    public static void checkExistingLog4j2Dependencies4RoutinePom(String projectTechName, IFile pomFile) {
-        if (!PluginChecker.isBigdataRoutineLoaded()) {
-            return;
-        }
-        try {
-            if (GlobalServiceRegister.getDefault().isServiceRegistered(IRepositoryService.class)) {
-                Model model = MODEL_MANAGER.readMavenModel(pomFile);
-                IRepositoryService service = GlobalServiceRegister.getDefault().getService(IRepositoryService.class);
-                boolean isLog4j2 = service.isProjectLevelLog4j2();
-                Map<String, MavenArtifact> GAVMap = service.getLog4j2Modules().stream()
-                        .map(m -> MavenUrlHelper.parseMvnUrl(m.getMavenUri()))
-                        .collect(Collectors.toMap(MavenArtifact::getArtifactId, MavenArtifact -> MavenArtifact));
-                long existingDependenciesSize = model.getDependencies().stream()
-                        .filter(d -> GAVMap.containsKey(d.getArtifactId())
-                                && GAVMap.get(d.getArtifactId()).getGroupId().equals(d.getGroupId())
-                                && GAVMap.get(d.getArtifactId()).getVersion().equals(d.getVersion()))
-                        .count();
-                boolean clean = false;
-                // CAUTION
-                // with this fix, project level log4j2 user can use log4j2 api in routine directly in BD project
-                // user should NEVER manually setup log4j2 in routine dependencies
-                // or else routine install cache could always be cleaned
-                if (isLog4j2 && existingDependenciesSize != GAVMap.size()) {
-                    // if project level log4j1 -> log4j2
-                    // if first time add log4j2 dependencies
-                    // if log4j2 upgrade version
-                    // then clean cache to add
-                    clean = true;
-                } else if (!isLog4j2 && existingDependenciesSize > 0) {
-                    // if project level log4j2 -> log4j1
-                    // then clean cache to remove
-                    clean = true;
-                }
-                if (clean) {
-                    File cacheFile = CodeM2CacheManager.getCacheFile(projectTechName, ERepositoryObjectType.ROUTINES);
-                    if (cacheFile.exists()) {
-                        cacheFile.delete();
-                    }
-                }
-            }
-        } catch (CoreException e) {
-            ExceptionHandler.process(e);
-        }
-    }
-
 }

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

@@ -96,14 +96,10 @@ public final class TalendCodeProjectUtil {
                 return true;
             }
 
-            try {
-                // because some cases, the project is not opened.
-                if (!codeProject.isOpen()) {
-                    // if not opened, will have exception when check nature or such
-                    codeProject.open(monitor);
-                }
-            } catch (Exception e) {
-                return true;
+            // because some cases, the project is not opened.
+            if (!codeProject.isOpen()) {
+                // if not opened, will have exception when check nature or such
+                codeProject.open(monitor);
             }
 
             codeProject.refreshLocal(IResource.DEPTH_ONE, monitor);

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

@@ -44,7 +44,6 @@ Export-Package: org.apache.commons.cli2,
  org.apache.commons.math3.stat.descriptive;version="3.3.0",
  org.apache.commons.math3.stat.descriptive.rank;version="3.3.0",
  org.apache.commons.math3.util;version="3.3.0",
- org.apache.commons.text,
  org.apache.commons.text.similarity,
  org.apache.commons.validator;version="1.5.1",
  org.apache.commons.validator.routines;version="1.5.1"

main/plugins/org.talend.libraries.apache.google/.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>