kjwang/Fix TUP-24128 Remove Hard coded keys from EncryptionHelper /

EncryptedProperties https://jira.talendforge.org/browse/TUP-24128
2019-08-08 14:26:49 +08:00 · 2019-08-08 11:04:50 +08:00 · 2019-08-07 17:26:12 +08:00 · 2019-07-24 13:53:59 +08:00 · 2019-07-15 10:57:49 +08:00 · 2019-07-15 10:33:35 +08:00
841 changed files with 15670 additions and 15130 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,
--- 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
@@ -114,9 +114,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
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/i18n/internal/messages.properties
+++ b/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}
-
--- 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/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,155 +13,37 @@
 package org.talend.commons.utils.network;

 import java.io.IOException;
-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.talend.commons.exception.ExceptionHandler;
-import org.talend.commons.i18n.internal.Messages;

 /**
 * 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 static final String PROP_ALLOW_PROXY_REDIRECT_EXCLUDE = "talend.studio.proxy.redirect.whiteList";
-
-    private static final String PROP_PROXY_HOST_MAP = "talend.studio.proxy.hostMap";
-
-    private static final String PROP_DISABLE_DEFAULT_SELECTOR = "talend.studio.proxy.disableDefaultSelector";
-
-    /**
-     * 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 ProxySelector defaultSelector;

-    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 disableDefaultSelector = false;
-
    private TalendProxySelector(final ProxySelector defaultSelector) {
        this.defaultSelector = defaultSelector;
-
-        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()));
-        printProxyLog = Boolean.valueOf(System.getProperty(PROP_PRINT_LOGS, Boolean.FALSE.toString()));
-
-        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);
-        }
+        selectorProviders = new ArrayList<>();
    }

    public static TalendProxySelector getInstance() {
@@ -199,109 +81,8 @@ public class TalendProxySelector extends ProxySelector {

    @Override
    public List<Proxy> select(final URI uri) {
-        Set<Proxy> results = new LinkedHashSet<>();
-
-        try {
-            final Set<Proxy> resultFromProviders = getProxysFromProviders(uri);
-            if (resultFromProviders != null && !resultFromProviders.isEmpty()) {
-                results.addAll(resultFromProviders);
-            }
-        } catch (Exception e) {
-            ExceptionHandler.process(e);
-        }
-
-        ProxySelector defaultProxySelector = getDefaultProxySelector();
-        if (defaultProxySelector != null) {
-            URI newUri = getNewUri(uri);
-            List<Proxy> defaultProxys = defaultProxySelector.select(newUri);
-            try {
-                results.addAll(filterProxys(uri, 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 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) {
-        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);
-            }
-
-            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);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        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) {
@@ -319,79 +100,36 @@ 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() {
@@ -404,7 +142,7 @@ public class TalendProxySelector extends ProxySelector {

    @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)) {
@@ -419,110 +157,22 @@ public class TalendProxySelector extends ProxySelector {
        }
    }

-    public IProxySelectorProvider createDefaultProxySelectorProvider() {
-        if (disableDefaultSelector) {
-            return null;
-        }
-        return new DefaultProxySelectorProvider(Thread.currentThread());
-    }
-
-    public IProxySelectorProvider createDefaultProxySelectorProvider(String host) {
-        if (disableDefaultSelector) {
-            return null;
-        }
-        return new DefaultProxySelectorProvider(host);
-    }
-
-    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 class DefaultProxySelectorProvider extends 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();
-            }
-        }
+    public static abstract class AbstractProxySelectorProvider implements IProxySelectorProvider {

        @Override
-        public Object getKey() {
-            if (this.currentThread != null) {
-                return currentThread;
-            }
-            if (this.host != null) {
-                return this.host;
-            }
-            return super.getKey();
+        public void connectFailed(final URI uri, final SocketAddress sa, final IOException ioe) {
+            // nothing to do
        }

-        @Override
-        public boolean canHandle(URI uri) {
-            if (disableDefaultSelector) {
-                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;
-        }
+    public static interface IProxySelectorProvider {
+
+        boolean canHandle(final URI uri);
+
+        List<Proxy> select(final URI uri);
+
+        void connectFailed(final URI uri, final SocketAddress sa, final IOException ioe);

    }

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
kjwang-talend	567f42ccb6	kjwang/Fix TUP-24128 Remove Hard coded keys from EncryptionHelper / EncryptedProperties https://jira.talendforge.org/browse/TUP-24128	2019-08-08 14:26:49 +08:00
kjwang-talend	33d94203e3	kjwang/Fix TUP-24128 Remove Hard coded keys from EncryptionHelper / EncryptedProperties https://jira.talendforge.org/browse/TUP-24128	2019-08-08 11:04:50 +08:00
kjwang-talend	64bc29a277	kjwang/Fix TUP-24128 Remove Hard coded keys from EncryptionHelper / EncryptedProperties https://jira.talendforge.org/browse/TUP-24128	2019-08-07 17:26:12 +08:00
kjwang-talend	07efecb906	TUP-23950 Error in calling spark job from trunjob job inside standard (#2613 ) job https://jira.talendforge.org/browse/TUP-23950	2019-07-24 13:53:59 +08:00
Zhiwei Xue	cee139ef8d	fix(TUP-23755):Regression caused by TUP-21532 for ESB test case (#2579 )	2019-07-15 10:57:49 +08:00
jiezhang-tlnd	ea00bfcad0	fix(TUP-23520)Change schema order function doesnot work (#2570 )	2019-07-15 10:33:35 +08:00
Mike Yan	5744d83e69	fix(TESB-26219): Fixed build.properties for missing libs (#2549 )	2019-06-20 12:32:25 +02:00
kjwang-talend	3737400399	kjwang/Fix TUP-23488 Retrieve jar list to download is slow (Fix license (#2539 ) name is empty problem) https://jira.talendforge.org/browse/TUP-23488	2019-06-19 21:52:02 +08:00
Zhiwei Xue	3cbbb38871	fix(TUP-23554):osgi.bundle=empty when install additional package failed (#2545 )	2019-06-19 20:46:03 +08:00
Mike Yan	768e4534b5	fix(TESB-26219): Fixed missing libs in apache cxf plugin (#2541 )	2019-06-19 14:56:35 +08:00
hwang-talend	07f992c3ee	bugfix(TUP-23230):Guess Schema error - SLF4J: Defaulting to no-operation (#2535 ) bugfix(TUP-23230):Guess Schema error - SLF4J: Defaulting to no-operation (NOP) logger implementation	2019-06-18 15:35:30 +08:00
Chao MENG	5b72922429	fix(TUP-23519): spark job can't run success when I select EMR58 as (#2534 ) distribution https://jira.talendforge.org/browse/TUP-23519	2019-06-18 15:22:21 +08:00
Chao MENG	c7ebdef42d	fix(TUP-23482)should avoid multi version slf4j-log4j jars in the job (#2532 ) classpath https://jira.talendforge.org/browse/TUP-23482	2019-06-18 12:32:39 +08:00
Jane Ding	5fe03dfbf2	fix(TUP-23482)should avoid multi version slf4j-log4j jars in the job (#2529 ) (#2531 ) classpath https://jira.talendforge.org/browse/TUP-23482	2019-06-18 11:49:34 +08:00
kjwang-talend	496afd04db	Kjwang/fix tup 23488 retrieve jar list to download is slow b721 (#2530 ) * kjwang/Fix improve the fetch license performance (#2523) * kjwang/Fix improve the fetch license performance * kjwang/Fix improve the fetch license performance https://jira.talendforge.org/browse/TUP-23488 * kjwang/Fix TUP-23488 Retrieve jar list to download is slow (Fix junit (#2528) error) https://jira.talendforge.org/browse/TUP-23488	2019-06-18 11:38:22 +08:00
Mike Yan	6b38b13eb9	fix(TESB-26219): Fixed NPE for cloud artifact viewer with Java11 (#2527 )	2019-06-17 17:08:02 +08:00
Jenkins Continuous Build server	07df547a88	Set version to 7.2.1	2019-06-14 11:49:03 +02:00