Merge branch 'master' into arashankar/master/APPINT-33784

CONTRIBUTORS.md

@@ -7,5 +7,4 @@ Huge thanks to these people who contributed in making Talend product better:
  - [overpackaging](https://github.com/overpackaging) (Steeve Dreux)
  - [brazabr](https://github.com/brazabr) (Thiago Benvenuto)
  - [phoflack](https://jira.talendforge.org/secure/ViewProfile.jspa?name=phoflack) (Philip Hoflack)
- - [bgunics-talend](https://github.com/bgunics-talend) (Balasz Gunics)
- - [cflamain](https://github.com/cflamain) (Christophe Flamain)
+ - [bgunics-talend](https://github.com/bgunics-talend) (Balasz Gunics)

SECURITY.md

@@ -1,14 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 8.0.x   | :white_check_mark: |
-| 7.3.x   | :white_check_mark: |
-| < 7.3.x | :x:                |
-
-## Reporting a Vulnerability
-
-For information on how to report a new security problem please see [here](https://www.talend.com/security/vulnerability-disclosure/).
-Our existing security advisories are published [here](https://www.talend.com/security/incident-response/).

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="8.0.2.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.designer.feature" label="Designer Feature" version="8.8.8.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>  
@@ -10,12 +10,13 @@
   </url>  
   <requires>
     <import feature="org.eclipse.gef" version="0.0.0" match="greaterOrEqual"/>
-    <import feature="org.talend.m2e.feature" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.eclipse.m2e.feature" version="0.0.0" match="greaterOrEqual"/>
     <import feature="org.eclipse.equinox.p2.discovery.feature" version="0.0.0" match="greaterOrEqual"/>
     <import feature="org.talend.utils.feature" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="javax.xml.rpc-api" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="javax.xml.rpc" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="net.jeeeyul.eclipse.themes" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="net.jeeeyul.swtend" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.apache.axis" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.gmf.runtime.draw2d.ui" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.gmf.runtime.common.core" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.gmf.runtime.common.ui" version="0.0.0" match="greaterOrEqual"/>
@@ -32,5 +33,4 @@
   <plugin id="org.talend.libraries.mozilla" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.sqlbuilder" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
   <plugin id="org.talend.sqlbuilder" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.designer.core.swt" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
 </feature>

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

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

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="8.0.2.qualifier">
+      version="8.8.8.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]

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>8.0.2-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.fragment.jars.di.feature</artifactId>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.gmf.feature"
       label="Gmf"
-      version="8.0.2.qualifier">
+      version="8.8.8.qualifier">
 
    <description url="http://www.example.com/description">
       GMF
@@ -17,15 +17,415 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.gmf.runtime.notation" version="0.0.0"/>
-      <import feature="org.eclipse.gef" version="0.0.0"/>
-      <import feature="org.eclipse.emf.common" version="0.0.0"/>
-      <import feature="org.eclipse.emf.ecore" version="0.0.0"/>
-      <import feature="org.eclipse.emf.ecore.edit" version="0.0.0"/>
-      <import feature="org.eclipse.emf.edit" version="0.0.0"/>
-      <import feature="org.eclipse.emf.transaction" version="0.0.0"/>
-      <import feature="org.eclipse.emf.validation" version="0.0.0"/>
-      <import feature="org.eclipse.emf.workspace" version="0.0.0"/>
+      <import feature="org.eclipse.gmf.runtime.notation" version="1.8.0"/>
+      <import feature="org.eclipse.gef" version="3.9.2"/>
+      <import feature="org.eclipse.emf.common" version="2.10.0"/>
+      <import feature="org.eclipse.emf.ecore" version="2.10.0"/>
+      <import feature="org.eclipse.emf.ecore.edit" version="2.8.0"/>
+      <import feature="org.eclipse.emf.edit" version="2.10.0"/>
+      <import feature="org.eclipse.emf.transaction" version="1.8.0"/>
+      <import feature="org.eclipse.emf.validation" version="1.8.0"/>
+      <import feature="org.eclipse.emf.workspace" version="1.8.0"/>
    </requires>
 
+   <plugin
+         id="org.eclipse.gmf.runtime.common.core"
+         download-size="117"
+         install-size="226"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.common.ui"
+         download-size="257"
+         install-size="509"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.common.ui.action"
+         download-size="101"
+         install-size="173"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.common.ui.action.ide"
+         download-size="39"
+         install-size="66"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.common.ui.services"
+         download-size="100"
+         install-size="208"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.common.ui.services.action"
+         download-size="120"
+         install-size="293"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.common.ui.services.dnd"
+         download-size="92"
+         install-size="190"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.common.ui.services.dnd.ide"
+         download-size="24"
+         install-size="38"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.common.ui.services.properties"
+         download-size="76"
+         install-size="146"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.diagram.core"
+         download-size="133"
+         install-size="284"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.diagram.ui"
+         download-size="1190"
+         install-size="2486"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.diagram.ui.actions"
+         download-size="218"
+         install-size="391"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.diagram.ui.dnd"
+         download-size="19"
+         install-size="29"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.diagram.ui.geoshapes"
+         download-size="99"
+         install-size="179"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.diagram.ui.properties"
+         download-size="215"
+         install-size="430"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.diagram.ui.providers"
+         download-size="137"
+         install-size="318"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.diagram.ui.providers.ide"
+         download-size="23"
+         install-size="38"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.diagram.ui.render"
+         download-size="117"
+         install-size="236"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.diagram.ui.resources.editor"
+         download-size="123"
+         install-size="251"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide"
+         download-size="69"
+         install-size="146"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.draw2d.ui"
+         download-size="318"
+         install-size="619"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.draw2d.ui.render"
+         download-size="49"
+         install-size="87"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.draw2d.ui.render.awt"
+         download-size="196"
+         install-size="396"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.emf.clipboard.core"
+         download-size="110"
+         install-size="223"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.emf.commands.core"
+         download-size="28"
+         install-size="48"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.emf.core"
+         download-size="114"
+         install-size="229"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.emf.type.core"
+         download-size="190"
+         install-size="439"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.emf.type.ui"
+         download-size="18"
+         install-size="25"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.emf.ui"
+         download-size="93"
+         install-size="177"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.emf.ui.properties"
+         download-size="62"
+         install-size="118"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.gef.ui"
+         download-size="101"
+         install-size="182"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.notation.providers"
+         download-size="29"
+         install-size="53"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf"
+         download-size="13"
+         install-size="17"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.common.ui.printing"
+         download-size="14"
+         install-size="19"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.common.ui.printing.win32"
+         download-size="752"
+         install-size="3091"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.diagram.ui.printing"
+         download-size="90"
+         install-size="172"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gmf.runtime.diagram.ui.printing.render"
+         download-size="92"
+         install-size="196"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.dom.svg"
+         download-size="453"
+         install-size="1509"
+         version="1.6.0.v201011041432"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.bridge"
+         download-size="504"
+         install-size="1013"
+         version="1.6.0.v201011041432"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.dom"
+         download-size="107"
+         install-size="203"
+         version="1.6.1.v201505192100"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.ext.awt"
+         download-size="387"
+         install-size="760"
+         version="1.6.0.v201011041432"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.transcoder"
+         download-size="79"
+         install-size="151"
+         version="1.6.0.v201011041432"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.svggen"
+         download-size="183"
+         install-size="338"
+         version="1.6.0.v201011041432"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.util"
+         download-size="99"
+         install-size="192"
+         version="1.6.0.v201011041432"
+         unpack="false"/>
+
+   <plugin
+         id="org.w3c.dom.svg"
+         download-size="95"
+         install-size="140"
+         version="1.1.0.v201011041433"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.xerces"
+         download-size="0"
+         install-size="0"
+         version="2.12.1.v20210115-0812"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.xml.resolver"
+         download-size="94"
+         install-size="201"
+         version="1.2.0.v201005080400"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.css"
+         download-size="259"
+         install-size="512"
+         version="1.6.0.v201011041432"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.util.gui"
+         download-size="161"
+         install-size="281"
+         version="1.6.0.v201011041432"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.parser"
+         download-size="54"
+         install-size="112"
+         version="1.6.0.v201011041432"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.xml"
+         download-size="35"
+         install-size="92"
+         version="1.6.0.v201011041432"
+         unpack="false"/>
+
+   <plugin
+         id="org.w3c.css.sac"
+         download-size="37"
+         install-size="65"
+         version="1.3.1.v200903091627"
+         unpack="false"/>
+
+   <plugin
+         id="org.w3c.dom.smil"
+         download-size="19"
+         install-size="37"
+         version="1.0.1.v200903091627"
+         unpack="false"/>
+
+   <plugin
+         id="javax.xml"
+         download-size="246"
+         install-size="413"
+         version="1.3.4.v201005080400"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.xml.serializer"
+         download-size="286"
+         install-size="577"
+         version="2.7.1.v201005080400"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.batik.pdf"
+         download-size="498"
+         install-size="989"
+         version="1.6.0.v201105071520"
+         unpack="false"/>
+
+   <plugin
+         id="org.w3c.dom.events"
+         download-size="17"
+         install-size="26"
+         version="3.0.0.draft20060413_v201105210656"
+         unpack="false"/>
+
 </feature>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.2-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.gmf.feature</artifactId>

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="8.0.2.qualifier" provider-name=".Talend SA." plugin="org.talend.rcp.branding.tos"> 
+<feature id="org.talend.rcp.branding.tos.feature" label="Tos branding feature" version="8.8.8.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>  

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>8.0.2-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.rcp.branding.tos.feature</artifactId>

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

@@ -1,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="8.0.2.qualifier"> 
+<feature id="org.talend.rcp.branding.tos.test.feature" label="Test feature for TOS" version="8.8.8.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>  
@@ -16,7 +16,6 @@
     <import plugin="org.talend.repository" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.talend.utils" version="0.0.0" match="greaterOrEqual"/>
   </requires>  
-  <plugin id="org.talend.common.ui.runtime.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.commons.runtime.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.commons.ui.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.core.repository.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
@@ -44,14 +43,11 @@
   <plugin id="org.talend.migrationTool.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.model.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.repository.generic.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.repository.json.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.repository.items.importexport.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.repository.items.importexport.ui.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.repository.localprovider.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.repository.metadata.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.repository.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.sqlbuilder.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.presentation.onboarding.resource.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.repository.view.di.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.repository.view.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.testutils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>

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>8.0.2-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.rcp.branding.tos.test.feature</artifactId>

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="8.0.2.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.repository.feature" label="Repository Feature" version="8.8.8.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>  

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

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

main/features/org.talend.studio.components.tck.jdbc.feature/.project

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.talend.studio.components.tck.jdbc.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>

main/features/org.talend.studio.components.tck.jdbc.feature/feature.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.talend.studio.components.tck.jdbc.feature"
-      label="JDBC"
-      version="8.0.2.qualifier">
-
-   <description url="http://www.example.com/description">
-      JDBC
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      JDBC
-Copyright (c) 2006-2021 Talend Inc. - www.talend.com
-All rights reserved.
-
-This product includes software developed at
-GlassFish Community (https://glassfish.dev.java.net)
-Licensed under the CDDL,GPL-2.0-only license.
-
-
-This product includes software developed at
-The Apache Software Foundation (http://jakarta.apache.org/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-FasterXML
-Licensed under the Apache-2.0 license.
-   </license>
-
-   <requires>
-      <import plugin="org.talend.designer.maven.repo.tck"/>
-      <import plugin="org.talend.studio.components.tck.jdbc"/>
-      <import plugin="org.talend.components.jdbc.definition"/>
-   </requires>
-
-</feature>

main/features/org.talend.studio.components.tck.jdbc.feature/pom.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.2-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tck.jdbc.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>

main/features/org.talend.studio.components.tck.jira.feature/.project

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

main/features/org.talend.studio.components.tck.jira.feature/build.properties

@@ -1,2 +0,0 @@
-bin.includes = feature.xml,\
-               p2.inf

main/features/org.talend.studio.components.tck.jira.feature/feature.xml

@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.talend.studio.components.tck.jira.feature"
-      label="Jira"
-      version="8.0.2.qualifier">
-
-   <description url="http://www.example.com/description">
-      Jira component
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      Jira component
-Copyright (c) 2006-2021 Talend Inc. - www.talend.com
-All rights reserved.
-
-This product includes software developed at
-OPS4J - Open Participation Software for Java
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-GlassFish Community (https://glassfish.dev.java.net)
-Licensed under the CDDL,GPL-2.0-only license.
-
-
-This product includes software developed at
-The Apache Software Foundation (http://jakarta.apache.org/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-FasterXML
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-OSGi Alliance (http://www.osgi.org/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-Joda.org (http://www.joda.org)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-FasterXML (http://fasterxml.com)
-Licensed under the JSON license.
-
-
-This product includes software developed at
-Google, Inc.
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-AddThis
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-SLF4J.ORG
-Licensed under the MIT license.
-
-
-This product includes software developed at
-SLF4J.ORG
-Licensed under the X11 license.
-
-
-This product includes software developed at
-JUnit
-Licensed under the EPL-1.0 license.
-
-
-This product includes software developed at
-Seam Framework
-Licensed under the Apache-2.0 license.
-   </license>
-
-   <requires>
-      <import plugin="org.talend.designer.maven.repo.tck" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.talend.designer.maven.repo.tcksdk" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.talend.studio.components.tck.jira"/>
-   </requires>
-
-</feature>

main/features/org.talend.studio.components.tck.jira.feature/p2.inf

@@ -1,4 +0,0 @@
-properties.0.name=TALEND_COMPONENT_tJIRAInput
-properties.0.value=
-properties.1.name=TALEND_COMPONENT_tJIRAOutput
-properties.1.value=

main/features/org.talend.studio.components.tck.jira.feature/pom.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.2-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tck.jira.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>

main/features/org.talend.studio.components.tck.splunk.feature/.project

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

main/features/org.talend.studio.components.tck.splunk.feature/build.properties

@@ -1,2 +0,0 @@
-bin.includes = feature.xml,\
-               p2.inf

main/features/org.talend.studio.components.tck.splunk.feature/feature.xml

@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.talend.studio.components.tck.splunk.feature"
-      label="Splunk"
-      version="8.0.2.qualifier">
-
-   <description url="http://www.example.com/description">
-      Splunk component
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      Splunk component
-Copyright (c) 2006-2021 Talend Inc. - www.talend.com
-All rights reserved.
-
-This product includes software developed at
-OPS4J - Open Participation Software for Java
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-GlassFish Community (https://glassfish.dev.java.net)
-Licensed under the CDDL,GPL-2.0-only license.
-
-
-This product includes software developed at
-The Apache Software Foundation (http://jakarta.apache.org/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-FasterXML
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-OSGi Alliance (http://www.osgi.org/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-Joda.org (http://www.joda.org)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-FasterXML (http://fasterxml.com)
-Licensed under the JSON license.
-
-
-This product includes software developed at
-Google, Inc.
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-AddThis
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-SLF4J.ORG
-Licensed under the MIT license.
-
-
-This product includes software developed at
-SLF4J.ORG
-Licensed under the X11 license.
-
-
-This product includes software developed at
-JUnit
-Licensed under the EPL-1.0 license.
-
-
-This product includes software developed at
-Seam Framework
-Licensed under the Apache-2.0 license.
-   </license>
-
-   <requires>
-      <import plugin="org.talend.designer.maven.repo.tck" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.talend.designer.maven.repo.tcksdk" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.talend.studio.components.tck.splunk"/>
-   </requires>
-
-</feature>

main/features/org.talend.studio.components.tck.splunk.feature/p2.inf

@@ -1,2 +0,0 @@
-properties.0.name=TALEND_COMPONENT_tSplunkEventCollector
-properties.0.value=

main/features/org.talend.studio.components.tck.splunk.feature/pom.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.2-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tck.splunk.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>

main/features/org.talend.studio.components.tcompv0.azurestorage.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.studio.components.tcompv0.azurestorage.feature"
       label="Azure Storage"
-      version="8.0.2.qualifier">
+      version="8.8.8.qualifier">
 
    <description url="http://www.example.com/description">
       Azure Storage

main/features/org.talend.studio.components.tcompv0.azurestorage.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.2-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.studio.components.tcompv0.azurestorage.feature</artifactId>

main/features/org.talend.studio.components.tcompv0.googledrive.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.studio.components.tcompv0.googledrive.feature"
       label="Google Drive"
-      version="8.0.2.qualifier">
+      version="8.8.8.qualifier">
 
    <description url="http://www.example.com/description">
       Google drive component

main/features/org.talend.studio.components.tcompv0.googledrive.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.2-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.studio.components.tcompv0.googledrive.feature</artifactId>

main/features/org.talend.studio.components.tcompv0.jdbc.feature/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.talend.studio.components.tcompv0.jdbc.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>

main/features/org.talend.studio.components.tcompv0.jdbc.feature/feature.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.talend.studio.components.tcompv0.jdbc.feature"
+      label="JDBC_feature"
+      version="8.8.8.qualifier">
+
+   <description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+   <plugin
+         id="org.talend.studio.components.tcompv0.jdbc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.components.jdbc.definition"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>

main/features/org.talend.studio.components.tcompv0.jdbc.feature/pom.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.talend.studio</groupId>
+    <artifactId>tdi-studio-se</artifactId>
+    <version>8.8.8-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.jdbc.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.studio.components.tcompv0.jira.feature/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.talend.studio.components.tcompv0.jira.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>

main/features/org.talend.studio.components.tcompv0.jira.feature/build.properties

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

main/features/org.talend.studio.components.tcompv0.jira.feature/feature.xml

@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.talend.studio.components.tcompv0.jira.feature"
+      label="Jira"
+      version="8.8.8.qualifier">
+
+   <description url="http://www.example.com/description">
+      Jira component
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      Jira component
+Copyright (c) 2006-2021 Talend Inc. - www.talend.com
+All rights reserved.
+
+This product includes software developed at
+OPS4J - Open Participation Software for Java
+Licensed under the Apache-2.0 license.
+
+
+This product includes software developed at
+GlassFish Community (https://glassfish.dev.java.net)
+Licensed under the CDDL,GPL-2.0-only license.
+
+
+This product includes software developed at
+The Apache Software Foundation (http://jakarta.apache.org/)
+Licensed under the Apache-2.0 license.
+
+
+This product includes software developed at
+FasterXML
+Licensed under the Apache-2.0 license.
+
+
+This product includes software developed at
+OSGi Alliance (http://www.osgi.org/)
+Licensed under the Apache-2.0 license.
+
+
+This product includes software developed at
+Joda.org (http://www.joda.org)
+Licensed under the Apache-2.0 license.
+
+
+This product includes software developed at
+FasterXML (http://fasterxml.com)
+Licensed under the JSON license.
+
+
+This product includes software developed at
+Google, Inc.
+Licensed under the Apache-2.0 license.
+
+
+This product includes software developed at
+AddThis
+Licensed under the Apache-2.0 license.
+
+
+This product includes software developed at
+SLF4J.ORG
+Licensed under the MIT license.
+
+
+This product includes software developed at
+SLF4J.ORG
+Licensed under the X11 license.
+
+
+This product includes software developed at
+JUnit
+Licensed under the EPL-1.0 license.
+
+
+This product includes software developed at
+Seam Framework
+Licensed under the Apache-2.0 license.
+   </license>
+
+   <requires>
+      <import plugin="org.talend.designer.maven.repo.tcompv0" version="0.0.0" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.talend.studio.components.tcompv0.jira"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.components.jira"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>

main/features/org.talend.studio.components.tcompv0.jira.feature/pom.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.talend.studio</groupId>
+    <artifactId>tdi-studio-se</artifactId>
+    <version>8.8.8-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.jira.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.studio.components.tcompv0.marketo.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.studio.components.tcompv0.marketo.feature"
       label="Marketo"
-      version="8.0.2.qualifier">
+      version="8.8.8.qualifier">
 
    <description url="http://www.example.com/description">
       Marketo component

main/features/org.talend.studio.components.tcompv0.marketo.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.2-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.studio.components.tcompv0.marketo.feature</artifactId>

main/features/org.talend.studio.components.tcompv0.marklogic.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.studio.components.tcompv0.marklogic.feature"
       label="Marklogic"
-      version="8.0.2.qualifier">
+      version="8.8.8.qualifier">
 
    <description url="http://www.example.com/description">
       Marklogic component

main/features/org.talend.studio.components.tcompv0.marklogic.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.2-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.studio.components.tcompv0.marklogic.feature</artifactId>

main/features/org.talend.studio.components.tcompv0.netsuite.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.studio.components.tcompv0.netsuite.feature"
       label="Netsuite"
-      version="8.0.2.qualifier">
+      version="8.8.8.qualifier">
 
    <description url="http://www.example.com/description">
       Netsuite

main/features/org.talend.studio.components.tcompv0.netsuite.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.2-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.studio.components.tcompv0.netsuite.feature</artifactId>

main/features/org.talend.studio.components.tcompv0.salesforce.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.studio.components.tcompv0.salesforce.feature"
       label="Salesforce"
-      version="8.0.2.qualifier">
+      version="8.8.8.qualifier">
 
    <description url="http://www.example.com/description">
       Salesforce component

main/features/org.talend.studio.components.tcompv0.salesforce.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.2-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.studio.components.tcompv0.salesforce.feature</artifactId>

main/features/org.talend.studio.components.tcompv0.snowflake.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.studio.components.tcompv0.snowflake.feature"
       label="SNOWFLAKE_feature"
-      version="8.0.2.qualifier">
+      version="8.8.8.qualifier">
 
    <description url="http://www.example.com/description">
       Snowflake

main/features/org.talend.studio.components.tcompv0.snowflake.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.2-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.studio.components.tcompv0.snowflake.feature</artifactId>

main/features/org.talend.studio.components.tcompv0.splunk.feature/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.talend.studio.components.tcompv0.splunk.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>

main/features/org.talend.studio.components.tcompv0.splunk.feature/build.properties

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

main/features/org.talend.studio.components.tcompv0.splunk.feature/feature.xml

@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.talend.studio.components.tcompv0.splunk.feature"
+      label="Splunk"
+      version="8.8.8.qualifier">
+
+   <description url="http://www.example.com/description">
+      Splunk component
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      Splunk component
+Copyright (c) 2006-2021 Talend Inc. - www.talend.com
+All rights reserved.
+
+This product includes software developed at
+OPS4J - Open Participation Software for Java
+Licensed under the Apache-2.0 license.
+
+
+This product includes software developed at
+GlassFish Community (https://glassfish.dev.java.net)
+Licensed under the CDDL,GPL-2.0-only license.
+
+
+This product includes software developed at
+The Apache Software Foundation (http://jakarta.apache.org/)
+Licensed under the Apache-2.0 license.
+
+
+This product includes software developed at
+FasterXML
+Licensed under the Apache-2.0 license.
+
+
+This product includes software developed at
+OSGi Alliance (http://www.osgi.org/)
+Licensed under the Apache-2.0 license.
+
+
+This product includes software developed at
+Joda.org (http://www.joda.org)
+Licensed under the Apache-2.0 license.
+
+
+This product includes software developed at
+FasterXML (http://fasterxml.com)
+Licensed under the JSON license.
+
+
+This product includes software developed at
+Google, Inc.
+Licensed under the Apache-2.0 license.
+
+
+This product includes software developed at
+AddThis
+Licensed under the Apache-2.0 license.
+
+
+This product includes software developed at
+SLF4J.ORG
+Licensed under the MIT license.
+
+
+This product includes software developed at
+SLF4J.ORG
+Licensed under the X11 license.
+
+
+This product includes software developed at
+JUnit
+Licensed under the EPL-1.0 license.
+
+
+This product includes software developed at
+Seam Framework
+Licensed under the Apache-2.0 license.
+   </license>
+
+   <requires>
+      <import plugin="org.talend.designer.maven.repo.tcompv0" version="0.0.0" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.talend.studio.components.tcompv0.splunk"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.components.splunk"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>

main/features/org.talend.studio.components.tcompv0.splunk.feature/pom.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.talend.studio</groupId>
+    <artifactId>tdi-studio-se</artifactId>
+    <version>8.8.8-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.splunk.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.tos.components.feature"
       label="Components-feature"
-      version="8.0.2.qualifier">
+      version="8.8.8.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -17,13 +17,14 @@
    </license>
 
    <requires>
-      <import feature="org.talend.studio.components.tck.jira.feature" version="0.0.0" match="greaterOrEqual"/>
-      <import feature="org.talend.studio.components.tck.splunk.feature" version="0.0.0" match="greaterOrEqual"/>
+      <import feature="org.talend.studio.components.tcompv0.jdbc.feature" version="0.0.0" match="greaterOrEqual"/>
       <import feature="org.talend.studio.components.tcompv0.netsuite.feature" version="0.0.0" match="greaterOrEqual"/>
       <import feature="org.talend.studio.components.tcompv0.googledrive.feature" version="0.0.0" match="greaterOrEqual"/>
       <import feature="org.talend.studio.components.tcompv0.marketo.feature" version="0.0.0" match="greaterOrEqual"/>
       <import feature="org.talend.studio.components.tcompv0.azurestorage.feature" version="0.0.0" match="greaterOrEqual"/>
       <import feature="org.talend.studio.components.tcompv0.snowflake.feature" version="0.0.0" match="greaterOrEqual"/>
+      <import feature="org.talend.studio.components.tcompv0.jira.feature" version="0.0.0" match="greaterOrEqual"/>
+      <import feature="org.talend.studio.components.tcompv0.splunk.feature" version="0.0.0" match="greaterOrEqual"/>
       <import feature="org.talend.studio.components.tcompv0.salesforce.feature" version="0.0.0" match="greaterOrEqual"/>
       <import feature="org.talend.esb.tooling.ws.consumer.feature" version="0.0.0" match="greaterOrEqual"/>
       <import plugin="biz.aQute.bnd.annotation" version="0.0.0" match="greaterOrEqual"/>
@@ -83,7 +84,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.talend.studio.components.tck.jira"
+         id="org.talend.components.jira"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -118,7 +119,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.talend.studio.components.tck.splunk"
+         id="org.talend.components.splunk"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -138,6 +139,12 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.talend.designer.components.exchange"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
    <plugin
          id="org.talend.designer.components.localprovider"
          download-size="0"
@@ -186,14 +193,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.talend.designer.mapper.swt"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
    <plugin
          id="org.talend.designer.rowgenerator"
          download-size="0"
@@ -250,10 +249,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.talend.studio.components.tck.jdbc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
 </feature>

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

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

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="8.0.2.qualifier"> 
+<feature id="org.talend.tos.core.feature" label="Feature" version="8.8.8.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>  
@@ -13,6 +13,9 @@
     <import feature="org.talend.repository.feature" version="0.0.0" match="greaterOrEqual"/>
     <import feature="org.talend.tos.components.feature" version="0.0.0" match="greaterOrEqual"/>
     <import feature="org.talend.updates.feature" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="javax.transaction" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="javax.xml.rpc" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.apache.axis" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.apache.log4j" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.core.runtime" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.ui" version="0.0.0" match="greaterOrEqual"/>

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>8.0.2-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.core.feature</artifactId>

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="8.0.2.qualifier" provider-name=".Talend SA.">
+<feature id="org.talend.tos.feature" label="Tos feature" version="8.8.8.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>

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

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

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="8.0.2.qualifier"> 
+<feature id="org.talend.tos.libraries.feature" label="Libraries_feature" version="8.8.8.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>  
@@ -29,6 +29,8 @@
   <plugin id="org.talend.libraries.ehcache" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.excel" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.groovy" download-size="0" install-size="0" version="0.0.0"/>
+  <plugin id="org.talend.libraries.guava" download-size="0" install-size="0" version="0.0.0"/>
+  <plugin id="org.talend.libraries.hadoop.mapr.5.0.0" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.jackson" download-size="0" install-size="0" version="0.0.0"/>
   <plugin download-size="0" install-size="0" version="0.0.0" unpack="false" id="org.talend.libraries.javacsv"/>
   <plugin id="org.talend.libraries.jax" download-size="0" install-size="0" version="0.0.0"/>
@@ -44,6 +46,4 @@
   <plugin id="org.talend.libraries.slf4j" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.xml" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.zmq" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.bigquery" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.repository.bigquery" download-size="0" install-size="0" version="0.0.0"/>
 </feature>

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

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

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

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Abstract Map Plug-in
 Bundle-SymbolicName: org.talend.designer.abstractmap;singleton:=true
-Bundle-Version: 8.0.2.qualifier
+Bundle-Version: 8.8.8.qualifier
 Bundle-Activator: org.talend.designer.abstractmap.MapPlugin
 Require-Bundle: org.eclipse.core.runtime,
  org.talend.core,
@@ -13,9 +13,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jface,
  org.apache.log4j,
  org.talend.libraries.apache,
- org.talend.components.api,
- org.talend.common.ui.runtime,
- org.talend.commons.runtime
+ org.talend.components.api
 Eclipse-LazyStart: true
 Export-Package: org.talend.designer.abstractmap,
  org.talend.designer.abstractmap.managers,
@@ -29,4 +27,3 @@ Export-Package: org.talend.designer.abstractmap,
  org.talend.designer.abstractmap.ui.visualmap.link,
  org.talend.designer.abstractmap.ui.visualmap.zone
 Bundle-Vendor: .Talend SA.
-Automatic-Module-Name: org.talend.designer.abstractmap

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

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

main/plugins/org.talend.designer.abstractmap/src/java/main/messages_en.properties

@@ -0,0 +1,20 @@
+prefs.configuration.LINK_STYLE.AUTO=Auto
+prefs.configuration.title=Map components preferences :
+prefs.configuration.LINK_STYLE.LINE=Lines (fast)
+prefs.configuration.LINK_STYLE.BEZIER_CURVE=Curves
+prefs.configuration.LINK_STYLE=Default mapping links display as :
+DraggingInfosPopup.draggingEntry=Dragging {0} entry.
+DraggingInfosPopup.dropInvalid=\n<< Drop invalid >>\n
+DraggingInfosPopup.draggingEntries=Dragging {0} entries.
+DraggingInfosPopup.dropInvalidWithKey=\n<< Drop invalid >>\nPress both Shift and Ctrl keys to map one to one and overwrite
+DraggingInfosPopup.overwriteMode=\ > Overwrite mode
+DraggingInfosPopup.appendMode=\ > Append mode
+DraggingInfosPopup.appendModeToOverwrite=\ > Append mode (Ctrl key to overwrite)
+DraggingInfosPopup.insertAllSelectedEntries=\ > Insert all selected entries
+DraggingInfosPopup.insertRemainingEntries=\ > Insert remaining entries
+DraggingInfosPopup.eachSourceEntryExpressionToEachTargetExpression=> Each source entry expression to each target expression
+DraggingInfosPopup.eachSourceEntryToEachTargetExpression=> Each source entry to each target expression
+DraggingInfosPopup.allSourceEntriesExpressionToASingleOneTargetExpressionShiftKey=> All source entries expression to a single one target expression (Shift key to change mapping)
+DraggingInfosPopup.allSourceEntriesExpressionToASingleOneTargetExpression=> All source entries expression to a single one target expression
+DraggingInfosPopup.allSourceEntriesToASingleOneTargetExpressionShiftKey=> All source entries to a single one target expression (Shift key to change mapping)
+DraggingInfosPopup.allSourceEntriesToASingleOneTargetExpression=> All source entries to a single one target expression

main/plugins/org.talend.designer.abstractmap/src/java/main/messages_fr.properties

@@ -6,7 +6,7 @@ prefs.configuration.LINK_STYLE.LINE=Lignes (rapide)
 DraggingInfosPopup.draggingEntry=Glissement de {0} entr\u00E9e(s).
 DraggingInfosPopup.dropInvalid=\n<< D\u00E9p\u00F4t impossible >>\n
 DraggingInfosPopup.draggingEntries=Glissement de {0} entr\u00E9es.
-DraggingInfosPopup.dropInvalidWithKey=\n<< D\u00E9p\u00F4t impossible >>\nAppuyez sur Maj et Ctrl pour mapper en un pour un et \u00E9craser
+DraggingInfosPopup.dropInvalidWithKey=\n<<D\u00E9p\u00F4t impossible>>\n : appuyez sur Maj et Ctrl pour mapper en un pour un et \u00E9craser
 DraggingInfosPopup.overwriteMode= > Mode \u00E9crasement
 DraggingInfosPopup.appendMode= > Mode \u00E9criture \u00E0 la suite
 DraggingInfosPopup.appendModeToOverwrite= > Mode \u00E9criture \u00E0 la suite (Ctrl pour \u00E9craser)

main/plugins/org.talend.designer.abstractmap/src/java/main/messages_ja.properties

@@ -2,19 +2,19 @@ prefs.configuration.title=\u30DE\u30C3\u30D7\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3
 prefs.configuration.LINK_STYLE=\u30C7\u30D5\u30A9\u30EB\u30C8\u30DE\u30C3\u30D4\u30F3\u30B0\u30EA\u30F3\u30AF\u306E\u8868\u793A:
 prefs.configuration.LINK_STYLE.AUTO=\u81EA\u52D5
 prefs.configuration.LINK_STYLE.BEZIER_CURVE=\u66F2\u7DDA
-prefs.configuration.LINK_STYLE.LINE=\u76F4\u7DDA(\u9AD8\u901F)
-DraggingInfosPopup.draggingEntry={0}\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u30C9\u30E9\u30C3\u30B0\u3057\u3066\u3044\u307E\u3059\u3002
+prefs.configuration.LINK_STYLE.LINE=\u76F4\u7DDA\uFF08\u9AD8\u901F\uFF09
+DraggingInfosPopup.draggingEntry={0}\u30A8\u30F3\u30C8\u30EA\u3092\u30C9\u30E9\u30C3\u30B0\u3057\u3066\u3044\u307E\u3059\u3002
 DraggingInfosPopup.dropInvalid=\n<< \u7121\u52B9\u306A\u30C9\u30ED\u30C3\u30D7 >>\n
-DraggingInfosPopup.draggingEntries={0}\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u30C9\u30E9\u30C3\u30B0\u3057\u3066\u3044\u307E\u3059\u3002
-DraggingInfosPopup.dropInvalidWithKey=\n<< \u7121\u52B9\u306A\u30C9\u30ED\u30C3\u30D7 >>\nShift\u30AD\u30FC\u3068Ctrl\u30AD\u30FC\u3092\u540C\u6642\u306B\u62BC\u3059\u3068\u30011\u5BFE1\u3067\u30DE\u30C3\u30D4\u30F3\u30B0\u3055\u308C\u3066\u4E0A\u66F8\u304D\u3055\u308C\u307E\u3059
+DraggingInfosPopup.draggingEntries={0}\u30A8\u30F3\u30C8\u30EA\u3092\u30C9\u30E9\u30C3\u30B0\u3057\u3066\u3044\u307E\u3059\u3002
+DraggingInfosPopup.dropInvalidWithKey=\n<< \u7121\u52B9\u306A\u30C9\u30ED\u30C3\u30D7 >>\n\u4E00\u5BFE\u4E00\u30DE\u30C3\u30D4\u30F3\u30B0\u3057\u3001\u4E0A\u66F8\u304D\u3059\u308B\u5834\u5408\u306F\u3001Shift\u30AD\u30FC\u3068Ctrl\u30AD\u30FC\u3092\u540C\u6642\u306B\u62BC\u3057\u307E\u3059
 DraggingInfosPopup.overwriteMode= > \u4E0A\u66F8\u304D\u30E2\u30FC\u30C9
 DraggingInfosPopup.appendMode= > \u8FFD\u52A0\u30E2\u30FC\u30C9
 DraggingInfosPopup.appendModeToOverwrite= > \u8FFD\u52A0\u30E2\u30FC\u30C9(\u4E0A\u66F8\u304D\u3059\u308B\u306B\u306F[Ctrl]\u30AD\u30FC)
-DraggingInfosPopup.insertAllSelectedEntries= > \u9078\u629E\u3057\u305F\u3059\u3079\u3066\u306E\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u633F\u5165\u3057\u307E\u3059
-DraggingInfosPopup.insertRemainingEntries= > \u6B8B\u308A\u306E\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u633F\u5165\u3057\u307E\u3059
-DraggingInfosPopup.eachSourceEntryExpressionToEachTargetExpression=> \u5404\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u5404\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u30FC\u5F0F
-DraggingInfosPopup.eachSourceEntryToEachTargetExpression=> \u5404\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u5404\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u30FC
-DraggingInfosPopup.allSourceEntriesExpressionToASingleOneTargetExpressionShiftKey=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u30FC\u5F0F (\u30DE\u30C3\u30D4\u30F3\u30B0\u3092\u5909\u66F4\u3059\u308B\u306B\u306FShift\u30AD\u30FC)
-DraggingInfosPopup.allSourceEntriesExpressionToASingleOneTargetExpression=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u30FC\u5F0F
-DraggingInfosPopup.allSourceEntriesToASingleOneTargetExpressionShiftKey=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u30FC (\u30DE\u30C3\u30D4\u30F3\u30B0\u3092\u5909\u66F4\u3059\u308B\u306B\u306FShift\u30AD\u30FC)
-DraggingInfosPopup.allSourceEntriesToASingleOneTargetExpression=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u30FC
+DraggingInfosPopup.insertAllSelectedEntries= > \u9078\u629E\u3057\u305F\u3059\u3079\u3066\u306E\u30A8\u30F3\u30C8\u30EA\u3092\u633F\u5165\u3057\u307E\u3059
+DraggingInfosPopup.insertRemainingEntries= > \u6B8B\u308A\u306E\u30A8\u30F3\u30C8\u30EA\u3092\u633F\u5165\u3057\u307E\u3059
+DraggingInfosPopup.eachSourceEntryExpressionToEachTargetExpression=> \u5404\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u5404\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u5F0F
+DraggingInfosPopup.eachSourceEntryToEachTargetExpression=> \u5404\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u5404\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA
+DraggingInfosPopup.allSourceEntriesExpressionToASingleOneTargetExpressionShiftKey=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u5F0F (\u30DE\u30C3\u30D4\u30F3\u30B0\u3092\u5909\u66F4\u3059\u308B\u306B\u306FShift\u30AD\u30FC)
+DraggingInfosPopup.allSourceEntriesExpressionToASingleOneTargetExpression=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u5F0F
+DraggingInfosPopup.allSourceEntriesToASingleOneTargetExpressionShiftKey=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA (\u30DE\u30C3\u30D4\u30F3\u30B0\u3092\u5909\u66F4\u3059\u308B\u306B\u306FShift\u30AD\u30FC)
+DraggingInfosPopup.allSourceEntriesToASingleOneTargetExpression=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA

main/plugins/org.talend.designer.abstractmap/src/java/main/messages_zh_CN.properties

@@ -6,7 +6,7 @@ prefs.configuration.LINK_STYLE.LINE=\u76F4\u7EBF (\u5FEB)
 DraggingInfosPopup.draggingEntry=\u62D6\u52A8 {0} \u6761\u76EE
 DraggingInfosPopup.dropInvalid=\n<< \u65E0\u6548\u91CA\u653E >>\n
 DraggingInfosPopup.draggingEntries=\u62D6\u52A8 {0} \u4E2A\u6761\u76EE\u3002
-DraggingInfosPopup.dropInvalidWithKey=\n<< \u65E0\u6548\u653E\u7F6E >>\n\u6309\u4F4F Shift \u548C Ctrl \u952E\u4EE5\u8FDB\u884C\u4E00\u5BF9\u4E00\u6620\u5C04\u5E76\u6539\u5199
+DraggingInfosPopup.dropInvalidWithKey=\n<<\u65E0\u6548\u653E\u7F6E>>\n\u6309\u4F4F Shift \u548C Ctrl \u952E\u4EE5\u8FDB\u884C\u4E00\u5BF9\u4E00\u6620\u5C04\u5E76\u6539\u5199
 DraggingInfosPopup.overwriteMode= > \u91CD\u5199\u6A21\u5F0F
 DraggingInfosPopup.appendMode= >\u9644\u52A0\u6A21\u5F0F
 DraggingInfosPopup.appendModeToOverwrite= > \u8FFD\u52A0\u6A21\u5F0F (Ctrl \u952E\u6765\u6539\u5199)

main/plugins/org.talend.designer.abstractmap/src/java/main/org/talend/designer/abstractmap/managers/AbstractUIManager.java

@@ -13,10 +13,6 @@
 package org.talend.designer.abstractmap.managers;
 
 import org.apache.log4j.Level;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.Display;
-import org.talend.commons.ui.runtime.ITalendThemeService;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
 import org.talend.designer.abstractmap.ui.dnd.DraggingInfosPopup;
 import org.talend.designer.abstractmap.ui.properties.LINK_STYLE;

main/plugins/org.talend.designer.abstractmap/src/java/main/org/talend/designer/abstractmap/ui/dnd/DraggingInfosPopup.java

@@ -77,7 +77,7 @@ public final class DraggingInfosPopup {
         private Label labelDropInvalid;
 
         public Popup(Shell parent) {
-            super(parent, SWT.ON_TOP, false, false, false, false, false, null, null);
+            super(parent, SWT.ON_TOP, false, false, false, false, null, null);
         }
 
         @Override

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: 8.0.2.qualifier
+Bundle-Version: 8.8.8.qualifier
 Bundle-Vendor: .Talend SA.
 Require-Bundle: org.eclipse.core.runtime,
  org.talend.core,
@@ -13,8 +13,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.talend.core.runtime,
  org.talend.model,
  org.eclipse.jface,
- org.talend.components.api,
- org.talend.common.ui.runtime,
- org.talend.commons.runtime
+ org.talend.components.api
 Eclipse-LazyStart: true
-Automatic-Module-Name: org.talend.designer.alfrescooutput

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

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

main/plugins/org.talend.designer.alfrescooutput/src/main/java/messages_en.properties

@@ -0,0 +1,20 @@
+AlfrescoModelDialog.missingAspectDefinitions.msg=The chosen aspects refer to unknown Alfresco aspect(s) : ${0}.\nPlease provide the alfresco model files that define them.
+AlfrescoModelDialog.modelTable.title=Title
+AlfrescoModelDialog.availableAspects=Available Aspects
+AlfrescoModelDialog.missingAspectDefinitions.title=Missing aspect definitions
+AlfrescoOutputManager.schemaError.title=Error in schema
+AlfrescoModelDialog.missingTypeDefinitions.msg=The chosen type refers to unknown Alfresco type(s) or aspect(s) : ${0}.\nPlease provide the alfresco model files that define them.
+AlfrescoModelDialog.missingTypeDefinitions.title=Missing type definitions
+AlfrescoModelDialog.add=Add...
+AlfrescoOutputModelManager.errorReadingModel=Error reading Alfresco model file
+AlfrescoModelDialog.aspects=Aspects
+AlfrescoOutputManager.schemaError.msg=Please synchronize schema first
+AlfrescoOutputModelManager.alreadyAdded=This model has already been added
+AlfrescoModelDialog.removeModelFailed=Failed to remove model
+AlfrescoOutputModelManager.prefixConflict=Unable to add the model, prefix conflict with previously added model for
+AlfrescoOutputModelManager.notYetAdded=This model has not yet been added
+AlfrescoModelDialog.type=Type
+AlfrescoModelDialog.addModelFailed=Failed to add model
+AlfrescoModelDialog.modelTable.name=Name
+AlfrescoModelDialog.remove=Remove
+AlfrescoOutputManager.failedLoadModel=Failed to load model from component metadata, reinitializing

main/plugins/org.talend.designer.alfrescooutput/src/main/java/messages_ja.properties

@@ -1,4 +1,4 @@
-AlfrescoOutputManager.failedLoadModel=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30E1\u30BF\u30C7\u30FC\u30BF\u304B\u3089\u30E2\u30C7\u30EB\u30ED\u30FC\u30C9\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002\u518D\u521D\u671F\u5316\u4E2D
+AlfrescoOutputManager.failedLoadModel=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30E1\u30BF\u30C7\u30FC\u30BF\u304B\u3089\u30E2\u30C7\u30EB\u30ED\u30FC\u30C9\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002\u518D\u521D\u671F\u5316\u4E2D,
 AlfrescoOutputManager.schemaError.title=\u30B9\u30AD\u30FC\u30DE\u306E\u30A8\u30E9\u30FC
 AlfrescoOutputManager.schemaError.msg=\u6700\u521D\u306B\u30B9\u30AD\u30FC\u30DE\u3092\u540C\u671F\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 AlfrescoOutputModelManager.alreadyAdded=\u3053\u306E\u30E2\u30C7\u30EB\u306F\u65E2\u306B\u8FFD\u52A0\u6E08\u307F\u3067\u3059\u3002
@@ -13,8 +13,8 @@ AlfrescoModelDialog.addModelFailed=\u30E2\u30C7\u30EB\u8FFD\u52A0\u306B\u5931\u6
 AlfrescoModelDialog.remove=\u524A\u9664
 AlfrescoModelDialog.removeModelFailed=\u30E2\u30C7\u30EB\u306E\u524A\u9664\u306B\u5931\u6557\u3057\u307E\u3057\u305F
 AlfrescoModelDialog.missingTypeDefinitions.title=\u578B\u5B9A\u7FA9\u304C\u3042\u308A\u307E\u305B\u3093
-AlfrescoModelDialog.missingTypeDefinitions.msg=\u9078\u629E\u3055\u308C\u305F\u30BF\u30A4\u30D7\u306F\u3001Alfresco\u306E\u4E0D\u660E\u306A\u30BF\u30A4\u30D7\u307E\u305F\u306F\u30A2\u30B9\u30DA\u30AF\u30C8: ${0}\u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059\u3002\n\u305D\u308C\u3089\u304C\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308Balfresco\u306E\u30E2\u30C7\u30EB\u30D5\u30A1\u30A4\u30EB\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+AlfrescoModelDialog.missingTypeDefinitions.msg=\u9078\u629E\u3057\u305F\u65B9\u306F\u4E0D\u660E\u306EAlfresco\u578B\u3082\u3057\u304F\u306F\u30A2\u30B9\u30DA\u30AF\u30C8: ${0}\u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059\u3002\n\u305D\u308C\u3089\u3092\u5B9A\u7FA9\u3057\u305FAlfresco\u30E2\u30C7\u30EB\u30D5\u30A1\u30A4\u30EB\u3092\u63D0\u4F9B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 AlfrescoModelDialog.missingAspectDefinitions.title=\u30A2\u30B9\u30DA\u30AF\u30C8\u5B9A\u7FA9\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-AlfrescoModelDialog.missingAspectDefinitions.msg=\u9078\u629E\u3055\u308C\u305F\u30A2\u30B9\u30DA\u30AF\u30C8\u306F\u3001Alfresco\u306E\u4E0D\u660E\u306A\u30A2\u30B9\u30DA\u30AF\u30C8: ${0}\u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059\u3002\n\u305D\u308C\u3089\u304C\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308Balfresco\u306E\u30E2\u30C7\u30EB\u30D5\u30A1\u30A4\u30EB\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+AlfrescoModelDialog.missingAspectDefinitions.msg=\u9078\u629E\u3055\u308C\u305F\u30A2\u30B9\u30DA\u30AF\u30C8\u306F\u4E0D\u660E\u306EAlfresco\u30A2\u30B9\u30DA\u30AF\u30C8: ${0}\u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059\u3002\n\u305D\u308C\u3089\u3092\u5B9A\u7FA9\u3057\u305FAlfresco\u30E2\u30C7\u30EB\u30D5\u30A1\u30A4\u30EB\u3092\u63D0\u4F9B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 AlfrescoModelDialog.modelTable.title=\u30BF\u30A4\u30C8\u30EB
 AlfrescoModelDialog.modelTable.name=\u540D\u524D

main/plugins/org.talend.designer.alfrescooutput/src/main/java/messages_zh_CN.properties

@@ -13,8 +13,8 @@ AlfrescoModelDialog.addModelFailed=\u6DFB\u52A0\u6A21\u578B\u5931\u8D25
 AlfrescoModelDialog.remove=\u79FB\u9664
 AlfrescoModelDialog.removeModelFailed=\u79FB\u9664\u6A21\u578B\u5931\u8D25
 AlfrescoModelDialog.missingTypeDefinitions.title=\u7F3A\u7701\u7C7B\u578B\u5B9A\u4E49
-AlfrescoModelDialog.missingTypeDefinitions.msg=\u6240\u9009\u62E9\u7684\u7C7B\u578B\u6D89\u53CA\u672A\u77E5\u7684 Alfresco \u7C7B\u578B\u6216\u65B9\u9762: ${0}\u3002\n\u8BF7\u63D0\u4F9B\u5B9A\u4E49\u8FD9\u4E9B aspect \u7684 Alfresco \u6A21\u578B\u6587\u4EF6\u3002
+AlfrescoModelDialog.missingTypeDefinitions.msg=\u6240\u9009\u62E9\u7684\u7C7B\u578B\u6D89\u53CA\u4E00\u4E2A\u6216\u591A\u4E2A\u672A\u77E5\u7684 Alfresco \u7C7B\u578B\u6216asepct: ${0}.\n \u8BF7\u63D0\u4F9B\u5B9A\u4E49\u8FD9\u4E9B \u7C7B\u578B\u6216 aspect \u7684 Alfresco \u6A21\u578B\u6587\u4EF6\u3002
 AlfrescoModelDialog.missingAspectDefinitions.title=\u7F3A\u7701\u65B9\u9762\u5B9A\u4E49
-AlfrescoModelDialog.missingAspectDefinitions.msg=\u6240\u9009\u62E9\u7684\u65B9\u9762\u6D89\u53CA\u672A\u77E5\u7684Alfresco\u65B9\u9762: ${0}.\n\u8BF7\u63D0\u4F9B\u5B9A\u4E49\u8FD9\u4E9B aspect \u7684 Alfresco \u6A21\u578B\u6587\u4EF6\u3002
+AlfrescoModelDialog.missingAspectDefinitions.msg=\u6240\u9009\u62E9\u7684\u65B9\u9762\u6D89\u53CA\u4E00\u4E2A\u6216\u591A\u4E2A\u672A\u77E5\u7684 Alfresco aspect: ${0}.\n \u8BF7\u63D0\u4F9B\u5B9A\u4E49\u8FD9\u4E9B aspect \u7684 Alfresco \u6A21\u578B\u6587\u4EF6\u3002
 AlfrescoModelDialog.modelTable.title=\u6807\u9898
 AlfrescoModelDialog.modelTable.name=\u540D\u79F0

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: 8.0.2.qualifier
+Bundle-Version: 8.8.8.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.talend.core.repository,
  org.eclipse.emf.codegen,
@@ -24,14 +24,7 @@ Require-Bundle: org.talend.core.repository,
  org.talend.daikon,
  org.talend.daikon.crypto.utils,
  org.talend.designer.core.generic,
- org.talend.updates.runtime,
- org.talend.commons.runtime,
- org.eclipse.equinox.common,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.talend.common.ui.runtime,
- org.eclipse.jface,
- org.talend.core.runtime
+ org.talend.updates.runtime
 Eclipse-LazyStart: true
 Bundle-ClassPath: .
 Export-Package: org.talend.designer.codegen,
@@ -46,4 +39,3 @@ Bundle-Vendor: .Talend SA.
 Bundle-Activator: org.talend.designer.codegen.CodeGeneratorActivator
 Import-Package: org.apache.commons.lang
 Eclipse-BundleShape: dir
-Automatic-Module-Name: org.talend.designer.codegen

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

@@ -90,9 +90,11 @@ if((codePart.equals(ECodePart.END))&&(stat || logstashCurrent)){
 		  		INode source = con.getSource();
 				String sourceNodeId = source.getUniqueName();
 				
-				String sourceNodeLabel = NodeUtil.getLabel(source);
-					
-				String targetNodeLabel = NodeUtil.getLabel(node);
+				String sourceLabel = ElementParameterParser.getValue(source, "__LABEL__");
+				String sourceNodeLabel = ((sourceLabel==null || "__UNIQUE_NAME__".equals(sourceLabel) || sourceLabel.contains("\"")) ? sourceNodeId : sourceLabel.trim());
+				
+				String targetLabel = ElementParameterParser.getValue(node, "__LABEL__");
+				String targetNodeLabel = ((targetLabel==null || "__UNIQUE_NAME__".equals(targetLabel) || targetLabel.contains("\"")) ? node.getUniqueName() : targetLabel.trim());
 				
 				String sourceNodeComponent = source.getComponent().getName();
 	 			for (INode jobStructureCatcher : jobCatcherNodes) {
@@ -122,9 +124,11 @@ if((codePart.equals(ECodePart.END))&&(stat || logstashCurrent)){
 			  		INode source = con.getSource();
 					String sourceNodeId = source.getUniqueName();
 					
-					String sourceNodeLabel = NodeUtil.getLabel(source);
+					String sourceLabel = ElementParameterParser.getValue(source, "__LABEL__");
+					String sourceNodeLabel = ((sourceLabel==null || "__UNIQUE_NAME__".equals(sourceLabel) || sourceLabel.contains("\"")) ? sourceNodeId : sourceLabel.trim());
 					
-					String targetNodeLabel = NodeUtil.getLabel(node);
+					String targetLabel = ElementParameterParser.getValue(node, "__LABEL__");
+					String targetNodeLabel = ((targetLabel==null || "__UNIQUE_NAME__".equals(targetLabel) || targetLabel.contains("\"")) ? node.getUniqueName() : targetLabel.trim());
 					
 					String sourceNodeComponent = source.getComponent().getName();
 		 			for (INode jobStructureCatcher : jobCatcherNodes) {

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

@@ -137,7 +137,7 @@
 	}
 	%>
 	currentComponent="<%=node.getUniqueName() %>";
-	
+
 	<%
 	connSet =  new HashSet<IConnection>();
 	connSet.addAll(node.getIncomingConnections(EConnectionType.FLOW_MAIN));
@@ -155,17 +155,6 @@
 	//about performance monitor, no way to support more than one job catcher component, also that is not necessary
 	final String subprocessName4Catcher = logstashCurrent ? jobCatcherNodes.get(0).getDesignSubjobStartNode().getUniqueName() : null;
 	
-	if(logstashCurrent) {
-		String currentLabel = ElementParameterParser.getValue(node, "__LABEL__");
-		if(currentLabel==null || "".equals(currentLabel) || "__UNIQUE_NAME__".equals(currentLabel) || cid.endsWith(NodeUtil.getLabel(node))) {
-			//not generate the unnecessary statement if label is default one
-		} else {
-		%>
-			cLabel="<%=NodeUtil.getLabel(node)%>";
-		<%
-		}
-	}
-	
 	if ((codePart.equals(ECodePart.BEGIN))&&(stat || logstashCurrent)&&connSet.size()>0) {
 		if(containsTPartitioner) {
 			%>
@@ -207,9 +196,11 @@
 					INode source = con.getSource();
 					String sourceNodeId = source.getUniqueName();
 					
-					String sourceNodeLabel = NodeUtil.getLabel(source);
+					String sourceLabel = ElementParameterParser.getValue(source, "__LABEL__");
+					String sourceNodeLabel = ((sourceLabel==null || "__UNIQUE_NAME__".equals(sourceLabel) || sourceLabel.contains("\"")) ? sourceNodeId : sourceLabel.trim());
 					
-					String targetNodeLabel = NodeUtil.getLabel(node);
+					String targetLabel = ElementParameterParser.getValue(node, "__LABEL__");
+					String targetNodeLabel = ((targetLabel==null || "__UNIQUE_NAME__".equals(targetLabel) || targetLabel.contains("\"")) ? node.getUniqueName() : targetLabel.trim());
 					
 					String sourceNodeComponent = source.getComponent().getName();
 				%>
@@ -241,9 +232,11 @@
 							INode source = con.getSource();
 							String sourceNodeId = source.getUniqueName();
 							
-							String sourceNodeLabel = NodeUtil.getLabel(source);
-					
-							String targetNodeLabel = NodeUtil.getLabel(node);
+							String sourceLabel = ElementParameterParser.getValue(source, "__LABEL__");
+							String sourceNodeLabel = ((sourceLabel==null || "__UNIQUE_NAME__".equals(sourceLabel) || sourceLabel.contains("\"")) ? sourceNodeId : sourceLabel.trim());
+							
+							String targetLabel = ElementParameterParser.getValue(node, "__LABEL__");
+							String targetNodeLabel = ((targetLabel==null || "__UNIQUE_NAME__".equals(targetLabel) || targetLabel.contains("\"")) ? node.getUniqueName() : targetLabel.trim());
 							
 							String sourceNodeComponent = source.getComponent().getName();
 						%>
@@ -266,9 +259,11 @@
 							INode source = con.getSource();
 							String sourceNodeId = source.getUniqueName();
 							
-							String sourceNodeLabel = NodeUtil.getLabel(source);
-					
-							String targetNodeLabel = NodeUtil.getLabel(node);
+							String sourceLabel = ElementParameterParser.getValue(source, "__LABEL__");
+							String sourceNodeLabel = ((sourceLabel==null || "__UNIQUE_NAME__".equals(sourceLabel) || sourceLabel.contains("\"")) ? sourceNodeId : sourceLabel.trim());
+							
+							String targetLabel = ElementParameterParser.getValue(node, "__LABEL__");
+							String targetNodeLabel = ((targetLabel==null || "__UNIQUE_NAME__".equals(targetLabel) || targetLabel.contains("\"")) ? node.getUniqueName() : targetLabel.trim());
 							
 							String sourceNodeComponent = source.getComponent().getName();
 							
@@ -300,9 +295,11 @@
 									INode source = con.getSource();
 									String sourceNodeId = source.getUniqueName();
 									
-									String sourceNodeLabel = NodeUtil.getLabel(source);
+									String sourceLabel = ElementParameterParser.getValue(source, "__LABEL__");
+									String sourceNodeLabel = ((sourceLabel==null || "__UNIQUE_NAME__".equals(sourceLabel) || sourceLabel.contains("\"")) ? sourceNodeId : sourceLabel.trim());
 									
-									String targetNodeLabel = NodeUtil.getLabel(node);
+									String targetLabel = ElementParameterParser.getValue(node, "__LABEL__");
+									String targetNodeLabel = ((targetLabel==null || "__UNIQUE_NAME__".equals(targetLabel) || targetLabel.contains("\"")) ? node.getUniqueName() : targetLabel.trim());
 							
 									String sourceNodeComponent = source.getComponent().getName();
 							
@@ -437,7 +434,8 @@
 		
 		if(logstashCurrent) {
 			for (INode jobStructureCatcher : jobCatcherNodes) {
-				String nodeLabel = NodeUtil.getLabel(node);
+				String label = ElementParameterParser.getValue(node, "__LABEL__");
+				String nodeLabel = ((label==null || "__UNIQUE_NAME__".equals(label) || label.contains("\"")) ? node.getUniqueName() : label.trim());
 			%>
 			if(enableLogStash) {
 				<%=jobStructureCatcher.getUniqueName() %>.addCM("<%=node.getUniqueName()%>", "<%=nodeLabel%>", "<%=node.getComponent().getName()%>");

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

@@ -56,9 +56,8 @@
 	String jobClassPackageFolder = codeGenArgument.getCurrentProjectName().toLowerCase() + '/' + jobFolderName;
 
     boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J_ACTIVATE__"));//log4j enable
-    boolean isLog4j2Enabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J2_ACTIVATE__"));//log4j2 enable
-    boolean isLog4j1Enabled = !isLog4j2Enabled;//log4j1 enable
-    String MDC_CLASS = "org.slf4j.MDC";
+	boolean isLog4j2Enabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J2_ACTIVATE__"));//log4j2 enable
+	boolean isLog4j1Enabled = !isLog4j2Enabled;//log4j1 enable
 
     boolean exist_tParallelize = false;
     List<? extends INode> tParallelizeList = process.getNodesOfType("tParallelize");
@@ -87,12 +86,12 @@
         "tIngresConnection",
         "tInterbaseConnection",
         "tJDBCConnection",
-        "JDBCConnection",
         "tMSSqlConnection",
         "tMysqlConnection",
         "tNetezzaConnection",
         "tOracleConnection",
         "tParAccelConnection",
+        "tPostgresPlusConnection",
         "tPostgresqlConnection",
         "tRedshiftConnection",
         "tSQLiteConnection",
@@ -224,7 +223,7 @@
         public boolean useDatastax(INode node){
             String dbVersion = ElementParameterParser.getValue(node, "__DB_VERSION__");
             String apiType = ElementParameterParser.getValue(node, "__API_TYPE__");
-            return "CASSANDRA_2_2".equals(dbVersion) || "CASSANDRA_3_0".equals(dbVersion) || "CASSANDRA_4_0".equals(dbVersion) || ("CASSANDRA_2_0_0".equals(dbVersion) && "DATASTAX".equals(apiType));
+            return "CASSANDRA_2_2".equals(dbVersion) || "CASSANDRA_3_0".equals(dbVersion) || ("CASSANDRA_2_0_0".equals(dbVersion) && "DATASTAX".equals(apiType));
         }
     }
 %>
@@ -322,11 +321,6 @@
     	globalMap.put(GLOBAL_CONNECTION_POOL_KEY, connectionPool);
     }
     <%}%>
-    
-    private final static java.util.Properties jobInfo = new java.util.Properties();
-    private final static java.util.Map<String,String> mdcInfo = new java.util.HashMap<>();
-    private final static java.util.concurrent.atomic.AtomicLong subJobPidCounter = new java.util.concurrent.atomic.AtomicLong();
-
 
     public static void main(String[] args){
         final <%=className %> <%=className %>Class = new <%=className %>();
@@ -340,42 +334,6 @@
 
         System.exit(exitCode);
     }
-	
-
-	
-	
-	private void getjobInfo() {
-		final String TEMPLATE_PATH = "src/main/templates/jobInfo_template.properties";
-		final String BUILD_PATH = "../jobInfo.properties";
-		final String path = this.getClass().getResource("").getPath();
-		if(path.lastIndexOf("target") > 0) {
-			final java.io.File templateFile = new java.io.File(
-					path.substring(0, path.lastIndexOf("target")).concat(TEMPLATE_PATH));
-			if (templateFile.exists()) {
-				readJobInfo(templateFile);
-				return;
-			}
-		}
-			readJobInfo(new java.io.File(BUILD_PATH));
-	}
-
-    private void readJobInfo(java.io.File jobInfoFile){
-	
-        if(jobInfoFile.exists()) {
-            try (java.io.InputStream is = new java.io.FileInputStream(jobInfoFile)) {
-            	jobInfo.load(is);
-            } catch (IOException e) {
-            	 <%if(isLog4jEnabled){%>
-                log.debug("Read jobInfo.properties file fail: " + e.getMessage());
-                <%}%>
-                
-            }
-        }
-            <%if(isLog4jEnabled){%>
-		log.info(String.format("Project name: %s\tJob name: %s\tGIT Commit ID: %s\tTalend Version: %s",
-				projectName,jobName,jobInfo.getProperty("gitCommitId"), "<%=System.getProperties().getProperty("talend.studio.version")%>"));
-		<%}%>
-    }
 
    <%
     if (isTestContainer) {
@@ -556,61 +514,17 @@
 				}
 				org.apache.logging.log4j.core.config.Configurator.setLevel(org.apache.logging.log4j.LogManager.getRootLogger().getName(), log.getLevel());
 				<%}%>
-			}
-
-	        getjobInfo();
-			log.info("TalendJob: '<%=codeGenArgument.getJobName()%>' - Start.");
-		<%}%>
-
-            <%if(isLog4jEnabled && isLog4j2Enabled) {%>
-                java.util.Set<Object> jobInfoKeys = jobInfo.keySet();
-                for(Object jobInfoKey: jobInfoKeys) {
-                    <%=MDC_CLASS%>.put("_" + jobInfoKey.toString(), jobInfo.get(jobInfoKey).toString());
-                }
-                <%=MDC_CLASS%>.put("_pid", pid);
-                <%=MDC_CLASS%>.put("_rootPid", rootPid);
-                <%=MDC_CLASS%>.put("_fatherPid", fatherPid);
-                <%=MDC_CLASS%>.put("_projectName", projectName);
-                <%=MDC_CLASS%>.put("_startTimestamp",java.time.ZonedDateTime.now(java.time.ZoneOffset.UTC ).format( java.time.format.DateTimeFormatter.ISO_INSTANT ));
-                <%=MDC_CLASS%>.put("_jobRepositoryId","<%=process.getId() %>");
-                <%=MDC_CLASS%>.put("_compiledAtTimestamp","<%=java.time.ZonedDateTime.now(java.time.ZoneOffset.UTC ).format( java.time.format.DateTimeFormatter.ISO_INSTANT )%>");
-
-                java.lang.management.RuntimeMXBean mx = java.lang.management.ManagementFactory.getRuntimeMXBean();
-                String[] mxNameTable = mx.getName().split("@"); //$NON-NLS-1$
-                if (mxNameTable.length == 2) {
-                    <%=MDC_CLASS%>.put("_systemPid", mxNameTable[0]);
-                } else {
-                    <%=MDC_CLASS%>.put("_systemPid", String.valueOf(java.lang.Thread.currentThread().getId()));
-                }
-
-                <%
-            }%>
-		
-		<%
-		INode jobCatcherNode = null;
-		
-		int threadPoolSize = 0;
-		boolean tRESTRequestLoopExists = false;
+    	    }
+        	log.info("TalendJob: '<%=codeGenArgument.getJobName()%>' - Start.");
+    	<%}%>
+    	
+    	<%
+    	INode jobCatcherNode = null;
 		for (INode nodeInProcess : process.getGeneratingNodes()) {
 			String componentName = nodeInProcess.getComponent().getName();
-
-			if(jobCatcherNode==null && "tJobStructureCatcher".equals(componentName)) {
+			if("tJobStructureCatcher".equals(componentName)) {
 				jobCatcherNode = nodeInProcess;
-				continue;
-			}
-
-			if(!nodeInProcess.isActivate()) continue;
-
-			if("tRESTRequestLoop".equals(componentName)) {
-				tRESTRequestLoopExists = true;
-				continue;
-			}
-			
-			if("tWriteXMLFieldOut".equals(componentName)) {
-				IConnection nextMergeConn = NodeUtil.getNextMergeConnection(nodeInProcess);
-				if(nextMergeConn == null || nextMergeConn.getInputId()==1){
-					threadPoolSize++;
-				}
+				break;
 			}
 		}
 		
@@ -710,26 +624,14 @@
             pid = TalendString.getAsciiRandomString(6);
         }
 
-        <%if(isLog4jEnabled && isLog4j2Enabled) {%>
-            <%=MDC_CLASS%>.put("_pid", pid);
-        <%}%>
-
         if (rootPid==null) {
             rootPid = pid;
         }
-
-        <%if(isLog4jEnabled && isLog4j2Enabled) {%>
-            <%=MDC_CLASS%>.put("_rootPid", rootPid);
-        <%}%>
-
         if (fatherPid==null) {
             fatherPid = pid;
         }else{
             isChildJob = true;
         }
-        <%if(isLog4jEnabled && isLog4j2Enabled) {%>
-            <%=MDC_CLASS%>.put("_fatherPid", fatherPid);
-        <%}%>
 
 <%
         if (stats) {
@@ -749,15 +651,15 @@
 %>
         boolean inOSGi = routines.system.BundleUtils.inOSGi();
 
-        try {
-            java.util.Dictionary<String, Object> jobProperties = null;
-            if (inOSGi) {
-                jobProperties = routines.system.BundleUtils.getJobProperties(jobName);
-    
-                if (jobProperties != null && jobProperties.get("context") != null) {
-                    contextStr = (String)jobProperties.get("context");
-                }
+        if (inOSGi) {
+            java.util.Dictionary<String, Object> jobProperties = routines.system.BundleUtils.getJobProperties(jobName);
+
+            if (jobProperties != null && jobProperties.get("context") != null) {
+                contextStr = (String)jobProperties.get("context");
             }
+        }
+
+        try {
             //call job/subjob with an existing context, like: --context=production. if without this parameter, there will use the default context instead.
             java.io.InputStream inContext = <%=className%>.class.getClassLoader().getResourceAsStream("<%=jobClassPackageFolder%>/contexts/" + contextStr + ".properties");
             if (inContext == null) {
@@ -767,17 +669,8 @@
                 try {
                     //defaultProps is in order to keep the original context value
                     if(context != null && context.isEmpty()) {
-    	                defaultProps.load(inContext);
-    	                if (inOSGi && jobProperties != null) {
-                             java.util.Enumeration<String> keys = jobProperties.keys();
-                             while (keys.hasMoreElements()) {
-                                 String propKey = keys.nextElement();
-                                 if (defaultProps.containsKey(propKey)) {
-                                     defaultProps.put(propKey, (String) jobProperties.get(propKey));
-                                 }
-                             }
-    	                }
-    	                context = new ContextProperties(defaultProps);
+	                defaultProps.load(inContext);
+	                context = new ContextProperties(defaultProps);
                     }
                 } finally {
                     inContext.close();
@@ -786,7 +679,7 @@
                 //print info and job continue to run, for case: context_param is not empty.
                 System.err.println("Could not find the context " + contextStr);
             }
-            
+
             if(!context_param.isEmpty()) {
                 context.putAll(context_param);
 				//set types for params from parentJobs
@@ -963,13 +856,7 @@
         }
 %>
         //Resume: jobStart
-        resumeUtil.addLog("JOB_STARTED", "JOB:" + jobName, parent_part_launcher, Thread.currentThread().getId() + "", "","","","",resumeUtil.convertToJsonText(context,ContextProperties.class,parametersToEncrypt));
-
-        <%if(isLog4jEnabled && isLog4j2Enabled) {%>
-            <%=MDC_CLASS%>.put("_context", contextStr);
-            log.info("TalendJob: '<%=codeGenArgument.getJobName()%>' - Started.");
-            java.util.Optional.ofNullable(<%=MDC_CLASS%>.getCopyOfContextMap()).ifPresent(mdcInfo::putAll);
-        <%}%>
+        resumeUtil.addLog("JOB_STARTED", "JOB:" + jobName, parent_part_launcher, Thread.currentThread().getId() + "", "","","","",resumeUtil.convertToJsonText(context,parametersToEncrypt));
 
 <%
         if (stats) {
@@ -1180,10 +1067,6 @@ this.globalResumeTicket = false;//to run others jobs
         runningThreadCount.add(1);
         new Thread(){
             public void run() {
-                <%if(isLog4jEnabled && isLog4j2Enabled) {%>
-                    mdcInfo.forEach(<%=MDC_CLASS%>::put);
-                <% } %>
-
                 java.util.Map threadRunResultMap = new java.util.HashMap();
                 threadRunResultMap.put("errorCode", null);
                 threadRunResultMap.put("status", "");
@@ -1246,15 +1129,9 @@ this.globalResumeTicket = false;//to run others jobs
             if (!componentName.equals("tJobStructureCatcher") && !componentName.equals("tLogCatcher") && !componentName.equals("tFlowMeterCatcher") && !componentName.equals("tAssertCatcher") && !componentName.equals("tStatCatcher") && !componentName.equals("tAsyncIn")) {
 %>
 <%=createCallProcess(rootNode, className, false) %>
-<%
-                if (process.getNodesOfType("tStatCatcher").size() > 0) {
-%>
-<%=statsErrorHandlingAfterMainCall(rootNode, process.getNodesOfType("tStatCatcher"))%>
-<%
-                }
-            }
-        }
-    }// end if(isRunInMultiThread)
+<%    }
+    }
+}// end if(isRunInMultiThread)
 %>
 
 this.globalResumeTicket = true;//to run tPostJob
@@ -1312,26 +1189,6 @@ this.globalResumeTicket = true;//to run tPostJob
 	            e.printStackTrace();
 	        }
         }
-<%
-    }
-
-    //tRESTRequest may appear in microservice, the code may be called before call submit(task) method, so can't shutdown it here
-    if(!tRESTRequestLoopExists && threadPoolSize>0) {
-%>
-        es.shutdown();
-        <%//shutdownNow should never be executed, only for safe%>
-        try {
-            if(!es.awaitTermination(60, java.util.concurrent.TimeUnit.SECONDS)) {
-                es.shutdownNow();
-                if(!es.awaitTermination(60, java.util.concurrent.TimeUnit.SECONDS)) {
-
-                }
-            }
-        } catch (java.lang.InterruptedException ie) {
-            es.shutdownNow();
-        } catch (java.lang.Exception e) {
-
-        }
 <%
     }
 %>
@@ -1388,15 +1245,6 @@ if (execStat) {
          returnCode = errorCode.intValue();
     }
     resumeUtil.addLog("JOB_ENDED", "JOB:" + jobName, parent_part_launcher, Thread.currentThread().getId() + "", "","" + returnCode,"","","");
-    resumeUtil.flush();
-
-    <%if(isLog4jEnabled && isLog4j2Enabled) {%>
-
-        <%=MDC_CLASS%>.remove("_subJobName");
-        <%=MDC_CLASS%>.remove("_subJobPid");
-        <%=MDC_CLASS%>.remove("_systemPid");
-        log.info("TalendJob: '<%=codeGenArgument.getJobName()%>' - Finished - status: " + status + " returnCode: " + returnCode );
-    <%}%>
 
     return returnCode;
 
@@ -1512,27 +1360,16 @@ if (execStat) {
             Object obj_cluster;
             Object obj_conn;
 <%  for (INode cassandraDbNode : cassandraComponentsList) {
-		String dbVersionCassandra = ElementParameterParser.getValue(cassandraDbNode, "__DB_VERSION__");
-        if((new API_selector()).useDatastax(cassandraDbNode)) { 
-			if("CASSANDRA_4_0".equals(dbVersionCassandra)) {
-			%>
-				obj_conn = globalMap.remove("connection_<%=cassandraDbNode.getUniqueName()%>");if(obj_conn != null) {
-					((com.datastax.oss.driver.api.core.CqlSession) obj_conn).close();
-				}
-			<%
-			} else {
-			%>
-				obj_cluster = globalMap.remove("cluster_<%=cassandraDbNode.getUniqueName()%>");
-				obj_conn = globalMap.remove("connection_<%=cassandraDbNode.getUniqueName()%>");
-				if(obj_conn != null) {
-					((com.datastax.driver.core.Session) obj_conn).close();
-				}
-				if(obj_cluster != null) {
-					((com.datastax.driver.core.Cluster) obj_cluster).close();
-				}
-			<%
-			}
-		} else { %>
+        if((new API_selector()).useDatastax(cassandraDbNode)) { %>
+            obj_cluster = globalMap.remove("cluster_<%=cassandraDbNode.getUniqueName()%>");
+            obj_conn = globalMap.remove("connection_<%=cassandraDbNode.getUniqueName()%>");
+            if(obj_conn != null) {
+                ((com.datastax.driver.core.Session) obj_conn).close();
+            }
+            if(obj_cluster != null) {
+                ((com.datastax.driver.core.Cluster) obj_cluster).close();
+            }
+<%      } else { %>
             obj_conn = globalMap.remove("cluster_<%=cassandraDbNode.getUniqueName()%>");
             if(obj_conn!=null) {
                 ((me.prettyprint.hector.api.Cluster) obj_conn).getConnectionManager().shutdown();
@@ -1870,31 +1707,6 @@ if (execStat) {
                     context_param.put(keyValue.substring(0, index), keyValue.substring(index + 1) );
                 }
             }
-        } else if (arg.startsWith("--context_file")) {
-        	String keyValue = arg.substring(15);
-        	String filePath = new String(java.util.Base64.getDecoder().decode(keyValue));
-        	java.nio.file.Path contextFile = java.nio.file.Paths.get(filePath);
-            try (java.io.BufferedReader reader = java.nio.file.Files.newBufferedReader(contextFile)) {
-                String line;
-                while ((line = reader.readLine()) != null) {
-                    int index = -1;
-                    if ( (index = line.indexOf('=')) > -1) {
-							if (line.startsWith("--context_param")) {
-								if ("id_Password".equals(context_param.getContextType(line.substring(16, index)))) {
-									context_param.put(line.substring(16, index), routines.system.PasswordEncryptUtil.decryptPassword(
-											line.substring(index + 1)));
-								} else {
-									context_param.put(line.substring(16, index), line.substring(index + 1));
-								}
-							}else {//--context_type
-								context_param.setContextType(line.substring(15, index), line.substring(index + 1));
-							}
-                    }
-                }
-            } catch (java.io.IOException e) {
-            	System.err.println("Could not load the context file: " + filePath);
-                e.printStackTrace();
-            }
         } else if (arg.startsWith("--log4jLevel=")) {
             log4jLevel = arg.substring(13);
 		} else if (arg.startsWith("--audit.enabled") && arg.contains("=")) {//for trunjob call

main/plugins/org.talend.designer.codegen/jet_stub/footer_java.skeleton

@@ -42,10 +42,10 @@ public class CLASS
       
        //List< ? extends IConnection> onSubJobErrorConns = rootNode.getOutgoingConnections(EConnectionType.ON_SUBJOB_ERROR);
        //if(onSubJobErrorConns!=null){
-       //    for(IConnection conn : onSubJobErrorConns) {
+       //    for(IConnection conn : onSubJobErrorConns) {               
        //        toReturn += createCallProcess(conn.getTarget(),  className, isMultiThread);
        //    }
-       //}
+       //}            
         if(isMultiThread){
             toReturn += "\n}catch (java.lang.Error e_" + rootNode.getUniqueName() + ") {\n";
             toReturn += "globalMap.put(\""+rootNode.getUniqueName()+ "_SUBPROCESS_STATE\", -1);\n";
@@ -55,20 +55,7 @@ public class CLASS
        toReturn += "\n}"; 
        return toReturn;
     }
-
-    public String statsErrorHandlingAfterMainCall(INode rootNode, List<? extends INode> statsNodes) {
-        String catchErrorReturn = "catch (Error error_" + rootNode.getUniqueName() + " ) {\n";
-        catchErrorReturn+="end = System.currentTimeMillis();\n";
-        for (INode statCatcherNode : statsNodes) {
-            catchErrorReturn += statCatcherNode.getUniqueName() + ".addMessage(\"failure\", (end-startTime));\n";
-            catchErrorReturn += "try {\n " + statCatcherNode.getDesignSubjobStartNode().getUniqueName() + "Process(globalMap);\n";
-            catchErrorReturn += "} catch (Exception e_" + statCatcherNode.getUniqueName() + ") {\n";
-            catchErrorReturn += "e_" + statCatcherNode.getUniqueName() + ".printStackTrace();\n}\n";
-        }
-        catchErrorReturn+= "throw error_" + rootNode.getUniqueName() + ";\n}\n";
-        return catchErrorReturn;
-    }
-
+		 
     public String generate(Object argument) {
         return "";
     }

main/plugins/org.talend.designer.codegen/jet_stub/generic/component_util_indexedrecord_to_rowstruct.javajet

@@ -170,8 +170,16 @@ 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%>.addColumnValue(dynamicValueEntry_<%=cid%>.getValue());
+                    <%=codeVarDynamic%>.setColumnValue(<%=codeVarDynamic%>.getIndex(dynamicValueEntry_<%=cid%>.getKey()), dynamicValueEntry_<%=cid%>.getValue());
                 }
                 <%=codeVarRowStruct%>.<%=dynamicColName%> = <%=codeVarDynamic%>;
             <%

main/plugins/org.talend.designer.codegen/jet_stub/generic/component_util_process_properties.javajet

@@ -138,7 +138,7 @@
  		                    SchemaSettingTool_<%=cid%>_<%=schemaIndex%>_<%=classNameTail%> sst_<%=cid%>_<%=schemaIndex%>_<%=classNameTail%> = new SchemaSettingTool_<%=cid%>_<%=schemaIndex%>_<%=classNameTail%>();
  		                    
  		                    props_<%=cid %><%=propInfo.fieldName%>.setValue("<%=property.getName()%>",
- 		                        new org.apache.avro.Schema.Parser().setValidateDefaults(false).parse(sst_<%=cid%>_<%=schemaIndex%>_<%=classNameTail%>.getSchemaValue()));
+ 		                        new org.apache.avro.Schema.Parser().parse(sst_<%=cid%>_<%=schemaIndex%>_<%=classNameTail%>.getSchemaValue()));
  		                    <%
  		                } else if (!(value instanceof String) || !((String)value).equals("")) {
  		                    %>

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

@@ -36,15 +36,6 @@
 	boolean stats = codeGenArgument.isStatistics();
 	boolean trace = codeGenArgument.isTrace();
 	boolean isRunInMultiThread = codeGenArgument.getIsRunInMultiThread();
-	
-	boolean exportTypeSpringBoot = false;
-	if (process instanceof org.talend.core.model.process.IProcess2) {
-            org.talend.core.model.process.IProcess2 p2 = (org.talend.core.model.process.IProcess2) process;
-	    if (p2.getProperty() != null && p2.getProperty().getAdditionalProperties() != null) {
-	        exportTypeSpringBoot = "REST_MS".equals(p2.getProperty().getAdditionalProperties().get(org.talend.core.runtime.process.TalendProcessArgumentConstant.ARG_BUILD_TYPE));
-	    } 
-	}
-
 	List<IContextParameter> params = new ArrayList<IContextParameter>();
 	params=process.getContextManager().getDefaultContext().getContextParameterList();
 	String className = process.getName();
@@ -150,8 +141,7 @@ for (INode node : process.getNodesOfType("tRESTClient")) {
     }
 }
 
-boolean isChildRouteJob = !process.getNodesOfType("tRouteInput").isEmpty();
-boolean talendEsbJobFactory = actAsProvider || isChildRouteJob;
+boolean talendEsbJobFactory = actAsProvider || !process.getNodesOfType("tRouteInput").isEmpty();
 boolean talendEsbJob = talendEsbJobFactory || actAsConsumer || ProcessorUtilities.isEsbJob(process);
 
 boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J_ACTIVATE__"));//log4j enable
@@ -255,11 +245,6 @@ if(isRunInMultiThread){
 
 	<%//uft-8 is for temp file, for example: tSortRow, tMap. Because they need keep reversibility.%>
 	private final static String utf8Charset = "UTF-8";
-
-<%
-if(!exportTypeSpringBoot || isChildRouteJob){
-%>	
-
 	//contains type for every context property
 	public class PropertiesWithType extends java.util.Properties {
 		private static final long serialVersionUID = 1L;
@@ -280,16 +265,9 @@ if(!exportTypeSpringBoot || isChildRouteJob){
 			return propertyTypes.get(key);
 		}
 	}
-<%
-}
-%>	
+	
 	// create and load default properties
 	private java.util.Properties defaultProps = new java.util.Properties();
-	
-<%
-if(!exportTypeSpringBoot){
-%>	
-
 	// create application properties with default
 	public class ContextProperties extends PropertiesWithType {
 
@@ -355,10 +333,6 @@ public <%=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true)%> get<%=Ch
 		}
 %>
 	}
-	
-<%
-}
-%>		
 	protected ContextProperties context = new ContextProperties(); // will be instanciated by MS.
 	public ContextProperties getContext() {
 		return this.context;
@@ -369,10 +343,6 @@ public <%=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true)%> get<%=Ch
 	public Integer errorCode = null;
 	private String currentComponent = "";
 	<%
-	// is necessary? avoid some compiler issue as var name not found? TODO consider remove it, also the currentComponent above
-	%>
-	private String cLabel =  null;
-	<%
 	//tParallelize will wrap globalMap with synchronizedMap
 	if(isRunInMultiThread || NodeUtil.containsMultiThreadComponent(process)){
 	%>
@@ -415,101 +385,11 @@ public <%=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true)%> get<%=Ch
 
 <%
 	INode jobCatcherNode = null;
-
-	//one matched component or part, one thread
-	//why not computed by cpu or resource : please image this case : 
-	//loop==>(input==>(twritexmlfield A)==>(twritexmlfield B)==>(twritexmlfield C)==>output), dead lock as cycle dependency and only one thead in thread pool
-	//maybe newCachedThreadPool is a better idea,  but that have risk for creating more threads, then more memory for TDI-47230
-	//why not generate thread pool object in subprocess scope : 
-	// 1: major reason : difficult to control the var scope, somewhere can't access it, then compiler issue
-	// 2: we may need this thread pool for bigger scope, not only for twritexmlfield/twritejsonfield in future
-	// 3: we don't suppose this thread pool cost big resource after all tasks done, so we can shutdown it more later,
-	//		for example, most time, user will use less than 3 twritexmlfield in one job, then 3 threads thread pool, we can close them in job finish code part, 
-	//		not a big cost to keep that. And of course, we best to start&clean it in subprocess finish, but that's risk of 1 above.
-	int threadPoolSize = 0;
-	boolean tHMapExists = false;
-	boolean tHMapOutExists = false;
-	boolean tRESTRequestLoopExists = false;
 	for (INode nodeInProcess : processNodes) {
 		String componentName = nodeInProcess.getComponent().getName();
-
-		if(jobCatcherNode==null && "tJobStructureCatcher".equals(componentName)) {
+		if("tJobStructureCatcher".equals(componentName)) {
 			jobCatcherNode = nodeInProcess;
-			continue;
-		}
-
-		if(!nodeInProcess.isActivate()) continue;
-
-		if("tHMap".equals(componentName)) {
-			tHMapExists = true;
-			continue;
-		}
-
-		if("tHMapOut".equals(componentName)) {
-			tHMapOutExists = true;
-			continue;
-		}
-
-		if("tRESTRequestLoop".equals(componentName)) {
-			tRESTRequestLoopExists = true;
-			continue;
-		}
-		
-		if("tWriteXMLFieldOut".equals(componentName)) {
-			IConnection nextMergeConn = NodeUtil.getNextMergeConnection(nodeInProcess);
-			if(nextMergeConn == null || nextMergeConn.getInputId()==1){
-				threadPoolSize++;
-			}
-		}
-	}
-
-	if(threadPoolSize>0) {
-		if(tRESTRequestLoopExists) {//miscroservice
-%>
-			private class DaemonThreadFactory implements java.util.concurrent.ThreadFactory {
-				java.util.concurrent.ThreadFactory factory = java.util.concurrent.Executors.defaultThreadFactory();
-				
-				public java.lang.Thread newThread(java.lang.Runnable r) {
-					java.lang.Thread t = factory.newThread(r);
-					t.setDaemon(true);
-					return t;
-				}
-			}
-<%
-		}
-
-		if(tHMapExists || tHMapOutExists) {
-%>
-private final java.util.concurrent.ExecutorService es = java.util.concurrent.Executors.newFixedThreadPool(<%=threadPoolSize%> <%if(tRESTRequestLoopExists) {%>,new DaemonThreadFactory()<%}%>);
-<%
-		} else {
-%>
-private final java.util.concurrent.ExecutorService es = java.util.concurrent.Executors.newCachedThreadPool(<%if(tRESTRequestLoopExists) {%>new DaemonThreadFactory()<%}%>);
-<%
-		}
-
-		if(tRESTRequestLoopExists) {//miscroservice
-%>
-		{
-			java.lang.Runtime.getRuntime().addShutdownHook(new java.lang.Thread() {
-				public void run() {
-					es.shutdown();
-					try {
-						if(!es.awaitTermination(60, java.util.concurrent.TimeUnit.SECONDS)) {
-							es.shutdownNow();
-							if(!es.awaitTermination(60, java.util.concurrent.TimeUnit.SECONDS)) {
-
-							}
-						}
-					} catch (java.lang.InterruptedException ie) {
-						es.shutdownNow();
-					} catch (java.lang.Exception e) {
-
-					}
-				}
-			});
-		}
-<%
+			break;
 		}
 	}
 	
@@ -627,10 +507,7 @@ private class TalendException extends Exception {
 
 	private java.util.Map<String, Object> globalMap = null;
 	private Exception e = null;
-	
 	private String currentComponent = null;
-	private String cLabel =  null;
-	
 	private String virtualComponentName = null;
 	
 	public void setVirtualComponentName (String virtualComponentName){
@@ -642,11 +519,6 @@ private class TalendException extends Exception {
 		this.globalMap = globalMap;
 		this.e = e;
 	}
-	
-	private TalendException(Exception e, String errorComponent, String errorComponentLabel, final java.util.Map<String, Object> globalMap) {
-		this(e, errorComponent, globalMap);
-		this.cLabel = errorComponentLabel;
-	}
 
 	public Exception getException() {
 		return this.e;
@@ -706,15 +578,6 @@ private class TalendException extends Exception {
 <%
 		boolean needCatchTalendException = false;
 		
-		if(enableLogStash) {
-%>
-		if(enableLogStash) {
-			<%=jobCatcherNode.getUniqueName() %>.addJobExceptionMessage(currentComponent, cLabel, null, e);
-			<%=jobCatcherNode.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
-		}
-<%
-		}
-		
 		if (process.getNodesOfType("tLogCatcher").size() > 0) {
 			List<INode> logCatchers = (List<INode>)process.getNodesOfType("tLogCatcher");
 			for (INode logCatcher : logCatchers) {
@@ -725,7 +588,7 @@ private class TalendException extends Exception {
 <%
 				}
 			}
-			
+
 			INode virtualNCatchNode = null;
 			boolean hasRealCatchNode = false;
 			for (INode logCatcher : logCatchers) {

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

@@ -71,7 +71,7 @@
 								}
 							}					
 				            		            
-		                    TalendException te = new TalendException(e, currentComponent, cLabel, globalMap);
+		                    TalendException te = new TalendException(e, currentComponent, globalMap);
 							<%
 							if(NodeUtil.hasVirtualComponent(subTree.getNodes())){
 							%>

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

@@ -30,10 +30,6 @@ boolean containsTPartitioner = node.getProcess().getNodesOfType("tPartitioner").
 boolean isRunJob = "tRunJob".equals(node.getComponent().getName());
 IProcess process = node.getProcess();
 
-final boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J_ACTIVATE__"));
-final boolean isLog4j2Enabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J2_ACTIVATE__"));//log4j2 enable
-final String MDC_CLASS = "org.slf4j.MDC";
-
 boolean isTestContainer=ProcessUtils.isTestContainer(process);
 String className = process.getName();
 if (isTestContainer) {
@@ -195,11 +191,8 @@ for (IConnection iterateConn : iterateConnSet) { //1
 				}
 
 
-				public void run() {
-					<% if(isLog4jEnabled && isLog4j2Enabled) { %>
-						mdcInfo.forEach(<%=MDC_CLASS%>::put);
-					<% } %>
-
+				public void run() {		
+		
 					java.util.Map threadRunResultMap = new java.util.HashMap();
 					threadRunResultMap.put("errorCode", null);
 					threadRunResultMap.put("status", "");
@@ -207,7 +200,6 @@ for (IConnection iterateConn : iterateConnSet) { //1
 					
 					this.isRunning = true;
 					String currentComponent = "";
-					String cLabel = null;
 					java.util.Map<String, Object> resourceMap = new java.util.HashMap<String, Object>();
 					<%
 					if(NodeUtil.hasVirtualComponent(subTree.getNodes())){

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

@@ -67,7 +67,7 @@
 								this.errorCode = localErrorCode;
 							}
 						}					
-			            pool.setErrorThread(this, new TalendException(e, currentComponent, cLabel, globalMap));
+			            pool.setErrorThread(this, new TalendException(e, currentComponent, globalMap));
 			            //pool.setErrorThread(this,e);
 			            pool.stopAllThreads();
 					}finally{
@@ -117,7 +117,7 @@
 		} catch (InterruptedException e) {
 			e.printStackTrace();
 		} catch (java.lang.Exception te) {
-			throw new TalendException(te, currentComponent, cLabel, globalMap);
+			throw new TalendException(te, currentComponent, globalMap);
 		}
 	<%
 	}else{
@@ -228,7 +228,7 @@
 				<%
 				}
 				%>
-				TalendException te = new TalendException(e, currentComponent, cLabel, globalMap);
+				TalendException te = new TalendException(e, currentComponent, globalMap);
 				<%
 				if(NodeUtil.hasVirtualComponent(subTree.getNodes())){
 				%>

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

@@ -20,7 +20,6 @@
 		org.talend.core.model.process.IHashConfiguration
 		org.talend.core.model.process.IHashableColumn
 		org.talend.core.model.utils.NodeUtil
-		org.talend.core.model.utils.TalendTextUtils
 	"
 	class="SubProcessHeader"
 	skeleton="subprocess_header_java.skeleton"
@@ -32,8 +31,6 @@
 	boolean stat = codeGenArgument.isStatistics();
 	boolean containsTPartitioner = subTree.getRootNode().getProcess().getNodesOfType("tPartitioner").size() > 0 ? true : false;
     boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(subTree.getRootNode().getProcess(), "__LOG4J_ACTIVATE__"));
-    boolean isLog4j2Enabled = ("true").equals(ElementParameterParser.getValue(subTree.getRootNode().getProcess(), "__LOG4J2_ACTIVATE__"));//log4j2 enable
-    String MDC_CLASS = "org.slf4j.MDC";
 %>
 
 <%
@@ -186,48 +183,6 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 				public <%= typeToGenerate %> get<%=column.getLabel().substring(0, 1).toUpperCase()%><%=column.getLabel().substring(1)%> () {
 					return this.<%=column.getLabel()%>;
 				}
-
-				public Boolean <%=column.getLabel()%>IsNullable(){
-				    return <%=column.isNullable()%>;
-				}
-				public Boolean <%=column.getLabel()%>IsKey(){
-				    return <%=column.isKey()%>;
-				}
-				public Integer <%=column.getLabel()%>Length(){
-				    return <%=column.getLength()%>;
-				}
-				public Integer <%=column.getLabel()%>Precision(){
-				    return <%=column.getPrecision()%>;
-				}
-				public String <%=column.getLabel()%>Default(){
-				<% if (column.getDefault() == null) { %>
-					return null;
-				<% } else { %>
-					return "<%=TalendTextUtils.escapeJavaText(TalendTextUtils.removeQuotes(column.getDefault()))%>";
-				<% } %>
-				}
-				public String <%=column.getLabel()%>Comment(){
-				<% if (column.getComment() == null) { %>
-				    return null;
-				<% } else { %>
-				    return "<%=TalendTextUtils.escapeJavaText(TalendTextUtils.removeQuotes(column.getComment()))%>";
-				<% } %>
-				}
-				public String <%=column.getLabel()%>Pattern(){
-				<% if (column.getPattern() == null) { %>
-				    return null;
-				<% } else { %>
-					return "<%=TalendTextUtils.escapeJavaText(TalendTextUtils.removeQuotes(column.getPattern()))%>";
-				<% } %>
-				}
-				public String <%=column.getLabel()%>OriginalDbColumnName(){
-				<% if (column.getOriginalDbColumnName() == null) { %>
-				    return null;
-				<% } else { %>
-					return "<%=TalendTextUtils.escapeJavaText(column.getOriginalDbColumnName())%>";
-				<% } %>
-				}
-
 				<%
 				if((conn.getLineStyle() == EConnectionType.FLOW_REF) && conn.getTarget().getUniqueName().startsWith("tXMLMap") && "id_Document".equals(javaType.getId())) {
 				%>
@@ -1098,8 +1053,7 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 					<%
 				} else if(javaType.isObjectBased() || typeToGenerate.equals("Geometry") || typeToGenerate.equals("Dynamic")) {
 					%>
-						dos.clearInstanceCache();
-						dos.writeObject(this.<%=column.getLabel() %>);
+       			    	dos.writeObject(this.<%=column.getLabel() %>);
 					<%
 				} else {
 					typeToGenerate =JavaTypesManager.getTypeToGenerate(column.getTalendType(), false);
@@ -1431,8 +1385,7 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 					<%
 				} else if(typeToGenerate.equals("Object") || typeToGenerate.equals("Geometry") || typeToGenerate.equals("BigDecimal") || typeToGenerate.equals("List") || typeToGenerate.equals("Dynamic") || typeToGenerate.equals("Document")) {
 					%>
-						objectOut.clearInstanceCache();
-						objectOut.writeObject(this.<%=column.getLabel() %>);
+       			    	objectOut.writeObject(this.<%=column.getLabel() %>);
 					<%
 				} else {
 					typeToGenerate =JavaTypesManager.getTypeToGenerate(column.getTalendType(), false);
@@ -1597,7 +1550,6 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 				}
 	}
 %>
-
 <% if (subTree.isMethodSizeNeeded()){ %>
 /**
  * Start of Function: <%=subTree.getName() %>Process.
@@ -1608,12 +1560,6 @@ public void <%=subTree.getName() %>Process(final java.util.Map<String, Object> g
 	globalMap.put("<%=subTree.getName() %>_SUBPROCESS_STATE", 0);
 
  final boolean execStat = this.execStat;
-	<%if(isLog4jEnabled && isLog4j2Enabled) {%>
-		mdcInfo.forEach(<%=MDC_CLASS%>::put);
-		<%=MDC_CLASS%>.put("_subJobName", "<%=subTree.getName() %>");
-		<%=MDC_CLASS%>.put("_subJobPid", "<%=getAsciiRandomString(6)%>_" + subJobPidCounter.getAndIncrement());
-	<%}%>
-
 <%
 	boolean isParallelize = false;
 	for (INode node : subTree.getNodes()) {
@@ -1652,7 +1598,6 @@ public void <%=subTree.getName() %>Process(final java.util.Map<String, Object> g
 
 				this.isRunning = true;
 				String currentComponent = "";
-				String cLabel = null;
 				<%
 				   	if(NodeUtil.hasVirtualComponent(subTree.getNodes())){
 					   %>
@@ -1686,7 +1631,6 @@ public void <%=subTree.getName() %>Process(final java.util.Map<String, Object> g
 		int iterateLoop = 0;
 	<%}%>
 	String currentComponent = "";
-	String cLabel =  null;
 	java.util.Map<String, Object> resourceMap = new java.util.HashMap<String, Object>();
 
 	try {

main/plugins/org.talend.designer.codegen/jet_stub/subprocess_header_java.skeleton

@@ -93,25 +93,7 @@ public class CLASS
         }
         return toReturn;
     }
-
-    // copy from routine TalendString
-    private static String getAsciiRandomString(int length) {
-        java.security.SecureRandom random = new java.security.SecureRandom();
-        int cnt = 0;
-        StringBuilder builder = new StringBuilder();
-        char ch;
-        int end = 'z' + 1;
-        int start = ' ';
-        while (cnt < length) {
-            ch = (char) (random.nextInt(end - start) + start);
-            if (Character.isLetterOrDigit(ch)) {
-                builder.append(ch);
-                cnt++;
-            }
-        }
-        return builder.toString();
-    }
-
+		 
     public String generate(Object argument) {
         return "";
     }

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

@@ -0,0 +1,5 @@
+providerName=www.example.org
+pluginName=EmittersPool Model
+components=Components
+trunjob=tRunJob
+format=Format

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

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

main/plugins/org.talend.designer.codegen/src/main/java/messages.properties

@@ -10,7 +10,6 @@ CodeGenerator.getGraphicalNode2=------process.getGeneratingNodes()------
 CodeGenerator.JET.TimeOut=JET initialisation Time Out
 CodeGenerator.newLine=\n\n\n\n
 CodeGenerator.Node.NotFound=Node not found in current process
-CodeGenerator.Components.NotFound={0}: Component is missing: {1}; use -D{2}=false in your studio or commandline to skip this check, and a warning message will be logged.
 JavaRoutineSynchronizer.UnsupportedOperation.Exception1=method not implemented: org.talend.designer.codegen.JavaRoutineSynchronizer line:49
 JavaRoutineSynchronizer.UnsupportedOperation.Exception2=method not implemented: org.talend.designer.codegen.JavaRoutineSynchronizer line:58
 JetSkeletonManager.unableLoad=unable to load skeleton update cache file

main/plugins/org.talend.designer.codegen/src/main/java/messages_en.properties

@@ -0,0 +1,148 @@
+JavaRoutineSynchronizer.UnsupportedOperation.Exception1=method not implemented: org.talend.designer.codegen.JavaRoutineSynchronizer line:49
+CodeGeneratorEmittersPoolFactory.JETEmitters.NoPresent=JETEmitters Project not present, full reinitialize is needed
+generatedcode.footerprocess.nbcharsgenerated={0} characters generated by {1}
+CodeGeneratorEmittersPoolFactory.Class.NotFound=Template still present, but class {0} has disapeared from workspace. This unit needs to be recompiled.
+CodeGeneratorEmittersPoolFactory.PersitentData.Error=Persitent data cannot be saved :
+generatedcode.copyright.title=Copyright (c) 2005-2011, Talend Inc.
+CodeGeneratorEmittersPoolFactory.initMessage=Generation Engine Initialization in progress...
+generatedcode.copyright.body5=(http://www.gnu.org/licenses/lgpl.html).
+EmfEmittersPersistence.CodeGen.DataMissing=Missing code generation data. Starting full code generation.
+CodeGenerator.JET.TimeOut=JET initialisation Time Out
+generatedcode.copyright.body4=You may distribute this code under the terms of the GNU LGPL license
+CodeGenerator.Node.NotFound=Node not found in current process
+generatedcode.copyright.body3=You can find more information about Talend products at www.talend.com.
+EmittersPoolFactoryImpl.Class.IllegalArg=The class ' {0}' is not a valid classifier
+generatedcode.copyright.body2=/ JobDesigner (CodeGenerator version {0}).
+JavaRoutineSynchronizer.UnsupportedOperation.Exception2=method not implemented: org.talend.designer.codegen.JavaRoutineSynchronizer line:58
+CodeGenerator.getGraphicalNode1=------process.getGraphicalNodes()------
+CodeGenerator.getGraphicalNode2=------process.getGeneratingNodes()------
+CodeGenerator.newLine=\n\n\n\n
+JetSkeletonManager.unableLoad=unable to load skeleton update cache file
+JetSkeletonManager.unableSave=unable to save skeleton update cache file
+JetSkeletonManager.updateProblem=when update skeleton persistence data, there have some problems
+CodeGeneratorEmittersPoolFactory.codeThread=Code generation background thread
+CodeGeneratorEmittersPoolFactory.componentCompiled=Components compiled in {0} ms
+CodeGeneratorEmittersPoolFactory.failCompail=Components compile fail : \r\n
+CodeGeneratorEmittersPoolFactory.initialException=Exception during Initialization
+CodeGeneratorEmittersPoolFactory.jetEmitterInitialException=Error during JetEmitter initalization
+CodeGeneratorService.invalidLanguage1=invalid language type.
+CodeGeneratorService.invalidLanguage2=invalid language type.
+CodeGenInit.addMarkers=Adding markers to workspace
+CodeGenInit.createProject=create {0} project
+CodeGenInit.deleteProject=delete {0} project
+CodeGenInit.initTemplate=init Templates
+CodeGenInit.removeLink=Remove linked resources
+CodeGenInit.saveWorkspace=Saving workspace
+DocumentRootImpl.mixed=\ (mixed:
+NodesSubTree.enableParallel=__ENABLE_PARALLEL__
+PoolTypeImpl.persistentPool= \ (persistentPool:
+TalendJetEmitter.compileFail=\ compile fail : {0} : {1}
+TalendJetEmitter.exception=Exception on
+JetFilesProviderManager.unableLoad=Unable to load {0}JetFilesProviderManager.unableLoad
+CodeGeneratorEmittersPoolFactory.dialogContent=JetEmitter Generation is canceled,to avoid problems cause by this, please press Ctrl+Shift+F3 to generate again\!
+CodeGeneratorEmittersPoolFactory.operationCanceled=Operation Canceled
+ComponentsFactory.afterSystemComponent=after system component
+ComponentsFactory.componentNotFound=Component folder not found\:
+ComponentsFactory.load.components=Load Components...
+ComponentsFactory.parentNotRecompiled=Warning\: parents of *.inc.javajet are not recompiled \!
+ComponentsLocalProviderService.componentLoadError=Component load error
+ComponentsLocalProviderService.talendExchangeError=Talend Exchange Error
+ComponentsPreferencePage.ButtonLabel0=Ok
+ComponentsPreferencePage.configuration.LINK_STYLE=Default mapping links display as :
+ComponentsPreferencePage.rowLimit=Row limit
+ComponentsPreferencePage.WarningMsg=You need to restart Talend Open Studio to load extra components.
+ComponentsPreferencePage.WarningTitle=Warning
+ComponentsPreferencePage.directoryFieldLabel=User component folder\:
+ComponentsProviderManager.unableLoad=unable to load component provider
+ComponenttRunJobPreferencePage.label=Don't show corresponding job after double click on a tRunJob Component.
+ComponentJobletPreferencePage.label=Don't show corresponding job after double click on a Joblet Component.
+ComponenttRunJobPreferencePage.showCorrespondingJob=Show corresponding job after double click on a tRunJob Component.
+XsdValidationCacheManager.unableLoadxsd=unable to load xsd validation cache file
+XsdValidationCacheManager.unableSavexsd=unable to save xsd validation cache file
+prefs.configuration.LINK_STYLE.AUTO=Auto
+prefs.configuration.LINK_STYLE.BEZIER_CURVE=Curves
+prefs.configuration.LINK_STYLE.LINE=Lines (fast)
+FAMILY.AS400=AS400
+FAMILY.Access=Access
+FAMILY.Alfresco=Alfresco
+FAMILY.Business=Business
+FAMILY.Business_Intelligence=Business Intelligence
+FAMILY.CentricCRM=CentricCRM
+FAMILY.Charts=Charts
+FAMILY.Connections=Connections
+FAMILY.Custom_Code=Custom Code
+FAMILY.DB2=DB2
+FAMILY.DB_Generic=DB Generic
+FAMILY.DB_JDBC=DB JDBC
+FAMILY.DB_SCD=DB SCD
+FAMILY.Data_Quality=Data Quality
+FAMILY.Databases=Databases
+FAMILY.ELT=ELT
+FAMILY.ESB=ESB
+FAMILY.EXASolution=EXASolution
+FAMILY.eXist=eXist
+FAMILY.FTP=FTP
+FAMILY.Fields=Fields
+FAMILY.File=File
+FAMILY.FireBird=FireBird
+FAMILY.Greenplum=Greenplum
+FAMILY.HSQLDb=HSQLDb
+FAMILY.Healthcare=Healthcare
+FAMILY.Hive=Hive
+FAMILY.Informix=Informix
+FAMILY.Ingres=Ingres
+FAMILY.Input=Input
+FAMILY.Interbase=Interbase
+FAMILY.Internet=Internet
+FAMILY.Jasper=Jasper
+FAMILY.JavaDB=JavaDB
+FAMILY.JDBC=JDBC
+FAMILY.LDAP=LDAP
+FAMILY.Logs_Errors=Logs & Errors
+FAMILY.MS_SQL_Server=MS SQL Server
+FAMILY.MSSql=MSSql
+FAMILY.Management=Management
+FAMILY.MaxDB=MaxDB
+FAMILY.Microsoft_AX=Microsoft AX
+FAMILY.Microsoft_CRM=Microsoft CRM
+FAMILY.Misc=Misc
+FAMILY.MySQL=MySQL
+FAMILY.Netezza=Netezza
+FAMILY.OLAP_Cube=OLAP Cube
+FAMILY.Oracle=Oracle
+FAMILY.Orchestration=Orchestration
+FAMILY.Output=Output
+FAMILY.ParAccel=ParAccel
+FAMILY.PostgreSQL=PostgreSQL
+FAMILY.PostgresPlus=PostgresPlus
+FAMILY.Processing=Processing
+FAMILY.SAP=SAP
+FAMILY.Sas=Sas
+FAMILY.SCD=SCD
+FAMILY.SCP=SCP
+FAMILY.SPSS=SPSS
+FAMILY.SQLite=SQLite
+FAMILY.Salesforce=Salesforce
+FAMILY.SugarCRM=SugarCRM
+FAMILY.Sybase=Sybase
+FAMILY.System=System
+FAMILY.Technical=Technical
+FAMILY.Teradata=Teradata
+FAMILY.Vertica=Vertica
+FAMILY.VtigerCRM=VtigerCRM
+FAMILY.XML=XML
+CodeGeneratorEmittersPoolFactory.updatePaletteForEditors=Update the palette for editors
+ComponentsPreferencePage.componentAssist=Enable Component Creation Assistant
+ComponentsPreferencePage.notValidDirectory=Your selection will result in folder nesting, which is not recommended. Do you want to continue anyway?
+ComponentsFactory.loadComponents.missingFolder=The folder "{0}" is missing in the plugin "{1}".
+ComponentsPreferencePage_SuccessTitle=Success
+ComponentsPreferencePage_SuccessMessage1=Need restart studio to load the new components. Else, will be loaded in next time when start.
+ComponentsPreferencePage_SuccessMessage2=Do you want to restart right now?
+ComponentsPreferencePage.installComponentsFailure=Install components failure
+generatedcode.copyright.body1=This source code has been automatically generated by {0}
+ComponentsFactory.init.waitForFinish.timeout=Can't initialise ComponentsFactory, please try again.
+FAMILY.Data_Privacy=Data Privacy
+ComponentsPreferencePage.enableOnLineHelp=Enable online help for components
+ComponentsPreferencePage.titleInstallHelp=Install offline help feature?
+ComponentsPreferencePage.msgInstallHelp=This will open additional packages dialog to install offline help feature, do you want to continue?
+ComponentsPreferencePage.grpHelp=Help

main/plugins/org.talend.designer.codegen/src/main/java/messages_fr.properties

@@ -10,7 +10,6 @@ CodeGenerator.getGraphicalNode2=------process.getGeneratingNodes()------
 CodeGenerator.JET.TimeOut=D\u00E9lai d'initialisation JET d\u00E9pass\u00E9
 CodeGenerator.newLine=\n\n\n\n
 CodeGenerator.Node.NotFound=N\u0153ud introuvable dans le processus courant
-CodeGenerator.Components.NotFound={0}\u00A0: Le composant est manquant\u00A0: {1}; utilisez -D{2}=false dans votre Studio ou CommandLine pour ignorer cette v\u00E9rification. Un message d'avertissement sera enregistr\u00E9 dans les logs.
 JavaRoutineSynchronizer.UnsupportedOperation.Exception1=M\u00E9thode non impl\u00E9ment\u00E9e : org.talend.designer.codegen.JavaRoutineSynchronizer line:49
 JavaRoutineSynchronizer.UnsupportedOperation.Exception2=M\u00E9thode non impl\u00E9ment\u00E9e : org.talend.designer.codegen.JavaRoutineSynchronizer line:58
 JetSkeletonManager.unableLoad=Impossible de charger le fichier de cache de la mise \u00E0 jour du squelette

main/plugins/org.talend.designer.codegen/src/main/java/messages_ja.properties

@@ -10,12 +10,11 @@ CodeGenerator.getGraphicalNode2=------process.getGeneratingNodes()------
 CodeGenerator.JET.TimeOut=JET\u306E\u521D\u671F\u5316\u51E6\u7406\u304C\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8\u3057\u307E\u3057\u305F
 CodeGenerator.newLine=\n\n\n\n
 CodeGenerator.Node.NotFound=\u73FE\u5728\u306E\u30D7\u30ED\u30BB\u30B9\u306B\u30CE\u30FC\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-CodeGenerator.Components.NotFound={0}: \u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u304C\u6B20\u843D\u3057\u3066\u3044\u307E\u3059: {1}\u3002Studio\u3067 -D{2}=false\u3092\u4F7F\u3046\u3068\u3053\u306E\u30C1\u30A7\u30C3\u30AF\u304C\u30B9\u30AD\u30C3\u30D7\u3055\u308C\u3001\u8B66\u544A\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u30ED\u30B0\u30D5\u30A1\u30A4\u30EB\u306B\u8A18\u9332\u3055\u308C\u307E\u3059\u3002
 JavaRoutineSynchronizer.UnsupportedOperation.Exception1=\u30E1\u30BD\u30C3\u30C9\u304C\u5B9F\u88C5\u3055\u308C\u3066\u3044\u307E\u305B\u3093\\: org.talend.designer.codegen.JavaRoutineSynchronizer line\\:49
 JavaRoutineSynchronizer.UnsupportedOperation.Exception2=\u30E1\u30BD\u30C3\u30C9\u304C\u5B9F\u88C5\u3055\u308C\u3066\u3044\u307E\u305B\u3093\\: org.talend.designer.codegen.JavaRoutineSynchronizer line\\:58
-JetSkeletonManager.unableLoad=\u30B9\u30B1\u30EB\u30C8\u30F3\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30AD\u30E3\u30C3\u30B7\u30E5\u30D5\u30A1\u30A4\u30EB\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093
-JetSkeletonManager.unableSave=\u30B9\u30B1\u30EB\u30C8\u30F3\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30AD\u30E3\u30C3\u30B7\u30E5\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093
-JetSkeletonManager.updateProblem=\u30B9\u30B1\u30EB\u30C8\u30F3\u6C38\u7D9A\u30C7\u30FC\u30BF\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u6642\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
+JetSkeletonManager.unableLoad=\u30B9\u30B1\u30EB\u30C8\u30F3\u66F4\u65B0\u30AD\u30E3\u30C3\u30B7\u30E5\u30D5\u30A1\u30A4\u30EB\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093
+JetSkeletonManager.unableSave=\u30B9\u30B1\u30EB\u30C8\u30F3\u66F4\u65B0\u30AD\u30E3\u30C3\u30B7\u30E5\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093
+JetSkeletonManager.updateProblem=\u30B9\u30B1\u30EB\u30C8\u30F3\u6C38\u7D9A\u30C7\u30FC\u30BF\u66F4\u65B0\u6642\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F,
 EmfEmittersPersistence.CodeGen.DataMissing=\u30B3\u30FC\u30C9\u751F\u6210\u306E\u30C7\u30FC\u30BF\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002\u5B8C\u5168\u306A\u30B3\u30FC\u30C9\u751F\u6210\u3092\u958B\u59CB\u3057\u3066\u3044\u307E\u3059\u3002
 CodeGeneratorEmittersPoolFactory.PersitentData.Error=\u6301\u7D9A\u30C7\u30FC\u30BF\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093:
 CodeGeneratorEmittersPoolFactory.JETEmitters.NoPresent=JETEmitter \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u304C\u5B58\u5728\u3057\u307E\u305B\u3093\u3001\u5168\u4F53\u306E\u518D\u521D\u671F\u5316\u304C\u5FC5\u8981\u3067\u3059\u3002
@@ -29,14 +28,14 @@ CodeGeneratorEmittersPoolFactory.initialException=\u521D\u671F\u5316\u4E2D\u306B
 CodeGeneratorEmittersPoolFactory.initMessage=\u751F\u6210\u30A8\u30F3\u30B8\u30F3\u306E\u521D\u671F\u5316\u4E2D...
 CodeGeneratorEmittersPoolFactory.jetEmitterInitialException=JetEmitter\u306E\u521D\u671F\u5316\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
 CodeGeneratorEmittersPoolFactory.operationCanceled=\u64CD\u4F5C\u306F\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u307E\u3057\u305F
-CodeGeneratorEmittersPoolFactory.updatePaletteForEditors=\u30D1\u30EC\u30C3\u30C8\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+CodeGeneratorEmittersPoolFactory.updatePaletteForEditors=\u30D1\u30EC\u30C3\u30C8\u3092\u66F4\u65B0
 CodeGeneratorService.invalidLanguage1=\u7121\u52B9\u306A\u8A00\u8A9E\u30BF\u30A4\u30D7\u3067\u3059\u3002
 CodeGeneratorService.invalidLanguage2=\u7121\u52B9\u306A\u8A00\u8A9E\u30BF\u30A4\u30D7\u3067\u3059\u3002
 CodeGenInit.addMarkers=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u306B\u30DE\u30FC\u30AB\u30FC\u3092\u8FFD\u52A0\u4E2D
 CodeGenInit.createProject={0}\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u4F5C\u6210
 CodeGenInit.deleteProject={0}\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u524A\u9664
 CodeGenInit.initTemplate=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u521D\u671F\u5316
-CodeGenInit.removeLink=\u30EA\u30F3\u30AF\u3055\u308C\u305F\u30EA\u30BD\u30FC\u30B9\u3092\u524A\u9664
+CodeGenInit.removeLink=\u30EA\u30F3\u30AF\u3055\u308C\u305F\u30EA\u30BD\u30FC\u30B9\u306E\u524A\u9664
 CodeGenInit.saveWorkspace=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u306E\u4FDD\u5B58\u4E2D
 DocumentRootImpl.mixed= (\u4E21\u7528:
 NodesSubTree.enableParallel=__ENABLE_PARALLEL__
@@ -45,11 +44,11 @@ TalendJetEmitter.compileFail= \u30B3\u30F3\u30D1\u30A4\u30EB\u5931\u6557: {0} :
 TalendJetEmitter.exception=\u4F8B\u5916
 JetFilesProviderManager.unableLoad={0}\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093
 ComponentsFactory.afterSystemComponent=\u30B7\u30B9\u30C6\u30E0\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u5F8C
-ComponentsFactory.componentNotFound=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30D5\u30A9\u30EB\u30C0\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093:
+ComponentsFactory.componentNotFound=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30D5\u30A9\u30EB\u30C0\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093 \\:
 ComponentsFactory.load.components=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30ED\u30FC\u30C9...
 ComponentsFactory.parentNotRecompiled=\u8B66\u544A: *.inc.javajet\u306E\u89AA\u306F\u518D\u30B3\u30F3\u30D1\u30A4\u30EB\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
 ComponentsFactory.loadComponents.missingFolder=\u30D7\u30E9\u30B0\u30A4\u30F3"{1}"\u306B\u30D5\u30A9\u30EB\u30C0\u30FC"{0}"\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-ComponentsFactory.init.waitForFinish.timeout=ComponentsFactory\u3092\u521D\u671F\u5316\u3067\u304D\u307E\u305B\u3093\u3002\u3084\u308A\u76F4\u3057\u3066\u307F\u3066\u304F\u3060\u3055\u3044\u3002
+ComponentsFactory.init.waitForFinish.timeout=ComponentsFactory\u3092\u521D\u671F\u5316\u3067\u304D\u307E\u305B\u3093\u3002\u3082\u3046\u4E00\u5EA6\u8A66\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 ComponentsLocalProviderService.componentLoadError=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30ED\u30FC\u30C9\u30A8\u30E9\u30FC
 ComponentsLocalProviderService.talendExchangeError=Talend Exchange \u30A8\u30E9\u30FC
 ComponentsPreferencePage.ButtonLabel0=OK
@@ -58,15 +57,15 @@ ComponentsPreferencePage.configuration.LINK_STYLE=\u30C7\u30D5\u30A9\u30EB\u30C8
 ComponentsPreferencePage.rowLimit=\u884C\u6570\u5236\u9650
 ComponentsPreferencePage.WarningMsg=Talend Open Studio\u3092\u518D\u8D77\u52D5\u3057\u3066\u3001\u62E1\u5F35\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30ED\u30FC\u30C9\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
 ComponentsPreferencePage.WarningTitle=\u8B66\u544A
-ComponentsPreferencePage.directoryFieldLabel=\u30E6\u30FC\u30B6\u30FC\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30D5\u30A9\u30EB\u30C0:
-ComponentsPreferencePage.notValidDirectory=\u3053\u308C\u3092\u9078\u629E\u3059\u308B\u3068\u30D5\u30A9\u30EB\u30C0\u30FC\u304C\u30CD\u30B9\u30C8\u3055\u308C\u307E\u3059\u3002\u3053\u308C\u306F\u63A8\u5968\u3055\u308C\u307E\u305B\u3093\u3002 \u7D9A\u884C\u3057\u307E\u3059\u304B?
+ComponentsPreferencePage.directoryFieldLabel=\u30E6\u30FC\u30B6\u30FC\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30D5\u30A9\u30EB\u30C0 \\:
+ComponentsPreferencePage.notValidDirectory=\u3053\u308C\u3092\u9078\u629E\u3059\u308B\u3068\u30D5\u30A9\u30EB\u30C0\u30FC\u304C\u30CD\u30B9\u30C8\u3055\u308C\u307E\u3059\u3002\u3053\u308C\u306F\u63A8\u5968\u3055\u308C\u307E\u305B\u3093\u3002 \u7D9A\u884C\u3057\u307E\u3059\u304B?,
 ComponentsPreferencePage.installComponentsFailure=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u306B\u5931\u6557\u3057\u307E\u3057\u305F
 ComponentsProviderManager.unableLoad=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30D7\u30ED\u30D0\u30A4\u30C0\u306E\u30ED\u30FC\u30C9\u304C\u3067\u304D\u307E\u305B\u3093
 ComponenttRunJobPreferencePage.label=tRunJob\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30C0\u30D6\u30EB\u30AF\u30EA\u30C3\u30AF\u5F8C\u3001\u5BFE\u5FDC\u30B8\u30E7\u30D6\u3092\u8868\u793A\u3057\u306A\u3044\u3002
 ComponentJobletPreferencePage.label=Joblet\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30C0\u30D6\u30EB\u30AF\u30EA\u30C3\u30AF\u5F8C\u3001\u5BFE\u5FDC\u30B8\u30E7\u30D6\u3092\u8868\u793A\u3057\u306A\u3044\u3002
 ComponentsPreferencePage_SuccessTitle=\u6210\u529F
 ComponentsPreferencePage_SuccessMessage1=\u65B0\u898F\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30ED\u30FC\u30C9\u3059\u308B\u305F\u3081\u306B\u306F\u3001Studio\u3092\u518D\u8D77\u52D5\u3057\u307E\u3059\u3002\u307E\u305F\u306F\u6B21\u56DE\u306E\u958B\u59CB\u6642\u306B\u30ED\u30FC\u30C9\u3055\u308C\u307E\u3059\u3002
-ComponentsPreferencePage_SuccessMessage2=\u518D\u8D77\u52D5\u3057\u307E\u3059\u304B?
+ComponentsPreferencePage_SuccessMessage2=\u518D\u8D77\u52D5\u3057\u307E\u3059\u304B\uFF1F
 ComponentsPreferencePage.enableOnLineHelp=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30AA\u30F3\u30E9\u30A4\u30F3\u30D8\u30EB\u30D7\u3092\u6709\u52B9\u5316
 ComponentsPreferencePage.titleInstallHelp=\u30AA\u30D5\u30E9\u30A4\u30F3\u30D8\u30EB\u30D7\u6A5F\u80FD\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3057\u307E\u3059\u304B?
 ComponentsPreferencePage.msgInstallHelp=\u3053\u308C\u306B\u3088\u3063\u3066\u8FFD\u52A0\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30C0\u30A4\u30A2\u30ED\u30B0\u304C\u958B\u304D\u3001\u30AA\u30D5\u30E9\u30A4\u30F3\u30D8\u30EB\u30D7\u6A5F\u80FD\u304C\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3055\u308C\u307E\u3059\u3002\u7D9A\u884C\u3057\u307E\u3059\u304B?
@@ -76,7 +75,7 @@ XsdValidationCacheManager.unableLoadxsd=XSD\u30D0\u30EA\u30C7\u30FC\u30B7\u30E7\
 XsdValidationCacheManager.unableSavexsd=XSD\u30D0\u30EA\u30C7\u30FC\u30B7\u30E7\u30F3\u306E\u30AD\u30E3\u30C3\u30B7\u30E5\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093
 prefs.configuration.LINK_STYLE.AUTO=\u81EA\u52D5
 prefs.configuration.LINK_STYLE.BEZIER_CURVE=\u66F2\u7DDA
-prefs.configuration.LINK_STYLE.LINE=\u76F4\u7DDA(\u9AD8\u901F)
+prefs.configuration.LINK_STYLE.LINE=\u76F4\u7DDA\uFF08\u9AD8\u901F\uFF09
 FAMILY.AS400=AS400
 FAMILY.Access=\u30A2\u30AF\u30BB\u30B9
 FAMILY.Alfresco=Alfresco
@@ -88,7 +87,7 @@ FAMILY.Connections=\u63A5\u7D9A
 FAMILY.Custom_Code=\u30AB\u30B9\u30BF\u30E0\u30B3\u30FC\u30C9
 FAMILY.DB2=DB2
 FAMILY.DB_Generic=\u6C4E\u7528ODBC
-FAMILY.DB_JDBC=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AFJDBC
+FAMILY.DB_JDBC=\u6C4E\u7528JDBC
 FAMILY.DB_SCD=DB SCD
 FAMILY.Data_Quality=\u30C7\u30FC\u30BF\u30AF\u30AA\u30EA\u30C6\u30A3
 FAMILY.Data_Privacy=\u30C7\u30FC\u30BF\u30D7\u30E9\u30A4\u30D0\u30B7\u30FC
@@ -126,7 +125,7 @@ FAMILY.MySQL=MySQL
 FAMILY.Netezza=Netezza
 FAMILY.OLAP_Cube=OLAP\u30AD\u30E5\u30FC\u30D6
 FAMILY.Oracle=Oracle
-FAMILY.Orchestration=\u30AA\u30FC\u30B1\u30B9\u30C8\u30EC\u30FC\u30B7\u30E7\u30F3\u5316
+FAMILY.Orchestration=\u30D7\u30ED\u30BB\u30B9\u5236\u5FA1
 FAMILY.Output=\u51FA\u529B
 FAMILY.ParAccel=ParAccel
 FAMILY.PostgreSQL=PostgreSQL

main/plugins/org.talend.designer.codegen/src/main/java/messages_zh_CN.properties

@@ -10,7 +10,6 @@ CodeGenerator.getGraphicalNode2=\u8FDB\u7A0B\u5F97\u5230\u751F\u6210\u8282\u70B9
 CodeGenerator.JET.TimeOut=JET \u521D\u59CB\u5316\u8D85\u65F6
 CodeGenerator.newLine=\n\n\n\n
 CodeGenerator.Node.NotFound=\u5728\u5F53\u524D
-CodeGenerator.Components.NotFound={0}: \u7EC4\u4EF6\u7F3A\u5931: {1}; \u5728 Studio \u6216\u547D\u4EE4\u884C\u4E2D\u4F7F\u7528 -D{2}=false \u53EF\u8DF3\u8FC7\u6B64\u9879\u68C0\u67E5\uFF0C\u540C\u65F6\u89E6\u53D1\u8B66\u544A\u6D88\u606F\u3002
 JavaRoutineSynchronizer.UnsupportedOperation.Exception1=\u65B9\u6CD5\u672A\u5B9E\u65BD\uFF1Aorg.talend.designer.codegen.JavaRoutineSynchronizer line:49
 JavaRoutineSynchronizer.UnsupportedOperation.Exception2=\u65B9\u6CD5\u672A\u5B9E\u65BD\uFF1Aorg.talend.designer.codegen.JavaRoutineSynchronizer line:58
 JetSkeletonManager.unableLoad=\u65E0\u6CD5\u52A0\u8F7D\u4E3B\u5E72\u66F4\u65B0\u7F13\u5B58\u6587\u4EF6

main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/CodeGenerator.java

@@ -66,7 +66,6 @@ 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.core.model.components.DummyComponent;
 import org.talend.designer.runprocess.ProcessorUtilities;
 
 /**
@@ -599,13 +598,6 @@ public class CodeGenerator implements ICodeGenerator {
 
                 } else {
                     // if (!isIterate) {
-                    if (isTacokitProcessor(node)) {
-                        codeComponent.append(generateComponentCode(subProcess, node, ECodePart.PROCESS_RECORDS_END, incomingName, typeGen));
-                        codeComponent.append(generateComponentCode(subProcess, node, ECodePart.PROCESS_DATA_BEGIN, incomingName, typeGen));
-                        codeComponent.append(generatesTreeCode(subProcess, node, ECodePart.MAIN, typeGen));
-                        codeComponent.append(generateComponentCode(subProcess, node, ECodePart.PROCESS_DATA_END, incomingName, typeGen));
-                    }
-                	
                     codeComponent.append(generateComponentCode(subProcess, node, ECodePart.END, incomingName, typeGen));
                     // }
                     if (node.getComponent() instanceof Component) {
@@ -636,6 +628,12 @@ public class CodeGenerator implements ICodeGenerator {
                         }
                     }
 
+                    if (isTacokitProcessor(node)) {
+                        codeComponent.append(generateComponentCode(subProcess, node, ECodePart.PROCESS_RECORDS_END, incomingName, typeGen));
+                        codeComponent.append(generateComponentCode(subProcess, node, ECodePart.PROCESS_DATA_BEGIN, incomingName, typeGen));
+                        codeComponent.append(generatesTreeCode(subProcess, node, ECodePart.MAIN, typeGen));
+                        codeComponent.append(generateComponentCode(subProcess, node, ECodePart.PROCESS_DATA_END, incomingName, typeGen));
+                    }
                     codeComponent.append(generatesTreeCode(subProcess, node, part, typeGen));
                     // if (isIterate) {
                     // codeComponent.append(generateComponentCode(node,
@@ -656,14 +654,11 @@ public class CodeGenerator implements ICodeGenerator {
         return codeComponent;
     }
 
-    private static final String TACOKIT_PROCESSOR_CODE_DIR = "tacokit/jet_stub/generic/processor";
-    
     private boolean isTacokitProcessor(final INode node) {
-        final String componentModelClass = node.getComponent().getClass().getName();
-        return ("org.talend.sdk.component.studio.ComponentModel".equals(componentModelClass) || "org.talend.sdk.component.studio.AdditionalJDBCComponentModel".equals(componentModelClass))
-                && (!NodeUtil.getIncomingConnections(node, IConnectionCategory.DATA).isEmpty() || TACOKIT_PROCESSOR_CODE_DIR.equals(node.getComponent().getTemplateFolder()));
+        return "org.talend.sdk.component.studio.ComponentModel".equals(node.getComponent().getClass().getName())
+                && !NodeUtil.getIncomingConnections(node, IConnectionCategory.DATA).isEmpty(); //has input data
     }
-    
+
     private StringBuffer generateSeperateEndCode(NodesSubTree subProcess, INode node, String incomingName, ETypeGen typeGen)
             throws CodeGeneratorException {
         StringBuffer codeComponent = new StringBuffer();
@@ -850,25 +845,6 @@ public class CodeGenerator implements ICodeGenerator {
             IComponentFileNaming componentFileNaming = ComponentsFactoryProvider.getFileNamingInstance();
 
             IComponent component = node.getComponent();
-            if (component instanceof DummyComponent) {
-                if (((DummyComponent) component).isMissingComponent()) {
-                    String processName = "";
-                    try {
-                        IProcess proc = node.getProcess();
-                        processName = proc.getName() + " " + proc.getVersion();
-                    } catch (Exception e) {
-                        ExceptionHandler.process(e);
-                    }
-                    if (IProcess.ERR_ON_COMPONENT_MISSING) {
-                        throw new CodeGeneratorException(Messages.getString("CodeGenerator.Components.NotFound", processName,
-                                component.getName(), IProcess.PROP_ERR_ON_COMPONENT_MISSING));
-                    }
-                    if (ECodePart.BEGIN.equals(part)) {
-                        log.warn(Messages.getString("CodeGenerator.Components.NotFound", processName, component.getName(),
-                                IProcess.PROP_ERR_ON_COMPONENT_MISSING));
-                    }
-                }
-            }
             // some code unification to handle all component types the same way.
             String templateURI = component.getTemplateFolder() + TemplateUtil.DIR_SEP
                     + componentFileNaming.getJetFileName(component.getTemplateNamePrefix(), language.getExtension(), part);

main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/CodeGeneratorService.java

@@ -152,9 +152,7 @@ public class CodeGeneratorService implements ICodeGeneratorService {
         ComponentsFactoryProvider.getInstance().resetCache();
         ILibraryManagerService librairesManagerService = (ILibraryManagerService) GlobalServiceRegister.getDefault().getService(
                 ILibraryManagerService.class);
-        //TUP-31721: The generated studio index will include every possible values with TP_ALL license . 
-        //Studio 8 will not re-generate the index after applying patch and installing any component.
-        librairesManagerService.clearCache(false);
+        librairesManagerService.clearCache();
         CorePlugin.getDefault().getLibrariesService().syncLibraries();
         Job job = CodeGeneratorEmittersPoolFactory.initialize();
         // achen modify to record ctrl+shift+f3 is pressed to fix bug 0006107

main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/components/model/ComponentsFactory.java

@@ -46,7 +46,6 @@ import org.talend.commons.exception.BusinessException;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.utils.io.FilesUtils;
 import org.talend.core.GlobalServiceRegister;
-import org.talend.core.ILibraryManagerService;
 import org.talend.core.language.LanguageManager;
 import org.talend.core.model.component_cache.ComponentsCache;
 import org.talend.core.model.components.AbstractComponentsProvider;
@@ -59,9 +58,7 @@ import org.talend.core.model.components.IComponentsFactory;
 import org.talend.core.model.components.IComponentsHandler;
 import org.talend.core.model.components.filters.ComponentsFactoryProviderManager;
 import org.talend.core.model.components.filters.IComponentFactoryFilter;
-import org.talend.core.runtime.services.IGenericService;
 import org.talend.core.runtime.util.ComponentsLocationProvider;
-import org.talend.core.service.ITCKUIService;
 import org.talend.core.ui.IJobletProviderService;
 import org.talend.core.ui.ISparkJobletProviderService;
 import org.talend.core.ui.ISparkStreamingJobletProviderService;
@@ -75,7 +72,6 @@ import org.talend.designer.core.model.components.EmfComponent;
 import org.talend.designer.core.model.process.AbstractProcessProvider;
 import org.talend.designer.core.model.process.GenericProcessProvider;
 import org.talend.designer.core.ui.editor.jobletcontainer.JobletUtil;
-import org.talend.designer.core.utils.UnifiedComponentUtil;
 
 /**
  * Component factory that look for each component and load their information. <br/>
@@ -94,8 +90,6 @@ public class ComponentsFactory implements IComponentsFactory {
 
     private static Set<IComponent> customComponentList = new HashSet<>(); // user/exchange/tck components
 
-    private static Map<IComponent, File> customComponentFolderMap = new HashMap<IComponent, File>();
-
     private IProgressMonitor monitor;
 
     private SubMonitor subMonitor;
@@ -138,7 +132,6 @@ public class ComponentsFactory implements IComponentsFactory {
             componentList.clear();
             skeletonList.clear();
             customComponentList.clear();
-            customComponentFolderMap.clear();
 
             boolean needRegenerate = false;
             if (CodeGeneratorActivator.getDefault().getBundle().getBundleContext().getProperty("osgi.dev") != null) {
@@ -176,8 +169,6 @@ public class ComponentsFactory implements IComponentsFactory {
             initComponentNameMap();
 
             isInitializing.set(false);
-            // sync custom component libs after init
-            syncCustomComponentLibs();
             // TimeMeasure.step("initComponents", "createCache");
             log.info(componentList.size() + " components loaded in " + (System.currentTimeMillis() - startTime) + " ms"); //$NON-NLS-1$ //$NON-NLS-2$
 
@@ -234,15 +225,7 @@ public class ComponentsFactory implements IComponentsFactory {
             if (StringUtils.isEmpty(componentName)) {
                 continue;
             }
-            if (IGenericService.getService().isTcompv0(component)
-                    && (UnifiedComponentUtil.isAdditionalJDBCComponent(component.getName())
-                            || component.getName().contains(ITCKUIService.get().getTCKJDBCType().getLabel()))) {
-                continue;
-            }
             String componentNameLowerCase = componentName.toLowerCase();
-            if (componentNameLowerCase.startsWith(ITCKUIService.get().getTCKJDBCType().getLabel().toLowerCase())) {
-                componentNameLowerCase = "t" + componentNameLowerCase;
-            }
             Map<String, Set<IComponent>> map = componentNameMap.get(componentNameLowerCase);
             if (map == null) {
                 map = new HashMap<String, Set<IComponent>>();
@@ -385,7 +368,6 @@ public class ComponentsFactory implements IComponentsFactory {
                     } else {
                         componentList.add(currentComp);
                         customComponentList.add(currentComp);
-                        customComponentFolderMap.put(currentComp, currentFolder);
                     }
                 } catch (MissingMainXMLComponentFileException e) {
                     log.trace(currentFolder.getName() + " is not a " + getCodeLanguageSuffix() + " component", e); //$NON-NLS-1$ //$NON-NLS-2$
@@ -405,23 +387,6 @@ public class ComponentsFactory implements IComponentsFactory {
         }
     }
 
-    private void syncCustomComponentLibs() {
-        try {
-            if (GlobalServiceRegister.getDefault().isServiceRegistered(ILibraryManagerService.class)) {
-                ILibraryManagerService libraryService = GlobalServiceRegister.getDefault()
-                        .getService(ILibraryManagerService.class);
-                if (libraryService != null) {
-                    customComponentFolderMap.forEach((component, componentFolder) -> libraryService
-                            .deployLibsFromCustomComponents(componentFolder, component.getModulesNeeded()));
-                }
-            }
-        } catch (Exception e) {
-            ExceptionHandler.process(e);
-        } finally {
-            customComponentFolderMap.clear();
-        }
-    }
-
     private void loadComponentsFromFolder(String pathSource, AbstractComponentsProvider provider) {
         // Changed by Marvin Wang on Feb.22 for bug TDI-19166, caz the test ConnectionManagerTest maybe get the null
         // context.