fix(TBD-8343): NoSuchMethodError when Having tGSConnection and tS3Connection Components Within one Job #

...then....else' condition.

CONTRIBUTORS.md

@@ -4,5 +4,4 @@ Huge thanks to these people who contributed in making Talend product better:
  - [jlolling](https://github.com/jlolling) (Jan -and Miss- Lolling)
  - [kirkalicious](https://github.com/kirkalicious) (Kirk Tarou)
  - [mrizzato](https://github.com/mrizzato) (Massimiliano Rizzato)
- - [brazabr](https://github.com/brazabr) (Thiago Benvenuto)
- - [phoflack](https://jira.talendforge.org/secure/ViewProfile.jspa?name=phoflack) (Philip Hoflack)
+ - [brazabr](https://github.com/brazabr) (Thiago Benvenuto)

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

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.abstractmap.nl
-Bundle-Version: 7.2.1.qualifier
+Bundle-Version: 7.1.2.qualifier
 Fragment-Host: org.talend.designer.abstractmap

i18n/plugins/org.talend.designer.abstractmap.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.abstractmap.nl</artifactId>

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

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.alfrescooutput.nl
-Bundle-Version: 7.2.1.qualifier
+Bundle-Version: 7.1.2.qualifier
 Fragment-Host: org.talend.designer.alfrescooutput

i18n/plugins/org.talend.designer.alfrescooutput.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.alfrescooutput.nl</artifactId>

i18n/plugins/org.talend.designer.business.diagram.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.business.diagram.nl
-Bundle-Version: 7.2.1.qualifier
+Bundle-Version: 7.1.2.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.designer.business.diagram
 Bundle-Localization: plugin

i18n/plugins/org.talend.designer.business.diagram.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.business.diagram.nl</artifactId>

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

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.designer.codegen Nl Fragment
 Bundle-SymbolicName: org.talend.designer.codegen.nl
-Bundle-Version: 7.2.1.qualifier
+Bundle-Version: 7.1.2.qualifier
 Fragment-Host: org.talend.designer.codegen
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.

i18n/plugins/org.talend.designer.codegen.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.codegen.nl</artifactId>

i18n/plugins/org.talend.designer.components.exchange.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.designer.components.exchange.nl
-Bundle-Version: 7.2.1.qualifier
+Bundle-Version: 7.1.2.qualifier
 Fragment-Host: org.talend.designer.components.exchange

i18n/plugins/org.talend.designer.components.exchange.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.components.exchange.nl</artifactId>

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

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Designer Plug-in Nl Fragment
 Bundle-SymbolicName: org.talend.designer.core.nl
-Bundle-Version: 7.2.1.qualifier
+Bundle-Version: 7.1.2.qualifier
 Fragment-Host: org.talend.designer.core
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.core.nl</artifactId>

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

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.dbmap.nl
-Bundle-Version: 7.2.1.qualifier
+Bundle-Version: 7.1.2.qualifier
 Fragment-Host: org.talend.designer.dbmap

i18n/plugins/org.talend.designer.dbmap.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.dbmap.nl</artifactId>

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

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.designer.documentation.nl
-Bundle-Version: 7.2.1.qualifier
+Bundle-Version: 7.1.2.qualifier
 Fragment-Host: org.talend.designer.documentation

i18n/plugins/org.talend.designer.documentation.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.documentation.nl</artifactId>

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

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.fileoutputxml.nl
-Bundle-Version: 7.2.1.qualifier
+Bundle-Version: 7.1.2.qualifier
 Fragment-Host: org.talend.designer.fileoutputxml

i18n/plugins/org.talend.designer.fileoutputxml.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.fileoutputxml.nl</artifactId>

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

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.gefabstractmap.nl
-Bundle-Version: 7.2.1.qualifier
+Bundle-Version: 7.1.2.qualifier
 Fragment-Host: org.talend.designer.gefabstractmap

i18n/plugins/org.talend.designer.gefabstractmap.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.gefabstractmap.nl</artifactId>

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

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mapper component Plug-in Nl Fragment
 Bundle-SymbolicName: org.talend.designer.mapper.nl
-Bundle-Version: 7.2.1.qualifier
+Bundle-Version: 7.1.2.qualifier
 Fragment-Host: org.talend.designer.mapper
 Bundle-Vendor: .Talend SA.

i18n/plugins/org.talend.designer.mapper.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.mapper.nl</artifactId>

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

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Maven Job NL
 Bundle-SymbolicName: org.talend.designer.maven.job.nl
-Bundle-Version: 7.2.1.qualifier
+Bundle-Version: 7.1.2.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.designer.maven.job
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.maven.job.nl</artifactId>

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

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Rowgenerator Nl Fragment
 Bundle-SymbolicName: org.talend.designer.rowgenerator.nl
-Bundle-Version: 7.2.1.qualifier
+Bundle-Version: 7.1.2.qualifier
 Fragment-Host: org.talend.designer.rowgenerator
 Bundle-Vendor: .Talend SA.

i18n/plugins/org.talend.designer.rowgenerator.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.rowgenerator.nl</artifactId>

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

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.designer.runprocess.nl fragment
 Bundle-SymbolicName: org.talend.designer.runprocess.nl
-Bundle-Version: 7.2.1.qualifier
+Bundle-Version: 7.1.2.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.designer.runprocess
 Bundle-Localization: plugin

i18n/plugins/org.talend.designer.runprocess.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.runprocess.nl</artifactId>

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

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.scd.nl
-Bundle-Version: 7.2.1.qualifier
+Bundle-Version: 7.1.2.qualifier
 Fragment-Host: org.talend.designer.scd

i18n/plugins/org.talend.designer.scd.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.scd.nl</artifactId>

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

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.webservice.nl
-Bundle-Version: 7.2.1.qualifier
+Bundle-Version: 7.1.2.qualifier
 Fragment-Host: org.talend.designer.webservice

i18n/plugins/org.talend.designer.webservice.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.webservice.nl</artifactId>

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

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.designer.xmlmap.nl
-Bundle-Version: 7.2.1.qualifier
+Bundle-Version: 7.1.2.qualifier
 Fragment-Host: org.talend.designer.xmlmap

i18n/plugins/org.talend.designer.xmlmap.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.xmlmap.nl</artifactId>

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

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Expression Builder Nl Fragment
 Bundle-SymbolicName: org.talend.expressionbuilder.nl
-Bundle-Version: 7.2.1.qualifier
+Bundle-Version: 7.1.2.qualifier
 Fragment-Host: org.talend.expressionbuilder
 Bundle-Vendor: .Talend SA.

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.expressionbuilder.nl</artifactId>

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

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NL
 Bundle-SymbolicName: org.talend.presentation.onboarding.resource.nl
-Bundle-Version: 7.2.1.qualifier
+Bundle-Version: 7.1.2.qualifier
 Fragment-Host: org.talend.presentation.onboarding.resource
 Bundle-Vendor: .Talend SA.

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.presentation.onboarding.resource.nl</artifactId>

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

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NL
 Bundle-SymbolicName: org.talend.presentation.onboarding.resource.tos.nl
-Bundle-Version: 7.2.1.qualifier
+Bundle-Version: 7.1.2.qualifier
 Fragment-Host: org.talend.presentation.onboarding.resource.tos
 Bundle-Vendor: .Talend SA.

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.presentation.onboarding.resource.tos.nl</artifactId>

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

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.repository.ftp.nl
-Bundle-Version: 7.2.1.qualifier
+Bundle-Version: 7.1.2.qualifier
 Fragment-Host: org.talend.repository.ftp

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.ftp.nl</artifactId>

i18n/plugins/org.talend.repository.json.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.json.nl
-Bundle-Version: 7.2.1.qualifier
+Bundle-Version: 7.1.2.qualifier
 Fragment-Host: org.talend.repository.json
 Bundle-Vendor: .Talend SA.

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.json.nl</artifactId>

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

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

i18n/plugins/org.talend.repository.nl/build.properties

@@ -3,21 +3,22 @@ output.. = class/
 bin.includes = META-INF/,\
                .,\
                plugin_en.properties,\
-               plugin_ar.properties,\
-               plugin_zh_CN.properties,\
-               plugin_ru.properties,\
-               plugin_ro.properties,\
-               plugin_jp.properties,\
-               plugin_hr.properties,\
-               plugin_fr.properties,\
-               plugin_pt_BR.properties,\
-               plugin_nl.properties,\
-               plugin_el.properties,\
-               plugin_ja.properties,\
-               plugin_it.properties,\
-               plugin_kr.properties,\
-               plugin_es.properties,\
-               plugin_tr.properties,\
-               plugin_pl.properties,\
-               plugin_de.properties,\
-               plugin_swtbot.properties
+               plugin_zh.properties\
+,plugin_ar.properties\
+,plugin_zh_CN.properties\
+,plugin_ru.properties\
+,plugin_ro.properties\
+,plugin_jp.properties\
+,plugin_hr.properties\
+,plugin_fr.properties\
+,plugin_pt_BR.properties\
+,plugin_nl.properties\
+,plugin_el.properties\
+,plugin_ja.properties\
+,plugin_it.properties\
+,plugin_kr.properties\
+,plugin_es.properties\
+,plugin_tr.properties\
+,plugin_pl.properties\
+,plugin_de.properties\
+,plugin_swtbot.properties

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.nl</artifactId>

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

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.repository.view.di.nl
-Bundle-Version: 7.2.1.qualifier
+Bundle-Version: 7.1.2.qualifier
 Fragment-Host: org.talend.repository.view.di

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.view.di.nl</artifactId>

i18n/plugins/org.talend.sbi.engines.client.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.sbi.engines.client.nl
-Bundle-Version: 7.2.1.qualifier
+Bundle-Version: 7.1.2.qualifier
 Fragment-Host: org.talend.sbi.engines.client

i18n/plugins/org.talend.sbi.engines.client.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.sbi.engines.client.nl</artifactId>

i18n/plugins/org.talend.spagic.engines.client.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.spagic.engines.client.nl
-Bundle-Version: 7.2.1.qualifier
+Bundle-Version: 7.1.2.qualifier
 Fragment-Host: org.talend.spagic.engines.client

i18n/plugins/org.talend.spagic.engines.client.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.spagic.engines.client.nl</artifactId>

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

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

i18n/plugins/org.talend.sqlbuilder.nl/build.properties

@@ -2,4 +2,5 @@ source.. = src/main/java/
 output.. = class/
 bin.includes = META-INF/,\
                .,\
-               plugin_en.properties
+               plugin_en.properties,\
+               plugin_zh.properties

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.sqlbuilder.nl</artifactId>

main/features/org.talend.designer.business.feature/feature.xml

@@ -1,24 +1,79 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.talend.designer.business.feature"
+      label="Business Feature"
+      version="7.1.2.qualifier"
+      provider-name=".Talend SA.">
+
+   <description url="http://www.talend.com/online/featuresdescription.html#business-feature">
+      Complete description about this feature at http://www.talend.com/online/featuresdescription.html#business-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>
+
+   <url>
+      <discovery label="Talend web site" url="http://www.talend.com"/>
+   </url>
+
+   <includes
+         id="org.eclipse.gmf"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.emf.workspace"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.emf.common"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.emf.ecore"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.emf.ecore.edit"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.emf.transaction"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.emf.validation"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.emf.edit"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.gef"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.gmf.runtime.notation"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.designer.business.diagram"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.business.diagram.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
 
-<feature id="org.talend.designer.business.feature" label="Business Feature" version="7.2.1.qualifier" provider-name=".Talend SA."> 
-  <description url="http://www.talend.com/online/featuresdescription.html#business-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#business-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>  
-  <url> 
-    <discovery label="Talend web site" url="http://www.talend.com"/> 
-  </url>  
-  <requires>
-    <import feature="org.eclipse.emf.common" version="0.0.0" match="greaterOrEqual"/>
-    <import feature="org.eclipse.emf.ecore" version="0.0.0" match="greaterOrEqual"/>
-    <import feature="org.eclipse.emf.ecore.edit" version="0.0.0" match="greaterOrEqual"/>
-    <import feature="org.eclipse.emf.edit" version="0.0.0" match="greaterOrEqual"/>
-    <import feature="org.eclipse.emf.transaction" version="0.0.0" match="greaterOrEqual"/>
-    <import feature="org.eclipse.emf.validation" version="0.0.0" match="greaterOrEqual"/>
-    <import feature="org.eclipse.emf.workspace" version="0.0.0" match="greaterOrEqual"/>
-    <import feature="org.eclipse.gef" version="0.0.0" match="greaterOrEqual"/>
-    <import feature="org.eclipse.gmf" version="0.0.0" match="greaterOrEqual"/>
-    <import feature="org.eclipse.gmf.runtime.notation" version="0.0.0" match="greaterOrEqual"/>
-  </requires>
-  <plugin id="org.talend.designer.business.diagram" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.designer.business.diagram.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
 </feature>

main/features/org.talend.designer.business.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.business.feature</artifactId>

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

@@ -1,38 +1,280 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.talend.designer.feature"
+      label="Designer Feature"
+      version="7.1.2.qualifier"
+      provider-name=".Talend SA.">
+
+   <description url="http://www.talend.com/online/featuresdescription.html#designer-feature">
+      Complete description about this feature at http://www.talend.com/online/featuresdescription.html#designer-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>
+
+   <url>
+      <update label="CORE Talend update site for milestones" url="http://talendforge.org/core/updatesite/testing/"/>
+      <discovery label="Talend web site" url="http://www.talend.com"/>
+   </url>
+
+   <includes
+         id="org.eclipse.gef"
+         version="0.0.0"/>
+
+   <includes
+         id="org.talend.m2e.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.talend.utils.feature"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.designer.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.codegen"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.designer.runprocess"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.sqlbuilder"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.codegen.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.core.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.runprocess.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.sqlbuilder.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.libraries.apache"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.dom4j-jaxen"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.jackson"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.javacsv"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.csv"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.librariesmanager"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.librariesmanager.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.metadata.managment"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.model"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.repository"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.libraries.jexcel"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.mozilla"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.datatools.xml"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.osgi.lib.loader"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.librariesmanager.ui.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.librariesmanager.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.themes.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="net.jeeeyul.eclipse.themes"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="net.jeeeyul.swtend"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.maven"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.runtime.visualization"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.runtime.visualization.tools"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.maven.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.maven.ui.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+         id="javax.xml.rpc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.axis"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.libraries.sqlbuilder"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-<feature id="org.talend.designer.feature" label="Designer Feature" version="7.2.1.qualifier" provider-name=".Talend SA."> 
-  <description url="http://www.talend.com/online/featuresdescription.html#designer-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#designer-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>  
-  <url> 
-    <update label="CORE Talend update site for milestones" url="http://talendforge.org/core/updatesite/testing/"/>  
-    <discovery label="Talend web site" url="http://www.talend.com"/> 
-  </url>  
-  <requires>
-    <import feature="org.eclipse.gef" version="0.0.0" match="greaterOrEqual"/>
-    <import feature="org.talend.m2e.feature" version="0.0.0" match="greaterOrEqual"/>
-    <import feature="org.talend.utils.feature" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="javax.xml.rpc" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="net.jeeeyul.eclipse.themes" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="net.jeeeyul.swtend" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.apache.axis" version="0.0.0" match="greaterOrEqual"/>
-  </requires>  
-  <plugin id="org.talend.designer.codegen" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.designer.codegen.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.designer.core" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.designer.core.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin download-size="0" install-size="0" version="0.0.0" unpack="false" id="org.talend.designer.dbmap.nl"/>
-  <plugin id="org.talend.designer.maven" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin download-size="0" install-size="0" version="0.0.0" unpack="false" id="org.talend.designer.maven.job"/>
-  <plugin download-size="0" install-size="0" version="0.0.0" unpack="false" id="org.talend.designer.maven.job.nl"/>
-  <plugin id="org.talend.designer.maven.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.designer.maven.ui.nl" download-size="0" install-size="0" version="0.0.0" fragment="true"/>
-  <plugin id="org.talend.designer.runprocess" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.designer.runprocess.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.designer.runtime.visualization" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.designer.runtime.visualization.tools" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.libraries.mozilla" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.sqlbuilder" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.sqlbuilder" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.sqlbuilder.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
 </feature>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.feature</artifactId>

main/features/org.talend.fragment.jars.di.feature/.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.talend.fragment.jars.di.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>

main/features/org.talend.fragment.jars.di.feature/build.properties

@@ -1 +0,0 @@
-bin.includes = feature.xml

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

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.talend.fragment.jars.di.feature"
-      label="Fragment Jars in DI"
-      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>
-
-   <plugin
-         id="org.talend.libraries.microsoft"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.designer.oas"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.libraries.edifact"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.libraries.ftp"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.libraries.uniserv"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.libraries.sqlbuilder.jars"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-</feature>

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

@@ -1,23 +1,99 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.talend.rcp.branding.tos.feature"
+      label="Tos branding feature"
+      version="7.1.2.qualifier"
+      provider-name=".Talend SA."
+      plugin="org.talend.rcp.branding.tos">
+
+   <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>
+      [Enter License Description here.]
+   </license>
+
+   <url>
+      <update label="TOS Talend update site for milestones" url="http://talendforge.org/core/updatesite/testing/"/>
+   </url>
+
+   <includes
+         id="org.talend.tos.feature"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.rcp.branding.tos"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.themes.css.talend"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.presentation.onboarding"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.presentation.onboarding.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.presentation.onboarding.resource"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.presentation.onboarding.resource.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.presentation.onboarding.resource.tos"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.presentation.onboarding.resource.tos.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+         id="org.talend.designer.maven.tos"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+         id="org.talend.libraries.mdm.webservice.ce"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
 
-<feature id="org.talend.rcp.branding.tos.feature" label="Tos branding feature" version="7.2.1.qualifier" provider-name=".Talend SA." plugin="org.talend.rcp.branding.tos"> 
-  <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>[Enter License Description here.]</license>  
-  <url> 
-    <update label="TOS Talend update site for milestones" url="http://talendforge.org/core/updatesite/testing/"/> 
-  </url>  
-  <requires>
-    <import feature="org.talend.tos.feature" version="0.0.0" match="greaterOrEqual"/>
-  </requires>
-  <plugin id="org.talend.designer.maven.tos" download-size="0" install-size="0" version="0.0.0" fragment="true"/>
-  <plugin id="org.talend.libraries.mdm.webservice.ce" download-size="0" install-size="0" version="0.0.0" fragment="true"/>
-  <plugin id="org.talend.presentation.onboarding" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.presentation.onboarding.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.presentation.onboarding.resource" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.presentation.onboarding.resource.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.presentation.onboarding.resource.tos" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.presentation.onboarding.resource.tos.nl" download-size="0" install-size="0" version="0.0.0" fragment="true"/>
-  <plugin id="org.talend.rcp.branding.tos" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.themes.css.talend" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 </feature>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.rcp.branding.tos.feature</artifactId>

main/features/org.talend.rcp.branding.tos.test.feature/feature.xml

@@ -1,59 +1,411 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.talend.rcp.branding.tos.test.feature"
+      label="Test feature for TOS"
+      version="7.1.2.qualifier">
 
-<feature id="org.talend.rcp.branding.tos.test.feature" label="Test feature 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>  
-  <requires>
-    <import feature="org.eclipse.test" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.junit" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.talend.commons.runtime" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.talend.commons.ui" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.talend.core" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.talend.designer.core" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.talend.designer.mapper" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.talend.designer.runprocess" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.talend.model.migration" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.talend.repository" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.talend.utils" version="0.0.0" match="greaterOrEqual"/>
-  </requires>  
-  <plugin id="org.talend.commons.runtime.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.commons.ui.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.core.repository.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.core.runtime.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.core.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.core.ui.test" download-size="0" install-size="0" version="0.0.0" fragment="true"/>
-  <plugin id="org.talend.datatools.xml.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.designer.codegen.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.designer.components.localprovider.test" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.designer.core.generic.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.designer.core.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.designer.dbmap.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.designer.mapper.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.designer.maven.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.designer.rowgenerator.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.designer.runprocess.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.designer.scd.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.designer.unifiedcomponent.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.designer.webservice.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.designer.xmlmap.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.librariesmanager.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.librariesmanager.ui.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.metadata.managment.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.metadata.managment.ui.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.migrationTool.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.model.migration.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.model.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.repository.generic.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.repository.items.importexport.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.repository.items.importexport.ui.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.repository.localprovider.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.repository.metadata.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.repository.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.repository.view.di.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.repository.view.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.testutils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.updates.runtime.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.utils.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="test.all.test.suite" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+   <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>
+
+   <includes
+         id="org.eclipse.test"
+         version="0.0.0"/>
+
+   <requires>
+      <import plugin="org.talend.dataquality.matching" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="org.talend.designer.runprocess" version="2.2.0" match="greaterOrEqual"/>
+      <import plugin="org.talend.designer.core" version="2.2.0" match="greaterOrEqual"/>
+      <import plugin="org.talend.commons.ui" version="2.2.0" match="greaterOrEqual"/>
+      <import plugin="org.talend.designer.mapper" version="2.2.0" match="greaterOrEqual"/>
+      <import plugin="org.talend.repository" version="2.2.0" match="greaterOrEqual"/>
+      <import plugin="org.talend.commons.runtime" version="2.2.0" match="greaterOrEqual"/>
+      <import plugin="org.talend.model.migration" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="org.talend.utils" version="2.1.0" match="greaterOrEqual"/>
+      <import plugin="org.talend.core" version="2.2.0" match="greaterOrEqual"/>
+      <import plugin="org.junit"/>
+   </requires>
+
+   <plugin
+         id="org.talend.designer.runprocess.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.commons.ui.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.mapper.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.model.migration.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.utils.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.core.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="test.all.test.suite"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.core.repository.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.commons.runtime.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.components.localprovider.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.core.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.repository.localprovider.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.repository.metadata.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.metadata.managment.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.core.runtime.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.librariesmanager.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.xmlmap.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.dbmap.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.repository.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.rowgenerator.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.codegen.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.testutils"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.repository.items.importexport.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.osgi.lib.loader"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.repository.items.importexport.ui.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.maven.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.oozie.scheduler.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.dataprofiler.core.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.dataprofiler.ecos.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.dataquality.matching.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.dataquality.record.linkage.ui.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.dataquality.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.cwm.compare.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.cwm.management.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.core.ui.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+         id="org.talend.librariesmanager.ui.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.repository.generic.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.core.generic.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.repository.view.di.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.webservice.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.updates.runtime.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.repository.view.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.migrationTool.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.metadata.managment.ui.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.model.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.scd.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+         
+    <plugin
+         id="org.talend.designer.unifiedcomponent.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+         
+    <plugin
+         id="org.talend.datatools.xml.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
 </feature>

main/features/org.talend.rcp.branding.tos.test.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.rcp.branding.tos.test.feature</artifactId>

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

@@ -1,33 +1,267 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.talend.repository.feature"
+      label="Repository Feature"
+      version="7.1.2.qualifier"
+      provider-name=".Talend SA.">
+
+   <description url="http://www.talend.com/online/featuresdescription.html#repository-feature">
+      Complete description about this feature at http://www.talend.com/online/featuresdescription.html#repository-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>
+
+   <url>
+      <update label="CORE Talend update site for milestones" url="http://talendforge.org/core/updatesite/testing/"/>
+      <discovery label="Talend web site" url="http://www.talend.com"/>
+   </url>
+
+   <plugin
+         id="org.talend.repository"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.repository.localprovider"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.repository.localprovider.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.repository.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.registration"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.core.repository"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.metadata.managment"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.core.repository.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.metadata.managment.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.registration.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.libraries.apache"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.dom4j-jaxen"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.jdbc.jtds"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.jdbc.mysql"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.jexcel"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.repository.view"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.repository.view.di"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.repository.metadata"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.libraries.csv"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.designer.documentation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.datatools.xml"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.repository.view.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.repository.view.di.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.documentation.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.repository.metadata.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="biz.aQute.bndlib"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.platform.logging"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.repository.items.importexport"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.repository.items.importexport.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.osgi.lib.loader"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.libraries.mdm"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.repository.items.importexport.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.repository.items.importexport.ui.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.net"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-<feature id="org.talend.repository.feature" label="Repository Feature" version="7.2.1.qualifier" provider-name=".Talend SA."> 
-  <description url="http://www.talend.com/online/featuresdescription.html#repository-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#repository-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>  
-  <url> 
-    <update label="CORE Talend update site for milestones" url="http://talendforge.org/core/updatesite/testing/"/>  
-    <discovery label="Talend web site" url="http://www.talend.com"/> 
-  </url>  
-  <requires>
-    <import plugin="biz.aQute.bndlib" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.core.net" version="0.0.0" match="greaterOrEqual"/>
-  </requires>  
-  <plugin id="org.talend.designer.documentation" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.designer.documentation.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.registration" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.registration.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.repository" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.repository.items.importexport" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.repository.items.importexport.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.repository.items.importexport.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.repository.items.importexport.ui.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.repository.localprovider" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.repository.localprovider.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.repository.metadata" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.repository.metadata.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.repository.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.repository.view" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.repository.view.di" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.repository.view.di.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.repository.view.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
 </feature>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.feature</artifactId>

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

@@ -1,12 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.talend.sbi.feature"
+      label="SBI Feature"
+      version="7.1.2.qualifier"
+      provider-name=".Talend SA.">
+
+   <description url="http://www.talend.com/online/featuresdescription.html#sbi-feature">
+      Complete description about this feature at http://www.talend.com/online/featuresdescription.html#sbi-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>
+
+   <url>
+      <discovery label="Talend web site" url="http://www.talend.com"/>
+   </url>
+
+   <plugin
+         id="org.talend.sbi.engines.client"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.sbi.engines.client.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.libraries.dom4j-jaxen"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
 
-<feature id="org.talend.sbi.feature" label="SBI Feature" version="7.2.1.qualifier" provider-name=".Talend SA."> 
-  <description url="http://www.talend.com/online/featuresdescription.html#sbi-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#sbi-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>  
-  <url> 
-    <discovery label="Talend web site" url="http://www.talend.com"/> 
-  </url>  
-  <plugin id="org.talend.sbi.engines.client" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.sbi.engines.client.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
 </feature>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.sbi.feature</artifactId>

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

@@ -1,12 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.talend.spagic.feature"
+      label="SPAGIC Feature"
+      version="7.1.2.qualifier"
+      provider-name=".Talend SA.">
+
+   <description url="http://www.talend.com/online/featuresdescription.html#spagic-feature">
+      Complete description about this feature at http://www.talend.com/online/featuresdescription.html#sbi-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>
+
+   <url>
+      <discovery label="Talend web site" url="http://www.talend.com"/>
+   </url>
+
+   <plugin
+         id="org.talend.spagic.engines.client"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.spagic.engines.client.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
 
-<feature id="org.talend.spagic.feature" label="SPAGIC Feature" version="7.2.1.qualifier" provider-name=".Talend SA."> 
-  <description url="http://www.talend.com/online/featuresdescription.html#spagic-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#sbi-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>  
-  <url> 
-    <discovery label="Talend web site" url="http://www.talend.com"/> 
-  </url>  
-  <plugin id="org.talend.spagic.engines.client" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.spagic.engines.client.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
 </feature>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.spagic.feature</artifactId>

main/features/org.talend.tos.components.feature/feature.xml

@@ -1,68 +1,446 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.talend.tos.components.feature"
+      label="Components-feature"
+      version="7.1.2.qualifier">
 
-<feature id="org.talend.tos.components.feature" label="Components-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>  
-  <requires>
-    <import feature="org.talend.esb.tooling.ws.consumer.feature" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="biz.aQute.bnd.annotation" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="javax.wsdl" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="joda-time" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.help.ui" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="jaxb-api" version="0.0.0" match="greaterOrEqual"/>
-  </requires>
-  <plugin id="org.talend.components.api" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.components.api.service.osgi" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.components.azurestorage" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.components.common" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.components.common-oauth" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.components.googledrive" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.components.jdbc.definition" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.components.jira" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.components.marketo" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.components.netsuite" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.components.salesforce.definition" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.components.snowflake.definition" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.components.splunk" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.designer.abstractmap" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.designer.abstractmap.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.designer.alfrescooutput" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.designer.alfrescooutput.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.designer.components.exchange" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.designer.components.exchange.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.designer.components.localprovider" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.designer.core.generic" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.designer.dbmap" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.designer.filemultischemas" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.designer.fileoutputxml" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.designer.fileoutputxml.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.designer.gefabstractmap" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.designer.gefabstractmap.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.designer.mapper" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.designer.mapper.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.designer.rowgenerator" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.designer.rowgenerator.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.designer.scd" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.designer.scd.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.designer.spss" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.designer.unifiedcomponent" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.designer.webservice" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.designer.webservice.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.designer.xmlmap" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.designer.xmlmap.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.expressionbuilder" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.expressionbuilder.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.help.azurestorage" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.help.filedelimited" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.help.filterrow" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.help.googledrive" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.help.jdbc" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.help.jira" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.help.marketo" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.help.salesforce" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.help.snowflake" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.help.splunk" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.repository.generic" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.sdk.component.studio-integration" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+   <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>
+
+   <includes
+         id="org.talend.esb.tooling.ws.consumer.feature"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.designer.components.localprovider"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.designer.mapper"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.dbmap"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.abstractmap"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.fileoutputxml"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.scd"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.filemultischemas"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.spss"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.abstractmap.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.rowgenerator"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.alfrescooutput"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.alfrescooutput.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.dbmap.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.fileoutputxml.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.scd.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.mapper.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.rowgenerator.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.expressionbuilder"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.expressionbuilder.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.gefabstractmap"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.xmlmap"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javax.wsdl"
+         download-size="0"
+         install-size="0"
+         version="1.6.2.v201012040545"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.webservice"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.webservice.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.components.exchange"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.designer.components.exchange.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.xmlmap.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.help.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.libraries.csv"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.designer.gefabstractmap.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="biz.aQute.bnd.annotation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.components.api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.components.api.service.osgi"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.components.common"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.components.common-oauth"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.repository.generic"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.core.generic"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.components.salesforce.definition"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.components.splunk"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.components.jira"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.components.snowflake.definition"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.components.azurestorage"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.components.netsuite"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.components.marketo"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+           id="org.talend.components.googledrive"
+           download-size="0"
+           install-size="0"
+           version="0.0.0"
+           unpack="false"/>
+
+   <plugin
+         id="joda-time"
+         download-size="0"
+         install-size="0"
+         version="2.8.2"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.help.azurestorage"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.help.jira"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.help.marketo"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.help.salesforce"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.help.snowflake"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.help.splunk"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.help.filedelimited"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.help.filterrow"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.help.jdbc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+    
+   <plugin
+         id="org.talend.help.googledrive"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.sdk.component.studio-integration"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="org.talend.designer.unifiedcomponent"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+           
+   <plugin
+         id="org.talend.components.jdbc.definition"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
 </feature>

main/features/org.talend.tos.components.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.components.feature</artifactId>

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

@@ -1,35 +1,142 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.talend.tos.core.feature"
+      label="Feature"
+      version="7.1.2.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>
+
+   <includes
+         id="org.talend.commons.feature"
+         version="0.0.0"
+         search-location="self"/>
+
+   <includes
+         id="org.talend.core.feature"
+         version="0.0.0"
+         search-location="self"/>
+
+   <includes
+         id="org.talend.repository.feature"
+         version="0.0.0"
+         search-location="self"/>
+
+   <includes
+         id="org.talend.designer.feature"
+         version="0.0.0"
+         search-location="self"/>
+
+   <includes
+         id="org.talend.rcp.feature"
+         version="0.0.0"
+         search-location="self"/>
+
+   <includes
+         id="org.talend.tos.components.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.talend.hadoop.distribution.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.talend.updates.feature"
+         version="0.0.0"/>
+
+   <requires>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.talend.commons.ui"/>
+      <import plugin="org.talend.designer.core"/>
+      <import plugin="org.eclipse.xsd"/>
+      <import plugin="org.apache.log4j"/>
+      <import plugin="org.talend.repository"/>
+      <import plugin="org.talend.core"/>
+      <import plugin="org.apache.axis"/>
+      <import plugin="javax.xml.rpc"/>
+   </requires>
+
+   <plugin
+         id="org.talend.repository.mdm"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.xsd"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.repository.ftp"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.repository.ftp.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.repository.mdm.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.libraries.json"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.repository.json"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.repository.json.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.maven.job"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javax.transaction"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
 
-<feature id="org.talend.tos.core.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>  
-  <requires>
-    <import feature="org.talend.commons.feature" version="0.0.0" match="greaterOrEqual"/>
-    <import feature="org.talend.core.feature" version="0.0.0" match="greaterOrEqual"/>
-    <import feature="org.talend.designer.feature" version="0.0.0" match="greaterOrEqual"/>
-    <import feature="org.talend.hadoop.distribution.feature" version="0.0.0" match="greaterOrEqual"/>
-    <import feature="org.talend.rcp.feature" version="0.0.0" match="greaterOrEqual"/>
-    <import feature="org.talend.repository.feature" version="0.0.0" match="greaterOrEqual"/>
-    <import feature="org.talend.tos.components.feature" version="0.0.0" match="greaterOrEqual"/>
-    <import feature="org.talend.updates.feature" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="javax.transaction" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="javax.xml.rpc" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.apache.axis" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.apache.log4j" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.core.runtime" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.ui" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.xsd" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.talend.commons.ui" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.talend.core" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.talend.designer.core" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.talend.repository" version="0.0.0" match="greaterOrEqual"/>
-  </requires>  
-  <plugin id="org.talend.libraries.json" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.repository.ftp" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.repository.ftp.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.repository.json" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.repository.json.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.repository.mdm" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.repository.mdm.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
 </feature>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.core.feature</artifactId>

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

@@ -1,15 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.talend.tos.feature"
+      label="Tos feature"
+      version="7.1.2.qualifier"
+      provider-name=".Talend SA.">
 
-<feature id="org.talend.tos.feature" label="Tos 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>[Enter License Description here.]</license>  
-  <requires>
-    <import feature="org.talend.designer.business.feature" version="0.0.0" match="greaterOrEqual"/>
-    <import feature="org.talend.help.feature" version="0.0.0" match="greaterOrEqual"/>
-    <import feature="org.talend.sbi.feature" version="0.0.0" match="greaterOrEqual"/>
-    <import feature="org.talend.spagic.feature" version="0.0.0" match="greaterOrEqual"/>
-    <import feature="org.talend.tos.core.feature" version="0.0.0" match="greaterOrEqual"/>
-  </requires>  
-  <plugin id="org.talend.designer.tutorials" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+   <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>
+      [Enter License Description here.]
+   </license>
+
+   <includes
+         id="org.talend.tos.core.feature"
+         version="0.0.0"
+         search-location="self"/>
+
+   <includes
+         id="org.talend.help.feature"
+         version="0.0.0"
+         search-location="self"/>
+
+   <includes
+         id="org.talend.designer.business.feature"
+         version="0.0.0"
+         search-location="self"/>
+
+   <includes
+         id="org.talend.sbi.feature"
+         version="0.0.0"
+         search-location="self"/>
+
+   <includes
+         id="org.talend.spagic.feature"
+         version="0.0.0"
+         search-location="self"/>
+
+   <plugin
+         id="org.talend.designer.tutorials"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.designer.maven.job.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+         
 </feature>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.feature</artifactId>

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

@@ -1,56 +1,313 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.talend.tos.libraries.feature"
+      label="Libraries_feature"
+      version="7.1.2.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>
+
+   <includes
+         id="org.talend.libraries.jdbc.feature"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.apache"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.apache.common"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.apache.axis2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.css"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.jackson"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.jxplorer"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.jexcel"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.salesforce"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.jboss"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.excel"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.apache.http"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.apache.xml"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.dom4j-jaxen"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.apache.batik"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.apache.chemistry"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.apache.cxf"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.apache.lucene"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.asm"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.bonita"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.ehcache"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.apache.google"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.groovy"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.jax"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.jersey"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.mondrian"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.palo"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.saaj"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.xml"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.crm"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.w3c.css.sac"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.libraries.custom"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.guava"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.jetty"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.servlet"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.slf4j"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.zookeeper"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.hadoop.mapr.5.0.0"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.nattable"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.netsuite"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.nebula.widgets.tablecombo"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.nebula.widgets.nattable.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.nebula.widgets.nattable.extension.glazedlists"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.commons.beanutils"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.commons.httpclient"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.commons.logging"
+         download-size="0"
+         install-size="0"
+         version="1.0.4.v201101211617"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.libraries.persist.lookup"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.libraries.zmq"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
 
-<feature id="org.talend.tos.libraries.feature" label="Libraries_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>  
-  <requires>
-    <import feature="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature" version="0.0.0" match="greaterOrEqual"/>
-    <import feature="org.talend.libraries.jdbc.feature" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.apache.commons.beanutils" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.apache.commons.httpclient" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.apache.commons.logging" version="1.2.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.nebula.widgets.nattable.core" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.nebula.widgets.tablecombo" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.w3c.css.sac" version="0.0.0" match="greaterOrEqual"/>
-  </requires>  
-  <plugin id="org.talend.libraries.apache" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.apache.axis2" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.apache.batik" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.apache.chemistry" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.apache.common" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.apache.cxf" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.apache.google" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.apache.http" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.apache.lucene" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.apache.xml" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.asm" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.crm" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.css" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin download-size="0" install-size="0" version="0.0.0" unpack="false" id="org.talend.libraries.csv"/>
-  <plugin id="org.talend.libraries.custom" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.dom4j-jaxen" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.ehcache" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.excel" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.groovy" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.guava" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.hadoop.mapr.5.0.0" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.jackson" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin download-size="0" install-size="0" version="0.0.0" unpack="false" id="org.talend.libraries.javacsv"/>
-  <plugin id="org.talend.libraries.jax" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.jboss" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.jetty" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.jexcel" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.jxplorer" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin download-size="0" install-size="0" version="0.0.0" unpack="false" id="org.talend.libraries.mdm"/>
-  <plugin id="org.talend.libraries.mondrian" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.netsuite" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.palo" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.persist.lookup" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.libraries.salesforce" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.servlet" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.slf4j" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.xml" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.zmq" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.zookeeper" download-size="0" install-size="0" version="0.0.0"/>
 </feature>

main/features/org.talend.tos.libraries.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.libraries.feature</artifactId>

main/plugins/org.talend.designer.abstractmap/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Abstract Map Plug-in
 Bundle-SymbolicName: org.talend.designer.abstractmap;singleton:=true
-Bundle-Version: 7.2.1.qualifier
+Bundle-Version: 7.1.2.qualifier
 Bundle-Activator: org.talend.designer.abstractmap.MapPlugin
 Require-Bundle: org.eclipse.core.runtime,
  org.talend.core,

main/plugins/org.talend.designer.abstractmap/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.abstractmap</artifactId>

main/plugins/org.talend.designer.alfrescooutput/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Alfresco Output Component Plug-in
 Bundle-SymbolicName: org.talend.designer.alfrescooutput;singleton:=true
-Bundle-Version: 7.2.1.qualifier
+Bundle-Version: 7.1.2.qualifier
 Bundle-Vendor: .Talend SA.
 Require-Bundle: org.eclipse.core.runtime,
  org.talend.core,

main/plugins/org.talend.designer.alfrescooutput/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.alfrescooutput</artifactId>

main/plugins/org.talend.designer.alfrescooutput/src/main/java/org/talend/designer/alfrescooutput/AlfrescoOutputManager.java

@@ -18,7 +18,6 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.swt.widgets.Shell;
-import org.talend.commons.ui.gmf.util.DisplayUtils;
 import org.talend.core.model.process.AbstractNode;
 import org.talend.core.model.process.EConnectionType;
 import org.talend.core.model.process.IConnection;
@@ -93,7 +92,7 @@ public class AlfrescoOutputManager {
         try {
 			modelManager.load(); // NB. or when modelManager is created
 		} catch (AlfrescoOutputException aoex) {
-            MessageDialog.openError(DisplayUtils.getDefaultShell(false),
+			MessageDialog.openError(new Shell(Display.getCurrent(), SWT.APPLICATION_MODAL),
 					Messages.getString("AlfrescoOutputManager.failedLoadModel"), aoex.getMessage()); //$NON-NLS-1$
 			modelManager.clear();
 		}

main/plugins/org.talend.designer.alfrescooutput/src/main/java/org/talend/designer/alfrescooutput/ui/AlfrescoModelDialog.java

@@ -33,6 +33,7 @@ import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.Label;
@@ -41,7 +42,6 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.TableItem;
-import org.talend.commons.ui.gmf.util.DisplayUtils;
 import org.talend.commons.ui.runtime.image.ImageUtils.ICON_SIZE;
 import org.talend.core.model.components.IComponent;
 import org.talend.core.ui.images.CoreImageProvider;
@@ -248,7 +248,7 @@ public class AlfrescoModelDialog extends Dialog {
                 try {
                     modelManager.addModel(AlfrescoModelDialog.this.chosenModelFilePath);
                 } catch (AlfrescoOutputException aoex) {
-                    MessageDialog.openError(DisplayUtils.getDefaultShell(false), Messages
+                    MessageDialog.openError(new Shell(Display.getCurrent(), SWT.APPLICATION_MODAL), Messages
                             .getString("AlfrescoModelDialog.addModelFailed"), aoex.getMessage()); //$NON-NLS-1$
                     return;
                 }
@@ -267,7 +267,7 @@ public class AlfrescoModelDialog extends Dialog {
                     try {
                         modelManager.removeModel(selectedItem);
                     } catch (AlfrescoOutputException aoex) {
-                        MessageDialog.openError(DisplayUtils.getDefaultShell(false), Messages
+                        MessageDialog.openError(new Shell(Display.getCurrent(), SWT.APPLICATION_MODAL), Messages
                                 .getString("AlfrescoModelDialog.removeModelFailed"), aoex.getMessage()); //$NON-NLS-1$
                         return;
                     }
@@ -303,14 +303,14 @@ public class AlfrescoModelDialog extends Dialog {
         List<String> missingTypeNames = modelManager.getMetadataManager().getMissingTypeNames();
         List<String> missingAspectNames = modelManager.getMetadataManager().getMissingAspectNames();
         if (!missingTypeNames.isEmpty()) {
-            MessageDialog.openError(DisplayUtils.getDefaultShell(false), Messages
+            MessageDialog.openError(new Shell(Display.getCurrent(), SWT.APPLICATION_MODAL), Messages
                     .getString("AlfrescoModelDialog.missingTypeDefinitions.title"), Messages.getString( //$NON-NLS-1$
                     "AlfrescoModelDialog.missingTypeDefinitions.msg", missingTypeNames)); //$NON-NLS-1$
         }
         if (!missingAspectNames.isEmpty()) {
-            MessageDialog.openError(DisplayUtils.getDefaultShell(false),
-                    Messages.getString("AlfrescoModelDialog.missingAspectDefinitions.title"), Messages.getString( //$NON-NLS-1$
-                            "AlfrescoModelDialog.missingAspectDefinitions.msg", missingAspectNames)); //$NON-NLS-1$
+            MessageDialog.openError(new Shell(Display.getCurrent(), SWT.APPLICATION_MODAL), Messages
+                    .getString("AlfrescoModelDialog.missingAspectDefinitions.title"), Messages.getString( //$NON-NLS-1$
+                    "AlfrescoModelDialog.missingAspectDefinitions.msg", missingAspectNames)); //$NON-NLS-1$
         }
         // NB. model is only saved on closing the dialog with OK
     }

main/plugins/org.talend.designer.business.diagram/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.talend.designer.business.diagram; singleton:=true
-Bundle-Version: 7.2.1.qualifier
+Bundle-Version: 7.1.2.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.talend.designer.business.model.business.diagram.part.BusinessDiagramEditorPlugin
 Bundle-Vendor: %providerName
@@ -36,7 +36,5 @@ Require-Bundle: org.eclipse.ui.ide,
  com.ibm.icu,
  org.talend.libraries.apache,
  org.talend.repository.items.importexport,
- org.talend.repository.view.di,
- org.talend.commons.runtime,
- org.talend.core.runtime
+ org.talend.repository.view.di
 Eclipse-LazyStart: true

main/plugins/org.talend.designer.business.diagram/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.business.diagram</artifactId>

main/plugins/org.talend.designer.business.diagram/src/org/talend/designer/business/diagram/custom/actions/CreateDiagramAction.java

@@ -10,6 +10,7 @@ import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IPerspectiveDescriptor;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
@@ -17,7 +18,6 @@ import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.WorkbenchException;
 import org.eclipse.ui.intro.IIntroSite;
 import org.eclipse.ui.intro.config.IIntroAction;
-import org.talend.commons.ui.gmf.util.DisplayUtils;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
 import org.talend.commons.ui.runtime.image.ECoreImage;
 import org.talend.commons.ui.runtime.image.ImageProvider;
@@ -67,7 +67,7 @@ public class CreateDiagramAction extends AContextualAction implements IIntroActi
         SimpleBusinessCreationWizard wizard = new SimpleBusinessCreationWizard(getActivePage().getWorkbenchWindow()
                 .getWorkbench(), getPath());
 
-        WizardDialog wizardDialog = new WizardDialog(DisplayUtils.getDefaultShell(false), wizard);
+        WizardDialog wizardDialog = new WizardDialog(new Shell(), wizard);
         wizardDialog.create();
         wizardDialog.open();
     }

main/plugins/org.talend.designer.business.diagram/src/org/talend/designer/business/diagram/views/link/BusinessModelsRepoViewLinker.java

@@ -45,8 +45,8 @@ public class BusinessModelsRepoViewLinker extends AbstractRepositoryEditorInputL
      * java.lang.String)
      */
     @Override
-    public boolean isRelation(IEditorInput editorInput, String repoNodeProjectTechLabel, String repoNodeId) {
-        return super.isRelation(getRealEditorInput(editorInput), repoNodeProjectTechLabel, repoNodeId);
+    public boolean isRelation(IEditorInput editorInput, String repoNodeId) {
+        return super.isRelation(getRealEditorInput(editorInput), repoNodeId);
     }
 
     private RepositoryEditorInput getRealEditorInput(IEditorInput editorInput) {

main/plugins/org.talend.designer.codegen/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CodeGen Plug-in
 Bundle-SymbolicName: org.talend.designer.codegen;singleton:=true
-Bundle-Version: 7.2.1.qualifier
+Bundle-Version: 7.1.2.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.talend.core.repository,
  org.eclipse.emf.codegen,

main/plugins/org.talend.designer.codegen/build.properties

@@ -4,5 +4,6 @@ bin.includes = plugin.xml,\
                META-INF/,\
                .,\
                icons/,\
+               resources/,\
                jet_stub/,\
                plugin.properties

main/plugins/org.talend.designer.codegen/jet_stub/footer.javajet

@@ -336,10 +336,10 @@
             String instance_<%=testData%>=null;
             <%
             if(ProcessUtils.isSpark(process)){
-            String lineSeparator = "\r\n";
+            String lineSeparator = (String) java.security.AccessController.doPrivileged(new sun.security.action.GetPropertyAction("line.separator"));
             String fileContentEnCodeStr = "";
             try {
-                fileContentEnCodeStr = java.util.Base64.getMimeEncoder().encodeToString(path.getBytes("UTF-8"));
+                fileContentEnCodeStr = (new sun.misc.BASE64Encoder()).encode(path.getBytes("UTF-8"));
             } catch (java.io.UnsupportedEncodingException e) {
                 e.printStackTrace();
             }
@@ -351,7 +351,7 @@
             String testDataValue = result.toString();
             %>
                 try {
-                    instance_<%=testData%> = new String(java.util.Base64.getMimeDecoder().decode("<%=testDataValue%>"), utf8Charset);
+                    instance_<%=testData%> = new String((new sun.misc.BASE64Decoder()).decodeBuffer("<%=testDataValue%>"), utf8Charset);
                 } catch (java.lang.Exception e) {
                     e.printStackTrace();
                 }
@@ -506,14 +506,11 @@
             if (inContext == null) {
                 inContext = <%=className%>.class.getClassLoader().getResourceAsStream("config/contexts/" + contextStr + ".properties");
             }
-            if (inContext != null) {
+            if (inContext != null && context != null && context.isEmpty()) {
                 //defaultProps is in order to keep the original context value
-                if(context != null && context.isEmpty()) {
-	                defaultProps.load(inContext);
-	                context = new ContextProperties(defaultProps);
-                }
-                
+                defaultProps.load(inContext);
                 inContext.close();
+                context = new ContextProperties(defaultProps);
             } else if (!isDefaultContext) {
                 //print info and job continue to run, for case: context_param is not empty.
                 System.err.println("Could not find the context " + contextStr);
@@ -1164,12 +1161,8 @@ if (execStat) {
 			if(conn_<%=hbaseComponent.getUniqueName()%> != null )
 	        {
 			<%
-		        if((isCustom && isHadoop2) || (!isCustom && hbaseDistrib.doSupportNewHBaseAPI())) {
-		            if (!hbaseDistrib.doSupportHBase2x()) {%>
-                                org.apache.hadoop.hbase.client.HConnection hConnection_<%=hbaseComponent.getUniqueName() %> = org.apache.hadoop.hbase.client.HConnectionManager.getConnection(conn_<%=hbaseComponent.getUniqueName() %>);
-                         <% } else {%>
-                                org.apache.hadoop.hbase.client.Connection hConnection_<%=hbaseComponent.getUniqueName() %> = org.apache.hadoop.hbase.client.ConnectionFactory.createConnection(conn_<%=hbaseComponent.getUniqueName() %>);
-                         <% }%>
+				if((isCustom && isHadoop2) || (!isCustom && hbaseDistrib.doSupportNewHBaseAPI())) {%>
+		        org.apache.hadoop.hbase.client.HConnection hConnection_<%=hbaseComponent.getUniqueName() %> = org.apache.hadoop.hbase.client.HConnectionManager.getConnection(conn_<%=hbaseComponent.getUniqueName() %>);
 		        if ((hConnection_<%=hbaseComponent.getUniqueName() %> != null) && (!hConnection_<%=hbaseComponent.getUniqueName() %>.isClosed())) {
 				    hConnection_<%=hbaseComponent.getUniqueName() %>.close();
 			}

main/plugins/org.talend.designer.codegen/jet_stub/header.javajet

@@ -512,8 +512,6 @@ private class TalendException extends Exception {
 
 			if(!(e instanceof TDieException)){
 <%
-		boolean needCatchTalendException = false;
-		
 		if (process.getNodesOfType("tLogCatcher").size() > 0) {
 			List<INode> logCatchers = (List<INode>)process.getNodesOfType("tLogCatcher");
 			for (INode logCatcher : logCatchers) {
@@ -545,7 +543,6 @@ private class TalendException extends Exception {
 				if (ElementParameterParser.getValue(logCatcher, "__CATCH_JAVA_EXCEPTION__").equals("true")) {
 					if(logCatcher!=virtualNCatchNode){
 					// 2) launch logCatcher subProcess
-					needCatchTalendException =  true;
 %>
 				<%=logCatcher.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
 <%
@@ -558,7 +555,6 @@ private class TalendException extends Exception {
 <%
 			}
 			if(virtualNCatchNode!=null){
-				needCatchTalendException =  true;
 %>
 				<%=virtualNCatchNode.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
 <%
@@ -572,12 +568,31 @@ private class TalendException extends Exception {
 %>
 			}
 <%
+		boolean needCatchTalendException = false;
+		if (process.getNodesOfType("tLogCatcher").size() > 0) {
+			for(INode node:process.getNodesOfType("tLogCatcher")){
+				if(ElementParameterParser.getValue(node, "__CATCH_JAVA_EXCEPTION__").equals("true")){
+					needCatchTalendException = true;
+					break;
+				}
+			}
+		}
+
+		if ((!needCatchTalendException) && (process.getNodesOfType("tAssertCatcher").size() > 0)) {
+			for(INode node:process.getNodesOfType("tAssertCatcher")){
+				if(ElementParameterParser.getValue(node, "__CATCH_JAVA_EXCEPTION__").equals("true")){
+					needCatchTalendException = true;
+					break;
+				}
+			}
+		}
 		if(needCatchTalendException) {
-			//TODO should catch the TalendException in assertcatcher process? but before should not work too as use java reflect, this exception can't catch
-			%>
-			} catch (TalendException e) {
-				// do nothing
-			<%
+			if (process.getNodesOfType("tLogCatcher").size() > 0) {
+				%>
+				} catch (TalendException e) {
+					// do nothing
+				<%
+			}
 		}
 %>
 		} catch (Exception e) {

main/plugins/org.talend.designer.codegen/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.codegen</artifactId>

main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/config/JetBean.java

@@ -16,7 +16,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.eclipse.core.runtime.Platform;
-import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.utils.StringUtils;
 
 /**
@@ -394,12 +393,7 @@ public class JetBean {
     }
 
     public String getFullTemplatePath() {
-        try {
-            return TemplateUtil.getPlatformUrlOfBundle(getJetPluginRepository()) + getTemplateRelativeUri();
-        } catch (Throwable e) {
-            ExceptionHandler.process(e);
-        }
-        return null;
+        return Platform.getPlugin(getJetPluginRepository()).getDescriptor().getInstallURL().toString() + getTemplateRelativeUri();
     }
 
     public String getGenerationError() {

main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/config/TalendJETCompiler.java

@@ -21,9 +21,7 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.emf.codegen.jet.JETCompiler;
 import org.eclipse.emf.codegen.jet.JETException;
 import org.eclipse.emf.codegen.jet.JETMark;
-import org.eclipse.emf.common.util.URI;
 import org.osgi.framework.Bundle;
-import org.talend.commons.exception.ExceptionHandler;
 
 /**
  * ggu class global comment. Detailled comment
@@ -78,24 +76,6 @@ public class TalendJETCompiler extends JETCompiler {
             if (newFileURI != null) {
                 newAttributes.put(fileKey, newFileURI);
             }
-            try {
-                String filePath = newAttributes.get(fileKey);
-                if (filePath != null && start != null && start.getFile() != null) {
-                    URI uri = URI.createURI(filePath);
-                    if (uri.isRelative() && uri.hasRelativePath()) {
-                        String basePath = start.getFile();
-                        String resolvedLocation = "";
-                        int index = basePath.lastIndexOf("/");
-                        if (index != -1) {
-                            resolvedLocation = basePath.substring(0, index + 1);
-                        }
-                        resolvedLocation = resolve(resolvedLocation, uri.toString());
-                        newAttributes.put(fileKey, resolvedLocation);
-                    }
-                }
-            } catch (Exception e) {
-                ExceptionHandler.process(e);
-            }
         } else if (directive.equals("jet")) { //$NON-NLS-1$
             String skeletonKey = "skeleton"; //$NON-NLS-1$
             String skeletonURI = newAttributes.get(skeletonKey);
@@ -105,79 +85,28 @@ public class TalendJETCompiler extends JETCompiler {
                     newAttributes.put(skeletonKey, newSkeletonURI);
                 }
             }
-            try {
-                String filePath = newAttributes.get(skeletonKey);
-                if (filePath != null && start != null && start.getFile() != null) {
-                    URI uri = URI.createURI(filePath);
-                    if (uri.isRelative() && uri.hasRelativePath()) {
-                        String basePath = start.getFile();
-                        String resolvedLocation = "";
-                        int index = basePath.lastIndexOf("/");
-                        if (index != -1) {
-                            resolvedLocation = basePath.substring(0, index + 1);
-                        }
-                        resolvedLocation = resolve(resolvedLocation, uri.toString());
-                        newAttributes.put(skeletonKey, resolvedLocation);
-                    }
-                }
-            } catch (Exception e) {
-                ExceptionHandler.process(e);
-            }
         }
         super.handleDirective(directive, start, stop, newAttributes);
     }
 
     @SuppressWarnings("deprecation")
     private String checkAndReplace(String fileURI) {
-        try {
-            if (fileURI != null) {
-                Matcher matcher = PLUGIN_VAR_PATTERN.matcher(fileURI);
-                if (matcher.find()) {
-                    // get the plugin name from fileURI
-                    String refPluginName = matcher.group(1);
-                    // retrieve the plugin URI by pluginName.
-                    Bundle refBundle = Platform.getBundle(refPluginName);
-                    if (refBundle != null) {
-                        String realURI = TemplateUtil.getPlatformUrlOfBundle(refPluginName);
-                        // replace the old fileURI to new one by pluginURI
-                        String newFileURI = fileURI.replaceFirst(PLUGIN_VAR_PATTERN.pattern(), realURI);
-                        return newFileURI;
+        if (fileURI != null) {
+            Matcher matcher = PLUGIN_VAR_PATTERN.matcher(fileURI);
+            if (matcher.find()) {
+                // get the plugin name from fileURI
+                String refPluginName = matcher.group(1);
+                // retrieve the plugin URI by pluginName.
+                Bundle refBundle = Platform.getBundle(refPluginName);
+                if (refBundle != null) {
+                    String realURI = Platform.getPlugin(refPluginName).getDescriptor().getInstallURL().toString();
+                    // replace the old fileURI to new one by pluginURI
+                    String newFileURI = fileURI.replaceFirst(PLUGIN_VAR_PATTERN.pattern(), realURI);
+                    return newFileURI;
 
-                    }
                 }
             }
-        } catch (Throwable e) {
-            ExceptionHandler.process(e);
         }
         return null; // not replace
     }
-
-    /**
-     * {@link JETCompiler#resolve(String, String)} has bug of resolving relative path when upgrading eclipse4.10, try to
-     * override it
-     * 
-     * @param base
-     * @param relativePath
-     * @return
-     */
-    private static String resolve(String base, String relativePath) {
-        while (relativePath.startsWith("./")) {
-            relativePath = relativePath.substring(2);
-        }
-
-        while (relativePath.startsWith("../")) {
-            int index = base.lastIndexOf('/', base.length() - 2);
-            if (index == -1) {
-                base = "";
-                relativePath = relativePath.substring(3);
-                break;
-            } else {
-                base = base.substring(0, index) + "/";
-                relativePath = relativePath.substring(3);
-            }
-        }
-
-        return base + relativePath;
-    }
-
 }

main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/config/TemplateUtil.java

@@ -12,9 +12,6 @@
 // ============================================================================
 package org.talend.designer.codegen.config;
 
-import org.eclipse.core.runtime.Platform;
-import org.osgi.framework.Bundle;
-
 /**
  * CodeGenerator Templates Ressources Utils.
  * 
@@ -153,18 +150,5 @@ public class TemplateUtil {
     public EInternalTemplate getType() {
         return this.template;
     }
-
-    /**
-     * Replacement of Platform.getPlugin(bundleName).getDescriptor().getInstallURL().toString()
-     * 
-     * @param bundleName
-     * @return
-     */
-    public static String getPlatformUrlOfBundle(String bundleName) {
-        Bundle bundle = Platform.getBundle(bundleName);
-        if (bundle == null) {
-            return null;
-        }
-        return "platform:/plugin/" + bundle.getSymbolicName() + "_" + bundle.getVersion().toString() + "/";
-    }
+    
 }