feat(TCOMP-1651): javajet update to Dynamic

feat(TCOMP-1651): copyright update
feat(TCOMP-1651): bump component-runtime to 1.1.23-SNAPSHOT
2020-06-17 18:27:50 +02:00 · 2020-06-17 16:15:18 +02:00 · 2020-06-17 16:12:56 +02:00 · 2020-06-17 16:37:28 +08:00 · 2020-06-16 17:37:51 +08:00 · 2020-06-16 13:19:02 +08:00
1243 changed files with 27968 additions and 13198 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ main/plugins/org.talend.designer.codegen/resources/sparkstreaming_header.javajet
 main/plugins/org.talend.designer.codegen/resources/sparkstreaming_subprocess_footer.javajet
 main/plugins/org.talend.designer.codegen/resources/sparkstreaming_subprocess_header.javajet
 main/plugins/org.talend.designer.codegen/resources/routelet.skeleton
+.DS_Store
--- 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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.gefabstractmap.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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.nl</artifactId>
--- 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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.sqlbuilder.nl</artifactId>
--- a/main/features/org.talend.designer.business.feature/feature.xml
+++ b/main/features/org.talend.designer.business.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.designer.business.feature" label="Business Feature" version="7.3.1.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.designer.business.feature" label="Business Feature" version="7.4.1.qualifier" provider-name=".Talend SA."> 
  <description url="http://www.talend.com/online/featuresdescription.html#business-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#business-feature</description>  
  <copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>  
  <license>The licence are describe in branding feature</license>  
--- 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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.designer.feature" label="Designer Feature" version="7.3.1.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.designer.feature" label="Designer Feature" version="7.4.1.qualifier" provider-name=".Talend SA."> 
  <description url="http://www.talend.com/online/featuresdescription.html#designer-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#designer-feature</description>  
  <copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>  
  <license>The licence are describe in branding feature</license>  
--- 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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.feature</artifactId>
--- a/main/features/org.talend.fragment.jars.di.feature/feature.xml
+++ b/main/features/org.talend.fragment.jars.di.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.fragment.jars.di.feature"
      label="Fragment Jars in DI"
-      version="7.3.1.qualifier">
+      version="7.4.1.qualifier">

   <description url="http://www.example.com/description">
      [Enter Feature Description here.]
--- a/main/features/org.talend.fragment.jars.di.feature/pom.xml
+++ b/main/features/org.talend.fragment.jars.di.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.fragment.jars.di.feature</artifactId>
--- a/main/features/org.talend.help.tos.components.feature/feature.xml
+++ b/main/features/org.talend.help.tos.components.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.help.tos.components.feature"
      label="Talend COMPONENTS help feature"
-      version="7.3.1.qualifier"
+      version="7.4.1.qualifier"
      provider-name=".Talend SA.">

   <description url="http://www.example.com/description">
--- a/main/features/org.talend.help.tos.components.feature/pom.xml
+++ b/main/features/org.talend.help.tos.components.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.help.tos.components.feature</artifactId>
--- a/main/features/org.talend.rcp.branding.tos.feature/feature.xml
+++ b/main/features/org.talend.rcp.branding.tos.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.rcp.branding.tos.feature" label="Tos branding feature" version="7.3.1.qualifier" provider-name=".Talend SA." plugin="org.talend.rcp.branding.tos"> 
+<feature id="org.talend.rcp.branding.tos.feature" label="Tos branding feature" version="7.4.1.qualifier" provider-name=".Talend SA." plugin="org.talend.rcp.branding.tos"> 
  <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
  <license>[Enter License Description here.]</license>  
--- 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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.rcp.branding.tos.test.feature" label="Test feature for TOS" version="7.3.1.qualifier"> 
+<feature id="org.talend.rcp.branding.tos.test.feature" label="Test feature 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/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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.repository.feature" label="Repository Feature" version="7.3.1.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.repository.feature" label="Repository Feature" version="7.4.1.qualifier" provider-name=".Talend SA."> 
  <description url="http://www.talend.com/online/featuresdescription.html#repository-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#repository-feature</description>  
  <copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>  
  <license>The licence are describe in branding feature</license>  
--- 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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.sbi.feature" label="SBI Feature" version="7.3.1.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.sbi.feature" label="SBI Feature" version="7.4.1.qualifier" provider-name=".Talend SA."> 
  <description url="http://www.talend.com/online/featuresdescription.html#sbi-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#sbi-feature</description>  
  <copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>  
  <license>The licence are describe in branding feature</license>  
--- 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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.spagic.feature" label="SPAGIC Feature" version="7.3.1.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.spagic.feature" label="SPAGIC Feature" version="7.4.1.qualifier" provider-name=".Talend SA."> 
  <description url="http://www.talend.com/online/featuresdescription.html#spagic-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#sbi-feature</description>  
  <copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>  
  <license>The licence are describe in branding feature</license>  
--- 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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.tos.components.feature" label="Components-feature" version="7.3.1.qualifier"> 
+<feature id="org.talend.tos.components.feature" label="Components-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.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.tos.components.feature</artifactId>
--- a/main/features/org.talend.tos.core.feature/feature.xml
+++ b/main/features/org.talend.tos.core.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.tos.core.feature" label="Feature" version="7.3.1.qualifier"> 
+<feature id="org.talend.tos.core.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.tos.core.feature/pom.xml
+++ b/main/features/org.talend.tos.core.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.tos.core.feature</artifactId>
--- a/main/features/org.talend.tos.feature/feature.xml
+++ b/main/features/org.talend.tos.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.tos.feature" label="Tos feature" version="7.3.1.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.tos.feature" label="Tos 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>[Enter License Description here.]</license>  
--- 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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.talend.tos.libraries.feature" label="Libraries_feature" version="7.3.1.qualifier"> 
+<feature id="org.talend.tos.libraries.feature" label="Libraries_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.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.tos.libraries.feature</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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.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>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</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: 7.3.1.qualifier
+Bundle-Version: 7.4.1.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.talend.core.repository,
 org.eclipse.emf.codegen,
--- a/main/plugins/org.talend.designer.codegen/jet_stub/component_part_footer.javajet
+++ b/main/plugins/org.talend.designer.codegen/jet_stub/component_part_footer.javajet
@@ -86,11 +86,18 @@ if((codePart.equals(ECodePart.END))&&(stat || logstashCurrent)){
 			for(IConnection con:connSet){
 		  		INode source = con.getSource();
 				String sourceNodeId = source.getUniqueName();
+				
+				String sourceLabel = ElementParameterParser.getValue(source, "__LABEL__");
+				String sourceNodeLabel = ((sourceLabel==null || "__UNIQUE_NAME__".equals(sourceLabel) || sourceLabel.contains("\"")) ? sourceNodeId : sourceLabel);
+				
+				String targetLabel = ElementParameterParser.getValue(node, "__LABEL__");
+				String targetNodeLabel = ((targetLabel==null || "__UNIQUE_NAME__".equals(targetLabel) || targetLabel.contains("\"")) ? node.getUniqueName() : targetLabel);
+				
 				String sourceNodeComponent = source.getComponent().getName();
 	 			for (INode jobStructureCatcher : jobCatcherNodes) {
 	 			%>
 			 		if(runStat.updateStatAndLog(execStat,enableLogStash,resourceMap,iterateId,"<%=con.getUniqueName()%>",2,0,
-			 			<%=jobStructureCatcher.getUniqueName()%>,"<%=sourceNodeId%>","<%=sourceNodeComponent%>","<%=node.getUniqueName()%>","<%=node.getComponent().getName()%>","<%="REJECT".equals(con.getConnectorName()) ? "reject" : "output"%>")) {
+			 			"<%=sourceNodeId%>","<%=sourceNodeLabel%>","<%=sourceNodeComponent%>","<%=node.getUniqueName()%>","<%=targetNodeLabel%>","<%=node.getComponent().getName()%>","<%="REJECT".equals(con.getConnectorName()) ? "reject" : "output"%>")) {
 						<%=jobStructureCatcher.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
 					}
 				<%
@@ -113,11 +120,18 @@ if((codePart.equals(ECodePart.END))&&(stat || logstashCurrent)){
 			  	for(IConnection con:connSet){
 			  		INode source = con.getSource();
 					String sourceNodeId = source.getUniqueName();
+					
+					String sourceLabel = ElementParameterParser.getValue(source, "__LABEL__");
+					String sourceNodeLabel = ((sourceLabel==null || "__UNIQUE_NAME__".equals(sourceLabel) || sourceLabel.contains("\"")) ? sourceNodeId : sourceLabel);
+					
+					String targetLabel = ElementParameterParser.getValue(node, "__LABEL__");
+					String targetNodeLabel = ((targetLabel==null || "__UNIQUE_NAME__".equals(targetLabel) || targetLabel.contains("\"")) ? node.getUniqueName() : targetLabel);
+					
 					String sourceNodeComponent = source.getComponent().getName();
 		 			for (INode jobStructureCatcher : jobCatcherNodes) {
 		 			%>
 				 		if(runStat.log(resourceMap,iterateId,"<%=con.getUniqueName()%>",2,0,
-				 			<%=jobStructureCatcher.getUniqueName()%>,"<%=sourceNodeId%>","<%=sourceNodeComponent%>","<%=node.getUniqueName()%>","<%=node.getComponent().getName()%>","<%="REJECT".equals(con.getConnectorName()) ? "reject" : "output"%>")) {
+				 			"<%=sourceNodeId%>","<%=sourceNodeLabel%>","<%=sourceNodeComponent%>","<%=node.getUniqueName()%>","<%=targetNodeLabel%>","<%=node.getComponent().getName()%>","<%="REJECT".equals(con.getConnectorName()) ? "reject" : "output"%>")) {
 							<%=jobStructureCatcher.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
 						}
 					<%
--- a/main/plugins/org.talend.designer.codegen/jet_stub/component_part_header.javajet
+++ b/main/plugins/org.talend.designer.codegen/jet_stub/component_part_header.javajet
@@ -178,16 +178,41 @@
 	}
 	
 	if((codePart.equals(ECodePart.MAIN))&&(stat || logstashCurrent)&&connSet.size()>0){
+		INode jobStructureCatcher = jobCatcherNodes.get(0);//about performance monitor, no way to support more than one job catcher component, also that is not necessary
+		String subprocessName4Catcher = jobStructureCatcher.getDesignSubjobStartNode().getUniqueName();
+	
 		if(!node.getComponent().useMerge()) {
 			if(stat && logstashCurrent) {
 			%>
-			runStat.updateStatAndLog(execStat,enableLogStash,iterateId,1,1<%for(IConnection con : connSet){%>,"<%=con.getUniqueName()%>"<%}%>);
+			if(runStat.update(execStat,enableLogStash,iterateId,1,1
+				<%for(IConnection con : connSet){
+					INode source = con.getSource();
+					String sourceNodeId = source.getUniqueName();
+					
+					String sourceLabel = ElementParameterParser.getValue(source, "__LABEL__");
+					String sourceNodeLabel = ((sourceLabel==null || "__UNIQUE_NAME__".equals(sourceLabel) || sourceLabel.contains("\"")) ? sourceNodeId : sourceLabel);
+					
+					String targetLabel = ElementParameterParser.getValue(node, "__LABEL__");
+					String targetNodeLabel = ((targetLabel==null || "__UNIQUE_NAME__".equals(targetLabel) || targetLabel.contains("\"")) ? node.getUniqueName() : targetLabel);
+					
+					String sourceNodeComponent = source.getComponent().getName();
+				%>
+					,"<%=con.getUniqueName()%>","<%=sourceNodeId%>","<%=sourceNodeLabel%>","<%=sourceNodeComponent%>","<%=node.getUniqueName()%>","<%=targetNodeLabel%>","<%=node.getComponent().getName()%>"
+				<%}%>
+			)) {
+				<%=subprocessName4Catcher %>Process(globalMap);
+			}
 			<%
 			} else {
 				if(stat) {
 					%>
 					if(execStat){
-						runStat.updateStatOnConnection(iterateId,1,1<%for(IConnection con : connSet){%>,"<%=con.getUniqueName()%>"<%}%>);
+						runStat.updateStatOnConnection(iterateId,1,1
+						<%for(IConnection con : connSet){
+						%>
+							,"<%=con.getUniqueName()%>"
+						<%}%>
+						);
 					}
 					<%
 				}
@@ -195,7 +220,24 @@
 				if(logstashCurrent) {
 					%>
 					if(enableLogStash) {
-						runStat.log(iterateId,1,1<%for(IConnection con : connSet){%>,"<%=con.getUniqueName()%>"<%}%>);
+						if(runStat.updateLog(iterateId,1,1
+						<%for(IConnection con : connSet){
+							INode source = con.getSource();
+							String sourceNodeId = source.getUniqueName();
+							
+							String sourceLabel = ElementParameterParser.getValue(source, "__LABEL__");
+							String sourceNodeLabel = ((sourceLabel==null || "__UNIQUE_NAME__".equals(sourceLabel) || sourceLabel.contains("\"")) ? sourceNodeId : sourceLabel);
+							
+							String targetLabel = ElementParameterParser.getValue(node, "__LABEL__");
+							String targetNodeLabel = ((targetLabel==null || "__UNIQUE_NAME__".equals(targetLabel) || targetLabel.contains("\"")) ? node.getUniqueName() : targetLabel);
+							
+							String sourceNodeComponent = source.getComponent().getName();
+						%>
+							,"<%=con.getUniqueName()%>","<%=sourceNodeId%>","<%=sourceNodeLabel%>","<%=sourceNodeComponent%>","<%=node.getUniqueName()%>","<%=targetNodeLabel%>","<%=node.getComponent().getName()%>"
+						<%}%>
+						)) {
+							<%=subprocessName4Catcher %>Process(globalMap);
+						}
 					}
 					<%
 				}
@@ -205,18 +247,62 @@
 				if(connection.getUniqueName().equals((String)codeGenArgument.getIncomingName())){
 					if(stat && logstashCurrent) {
 					%>
-					runStat.updateStatAndLog(execStat,enableLogStash,iterateId,1,1<%for(IConnection con : connSet){if(con.getUniqueName().equals((String)codeGenArgument.getIncomingName())){%>,"<%=con.getUniqueName()%>"<%}}%>);
+					if(runStat.update(execStat,enableLogStash,iterateId,1,1
+						<%for(IConnection con : connSet){
+							INode source = con.getSource();
+							String sourceNodeId = source.getUniqueName();
+							
+							String sourceLabel = ElementParameterParser.getValue(source, "__LABEL__");
+							String sourceNodeLabel = ((sourceLabel==null || "__UNIQUE_NAME__".equals(sourceLabel) || sourceLabel.contains("\"")) ? sourceNodeId : sourceLabel);
+							
+							String targetLabel = ElementParameterParser.getValue(node, "__LABEL__");
+							String targetNodeLabel = ((targetLabel==null || "__UNIQUE_NAME__".equals(targetLabel) || targetLabel.contains("\"")) ? node.getUniqueName() : targetLabel);
+							
+							String sourceNodeComponent = source.getComponent().getName();
+							
+							if(con.getUniqueName().equals((String)codeGenArgument.getIncomingName())){%>
+							,"<%=con.getUniqueName()%>","<%=sourceNodeId%>","<%=sourceNodeLabel%>","<%=sourceNodeComponent%>","<%=node.getUniqueName()%>","<%=targetNodeLabel%>","<%=node.getComponent().getName()%>"
+							<%}
+						}%>
+					)) {
+						<%=subprocessName4Catcher %>Process(globalMap);
+					}
 					<%
 					} else {
 						if(stat) {%>
 						if(execStat){
-							runStat.updateStatOnConnection(iterateId,1,1<%for(IConnection con : connSet){if(con.getUniqueName().equals((String)codeGenArgument.getIncomingName())){%>,"<%=con.getUniqueName()%>"<%}}%>);
+							runStat.updateStatOnConnection(iterateId,1,1
+								<%for(IConnection con : connSet){
+									if(con.getUniqueName().equals((String)codeGenArgument.getIncomingName())){%>
+									,"<%=con.getUniqueName()%>"
+									<%}
+								}%>
+							);
 						}
 						<%}
 						
 						if(logstashCurrent) {%>
 						if(enableLogStash) {
-							runStat.log(iterateId,1,1<%for(IConnection con : connSet){if(con.getUniqueName().equals((String)codeGenArgument.getIncomingName())){%>,"<%=con.getUniqueName()%>"<%}}%>);
+							if(runStat.updateLog(iterateId,1,1
+								<%for(IConnection con : connSet){
+									INode source = con.getSource();
+									String sourceNodeId = source.getUniqueName();
+									
+									String sourceLabel = ElementParameterParser.getValue(source, "__LABEL__");
+									String sourceNodeLabel = ((sourceLabel==null || "__UNIQUE_NAME__".equals(sourceLabel) || sourceLabel.contains("\"")) ? sourceNodeId : sourceLabel);
+									
+									String targetLabel = ElementParameterParser.getValue(node, "__LABEL__");
+									String targetNodeLabel = ((targetLabel==null || "__UNIQUE_NAME__".equals(targetLabel) || targetLabel.contains("\"")) ? node.getUniqueName() : targetLabel);
+							
+									String sourceNodeComponent = source.getComponent().getName();
+							
+									if(con.getUniqueName().equals((String)codeGenArgument.getIncomingName())){%>
+									,"<%=con.getUniqueName()%>","<%=sourceNodeId%>","<%=sourceNodeLabel%>","<%=sourceNodeComponent%>","<%=node.getUniqueName()%>","<%=targetNodeLabel%>","<%=node.getComponent().getName()%>"
+									<%}
+								}%>
+							)) {
+								<%=subprocessName4Catcher %>Process(globalMap);
+							}
 						}
 						<%}
 					}
@@ -248,9 +334,11 @@
 		
 		if(logstashCurrent) {
 			for (INode jobStructureCatcher : jobCatcherNodes) {
+				String label = ElementParameterParser.getValue(node, "__LABEL__");
+				String nodeLabel = ((label==null || "__UNIQUE_NAME__".equals(label) || label.contains("\"")) ? node.getUniqueName() : label);
 			%>
 			if(enableLogStash) {
-				<%=jobStructureCatcher.getUniqueName() %>.addCM("<%=node.getUniqueName()%>", "<%=node.getComponent().getName()%>");
+				<%=jobStructureCatcher.getUniqueName() %>.addCM("<%=node.getUniqueName()%>", "<%=nodeLabel%>", "<%=node.getComponent().getName()%>");
 				<%=jobStructureCatcher.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
 			}
 			<%
--- a/main/plugins/org.talend.designer.codegen/jet_stub/footer.javajet
+++ b/main/plugins/org.talend.designer.codegen/jet_stub/footer.javajet
@@ -108,6 +108,21 @@
        exist_tSQLDB = true;
    }

+
+    String[] tcompV0Components = new String[] {
+        "tAzureStorageConnection",
+        "tGoogleDriveConnection",
+        "tMarketoConnection",
+        "tSnowflakeConnection",
+        "tSalesforceConnection",
+        "tNetsuiteConnection",
+        "tMarkLogicConnection"
+    };
+    List<INode> tcompV0ComponentsList =  new ArrayList<INode>();
+    for (String tcompV0Component : tcompV0Components) {
+        tcompV0ComponentsList.addAll((List<INode>)process.getNodesOfType(tcompV0Component));
+    }
+
    boolean exist_tSCP = false;
    List<INode> scpComponentsList = (List<INode>)process.getNodesOfType("tSCPConnection");
    if (scpComponentsList.size() > 0) {
@@ -167,6 +182,8 @@
        exist_tSalesforce = true;
    }

+    List<INode> snowflakeComponentsList = (List<INode>)process.getNodesOfType("tSnowflakeConnection");
+
    boolean exist_tSAP= false;
    List<INode> sapComponentsList = (List<INode>)process.getNodesOfType("tSAPConnection");
    if (sapComponentsList.size() > 0) {
@@ -447,7 +464,7 @@
                lastStr = "";
            }
        }
-        enableLogStash = "true".equalsIgnoreCase(System.getProperty("monitoring"));
+        enableLogStash = "true".equalsIgnoreCase(System.getProperty("audit.enabled"));

        <%if(isLog4jEnabled){%>
 	        if(!"".equals(log4jLevel)){
@@ -519,15 +536,15 @@
 				properties_<%=jobCatcherNode.getUniqueName()%>.setProperty("host", "false");

 				System.getProperties().stringPropertyNames().stream()
-					.filter(it -> it.startsWith("monitoring.audit.logger.properties."))
-					.forEach(key -> properties_<%=jobCatcherNode.getUniqueName()%>.setProperty(key.substring("monitoring.audit.logger.properties.".length()), System.getProperty(key)));
+					.filter(it -> it.startsWith("audit.logger."))
+					.forEach(key -> properties_<%=jobCatcherNode.getUniqueName()%>.setProperty(key.substring("audit.logger.".length()), System.getProperty(key)));

 				<%if(isLog4j1Enabled) {%>
-				org.apache.log4j.Logger.getLogger("audit").setLevel(org.apache.log4j.Level.DEBUG);
+				org.apache.log4j.Logger.getLogger(properties_<%=jobCatcherNode.getUniqueName()%>.getProperty("root.logger")).setLevel(org.apache.log4j.Level.DEBUG);
 				<%}%>
 				
 				<%if(isLog4j2Enabled) {%>
-				org.apache.logging.log4j.core.config.Configurator.setLevel("audit", org.apache.logging.log4j.Level.DEBUG);
+				org.apache.logging.log4j.core.config.Configurator.setLevel(properties_<%=jobCatcherNode.getUniqueName()%>.getProperty("root.logger"), org.apache.logging.log4j.Level.DEBUG);
 				<%}%>
 				auditLogger_<%=jobCatcherNode.getUniqueName()%> = org.talend.job.audit.JobEventAuditLoggerFactory.createJobAuditLogger(properties_<%=jobCatcherNode.getUniqueName()%>);
 			}
@@ -619,7 +636,16 @@
                        } //endIf
 %>
                        context.setContextType("<%=ctxParam.getName()%>", "<%=ctxParam.getType()%>");
+                        if(context.getStringValue("<%=ctxParam.getName()%>") == null) {
+                            context.<%=ctxParam.getName()%> = null;
+                        } else {
+                        <%//}B1 block%>
 <%
+                        String typeToGenerate ="String";
+                        if( !(ctxParam.getType().equals("id_File") || ctxParam.getType().equals("id_Directory") ||ctxParam.getType().equals("id_List Of Value"))) {
+                           typeToGenerate=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true);
+                        }
+                        
                        if (ctxParam.getType().equals("id_Password")) {
 %>
                            String pwd_<%=ctxParam.getName()%>_value = context.getProperty("<%=ctxParam.getName()%>");
@@ -637,42 +663,41 @@
                                }
                            }
 <%
-                            continue;
-                        }
-                        String typeToGenerate ="String";
-                        if( !(ctxParam.getType().equals("id_File") || ctxParam.getType().equals("id_Directory") ||ctxParam.getType().equals("id_List Of Value"))) {
-                           typeToGenerate=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true);
-                        }
-                        if(typeToGenerate.equals("java.util.Date")) {
+                        } else if(typeToGenerate.equals("java.util.Date")) {
 %>
-                        try{
                            String context_<%=ctxParam.getName()%>_value = context.getProperty("<%=ctxParam.getName()%>");
-                            if (context_<%=ctxParam.getName()%>_value == null){
-                                context_<%=ctxParam.getName()%>_value = "";
-                            }
-                            int context_<%=ctxParam.getName()%>_pos = context_<%=ctxParam.getName()%>_value.indexOf(";");
-                            String context_<%=ctxParam.getName()%>_pattern =  "yyyy-MM-dd HH:mm:ss";
-                            if(context_<%=ctxParam.getName()%>_pos > -1){
-                                context_<%=ctxParam.getName()%>_pattern = context_<%=ctxParam.getName()%>_value.substring(0, context_<%=ctxParam.getName()%>_pos);
-                                context_<%=ctxParam.getName()%>_value = context_<%=ctxParam.getName()%>_value.substring(context_<%=ctxParam.getName()%>_pos + 1);
-                            }
+                            try{
+                                if (context_<%=ctxParam.getName()%>_value == null){
+                                    context_<%=ctxParam.getName()%>_value = "";
+                                }
+                                int context_<%=ctxParam.getName()%>_pos = context_<%=ctxParam.getName()%>_value.indexOf(";");
+                                String context_<%=ctxParam.getName()%>_pattern =  "yyyy-MM-dd HH:mm:ss";
+                                if(context_<%=ctxParam.getName()%>_pos > -1){
+                                    context_<%=ctxParam.getName()%>_pattern = context_<%=ctxParam.getName()%>_value.substring(0, context_<%=ctxParam.getName()%>_pos);
+                                    context_<%=ctxParam.getName()%>_value = context_<%=ctxParam.getName()%>_value.substring(context_<%=ctxParam.getName()%>_pos + 1);
+                                }

-                            context.<%=ctxParam.getName()%>=(java.util.Date)(new java.text.SimpleDateFormat(context_<%=ctxParam.getName()%>_pattern).parse(context_<%=ctxParam.getName()%>_value));
+                                context.<%=ctxParam.getName()%>=(java.util.Date)(new java.text.SimpleDateFormat(context_<%=ctxParam.getName()%>_pattern).parse(context_<%=ctxParam.getName()%>_value));

-                        } catch(ParseException e) {
+                            } catch(ParseException e) {
+                                try { <% /*try to check if date passed as long also*/ %>
+                                    long context_<%=ctxParam.getName()%>_longValue = Long.valueOf(context_<%=ctxParam.getName()%>_value);
+                                    context.<%=ctxParam.getName()%> = new java.util.Date(context_<%=ctxParam.getName()%>_longValue);
+                                } catch (NumberFormatException cantParseToLongException) {
 <%
-                            if (isLog4jEnabled) {
+                                    if (isLog4jEnabled) {
 %>
-                                log.warn(String.format("<%=warningMessageFormat %>", "<%=ctxParam.getName() %>", e.getMessage()));
+                                        log.warn(String.format("<%=warningMessageFormat %>", "<%=ctxParam.getName() %>", "Can't parse date string: " + e.getMessage() + " and long: " + cantParseToLongException.getMessage()));
 <%
-                            } else {
+                                    } else {
 %>
-                                System.err.println(String.format("<%=warningMessageFormat %>", "<%=ctxParam.getName() %>", e.getMessage()));
+                                        System.err.println(String.format("<%=warningMessageFormat %>", "<%=ctxParam.getName() %>", "Can't parse date string: " + e.getMessage() + " and long: " + cantParseToLongException.getMessage()));
 <%
+                                    }
+%>
+                                    context.<%=ctxParam.getName()%>=null;
+                                }
                            }
-%>
-                            context.<%=ctxParam.getName()%>=null;
-                        }
 <%
                        } else if(typeToGenerate.equals("Object")||typeToGenerate.equals("String")||typeToGenerate.equals("java.lang.String")) {
 %>
@@ -702,6 +727,10 @@
                            }
 <%
                        }
+%>
+                        <%//{B1 block%>
+                        }
+<%
                    }
 %>
                } <%/*close last method*/%>
@@ -872,20 +901,6 @@ if(execStat) {
        }
 %>

-<%if (hadoopClusterIds.size() > 1) {%>
-    System.err.println("Only one hadoop configuration is allowed in one job!");
-<%}%>
-
-<%
-// run tHadoopConfManager component if there is it.
- if(!hadoopConfNodes.isEmpty()) {
-    INode hadoopConfNode = hadoopConfNodes.get(0);
-%>
-<%=createCallProcess(hadoopConfNode, className, false) %>
-<%
- }
-%>
-
 <%
 //2. load implicit contextload
 if(implicit_Context != null) {
@@ -908,6 +923,19 @@ this.globalResumeTicket = true;//to run tPreJob
 }
 %>

+<%if (hadoopClusterIds.size() > 1) {%>
+    System.err.println("Only one hadoop configuration is allowed in one job!");
+<%}%>
+
+<%
+// run tHadoopConfManager component if there is it.
+ if(!hadoopConfNodes.isEmpty()) {
+    INode hadoopConfNode = hadoopConfNodes.get(0);
+%>
+<%=createCallProcess(hadoopConfNode, className, false) %>
+<%
+ }
+%>

 <%
        //4. flush the begin msg
@@ -1320,13 +1348,11 @@ if (execStat) {
            } else {
                type = "ftp";
            }
-            if ("ftp".equals(type)) { %>
-                ((com.enterprisedt.net.ftp.FTPClient) obj_conn).quit();
-        <%} else if ("sftp".equals(type)) { %>
+            if ("sftp".equals(type)) { %>
                ((com.jcraft.jsch.ChannelSftp) obj_conn).quit();
-        <%} else { %>
-                ((org.apache.commons.net.ftp.FTPSClient) obj_conn).disconnect();
-        <%}%>
+            <%} else { %>
+                ((org.apache.commons.net.ftp.FTPClient) obj_conn).disconnect();
+            <%}%>
            }
 <%  } %>
        } catch (java.lang.Exception e) {
@@ -1501,12 +1527,14 @@ if (execStat) {
 <%      } %>
 <%      for (INode existNode : existComponentsList) { %>
            connections.put("col_<%=existNode.getUniqueName()%>", globalMap.get("col_<%=existNode.getUniqueName()%>"));
-<%      } %>
+<%      }

-<%      for (INode salesforceNode : salesforceComponentsList) { %>
-            connections.put("conn_<%=salesforceNode.getUniqueName()%>", globalMap.get("conn_<%=salesforceNode.getUniqueName()%>"));
-<%      } %>
-<%      for (INode sapNode : sapComponentsList) { %>
+        for (INode tcompV0ConnectionNode : tcompV0ComponentsList) { %>
+            connections.put("<%=tcompV0ConnectionNode.getUniqueName()%>_connection", globalMap.get("<%=tcompV0ConnectionNode.getUniqueName()%>_connection"));
+            connections.put("<%=tcompV0ConnectionNode.getUniqueName()%>_COMPONENT_RUNTIME_PROPERTIES", globalMap.get("<%=tcompV0ConnectionNode.getUniqueName()%>_COMPONENT_RUNTIME_PROPERTIES"));
+<%      }
+
+        for (INode sapNode : sapComponentsList) { %>
            connections.put("conn_<%=sapNode.getUniqueName()%>", globalMap.get("conn_<%=sapNode.getUniqueName()%>"));
 <%      } %>
 <%      for (INode gsNode : gsComponentsList) { %>
@@ -1570,7 +1598,7 @@ if (execStat) {
            }
        } else if (arg.startsWith("--log4jLevel=")) {
            log4jLevel = arg.substring(13);
-		} else if (arg.startsWith("--monitoring") && arg.contains("=")) {//for trunjob call
+		} else if (arg.startsWith("--audit.enabled") && arg.contains("=")) {//for trunjob call
 		    final int equal = arg.indexOf('=');
 			final String key = arg.substring("--".length(), equal);
 			System.setProperty(key, arg.substring(equal + 1));
--- 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
@@ -116,7 +116,11 @@ class IndexedRecordToRowStructGenerator {
                    routines.system.DynamicMetadata dynamicMetadata_<%=cid%> = new routines.system.DynamicMetadata();
                    org.apache.avro.Schema dynamicFieldSchema_<%=cid%> = dynamicField_<%=cid%>.schema();
                    // set name
-                    dynamicMetadata_<%=cid%>.setName(dynamicField_<%=cid%>.name());
+                    					if("true".equals(dynamicField_<%=cid%>.getProp("ENABLE_SPECIAL_TABLENAME"))){
+					    dynamicMetadata_<%=cid%>.setName(dynamicField_<%=cid%>.getProp("talend.field.dbColumnName"));
+					}else{
+					    dynamicMetadata_<%=cid%>.setName(dynamicField_<%=cid%>.name());
+					}
                    // set db name
                    dynamicMetadata_<%=cid%>.setDbName(dynamicField_<%=cid%>.name());
                    // set nullable
@@ -166,6 +170,14 @@ class IndexedRecordToRowStructGenerator {
            if (columnName.equals(dynamicColName)) {
            %>
                java.util.Map<String, Object> dynamicValue_<%=cid%> = (java.util.Map<String, Object>) <%=codeVarSchemaEnforcer%>.get(<%=i%>);
+				org.apache.avro.Schema dynSchema_<%=cid%> = ((org.talend.codegen.enforcer.OutgoingDynamicSchemaEnforcer) <%=codeVarSchemaEnforcer%>).getDynamicFieldsSchema();
+                for (org.apache.avro.Schema.Field dynamicField_<%=cid%> : dynSchema_<%=cid%>.getFields()){
+					String name = dynamicField_<%=cid%>.name();
+					if("true".equals(dynamicField_<%=cid%>.getProp("ENABLE_SPECIAL_TABLENAME"))){
+							dynamicValue_<%=cid%>.put(dynamicField_<%=cid%>.getProp("talend.field.dbColumnName"), dynamicValue_<%=cid%>.get(name));
+							dynamicValue_<%=cid%>.remove(name);
+					}
+				}
                for (java.util.Map.Entry<String, Object> dynamicValueEntry_<%=cid%> : dynamicValue_<%=cid%>.entrySet()) {
                    <%=codeVarDynamic%>.setColumnValue(<%=codeVarDynamic%>.getIndex(dynamicValueEntry_<%=cid%>.getKey()), dynamicValueEntry_<%=cid%>.getValue());
                }
--- a/main/plugins/org.talend.designer.codegen/jet_stub/header.javajet
+++ b/main/plugins/org.talend.designer.codegen/jet_stub/header.javajet
@@ -298,6 +298,15 @@ if(isRunInMultiThread){
 			}
 			<% } %>
 		}
+		
+		//if the stored or passed value is "<TALEND_NULL>" string, it mean null
+		public String getStringValue(String key) {
+			String origin_value = this.getProperty(key);
+			if(NULL_VALUE_EXPRESSION_IN_COMMAND_STRING_FOR_CHILD_JOB_ONLY.equals(origin_value)) {
+				return null;
+			}
+			return origin_value;
+		}

 <%
 		for (IContextParameter ctxParam :params)
@@ -381,7 +390,14 @@ public <%=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true)%> get<%=Ch
 		}
 	}
 	boolean enableLogStash = jobCatcherNode != null;
-	if (stats || enableLogStash) {
+	if (enableLogStash) {
+%>
+private final JobStructureCatcherUtils <%=jobCatcherNode.getUniqueName() %> = new JobStructureCatcherUtils(jobName, "<%=process.getId() %>", "<%=process.getVersion() %>");
+private org.talend.job.audit.JobAuditLogger auditLogger_<%=jobCatcherNode.getUniqueName()%> = null;
+
+private RunStat runStat = new RunStat(<%=jobCatcherNode.getUniqueName() %>);
+<%
+	} else if(stats) {
 %>
 private RunStat runStat = new RunStat();
 <%
@@ -422,13 +438,6 @@ private RunTrace runTrace = new RunTrace();
 <%
 	}
 	
-	if(enableLogStash) {
-%>
-	JobStructureCatcherUtils <%=jobCatcherNode.getUniqueName() %> = new JobStructureCatcherUtils(jobName, "<%=process.getId() %>", "<%=process.getVersion() %>");
-	org.talend.job.audit.JobAuditLogger auditLogger_<%=jobCatcherNode.getUniqueName()%> = null;
-<%
-	}
-
 	for (INode metterCatcher : process.getNodesOfType("tFlowMeterCatcher")) {
 %>
 	MetterCatcherUtils <%=metterCatcher.getUniqueName() %> = new MetterCatcherUtils("<%=process.getId() %>", "<%=process.getVersion() %>");
--- a/main/plugins/org.talend.designer.codegen/pom.xml
+++ b/main/plugins/org.talend.designer.codegen/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.codegen</artifactId>
--- a/main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/CodeGenerator.java
+++ b/main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/CodeGenerator.java
@@ -66,6 +66,7 @@ import org.talend.designer.codegen.model.CodeGeneratorEmittersPoolFactory;
 import org.talend.designer.codegen.model.CodeGeneratorInternalTemplatesFactoryProvider;
 import org.talend.designer.codegen.proxy.JetProxy;
 import org.talend.designer.core.generic.model.Component;
+import org.talend.designer.runprocess.ProcessorUtilities;

 /**
 * CodeGenerator.
@@ -353,8 +354,12 @@ public class CodeGenerator implements ICodeGenerator {
                                    .getDefault().getService(IResourcesDependenciesService.class);
                            String resourcePathForContext = null;
                            if (process instanceof IProcess2) {
-                                resourcePathForContext = resourceService.getResourcePathForContext(process,
-                                        contextPar.getValue());
+                                String value = contextPar.getValue();
+                                // for runtime
+                                if (!ProcessorUtilities.isExportConfig()) {
+                                    contextPar.setType(JavaTypesManager.FILE.getId());
+                                }
+                                resourcePathForContext = resourceService.getResourcePathForContext(process, value);
                            } else {
                                // for PreviewFileInputContentDataProcess run
                                resourcePathForContext = resourceService.getResourceItemFilePath(contextPar.getValue());
--- a/main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/components/model/ComponentsFactory.java
+++ b/main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/components/model/ComponentsFactory.java
@@ -28,9 +28,9 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Optional;
 import java.util.ResourceBundle;
 import java.util.Set;
-import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.Lock;
@@ -70,7 +70,6 @@ import org.talend.core.model.components.ComponentCategory;
 import org.talend.core.model.components.ComponentManager;
 import org.talend.core.model.components.ComponentProviderInfo;
 import org.talend.core.model.components.ComponentUtilities;
-import org.talend.core.model.components.EComponentType;
 import org.talend.core.model.components.IComponent;
 import org.talend.core.model.components.IComponentsFactory;
 import org.talend.core.model.components.IComponentsHandler;
@@ -838,23 +837,21 @@ public class ComponentsFactory implements IComponentsFactory {
            init(false);
        }

-        for (IComponent comp : componentList) {
-            if (comp.getComponentType() != EComponentType.JOBLET) {
-                continue;
-            }
-            String comName = comp.getName();
-            if (comp != null && paletteType.equals(comp.getPaletteType())) {
-                if (comName.equals(name)) {
-                    return comp;
-                } else if (new JobletUtil().matchExpression(comName)) {
-                    String[] names = comName.split(":"); //$NON-NLS-1$
-                    comName = names[1];
-                    if (comName.equals(name)) {
-                        return comp;
-                    }
+        // check if reference joblet component presents
+        JobletUtil jobletUtils = new JobletUtil();
+        Optional<IComponent> result = jobletUtils.findComponentByName(componentList, name, paletteType);
+        if (!result.isPresent()) {
+            // check if any name matching joblet component presents
+            if (jobletUtils.matchExpression(name)) {
+                name = StringUtils.substringAfterLast(name, ":"); //$NON-NLS-1$
+                if (StringUtils.isNotBlank(name)) {
+                    result = jobletUtils.findComponentByName(componentList, name, paletteType);
                }
            }
        }
+        if (result.isPresent()) {
+            return result.get();
+        }
        return null;
    }

--- a/main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/components/ui/ComponentsPreferencePage.java
+++ b/main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/components/ui/ComponentsPreferencePage.java
@@ -562,7 +562,9 @@ public class ComponentsPreferencePage extends FieldEditorPreferencePage implemen
                ExtraFeaturesUpdatesFactory extraFeaturesFactory = new ExtraFeaturesUpdatesFactory(false);
                final Set<ExtraFeature> uninstalledExtraFeatures = new HashSet<ExtraFeature>();
                extraFeaturesFactory.retrieveUninstalledExtraFeatures(monitor, uninstalledExtraFeatures, false);
-
+                if (monitor.isCanceled()) {
+                    throw new InterruptedException("User cancelled"); //$NON-NLS-1$
+                }
                for (ExtraFeature feature : uninstalledExtraFeatures) {
                    if (HELP_FEATURE_NAME.equalsIgnoreCase(feature.getName())) {
                        if (feature instanceof AbstractExtraFeature) {
@@ -570,19 +572,24 @@ public class ComponentsPreferencePage extends FieldEditorPreferencePage implemen
                        }
                        installSet.add(feature);
                    }
+                    if (monitor.isCanceled()) {
+                        throw new InterruptedException("User cancelled"); //$NON-NLS-1$
+                    }
                }
            }
        };
        final ProgressMonitorDialog dialog = new ProgressMonitorDialog(null);
        try {
            dialog.run(true, true, runnable);
+            synchronized (ShowWizardHandler.showWizardLock) {
+                new ShowWizardHandler().showUpdateWizard(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+                        installSet);
+            }
        } catch (InvocationTargetException e) {
+            ExceptionHandler.process(e);
            return;
        } catch (InterruptedException e) {
            return;
        }
-        synchronized (ShowWizardHandler.showWizardLock) {
-            new ShowWizardHandler().showUpdateWizard(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), installSet);
-        }
    }
 }
--- a/main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/config/EInternalTemplate.java
+++ b/main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/config/EInternalTemplate.java
@@ -60,6 +60,7 @@ public enum EInternalTemplate {
    // just to have compiled templates
    FOOTER_ROUTE("footer_route", "0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
    HEADER_ROUTE("header_route", "0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
+    MICROSERVICE_APP_SECURITY("microservice_app_security","0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
    CAMEL_RUNIF("camel_run_if", "0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
    CAMEL_SPECIALLINKS("camel_speciallinks", "0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
    MICROSERVICE_APP("microservice_app", "0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
--- a/main/plugins/org.talend.designer.components.exchange/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.designer.components.exchange/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Exchange Plug-in
 Bundle-SymbolicName: org.talend.designer.components.exchange;singleton:=true
-Bundle-Version: 7.3.1.qualifier
+Bundle-Version: 7.4.1.qualifier
 Bundle-Activator: org.talend.designer.components.exchange.ExchangePlugin
 Require-Bundle: org.eclipse.core.runtime,
 org.eclipse.ui,
--- a/main/plugins/org.talend.designer.components.exchange/pom.xml
+++ b/main/plugins/org.talend.designer.components.exchange/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.4.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.components.exchange</artifactId>
--- a/Show More
+++ b/Show More