fix(TESB-29148): Add lines deleted by accident.

fix(TCOMP-1681): Adding missing poms for OSGi type build
fix(TUP-26809): backport
2020-05-20 19:27:48 +03:00 · 2020-05-15 17:25:03 +08:00 · 2020-05-14 16:04:36 +08:00 · 2020-05-14 11:27:21 +08:00 · 2020-05-14 10:51:25 +08:00 · 2020-05-12 18:29:11 +02:00
845 changed files with 16940 additions and 13307 deletions
--- a/i18n/features/org.talend.babel.all.tos.feature/feature.xml
+++ b/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.3.1.qualifier"> 
+<feature id="org.talend.babel.all.tos.feature" label="Babel feature with all languages for TOS" version="7.2.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>  
--- a/i18n/features/org.talend.babel.all.tos.feature/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  
--- a/i18n/plugins/org.talend.common.ui.runtime.nl/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.common.ui.runtime
--- a/i18n/plugins/org.talend.common.ui.runtime.nl/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.common.ui.runtime.nl</artifactId>
--- a/i18n/plugins/org.talend.commons.runtime.nl/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.commons.runtime
--- a/i18n/plugins/org.talend.commons.runtime.nl/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.commons.runtime.nl</artifactId>
--- a/i18n/plugins/org.talend.commons.ui.nl/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.commons.ui
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.commons.ui.nl/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.commons.ui.nl</artifactId>
--- a/i18n/plugins/org.talend.core.nl/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.core
 Bundle-Localization: plugin
--- a/i18n/plugins/org.talend.core.nl/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.core.nl</artifactId>
--- a/i18n/plugins/org.talend.core.repository.nl/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.core.repository
--- a/i18n/plugins/org.talend.core.repository.nl/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.core.repository.nl</artifactId>
--- a/i18n/plugins/org.talend.core.runtime.nl/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.core.runtime
--- a/i18n/plugins/org.talend.core.runtime.nl/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.core.runtime.nl</artifactId>
--- a/i18n/plugins/org.talend.core.ui.nl/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.core.ui
--- a/i18n/plugins/org.talend.core.ui.nl/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.core.ui.nl</artifactId>
--- a/i18n/plugins/org.talend.cwm.mip.edit.nl/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.cwm.mip.edit
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.cwm.mip.edit.nl/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.cwm.mip.edit.nl</artifactId>
--- a/i18n/plugins/org.talend.cwm.mip.nl/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.cwm.mip
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.cwm.mip.nl/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.cwm.mip.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.maven.ui.nl/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.designer.maven.ui
 Bundle-Vendor: .Talend SA.
 Bundle-Localization: plugin
--- a/i18n/plugins/org.talend.designer.maven.ui.nl/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.maven.ui.nl</artifactId>
--- a/i18n/plugins/org.talend.help.nl/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.help
 Bundle-Localization: plugin
--- a/i18n/plugins/org.talend.help.nl/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.help.nl</artifactId>
--- a/i18n/plugins/org.talend.helpers.nl/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.helpers
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.helpers.nl/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.helpers.nl</artifactId>
--- a/i18n/plugins/org.talend.librariesmanager.nl/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.librariesmanager
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.librariesmanager.nl/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.librariesmanager.nl</artifactId>
--- a/i18n/plugins/org.talend.librariesmanager.ui.nl/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.librariesmanager.ui
--- a/i18n/plugins/org.talend.librariesmanager.ui.nl/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.librariesmanager.ui.nl</artifactId>
--- a/i18n/plugins/org.talend.metadata.managment.nl/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.metadata.managment
--- a/i18n/plugins/org.talend.metadata.managment.nl/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.metadata.managment.nl</artifactId>
--- a/i18n/plugins/org.talend.metadata.managment.ui.nl/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.metadata.managment.ui
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.metadata.managment.ui.nl/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.metadata.managment.ui.nl</artifactId>
--- a/i18n/plugins/org.talend.migrationTool.nl/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.migrationTool
--- a/i18n/plugins/org.talend.migrationTool.nl/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.migrationTool.nl</artifactId>
--- a/i18n/plugins/org.talend.model.edit.nl/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.model.edit
 Bundle-Localization: plugin
 Bundle-Vendor: %providerName
--- a/i18n/plugins/org.talend.model.edit.nl/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.model.edit.nl</artifactId>
--- a/i18n/plugins/org.talend.model.migration.nl/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.model.migration
--- a/i18n/plugins/org.talend.model.migration.nl/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.model.migration.nl</artifactId>
--- a/i18n/plugins/org.talend.model.nl/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.model
 Bundle-Localization: plugin
--- a/i18n/plugins/org.talend.model.nl/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.model.nl</artifactId>
--- a/i18n/plugins/org.talend.presentation.onboarding.nl/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.presentation.onboarding
--- a/i18n/plugins/org.talend.presentation.onboarding.nl/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.presentation.onboarding.nl</artifactId>
--- a/i18n/plugins/org.talend.rcp.nl/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.rcp
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.rcp.nl/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.rcp.nl</artifactId>
--- a/i18n/plugins/org.talend.registration.nl/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.registration
--- a/i18n/plugins/org.talend.registration.nl/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.registration.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.items.importexport.nl/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.repository.items.importexport
--- a/i18n/plugins/org.talend.repository.items.importexport.nl/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.items.importexport.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.items.importexport.ui.nl/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.repository.items.importexport.ui
--- a/i18n/plugins/org.talend.repository.items.importexport.ui.nl/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.items.importexport.ui.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.localprovider.nl/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.repository.localprovider
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.repository.localprovider.nl/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.localprovider.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.mdm.nl/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.repository.mdm
--- a/i18n/plugins/org.talend.repository.mdm.nl/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.mdm.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.metadata.nl/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.repository.metadata
--- a/i18n/plugins/org.talend.repository.metadata.nl/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.metadata.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.view.nl/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.repository.view
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.repository.view.nl/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.view.nl</artifactId>
--- a/i18n/plugins/org.talend.resources.nl/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.resources
--- a/i18n/plugins/org.talend.resources.nl/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.resources.nl</artifactId>
--- a/main/features/org.talend.commons.feature/feature.xml
+++ b/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.3.1.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.commons.feature" label="Commons Feature" version="7.2.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>  
--- a/main/features/org.talend.commons.feature/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.commons.feature</artifactId>
--- a/main/features/org.talend.core.feature/feature.xml
+++ b/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.3.1.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.core.feature" label="Core Feature" version="7.2.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>  
--- a/main/features/org.talend.core.feature/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.core.feature</artifactId>
--- a/main/features/org.talend.fragment.jars.common.feature/feature.xml
+++ b/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.3.1.qualifier">
+      version="7.2.1.qualifier">

   <description url="http://www.example.com/description">
      [Enter Feature Description here.]
@@ -51,17 +51,16 @@
         fragment="true"/>

   <plugin
-         id="org.talend.libraries.apache.lucene8"
+         id="org.talend.libraries.apache.lucene6"
         download-size="0"
         install-size="0"
-         version="0.0.0"
-         unpack="true"/>
+         version="0.0.0"/>

   <plugin
         id="org.talend.libraries.apache.lucene4"
         download-size="0"
         install-size="0"
         version="0.0.0"
-         unpack="true"/>
+         unpack="false"/>

 </feature>
--- a/main/features/org.talend.fragment.jars.common.feature/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.fragment.jars.common.feature</artifactId>
--- a/main/features/org.talend.help.feature/feature.xml
+++ b/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.3.1.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.help.feature" label="Help Feature" version="7.2.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>  
--- a/main/features/org.talend.help.feature/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.help.feature</artifactId>
--- a/main/features/org.talend.jdt.feature/feature.xml
+++ b/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.3.1.qualifier"> 
+<feature id="org.talend.jdt.feature" label="Feature" version="7.2.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>  
--- a/main/features/org.talend.jdt.feature/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.jdt.feature</artifactId>
--- a/main/features/org.talend.libraries.jdbc.feature/feature.xml
+++ b/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.3.1.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.libraries.jdbc.feature" label="Jdbc_feature Feature" version="7.2.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>  
--- a/main/features/org.talend.libraries.jdbc.feature/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.libraries.jdbc.feature</artifactId>
--- a/main/features/org.talend.m2e.feature/feature.xml
+++ b/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.3.1.qualifier"> 
+<feature id="org.talend.m2e.feature" label="Feature" version="7.2.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>  
--- a/main/features/org.talend.m2e.feature/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.m2e.feature</artifactId>
--- a/main/features/org.talend.model.migration.feature/feature.xml
+++ b/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.3.1.qualifier">
+      version="7.2.1.qualifier">

   <description url="http://www.example.com/description">
      [Enter Feature Description here.]
--- a/main/features/org.talend.model.migration.feature/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.model.migration.feature</artifactId>
--- a/main/features/org.talend.platform.feature/feature.xml
+++ b/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.3.1.qualifier"> 
+<feature id="org.talend.platform.feature" label="Platform" version="7.2.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>  
--- a/main/features/org.talend.platform.feature/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  
--- a/main/features/org.talend.rcp.feature/feature.xml
+++ b/main/features/org.talend.rcp.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.rcp.feature"
      label="RCP Feature"
-      version="7.3.1.qualifier"
+      version="7.2.1.qualifier"
      provider-name=".Talend SA.">

   <description url="http://www.talend.com/online/featuresdescription.html#rcp-feature">
--- a/main/features/org.talend.rcp.feature/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.rcp.feature</artifactId>
--- a/main/features/org.talend.update.p2.feature/feature.xml
+++ b/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.3.1.qualifier"> 
+<feature id="org.talend.update.p2.feature" label="P2-feature" version="7.2.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>  
--- a/main/features/org.talend.update.p2.feature/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.update.p2.feature</artifactId>
--- a/main/features/org.talend.updates.feature/feature.xml
+++ b/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.3.1.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.updates.feature" label="Updates-feature" version="7.2.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>
--- a/main/features/org.talend.updates.feature/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.updates.feature</artifactId>
--- a/main/features/org.talend.utils.feature/feature.xml
+++ b/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.3.1.qualifier"> 
+<feature id="org.talend.utils.feature" label="Utils_feature Feature" version="7.2.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,10 +20,8 @@
    <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>
--- a/main/features/org.talend.utils.feature/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.utils.feature</artifactId>
--- a/main/plugins/org.talend.common.ui.runtime/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Require-Bundle: org.eclipse.core.runtime,
 org.apache.commons.collections,
 org.talend.libraries.dom4j-jaxen,
--- a/main/plugins/org.talend.common.ui.runtime/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.common.ui.runtime</artifactId>
--- a/main/plugins/org.talend.commons.runtime/META-INF/MANIFEST.MF
+++ b/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.3.1.qualifier
+Bundle-Version: 7.2.1.qualifier
 Require-Bundle: org.apache.log4j;visibility:=reexport,
 org.apache.commons.beanutils,
 org.apache.commons.collections,
@@ -13,7 +13,8 @@ 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
 Export-Package: org.talend.commons,
 org.talend.commons.exception,
 org.talend.commons.i18n,
--- a/main/plugins/org.talend.commons.runtime/pom.xml
+++ b/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.2.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.commons.runtime</artifactId>
--- a/main/plugins/org.talend.commons.runtime/pom_server.xml
+++ b/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.2.1</version>
        <relativePath>../pom_server.xml</relativePath>
    </parent>

--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/CommonsPlugin.java
+++ b/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;
    }
@@ -114,9 +118,6 @@ public class CommonsPlugin implements BundleActivator {
        return Boolean.getBoolean("junit_test"); //$NON-NLS-1$
    }

-    public static boolean isTUJTest() {
-        return "org.talend.rcp.branding.tuj.product".equals(Platform.getProduct().getId()); //$NON-NLS-1$
-    }

    /**
     * Answer the file associated with name. This handles the case of running as a plugin and running standalone which
@@ -179,4 +180,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();
+    }
+
 }
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/PasswordEncryptUtil.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/PasswordEncryptUtil.java
@@ -21,23 +21,29 @@ import javax.crypto.SecretKeyFactory;
 import javax.crypto.spec.DESKeySpec;

 import org.apache.commons.codec.binary.Base64;
-import org.talend.utils.security.StudioEncryption;
+import org.talend.utils.security.AESEncryption;

 /**
 * DOC chuang class global comment. Detailled comment
 */
 public class PasswordEncryptUtil {

-    public static final String ENCRYPT_KEY = "Encrypt"; //$NON-NLS-1$
+    public static String ENCRYPT_KEY = "Encrypt"; //$NON-NLS-1$
+
+    private static String rawKey = "Talend-Key"; //$NON-NLS-1$
+
+    public static String PREFIX_PASSWORD = "ENC:["; //$NON-NLS-1$
+
+    public static String POSTFIX_PASSWORD = "]"; //$NON-NLS-1$

    private static SecretKey key = null;

-    private static final SecureRandom SECURERANDOM = new SecureRandom();
+    private static SecureRandom secureRandom = new SecureRandom();

    private static SecretKey getSecretKey() throws Exception {
        if (key == null) {
-            byte rawKeyData[] = StudioEncryption.getKeySource(StudioEncryption.EncryptionKeyName.MIGRATION.toString(), false)
-                    .getKey();
+
+            byte rawKeyData[] = rawKey.getBytes();
            DESKeySpec dks = new DESKeySpec(rawKeyData);
            SecretKeyFactory keyFactory = SecretKeyFactory.getInstance("DES"); //$NON-NLS-1$
            key = keyFactory.generateSecret(dks);
@@ -59,7 +65,7 @@ public class PasswordEncryptUtil {

        SecretKey key = getSecretKey();
        Cipher c = Cipher.getInstance("DES"); //$NON-NLS-1$
-        c.init(Cipher.ENCRYPT_MODE, key, SECURERANDOM);
+        c.init(Cipher.ENCRYPT_MODE, key, secureRandom);
        byte[] cipherByte = c.doFinal(input.getBytes());
        String dec = new String(Base64.encodeBase64(cipherByte));
        return dec;
@@ -79,7 +85,7 @@ public class PasswordEncryptUtil {
        byte[] dec = Base64.decodeBase64(input.getBytes());
        SecretKey key = getSecretKey();
        Cipher c = Cipher.getInstance("DES"); //$NON-NLS-1$
-        c.init(Cipher.DECRYPT_MODE, key, SECURERANDOM);
+        c.init(Cipher.DECRYPT_MODE, key, secureRandom);
        byte[] clearByte = c.doFinal(dec);
        return new String(clearByte);
    }
@@ -93,7 +99,7 @@ public class PasswordEncryptUtil {
        if (input == null) {
            return input;
        }
-        return StudioEncryption.getStudioEncryption(StudioEncryption.EncryptionKeyName.ROUTINE).encrypt(input);
+        return PREFIX_PASSWORD + AESEncryption.encryptPassword(input) + POSTFIX_PASSWORD;
    }

    /**
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/VersionUtils.java
+++ b/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);
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/database/Sybase16SADatabaseMetaData.java
+++ b/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;
+    }
+
+}
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/encoding/CharsetToolkit.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/encoding/CharsetToolkit.java
@@ -342,7 +342,7 @@ public class CharsetToolkit {
        return (buffer[0] == -2 && buffer[1] == -1);
    }

-    public static String getCharset(File file) {
+    public static String getCharset(File file){
        String charset = "UTF-8";
        byte[] fileContent = null;
        FileInputStream fin = null;
@@ -350,18 +350,11 @@ public class CharsetToolkit {
            fin = new FileInputStream(file.getPath());
            fileContent = new byte[(int) file.length()];
            fin.read(fileContent);
-            byte[] data = fileContent;
+
+            byte[] data =  fileContent;
            charset = getCharset(data);
        } catch (IOException e) {
            charset = "UTF-8";
-        } finally {
-            if (fin != null) {
-                try {
-                    fin.close();
-                } catch (IOException e) {
-                    // Ignore here
-                }
-            }
        }
        return charset;
    }
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/network/NetworkUtil.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/network/NetworkUtil.java
@@ -49,10 +49,9 @@ public class NetworkUtil {
        if ("true".equals(disableInternet)) { //$NON-NLS-1$
            return false;
        }
-        HttpURLConnection conn = null;
        try {
            URL url = new URL(HTTP_NETWORK_URL);
-            conn = (HttpURLConnection) url.openConnection();
+            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
            conn.setConnectTimeout(4000);
            conn.setReadTimeout(4000);

@@ -64,36 +63,9 @@ public class NetworkUtil {
            if (strMessage.equals("OK")) { //$NON-NLS-1$
                return true;
            }
+            conn.disconnect();
        } catch (Exception e) {
            return false;
-        } finally {
-            conn.disconnect();
-        }
-        return true;
-    }
-
-    public static boolean isNetworkValid(String url) {
-        if (url == null) {
-            return isNetworkValid();
-        }
-        return checkValidWithHttp(url);
-    }
-
-    private static boolean checkValidWithHttp(String urlString) {
-        HttpURLConnection conn = null;
-        try {
-            URL url = new URL(urlString);
-            conn = (HttpURLConnection) url.openConnection();
-            conn.setConnectTimeout(4000);
-            conn.setReadTimeout(4000);
-            conn.setRequestMethod("HEAD"); //$NON-NLS-1$
-            conn.getResponseMessage();
-        } catch (Exception e) {
-            // if not reachable , will throw exception(time out/unknown host) .So if catched exception, make it a
-            // invalid server
-            return false;
-        } finally {
-            conn.disconnect();
        }
        return true;
    }
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/network/TalendProxySelector.java
+++ b/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;
@@ -35,8 +37,14 @@ 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
@@ -51,9 +59,23 @@ 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";

    /**
     * Example: update.talend.com,socket:http,https:http;nexus.talend.com,socket,http;,socket:http
@@ -67,7 +89,20 @@ 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;

    final private Map<Object, Collection<IProxySelectorProvider>> selectorProviders;

@@ -83,15 +118,36 @@ public class TalendProxySelector extends ProxySelector {

    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 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()));
+
+        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();
@@ -176,6 +232,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 +256,72 @@ 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) {
+            return Collections.EMPTY_LIST;
+        }
+        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);
@@ -229,6 +335,54 @@ public class TalendProxySelector extends ProxySelector {
        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 +418,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 +559,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,26 +611,61 @@ 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);
    }

+    public static interface IProxySelectorProvider {
+
+        Object getKey();
+
+        boolean canHandle(final URI uri);
+
+        List<Proxy> select(final URI uri);
+
+        void connectFailed(final URI uri, final SocketAddress sa, final IOException ioe);
+
+    }
+
+    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());
@@ -445,7 +678,12 @@ public class TalendProxySelector extends ProxySelector {
        return possibleKeys;
    }

-    private class DefaultProxySelectorProvider extends AbstractProxySelectorProvider {
+    private enum EProxySelector {
+        eclipse_default,
+        jre
+    }
+
+    private class DefaultProxySelectorProvider extends TalendProxySelector.AbstractProxySelectorProvider {

        private Thread currentThread = null;

@@ -475,7 +713,7 @@ public class TalendProxySelector extends ProxySelector {

        @Override
        public boolean canHandle(URI uri) {
-            if (disableDefaultSelector) {
+            if (disableDefaultSelectorProvider) {
                return false;
            }
            if (currentThread != null && Thread.currentThread() == currentThread) {
--- a/Show More
+++ b/Show More