feature(TUP-24029):[FTP] Connection wizard add timeout property #2684

This reverts commit 992e01de37.

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<feature id="org.talend.babel.all.tos.feature" label="Babel feature with all languages for TOS" version="7.2.2.qualifier"> 
+<feature id="org.talend.babel.all.tos.feature" label="Babel feature with all languages for TOS" version="7.3.1.qualifier"> 
   <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
   <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
   <license url="http://www.example.com/license">[Enter License Description here.]</license>  

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   

i18n/plugins/org.talend.common.ui.runtime.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.common.ui.runtime.nl
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Fragment-Host: org.talend.common.ui.runtime

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.common.ui.runtime.nl</artifactId>

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

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.commons.runtime.nl
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Fragment-Host: org.talend.commons.runtime

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.commons.runtime.nl</artifactId>

i18n/plugins/org.talend.commons.ui.nl/META-INF/MANIFEST.MF

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Commons UI Nl Fragment
 Bundle-SymbolicName: org.talend.commons.ui.nl
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Fragment-Host: org.talend.commons.ui
 Bundle-Vendor: .Talend SA.

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.commons.ui.nl</artifactId>

i18n/plugins/org.talend.core.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.core.nl Fragment
 Bundle-SymbolicName: org.talend.core.nl
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.core
 Bundle-Localization: plugin

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.core.nl</artifactId>

i18n/plugins/org.talend.core.repository.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.core.repository.nl
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Fragment-Host: org.talend.core.repository

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.core.repository.nl</artifactId>

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

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.core.runtime.nl
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Fragment-Host: org.talend.core.runtime

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.core.runtime.nl</artifactId>

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

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.core.ui.nl
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.core.ui

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.core.ui.nl</artifactId>

i18n/plugins/org.talend.cwm.mip.edit.nl/META-INF/MANIFEST.MF

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.cwm.mip.edit.nl
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Fragment-Host: org.talend.cwm.mip.edit
 Bundle-Vendor: .Talend SA.

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.cwm.mip.edit.nl</artifactId>

i18n/plugins/org.talend.cwm.mip.nl/META-INF/MANIFEST.MF

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.cwm.mip.nl
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Fragment-Host: org.talend.cwm.mip
 Bundle-Vendor: .Talend SA.

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.cwm.mip.nl</artifactId>

i18n/plugins/org.talend.designer.maven.ui.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Designer Maven UI NL
 Bundle-SymbolicName: org.talend.designer.maven.ui.nl
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Fragment-Host: org.talend.designer.maven.ui
 Bundle-Vendor: .Talend SA.
 Bundle-Localization: plugin

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.maven.ui.nl</artifactId>

i18n/plugins/org.talend.help.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.help.Nl Fragment
 Bundle-SymbolicName: org.talend.help.nl
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.help
 Bundle-Localization: plugin

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.help.nl</artifactId>

i18n/plugins/org.talend.helpers.nl/META-INF/MANIFEST.MF

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.helpers.nl Fragment
 Bundle-SymbolicName: org.talend.helpers.nl
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Fragment-Host: org.talend.helpers
 Bundle-Vendor: .Talend SA.

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.helpers.nl</artifactId>

i18n/plugins/org.talend.librariesmanager.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.librariesmanager Nl Fragment
 Bundle-SymbolicName: org.talend.librariesmanager.nl
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Fragment-Host: org.talend.librariesmanager
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.librariesmanager.nl</artifactId>

i18n/plugins/org.talend.librariesmanager.ui.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.librariesmanager.ui.nl
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Fragment-Host: org.talend.librariesmanager.ui

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.librariesmanager.ui.nl</artifactId>

i18n/plugins/org.talend.metadata.managment.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.metadata.managment.nl
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Fragment-Host: org.talend.metadata.managment

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.metadata.managment.nl</artifactId>

i18n/plugins/org.talend.metadata.managment.ui.nl/META-INF/MANIFEST.MF

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Metadata Managment UI Nl Fragment
 Bundle-SymbolicName: org.talend.metadata.managment.ui.nl
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Fragment-Host: org.talend.metadata.managment.ui
 Bundle-Vendor: .Talend SA.

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.metadata.managment.ui.nl</artifactId>

i18n/plugins/org.talend.migrationTool.nl/META-INF/MANIFEST.MF

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: MigrationTool Plug-in nl fragment
 Bundle-SymbolicName: org.talend.migrationTool.nl
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.migrationTool

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.migrationTool.nl</artifactId>

i18n/plugins/org.talend.model.edit.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName Nl Fragment
 Bundle-SymbolicName: org.talend.model.edit.nl
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Fragment-Host: org.talend.model.edit
 Bundle-Localization: plugin
 Bundle-Vendor: %providerName

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.model.edit.nl</artifactId>

i18n/plugins/org.talend.model.migration.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.model.migration.nl
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Fragment-Host: org.talend.model.migration

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.model.migration.nl</artifactId>

i18n/plugins/org.talend.model.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.model.Nl Fragment
 Bundle-SymbolicName: org.talend.model.nl
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.model
 Bundle-Localization: plugin

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.model.nl</artifactId>

i18n/plugins/org.talend.presentation.onboarding.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NL
 Bundle-SymbolicName: org.talend.presentation.onboarding.nl
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Fragment-Host: org.talend.presentation.onboarding

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.presentation.onboarding.nl</artifactId>

i18n/plugins/org.talend.rcp.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.rcp.nl
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Fragment-Host: org.talend.rcp
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.rcp.nl</artifactId>

i18n/plugins/org.talend.registration.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.registration.nl
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Fragment-Host: org.talend.registration

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.registration.nl</artifactId>

i18n/plugins/org.talend.repository.items.importexport.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.repository.items.importexport.nl
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Fragment-Host: org.talend.repository.items.importexport

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.items.importexport.nl</artifactId>

i18n/plugins/org.talend.repository.items.importexport.ui.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.repository.items.importexport.ui.nl
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Fragment-Host: org.talend.repository.items.importexport.ui

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.items.importexport.ui.nl</artifactId>

i18n/plugins/org.talend.repository.localprovider.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Local repository Plug-in Nl Fragment
 Bundle-SymbolicName: org.talend.repository.localprovider.nl
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Fragment-Host: org.talend.repository.localprovider
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.localprovider.nl</artifactId>

i18n/plugins/org.talend.repository.mdm.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.repository.mdm.nl
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Fragment-Host: org.talend.repository.mdm

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.mdm.nl</artifactId>

i18n/plugins/org.talend.repository.metadata.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.repository.metadata.nl
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Fragment-Host: org.talend.repository.metadata

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.metadata.nl</artifactId>

i18n/plugins/org.talend.repository.view.nl/META-INF/MANIFEST.MF

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.repository.view.nl
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Fragment-Host: org.talend.repository.view
 Bundle-Vendor: .Talend SA.

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.view.nl</artifactId>

i18n/plugins/org.talend.resources.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.resources.nl
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Fragment-Host: org.talend.resources

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.resources.nl</artifactId>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<feature id="org.talend.commons.feature" label="Commons Feature" version="7.2.2.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.commons.feature" label="Commons Feature" version="7.3.1.qualifier" provider-name=".Talend SA."> 
   <description url="http://www.talend.com/online/featuresdescription.html#commons-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#commons-feature</description>  
   <copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>  
   <license>The licence are describe in branding feature</license>  

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.commons.feature</artifactId>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<feature id="org.talend.core.feature" label="Core Feature" version="7.2.2.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.core.feature" label="Core Feature" version="7.3.1.qualifier" provider-name=".Talend SA."> 
   <description url="http://www.talend.com/online/featuresdescription.html#core-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#core-feature</description>  
   <copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>  
   <license>The licence are describe in branding feature</license>  

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.core.feature</artifactId>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.fragment.jars.common.feature"
       label="Fragment Jars in Common"
-      version="7.2.2.qualifier">
+      version="7.3.1.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.fragment.jars.common.feature</artifactId>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<feature id="org.talend.help.feature" label="Help Feature" version="7.2.2.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.help.feature" label="Help Feature" version="7.3.1.qualifier" provider-name=".Talend SA."> 
   <description url="http://www.talend.com/online/featuresdescription.html#help-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#help-feature</description>  
   <copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>  
   <license>The licence are describe in branding feature</license>  

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.help.feature</artifactId>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<feature id="org.talend.jdt.feature" label="Feature" version="7.2.2.qualifier"> 
+<feature id="org.talend.jdt.feature" label="Feature" version="7.3.1.qualifier"> 
   <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
   <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
   <license url="http://www.example.com/license">[Enter License Description here.]</license>  

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.jdt.feature</artifactId>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<feature id="org.talend.libraries.jdbc.feature" label="Jdbc_feature Feature" version="7.2.2.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.libraries.jdbc.feature" label="Jdbc_feature Feature" version="7.3.1.qualifier" provider-name=".Talend SA."> 
   <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
   <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
   <license url="http://www.example.com/license">[Enter License Description here.]</license>  

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.libraries.jdbc.feature</artifactId>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<feature id="org.talend.m2e.feature" label="Feature" version="7.2.2.qualifier"> 
+<feature id="org.talend.m2e.feature" label="Feature" version="7.3.1.qualifier"> 
   <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
   <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
   <license url="http://www.example.com/license">[Enter License Description here.]</license>  

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.m2e.feature</artifactId>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.model.migration.feature"
       label="model Migration feature"
-      version="7.2.2.qualifier">
+      version="7.3.1.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.model.migration.feature</artifactId>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<feature id="org.talend.platform.feature" label="Platform" version="7.2.2.qualifier"> 
+<feature id="org.talend.platform.feature" label="Platform" version="7.3.1.qualifier"> 
   <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
   <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
   <license url="http://www.example.com/license">[Enter License Description here.]</license>  

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   

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

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.rcp.feature"
       label="RCP Feature"
-      version="7.2.2.qualifier"
+      version="7.3.1.qualifier"
       provider-name=".Talend SA.">
 
    <description url="http://www.talend.com/online/featuresdescription.html#rcp-feature">

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.rcp.feature</artifactId>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<feature id="org.talend.update.p2.feature" label="P2-feature" version="7.2.2.qualifier"> 
+<feature id="org.talend.update.p2.feature" label="P2-feature" version="7.3.1.qualifier"> 
   <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
   <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
   <license url="http://www.example.com/license">[Enter License Description here.]</license>  

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.update.p2.feature</artifactId>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<feature id="org.talend.updates.feature" label="Updates-feature" version="7.2.2.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.updates.feature" label="Updates-feature" version="7.3.1.qualifier" provider-name=".Talend SA."> 
   <copyright url="http://www.talend.com/about-us">[Enter Copyright Description here.]</copyright>  
   <plugin id="org.talend.updates.runtime" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 </feature>

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.updates.feature</artifactId>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<feature id="org.talend.utils.feature" label="Utils_feature Feature" version="7.2.2.qualifier"> 
+<feature id="org.talend.utils.feature" label="Utils_feature Feature" version="7.3.1.qualifier"> 
   <description url="http://www.example.com/description">This feature contains the Talend utilities plugin and its dependencies.</description>  
   <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
   <license url="http://www.example.com/license">[Enter License Description here.]</license>  
@@ -20,8 +20,10 @@
     <import plugin="org.apache.servicemix.bundles.avro" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.junit" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.slf4j.api" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.apache.commons.configuration" version="2.0.0" match="greaterOrEqual"/>
   </requires>  
   <plugin id="org.talend.daikon" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
   <plugin id="org.talend.daikon.exception" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.daikon.crypto.utils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
   <plugin id="org.talend.utils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 </feature>

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.utils.feature</artifactId>

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

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common UI runtime Plug-in
 Bundle-SymbolicName: org.talend.common.ui.runtime;singleton:=true
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Require-Bundle: org.eclipse.core.runtime,
  org.apache.commons.collections,
  org.talend.libraries.dom4j-jaxen,

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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</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,7 +21,6 @@ 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;
@@ -39,8 +38,6 @@ 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);
@@ -150,21 +147,4 @@ 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.commons.runtime/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common Runtime Plug-in
 Bundle-SymbolicName: org.talend.commons.runtime;singleton:=true
-Bundle-Version: 7.2.2.qualifier
+Bundle-Version: 7.3.1.qualifier
 Require-Bundle: org.apache.log4j;visibility:=reexport,
  org.apache.commons.beanutils,
  org.apache.commons.collections,
@@ -13,8 +13,7 @@ Require-Bundle: org.apache.log4j;visibility:=reexport,
  org.talend.libraries.apache,
  com.ibm.icu,
  org.apache.commons.io,
- org.talend.utils,
- org.eclipse.core.net
+ org.talend.utils
 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.2.2-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</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.2.2-SNAPSHOT</version>
+        <version>7.3.1-SNAPSHOT</version>
         <relativePath>../pom_server.xml</relativePath>
     </parent>
 

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

@@ -17,7 +17,6 @@ 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;
@@ -25,7 +24,6 @@ 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;
@@ -57,8 +55,6 @@ 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;
     }
@@ -180,13 +176,4 @@ 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/i18n/internal/messages.properties

@@ -58,6 +58,3 @@ AS400ResultSet.unknowCloumn=Invalid argument\: unknown column name
 AS400ResultSet.parameterIndex=Invalid argument\: parameter index
 AS400ResultSet.outofRange=\ is out of range.
 ITaCoKitService.exception.multipleInstance=More than one instance found: {0}
-TalendProxySelector.exception.badUriMap=Bad uri map: {0}
-TalendProxySelector.exception.proxySelectionError=Error occurs when selecting proxy for {0}
-

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

@@ -19,7 +19,6 @@ import java.io.InputStream;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Properties;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.commons.lang3.StringUtils;
@@ -193,27 +192,6 @@ public class VersionUtils {
         return talendVersion;
     }
 
-    public static String getTalendPureVersion(String fullProductVersion) {
-        String version = fullProductVersion;
-        String[] splitStr = fullProductVersion.split("-"); //$NON-NLS-1$
-        Pattern pattern = Pattern.compile("((\\d+\\.){2}\\d.*)"); //$NON-NLS-1$
-        StringBuffer versionStr = new StringBuffer();
-        boolean find = false;
-        for (String str : splitStr) {
-            if (find) {
-                versionStr.append("-").append(str); //$NON-NLS-1$
-            }else {
-                Matcher matcher = pattern.matcher(str);
-                if (matcher.find()) {
-                    find = true;
-                    versionStr.append(str); // $NON-NLS-1$
-                }
-            }
-        }
-
-        return getTalendVersion(versionStr.toString());
-    }
-
     public static String getTalendVersion(String productVersion) {
         try {
             org.osgi.framework.Version v = new org.osgi.framework.Version(productVersion);

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/database/Sybase16SADatabaseMetaData.java

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

@@ -44,8 +44,6 @@ public class NetworkUtil {
 
     private static final String HTTP_NETWORK_URL = "https://talend-update.talend.com";
 
-    public static final String ORG_TALEND_DESIGNER_CORE = "org.talend.designer.core"; //$NON-NLS-1$
-
     public static boolean isNetworkValid() {
         String disableInternet = System.getProperty(TALEND_DISABLE_INTERNET);
         if ("true".equals(disableInternet)) { //$NON-NLS-1$
@@ -94,28 +92,6 @@ public class NetworkUtil {
 
                 @Override
                 protected PasswordAuthentication getPasswordAuthentication() {
-                    String httpProxyHost = System.getProperty("http.proxyHost"); //$NON-NLS-1$
-                    String httpProxyPort = System.getProperty("http.proxyPort"); //$NON-NLS-1$
-                    String httpsProxyHost = System.getProperty("https.proxyHost"); //$NON-NLS-1$
-                    String httpsProxyPort = System.getProperty("https.proxyPort"); //$NON-NLS-1$
-                    String requestingHost = getRequestingHost();
-                    int requestingPort = getRequestingPort();
-                    String proxyHost = null;
-                    String proxyPort = null;
-                    boolean isHttp = false;
-                    if ("http".equalsIgnoreCase(getRequestingScheme())) {
-                        isHttp = true;
-                    }
-                    if (isHttp && StringUtils.isNotBlank(httpProxyHost)) {
-                        proxyHost = httpProxyHost;
-                        proxyPort = httpProxyPort;
-                    } else {
-                        proxyHost = httpsProxyHost;
-                        proxyPort = httpsProxyPort;
-                    }
-                    if (!StringUtils.equals(proxyHost, requestingHost) || !StringUtils.equals(proxyPort, "" + requestingPort)) {
-                        return null;
-                    }
                     String httpProxyUser = System.getProperty("http.proxyUser"); //$NON-NLS-1$
                     String httpProxyPassword = System.getProperty("http.proxyPassword"); //$NON-NLS-1$
                     String httpsProxyUser = System.getProperty("https.proxyUser"); //$NON-NLS-1$
@@ -133,11 +109,7 @@ public class NetworkUtil {
                             proxyPassword = httpsProxyPassword.toCharArray();
                         }
                     }
-                    if (StringUtils.isBlank(proxyUser)) {
-                        return null;
-                    } else {
-                        return new PasswordAuthentication(proxyUser, proxyPassword);
-                    }
+                    return new PasswordAuthentication(proxyUser, proxyPassword);
                 }
 
             });

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

@@ -13,211 +13,37 @@
 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;
 import java.net.ProxySelector;
 import java.net.SocketAddress;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 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.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
  */
 public class TalendProxySelector extends ProxySelector {
 
-    public static final String PROP_PRINT_LOGS = "talend.studio.proxy.printLogs";
-
     private static final String ECLIPSE_PROXY_SELECTOR = ".EclipseProxySelector"; //$NON-NLS-1$
 
-    private static final String PROP_ALLOW_PROXY_REDIRECT = "talend.studio.proxy.allowProxyRedirect";
+    private ProxySelector defaultSelector;
 
-    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_PROVIDER = "talend.studio.proxy.disableDefaultSelectorProvider";
-
-    /**
-     * Example: update.talend.com,socket:http,https:http;nexus.talend.com,socket,http;,socket:http
-     */
-    private static final String PROP_PROXY_MAP_HOST_DEFAULT = "";
-
-    /**
-     * Example: svn.company.com;nexus.company.com
-     */
-    private static final String PROP_ALLOW_PROXY_REDIRECT_EXCLUDE_DEFAULT = "";
-
-    private static final String KEY_DEFAULT = ":default:";
-
-    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;
-
-    final private Map<Object, Collection<IProxySelectorProvider>> selectorProviders;
-
-    private Map<String, Map<String, String>> hostMap;
-
-    private Set<String> redirectWhiteList;
+    final private List<IProxySelectorProvider> selectorProviders;
 
     private volatile static TalendProxySelector instance;
 
     private static Object instanceLock = new Object();
 
-    private boolean printProxyLog = false;
-
-    private boolean allowProxyRedirect = false;
-
-    private boolean disableDefaultSelectorProvider = false;
-
-    private boolean validateUri = true;
-
-    private boolean executeConnectionFailed = true;
-
-    private boolean updateSystemPropertiesForJre = true;
-
-    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()));
-        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()));
-
-        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;
-        }
-
-        initHostMap();
-        initRedirectList();
-    }
-
-    private void initHostMap() {
-        try {
-            hostMap = new HashMap<>();
-            String property = System.getProperty(PROP_PROXY_HOST_MAP, PROP_PROXY_MAP_HOST_DEFAULT);
-            if (StringUtils.isEmpty(property)) {
-                return;
-            }
-            String[] splits = property.split(";");
-            for (String split : splits) {
-                try {
-                    int index = split.indexOf(',');
-                    String uri = split.substring(0, index);
-                    String key = StringUtils.strip(uri);
-                    if (StringUtils.isBlank(key)) {
-                        key = KEY_DEFAULT;
-                    }
-                    key = key.toLowerCase();
-                    Map<String, String> protocolMap = hostMap.get(key);
-                    if (protocolMap == null) {
-                        protocolMap = new HashMap<>();
-                        hostMap.put(key, protocolMap);
-                    }
-                    int protocolMapIndex = index + 1;
-                    String protocolMapStr = split.substring(protocolMapIndex);
-                    String[] entry = protocolMapStr.split(",");
-                    for (String pMap : entry) {
-                        try {
-                            String[] mapEntry = pMap.split(":");
-                            if (mapEntry.length != 2) {
-                                ExceptionHandler.process(
-                                        new Exception(Messages.getString("TalendProxySelector.exception.badUriMap", pMap)));
-                                continue;
-                            }
-                            protocolMap.put(mapEntry[0].toLowerCase(), mapEntry[1].toLowerCase());
-                        } catch (Exception e) {
-                            ExceptionHandler.process(e);
-                        }
-                    }
-                } catch (Exception e) {
-                    ExceptionHandler.process(e);
-                }
-            }
-        } catch (Exception e) {
-            ExceptionHandler.process(e);
-        }
-    }
-
-    private void initRedirectList() {
-        try {
-            redirectWhiteList = new HashSet<>();
-            String property = System.getProperty(PROP_ALLOW_PROXY_REDIRECT_EXCLUDE, PROP_ALLOW_PROXY_REDIRECT_EXCLUDE_DEFAULT);
-            if (StringUtils.isEmpty(property)) {
-                return;
-            }
-            String[] split = property.split(";");
-            for (String host : split) {
-                host = StringUtils.strip(host);
-                if (StringUtils.isBlank(host)) {
-                    host = KEY_DEFAULT;
-                }
-                redirectWhiteList.add(host);
-            }
-        } catch (Exception e) {
-            ExceptionHandler.process(e);
-        }
+    private TalendProxySelector(final ProxySelector defaultSelector) {
+        this.defaultSelector = defaultSelector;
+        selectorProviders = new ArrayList<>();
     }
 
     public static TalendProxySelector getInstance() {
@@ -232,18 +58,6 @@ 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);
-                    }
                 }
             }
         }
@@ -256,216 +70,19 @@ public class TalendProxySelector extends ProxySelector {
                     return null;
                 }
             });
-            if (instance.getEclipseDefaultSelector() == null
+            if (instance.getDefaultProxySelector() == null
                     || (proxySelector != null && proxySelector.getClass().getName().endsWith(ECLIPSE_PROXY_SELECTOR))) {
-                instance.setEclipseDefaultSelector(proxySelector);
+                instance.setDefaultProxySelector(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) {
-            return Collections.EMPTY_LIST;
-        }
-        URI validatedUri = validateUri(uri);
-        Set<Proxy> results = new LinkedHashSet<>();
-
-        try {
-            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) {
-            /**
-             * 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(validatedUri, defaultProxys));
-            } catch (Exception e) {
-                results.addAll(defaultProxys);
-                ExceptionHandler.process(e);
-            }
-        }
-        if (printProxyLog) {
-            String proxys = results.toString();
-            ExceptionHandler.log("Selected proxys for " + uri + ", " + proxys);
-            ExceptionHandler.process(new Exception("Proxy call stacks"), Priority.INFO);
-        }
-        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()) {
-            for (Proxy proxy : defaultProxys) {
-                SocketAddress addr = null;
-                Proxy.Type proxyType = null;
-                if (proxy != null) {
-                    proxyType = proxy.type();
-                    addr = proxy.address();
-                }
-
-                boolean redirect = true;
-                if (!allowProxyRedirect) {
-                    String host = uri.getHost();
-                    if (host == null) {
-                        host = "";
-                    }
-                    host = StringUtils.strip(host).toLowerCase();
-                    if (this.redirectWhiteList.contains(host) || this.redirectWhiteList.contains(KEY_DEFAULT)) {
-                        redirect = true;
-                    } else if (Proxy.Type.DIRECT == proxyType
-                            || (addr != null && StringUtils.equals(uri.getHost(), ((InetSocketAddress) addr).getHostString()))) {
-                        redirect = false;
-                    }
-                }
-                if (redirect) {
-                    result.add(proxy);
-                } else {
-                    result.add(Proxy.NO_PROXY);
-                }
-            }
-        }
-        return result;
-    }
-
-    private URI getNewUri(URI uri, boolean validateUri) {
-        URI newUri = uri;
-        if (newUri != null) {
-            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)) {
-                            /**
-                             * 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;
-    }
-
-    private Set<Proxy> getProxysFromProviders(final URI uri) {
-        final Set<Proxy> resultFromProviders = new LinkedHashSet<>();
-        Collection<IProxySelectorProvider> providers = getCustomProviders(uri);
+        final Set<Proxy> resultFromProviders = new HashSet<>();
+        List<IProxySelectorProvider> providers = getProxySelectorProviders();
         if (providers != null) {
             providers.stream().forEach(p -> {
                 if (instance == p) {
@@ -483,126 +100,49 @@ public class TalendProxySelector extends ProxySelector {
                 }
             });
         }
-        return resultFromProviders;
-    }
+        List<Proxy> result = new ArrayList<>();
 
-    private Collection<IProxySelectorProvider> getCustomProviders(final URI uri) {
-        Collection<IProxySelectorProvider> providers = Collections.EMPTY_LIST;
-        Collection<Object> possibleKeys = getPossibleKeys(uri);
-        for (Object key : possibleKeys) {
-            providers = this.selectorProviders.get(key);
-            if (providers != null) {
-                break;
+        if (resultFromProviders != null && !resultFromProviders.isEmpty()) {
+            result.addAll(resultFromProviders);
+        }
+
+        ProxySelector defaultProxySelector = getDefaultProxySelector();
+        if (defaultProxySelector != null) {
+            List<Proxy> defaultProxys = defaultProxySelector.select(uri);
+            if (defaultProxys != null && !defaultProxys.isEmpty()) {
+                result.addAll(defaultProxys);
             }
         }
-        return providers;
-    }
-
-    public PasswordAuthentication getHttpPasswordAuthentication() {
-        String[] schemas = new String[] { "http", "https" };
-        for (String schema : schemas) {
-            String proxyUser = System.getProperty(schema + ".proxyUser");
-            String proxyPassword = System.getProperty(schema + ".proxyPassword");
-
-            if (StringUtils.isNotBlank(proxyUser)) {
-                char[] pwdChars = new char[0];
-                if (proxyPassword != null && !proxyPassword.isEmpty()) {
-                    pwdChars = proxyPassword.toCharArray();
-                }
-                return new PasswordAuthentication(proxyUser, pwdChars);
-            }
-        }
-        return null;
+        return result;
     }
 
     public boolean addProxySelectorProvider(IProxySelectorProvider provider) {
-        try {
-            Object key = provider.getKey();
-            Collection<IProxySelectorProvider> collection = this.selectorProviders.get(key);
-            if (collection == null) {
-                synchronized (this.selectorProviders) {
-                    collection = this.selectorProviders.get(key);
-                    if (collection == null) {
-                        collection = Collections.synchronizedList(new LinkedList<>());
-                        this.selectorProviders.put(key, collection);
-                    }
-                }
-            }
-            collection.add(provider);
-            return true;
-        } catch (Exception e) {
-            ExceptionHandler.process(e);
+        List<IProxySelectorProvider> proxySelectorProviders = getProxySelectorProviders();
+        if (!proxySelectorProviders.contains(provider)) {
+            return proxySelectorProviders.add(provider);
         }
         return false;
     }
 
     public boolean removeProxySelectorProvider(IProxySelectorProvider provider) {
-        try {
-            Object key = provider.getKey();
-            Collection<IProxySelectorProvider> collection = this.selectorProviders.get(key);
-            if (collection != null) {
-                synchronized (this.selectorProviders) {
-                    collection = this.selectorProviders.get(key);
-                    if (collection != null) {
-                        collection.remove(provider);
-                        if (collection.isEmpty()) {
-                            this.selectorProviders.remove(key);
-                        }
-                    }
-                }
-            }
-            return true;
-        } catch (Exception e) {
-            ExceptionHandler.process(e);
-        }
-        return false;
+        return getProxySelectorProviders().remove(provider);
+    }
+
+    private List<IProxySelectorProvider> getProxySelectorProviders() {
+        return selectorProviders;
     }
 
     public ProxySelector getDefaultProxySelector() {
-        switch (eProxySelector) {
-        case jre:
-            return getJreProxySelector();
-        default:
-            return eclipseDefaultSelector;
-        }
+        return defaultSelector;
     }
 
-    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;
+    public void setDefaultProxySelector(final ProxySelector selector) {
+        defaultSelector = selector;
     }
 
     @Override
     public void connectFailed(final URI uri, final SocketAddress sa, final IOException ioe) {
-        Collection<IProxySelectorProvider> providers = getCustomProviders(uri);
+        List<IProxySelectorProvider> providers = getProxySelectorProviders();
         if (providers != null) {
             providers.stream().forEach(p -> {
                 if (p.canHandle(uri)) {
@@ -611,35 +151,23 @@ public class TalendProxySelector extends ProxySelector {
             });
         }
 
-        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);
-            }
+        ProxySelector defaultProxySelector = getDefaultProxySelector();
+        if (defaultProxySelector != null) {
+            defaultProxySelector.connectFailed(uri, sa, ioe);
         }
     }
 
-    public IProxySelectorProvider createDefaultProxySelectorProvider() {
-        if (disableDefaultSelectorProvider) {
-            return null;
-        }
-        return new DefaultProxySelectorProvider(Thread.currentThread());
-    }
+    public static abstract class AbstractProxySelectorProvider implements IProxySelectorProvider {
 
-    public IProxySelectorProvider createDefaultProxySelectorProvider(String host) {
-        if (disableDefaultSelectorProvider) {
-            return null;
+        @Override
+        public void connectFailed(final URI uri, final SocketAddress sa, final IOException ioe) {
+            // nothing to do
         }
-        return new DefaultProxySelectorProvider(host);
+
     }
 
     public static interface IProxySelectorProvider {
 
-        Object getKey();
-
         boolean canHandle(final URI uri);
 
         List<Proxy> select(final URI uri);
@@ -648,120 +176,4 @@ public class TalendProxySelector extends ProxySelector {
 
     }
 
-    public static abstract class AbstractProxySelectorProvider implements IProxySelectorProvider {
-
-        private boolean isDebugMode = CommonsPlugin.isDebugMode();
-
-        @Override
-        public Object getKey() {
-            return this;
-        }
-
-        @Override
-        public void connectFailed(final URI uri, final SocketAddress sa, final IOException ioe) {
-            if (isDebugMode) {
-                ExceptionHandler.process(ioe);
-            }
-        }
-
-    }
-
-    public static Collection<Object> getPossibleKeys(URI uri) {
-        Collection<Object> possibleKeys = new ArrayList<>();
-        possibleKeys.add(Thread.currentThread());
-        if (uri != null) {
-            String uriHost = uri.getHost();
-            if (StringUtils.isNotBlank(uriHost)) {
-                possibleKeys.add(uriHost);
-            }
-        }
-        return possibleKeys;
-    }
-
-    private enum EProxySelector {
-        eclipse_default,
-        jre
-    }
-
-    private class DefaultProxySelectorProvider extends TalendProxySelector.AbstractProxySelectorProvider {
-
-        private Thread currentThread = null;
-
-        private String host = null;
-
-        public DefaultProxySelectorProvider(Thread thread) {
-            this.currentThread = thread;
-        }
-
-        public DefaultProxySelectorProvider(String host) {
-            this.host = host;
-            if (StringUtils.isNotBlank(this.host)) {
-                this.host = this.host.toLowerCase();
-            }
-        }
-
-        @Override
-        public Object getKey() {
-            if (this.currentThread != null) {
-                return currentThread;
-            }
-            if (this.host != null) {
-                return this.host;
-            }
-            return super.getKey();
-        }
-
-        @Override
-        public boolean canHandle(URI uri) {
-            if (disableDefaultSelectorProvider) {
-                return false;
-            }
-            if (currentThread != null && Thread.currentThread() == currentThread) {
-                return true;
-            }
-            if (host != null) {
-                if (uri == null) {
-                    return false;
-                }
-                String uriHost = uri.getHost();
-                if (StringUtils.isNotBlank(uriHost)) {
-                    return this.host.equals(uriHost.toLowerCase());
-                }
-                return false;
-            }
-            return false;
-        }
-
-        @Override
-        public List<Proxy> select(URI uri) {
-            List<Proxy> result = new ArrayList<>();
-            try {
-                ProxySelector defaultProxySelector = getDefaultProxySelector();
-                if (defaultProxySelector != null) {
-                    List<Proxy> defaultProxys = defaultProxySelector.select(uri);
-                    if (defaultProxys != null && !defaultProxys.isEmpty()) {
-                        for (Proxy proxy : defaultProxys) {
-                            SocketAddress addr = null;
-                            Proxy.Type proxyType = null;
-                            if (proxy != null) {
-                                proxyType = proxy.type();
-                                addr = proxy.address();
-                            }
-                            if (Proxy.Type.DIRECT == proxyType || (addr != null
-                                    && StringUtils.equals(uri.getHost(), ((InetSocketAddress) addr).getHostString()))) {
-                                result.add(Proxy.NO_PROXY);
-                            } else {
-                                result.add(proxy);
-                            }
-                        }
-                    }
-                }
-            } catch (Exception e) {
-                ExceptionHandler.process(e);
-            }
-            return result;
-        }
-
-    }
-
 }