fix(TDI-40458):compile error dynamic schema with identity tsybaseOutput (#2274 )

fix(TUP-4096)[tOracleInput] "Guess schema" uses wrong "Connection type"
when using tOracleConnection (#2212) * fix(TUP-4096)[tOracleInput] "Guess schema" uses wrong "Connection type" when using tOracleConnection https://jira.talendforge.org/browse/TUP-4096 * fix(TUP-4096)[tOracleInput] "Guess schema" uses wrong "Connection type" when using tOracleConnection https://jira.talendforge.org/browse/TUP-4096 Conflicts: main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/properties/controllers/AbstractElementPropertySectionController.java
2018-05-03 10:02:03 +08:00 · 2018-04-17 16:17:20 +08:00 · 2018-02-09 16:03:12 +01:00 · 2017-11-14 16:46:12 +01:00 · 2017-11-14 16:38:10 +01:00 · 2017-09-05 18:21:33 +02:00
8366 changed files with 301311 additions and 11969 deletions
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -3,4 +3,4 @@ Huge thanks to these people who contributed in making Talend product better:
 - [deki](https://github.com/deki) (Dennis Kieselhorst)
 - [jlolling](https://github.com/jlolling) (Jan -and Miss- Lolling)
 - [kirkalicious](https://github.com/kirkalicious) (Kirk Tarou)
- 
+ - [mrizzato](https://github.com/mrizzato) (Massimiliano Rizzato)
--- 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.1.1.qualifier
+Bundle-Version: 6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-SNAPSHOT</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.1.1.qualifier
+Bundle-Version: 6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-SNAPSHOT</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.1.1.qualifier
+Bundle-Version: 6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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: 6.1.1.qualifier
+Bundle-Version: 6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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: 6.1.1.qualifier
+Bundle-Version: 6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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: 6.1.1.qualifier
+Bundle-Version: 6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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: 6.1.1.qualifier
+Bundle-Version: 6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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: 6.1.1.qualifier
+Bundle-Version: 6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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: 6.1.1.qualifier
+Bundle-Version: 6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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: 6.1.1.qualifier
+Bundle-Version: 6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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: 6.1.1.qualifier
+Bundle-Version: 6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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: 6.1.1.qualifier
+Bundle-Version: 6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-SNAPSHOT</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.1.1.qualifier
+Bundle-Version: 6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-SNAPSHOT</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.1.1.qualifier
+Bundle-Version: 6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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: 6.1.1.qualifier
+Bundle-Version: 6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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: 6.1.1.qualifier
+Bundle-Version: 6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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: 6.1.1.qualifier
+Bundle-Version: 6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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: 6.1.1.qualifier
+Bundle-Version: 6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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: 6.1.1.qualifier
+Bundle-Version: 6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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: 6.1.1.qualifier
+Bundle-Version: 6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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: 6.1.1.qualifier
+Bundle-Version: 6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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: 6.1.1.qualifier
+Bundle-Version: 6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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: 6.1.1.qualifier
+Bundle-Version: 6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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: 6.1.1.qualifier
+Bundle-Version: 6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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: 6.1.1.qualifier
+Bundle-Version: 6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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: 6.1.1.qualifier
+Bundle-Version: 6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-SNAPSHOT</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
@@ -477,7 +477,7 @@ SecurityProjectSettingPage.hidePass=Hide password for document generation
 SelectDeleteProjectDialog.deleteWarning=Do not delete projects physically
 SelectorTableForm.enterType=Enter type name prefix or pattern (*,?).
 SelectorTableForm.nameFilter=Name Filter\:
-connections.form.field.usernameNoMail=User name
+connections.form.field.usernameNoMail=User Name
 ImportProjectSettings.Error=Project settings file is invalid !
 ExportTreeViewer.hideJobTree=Hide job tree
 ExportTreeViewer.selectItems=Select the items to Export:
--- a/i18n/plugins/org.talend.repository.nl/src/main/java/org/talend/repository/i18n/Messages.java
+++ b/i18n/plugins/org.talend.repository.nl/src/main/java/org/talend/repository/i18n/Messages.java
@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2018 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
--- 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.1.1.qualifier
+Bundle-Version: 6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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: 6.1.1.qualifier
+Bundle-Version: 6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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: 6.1.1.qualifier
+Bundle-Version: 6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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: 6.1.1.qualifier
+Bundle-Version: 6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-SNAPSHOT</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.1.1.qualifier"
+      version="6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-SNAPSHOT</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.1.1.qualifier"
+      version="6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.designer.feature"
      label="Designer Feature"
-      version="6.1.1.qualifier"
+      version="6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-SNAPSHOT</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.1.1.qualifier"
+      version="6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.rcp.branding.tos.test.feature"
      label="Test feature for TOS"
-      version="6.1.1.qualifier">
+      version="6.1.3.qualifier">

   <description url="http://www.example.com/description">
      [Enter Feature Description here.]
--- 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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.repository.feature"
      label="Repository Feature"
-      version="6.1.1.qualifier"
+      version="6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.sbi.feature"
      label="SBI Feature"
-      version="6.1.1.qualifier"
+      version="6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.spagic.feature"
      label="SPAGIC Feature"
-      version="6.1.1.qualifier"
+      version="6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.tos.components.feature"
      label="Components-feature"
-      version="6.1.1.qualifier">
+      version="6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-SNAPSHOT</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.1.1.qualifier"
+      version="6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-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
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.tos.libraries.feature"
      label="Libraries_feature"
-      version="6.1.1.qualifier">
+      version="6.1.3.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.1.1-SNAPSHOT</version>
+    <version>6.1.3-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.tos.libraries.feature</artifactId>
--- a/main/plugins/org.talend.component.core/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.component.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Component Core
 Bundle-SymbolicName: org.talend.component.core;singleton:=true
-Bundle-Version: 6.1.1.qualifier
+Bundle-Version: 6.1.3.qualifier
 Require-Bundle: org.eclipse.ui,
 org.eclipse.core.runtime,
 org.eclipse.gef,
--- a/main/plugins/org.talend.component.core/pom.xml
+++ b/main/plugins/org.talend.component.core/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>6.1.1-SNAPSHOT</version>
+    <version>6.1.3-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.component.core</artifactId>
--- a/main/plugins/org.talend.component.core/src/main/java/org/talend/component/core/constants/IComponentConstants.java
+++ b/main/plugins/org.talend.component.core/src/main/java/org/talend/component/core/constants/IComponentConstants.java
@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2018 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
--- a/main/plugins/org.talend.component.core/src/main/java/org/talend/component/core/constants/IContextEventProperties.java
+++ b/main/plugins/org.talend.component.core/src/main/java/org/talend/component/core/constants/IContextEventProperties.java
@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2018 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
--- a/main/plugins/org.talend.component.core/src/main/java/org/talend/component/core/constants/IElementParameterEventProperties.java
+++ b/main/plugins/org.talend.component.core/src/main/java/org/talend/component/core/constants/IElementParameterEventProperties.java
@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2018 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
--- a/main/plugins/org.talend.component.core/src/main/java/org/talend/component/core/constants/IGenericConstants.java
+++ b/main/plugins/org.talend.component.core/src/main/java/org/talend/component/core/constants/IGenericConstants.java
@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2018 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
--- a/main/plugins/org.talend.component.core/src/main/java/org/talend/component/core/dnd/AbstractComponentDragAndDropHandler.java
+++ b/main/plugins/org.talend.component.core/src/main/java/org/talend/component/core/dnd/AbstractComponentDragAndDropHandler.java
@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2018 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
--- a/main/plugins/org.talend.component.core/src/main/java/org/talend/component/core/i18n/Messages.java
+++ b/main/plugins/org.talend.component.core/src/main/java/org/talend/component/core/i18n/Messages.java
@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2018 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
--- a/main/plugins/org.talend.component.core/src/main/java/org/talend/component/core/model/Component.java
+++ b/main/plugins/org.talend.component.core/src/main/java/org/talend/component/core/model/Component.java
@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2018 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
@@ -56,6 +56,7 @@ import org.talend.core.model.temp.ECodePart;
 import org.talend.core.model.utils.TalendTextUtils;
 import org.talend.core.prefs.ITalendCorePrefConstants;
 import org.talend.core.ui.services.IComponentsLocalProviderService;
+import org.talend.core.utils.TalendQuoteUtils;
 import org.talend.designer.core.DesignerPlugin;
 import org.talend.designer.core.model.components.AbstractComponent;
 import org.talend.designer.core.model.components.DummyComponent;
@@ -1633,7 +1634,8 @@ public class Component extends AbstractComponent {
            return "\"" + value + "\"";//$NON-NLS-1$ //$NON-NLS-2$
        }
        if (property.getType() == SchemaElement.Type.SCHEMA) {
-            return "\"" + value.replace("\"", "\\\"") + "\"";//$NON-NLS-1$ //$NON-NLS-2$
+        	// Handles embedded escaped quotes which might occur
+            return "\"" + value.replace("\\\"",	"\\\\\"").replace("\"", "\\\"") + "\"";//$NON-NLS-1$ //$NON-NLS-2$
        }
        return value;
    }
--- a/main/plugins/org.talend.component.core/src/main/java/org/talend/component/core/model/ComponentsProvider.java
+++ b/main/plugins/org.talend.component.core/src/main/java/org/talend/component/core/model/ComponentsProvider.java
@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2018 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
--- a/main/plugins/org.talend.component.core/src/main/java/org/talend/component/core/model/GenericElementParameter.java
+++ b/main/plugins/org.talend.component.core/src/main/java/org/talend/component/core/model/GenericElementParameter.java
@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2018 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
--- a/main/plugins/org.talend.component.core/src/main/java/org/talend/component/core/model/migration/AbstractComponentParametersMigrationTask.java
+++ b/main/plugins/org.talend.component.core/src/main/java/org/talend/component/core/model/migration/AbstractComponentParametersMigrationTask.java
@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2018 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
--- a/main/plugins/org.talend.component.core/src/main/java/org/talend/component/core/model/migration/ChangeSalesforceComponentsParametersToSerializedMigrationTask.java
+++ b/main/plugins/org.talend.component.core/src/main/java/org/talend/component/core/model/migration/ChangeSalesforceComponentsParametersToSerializedMigrationTask.java
@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2018 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
--- a/main/plugins/org.talend.component.core/src/main/java/org/talend/component/core/model/migration/GenericParametersProvider.java
+++ b/main/plugins/org.talend.component.core/src/main/java/org/talend/component/core/model/migration/GenericParametersProvider.java
@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2018 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
--- a/main/plugins/org.talend.component.core/src/main/java/org/talend/component/core/model/migration/UpdateComponentParametersMigrationTask.java
+++ b/main/plugins/org.talend.component.core/src/main/java/org/talend/component/core/model/migration/UpdateComponentParametersMigrationTask.java
@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2018 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
--- a/Show More
+++ b/Show More