Set version to 6.5.0 M2

fix(TDI-39363): add the miss instance type (#1615 )
[TESB-20121] Add CXF swagger-ui setting for jobs (#1614 )
2017-08-29 14:16:36 +02:00 · 2017-08-28 14:18:54 +08:00 · 2017-08-28 11:05:23 +08:00 · 2017-08-28 10:04:30 +08:00 · 2017-08-25 15:05:55 +08:00 · 2017-08-24 09:42:36 +08:00
725 changed files with 25932 additions and 3725 deletions
--- a/i18n/plugins/org.talend.componentdesigner.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.componentdesigner.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.componentdesigner.nl
-Bundle-Version: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Fragment-Host: org.talend.componentdesigner
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.componentdesigner.nl/pom.xml
+++ b/i18n/plugins/org.talend.componentdesigner.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.componentdesigner.nl</artifactId>
--- a/i18n/plugins/org.talend.componentdesigner.rcp.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.componentdesigner.rcp.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.componentdesigner.rcp.nl
-Bundle-Version: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Fragment-Host: org.talend.componentdesigner.rcp
--- a/i18n/plugins/org.talend.componentdesigner.rcp.nl/pom.xml
+++ b/i18n/plugins/org.talend.componentdesigner.rcp.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.componentdesigner.rcp.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.abstractmap.nl/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Fragment-Host: org.talend.designer.abstractmap
--- a/i18n/plugins/org.talend.designer.abstractmap.nl/pom.xml
+++ b/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>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.abstractmap.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.alfrescooutput.nl/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Fragment-Host: org.talend.designer.alfrescooutput
--- a/i18n/plugins/org.talend.designer.alfrescooutput.nl/pom.xml
+++ b/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>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.alfrescooutput.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.business.diagram.nl/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.designer.business.diagram
 Bundle-Localization: plugin
--- a/i18n/plugins/org.talend.designer.business.diagram.nl/pom.xml
+++ b/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>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.business.diagram.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.codegen.nl/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Fragment-Host: org.talend.designer.codegen
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.designer.codegen.nl/pom.xml
+++ b/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>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.codegen.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.components.exchange.nl/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Fragment-Host: org.talend.designer.components.exchange
--- a/i18n/plugins/org.talend.designer.components.exchange.nl/pom.xml
+++ b/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>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.components.exchange.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.core.nl/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Fragment-Host: org.talend.designer.core
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.designer.core.nl/pom.xml
+++ b/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>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.core.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.dbmap.nl/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Fragment-Host: org.talend.designer.dbmap
--- a/i18n/plugins/org.talend.designer.dbmap.nl/pom.xml
+++ b/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>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.dbmap.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.documentation.nl/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Fragment-Host: org.talend.designer.documentation
--- a/i18n/plugins/org.talend.designer.documentation.nl/pom.xml
+++ b/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>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.documentation.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.fileoutputxml.nl/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Fragment-Host: org.talend.designer.fileoutputxml
--- a/i18n/plugins/org.talend.designer.fileoutputxml.nl/pom.xml
+++ b/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>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.fileoutputxml.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.gefabstractmap.nl/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Fragment-Host: org.talend.designer.gefabstractmap
--- a/i18n/plugins/org.talend.designer.gefabstractmap.nl/pom.xml
+++ b/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>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.gefabstractmap.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.hl7.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.designer.hl7.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.designer.hl7.nl
-Bundle-Version: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Fragment-Host: org.talend.designer.hl7
--- a/i18n/plugins/org.talend.designer.hl7.nl/pom.xml
+++ b/i18n/plugins/org.talend.designer.hl7.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.hl7.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.mapper.nl/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Fragment-Host: org.talend.designer.mapper
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.designer.mapper.nl/pom.xml
+++ b/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>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.mapper.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.maven.job.nl/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.designer.maven.job
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
--- a/i18n/plugins/org.talend.designer.maven.job.nl/pom.xml
+++ b/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>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.maven.job.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.rowgenerator.nl/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Fragment-Host: org.talend.designer.rowgenerator
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.designer.rowgenerator.nl/pom.xml
+++ b/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>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.rowgenerator.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.runprocess.nl/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.designer.runprocess
 Bundle-Localization: plugin
--- a/i18n/plugins/org.talend.designer.runprocess.nl/pom.xml
+++ b/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>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.runprocess.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.scd.nl/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Fragment-Host: org.talend.designer.scd
--- a/i18n/plugins/org.talend.designer.scd.nl/pom.xml
+++ b/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>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.scd.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.webservice.nl/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Fragment-Host: org.talend.designer.webservice
--- a/i18n/plugins/org.talend.designer.webservice.nl/pom.xml
+++ b/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>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.webservice.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.xmlmap.nl/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Fragment-Host: org.talend.designer.xmlmap
--- a/i18n/plugins/org.talend.designer.xmlmap.nl/pom.xml
+++ b/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>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.xmlmap.nl</artifactId>
--- a/i18n/plugins/org.talend.expressionbuilder.nl/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Fragment-Host: org.talend.expressionbuilder
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.expressionbuilder.nl/pom.xml
+++ b/i18n/plugins/org.talend.expressionbuilder.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.expressionbuilder.nl</artifactId>
--- a/i18n/plugins/org.talend.presentation.onboarding.resource.nl/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Fragment-Host: org.talend.presentation.onboarding.resource
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.presentation.onboarding.resource.nl/pom.xml
+++ b/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>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.presentation.onboarding.resource.nl</artifactId>
--- a/i18n/plugins/org.talend.presentation.onboarding.resource.tos.nl/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Fragment-Host: org.talend.presentation.onboarding.resource.tos
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.presentation.onboarding.resource.tos.nl/pom.xml
+++ b/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>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.presentation.onboarding.resource.tos.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.ftp.nl/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Fragment-Host: org.talend.repository.ftp
--- a/i18n/plugins/org.talend.repository.ftp.nl/pom.xml
+++ b/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>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.ftp.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.json.nl/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Fragment-Host: org.talend.repository.json
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.repository.json.nl/pom.xml
+++ b/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>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.json.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.nl/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Fragment-Host: org.talend.repository
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.repository.nl/pom.xml
+++ b/i18n/plugins/org.talend.repository.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.nl/src/main/java/messages_en.properties
+++ b/i18n/plugins/org.talend.repository.nl/src/main/java/messages_en.properties
@@ -887,13 +887,13 @@ VersionManagementDialog.WarningTitle2=Warning
 VersionManagementDialog.openedInEditorMessage=Items : {0} \nare opened in editors, save them after click OK.
 VersionManagementDialog.inValidVersionWarning=Invalid version pattern
 VersionManagementDialog.applyVersion=Apply version
-VersionManagementDialog.useJobVersion=Use job versions.
+VersionManagementDialog.useJobVersion=Use job version
 JavaVersionProjectSettingPage.versionLabel=JDK Compiler compliance level:
 BuildJobManager.mavenErrorMessage=Job was not built successfully, please check the logs for more details available on the workspace/.Java/lastGenerated.log
-VersionManagementDialog.projectVersion=Project Version
+VersionManagementDialog.projectVersion=Project version
 VersionManagementDialog.useSnapshot=Use snapshot
 VersionManagementDialog.applyDetail=Apply
-VersionManagementDialog.eachMavenVersion=Change the version of each item individually.
-VersionManagementDialog.useProjectVersion=Apply Project versions to items.
+VersionManagementDialog.eachMavenVersion=Change the version of each item individually
+VersionManagementDialog.useProjectVersion=Apply project version to items
 VersionManagementDialog.snapshot=Snapshot
 VersionManagementDialog.remove=Remove
--- a/i18n/plugins/org.talend.repository.view.di.nl/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Fragment-Host: org.talend.repository.view.di
--- a/i18n/plugins/org.talend.repository.view.di.nl/pom.xml
+++ b/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>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.view.di.nl</artifactId>
--- a/i18n/plugins/org.talend.sbi.engines.client.nl/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Fragment-Host: org.talend.sbi.engines.client
--- a/i18n/plugins/org.talend.sbi.engines.client.nl/pom.xml
+++ b/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>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.sbi.engines.client.nl</artifactId>
--- a/i18n/plugins/org.talend.spagic.engines.client.nl/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Fragment-Host: org.talend.spagic.engines.client
--- a/i18n/plugins/org.talend.spagic.engines.client.nl/pom.xml
+++ b/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>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.spagic.engines.client.nl</artifactId>
--- a/i18n/plugins/org.talend.sqlbuilder.nl/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.sqlbuilder
 Bundle-Localization: plugin
--- a/i18n/plugins/org.talend.sqlbuilder.nl/pom.xml
+++ b/i18n/plugins/org.talend.sqlbuilder.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.sqlbuilder.nl</artifactId>
--- a/main/features/org.talend.componentdesigner.feature/feature.xml
+++ b/main/features/org.talend.componentdesigner.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.componentdesigner.feature"
      label="Componentdesigner_feature Feature"
-      version="6.4.1.qualifier"
+      version="6.5.0.qualifier"
      provider-name=".Talend SA.">

   <description url="http://www.example.com/description">
--- a/main/features/org.talend.componentdesigner.feature/pom.xml
+++ b/main/features/org.talend.componentdesigner.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.componentdesigner.feature</artifactId>
--- a/main/features/org.talend.designer.business.feature/feature.xml
+++ b/main/features/org.talend.designer.business.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.designer.business.feature"
      label="Business Feature"
-      version="6.4.1.qualifier"
+      version="6.5.0.qualifier"
      provider-name=".Talend SA.">

   <description url="http://www.talend.com/online/featuresdescription.html#business-feature">
--- a/main/features/org.talend.designer.business.feature/pom.xml
+++ b/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>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.business.feature</artifactId>
--- a/main/features/org.talend.designer.feature/feature.xml
+++ b/main/features/org.talend.designer.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.designer.feature"
      label="Designer Feature"
-      version="6.4.1.qualifier"
+      version="6.5.0.qualifier"
      provider-name=".Talend SA.">

   <description url="http://www.talend.com/online/featuresdescription.html#designer-feature">
--- a/main/features/org.talend.designer.feature/pom.xml
+++ b/main/features/org.talend.designer.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.feature</artifactId>
--- a/main/features/org.talend.rcp.branding.tos.feature/feature.xml
+++ b/main/features/org.talend.rcp.branding.tos.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.rcp.branding.tos.feature"
      label="Tos branding feature"
-      version="6.4.1.qualifier"
+      version="6.5.0.qualifier"
      provider-name=".Talend SA."
      plugin="org.talend.rcp.branding.tos">

--- a/main/features/org.talend.rcp.branding.tos.feature/pom.xml
+++ b/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>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.rcp.branding.tos.feature</artifactId>
--- a/main/features/org.talend.rcp.branding.tos.test.feature/feature.xml
+++ b/main/features/org.talend.rcp.branding.tos.test.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.rcp.branding.tos.test.feature"
      label="Test feature for TOS"
-      version="6.4.1.qualifier">
+      version="6.5.0.qualifier">

   <description url="http://www.example.com/description">
      [Enter Feature Description here.]
@@ -385,4 +385,11 @@
         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"/>
 </feature>
--- a/main/features/org.talend.rcp.branding.tos.test.feature/pom.xml
+++ b/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>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.rcp.branding.tos.test.feature</artifactId>
--- a/main/features/org.talend.repository.feature/feature.xml
+++ b/main/features/org.talend.repository.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.repository.feature"
      label="Repository Feature"
-      version="6.4.1.qualifier"
+      version="6.5.0.qualifier"
      provider-name=".Talend SA.">

   <description url="http://www.talend.com/online/featuresdescription.html#repository-feature">
--- a/main/features/org.talend.repository.feature/pom.xml
+++ b/main/features/org.talend.repository.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.feature</artifactId>
--- a/main/features/org.talend.sbi.feature/feature.xml
+++ b/main/features/org.talend.sbi.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.sbi.feature"
      label="SBI Feature"
-      version="6.4.1.qualifier"
+      version="6.5.0.qualifier"
      provider-name=".Talend SA.">

   <description url="http://www.talend.com/online/featuresdescription.html#sbi-feature">
--- a/main/features/org.talend.sbi.feature/pom.xml
+++ b/main/features/org.talend.sbi.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.sbi.feature</artifactId>
--- a/main/features/org.talend.spagic.feature/feature.xml
+++ b/main/features/org.talend.spagic.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.spagic.feature"
      label="SPAGIC Feature"
-      version="6.4.1.qualifier"
+      version="6.5.0.qualifier"
      provider-name=".Talend SA.">

   <description url="http://www.talend.com/online/featuresdescription.html#spagic-feature">
--- a/main/features/org.talend.spagic.feature/pom.xml
+++ b/main/features/org.talend.spagic.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.spagic.feature</artifactId>
--- a/main/features/org.talend.tos.components.feature/feature.xml
+++ b/main/features/org.talend.tos.components.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.tos.components.feature"
      label="Components-feature"
-      version="6.4.1.qualifier">
+      version="6.5.0.qualifier">

   <description url="http://www.example.com/description">
      [Enter Feature Description here.]
--- a/main/features/org.talend.tos.components.feature/pom.xml
+++ b/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>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.tos.components.feature</artifactId>
--- a/main/features/org.talend.tos.feature/feature.xml
+++ b/main/features/org.talend.tos.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.tos.feature"
      label="Tos feature"
-      version="6.4.1.qualifier"
+      version="6.5.0.qualifier"
      provider-name=".Talend SA.">

   <description url="http://www.example.com/description">
--- a/main/features/org.talend.tos.feature/pom.xml
+++ b/main/features/org.talend.tos.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.tos.feature</artifactId>
--- a/main/features/org.talend.tos.libraries.feature/feature.xml
+++ b/main/features/org.talend.tos.libraries.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.tos.libraries.feature"
      label="Libraries_feature"
-      version="6.4.1.qualifier">
+      version="6.5.0.qualifier">

   <description url="http://www.example.com/description">
      [Enter Feature Description here.]
--- a/main/features/org.talend.tos.libraries.feature/pom.xml
+++ b/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>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.tos.libraries.feature</artifactId>
--- a/main/plugins/org.talend.componentdesigner.rcp/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.componentdesigner.rcp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Rcp Plug-in
 Bundle-SymbolicName: org.talend.componentdesigner.rcp; singleton:=true
-Bundle-Version: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Bundle-Activator: org.talend.componentdesigner.rcp.Activator
 Require-Bundle: org.eclipse.ui,
 org.eclipse.core.runtime,
--- a/main/plugins/org.talend.componentdesigner.rcp/pom.xml
+++ b/main/plugins/org.talend.componentdesigner.rcp/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.componentdesigner.rcp</artifactId>
--- a/main/plugins/org.talend.componentdesigner/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.componentdesigner/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Componentdesigner Plug-in
 Bundle-SymbolicName: org.talend.componentdesigner; singleton:=true
-Bundle-Version: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Bundle-Activator: org.talend.componentdesigner.ComponentDesigenerPlugin
 Require-Bundle: org.talend.model,
 org.eclipse.ui,
--- a/main/plugins/org.talend.componentdesigner/pom.xml
+++ b/main/plugins/org.talend.componentdesigner/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.componentdesigner</artifactId>
--- a/main/plugins/org.talend.designer.abstractmap/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Bundle-Activator: org.talend.designer.abstractmap.MapPlugin
 Require-Bundle: org.eclipse.core.runtime,
 org.talend.core,
--- a/main/plugins/org.talend.designer.abstractmap/pom.xml
+++ b/main/plugins/org.talend.designer.abstractmap/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.abstractmap</artifactId>
--- a/main/plugins/org.talend.designer.alfrescooutput/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Bundle-Vendor: .Talend SA.
 Require-Bundle: org.eclipse.core.runtime,
 org.talend.core,
--- a/main/plugins/org.talend.designer.alfrescooutput/pom.xml
+++ b/main/plugins/org.talend.designer.alfrescooutput/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.alfrescooutput</artifactId>
--- a/main/plugins/org.talend.designer.business.diagram/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.talend.designer.business.model.business.diagram.part.BusinessDiagramEditorPlugin
 Bundle-Vendor: %providerName
--- a/main/plugins/org.talend.designer.business.diagram/pom.xml
+++ b/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>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M2</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.business.diagram</artifactId>
--- a/main/plugins/org.talend.designer.codegen/META-INF/MANIFEST.MF
+++ b/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: 6.4.1.qualifier
+Bundle-Version: 6.5.0.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.talend.core.repository,
 org.eclipse.emf.codegen,
--- a/main/plugins/org.talend.designer.codegen/jet_stub/footer.javajet
+++ b/main/plugins/org.talend.designer.codegen/jet_stub/footer.javajet
@@ -229,15 +229,6 @@
        };
    };

-<% if (hasSAM4RS) { %>
-    // ESB Service Activity Monitor Feature
-    private org.apache.cxf.feature.Feature eventFeature;
-
-    public void setEventFeature(org.apache.cxf.feature.Feature eventFeature) {
-        this.eventFeature = eventFeature;
-    }
-<% } %>
-
 <%
    if(isRunInMultiThread || exist_tParallelize){
 %>
@@ -894,20 +885,6 @@ this.globalResumeTicket = true;//to run tPostJob
    closeScpConnections();
 <% } %>

-<%
-    if (hasSAM4RS || hasSAM4WS) {
-%>
-    if (false<% if (hasSAM4RS) { %> || null == eventFeature<% } %><% if (hasSAM4WS) { %> || null == registry<% } %>) { // TESB-8574: Fix SAM timeout issue in Studio
-        try {
-            Thread.sleep(5000);
-        } catch (InterruptedException e) {
-        }
-    }
-<%
-    }
-%>
-
-
 <%
    if (stats) {
 %>
--- a/main/plugins/org.talend.designer.codegen/jet_stub/generic/component_begin.javajet
+++ b/main/plugins/org.talend.designer.codegen/jet_stub/generic/component_begin.javajet
@@ -25,6 +25,7 @@ imports="
        org.talend.core.model.process.IElementParameter
        org.talend.core.model.process.INode
        org.talend.core.model.utils.TalendTextUtils
+        org.talend.core.model.utils.ContextParameterUtils
        org.talend.daikon.NamedThing
        org.talend.daikon.properties.property.Property
        org.talend.designer.codegen.config.CodeGeneratorArgument
@@ -33,6 +34,7 @@ imports="
        "
 %>
 <%@include file="@{org.talend.designer.codegen}/jet_stub/generic/component_util_indexedrecord_to_rowstruct.javajet"%>
+<%@include file="@{org.talend.designer.codegen}/jet_stub/generic/component_util_process_properties.javajet"%>
 <%
 CodeGeneratorArgument codeGenArgument = (CodeGeneratorArgument) argument;
 INode node = (INode)codeGenArgument.getArgument();
@@ -68,6 +70,20 @@ List<Component.CodegenPropInfo> propsToProcess = component.getCodegenPropInfos(c

 final Set<String> referenceProperties = new HashSet<String>();

+boolean hasInput = !NodeUtil.getIncomingConnections(node, IConnectionCategory.DATA).isEmpty();
+
+String connName = null;
+if(hasInput) {
+	IConnection main = null;
+    List<? extends IConnection> mains = NodeUtil.getIncomingConnections(node, IConnectionCategory.DATA);
+    if (mains!=null && !mains.isEmpty()) {
+        main = mains.get(0);
+        connName = main.getName();
+    }
+}
+ProcessPropertiesGenerator generator = new ProcessPropertiesGenerator(cid, component);
+List<Property> dynamicProperties = new ArrayList<Property>();
+
 for (Component.CodegenPropInfo propInfo : propsToProcess) { // propInfo
    List<NamedThing> properties = propInfo.props.getProperties();
    for (NamedThing prop : properties) { // property
@@ -75,68 +91,7 @@ for (Component.CodegenPropInfo propInfo : propsToProcess) { // propInfo
            Property property = (Property)prop;
            if (property.getFlags() != null && (property.getFlags().contains(Property.Flags.DESIGN_TIME_ONLY) || property.getFlags().contains(Property.Flags.HIDDEN)))
                continue;
-            Object value = property.getStoredValue();
-            if (value != null) {
-                if (value instanceof List) {
-                    // added for the support of tables
-                    String tmpVarName = cid+propInfo.fieldName.replace('.','_')+"_"+property.getName();
-                    %>
-                    java.util.List<Object> <%=tmpVarName %> = new java.util.ArrayList<Object>();
-                    <%
-                    for (Object subPropertyValue : (java.util.List<Object>)property.getValue()) {
-                        if ((property.getPossibleValues() != null && property.getPossibleValues().size() > 0)||
-                        	Boolean.valueOf(String.valueOf(property.getTaggedValue(IGenericConstants.ADD_QUOTES)))) {
-                            %>
-                            <%=tmpVarName %>.add("<%=subPropertyValue %>");
-                            <%
-                        } else if(!"".equals(subPropertyValue)) {
-                                %>
-                                <%=tmpVarName %>.add(<%=subPropertyValue %>);
-                                <%
-                        } else {
-                            %>
-                            <%=tmpVarName %>.add("");
-                            <%
-                        }
-                    }
-                    %>
-                    ((org.talend.daikon.properties.Properties)props_<%=cid %><%=propInfo.fieldName%>).setValue("<%=property.getName()%>",<%=tmpVarName %>);
-                    <%
-                }  else if (value instanceof String && property.isFlag(Property.Flags.ENCRYPT) && ElementParameterParser.canEncryptValue((String) value)) {
-                    if (!"".equals(property.getStringValue())) {
-                        %>
-                        props_<%=cid %><%=propInfo.fieldName%>.setValue("<%=property.getName()%>",
-                        routines.system.PasswordEncryptUtil.decryptPassword(<%=component.getCodegenValue(property, (String) value)%>));
-                        <%
-                    }
-                } else if (value != null && "java.util.Date".equals(property.getType())){
-                    %>
-                    props_<%=cid %><%=propInfo.fieldName%>.setValue("<%=property.getName()%>",
-                        TalendDate.parseDate("yyyy-MM-dd HH:mm:ss",<%=component.getCodegenValue(property, value.toString())%>));
-                    <%
-                } else if (property instanceof org.talend.daikon.properties.property.EnumProperty) {
-                    %>
-                    props_<%=cid %><%=propInfo.fieldName%>.setValue("<%=property.getName()%>",
-                        <%=property.getType().replaceAll("<.*>", "")%>.<%=property.getValue()%>);
-                    <%
-                } else if (property instanceof org.talend.daikon.properties.property.SchemaProperty) {
-                    %>
-                    props_<%=cid %><%=propInfo.fieldName%>.setValue("<%=property.getName()%>",
-                        new org.apache.avro.Schema.Parser().parse(<%=component.getCodegenValue(property, property.getStringValue())%>));
-                    <%
-                } else if (!(value instanceof String) || !((String)value).equals("")) {
-                    %>
-                    props_<%=cid %><%=propInfo.fieldName%>.setValue("<%=property.getName()%>",
-                    <%=component.getCodegenValue(property, value.toString())%>);
-                    <%
-                }
-            }
-
-            if("java.lang.Integer".equals(property.getType()) && (value == null || ((value instanceof String) && ((String)value).isEmpty()))) {//need to overwrite the default value when the passed value is null or empty string from the model
-        	%>
-                props_<%=cid %><%=propInfo.fieldName%>.setValue("<%=property.getName()%>", null);
-            <%
-            }
+            generator.setPropertyValues(property, propInfo, connName, true, true);
        } else if (prop instanceof ComponentReferenceProperties) {
            final String fieldString = propInfo.fieldName + "." + prop.getName();
            referenceProperties.add(fieldString);
@@ -181,7 +136,6 @@ int nb_line_<%=cid %> = 0;

 org.talend.components.api.component.ConnectorTopology topology_<%=cid%> = null;
 <%
-boolean hasInput = !NodeUtil.getIncomingConnections(node, IConnectionCategory.DATA).isEmpty();
 boolean hasOutput = !NodeUtil.getOutgoingConnections(node, IConnectionCategory.DATA).isEmpty();
 boolean hasOutputOnly = hasOutput && !hasInput;

@@ -405,8 +359,8 @@ if (hasOutputOnly || asInputComponent) {
        }
    }
    org.apache.avro.Schema designSchema_<%=cid%> = props_<%=cid %>.getSchema(c_<%=cid%>, false);
-    org.talend.daikon.di.DiIncomingSchemaEnforcer current_<%=cid%>
-            = new org.talend.daikon.di.DiIncomingSchemaEnforcer(designSchema_<%=cid%>);
+    org.talend.codegen.enforcer.IncomingSchemaEnforcer incomingEnforcer_<%=cid%>
+            = new org.talend.codegen.enforcer.IncomingSchemaEnforcer(designSchema_<%=cid%>);
    <%
    List<? extends IConnection> outgoingConns = node.getOutgoingSortedConnections();
    if (outgoingConns!=null){
--- a/main/plugins/org.talend.designer.codegen/jet_stub/generic/component_main.javajet
+++ b/main/plugins/org.talend.designer.codegen/jet_stub/generic/component_main.javajet
@@ -17,9 +17,19 @@ imports="
        org.talend.designer.codegen.config.CodeGeneratorArgument
        org.talend.core.model.utils.TalendTextUtils
        org.talend.core.model.utils.NodeUtil
+        org.talend.designer.core.generic.model.Component
+        java.util.ArrayList
+        java.util.HashMap
+        java.util.Map
+        org.talend.components.api.properties.ComponentProperties
+        org.talend.daikon.NamedThing
+        org.talend.daikon.properties.property.Property
+        org.talend.designer.core.generic.constants.IGenericConstants
+        org.talend.core.model.utils.ContextParameterUtils
        "
 %>
 <%@include file="@{org.talend.designer.codegen}/jet_stub/generic/component_util_indexedrecord_to_rowstruct.javajet"%>
+<%@include file="@{org.talend.designer.codegen}/jet_stub/generic/component_util_process_properties.javajet"%>
 <%
 CodeGeneratorArgument codeGenArgument = (CodeGeneratorArgument) argument;
 INode node = (INode)codeGenArgument.getArgument();
@@ -90,10 +100,10 @@ if(hasInput){

            if (dynamicPos != -1)  {
                %>
-                if (!current_<%=cid%>.areDynamicFieldsInitialized()) {
+                if (!incomingEnforcer_<%=cid%>.areDynamicFieldsInitialized()) {
                    // Initialize the dynamic columns when they are first encountered.
                    for (routines.system.DynamicMetadata dm_<%=cid%> : <%=inputConn.getName()%>.<%=input_columnList.get(dynamicPos).getLabel()%>.metadatas) {
-                        current_<%=cid%>.addDynamicField(
+                        incomingEnforcer_<%=cid%>.addDynamicField(
                                dm_<%=cid%>.getName(),
                                dm_<%=cid%>.getType(),
                                dm_<%=cid%>.getLogicalType(),
@@ -101,24 +111,24 @@ if(hasInput){
                                dm_<%=cid%>.getDescription(),
                                dm_<%=cid%>.isNullable());
                    }
-                    current_<%=cid%>.createRuntimeSchema();
+                    incomingEnforcer_<%=cid%>.createRuntimeSchema();
                }
                <%
            }

            %>
-            current_<%=cid%>.createNewRecord();
+            incomingEnforcer_<%=cid%>.createNewRecord();
            <%
            for (int i = 0; i < input_columnList.size(); i++) { // column
                IMetadataColumn column = input_columnList.get(i);
                if (dynamicPos != i) {
                    %>
-                    current_<%=cid%>.put("<%=column.getLabel()%>", <%=inputConn.getName()%>.<%=column.getLabel()%>);
+                    incomingEnforcer_<%=cid%>.put("<%=column.getLabel()%>", <%=inputConn.getName()%>.<%=column.getLabel()%>);
                    <%
                } else {
                    %>
                    for (int i = 0; i < <%=inputConn.getName()%>.<%=column.getLabel()%>.getColumnCount(); i++) {
-                        current_<%=cid%>.put(<%=inputConn.getName()%>.<%=column.getLabel()%>.getColumnMetadata(i).getName(),
+                        incomingEnforcer_<%=cid%>.put(<%=inputConn.getName()%>.<%=column.getLabel()%>.getColumnMetadata(i).getName(),
                                <%=inputConn.getName()%>.<%=column.getLabel()%>.getColumnValue(i));
                    }
                    <%
@@ -134,9 +144,26 @@ if(hasInput){
            // There will be a ClassCastException if the output component does
            // not implement WriterWithFeedback, but permits outgoing
            // connections.
-
+            
+            ComponentProperties componentProps = node.getComponentProperties();
+			ProcessPropertiesGenerator generator = new ProcessPropertiesGenerator(cid, component);
+            List<Component.CodegenPropInfo> propsToProcess = component.getCodegenPropInfos(componentProps);
+            for (Component.CodegenPropInfo propInfo : propsToProcess) { // propInfo
+    			List<NamedThing> properties = propInfo.props.getProperties();
+    			for (NamedThing prop : properties) { // property
+        			if (prop instanceof Property) { // if, only deal with valued Properties
+            			Property property = (Property)prop;
+            			if (property.getFlags() != null && (property.getFlags().contains(Property.Flags.DESIGN_TIME_ONLY) || property.getFlags().contains(Property.Flags.HIDDEN)))
+ 		                	continue;
+            			if(property.getTaggedValue(IGenericConstants.DYNAMIC_PROPERTY_VALUE)!=null && Boolean.valueOf(String.valueOf(property.getTaggedValue(IGenericConstants.DYNAMIC_PROPERTY_VALUE)))) {
+            				generator.setPropertyValues(property, propInfo, null, false, false);
+            			}
+        			}
+    			} // property
+			} // propInfo
+            
            %>
-            org.apache.avro.generic.IndexedRecord data_<%=cid%> = current_<%=cid%>.getCurrentRecord();
+            org.apache.avro.generic.IndexedRecord data_<%=cid%> = incomingEnforcer_<%=cid%>.getCurrentRecord();

            writer_<%=cid%>.write(data_<%=cid%>);
            
--- a/main/plugins/org.talend.designer.codegen/jet_stub/generic/component_util_indexedrecord_to_rowstruct.javajet
+++ b/main/plugins/org.talend.designer.codegen/jet_stub/generic/component_util_indexedrecord_to_rowstruct.javajet
@@ -43,7 +43,7 @@ class IndexedRecordToRowStructGenerator {
        }
        dynamicColName = tmpDynamicColName;

-        this.codeVarSchemaEnforcer = "current_" + cid;
+        this.codeVarSchemaEnforcer = "outgoingEnforcer_" + cid;
        this.codeVarIsDynamicInitialized = "initDyn_" + cid;
        this.codeVarDynamic = "dynamic_" + cid;
        this.codeVarIndexedRecordAdapter = "factory_" + cid;
@@ -66,7 +66,7 @@ class IndexedRecordToRowStructGenerator {
        }

        %>
-        org.talend.daikon.di.DiOutgoingSchemaEnforcer <%=codeVarSchemaEnforcer%> = org.talend.daikon.di.EnforcerCreator.createOutgoingEnforcer(<%=codeVarSchemaToEnforce%>, <%=dynamicByPosition%>);
+        org.talend.codegen.enforcer.OutgoingSchemaEnforcer <%=codeVarSchemaEnforcer%> = org.talend.codegen.enforcer.EnforcerCreator.createOutgoingEnforcer(<%=codeVarSchemaToEnforce%>, <%=dynamicByPosition%>);

        // Create a reusable factory that converts the output of the reader to an IndexedRecord.
        org.talend.daikon.avro.converter.IndexedRecordConverter<Object, ? extends org.apache.avro.generic.IndexedRecord> <%=codeVarIndexedRecordAdapter%> = null;
@@ -111,66 +111,39 @@ class IndexedRecordToRowStructGenerator {
        if (dynamicColName != null) {
            %>
            if (!<%=codeVarIsDynamicInitialized%>) {
-                org.apache.avro.Schema dynSchema_<%=cid%> = ((org.talend.daikon.di.DiOutgoingDynamicSchemaEnforcer) <%=codeVarSchemaEnforcer%>).getDynamicFieldsSchema();
+                org.apache.avro.Schema dynSchema_<%=cid%> = ((org.talend.codegen.enforcer.OutgoingDynamicSchemaEnforcer) <%=codeVarSchemaEnforcer%>).getDynamicFieldsSchema();
                for (org.apache.avro.Schema.Field dynamicField_<%=cid%> : dynSchema_<%=cid%>.getFields()){
                    routines.system.DynamicMetadata dynamicMetadata_<%=cid%> = new routines.system.DynamicMetadata();
-                    // set name and db name
+                    org.apache.avro.Schema dynamicFieldSchema_<%=cid%> = dynamicField_<%=cid%>.schema();
+                    // set name
                    dynamicMetadata_<%=cid%>.setName(dynamicField_<%=cid%>.name());
+                    // set db name
                    dynamicMetadata_<%=cid%>.setDbName(dynamicField_<%=cid%>.name());
-                    // set type
-                    String talendType_<%=cid%> = null;
-                    org.apache.avro.Schema.Type type_<%=cid%> = dynamicField_<%=cid%>.schema().getType();
-                    if(type_<%=cid%>  == org.apache.avro.Schema.Type.UNION){
-                    	java.util.List<org.apache.avro.Schema> fieldTypes_<%=cid%> = dynamicField_<%=cid%>.schema().getTypes();
-                    	for(org.apache.avro.Schema fieldType_<%=cid%>:fieldTypes_<%=cid%>){
-                    		if(fieldType_<%=cid%>.getType() == org.apache.avro.Schema.Type.NULL){
-                    			dynamicMetadata_<%=cid%>.setNullable(true);
-                    		}else{
-                    			type_<%=cid%> = fieldType_<%=cid%>.getType();
-                    		}
-                    	}
-					}
-                    if (type_<%=cid%> == org.apache.avro.Schema.Type.ARRAY) {
-                        talendType_<%=cid%> = "<%=JavaTypesManager.LIST.getId()%>";
-                    } else if (type_<%=cid%> == org.apache.avro.Schema.Type.BOOLEAN) {
-                        talendType_<%=cid%> = "<%=JavaTypesManager.BOOLEAN.getId()%>";
-                    } else if (type_<%=cid%> == org.apache.avro.Schema.Type.BYTES) {
-                        talendType_<%=cid%> = "<%=JavaTypesManager.BYTE_ARRAY.getId()%>";
-                    } else if (type_<%=cid%> == org.apache.avro.Schema.Type.FIXED) {
-                        talendType_<%=cid%> = "<%=JavaTypesManager.BYTE_ARRAY.getId()%>";
-                    } else if (type_<%=cid%> == org.apache.avro.Schema.Type.DOUBLE) {
-                        talendType_<%=cid%> = "<%=JavaTypesManager.DOUBLE.getId()%>";
-                    } else if (type_<%=cid%> == org.apache.avro.Schema.Type.FLOAT) {
-                        talendType_<%=cid%> = "<%=JavaTypesManager.FLOAT.getId()%>";
-                    } else if (type_<%=cid%> == org.apache.avro.Schema.Type.INT) {
-                        talendType_<%=cid%> = "<%=JavaTypesManager.INTEGER.getId()%>";
-                    } else if (type_<%=cid%> == org.apache.avro.Schema.Type.LONG) {
-                    	String pattern_<%=cid%> = dynamicField_<%=cid%>.getProp(org.talend.daikon.avro.SchemaConstants.TALEND_COLUMN_PATTERN);
-                    	if(pattern_<%=cid%>!=null && !pattern_<%=cid%>.trim().isEmpty()){
-                    		talendType_<%=cid%> = "<%=JavaTypesManager.DATE.getId()%>";
-                    		dynamicMetadata_<%=cid%>.setFormat(pattern_<%=cid%>);
-                    	}else{
-                    		talendType_<%=cid%> = "<%=JavaTypesManager.LONG.getId()%>";
-                    	}
-                    } else if (type_<%=cid%> == org.apache.avro.Schema.Type.ENUM) {
-                        talendType_<%=cid%> = "<%=JavaTypesManager.STRING.getId()%>";
-                    } else if (type_<%=cid%> == org.apache.avro.Schema.Type.STRING) {
-                        talendType_<%=cid%> = "<%=JavaTypesManager.STRING.getId()%>";
+                    // set nullable
+                    if (org.talend.daikon.avro.AvroUtils.isNullable(dynamicFieldSchema_<%=cid%>)) {
+                        dynamicMetadata_<%=cid%>.setNullable(true);
                    }
+                    // set type
+                    String talendType_<%=cid%> = org.talend.codegen.converter.TypeConverter.avroToDi(dynamicFieldSchema_<%=cid%>);
                    dynamicMetadata_<%=cid%>.setType(talendType_<%=cid%>);
+                    // set pattern
+                    String pattern_<%=cid%> = dynamicField_<%=cid%>.getProp(org.talend.daikon.avro.SchemaConstants.TALEND_COLUMN_PATTERN);
+                    if (pattern_<%=cid%> != null && !pattern_<%=cid%>.trim().isEmpty()) {
+                        dynamicMetadata_<%=cid%>.setFormat(pattern_<%=cid%>);
+                    }
                    // set logical type
-                    org.apache.avro.Schema unwrappedSchema_<%=cid%> = org.talend.daikon.avro.AvroUtils.unwrapIfNullable(dynamicField_<%=cid%>.schema());
+                    org.apache.avro.Schema unwrappedSchema_<%=cid%> = org.talend.daikon.avro.AvroUtils.unwrapIfNullable(dynamicFieldSchema_<%=cid%>);
                    String logicalType_<%=cid%> = org.talend.daikon.avro.LogicalTypeUtils.getLogicalTypeName(unwrappedSchema_<%=cid%>);
                    dynamicMetadata_<%=cid%>.setLogicalType(logicalType_<%=cid%>);
                    // set length
                    Object length_<%=cid%> = dynamicField_<%=cid%>.getProp(org.talend.daikon.avro.SchemaConstants.TALEND_COLUMN_DB_LENGTH);
-                    if(length_<%=cid%> != null){
-                    	dynamicMetadata_<%=cid%>.setLength(Integer.parseInt(String.valueOf(length_<%=cid%>)));
+                    if (length_<%=cid%> != null) {
+                        dynamicMetadata_<%=cid%>.setLength(Integer.parseInt(String.valueOf(length_<%=cid%>)));
                    }
                    // set precision
                    Object precision_<%=cid%> = dynamicField_<%=cid%>.getProp(org.talend.daikon.avro.SchemaConstants.TALEND_COLUMN_PRECISION); 
-                    if(precision_<%=cid%> != null){
-						dynamicMetadata_<%=cid%>.setPrecision(Integer.parseInt(String.valueOf(precision_<%=cid%>)));
+                    if (precision_<%=cid%> != null) {
+                        dynamicMetadata_<%=cid%>.setPrecision(Integer.parseInt(String.valueOf(precision_<%=cid%>)));
                    } 
                    // add dynamic field metadata to dynamic variable
                    <%=codeVarDynamic%>.metadatas.add(dynamicMetadata_<%=cid%>);
@@ -184,46 +157,54 @@ class IndexedRecordToRowStructGenerator {
        for (int i = 0; i < columnsToGenerate.size(); i++) {
            IMetadataColumn column = columnsToGenerate.get(i);
            String columnName = column.getLabel();
-            JavaType javaType = JavaTypesManager.getJavaTypeFromId(column.getTalendType());
            String typeToGenerate = JavaTypesManager.getTypeToGenerate(column.getTalendType(), column.isNullable());
            if (columnName.equals(dynamicColName)) {
-                %>
+            %>
                java.util.Map<String, Object> dynamicValue_<%=cid%> = (java.util.Map<String, Object>) <%=codeVarSchemaEnforcer%>.get(<%=i%>);
                for (java.util.Map.Entry<String, Object> dynamicValueEntry_<%=cid%> : dynamicValue_<%=cid%>.entrySet()) {
                    <%=codeVarDynamic%>.setColumnValue(<%=codeVarDynamic%>.getIndex(dynamicValueEntry_<%=cid%>.getKey()), dynamicValueEntry_<%=cid%>.getValue());
                }
                <%=codeVarRowStruct%>.<%=dynamicColName%> = <%=codeVarDynamic%>;
-                <%
+            <%
            } else {
-                %>
-				Object columnValue_<%=i%>_<%=cid%> = <%=codeVarSchemaEnforcer%>.get(<%=i%>);
-                if (columnValue_<%=i%>_<%=cid%> == null) {
-                     <%=codeVarRowStruct%>.<%=columnName%> = <%=JavaTypesManager.getDefaultValueFromJavaType(typeToGenerate)%>;
-                } else {
-                    <%
-                    if (javaType == JavaTypesManager.STRING) {
-                        %>
-                        <%=codeVarRowStruct%>.<%=columnName%> = String.valueOf(columnValue_<%=i%>_<%=cid%>);
-                        <%
-                    } else if (javaType == JavaTypesManager.CHARACTER) {
-                        %>
-                        <%=codeVarRowStruct%>.<%=columnName%> = String.valueOf(columnValue_<%=i%>_<%=cid%>).charAt(0);
-                        <%
-                    } else if("id_Document".equals(column.getTalendType())){
-                    	%>
-                    	<%=codeVarRowStruct%>.<%=columnName%> = ParserUtils.parseTo_Document(String.valueOf(columnValue_<%=i%>_<%=cid%>));
-                    	<%
-                    } else  {
-                        %>
-                        <%=codeVarRowStruct%>.<%=columnName%> = (<%=typeToGenerate%>) (columnValue_<%=i%>_<%=cid%>);
-                        <%
-                    }
-                    %>
-                }
+            %>
+                Object columnValue_<%=i%>_<%=cid%> = <%=codeVarSchemaEnforcer%>.get(<%=i%>);
                <%
+                if (JavaTypesManager.NULL.equals(JavaTypesManager.getDefaultValueFromJavaType(typeToGenerate))) {
+                    // there is no default value, so just assign data value to RowStruct
+                %>
+                    <%
+                    if ("id_Document".equals(column.getTalendType())) {
+                    %>
+                        <%=codeVarRowStruct%>.<%=columnName%> = ParserUtils.parseTo_Document(String.valueOf(columnValue_<%=i%>_<%=cid%>));
+                    <%
+                    } else {
+                    %>
+                        <%=codeVarRowStruct%>.<%=columnName%> = (<%=typeToGenerate%>) (columnValue_<%=i%>_<%=cid%>);
+                    <%
+                    }
+                } else {
+                    // there is default value, so check on null and set default value instead of null
+                %>
+                    if (columnValue_<%=i%>_<%=cid%> == null) {
+                        <%=codeVarRowStruct%>.<%=columnName%> = <%=JavaTypesManager.getDefaultValueFromJavaType(typeToGenerate)%>;
+                    } else {
+                        <%
+                        if ("id_Document".equals(column.getTalendType())) {
+                        %>
+                            <%=codeVarRowStruct%>.<%=columnName%> = ParserUtils.parseTo_Document(String.valueOf(columnValue_<%=i%>_<%=cid%>));
+                        <%
+                        } else {
+                        %>
+                            <%=codeVarRowStruct%>.<%=columnName%> = (<%=typeToGenerate%>) (columnValue_<%=i%>_<%=cid%>);
+                        <%
+                        }
+                        %>
+                    }
+                <%
+                }
            }
        }
    }
-
 }
 %>
--- a/main/plugins/org.talend.designer.codegen/jet_stub/generic/component_util_process_properties.javajet
+++ b/main/plugins/org.talend.designer.codegen/jet_stub/generic/component_util_process_properties.javajet
@@ -0,0 +1,111 @@
+<%
+ 
+ /**
+  * Utility for generating code that set values for the properties of the component.
+  */
+ class ProcessPropertiesGenerator {
+ 
+     /** A unique tag for generating code variables, usually based on the cid
+      *  of the node. */
+     private final String cid;
+ 
+     private final Component component;
+     
+     public ProcessPropertiesGenerator(String cid, Component component) {
+         this.cid = cid;
+         this.component = component;    
+     }
+ 
+     /**
+      * Generate code that set value for component properties
+      */
+     public void setPropertyValues(Property property, Component.CodegenPropInfo propInfo, String connName, boolean setDynamicTags, boolean firstCall) {
+     
+ 		            Object value = property.getStoredValue();
+ 		            if (value != null) {
+ 		            	if (setDynamicTags && (value instanceof String) && isDynamicValue(String.valueOf(value), connName)) {
+ 		            		property.setTaggedValue(IGenericConstants.DYNAMIC_PROPERTY_VALUE, "true");
+ 		            	}
+ 		                if (value instanceof List) { // if
+ 		                    // added for the support of tables
+ 		                    String tmpVarName = cid+propInfo.fieldName.replace('.','_')+"_"+property.getName();
+ 		                    if(firstCall) {
+ 		                    %>
+ 		                    java.util.List<Object> <%=tmpVarName %> = new java.util.ArrayList<Object>();
+ 		                    <%
+ 		                    } else {
+ 		                    %>
+ 		                    <%=tmpVarName %> = new java.util.ArrayList<Object>();
+ 		                    <%
+ 		                    }
+ 		                    for (Object subPropertyValue : (java.util.List<Object>)property.getValue()) {
+ 		                        if ((property.getPossibleValues() != null && property.getPossibleValues().size() > 0)||
+ 		                        	Boolean.valueOf(String.valueOf(property.getTaggedValue(IGenericConstants.ADD_QUOTES)))) {
+ 		                            %>
+ 		                            <%=tmpVarName %>.add("<%=subPropertyValue %>");
+ 		                            <%
+ 		                        } else if(!"".equals(subPropertyValue)) {
+ 		                        	if(setDynamicTags && isDynamicValue(String.valueOf(subPropertyValue), connName)) {
+ 		                        		property.setTaggedValue(IGenericConstants.DYNAMIC_PROPERTY_VALUE, "true");
+ 		                        	}
+ 		                                %>
+ 		                                <%=tmpVarName %>.add(<%=subPropertyValue %>);
+ 		                                <%
+ 		                        } else {
+ 		                            %>
+ 		                            <%=tmpVarName %>.add("");
+ 		                            <%
+ 		                        }
+ 		                    }
+ 		                    %>
+ 		                    ((org.talend.daikon.properties.Properties)props_<%=cid %><%=propInfo.fieldName%>).setValue("<%=property.getName()%>",<%=tmpVarName %>);
+ 		                    <%
+ 		                } else if (value instanceof String && property.isFlag(Property.Flags.ENCRYPT) && ElementParameterParser.canEncryptValue((String) value)) {
+ 		                    if (!"".equals(property.getStringValue())) {
+ 		                        %>
+ 		                        props_<%=cid %><%=propInfo.fieldName%>.setValue("<%=property.getName()%>",
+ 		                        routines.system.PasswordEncryptUtil.decryptPassword(<%=component.getCodegenValue(property, (String) value)%>));
+ 		                        <%
+ 		                    }
+ 		                } else if (value != null && "java.util.Date".equals(property.getType())){
+ 		                    %>
+ 		                    props_<%=cid %><%=propInfo.fieldName%>.setValue("<%=property.getName()%>",
+ 		                        TalendDate.parseDate("yyyy-MM-dd HH:mm:ss",<%=component.getCodegenValue(property, value.toString())%>));
+ 		                    <%
+ 		                } else if (property instanceof org.talend.daikon.properties.property.EnumProperty) {
+ 		                    %>
+ 		                    props_<%=cid %><%=propInfo.fieldName%>.setValue("<%=property.getName()%>",
+ 		                        <%=property.getType().replaceAll("<.*>", "")%>.<%=property.getValue()%>);
+ 		                    <%
+ 		                } else if (property instanceof org.talend.daikon.properties.property.SchemaProperty) {
+ 		                    %>
+ 		                    props_<%=cid %><%=propInfo.fieldName%>.setValue("<%=property.getName()%>",
+ 		                        new org.apache.avro.Schema.Parser().parse(<%=component.getCodegenValue(property, property.getStringValue())%>));
+ 		                    <%
+ 		                } else if (!(value instanceof String) || !((String)value).equals("")) {
+ 		                    %>
+ 		                    props_<%=cid %><%=propInfo.fieldName%>.setValue("<%=property.getName()%>",
+ 		                    <%=component.getCodegenValue(property, value.toString())%>);
+ 		                    <%
+ 		                }
+ 		            }
+ 		            if("java.lang.Integer".equals(property.getType()) && (value == null || ((value instanceof String) && ((String)value).isEmpty()))) {//need to overwrite the default value when the passed value is null or empty string from the model
+ 		        	%>
+ 		                props_<%=cid %><%=propInfo.fieldName%>.setValue("<%=property.getName()%>", null);
+ 		            <%
+ 		            }
+     }
+     
+     private boolean isDynamicValue(String value, String connName) {
+		if(value == null) {
+			return false;
+		}
+		boolean dynamicByGlobals = ContextParameterUtils.isContainContextParam(value) || ContextParameterUtils.containCodeVariable(value, "globalMap.");
+		if(connName == null || dynamicByGlobals) {
+			return dynamicByGlobals;
+		}
+		return ContextParameterUtils.containCodeVariable(value, connName + ".");
+	}
+ 
+ }
+ %>
--- a/main/plugins/org.talend.designer.codegen/jet_stub/header.javajet
+++ b/main/plugins/org.talend.designer.codegen/jet_stub/header.javajet
@@ -198,11 +198,6 @@ public class <%=className%> implements <%=talendJobInterfaces%> {
 		// fix for TESB-7714
 		talendESBJob.setEndpointRegistry(registry);

-        // TESB-15920 tRESTClient and SAM not working
-        <% if (hasSAM4RS) { %>
-        talendESBJob.setEventFeature(eventFeature);
-        <% } %>
-
 		return talendESBJob;
 	}
 <% } %>
@@ -324,6 +319,13 @@ public <%=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true)%> get<%=Ch
 	if(isRunInMultiThread || NodeUtil.containsMultiThreadComponent(process)){
 	%>
 		private final java.util.Map<String, Object> globalMap = java.util.Collections.synchronizedMap(new java.util.HashMap<String, Object>());
+		<%
+		if(ProcessUtils.isTestContainer(process)) {
+		%>
+			private final static java.util.Map<String, Object> junitGlobalMap = java.util.Collections.synchronizedMap(new java.util.HashMap<String, Object>());
+		<%
+		}
+		%>
 	<%
 	} else {
 	%>
--- a/Show More
+++ b/Show More