APPINT-32905: Issue with Rest service flow

Revert the commit of TUP-31096 to test tuj (#4255 )
Co-authored-by: kjwang <kjwang@LT-B1Z2R73.talend.com>
2021-04-30 18:17:02 +03:00 · 2021-04-30 10:21:37 +08:00 · 2021-04-29 14:27:50 +08:00 · 2021-04-28 18:04:59 +08:00 · 2021-04-28 16:32:52 +08:00 · 2021-04-28 12:10:19 +08:00
544 changed files with 3366 additions and 282420 deletions
--- a/README.md
+++ b/README.md
@@ -42,6 +42,6 @@ Feel free to share your Talend components on [Talend Exchange](http://www.talend

 ## License

-Copyright (c) 2006-2019 Talend
+Copyright (c) 2006-2021 Talend

 Licensed under the Apache V2 License
--- a/i18n/features/org.talend.babel.all.tos.feature/feature.xml
+++ b/i18n/features/org.talend.babel.all.tos.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.babel.all.tos.feature" label="Babel feature with all languages for TOS" version="7.4.1.M7"> 
+<feature id="org.talend.babel.all.tos.feature" label="Babel feature with all languages for TOS" version="7.4.1.qualifier"> 
  <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
  <license url="http://www.example.com/license">[Enter License Description here.]</license>  
--- a/i18n/features/org.talend.babel.all.tos.feature/pom.xml
+++ b/i18n/features/org.talend.babel.all.tos.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
 	<groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  
--- a/i18n/plugins/org.talend.common.ui.runtime.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.common.ui.runtime.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.common.ui.runtime.nl
-Bundle-Version: 7.4.1.M7
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.common.ui.runtime
--- a/i18n/plugins/org.talend.common.ui.runtime.nl/pom.xml
+++ b/i18n/plugins/org.talend.common.ui.runtime.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.common.ui.runtime.nl</artifactId>
--- a/i18n/plugins/org.talend.commons.runtime.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.commons.runtime.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.commons.runtime.nl
-Bundle-Version: 7.4.1.M7
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.commons.runtime
--- a/i18n/plugins/org.talend.commons.runtime.nl/pom.xml
+++ b/i18n/plugins/org.talend.commons.runtime.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.commons.runtime.nl</artifactId>
--- a/i18n/plugins/org.talend.commons.ui.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.commons.ui.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Commons UI Nl Fragment
 Bundle-SymbolicName: org.talend.commons.ui.nl
-Bundle-Version: 7.4.1.M7
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.commons.ui
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.commons.ui.nl/pom.xml
+++ b/i18n/plugins/org.talend.commons.ui.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.commons.ui.nl</artifactId>
--- a/i18n/plugins/org.talend.core.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.core.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.core.nl Fragment
 Bundle-SymbolicName: org.talend.core.nl
-Bundle-Version: 7.4.1.M7
+Bundle-Version: 7.4.1.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.core
 Bundle-Localization: plugin
--- a/i18n/plugins/org.talend.core.nl/pom.xml
+++ b/i18n/plugins/org.talend.core.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.core.nl</artifactId>
--- a/i18n/plugins/org.talend.core.repository.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.core.repository.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.core.repository.nl
-Bundle-Version: 7.4.1.M7
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.core.repository
--- a/i18n/plugins/org.talend.core.repository.nl/pom.xml
+++ b/i18n/plugins/org.talend.core.repository.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.core.repository.nl</artifactId>
--- a/i18n/plugins/org.talend.core.runtime.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.core.runtime.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.core.runtime.nl
-Bundle-Version: 7.4.1.M7
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.core.runtime
--- a/i18n/plugins/org.talend.core.runtime.nl/pom.xml
+++ b/i18n/plugins/org.talend.core.runtime.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.core.runtime.nl</artifactId>
--- a/i18n/plugins/org.talend.core.ui.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.core.ui.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.core.ui.nl
-Bundle-Version: 7.4.1.M7
+Bundle-Version: 7.4.1.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.core.ui
--- a/i18n/plugins/org.talend.core.ui.nl/pom.xml
+++ b/i18n/plugins/org.talend.core.ui.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.core.ui.nl</artifactId>
--- a/i18n/plugins/org.talend.cwm.mip.edit.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.cwm.mip.edit.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.cwm.mip.edit.nl
-Bundle-Version: 7.4.1.M7
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.cwm.mip.edit
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.cwm.mip.edit.nl/pom.xml
+++ b/i18n/plugins/org.talend.cwm.mip.edit.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.cwm.mip.edit.nl</artifactId>
--- a/i18n/plugins/org.talend.cwm.mip.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.cwm.mip.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.cwm.mip.nl
-Bundle-Version: 7.4.1.M7
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.cwm.mip
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.cwm.mip.nl/pom.xml
+++ b/i18n/plugins/org.talend.cwm.mip.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.cwm.mip.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.maven.ui.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.designer.maven.ui.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Designer Maven UI NL
 Bundle-SymbolicName: org.talend.designer.maven.ui.nl
-Bundle-Version: 7.4.1.M7
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.designer.maven.ui
 Bundle-Vendor: .Talend SA.
 Bundle-Localization: plugin
--- a/i18n/plugins/org.talend.designer.maven.ui.nl/pom.xml
+++ b/i18n/plugins/org.talend.designer.maven.ui.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.maven.ui.nl</artifactId>
--- a/i18n/plugins/org.talend.help.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.help.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.help.Nl Fragment
 Bundle-SymbolicName: org.talend.help.nl
-Bundle-Version: 7.4.1.M7
+Bundle-Version: 7.4.1.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.help
 Bundle-Localization: plugin
--- a/i18n/plugins/org.talend.help.nl/pom.xml
+++ b/i18n/plugins/org.talend.help.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.help.nl</artifactId>
--- a/i18n/plugins/org.talend.helpers.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.helpers.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.helpers.nl Fragment
 Bundle-SymbolicName: org.talend.helpers.nl
-Bundle-Version: 7.4.1.M7
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.helpers
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.helpers.nl/pom.xml
+++ b/i18n/plugins/org.talend.helpers.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.helpers.nl</artifactId>
--- a/i18n/plugins/org.talend.librariesmanager.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.librariesmanager.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.librariesmanager Nl Fragment
 Bundle-SymbolicName: org.talend.librariesmanager.nl
-Bundle-Version: 7.4.1.M7
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.librariesmanager
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.librariesmanager.nl/pom.xml
+++ b/i18n/plugins/org.talend.librariesmanager.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.librariesmanager.nl</artifactId>
--- a/i18n/plugins/org.talend.librariesmanager.ui.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.librariesmanager.ui.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.librariesmanager.ui.nl
-Bundle-Version: 7.4.1.M7
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.librariesmanager.ui
--- a/i18n/plugins/org.talend.librariesmanager.ui.nl/pom.xml
+++ b/i18n/plugins/org.talend.librariesmanager.ui.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.librariesmanager.ui.nl</artifactId>
--- a/i18n/plugins/org.talend.metadata.managment.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.metadata.managment.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.metadata.managment.nl
-Bundle-Version: 7.4.1.M7
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.metadata.managment
--- a/i18n/plugins/org.talend.metadata.managment.nl/pom.xml
+++ b/i18n/plugins/org.talend.metadata.managment.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.metadata.managment.nl</artifactId>
--- a/i18n/plugins/org.talend.metadata.managment.ui.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.metadata.managment.ui.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Metadata Managment UI Nl Fragment
 Bundle-SymbolicName: org.talend.metadata.managment.ui.nl
-Bundle-Version: 7.4.1.M7
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.metadata.managment.ui
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.metadata.managment.ui.nl/pom.xml
+++ b/i18n/plugins/org.talend.metadata.managment.ui.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.metadata.managment.ui.nl</artifactId>
--- a/i18n/plugins/org.talend.migrationTool.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.migrationTool.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: MigrationTool Plug-in nl fragment
 Bundle-SymbolicName: org.talend.migrationTool.nl
-Bundle-Version: 7.4.1.M7
+Bundle-Version: 7.4.1.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.migrationTool
--- a/i18n/plugins/org.talend.migrationTool.nl/pom.xml
+++ b/i18n/plugins/org.talend.migrationTool.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.migrationTool.nl</artifactId>
--- a/i18n/plugins/org.talend.model.edit.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.model.edit.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName Nl Fragment
 Bundle-SymbolicName: org.talend.model.edit.nl
-Bundle-Version: 7.4.1.M7
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.model.edit
 Bundle-Localization: plugin
 Bundle-Vendor: %providerName
--- a/i18n/plugins/org.talend.model.edit.nl/pom.xml
+++ b/i18n/plugins/org.talend.model.edit.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.model.edit.nl</artifactId>
--- a/i18n/plugins/org.talend.model.migration.nl/.classpath
+++ b/i18n/plugins/org.talend.model.migration.nl/.classpath
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="class"/>
-</classpath>
--- a/i18n/plugins/org.talend.model.migration.nl/.project
+++ b/i18n/plugins/org.talend.model.migration.nl/.project
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.talend.model.migration.nl</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
--- a/i18n/plugins/org.talend.model.migration.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.model.migration.nl/META-INF/MANIFEST.MF
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Nl
-Bundle-SymbolicName: org.talend.model.migration.nl
-Bundle-Version: 7.4.1.M7
-Fragment-Host: org.talend.model.migration
--- a/i18n/plugins/org.talend.model.migration.nl/META-INF/eclipse.inf
+++ b/i18n/plugins/org.talend.model.migration.nl/META-INF/eclipse.inf
@@ -1 +0,0 @@
-jarprocessor.exclude.children=true
--- a/i18n/plugins/org.talend.model.migration.nl/build.properties
+++ b/i18n/plugins/org.talend.model.migration.nl/build.properties
@@ -1,13 +0,0 @@
-source.. = src/
-output.. = class/
-bin.includes = META-INF/,\
-               .\
-,plugin_ru.properties\
-,plugin_en.properties\
-,plugin_hr.properties\
-,plugin_fr.properties\
-,plugin_el.properties\
-,plugin_ja.properties\
-,plugin_it.properties\
-,plugin_de.properties\
-,plugin_swtbot.properties
--- a/i18n/plugins/org.talend.model.migration.nl/plugin_de.properties
+++ b/i18n/plugins/org.talend.model.migration.nl/plugin_de.properties
@@ -1 +0,0 @@
-providerName=www.beispiel.de
--- a/i18n/plugins/org.talend.model.migration.nl/plugin_en.properties
+++ b/i18n/plugins/org.talend.model.migration.nl/plugin_en.properties
@@ -1,2 +0,0 @@
-pluginName=Migration Model
-providerName=www.example.org
--- a/i18n/plugins/org.talend.model.migration.nl/plugin_fr.properties
+++ b/i18n/plugins/org.talend.model.migration.nl/plugin_fr.properties
@@ -1,2 +0,0 @@
-pluginName=Mod\u00E8le de migration
-providerName=www.example.org
--- a/i18n/plugins/org.talend.model.migration.nl/plugin_it.properties
+++ b/i18n/plugins/org.talend.model.migration.nl/plugin_it.properties
@@ -1 +0,0 @@
-providerName=www.example.org
--- a/i18n/plugins/org.talend.model.migration.nl/plugin_ja.properties
+++ b/i18n/plugins/org.talend.model.migration.nl/plugin_ja.properties
@@ -1,2 +0,0 @@
-pluginName=\u79FB\u884C\u30E2\u30C7\u30EB
-providerName=www.example.org
--- a/i18n/plugins/org.talend.model.migration.nl/plugin_ru.properties
+++ b/i18n/plugins/org.talend.model.migration.nl/plugin_ru.properties
@@ -1 +0,0 @@
-providerName=www.example.org
--- a/i18n/plugins/org.talend.model.migration.nl/plugin_swtbot.properties
+++ b/i18n/plugins/org.talend.model.migration.nl/plugin_swtbot.properties
@@ -1,2 +0,0 @@
-pluginName = Migration Model
-providerName = www.example.org
--- a/i18n/plugins/org.talend.model.migration.nl/plugin_zh_CN.properties
+++ b/i18n/plugins/org.talend.model.migration.nl/plugin_zh_CN.properties
@@ -1,2 +0,0 @@
-pluginName=\u8FC1\u79FB\u6A21\u578B
-providerName=www.example.org
--- a/i18n/plugins/org.talend.model.migration.nl/pom.xml
+++ b/i18n/plugins/org.talend.model.migration.nl/pom.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.model.migration.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
--- a/i18n/plugins/org.talend.model.migration.nl/src/messages_en.properties
+++ b/i18n/plugins/org.talend.model.migration.nl/src/messages_en.properties
@@ -1,2 +0,0 @@
-TopMetadataMigrationFrom400to410usingGenericVM_top_error_log=error while loading the Transformation file : {0}
-TosMetadataMigrationFrom400to410_tos_error_log=error while loading the Transformation file : {0}
--- a/i18n/plugins/org.talend.model.migration.nl/src/messages_es.properties
+++ b/i18n/plugins/org.talend.model.migration.nl/src/messages_es.properties
@@ -1,2 +0,0 @@
-TopMetadataMigrationFrom400to410usingGenericVM_top_error_log=error mientras se cargaba el fichero de Transformaci\u00F3n: {0}
-TosMetadataMigrationFrom400to410_tos_error_log=error mientras se cargaba el fichero de Transformaci\u00F3n: {0}
--- a/i18n/plugins/org.talend.model.migration.nl/src/messages_fr.properties
+++ b/i18n/plugins/org.talend.model.migration.nl/src/messages_fr.properties
@@ -1,2 +0,0 @@
-TopMetadataMigrationFrom400to410usingGenericVM_top_error_log=erreur lors du chargement du fichier de transformation : {0}
-TosMetadataMigrationFrom400to410_tos_error_log=Erreur lors du chargement du fichier de transformation : {0}
--- a/i18n/plugins/org.talend.model.migration.nl/src/messages_ja.properties
+++ b/i18n/plugins/org.talend.model.migration.nl/src/messages_ja.properties
@@ -1,2 +0,0 @@
-TopMetadataMigrationFrom400to410usingGenericVM_top_error_log=\u5909\u63DB\u30D5\u30A1\u30A4\u30EB\u30ED\u30FC\u30C9\u4E2D\u306B\u30A8\u30E9\u30FC\uFF1A{0}
-TosMetadataMigrationFrom400to410_tos_error_log=\u5909\u63DB\u30D5\u30A1\u30A4\u30EB\u30ED\u30FC\u30C9\u4E2D\u306B\u30A8\u30E9\u30FC\uFF1A{0}
--- a/i18n/plugins/org.talend.model.migration.nl/src/messages_swtbot.properties
+++ b/i18n/plugins/org.talend.model.migration.nl/src/messages_swtbot.properties
@@ -1,2 +0,0 @@
-TopMetadataMigrationFrom400to410usingGenericVM_top_error_log=error while loading the Transformation file : {0}
-TosMetadataMigrationFrom400to410_tos_error_log=error while loading the Transformation file : {0}
--- a/i18n/plugins/org.talend.model.migration.nl/src/messages_zh_CN.properties
+++ b/i18n/plugins/org.talend.model.migration.nl/src/messages_zh_CN.properties
@@ -1,2 +0,0 @@
-TopMetadataMigrationFrom400to410usingGenericVM_top_error_log=\u52A0\u8F7D\u8F6C\u6362\u6587\u4EF6\u65F6\u51FA\u9519\uFF1A{0}
-TosMetadataMigrationFrom400to410_tos_error_log=\u52A0\u8F7D\u8F6C\u6362\u6587\u4EF6\u65F6\u51FA\u9519\uFF1A{0}
--- a/i18n/plugins/org.talend.model.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.model.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.model.Nl Fragment
 Bundle-SymbolicName: org.talend.model.nl
-Bundle-Version: 7.4.1.M7
+Bundle-Version: 7.4.1.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.model
 Bundle-Localization: plugin
--- a/i18n/plugins/org.talend.model.nl/pom.xml
+++ b/i18n/plugins/org.talend.model.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.model.nl</artifactId>
--- a/i18n/plugins/org.talend.presentation.onboarding.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.presentation.onboarding.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NL
 Bundle-SymbolicName: org.talend.presentation.onboarding.nl
-Bundle-Version: 7.4.1.M7
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.presentation.onboarding
--- a/i18n/plugins/org.talend.presentation.onboarding.nl/pom.xml
+++ b/i18n/plugins/org.talend.presentation.onboarding.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.presentation.onboarding.nl</artifactId>
--- a/i18n/plugins/org.talend.rcp.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.rcp.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.rcp.nl
-Bundle-Version: 7.4.1.M7
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.rcp
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.rcp.nl/plugin_de.properties
+++ b/i18n/plugins/org.talend.rcp.nl/plugin_de.properties
@@ -4,5 +4,5 @@ Version: {1}
 Build id: {0}


-(c) Copyright 2006-2020 Talend Inc.  All rights reserved.
+(c) Copyright 2006-2021 Talend Inc.  All rights reserved.
 Visit {3}
--- a/i18n/plugins/org.talend.rcp.nl/plugin_en.properties
+++ b/i18n/plugins/org.talend.rcp.nl/plugin_en.properties
@@ -4,5 +4,5 @@ Version: {1}
 Build id: {0}


-(c) Copyright 2006-2020 Talend Inc.  All rights reserved.
+(c) Copyright 2006-2021 Talend Inc.  All rights reserved.
 Visit {3}
--- a/i18n/plugins/org.talend.rcp.nl/pom.xml
+++ b/i18n/plugins/org.talend.rcp.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.rcp.nl</artifactId>
--- a/i18n/plugins/org.talend.registration.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.registration.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.registration.nl
-Bundle-Version: 7.4.1.M7
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.registration
--- a/i18n/plugins/org.talend.registration.nl/pom.xml
+++ b/i18n/plugins/org.talend.registration.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.registration.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.items.importexport.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.repository.items.importexport.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.repository.items.importexport.nl
-Bundle-Version: 7.4.1.M7
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.repository.items.importexport
--- a/i18n/plugins/org.talend.repository.items.importexport.nl/pom.xml
+++ b/i18n/plugins/org.talend.repository.items.importexport.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.items.importexport.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.items.importexport.ui.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.repository.items.importexport.ui.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.repository.items.importexport.ui.nl
-Bundle-Version: 7.4.1.M7
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.repository.items.importexport.ui
--- a/i18n/plugins/org.talend.repository.items.importexport.ui.nl/pom.xml
+++ b/i18n/plugins/org.talend.repository.items.importexport.ui.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.items.importexport.ui.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.localprovider.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.repository.localprovider.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Local repository Plug-in Nl Fragment
 Bundle-SymbolicName: org.talend.repository.localprovider.nl
-Bundle-Version: 7.4.1.M7
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.repository.localprovider
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.repository.localprovider.nl/pom.xml
+++ b/i18n/plugins/org.talend.repository.localprovider.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.localprovider.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.mdm.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.repository.mdm.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.repository.mdm.nl
-Bundle-Version: 7.4.1.M7
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.repository.mdm
--- a/i18n/plugins/org.talend.repository.mdm.nl/pom.xml
+++ b/i18n/plugins/org.talend.repository.mdm.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.mdm.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.metadata.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.repository.metadata.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.repository.metadata.nl
-Bundle-Version: 7.4.1.M7
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.repository.metadata
--- a/i18n/plugins/org.talend.repository.metadata.nl/pom.xml
+++ b/i18n/plugins/org.talend.repository.metadata.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.metadata.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.view.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.repository.view.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.repository.view.nl
-Bundle-Version: 7.4.1.M7
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.repository.view
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.repository.view.nl/pom.xml
+++ b/i18n/plugins/org.talend.repository.view.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.view.nl</artifactId>
--- a/i18n/plugins/org.talend.resources.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.resources.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.resources.nl
-Bundle-Version: 7.4.1.M7
+Bundle-Version: 7.4.1.qualifier
 Fragment-Host: org.talend.resources
--- a/i18n/plugins/org.talend.resources.nl/pom.xml
+++ b/i18n/plugins/org.talend.resources.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.resources.nl</artifactId>
--- a/main/features/org.talend.commons.feature/feature.xml
+++ b/main/features/org.talend.commons.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.commons.feature" label="Commons Feature" version="7.4.1.M7" provider-name=".Talend SA."> 
+<feature id="org.talend.commons.feature" label="Commons Feature" version="7.4.1.qualifier" provider-name=".Talend SA."> 
  <description url="http://www.talend.com/online/featuresdescription.html#commons-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#commons-feature</description>  
  <copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>  
  <license>The licence are describe in branding feature</license>  
@@ -8,7 +8,6 @@
    <discovery label="Talend web site" url="http://www.talend.com"/> 
  </url>  
  <requires>
-    <import feature="org.talend.model.migration.feature" version="0.0.0" match="greaterOrEqual"/>
    <import plugin="org.bouncycastle.bcprov" version="0.0.0" match="greaterOrEqual"/>
    <import plugin="com.fasterxml.jackson.core.jackson-databind" version="2.9.8" match="greaterOrEqual"/>
    <import plugin="jackson-core-asl" version="0.0.0" match="greaterOrEqual"/>
--- a/main/features/org.talend.commons.feature/pom.xml
+++ b/main/features/org.talend.commons.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.commons.feature</artifactId>
--- a/main/features/org.talend.core.feature/feature.xml
+++ b/main/features/org.talend.core.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.core.feature" label="Core Feature" version="7.4.1.M7" provider-name=".Talend SA."> 
+<feature id="org.talend.core.feature" label="Core Feature" version="7.4.1.qualifier" provider-name=".Talend SA."> 
  <description url="http://www.talend.com/online/featuresdescription.html#core-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#core-feature</description>  
  <copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>  
  <license>The licence are describe in branding feature</license>  
@@ -38,7 +38,6 @@
    <import plugin="org.apache.httpcomponents.httpcore" version="0.0.0" match="greaterOrEqual"/>
    <import plugin="org.eclipse.compare" version="0.0.0" match="greaterOrEqual"/>
    <import plugin="org.eclipse.compare.core" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.m2m.atl.emftvm.trace" version="0.0.0" match="greaterOrEqual"/>
    <import plugin="org.ops4j.pax.url.mvn" version="0.0.0" match="greaterOrEqual"/>
  </requires>  
  <plugin id="org.talend.core" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
@@ -66,8 +65,6 @@
  <plugin id="org.talend.model" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
  <plugin id="org.talend.model.edit" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
  <plugin id="org.talend.model.edit.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.model.migration" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.model.migration.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
  <plugin id="org.talend.model.nl" 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" fragment="true"/>
  <plugin id="org.talend.resources" download-size="0" install-size="0" version="0.0.0"/>
--- a/main/features/org.talend.core.feature/pom.xml
+++ b/main/features/org.talend.core.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.core.feature</artifactId>
--- a/main/features/org.talend.fragment.jars.common.feature/feature.xml
+++ b/main/features/org.talend.fragment.jars.common.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.fragment.jars.common.feature"
      label="Fragment Jars in Common"
-      version="7.4.1.M7">
+      version="7.4.1.qualifier">

   <description url="http://www.example.com/description">
      [Enter Feature Description here.]
--- a/main/features/org.talend.fragment.jars.common.feature/pom.xml
+++ b/main/features/org.talend.fragment.jars.common.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.fragment.jars.common.feature</artifactId>
--- a/main/features/org.talend.model.migration.feature/.project
+++ b/main/features/org.talend.model.migration.feature/.project
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.talend.model.migration.feature</name>
+	<name>org.talend.help.di.feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>
--- a/main/features/org.talend.help.di.feature/feature.xml
+++ b/main/features/org.talend.help.di.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.help.di.feature"
      label="Talend DI help feature"
-      version="7.4.1.M7"
+      version="7.4.1.qualifier"
      provider-name=".Talend SA.">

   <description url="http://www.example.com/description">
--- a/main/features/org.talend.help.di.feature/pom.xml
+++ b/main/features/org.talend.help.di.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.help.di.feature</artifactId>
--- a/main/features/org.talend.help.feature/feature.xml
+++ b/main/features/org.talend.help.feature/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.talend.help.feature" label="Help Feature" version="7.4.1.M7" provider-name=".Talend SA."> 
+<feature id="org.talend.help.feature" label="Help Feature" version="7.4.1.qualifier" provider-name=".Talend SA."> 
  <description url="http://www.talend.com/online/featuresdescription.html#help-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#help-feature</description>  
  <copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>  
  <license>The licence are describe in branding feature</license>  
--- a/main/features/org.talend.help.feature/pom.xml
+++ b/main/features/org.talend.help.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.help.feature</artifactId>
--- a/main/features/org.talend.jdt.feature/feature.xml
+++ b/main/features/org.talend.jdt.feature/feature.xml
@@ -1,36 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.talend.jdt.feature"
+      label="Feature"
+      version="7.4.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 plugin="org.eclipse.jdt" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.annotation" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.apt.core" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.apt.pluggable.core" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.apt.ui" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.compiler.apt" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.compiler.tool" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.core" version="3.16.0.xx-201903290056-e1812-RELEASE" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.core.manipulation" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.debug" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.debug.ui" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.launching" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.ui" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.hamcrest.core" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.junit" version="4.13.2" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.groovy.core" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.codehaus.groovy" version="2.4.16" match="equivalent"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.jdt.launching.macosx"
+         os="macosx"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jdt.launching.ui.macosx"
+         os="macosx"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>

-<feature id="org.talend.jdt.feature" label="Feature" version="7.4.1.M7"> 
-  <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>
-    <!-- bonita requires org.codehaus.groovy version 2.4.16.xx-201903290056-e1812-RELEASE -->
-    <import plugin="org.codehaus.groovy" version="2.4.16.xx-201903290056-e1812-RELEASE" match="perfect"/>
-    <import plugin="org.eclipse.ant.launching" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.ant.ui" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.annotation" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.apt.core" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.apt.pluggable.core" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.apt.ui" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.compiler.apt" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.compiler.tool" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.core" version="3.16.0.xx-201903290056-e1812-RELEASE" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.core.manipulation" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.debug" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.debug.ui" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.doc.user" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.groovy.core" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.junit" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.junit.core" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.junit.runtime" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.junit4.runtime" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.launching" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.ui" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.hamcrest.core" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.junit" version="0.0.0" match="greaterOrEqual"/>
-  </requires>
-  <plugin id="org.eclipse.jdt.launching.macosx" os="macosx" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.eclipse.jdt.launching.ui.macosx" os="macosx" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 </feature>
--- a/main/features/org.talend.jdt.feature/pom.xml
+++ b/main/features/org.talend.jdt.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.jdt.feature</artifactId>
--- a/main/features/org.talend.libraries.jdbc.feature/feature.xml
+++ b/main/features/org.talend.libraries.jdbc.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.libraries.jdbc.feature" label="Jdbc_feature Feature" version="7.4.1.M7" provider-name=".Talend SA."> 
+<feature id="org.talend.libraries.jdbc.feature" label="Jdbc_feature Feature" version="7.4.1.qualifier" provider-name=".Talend SA."> 
  <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
  <license url="http://www.example.com/license">[Enter License Description here.]</license>  
--- a/main/features/org.talend.libraries.jdbc.feature/pom.xml
+++ b/main/features/org.talend.libraries.jdbc.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.libraries.jdbc.feature</artifactId>
--- a/main/features/org.talend.m2e.feature/feature.xml
+++ b/main/features/org.talend.m2e.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.m2e.feature" label="Feature" version="7.4.1.M7"> 
+<feature id="org.talend.m2e.feature" label="Feature" version="7.4.1.qualifier"> 
  <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
  <license url="http://www.example.com/license">[Enter License Description here.]</license>  
--- a/main/features/org.talend.m2e.feature/pom.xml
+++ b/main/features/org.talend.m2e.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-M7</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.m2e.feature</artifactId>
--- a/Show More
+++ b/Show More