fix(TESB-27401): Place refresh routine inside importItemRecords to cover all import cases.

fix(TESB-27614): Check NPE for 'files' node in route assembly file (#2942 )
Fix TUP-24554 Potential NullPointerException (#2938 )
2020-01-09 17:23:12 +02:00 · 2019-12-24 18:06:23 +08:00 · 2019-12-24 17:07:18 +08:00 · 2019-12-23 10:17:54 +08:00 · 2019-12-23 10:08:25 +08:00 · 2019-12-20 17:28:01 +08:00
837 changed files with 14992 additions and 15689 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.2.1.qualifier"> 
+<feature id="org.talend.babel.all.tos.feature" label="Babel feature with all languages for TOS" version="7.3.1.qualifier"> 
  <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
  <license url="http://www.example.com/license">[Enter License Description here.]</license>  
--- 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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.commons.feature" label="Commons Feature" version="7.3.1.qualifier" provider-name=".Talend SA."> 
  <description url="http://www.talend.com/online/featuresdescription.html#commons-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#commons-feature</description>  
  <copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>  
  <license>The licence are describe in branding feature</license>  
--- 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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.core.feature" label="Core Feature" version="7.3.1.qualifier" provider-name=".Talend SA."> 
  <description url="http://www.talend.com/online/featuresdescription.html#core-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#core-feature</description>  
  <copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>  
  <license>The licence are describe in branding feature</license>  
--- 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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier">
+      version="7.3.1.qualifier">

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

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

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

 </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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.help.feature" label="Help Feature" version="7.3.1.qualifier" provider-name=".Talend SA."> 
  <description url="http://www.talend.com/online/featuresdescription.html#help-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#help-feature</description>  
  <copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>  
  <license>The licence are describe in branding feature</license>  
--- 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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier"> 
+<feature id="org.talend.jdt.feature" label="Feature" version="7.3.1.qualifier"> 
  <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
  <license url="http://www.example.com/license">[Enter License Description here.]</license>  
--- 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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.libraries.jdbc.feature" label="Jdbc_feature Feature" version="7.3.1.qualifier" provider-name=".Talend SA."> 
  <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
  <license url="http://www.example.com/license">[Enter License Description here.]</license>  
--- 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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier"> 
+<feature id="org.talend.m2e.feature" label="Feature" version="7.3.1.qualifier"> 
  <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
  <license url="http://www.example.com/license">[Enter License Description here.]</license>  
--- 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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier">
+      version="7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier"> 
+<feature id="org.talend.platform.feature" label="Platform" version="7.3.1.qualifier"> 
  <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
  <license url="http://www.example.com/license">[Enter License Description here.]</license>  
--- 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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier"
+      version="7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier"> 
+<feature id="org.talend.update.p2.feature" label="P2-feature" version="7.3.1.qualifier"> 
  <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
  <license url="http://www.example.com/license">[Enter License Description here.]</license>  
--- 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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.updates.feature" label="Updates-feature" version="7.3.1.qualifier" provider-name=".Talend SA."> 
  <copyright url="http://www.talend.com/about-us">[Enter Copyright Description here.]</copyright>  
  <plugin id="org.talend.updates.runtime" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 </feature>
--- 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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier"> 
+<feature id="org.talend.utils.feature" label="Utils_feature Feature" version="7.3.1.qualifier"> 
  <description url="http://www.example.com/description">This feature contains the Talend utilities plugin and its dependencies.</description>  
  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
  <license url="http://www.example.com/license">[Enter License Description here.]</license>  
@@ -20,8 +20,10 @@
    <import plugin="org.apache.servicemix.bundles.avro" version="0.0.0" match="greaterOrEqual"/>
    <import plugin="org.junit" version="0.0.0" match="greaterOrEqual"/>
    <import plugin="org.slf4j.api" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.apache.commons.configuration" version="2.0.0" match="greaterOrEqual"/>
  </requires>  
  <plugin id="org.talend.daikon" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
  <plugin id="org.talend.daikon.exception" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.daikon.crypto.utils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
  <plugin id="org.talend.utils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 </feature>
--- 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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1.qualifier
+Bundle-Version: 7.3.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.2.1</version>
+    <version>7.3.1-SNAPSHOT</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.2.1</version>
+        <version>7.3.1-SNAPSHOT</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,6 +114,9 @@ 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,3 +58,6 @@ 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,29 +21,23 @@ import javax.crypto.SecretKeyFactory;
 import javax.crypto.spec.DESKeySpec;

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

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

-    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$
+    public static final String ENCRYPT_KEY = "Encrypt"; //$NON-NLS-1$

    private static SecretKey key = null;

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

    private static SecretKey getSecretKey() throws Exception {
        if (key == null) {
-
-            byte rawKeyData[] = rawKey.getBytes();
+            byte rawKeyData[] = StudioEncryption.getKeySource(StudioEncryption.EncryptionKeyName.MIGRATION.toString(), false)
+                    .getKey();
            DESKeySpec dks = new DESKeySpec(rawKeyData);
            SecretKeyFactory keyFactory = SecretKeyFactory.getInstance("DES"); //$NON-NLS-1$
            key = keyFactory.generateSecret(dks);
@@ -65,7 +59,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;
@@ -85,7 +79,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);
    }
@@ -99,7 +93,7 @@ public class PasswordEncryptUtil {
        if (input == null) {
            return input;
        }
-        return PREFIX_PASSWORD + AESEncryption.encryptPassword(input) + POSTFIX_PASSWORD;
+        return StudioEncryption.getStudioEncryption(StudioEncryption.EncryptionKeyName.ROUTINE).encrypt(input);
    }

    /**
--- 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,6 +19,7 @@ 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;
@@ -192,6 +193,27 @@ 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,11 +350,18 @@ 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.updates.runtime/src/main/java/org/talend/updates/runtime/ui/feature/model/impl/AbstractFeatureItem.java
+++ b/main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/ui/feature/model/impl/AbstractFeatureItem.java
@@ -10,36 +10,32 @@
 // 9 rue Pages 92150 Suresnes, France
 //
 // ============================================================================
-package org.talend.updates.runtime.ui.feature.model.impl;
+package org.talend.commons.utils.network;

-import org.talend.updates.runtime.model.ExtraFeature;
-import org.talend.updates.runtime.ui.feature.model.IFeatureItem;
+import java.io.IOException;
+import java.net.SocketAddress;
+import java.net.URI;

+import org.talend.commons.CommonsPlugin;
+import org.talend.commons.exception.ExceptionHandler;

 /**
 * DOC cmeng  class global comment. Detailled comment
 */
-public abstract class AbstractFeatureItem implements IFeatureItem {
+public abstract class AbstractProxySelectorProvider implements IProxySelectorProvider {

-    private String title;
-
-    private ExtraFeature feature;
+    private boolean isDebugMode = CommonsPlugin.isDebugMode();

    @Override
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
+    public Object getKey() {
+        return this;
    }

    @Override
-    public ExtraFeature getFeature() {
-        return feature;
+    public void connectFailed(final URI uri, final SocketAddress sa, final IOException ioe) {
+        if (isDebugMode) {
+            ExceptionHandler.process(ioe);
+        }
    }

-    public void setFeature(ExtraFeature feature) {
-        this.feature = feature;
-    }
 }
--- a/main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/ui/feature/form/listener/ICheckListener.java
+++ b/main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/ui/feature/form/listener/ICheckListener.java
@@ -10,21 +10,25 @@
 // 9 rue Pages 92150 Suresnes, France
 //
 // ============================================================================
-package org.talend.updates.runtime.ui.feature.form.listener;
+package org.talend.commons.utils.network;

-import org.eclipse.jface.operation.IRunnableWithProgress;
+import java.io.IOException;
+import java.net.Proxy;
+import java.net.SocketAddress;
+import java.net.URI;
+import java.util.List;

 /**
 * DOC cmeng  class global comment. Detailled comment
 */
-public interface ICheckListener {
+public interface IProxySelectorProvider {

-    public void showMessage(String message, int level);
+    Object getKey();

-    public String getMessage();
+    boolean canHandle(final URI uri);

-    public void updateButtons();
+    List<Proxy> select(final URI uri);

-    public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws Exception;
+    void connectFailed(final URI uri, final SocketAddress sa, final IOException ioe);

 }
--- a/Show More
+++ b/Show More