Jzhang/73/release/tup 39647 junit (#8999)

* fix junit

* fix junit

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

@@ -1096,7 +1096,8 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 					<%
 				} else if(javaType.isObjectBased() || typeToGenerate.equals("Geometry") || typeToGenerate.equals("Dynamic")) {
 					%>
-       			    	dos.writeObject(this.<%=column.getLabel() %>);
+						dos.clearInstanceCache();
+						dos.writeObject(this.<%=column.getLabel() %>);
 					<%
 				} else {
 					typeToGenerate =JavaTypesManager.getTypeToGenerate(column.getTalendType(), false);
@@ -1428,7 +1429,8 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 					<%
 				} else if(typeToGenerate.equals("Object") || typeToGenerate.equals("Geometry") || typeToGenerate.equals("BigDecimal") || typeToGenerate.equals("List") || typeToGenerate.equals("Dynamic") || typeToGenerate.equals("Document")) {
 					%>
-       			    	objectOut.writeObject(this.<%=column.getLabel() %>);
+						objectOut.clearInstanceCache();
+						objectOut.writeObject(this.<%=column.getLabel() %>);
 					<%
 				} else {
 					typeToGenerate =JavaTypesManager.getTypeToGenerate(column.getTalendType(), false);

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseBulkExec/tAzureSynapseBulkExec_java.xml

@@ -387,7 +387,7 @@
             <IMPORT NAME="gson" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-            <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="json-smart" MODULE="json-smart-2.4.11.jar" MVN="mvn:net.minidev/json-smart/2.4.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
 		</IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseConnection/tAzureSynapseConnection_java.xml

@@ -210,7 +210,7 @@
         <IMPORT NAME="gson" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
         <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
         <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
-        <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
+        <IMPORT NAME="json-smart" MODULE="json-smart-2.4.11.jar" MVN="mvn:net.minidev/json-smart/2.4.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
         <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
         <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
      </IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseInput/tAzureSynapseInput_java.xml

@@ -270,7 +270,7 @@
         <IMPORT NAME="gson" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="json-smart" MODULE="json-smart-2.4.11.jar" MVN="mvn:net.minidev/json-smart/2.4.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
      </IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseOutput/tAzureSynapseOutput_java.xml

@@ -341,7 +341,7 @@
             <IMPORT NAME="gson" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-            <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="json-smart" MODULE="json-smart-2.4.11.jar" MVN="mvn:net.minidev/json-smart/2.4.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
 		</IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseRow/tAzureSynapseRow_java.xml

@@ -326,7 +326,7 @@
         <IMPORT NAME="gson" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="json-smart" MODULE="json-smart-2.4.11.jar" MVN="mvn:net.minidev/json-smart/2.4.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
     </IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tCreateTable/tCreateTable_java.xml

@@ -866,7 +866,7 @@
 		<IMPORT NAME="gson" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
 		<IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
 		<IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
-		<IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
+		<IMPORT NAME="json-smart" MODULE="json-smart-2.4.11.jar" MVN="mvn:net.minidev/json-smart/2.4.11"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
 		<IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
 		<IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DBTYPE=='MSSQL') AND (MSSQL_DRIVER=='MSSQL_PROP') AND (MSSQL_ACTIVE_DIR_AUTH == 'true')" />
 		<IMPORT NAME="Driver-MYSQL5" MODULE="mysql-connector-java-5.1.49.jar" MVN="mvn:mysql/mysql-connector-java/5.1.49"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') and (DBTYPE=='MYSQL') and (DB_MYSQL_VERSION=='MYSQL_5')"/>
@@ -914,7 +914,7 @@
   		<IMPORT NAME="Driver-EXASolution" MODULE="exajdbc-6.0.9302.jar" MVN="mvn:org.talend.libraries/exajdbc-6.0.9302/6.3.0"  REQUIRED_IF="(DBTYPE=='EXASOL') and (USE_EXISTING_CONNECTION == 'false')" />
 		<IMPORT NAME="Driver-Redshift" MODULE="redshift-jdbc42-no-awssdk-1.2.55.1083.jar" MVN="mvn:com.amazon.redshift/redshift-jdbc42-no-awssdk/1.2.55.1083"  REQUIRED_IF="(DBTYPE=='REDSHIFT') and (USE_EXISTING_CONNECTION == 'false')" />
 		<IMPORT NAME="antlr4-runtime-4.8-1.jar" MODULE="antlr4-runtime-4.8-1.jar" MVN="mvn:org.antlr/antlr4-runtime/4.8-1"  REQUIRED_IF="(DBTYPE=='REDSHIFT') and (USE_EXISTING_CONNECTION == 'false')" />
-		<IMPORT NAME="Driver-Snowflake" MODULE="snowflake-jdbc-3.13.1.jar" MVN="mvn:net.snowflake/snowflake-jdbc/3.13.1"  REQUIRED_IF="(DBTYPE=='SNOWFLAKE') and (USE_EXISTING_CONNECTION == 'false')" />
+		<IMPORT NAME="Driver-Snowflake" MODULE="snowflake-jdbc-3.13.30.jar" MVN="mvn:net.snowflake/snowflake-jdbc/3.13.30"  REQUIRED_IF="(DBTYPE=='SNOWFLAKE') and (USE_EXISTING_CONNECTION == 'false')" />
 		<IMPORT NAME="Driver-VERTICA_9.0" MODULE="vertica-jdbc-9.3.1-0.jar" MVN="mvn:com.vertica/vertica-jdbc/9.3.1-0"   REQUIRED_IF="(DBTYPE=='VERTICA') and (USE_EXISTING_CONNECTION == 'false') and (DB_VERTICA_VERSION=='VERTICA_9_0')"/>
 
 		 <!-- java 11 dependencies for jdbc HSQLDB driver -->

main/plugins/org.talend.designer.components.localprovider/components/tELTMSSqlMap/tELTMSSqlMap_java.xml

@@ -200,7 +200,7 @@
             <IMPORT NAME="gson" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND     (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND     (USE_EXISTING_CONNECTION == 'false')" />
-            <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="json-smart" MODULE="json-smart-2.4.11.jar" MVN="mvn:net.minidev/json-smart/2.4.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
 		</IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tExtractJSONFields/tExtractJSONFields_java.xml

@@ -190,8 +190,8 @@
             <IMPORT NAME="json-path-2.1.0.jar" MODULE="json-path-2.1.0.jar" MVN="mvn:org.talend.libraries/json-path-2.1.0/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.json/lib/json-path-2.1.0.jar" REQUIRED_IF="(READ_BY == 'JSONPATH') AND (JSON_PATH_VERSION == '2_1_0')" />
             <IMPORT NAME="json-path-1.2.0.jar" MODULE="json-path-1.2.0.jar" MVN="mvn:org.talend.libraries/json-path-1.2.0/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.json/lib/json-path-1.2.0.jar" REQUIRED_IF="(READ_BY == 'JSONPATH') AND (JSON_PATH_VERSION == '1_2_0')" />
             
-            <IMPORT NAME="json-smart-2.4.7.jar" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="READ_BY == 'JSONPATH'" />
-            <IMPORT NAME="accessors-smart-2.4.7.jar" MODULE="accessors-smart-2.4.7.jar" MVN="mvn:net.minidev/accessors-smart/2.4.7"  REQUIRED_IF="READ_BY == 'JSONPATH'" />
+            <IMPORT NAME="json-smart-2.4.11.jar" MODULE="json-smart-2.4.11.jar" MVN="mvn:net.minidev/json-smart/2.4.11"  REQUIRED_IF="READ_BY == 'JSONPATH'" />
+            <IMPORT NAME="accessors-smart-2.4.11.jar" MODULE="accessors-smart-2.4.11.jar" MVN="mvn:net.minidev/accessors-smart/2.4.11"  REQUIRED_IF="READ_BY == 'JSONPATH'" />
             <IMPORT NAME="slf4j-api-1.7.5.jar" MODULE="slf4j-api-1.7.5.jar" MVN="mvn:org.talend.libraries/slf4j-api-1.7.5/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.slf4j/lib/slf4j-api-1.7.5.jar" REQUIRED_IF="READ_BY == 'JSONPATH'" />
             <IMPORT NAME="slf4j-log4j12-1.7.5.jar" MODULE="slf4j-log4j12-1.7.5.jar" MVN="mvn:org.talend.libraries/slf4j-log4j12-1.7.5/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.slf4j/lib/slf4j-log4j12-1.7.5.jar" REQUIRED_IF="READ_BY == 'JSONPATH'" />
     </IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tFileInputExcel/tFileInputExcel_begin.javajet

@@ -1290,7 +1290,7 @@ globalMap.put("<%=cid%>_ERROR_MESSAGE",e.getMessage());
 			if ("id_Date".equals(columnList.get(i).getTalendType())) {
 		       // it's input component. we should avoid data rounding here. for dynamic schema we have another algo
 %>
-		excelReader_<%=cid%>.addDateFormat(<%=i%>,new java.text.SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"));
+		excelReader_<%=cid%>.addDateFormat(<%=i%> + start_column_<%= cid %>,new java.text.SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"));
 <%
 			}
 		}

main/plugins/org.talend.designer.components.localprovider/components/tFileInputJSON/tFileInputJSON_java.xml

@@ -184,9 +184,9 @@
 			    REQUIRED_IF="(READ_BY == 'JSONPATH') AND (JSON_PATH_VERSION == '2_1_0')" />
 			<IMPORT NAME="json-path-1.2.0.jar" MODULE="json-path-1.2.0.jar" MVN="mvn:org.talend.libraries/json-path-1.2.0/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.json/lib/json-path-1.2.0.jar"
                 REQUIRED_IF="(READ_BY == 'JSONPATH') AND (JSON_PATH_VERSION == '1_2_0')" />
-            <IMPORT NAME="json-smart-2.4.7.jar" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"
+            <IMPORT NAME="json-smart-2.4.11.jar" MODULE="json-smart-2.4.11.jar" MVN="mvn:net.minidev/json-smart/2.4.11"
                 REQUIRED_IF="(READ_BY == 'JSONPATH')" />
-            <IMPORT NAME="accessors-smart-2.4.7.jar" MODULE="accessors-smart-2.4.7.jar" MVN="mvn:net.minidev/accessors-smart/2.4.7"
+            <IMPORT NAME="accessors-smart-2.4.11.jar" MODULE="accessors-smart-2.4.11.jar" MVN="mvn:net.minidev/accessors-smart/2.4.11"
                 REQUIRED_IF="(READ_BY == 'JSONPATH')" />
             <IMPORT NAME="slf4j-api-1.7.5.jar" MODULE="slf4j-api-1.7.5.jar" MVN="mvn:org.talend.libraries/slf4j-api-1.7.5/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.slf4j/lib/slf4j-api-1.7.5.jar"
                 REQUIRED_IF="(READ_BY == 'JSONPATH')" BundleID="" />

main/plugins/org.talend.designer.components.localprovider/components/tMSSqlBulkExec/tMSSqlBulkExec_java.xml

@@ -412,7 +412,7 @@
         <IMPORT NAME="gson" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="json-smart" MODULE="json-smart-2.4.11.jar" MVN="mvn:net.minidev/json-smart/2.4.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
     </IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tMSSqlConnection/tMSSqlConnection_java.xml

@@ -212,7 +212,7 @@
         <IMPORT NAME="gson" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP')" />
         <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP')" />
         <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP')" />
-        <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP')" />
+        <IMPORT NAME="json-smart" MODULE="json-smart-2.4.11.jar" MVN="mvn:net.minidev/json-smart/2.4.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP')" />
         <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP')" />
         <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP')" />
      </IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tMSSqlInput/tMSSqlInput_java.xml

@@ -286,7 +286,7 @@
         <IMPORT NAME="gson" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="json-smart" MODULE="json-smart-2.4.11.jar" MVN="mvn:net.minidev/json-smart/2.4.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
      </IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tMSSqlOutput/tMSSqlOutput_java.xml

@@ -380,7 +380,7 @@
             <IMPORT NAME="gson" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-            <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="json-smart" MODULE="json-smart-2.4.11.jar" MVN="mvn:net.minidev/json-smart/2.4.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
             <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
 		</IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tMSSqlRow/tMSSqlRow_java.xml

@@ -344,7 +344,7 @@
         <IMPORT NAME="gson" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="json-smart" MODULE="json-smart-2.4.11.jar" MVN="mvn:net.minidev/json-smart/2.4.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
     </IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tMSSqlSCD/tMSSqlSCD_java.xml

@@ -526,7 +526,7 @@
         <IMPORT NAME="gson" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="json-smart" MODULE="json-smart-2.4.11.jar" MVN="mvn:net.minidev/json-smart/2.4.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
     </IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tMSSqlSP/tMSSqlSP_java.xml

@@ -266,7 +266,7 @@
         <IMPORT NAME="gson" MODULE="gson-2.8.9.jar" MVN="mvn:com.google.code.gson/gson/2.8.9"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-9.7.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/9.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="content-type" MODULE="content-type-2.1.jar" MVN="mvn:com.nimbusds/content-type/2.1"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-        <IMPORT NAME="json-smart" MODULE="json-smart-2.4.7.jar" MVN="mvn:net.minidev/json-smart/2.4.7"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="json-smart" MODULE="json-smart-2.4.11.jar" MVN="mvn:net.minidev/json-smart/2.4.11"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-9.22.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/9.22"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
         <IMPORT NAME="javax.mail" MODULE="javax.mail-1.6.2.jar" MVN="mvn:com.sun.mail/javax.mail/1.6.2"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
     </IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tMap/tMap_begin.inc.javajet

@@ -876,7 +876,6 @@ for (int iInputTable = 0; iInputTable < sizeInputTables - 1; iInputTable++) { //
 			 		hasAtLeastOneObjectType = true;
 					%>
 						this.<%= connection.getName() %>__<%= column.getLabel() %> = (<%= typeToGenerate %>) objectIn.readObject();
-					
 					<%
 				} else {
 					typeToGenerate = JavaTypesManager.getTypeToGenerate(column.getTalendType(), false);
@@ -961,7 +960,6 @@ for (int iInputTable = 0; iInputTable < sizeInputTables - 1; iInputTable++) { //
 			 		hasAtLeastOneObjectType = true;
 					%>
            				this.exprKey_<%= nextInputTable.getName() %>__<%= column.getLabel() %> = (<%= typeToGenerate %>) objectIn.readObject();
-					
 					<%
 				} else {
 					typeToGenerate = JavaTypesManager.getTypeToGenerate(column.getTalendType(), false);
@@ -1236,7 +1234,8 @@ for (int iInputTable = 0; iInputTable < sizeInputTables - 1; iInputTable++) { //
 					<%
 				} else if(("Object").equals(typeToGenerate) || ("BigDecimal").equals(typeToGenerate) || ("List").equals(typeToGenerate)) {
 					%>
-       			    	objectOut.writeObject(this.<%= connection.getName() %>__<%= column.getLabel() %>);
+						objectOut.clearInstanceCache();
+						objectOut.writeObject(this.<%= connection.getName() %>__<%= column.getLabel() %>);
 					<%
 				} else {
 					typeToGenerate =JavaTypesManager.getTypeToGenerate(column.getTalendType(), false);
@@ -1249,6 +1248,7 @@ for (int iInputTable = 0; iInputTable < sizeInputTables - 1; iInputTable++) { //
            			    	<%
            						if ("Dynamic".equals(typeToGenerate)) {
            					%>
+           							objectOut.clearInstanceCache();
            							objectOut.writeObject(this.<%= connection.getName() %>__<%= column.getLabel() %>);
            					<%
            						} else {
@@ -1307,7 +1307,8 @@ for (int iInputTable = 0; iInputTable < sizeInputTables - 1; iInputTable++) { //
 					<%
 				} else if(("Object").equals(typeToGenerate) || ("BigDecimal").equals(typeToGenerate) || ("List").equals(typeToGenerate)) {
 					%>
-       			    	objectOut.writeObject(this.exprKey_<%= nextInputTable.getName() %>__<%= column.getLabel() %>);
+						objectOut.clearInstanceCache();
+						objectOut.writeObject(this.exprKey_<%= nextInputTable.getName() %>__<%= column.getLabel() %>);
 					<%
 				} else {
 					typeToGenerate =JavaTypesManager.getTypeToGenerate(column.getTalendType(), false);
@@ -1320,6 +1321,7 @@ for (int iInputTable = 0; iInputTable < sizeInputTables - 1; iInputTable++) { //
            			    	<%
            						if ("Dynamic".equals(typeToGenerate)) {
            					%>
+           							objectOut.clearInstanceCache();
            							objectOut.writeObject(this.exprKey_<%= nextInputTable.getName() %>__<%= column.getLabel() %>);
            					<%
            						} else {

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

@@ -27614,9 +27614,9 @@
                     UrlPath="platform:/base/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar"
                     REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
                 <IMPORT
-                    NAME="asm-9.1"
-                    MODULE="asm-9.1.jar"
-                    MVN="mvn:org.ow2.asm/asm/9.1"
+                    NAME="asm-9.5"
+                    MODULE="asm-9.5.jar"
+                    MVN="mvn:org.ow2.asm/asm/9.5"
                     REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
                 <IMPORT
                     NAME="cxf-core-3.4.10"
@@ -27880,14 +27880,14 @@
                 MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.4"
                 REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018')))" />
             <IMPORT
-                NAME="json-smart-2.4.7.jar"
-                MODULE="json-smart-2.4.7.jar"
-                MVN="mvn:net.minidev/json-smart/2.4.7"
+                NAME="json-smart-2.4.11.jar"
+                MODULE="json-smart-2.4.11.jar"
+                MVN="mvn:net.minidev/json-smart/2.4.11"
                 REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018')))" />
             <IMPORT
-                NAME="accessors-smart-2.4.7"
-                MODULE="accessors-smart-2.4.7.jar"
-                MVN="mvn:net.minidev/accessors-smart/2.4.7"
+                NAME="accessors-smart-2.4.11"
+                MODULE="accessors-smart-2.4.11.jar"
+                MVN="mvn:net.minidev/accessors-smart/2.4.11"
                 REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018')))" />
             <IMPORT NAME="jakartaMail" MODULE="jakarta.mail-1.6.7.jar" MVN="mvn:com.sun.mail/jakarta.mail/1.6.7"
                 REQUIRED_IF="(((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE=='ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018')))" />

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

@@ -38370,9 +38370,9 @@
                 UrlPath="platform:/base/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar"
                 REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
             <IMPORT
-                NAME="asm-9.1"
-                MODULE="asm-9.1.jar"
-                MVN="mvn:org.ow2.asm/asm/9.1"
+                NAME="asm-9.5"
+                MODULE="asm-9.5.jar"
+                MVN="mvn:org.ow2.asm/asm/9.5"
                 REQUIRED_IF="(AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2015')" />
             <IMPORT
                 NAME="cxf-core-3.4.10"
@@ -38642,14 +38642,14 @@
                 MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.4"
                 REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018'))" />
             <IMPORT
-                NAME="json-smart-2.4.7.jar"
-                MODULE="json-smart-2.4.7.jar"
-                MVN="mvn:net.minidev/json-smart/2.4.7"
+                NAME="json-smart-2.4.11.jar"
+                MODULE="json-smart-2.4.11.jar"
+                MVN="mvn:net.minidev/json-smart/2.4.11"
                 REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018'))" />
             <IMPORT
-                NAME="accessors-smart-2.4.7"
-                MODULE="accessors-smart-2.4.7.jar"
-                MVN="mvn:net.minidev/accessors-smart/2.4.7"
+                NAME="accessors-smart-2.4.11"
+                MODULE="accessors-smart-2.4.11.jar"
+                MVN="mvn:net.minidev/accessors-smart/2.4.11"
                 REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018'))" />
             <IMPORT NAME="jakartaMail" MODULE="jakarta.mail-1.6.7.jar" MVN="mvn:com.sun.mail/jakarta.mail/1.6.7"
                 REQUIRED_IF="((AUTH_TYPE=='ONLINE') AND (API_VERSION=='API_2011' OR API_VERSION=='API_2016_ODATA' OR API_VERSION=='API_2018_ODATA')) OR ((AUTH_TYPE == 'ON_PREMISE') AND (MS_CRM_VERSION == 'CRM_2016' OR MS_CRM_VERSION == 'CRM_2018'))" />

main/plugins/org.talend.designer.core.generic/src/main/java/org/talend/designer/core/generic/service/GenericService.java

@@ -109,6 +109,17 @@ public class GenericService implements IGenericService {
                 ps = conn.getProperties("referencedComponent"); //$NON-NLS-1$
             }
         }
+        if (ps == null) {
+            // TSnowflakeOutputBulkProperties is not a sub class of SnowflakeConnectionTableProperties but
+            // extends FixedConnectorsComponentProperties directly so there's no "connection" property
+            // need to get "snowflakeConnectionProperties" from TSnowflakeOutputBulkProperties as "connection"
+            if (pros.getClass().getSimpleName().equals("TSnowflakeOutputBulkProperties")) {
+                Properties conn = pros.getProperties("snowflakeConnectionProperties"); //$NON-NLS-1$
+                if (conn != null) {
+                    ps = conn.getProperties("referencedComponent"); //$NON-NLS-1$
+                }
+            }
+        }
         if(ps == null){
             return null;
         }

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

@@ -330,6 +330,7 @@ public class ProcessUpdateManager extends AbstractUpdateManager {
                     processContextVars.add(param.getName());
                 }
                 Map<String, JobContext> newGroupMap = new HashMap<>();
+                ContextUtils.clearMissingContextCache();
                 for (IContextParameter param : defaultContext.getContextParameterList()) {
                     if (!param.isBuiltIn()) {
                         String source = param.getSource();
@@ -430,7 +431,7 @@ public class ProcessUpdateManager extends AbstractUpdateManager {
         } catch (PersistenceException e) {
             ExceptionHandler.process(e);
         }
-
+        ContextUtils.clearMissingContextCache();
         for (IContext context : contextManager.getListContext()) {
             for (IContextParameter param : context.getContextParameterList()) {
                 if (!param.isBuiltIn()) {

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/properties/controllers/AbstractGuessSchemaProcess.java

@@ -46,8 +46,6 @@ public abstract class AbstractGuessSchemaProcess {
     protected static final String DEFAULT_JOB_NAME = "Mock_job_for_Guess_schema"; //$NON-NLS-1$
 
     protected static String TEMPFILE_APPEND_NAME = "GuessSchemaDelimitedFile"; //$NON-NLS-1$
-    
-    protected static final String ENABLE_LOG4J_FOR_GUESSSCHEMA = "enableLog4jForGuessSchema";
 
     protected static final int maximumRowsToPreview = CorePlugin.getDefault().getPreferenceStore()
             .getInt(ITalendCorePrefConstants.PREVIEW_LIMIT);
@@ -176,14 +174,6 @@ public abstract class AbstractGuessSchemaProcess {
 
         return mockProperty;
     }
-    
-    public static Boolean isEnableLog4jForGuessSchema() {
-
-        String isEnableLog4jForGuessSchema = System.getProperty(AbstractGuessSchemaProcess.ENABLE_LOG4J_FOR_GUESSSCHEMA, "false");//$NON-NLS-1$
-        Boolean isEnableLog4j = Boolean.valueOf(isEnableLog4jForGuessSchema);
-
-        return isEnableLog4j;
-    }
 
     // write content to a temp .csv file
     protected IPath buildTempCSVFilename() {

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/properties/controllers/GuessSchemaProcess.java

@@ -32,7 +32,6 @@ import org.talend.core.model.process.INode;
 import org.talend.core.model.process.IProcess;
 import org.talend.core.model.properties.Property;
 import org.talend.core.ui.component.ComponentsFactoryProvider;
-import org.talend.designer.core.model.components.EParameterName;
 import org.talend.designer.core.ui.editor.nodecontainer.NodeContainer;
 import org.talend.designer.core.ui.editor.nodes.Node;
 import org.talend.designer.core.ui.editor.process.EDatabaseComponentName;
@@ -79,12 +78,6 @@ public class GuessSchemaProcess extends AbstractGuessSchemaProcess {
         Property property = getProperty();
         Process process = null;
         process = new Process(property);
-        IElementParameter log4jElemParam = process.getElementParameter(EParameterName.LOG4J_ACTIVATE.getName());
-        if (log4jElemParam != null) {
-
-            Boolean isEnableLog4j = AbstractGuessSchemaProcess.isEnableLog4jForGuessSchema();
-            log4jElemParam.setValue(isEnableLog4j);
-        }
         setProcess(process);
         INode node = getNode();
         configContext(process, node);

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/update/cmd/UpdateContextParameterCommand.java

@@ -114,6 +114,7 @@ public class UpdateContextParameterCommand extends Command {
                     checkNewRepositoryParameters(process, names);
                     return;
                 }
+                ContextUtils.clearMissingContextCache();
                 for (IContext context : listContext) {
                         for (IContextParameter param : context.getContextParameterList()) {
                         Item item = null;

main/plugins/org.talend.designer.maven.job/resources/templates/standalone/assembly_job_template.xml

@@ -145,6 +145,7 @@
 		<fileSet> <!-- add items -->
 			<directory>${items.dir}</directory>
 			<outputDirectory>${talend.job.name}</outputDirectory>
+			<useDefaultExcludes>false</useDefaultExcludes>
 			<includes>
 				<include>**</include>
 			</includes>

main/plugins/org.talend.designer.maven.job/resources/templates/standalone/pom_test_route_template.xml

@@ -57,12 +57,22 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.12.4</version>
+				<version>2.22.2</version>
 				<dependencies>
 					<dependency>
 						<groupId>org.apache.maven.surefire</groupId>
 						<artifactId>surefire-junit4</artifactId>
-						<version>2.12.4</version>
+						<version>2.22.2</version>
+					</dependency>
+					<dependency>
+						<groupId>junit</groupId>
+						<artifactId>junit</artifactId>
+						<version>4.13.2</version>
+					</dependency>
+					<dependency>
+						<groupId>org.apache.commons</groupId>
+						<artifactId>commons-lang3</artifactId>
+						<version>3.11</version>
 					</dependency>
 				</dependencies>
 				<configuration>

main/plugins/org.talend.repository/plugin.xml

@@ -3735,6 +3735,15 @@
               name="RemoveDuplicateContextReferencesMigrationTask"
               version="7.3.1">
         </projecttask>
+        <projecttask
+              beforeLogon="true"
+              breaks="7.3.0"
+              class="org.talend.repository.model.migration.RemoveUnwantedUsageDataMigrationTask"
+              description="Remove unwanted old entried from prefrence store for Usage Data Collection"
+              id="org.talend.repository.model.migration.RemoveUnwantedUsageDataMigrationTask"
+              name="RemoveUnwantedUsageDataMigrationTask"
+              version="7.3.1">
+        </projecttask>
    </extension>
 
    <extension

main/plugins/org.talend.repository/src/main/java/org/talend/repository/model/migration/RemoveUnwantedUsageDataMigrationTask.java

@@ -0,0 +1,82 @@
+package org.talend.repository.model.migration;
+
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.talend.core.model.general.Project;
+import org.talend.core.model.migration.AbstractProjectMigrationTask;
+import org.talend.repository.RepositoryPlugin;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import us.monoid.json.JSONObject;
+
+public class RemoveUnwantedUsageDataMigrationTask extends AbstractProjectMigrationTask {
+
+	private static final String PREF_TOS_JOBS_RECORDS = "TOS_Jobs_Records";
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public ExecutionResult execute(Project project) {
+
+		boolean isDataUpdated = false;
+
+		IPreferenceStore preferenceStore = RepositoryPlugin.getDefault().getPreferenceStore();
+		String oldData = preferenceStore.getString(PREF_TOS_JOBS_RECORDS);
+		try {
+			ObjectMapper objectMapper = new ObjectMapper();
+			HashMap<String,Object> result = (HashMap<String,Object>) objectMapper.readValue(oldData, Map.class);
+			
+			isDataUpdated = deletedUnwantedData(result, "nb.route.osgi");
+			
+			// store the updated value
+			if(isDataUpdated) {
+				JSONObject jsonObject = new JSONObject(result);
+				preferenceStore.setValue(PREF_TOS_JOBS_RECORDS, jsonObject.toString());
+			}
+			
+			return ExecutionResult.SUCCESS_NO_ALERT;
+			
+		} catch (Exception e) {
+			// the value is not set, or is empty
+			e.printStackTrace();
+		}
+
+		return ExecutionResult.NOTHING_TO_DO;
+	}
+
+	@Override
+	public Date getOrder() {
+		GregorianCalendar gc = new GregorianCalendar(2017, 4, 17, 12, 0, 0);
+		return gc.getTime();
+	}
+
+	@SuppressWarnings("unchecked")
+	private static boolean deletedUnwantedData(HashMap<String, Object> result, String keyToRemove) throws JsonProcessingException, JsonMappingException {
+
+		boolean isDataUpdated = false;
+		
+		for(Entry<String, Object> entry : result.entrySet()) {
+			
+			HashMap<String,Object> mainValue = (HashMap<String, Object>) entry.getValue();
+			HashMap<String,Object> projectsObj = (HashMap<String, Object>) mainValue.get("projects");
+
+			if(null != projectsObj) {
+				HashMap<String,Object> processObject = (HashMap<String, Object>) projectsObj.get("PROCESS");
+				if(null != processObject) {
+					HashMap<String,Object> detailsObject = (HashMap<String, Object>) processObject.get("details");
+					if(null != detailsObject && detailsObject.containsKey(keyToRemove)) {
+							detailsObject.remove(keyToRemove);
+							isDataUpdated = true;
+					}
+				}
+			}
+		}
+		
+		return isDataUpdated;
+	}
+}

main/plugins/org.talend.repository/src/main/java/org/talend/repository/preference/TosTokenCollector.java

@@ -72,43 +72,43 @@ public class TosTokenCollector extends AbstractTokenCollector {
 
     private static final String NB_ROUTE_MS = "nb.route.ms";
 
-	private static final String NB_ROUTE_OSGI = "nb.route.osgi";
+    private static final String NB_ROUTE_OSGI = "nb.route.osgi";
 
-	private static final String NB_ROUTERESTDS_APIFILE_MS = "nb.routerestds.apifile.ms";
+    private static final String NB_ROUTERESTDS_APIFILE_MS = "nb.routerestds.apifile.ms";
 
-	private static final String NB_ROUTERESTDS_APIDESIGNER_MS = "nb.routerestds.apidesigner.ms";
+    private static final String NB_ROUTERESTDS_APIDESIGNER_MS = "nb.routerestds.apidesigner.ms";
 
-	private static final String NB_ROUTERESTDS_APIFILE_OSGI = "nb.routerestds.apifile.osgi";
+    private static final String NB_ROUTERESTDS_APIFILE_OSGI = "nb.routerestds.apifile.osgi";
 
-	private static final String NB_ROUTERESTDS_APIDESIGNER_OSGI = "nb.routerestds.apidesigner.osgi";
+    private static final String NB_ROUTERESTDS_APIDESIGNER_OSGI = "nb.routerestds.apidesigner.osgi";
 
-	private static final String NB_ROUTERESTDS_BUILTIN_MS = "nb.routerestds.builtin.ms";
+    private static final String NB_ROUTERESTDS_BUILTIN_MS = "nb.routerestds.builtin.ms";
 
-	private static final String NB_ROUTERESTDS_BUILTIN_OSGI = "nb.routerestds.builtin.osgi";
+    private static final String NB_ROUTERESTDS_BUILTIN_OSGI = "nb.routerestds.builtin.osgi";
 
-	private static final String NB_ROUTESOAPDS_MS = "nb.routesoapds.ms";
+    private static final String NB_ROUTESOAPDS_MS = "nb.routesoapds.ms";
 
-	private static final String NB_ROUTESOAPDS_OSGI = "nb.routesoapds.osgi";
+    private static final String NB_ROUTESOAPDS_OSGI = "nb.routesoapds.osgi";
 
-	private static final String ROUTE_MICROSERVICE = "ROUTE_MICROSERVICE";
+    private static final String ROUTE_MICROSERVICE = "ROUTE_MICROSERVICE";
 
-	private static final String ROUTE = "ROUTE";
+    private static final String ROUTE = "ROUTE";
 
-	private static final String REST_MS = "REST_MS";
+    private static final String REST_MS = "REST_MS";
 
-	private static final String OSGI = "OSGI";
+    private static final String OSGI = "OSGI";
 
-	private static final String NB_DSREST_APIFILE_MS = "nb.dsrest.apifile.ms";
+    private static final String NB_DSREST_APIFILE_MS = "nb.dsrest.apifile.ms";
 
-	private static final String NB_DSREST_APIDESIGNER_MS = "nb.dsrest.apidesigner.ms";
+    private static final String NB_DSREST_APIDESIGNER_MS = "nb.dsrest.apidesigner.ms";
 
-	private static final String NB_DSREST_APIFILE_OSGI = "nb.dsrest.apifile.osgi";
+    private static final String NB_DSREST_APIFILE_OSGI = "nb.dsrest.apifile.osgi";
 
-	private static final String NB_DSREST_APIDESIGNER_OSGI = "nb.dsrest.apidesigner.osgi";
+    private static final String NB_DSREST_APIDESIGNER_OSGI = "nb.dsrest.apidesigner.osgi";
 
-	private static final String NB_DSREST_BUILTIN_MS = "nb.dsrest.builtin.ms";
+    private static final String NB_DSREST_BUILTIN_MS = "nb.dsrest.builtin.ms";
 
-	private static final String NB_DSREST_BUILTIN_OSGI = "nb.dsrest.builtin.osgi";
+    private static final String NB_DSREST_BUILTIN_OSGI = "nb.dsrest.builtin.osgi";
 
     private static final String PREF_TOS_JOBS_RECORDS = "TOS_Jobs_Records"; //$NON-NLS-1$
 
@@ -235,7 +235,7 @@ public class TosTokenCollector extends AbstractTokenCollector {
                                 removeUnwantedNodeFromjobDetails(typeStats, jobDetails, NB_DSREST_APIDESIGNER_MS);
                                 removeUnwantedNodeFromjobDetails(typeStats, jobDetails, NB_DSREST_APIFILE_MS);
                             }else if (ERepositoryObjectType.PROCESS_ROUTE.equals(type)) {
-                            	removeUnwantedNodeFromjobDetails(typeStats, jobDetails, NB_ROUTESOAPDS_OSGI);
+                                removeUnwantedNodeFromjobDetails(typeStats, jobDetails, NB_ROUTESOAPDS_OSGI);
                                 removeUnwantedNodeFromjobDetails(typeStats, jobDetails, NB_ROUTESOAPDS_MS);
                                 removeUnwantedNodeFromjobDetails(typeStats, jobDetails, NB_ROUTERESTDS_BUILTIN_OSGI);
                                 removeUnwantedNodeFromjobDetails(typeStats, jobDetails, NB_ROUTERESTDS_BUILTIN_MS);
@@ -287,8 +287,8 @@ public class TosTokenCollector extends AbstractTokenCollector {
             }
         }
         if(repoStats.has("SERVICES")) {
-        	JSONObject serviceJson = (JSONObject)repoStats.get("SERVICES");
-        	serviceJson.put("nbdssoap", nbdssoap);
+            JSONObject serviceJson = (JSONObject)repoStats.get("SERVICES");
+            serviceJson.put("nbdssoap", nbdssoap);
         }
         jObject.put(PROJECTS.getKey(), repoStats); //$NON-NLS-1$
         jObject.put(TYPE.getKey(), ProjectManager.getInstance().getProjectType(currentProject));
@@ -310,145 +310,168 @@ public class TosTokenCollector extends AbstractTokenCollector {
     }
     
     private void removeUnwantedNodeFromjobDetails(JSONObject typeStats, JSONObject jobDetails, String key) throws JSONException {
-		if(jobDetails.has(key)) {
-			typeStats.put(key, jobDetails.get(key)); //$NON-NLS-1$
-			jobDetails.remove(key); //$NON-NLS-1$
-		}
-	}
+        if(jobDetails.has(key)) {
+            typeStats.put(key, jobDetails.get(key)); //$NON-NLS-1$
+            jobDetails.remove(key); //$NON-NLS-1$
+        }
+    }
     
     @SuppressWarnings("unchecked")
-    private void extractBuildTypeData(List<IRepositoryViewObject> allRvo, Map<String, Integer> buildTypeDetails) {
-    	Set<String> checkedItemSet = new HashSet<String>();
-    	for (IRepositoryViewObject rvo : allRvo) {
-    		Item item = rvo.getProperty().getItem();
-    		if (item instanceof ProcessItem) {
-    			ProcessType processType = ((ProcessItem) item).getProcess();
-    			String itemID = ((ProcessItem) item).getProperty().getId();
-    			List<NodeType> nodeList = (List<NodeType>) processType.getNode();
+    private void extractBuildTypeData(NodeType node, Item item, String itemID, String componentName, 
+    		Set<String> checkedItemSet, Map<String, Integer> buildTypeDetails, Set<String> componentNamesList) {
 
-    			for (NodeType node : nodeList) {
-    				String componentName = node.getComponentName();
-    				List<AdditionalInfoMapImpl> properties = item.getProperty().getAdditionalProperties();
-    				for (AdditionalInfoMapImpl property : properties) {
+    	List<AdditionalInfoMapImpl> properties = item.getProperty().getAdditionalProperties();
+    	boolean isItemChecked = false;
+    	boolean buildTypeIsPresent = false;
+    	String buildType = null;
 
-    					String buildType = property.getValue().toString();
-    					String nodeType = ComponentUtilities.getNodePropertyValue(node, "PROPERTY:PROPERTY_TYPE"); //$NON-NLS-1$
-    					String apiID = ComponentUtilities.getNodePropertyValue(node, "API_ID"); //$NON-NLS-1$
+    	for (AdditionalInfoMapImpl property : properties) {
 
-    					if("BUILD_TYPE".equals(property.getKey().toString()) && null != buildType) {
-    						if ("tRESTRequest".equals(componentName)) {
-    							if(null == nodeType || !nodeType.equals("REPOSITORY")) {
-    								// when API Definition = built-in
-    								if(buildType.equals(OSGI)) {
-    									// nb jobs with tRESTRequest where build type is = OSGI and API definition is = Built-in
-    									String key = NB_DSREST_BUILTIN_OSGI;
-    									buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
-    									break;
-    								}else if(buildType.equals(REST_MS)) {
-    									//nb jobs with tRESTRequest where build type is = Microservice and API definition is = Built-in
-    									String key = NB_DSREST_BUILTIN_MS;
-    									buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
-    									break;
-    								}
-    							}else if(null != nodeType && nodeType.equals("REPOSITORY")){
-    								// when API Definition = Repository
-    								if(buildType.equals(OSGI)) {
-    									if(null!=apiID && !apiID.isEmpty()) {
-    										// nb jobs with tRESTRequest where build type is = OSGI and API definition is = imported from API Designer
-    										String key = NB_DSREST_APIDESIGNER_OSGI;
-    										buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
-    										break;
-    									}else {
-    										// nb jobs with tRESTRequest where build type is = OSGI and API definition is = imported from local file
-    										String key = NB_DSREST_APIFILE_OSGI;
-    										buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
-    										break;
-    									}
-    								}else if(buildType.equals(REST_MS)) {
-    									if(null!=apiID && !apiID.isEmpty()) {
-    										//nb jobs with tRESTRequest where build type is = Microservice and API definition is = imported from API Designer
-    										String key = NB_DSREST_APIDESIGNER_MS;
-    										buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
-    										break;
-    									}else {
-    										// nb jobs with tRESTRequest where build type is = Microservice and API definition is = imported from local file
-    										String key = NB_DSREST_APIFILE_MS;
-    										buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
-    										break;
-    									}
-    								}
-    							}
-    						} else if("cSOAP".equals(componentName)) {
-    							if(buildType.equals(ROUTE)) {
-    								// nb routes with cSOAP as producer where build type = OSGI
-    								String key = NB_ROUTESOAPDS_OSGI;
-    								buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
-    								break;
-    							}else if(buildType.equals(ROUTE_MICROSERVICE)) {
-    								// nb routes with cSOAP as producer where build type = Microservice
-    								String key = NB_ROUTESOAPDS_MS;
-    								buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
-    								break;
-    							}
-    						}else if("cREST".equals(componentName)) {
-    							if(null == nodeType || !nodeType.equals("REPOSITORY")) {
-    								if(buildType.equals(ROUTE)) {
-    									// nb routes with cREST as producer where build type = OSGI and API definition = Built-in
-    									String key = NB_ROUTERESTDS_BUILTIN_OSGI;
-    									buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
-    									break;
-    								}else if(buildType.equals(ROUTE_MICROSERVICE)) {
-    									// nb routes with cREST as producer where build build type = Microservice and API definition = Built-in
-    									String key = NB_ROUTERESTDS_BUILTIN_MS;
-    									buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
-    									break;
-    								}
-    							}else if(null != nodeType && nodeType.equals("REPOSITORY")){
-    								// when API Definition = Repository
-    								if(buildType.equals(ROUTE)) {
-    									if(null!=apiID && !apiID.isEmpty()) {
-    										// nb routes with cREST as producer where build type is = OSGI and API definition is = imported from API Designer
-    										String key = NB_ROUTERESTDS_APIDESIGNER_OSGI;
-    										buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
-    										break;
-    									}else {
-    										// nb routes with cREST as producer where build type is = OSGI and API definition is = imported from local file
-    										String key = NB_ROUTERESTDS_APIFILE_OSGI;
-    										buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
-    										break;
-    									}
-    								}else if(buildType.equals(ROUTE_MICROSERVICE)) {
-    									if(null!=apiID && !apiID.isEmpty()) {
-    										// nb routes with cREST as producer where build type is  = Microservice and API definition is = imported from API Designer
-    										String key = NB_ROUTERESTDS_APIDESIGNER_MS;
-    										buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
-    										break;
-    									}else {
-    										// nb routes with cREST as producer where build type is = Microservice and API definition is = imported from local file
-    										String key = NB_ROUTERESTDS_APIFILE_MS;
-    										buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
-    										break;
-    									}
-    								}
-    							}
-    						}else if(!"cSOAP".equals(componentName) && !"cREST".equals(componentName) && !checkedItemSet.contains(itemID)) {
-    							// nb of jobs which doesn't contains cSOAP or cREST components
-    							if(buildType.equals(ROUTE)) {
-    								// nb routes without cSOAP or cREST as producer where build type = OSGI
-    								String key = NB_ROUTE_OSGI;
-    								buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
-    								break;
-    							}else if(buildType.equals(ROUTE_MICROSERVICE)) {
-    								// nb routes without cSOAP or cREST as producer where build type = Microservice
-    								String key = NB_ROUTE_MS;
-    								buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
-    								break;
-    							}
-    						}
-    					}
-    				}
-    				checkedItemSet.add(itemID);
-    				break;
+    		String buildTypeKey = property.getKey().toString();
+    		String buildTypeValue = property.getValue().toString();
+
+    		if("BUILD_TYPE".equals(buildTypeKey) && null != buildTypeValue) {
+    			buildType = buildTypeValue;
+    			buildTypeIsPresent = true;
+    			break;
+    		}
+    	}
+
+    	String nodeType = ComponentUtilities.getNodePropertyValue(node, "PROPERTY:PROPERTY_TYPE"); //$NON-NLS-1$
+    	String apiID = ComponentUtilities.getNodePropertyValue(node, "API_ID"); //$NON-NLS-1$
+
+    	// decide build type for Job/Route
+    	// if build type is missing then it is treated as OSGI type i.e. for JOB buildType = OSGI and for Route buildType = ROUTE
+    	// for Microservice if buildType is missing then it will treated as OSGI type always 
+    	if(!buildTypeIsPresent || null==buildType) {
+    		if (componentName.startsWith("t")) {
+    			// if Build type is not present then treat this job as OSGI
+    			buildType = OSGI;
+    		}else if (componentName.startsWith("c")){
+    			// if Build type is not present then treat this Route as OSGI
+    			buildType = ROUTE;
+    		}
+    	}
+
+    	if(null != buildType) {
+    		if (componentNamesList.contains("tRESTRequest")) {
+    			extractDataWhenItemHastRESTRequest(buildTypeDetails, buildType, nodeType, apiID);
+    			isItemChecked =true;
+    		} else if(componentNamesList.contains("cSOAP")) {
+    			extractDataWhenItemHascSOAP(buildTypeDetails, buildType);
+    			isItemChecked =true;
+    		}else if(componentNamesList.contains("cREST")) {
+    			extractDataWhenItemHascREST(buildTypeDetails, buildType, nodeType, apiID);
+    			isItemChecked =true;
+    		}else if(!componentNamesList.contains("cSOAP") && !componentNamesList.contains("cREST")  && !checkedItemSet.contains(itemID)) {
+    			extractDataForRouteWithoutcRESTorcSOAP(buildTypeDetails, buildType);
+    			isItemChecked =true;
+    		}
+    	}
+
+    	if(isItemChecked) {
+    		checkedItemSet.add(itemID);
+    	}
+    }
+
+    private void extractDataForRouteWithoutcRESTorcSOAP(Map<String, Integer> buildTypeDetails, String buildType) {
+    	// nb of jobs which doesn't contains cSOAP or cREST components
+    	if(buildType.equals(ROUTE)) {
+    		// nb routes without cSOAP or cREST as producer where build type = OSGI
+    		String key = NB_ROUTE_OSGI;
+    		buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
+    	}else if(buildType.equals(ROUTE_MICROSERVICE)) {
+    		// nb routes without cSOAP or cREST as producer where build type = Microservice
+    		String key = NB_ROUTE_MS;
+    		buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
+    	}
+    }
+
+    private void extractDataWhenItemHascREST(Map<String, Integer> buildTypeDetails, String buildType, String nodeType, String apiID) {
+    	if(null == nodeType || !nodeType.equals("REPOSITORY")) {
+    		if(buildType.equals(ROUTE)) {
+    			// nb routes with cREST as producer where build type = OSGI and API definition = Built-in
+    			String key = NB_ROUTERESTDS_BUILTIN_OSGI;
+    			buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
+    		}else if(buildType.equals(ROUTE_MICROSERVICE)) {
+    			// nb routes with cREST as producer where build build type = Microservice and API definition = Built-in
+    			String key = NB_ROUTERESTDS_BUILTIN_MS;
+    			buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
+    		}
+    	}else if(null != nodeType && nodeType.equals("REPOSITORY")){
+    		// when API Definition = Repository
+    		if(buildType.equals(ROUTE)) {
+    			if(null!=apiID && !apiID.isEmpty()) {
+    				// nb routes with cREST as producer where build type is = OSGI and API definition is = imported from API Designer
+    				String key = NB_ROUTERESTDS_APIDESIGNER_OSGI;
+    				buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
+    			}else {
+    				// nb routes with cREST as producer where build type is = OSGI and API definition is = imported from local file
+    				String key = NB_ROUTERESTDS_APIFILE_OSGI;
+    				buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
+    			}
+    		}else if(buildType.equals(ROUTE_MICROSERVICE)) {
+    			if(null!=apiID && !apiID.isEmpty()) {
+    				// nb routes with cREST as producer where build type is  = Microservice and API definition is = imported from API Designer
+    				String key = NB_ROUTERESTDS_APIDESIGNER_MS;
+    				buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
+    			}else {
+    				// nb routes with cREST as producer where build type is = Microservice and API definition is = imported from local file
+    				String key = NB_ROUTERESTDS_APIFILE_MS;
+    				buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
+    			}
+    		}
+    	}
+    }
+
+    private void extractDataWhenItemHascSOAP(Map<String, Integer> buildTypeDetails, String buildType) {
+    	if(buildType.equals(ROUTE)) {
+    		// nb routes with cSOAP as producer where build type = OSGI
+    		String key = NB_ROUTESOAPDS_OSGI;
+    		buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
+    		//break;
+    	}else if(buildType.equals(ROUTE_MICROSERVICE)) {
+    		// nb routes with cSOAP as producer where build type = Microservice
+    		String key = NB_ROUTESOAPDS_MS;
+    		buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
+    		//break;
+    	}
+    }
+
+    private void extractDataWhenItemHastRESTRequest(Map<String, Integer> buildTypeDetails, String buildType,
+    		String nodeType, String apiID) {
+    	if(null == nodeType || !nodeType.equals("REPOSITORY")) {
+    		// when API Definition = built-in
+    		if(buildType.equals(OSGI)) {
+    			// nb jobs with tRESTRequest where build type is = OSGI and API definition is = Built-in
+    			String key = NB_DSREST_BUILTIN_OSGI;
+    			buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
+    		}else if(buildType.equals(REST_MS)) {
+    			//nb jobs with tRESTRequest where build type is = Microservice and API definition is = Built-in
+    			String key = NB_DSREST_BUILTIN_MS;
+    			buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
+    		}
+    	}else if(null != nodeType && nodeType.equals("REPOSITORY")){
+    		// when API Definition = Repository
+    		if(buildType.equals(OSGI)) {
+    			if(null!=apiID && !apiID.isEmpty()) {
+    				// nb jobs with tRESTRequest where build type is = OSGI and API definition is = imported from API Designer
+    				String key = NB_DSREST_APIDESIGNER_OSGI;
+    				buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
+    			}else {
+    				// nb jobs with tRESTRequest where build type is = OSGI and API definition is = imported from local file
+    				String key = NB_DSREST_APIFILE_OSGI;
+    				buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
+    			}
+    		}else if(buildType.equals(REST_MS)) {
+    			if(null!=apiID && !apiID.isEmpty()) {
+    				//nb jobs with tRESTRequest where build type is = Microservice and API definition is = imported from API Designer
+    				String key = NB_DSREST_APIDESIGNER_MS;
+    				buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
+    			}else {
+    				// nb jobs with tRESTRequest where build type is = Microservice and API definition is = imported from local file
+    				String key = NB_DSREST_APIFILE_MS;
+    				buildTypeDetails.put(key, null!=buildTypeDetails.get(key) ? buildTypeDetails.get(key)+1 : 1);
     			}
     		}
     	}
@@ -488,15 +511,21 @@ public class TosTokenCollector extends AbstractTokenCollector {
         Map<String, JSONObject> camelComponentMap = new HashMap<>();
         Map<String, JSONObject> customCamelComponentMap = new HashMap<>();
         Map<String,Integer> buildTypeDetails = new HashMap<String,Integer>();
-        extractBuildTypeData(allRvo, buildTypeDetails);
+        Set<String> checkedIteSetForBuildTypes = new HashSet<String>();
         for (IRepositoryViewObject rvo : allRvo) {
             Item item = rvo.getProperty().getItem();
+            String itemID = ((ProcessItem) item).getProperty().getId();
             if (item instanceof ProcessItem) {
                 boolean has_tRestRequest = false;
                 boolean has_tESBProviderRequest = false;
                 boolean has_tESBProviderRequest_Or_tRESTRequest = false;
                 ProcessType processType = ((ProcessItem) item).getProcess();
-                for (NodeType node : (List<NodeType>) processType.getNode()) {
+                List<NodeType> nodeTypeList = (List<NodeType>) processType.getNode();
+                Set<String> componentNamesList = new HashSet<String>();
+                for (NodeType node : nodeTypeList) {
+                	componentNamesList.add(node.getComponentName());
+                }
+                for (NodeType node : nodeTypeList) {
                     JSONObject component_names = null;
                     String componentName = node.getComponentName();
                     int nbComp = 0;
@@ -516,6 +545,9 @@ public class TosTokenCollector extends AbstractTokenCollector {
                     component_names.put("count", nbComp + 1);
 
                     extractRuntimeFeature(node, component_names, componentName);
+                    if(!checkedIteSetForBuildTypes.contains(itemID)) {
+                        extractBuildTypeData(node, item, itemID, componentName, checkedIteSetForBuildTypes, buildTypeDetails, componentNamesList);
+                    }
                     
                     if (dsComponentsInDIJobs.contains(componentName)) {
                         has_tESBProviderRequest_Or_tRESTRequest = true;
@@ -631,9 +663,9 @@ public class TosTokenCollector extends AbstractTokenCollector {
             // nb Services (SOAP WSDL) with at least one operation implemented as job with tESBProviderRequest
             jobDetails.put("nbdssoap", soapWsdlWithImpl.size());
         }
-	// put build type data
+    // put build type data
         for(Map.Entry<String,Integer> entry : buildTypeDetails.entrySet()){
-        	jobDetails.put(entry.getKey(), entry.getValue());
+            jobDetails.put(entry.getKey(), entry.getValue());
         }
     }
 
@@ -670,31 +702,39 @@ public class TosTokenCollector extends AbstractTokenCollector {
                 }
             }
         }
-        // cREST, tRESTRequest, tRESTClient
-        if (Arrays.asList("cREST", "tRESTRequest", "tRESTClient").contains(componentName)) {
+        // Runtime feature count
+        if (Arrays.asList("cREST", "tRESTRequest", "tRESTClient", "cSOAP", "tESBConsumer").contains(componentName)) {
             EList elementParameter = node.getElementParameter();
             boolean useAuthentication = false;
             for (Object obj : elementParameter) {
                 if (obj instanceof ElementParameterType) {
                     ElementParameterType ep = (ElementParameterType) obj;
-                    // check if service locator is used
-                    if (ep.getName().equals("SERVICE_LOCATOR") && ep.getValue().equals("true")) {
+                    if (!ep.isShow()) {
+                        continue;
+                    }
+                    // check if service locator is used 
+                    if ((ep.getName().equals("SERVICE_LOCATOR") || ep.getName().equals("ENABLE_SL")) && ep.getValue().equals("true")) {
                         addCountInComponent("count_use_service_locator", component_names);
                     }
+                    
+                    // check if service registry is used
+                    if ((ep.getName().equals("ENABLE_REGISTRY") || ep.getName().equals("USE_SR"))
+                            && ep.getValue().equals("true")) {
+                        addCountInComponent("count_use_service_registry", component_names);
+                    }
                     // check if service activity monitoring is used
-                    if (ep.getName().equals("SERVICE_ACTIVITY_MONITOR") && ep.getValue().equals("true")) {
+                    if ((ep.getName().equals("SERVICE_ACTIVITY_MONITOR") || ep.getName().equals("ENABLE_SAM"))
+                            && ep.getValue().equals("true")) {
                         addCountInComponent("count_use_service_activity_monitoring", component_names);
                     }
                     // check if authentication is used.
-                    if (("cREST".equals(componentName) && ep.getName().equals("ENABLE_SECURITY") && ep.getValue().equals("true"))
-                            || ((Arrays.asList("tRESTRequest", "tRESTClient").contains(componentName) && ep.getName().equals("NEED_AUTH")
-                                    && ep.getValue().equals("true")))) {
+                    if ((ep.getName().equals("ENABLE_SECURITY") || ep.getName().equals("NEED_AUTH"))
+                            && ep.getValue().equals("true")) {
                         useAuthentication = true;
                     }
                     // get authentication type
                     if (useAuthentication
-                            && ((("cREST".equals(componentName) && ep.getName().equals("SECURITY_TYPE"))
-                                    || ((Arrays.asList("tRESTRequest", "tRESTClient").contains(componentName) && ep.getName().equals("AUTH_TYPE")))))) {
+                            && (ep.getName().equals("SECURITY_TYPE") || ep.getName().equals("AUTH_TYPE"))) {
                         if (ep.getValue().equals("SAML")) {
                             addCountInComponent("count_use_authent_SAML_token", component_names);
                         }
@@ -708,12 +748,26 @@ public class TosTokenCollector extends AbstractTokenCollector {
                         }
                         
                         if(ep.getValue().equals("OAUTH2_BEARER")) {
-                            addCountInComponent("count_use_OAuther2_Bearer", component_names);
+                            addCountInComponent("count_use_OAuth2_Bearer", component_names);
                         }
                         
-                        if(ep.getValue().equals("HTTP Digest")) {
+                        if(ep.getValue().equals("HTTP Digest") || ep.getValue().equals("DIGEST")) {
                             addCountInComponent("count_use_authent_http_digest", component_names);
                         }
+                        
+                        if (ep.getValue().equals("USER") || ep.getValue().equals("TOKEN")) {
+                            addCountInComponent("count_use_authent_UsernameToken", component_names);
+                        }
+                    }
+                    
+                    if ((ep.getName().equals("USE_AUTHORIZATION") || ep.getName().equals("NEED_AUTHORIZATION"))
+                            && ep.getValue().equals("true")) {
+                        addCountInComponent("count_use_authorization", component_names);
+                    }
+                    // check if use business correlation is checked
+                    if ((ep.getName().equals("ENABLE_CORRELATION") || ep.getName().equals("USE_BUSINESS_CORRELATION"))
+                            && ep.getValue().equals("true")) {
+                        addCountInComponent("count_use_business_correlation", component_names);
                     }
                 }
             }

main/plugins/org.talend.sdk.component.studio-integration/src/main/java/org/talend/sdk/component/studio/ui/guessschema/TaCoKitGuessSchemaProcess.java

@@ -35,11 +35,9 @@ import org.talend.core.model.process.IElementParameter;
 import org.talend.core.model.process.INode;
 import org.talend.core.model.process.IProcess;
 import org.talend.core.model.properties.Property;
-import org.talend.designer.core.model.components.EParameterName;
 import org.talend.designer.core.model.components.ElementParameter;
 import org.talend.designer.core.model.process.DataProcess;
 import org.talend.designer.core.ui.editor.process.Process;
-import org.talend.designer.core.ui.editor.properties.controllers.AbstractGuessSchemaProcess;
 import org.talend.designer.runprocess.IProcessor;
 import org.talend.designer.runprocess.ProcessorUtilities;
 import org.talend.sdk.component.server.front.model.ActionReference;
@@ -196,11 +194,6 @@ public class TaCoKitGuessSchemaProcess {
                 DataProcess dataProcess = new DataProcess(originalProcess);
                 dataProcess.buildFromGraphicalProcess(nodes);
                 process = dataProcess.getDuplicatedProcess();
-                IElementParameter log4jElemParam = process.getElementParameter(EParameterName.LOG4J_ACTIVATE.getName());
-                if (log4jElemParam != null) {
-                    Boolean isEnableLog4j = AbstractGuessSchemaProcess.isEnableLog4jForGuessSchema();
-                    log4jElemParam.setValue(isEnableLog4j);
-                }
                 process.getContextManager()
                         .getListContext()
                         .addAll(originalProcess.getContextManager().getListContext());