fix(TDI-42239): tLogCatcher and tAssertCatcher cause compilation error when used together

This reverts commit 471fe65fb5.

PATCH_RELEASE_NOTE.md

@@ -0,0 +1,57 @@
+---
+version: 6.2.1
+module: https://talend.poolparty.biz/coretaxonomy/42
+product:
+- https://talend.poolparty.biz/coretaxonomy/23
+---
+
+# TPS-3130
+
+| Info             | Value |
+| ---------------- | ---------------- |
+| Patch Name       | Patch\_20190603\_TPS-3130\_v1-6.2.1 |
+| Release Date     | 2019-06-03 |
+| Target Version   | 20160704_1411-V6.2.1 |
+| Product affected | Talend Studio |
+
+## Introduction
+
+This is a self-contained patch.
+
+**NOTE**: For information on how to obtain this patch, reach out to your Support contact at Talend.
+
+## Fixed issues
+
+This patch contains the following fixes:
+
+- TPS-3130 [6.2.1] tLogCatcher and tAssertCatcher cause compilation error when used together (TDI-42239)
+
+## Prerequisites
+
+Consider the following requirements for your system:
+
+- Talend Studio 6.2.1 must be installed.
+
+## Installation
+
+### Installing the patch using Software update
+
+1) Logon TAC and switch to Configuration->Software Update, then enter the correct values and save referring to the documentation: https://help.talend.com/reader/f7Em9WV_cPm2RRywucSN0Q/j9x5iXV~vyxMlUafnDejaQ
+
+2) Switch to Software update page, where the new patch will be listed. The patch can be downloaded from here into the nexus repository.
+
+3) On Studio Side: Logon Studio with remote mode, on the logon page the Update button is displayed: click this button to install the patch.
+
+### Installing the patch using Talend Studio
+
+1) Create a folder named "patches" under your studio installer directory and copy the patch .zip file to this folder.
+
+2) Restart your studio: a window pops up, then click OK to install the patch, or restart the commandline and the patch will be installed automatically.
+
+### Installing the patch using Commandline
+
+Execute the following commands:
+
+1. Talend-Studio-win-x86_64.exe -nosplash -application org.talend.commandline.CommandLine -consoleLog -data commandline-workspace startServer -p 8002 --talendDebug
+2. initRemote {tac_url} -ul {TAC login username} -up {TAC login password}
+3. checkAndUpdate -tu {TAC login username} -tup {TAC login password}

i18n/plugins/org.talend.componentdesigner.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.componentdesigner.nl</artifactId>

i18n/plugins/org.talend.componentdesigner.rcp.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.componentdesigner.rcp.nl</artifactId>

i18n/plugins/org.talend.designer.abstractmap.nl/pom.xml

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

i18n/plugins/org.talend.designer.alfrescooutput.nl/pom.xml

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

i18n/plugins/org.talend.designer.business.diagram.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.business.diagram.nl</artifactId>

i18n/plugins/org.talend.designer.codegen.nl/pom.xml

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

i18n/plugins/org.talend.designer.components.exchange.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.components.exchange.nl</artifactId>

i18n/plugins/org.talend.designer.core.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.core.nl</artifactId>

i18n/plugins/org.talend.designer.dbmap.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.dbmap.nl</artifactId>

i18n/plugins/org.talend.designer.documentation.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.documentation.nl</artifactId>

i18n/plugins/org.talend.designer.fileoutputxml.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.fileoutputxml.nl</artifactId>

i18n/plugins/org.talend.designer.gefabstractmap.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.gefabstractmap.nl</artifactId>

i18n/plugins/org.talend.designer.hl7.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.hl7.nl</artifactId>

i18n/plugins/org.talend.designer.mapper.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.mapper.nl</artifactId>

i18n/plugins/org.talend.designer.maven.job.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.maven.job.nl</artifactId>

i18n/plugins/org.talend.designer.rowgenerator.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.rowgenerator.nl</artifactId>

i18n/plugins/org.talend.designer.runprocess.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.runprocess.nl</artifactId>

i18n/plugins/org.talend.designer.scd.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.scd.nl</artifactId>

i18n/plugins/org.talend.designer.webservice.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.webservice.nl</artifactId>

i18n/plugins/org.talend.designer.xmlmap.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.xmlmap.nl</artifactId>

i18n/plugins/org.talend.expressionbuilder.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.expressionbuilder.nl</artifactId>

i18n/plugins/org.talend.presentation.onboarding.resource.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.presentation.onboarding.resource.nl</artifactId>

i18n/plugins/org.talend.presentation.onboarding.resource.tos.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.presentation.onboarding.resource.tos.nl</artifactId>

i18n/plugins/org.talend.repository.ftp.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.ftp.nl</artifactId>

i18n/plugins/org.talend.repository.json.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.json.nl</artifactId>

i18n/plugins/org.talend.repository.nl/pom.xml

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

i18n/plugins/org.talend.repository.view.di.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.view.di.nl</artifactId>

i18n/plugins/org.talend.sbi.engines.client.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.sbi.engines.client.nl</artifactId>

i18n/plugins/org.talend.spagic.engines.client.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.spagic.engines.client.nl</artifactId>

i18n/plugins/org.talend.sqlbuilder.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.sqlbuilder.nl</artifactId>

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

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

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

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

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

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

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

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

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.rcp.branding.tos.test.feature</artifactId>

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

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

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

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

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

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

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

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

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

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

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

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

main/plugins/org.talend.componentdesigner.rcp/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.componentdesigner.rcp</artifactId>

main/plugins/org.talend.componentdesigner/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.componentdesigner</artifactId>

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

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

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

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

main/plugins/org.talend.designer.business.diagram/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.business.diagram</artifactId>

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

@@ -118,27 +118,52 @@ class IndexedRecordToRowStructGenerator {
                     dynamicMetadata_<%=cid%>.setName(childDynamic_<%=cid%>.name());
                     dynamicMetadata_<%=cid%>.setDbName(childDynamic_<%=cid%>.name());
                     String talendType_<%=cid%> = null;
-                    if (childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.ARRAY) {
+                    org.apache.avro.Schema.Type type_<%=cid%> = childDynamic_<%=cid%>.schema().getType();
+                    if(type_<%=cid%>  == org.apache.avro.Schema.Type.UNION){
+                    	java.util.List<org.apache.avro.Schema> fieldTypes_<%=cid%> = childDynamic_<%=cid%>.schema().getTypes();
+                    	for(org.apache.avro.Schema fieldType_<%=cid%>:fieldTypes_<%=cid%>){
+                    		if(fieldType_<%=cid%>.getType() == org.apache.avro.Schema.Type.NULL){
+                    			dynamicMetadata_<%=cid%>.setNullable(true);
+                    		}else{
+                    			type_<%=cid%> = fieldType_<%=cid%>.getType();
+                    		}
+                    	}
+					}
+                    if (type_<%=cid%> == org.apache.avro.Schema.Type.ARRAY) {
                         talendType_<%=cid%> = "<%=JavaTypesManager.LIST.getId()%>";
-                    } else if (childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.BOOLEAN) {
+                    } else if (type_<%=cid%> == org.apache.avro.Schema.Type.BOOLEAN) {
                         talendType_<%=cid%> = "<%=JavaTypesManager.BOOLEAN.getId()%>";
-                    } else if (childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.BYTES) {
+                    } else if (type_<%=cid%> == org.apache.avro.Schema.Type.BYTES) {
                         talendType_<%=cid%> = "<%=JavaTypesManager.BYTE_ARRAY.getId()%>";
-                    } else if (childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.FIXED) {
+                    } else if (type_<%=cid%> == org.apache.avro.Schema.Type.FIXED) {
                         talendType_<%=cid%> = "<%=JavaTypesManager.BYTE_ARRAY.getId()%>";
-                    } else if (childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.DOUBLE) {
+                    } else if (type_<%=cid%> == org.apache.avro.Schema.Type.DOUBLE) {
                         talendType_<%=cid%> = "<%=JavaTypesManager.DOUBLE.getId()%>";
-                    } else if (childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.FLOAT) {
+                    } else if (type_<%=cid%> == org.apache.avro.Schema.Type.FLOAT) {
                         talendType_<%=cid%> = "<%=JavaTypesManager.FLOAT.getId()%>";
-                    } else if (childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.INT) {
+                    } else if (type_<%=cid%> == org.apache.avro.Schema.Type.INT) {
                         talendType_<%=cid%> = "<%=JavaTypesManager.INTEGER.getId()%>";
-                    } else if (childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.LONG) {
+                    } else if (type_<%=cid%> == org.apache.avro.Schema.Type.LONG) {
-                        talendType_<%=cid%> = "<%=JavaTypesManager.LONG.getId()%>";
+                    	String pattern_<%=cid%> = childDynamic_<%=cid%>.getProp(org.talend.daikon.di.DiSchemaConstants.TALEND6_COLUMN_PATTERN);
-                    } else if (childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.ENUM) {
+                    	if(pattern_<%=cid%>!=null && !pattern_<%=cid%>.trim().isEmpty()){
+                    		talendType_<%=cid%> = "<%=JavaTypesManager.DATE.getId()%>";
+                    		dynamicMetadata_<%=cid%>.setFormat(pattern_<%=cid%>);
+                    	}else{
+                    		talendType_<%=cid%> = "<%=JavaTypesManager.LONG.getId()%>";
+                    	}
+                    } else if (type_<%=cid%> == org.apache.avro.Schema.Type.ENUM) {
                         talendType_<%=cid%> = "<%=JavaTypesManager.STRING.getId()%>";
-                    } else if (childDynamic_<%=cid%>.schema().getType() == org.apache.avro.Schema.Type.STRING) {
+                    } else if (type_<%=cid%> == org.apache.avro.Schema.Type.STRING) {
                         talendType_<%=cid%> = "<%=JavaTypesManager.STRING.getId()%>";
                     }
+                    Object length_<%=cid%> = childDynamic_<%=cid%>.getProp(org.talend.daikon.di.DiSchemaConstants.TALEND6_COLUMN_LENGTH);
+                    if(length_<%=cid%> != null){
+                    	dynamicMetadata_<%=cid%>.setLength(Integer.parseInt(String.valueOf(length_<%=cid%>)));
+                    }
+                    Object precision_<%=cid%> = childDynamic_<%=cid%>.getProp(org.talend.daikon.di.DiSchemaConstants.TALEND6_COLUMN_PRECISION); 
+                    if(precision_<%=cid%> != null){
+						dynamicMetadata_<%=cid%>.setPrecision(Integer.parseInt(String.valueOf(precision_<%=cid%>)));
+                    } 
                     dynamicMetadata_<%=cid%>.setType(talendType_<%=cid%>);
                     <%=codeVarDynamic%>.metadatas.add(dynamicMetadata_<%=cid%>);
                 }

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

@@ -480,6 +480,7 @@ private class TalendException extends Exception {
 
 			if(!(e instanceof TDieException)){
 <%
+		boolean needCatchTalendException = false;
 		if (process.getNodesOfType("tLogCatcher").size() > 0) {
 			List<INode> logCatchers = (List<INode>)process.getNodesOfType("tLogCatcher");
 			for (INode logCatcher : logCatchers) {
@@ -511,6 +512,7 @@ private class TalendException extends Exception {
 				if (ElementParameterParser.getValue(logCatcher, "__CATCH_JAVA_EXCEPTION__").equals("true")) {
 					if(logCatcher!=virtualNCatchNode){
 					// 2) launch logCatcher subProcess
+					needCatchTalendException =  true;
 %>
 				<%=logCatcher.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
 <%
@@ -523,6 +525,7 @@ private class TalendException extends Exception {
 <%
 			}
 			if(virtualNCatchNode!=null){
+				needCatchTalendException =  true;
 %>
 				<%=virtualNCatchNode.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
 <%
@@ -536,31 +539,13 @@ private class TalendException extends Exception {
 %>
 			}
 <%
-		boolean needCatchTalendException = false;
-		if (process.getNodesOfType("tLogCatcher").size() > 0) {
-			for(INode node:process.getNodesOfType("tLogCatcher")){
-				if(ElementParameterParser.getValue(node, "__CATCH_JAVA_EXCEPTION__").equals("true")){
-					needCatchTalendException = true;
-					break;
-				}
-			}
-		}
 
-		if ((!needCatchTalendException) && (process.getNodesOfType("tAssertCatcher").size() > 0)) {
-			for(INode node:process.getNodesOfType("tAssertCatcher")){
-				if(ElementParameterParser.getValue(node, "__CATCH_JAVA_EXCEPTION__").equals("true")){
-					needCatchTalendException = true;
-					break;
-				}
-			}
-		}
 		if(needCatchTalendException) {
-			if (process.getNodesOfType("tLogCatcher").size() > 0) {
+			//TODO should catch the TalendException in assertcatcher process? but before should not work too as use java reflect, this exception can't catch
 				%>
 				} catch (TalendException e) {
 					// do nothing
 				<%
-			}
 		}
 %>
 		} catch (Exception e) {

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

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

main/plugins/org.talend.designer.components.exchange/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.components.exchange</artifactId>

main/plugins/org.talend.designer.components.libs/libs_src/talend-db-exasol-util/pom.xml

@@ -14,7 +14,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<talend.nexus.url>http://newbuild.talend.com:8081</talend.nexus.url>
+		<talend.nexus.url>https://artifacts-zl.talend.com</talend.nexus.url>
 	</properties>
 	
 	<distributionManagement>

main/plugins/org.talend.designer.components.libs/libs_src/talend-marketo-rest/pom.xml

@@ -15,7 +15,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<cxf.version>3.1.1</cxf.version>
-		<talend.nexus.url>http://newbuild.talend.com:8081</talend.nexus.url>
+		<talend.nexus.url>https://artifacts-zl.talend.com</talend.nexus.url>
 	</properties>
 	
 	<distributionManagement>

main/plugins/org.talend.designer.components.libs/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.components.libs</artifactId>

main/plugins/org.talend.designer.components.localprovider/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.components.localprovider</artifactId>

main/plugins/org.talend.designer.core.generic/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.core.generic</artifactId>

main/plugins/org.talend.designer.core.generic/src/main/java/org/talend/designer/core/generic/model/GenericElementParameter.java

@@ -333,7 +333,7 @@ public class GenericElementParameter extends ElementParameter {
         }
     }
 
-    private String getParameterName() {
+    public String getParameterName() {
         String paramName = getName();
         if (paramName.indexOf(IGenericConstants.EXP_SEPARATOR) != -1) {
             paramName = paramName.substring(paramName.lastIndexOf(IGenericConstants.EXP_SEPARATOR) + 1);

main/plugins/org.talend.designer.core.generic/src/main/java/org/talend/designer/core/generic/utils/ComponentsUtils.java

@@ -272,7 +272,8 @@ public class ComponentsUtils {
                 Property property = (Property) widgetProperty;
                 param.setRequired(property.isRequired());
                 param.setValue(getParameterValue(element, property, fieldType, isInitializing));
-                if (EParameterFieldType.NAME_SELECTION_AREA.equals(fieldType)) {
+                boolean isNameProperty = IGenericConstants.NAME_PROPERTY.equals(param.getParameterName());
+                if (EParameterFieldType.NAME_SELECTION_AREA.equals(fieldType) || isNameProperty) {
                     // Disable context support for this filed type.
                     param.setSupportContext(false);
                 } else {

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

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

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/StandAloneTalendJavaEditor.java

@@ -419,7 +419,7 @@ public class StandAloneTalendJavaEditor extends CompilationUnitEditor implements
         if (!isEditable()) {
             return false;
         }
-        return propertyIsDirty || super.isDirty();
+        return super.isDirty();
     }
 
     @Override
@@ -562,14 +562,12 @@ public class StandAloneTalendJavaEditor extends CompilationUnitEditor implements
 
     private FileItem item;
 
-    private boolean propertyIsDirty;
 
     private final AdapterImpl dirtyListener = new AdapterImpl() {
 
         @Override
         public void notifyChanged(Notification notification) {
             if (notification.getEventType() != Notification.REMOVING_ADAPTER) {
-                propertyIsDirty = true;
                 Display.getDefault().syncExec(new Runnable() {
 
                     @Override
@@ -611,7 +609,6 @@ public class StandAloneTalendJavaEditor extends CompilationUnitEditor implements
 
         ICompilationUnit unit = (ICompilationUnit) this.getInputJavaElement();
         String newName = item.getProperty().getLabel();
-        propertyIsDirty = false;
         try {
             boolean noError = true;
             // String newName2 = newName + SuffixConstants.SUFFIX_STRING_java;

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/utils/JavaProcessUtil.java

@@ -244,14 +244,13 @@ public class JavaProcessUtil {
         addNodeRelatedModules(node.getProcess(), modulesNeeded, node, forMR);
         // for children job
         if (withChildrens) {
-            modulesNeeded.addAll(getChildrenModules(node, searchItems, withChildrens, forMR));
+            modulesNeeded.addAll(getChildrenModules(node, searchItems, forMR));
         }
 
         return new HashSet<ModuleNeeded>(modulesNeeded);
     }
 
-    static List<ModuleNeeded> getChildrenModules(final INode node, Set<ProcessItem> searchItems, boolean withChildrens,
+    static List<ModuleNeeded> getChildrenModules(final INode node, Set<ProcessItem> searchItems, boolean forMR) {
-            boolean forMR) {
         List<ModuleNeeded> modulesNeeded = new ArrayList<ModuleNeeded>();
         if (node.getComponent().getName().equals("tRunJob")) { //$NON-NLS-1$
             IElementParameter processIdparam = node.getElementParameter("PROCESS_TYPE_PROCESS"); //$NON-NLS-1$
@@ -267,16 +266,16 @@ public class JavaProcessUtil {
 
             String context = (String) node.getElementParameter("PROCESS_TYPE_CONTEXT").getValue(); //$NON-NLS-1$
             if (processItem != null && !searchItems.contains(processItem)) {
-                boolean independent = getBooleanParamValue(node, "USE_INDEPENDENT_PROCESS") //$NON-NLS-1$
+                boolean seperated = getBooleanParamValue(node, "USE_INDEPENDENT_PROCESS") //$NON-NLS-1$
                         || getBooleanParamValue(node, "USE_DYNAMIC_JOB"); //$NON-NLS-1$
-                if (withChildrens || !independent) {
+                if (!seperated) {
                     // avoid dead loop of method call
                     searchItems.add(processItem);
                     JobInfo subJobInfo = new JobInfo(processItem, context);
                     IDesignerCoreService service = CorePlugin.getDefault().getDesignerCoreService();
                     IProcess child = service.getProcessFromItem(subJobInfo.getProcessItem());
 
-                    getNeededModules(child, withChildrens, searchItems, modulesNeeded, forMR);
+                    getNeededModules(child, true, searchItems, modulesNeeded, forMR);
                 }
             }
         }

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

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

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

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

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

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

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

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

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

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

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

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

main/plugins/org.talend.designer.mapper.advanced/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.mapper.advanced</artifactId>

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

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

main/plugins/org.talend.designer.maven.job/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.maven.job</artifactId>

main/plugins/org.talend.designer.publish.core/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.publish.core</artifactId>

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

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

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

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

main/plugins/org.talend.designer.runprocess/src/main/java/org/talend/designer/runprocess/maven/MavenJavaProcessor.java

@@ -301,6 +301,8 @@ public class MavenJavaProcessor extends JavaProcessor {
     @Override
     public void build(IProgressMonitor monitor) throws Exception {
         final ITalendProcessJavaProject talendJavaProject = getTalendJavaProject();
+        // compile with JDT first in order to make the maven packaging work with a JRE.
+        talendJavaProject.buildModules(monitor, null, null);
 
         final Map<String, Object> argumentsMap = new HashMap<>();
         argumentsMap.put(TalendProcessArgumentConstant.ARG_GOAL, getGoals());

main/plugins/org.talend.designer.runtime.visualization.tools/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.runtime.visualization.tools</artifactId>

main/plugins/org.talend.designer.runtime.visualization/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.runtime.visualization</artifactId>

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

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

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

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

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

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

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

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

main/plugins/org.talend.expressionbuilder/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.expressionbuilder</artifactId>

main/plugins/org.talend.libraries.asm/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.libraries.asm</artifactId>

main/plugins/org.talend.libraries.bonita/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.libraries.bonita</artifactId>

main/plugins/org.talend.libraries.crm/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.libraries.crm</artifactId>

main/plugins/org.talend.libraries.css/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.libraries.css</artifactId>

main/plugins/org.talend.libraries.custom/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.libraries.custom</artifactId>

main/plugins/org.talend.libraries.edifact/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.libraries.edifact</artifactId>

main/plugins/org.talend.libraries.ehcache/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.libraries.ehcache</artifactId>

main/plugins/org.talend.libraries.excel/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.libraries.excel</artifactId>

main/plugins/org.talend.libraries.ftp/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.libraries.ftp</artifactId>

main/plugins/org.talend.libraries.groovy/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.libraries.groovy</artifactId>

main/plugins/org.talend.libraries.guava/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.libraries.guava</artifactId>

main/plugins/org.talend.libraries.hadoop.mapr.5.0.0/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.libraries.hadoop.mapr.5.0.0</artifactId>

main/plugins/org.talend.libraries.hl7.jars/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.libraries.hl7.jars</artifactId>

main/plugins/org.talend.libraries.hl7/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.libraries.hl7</artifactId>

main/plugins/org.talend.libraries.jax/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.libraries.jax</artifactId>

main/plugins/org.talend.libraries.jboss.jars/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.libraries.jboss.jars</artifactId>

main/plugins/org.talend.libraries.jboss/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.libraries.jboss</artifactId>

main/plugins/org.talend.libraries.jersey/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.libraries.jersey</artifactId>

main/plugins/org.talend.libraries.jetty/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.2.1-SNAPSHOT</version>
+    <version>6.2.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.libraries.jetty</artifactId>