fix(TUP-30273)tDBOutput component compilation error (#4029)

* fix(TUP-30273)tDBOutput component compilation error
https://jira.talendforge.org/browse/TUP-30273

* fix(TUP-30273)tDBOutput component compilation error

i18n/features/org.talend.babel.all.tos.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
 	<groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   

i18n/plugins/org.talend.common.ui.runtime.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.common.ui.runtime.nl</artifactId>

i18n/plugins/org.talend.commons.runtime.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.commons.runtime.nl</artifactId>

i18n/plugins/org.talend.commons.ui.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.commons.ui.nl</artifactId>

i18n/plugins/org.talend.core.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.core.nl</artifactId>

i18n/plugins/org.talend.core.repository.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.core.repository.nl</artifactId>

i18n/plugins/org.talend.core.runtime.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.core.runtime.nl</artifactId>

i18n/plugins/org.talend.core.ui.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.core.ui.nl</artifactId>

i18n/plugins/org.talend.cwm.mip.edit.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.cwm.mip.edit.nl</artifactId>

i18n/plugins/org.talend.cwm.mip.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.cwm.mip.nl</artifactId>

i18n/plugins/org.talend.designer.maven.ui.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.maven.ui.nl</artifactId>

i18n/plugins/org.talend.help.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.help.nl</artifactId>

i18n/plugins/org.talend.helpers.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.helpers.nl</artifactId>

i18n/plugins/org.talend.librariesmanager.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.librariesmanager.nl</artifactId>

i18n/plugins/org.talend.librariesmanager.ui.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.librariesmanager.ui.nl</artifactId>

i18n/plugins/org.talend.metadata.managment.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.metadata.managment.nl</artifactId>

i18n/plugins/org.talend.metadata.managment.ui.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.metadata.managment.ui.nl</artifactId>

i18n/plugins/org.talend.migrationTool.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.migrationTool.nl</artifactId>

i18n/plugins/org.talend.model.edit.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.model.edit.nl</artifactId>

i18n/plugins/org.talend.model.migration.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.model.migration.nl</artifactId>

i18n/plugins/org.talend.model.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.model.nl</artifactId>

i18n/plugins/org.talend.presentation.onboarding.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.presentation.onboarding.nl</artifactId>

i18n/plugins/org.talend.rcp.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.rcp.nl</artifactId>

i18n/plugins/org.talend.registration.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.registration.nl</artifactId>

i18n/plugins/org.talend.repository.items.importexport.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.items.importexport.nl</artifactId>

i18n/plugins/org.talend.repository.items.importexport.ui.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.items.importexport.ui.nl</artifactId>

i18n/plugins/org.talend.repository.localprovider.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.localprovider.nl</artifactId>

i18n/plugins/org.talend.repository.mdm.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.mdm.nl</artifactId>

i18n/plugins/org.talend.repository.metadata.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.metadata.nl</artifactId>

i18n/plugins/org.talend.repository.view.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.view.nl</artifactId>

i18n/plugins/org.talend.resources.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.resources.nl</artifactId>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.commons.feature</artifactId>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.core.feature</artifactId>

main/features/org.talend.fragment.jars.common.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.fragment.jars.common.feature</artifactId>

main/features/org.talend.help.di.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.help.di.feature</artifactId>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.help.feature</artifactId>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.jdt.feature</artifactId>

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

@@ -13,7 +13,6 @@
   <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/features/org.talend.libraries.jdbc.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.libraries.jdbc.feature</artifactId>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.m2e.feature</artifactId>

main/features/org.talend.model.migration.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.model.migration.feature</artifactId>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.rcp.feature</artifactId>

main/features/org.talend.update.p2.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.update.p2.feature</artifactId>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.updates.feature</artifactId>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.utils.feature</artifactId>

main/plugins/org.talend.common.ui.runtime/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.common.ui.runtime</artifactId>

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

@@ -21,6 +21,7 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
@@ -38,6 +39,8 @@ public class ExceptionMessageDialog extends MessageDialog {
 
     private String exceptionString = null;
 
+    private int[] diabledButtonIndex = new int[] {};
+
     public ExceptionMessageDialog(Shell parentShell, String dialogTitle, Image dialogTitleImage, String dialogMessage,
             int dialogImageType, String[] dialogButtonLabels, int defaultIndex, Throwable ex) {
         super(parentShell, dialogTitle, dialogTitleImage, dialogMessage, dialogImageType, dialogButtonLabels, defaultIndex);
@@ -147,4 +150,21 @@ public class ExceptionMessageDialog extends MessageDialog {
         this.exceptionString = exceptionString;
     }
 
+    public void setDisabledButtons(int[] index) {
+        this.diabledButtonIndex = index;
+    }
+
+    @Override
+    protected void createButtonsForButtonBar(Composite parent) {
+        super.createButtonsForButtonBar(parent);
+        if (diabledButtonIndex == null) {
+            return;
+        }
+        for (int index : diabledButtonIndex) {
+            Button button = super.getButton(index);
+            button.setEnabled(false);
+        }
+    }
+
+
 }

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

@@ -166,6 +166,7 @@ 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,6 +16,8 @@ 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/>
@@ -52,5 +54,9 @@ 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/META-INF/MANIFEST.MF

@@ -13,7 +13,11 @@ Require-Bundle: org.apache.log4j;visibility:=reexport,
  org.talend.libraries.apache,
  com.ibm.icu,
  org.apache.commons.io,
- org.talend.utils
+ org.talend.utils,
+ org.eclipse.core.net,
+ org.eclipse.m2e.core,
+ org.eclipse.m2e.maven.runtime,
+ org.eclipse.core.resources
 Export-Package: org.talend.commons,
  org.talend.commons.exception,
  org.talend.commons.i18n,

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.commons.runtime</artifactId>

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

@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.talend</groupId>
         <artifactId>org.talend.tos</artifactId>
-        <version>7.3.1-SNAPSHOT</version>
+        <version>7.3.2-SNAPSHOT</version>
         <relativePath>../pom_server.xml</relativePath>
     </parent>
 

main/plugins/org.talend.commons.runtime/src/org/talend/commons/CommonsPlugin.java

@@ -17,6 +17,7 @@ import java.io.InputStream;
 import java.net.URL;
 
 import org.apache.commons.lang.ArrayUtils;
+import org.eclipse.core.net.proxy.IProxyService;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.preferences.InstanceScope;
@@ -24,6 +25,7 @@ import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
+import org.osgi.util.tracker.ServiceTracker;
 import org.talend.commons.exception.ExceptionService;
 import org.talend.commons.runtime.debug.TalendDebugHandler;
 import org.talend.commons.utils.system.EclipseCommandLine;
@@ -55,6 +57,8 @@ public class CommonsPlugin implements BundleActivator {
     // TESB-17856: For commandline builds ESB Micorservice bundle
     private static boolean isESBMicorservice = false;
 
+    private static ServiceTracker proxyTracker;
+
     public static boolean isWorkbenchCreated() {
         return isWorkbenchCreated;
     }
@@ -107,7 +111,8 @@ public class CommonsPlugin implements BundleActivator {
     }
 
     public static boolean isDebugMode() {
-        return ArrayUtils.contains(Platform.getApplicationArgs(), TalendDebugHandler.TALEND_DEBUG);
+        return Boolean.getBoolean("talendDebug") //$NON-NLS-1$
+                || ArrayUtils.contains(Platform.getApplicationArgs(), TalendDebugHandler.TALEND_DEBUG);
     }
 
     public static boolean isJUnitTest() {
@@ -179,4 +184,13 @@ public class CommonsPlugin implements BundleActivator {
         return FileLocator.toFileURL(entry);
     }
 
+    public static IProxyService getProxyService() {
+        if (proxyTracker == null) {
+            proxyTracker = new ServiceTracker(Platform.getBundle(PLUGIN_ID).getBundleContext(), IProxyService.class.getName(),
+                    null);
+            proxyTracker.open();
+        }
+        return (IProxyService) proxyTracker.getService();
+    }
+
 }

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

@@ -0,0 +1,58 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2020 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.commons.exception;
+
+public class ClientException extends PersistenceException {
+    
+    private Integer httpCode;
+
+    public ClientException(String message) {
+        super(message);
+    }
+
+    public ClientException(Integer httpCode, String message) {
+        super(message);
+        this.httpCode = httpCode;
+    }
+
+    public ClientException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public ClientException(Integer httpCode, String message, Throwable cause) {
+        super(message, cause);
+        this.httpCode = httpCode;
+    }
+
+    public ClientException(Throwable cause) {
+        super(cause);
+    }
+
+    public ClientException(Integer httpCode, Throwable cause) {
+        super(cause);
+        this.httpCode = httpCode;
+    }
+
+    public Integer getHttpCode() {
+        return httpCode;
+    }
+
+    public void setHttpCode(Integer httpCode) {
+        this.httpCode = httpCode;
+    }
+
+    @Override
+    public String toString() {
+        return getLocalizedMessage();
+    }
+}

main/plugins/org.talend.commons.runtime/src/org/talend/commons/runtime/service/ITaCoKitService.java

@@ -42,6 +42,8 @@ public interface ITaCoKitService {
 
     boolean isNeedMigration(String componentName, Map<String, String> properties);
 
+    boolean isTaCoKitType(Object repoType);
+
     public static ITaCoKitService getInstance() throws Exception {
         BundleContext bc = FrameworkUtil.getBundle(ITaCoKitService.class).getBundleContext();
         Collection<ServiceReference<ITaCoKitService>> tacokitServices = Collections.emptyList();

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

@@ -0,0 +1,60 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2020 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.commons.utils;
+
+import java.io.File;
+import java.nio.file.Path;
+
+import org.eclipse.m2e.core.MavenPlugin;
+
+public enum MojoType {
+
+    CI_BUILDER("org.talend.ci", "builder-maven-plugin", "ci.builder.version"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    CLOUD_PUBLISHER("org.talend.ci", "cloudpublisher-maven-plugin", "cloud.publisher.version"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    SIGNER("org.talend.ci", "signer-maven-plugin", "signer.version"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    OSGI_HELPER("org.talend.ci", "osgihelper-maven-plugin", "osgihelper.version"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+    private String groupId;
+
+    private String artifactId;
+
+    private String versionKey;
+
+    private MojoType(String groupId, String artifactId, String versionKey) {
+        this.groupId = groupId;
+        this.artifactId = artifactId;
+        this.versionKey = versionKey;
+    }
+
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public String getArtifactId() {
+        return artifactId;
+    }
+
+    public String getVersionKey() {
+        return versionKey;
+    }
+
+    public String getMojoArtifactIdFolder() {
+        Path basePath = new File(MavenPlugin.getMaven().getLocalRepositoryPath()).toPath();
+        return basePath.resolve(getGroupId().replaceAll("\\.", "/")).resolve(getArtifactId()).toString(); //$NON-NLS-1$ //$NON-NLS-2$
+    }
+
+    public String getMojoGAV() {
+        return getGroupId() + ":" + getArtifactId() + ":" + getVersionKey(); //$NON-NLS-1$ //$NON-NLS-2$
+    }
+
+}

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

@@ -15,15 +15,17 @@ package org.talend.commons.utils;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.util.Optional;
 import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Stream;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
+import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
@@ -230,10 +232,50 @@ 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;
         }
-        return getInternalVersion().compareTo(getProductVersionWithoutBranding(remoteFullProductVersion)) < 0;
+        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;
     }
 
     public static String getTalendVersion(String productVersion) {
@@ -262,24 +304,28 @@ public class VersionUtils {
         return version;
     }
 
-    public static String getMojoVersion(String mojoKey) {
-        String version = null;
+    public static String getMojoVersion(MojoType mojoType) {
+        String mojoKey = mojoType.getVersionKey();
+        String version = System.getProperty(mojoKey);
+        if (StringUtils.isNotBlank(version)) {
+            return version;
+        }
         String talendVersion = getTalendVersion();
-        Properties properties = new Properties();
-        File file = new Path(Platform.getConfigurationLocation().getURL().getPath()).append("mojo_version.properties").toFile(); //$NON-NLS-1$
-        if (file.exists()) {
-            try (InputStream inStream = new FileInputStream(file)) {
-                properties.load(inStream);
-                version = properties.getProperty(mojoKey);
-            } catch (IOException e) {
-                ExceptionHandler.process(e);
-            }
-            if (version != null && !version.startsWith(talendVersion)) {
-                ExceptionHandler
-                        .process(new Exception(
-                                "Incompatible Mojo version:" + mojoKey + "[" + version + "], use default version.")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                version = null;
+        String majorVersion = StringUtils.substringBeforeLast(talendVersion, "."); //$NON-NLS-1$
+        String artifactIdFolder = mojoType.getMojoArtifactIdFolder();
+        Optional<File> optional = Stream.of(new File(artifactIdFolder).listFiles())
+                .filter(f -> f.isDirectory() && f.getName().startsWith(majorVersion))
+                .sorted((f1, f2) -> new DefaultArtifactVersion(f2.getName()).compareTo(new DefaultArtifactVersion(f1.getName())))
+                .findFirst();
+        if (optional.isPresent()) {
+            File latestArtifact = optional.get();
+            String fileName = mojoType.getArtifactId() + "-" + latestArtifact.getName(); //$NON-NLS-1$
+            if (Stream.of(latestArtifact.listFiles())
+                    .filter(f -> f.getName().equals(fileName + ".jar") || f.getName().equals(fileName + ".pom")) //$NON-NLS-1$ //$NON-NLS-2$
+                    .count() != 2) {
+                ExceptionHandler.process(new Exception("Can't find plugin artifact " + mojoType.getMojoGAV())); //$NON-NLS-1$
             }
+            version = latestArtifact.getName();
         }
         // default version
         if (StringUtils.isBlank(version)) {
@@ -293,6 +339,7 @@ public class VersionUtils {
                 version += "-" + revision; //$NON-NLS-1$
             }
         }
+        System.setProperty(mojoKey, version);
         return version;
     }
 
@@ -302,4 +349,25 @@ public class VersionUtils {
             talendVersion = null;
         }
     }
+
+    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])) {
+        if (ArrayUtils.contains(neededTypes, NEEDED_TYPES[3]) && "_SYS_BIC".equalsIgnoreCase(schemaPattern)) { //$NON-NLS-1$
             // 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[] { "", "_SYS_BIC", name, NEEDED_TYPES[3], "", packageId }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                    String[] r = new String[] { "", schemaPattern, name, NEEDED_TYPES[3], "", packageId }; //$NON-NLS-1$ //$NON-NLS-2$
                     listcv.add(r);
                 }
             } catch (SQLException e) {
@@ -355,4 +355,16 @@ 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/database/Sybase16SADatabaseMetaData.java

@@ -0,0 +1,121 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2020 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.commons.utils.database;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
+
+
+/**
+ * created by qiongli on 2013-11-13 Detailled comment
+ *
+ */
+public class Sybase16SADatabaseMetaData extends SybaseDatabaseMetaData {
+
+    private static Logger log = Logger.getLogger(Sybase16SADatabaseMetaData.class);
+
+    /**
+     * DOC qiongli SybaseIQDatabaseMetaData constructor comment.
+     *
+     * @param connection
+     * @throws SQLException
+     */
+    public Sybase16SADatabaseMetaData(Connection connection) throws SQLException {
+        super(connection);
+    }
+
+    public ResultSet getCatalogs(String login, String database) throws SQLException {
+        List<String[]> list = new ArrayList<String[]>();
+
+        List<String> catList = new ArrayList<String>();
+        if (!StringUtils.isEmpty(database)) {
+            catList.add(database);
+        }
+        
+        for (String catalogName : catList) {
+            String sql = createSqlByLoginAndCatalog(login, catalogName);
+            ResultSet rs = null;
+            Statement stmt = null;
+            try {
+                stmt = connection.createStatement();
+                rs = stmt.executeQuery(sql);
+
+                while (rs.next()) {
+                    int temp = rs.getInt(1);
+                    if (temp > 0) {
+                        String[] r = new String[] { catalogName };
+                        list.add(r);
+                    }
+                }
+            } catch (SQLException e) {
+                log.error(e);
+            } finally {
+                try {
+                    if (rs != null) {
+                        rs.close();
+                    }
+                    if (stmt != null) {
+                        stmt.close();
+                    }
+                } catch (Exception e) {
+                    log.error(e);
+                }
+            }
+        }
+
+        SybaseResultSet tableResultSet = new SybaseResultSet();
+        tableResultSet.setMetadata(new String[] { "TABLE_CAT" }); //$NON-NLS-1$
+        tableResultSet.setData(list);
+        return tableResultSet;
+    }
+    
+    @Override
+    public ResultSet getColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern)
+            throws SQLException {
+        return super.getColumns(null, schemaPattern, tableNamePattern, columnNamePattern);
+    }
+
+    @Override
+    public ResultSet getPrimaryKeys(String catalog, String schema, String table) throws SQLException {
+        return super.getPrimaryKeys(null, schema, table);
+    }
+
+    @Override
+    public ResultSet getTables(String catalog, String schemaPattern, String tableNamePattern, String[] types)
+            throws SQLException {
+        return super.getTables(null, schemaPattern, tableNamePattern, types);
+    }
+
+    /**
+     *
+     * get a sql query by login name and catalog name.
+     *
+     * @param loginName
+     * @param catalogName
+     * @return
+     */
+    protected String createSqlByLoginAndCatalog(String loginName, String catalogName) {
+        String sql = "select count(*) from " + catalogName
+                + ".dbo.sysusers where suid in (select suid from "+catalogName+".dbo.syslogins where name = '" + loginName
+                + "')";
+        return sql;
+    }
+
+}

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

@@ -0,0 +1,18 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2020 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.commons.utils.network;
+
+public interface ITalendNexusPrefConstants {
+
+    public static final String NEXUS_TIMEOUT = "NEXUS_TIMEOUT"; //$NON-NLS-1$
+}

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

@@ -15,6 +15,7 @@ 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;
@@ -22,10 +23,17 @@ 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;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.runtime.utils.io.FileCopyUtils;
 
 /**
@@ -44,7 +52,17 @@ public class NetworkUtil {
 
     private static final String HTTP_NETWORK_URL = "https://talend-update.talend.com";
 
+    private static final int DEFAULT_TIMEOUT = 4000;
+
+    private static final int DEFAULT_NEXUS_TIMEOUT = 20000;// same as preference value
+
+    public static final String ORG_TALEND_DESIGNER_CORE = "org.talend.designer.core"; //$NON-NLS-1$
+
     public static boolean isNetworkValid() {
+        return isNetworkValid(DEFAULT_TIMEOUT);
+    }
+
+    public static boolean isNetworkValid(Integer timeout) {
         String disableInternet = System.getProperty(TALEND_DISABLE_INTERNET);
         if ("true".equals(disableInternet)) { //$NON-NLS-1$
             return false;
@@ -55,8 +73,9 @@ public class NetworkUtil {
             conn = (HttpURLConnection) url.openConnection();
             conn.setDefaultUseCaches(false);
             conn.setUseCaches(false);
-            conn.setConnectTimeout(4000);
-            conn.setReadTimeout(4000);
+            int conntimeout = timeout != null ? timeout.intValue() : DEFAULT_TIMEOUT;
+            conn.setConnectTimeout(conntimeout);
+            conn.setReadTimeout(conntimeout);
             conn.setRequestMethod("HEAD"); //$NON-NLS-1$
             String strMessage = conn.getResponseMessage();
             if (strMessage.compareTo("Not Found") == 0) { //$NON-NLS-1$
@@ -73,22 +92,23 @@ public class NetworkUtil {
         return true;
     }
 
-    public static boolean isNetworkValid(String url) {
+    public static boolean isNetworkValid(String url, Integer timeout) {
         if (url == null) {
-            return isNetworkValid();
+            return isNetworkValid(timeout);
         }
-        return checkValidWithHttp(url);
+        return checkValidWithHttp(url, timeout);
     }
 
-    private static boolean checkValidWithHttp(String urlString) {
+    private static boolean checkValidWithHttp(String urlString, Integer timeout) {
         HttpURLConnection conn = null;
         try {
             URL url = new URL(urlString);
             conn = (HttpURLConnection) url.openConnection();
             conn.setDefaultUseCaches(false);
             conn.setUseCaches(false);
-            conn.setConnectTimeout(4000);
-            conn.setReadTimeout(4000);
+            int conntimeout = timeout != null ? timeout.intValue() : DEFAULT_TIMEOUT;
+            conn.setConnectTimeout(conntimeout);
+            conn.setReadTimeout(conntimeout);
             conn.setRequestMethod("HEAD"); //$NON-NLS-1$
             conn.getResponseMessage();
         } catch (Exception e) {
@@ -101,6 +121,18 @@ public class NetworkUtil {
         return true;
     }
 
+    public static int getNexusTimeout() {
+        int timeout = DEFAULT_NEXUS_TIMEOUT;
+        try {
+            IEclipsePreferences node = InstanceScope.INSTANCE.getNode(ORG_TALEND_DESIGNER_CORE);
+            timeout = node.getInt(ITalendNexusPrefConstants.NEXUS_TIMEOUT, DEFAULT_NEXUS_TIMEOUT);
+        } catch (Throwable e) {
+            ExceptionHandler.process(e);
+        }
+
+        return timeout;
+    }
+
     public static Authenticator getDefaultAuthenticator() {
         try {
             Field theAuthenticatorField = Authenticator.class.getDeclaredField("theAuthenticator");
@@ -123,6 +155,28 @@ 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$
@@ -140,7 +194,11 @@ public class NetworkUtil {
                             proxyPassword = httpsProxyPassword.toCharArray();
                         }
                     }
-                    return new PasswordAuthentication(proxyUser, proxyPassword);
+                    if (StringUtils.isBlank(proxyUser)) {
+                        return null;
+                    } else {
+                        return new PasswordAuthentication(proxyUser, proxyPassword);
+                    }
                 }
 
             });
@@ -179,6 +237,54 @@ 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

@@ -13,6 +13,8 @@
 package org.talend.commons.utils.network;
 
 import java.io.IOException;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.net.InetSocketAddress;
 import java.net.PasswordAuthentication;
 import java.net.Proxy;
@@ -23,6 +25,7 @@ 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;
@@ -35,8 +38,16 @@ 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;
 import org.talend.commons.i18n.internal.Messages;
+import org.talend.daikon.sandbox.properties.ClassLoaderIsolatedSystemProperties;
+
+import sun.net.spi.DefaultProxySelector;
 
 /**
  * DOC cmeng  class global comment. Detailled comment
@@ -51,9 +62,31 @@ public class TalendProxySelector extends ProxySelector {
 
     private static final String PROP_ALLOW_PROXY_REDIRECT_EXCLUDE = "talend.studio.proxy.redirect.whiteList";
 
+    private static final String PROP_EXECUTE_CONNECTION_FAILED = "talend.studio.proxy.executeConnectionFailed";
+
+    private static final String PROP_UPDATE_SYSTEM_PROPERTIES_FOR_JRE = "talend.studio.proxy.jre.updateSystemProperties";
+
+    private static final String PROP_CHECK_PROXY = "talend.studio.proxy.checkProxy";
+
+    private static final String PROP_VALIDATE_URI = "talend.studio.proxy.validateUri";
+
+    private static final String PROP_PROXY_SELECTOR = "talend.studio.proxy.selector";
+
+    private static final String PROP_PROXY_SELECTOR_DEFAULT = "default";
+
+    private static final String PROP_PROXY_SELECTOR_JRE = "jre";
+
     private static final String PROP_PROXY_HOST_MAP = "talend.studio.proxy.hostMap";
 
-    private static final String PROP_DISABLE_DEFAULT_SELECTOR = "talend.studio.proxy.disableDefaultSelector";
+    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
@@ -67,7 +100,22 @@ public class TalendProxySelector extends ProxySelector {
 
     private static final String KEY_DEFAULT = ":default:";
 
-    private ProxySelector defaultSelector;
+    private static Field uriHostField;
+
+    private static Method proxyManagerUpdateSystemPropertiesFunc;
+
+    private static boolean checkProxy = Boolean.valueOf(System.getProperty(PROP_CHECK_PROXY, Boolean.TRUE.toString()));
+
+    /**
+     * Note: eclipse default selector may be different between TOS and TIS, TOS may use jre one, TIS may use egit one
+     */
+    private ProxySelector eclipseDefaultSelector;
+
+    private ProxySelector jreDefaultSelector;
+
+    private EProxySelector eProxySelector;
+
+    private IProxyService proxyManager;
 
     final private Map<Object, Collection<IProxySelectorProvider>> selectorProviders;
 
@@ -79,24 +127,125 @@ 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;
 
-    private boolean disableDefaultSelector = false;
+    private boolean disableDefaultSelectorProvider = false;
 
-    private TalendProxySelector(final ProxySelector defaultSelector) {
-        this.defaultSelector = defaultSelector;
+    private boolean validateUri = true;
+
+    private boolean executeConnectionFailed = true;
+
+    private boolean updateSystemPropertiesForJre = true;
+
+    private boolean excludeLoopbackAddressAutomatically = false;
+
+    private TalendProxySelector(final ProxySelector eclipseDefaultSelector) {
+        this.eclipseDefaultSelector = eclipseDefaultSelector;
+        this.jreDefaultSelector = new DefaultProxySelector();
 
         selectorProviders = Collections.synchronizedMap(new HashMap<>());
         allowProxyRedirect = Boolean.valueOf(System.getProperty(PROP_ALLOW_PROXY_REDIRECT, Boolean.FALSE.toString()));
-        disableDefaultSelector = Boolean.valueOf(System.getProperty(PROP_DISABLE_DEFAULT_SELECTOR, Boolean.FALSE.toString()));
+        disableDefaultSelectorProvider = Boolean
+                .valueOf(System.getProperty(PROP_DISABLE_DEFAULT_SELECTOR_PROVIDER, Boolean.FALSE.toString()));
         printProxyLog = Boolean.valueOf(System.getProperty(PROP_PRINT_LOGS, Boolean.FALSE.toString()));
+        validateUri = Boolean.valueOf(System.getProperty(PROP_VALIDATE_URI, Boolean.TRUE.toString()));
+        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:
+            this.eProxySelector = EProxySelector.jre;
+            break;
+        default:
+            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<>();
@@ -176,6 +325,18 @@ public class TalendProxySelector extends ProxySelector {
             synchronized (instanceLock) {
                 if (instance == null) {
                     instance = new TalendProxySelector(proxySelector);
+                    try {
+                        uriHostField = URI.class.getDeclaredField("host");
+                        uriHostField.setAccessible(true);
+                    } catch (Exception e) {
+                        ExceptionHandler.process(e);
+                    }
+                    try {
+                        proxyManagerUpdateSystemPropertiesFunc = ProxyManager.class.getDeclaredMethod("updateSystemProperties");
+                        proxyManagerUpdateSystemPropertiesFunc.setAccessible(true);
+                    } catch (Exception e) {
+                        ExceptionHandler.process(e);
+                    }
                 }
             }
         }
@@ -188,34 +349,92 @@ public class TalendProxySelector extends ProxySelector {
                     return null;
                 }
             });
-            if (instance.getDefaultProxySelector() == null
+            if (instance.getEclipseDefaultSelector() == null
                     || (proxySelector != null && proxySelector.getClass().getName().endsWith(ECLIPSE_PROXY_SELECTOR))) {
-                instance.setDefaultProxySelector(proxySelector);
+                instance.setEclipseDefaultSelector(proxySelector);
             }
         }
 
         return instance;
     }
 
+    public static void checkProxy() {
+        if (!checkProxy) {
+            return;
+        }
+        try {
+            TalendProxySelector.getInstance();
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+    }
+
     @Override
     public List<Proxy> select(final URI uri) {
+        if (printProxyLog) {
+            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);
+        }
+        URI validatedUri = validateUri(uri);
         Set<Proxy> results = new LinkedHashSet<>();
 
         try {
-            final Set<Proxy> resultFromProviders = getProxysFromProviders(uri);
+            final Set<Proxy> resultFromProviders = getProxysFromProviders(validatedUri);
             if (resultFromProviders != null && !resultFromProviders.isEmpty()) {
                 results.addAll(resultFromProviders);
             }
         } catch (Exception e) {
             ExceptionHandler.process(e);
         }
+        if (printProxyLog) {
+            ExceptionHandler.log("TalendProxySelector.resultFromProviders " + results);
+        }
 
         ProxySelector defaultProxySelector = getDefaultProxySelector();
+        if (printProxyLog) {
+            ExceptionHandler.log("TalendProxySelector.defaultProxySelector " + defaultProxySelector);
+        }
         if (defaultProxySelector != null) {
-            URI newUri = getNewUri(uri);
-            List<Proxy> defaultProxys = defaultProxySelector.select(newUri);
+            /**
+             * don't validate uri here, so that we can know whether it is an issue uri
+             */
+            URI newUri = getNewUri(validatedUri, false);
+            List<Proxy> defaultProxys = null;
+            if (validateUri && StringUtils.isBlank(newUri.getHost())) {
+                /**
+                 * If host is blank, force to use jre proxy selector to avoid the eclipse proxy selector bug
+                 */
+                defaultProxys = getJreProxySelector().select(newUri);
+            } else {
+                defaultProxys = defaultProxySelector.select(newUri);
+            }
+            if (printProxyLog) {
+                ExceptionHandler.log("TalendProxySelector.defaultProxys " + defaultProxys);
+            }
             try {
-                results.addAll(filterProxys(uri, defaultProxys));
+                results.addAll(filterProxys(validatedUri, defaultProxys));
             } catch (Exception e) {
                 results.addAll(defaultProxys);
                 ExceptionHandler.process(e);
@@ -226,9 +445,60 @@ 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);
     }
 
+    private URI validateUri(URI uri) {
+        if (!validateUri) {
+            return uri;
+        }
+
+        URI validatedUri = null;
+        try {
+            /**
+             * DON'T use URI.create(), MUST use the conductor which requires authority
+             */
+            validatedUri = new URI(uri.getScheme(), uri.getAuthority(), uri.getPath(), uri.getQuery(), uri.getFragment());
+
+            /**
+             * Validate the host, if the host is empty, it will cause the eclipse selector to return dirrect
+             */
+            if (StringUtils.isBlank(validatedUri.getHost())) {
+                String authority = validatedUri.getAuthority();
+                if (StringUtils.isNotBlank(authority)) {
+                    // example: https://u:p@www.company.com:8081/path/a?param=b
+                    String host = null;
+                    int userInfoIndex = authority.indexOf('@');
+                    if (0 <= userInfoIndex) {
+                        authority = authority.substring(userInfoIndex + 1);
+                    }
+                    int portIndex = authority.lastIndexOf(':');
+                    if (0 <= portIndex) {
+                        host = authority.substring(0, portIndex);
+                    }
+                    try {
+                        uriHostField.set(validatedUri, host);
+                    } catch (Exception e) {
+                        ExceptionHandler.process(e);
+                    }
+                }
+
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+            if (validatedUri == null) {
+                validatedUri = uri;
+            }
+        }
+        if (printProxyLog) {
+            ExceptionHandler.log("After validate: " + uri + " -> " + validatedUri);
+        }
+        return validatedUri;
+    }
+
     private List<Proxy> filterProxys(final URI uri, List<Proxy> defaultProxys) {
         List<Proxy> result = new ArrayList<>();
         if (defaultProxys != null && !defaultProxys.isEmpty()) {
@@ -264,38 +534,48 @@ public class TalendProxySelector extends ProxySelector {
         return result;
     }
 
-    private URI getNewUri(URI uri) {
+    private URI getNewUri(URI uri, boolean validateUri) {
         URI newUri = uri;
         if (newUri != null) {
-            String host = newUri.getHost();
-            Map<String, String> protocolMap = null;
-            if (StringUtils.isNotBlank(host)) {
-                protocolMap = hostMap.get(host.toLowerCase());
-            }
-            if (protocolMap == null) {
-                protocolMap = hostMap.get(KEY_DEFAULT);
-            }
+            try {
+                // get host before new URI, because the host may be set manually due to URI issue
+                String host = newUri.getHost();
+                newUri = new URI(newUri.getScheme(), newUri.getAuthority(), newUri.getPath(), newUri.getQuery(),
+                        newUri.getFragment());
+                Map<String, String> protocolMap = null;
+                if (StringUtils.isNotBlank(host)) {
+                    protocolMap = hostMap.get(host.toLowerCase());
+                }
+                if (protocolMap == null) {
+                    protocolMap = hostMap.get(KEY_DEFAULT);
+                }
 
-            if (protocolMap != null) {
-                String schema = newUri.getScheme();
-                if (schema != null) {
-                    String lowercasedProtocol = schema.toLowerCase();
-                    String preferedProtocol = protocolMap.get(lowercasedProtocol);
-                    if (StringUtils.isNotBlank(preferedProtocol)) {
-                        try {
-                            newUri = new URI(preferedProtocol, newUri.getUserInfo(), newUri.getHost(), newUri.getPort(),
-                                    newUri.getPath(), newUri.getQuery(), newUri.getFragment());
-                        } catch (URISyntaxException e) {
-                            if (printProxyLog) {
-                                ExceptionHandler.process(new Exception(
-                                        Messages.getString("TalendProxySelector.exception.proxySelectionError", newUri), e),
-                                        Priority.WARN);
-                            }
+                if (protocolMap != null) {
+                    String schema = newUri.getScheme();
+                    if (schema != null) {
+                        String lowercasedProtocol = schema.toLowerCase();
+                        String preferedProtocol = protocolMap.get(lowercasedProtocol);
+                        if (StringUtils.isNotBlank(preferedProtocol)) {
+                            /**
+                             * Note: MUST use the constructor which requires authority, because some uri may be illegal,
+                             * then host info will be stored in authority field instead of host filed
+                             */
+                            newUri = new URI(preferedProtocol, newUri.getAuthority(), newUri.getPath(), newUri.getQuery(),
+                                    newUri.getFragment());
                         }
                     }
                 }
+            } catch (URISyntaxException e) {
+                if (printProxyLog) {
+                    ExceptionHandler.process(
+                            new Exception(Messages.getString("TalendProxySelector.exception.proxySelectionError", uri), e),
+                            Priority.WARN);
+                }
             }
         }
+        if (validateUri) {
+            newUri = validateUri(newUri);
+        }
         return newUri;
     }
 
@@ -395,11 +675,45 @@ public class TalendProxySelector extends ProxySelector {
     }
 
     public ProxySelector getDefaultProxySelector() {
-        return defaultSelector;
+        switch (eProxySelector) {
+        case jre:
+            return getJreProxySelector();
+        default:
+            return eclipseDefaultSelector;
+        }
     }
 
-    public void setDefaultProxySelector(final ProxySelector selector) {
-        defaultSelector = selector;
+    private ProxySelector getJreProxySelector() {
+        try {
+            /**
+             * for tcompv0, daikon may create an isolated system properties for it, so proxies may be ignored in the new
+             * system properties; here we try to call the method to add proxies into the isolated system properties
+             */
+            if (updateSystemPropertiesForJre && ClassLoaderIsolatedSystemProperties.getInstance()
+                    .isIsolated(Thread.currentThread().getContextClassLoader())) {
+                if (printProxyLog) {
+                    ExceptionHandler.log("Before update jre proxy system properties for the isolated classloader, http.proxyHost="
+                            + System.getProperty("http.proxyHost"));
+                }
+                IProxyService proxyService = CommonsPlugin.getProxyService();
+                proxyManagerUpdateSystemPropertiesFunc.invoke(proxyService);
+                if (printProxyLog) {
+                    ExceptionHandler.log("After updated jre proxy system properties for the isolated classloader, http.proxyHost="
+                            + System.getProperty("http.proxyHost"));
+                }
+            }
+        } catch (Throwable e) {
+            ExceptionHandler.process(e);
+        }
+        return this.jreDefaultSelector;
+    }
+
+    public ProxySelector getEclipseDefaultSelector() {
+        return eclipseDefaultSelector;
+    }
+
+    public void setEclipseDefaultSelector(ProxySelector eclipseDefaultSelector) {
+        this.eclipseDefaultSelector = eclipseDefaultSelector;
     }
 
     @Override
@@ -413,21 +727,26 @@ public class TalendProxySelector extends ProxySelector {
             });
         }
 
-        ProxySelector defaultProxySelector = getDefaultProxySelector();
-        if (defaultProxySelector != null) {
-            defaultProxySelector.connectFailed(uri, sa, ioe);
+        if (executeConnectionFailed) {
+            /**
+             * Just try to make the behavior of jre proxy selector same like eclipse proxy selector
+             */
+            ProxySelector defaultProxySelector = getDefaultProxySelector();
+            if (defaultProxySelector != null) {
+                defaultProxySelector.connectFailed(uri, sa, ioe);
+            }
         }
     }
 
     public IProxySelectorProvider createDefaultProxySelectorProvider() {
-        if (disableDefaultSelector) {
+        if (disableDefaultSelectorProvider) {
             return null;
         }
         return new DefaultProxySelectorProvider(Thread.currentThread());
     }
 
     public IProxySelectorProvider createDefaultProxySelectorProvider(String host) {
-        if (disableDefaultSelector) {
+        if (disableDefaultSelectorProvider) {
             return null;
         }
         return new DefaultProxySelectorProvider(host);
@@ -445,6 +764,11 @@ public class TalendProxySelector extends ProxySelector {
         return possibleKeys;
     }
 
+    private enum EProxySelector {
+        eclipse_default,
+        jre
+    }
+
     private class DefaultProxySelectorProvider extends AbstractProxySelectorProvider {
 
         private Thread currentThread = null;
@@ -475,7 +799,7 @@ public class TalendProxySelector extends ProxySelector {
 
         @Override
         public boolean canHandle(URI uri) {
-            if (disableDefaultSelector) {
+            if (disableDefaultSelectorProvider) {
                 return false;
             }
             if (currentThread != null && Thread.currentThread() == currentThread) {

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/resource/UpdatesHelper.java

@@ -19,15 +19,18 @@ import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashSet;
+import java.util.Properties;
 import java.util.Set;
 import java.util.jar.JarEntry;
 import java.util.jar.JarInputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
+import org.apache.commons.io.FilenameUtils;
 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.commons.runtime.service.ITaCoKitService;
 
@@ -58,8 +61,14 @@ public class UpdatesHelper {
 
     public static final String COMPONENT_SUFFIX = "_java.xml";
 
+    public static final String COMPONENT_TEMPLATES = "templates";
+
     public static final String NEW_COMPONENT_PREFIX = "installer$$";
 
+    public static final String PRE_TALEND_PATCH = "talend.patch";
+
+    public static final String RECORD_SEPERATOR = ",";
+
     public static boolean existArtifacts(File base) {
         return new File(base, FILE_ARTIFACTS).exists() || new File(base, FILE_JAR_ARTIFACTS).exists()
                 || new File(base, FILE_XZ_ARTIFACTS).exists();
@@ -83,6 +92,9 @@ public class UpdatesHelper {
      * will check that existed the plugins folder only.
      */
     public static boolean isPlainUpdate(File file) {
+        if (skipPatchFile(file)) {
+            return false;
+        }
         if (file != null && file.exists()) {
             if (file.isFile() && file.getName().endsWith(FileExtensions.ZIP_FILE_SUFFIX)) {
                 ZipFileStatus status = new ZipFileStatus(file);
@@ -110,6 +122,9 @@ public class UpdatesHelper {
      * need check that contain "artifacts.xml", "content.xml" and "plugins" folder in same place.
      */
     public static boolean isUpdateSite(File file) {
+        if (skipPatchFile(file)) {
+            return false;
+        }
         if (file != null && file.exists()) {
             if (file.isFile() && file.getName().endsWith(FileExtensions.ZIP_FILE_SUFFIX)) {
 
@@ -171,7 +186,8 @@ public class UpdatesHelper {
     }
 
     private static void findUpdateBaseFile(Set<File> foundUpdateFiles, File baseFile) {
-        if (isPlainUpdate(baseFile) || isUpdateSite(baseFile) && !isComponentUpdateSite(baseFile)) {
+        if (isPlainUpdate(baseFile)
+                || isUpdateSite(baseFile) && !isComponentUpdateSite(baseFile)) {
             foundUpdateFiles.add(baseFile);
         } else if (baseFile.isDirectory()) {
             final File[] listFiles = baseFile.listFiles();
@@ -184,6 +200,10 @@ public class UpdatesHelper {
     }
 
     public static boolean isComponentUpdateSite(File file) {
+
+        if (skipPatchFile(file)) {
+            return false;
+        }
         if (file != null && file.exists()) {
             if (file.isFile() && file.getName().endsWith(FileExtensions.ZIP_FILE_SUFFIX)) {
                 ZipFileStatus status = new ZipFileStatus(file) {
@@ -296,6 +316,9 @@ public class UpdatesHelper {
 
     public static boolean isOldComponent(File f) {
         if (f != null && f.exists() && f.isDirectory()) {
+            if (f.getName().equals(COMPONENT_TEMPLATES)) {
+                return true;
+            }
             File[] listFiles = f.listFiles();
             if (listFiles != null) {
                 for (File subFile : listFiles) {
@@ -307,4 +330,53 @@ public class UpdatesHelper {
         }
         return false;
     }
+
+    public static File getProductFile() {
+        try {
+            return new File(Platform.getInstallLocation().getDataArea(FILE_ECLIPSE_PRODUCT).getPath());
+        } catch (IOException e) {
+            //
+        }
+        return null;
+    }
+
+    public static Properties loadProductProperties(File productFile) {
+        Properties prop = new Properties();
+        if (productFile != null && productFile.exists()) {
+            try (FileInputStream fis = new FileInputStream(productFile)) {
+                prop.load(fis);
+            } catch (Exception e) {
+                ExceptionHandler.process(e);
+            }
+        }
+        return prop;
+    }
+
+    public static Set<String> getPatchesInstalled() {
+        Set<String> installed = new HashSet<String>();
+        File productFile = getProductFile();
+        Properties props = loadProductProperties(productFile);
+        props.forEach((k, v) -> {
+            String key = String.valueOf(k);
+            if (key.startsWith(PRE_TALEND_PATCH)) {
+                String val = String.valueOf(v);
+                String[] vals = val.split(RECORD_SEPERATOR);
+                if (vals.length > 1) {
+                    installed.add(vals[1]);
+                } else {
+                    installed.add(val);
+                }
+            }
+        });
+        return installed;
+    }
+
+    public static boolean skipPatchFile(File patchFile) {
+        Set<String> installedPathNames = getPatchesInstalled();
+        if (patchFile != null && patchFile.isFile()) {
+            String patchName = FilenameUtils.getBaseName(patchFile.getName());
+            return installedPathNames.contains(patchName);
+        }
+        return false;
+    }
 }

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

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

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

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

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

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

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

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

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.commons.ui</artifactId>

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

@@ -240,7 +240,11 @@ public class BackgroundRefresher implements IBackgroundRefresher {
 
             gc.dispose();
 
-            drawableComposite.getBgDrawableComposite().setBackgroundImage(newImage);
+            if (WindowSystem.isBigSurOrLater()) {
+                drawableComposite.refreshBgDrawableCompsite(newImage);
+            } else {
+                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,6 +13,7 @@
 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;
 
@@ -28,6 +29,8 @@ 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,6 +26,7 @@ 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.
@@ -153,7 +154,14 @@ public class LabelledText {
         });
         GridDataFactory.swtDefaults().applyTo(label);
 
-        text = new Text(composite, styleField);
+        // 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.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,7 +12,12 @@
 // ============================================================================
 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;
@@ -28,6 +33,8 @@ public abstract class BgDrawableComposite implements IBgDrawableComposite {
     private Composite commonParent;
 
     private Point offsetPoint = new Point(0, 0);
+    
+    private Image backgroundImage;
 
     /**
      * DOC amaumont DrawableBackground constructor comment.
@@ -36,9 +43,36 @@ 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/TableToTreeLinker.java

@@ -104,7 +104,6 @@ public class TableToTreeLinker<D1, D2> extends BgDrawableComposite implements IB
         this.source = sourceTable;
 
         dataToTableItemCache = new DataToTableItemCache(sourceTable);
-
     }
 
     protected IStyleLink getDefaultStyleLink() {
@@ -232,7 +231,7 @@ public class TableToTreeLinker<D1, D2> extends BgDrawableComposite implements IB
 
             int yStraight = sourceToCommonPoint.y + treeItemHeight / 2 + tableItemBounds.y;
             pointEndStraight.x = sourceToCommonPoint.x + xStartBezierLink;
-            if (Platform.OS_MACOSX.equals(Platform.getOS())) {
+            if (Platform.OS_MACOSX.equals(Platform.getOS()) || Platform.OS_LINUX.equals(Platform.getOS())) {
                 pointStartStraight.x = sourceToCommonPoint.x + tableItem.getParent().getBounds().width;
                 pointEndStraight.x = pointStartStraight.x;
             } else {
@@ -311,10 +310,10 @@ public class TableToTreeLinker<D1, D2> extends BgDrawableComposite implements IB
                 // Added by Marvin Wang on Nov. 28, 2012 for bug TDI-23378. This is not the best way to fix this issue,
                 // but till now I have not found the root cause.
                 if (Platform.OS_LINUX.equals(Platform.getOS())) {
-                    pointEndCentralCurve.y = pointEndCentralCurve.y - tableItem.getBounds().height;
+                    pointEndCentralCurve.y = pointEndCentralCurve.y - tableItem.getBounds().height - treeItemHeight / 2;
                 }
                 if (Platform.OS_MACOSX.equals(Platform.getOS())) {
-                    pointEndCentralCurve.y = pointEndCentralCurve.y + tableItem.getBounds(0).height;
+                    pointEndCentralCurve.y = pointEndCentralCurve.y - tableItem.getBounds().height;
                 }
                 drawableLink.setPoint1(pointEndStraight);
                 drawableLink.setPoint2(pointEndCentralCurve);

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

@@ -15,6 +15,7 @@ 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;
@@ -77,6 +78,8 @@ 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.
      *
@@ -258,8 +261,34 @@ public class TreeToTablesLinker<D1, D2> extends BgDrawableComposite implements I
 
             Point offset = getOffset();
 
-            gc.drawLine(pointStartStraight.x + offset.x, pointStartStraight.y + offset.y, pointEndStraight.x + offset.x,
-                    pointEndStraight.y + offset.y);
+            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);
+            }
 
             pointEndStraight.x += offset.x;
             pointEndStraight.y += offset.y;

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

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

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

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

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-PATCH</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.core.repository</artifactId>

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

@@ -109,4 +109,8 @@ 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/handlers/JobAndNodesParametersRelationshipHandler.java

@@ -117,6 +117,7 @@ public class JobAndNodesParametersRelationshipHandler implements IItemRelationsh
                 }
             }
         }
+        relationsMap.values().removeIf(value -> value.isEmpty());
         return relationsMap;
 
     }

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/handlers/JobRoutinesItemRelationshipHandler.java

@@ -14,6 +14,7 @@ package org.talend.core.repository.handlers;
 
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 
 import org.talend.core.model.properties.Item;
@@ -43,8 +44,13 @@ public class JobRoutinesItemRelationshipHandler extends AbstractJobItemRelations
         Set<Relation> relationSet = new HashSet<Relation>();
 
         if (processType.getParameters() != null && processType.getParameters().getRoutinesParameter() != null) {
+            Map<String, String> currentSystemRoutinesMap = RelationshipItemBuilder.getInstance().getCurrentSystemRoutinesMap();
             for (Object o : processType.getParameters().getRoutinesParameter()) {
                 RoutinesParameterType itemInfor = (RoutinesParameterType) o;
+                if (currentSystemRoutinesMap.containsValue(itemInfor.getName())) {
+                    // exclude system routines relation
+                    continue;
+                }
 
                 Relation addedRelation = new Relation();
                 addedRelation.setId(itemInfor.getName());

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

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

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

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

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

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

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

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

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

@@ -15,6 +15,7 @@ package org.talend.core.repository.model;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.io.File;
+import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Date;
@@ -70,7 +71,8 @@ import org.talend.commons.runtime.service.ITaCoKitService;
 import org.talend.commons.ui.gmf.util.DisplayUtils;
 import org.talend.commons.ui.runtime.exception.MessageBoxExceptionHandler;
 import org.talend.commons.utils.data.container.RootContainer;
-import org.talend.commons.utils.time.TimeMeasure;
+import org.talend.commons.utils.network.TalendProxySelector;
+import org.talend.commons.utils.time.TimeMeasurePerformance;
 import org.talend.commons.utils.workbench.resources.ResourceUtils;
 import org.talend.core.AbstractDQModelService;
 import org.talend.core.GlobalServiceRegister;
@@ -83,6 +85,7 @@ import org.talend.core.context.Context;
 import org.talend.core.context.RepositoryContext;
 import org.talend.core.exception.TalendInternalPersistenceException;
 import org.talend.core.hadoop.BigDataBasicUtil;
+import org.talend.core.model.general.ILibrariesService;
 import org.talend.core.model.general.ModuleNeeded;
 import org.talend.core.model.general.Project;
 import org.talend.core.model.metadata.MetadataTalendType;
@@ -107,6 +110,7 @@ import org.talend.core.model.properties.SpagoBiServer;
 import org.talend.core.model.properties.Status;
 import org.talend.core.model.properties.User;
 import org.talend.core.model.properties.impl.FolderItemImpl;
+import org.talend.core.model.relationship.RelationshipItemBuilder;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.model.repository.Folder;
 import org.talend.core.model.repository.IRepositoryContentHandler;
@@ -122,16 +126,22 @@ import org.talend.core.repository.constants.Constant;
 import org.talend.core.repository.constants.FileConstants;
 import org.talend.core.repository.i18n.Messages;
 import org.talend.core.repository.recyclebin.RecycleBinManager;
+import org.talend.core.repository.utils.LoginTaskRegistryReader;
+import org.talend.core.repository.utils.ProjectDataJsonProvider;
 import org.talend.core.repository.utils.RepositoryPathProvider;
 import org.talend.core.repository.utils.XmiResourceManager;
 import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.runtime.repository.item.ItemProductKeys;
+import org.talend.core.runtime.services.IGenericWizardService;
 import org.talend.core.runtime.services.IMavenUIService;
 import org.talend.core.runtime.util.ItemDateParser;
+import org.talend.core.runtime.util.SharedStudioUtils;
 import org.talend.core.service.ICoreUIService;
+import org.talend.core.service.IUpdateService;
 import org.talend.cwm.helper.SubItemHelper;
 import org.talend.cwm.helper.TableHelper;
 import org.talend.designer.runprocess.IRunProcessService;
+import org.talend.login.ILoginTask;
 import org.talend.repository.ProjectManager;
 import org.talend.repository.ReferenceProjectProblemManager;
 import org.talend.repository.ReferenceProjectProvider;
@@ -173,6 +183,8 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
 
     private boolean isCancelled;
 
+    private static final LoginTaskRegistryReader LOGIN_TASK_REGISTRY_READER = new LoginTaskRegistryReader();
+
     @Override
     public synchronized void addPropertyChangeListener(PropertyChangeListener l) {
         if (l == null) {
@@ -222,6 +234,13 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         return null;
     }
 
+    private ILibrariesService getLibrariesService() {
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(ILibrariesService.class)) {
+            return GlobalServiceRegister.getDefault().getService(ILibrariesService.class);
+        }
+        return null;
+    }
+    
     /*
      * (non-Javadoc)
      *
@@ -872,6 +891,9 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         }
 
         this.repositoryFactoryFromProvider.deleteObjectPhysical(project, object, version, fromEmptyRecycleBin);
+        if (isFullLogonFinished()) {
+            fireRepositoryPropertyChange(ERepositoryActionName.AFTER_DELETE.getName(), null, object);
+        }
         // i18n
         // log.info("Physical deletion [" + objToDelete + "] by " + getRepositoryContext().getUser() + ".");
         String str[] = new String[] { object.toString(), getRepositoryContext().getUser().toString() };
@@ -1206,6 +1228,28 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         return this.repositoryFactoryFromProvider.getLastVersion(project, ProcessUtils.getPureItemId(id), folderPath, type);
     }
 
+
+    @Override
+    public IRepositoryViewObject getLastVersion(String id, ERepositoryObjectType type)
+            throws PersistenceException {
+        return getLastVersion(id , "", type);
+    }
+    
+    @Override
+    public IRepositoryViewObject getLastVersion(String id, List<ERepositoryObjectType> types) throws PersistenceException {
+        if (types != null) {
+            IRepositoryViewObject object = null;
+            for (ERepositoryObjectType type : types) {
+                object = getLastVersion(id, type);
+                if (object != null) {
+                    return object;
+                }
+            }
+        }
+        return null;
+    }
+
+    @Override
     public IRepositoryViewObject getLastVersion(String id, String folderPath, ERepositoryObjectType type)
             throws PersistenceException {
         String objId = id;
@@ -1217,7 +1261,25 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 return this.repositoryFactoryFromProvider.getLastVersion(project, objId, folderPath, type);
             }
         }
-        return this.repositoryFactoryFromProvider.getLastVersion(projectManager.getCurrentProject(), objId , folderPath, type);
+        return getLastRefVersion(projectManager.getCurrentProject(), objId , folderPath, type);
+    }
+    
+    @Override
+    public IRepositoryViewObject getLastRefVersion(Project project, String id, String folderPath, ERepositoryObjectType type) throws PersistenceException {
+        String projectLabel = ProcessUtils.getProjectLabelFromItemId(id);
+        IRepositoryViewObject lastVersion = getLastVersion(project, ProcessUtils.getPureItemId(id), folderPath, type);
+        if (lastVersion == null) {
+            for (Project p : projectManager.getReferencedProjects(project)) {
+                if (projectLabel != null && !projectLabel.equals(p.getTechnicalLabel())) {
+                    continue;
+                }
+                lastVersion = getLastRefVersion(p, id);
+                if (lastVersion != null) {
+                    break;
+                }
+            }
+        }
+        return lastVersion;
     }
 
     @Override
@@ -1539,14 +1601,15 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
 
     @Override
     public void save(Project project, Item item, boolean... isMigrationTask) throws PersistenceException {
-        this.repositoryFactoryFromProvider.save(project, item);
         if (isMigrationTask == null || isMigrationTask.length == 0 || !isMigrationTask[0]) {
+            this.repositoryFactoryFromProvider.save(project, item);
             boolean avoidGenerateProm = false;
             if (isMigrationTask != null && isMigrationTask.length == 2) {
                 avoidGenerateProm = isMigrationTask[1];
             }
             fireRepositoryPropertyChange(ERepositoryActionName.SAVE.getName(), avoidGenerateProm, item);
-
+        } else {
+            this.repositoryFactoryFromProvider.save(project, item, true);
         }
     }
 
@@ -1737,9 +1800,12 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * @throws PersistenceException
      */
     private void emptyTempFolder(Project project) throws PersistenceException {
-        String str = (System.getProperty("eclipse.home.location") + "temp").substring(5);
-        FilesUtils.deleteFolder(new File(str), false);
-
+    	try {
+            String str = SharedStudioUtils.getTempFolderPath().toPortableString();
+            FilesUtils.deleteFolder(new File(str), false);
+    	}catch (Exception ex) {
+    		ExceptionHandler.process(ex);
+    	}
         long start = System.currentTimeMillis();
         IProject fsProject = ResourceUtils.getProject(project);
         IFolder folder = ResourceUtils.getFolder(fsProject, RepositoryConstants.TEMP_DIRECTORY, false);
@@ -2028,12 +2094,13 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      */
     public void logOnProject(Project project, IProgressMonitor monitor) throws LoginException, PersistenceException {
         try {
-            TimeMeasure.display = CommonsPlugin.isDebugMode();
-            TimeMeasure.displaySteps = CommonsPlugin.isDebugMode();
-            TimeMeasure.measureActive = CommonsPlugin.isDebugMode();
-
-            TimeMeasure.begin("logOnProject"); //$NON-NLS-1$
+            TimeMeasurePerformance.begin("logOnProject", "logon project name '" + project.getLabel()+"'"); //$NON-NLS-1$ //$NON-NLS-2$
             try {
+                /**
+                 * init/check proxy selector, in case default proxy selector is not registed yet
+                 */
+                TalendProxySelector.checkProxy();
+
                 System.getProperties().put("ReadOnlyUser", Boolean.FALSE.toString()); //$NON-NLS-1$
 
                 // remove the auto-build to enhance the build speed and application's use
@@ -2053,6 +2120,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 SubMonitor subMonitor = SubMonitor.convert(monitor, MAX_TASKS);
                 SubMonitor currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
                 currentMonitor.beginTask(Messages.getString("ProxyRepositoryFactory.logonInProgress"), 1); //$NON-NLS-1$
+
                 project.setReferenceProjectProvider(null);
                 getRepositoryContext().setProject(null);
                 initEmfProjectContent();
@@ -2070,10 +2138,35 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 this.repositoryFactoryFromProvider.beforeLogon(project);
                 ProjectManager.getInstance().getBeforeLogonRecords().clear();
                 ProjectManager.getInstance().getUpdatedRemoteHandlerRecords().clear();
+                ILibrariesService librariesService = getLibrariesService();
+                if (librariesService != null) {
+                	librariesService.setForceReloadCustomUri();
+                }
+
+                ProjectDataJsonProvider.checkAndRectifyRelationShipSetting(project.getEmfProject());
+
+                try {
+                    // load additional jdbc
+                    if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericWizardService.class)) {
+                        IGenericWizardService service = GlobalServiceRegister.getDefault()
+                                .getService(IGenericWizardService.class);
+                        if (service != null) {
+                            service.loadAdditionalJDBC();
+                        }
+                    }
+                } catch (Exception e) {
+                    // in case, to avoid block logon
+                    ExceptionHandler.process(e);
+                }
 
                 // init dynamic distirbution after `beforeLogon`, before loading libraries.
                 initDynamicDistribution(monitor);
 
+                if (GlobalServiceRegister.getDefault().isServiceRegistered(IUpdateService.class)) {
+                    IUpdateService updateService = GlobalServiceRegister.getDefault().getService(IUpdateService.class);
+                    updateService.syncComponentM2Jars(currentMonitor);
+                }
+
                 // init sdk component
                 try {
                     currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
@@ -2091,7 +2184,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                     throw new OperationCanceledException(""); //$NON-NLS-1$
                 }
                 // monitorWrap.worked(1);
-                TimeMeasure.step("logOnProject", "beforeLogon"); //$NON-NLS-1$ //$NON-NLS-2$
+                TimeMeasurePerformance.step("logOnProject", "beforeLogon"); //$NON-NLS-1$ //$NON-NLS-2$
 
                 // Check project compatibility
                 checkProjectCompatibility(project);
@@ -2109,7 +2202,15 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                     currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
                     currentMonitor.beginTask(Messages.getString("ProxyRepositoryFactory.synchronizeLibraries"), 1); //$NON-NLS-1$
                     coreService.syncLibraries(currentMonitor);
-                    TimeMeasure.step("logOnProject", "Sync components libraries"); //$NON-NLS-1$
+                    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);
@@ -2118,7 +2219,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 executeMigrations(project, true, currentMonitor);
                 ProjectManager.getInstance().getMigrationRecords().clear();
                 // monitorWrap.worked(1);
-                TimeMeasure.step("logOnProject", "executeMigrations(beforeLogonTasks)"); //$NON-NLS-1$ //$NON-NLS-2$
+                TimeMeasurePerformance.step("logOnProject", "executeMigrations(beforeLogonTasks)"); //$NON-NLS-1$ //$NON-NLS-2$
 
                 currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
                 currentMonitor.beginTask(Messages.getString("ProxyRepositoryFactory.logonInProgress"), 1); //$NON-NLS-1$
@@ -2126,7 +2227,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 this.repositoryFactoryFromProvider.logOnProject(project);
                 ProjectManager.getInstance().getLogonRecords().clear();
                 // monitorWrap.worked(1);
-                TimeMeasure.step("logOnProject", "logOnProject"); //$NON-NLS-1$ //$NON-NLS-2$
+                TimeMeasurePerformance.step("logOnProject", "logOnProject"); //$NON-NLS-1$ //$NON-NLS-2$
 
                 emptyTempFolder(project);
 
@@ -2152,7 +2253,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 ProjectManager.getInstance().getMigrationRecords().clear();
                 executeMigrations(project, false, currentMonitor);
                 ProjectManager.getInstance().getMigrationRecords().clear();
-                TimeMeasure.step("logOnProject", "executeMigrations(afterLogonTasks)"); //$NON-NLS-1$ //$NON-NLS-2$
+                TimeMeasurePerformance.step("logOnProject", "executeMigrations(afterLogonTasks)"); //$NON-NLS-1$ //$NON-NLS-2$
                 if (monitor != null && monitor.isCanceled()) {
                     throw new OperationCanceledException(""); //$NON-NLS-1$
                 }
@@ -2168,12 +2269,12 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                     // clean workspace
                     currentMonitor.beginTask(Messages.getString("ProxyRepositoryFactory.cleanWorkspace"), 1); //$NON-NLS-1$
 
-                    TimeMeasure.step("logOnProject", "clean Java project"); //$NON-NLS-1$ //$NON-NLS-2$
+                    TimeMeasurePerformance.step("logOnProject", "clean Java project"); //$NON-NLS-1$ //$NON-NLS-2$
 
                     if (workspace instanceof Workspace) {
                         ((Workspace) workspace).getFileSystemManager().getHistoryStore().clean(currentMonitor);
                     }
-                    TimeMeasure.step("logOnProject", "clean workspace history"); //$NON-NLS-1$ //$NON-NLS-2$
+                    TimeMeasurePerformance.step("logOnProject", "clean workspace history"); //$NON-NLS-1$ //$NON-NLS-2$
 
                     currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
                     currentMonitor.beginTask(Messages.getString("ProxyRepositoryFactory.synch.repo.items"), 1); //$NON-NLS-1$
@@ -2199,12 +2300,12 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 if (monitor != null && monitor.isCanceled()) {
                     throw new OperationCanceledException(""); //$NON-NLS-1$
                 }
-                TimeMeasure.step("logOnProject", "sync repository (routines/rules/beans)"); //$NON-NLS-1$ //$NON-NLS-2$
+                TimeMeasurePerformance.step("logOnProject", "sync repository (routines/rules/beans)"); //$NON-NLS-1$ //$NON-NLS-2$
 
                 // log4j prefs
                 if (coreUiService != null && coreService != null) {
                     coreService.syncLog4jSettings(null);
-                    TimeMeasure.step("logOnProject", "sync log4j"); //$NON-NLS-1$ //$NON-NLS-2$
+                    TimeMeasurePerformance.step("logOnProject", "sync log4j"); //$NON-NLS-1$ //$NON-NLS-2$
                 }
 
                 try {
@@ -2221,7 +2322,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 if (runProcessService != null && !isCommandLineLocalRefProject) {
                     runProcessService.initializeRootPoms(monitor);
 
-                    TimeMeasure.step("logOnProject", "install / setup root poms"); //$NON-NLS-1$ //$NON-NLS-2$
+                    TimeMeasurePerformance.step("logOnProject", "install / setup root poms"); //$NON-NLS-1$ //$NON-NLS-2$
                 }
                 if (GlobalServiceRegister.getDefault().isServiceRegistered(ITDQRepositoryService.class)) {
                     ITDQRepositoryService tdqRepositoryService = GlobalServiceRegister.getDefault()
@@ -2230,13 +2331,15 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                         tdqRepositoryService.initProxyRepository();
                     }
                 }
+                // regenerate relationship index
+                if (project.getEmfProject().getItemsRelations().isEmpty()) {
+                    RelationshipItemBuilder.getInstance().buildAndSaveIndex();
+                }
+
                 fullLogonFinished = true;
                 this.repositoryFactoryFromProvider.afterLogon(monitor);
             } finally {
-                TimeMeasure.end("logOnProject"); //$NON-NLS-1$
-                TimeMeasure.display = false;
-                TimeMeasure.displaySteps = false;
-                TimeMeasure.measureActive = false;
+                TimeMeasurePerformance.end("logOnProject"); //$NON-NLS-1$
             }
             String str[] = new String[] { getRepositoryContext().getUser() + "", projectManager.getCurrentProject() + "" }; //$NON-NLS-1$ //$NON-NLS-2$
             log.info(Messages.getString("ProxyRepositoryFactory.log.loggedOn", str)); //$NON-NLS-1$
@@ -2409,9 +2512,14 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
     @Override
     @SuppressWarnings("unchecked")
     public void executeRepositoryWorkUnit(RepositoryWorkUnit workUnit) {
+        checkProxySettings();
         this.repositoryFactoryFromProvider.executeRepositoryWorkUnit(workUnit);
     }
 
+    private void checkProxySettings() {
+        TalendProxySelector.checkProxy();
+    }
+
     @Override
     public void unloadResources(Property property) throws PersistenceException {
         repositoryFactoryFromProvider.unloadResources(property);
@@ -2632,4 +2740,13 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
     public RepositoryWorkUnit getWorkUnitInProgress() {
         return repositoryFactoryFromProvider.getWorkUnitInProgress();
     }
+
+    public void executeRequiredLoginTasks(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
+        ILoginTask[] allLoginTasks = LOGIN_TASK_REGISTRY_READER.getAllTaskListInstance();
+        for (ILoginTask task : allLoginTasks) {
+            if (task.isRequiredAlways()) {
+                task.run(monitor);
+            }
+        }
+    }
 }

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/dnd/SalesforceComponentDndFilter.java

@@ -12,10 +12,14 @@
 // ============================================================================
 package org.talend.core.repository.model.dnd;
 
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
+import org.talend.core.GlobalServiceRegister;
 import org.talend.core.model.components.IComponent;
+import org.talend.core.model.components.IComponentsService;
+import org.talend.core.model.properties.ConnectionItem;
 import org.talend.core.model.properties.Item;
 import org.talend.core.model.properties.SalesforceSchemaConnectionItem;
 import org.talend.core.model.repository.ERepositoryObjectType;
@@ -28,6 +32,8 @@ import org.talend.repository.model.RepositoryNode;
  */
 public class SalesforceComponentDndFilter extends DefaultRepositoryComponentDndFilter {
 
+    public static final String SALSEFORCE = "salesforce"; //$NON-NLS-1$
+
     public static final String COMPONENT_T_SALSEFORCE_CONNECTION = "tSalesforceConnection"; //$NON-NLS-1$
 
     public static final String COMPONENT_T_SALSEFORCE_WAVE_BULK_EXEC = "tSalesforceWaveBulkExec"; //$NON-NLS-1$
@@ -98,7 +104,16 @@ public class SalesforceComponentDndFilter extends DefaultRepositoryComponentDndF
                     }
                 }
             }
-
+        }
+        if (item instanceof ConnectionItem && SALSEFORCE.equalsIgnoreCase(((ConnectionItem) item).getTypeName())) {
+            // Special for Javajet components: tSalesforceEinsteinBulkExec/tSalesforceEinsteinOutputBulkExec
+            IComponentsService service = GlobalServiceRegister.getDefault().getService(IComponentsService.class);
+            Collection<IComponent> componentAll = service.getComponentsFactory().readComponents();
+            for (IComponent component : componentAll) {
+                if (component.getName().startsWith("tSalesforceEinstein") && !components.contains(component)) { //$NON-NLS-1$
+                    components.add(component);
+                }
+            }
         }
         return components;
     }

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

@@ -14,6 +14,7 @@ package org.talend.core.repository.recyclebin;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
@@ -24,6 +25,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.emf.common.util.EList;
@@ -106,7 +108,8 @@ public class RecycleBinManager {
         List<IRepositoryViewObject> deletedObjects = new ArrayList<IRepositoryViewObject>();
         final EList<TalendItem> deletedItems = projectRecyclebins.get(project.getTechnicalLabel()).getDeletedItems();
         List<TalendItem> notDeletedItems = new ArrayList<TalendItem>();
-        for (TalendItem deletedItem : deletedItems) {
+        List<TalendItem> dup_deletedItems = new ArrayList<>(deletedItems);
+        for (TalendItem deletedItem : dup_deletedItems) {
             try {
                 final ERepositoryObjectType type = ERepositoryObjectType.getType(deletedItem.getType());
                 // ignore the generated doc in recycle bin
@@ -274,7 +277,40 @@ public class RecycleBinManager {
                 resource = createRecycleBinResource(project);
             }
             resource.getContents().clear();
-            recycleBin.setLastUpdate(new Date());
+            EList<String> deletedFolders = recycleBin.getDeletedFolders();
+            if (deletedFolders != null) {
+                List<String> folders = new LinkedList<>(deletedFolders);
+                Collections.sort(folders);
+                deletedFolders.clear();
+                deletedFolders.addAll(folders);
+            }
+            EList<TalendItem> deletedItems = recycleBin.getDeletedItems();
+            if (deletedItems != null) {
+                List<TalendItem> items = new LinkedList<>(deletedItems);
+                items.sort((l, r) -> {
+                    if (l == null && r == null) {
+                        return 0;
+                    } else if (l == null) {
+                        return -1;
+                    } else if (r == null) {
+                        return 1;
+                    }
+                    int result = StringUtils.compare(l.getType(), r.getType());
+                    if (result != 0) {
+                        return result;
+                    }
+                    result = StringUtils.compare(l.getPath(), r.getPath());
+                    if (result != 0) {
+                        return result;
+                    }
+                    return StringUtils.compare(l.getId(), r.getId());
+                });
+                deletedItems.clear();
+                deletedItems.addAll(items);
+            }
+
+            // set date to null to avoid timezone conflict
+            recycleBin.setLastUpdate(null);
             resource.getContents().add(recycleBin);
             EmfHelper.saveResource(resource);
             lastSavedRecycleBinMap.put(recycleBin, EcoreUtil.copy(recycleBin));

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/ui/dialog/PastSelectorDialog.java

@@ -13,6 +13,8 @@
 package org.talend.core.repository.ui.dialog;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -30,12 +32,14 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.TableItem;
+import org.talend.commons.exception.PersistenceException;
 import org.talend.core.GlobalServiceRegister;
 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.IRepositoryObject;
 import org.talend.core.model.repository.IRepositoryViewObject;
+import org.talend.core.repository.utils.RepositoryNodeSortUtil;
 import org.talend.core.ui.ITestContainerProviderService;
 import org.talend.repository.model.RepositoryNode;
 import org.talend.repository.model.IRepositoryNode.EProperties;
@@ -107,7 +111,8 @@ public class PastSelectorDialog extends Dialog {
         modificationTime.setWidth(200);
         modificationTime.setText("Modification Time");
 
-        for (IRepositoryViewObject object : versions) {
+        RepositoryNodeSortUtil util = new RepositoryNodeSortUtil();
+        for (IRepositoryViewObject object : util.getSortVersion(versions)) {
             TableItem item = new TableItem(table, SWT.NONE);
             item.setData(object);
             item.setText(0, object.getVersion());
@@ -187,7 +192,7 @@ public class PastSelectorDialog extends Dialog {
         });
         return composite;
     }
-
+    
     public Set<IRepositoryViewObject> getSelectedVersionItems() {
         return this.selectedVersionItems;
     }

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

@@ -22,6 +22,7 @@ import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
@@ -32,6 +33,7 @@ import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
+import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.utils.workbench.resources.ResourceUtils;
 import org.talend.core.model.properties.ImplicitContextSettings;
@@ -43,6 +45,7 @@ import org.talend.core.model.properties.Project;
 import org.talend.core.model.properties.StatAndLogsSettings;
 import org.talend.core.model.properties.Status;
 import org.talend.core.model.properties.impl.PropertiesFactoryImpl;
+import org.talend.core.model.relationship.RelationshipItemBuilder;
 import org.talend.core.repository.constants.FileConstants;
 import org.talend.core.repository.recyclebin.RecycleBinManager;
 import org.talend.designer.core.model.utils.emf.talendfile.ElementParameterType;
@@ -140,9 +143,10 @@ public class ProjectDataJsonProvider {
             ProjectDataJsonProvider.loadProjectSettings(project, input);
         }
         IPath relationShipPath = settingFolderPath.append(FileConstants.RELATIONSHIP_FILE_NAME);
-        input = inputStreamProvider.getStream(relationShipPath);
-        if (input != null) {
-            ProjectDataJsonProvider.loadRelationShips(project, input);
+        try (InputStream is = inputStreamProvider.getStream(relationShipPath)) {
+            if (is != null) {
+                ProjectDataJsonProvider.loadRelationShips(project, is);
+            }
         }
         IPath migrationTaskPath = settingFolderPath.append(FileConstants.MIGRATION_TASK_FILE_NAME);
         input = inputStreamProvider.getStream(migrationTaskPath);
@@ -184,10 +188,11 @@ public class ProjectDataJsonProvider {
     private static void loadRelationShips(Project project, IPath projectFolderPath) throws PersistenceException {
         File file = getLoadingConfigurationFile(projectFolderPath, FileConstants.RELATIONSHIP_FILE_NAME);
         if (file != null && file.exists()) {
-            try {
-                loadRelationShips(project, new FileInputStream(file));
-            } catch (FileNotFoundException e) {
-                throw new PersistenceException(e);
+            try (FileInputStream fis = new FileInputStream(file)) {
+                loadRelationShips(project, fis);
+            } catch (Exception e) {
+                // ignore
+                ExceptionHandler.process(e);
             }
         }
     }
@@ -206,11 +211,72 @@ public class ProjectDataJsonProvider {
                     project.getItemsRelations().add(json.toEmfObject());
                 }
             }
+        } catch (Exception e) {
+            // ignore
+            ExceptionHandler.process(e);
+        }
+    }
+
+    public static void checkAndRectifyRelationShipSetting(Project project) throws PersistenceException {
+        File file = getSavingConfigurationFile(project.getTechnicalLabel(), FileConstants.RELATIONSHIP_FILE_NAME);
+        if (file == null || !file.exists()) {
+            return;
+        }
+
+        List<ItemRelationsJson> itemRelationsJsonsList = null;
+        TypeReference<List<ItemRelationsJson>> typeReference = new TypeReference<List<ItemRelationsJson>>() {
+        };
+        FileInputStream input = null;
+        try {
+            input = new FileInputStream(file);
+            itemRelationsJsonsList = new ObjectMapper().readValue(new FileInputStream(file), typeReference);
         } catch (Exception e) {
             throw new PersistenceException(e);
         } finally {
             closeInputStream(input);
         }
+
+        if (itemRelationsJsonsList == null || itemRelationsJsonsList.isEmpty()) {
+            return;
+        }
+
+        Set<String> idVersionSet = new HashSet<String>();
+        List<ItemRelationsJson> relationJsonList = new ArrayList<ItemRelationsJson>();
+        Map<String, String> currentSystemRoutinesMap = RelationshipItemBuilder.getInstance().getCurrentSystemRoutinesMap();
+        boolean needModify = false;
+        for (ItemRelationsJson relationJson : itemRelationsJsonsList) {
+            ItemRelationJson baseItem = relationJson.getBaseItem();
+            String idversion = baseItem.getId() + ";" + baseItem.getVersion();
+            if (idVersionSet.contains(idversion)) {
+                // in case duplicate
+                needModify = true;
+                continue;
+            }
+            // remove system routines relation
+            int originalSize = relationJson.getRelatedItems().size();
+            relationJson.getRelatedItems()
+                    .removeIf(relatedItem -> RelationshipItemBuilder.ROUTINE_RELATION.equals(relatedItem.getType())
+                            && currentSystemRoutinesMap.containsValue(relatedItem.getId()));
+            if (relationJson.getRelatedItems().size() != originalSize) {
+                needModify = true;
+            }
+            if (!relationJson.getRelatedItems().isEmpty()) {
+                relationJsonList.add(relationJson);
+            }
+            idVersionSet.add(idversion);
+        }
+
+        if (needModify) {
+            // re-load to project
+            if (relationJsonList != null && !relationJsonList.isEmpty()) {
+                project.getItemsRelations().clear();
+                for (ItemRelationsJson json : relationJsonList) {
+                    project.getItemsRelations().add(json.toEmfObject());
+                }
+            }
+            // re-save relationship setting json file
+            saveRelationShips(project);
+        }
     }
 
     private static void loadMigrationTaskSetting(Project project, IPath projectFolderPath) throws PersistenceException {

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

@@ -0,0 +1,47 @@
+// ============================================================================
+//
+// 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.repository.utils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import org.talend.commons.utils.Version;
+import org.talend.core.model.repository.IRepositoryViewObject;
+
+/**
+ * @author hwang
+ *
+ */
+public class RepositoryNodeSortUtil {
+
+	public List<IRepositoryViewObject> getSortVersion(List<IRepositoryViewObject> versions) {
+    	List<IRepositoryViewObject> temp = new ArrayList<IRepositoryViewObject>();
+        temp.addAll(versions);
+        
+        Collections.sort(temp, new Comparator<IRepositoryViewObject>() {
+
+            @Override
+            public int compare(IRepositoryViewObject o1, IRepositoryViewObject o2) {
+                String version1 = o1.getVersion();
+                String version2 = o2.getVersion();
+                if(version1 != null && version2 != null) {
+                	return new Version(version1).compareTo(new Version(version2));
+                }
+                return 0;
+            }
+        });
+        return temp;
+    }
+}

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

@@ -205,6 +205,27 @@ 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.repository/src/main/java/org/talend/core/repository/utils/XmiResourceManager.java

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

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

@@ -28,6 +28,7 @@ Export-Package: org.talend.commons.utils.generation,
  org.talend.core.model.business,
  org.talend.core.model.components,
  org.talend.core.model.context,
+ org.talend.core.model.context.link,
  org.talend.core.model.general,
  org.talend.core.model.genhtml,
  org.talend.core.model.metadata,
@@ -121,7 +122,8 @@ 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.jackson,
+ org.talend.libraries.apache.common
 Bundle-Activator: org.talend.core.runtime.CoreRuntimePlugin
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,

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

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

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

@@ -40,7 +40,7 @@
 			<dbType type="SET" ignoreLen="true" ignorePre="true" />
 			<dbType type="TEXT" ignoreLen="true" ignorePre="true" />
 			<dbType type="TIME" ignoreLen="true" ignorePre="true" />
-			<dbType type="TIMESTAMP" ignoreLen="true" ignorePre="true" />
+			<dbType type="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" />

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

@@ -0,0 +1,288 @@
+<?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/mappings/mapping_Sybase.xml

@@ -9,13 +9,14 @@
 			<dbType type="CHAR" defaultLength="50" ignorePre="true"/>
 			<dbType type="CHARACTER" ignoreLen="true" ignorePre="true" />
 			<dbType type="CHARACTER VARYING" ignoreLen="true" ignorePre="true" />
-			<dbType type="DATE" ignoreLen="true" ignorePre="true" />
+			<dbType type="DATE" ignoreLen="true" ignorePre="true" defaultPattern="dd-MM-yyyy" />
 			<dbType type="DATETIME" ignoreLen="true" ignorePre="true" />
 			<dbType type="DECIMAL" defaultLength="20" defaultPrecision="10" />
 			<dbType type="DOUBLE PRECISION" ignoreLen="true" ignorePre="true" />
             <dbType type="UNSIGNED INT" ignoreLen="true" ignorePre="true" />
 			<dbType type="FLOAT" ignoreLen="true" ignorePre="true" />
 			<dbType type="INT" ignoreLen="true" ignorePre="true" />
+			<dbType type="INTEGER" defaultLength="10" ignorePre="false"  />
 			<dbType type="NUMERIC" defaultLength="20" defaultPrecision="10"/>
 			<dbType type="REAL" />
 			<dbType type="SMALLINT" ignoreLen="true" ignorePre="true" />
@@ -175,6 +176,11 @@
 					<talendType type="id_Short"/>
 					<talendType type="id_Long"/>
 				</dbType>
+   <dbType type="INTEGER">
+    <talendType type="id_Integer" default="true" />
+    <talendType type="id_Short"/>
+    <talendType type="id_Long"/>
+   </dbType>
 				<dbType type="NUMERIC">
 					<talendType type="id_Double"/>
 					<talendType type="id_Float"/>

main/plugins/org.talend.core.runtime/mappings/mapping_validate.xsd

@@ -100,6 +100,11 @@
 					<xs:restriction base="xs:short"/>
 				</xs:simpleType>
 			</xs:attribute>
+			<xs:attribute name="defaultPattern">
+    <xs:simpleType>
+     <xs:restriction base="xs:string"/>
+    </xs:simpleType>
+   </xs:attribute>
 			<xs:attribute name="default" type="xs:boolean"/>
 		</xs:complexType>
 	</xs:element>