fix(TDI-40438) : TDI-40438 + some backport

* fix(TUP-18146) fix quote issue

* fix(TUP-18146): update junits.

* fix(TUP-18146): update junits.

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>6.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.business.diagram</artifactId>

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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.components.exchange</artifactId>

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.4.1-SNAPSHOT</version>
+    <version>6.4.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.components.libs</artifactId>

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryBulkExec/tBigQueryBulkExec_begin.javajet

@@ -366,6 +366,12 @@
 		}
 
 		com.google.api.services.bigquery.model.Job doneJob_<%=cid%> = pollJob_<%=cid%>;
+
+		if ((doneJob_<%=cid%>.getStatus() != null) && (doneJob_<%=cid%>.getStatus().getErrors() != null)) {
+			status = "failure";
+			throw new Exception(doneJob_<%=cid%>.getStatus().getErrors().toString());
+		}
+
 		System.out.println("Done: " + doneJob_<%=cid%>.toString());
 		com.google.api.services.bigquery.model.JobStatistics jobStatistics_<%=cid%>= doneJob_<%=cid%>.getStatistics();
 		if(jobStatistics_<%=cid%>!=null && jobStatistics_<%=cid%>.getLoad() != null){

main/plugins/org.talend.designer.components.localprovider/components/tMDMBulkLoad/tMDMBulkLoad_begin.javajet

@@ -36,33 +36,35 @@ String trans = "mdmTrans_" + connection;
 org.talend.mdm.bulkload.client.BulkloadClient bulkloadClient_<%=cid %> = new org.talend.mdm.bulkload.client.BulkloadClient(<%=mdmUrl %>, <%=username %>, decryptedPassword_<%=cid %>, null, <%=dataCluster %> + "<%=isStaging?"#STAGING":""%>", <%=dataEntity %>, <%=dataModule %>);
 
 <%if(useTransaction) {%>
-    String transKey_<%=cid %> = "<%=trans%>_" + Thread.currentThread().getThreadGroup().getName();
-    com.talend.mdm.transaction.client.MDMTransaction mdmTransaction_<%=cid %> = (com.talend.mdm.transaction.client.MDMTransaction)globalMap.get(transKey_<%=cid %>);
-    if(mdmTransaction_<%=cid %> == null) {
-        String murl_<%=cid %> = (String)globalMap.get("mdmUrl_<%=connection %>");
-        if(murl_<%=cid %>.endsWith("?wsdl")) {
-            murl_<%=cid %> = murl_<%=cid %>.substring(0, murl_<%=cid %>.length() - 5);
+    if(globalMap.get("useTransaction_<%=connection %>") != null && (Boolean)globalMap.get("useTransaction_<%=connection %>")) {
+        String transKey_<%=cid %> = "<%=trans%>_" + Thread.currentThread().getThreadGroup().getName();
+        com.talend.mdm.transaction.client.MDMTransaction mdmTransaction_<%=cid %> = (com.talend.mdm.transaction.client.MDMTransaction)globalMap.get(transKey_<%=cid %>);
+        if(mdmTransaction_<%=cid %> == null) {
+            String murl_<%=cid %> = (String)globalMap.get("mdmUrl_<%=connection %>");
+            if(murl_<%=cid %>.endsWith("?wsdl")) {
+                murl_<%=cid %> = murl_<%=cid %>.substring(0, murl_<%=cid %>.length() - 5);
+            }
+            String turl_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.getMDMTransactionURL(murl_<%=cid %>, true);
+            String username_<%=cid %> = (String)globalMap.get("username_<%=connection %>");
+            String password_<%=cid %> = (String)globalMap.get("password_<%=connection %>");
+            if((Boolean)globalMap.get("useClientTranId_<%=connection %>")) {
+                String sessionID_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.getSessionID(turl_<%=cid %>,username_<%=cid %>,password_<%=cid %>);
+                mdmTransaction_<%=cid %> = new com.talend.mdm.transaction.client.MDMTransaction();
+                mdmTransaction_<%=cid %>.setUrl(turl_<%=cid %>);
+                mdmTransaction_<%=cid %>.setId("<%=cid %>_" + java.util.UUID.randomUUID());
+                mdmTransaction_<%=cid %>.setUsername(username_<%=cid %>);
+                mdmTransaction_<%=cid %>.setPassword(password_<%=cid %>);
+                mdmTransaction_<%=cid %>.setSessionId(sessionID_<%=cid %>);
+            } else {
+                <% logUtil.debug("\"Attempt to get a remote transaction from url: \" + murl_" + cid);%>
+                mdmTransaction_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.newTransaction(turl_<%=cid %>,username_<%=cid %>,password_<%=cid %>);
+            }
+            globalMap.put(transKey_<%=cid %>, mdmTransaction_<%=cid %>);
+            <% logUtil.debug("\"Got transaction successfully with key=\" + transKey_" + cid);%>
         }
-        String turl_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.getMDMTransactionURL(murl_<%=cid %>, true);
-        String username_<%=cid %> = (String)globalMap.get("username_<%=connection %>");
-        String password_<%=cid %> = (String)globalMap.get("password_<%=connection %>");
-        if((Boolean)globalMap.get("useClientTranId_<%=connection %>")) {
-            String sessionID_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.getSessionID(turl_<%=cid %>,username_<%=cid %>,password_<%=cid %>);
-            mdmTransaction_<%=cid %> = new com.talend.mdm.transaction.client.MDMTransaction();
-            mdmTransaction_<%=cid %>.setUrl(turl_<%=cid %>);
-            mdmTransaction_<%=cid %>.setId("<%=cid %>_" + java.util.UUID.randomUUID());
-            mdmTransaction_<%=cid %>.setUsername(username_<%=cid %>);
-            mdmTransaction_<%=cid %>.setPassword(password_<%=cid %>);
-            mdmTransaction_<%=cid %>.setSessionId(sessionID_<%=cid %>);
-        } else {
-            <% logUtil.debug("\"Attempt to get a remote transaction from url: \" + murl_" + cid);%>
-            mdmTransaction_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.newTransaction(turl_<%=cid %>,username_<%=cid %>,password_<%=cid %>);
-        }
-        globalMap.put(transKey_<%=cid %>, mdmTransaction_<%=cid %>);
-        <% logUtil.debug("\"Got transaction successfully with key=\" + transKey_" + cid);%>
+        bulkloadClient_<%=cid %>.setTransactionId(mdmTransaction_<%=cid %>.getId());
+        bulkloadClient_<%=cid %>.setSessionId(mdmTransaction_<%=cid%>.getSessionId());
     }
-    bulkloadClient_<%=cid %>.setTransactionId(mdmTransaction_<%=cid %>.getId());
-    bulkloadClient_<%=cid %>.setSessionId(mdmTransaction_<%=cid%>.getSessionId());
 <%}%>
 
 bulkloadClient_<%=cid %>.startThreadCount();

main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmInput/tMicrosoftCrmInput_begin_odata.javajet

@@ -65,7 +65,8 @@ if ((metadatas != null) && (metadatas.size() > 0)) {
 
 			<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/password.javajet"%>
 
-				org.talend.ms.crm.odata.ClientConfiguration clientConfig_<%=cid%> = new org.talend.ms.crm.odata.ClientConfiguration(<%=applicationId%>, <%=userName%>, decryptedPassword_<%=cid%>, <%=authority%>);
+				org.talend.ms.crm.odata.ClientConfiguration clientConfig_<%=cid%> = org.talend.ms.crm.odata.ClientConfigurationFactory
+		                        .buildOAuthNativeClientConfiguration(<%=applicationId%>, <%=userName%>, decryptedPassword_<%=cid%>, <%=authority%>);
 				clientConfig_<%=cid%>.setTimeout(<%=timeout%>);
 				clientConfig_<%=cid%>.setMaxRetry(reConnMaxNum_<%=cid%>,<%=attemptsInterval%>);
 				clientConfig_<%=cid%>.setReuseHttpClient(<%=reuseHttpClient%>);
@@ -171,6 +172,17 @@ if ((metadatas != null) && (metadatas.size() > 0)) {
 		        					%>
 		        						<%=outgoingConn.getName()%>.<%=columnList.get(i).getLabel()%> = ParserUtils.parseTo_Date(property_<%=column.getLabel()%>_<%=cid%>.getValue().toString(), <%= patternValue %>);
 		        					<%
+		        					}else if(javaType == JavaTypesManager.BYTE_ARRAY){ // Byte[]
+		        					%>
+		        					    String property_<%=column.getLabel()%>_<%=cid%>_type = property_<%=column.getLabel()%>_<%=cid%>.getValue().getTypeName();
+		        						if("Edm.Binary".equals(property_<%=column.getLabel()%>_<%=cid%>_type)){
+		        						    <%=outgoingConn.getName()%>.<%=columnList.get(i).getLabel()%> = (byte[])property_<%=column.getLabel()%>_<%=cid%>.getValue().asPrimitive().toValue();
+		        						}
+		        						else{
+		        						    org.apache.olingo.commons.api.edm.EdmPrimitiveType edmpt = org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory.getInstance(org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind.Binary);
+                                            <%=outgoingConn.getName()%>.<%=columnList.get(i).getLabel()%> = (byte[])edmpt.valueOfString(property_<%=column.getLabel()%>_<%=cid%>.getValue().toString(), null, null, org.apache.olingo.commons.api.Constants.DEFAULT_PRECISION, org.apache.olingo.commons.api.Constants.DEFAULT_SCALE, null, byte[].class);
+		        						}
+		        					<%
 		        					}else{ // other
 		        					%>
 		        						<%=outgoingConn.getName()%>.<%=columnList.get(i).getLabel()%> = ParserUtils.parseTo_<%=typeToGenerate%>(property_<%=column.getLabel()%>_<%=cid%>.getValue().toString());

main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmInput/tMicrosoftCrmInput_java.xml

@@ -11696,7 +11696,7 @@
     <COLUMN KEY="false" LENGTH="0" NAME="emailaddress1" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="emailaddress2" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="emailaddress3" TYPE="id_String"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_timestamp" TYPE="id_Long"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_url" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimageid" TYPE="id_String"  />
@@ -11780,7 +11780,7 @@
     <COLUMN KEY="false" LENGTH="0" NAME="attachmentcontentid" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="attachmentnumber" TYPE="id_Integer"  />
     <COLUMN KEY="false" LENGTH="0" NAME="body" TYPE="id_String"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="body_binary" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="body_binary" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="componentstate" TYPE="id_Integer"  />
     <COLUMN KEY="false" LENGTH="0" NAME="filename" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="filesize" TYPE="id_Integer"  />
@@ -11875,7 +11875,7 @@
     <COLUMN KEY="true" LENGTH="0" NAME="annotationid" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="createdon" TYPE="id_Date" PATTERN="&quot;yyyy-MM-dd&apos;T&apos;HH:mm:ss&apos;Z&apos;&quot;" />
     <COLUMN KEY="false" LENGTH="0" NAME="documentbody" TYPE="id_String"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="documentbody_binary" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="documentbody_binary" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="filename" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="filesize" TYPE="id_Integer"  />
     <COLUMN KEY="false" LENGTH="0" NAME="importsequencenumber" TYPE="id_Integer"  />
@@ -12031,7 +12031,7 @@
 <TABLE IF="(ENTITYSET=='attachments') AND (AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')">
     <COLUMN KEY="true" LENGTH="0" NAME="attachmentid" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="body" TYPE="id_String"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="body_binary" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="body_binary" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="filename" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="filesize" TYPE="id_Integer"  />
     <COLUMN KEY="false" LENGTH="0" NAME="mimetype" TYPE="id_String"  />
@@ -12688,7 +12688,7 @@
     <COLUMN KEY="false" LENGTH="0" NAME="codename" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="createdon" TYPE="id_Date" PATTERN="&quot;yyyy-MM-dd&apos;T&apos;HH:mm:ss&apos;Z&apos;&quot;" />
     <COLUMN KEY="false" LENGTH="0" NAME="description" TYPE="id_String"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_timestamp" TYPE="id_Long"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_url" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimageid" TYPE="id_String"  />
@@ -12878,7 +12878,7 @@
     <COLUMN KEY="false" LENGTH="0" NAME="address2_utcoffset" TYPE="id_Integer"  />
     <COLUMN KEY="true" LENGTH="0" NAME="competitorid" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="createdon" TYPE="id_Date" PATTERN="&quot;yyyy-MM-dd&apos;T&apos;HH:mm:ss&apos;Z&apos;&quot;" />
-    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_timestamp" TYPE="id_Long"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_url" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimageid" TYPE="id_String"  />
@@ -12969,7 +12969,7 @@
     <COLUMN KEY="false" LENGTH="0" NAME="description" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="effectiveend" TYPE="id_Date" PATTERN="&quot;yyyy-MM-dd&apos;T&apos;HH:mm:ss&apos;Z&apos;&quot;" />
     <COLUMN KEY="false" LENGTH="0" NAME="effectivestart" TYPE="id_Date" PATTERN="&quot;yyyy-MM-dd&apos;T&apos;HH:mm:ss&apos;Z&apos;&quot;" />
-    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_timestamp" TYPE="id_Long"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_url" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimageid" TYPE="id_String"  />
@@ -13150,7 +13150,7 @@
     <COLUMN KEY="false" LENGTH="0" NAME="emailaddress2" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="emailaddress3" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="employeeid" TYPE="id_String"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_timestamp" TYPE="id_Long"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_url" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimageid" TYPE="id_String"  />
@@ -13298,7 +13298,7 @@
     <COLUMN KEY="false" LENGTH="0" NAME="createdon" TYPE="id_Date" PATTERN="&quot;yyyy-MM-dd&apos;T&apos;HH:mm:ss&apos;Z&apos;&quot;" />
     <COLUMN KEY="false" LENGTH="0" NAME="duration" TYPE="id_Integer"  />
     <COLUMN KEY="false" LENGTH="0" NAME="effectivitycalendar" TYPE="id_String"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_timestamp" TYPE="id_Long"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_url" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimageid" TYPE="id_String"  />
@@ -13707,7 +13707,7 @@
     <COLUMN KEY="true" LENGTH="0" NAME="emailserverprofileid" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="emailservertypename" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="encodingcodepage" TYPE="id_String"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_timestamp" TYPE="id_Long"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_url" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimageid" TYPE="id_String"  />
@@ -13715,7 +13715,6 @@
     <COLUMN KEY="false" LENGTH="0" NAME="exchangeversion" TYPE="id_Integer"  />
     <COLUMN KEY="false" LENGTH="0" NAME="incomingauthenticationprotocol" TYPE="id_Integer"  />
     <COLUMN KEY="false" LENGTH="0" NAME="incomingcredentialretrieval" TYPE="id_Integer"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="incomingpassword" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="incomingportnumber" TYPE="id_Integer"  />
     <COLUMN KEY="false" LENGTH="0" NAME="incomingserverlocation" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="incominguseimpersonation" TYPE="id_Boolean"  />
@@ -13739,7 +13738,6 @@
     <COLUMN KEY="false" LENGTH="0" NAME="outgoingauthenticationprotocol" TYPE="id_Integer"  />
     <COLUMN KEY="false" LENGTH="0" NAME="outgoingautograntdelegateaccess" TYPE="id_Boolean"  />
     <COLUMN KEY="false" LENGTH="0" NAME="outgoingcredentialretrieval" TYPE="id_Integer"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="outgoingpassword" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="outgoingportnumber" TYPE="id_Integer"  />
     <COLUMN KEY="false" LENGTH="0" NAME="outgoingserverlocation" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="outgoinguseimpersonation" TYPE="id_Boolean"  />
@@ -14265,7 +14263,7 @@
     <COLUMN KEY="false" LENGTH="0" NAME="customrollupfieldmoney_base" TYPE="id_BigDecimal"  />
     <COLUMN KEY="false" LENGTH="0" NAME="customrollupfieldstring" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="depth" TYPE="id_Integer"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_timestamp" TYPE="id_Long"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_url" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimageid" TYPE="id_String"  />
@@ -14586,7 +14584,7 @@
     <COLUMN KEY="false" LENGTH="0" NAME="customersatisfactioncode" TYPE="id_Integer"  />
     <COLUMN KEY="false" LENGTH="0" NAME="decremententitlementterm" TYPE="id_Boolean"  />
     <COLUMN KEY="false" LENGTH="0" NAME="description" TYPE="id_String"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_timestamp" TYPE="id_Long"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_url" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimageid" TYPE="id_String"  />
@@ -14755,7 +14753,7 @@
     <COLUMN KEY="false" LENGTH="0" NAME="discountamount_base" TYPE="id_BigDecimal"  />
     <COLUMN KEY="false" LENGTH="0" NAME="discountpercentage" TYPE="id_BigDecimal"  />
     <COLUMN KEY="false" LENGTH="0" NAME="duedate" TYPE="id_Date" PATTERN="&quot;yyyy-MM-dd&apos;T&apos;HH:mm:ss&apos;Z&apos;&quot;" />
-    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_timestamp" TYPE="id_Long"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_url" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimageid" TYPE="id_String"  />
@@ -14847,7 +14845,7 @@
     <COLUMN KEY="false" LENGTH="0" NAME="content" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="createdon" TYPE="id_Date" PATTERN="&quot;yyyy-MM-dd&apos;T&apos;HH:mm:ss&apos;Z&apos;&quot;" />
     <COLUMN KEY="false" LENGTH="0" NAME="description" TYPE="id_String"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_timestamp" TYPE="id_Long"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_url" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimageid" TYPE="id_String"  />
@@ -15155,7 +15153,7 @@
     <COLUMN KEY="false" LENGTH="0" NAME="emailaddress1" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="emailaddress2" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="emailaddress3" TYPE="id_String"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_timestamp" TYPE="id_Long"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_url" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimageid" TYPE="id_String"  />
@@ -15367,7 +15365,7 @@
     <COLUMN KEY="false" LENGTH="0" NAME="enabledforact" TYPE="id_Boolean"  />
     <COLUMN KEY="false" LENGTH="0" NAME="enabledforincomingemail" TYPE="id_Boolean"  />
     <COLUMN KEY="false" LENGTH="0" NAME="enabledforoutgoingemail" TYPE="id_Boolean"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_timestamp" TYPE="id_Long"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_url" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimageid" TYPE="id_String"  />
@@ -15409,7 +15407,6 @@
     <COLUMN KEY="false" LENGTH="0" NAME="orgmarkedasprimaryforexchangesync" TYPE="id_Boolean"  />
     <COLUMN KEY="false" LENGTH="0" NAME="outgoingemaildeliverymethod" TYPE="id_Integer"  />
     <COLUMN KEY="false" LENGTH="0" NAME="outgoingemailstatus" TYPE="id_Integer"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="password" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="postponemailboxprocessinguntil" TYPE="id_Date" PATTERN="&quot;yyyy-MM-dd&apos;T&apos;HH:mm:ss&apos;Z&apos;&quot;" />
     <COLUMN KEY="false" LENGTH="0" NAME="postponeofficeappsdeploymentuntil" TYPE="id_Date" PATTERN="&quot;yyyy-MM-dd&apos;T&apos;HH:mm:ss&apos;Z&apos;&quot;" />
     <COLUMN KEY="false" LENGTH="0" NAME="postponesendinguntil" TYPE="id_Date" PATTERN="&quot;yyyy-MM-dd&apos;T&apos;HH:mm:ss&apos;Z&apos;&quot;" />
@@ -15865,7 +15862,7 @@
     <COLUMN KEY="false" LENGTH="0" NAME="baseamount_base" TYPE="id_BigDecimal"  />
     <COLUMN KEY="false" LENGTH="0" NAME="createdon" TYPE="id_Date" PATTERN="&quot;yyyy-MM-dd&apos;T&apos;HH:mm:ss&apos;Z&apos;&quot;" />
     <COLUMN KEY="false" LENGTH="0" NAME="description" TYPE="id_String"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_timestamp" TYPE="id_Long"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_url" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimageid" TYPE="id_String"  />
@@ -16042,7 +16039,7 @@
     <COLUMN KEY="false" LENGTH="0" NAME="enablepricingoncreate" TYPE="id_Boolean"  />
     <COLUMN KEY="false" LENGTH="0" NAME="enablesmartmatching" TYPE="id_Boolean"  />
     <COLUMN KEY="false" LENGTH="0" NAME="enforcereadonlyplugins" TYPE="id_Boolean"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_timestamp" TYPE="id_Long"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_url" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimageid" TYPE="id_String"  />
@@ -16213,7 +16210,6 @@
     <COLUMN KEY="false" LENGTH="0" NAME="timeseparator" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="timezoneruleversionnumber" TYPE="id_Integer"  />
     <COLUMN KEY="false" LENGTH="0" NAME="tokenexpiry" TYPE="id_Integer"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="tokenkey" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="trackingprefix" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="trackingtokenidbase" TYPE="id_Integer"  />
     <COLUMN KEY="false" LENGTH="0" NAME="trackingtokeniddigits" TYPE="id_Integer"  />
@@ -16328,7 +16324,7 @@
 <TABLE IF="(ENTITYSET=='pluginassemblies') AND (AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')">
     <COLUMN KEY="false" LENGTH="0" NAME="componentstate" TYPE="id_Integer"  />
     <COLUMN KEY="false" LENGTH="0" NAME="content" TYPE="id_String"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="content_binary" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="content_binary" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="createdon" TYPE="id_Date" PATTERN="&quot;yyyy-MM-dd&apos;T&apos;HH:mm:ss&apos;Z&apos;&quot;" />
     <COLUMN KEY="false" LENGTH="0" NAME="culture" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="customizationlevel" TYPE="id_Integer"  />
@@ -16559,7 +16555,6 @@
 </TABLE>
 <TABLE IF="(ENTITYSET=='productassociations') AND (AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')">
     <COLUMN KEY="false" LENGTH="0" NAME="createdon" TYPE="id_Date" PATTERN="&quot;yyyy-MM-dd&apos;T&apos;HH:mm:ss&apos;Z&apos;&quot;" />
-    <COLUMN KEY="false" LENGTH="0" NAME="dmtimportstate" TYPE="id_Integer"  />
     <COLUMN KEY="false" LENGTH="0" NAME="exchangerate" TYPE="id_BigDecimal"  />
     <COLUMN KEY="false" LENGTH="0" NAME="importsequencenumber" TYPE="id_Integer"  />
     <COLUMN KEY="false" LENGTH="0" NAME="modifiedon" TYPE="id_Date" PATTERN="&quot;yyyy-MM-dd&apos;T&apos;HH:mm:ss&apos;Z&apos;&quot;" />
@@ -16619,8 +16614,7 @@
     <COLUMN KEY="false" LENGTH="0" NAME="currentcost" TYPE="id_BigDecimal"  />
     <COLUMN KEY="false" LENGTH="0" NAME="currentcost_base" TYPE="id_BigDecimal"  />
     <COLUMN KEY="false" LENGTH="0" NAME="description" TYPE="id_String"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="dmtimportstate" TYPE="id_Integer"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_timestamp" TYPE="id_Long"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_url" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimageid" TYPE="id_String"  />
@@ -16788,7 +16782,7 @@
     <COLUMN KEY="false" LENGTH="0" NAME="customizationprefix" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="description" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="emailaddress" TYPE="id_String"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_timestamp" TYPE="id_Long"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_url" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimageid" TYPE="id_String"  />
@@ -16872,7 +16866,7 @@
     <COLUMN KEY="false" LENGTH="0" NAME="description" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="emailaddress" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="emailrouteraccessapproval" TYPE="id_Integer"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_timestamp" TYPE="id_Long"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_url" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimageid" TYPE="id_String"  />
@@ -17332,7 +17326,7 @@
 </TABLE>
 <TABLE IF="(ENTITYSET=='reports') AND (AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')">
     <COLUMN KEY="false" LENGTH="0" NAME="bodybinary" TYPE="id_String"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="bodybinary_binary" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="bodybinary_binary" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="bodytext" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="bodyurl" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="componentstate" TYPE="id_Integer"  />
@@ -17392,7 +17386,7 @@
 <TABLE IF="(ENTITYSET=='resources') AND (AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')">
     <COLUMN KEY="false" LENGTH="0" NAME="calendarid" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="displayinserviceviews" TYPE="id_Boolean"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_timestamp" TYPE="id_Long"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_url" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimageid" TYPE="id_String"  />
@@ -17481,7 +17475,7 @@
     <COLUMN KEY="false" LENGTH="0" NAME="authorname" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="createdon" TYPE="id_Date" PATTERN="&quot;yyyy-MM-dd&apos;T&apos;HH:mm:ss&apos;Z&apos;&quot;" />
     <COLUMN KEY="false" LENGTH="0" NAME="documentbody" TYPE="id_String"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="documentbody_binary" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="documentbody_binary" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="filename" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="filesize" TYPE="id_Integer"  />
     <COLUMN KEY="false" LENGTH="0" NAME="filetypecode" TYPE="id_Integer"  />
@@ -17504,7 +17498,7 @@
 <TABLE IF="(ENTITYSET=='salesliteratures') AND (AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')">
     <COLUMN KEY="false" LENGTH="0" NAME="createdon" TYPE="id_Date" PATTERN="&quot;yyyy-MM-dd&apos;T&apos;HH:mm:ss&apos;Z&apos;&quot;" />
     <COLUMN KEY="false" LENGTH="0" NAME="description" TYPE="id_String"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_timestamp" TYPE="id_Long"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_url" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimageid" TYPE="id_String"  />
@@ -17622,7 +17616,7 @@
     <COLUMN KEY="false" LENGTH="0" NAME="discountamount" TYPE="id_BigDecimal"  />
     <COLUMN KEY="false" LENGTH="0" NAME="discountamount_base" TYPE="id_BigDecimal"  />
     <COLUMN KEY="false" LENGTH="0" NAME="discountpercentage" TYPE="id_BigDecimal"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_timestamp" TYPE="id_Long"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_url" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimageid" TYPE="id_String"  />
@@ -17996,9 +17990,7 @@
     <COLUMN KEY="false" LENGTH="0" NAME="namespaceformat" TYPE="id_Integer"  />
     <COLUMN KEY="false" LENGTH="0" NAME="overwritetime" TYPE="id_Date" PATTERN="&quot;yyyy-MM-dd&apos;T&apos;HH:mm:ss&apos;Z&apos;&quot;" />
     <COLUMN KEY="false" LENGTH="0" NAME="path" TYPE="id_String"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="saskey" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="saskeyname" TYPE="id_String"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="sastoken" TYPE="id_String"  />
     <COLUMN KEY="true" LENGTH="0" NAME="serviceendpointid" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="serviceendpointidunique" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="solutionid" TYPE="id_String"  />
@@ -18574,7 +18566,7 @@
     <COLUMN KEY="false" LENGTH="0" NAME="domainname" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="emailrouteraccessapproval" TYPE="id_Integer"  />
     <COLUMN KEY="false" LENGTH="0" NAME="employeeid" TYPE="id_String"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_timestamp" TYPE="id_Long"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_url" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimageid" TYPE="id_String"  />
@@ -18815,7 +18807,7 @@
 <TABLE IF="(ENTITYSET=='territories') AND (AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')">
     <COLUMN KEY="false" LENGTH="0" NAME="createdon" TYPE="id_Date" PATTERN="&quot;yyyy-MM-dd&apos;T&apos;HH:mm:ss&apos;Z&apos;&quot;" />
     <COLUMN KEY="false" LENGTH="0" NAME="description" TYPE="id_String"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_timestamp" TYPE="id_Long"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_url" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimageid" TYPE="id_String"  />
@@ -18974,7 +18966,7 @@
     <COLUMN KEY="false" LENGTH="0" NAME="currencyname" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="currencyprecision" TYPE="id_Integer"  />
     <COLUMN KEY="false" LENGTH="0" NAME="currencysymbol" TYPE="id_String"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_timestamp" TYPE="id_Long"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_url" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimageid" TYPE="id_String"  />
@@ -19194,7 +19186,7 @@
     <COLUMN KEY="false" LENGTH="0" NAME="canbedeleted" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="componentstate" TYPE="id_Integer"  />
     <COLUMN KEY="false" LENGTH="0" NAME="content" TYPE="id_String"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="content_binary" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="content_binary" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="createdon" TYPE="id_Date" PATTERN="&quot;yyyy-MM-dd&apos;T&apos;HH:mm:ss&apos;Z&apos;&quot;" />
     <COLUMN KEY="false" LENGTH="0" NAME="description" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="displayname" TYPE="id_String"  />
@@ -19272,7 +19264,7 @@
     <COLUMN KEY="false" LENGTH="0" NAME="createstage" TYPE="id_Integer"  />
     <COLUMN KEY="false" LENGTH="0" NAME="deletestage" TYPE="id_Integer"  />
     <COLUMN KEY="false" LENGTH="0" NAME="description" TYPE="id_String"  />
-    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_String"  />
+    <COLUMN KEY="false" LENGTH="0" NAME="entityimage" TYPE="id_byte[]"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_timestamp" TYPE="id_Long"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimage_url" TYPE="id_String"  />
     <COLUMN KEY="false" LENGTH="0" NAME="entityimageid" TYPE="id_String"  />
@@ -19427,7 +19419,7 @@
                 <IMPORT NAME="jcifs" MODULE="jcifs-1.3.0.jar" MVN="mvn:org.talend.libraries/jcifs-1.3.0/6.0.0"  REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')" />
                 <!-- 2011 -->
                 <!-- crm client -->
-                <IMPORT NAME="talend-mscrm-3.0-20170426" MODULE="talend-mscrm-3.0-20170426.jar" MVN="mvn:org.talend.libraries/talend-mscrm-3.0-20170426/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.crm/lib/talend-mscrm-3.0-20170426.jar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION =='API_2016_ODATA')" />
+                <IMPORT NAME="talend-mscrm-3.3-20171205" MODULE="talend-mscrm-3.3-20171205.jar" MVN="mvn:org.talend.libraries/talend-mscrm-3.3-20171205/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.crm/lib/talend-mscrm-3.3-20171205.jar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION =='API_2016_ODATA')" />
                 <!-- axis2 1.7.4 -->
                 <IMPORT NAME="activation-1.1" MODULE="activation-1.1.jar" MVN="mvn:org.talend.libraries/activation-1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/activation-1.1.jar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
                 <IMPORT NAME="axiom-api-1.2.20" MODULE="axiom-api-1.2.20.jar" MVN="mvn:org.talend.libraries/axiom-api-1.2.20/6.0.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />

main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmOutput/tMicrosoftCrmOutput_begin.javajet

@@ -6,6 +6,8 @@ imports="
         org.talend.core.model.process.ElementParameterParser
         org.talend.core.model.process.INode
         org.talend.designer.codegen.config.CodeGeneratorArgument
+        org.talend.core.model.metadata.IMetadataColumn
+        org.talend.core.model.metadata.IMetadataTable
         "
 %>
 

main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmOutput/tMicrosoftCrmOutput_begin_odata.javajet

@@ -29,11 +29,38 @@ imports="
 		String entitySetName_<%=cid%>="<%=entitySetName%>";
 	<%	
 	}
+	 String action = ElementParameterParser.getValue(node,"__ACTION__");
+	 if("update".equals(action)){
+	    List<IMetadataTable> metadatas = node.getMetadataList();
+	    if ((metadatas!=null)&&(metadatas.size()>0)) {
+	        IMetadataTable metadata = metadatas.get(0);
+	        if (metadata!=null) {
+			      List<IMetadataColumn> columns = metadata.getListColumns();
+			      int sizeColumns = columns.size();
+			      boolean hasKeyColumn=false;
+			      for(int i = 0; i < sizeColumns; i++){
+	        		    IMetadataColumn column = columns.get(i);
+                   if(column.isKey()){
+                        hasKeyColumn = true;
+                        break;
+                    }
+                }
+                if(!hasKeyColumn){
+                %>
+                    if(true){
+                        throw new RuntimeException("No key column is specified in the schema!");
+                    }
+                <%
+                }
+            }
+        }
+    }
 	%>
 
 	<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/password.javajet"%>
 
-	org.talend.ms.crm.odata.ClientConfiguration clientConfig_<%=cid%> = new org.talend.ms.crm.odata.ClientConfiguration(<%=applicationId%>, <%=userName%>, decryptedPassword_<%=cid%>, <%=authority%>);
+	org.talend.ms.crm.odata.ClientConfiguration clientConfig_<%=cid%> = org.talend.ms.crm.odata.ClientConfigurationFactory
+                    .buildOAuthNativeClientConfiguration(<%=applicationId%>, <%=userName%>, decryptedPassword_<%=cid%>, <%=authority%>);
 	clientConfig_<%=cid%>.setTimeout(<%=timeout%>);
 	clientConfig_<%=cid%>.setMaxRetry(reConnMaxNum_<%=cid%>,<%=attemptsInterval%>);
 	clientConfig_<%=cid%>.setReuseHttpClient(<%=reuseHttpClient%>);

main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmOutput/tMicrosoftCrmOutput_java.xml

@@ -17611,7 +17611,7 @@
         </TABLE>
         <TABLE IF="(ACTION=='insert') AND (ENTITYSET=='attachments') AND (AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')">
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="body" TYPE="id_String" />
-            <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="body_binary" TYPE="id_String" />
+            <COLUMN DBTYPE="Binary" KEY="false" LENGTH="0" NAME="body_binary" TYPE="id_byte[]" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="filename" TYPE="id_String" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="mimetype" TYPE="id_String" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="subject" TYPE="id_String" />
@@ -20723,7 +20723,7 @@
         </TABLE>
         <TABLE IF="(ACTION=='insert') AND (ENTITYSET=='pluginassemblies') AND (AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')">
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="content" TYPE="id_String" />
-            <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="content_binary" TYPE="id_String" />
+            <COLUMN DBTYPE="Binary" KEY="false" LENGTH="0" NAME="content_binary" TYPE="id_byte[]" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="culture" TYPE="id_String" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="description" TYPE="id_String" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="introducedversion" TYPE="id_String" />
@@ -21437,7 +21437,7 @@
         </TABLE>
         <TABLE IF="(ACTION=='insert') AND (ENTITYSET=='reports') AND (AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')">
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="bodybinary" TYPE="id_String" />
-            <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="bodybinary_binary" TYPE="id_String" />
+            <COLUMN DBTYPE="Binary" KEY="false" LENGTH="0" NAME="bodybinary_binary" TYPE="id_byte[]" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="bodytext" TYPE="id_String" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="bodyurl" TYPE="id_String" />
             <COLUMN DBTYPE="Int32" KEY="false" LENGTH="0" NAME="createdinmajorversion" TYPE="id_Integer" />
@@ -21532,7 +21532,7 @@
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="attacheddocumenturl" TYPE="id_String" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="authorname" TYPE="id_String" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="documentbody" TYPE="id_String" />
-            <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="documentbody_binary" TYPE="id_String" />
+            <COLUMN DBTYPE="Binary" KEY="false" LENGTH="0" NAME="documentbody_binary" TYPE="id_byte[]" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="filename" TYPE="id_String" />
             <COLUMN DBTYPE="Int32" KEY="false" LENGTH="0" NAME="filetypecode" TYPE="id_Integer" />
             <COLUMN DBTYPE="Int32" KEY="false" LENGTH="0" NAME="importsequencenumber" TYPE="id_Integer" />
@@ -22813,7 +22813,7 @@
         <TABLE IF="(ACTION=='insert') AND (ENTITYSET=='webresourceset') AND (AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')">
             <COLUMN DBTYPE="Boolean" KEY="false" LENGTH="0" NAME="canbedeleted" TYPE="id_Boolean" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="content" TYPE="id_String" />
-            <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="content_binary" TYPE="id_String" />
+            <COLUMN DBTYPE="Binary" KEY="false" LENGTH="0" NAME="content_binary" TYPE="id_byte[]" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="description" TYPE="id_String" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="displayname" TYPE="id_String" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="introducedversion" TYPE="id_String" />
@@ -23050,7 +23050,7 @@
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="attachmentcontentid" TYPE="id_String" />
             <COLUMN DBTYPE="Int32" KEY="false" LENGTH="0" NAME="attachmentnumber" TYPE="id_Integer" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="body" TYPE="id_String" />
-            <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="body_binary" TYPE="id_String" />
+            <COLUMN DBTYPE="Binary" KEY="false" LENGTH="0" NAME="body_binary" TYPE="id_byte[]" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="filename" TYPE="id_String" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="mimetype" TYPE="id_String" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="objecttypecode" TYPE="id_String" />
@@ -23116,7 +23116,7 @@
         <TABLE IF="(ACTION=='update') AND (ENTITYSET=='annotations') AND (AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')">
             <COLUMN DBTYPE="Guid" KEY="true" LENGTH="0" NAME="annotationid" TYPE="id_String" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="documentbody" TYPE="id_String" />
-            <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="documentbody_binary" TYPE="id_String" />
+            <COLUMN DBTYPE="Binary" KEY="false" LENGTH="0" NAME="documentbody_binary" TYPE="id_byte[]" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="filename" TYPE="id_String" />
             <COLUMN DBTYPE="Int32" KEY="false" LENGTH="0" NAME="importsequencenumber" TYPE="id_Integer" />
             <COLUMN DBTYPE="Boolean" KEY="false" LENGTH="0" NAME="isdocument" TYPE="id_Boolean" />
@@ -23239,7 +23239,7 @@
         <TABLE IF="(ACTION=='update') AND (ENTITYSET=='attachments') AND (AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')">
             <COLUMN DBTYPE="Guid" KEY="true" LENGTH="0" NAME="attachmentid" TYPE="id_String" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="body" TYPE="id_String" />
-            <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="body_binary" TYPE="id_String" />
+            <COLUMN DBTYPE="Binary" KEY="false" LENGTH="0" NAME="body_binary" TYPE="id_byte[]" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="filename" TYPE="id_String" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="mimetype" TYPE="id_String" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="subject" TYPE="id_String" />
@@ -26467,7 +26467,7 @@
         <TABLE IF="(ACTION=='update') AND (ENTITYSET=='pluginassemblies') AND (AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')">
             <COLUMN DBTYPE="Guid" KEY="true" LENGTH="0" NAME="pluginassemblyid" TYPE="id_String" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="content" TYPE="id_String" />
-            <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="content_binary" TYPE="id_String" />
+            <COLUMN DBTYPE="Binary" KEY="false" LENGTH="0" NAME="content_binary" TYPE="id_byte[]" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="culture" TYPE="id_String" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="description" TYPE="id_String" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="introducedversion" TYPE="id_String" />
@@ -27218,7 +27218,7 @@
         <TABLE IF="(ACTION=='update') AND (ENTITYSET=='reports') AND (AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2016_ODATA')">
             <COLUMN DBTYPE="Guid" KEY="true" LENGTH="0" NAME="reportid" TYPE="id_String" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="bodybinary" TYPE="id_String" />
-            <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="bodybinary_binary" TYPE="id_String" />
+            <COLUMN DBTYPE="Binary" KEY="false" LENGTH="0" NAME="bodybinary_binary" TYPE="id_byte[]" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="bodytext" TYPE="id_String" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="bodyurl" TYPE="id_String" />
             <COLUMN DBTYPE="Int32" KEY="false" LENGTH="0" NAME="createdinmajorversion" TYPE="id_Integer" />
@@ -27321,7 +27321,7 @@
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="attacheddocumenturl" TYPE="id_String" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="authorname" TYPE="id_String" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="documentbody" TYPE="id_String" />
-            <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="documentbody_binary" TYPE="id_String" />
+            <COLUMN DBTYPE="Binary" KEY="false" LENGTH="0" NAME="documentbody_binary" TYPE="id_byte[]" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="filename" TYPE="id_String" />
             <COLUMN DBTYPE="Int32" KEY="false" LENGTH="0" NAME="filetypecode" TYPE="id_Integer" />
             <COLUMN DBTYPE="Int32" KEY="false" LENGTH="0" NAME="importsequencenumber" TYPE="id_Integer" />
@@ -28649,7 +28649,7 @@
             <COLUMN DBTYPE="Guid" KEY="true" LENGTH="0" NAME="webresourceid" TYPE="id_String" />
             <COLUMN DBTYPE="Boolean" KEY="false" LENGTH="0" NAME="canbedeleted" TYPE="id_String" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="content" TYPE="id_String" />
-            <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="content_binary" TYPE="id_String" />
+            <COLUMN DBTYPE="Binary" KEY="false" LENGTH="0" NAME="content_binary" TYPE="id_byte[]" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="description" TYPE="id_String" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="displayname" TYPE="id_String" />
             <COLUMN DBTYPE="String" KEY="false" LENGTH="0" NAME="introducedversion" TYPE="id_String" />
@@ -28837,7 +28837,7 @@
             <IMPORT NAME="jcifs" MODULE="jcifs-1.3.0.jar" MVN="mvn:org.talend.libraries/jcifs-1.3.0/6.0.0"  REQUIRED_IF="((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2011')) OR (API_VERSION=='API_2007')" />
             <!-- 2011 -->
             <!-- crm client -->
-            <IMPORT NAME="talend-mscrm-3.0-20170426" MODULE="talend-mscrm-3.0-20170426.jar" MVN="mvn:org.talend.libraries/talend-mscrm-3.0-20170426/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.crm/lib/talend-mscrm-3.0-20170426.jar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION =='API_2016_ODATA')" />
+            <IMPORT NAME="talend-mscrm-3.3-20171205" MODULE="talend-mscrm-3.3-20171205.jar" MVN="mvn:org.talend.libraries/talend-mscrm-3.3-20171205/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.crm/lib/talend-mscrm-3.3-20171205.jar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION =='API_2016_ODATA')" />
             <!-- axis2 1.7.4 -->
             <IMPORT NAME="activation-1.1" MODULE="activation-1.1.jar" MVN="mvn:org.talend.libraries/activation-1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/activation-1.1.jar" REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />
             <IMPORT NAME="axiom-api-1.2.20" MODULE="axiom-api-1.2.20.jar" MVN="mvn:org.talend.libraries/axiom-api-1.2.20/6.0.0"  REQUIRED_IF="(AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011')" />

main/plugins/org.talend.designer.components.localprovider/components/tMicrosoftCrmOutput/tMicrosoftCrmOutput_main_odata.javajet

@@ -1,6 +1,6 @@
 <%
     String action = ElementParameterParser.getValue(node,"__ACTION__");
-	 boolean emptyLookupIntoNull = "true".equals(ElementParameterParser.getValue(node,"__EMPTY_LOOKUP_TO_NULL__"));
+	boolean emptyLookupIntoNull = "true".equals(ElementParameterParser.getValue(node,"__EMPTY_LOOKUP_TO_NULL__"));
     List<IMetadataTable> metadatas = node.getMetadataList();
     if ((metadatas!=null)&&(metadatas.size()>0)) {//1
         IMetadataTable metadata = metadatas.get(0);
@@ -36,19 +36,26 @@
                             
 		  			    			if(lookupMaps.containsKey(column.getLabel())){
                            %>
-                            		if(<%=connName%>.<%=column.getLabel()%> != null<%if(emptyLookupIntoNull) {%> && !(String.valueOf(<%=connName%>.<%=column.getLabel()%>).isEmpty())<%}%>){
-	                            		client_<%=cid%>.addEntityNavigationLink(entity_<%=cid%>, <%=lookupMaps.get(column.getLabel())%>,"<%=column.getOriginalDbColumnName()%>", <%=connName%>.<%=column.getLabel()%>);
-	                            	}
+	                            	client_<%=cid%>.addEntityNavigationLink(entity_<%=cid%>, <%=lookupMaps.get(column.getLabel())%>,"<%=column.getOriginalDbColumnName()%>", <%=connName%>.<%=column.getLabel()%>, <%=emptyLookupIntoNull%>, <%=ignoreNull%>);
                            <%
                            }else{
 	                           if(!isPrimitive && ignoreNull) {
 			  							%>   				
 			  			    				if(<%=connName%>.<%=column.getLabel()%> != null){
-			  			    				
+
 			  			    			<%
 			  			    			}
+
+                          String columnValue = connName+"."+column.getLabel();
+                          if("Guid".equals(column.getType())){
+                                columnValue = "(("+columnValue+" == null) ? null : java.util.UUID.fromString("+columnValue+"))";
+                          }
+
+			  if("String".equals(column.getType()) && "id_byte[]".equals(column.getTalendType())){
+			  	columnValue = "java.util.Base64.getEncoder().encodeToString("+columnValue+")";
+			  }
 	                           %>
-                           		client_<%=cid%>.addEntityProperty(entity_<%=cid%>, "<%=column.getLabel()%>", org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind.<%=column.getType()%>, 	<%=connName%>.<%=column.getLabel()%>);
+                           		client_<%=cid%>.addEntityProperty(entity_<%=cid%>, "<%=column.getLabel()%>", org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind.<%=column.getType()%>, 	<%=columnValue%>);
 	                           <%
 	                           if(!isPrimitive && ignoreNull) {
 			  			    			%>
@@ -66,9 +73,11 @@
                     		client_<%=cid%>.insertEntity(entity_<%=cid%>);
                     	<%
                     	}else if("update".equals(action)){
-                    	%>
-                 			client_<%=cid%>.updateEntity( entity_<%=cid%>, <%=connName%>.<%=idColumnName%>);
-                    	<%
+                    		if(idColumnName!=null){
+                    		%>
+                 				client_<%=cid%>.updateEntity( entity_<%=cid%>, <%=connName%>.<%=idColumnName%>);
+                    		<%
+                    		}
                     	} else if ("delete".equals(action)){
                     	%>
                     		client_<%=cid%>.deleteEntity(<%=connName%>.Id);

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.4.1-SNAPSHOT</version>
+		<version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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/utils/ComponentsUtils.java

@@ -49,6 +49,7 @@ import org.talend.core.model.process.EComponentCategory;
 import org.talend.core.model.process.EConnectionType;
 import org.talend.core.model.process.EParameterFieldType;
 import org.talend.core.model.process.IElement;
+import org.talend.core.model.process.IElementParameter;
 import org.talend.core.model.process.IElementParameterDefaultValue;
 import org.talend.core.model.process.INode;
 import org.talend.core.model.process.INodeConnector;
@@ -331,7 +332,7 @@ public class ComponentsUtils {
             } else if (widgetProperty instanceof Property) {
                 Property property = (Property) widgetProperty;
                 param.setRequired(property.isRequired());
-                param.setValue(getParameterValue(element, property, fieldType));
+                param.setValue(getParameterValue(element, property, fieldType, parameterName));
                 boolean isNameProperty = IGenericConstants.NAME_PROPERTY.equals(param.getParameterName());
                 if (EParameterFieldType.NAME_SELECTION_AREA.equals(fieldType) || EParameterFieldType.JSON_TABLE.equals(fieldType)
                         || EParameterFieldType.CLOSED_LIST.equals(fieldType) || EParameterFieldType.CHECK.equals(fieldType)
@@ -493,7 +494,7 @@ public class ComponentsUtils {
         return params;
     }
 
-    public static Object getParameterValue(IElement element, Property property, EParameterFieldType fieldType) {
+    public static Object getParameterValue(IElement element, Property property, EParameterFieldType fieldType, String parameterName) {
         Object paramValue = property.getStoredValue();
         if (paramValue instanceof List) {
             return null;
@@ -507,10 +508,24 @@ public class ComponentsUtils {
                 }
             }
         } else if (GenericTypeUtils.isStringType(property)) {
+            boolean needInitializeProperty = false;
+            IElementParameter oldParam = null;
+            if (element.getElementParameters() != null) {
+                oldParam = element.getElementParameter(parameterName);
+            }
+            if (oldParam == null || oldParam.getValue() == null || !StringUtils.equals((String) oldParam.getValue(), (String) property.getStoredValue())) {
+                // if parameter is not setup yet (= initialization)
+                // then we set the value and check if we need to add quotes.
+                //
+                // if parameter value / property value are not the same
+                // then the component updated the property in it's own code, so we need to add quotes/initialize.
+                needInitializeProperty = true;
+            }
+
             String value = (String) paramValue;
-            // If value is not context mode and is not in wizard and is not changed by user then add double quotes.
-            if (!(element instanceof FakeElement || ContextParameterUtils.isContainContextParam(value)
-                    || isPropertyChangedByUser(property))) {
+            // If property is not initialized by client and value is not context mode and is not in wizard then add
+            // double quotes.
+            if (needInitializeProperty && !(element instanceof FakeElement || ContextParameterUtils.isContainContextParam(value))) {
                 if (value == null) {
                     value = StringUtils.EMPTY;
                 }

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.4.1-SNAPSHOT</version>
+    <version>6.4.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/nodes/Node.java

@@ -3345,7 +3345,8 @@ public class Node extends Element implements IGraphicalNode {
 
         // check not startable components not linked
         if (getComponentProperties() == null) {
-            if ((getConnectorFromType(EConnectionType.FLOW_MAIN).getMaxLinkInput() == 0)
+            if (getConnectorFromType(EConnectionType.FLOW_MAIN) != null 
+                    && (getConnectorFromType(EConnectionType.FLOW_MAIN).getMaxLinkInput() == 0)
                     && (getConnectorFromType(EConnectionType.FLOW_MAIN).getMaxLinkOutput() != 0)) {
                 if ((getCurrentActiveLinksNbOutput(EConnectionType.FLOW_MAIN) == 0)
                         && (getCurrentActiveLinksNbOutput(EConnectionType.FLOW_MERGE) == 0)

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

@@ -2546,7 +2546,8 @@ public class Process extends Element implements IProcess2, IGEFProcess, ILastVer
             if (!listNames.contains(metadataTable.getTableName())) {
                 listNames.add(metadataTable.getTableName());
                 listMetaData.add(metadataTable);
-                if (nc.getConnectorFromType(EConnectionType.FLOW_MAIN).isMultiSchema()
+                if (nc.getConnectorFromType(EConnectionType.FLOW_MAIN) != null
+                        && nc.getConnectorFromType(EConnectionType.FLOW_MAIN).isMultiSchema()
                         && checkValidConnectionName(metadataTable.getTableName())) {
                     addUniqueConnectionName(metadataTable.getTableName());
                     // for tmap 11884

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

@@ -1684,6 +1684,7 @@ public class ProcessUpdateManager extends AbstractUpdateManager {
         }
         List<UpdateResult> propertiesResults = new ArrayList<UpdateResult>();
 
+
         for (IElementParameter curPropertyParam : node.getElementParametersFromField(EParameterFieldType.PROPERTY_TYPE)) {
             String propertyType = (String) curPropertyParam.getChildParameters().get(EParameterName.PROPERTY_TYPE.getName())
                     .getValue();
@@ -2197,6 +2198,8 @@ public class ProcessUpdateManager extends AbstractUpdateManager {
                                 result.setResult(EUpdateItemType.NODE_PROPERTY, EUpdateResult.UPDATE, newValueParameter);
                             }
                         }
+                    } else if (item != null && item instanceof RulesItem) {
+                        // if the RulesItem is not null, that means the Rule exist, so do nothing
                     } else {
                         result = new UpdateCheckResult(node);
                         result.setResult(EUpdateItemType.NODE_PROPERTY, EUpdateResult.BUIL_IN, repositoryPropertyParam);

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/views/jobsettings/tabs/DeploymentComposite.java

@@ -130,7 +130,7 @@ public class DeploymentComposite extends AbstractTabComposite {
             }
         } else {
             IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-            if (esbService.isWSDLEditor(editor) && esbService.getServicesType() == repositoryViewObject.getRepositoryObjectType()) {
+            if (esbService != null && esbService.isWSDLEditor(editor)) {
                 serviceItem = esbService.getWSDLEditorItem(editor);
                 commandStack = (CommandStack) editor.getAdapter(CommandStack.class);
                 defaultVersion = getDefaultVersion(serviceItem.getProperty().getVersion());

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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.runprocess</artifactId>

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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.spss</artifactId>

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

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tdi-studio-se</artifactId>
-		<version>6.4.1-SNAPSHOT</version>
+		<version>6.4.1</version>
 		<relativePath>../../../</relativePath>
 	</parent>
 	<artifactId>org.talend.designer.tutorials</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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+		<version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.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.4.1-SNAPSHOT</version>
+    <version>6.4.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.libraries.jax</artifactId>