TESB-29664 Reverting changes (#4955)

Co-authored-by: Maksym Sheverda <maksym.sheverda@synapse.com>

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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.gefabstractmap.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.sqlbuilder.nl</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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.feature</artifactId>

main/features/org.talend.fragment.jars.di.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.fragment.jars.di.feature</artifactId>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.help.tos.components.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.components.feature</artifactId>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.core.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.libraries.feature</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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.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>7.3.1-SNAPSHOT</version>
+    <version>7.3.1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.business.diagram</artifactId>

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

@@ -108,6 +108,21 @@
         exist_tSQLDB = true;
     }
 
+
+    String[] tcompV0Components = new String[] {
+        "tAzureStorageConnection",
+        "tGoogleDriveConnection",
+        "tMarketoConnection",
+        "tSnowflakeConnection",
+        "tSalesforceConnection",
+        "tNetsuiteConnection",
+        "tMarkLogicConnection"
+    };
+    List<INode> tcompV0ComponentsList =  new ArrayList<INode>();
+    for (String tcompV0Component : tcompV0Components) {
+        tcompV0ComponentsList.addAll((List<INode>)process.getNodesOfType(tcompV0Component));
+    }
+
     boolean exist_tSCP = false;
     List<INode> scpComponentsList = (List<INode>)process.getNodesOfType("tSCPConnection");
     if (scpComponentsList.size() > 0) {
@@ -167,6 +182,8 @@
         exist_tSalesforce = true;
     }
 
+    List<INode> snowflakeComponentsList = (List<INode>)process.getNodesOfType("tSnowflakeConnection");
+
     boolean exist_tSAP= false;
     List<INode> sapComponentsList = (List<INode>)process.getNodesOfType("tSAPConnection");
     if (sapComponentsList.size() > 0) {
@@ -619,7 +636,16 @@
                         } //endIf
 %>
                         context.setContextType("<%=ctxParam.getName()%>", "<%=ctxParam.getType()%>");
+                        if(context.getStringValue("<%=ctxParam.getName()%>") == null) {
+                            context.<%=ctxParam.getName()%> = null;
+                        } else {
+                        <%//}B1 block%>
 <%
+                        String typeToGenerate ="String";
+                        if( !(ctxParam.getType().equals("id_File") || ctxParam.getType().equals("id_Directory") ||ctxParam.getType().equals("id_List Of Value"))) {
+                           typeToGenerate=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true);
+                        }
+                        
                         if (ctxParam.getType().equals("id_Password")) {
 %>
                             String pwd_<%=ctxParam.getName()%>_value = context.getProperty("<%=ctxParam.getName()%>");
@@ -637,13 +663,7 @@
                                 }
                             }
 <%
-                            continue;
-                        }
-                        String typeToGenerate ="String";
-                        if( !(ctxParam.getType().equals("id_File") || ctxParam.getType().equals("id_Directory") ||ctxParam.getType().equals("id_List Of Value"))) {
-                           typeToGenerate=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true);
-                        }
-                        if(typeToGenerate.equals("java.util.Date")) {
+                        } else if(typeToGenerate.equals("java.util.Date")) {
 %>
                         try{
                             String context_<%=ctxParam.getName()%>_value = context.getProperty("<%=ctxParam.getName()%>");
@@ -702,6 +722,10 @@
                             }
 <%
                         }
+%>
+                        <%//{B1 block%>
+                        }
+<%
                     }
 %>
                 } <%/*close last method*/%>
@@ -872,20 +896,6 @@ if(execStat) {
         }
 %>
 
-<%if (hadoopClusterIds.size() > 1) {%>
-    System.err.println("Only one hadoop configuration is allowed in one job!");
-<%}%>
-
-<%
-// run tHadoopConfManager component if there is it.
- if(!hadoopConfNodes.isEmpty()) {
-    INode hadoopConfNode = hadoopConfNodes.get(0);
-%>
-<%=createCallProcess(hadoopConfNode, className, false) %>
-<%
- }
-%>
-
 <%
 //2. load implicit contextload
  if(implicit_Context != null) {
@@ -908,6 +918,19 @@ this.globalResumeTicket = true;//to run tPreJob
  }
 %>
 
+<%if (hadoopClusterIds.size() > 1) {%>
+    System.err.println("Only one hadoop configuration is allowed in one job!");
+<%}%>
+
+<%
+// run tHadoopConfManager component if there is it.
+ if(!hadoopConfNodes.isEmpty()) {
+    INode hadoopConfNode = hadoopConfNodes.get(0);
+%>
+<%=createCallProcess(hadoopConfNode, className, false) %>
+<%
+ }
+%>
 
 <%
         //4. flush the begin msg
@@ -1501,12 +1524,14 @@ if (execStat) {
 <%      } %>
 <%      for (INode existNode : existComponentsList) { %>
             connections.put("col_<%=existNode.getUniqueName()%>", globalMap.get("col_<%=existNode.getUniqueName()%>"));
-<%      } %>
+<%      }
 
-<%      for (INode salesforceNode : salesforceComponentsList) { %>
-            connections.put("conn_<%=salesforceNode.getUniqueName()%>", globalMap.get("conn_<%=salesforceNode.getUniqueName()%>"));
-<%      } %>
-<%      for (INode sapNode : sapComponentsList) { %>
+        for (INode tcompV0ConnectionNode : tcompV0ComponentsList) { %>
+            connections.put("<%=tcompV0ConnectionNode.getUniqueName()%>_connection", globalMap.get("<%=tcompV0ConnectionNode.getUniqueName()%>_connection"));
+            connections.put("<%=tcompV0ConnectionNode.getUniqueName()%>_COMPONENT_RUNTIME_PROPERTIES", globalMap.get("<%=tcompV0ConnectionNode.getUniqueName()%>_COMPONENT_RUNTIME_PROPERTIES"));
+<%      }
+
+        for (INode sapNode : sapComponentsList) { %>
             connections.put("conn_<%=sapNode.getUniqueName()%>", globalMap.get("conn_<%=sapNode.getUniqueName()%>"));
 <%      } %>
 <%      for (INode gsNode : gsComponentsList) { %>

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

@@ -62,6 +62,8 @@ class IndexedRecordToRowStructGenerator {
             %>
             boolean <%=codeVarIsDynamicInitialized%> = false;
             routines.system.Dynamic <%=codeVarDynamic%> = new routines.system.Dynamic();
+			//Workaround for TDI-44051, TcimpV0 do not need DbmsID
+			<%=codeVarDynamic%>.setDbmsId("<%=cid%>");
             <%
         }
 
@@ -115,10 +117,11 @@ class IndexedRecordToRowStructGenerator {
                 for (org.apache.avro.Schema.Field dynamicField_<%=cid%> : dynSchema_<%=cid%>.getFields()){
                     routines.system.DynamicMetadata dynamicMetadata_<%=cid%> = new routines.system.DynamicMetadata();
                     org.apache.avro.Schema dynamicFieldSchema_<%=cid%> = dynamicField_<%=cid%>.schema();
+					String dbName = dynamicField_<%=cid%>.getProp("talend.field.dbColumnName");
                     // set name
                     dynamicMetadata_<%=cid%>.setName(dynamicField_<%=cid%>.name());
                     // set db name
-                    dynamicMetadata_<%=cid%>.setDbName(dynamicField_<%=cid%>.name());
+                    dynamicMetadata_<%=cid%>.setDbName(dbName==null?dynamicField_<%=cid%>.name():dbName);
                     // set nullable
                     if (org.talend.daikon.avro.AvroUtils.isNullable(dynamicFieldSchema_<%=cid%>)) {
                         dynamicMetadata_<%=cid%>.setNullable(true);

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

@@ -298,6 +298,15 @@ if(isRunInMultiThread){
 			}
 			<% } %>
 		}
+		
+		//if the stored or passed value is "<TALEND_NULL>" string, it mean null
+		public String getStringValue(String key) {
+			String origin_value = this.getProperty(key);
+			if(NULL_VALUE_EXPRESSION_IN_COMMAND_STRING_FOR_CHILD_JOB_ONLY.equals(origin_value)) {
+				return null;
+			}
+			return origin_value;
+		}
 
 <%
 		for (IContextParameter ctxParam :params)

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

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

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

@@ -28,9 +28,9 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Optional;
 import java.util.ResourceBundle;
 import java.util.Set;
-import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.Lock;
@@ -70,7 +70,6 @@ import org.talend.core.model.components.ComponentCategory;
 import org.talend.core.model.components.ComponentManager;
 import org.talend.core.model.components.ComponentProviderInfo;
 import org.talend.core.model.components.ComponentUtilities;
-import org.talend.core.model.components.EComponentType;
 import org.talend.core.model.components.IComponent;
 import org.talend.core.model.components.IComponentsFactory;
 import org.talend.core.model.components.IComponentsHandler;
@@ -838,23 +837,21 @@ public class ComponentsFactory implements IComponentsFactory {
             init(false);
         }
 
-        for (IComponent comp : componentList) {
-            if (comp.getComponentType() != EComponentType.JOBLET) {
-                continue;
-            }
-            String comName = comp.getName();
-            if (comp != null && paletteType.equals(comp.getPaletteType())) {
-                if (comName.equals(name)) {
-                    return comp;
-                } else if (new JobletUtil().matchExpression(comName)) {
-                    String[] names = comName.split(":"); //$NON-NLS-1$
-                    comName = names[1];
-                    if (comName.equals(name)) {
-                        return comp;
-                    }
+        // check if reference joblet component presents
+        JobletUtil jobletUtils = new JobletUtil();
+        Optional<IComponent> result = jobletUtils.findComponentByName(componentList, name, paletteType);
+        if (!result.isPresent()) {
+            // check if any name matching joblet component presents
+            if (jobletUtils.matchExpression(name)) {
+                name = StringUtils.substringAfterLast(name, ":"); //$NON-NLS-1$
+                if (StringUtils.isNotBlank(name)) {
+                    result = jobletUtils.findComponentByName(componentList, name, paletteType);
                 }
             }
         }
+        if (result.isPresent()) {
+            return result.get();
+        }
         return null;
     }
 

main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/config/EInternalTemplate.java

@@ -60,6 +60,7 @@ public enum EInternalTemplate {
     // just to have compiled templates
     FOOTER_ROUTE("footer_route", "0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
     HEADER_ROUTE("header_route", "0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
+    MICROSERVICE_APP_SECURITY("microservice_app_security","0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
     CAMEL_RUNIF("camel_run_if", "0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
     CAMEL_SPECIALLINKS("camel_speciallinks", "0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
     MICROSERVICE_APP("microservice_app", "0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$

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

main/plugins/org.talend.designer.components.localprovider/components/tAmazonEMRListInstances/tAmazonEMRListInstances_java.xml

@@ -58,7 +58,7 @@
 			<DEFAULT>""</DEFAULT>
     	</PARAMETER>
     	
-    	<PARAMETER NAME="SESSION_DURATION" FIELD="TEXT" NUM_ROW="15" REQUIRED="true"
+    	<PARAMETER NAME="SESSION_DURATION" FIELD="TEXT" NUM_ROW="15"
     		SHOW_IF="ASSUME_ROLE == 'true'"
 			GROUP="AUTHENTICATION">
 			<DEFAULT>15</DEFAULT>
@@ -105,21 +105,131 @@
 	</PARAMETERS>
 
 	<ADVANCED_PARAMETERS>
-		<PARAMETER NAME="SET_STS_ENDPOINT" FIELD="CHECK" NUM_ROW="1" REQUIRED="true"
-			SHOW_IF="ASSUME_ROLE == 'true'">
-      		<DEFAULT>false</DEFAULT>
-    	</PARAMETER>
-    	
-    	<PARAMETER NAME="STS_ENDPOINT" FIELD="TEXT" NUM_ROW="1" REQUIRED="true"
-    		SHOW_IF="(ASSUME_ROLE == 'true') AND (SET_STS_ENDPOINT == 'true')">
-      		<DEFAULT>""</DEFAULT>
-    	</PARAMETER>
+    	<PARAMETER
+	      NAME="SET_STS_ENDPOINT"
+	      FIELD="CHECK"
+	      NUM_ROW="1"
+	      NB_LINES="5"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      SHOW_IF="isShow[ASSUME_ROLE] AND (ASSUME_ROLE == 'true')"
+	    >
+	    </PARAMETER>
+	    
+		<PARAMETER
+	      NAME="STS_ENDPOINT"
+	      FIELD="TEXT"
+	      NUM_ROW="1"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      SHOW_IF="isShow[SET_STS_ENDPOINT] AND (SET_STS_ENDPOINT == 'true')"
+	    >
+	      <DEFAULT>""</DEFAULT>
+	    </PARAMETER>
+	    
+	    <PARAMETER
+	      NAME="SIGNING_REGION"
+	      FIELD="OPENED_LIST"
+	      NUM_ROW="2"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      REQUIRED="true"
+	      SHOW_IF="ASSUME_ROLE == 'true'"
+	    >
+	      <ITEMS DEFAULT="DEFAULT">
+	        	<ITEM NAME="DEFAULT" VALUE="DEFAULT" />
+		        <ITEM NAME="GovCloud" VALUE="&quot;us-gov-west-1&quot;" />
+		        <ITEM NAME="US_EAST_1" VALUE="&quot;us-east-1&quot;" />
+		        <ITEM NAME="US_WEST_1" VALUE="&quot;us-west-1&quot;" />
+		        <ITEM NAME="US_WEST_2" VALUE="&quot;us-west-2&quot;" />
+		        <ITEM NAME="US_EAST_2" VALUE="&quot;us-east-2&quot;" />
+		        <ITEM NAME="SA_EAST_1" VALUE="&quot;sa-east-1&quot;" />
+		        <ITEM NAME="EU_WEST_1" VALUE="&quot;eu-west-1&quot;" />
+		        <ITEM NAME="EU_CENTRAL_1" VALUE="&quot;eu-central-1&quot;" />
+		        <ITEM NAME="EU_WEST_2" VALUE="&quot;eu-west-2&quot;" />
+		        <ITEM NAME="EU_WEST_3" VALUE="&quot;eu-west-3&quot;" />
+		        <ITEM NAME="EU_NORTH_1" VALUE="&quot;eu-north-1&quot;" />
+		        <ITEM NAME="CN_NORTH_1" VALUE="&quot;cn-north-1&quot;" />
+		        <ITEM NAME="CN_NORTHWEST_1" VALUE="&quot;cn-northwest-1&quot;" />
+		        <ITEM NAME="AP_EAST_1" VALUE="&quot;ap-east-1&quot;" />
+	         	<ITEM NAME="AP_SOUTHEAST_1" VALUE="&quot;ap-southeast-1&quot;" />
+		        <ITEM NAME="AP_SOUTHEAST_2" VALUE="&quot;ap-southeast-2&quot;" />
+		        <ITEM NAME="AP_NORTHEAST_1" VALUE="&quot;ap-northeast-1&quot;" />
+		        <ITEM NAME="AP_NORTHEAST_2" VALUE="&quot;ap-northeast-2&quot;" />
+	        	<ITEM NAME="AP_SOUTH_1" VALUE="&quot;ap-south-1&quot;" />
+		        <ITEM NAME="CA_CENTRAL_1" VALUE="&quot;ca-central-1&quot;" />
+	    	</ITEMS>
+	    </PARAMETER> 
+	    
+	    <PARAMETER
+	      NAME="EXTERNALID"
+	      FIELD="TEXT"
+	      NUM_ROW="3"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      SHOW_IF="ASSUME_ROLE == 'true'"
+	    >
+	      <DEFAULT>""</DEFAULT>
+	    </PARAMETER>
+	    
+	    <PARAMETER
+	      NAME="SERIALNUMBER"
+	      FIELD="TEXT"
+	      NUM_ROW="4"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      SHOW_IF="ASSUME_ROLE == 'true'"
+	    >
+	      <DEFAULT>""</DEFAULT>
+	    </PARAMETER>
+	    
+	     <PARAMETER
+	      NAME="TOKENCODE"
+	      FIELD="TEXT"
+	      NUM_ROW="5"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      SHOW_IF="ASSUME_ROLE == 'true'"
+	    >
+	      <DEFAULT>""</DEFAULT>
+	    </PARAMETER>
+	    
+	    <PARAMETER
+	      NAME="TAGS"
+	      FIELD="TABLE"
+	      NUM_ROW="6"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      SHOW_IF="ASSUME_ROLE == 'true'"
+	    >
+	      <ITEMS>
+	      	<ITEM NAME="TAG_KEY" FIELD="TEXT" />
+	      	<ITEM NAME="TAG_VALUE" FIELD="TEXT" />
+	      	<ITEM NAME="TAG_TRANSITIVE" FIELD="CHECK" VALUE="FALSE"/>
+	      </ITEMS>
+	    </PARAMETER>
+	    
+	    <PARAMETER
+	      NAME="POLICY_TABLE"
+	      FIELD="TABLE"
+	      NUM_ROW="7"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      SHOW_IF="ASSUME_ROLE == 'true'"
+	    >
+	   		<ITEMS>
+	    		<ITEM NAME="POLICY_ARN" VALUE="" />
+	   		</ITEMS>
+	    </PARAMETER>
+	    
+	    <PARAMETER
+	      NAME="POLICY"
+	      FIELD="MEMO"
+	      NUM_ROW="8"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      NB_LINES="15"
+	      SHOW_IF="ASSUME_ROLE == 'true'"
+	    >
+	      <DEFAULT>""</DEFAULT>
+	    </PARAMETER>
 	</ADVANCED_PARAMETERS>
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="aws-java-sdk-1.11.406.jar" MODULE="aws-java-sdk-1.11.406.jar"
-				MVN="mvn:com.amazonaws/aws-java-sdk/1.11.406"
+			<IMPORT NAME="aws-java-sdk-1.11.729.jar" MODULE="aws-java-sdk-1.11.729.jar"
+				MVN="mvn:com.amazonaws/aws-java-sdk/1.11.729"
 				REQUIRED="true" />
 			<IMPORT NAME="jackson-core-2.10.1.jar" MODULE="jackson-core-2.10.1.jar"
 				MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1"
@@ -130,22 +240,20 @@
 			<IMPORT NAME="jackson-annotations-2.10.1.jar" MODULE="jackson-annotations-2.10.1.jar"
 				MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.10.1"
 				REQUIRED="true" />
-			<IMPORT NAME="httpcore-4.4.9.jar" MODULE="httpcore-4.4.9.jar"
-				MVN="mvn:org.apache.httpcomponents/httpcore/4.4.9"
+			<IMPORT NAME="httpcore-4.4.11.jar" MODULE="httpcore-4.4.11.jar"
+				MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11"
 				REQUIRED="true" />
-			<IMPORT NAME="httpclient-4.5.5.jar" MODULE="httpclient-4.5.5.jar"
-				MVN="mvn:org.apache.httpcomponents/httpclient/4.5.5"
+			<IMPORT NAME="httpclient-4.5.9.jar" MODULE="httpclient-4.5.9.jar"
+				MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9"
 				REQUIRED="true" />
 			<IMPORT NAME="joda-time-2.8.1.jar" MODULE="joda-time-2.8.1.jar"
 				MVN="mvn:joda-time/joda-time/2.8.1"
 				REQUIRED="true" />
-			<IMPORT NAME="commons-logging-1.1.3.jar" MODULE="commons-logging-1.1.3.jar"
-				MVN="mvn:commons-logging/commons-logging/1.1.3"
-				UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.3.jar"
+			<IMPORT NAME="commons-logging-1.2.jar" MODULE="commons-logging-1.2.jar"
+				MVN="mvn:commons-logging/commons-logging/1.2"
 				REQUIRED="true" />
-			<IMPORT NAME="commons-codec-1.6.jar" MODULE="commons-codec-1.6.jar"
-				MVN="mvn:org.talend.libraries/commons-codec-1.6/6.0.0"
-				UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-codec-1.6.jar"
+			<IMPORT NAME="commons-codec-1.11.jar" MODULE="commons-codec-1.11.jar"
+				MVN="mvn:commons-codec/commons-codec/1.11"
 				REQUIRED="true" />
 		</IMPORTS>
 	</CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tAmazonEMRListInstances/tAmazonEMRListInstances_messages.properties

@@ -52,5 +52,38 @@ ARN.NAME=Role ARN
 ROLE_SESSION_NAME.NAME=Role session name
 SESSION_DURATION.NAME=Session duration(minutes)
 
+ASSUME_ROLE_CONFIG.NAME=Assume Role Configuration
+EXTERNALID.NAME=External Id
+SERIALNUMBER.NAME=Serial number
+TOKENCODE.NAME=Token code
+POLICY_TABLE.NAME=IAM Policy ARNs
+POLICY_TABLE.ITEM.POLICY_ARN=Policy ARN
+POLICY.NAME=Policy
+TAGS.NAME=Tags
+TAGS.ITEM.TAG_KEY=Key
+TAGS.ITEM.TAG_VALUE=Value
+TAGS.ITEM.TAG_TRANSITIVE=Transitive
 SET_STS_ENDPOINT.NAME=STS Endpoint
-STS_ENDPOINT.NAME=
+STS_ENDPOINT.NAME=
+SIGNING_REGION.NAME=Signing region
+SIGNING_REGION.ITEM.DEFAULT=DEFAULT
+SIGNING_REGION.ITEM.GovCloud=AWS GovCloud (US)
+SIGNING_REGION.ITEM.US_EAST_1=US Standard
+SIGNING_REGION.ITEM.US_WEST_1=US West (N. California)
+SIGNING_REGION.ITEM.US_WEST_2=US West (Oregon)
+SIGNING_REGION.ITEM.US_EAST_2=US East (Ohio)
+SIGNING_REGION.ITEM.SA_EAST_1=South America (Sao Paulo)
+SIGNING_REGION.ITEM.EU_WEST_1=EU (Ireland)
+SIGNING_REGION.ITEM.EU_CENTRAL_1=EU (Frankfurt)
+SIGNING_REGION.ITEM.EU_WEST_2=EU (London)
+SIGNING_REGION.ITEM.EU_WEST_3=EU (Paris)
+SIGNING_REGION.ITEM.EU_NORTH_1=EU (Stockholm)
+SIGNING_REGION.ITEM.CN_NORTH_1=China (Beijing)
+SIGNING_REGION.ITEM.CN_NORTHWEST_1=China (Ningxia)
+SIGNING_REGION.ITEM.AP_EAST_1=Asia Pacific (Hong Kong)
+SIGNING_REGION.ITEM.AP_SOUTHEAST_1=Asia Pacific (Singapore)
+SIGNING_REGION.ITEM.AP_SOUTHEAST_2=Asia Pacific (Sydney)
+SIGNING_REGION.ITEM.AP_NORTHEAST_1=Asia Pacific (Tokyo)
+SIGNING_REGION.ITEM.AP_NORTHEAST_2=Asia Pacific (Seoul)
+SIGNING_REGION.ITEM.AP_SOUTH_1=Asia Pacific (Mumbai)
+SIGNING_REGION.ITEM.CA_CENTRAL_1=Canada (Central)

main/plugins/org.talend.designer.components.localprovider/components/tAmazonEMRManage/tAmazonEMRManage_java.xml

@@ -58,7 +58,7 @@
 			<DEFAULT>""</DEFAULT>
     	</PARAMETER>
     	
-    	<PARAMETER NAME="SESSION_DURATION" FIELD="TEXT" NUM_ROW="15" REQUIRED="true"
+    	<PARAMETER NAME="SESSION_DURATION" FIELD="TEXT" NUM_ROW="15"
     		SHOW_IF="ASSUME_ROLE == 'true'"
 			GROUP="AUTHENTICATION">
 			<DEFAULT>15</DEFAULT>
@@ -259,47 +259,157 @@
 	</PARAMETERS>
 
 	<ADVANCED_PARAMETERS>
-		<PARAMETER NAME="SET_STS_ENDPOINT" FIELD="CHECK" NUM_ROW="1" REQUIRED="true"
-			SHOW_IF="ASSUME_ROLE == 'true'">
-      		<DEFAULT>false</DEFAULT>
-    	</PARAMETER>
-    	
-    	<PARAMETER NAME="STS_ENDPOINT" FIELD="TEXT" NUM_ROW="1" REQUIRED="true"
-    		SHOW_IF="(ASSUME_ROLE == 'true') AND (SET_STS_ENDPOINT == 'true')">
-      		<DEFAULT>""</DEFAULT>
-    	</PARAMETER>
+		<PARAMETER
+	      NAME="SET_STS_ENDPOINT"
+	      FIELD="CHECK"
+	      NUM_ROW="1"
+	      NB_LINES="5"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      SHOW_IF="isShow[ASSUME_ROLE] AND (ASSUME_ROLE == 'true')"
+	    >
+	    </PARAMETER>
+	    
+		<PARAMETER
+	      NAME="STS_ENDPOINT"
+	      FIELD="TEXT"
+	      NUM_ROW="1"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      SHOW_IF="isShow[SET_STS_ENDPOINT] AND (SET_STS_ENDPOINT == 'true')"
+	    >
+	      <DEFAULT>""</DEFAULT>
+	    </PARAMETER>
+	    
+	    <PARAMETER
+	      NAME="SIGNING_REGION"
+	      FIELD="OPENED_LIST"
+	      NUM_ROW="2"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      REQUIRED="true"
+	      SHOW_IF="ASSUME_ROLE == 'true'"
+	    >
+	      <ITEMS DEFAULT="DEFAULT">
+	        	<ITEM NAME="DEFAULT" VALUE="DEFAULT" />
+		        <ITEM NAME="GovCloud" VALUE="&quot;us-gov-west-1&quot;" />
+		        <ITEM NAME="US_EAST_1" VALUE="&quot;us-east-1&quot;" />
+		        <ITEM NAME="US_WEST_1" VALUE="&quot;us-west-1&quot;" />
+		        <ITEM NAME="US_WEST_2" VALUE="&quot;us-west-2&quot;" />
+		        <ITEM NAME="US_EAST_2" VALUE="&quot;us-east-2&quot;" />
+		        <ITEM NAME="SA_EAST_1" VALUE="&quot;sa-east-1&quot;" />
+		        <ITEM NAME="EU_WEST_1" VALUE="&quot;eu-west-1&quot;" />
+		        <ITEM NAME="EU_CENTRAL_1" VALUE="&quot;eu-central-1&quot;" />
+		        <ITEM NAME="EU_WEST_2" VALUE="&quot;eu-west-2&quot;" />
+		        <ITEM NAME="EU_WEST_3" VALUE="&quot;eu-west-3&quot;" />
+		        <ITEM NAME="EU_NORTH_1" VALUE="&quot;eu-north-1&quot;" />
+		        <ITEM NAME="CN_NORTH_1" VALUE="&quot;cn-north-1&quot;" />
+		        <ITEM NAME="CN_NORTHWEST_1" VALUE="&quot;cn-northwest-1&quot;" />
+		        <ITEM NAME="AP_EAST_1" VALUE="&quot;ap-east-1&quot;" />
+	         	<ITEM NAME="AP_SOUTHEAST_1" VALUE="&quot;ap-southeast-1&quot;" />
+		        <ITEM NAME="AP_SOUTHEAST_2" VALUE="&quot;ap-southeast-2&quot;" />
+		        <ITEM NAME="AP_NORTHEAST_1" VALUE="&quot;ap-northeast-1&quot;" />
+		        <ITEM NAME="AP_NORTHEAST_2" VALUE="&quot;ap-northeast-2&quot;" />
+	        	<ITEM NAME="AP_SOUTH_1" VALUE="&quot;ap-south-1&quot;" />
+		        <ITEM NAME="CA_CENTRAL_1" VALUE="&quot;ca-central-1&quot;" />
+	    	</ITEMS>
+	    </PARAMETER> 
+	    
+	    <PARAMETER
+	      NAME="EXTERNALID"
+	      FIELD="TEXT"
+	      NUM_ROW="3"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      SHOW_IF="ASSUME_ROLE == 'true'"
+	    >
+	      <DEFAULT>""</DEFAULT>
+	    </PARAMETER>
+	    
+	    <PARAMETER
+	      NAME="SERIALNUMBER"
+	      FIELD="TEXT"
+	      NUM_ROW="4"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      SHOW_IF="ASSUME_ROLE == 'true'"
+	    >
+	      <DEFAULT>""</DEFAULT>
+	    </PARAMETER>
+	    
+	     <PARAMETER
+	      NAME="TOKENCODE"
+	      FIELD="TEXT"
+	      NUM_ROW="5"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      SHOW_IF="ASSUME_ROLE == 'true'"
+	    >
+	      <DEFAULT>""</DEFAULT>
+	    </PARAMETER>
+	    
+	    <PARAMETER
+	      NAME="TAGS"
+	      FIELD="TABLE"
+	      NUM_ROW="6"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      SHOW_IF="ASSUME_ROLE == 'true'"
+	    >
+	      <ITEMS>
+	      	<ITEM NAME="TAG_KEY" FIELD="TEXT" />
+	      	<ITEM NAME="TAG_VALUE" FIELD="TEXT" />
+	      	<ITEM NAME="TAG_TRANSITIVE" FIELD="CHECK" VALUE="FALSE"/>
+	      </ITEMS>
+	    </PARAMETER>
+	    
+	    <PARAMETER
+	      NAME="POLICY_TABLE"
+	      FIELD="TABLE"
+	      NUM_ROW="7"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      SHOW_IF="ASSUME_ROLE == 'true'"
+	    >
+	   		<ITEMS>
+	    		<ITEM NAME="POLICY_ARN" VALUE="" />
+	   		</ITEMS>
+	    </PARAMETER>
+	    
+	    <PARAMETER
+	      NAME="POLICY"
+	      FIELD="MEMO"
+	      NUM_ROW="8"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      NB_LINES="15"
+	      SHOW_IF="ASSUME_ROLE == 'true'"
+	    >
+	      <DEFAULT>""</DEFAULT>
+	    </PARAMETER>
     	
 		<PARAMETER NAME="WAIT_FOR_CLUSTER_READY" FIELD="CHECK"
-			NUM_ROW="2" SHOW_IF="(ACTION=='START')" GROUP="ADVANCED_CONFIGURATION">
+			NUM_ROW="10" SHOW_IF="(ACTION=='START')" GROUP="ADVANCED_CONFIGURATION">
 			<DEFAULT>true</DEFAULT>
 		</PARAMETER>
 
 		<PARAMETER NAME="VISIBLE_TO_ALL_USERS" FIELD="CHECK"
-			NUM_ROW="5" SHOW_IF="ACTION=='START'" GROUP="ADVANCED_CONFIGURATION">
+			NUM_ROW="15" SHOW_IF="ACTION=='START'" GROUP="ADVANCED_CONFIGURATION">
 			<DEFAULT>false</DEFAULT>
 		</PARAMETER>
 
 		<PARAMETER NAME="TERMINATION_PROTECTED" FIELD="CHECK"
-			NUM_ROW="5" SHOW_IF="ACTION=='START'" GROUP="ADVANCED_CONFIGURATION">
+			NUM_ROW="20" SHOW_IF="ACTION=='START'" GROUP="ADVANCED_CONFIGURATION">
 			<DEFAULT>false</DEFAULT>
 		</PARAMETER>
 		
 		<PARAMETER NAME="ENABLE_DEBUG" FIELD="CHECK"
-			NUM_ROW="7" SHOW_IF="ACTION=='START'" GROUP="ADVANCED_CONFIGURATION">
+			NUM_ROW="25" SHOW_IF="ACTION=='START'" GROUP="ADVANCED_CONFIGURATION">
 			<DEFAULT>true</DEFAULT>
 		</PARAMETER>
 		
 		<PARAMETER NAME="USE_CUSTOMIZE_VERSION" FIELD="CHECK"
-			NUM_ROW="10" SHOW_IF="ACTION=='START'" GROUP="ADVANCED_CONFIGURATION">
+			NUM_ROW="30" SHOW_IF="ACTION=='START'" GROUP="ADVANCED_CONFIGURATION">
 			<DEFAULT>false</DEFAULT>
 		</PARAMETER>
 		
 		<PARAMETER NAME="CUSTOMIZE_VERSION" FIELD="TEXT"
-			NUM_ROW="12" SHOW_IF="(ACTION=='START') AND (USE_CUSTOMIZE_VERSION =='true')" GROUP="CUSTOMIZE_APPLICATION_GROUP">
+			NUM_ROW="35" SHOW_IF="(ACTION=='START') AND (USE_CUSTOMIZE_VERSION =='true')" GROUP="CUSTOMIZE_APPLICATION_GROUP">
 			<DEFAULT>"emr-5.15.0"</DEFAULT>
 		</PARAMETER>
 		
-		<PARAMETER NAME="CUSTOMIZE_APPLICATION_TABLE" FIELD="TABLE" NUM_ROW="13" NB_LINES="5" GROUP="CUSTOMIZE_APPLICATION_GROUP"
+		<PARAMETER NAME="CUSTOMIZE_APPLICATION_TABLE" FIELD="TABLE" NUM_ROW="40" NB_LINES="5" GROUP="CUSTOMIZE_APPLICATION_GROUP"
 			SHOW_IF="(ACTION=='START') AND (USE_CUSTOMIZE_VERSION =='true')">
 			<ITEMS>
 				<ITEM NAME="NAME" FIELD="OPENED_LIST">
@@ -334,51 +444,51 @@
 		</PARAMETER>
 		
 		<PARAMETER NAME="SUBNET_ID" FIELD="TEXT"
-			NUM_ROW="17" SHOW_IF="ACTION=='START'" GROUP="ADVANCED_INSTANCE_CONFIGURATION">
+			NUM_ROW="45" SHOW_IF="ACTION=='START'" GROUP="ADVANCED_INSTANCE_CONFIGURATION">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
 
 		<PARAMETER NAME="AVAILABILITY_ZONE" FIELD="TEXT"
-			NUM_ROW="18" SHOW_IF="(ACTION=='START')" GROUP="ADVANCED_INSTANCE_CONFIGURATION">
+			NUM_ROW="50" SHOW_IF="(ACTION=='START')" GROUP="ADVANCED_INSTANCE_CONFIGURATION">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
 		
 		<PARAMETER NAME="MASTER_SECURITY_GROUP" FIELD="TEXT"
-			REQUIRED="true" NUM_ROW="19" SHOW_IF="ACTION=='START'"
+			REQUIRED="true" NUM_ROW="55" SHOW_IF="ACTION=='START'"
 			GROUP="ADVANCED_INSTANCE_CONFIGURATION">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
 
 		<PARAMETER NAME="ADDITIONAL_MASTER_SECURITY_GROUPS" FIELD="TEXT"
-			REQUIRED="true" NUM_ROW="19" SHOW_IF="ACTION=='START'"
+			REQUIRED="true" NUM_ROW="55" SHOW_IF="ACTION=='START'"
 			GROUP="ADVANCED_INSTANCE_CONFIGURATION">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
 
 		<PARAMETER NAME="SLAVE_SECURITY_GROUP" FIELD="TEXT"
-			REQUIRED="true" NUM_ROW="20" SHOW_IF="ACTION=='START'"
+			REQUIRED="true" NUM_ROW="60" SHOW_IF="ACTION=='START'"
 			GROUP="ADVANCED_INSTANCE_CONFIGURATION">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
 
 		<PARAMETER NAME="ADDITIONAL_SLAVE_SECURITY_GROUPS" FIELD="TEXT"
-			REQUIRED="true" NUM_ROW="20" SHOW_IF="ACTION=='START'"
+			REQUIRED="true" NUM_ROW="60" SHOW_IF="ACTION=='START'"
 			GROUP="ADVANCED_INSTANCE_CONFIGURATION">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
 
 		<PARAMETER NAME="NOTE" FIELD="LABEL" REQUIRED="true"
-			NUM_ROW="30" SHOW_IF="ACTION=='START'" GROUP="ADVANCED_INSTANCE_CONFIGURATION">
+			NUM_ROW="65" SHOW_IF="ACTION=='START'" GROUP="ADVANCED_INSTANCE_CONFIGURATION">
 			<DEFAULT>Additional groups should be set like this : "gname1,gname2,gname3"</DEFAULT>
 		</PARAMETER>
 		
 		<PARAMETER NAME="SERVICE_ACCESS_SECURITY_GROUP" FIELD="TEXT"
-			REQUIRED="true" NUM_ROW="31" SHOW_IF="ACTION=='START'"
+			REQUIRED="true" NUM_ROW="70" SHOW_IF="ACTION=='START'"
 			GROUP="ADVANCED_INSTANCE_CONFIGURATION">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
 		
-		<PARAMETER NAME="BOOTSTRAP_ACTIONS" FIELD="TABLE" SHOW_IF="ACTION=='START'" NUM_ROW="32" NB_LINES="5" GROUP="BOOTSTRAP_GROUP">
+		<PARAMETER NAME="BOOTSTRAP_ACTIONS" FIELD="TABLE" SHOW_IF="ACTION=='START'" NUM_ROW="75" NB_LINES="5" GROUP="BOOTSTRAP_GROUP">
 			<ITEMS>
 				<ITEM NAME="NAME" />
 				<ITEM NAME="SCRIPT_PATH" />
@@ -386,7 +496,7 @@
 			</ITEMS>
 		</PARAMETER>
 		
-		<PARAMETER NAME="STEP_TABLE" FIELD="TABLE" SHOW_IF="ACTION=='START'" NUM_ROW="35" NB_LINES="5" GROUP="STEPS">
+		<PARAMETER NAME="STEP_TABLE" FIELD="TABLE" SHOW_IF="ACTION=='START'" NUM_ROW="80" NB_LINES="5" GROUP="STEPS">
 			<ITEMS>
 				<ITEM NAME="NAME" />
 				<ITEM NAME="ACTION_ON_FAILURE" FIELD="CLOSED_LIST">
@@ -402,15 +512,15 @@
 			</ITEMS>
 		</PARAMETER>
 		<PARAMETER NAME="KEEP_ALIVE" FIELD="CHECK"
-			NUM_ROW="36" SHOW_IF="ACTION=='START'" GROUP="STEPS">
+			NUM_ROW="85" SHOW_IF="ACTION=='START'" GROUP="STEPS">
 			<DEFAULT>true</DEFAULT>
 		</PARAMETER>
 		<PARAMETER NAME="WAIT_FOR_STEPS_COMPLETE" FIELD="CHECK"
-			NUM_ROW="37" SHOW_IF="ACTION=='START' AND isShow[WAIT_FOR_CLUSTER_READY] AND (WAIT_FOR_CLUSTER_READY=='true')" GROUP="STEPS">
+			NUM_ROW="90" SHOW_IF="ACTION=='START' AND isShow[WAIT_FOR_CLUSTER_READY] AND (WAIT_FOR_CLUSTER_READY=='true')" GROUP="STEPS">
 			<DEFAULT>true</DEFAULT>
 		</PARAMETER>
 		
-		<PARAMETER NAME="PROPERTY_TABLE" FIELD="TABLE" NUM_ROW="40" NB_LINES="5" GROUP="PROPERTY_GROUP"
+		<PARAMETER NAME="PROPERTY_TABLE" FIELD="TABLE" NUM_ROW="95" NB_LINES="5" GROUP="PROPERTY_GROUP"
 			SHOW_IF="(ACTION=='START') AND (CLUSTER_VERSION!='AMI3_10_0') AND (CLUSTER_VERSION!='AMI3_9_0') AND (CLUSTER_VERSION!='AMI3_8_0') AND (CLUSTER_VERSION!='AMI2_4_11') AND (CLUSTER_VERSION!='AMI2_4_10')">
 			<ITEMS>
 				<ITEM NAME="CLASSIFICATION" />
@@ -422,8 +532,8 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="aws-java-sdk-1.11.406.jar" MODULE="aws-java-sdk-1.11.406.jar"
-				MVN="mvn:com.amazonaws/aws-java-sdk/1.11.406"
+			<IMPORT NAME="aws-java-sdk-1.11.729.jar" MODULE="aws-java-sdk-1.11.729.jar"
+				MVN="mvn:com.amazonaws/aws-java-sdk/1.11.729"
 				REQUIRED="true" />
 			<IMPORT NAME="jackson-core-2.10.1.jar" MODULE="jackson-core-2.10.1.jar"
 				MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1"
@@ -434,22 +544,20 @@
 			<IMPORT NAME="jackson-annotations-2.10.1.jar" MODULE="jackson-annotations-2.10.1.jar"
 				MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.10.1"
 				REQUIRED="true" />
-			<IMPORT NAME="httpcore-4.4.9.jar" MODULE="httpcore-4.4.9.jar"
-				MVN="mvn:org.apache.httpcomponents/httpcore/4.4.9"
+			<IMPORT NAME="httpcore-4.4.11.jar" MODULE="httpcore-4.4.11.jar"
+				MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11"
 				REQUIRED="true" />
-			<IMPORT NAME="httpclient-4.5.5.jar" MODULE="httpclient-4.5.5.jar"
-				MVN="mvn:org.apache.httpcomponents/httpclient/4.5.5"
+			<IMPORT NAME="httpclient-4.5.9.jar" MODULE="httpclient-4.5.9.jar"
+				MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9"
 				REQUIRED="true" />
 			<IMPORT NAME="joda-time-2.8.1.jar" MODULE="joda-time-2.8.1.jar"
 				MVN="mvn:joda-time/joda-time/2.8.1"
 				REQUIRED="true" />
-			<IMPORT NAME="commons-logging-1.1.3.jar" MODULE="commons-logging-1.1.3.jar"
-				MVN="mvn:commons-logging/commons-logging/1.1.3"
-				UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.3.jar"
+			<IMPORT NAME="commons-logging-1.2.jar" MODULE="commons-logging-1.2.jar"
+				MVN="mvn:commons-logging/commons-logging/1.2"
 				REQUIRED="true" />
-			<IMPORT NAME="commons-codec-1.6.jar" MODULE="commons-codec-1.6.jar"
-				MVN="mvn:org.talend.libraries/commons-codec-1.6/6.0.0"
-				UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-codec-1.6.jar"
+			<IMPORT NAME="commons-codec-1.11.jar" MODULE="commons-codec-1.11.jar"
+				MVN="mvn:commons-codec/commons-codec/1.11"
 				REQUIRED="true" />
 		</IMPORTS>
 	</CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tAmazonEMRManage/tAmazonEMRManage_messages.properties

@@ -198,8 +198,41 @@ ARN.NAME=Role ARN
 ROLE_SESSION_NAME.NAME=Role session name
 SESSION_DURATION.NAME=Session duration(minutes)
 
+ASSUME_ROLE_CONFIG.NAME=Assume Role Configuration
+EXTERNALID.NAME=External Id
+SERIALNUMBER.NAME=Serial number
+TOKENCODE.NAME=Token code
+POLICY_TABLE.NAME=IAM Policy ARNs
+POLICY_TABLE.ITEM.POLICY_ARN=Policy ARN
+POLICY.NAME=Policy
+TAGS.NAME=Tags
+TAGS.ITEM.TAG_KEY=Key
+TAGS.ITEM.TAG_VALUE=Value
+TAGS.ITEM.TAG_TRANSITIVE=Transitive
 SET_STS_ENDPOINT.NAME=STS Endpoint
 STS_ENDPOINT.NAME=
+SIGNING_REGION.NAME=Signing region
+SIGNING_REGION.ITEM.DEFAULT=DEFAULT
+SIGNING_REGION.ITEM.GovCloud=AWS GovCloud (US)
+SIGNING_REGION.ITEM.US_EAST_1=US Standard
+SIGNING_REGION.ITEM.US_WEST_1=US West (N. California)
+SIGNING_REGION.ITEM.US_WEST_2=US West (Oregon)
+SIGNING_REGION.ITEM.US_EAST_2=US East (Ohio)
+SIGNING_REGION.ITEM.SA_EAST_1=South America (Sao Paulo)
+SIGNING_REGION.ITEM.EU_WEST_1=EU (Ireland)
+SIGNING_REGION.ITEM.EU_CENTRAL_1=EU (Frankfurt)
+SIGNING_REGION.ITEM.EU_WEST_2=EU (London)
+SIGNING_REGION.ITEM.EU_WEST_3=EU (Paris)
+SIGNING_REGION.ITEM.EU_NORTH_1=EU (Stockholm)
+SIGNING_REGION.ITEM.CN_NORTH_1=China (Beijing)
+SIGNING_REGION.ITEM.CN_NORTHWEST_1=China (Ningxia)
+SIGNING_REGION.ITEM.AP_EAST_1=Asia Pacific (Hong Kong)
+SIGNING_REGION.ITEM.AP_SOUTHEAST_1=Asia Pacific (Singapore)
+SIGNING_REGION.ITEM.AP_SOUTHEAST_2=Asia Pacific (Sydney)
+SIGNING_REGION.ITEM.AP_NORTHEAST_1=Asia Pacific (Tokyo)
+SIGNING_REGION.ITEM.AP_NORTHEAST_2=Asia Pacific (Seoul)
+SIGNING_REGION.ITEM.AP_SOUTH_1=Asia Pacific (Mumbai)
+SIGNING_REGION.ITEM.CA_CENTRAL_1=Canada (Central)
 
 CUSTOMIZE_APPLICATION_GROUP.NAME=Customize Version and Application
 USE_CUSTOMIZE_VERSION.NAME=Customize Version and Application

main/plugins/org.talend.designer.components.localprovider/components/tAmazonEMRResize/tAmazonEMRResize_java.xml

@@ -58,7 +58,7 @@
 			<DEFAULT>""</DEFAULT>
     	</PARAMETER>
     	
-    	<PARAMETER NAME="SESSION_DURATION" FIELD="TEXT" NUM_ROW="15" REQUIRED="true"
+    	<PARAMETER NAME="SESSION_DURATION" FIELD="TEXT" NUM_ROW="15"
     		SHOW_IF="ASSUME_ROLE == 'true'"
 			GROUP="AUTHENTICATION">
 			<DEFAULT>15</DEFAULT>
@@ -162,21 +162,131 @@
 	</PARAMETERS>
 
 	<ADVANCED_PARAMETERS>
-		<PARAMETER NAME="SET_STS_ENDPOINT" FIELD="CHECK" NUM_ROW="1" REQUIRED="true"
-			SHOW_IF="ASSUME_ROLE == 'true'">
-      		<DEFAULT>false</DEFAULT>
-    	</PARAMETER>
-    	
-    	<PARAMETER NAME="STS_ENDPOINT" FIELD="TEXT" NUM_ROW="1" REQUIRED="true"
-    		SHOW_IF="(ASSUME_ROLE == 'true') AND (SET_STS_ENDPOINT == 'true')">
-      		<DEFAULT>""</DEFAULT>
-    	</PARAMETER>
+		<PARAMETER
+	      NAME="SET_STS_ENDPOINT"
+	      FIELD="CHECK"
+	      NUM_ROW="1"
+	      NB_LINES="5"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      SHOW_IF="isShow[ASSUME_ROLE] AND (ASSUME_ROLE == 'true')"
+	    >
+	    </PARAMETER>
+	    
+		<PARAMETER
+	      NAME="STS_ENDPOINT"
+	      FIELD="TEXT"
+	      NUM_ROW="1"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      SHOW_IF="isShow[SET_STS_ENDPOINT] AND (SET_STS_ENDPOINT == 'true')"
+	    >
+	      <DEFAULT>""</DEFAULT>
+	    </PARAMETER>
+	    
+	    <PARAMETER
+	      NAME="SIGNING_REGION"
+	      FIELD="OPENED_LIST"
+	      NUM_ROW="2"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      REQUIRED="true"
+	      SHOW_IF="ASSUME_ROLE == 'true'"
+	    >
+	      <ITEMS DEFAULT="DEFAULT">
+	        	<ITEM NAME="DEFAULT" VALUE="DEFAULT" />
+		        <ITEM NAME="GovCloud" VALUE="&quot;us-gov-west-1&quot;" />
+		        <ITEM NAME="US_EAST_1" VALUE="&quot;us-east-1&quot;" />
+		        <ITEM NAME="US_WEST_1" VALUE="&quot;us-west-1&quot;" />
+		        <ITEM NAME="US_WEST_2" VALUE="&quot;us-west-2&quot;" />
+		        <ITEM NAME="US_EAST_2" VALUE="&quot;us-east-2&quot;" />
+		        <ITEM NAME="SA_EAST_1" VALUE="&quot;sa-east-1&quot;" />
+		        <ITEM NAME="EU_WEST_1" VALUE="&quot;eu-west-1&quot;" />
+		        <ITEM NAME="EU_CENTRAL_1" VALUE="&quot;eu-central-1&quot;" />
+		        <ITEM NAME="EU_WEST_2" VALUE="&quot;eu-west-2&quot;" />
+		        <ITEM NAME="EU_WEST_3" VALUE="&quot;eu-west-3&quot;" />
+		        <ITEM NAME="EU_NORTH_1" VALUE="&quot;eu-north-1&quot;" />
+		        <ITEM NAME="CN_NORTH_1" VALUE="&quot;cn-north-1&quot;" />
+		        <ITEM NAME="CN_NORTHWEST_1" VALUE="&quot;cn-northwest-1&quot;" />
+		        <ITEM NAME="AP_EAST_1" VALUE="&quot;ap-east-1&quot;" />
+	         	<ITEM NAME="AP_SOUTHEAST_1" VALUE="&quot;ap-southeast-1&quot;" />
+		        <ITEM NAME="AP_SOUTHEAST_2" VALUE="&quot;ap-southeast-2&quot;" />
+		        <ITEM NAME="AP_NORTHEAST_1" VALUE="&quot;ap-northeast-1&quot;" />
+		        <ITEM NAME="AP_NORTHEAST_2" VALUE="&quot;ap-northeast-2&quot;" />
+	        	<ITEM NAME="AP_SOUTH_1" VALUE="&quot;ap-south-1&quot;" />
+		        <ITEM NAME="CA_CENTRAL_1" VALUE="&quot;ca-central-1&quot;" />
+	    	</ITEMS>
+	    </PARAMETER> 
+	    
+	    <PARAMETER
+	      NAME="EXTERNALID"
+	      FIELD="TEXT"
+	      NUM_ROW="3"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      SHOW_IF="ASSUME_ROLE == 'true'"
+	    >
+	      <DEFAULT>""</DEFAULT>
+	    </PARAMETER>
+	    
+	    <PARAMETER
+	      NAME="SERIALNUMBER"
+	      FIELD="TEXT"
+	      NUM_ROW="4"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      SHOW_IF="ASSUME_ROLE == 'true'"
+	    >
+	      <DEFAULT>""</DEFAULT>
+	    </PARAMETER>
+	    
+	     <PARAMETER
+	      NAME="TOKENCODE"
+	      FIELD="TEXT"
+	      NUM_ROW="5"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      SHOW_IF="ASSUME_ROLE == 'true'"
+	    >
+	      <DEFAULT>""</DEFAULT>
+	    </PARAMETER>
+	    
+	    <PARAMETER
+	      NAME="TAGS"
+	      FIELD="TABLE"
+	      NUM_ROW="6"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      SHOW_IF="ASSUME_ROLE == 'true'"
+	    >
+	      <ITEMS>
+	      	<ITEM NAME="TAG_KEY" FIELD="TEXT" />
+	      	<ITEM NAME="TAG_VALUE" FIELD="TEXT" />
+	      	<ITEM NAME="TAG_TRANSITIVE" FIELD="CHECK" VALUE="FALSE"/>
+	      </ITEMS>
+	    </PARAMETER>
+	    
+	    <PARAMETER
+	      NAME="POLICY_TABLE"
+	      FIELD="TABLE"
+	      NUM_ROW="7"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      SHOW_IF="ASSUME_ROLE == 'true'"
+	    >
+	   		<ITEMS>
+	    		<ITEM NAME="POLICY_ARN" VALUE="" />
+	   		</ITEMS>
+	    </PARAMETER>
+	    
+	    <PARAMETER
+	      NAME="POLICY"
+	      FIELD="MEMO"
+	      NUM_ROW="8"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      NB_LINES="15"
+	      SHOW_IF="ASSUME_ROLE == 'true'"
+	    >
+	      <DEFAULT>""</DEFAULT>
+	    </PARAMETER>
 	</ADVANCED_PARAMETERS>
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="aws-java-sdk-1.11.406.jar" MODULE="aws-java-sdk-1.11.406.jar"
-				MVN="mvn:com.amazonaws/aws-java-sdk/1.11.406"
+			<IMPORT NAME="aws-java-sdk-1.11.729.jar" MODULE="aws-java-sdk-1.11.729.jar"
+				MVN="mvn:com.amazonaws/aws-java-sdk/1.11.729"
 				REQUIRED="true" />
 			<IMPORT NAME="jackson-core-2.10.1.jar" MODULE="jackson-core-2.10.1.jar"
 				MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1"
@@ -187,22 +297,20 @@
 			<IMPORT NAME="jackson-annotations-2.10.1.jar" MODULE="jackson-annotations-2.10.1.jar"
 				MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.10.1"
 				REQUIRED="true" />
-			<IMPORT NAME="httpcore-4.4.9.jar" MODULE="httpcore-4.4.9.jar"
-				MVN="mvn:org.apache.httpcomponents/httpcore/4.4.9"
+			<IMPORT NAME="httpcore-4.4.11.jar" MODULE="httpcore-4.4.11.jar"
+				MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11"
 				REQUIRED="true" />
-			<IMPORT NAME="httpclient-4.5.5.jar" MODULE="httpclient-4.5.5.jar"
-				MVN="mvn:org.apache.httpcomponents/httpclient/4.5.5"
+			<IMPORT NAME="httpclient-4.5.9.jar" MODULE="httpclient-4.5.9.jar"
+				MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9"
 				REQUIRED="true" />
 			<IMPORT NAME="joda-time-2.8.1.jar" MODULE="joda-time-2.8.1.jar"
 				MVN="mvn:joda-time/joda-time/2.8.1"
 				REQUIRED="true" />
-			<IMPORT NAME="commons-logging-1.1.3.jar" MODULE="commons-logging-1.1.3.jar"
-				MVN="mvn:commons-logging/commons-logging/1.1.3"
-				UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.3.jar"
+			<IMPORT NAME="commons-logging-1.2.jar" MODULE="commons-logging-1.2.jar"
+				MVN="mvn:commons-logging/commons-logging/1.2"
 				REQUIRED="true" />
-			<IMPORT NAME="commons-codec-1.6.jar" MODULE="commons-codec-1.6.jar"
-				MVN="mvn:org.talend.libraries/commons-codec-1.6/6.0.0"
-				UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-codec-1.6.jar"
+			<IMPORT NAME="commons-codec-1.11.jar" MODULE="commons-codec-1.11.jar"
+				MVN="mvn:commons-codec/commons-codec/1.11"
 				REQUIRED="true" />
 		</IMPORTS>
 	</CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tAmazonEMRResize/tAmazonEMRResize_messages.properties

@@ -94,5 +94,38 @@ ARN.NAME=Role ARN
 ROLE_SESSION_NAME.NAME=Role session name
 SESSION_DURATION.NAME=Session duration(minutes)
 
+ASSUME_ROLE_CONFIG.NAME=Assume Role Configuration
+EXTERNALID.NAME=External Id
+SERIALNUMBER.NAME=Serial number
+TOKENCODE.NAME=Token code
+POLICY_TABLE.NAME=IAM Policy ARNs
+POLICY_TABLE.ITEM.POLICY_ARN=Policy ARN
+POLICY.NAME=Policy
+TAGS.NAME=Tags
+TAGS.ITEM.TAG_KEY=Key
+TAGS.ITEM.TAG_VALUE=Value
+TAGS.ITEM.TAG_TRANSITIVE=Transitive
 SET_STS_ENDPOINT.NAME=STS Endpoint
-STS_ENDPOINT.NAME=
+STS_ENDPOINT.NAME=
+SIGNING_REGION.NAME=Signing region
+SIGNING_REGION.ITEM.DEFAULT=DEFAULT
+SIGNING_REGION.ITEM.GovCloud=AWS GovCloud (US)
+SIGNING_REGION.ITEM.US_EAST_1=US Standard
+SIGNING_REGION.ITEM.US_WEST_1=US West (N. California)
+SIGNING_REGION.ITEM.US_WEST_2=US West (Oregon)
+SIGNING_REGION.ITEM.US_EAST_2=US East (Ohio)
+SIGNING_REGION.ITEM.SA_EAST_1=South America (Sao Paulo)
+SIGNING_REGION.ITEM.EU_WEST_1=EU (Ireland)
+SIGNING_REGION.ITEM.EU_CENTRAL_1=EU (Frankfurt)
+SIGNING_REGION.ITEM.EU_WEST_2=EU (London)
+SIGNING_REGION.ITEM.EU_WEST_3=EU (Paris)
+SIGNING_REGION.ITEM.EU_NORTH_1=EU (Stockholm)
+SIGNING_REGION.ITEM.CN_NORTH_1=China (Beijing)
+SIGNING_REGION.ITEM.CN_NORTHWEST_1=China (Ningxia)
+SIGNING_REGION.ITEM.AP_EAST_1=Asia Pacific (Hong Kong)
+SIGNING_REGION.ITEM.AP_SOUTHEAST_1=Asia Pacific (Singapore)
+SIGNING_REGION.ITEM.AP_SOUTHEAST_2=Asia Pacific (Sydney)
+SIGNING_REGION.ITEM.AP_NORTHEAST_1=Asia Pacific (Tokyo)
+SIGNING_REGION.ITEM.AP_NORTHEAST_2=Asia Pacific (Seoul)
+SIGNING_REGION.ITEM.AP_SOUTH_1=Asia Pacific (Mumbai)
+SIGNING_REGION.ITEM.CA_CENTRAL_1=Canada (Central)

main/plugins/org.talend.designer.components.localprovider/components/tAmazonRedshiftManage/tAmazonRedshiftManage_java.xml

@@ -59,7 +59,7 @@
 			<DEFAULT>""</DEFAULT>
     	</PARAMETER>
     	
-    	<PARAMETER NAME="SESSION_DURATION" FIELD="TEXT" NUM_ROW="15" REQUIRED="true"
+    	<PARAMETER NAME="SESSION_DURATION" FIELD="TEXT" NUM_ROW="15"
     		SHOW_IF="ASSUME_ROLE == 'true'"
 			GROUP="AUTHENTICATION">
 			<DEFAULT>15</DEFAULT>
@@ -153,31 +153,141 @@
 	</PARAMETERS>
 
 	<ADVANCED_PARAMETERS>
-		<PARAMETER NAME="SET_STS_ENDPOINT" FIELD="CHECK" NUM_ROW="1" REQUIRED="true"
-			SHOW_IF="ASSUME_ROLE == 'true'">
-      		<DEFAULT>false</DEFAULT>
-    	</PARAMETER>
-    	
-    	<PARAMETER NAME="STS_ENDPOINT" FIELD="TEXT" NUM_ROW="1" REQUIRED="true"
-    		SHOW_IF="(ASSUME_ROLE == 'true') AND (SET_STS_ENDPOINT == 'true')">
-      		<DEFAULT>""</DEFAULT>
-    	</PARAMETER>
+		<PARAMETER
+	      NAME="SET_STS_ENDPOINT"
+	      FIELD="CHECK"
+	      NUM_ROW="1"
+	      NB_LINES="5"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      SHOW_IF="isShow[ASSUME_ROLE] AND (ASSUME_ROLE == 'true')"
+	    >
+	    </PARAMETER>
+	    
+		<PARAMETER
+	      NAME="STS_ENDPOINT"
+	      FIELD="TEXT"
+	      NUM_ROW="1"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      SHOW_IF="isShow[SET_STS_ENDPOINT] AND (SET_STS_ENDPOINT == 'true')"
+	    >
+	      <DEFAULT>""</DEFAULT>
+	    </PARAMETER>
+	    
+	    <PARAMETER
+	      NAME="SIGNING_REGION"
+	      FIELD="OPENED_LIST"
+	      NUM_ROW="2"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      REQUIRED="true"
+	      SHOW_IF="ASSUME_ROLE == 'true'"
+	    >
+	      <ITEMS DEFAULT="DEFAULT">
+	        	<ITEM NAME="DEFAULT" VALUE="DEFAULT" />
+		        <ITEM NAME="GovCloud" VALUE="&quot;us-gov-west-1&quot;" />
+		        <ITEM NAME="US_EAST_1" VALUE="&quot;us-east-1&quot;" />
+		        <ITEM NAME="US_WEST_1" VALUE="&quot;us-west-1&quot;" />
+		        <ITEM NAME="US_WEST_2" VALUE="&quot;us-west-2&quot;" />
+		        <ITEM NAME="US_EAST_2" VALUE="&quot;us-east-2&quot;" />
+		        <ITEM NAME="SA_EAST_1" VALUE="&quot;sa-east-1&quot;" />
+		        <ITEM NAME="EU_WEST_1" VALUE="&quot;eu-west-1&quot;" />
+		        <ITEM NAME="EU_CENTRAL_1" VALUE="&quot;eu-central-1&quot;" />
+		        <ITEM NAME="EU_WEST_2" VALUE="&quot;eu-west-2&quot;" />
+		        <ITEM NAME="EU_WEST_3" VALUE="&quot;eu-west-3&quot;" />
+		        <ITEM NAME="EU_NORTH_1" VALUE="&quot;eu-north-1&quot;" />
+		        <ITEM NAME="CN_NORTH_1" VALUE="&quot;cn-north-1&quot;" />
+		        <ITEM NAME="CN_NORTHWEST_1" VALUE="&quot;cn-northwest-1&quot;" />
+		        <ITEM NAME="AP_EAST_1" VALUE="&quot;ap-east-1&quot;" />
+	         	<ITEM NAME="AP_SOUTHEAST_1" VALUE="&quot;ap-southeast-1&quot;" />
+		        <ITEM NAME="AP_SOUTHEAST_2" VALUE="&quot;ap-southeast-2&quot;" />
+		        <ITEM NAME="AP_NORTHEAST_1" VALUE="&quot;ap-northeast-1&quot;" />
+		        <ITEM NAME="AP_NORTHEAST_2" VALUE="&quot;ap-northeast-2&quot;" />
+	        	<ITEM NAME="AP_SOUTH_1" VALUE="&quot;ap-south-1&quot;" />
+		        <ITEM NAME="CA_CENTRAL_1" VALUE="&quot;ca-central-1&quot;" />
+	    	</ITEMS>
+	    </PARAMETER> 
+	    
+	    <PARAMETER
+	      NAME="EXTERNALID"
+	      FIELD="TEXT"
+	      NUM_ROW="3"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      SHOW_IF="ASSUME_ROLE == 'true'"
+	    >
+	      <DEFAULT>""</DEFAULT>
+	    </PARAMETER>
+	    
+	    <PARAMETER
+	      NAME="SERIALNUMBER"
+	      FIELD="TEXT"
+	      NUM_ROW="4"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      SHOW_IF="ASSUME_ROLE == 'true'"
+	    >
+	      <DEFAULT>""</DEFAULT>
+	    </PARAMETER>
+	    
+	     <PARAMETER
+	      NAME="TOKENCODE"
+	      FIELD="TEXT"
+	      NUM_ROW="5"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      SHOW_IF="ASSUME_ROLE == 'true'"
+	    >
+	      <DEFAULT>""</DEFAULT>
+	    </PARAMETER>
+	    
+	    <PARAMETER
+	      NAME="TAGS"
+	      FIELD="TABLE"
+	      NUM_ROW="6"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      SHOW_IF="ASSUME_ROLE == 'true'"
+	    >
+	      <ITEMS>
+	      	<ITEM NAME="TAG_KEY" FIELD="TEXT" />
+	      	<ITEM NAME="TAG_VALUE" FIELD="TEXT" />
+	      	<ITEM NAME="TAG_TRANSITIVE" FIELD="CHECK" VALUE="FALSE"/>
+	      </ITEMS>
+	    </PARAMETER>
+	    
+	    <PARAMETER
+	      NAME="POLICY_TABLE"
+	      FIELD="TABLE"
+	      NUM_ROW="7"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      SHOW_IF="ASSUME_ROLE == 'true'"
+	    >
+	   		<ITEMS>
+	    		<ITEM NAME="POLICY_ARN" VALUE="" />
+	   		</ITEMS>
+	    </PARAMETER>
+	    
+	    <PARAMETER
+	      NAME="POLICY"
+	      FIELD="MEMO"
+	      NUM_ROW="8"
+	      GROUP="ASSUME_ROLE_CONFIG"
+	      NB_LINES="15"
+	      SHOW_IF="ASSUME_ROLE == 'true'"
+	    >
+	      <DEFAULT>""</DEFAULT>
+	    </PARAMETER>
 		
 		<PARAMETER NAME="WAIT_FOR_CLUSTER_READY" FIELD="CHECK"
-			NUM_ROW="3"
+			NUM_ROW="9"
 			SHOW_IF="(ACTION=='CREATE_CLUSTER') OR (ACTION=='RESIZE_CLUSTER') OR (ACTION=='RESTORE_FROM_SNAPSHOT')"
 			GROUP="ADVANCED_CONFIGURATION">
 			<DEFAULT>true</DEFAULT>
 		</PARAMETER>
 		
 		<PARAMETER NAME="ORIGINAL_CLUSTER_ID_OF_SNAPSHOT" FIELD="TEXT"
-			NUM_ROW="5"
+			NUM_ROW="10"
 			SHOW_IF="(ACTION=='RESTORE_FROM_SNAPSHOT') OR (ACTION=='DELETE_SNAPSHOT')"
 			GROUP="ADVANCED_CONFIGURATION">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
 
-		<PARAMETER NAME="PARAMETER_GROUP_NAME" FIELD="TEXT" NUM_ROW="10"
+		<PARAMETER NAME="PARAMETER_GROUP_NAME" FIELD="TEXT" NUM_ROW="11"
 			SHOW_IF="(ACTION=='CREATE_CLUSTER') OR (ACTION=='RESTORE_FROM_SNAPSHOT')"
 			GROUP="ADVANCED_CONFIGURATION">
 			<DEFAULT>""</DEFAULT>
@@ -231,8 +341,8 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="aws-java-sdk-1.11.406.jar" MODULE="aws-java-sdk-1.11.406.jar"
-				MVN="mvn:com.amazonaws/aws-java-sdk/1.11.406"
+			<IMPORT NAME="aws-java-sdk-1.11.729.jar" MODULE="aws-java-sdk-1.11.729.jar"
+				MVN="mvn:com.amazonaws/aws-java-sdk/1.11.729"
 				REQUIRED="true" />
 			<IMPORT NAME="jackson-core-2.10.1.jar" MODULE="jackson-core-2.10.1.jar"
 				MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1"
@@ -243,22 +353,20 @@
 			<IMPORT NAME="jackson-annotations-2.10.1.jar" MODULE="jackson-annotations-2.10.1.jar"
 				MVN="mvn:com.fasterxml.jackson.core/jackson-annotations/2.10.1"
 				REQUIRED="true" />
-			<IMPORT NAME="httpcore-4.4.9.jar" MODULE="httpcore-4.4.9.jar"
-				MVN="mvn:org.apache.httpcomponents/httpcore/4.4.9"
+			<IMPORT NAME="httpcore-4.4.11.jar" MODULE="httpcore-4.4.11.jar"
+				MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11"
 				REQUIRED="true" />
-			<IMPORT NAME="httpclient-4.5.5.jar" MODULE="httpclient-4.5.5.jar"
-				MVN="mvn:org.apache.httpcomponents/httpclient/4.5.5"
+			<IMPORT NAME="httpclient-4.5.9.jar" MODULE="httpclient-4.5.9.jar"
+				MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9"
 				REQUIRED="true" />
 			<IMPORT NAME="joda-time-2.8.1.jar" MODULE="joda-time-2.8.1.jar"
 				MVN="mvn:joda-time/joda-time/2.8.1"
 				REQUIRED="true" />
-			<IMPORT NAME="commons-logging-1.1.3.jar" MODULE="commons-logging-1.1.3.jar"
-				MVN="mvn:commons-logging/commons-logging/1.1.3"
-				UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.3.jar"
+			<IMPORT NAME="commons-logging-1.2.jar" MODULE="commons-logging-1.2.jar"
+				MVN="mvn:commons-logging/commons-logging/1.2"
 				REQUIRED="true" />
-			<IMPORT NAME="commons-codec-1.6.jar" MODULE="commons-codec-1.6.jar"
-				MVN="mvn:org.talend.libraries/commons-codec-1.6/6.0.0"
-				UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-codec-1.6.jar"
+			<IMPORT NAME="commons-codec-1.11.jar" MODULE="commons-codec-1.11.jar"
+				MVN="mvn:commons-codec/commons-codec/1.11"
 				REQUIRED="true" />
 		</IMPORTS>
 	</CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tAmazonRedshiftManage/tAmazonRedshiftManage_messages.properties

@@ -71,5 +71,38 @@ ARN.NAME=Role ARN
 ROLE_SESSION_NAME.NAME=Role session name
 SESSION_DURATION.NAME=Session duration(minutes)
 
+ASSUME_ROLE_CONFIG.NAME=Assume Role Configuration
+EXTERNALID.NAME=External Id
+SERIALNUMBER.NAME=Serial number
+TOKENCODE.NAME=Token code
+POLICY_TABLE.NAME=IAM Policy ARNs
+POLICY_TABLE.ITEM.POLICY_ARN=Policy ARN
+POLICY.NAME=Policy
+TAGS.NAME=Tags
+TAGS.ITEM.TAG_KEY=Key
+TAGS.ITEM.TAG_VALUE=Value
+TAGS.ITEM.TAG_TRANSITIVE=Transitive
 SET_STS_ENDPOINT.NAME=STS Endpoint
-STS_ENDPOINT.NAME=
+STS_ENDPOINT.NAME=
+SIGNING_REGION.NAME=Signing region
+SIGNING_REGION.ITEM.DEFAULT=DEFAULT
+SIGNING_REGION.ITEM.GovCloud=AWS GovCloud (US)
+SIGNING_REGION.ITEM.US_EAST_1=US Standard
+SIGNING_REGION.ITEM.US_WEST_1=US West (N. California)
+SIGNING_REGION.ITEM.US_WEST_2=US West (Oregon)
+SIGNING_REGION.ITEM.US_EAST_2=US East (Ohio)
+SIGNING_REGION.ITEM.SA_EAST_1=South America (Sao Paulo)
+SIGNING_REGION.ITEM.EU_WEST_1=EU (Ireland)
+SIGNING_REGION.ITEM.EU_CENTRAL_1=EU (Frankfurt)
+SIGNING_REGION.ITEM.EU_WEST_2=EU (London)
+SIGNING_REGION.ITEM.EU_WEST_3=EU (Paris)
+SIGNING_REGION.ITEM.EU_NORTH_1=EU (Stockholm)
+SIGNING_REGION.ITEM.CN_NORTH_1=China (Beijing)
+SIGNING_REGION.ITEM.CN_NORTHWEST_1=China (Ningxia)
+SIGNING_REGION.ITEM.AP_EAST_1=Asia Pacific (Hong Kong)
+SIGNING_REGION.ITEM.AP_SOUTHEAST_1=Asia Pacific (Singapore)
+SIGNING_REGION.ITEM.AP_SOUTHEAST_2=Asia Pacific (Sydney)
+SIGNING_REGION.ITEM.AP_NORTHEAST_1=Asia Pacific (Tokyo)
+SIGNING_REGION.ITEM.AP_NORTHEAST_2=Asia Pacific (Seoul)
+SIGNING_REGION.ITEM.AP_SOUTH_1=Asia Pacific (Mumbai)
+SIGNING_REGION.ITEM.CA_CENTRAL_1=Canada (Central)

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseBulkExec/tAzureSynapseBulkExec_begin.javajet

@@ -22,16 +22,6 @@ skeleton="../templates/db_output_bulk.skeleton"
     INode node = (INode)codeGenArgument.getArgument();
     String cid = node.getUniqueName();
 
-    String storageType = ElementParameterParser.getValue(node, "__AZURE_STORAGE__");
-    String accountName = ElementParameterParser.getValue(node, "__ACCOUNT_NAME__");
-    
-    String clientId = ElementParameterParser.getValue(node, "__CLIENT_ID__");
-    String oauthEndpoint = ElementParameterParser.getValue(node, "__ENDPOINT__");    
-    
-    String container = ElementParameterParser.getValue(node, "__CONTAINER__");
-
-    String azureFolder = ElementParameterParser.getValue(node, "__AZURE_LOCATION__");
-    
     boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(node.getProcess(), "__LOG4J_ACTIVATE__"));
 %>
 
@@ -62,238 +52,66 @@ skeleton="../templates/db_output_bulk.skeleton"
     
     String tableAction = ElementParameterParser.getValue(node,"__TABLE_ACTION__");
     
-    String fieldSeparator = ElementParameterParser.getValueWithUIFieldKey(node,"__FIELDSEPARATOR__","FIELDSEPARATOR");
-    
-    String loadFileFormat = ElementParameterParser.getValue(node,"__IMPORT_TYPE__");
-    
-    boolean dateFormat = "true".equals(ElementParameterParser.getValue(node,"__DATE_FORMAT__"));
-    
-    String datePattern = ElementParameterParser.getValue(node,"__DATE_PATTERN__");
-    
-    boolean useStringDelimiter = "true".equals(ElementParameterParser.getValue(node,"__USE_STRING_DELIMITER__"));
-    
-    String stringDelimiter = ElementParameterParser.getValueWithUIFieldKey(node,"__STRINGDELIMITER__","STRINGDELIMITER");
-        
-    boolean isTypeDefault = "true".equals(ElementParameterParser.getValue(node,"__USE_TYPE_DEFAULT__"));
+    boolean useActiveDirectoryAuth = "true".equals(ElementParameterParser.getValue(node, "__ACTIVE_DIR_AUTH__"));
+
+    // PolyBase & Copy shared config
+    boolean isPolyBase = "POLYBASE".equals(ElementParameterParser.getValue(node,"__LOAD_METHOD__"));
     
+    String storageType = ElementParameterParser.getValue(node, "__AZURE_STORAGE__");
+    String accountName = ElementParameterParser.getValue(node, "__ACCOUNT_NAME__");
+    String container = ElementParameterParser.getValue(node, "__CONTAINER__");
+    String azureFolder = ElementParameterParser.getValue(node, "__AZURE_LOCATION__");
     boolean isCompress = "true".equals(ElementParameterParser.getValue(node, "__COMPRESS__"));
     
-    String compressionType = null;
-    
-    String serdeMethod = ElementParameterParser.getValue(node,"__SERDE_METHOD__");
-    
-    if (isCompress) {
-        if ("DELIMITED_TEXT".equals(loadFileFormat)) {
-            compressionType = ElementParameterParser.getValue(node,"__COMPRESSION_TEXT__");
-        } else if ("HIVE_RCFILE".equals(loadFileFormat)) {
-            compressionType = ElementParameterParser.getValue(node,"__COMPRESSION_RC__");
-        } else if ("HIVE_ORC".equals(loadFileFormat)) {
-            compressionType = ElementParameterParser.getValue(node,"__COMPRESSION_ORC__");
-        } else if ("PARQUET".equals(loadFileFormat)) {
-            compressionType = ElementParameterParser.getValue(node,"__COMPRESSION_PARQUET__");
-        }
-    }
-    
-    String fileFormatType= null;
-    if ("DELIMITED_TEXT".equals(loadFileFormat)) {
-        fileFormatType = "DelimitedText";
-    } else if ("HIVE_RCFILE".equals(loadFileFormat)) {
-        fileFormatType = "RCFILE";
-    } else if ("HIVE_ORC".equals(loadFileFormat)) {
-        fileFormatType = "ORC";
-    } else if ("PARQUET".equals(loadFileFormat)) {
-        fileFormatType = "PARQUET";
-    }
-    // External Table Reject Options
-    
-    boolean isEnabledExtTableOptions = "true".equals(ElementParameterParser.getValue(node, "__EXT_TABLE_OPTIONS__"));
-    
-    String rejectType = ElementParameterParser.getValue(node,"__REJECT_TYPE__");
-    
-    String rejectValue = ElementParameterParser.getValue(node,"__REJECT_VALUE__");
-    
-    String rejectSampleValue = ElementParameterParser.getValue(node,"__REJECT_SAMPLE_VALUE__");    
-    
     String DistributionOption = ElementParameterParser.getValue(node,"__DISTRIBUTION__");
-    
     String DistributionColumnName = ElementParameterParser.getValue(node,"__DISTRIBUTION_COLUMN_NAME__");
-    
     String TableOption = ElementParameterParser.getValue(node,"__TABLE_OPTION__");
-    
     String IndexColumns = ElementParameterParser.getValue(node,"__INDEX_COLUMNS__");
-    
     boolean isEnabled_Partition = "true".equals(ElementParameterParser.getValue(node, "__PARTITION__"));
-    
     String PartitionColumnName = ElementParameterParser.getValue(node,"__PARTITION_COLUMN_NAME__");
-    
     String PartitionRange = ElementParameterParser.getValue(node,"__PARTITION_COLUMN_NAME_RANGE__");
-    
     String PartitionValues = ElementParameterParser.getValue(node,"__PARTITION_VALUES__");
     
-    // External Table Reject Options END
-    
 %>
 
-    final String OUT_DELIM_<%=cid %> = <%=fieldSeparator %>;
-    
-    String randomIdentifier_<%=cid%> = java.util.UUID.randomUUID().toString().replaceAll("-","");
-    
-    String azureCredIdentity_<%=cid%> = "";
-    String azureCredName_<%=cid%> = "";
-    String azureContainer_<%=cid%> = "";    
-    
+<%
+    String passwordFieldName = null;
+    if(isPolyBase){
+        if ("ADLS".equals(storageType)) {
+            passwordFieldName = "__PRINCIPAL_KEY__";
+        }else{
+            passwordFieldName = "__SECRET_KEY__";
+        }
+    }else{// Copy command
+        String authMethod = ElementParameterParser.getValue(node,"__AUTH_METHOD__");
+        if ("KEY".equals(authMethod)) {
+            passwordFieldName = "__SECRET_KEY__";
+        }
+    }
+%>
     String dbschema_<%=cid%> = null;
-    //external tableName
-    String ext_tableName_<%=cid%> = null;
-
     String tableName_<%=cid%> = null;
     String azureFolder_<%=cid%> = <%=azureFolder%>;
     
-    String clientId_<%=cid%> = <%=clientId%>;
-    String oauthEndpoint_<%=cid%> = <%=oauthEndpoint%>;
-    
-<%
-    String passwordFieldName = "";
-    if ("ADLS".equals(storageType)) {
-        passwordFieldName = "__PRINCIPAL_KEY__";
-    }else{
-        passwordFieldName = "__SECRET_KEY__";
-    }
-    if (ElementParameterParser.canEncrypt(node, passwordFieldName)) {
-%> 
-        final String azureAccessKey_<%=cid%> = routines.system.PasswordEncryptUtil.decryptPassword(<%=ElementParameterParser.getEncryptedValue(node, passwordFieldName)%>);
-<%
-    } else {
-        
-%>
-        final String azureAccessKey_<%=cid%> = <%= ElementParameterParser.getValue(node, passwordFieldName)%>; 
-<%
-    }
-     
-    if ("ADLS".equals(storageType)) {
-%>
-        azureCredIdentity_<%=cid%> = clientId_<%=cid%> + "@" + oauthEndpoint_<%=cid%>;
-        azureCredName_<%=cid%> = "talend_ADLCredential_" + randomIdentifier_<%=cid%>;
-<%
-    } else {
-%>
-        azureCredIdentity_<%=cid%> = "talend";
-        azureCredName_<%=cid%> = "talend_AzureStorageCredential_" + randomIdentifier_<%=cid%>;
-        azureContainer_<%=cid%> = <%=container%>;
-<%
-    }
-%>
-    
-    String azureAccountName_<%=cid%> = <%=accountName%>;
-    String azureExtDataSrc_<%=cid%> = "talend_DataSource_" + randomIdentifier_<%=cid%>;
+    String randomIdentifier_<%=cid%> = java.util.UUID.randomUUID().toString().replaceAll("-","");
     String azureExtFileFormat_<%=cid%> = "talend_FileFormat_" + randomIdentifier_<%=cid%>;
     
-    String azureFileLoadType_<%=cid%> = "<%=loadFileFormat%>";
-    
     String dwDistributionOptions_<%=cid%> = "";
     String dwTableOptions_<%=cid%> = "";
     String dwPartition_<%=cid%> = "";
-
 <%
-    List<IMetadataColumn> columnList = getColumnList(node);
-    List<Column> stmtStructure = null;
-    Manager manager = null;
-
-    boolean isDynamic = false;
-    List<IMetadataTable> metadatas = node.getMetadataList();
-    if ((metadatas!=null)&&(metadatas.size()>0)) {
-        IMetadataTable metadata = metadatas.get(0);
-    
-    }
-
-    if(columnList != null && columnList.size() > 0) {
-        stmtStructure = getManager(dbmsId, cid).createColumnList(columnList, false, null, null);
-    }
-
+    // NOT AAD
+    if(passwordFieldName != null){
+        if (ElementParameterParser.canEncrypt(node, passwordFieldName)) {
+%> 
+        final String azureAccessKey_<%=cid%> = routines.system.PasswordEncryptUtil.decryptPassword(<%=ElementParameterParser.getEncryptedValue(node, passwordFieldName)%>);
+<%
+        } else {
 %>
-
-    //BEGIN CONNECTION Code 
-    
-    java.sql.Connection conn_<%=cid%> = null;
+        final String azureAccessKey_<%=cid%> = <%= ElementParameterParser.getValue(node, passwordFieldName)%>; 
 <%
-    boolean useExistingConnection = "true".equals(ElementParameterParser.getValue(node,"__USE_EXISTING_CONNECTION__"));
-%>
-    String dbUser_<%=cid %> = null;
-<%
-    if(useExistingConnection) {
-        String connection = ElementParameterParser.getValue(node,"__CONNECTION__");
-        String conn = "conn_" + connection;
-        String schema = "dbschema_" + connection;
-        %>
-        dbschema_<%=cid%> = (String)globalMap.get("<%=schema%>");
-        conn_<%=cid%> = (java.sql.Connection)globalMap.get("<%=conn%>");
-<%
-    } else {
-%>
-        dbschema_<%=cid%> = <%=dbschema%>;
-        String driverClass_<%=cid%> = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
-        <%dbLog.conn().logJDBCDriver(dbLog.var("driverClass"));%>
-        java.lang.Class.forName(driverClass_<%=cid%>);
-        String port_<%=cid%> = <%=dbport%>;
-        String dbname_<%=cid%> = <%=dbname%> ;
-        String url_<%=cid %> = "jdbc:sqlserver://" + <%=dbhost%> ; 
-        if (!"".equals(port_<%=cid%>)) {
-            url_<%=cid %> += ":" + <%=dbport%>;
-        }
-        if (!"".equals(dbname_<%=cid%>)) {
-        url_<%=cid%> += ";database=" + <%=dbname%>; 
-        }
-        url_<%=cid%> += ";applicationName=Talend;" + <%=dbproperties%>;
-        dbUser_<%=cid %> = <%=dbuser%>;
-
-<%
-        passwordFieldName = "__PASS__";
-%>
-
-        <%@ include file="@{org.talend.designer.components.localprovider}/components/templates/password.javajet"%>
-
-        String dbPwd_<%=cid %> = decryptedPassword_<%=cid%>;
-        <%dbLog.conn().connTry(dbLog.var("url"), dbLog.var("dbUser"));%>    
-        conn_<%=cid%> = java.sql.DriverManager.getConnection(url_<%=cid %>,dbUser_<%=cid%>,dbPwd_<%=cid%>);
-        <%dbLog.conn().connDone(dbLog.var("url"));%>
-<%
-    }
-%>
-
-// END CONNECTION Code
-
-<%
-    if(!useExistingConnection) {
-%>
-        resourceMap.put("conn_<%=cid%>", conn_<%=cid%>);
-        conn_<%=cid%>.setAutoCommit(true);
-<%
-    }
-    dbLog.commit().logAutoCommit("conn_"+cid+".getAutoCommit()");
-%>
-    if(dbschema_<%=cid%> == null || dbschema_<%=cid%>.trim().length() == 0) {
-        ext_tableName_<%=cid%> = <%=table%> + "_" + randomIdentifier_<%=cid%>;
-    } else {
-        ext_tableName_<%=cid%> = dbschema_<%=cid%> + "].[" + <%=table%> + "_" + randomIdentifier_<%=cid%>;
-    }
-
-    if(dbschema_<%=cid%> == null || dbschema_<%=cid%>.trim().length() == 0) {
-        tableName_<%=cid%> = <%=table%>;
-    } else {
-        tableName_<%=cid%> = dbschema_<%=cid%> + "].[" + <%=table%>;
-    }
-<%
-    if(isEnabledExtTableOptions){
-%>
-        String externalTableRejectOptions_<%=cid%> = "REJECT_TYPE = <%=rejectType%>" + ",REJECT_VALUE = " + <%=rejectValue%>;
-<%
-        if("Percentage".equals(rejectType)){
-%>
-            externalTableRejectOptions_<%=cid%> += ",REJECT_SAMPLE_VALUE = " + <%=rejectSampleValue%>;
-<%    
         }
     }
-
     if(("DROP_CREATE").equals(tableAction) || ("CREATE").equals(tableAction) || ("CREATE_IF_NOT_EXISTS").equals(tableAction) || ("DROP_IF_EXISTS_AND_CREATE").equals(tableAction)) {   
     
         // DW Table Options
@@ -335,7 +153,177 @@ skeleton="../templates/db_output_bulk.skeleton"
 <%
         }
         // DW Table Partition END
+    }
+%>
+    String azureAccountName_<%=cid%> = <%=accountName%>;
+<%
+    List<IMetadataColumn> columnList = getColumnList(node);
+    List<Column> stmtStructure = null;
+    Manager manager = null;
+    boolean isDynamic = false;
+    List<IMetadataTable> metadatas = node.getMetadataList();
+    if ((metadatas!=null)&&(metadatas.size()>0)) {
+        IMetadataTable metadata = metadatas.get(0);
+    
+    }
+    if(columnList != null && columnList.size() > 0) {
+        stmtStructure = getManager(dbmsId, cid).createColumnList(columnList, false, null, null);
+    }
+
+%>
+
+    //BEGIN CONNECTION Code 
+    java.sql.Connection conn_<%=cid%> = null;
+<%
+    boolean useExistingConnection = "true".equals(ElementParameterParser.getValue(node,"__USE_EXISTING_CONNECTION__"));
+%>
+    String dbUser_<%=cid %> = null;
+<%
+    if(useExistingConnection) {
+        String connection = ElementParameterParser.getValue(node,"__CONNECTION__");
+        String conn = "conn_" + connection;
+        String schema = "dbschema_" + connection;
+        %>
+        dbschema_<%=cid%> = (String)globalMap.get("<%=schema%>");
+        conn_<%=cid%> = (java.sql.Connection)globalMap.get("<%=conn%>");
+<%
+    } else {
+%>
+        dbschema_<%=cid%> = <%=dbschema%>;
+        String driverClass_<%=cid%> = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
+        <%dbLog.conn().logJDBCDriver(dbLog.var("driverClass"));%>
+        java.lang.Class.forName(driverClass_<%=cid%>);
+        String port_<%=cid%> = <%=dbport%>;
+        String dbname_<%=cid%> = <%=dbname%> ;
+        String url_<%=cid %> = "jdbc:sqlserver://" + <%=dbhost%> ; 
+        if (!"".equals(port_<%=cid%>)) {
+            url_<%=cid %> += ":" + <%=dbport%>;
+        }
+        if (!"".equals(dbname_<%=cid%>)) {
+        url_<%=cid%> += ";database=" + <%=dbname%>; 
+        }
+
+<%
+        if (useActiveDirectoryAuth) {
+%>
+            url_<%=cid%> += ";encrypt=true;trustServerCertificate=false;hostNameInCertificate=*.database.windows.net;Authentication=ActiveDirectoryPassword";
+<%
+        }
+%>
+        url_<%=cid%> += ";applicationName=Talend;" + <%=dbproperties%>;
+        dbUser_<%=cid %> = <%=dbuser%>;
+
+<%
+        passwordFieldName = "__PASS__";
+%>
+
+        <%@ include file="@{org.talend.designer.components.localprovider}/components/templates/password.javajet"%>
+
+        String dbPwd_<%=cid %> = decryptedPassword_<%=cid%>;
+        <%dbLog.conn().connTry(dbLog.var("url"), dbLog.var("dbUser"));%>    
+        conn_<%=cid%> = java.sql.DriverManager.getConnection(url_<%=cid %>,dbUser_<%=cid%>,dbPwd_<%=cid%>);
+        <%dbLog.conn().connDone(dbLog.var("url"));%>
+<%
+    }
+%>
+
+// END CONNECTION Code
+
+<%
+    if(!useExistingConnection) {
+%>
+        resourceMap.put("conn_<%=cid%>", conn_<%=cid%>);
+        conn_<%=cid%>.setAutoCommit(true);
+<%
+    }
+    dbLog.commit().logAutoCommit("conn_"+cid+".getAutoCommit()");
+%>
+    if(dbschema_<%=cid%> == null || dbschema_<%=cid%>.trim().length() == 0) {
+        tableName_<%=cid%> = <%=table%>;
+    } else {
+        tableName_<%=cid%> = dbschema_<%=cid%> + "].[" + <%=table%>;
+    }
+<%
+    // PolyBase
+    if(isPolyBase){
+        // External Table Reject Options
+        boolean isEnabledExtTableOptions = "true".equals(ElementParameterParser.getValue(node, "__EXT_TABLE_OPTIONS__"));
+        String rejectType = ElementParameterParser.getValue(node,"__REJECT_TYPE__");
+        String rejectValue = ElementParameterParser.getValue(node,"__REJECT_VALUE__");
+        String rejectSampleValue = ElementParameterParser.getValue(node,"__REJECT_SAMPLE_VALUE__");    
         
+        // External Table Reject Options END
+        boolean dateFormat = "true".equals(ElementParameterParser.getValue(node,"__DATE_FORMAT__"));
+        String fieldSeparator = ElementParameterParser.getValueWithUIFieldKey(node,"__FIELDSEPARATOR__","FIELDSEPARATOR");
+        String loadFileFormat = ElementParameterParser.getValue(node,"__IMPORT_TYPE__");
+        String datePattern = ElementParameterParser.getValue(node,"__DATE_PATTERN__");
+        boolean useStringDelimiter = "true".equals(ElementParameterParser.getValue(node,"__USE_STRING_DELIMITER__"));
+        String stringDelimiter = ElementParameterParser.getValueWithUIFieldKey(node,"__STRINGDELIMITER__","STRINGDELIMITER");
+        boolean isTypeDefault = "true".equals(ElementParameterParser.getValue(node,"__USE_TYPE_DEFAULT__"));
+        String serdeMethod = ElementParameterParser.getValue(node,"__SERDE_METHOD__");
+        
+        String compressionType = null;
+        if (isCompress) {
+            if ("DELIMITED_TEXT".equals(loadFileFormat)) {
+                compressionType = ElementParameterParser.getValue(node,"__COMPRESSION_TEXT__");
+            } else if ("HIVE_RCFILE".equals(loadFileFormat)) {
+                compressionType = ElementParameterParser.getValue(node,"__COMPRESSION_RC__");
+            } else if ("HIVE_ORC".equals(loadFileFormat)) {
+                compressionType = ElementParameterParser.getValue(node,"__COMPRESSION_ORC__");
+            } else if ("PARQUET".equals(loadFileFormat)) {
+                compressionType = ElementParameterParser.getValue(node,"__COMPRESSION_PARQUET__");
+            }
+        }
+        String fileFormatType= null;
+        if ("DELIMITED_TEXT".equals(loadFileFormat)) {
+            fileFormatType = "DelimitedText";
+        } else if ("HIVE_RCFILE".equals(loadFileFormat)) {
+            fileFormatType = "RCFILE";
+        } else if ("HIVE_ORC".equals(loadFileFormat)) {
+            fileFormatType = "ORC";
+        } else if ("PARQUET".equals(loadFileFormat)) {
+            fileFormatType = "PARQUET";
+        }
+        String clientId = ElementParameterParser.getValue(node, "__CLIENT_ID__");
+        String oauthEndpoint = ElementParameterParser.getValue(node, "__ENDPOINT__");
+%>
+        final String OUT_DELIM_<%=cid %> = <%=fieldSeparator %>;
+        String ext_tableName_<%=cid%> = null;
+        String azureExtDataSrc_<%=cid%> = "talend_DataSource_" + randomIdentifier_<%=cid%>;
+        String azureFileLoadType_<%=cid%> = "<%=loadFileFormat%>";
+        
+<%
+        if ("ADLS".equals(storageType)) {
+%>
+        String clientId_<%=cid%> = <%=clientId%>;
+        String oauthEndpoint_<%=cid%> = <%=oauthEndpoint%>;
+        String azureCredIdentity_<%=cid%> = clientId_<%=cid%> + "@" + oauthEndpoint_<%=cid%>;
+        String azureCredName_<%=cid%> = "talend_ADLCredential_" + randomIdentifier_<%=cid%>;
+<%
+        } else {//ADLS Gen2 & Blob Storage
+%>
+        String azureCredIdentity_<%=cid%> = "talend";
+        String azureCredName_<%=cid%> = "talend_AzureStorageCredential_" + randomIdentifier_<%=cid%>;
+        String azureContainer_<%=cid%> = <%=container%>;
+<%
+        }
+%>
+    if(dbschema_<%=cid%> == null || dbschema_<%=cid%>.trim().length() == 0) {
+        ext_tableName_<%=cid%> = <%=table%> + "_" + randomIdentifier_<%=cid%>;
+    } else {
+        ext_tableName_<%=cid%> = dbschema_<%=cid%> + "].[" + <%=table%> + "_" + randomIdentifier_<%=cid%>;
+    }
+
+<%
+    if(isEnabledExtTableOptions){
+%>
+        String externalTableRejectOptions_<%=cid%> = "REJECT_TYPE = <%=rejectType%>" + ",REJECT_VALUE = " + <%=rejectValue%>;
+<%
+        if("Percentage".equals(rejectType)){
+%>
+            externalTableRejectOptions_<%=cid%> += ",REJECT_SAMPLE_VALUE = " + <%=rejectSampleValue%>;
+<%    
+        }
     }
 
     if(columnList != null && columnList.size()>0) {
@@ -373,6 +361,11 @@ skeleton="../templates/db_output_bulk.skeleton"
             if ("ADLS".equals(storageType)) {
 %>    
                 stmtCreateExtDataSource_<%=cid%>.execute("CREATE EXTERNAL DATA SOURCE " + azureExtDataSrc_<%=cid%> + " WITH (TYPE=HADOOP, LOCATION = 'adl://" + azureAccountName_<%=cid%> + ".azuredatalakestore.net', CREDENTIAL = " + azureCredName_<%=cid%> + ")");
+<%
+            }else if ("ADLS_GEN2".equals(storageType)) {
+                boolean enableSSL = "true".equals(ElementParameterParser.getValue(node,"__ENABLE_SSL__"));
+%>    
+                stmtCreateExtDataSource_<%=cid%>.execute("CREATE EXTERNAL DATA SOURCE " + azureExtDataSrc_<%=cid%> + " WITH (TYPE=HADOOP, LOCATION = 'abfs<%=(enableSSL?"s":"")%>://" + azureContainer_<%=cid%> + "@" + azureAccountName_<%=cid%>  + ".dfs.core.windows.net', CREDENTIAL = " + azureCredName_<%=cid%> + ")");
 <%
             } else {
 %>    
@@ -786,6 +779,423 @@ skeleton="../templates/db_output_bulk.skeleton"
 <%
         }
     } 
+}else{
+    String authMethod = ElementParameterParser.getValue(node,"__AUTH_METHOD__");
+    String sasToken = ElementParameterParser.getValue(node,"__SAS_TOKEN__");
+    String endpointSuffix = ElementParameterParser.getValue(node,"__ENDPOINT_SUFFIX__");
+    List<Map<String,String>> externalPaths = (List<Map<String,String>>)ElementParameterParser.getObjectValue(node, "__EXTERNAL_LOCATIONS__");
+    boolean specifyFieldsMapping = "true".equals(ElementParameterParser.getValue(node, "__SPECIFY_FIELDS_MAPPING__"));
+    List<Map<String,String>> fieldsMapping = (List<Map<String,String>>)ElementParameterParser.getObjectValue(node, "__COLUMN_MAP_FIELD__");
+    String fileType = ElementParameterParser.getValue(node,"__FILE_TYPE__");
+    String firstRow = ElementParameterParser.getValue(node,"__FIRST_ROW__");
+    if(firstRow==null || firstRow.isEmpty()){
+        firstRow = "1";
+    }
+    // csv format
+    String fieldQuote = ElementParameterParser.getValue(node,"__FIELD_QUOTE__");
+    if(fieldQuote==null || fieldQuote.isEmpty()){
+        fieldQuote = "\"\"";
+    }
+    String fieldTerminator = ElementParameterParser.getValue(node,"__FIELD_TERMINATOR__");
+    if(fieldTerminator==null || fieldTerminator.isEmpty()){
+        fieldTerminator = "\"\"";
+    }
+    String rowTerminator = ElementParameterParser.getValue(node,"__ROW_TERMINATOR__");
+    if(rowTerminator==null || rowTerminator.isEmpty()){
+        rowTerminator = "\"\"";
+    }
+    String copyCsvDateFormat = ElementParameterParser.getValue(node,"__COPY_CSV_DATE_FORMAT__");
+    String encoding = ElementParameterParser.getValue(node,"__ENCODING__");
+    // csv end
+    boolean identityInsert = "true".equals(ElementParameterParser.getValue(node,"__IDENTITY_INSERTE__"));
+    String maxErrors = ElementParameterParser.getValue(node,"__MAX_ERRORS__");
+    if(maxErrors==null || maxErrors.isEmpty()){
+        maxErrors = "0";
+    }
+    String errorFile = ElementParameterParser.getValue(node,"__ERROR_FILE__");
+    if(errorFile==null || errorFile.isEmpty()){
+        errorFile = "\"\"";
+    }
+    String compressionType = null;
+    if (isCompress) {
+        if ("CSV".equals(fileType)) { //TODO recheck
+            //compressionType = ElementParameterParser.getValue(node,"__COMPRESSION_TEXT__");
+            compressionType = "GZIP";
+        } else if ("ORC".equals(fileType)) {
+            compressionType = ElementParameterParser.getValue(node,"__COMPRESSION_ORC__");
+        } else if ("PARQUET".equals(fileType)) {
+            compressionType = ElementParameterParser.getValue(node,"__COMPRESSION_PARQUET__");
+        }
+    }
+    if("SAS".equals(authMethod)){
+    %>
+    String azureCredIdentity_<%=cid%> = "Shared Access Signature";
+    <%
+    }else if("KEY".equals(authMethod)){
+    %>
+    String azureCredIdentity_<%=cid%> = "Storage Account Key";
+    <%
+    }else if("AAD".equals(authMethod)){
+    %>
+    // CREDENTIAL is not required for AAD
+    <%
+    }
+    if ("CSV".equals(fileType)) {
+%>
+
+    String fieldQuote_<%=cid%> = <%=fieldQuote%>;
+    String fieldTerminator_<%=cid%> = <%=fieldTerminator%>;
+    String rowTerminator_<%=cid%> = <%=rowTerminator%>;
+    String errorFile_<%=cid%> = <%=errorFile%>;
+<%
+    }
+%>
+    Integer firstRow_<%=cid%> = <%=firstRow%>;
+    Integer maxErrors_<%=cid%> = <%=maxErrors%>;
+    
+<%
+        manager = getManager(dbmsId, cid);
+        String ending="";
+        if(!"CSV".equals(fileType)){
+        // stores the file type and compression method for the external data
+        %>
+            boolean extFileFormatCreated_<%=cid%> = false;
+            StringBuilder cmdExtFileFormat_<%=cid%> = new StringBuilder(); 
+            java.sql.Statement stmtCreateExtFileFormat_<%=cid%> = conn_<%=cid%>.createStatement();
+	        cmdExtFileFormat_<%=cid%>.append("CREATE EXTERNAL FILE FORMAT ").append(azureExtFileFormat_<%=cid%>).append(" WITH (FORMAT_TYPE = <%=fileType%>");
+            <%
+            if (isCompress && compressionType != null){
+            %>
+                cmdExtFileFormat_<%=cid%>.append(", DATA_COMPRESSION = '<%=compressionType%>'");
+            <%
+            }
+            %>
+            cmdExtFileFormat_<%=cid%>.append(")");
+            stmtCreateExtFileFormat_<%=cid%>.execute(cmdExtFileFormat_<%=cid%>.toString());
+            stmtCreateExtFileFormat_<%=cid%>.close();
+            extFileFormatCreated_<%=cid%> = true;
+            <%
+            if(isLog4jEnabled) {
+            %>
+                log.info("<%=cid%> - Created External File Format: " + azureExtFileFormat_<%=cid%> + " successfully.");
+            <%
+            }
+        }
+            %>  
+                        // CREATE DW TABLE AND / OR INSERT INTO DW TABLE
+                        try{
+            <%
+                            if(!("NONE").equals(tableAction)) {
+                                if(("DROP_CREATE").equals(tableAction) || ("CREATE").equals(tableAction) || ("CREATE_IF_NOT_EXISTS").equals(tableAction) || ("DROP_IF_EXISTS_AND_CREATE").equals(tableAction)) {
+                                    if(columnList == null || columnList.size()<= 0) {
+%>
+                                        if(true){
+                                            throw new RuntimeException("Can't create table with empty schema!");
+                                        }
+<%
+                                    }
+                                }
+                                if(("DROP_CREATE").equals(tableAction)) {
+            %>
+                                    java.sql.Statement stmtDrop_<%=cid%> = conn_<%=cid%>.createStatement();
+                                    <%dbLog.table().dropTry(dbLog.var("tableName"));%>
+                                    stmtDrop_<%=cid%>.execute("DROP TABLE [" + tableName_<%=cid%> + "]");
+                                    <%dbLog.table().dropDone(dbLog.var("tableName"));%>
+                                    stmtDrop_<%=cid%>.close();
+<%
+                                    if(columnList != null && columnList.size()>0) {
+%>
+                                    java.sql.Statement stmtCreate_<%=cid%> = conn_<%=cid%>.createStatement();
+                                    <%dbLog.table().createTry(dbLog.var("tableName"));%>
+                                    stmtCreate_<%=cid%>.execute("<%=manager.getCreateTableSQL(stmtStructure)%>) WITH (" + dwTableOptions_<%=cid%> + dwDistributionOptions_<%=cid%> + dwPartition_<%=cid%> + ")");
+                                    <%dbLog.table().createDone(dbLog.var("tableName"));%>
+                                    stmtCreate_<%=cid%>.close();
+<%
+                                    }
+%>
+            <%
+            
+                                } else if(("CREATE").equals(tableAction)) {
+                                    if(columnList != null && columnList.size()>0) {
+%>
+                                    java.sql.Statement stmtCreate_<%=cid%> = conn_<%=cid%>.createStatement();
+                                    <%dbLog.table().createTry(dbLog.var("tableName"));%>
+                                    stmtCreate_<%=cid%>.execute("<%=manager.getCreateTableSQL(stmtStructure)%>) WITH (" + dwTableOptions_<%=cid%> + dwDistributionOptions_<%=cid%> + dwPartition_<%=cid%> + ")");
+                                    <%dbLog.table().createDone(dbLog.var("tableName"));%>
+                                    stmtCreate_<%=cid%>.close();
+            <%
+                                    }
+                                } else if(("CREATE_IF_NOT_EXISTS").equals(tableAction) || ("DROP_IF_EXISTS_AND_CREATE").equals(tableAction)) {
+                                    boolean tableNameCaseSensitive=false;
+            %>
+                                    //check if table exists
+                                    java.sql.Statement isExistStmt_<%=cid%> = conn_<%=cid%>.createStatement();
+                                    boolean whetherExist_<%=cid%> = false;
+                                    try {
+                                        isExistStmt_<%=cid%>.execute("SELECT TOP 1 1 FROM [" +  tableName_<%=cid%> + "]" );
+                                        whetherExist_<%=cid%> = true;
+                                    } catch (java.lang.Exception e){
+                                        whetherExist_<%=cid%> = false;
+                                    }
+                                    isExistStmt_<%=cid%>.close();
+            <%
+                                    if(("CREATE_IF_NOT_EXISTS").equals(tableAction)) {
+                                        if(columnList != null && columnList.size()>0) {
+    %>
+                                        if(!whetherExist_<%=cid%>) {
+                                            java.sql.Statement stmtCreate_<%=cid%> = conn_<%=cid%>.createStatement();
+                                            <%dbLog.table().createTry(dbLog.var("tableName"));%>
+                                            stmtCreate_<%=cid%>.execute("<%=manager.getCreateTableSQL(stmtStructure)%>) WITH (" + dwTableOptions_<%=cid%> + dwDistributionOptions_<%=cid%> + dwPartition_<%=cid%> + ")");
+                                            <%dbLog.table().createDone(dbLog.var("tableName"));%>
+                                            stmtCreate_<%=cid%>.close();
+                                        }
+            <%
+                                        }
+                                    } else {
+            %>
+                                        if(whetherExist_<%=cid%>) {
+                                            java.sql.Statement stmtDrop_<%=cid%> = conn_<%=cid%>.createStatement();
+                                            <%dbLog.table().dropTry(dbLog.var("tableName"));%>
+                                            stmtDrop_<%=cid%>.execute("DROP TABLE [" + tableName_<%=cid%> + "]");
+                                            <%dbLog.table().dropDone(dbLog.var("tableName"));%>
+                                            stmtDrop_<%=cid%>.close();
+                                        }
+<%
+                                        if(columnList != null && columnList.size()>0) {
+%>
+                                        java.sql.Statement stmtCreate_<%=cid%> = conn_<%=cid%>.createStatement();
+                                        <%dbLog.table().createTry(dbLog.var("tableName"));%>
+                                        stmtCreate_<%=cid%>.execute("<%=manager.getCreateTableSQL(stmtStructure)%>) WITH (" + dwTableOptions_<%=cid%> + dwDistributionOptions_<%=cid%> + dwPartition_<%=cid%> + ")");
+                                        <%dbLog.table().createDone(dbLog.var("tableName"));%>
+                                        stmtCreate_<%=cid%>.close();
+            <%
+                                        }
+                                    }
+                                } else if(("CLEAR").equals(tableAction)) {
+            %>
+                                    java.sql.Statement stmtClear_<%=cid%> = conn_<%=cid%>.createStatement();
+                                    <%dbLog.table().clearTry(dbLog.var("tableName"));%>
+                                    stmtClear_<%=cid%>.executeUpdate("<%=manager.getDeleteTableSQL()%>");
+                                    <%dbLog.table().clearDone(dbLog.var("tableName"));%>
+                                    stmtClear_<%=cid%>.close();
+            <%
+                                } else if(("TRUNCATE").equals(tableAction)) {
+            %>
+                                    java.sql.Statement stmtTruncCount_<%=cid%> = conn_<%=cid%>.createStatement();
+                                    java.sql.ResultSet rsTruncCount_<%=cid%> = stmtTruncCount_<%=cid%>.executeQuery("<%=manager.getSelectionSQL()%>");
+                                    int rsTruncCountNumber_<%=cid%> = 0;
+                                    if(rsTruncCount_<%=cid%>.next()) {
+                                        rsTruncCountNumber_<%=cid%> = rsTruncCount_<%=cid%>.getInt(1);
+                                    }
+                                    rsTruncCount_<%=cid%>.close();
+                                    stmtTruncCount_<%=cid%>.close();
+                                    java.sql.Statement stmtTrunc_<%=cid%> = conn_<%=cid%>.createStatement();
+                                    <%dbLog.table().truncateTry(dbLog.var("tableName"));%>
+                                    stmtTrunc_<%=cid%>.executeUpdate("<%=manager.getTruncateTableSQL()%>");
+                                    <%dbLog.table().truncateDone(dbLog.var("tableName"));%>
+            <%
+                                    if(isLog4jEnabled) {
+            %>
+                                        log.info("<%=cid%> - Number of Rows Truncated : " + rsTruncCountNumber_<%=cid%> + ".");
+            <%
+                                    }
+            %>
+                                    stmtTrunc_<%=cid%>.close();
+            <%
+
+                                } 
+                            }
+            %>
+                            StringBuilder copySQL_<%=cid%> = new StringBuilder(); 
+                            copySQL_<%=cid%>.append("COPY INTO [" +  tableName_<%=cid%> + "] ");
+<%
+                            if(specifyFieldsMapping){
+	                            if(columnList != null && columnList.size()>0) {
+%>
+                                    copySQL_<%=cid%>.append("(");
+<%
+                                    for(int columnIndex = 0;columnIndex<columnList.size();columnIndex++){
+	                                    IMetadataColumn column = columnList.get(columnIndex);
+	                                    String fieldIndex = fieldsMapping.get(columnIndex).get("FIELD_INDEX");
+	                                    if(columnIndex != 0){
+%>
+                                            copySQL_<%=cid%>.append(",");
+<%
+	                                    }
+ %>
+                                        copySQL_<%=cid%>.append("<%=column.getOriginalDbColumnName() %>");
+                                        // TODO support default value
+<%
+                                        if(fieldIndex != null && !fieldIndex.isEmpty()){
+%>
+                                        copySQL_<%=cid%>.append(" "+<%=fieldIndex%>);
+<%
+                                        }
+	                                }
+%>
+                                    copySQL_<%=cid%>.append(")");
+<%
+                                }
+                            }
+%>
+                            copySQL_<%=cid%>.append("");
+                            //external localtion
+                            copySQL_<%=cid%>.append("FROM ");
+<%
+							int pathSize=externalPaths.size();
+							if(pathSize > 0){
+					            for(int pathIndex = 0;pathIndex<pathSize;pathIndex++){
+					                Map<String, String> externalPathMap = externalPaths.get(pathIndex);
+					                String externalPath = externalPathMap.get("EXTERNAL_LOCATION");
+					                if(pathIndex != 0){
+%>
+                                     copySQL_<%=cid%>.append(",");
+<%
+                                    }
+%>
+                                     copySQL_<%=cid%>.append("'https://"+<%=accountName %>+"."+<%=endpointSuffix %>+"/"+<%=container %>+"/"+<%=externalPath%>+"'");
+<%
+                                }
+							}
+%>
+                            copySQL_<%=cid%>.append(" WITH ( ");
+<%
+							if("CSV".equals(fileType)){
+%>
+                            copySQL_<%=cid%>.append("FILE_TYPE = 'CSV' ");
+<%
+							}else{
+%>
+                            copySQL_<%=cid%>.append("FILE_FORMAT = "+azureExtFileFormat_<%=cid%>+" ");
+<%
+							}
+                            if("KEY".equals(authMethod)){
+%>
+                            copySQL_<%=cid%>.append(",CREDENTIAL=(IDENTITY= '"+azureCredIdentity_<%=cid%>+"', SECRET='"+azureAccessKey_<%=cid%>+"')");
+<%
+                            }
+                            if("SAS".equals(authMethod)){
+%>
+                            copySQL_<%=cid%>.append(",CREDENTIAL=(IDENTITY= '"+azureCredIdentity_<%=cid%>+"', SECRET='"+<%=sasToken%>+"')");
+<%
+                            }
+                            if("CSV".equals(fileType)){
+%>
+                            if(fieldQuote_<%=cid%>!=null && !fieldQuote_<%=cid%>.isEmpty()){
+                                copySQL_<%=cid%>.append(",FIELDQUOTE = '"+ fieldQuote_<%=cid%> +"' ");
+                            }
+                            if(fieldTerminator_<%=cid%>!=null && !fieldTerminator_<%=cid%>.isEmpty()){
+                                copySQL_<%=cid%>.append(",FIELDTERMINATOR = '"+ fieldTerminator_<%=cid%> +"' ");
+                            }
+                            if(rowTerminator_<%=cid%>!=null && !rowTerminator_<%=cid%>.isEmpty()){
+                                copySQL_<%=cid%>.append(",ROWTERMINATOR = '"+ rowTerminator_<%=cid%> +"' ");
+                            }
+                            if(firstRow_<%=cid%>!=null && firstRow_<%=cid%> > 1){
+                                copySQL_<%=cid%>.append(",FIRSTROW = '"+ firstRow_<%=cid%> +"' ");
+                            }
+<%
+                            if(!"SESSION_DATEFORMAT".equals(copyCsvDateFormat)){
+%>
+                                copySQL_<%=cid%>.append(",DATEFORMAT = '"+ <%=copyCsvDateFormat%> +"' ");
+<%
+                            }
+%>
+
+                            copySQL_<%=cid%>.append(",ENCODING = '"+ <%=encoding%> +"' ");
+<%
+                                if(!"KEY".equals(authMethod)){
+%>
+		                            if(errorFile_<%=cid%>!=null && !errorFile_<%=cid%>.isEmpty()){
+		                                copySQL_<%=cid%>.append(",ERRORFILE = '"+ errorFile_<%=cid%> +"' ");
+		                            }
+<%
+                                }
+                                if(isCompress){
+%>
+                                    copySQL_<%=cid%>.append(",COMPRESSION = '<%=compressionType%>' ");
+<%
+                                }
+                            }
+%>
+                            if(maxErrors_<%=cid%>!=null && maxErrors_<%=cid%> > 0){
+                                copySQL_<%=cid%>.append(",MAXERRORS = '"+ maxErrors_<%=cid%> +"' ");
+                            }
+                            copySQL_<%=cid%>.append(",IDENTITY_INSERT = '<%=identityInsert?"ON":"OFF" %>'");
+                            String label_<%=cid%> = "COPY: ["+tableName_<%=cid%>+"] UniqueID: "+randomIdentifier_<%=cid%>;
+                            copySQL_<%=cid%>.append(") OPTION (LABEL = '"+label_<%=cid%>+"')");
+                            
+                            java.sql.Statement stmt_Copy<%=cid%> = conn_<%=cid%>.createStatement();
+<%
+
+                            if(isLog4jEnabled) {
+%>
+                                log.info("<%=cid%> - Starting COPY into table : [" + tableName_<%=cid%> + "].");
+<%
+                             }
+%>  
+				            stmt_Copy<%=cid%>.executeUpdate(copySQL_<%=cid%>.toString());
+				            stmt_Copy<%=cid%>.close();
+				            
+				            java.sql.Statement monitor_<%=cid%> = conn_<%=cid%>.createStatement();
+				            String monitorSql_<%=cid %>="SELECT r.command,sum(bytes_processed) AS bytes_processed,sum(rows_processed) AS rows_processed from sys.dm_pdw_exec_requests r JOIN sys.dm_pdw_dms_workers w ON r.[request_id] = w.request_id WHERE [label] = '"+label_<%=cid%>+"' and session_id = session_id() and type = 'WRITER' GROUP BY r.command ";
+				            java.sql.ResultSet result_<%=cid %> = monitor_<%=cid%>.executeQuery(monitorSql_<%=cid %>);
+				            int insertedCount_<%=cid%> = 0;
+				            if(result_<%=cid %>!=null){
+				                while(result_<%=cid %>.next()){
+				                    insertedCount_<%=cid%> = result_<%=cid %>.getInt(3);
+<%
+                            if(isLog4jEnabled) {
+%>
+                                    log.info("<%=cid%> - Copy command : " + result_<%=cid %>.getString(1) );
+                                    log.info("<%=cid%> - Bytes processed : " + result_<%=cid %>.getLong(2) );
+                                    log.info("<%=cid%> - Row processed : " + insertedCount_<%=cid%> );
+<%
+}
+%>
+				                }
+				            }
+				            monitor_<%=cid%>.close();
+				            globalMap.put("<%=cid%>_NB_LINE_INSERTED",insertedCount_<%=cid%>);
+				            
+<%
+                            if(isLog4jEnabled) {
+%>
+				                log.info("<%=cid%> - Copy into table : [" + tableName_<%=cid%> + "] completed successfully.");
+<%
+                            }
+            %>
+                        } catch (java.sql.SQLException e_<%=cid%>) {
+            <%
+                            if(isLog4jEnabled) {
+            %>
+                                log.error("<%=cid%> - " + e_<%=cid%>.getMessage());
+            <%
+                            }
+            %>
+                            throw e_<%=cid%>;
+                        }finally{
+<%
+                            if(!"CSV".equals(fileType)){
+%>
+                            if(extFileFormatCreated_<%=cid%>){
+	                            java.sql.Statement stmtDropExtFileFormat_<%=cid%> = conn_<%=cid%>.createStatement();
+	                            stmtDropExtFileFormat_<%=cid%>.execute("DROP EXTERNAL FILE FORMAT [" + azureExtFileFormat_<%=cid%> + "]");
+	                            stmtDropExtFileFormat_<%=cid%>.close();
+<%
+                                if(isLog4jEnabled) {
+%>
+                                    log.info("<%=cid%> - Dropped External File Format : [" + azureExtFileFormat_<%=cid%> + "] successfully.");
+<%
+                                }
+%>
+                            }
+<%
+                           }
+%>  
+                        }
+                    
+            <%
+}
 
     if(!useExistingConnection) {
 %>

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

@@ -6,8 +6,8 @@
 	</HEADER>
 
   <FAMILIES>
-     <FAMILY>Databases/DB Specifics/Azure/SQL Data Warehouse</FAMILY>
-     <FAMILY>Cloud/Azure/SQL Data Warehouse</FAMILY>
+     <FAMILY>Databases/DB Specifics/Azure/Synapse Analytics</FAMILY>
+     <FAMILY>Cloud/Azure/Synapse Analytics</FAMILY>
   </FAMILIES>
 
 	<DOCUMENTATION>
@@ -32,7 +32,7 @@
 			<DEFAULT>false</DEFAULT>
 		</PARAMETER>
 
-		<PARAMETER NAME="CONNECTION" FIELD="COMPONENT_LIST" REQUIRED="true" FILTER="tSQLDWHConnection" NUM_ROW="2" SHOW_IF="USE_EXISTING_CONNECTION == 'true'" DYNAMIC_SETTINGS="true" GROUP="DB_CONFIG" />
+		<PARAMETER NAME="CONNECTION" FIELD="COMPONENT_LIST" REQUIRED="true" FILTER="tAzureSynapseConnection" NUM_ROW="2" SHOW_IF="USE_EXISTING_CONNECTION == 'true'" DYNAMIC_SETTINGS="true" GROUP="DB_CONFIG" />
 		
 		<PARAMETER NAME="DRIVER" FIELD="CLOSED_LIST" NUM_ROW="25" REPOSITORY_VALUE="DRIVER" SHOW_IF="USE_EXISTING_CONNECTION == 'false'" GROUP="DB_CONFIG">
             <ITEMS DEFAULT="MSSQL_PROP">
@@ -92,42 +92,72 @@
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
 		
+		<PARAMETER NAME="LOAD_METHOD" FIELD="CLOSED_LIST" REQUIRED="true" NUM_ROW="90">
+            <ITEMS DEFAULT="COPY">
+                <ITEM NAME="POLYBASE" VALUE="POLYBASE" />
+                <ITEM NAME="COPY" VALUE="COPY"/>
+            </ITEMS>
+        </PARAMETER>
+		
 		<PARAMETER NAME="AZURE_STORAGE" FIELD="CLOSED_LIST" REQUIRED="true" NUM_ROW="100" GROUP="AZURE_CONNECTION">
 			<ITEMS DEFAULT="BLOB">
 				<ITEM NAME="BLOB" VALUE="BLOB" />
-				<ITEM NAME="ADLS" VALUE="ADLS"/>
+				<ITEM NAME="ADLS" VALUE="ADLS" SHOW_IF="LOAD_METHOD == 'POLYBASE'"/>
+				<ITEM NAME="ADLS_GEN2" VALUE="ADLS_GEN2"/>
 			</ITEMS>
 		</PARAMETER>
 		
-    
+		<PARAMETER NAME="AUTH_METHOD" FIELD="CLOSED_LIST" REQUIRED_IF="LOAD_METHOD == 'COPY'"  NUM_ROW="105" SHOW_IF="LOAD_METHOD == 'COPY'" GROUP="AZURE_CONNECTION">
+            <ITEMS DEFAULT="SAS">
+                <ITEM NAME="SAS" VALUE="SAS" />
+                <ITEM NAME="KEY" VALUE="KEY"/>
+                <ITEM NAME="AAD" VALUE="AAD" SHOW_IF="(isShow[ACTIVE_DIR_AUTH] AND (ACTIVE_DIR_AUTH == 'true')) OR ((USE_EXISTING_CONNECTION == 'true') AND (#LINK@NODE.CONNECTION.ACTIVE_DIR_AUTH != 'true'))"/>
+            </ITEMS>
+        </PARAMETER>
+		
 		<PARAMETER NAME="ACCOUNT_NAME" FIELD="TEXT" NUM_ROW="110"	REQUIRED="true"	GROUP="AZURE_CONNECTION">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
 
-		<PARAMETER NAME="SECRET_KEY" FIELD="PASSWORD" NUM_ROW="110" REQUIRED="true"	GROUP="AZURE_CONNECTION" SHOW_IF="AZURE_STORAGE == 'BLOB'">
+		<PARAMETER NAME="SECRET_KEY" FIELD="PASSWORD" NUM_ROW="110" REQUIRED="true"	GROUP="AZURE_CONNECTION" SHOW_IF="(!isShow[AUTH_METHOD] AND ((AZURE_STORAGE == 'BLOB') OR (AZURE_STORAGE == 'ADLS_GEN2'))) OR (isShow[AUTH_METHOD] AND (AUTH_METHOD == 'KEY'))">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
 		
-		<PARAMETER NAME="CONTAINER" FIELD="TEXT" NUM_ROW="120" GROUP="AZURE_CONNECTION"	REQUIRED="true" SHOW_IF="AZURE_STORAGE == 'BLOB'">
-			<DEFAULT>""</DEFAULT>
-		</PARAMETER>
-		
-        <PARAMETER NAME="PRINCIPAL_KEY" FIELD="PASSWORD" NUM_ROW="110" REQUIRED="true"  GROUP="AZURE_CONNECTION" SHOW_IF="AZURE_STORAGE == 'ADLS'">
+		<PARAMETER NAME="SAS_TOKEN" FIELD="TEXT" NUM_ROW="110" REQUIRED="true" GROUP="AZURE_CONNECTION" SHOW_IF="(isShow[AUTH_METHOD] AND (AUTH_METHOD == 'SAS'))">
             <DEFAULT>""</DEFAULT>
         </PARAMETER>
 		
-		<PARAMETER NAME="CLIENT_ID" FIELD="TEXT" NUM_ROW="130" GROUP="AZURE_CONNECTION"	REQUIRED="true" SHOW_IF="AZURE_STORAGE == 'ADLS'">
+		<PARAMETER NAME="ENDPOINT_SUFFIX" FIELD="TEXT" NUM_ROW="115" GROUP="AZURE_CONNECTION" REQUIRED="true" SHOW_IF="LOAD_METHOD == 'COPY'">
+            <DEFAULT IF="(LOAD_METHOD == 'COPY') AND (AZURE_STORAGE == 'ADLS_GEN2')">"dfs.core.windows.net"</DEFAULT>
+            <DEFAULT IF="(LOAD_METHOD == 'COPY') AND (AZURE_STORAGE == 'BLOB')">"blob.core.windows.net"</DEFAULT>
+        </PARAMETER>
+		
+		<PARAMETER NAME="CONTAINER" FIELD="TEXT" NUM_ROW="120" GROUP="AZURE_CONNECTION"	REQUIRED="true" SHOW_IF="(AZURE_STORAGE == 'BLOB') OR (AZURE_STORAGE == 'ADLS_GEN2')">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
 		
-		<PARAMETER NAME="ENDPOINT" FIELD="TEXT" NUM_ROW="135" GROUP="AZURE_CONNECTION"	REQUIRED="true" SHOW_IF="AZURE_STORAGE == 'ADLS'">
+        <PARAMETER NAME="PRINCIPAL_KEY" FIELD="PASSWORD" NUM_ROW="110" REQUIRED="true"  GROUP="AZURE_CONNECTION" SHOW_IF="(LOAD_METHOD == 'POLYBASE') AND (AZURE_STORAGE == 'ADLS')">
+            <DEFAULT>""</DEFAULT>
+        </PARAMETER>
+		
+		<PARAMETER NAME="CLIENT_ID" FIELD="TEXT" NUM_ROW="130" GROUP="AZURE_CONNECTION"	REQUIRED="true" SHOW_IF="(LOAD_METHOD == 'POLYBASE') AND (AZURE_STORAGE == 'ADLS')">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
 		
-		<PARAMETER NAME="AZURE_LOCATION" FIELD="TEXT"	NUM_ROW="140" GROUP="AZURE_CONNECTION"	REQUIRED="true">
+		<PARAMETER NAME="ENDPOINT" FIELD="TEXT" NUM_ROW="135" GROUP="AZURE_CONNECTION"	REQUIRED="true" SHOW_IF="(LOAD_METHOD == 'POLYBASE') AND (AZURE_STORAGE == 'ADLS')">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
 		
+		<PARAMETER NAME="AZURE_LOCATION" FIELD="TEXT"	NUM_ROW="140" SHOW_IF="LOAD_METHOD == 'POLYBASE'" GROUP="AZURE_CONNECTION" REQUIRED_IF="LOAD_METHOD == 'POLYBASE'">
+			<DEFAULT>""</DEFAULT>
+		</PARAMETER>
+		
+	    <PARAMETER NAME="EXTERNAL_LOCATIONS" FIELD="TABLE" NUM_ROW="145" REQUIRED="true" SHOW_IF="LOAD_METHOD == 'COPY'" GROUP="AZURE_CONNECTION" REQUIRED_IF="LOAD_METHOD == 'COPY'">
+          <ITEMS>
+            <ITEM NAME="EXTERNAL_LOCATION" VALUE=""/>
+          </ITEMS>
+        </PARAMETER>
+		
 		<PARAMETER NAME="MAPPING"   FIELD="MAPPING_TYPE"    NUM_ROW="150"    SHOW="false"   >
 	      <DEFAULT>id_MSSQL</DEFAULT>
 	    </PARAMETER>
@@ -136,7 +166,16 @@
 
 	<ADVANCED_PARAMETERS>
 	
-		<PARAMETER NAME="IMPORT_TYPE" FIELD="CLOSED_LIST" NUM_ROW="1" REQUIRED="true" GROUP="LOAD_DETAILS">
+        <PARAMETER NAME="ENABLE_SSL" FIELD="CHECK" NUM_ROW="1" GROUP="AZURE_CONNECTION" SHOW_IF="(LOAD_METHOD == 'POLYBASE') AND (AZURE_STORAGE == 'ADLS_GEN2')">
+            <DEFAULT>true</DEFAULT>
+        </PARAMETER>
+
+        <PARAMETER NAME="ACTIVE_DIR_AUTH" FIELD="CHECK" NUM_ROW="2" SHOW_IF="USE_EXISTING_CONNECTION=='false'">
+            <DEFAULT>false</DEFAULT>
+        </PARAMETER>
+        
+        <!-- POLYBASE -->
+		<PARAMETER NAME="IMPORT_TYPE" FIELD="CLOSED_LIST" NUM_ROW="3" REQUIRED="true" SHOW_IF="(LOAD_METHOD == 'POLYBASE')" GROUP="LOAD_DETAILS">
 			<ITEMS DEFAULT="DELIMITED_TEXT">
 				<ITEM NAME="DELIMITED_TEXT" VALUE="DELIMITED_TEXT" />
 				<ITEM NAME="HIVE_RCFILE" VALUE="HIVE_RCFILE" />
@@ -144,85 +183,152 @@
 				<ITEM NAME="PARQUET" VALUE="PARQUET" />
 			</ITEMS>
 		</PARAMETER>
-	
-		<PARAMETER NAME="FIELDSEPARATOR" GROUP="LOAD_DETAILS" FIELD="TEXT" NUM_ROW="5" REPOSITORY_VALUE="FIELD_SEPARATOR" SHOW_IF="IMPORT_TYPE=='DELIMITED_TEXT'">
+		
+		<PARAMETER NAME="FIELDSEPARATOR" GROUP="LOAD_DETAILS" FIELD="TEXT" NUM_ROW="5" REPOSITORY_VALUE="FIELD_SEPARATOR" SHOW_IF="(LOAD_METHOD == 'POLYBASE') AND (IMPORT_TYPE=='DELIMITED_TEXT')">
 			<DEFAULT>";"</DEFAULT>
 		</PARAMETER>
 
-		<PARAMETER NAME="USE_STRING_DELIMITER" FIELD="CHECK" NUM_ROW="10" GROUP="LOAD_DETAILS" SHOW_IF="IMPORT_TYPE=='DELIMITED_TEXT'">
+		<PARAMETER NAME="USE_STRING_DELIMITER" FIELD="CHECK" NUM_ROW="10" GROUP="LOAD_DETAILS" SHOW_IF="(LOAD_METHOD == 'POLYBASE') AND (IMPORT_TYPE=='DELIMITED_TEXT')">
 			<DEFAULT>false</DEFAULT>
         </PARAMETER>	
 		
-		<PARAMETER NAME="STRINGDELIMITER" GROUP="LOAD_DETAILS" FIELD="TEXT" NUM_ROW="10" REPOSITORY_VALUE="STRING_DELIMITER" SHOW_IF="(IMPORT_TYPE=='DELIMITED_TEXT' AND USE_STRING_DELIMITER == 'true')">
+		<PARAMETER NAME="STRINGDELIMITER" GROUP="LOAD_DETAILS" FIELD="TEXT" NUM_ROW="10" REPOSITORY_VALUE="STRING_DELIMITER" SHOW_IF="isShow[USE_STRING_DELIMITER] AND (USE_STRING_DELIMITER == 'true')">
 			<DEFAULT>"\""</DEFAULT>
 		</PARAMETER>	
 
-		<PARAMETER NAME="DATE_FORMAT" FIELD="CHECK" NUM_ROW="15" GROUP="LOAD_DETAILS" SHOW_IF="IMPORT_TYPE=='DELIMITED_TEXT'">
+		<PARAMETER NAME="DATE_FORMAT" FIELD="CHECK" NUM_ROW="15" GROUP="LOAD_DETAILS" SHOW_IF="(LOAD_METHOD == 'POLYBASE') AND (IMPORT_TYPE=='DELIMITED_TEXT')">
 			<DEFAULT>false</DEFAULT>
         </PARAMETER>	
 
-		<PARAMETER NAME="DATE_PATTERN" GROUP="LOAD_DETAILS" FIELD="TEXT" NUM_ROW="15" SHOW_IF="(IMPORT_TYPE=='DELIMITED_TEXT' AND DATE_FORMAT == 'true')">
+		<PARAMETER NAME="DATE_PATTERN" GROUP="LOAD_DETAILS" FIELD="TEXT" NUM_ROW="15" SHOW_IF="isShow[(DATE_FORMAT] AND (DATE_FORMAT == 'true')">
 			<DEFAULT>"yyyy-MM-dd"</DEFAULT>
 		</PARAMETER>
 		
-		<PARAMETER NAME="USE_TYPE_DEFAULT" FIELD="CHECK" NUM_ROW="20" GROUP="LOAD_DETAILS" SHOW_IF="IMPORT_TYPE=='DELIMITED_TEXT'">
+		<PARAMETER NAME="USE_TYPE_DEFAULT" FIELD="CHECK" NUM_ROW="20" GROUP="LOAD_DETAILS" SHOW_IF="(LOAD_METHOD == 'POLYBASE') AND (IMPORT_TYPE=='DELIMITED_TEXT')">
 			<DEFAULT>false</DEFAULT>
         </PARAMETER>	
+        
+        <!-- COPY -->
+        <PARAMETER NAME="FILE_TYPE" FIELD="CLOSED_LIST" NUM_ROW="3" REQUIRED="true" SHOW_IF="(LOAD_METHOD == 'COPY')" GROUP="LOAD_DETAILS">
+            <ITEMS DEFAULT="CSV">
+                <ITEM NAME="CSV" VALUE="CSV" />
+                <ITEM NAME="ORC" VALUE="ORC" />
+                <ITEM NAME="PARQUET" VALUE="PARQUET" />
+            </ITEMS>
+        </PARAMETER>
+        
+        <PARAMETER NAME="SPECIFY_FIELDS_MAPPING" FIELD="CHECK" NUM_ROW="4" SHOW_IF="(LOAD_METHOD == 'COPY')" GROUP="LOAD_DETAILS">
+            <DEFAULT>false</DEFAULT>
+        </PARAMETER>    
+        <PARAMETER NAME="COLUMN_MAP_FIELD" FIELD="TABLE" NUM_ROW="5" REQUIRED="false" SHOW_IF="(LOAD_METHOD == 'COPY') AND (SPECIFY_FIELDS_MAPPING == 'true')" GROUP="LOAD_DETAILS">>
+          <ITEMS BASED_ON_SCHEMA="true">
+            <ITEM NAME="FIELD_INDEX" VALUE=""/>
+          </ITEMS>
+        </PARAMETER>
+        
+        <PARAMETER NAME="FIRST_ROW" GROUP="LOAD_DETAILS" FIELD="TEXT" NUM_ROW="6" SHOW_IF="(LOAD_METHOD == 'COPY') AND (FILE_TYPE=='CSV')">
+            <DEFAULT>1</DEFAULT>
+        </PARAMETER>
+        
+        <PARAMETER NAME="FIELD_QUOTE" GROUP="LOAD_DETAILS" FIELD="TEXT" NUM_ROW="7" SHOW_IF="(LOAD_METHOD == 'COPY') AND (FILE_TYPE=='CSV')">
+            <DEFAULT>""</DEFAULT>
+        </PARAMETER>
+        
+        <PARAMETER NAME="FIELD_TERMINATOR" GROUP="LOAD_DETAILS" FIELD="TEXT" NUM_ROW="8" SHOW_IF="(LOAD_METHOD == 'COPY') AND (FILE_TYPE=='CSV')">
+            <DEFAULT>","</DEFAULT>
+        </PARAMETER>
+
+        <PARAMETER NAME="ROW_TERMINATOR" GROUP="LOAD_DETAILS" FIELD="TEXT" NUM_ROW="10" SHOW_IF="(LOAD_METHOD == 'COPY') AND (FILE_TYPE=='CSV')">
+            <DEFAULT>"\n"</DEFAULT>
+        </PARAMETER>    
+
+        <PARAMETER NAME="COPY_CSV_DATE_FORMAT" GROUP="LOAD_DETAILS" FIELD="CLOSED_LIST" NUM_ROW="12" SHOW_IF="(LOAD_METHOD == 'COPY') AND (FILE_TYPE=='CSV')">
+            <ITEMS DEFAULT="SESSION_DATEFORMAT">
+                <ITEM NAME="SESSION_DATEFORMAT" VALUE="SESSION_DATEFORMAT" />
+                <ITEM NAME="MDY" VALUE="&quot;mdy&quot;" />
+                <ITEM NAME="DMY" VALUE="&quot;dmy&quot;" />
+                <ITEM NAME="YMD" VALUE="&quot;ymd&quot;" />
+                <ITEM NAME="YDM" VALUE="&quot;ydm&quot;" />
+                <ITEM NAME="MYD" VALUE="&quot;myd&quot;" />
+                <ITEM NAME="DYM" VALUE="&quot;dym&quot;" />
+            </ITEMS>
+        </PARAMETER>
+        
+        <PARAMETER NAME="ENCODING" GROUP="LOAD_DETAILS" FIELD="CLOSED_LIST" NUM_ROW="14" SHOW_IF="(LOAD_METHOD == 'COPY') AND (FILE_TYPE=='CSV')">
+            <ITEMS DEFAULT="UTF8">
+                <ITEM NAME="UTF8" VALUE="&quot;UTF8&quot;" />
+                <ITEM NAME="UTF16" VALUE="&quot;UTF16&quot;" />
+            </ITEMS>
+        </PARAMETER>
+        
+        <PARAMETER NAME="IDENTITY_INSERT" GROUP="LOAD_DETAILS" FIELD="CHECK" NUM_ROW="16" SHOW_IF="(LOAD_METHOD == 'COPY')">
+            <DEFAULT>false</DEFAULT>
+        </PARAMETER>
+        
+        <PARAMETER NAME="MAX_ERRORS" GROUP="LOAD_DETAILS" FIELD="TEXT" NUM_ROW="18" SHOW_IF="(LOAD_METHOD == 'COPY')">
+            <DEFAULT>0</DEFAULT>
+        </PARAMETER>
+        
+        <PARAMETER NAME="ERROR_FILE" GROUP="LOAD_DETAILS" FIELD="TEXT" NUM_ROW="20" SHOW_IF="(LOAD_METHOD == 'COPY') AND (AUTH_METHOD != 'KEY') AND (FILE_TYPE=='CSV')">
+            <DEFAULT>""</DEFAULT>
+        </PARAMETER>
+        
+        <!-- COPY end -->
 
 		<PARAMETER NAME="COMPRESS" FIELD="CHECK" NUM_ROW="25" REQUIRED="true" GROUP="LOAD_DETAILS">
 			<DEFAULT>false</DEFAULT>
 		</PARAMETER>
 		
-		<PARAMETER NAME="COMPRESSION_TEXT" FIELD="CLOSED_LIST" NUM_ROW="25" GROUP="LOAD_DETAILS" SHOW_IF="COMPRESS=='true' AND (IMPORT_TYPE == 'DELIMITED_TEXT')">
+		<PARAMETER NAME="COMPRESSION_TEXT" FIELD="CLOSED_LIST" NUM_ROW="25" GROUP="LOAD_DETAILS" SHOW_IF="(COMPRESS=='true') AND (((LOAD_METHOD == 'POLYBASE') AND (IMPORT_TYPE == 'DELIMITED_TEXT')) OR ((LOAD_METHOD == 'COPY') AND (FILE_TYPE == 'CSV')))">
 			<ITEMS DEFAULT="DEFAULT">
-				<ITEM NAME="DEFAULT" VALUE="org.apache.hadoop.io.compress.DefaultCodec"/>
+				<ITEM NAME="DEFAULT" VALUE="org.apache.hadoop.io.compress.DefaultCodec" SHOW_IF="LOAD_METHOD == 'POLYBASE'"/>
 				<ITEM NAME="GZIP" VALUE="org.apache.hadoop.io.compress.GzipCodec"/>
 			</ITEMS>
         </PARAMETER>	
 
-		<PARAMETER NAME="COMPRESSION_RC" FIELD="CLOSED_LIST" NUM_ROW="25" GROUP="LOAD_DETAILS" SHOW_IF="COMPRESS=='true' AND (IMPORT_TYPE == 'HIVE_RCFILE')">
+		<PARAMETER NAME="COMPRESSION_RC" FIELD="CLOSED_LIST" NUM_ROW="25" GROUP="LOAD_DETAILS" SHOW_IF="(LOAD_METHOD == 'POLYBASE') AND (COMPRESS=='true') AND (IMPORT_TYPE == 'HIVE_RCFILE')">
 			<ITEMS DEFAULT="DEFAULT">
 				<ITEM NAME="DEFAULT" VALUE="org.apache.hadoop.io.compress.DefaultCodec"/>
 			</ITEMS>
         </PARAMETER>
 		
-		<PARAMETER NAME="SERDE_METHOD" FIELD="CLOSED_LIST" NUM_ROW="23" GROUP="LOAD_DETAILS" SHOW_IF="IMPORT_TYPE == 'HIVE_RCFILE'">
+		<PARAMETER NAME="SERDE_METHOD" FIELD="CLOSED_LIST" NUM_ROW="23" GROUP="LOAD_DETAILS" SHOW_IF="(LOAD_METHOD == 'POLYBASE') AND (IMPORT_TYPE == 'HIVE_RCFILE')">
 			<ITEMS DEFAULT="LAZY">
 				<ITEM NAME="LAZY" VALUE="org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe"/>
 				<ITEM NAME="COLUMNAR" VALUE="org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe"/>
 			</ITEMS>
         </PARAMETER>		
 
-		<PARAMETER NAME="COMPRESSION_ORC" FIELD="CLOSED_LIST" NUM_ROW="25" GROUP="LOAD_DETAILS" SHOW_IF="COMPRESS=='true' AND (IMPORT_TYPE == 'HIVE_ORC')">
+		<PARAMETER NAME="COMPRESSION_ORC" FIELD="CLOSED_LIST" NUM_ROW="25" GROUP="LOAD_DETAILS" SHOW_IF="(COMPRESS=='true') AND (((LOAD_METHOD == 'POLYBASE') AND (IMPORT_TYPE == 'HIVE_ORC')) OR ((LOAD_METHOD == 'COPY') AND (FILE_TYPE == 'ORC')))">>
 			<ITEMS DEFAULT="DEFAULT">
 				<ITEM NAME="DEFAULT" VALUE="org.apache.hadoop.io.compress.DefaultCodec"/>
 				<ITEM NAME="SNAPPY" VALUE="org.apache.hadoop.io.compress.SnappyCodec"/>
 			</ITEMS>
         </PARAMETER>	
 
-		<PARAMETER NAME="COMPRESSION_PARQUET" FIELD="CLOSED_LIST" NUM_ROW="25" GROUP="LOAD_DETAILS" SHOW_IF="COMPRESS=='true' AND (IMPORT_TYPE == 'PARQUET')">
+		<PARAMETER NAME="COMPRESSION_PARQUET" FIELD="CLOSED_LIST" NUM_ROW="25" GROUP="LOAD_DETAILS" SHOW_IF="(COMPRESS=='true') AND (((LOAD_METHOD == 'POLYBASE') AND (IMPORT_TYPE == 'PARQUET')) OR ((LOAD_METHOD == 'COPY') AND (FILE_TYPE == 'PARQUET')))">>
 			<ITEMS DEFAULT="GZIP">
 				<ITEM NAME="GZIP" VALUE="org.apache.hadoop.io.compress.GzipCodec"/>
 				<ITEM NAME="SNAPPY" VALUE="org.apache.hadoop.io.compress.SnappyCodec"/>
 			</ITEMS>
         </PARAMETER>			
 		
-		<PARAMETER NAME="EXT_TABLE_OPTIONS" FIELD="CHECK" NUM_ROW="30" REPOSITORY_VALUE="EXT_TABLE_OPTIONS">
+		<PARAMETER NAME="EXT_TABLE_OPTIONS" FIELD="CHECK" NUM_ROW="30" REPOSITORY_VALUE="EXT_TABLE_OPTIONS" SHOW_IF="(LOAD_METHOD == 'POLYBASE')">
 			<DEFAULT>false</DEFAULT>
 		</PARAMETER>
 		
-		<PARAMETER NAME="REJECT_TYPE" FIELD="CLOSED_LIST" NUM_ROW="35" REQUIRED="true" SHOW_IF="(EXT_TABLE_OPTIONS == 'true')">
+		<PARAMETER NAME="REJECT_TYPE" FIELD="CLOSED_LIST" NUM_ROW="35" REQUIRED="true" SHOW_IF="(LOAD_METHOD == 'POLYBASE') AND (EXT_TABLE_OPTIONS == 'true')">
 			<ITEMS DEFAULT="Value">
 				<ITEM NAME="Value" VALUE="Value" />
 				<ITEM NAME="Percentage" VALUE="Percentage"/>
 			</ITEMS>
 		</PARAMETER>
 		
-		<PARAMETER NAME="REJECT_VALUE" FIELD="TEXT" NUM_ROW="35" REQUIRED="true" SHOW_IF="(EXT_TABLE_OPTIONS == 'true')">
+		<PARAMETER NAME="REJECT_VALUE" FIELD="TEXT" NUM_ROW="35" REQUIRED="true" SHOW_IF="(LOAD_METHOD == 'POLYBASE') AND (EXT_TABLE_OPTIONS == 'true')">
 			<DEFAULT>0</DEFAULT>
 		</PARAMETER>
 		
-		<PARAMETER NAME="REJECT_SAMPLE_VALUE" FIELD="TEXT" NUM_ROW="35" REQUIRED="true" SHOW_IF="(EXT_TABLE_OPTIONS == 'true') AND (REJECT_TYPE == 'Percentage')">
+		<PARAMETER NAME="REJECT_SAMPLE_VALUE" FIELD="TEXT" NUM_ROW="35" REQUIRED="true" SHOW_IF="(LOAD_METHOD == 'POLYBASE') AND (EXT_TABLE_OPTIONS == 'true') AND (REJECT_TYPE == 'Percentage')">
 			<DEFAULT>0</DEFAULT>
 		</PARAMETER>
 		
@@ -238,7 +344,7 @@
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
 		
-		<PARAMETER NAME="TABLE_OPTION" FIELD="CLOSED_LIST" NUM_ROW="45" GROUP="DW_TABLE_PROPERTIES" REQUIRED="true" SHOW_IF="(TABLE_ACTION == 'DROP_CREATE') OR (TABLE_ACTION == 'DROP_IF_EXISTS_AND_CREATE') OR (TABLE_ACTION == 'CREATE') OR (TABLE_ACTION == 'CREATE_IF_NOT_EXISTS')">
+		<PARAMETER NAME="TABLE_OPTION" FIELD="CLOSED_LIST" NUM_ROW="45" GROUP="DW_TABLE_PROPERTIES" REQUIRED="true" SHOW_IF="(TABLE_ACTION == 'DROP_CREATE') OR (TABLE_ACTION == 'DROP_IF_EXISTS_AND_CREATE') OR (TABLE_ACTION == 'CREATE') OR (TABLE_ACTION == 'CREATE_IF_NOT_EXISTS'))">
 			<ITEMS DEFAULT="CLUSTERED_COLUMNSTORE_INDEX">
 				<ITEM NAME="CLUSTERED_COLUMNSTORE_INDEX" VALUE="CLUSTERED_COLUMNSTORE_INDEX" />
 				<ITEM NAME="HEAP" VALUE="HEAP"/>
@@ -250,7 +356,7 @@
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
 		
-		<PARAMETER NAME="PARTITION" FIELD="CHECK" NUM_ROW="47" GROUP="DW_TABLE_PROPERTIES" REPOSITORY_VALUE="PARTITION" SHOW_IF="(TABLE_ACTION == 'DROP_CREATE') OR (TABLE_ACTION == 'DROP_IF_EXISTS_AND_CREATE') OR (TABLE_ACTION == 'CREATE') OR (TABLE_ACTION == 'CREATE_IF_NOT_EXISTS')">
+		<PARAMETER NAME="PARTITION" FIELD="CHECK" NUM_ROW="47" GROUP="DW_TABLE_PROPERTIES" REPOSITORY_VALUE="PARTITION" SHOW_IF="(TABLE_ACTION == 'DROP_CREATE') OR (TABLE_ACTION == 'DROP_IF_EXISTS_AND_CREATE') OR (TABLE_ACTION == 'CREATE') OR (TABLE_ACTION == 'CREATE_IF_NOT_EXISTS'))">
 			<DEFAULT>false</DEFAULT>
 		</PARAMETER>
 		
@@ -275,6 +381,14 @@
 	<CODEGENERATION>
 		<IMPORTS>
 			<IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:org.talend.libraries/mssql-jdbc/6.0.0"  REQUIRED_IF="DRIVER=='MSSQL_PROP'" />
+            <IMPORT NAME="adal4j" MODULE="adal4j-1.6.5.jar" MVN="mvn:com.microsoft.azure/adal4j/1.6.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="commons-lang3" MODULE="commons-lang3-3.10.jar" MVN="mvn:org.apache.commons/commons-lang3/3.10"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="commons-codec" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="gson" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-6.5.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/6.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="json-smart" MODULE="json-smart-2.3.jar" MVN="mvn:net.minidev/json-smart/2.3"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  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>
 	</CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseBulkExec/tAzureSynapseBulkExec_messages.properties

@@ -1,7 +1,8 @@
 ACCOUNT_NAME.NAME=Account Name
 AZURE_CONNECTION.NAME=Azure Storage Connection
 AZURE_LOCATION.NAME=Azure Storage Location
-AZURE_STORAGE.ITEM.ADLS=Data Lake Store
+AZURE_STORAGE.ITEM.ADLS=Data Lake Storage Gen1
+AZURE_STORAGE.ITEM.ADLS_GEN2=Data Lake Storage Gen2
 AZURE_STORAGE.ITEM.BLOB=Blob Storage
 AZURE_STORAGE.NAME=Azure Storage
 CLIENT_ID.NAME=Client Id
@@ -35,12 +36,13 @@ DISTRIBUTION.NAME=Distribution Option
 DISTRIBUTION_COLUMN_NAME.NAME=Distribution Column Name
 DRIVER.NAME=JDBC Provider
 DRIVER.ITEM.MSSQL_PROP=Microsoft
-DW_TABLE_PROPERTIES.NAME=Data Warehouse Table Properties
+DW_TABLE_PROPERTIES.NAME=Synapse Analytics table properties
+ENABLE_SSL.NAME=Secure transfer required
 ENDPOINT.NAME=OAuth 2.0 token endpoint
 EXT_TABLE_OPTIONS.NAME=Data import reject options
 FIELDSEPARATOR.NAME=Field separator
 FILENAME.NAME=Filepath at local
-HELP=org.talend.help.tSQLDWHBulkExec
+HELP=org.talend.help.tAzureSynapseBulkExec
 HOST.NAME=Host
 IMPORT_TYPE.ITEM.DELIMITED_TEXT=Delimited Text
 IMPORT_TYPE.ITEM.HIVE_ORC=Hive ORC
@@ -49,7 +51,7 @@ IMPORT_TYPE.ITEM.PARQUET=Parquet
 IMPORT_TYPE.NAME=File format
 INDEX_COLUMNS.NAME=Index column(s) 
 LOAD_DETAILS.NAME=Load Parameters
-LONG_NAME=Load data into Azure Data Warehouse with PolyBase
+LONG_NAME=Load data into Azure Synapse Analytics with PolyBase
 MAPPING.NAME=Mapping
 NB_LINE_INSERTED.NAME=Number of lines inserted
 PARTITION.NAME=Partition
@@ -100,4 +102,45 @@ USE_EXISTING_CONNECTION.NAME=Use an existing connection
 USE_STRING_DELIMITER.NAME=Enclosed by
 USE_TYPE_DEFAULT.ITEM.FALSE=False
 USE_TYPE_DEFAULT.ITEM.TRUE=True
-USE_TYPE_DEFAULT.NAME=Use type default
+USE_TYPE_DEFAULT.NAME=Use type default
+
+ACTIVE_DIR_AUTH.NAME=Authenticate using Azure Active Directory
+
+LOAD_METHOD.NAME=Load method
+LOAD_METHOD.ITEM.POLYBASE=PolyBase
+LOAD_METHOD.ITEM.COPY=Copy
+
+AUTH_METHOD.NAME=Authentication method
+AUTH_METHOD.ITEM.SAS=Shared Access Signatures
+AUTH_METHOD.ITEM.KEY=Storage account key
+AUTH_METHOD.ITEM.AAD=Azure Active Directory
+SAS_TOKEN.NAME=SAS token
+ENDPOINT_SUFFIX.NAME=Endpoint suffix
+EXTERNAL_LOCATIONS.NAME=External paths
+EXTERNAL_LOCATIONS.ITEM.EXTERNAL_LOCATION=Path
+SPECIFY_FIELDS_MAPPING.NAME=Specify map to source data fields
+COLUMN_MAP_FIELD.NAME=
+COLUMN_MAP_FIELD.ITEM.FIELD_INDEX=Source field index
+FILE_TYPE.NAME=File type
+FILE_TYPE.ITEM.CSV=CSV
+FILE_TYPE.ITEM.ORC=ORC
+FILE_TYPE.ITEM.PARQUET=PARQUET
+FIRST_ROW.NAME=First row
+FIELD_QUOTE.NAME=Field quote
+FIELD_TERMINATOR.NAME=Field terminator
+ROW_TERMINATOR.NAME=Row terminator
+COPY_CSV_DATE_FORMAT.NAME=Date format
+COPY_CSV_DATE_FORMAT.ITEM.SESSION_DATEFORMAT=Session date format
+COPY_CSV_DATE_FORMAT.ITEM.MDY=mdy
+COPY_CSV_DATE_FORMAT.ITEM.DMY=dmy
+COPY_CSV_DATE_FORMAT.ITEM.YMD=ymd
+COPY_CSV_DATE_FORMAT.ITEM.YDM=ydm
+COPY_CSV_DATE_FORMAT.ITEM.MYD=myd
+COPY_CSV_DATE_FORMAT.ITEM.DYM=dym
+ENCODING.NAME=Encoding
+ENCODING.ITEM.UTF8=UTF8
+ENCODING.ITEM.UTF16=UTF16
+IDENTITY_INSERT.NAME=Identity insert
+MAX_ERRORS.NAME=Max errors
+ERROR_FILE.NAME=Error file location
+

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseClose/tAzureSynapseClose_java.xml

@@ -15,8 +15,8 @@
   </HEADER>
 
   <FAMILIES>
-      <FAMILY>Databases/DB Specifics/Azure/SQL Data Warehouse</FAMILY>
-    <FAMILY>Cloud/Azure/SQL Data Warehouse</FAMILY>
+      <FAMILY>Databases/DB Specifics/Azure/Synapse Analytics</FAMILY>
+    <FAMILY>Cloud/Azure/Synapse Analytics</FAMILY>
   </FAMILIES>
 
   <DOCUMENTATION>
@@ -37,7 +37,7 @@
     <PARAMETER
       NAME="CONNECTION"
       FIELD="COMPONENT_LIST"
-      REQUIRED="true" FILTER="tSQLDWHConnection"
+      REQUIRED="true" FILTER="tAzureSynapseConnection"
       NUM_ROW="10"
       DYNAMIC_SETTINGS="true"
     />

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseClose/tAzureSynapseClose_messages.properties

@@ -1,3 +1,3 @@
-HELP=org.talend.help.tSQLDWHClose
+HELP=org.talend.help.tAzureSynapseClose
 LONG_NAME=Close a selected MSSql connection.
 CONNECTION.NAME=Component List

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseCommit/tAzureSynapseCommit_java.xml

@@ -16,8 +16,8 @@
   </HEADER>
 
   <FAMILIES>
-     <FAMILY>Databases/DB Specifics/Azure/SQL Data Warehouse</FAMILY>
-    <FAMILY>Cloud/Azure/SQL Data Warehouse</FAMILY>
+     <FAMILY>Databases/DB Specifics/Azure/Synapse Analytics</FAMILY>
+    <FAMILY>Cloud/Azure/Synapse Analytics</FAMILY>
   </FAMILIES>
 
   <DOCUMENTATION>
@@ -38,7 +38,7 @@
     <PARAMETER
       NAME="CONNECTION"
       FIELD="COMPONENT_LIST"
-      REQUIRED="true" FILTER="tSQLDWHConnection"
+      REQUIRED="true" FILTER="tAzureSynapseConnection"
       NUM_ROW="10"
       DYNAMIC_SETTINGS="true"
     />

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseCommit/tAzureSynapseCommit_messages.properties

@@ -1,6 +1,6 @@
 #Created by JInto - www.guh-software.de
 #Wed May 23 11:26:21 CST 2007
-HELP=org.talend.help.tSQLDWHCommit
+HELP=org.talend.help.tAzureSynapseCommit
 LONG_NAME=Commits all transactions not already commited in a selected MSSql connection 
 CLOSE.NAME=Close Connection
 CONNECTION.NAME=Component List

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseConnection/tAzureSynapseConnection_begin.javajet

@@ -0,0 +1,78 @@
+<%@ jet 
+imports="
+    org.talend.core.model.process.INode 
+    org.talend.core.model.process.ElementParameterParser 
+    org.talend.designer.codegen.config.CodeGeneratorArgument
+" 
+%>
+    <%@ include file="../templates/DB/HelpClass/HelpClass.javajet"%>
+<%
+    class ConnectionUtil extends DefaultConnectionUtil{
+
+        public void createURL(INode node) {
+            super.createURL(node);
+            String driver = ElementParameterParser.getValue(node, "__DRIVER__");
+            boolean useActiveDirectoryAuth = "true".equals(ElementParameterParser.getValue(node, "__ACTIVE_DIR_AUTH__"));
+%>
+<%
+            if(driver.equals("JTDS")) {
+%>
+            String url_<%=cid %> = "jdbc:jtds:sqlserver://" + <%=dbhost%> ;
+<%
+            } else {
+%>
+            String url_<%=cid %> = "jdbc:sqlserver://" + <%=dbhost%> ;
+<%
+            }
+%>
+            String port_<%=cid%> = <%=dbport%>;
+            String dbname_<%=cid%> = <%=dbname%> ;
+            if (!"".equals(port_<%=cid%>)) {
+                url_<%=cid %> += ":" + <%=dbport%>;
+            }
+            if (!"".equals(dbname_<%=cid%>)) {
+<%
+                if(driver.equals("JTDS")) {
+%>
+                    url_<%=cid%> += "//" + <%=dbname%>; 
+<%
+                } else {
+%>
+                    url_<%=cid%> += ";databaseName=" + <%=dbname%>; 
+<%
+                }
+%>
+            }
+            url_<%=cid%> += ";applicationName=Talend;" + <%=dbproperties%>;
+<%
+            if (useActiveDirectoryAuth) {
+%>
+                url_<%=cid%> += ";encrypt=true;trustServerCertificate=false;hostNameInCertificate=*.database.windows.net;Authentication=ActiveDirectoryPassword";
+                url_<%=cid%> += ";database=" + <%=dbname%>;
+<%
+            }
+        }
+
+		public String getDirverClassName(INode node){
+			String driver = ElementParameterParser.getValue(node, "__DRIVER__");
+			if(driver.equals("JTDS")) {
+				return "net.sourceforge.jtds.jdbc.Driver";
+			}
+			return "com.microsoft.sqlserver.jdbc.SQLServerDriver";
+		}
+		
+	}//end class
+	
+	connUtil = new ConnectionUtil();
+%>
+<%//----------------------------component codes-----------------------------------------%>
+
+	<%@ include file="../templates/DB/AbstractDBConnection.javajet"%>
+
+	globalMap.put("dbschema_<%=cid%>", <%=dbschema%>);
+
+	globalMap.put("db_<%=cid%>",  <%=dbname%>);
+
+	globalMap.put("conn_<%=cid%>",conn_<%=cid%>);
+	
+	globalMap.put("shareIdentitySetting_<%=cid%>",  <%=ElementParameterParser.getValue(node, "__SHARE_IDENTITY_SETTING__")%>);

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

@@ -16,8 +16,8 @@
   </HEADER>
 
   <FAMILIES>
-     <FAMILY>Databases/DB Specifics/Azure/SQL Data Warehouse</FAMILY>
-    <FAMILY>Cloud/Azure/SQL Data Warehouse</FAMILY>
+     <FAMILY>Databases/DB Specifics/Azure/Synapse Analytics</FAMILY>
+    <FAMILY>Cloud/Azure/Synapse Analytics</FAMILY>
   </FAMILIES>
 
   <DOCUMENTATION>
@@ -188,6 +188,9 @@
    </PARAMETERS>
 
    	<ADVANCED_PARAMETERS>
+        <PARAMETER NAME="ACTIVE_DIR_AUTH" FIELD="CHECK" NUM_ROW="6">
+            <DEFAULT>false</DEFAULT>
+        </PARAMETER>
 		<PARAMETER NAME="AUTO_COMMIT" FIELD="CHECK" NUM_ROW="10">
 			<DEFAULT>false</DEFAULT>
     	</PARAMETER>
@@ -201,6 +204,14 @@
      	<IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:org.talend.libraries/mssql-jdbc/6.0.0"  REQUIRED_IF="DRIVER=='MSSQL_PROP'" />
      	<IMPORT NAME="slf4j-api-1.7.25.jar" MODULE="slf4j-api-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.25" REQUIRED_IF="(USE_SHARED_CONNECTION == 'true' AND SPECIFY_DATASOURCE_ALIAS=='false')" />
      	<IMPORT NAME="slf4j-log4j12-1.7.25.jar" MODULE="slf4j-log4j12-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.25" REQUIRED_IF="(USE_SHARED_CONNECTION == 'true' AND SPECIFY_DATASOURCE_ALIAS=='false')" />
+        <IMPORT NAME="adal4j" MODULE="adal4j-1.6.5.jar" MVN="mvn:com.microsoft.azure/adal4j/1.6.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
+        <IMPORT NAME="commons-lang3" MODULE="commons-lang3-3.10.jar" MVN="mvn:org.apache.commons/commons-lang3/3.10"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
+        <IMPORT NAME="commons-codec" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
+        <IMPORT NAME="gson" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
+        <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-6.5.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/6.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
+        <IMPORT NAME="json-smart" MODULE="json-smart-2.3.jar" MVN="mvn:net.minidev/json-smart/2.3"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true')" />
+        <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  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>
    </CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseConnection/tAzureSynapseConnection_messages.properties

@@ -2,7 +2,7 @@
 #Wed Feb 07 18:38:14 CST 2007
 DBNAME.NAME=Database
 ENCODING.NAME=Encoding
-HELP=org.talend.help.tSQLDWHConnection
+HELP=org.talend.help.tAzureSynapseConnection
 HOST.NAME=Host
 LONG_NAME=Creates a connection to an MSSql database 
 NB_LINE.NAME=Number of line
@@ -27,4 +27,6 @@ DATASOURCE_ALIAS.NAME=Data source alias
 
 DRIVER.NAME=JDBC Provider
 DRIVER.ITEM.JTDS=Open source JTDS
-DRIVER.ITEM.MSSQL_PROP=Microsoft
+DRIVER.ITEM.MSSQL_PROP=Microsoft
+
+ACTIVE_DIR_AUTH.NAME=Authenticate using Azure Active Directory

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseInput/tAzureSynapseInput_begin.javajet

@@ -13,15 +13,18 @@ imports="
 " 
 %>
 	<%@ include file="../templates/DB/Input/HelpClass.javajet"%>
+   
 <%
 
 	class DBInputBeginUtil extends DefaultDBInputUtil{
 	
 		private String driver;
+        private boolean useActiveDirectoryAuth = false;
 	
 		public void beforeComponentProcess(INode node){
 			super.beforeComponentProcess(node);
 	    	cid = node.getUniqueName();
+            useActiveDirectoryAuth = "true".equals(ElementParameterParser.getValue(node, "__ACTIVE_DIR_AUTH__"));
 %>
 			org.talend.designer.components.util.mssql.MSSqlGenerateTimestampUtil mssqlGTU_<%=cid%> = org.talend.designer.components.util.mssql.MSSqlUtilFactory.getMSSqlGenerateTimestampUtil();
 			
@@ -84,6 +87,14 @@ imports="
 			}
 %>
 		    }
+<%
+            if (useActiveDirectoryAuth) {
+%>
+                url_<%=cid%> += ";encrypt=true;trustServerCertificate=false;hostNameInCertificate=*.database.windows.net;Authentication=ActiveDirectoryPassword";
+                url_<%=cid%> += ";database=" + <%=dbname%>;
+<%
+            }
+%>
 		    url_<%=cid%> += ";applicationName=Talend;" + <%=dbproperties%>;
 		    String dbschema_<%=cid%> = <%=dbschema%>;
 <%		

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

@@ -16,8 +16,8 @@
   </HEADER>
 
   <FAMILIES>
-     <FAMILY>Databases/DB Specifics/Azure/SQL Data Warehouse</FAMILY>
-    <FAMILY>Cloud/Azure/SQL Data Warehouse</FAMILY>
+     <FAMILY>Databases/DB Specifics/Azure/Synapse Analytics</FAMILY>
+    <FAMILY>Cloud/Azure/Synapse Analytics</FAMILY>
   </FAMILIES>
 
   <DOCUMENTATION>
@@ -47,7 +47,7 @@
     <PARAMETER
       NAME="CONNECTION"
       FIELD="COMPONENT_LIST"
-      REQUIRED="true" FILTER="tSQLDWHConnection"
+      REQUIRED="true" FILTER="tAzureSynapseConnection"
       NUM_ROW="1"
       SHOW_IF="USE_EXISTING_CONNECTION == 'true'"
       DYNAMIC_SETTINGS="true"
@@ -233,6 +233,10 @@
 		<DEFAULT>"noDatetimeStringSync=true"</DEFAULT>
 	</PARAMETER>
 
+	<PARAMETER NAME="ACTIVE_DIR_AUTH" FIELD="CHECK" NUM_ROW="6" SHOW_IF="USE_EXISTING_CONNECTION=='false'">
+		<DEFAULT>false</DEFAULT>
+	</PARAMETER>
+
 	<PARAMETER
       	NAME="ENCODING"
       	FIELD="ENCODING_TYPE"
@@ -258,8 +262,16 @@
 
    <CODEGENERATION>
      <IMPORTS>
-     	<IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:org.talend.libraries/mssql-jdbc/6.0.0"  REQUIRED_IF="(DRIVER == 'MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
-     	<IMPORT NAME="Talend_MssqlUtil" MODULE="talend_DB_mssqlUtil-1.4.jar" MVN="mvn:org.talend.components.lib/talend_DB_mssqlUtil/1.4" UrlPath="platform:/plugin/org.talend.libraries.custom/lib/talend_DB_mssqlUtil-1.4.jar" REQUIRED="true" />
+        <IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:org.talend.libraries/mssql-jdbc/6.0.0"  REQUIRED_IF="(DRIVER == 'MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="Talend_MssqlUtil" MODULE="talend_DB_mssqlUtil-1.4.jar" MVN="mvn:org.talend.components.lib/talend_DB_mssqlUtil/1.4" UrlPath="platform:/plugin/org.talend.libraries.custom/lib/talend_DB_mssqlUtil-1.4.jar" REQUIRED="true" />
+        <IMPORT NAME="adal4j" MODULE="adal4j-1.6.5.jar" MVN="mvn:com.microsoft.azure/adal4j/1.6.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="commons-lang3" MODULE="commons-lang3-3.10.jar" MVN="mvn:org.apache.commons/commons-lang3/3.10"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="commons-codec" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="gson" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-6.5.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/6.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="json-smart" MODULE="json-smart-2.3.jar" MVN="mvn:net.minidev/json-smart/2.3"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  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>
    </CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseInput/tAzureSynapseInput_messages.properties

@@ -7,7 +7,7 @@ DBD-mysql.INFO=Required for MySQL
 DBNAME.NAME=Database
 DSN.NAME=Datasource
 ENCODING.NAME=Encoding
-HELP=org.talend.help.tSQLDWHInput
+HELP=org.talend.help.tAzureSynapseInput
 HOST.NAME=Host
 LONG_NAME=Reads an MSSql table and extracts fields based on an SQL query
 NB_LINE.NAME=Number of line
@@ -47,6 +47,8 @@ SPECIFY_DATASOURCE_ALIAS.NAME=Specify a data source alias
 DATASOURCE.NAME=Data source
 DATASOURCE_ALIAS.NAME=Data source alias 
 
+ACTIVE_DIR_AUTH.NAME=Authenticate using Azure Active Directory
+
 DRIVER.NAME=JDBC Provider
 DRIVER.ITEM.JTDS=Open source JTDS
 DRIVER.ITEM.MSSQL_PROP=Microsoft

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseOutput/tAzureSynapseOutput_begin.javajet

@@ -65,6 +65,8 @@ skeleton="../templates/db_output_bulk.skeleton"
     String commitEvery = ElementParameterParser.getValue(node, "__COMMIT_EVERY__");
 
     boolean  identityInsert= "true".equals(ElementParameterParser.getValue(node, "__IDENTITY_INSERT__"));
+    
+    boolean useActiveDirectoryAuth = "true".equals(ElementParameterParser.getValue(node, "__ACTIVE_DIR_AUTH__"));
 
     boolean isEnableDebug = ("true").equals(ElementParameterParser.getValue(node,"__ENABLE_DEBUG_MODE__"));
     boolean usingStatsLogs=cid.equals("talendLogs_DB") || cid.equals("talendStats_DB") || cid.equals("talendMeter_DB");
@@ -261,6 +263,14 @@ if(useExistingConnection) {
 			}
 	%>
     }
+<%
+    if (useActiveDirectoryAuth) {
+%>
+        url_<%=cid%> += ";encrypt=true;trustServerCertificate=false;hostNameInCertificate=*.database.windows.net;Authentication=ActiveDirectoryPassword";
+        url_<%=cid%> += ";database=" + <%=dbname%>;
+<%
+    }
+%>
     url_<%=cid%> += ";applicationName=Talend;" + <%=dbproperties%>;
     dbUser_<%=cid %> = <%=dbuser%>;
 

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

@@ -7,8 +7,8 @@
 	</HEADER>
 
   <FAMILIES>
-     <FAMILY>Databases/DB Specifics/Azure/SQL Data Warehouse</FAMILY>
-    <FAMILY>Cloud/Azure/SQL Data Warehouse</FAMILY>
+     <FAMILY>Databases/DB Specifics/Azure/Synapse Analytics</FAMILY>
+    <FAMILY>Cloud/Azure/Synapse Analytics</FAMILY>
   </FAMILIES>
 
 	<DOCUMENTATION>
@@ -44,7 +44,7 @@
 	    <PARAMETER
 	      NAME="CONNECTION"
 	      FIELD="COMPONENT_LIST"
-	      REQUIRED="true" FILTER="tSQLDWHConnection"
+	      REQUIRED="true" FILTER="tAzureSynapseConnection"
 	      NUM_ROW="20"
 	      SHOW_IF="USE_EXISTING_CONNECTION == 'true'"
 	      DYNAMIC_SETTINGS="true"
@@ -233,7 +233,9 @@
 		<PARAMETER NAME="PROPERTIES" FIELD="TEXT" NUM_ROW="4" REPOSITORY_VALUE="PROPERTIES_STRING" SHOW_IF="USE_EXISTING_CONNECTION == 'false'">
 			<DEFAULT>""</DEFAULT>
 		</PARAMETER>
-
+		<PARAMETER NAME="ACTIVE_DIR_AUTH" FIELD="CHECK" NUM_ROW="6" SHOW_IF="USE_EXISTING_CONNECTION=='false'">
+			<DEFAULT>false</DEFAULT>
+		</PARAMETER>
 		<PARAMETER NAME="ENCODING" FIELD="ENCODING_TYPE" NUM_ROW="9"
 			REQUIRED="true" SHOW="false">
 			<DEFAULT>"ISO-8859-15"</DEFAULT>
@@ -332,7 +334,15 @@
 
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:org.talend.libraries/mssql-jdbc/6.0.0"  REQUIRED_IF="(DRIVER == 'MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />	
+			<IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:org.talend.libraries/mssql-jdbc/6.0.0"  REQUIRED_IF="(DRIVER == 'MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="adal4j" MODULE="adal4j-1.6.5.jar" MVN="mvn:com.microsoft.azure/adal4j/1.6.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="commons-lang3" MODULE="commons-lang3-3.10.jar" MVN="mvn:org.apache.commons/commons-lang3/3.10"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="commons-codec" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="gson" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-6.5.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/6.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="json-smart" MODULE="json-smart-2.3.jar" MVN="mvn:net.minidev/json-smart/2.3"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+            <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  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>
 	</CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseOutput/tAzureSynapseOutput_messages.properties

@@ -43,7 +43,7 @@ FIELD_OPTIONS.ITEM.INSERTABLE=Insertable
 FIELD_OPTIONS.ITEM.UPDATABLE=Updatable
 FIELD_OPTIONS.ITEM.UPDATE_KEY=Key in update
 FIELD_OPTIONS.NAME=Field options
-HELP=org.talend.help.tSQLDWHOutput
+HELP=org.talend.help.tAzureSynapseOutput
 HOST.NAME=Host
 IDENTITY_INSERT.NAME=Turn on identity insert
 INSTANCE.NAME=Instance
@@ -99,4 +99,6 @@ DATASOURCE_ALIAS.NAME=Data source alias
 
 DRIVER.NAME=JDBC Provider
 DRIVER.ITEM.JTDS=Open source JTDS
-DRIVER.ITEM.MSSQL_PROP=Microsoft
+DRIVER.ITEM.MSSQL_PROP=Microsoft
+
+ACTIVE_DIR_AUTH.NAME=Authenticate using Azure Active Directory

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseRollback/tAzureSynapseRollback_java.xml

@@ -16,8 +16,8 @@
   </HEADER>
 
   <FAMILIES>
-     <FAMILY>Databases/DB Specifics/Azure/SQL Data Warehouse</FAMILY>
-    <FAMILY>Cloud/Azure/SQL Data Warehouse</FAMILY>
+     <FAMILY>Databases/DB Specifics/Azure/Synapse Analytics</FAMILY>
+    <FAMILY>Cloud/Azure/Synapse Analytics</FAMILY>
   </FAMILIES>
 
   <DOCUMENTATION>
@@ -38,7 +38,7 @@
     <PARAMETER
       NAME="CONNECTION"
       FIELD="COMPONENT_LIST"
-      REQUIRED="true" FILTER="tSQLDWHConnection"
+      REQUIRED="true" FILTER="tAzureSynapseConnection"
       NUM_ROW="10"
       DYNAMIC_SETTINGS="true"
     />

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseRollback/tAzureSynapseRollback_messages.properties

@@ -1,6 +1,6 @@
 #Created by JInto - www.guh-software.de
 #Wed May 23 11:26:21 CST 2007
-HELP=org.talend.help.tSQLDWHRollback
+HELP=org.talend.help.tAzureSynapseRollback
 LONG_NAME=Rollbacks all transactions not already commited in a selected MSSql connection 
 CLOSE.NAME=Close Connection
 CONNECTION.NAME=Component List

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseRow/tAzureSynapseRow_begin.javajet

@@ -11,11 +11,13 @@ imports="
 	class DBRowBeginUtil extends DefaultDBRowUtil{
 	
 		private String driver;
+        private boolean useActiveDirectoryAuth = false;
 	
 		public void beforeComponentProcess(INode node){
 			super.beforeComponentProcess(node);
 			cid = node.getUniqueName();
 			this.driver = ElementParameterParser.getValue(node, "__DRIVER__");
+            this.useActiveDirectoryAuth = "true".equals(ElementParameterParser.getValue(node, "__ACTIVE_DIR_AUTH__"));
 	    }
 	    
 	    public void afterUseExistConnection(INode node) {
@@ -58,12 +60,20 @@ imports="
 				url_<%=cid%> += "//" + <%=dbname%>; 
 			<%
 				} else {
-			%>		    
+			%>
 		    	url_<%=cid%> += ";databaseName=" + <%=dbname%>; 
 			<%
 				}
 			%>
 		    }
+<%
+            if (useActiveDirectoryAuth) {
+%>
+                url_<%=cid%> += ";encrypt=true;trustServerCertificate=false;hostNameInCertificate=*.database.windows.net;Authentication=ActiveDirectoryPassword";
+                url_<%=cid%> += ";database=" + <%=dbname%>;
+<%
+            }
+%>
 		    url_<%=cid%> += ";applicationName=Talend;" + <%=dbproperties%>;
 		<%
 		}

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

@@ -18,8 +18,8 @@
   </HEADER>
 
   <FAMILIES>
-     <FAMILY>Databases/DB Specifics/Azure/SQL Data Warehouse</FAMILY>
-    <FAMILY>Cloud/Azure/SQL Data Warehouse</FAMILY>
+     <FAMILY>Databases/DB Specifics/Azure/Synapse Analytics</FAMILY>
+    <FAMILY>Cloud/Azure/Synapse Analytics</FAMILY>
   </FAMILIES>
 
   <DOCUMENTATION>
@@ -49,7 +49,7 @@
 	    <PARAMETER
 	      NAME="CONNECTION"
 	      FIELD="COMPONENT_LIST"
-	      REQUIRED="true" FILTER="tSQLDWHConnection"
+	      REQUIRED="true" FILTER="tAzureSynapseConnection"
 	      NUM_ROW="1"
 	      SHOW_IF="USE_EXISTING_CONNECTION == 'true'"
 	      DYNAMIC_SETTINGS="true"
@@ -245,10 +245,14 @@
 		<DEFAULT>""</DEFAULT>
 	</PARAMETER>
 
+	<PARAMETER NAME="ACTIVE_DIR_AUTH" FIELD="CHECK" NUM_ROW="5" SHOW_IF="USE_EXISTING_CONNECTION=='false'">
+		<DEFAULT>false</DEFAULT>
+	</PARAMETER>
+
 	<PARAMETER
       NAME="PROPAGATE_RECORD_SET"
       FIELD="CHECK"
-      NUM_ROW="5"
+      NUM_ROW="6"
     >
       <DEFAULT>false</DEFAULT>
     </PARAMETER>
@@ -256,14 +260,14 @@
     <PARAMETER
       NAME="RECORD_SET_COLUMN"
       FIELD="COLUMN_LIST"
-      NUM_ROW="5"
+      NUM_ROW="6"
       SHOW_IF="PROPAGATE_RECORD_SET == 'true'"
     />
 
 	<PARAMETER
       NAME="USE_PREPAREDSTATEMENT"
       FIELD="CHECK"
-      NUM_ROW="6"
+      NUM_ROW="7"
     >
       <DEFAULT>false</DEFAULT>
     </PARAMETER>
@@ -272,7 +276,7 @@
       NAME="SET_PREPAREDSTATEMENT_PARAMETERS"
       FIELD="TABLE"
       REQUIRED="false"
-      NUM_ROW="7"
+      NUM_ROW="8"
       NB_LINES="3"
       SHOW_IF="(USE_PREPAREDSTATEMENT == 'true')"
     >
@@ -315,7 +319,15 @@
 
   <CODEGENERATION>
     <IMPORTS>
-    	<IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:org.talend.libraries/mssql-jdbc/6.0.0"  REQUIRED_IF="(DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />	
+        <IMPORT NAME="Driver-mssql-jdbc" MODULE="mssql-jdbc.jar" MVN="mvn:org.talend.libraries/mssql-jdbc/6.0.0"  REQUIRED_IF="(DRIVER=='MSSQL_PROP') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="adal4j" MODULE="adal4j-1.6.5.jar" MVN="mvn:com.microsoft.azure/adal4j/1.6.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="commons-lang3" MODULE="commons-lang3-3.10.jar" MVN="mvn:org.apache.commons/commons-lang3/3.10"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="commons-codec" MODULE="commons-codec-1.14.jar" MVN="mvn:commons-codec/commons-codec/1.14"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="gson" MODULE="gson-2.8.6.jar" MVN="mvn:com.google.code.gson/gson/2.8.6"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="oauth2-oidc-sdk" MODULE="oauth2-oidc-sdk-6.5.jar" MVN="mvn:com.nimbusds/oauth2-oidc-sdk/6.5"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="json-smart" MODULE="json-smart-2.3.jar" MVN="mvn:net.minidev/json-smart/2.3"  REQUIRED_IF="(ACTIVE_DIR_AUTH == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
+        <IMPORT NAME="nimbus-jose-jwt" MODULE="nimbus-jose-jwt-8.11.jar" MVN="mvn:com.nimbusds/nimbus-jose-jwt/8.11"  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>
   </CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tAzureSynapseRow/tAzureSynapseRow_messages.properties

@@ -8,7 +8,7 @@ DB_SCHEMA.NAME=Schema
 DIE_ON_ERROR.NAME=Die on error
 DSN.NAME=Datasource
 ENCODING.NAME=Encoding
-HELP=org.talend.help.tSQLDWHRow
+HELP=org.talend.help.tAzureSynapseRow
 HOST.NAME=Host
 IDENTITY_INSERT.NAME=Turn on identity insert
 INSTANCE.NAME=Instance
@@ -61,4 +61,6 @@ DATASOURCE_ALIAS.NAME=Data source alias
 
 DRIVER.NAME=JDBC Provider
 DRIVER.ITEM.JTDS=Open source JTDS
-DRIVER.ITEM.MSSQL_PROP=Microsoft
+DRIVER.ITEM.MSSQL_PROP=Microsoft
+
+ACTIVE_DIR_AUTH.NAME=Authenticate using Azure Active Directory

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryBulkExec/tBigQueryBulkExec_java.xml

@@ -193,10 +193,10 @@
 		<IMPORT NAME="jackson-core-2.10.1.jar" MODULE="jackson-core-2.10.1.jar" MVN="mvn:com.fasterxml.jackson.core/jackson-core/2.10.1" REQUIRED="true" />
 		<!-- REQUIRED FOR GOOGLE STORAGE -->
 		<IMPORT NAME="jets3t-0.9.1" MODULE="jets3t-0.9.1.jar" MVN="mvn:org.talend.libraries/jets3t-0.9.1/6.0.0"  REQUIRED="true" />
-		<IMPORT NAME="commons-logging-1.1.1" MODULE="commons-logging-1.1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1.1/6.0.0"  UrlPath="platform:/base/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar" REQUIRED="true" />
-		<IMPORT NAME="httpclient-4.5.5" MODULE="httpclient-4.5.5.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.5" REQUIRED="true" />
-		<IMPORT NAME="httpcore-4.4.9" MODULE="httpcore-4.4.9.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.9" REQUIRED="true" />
-		<IMPORT NAME="commons-codec-1.4" MODULE="commons-codec-1.4.jar" MVN="mvn:commons-codec/commons-codec/1.4"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-codec-1.4.jar" REQUIRED="true" />
+		<IMPORT NAME="commons-logging-1.2" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED="true" />
+		<IMPORT NAME="httpclient-4.5.9" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED="true" />
+		<IMPORT NAME="httpcore-4.4.11" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED="true" />
+		<IMPORT NAME="commons-codec-1.11" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED="true" />
 		<IMPORT NAME="google-cloud-bigquery-1.32.0.jar" MODULE="google-cloud-bigquery-1.32.0.jar" MVN="mvn:com.google.cloud/google-cloud-bigquery/1.32.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
 		<IMPORT NAME="google-http-client-jackson-1.25.0.jar" MODULE="google-http-client-jackson-1.25.0.jar" MVN="mvn:com.google.http-client/google-http-client-jackson/1.25.0" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />
 		<IMPORT NAME="threetenbp-1.3.3.jar" MODULE="threetenbp-1.3.3.jar" MVN="mvn:org.threeten/threetenbp/1.3.3" REQUIRED_IF="AUTH_MODE == 'SERVICEACCOUNT'" />

main/plugins/org.talend.designer.components.localprovider/components/tBonitaDeploy/tBonitaDeploy_java.xml

@@ -226,9 +226,10 @@
 			<IMPORT NAME="bonita-common-6.5.2.jar" MODULE="bonita-common-6.5.2.jar" MVN="mvn:org.talend.libraries/bonita-common-6.5.2/6.0.0" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
 			
 			<IMPORT NAME="httpmime-4.2.5.jar" MODULE="httpmime-4.2.5.jar" MVN="mvn:org.talend.libraries/httpmime-4.2.5/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.http/lib/httpmime-4.2.5.jar" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
-			<IMPORT NAME="httpclient-4.2.5.jar" MODULE="httpclient-4.2.5.jar" MVN="mvn:org.talend.libraries/httpclient-4.2.5/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.http/lib/httpclient-4.2.5.jar" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
-			<IMPORT NAME="httpcore-4.2.5.jar" MODULE="httpcore-4.2.5.jar" MVN="mvn:org.talend.libraries/httpcore-4.2.5/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.http/lib/httpcore-4.2.5.jar" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
-			<IMPORT NAME="commons-logging-1.1.1.jar" MODULE="commons-logging-1.1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1.1/6.0.0" UrlPath="platform:/base/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
+			<IMPORT NAME="httpclient-4.5.9.jar" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
+			<IMPORT NAME="httpcore-4.4.11.jar" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
+			<IMPORT NAME="commons-codec-1.11.jar" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
+			<IMPORT NAME="commons-logging-1.2.jar" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='HTTP_CLIENT')" />
 			
 			<!-- Bonita 6.5.2 JAVA API -->
 			<IMPORT NAME="talend-bonita-client-1.0.0.jar" MODULE="talend-bonita-client-1.0.0.jar" MVN="mvn:org.talend.libraries/talend-bonita-client-1.0.0/6.0.0" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
@@ -238,10 +239,10 @@
 			<IMPORT NAME="xpp3-1.1.6.jar" MODULE="xpp3-1.1.6.jar" MVN="mvn:org.talend.libraries/xpp3-1.1.6/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.xml/lib/xpp3-1.1.6.jar" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
 			
 			<IMPORT NAME="httpmime-4.2.5.jar" MODULE="httpmime-4.2.5.jar" MVN="mvn:org.talend.libraries/httpmime-4.2.5/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.http/lib/httpmime-4.2.5.jar" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
-			<IMPORT NAME="httpclient-4.2.5.jar" MODULE="httpclient-4.2.5.jar" MVN="mvn:org.talend.libraries/httpclient-4.2.5/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.http/lib/httpclient-4.2.5.jar" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
-			<IMPORT NAME="httpcore-4.2.5.jar" MODULE="httpcore-4.2.5.jar" MVN="mvn:org.talend.libraries/httpcore-4.2.5/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.http/lib/httpcore-4.2.5.jar" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
-			<IMPORT NAME="commons-logging-1.1.1.jar" MODULE="commons-logging-1.1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1.1/6.0.0" UrlPath="platform:/base/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
-			<IMPORT NAME="commons-codec-1.7.jar" MODULE="commons-codec-1.7.jar" MVN="mvn:org.talend.libraries/commons-codec-1.7/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-codec-1.7.jar" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
+			<IMPORT NAME="httpclient-4.5.9.jar" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
+			<IMPORT NAME="httpcore-4.4.11.jar" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
+			<IMPORT NAME="commons-logging-1.2.jar" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
+			<IMPORT NAME="commons-codec-1.11.jar" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(DB_VERSION=='BONITA_652') AND (CLIENT_MODE=='JAVA_CLIENT')" />
 			
 			<!-- Bonita 7.2.4 HTTP API -->
 			<IMPORT NAME="talend-bonita-client-1.0.0.jar" MODULE="talend-bonita-client-1.0.0.jar" MVN="mvn:org.talend.libraries/talend-bonita-client-1.0.0/6.0.0" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
@@ -249,9 +250,10 @@
 			<IMPORT NAME="bonita-common-7.2.4.jar" MODULE="bonita-common-7.2.4.jar" MVN="mvn:org.talend.libraries/bonita-common-7.2.4/6.3.0" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
 			
 			<IMPORT NAME="httpmime-4.2.5.jar" MODULE="httpmime-4.2.5.jar" MVN="mvn:org.talend.libraries/httpmime-4.2.5/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.http/lib/httpmime-4.2.5.jar" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
-			<IMPORT NAME="httpclient-4.2.5.jar" MODULE="httpclient-4.2.5.jar" MVN="mvn:org.talend.libraries/httpclient-4.2.5/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.http/lib/httpclient-4.2.5.jar" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
-			<IMPORT NAME="httpcore-4.2.5.jar" MODULE="httpcore-4.2.5.jar" MVN="mvn:org.talend.libraries/httpcore-4.2.5/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.http/lib/httpcore-4.2.5.jar" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
-			<IMPORT NAME="commons-logging-1.1.1.jar" MODULE="commons-logging-1.1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1.1/6.0.0" UrlPath="platform:/base/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
+			<IMPORT NAME="httpclient-4.5.9.jar" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
+			<IMPORT NAME="httpcore-4.4.11.jar" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
+			<IMPORT NAME="commons-logging-1.2.jar" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
+			<IMPORT NAME="commons-codec-1.11.jar" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='HTTP_CLIENT')" />
 			
 			<!-- Bonita 7.2.4 JAVA API -->
 			<IMPORT NAME="talend-bonita-client-1.0.0.jar" MODULE="talend-bonita-client-1.0.0.jar" MVN="mvn:org.talend.libraries/talend-bonita-client-1.0.0/6.0.0" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
@@ -261,10 +263,10 @@
 			<IMPORT NAME="xpp3-1.1.6.jar" MODULE="xpp3-1.1.6.jar" MVN="mvn:org.talend.libraries/xpp3-1.1.6/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.xml/lib/xpp3-1.1.6.jar" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
 			
 			<IMPORT NAME="httpmime-4.2.5.jar" MODULE="httpmime-4.2.5.jar" MVN="mvn:org.talend.libraries/httpmime-4.2.5/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.http/lib/httpmime-4.2.5.jar" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
-			<IMPORT NAME="httpclient-4.2.5.jar" MODULE="httpclient-4.2.5.jar" MVN="mvn:org.talend.libraries/httpclient-4.2.5/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.http/lib/httpclient-4.2.5.jar" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
-			<IMPORT NAME="httpcore-4.2.5.jar" MODULE="httpcore-4.2.5.jar" MVN="mvn:org.talend.libraries/httpcore-4.2.5/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.http/lib/httpcore-4.2.5.jar" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
-			<IMPORT NAME="commons-logging-1.1.1.jar" MODULE="commons-logging-1.1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1.1/6.0.0" UrlPath="platform:/base/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
-			<IMPORT NAME="commons-codec-1.7.jar" MODULE="commons-codec-1.7.jar" MVN="mvn:org.talend.libraries/commons-codec-1.7/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-codec-1.7.jar" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
+			<IMPORT NAME="httpclient-4.5.9.jar" MODULE="httpclient-4.5.9.jar" MVN="mvn:org.apache.httpcomponents/httpclient/4.5.9" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
+			<IMPORT NAME="httpcore-4.4.11.jar" MODULE="httpcore-4.4.11.jar" MVN="mvn:org.apache.httpcomponents/httpcore/4.4.11" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
+			<IMPORT NAME="commons-logging-1.2.jar" MODULE="commons-logging-1.2.jar" MVN="mvn:commons-logging/commons-logging/1.2" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
+			<IMPORT NAME="commons-codec-1.11.jar" MODULE="commons-codec-1.11.jar" MVN="mvn:commons-codec/commons-codec/1.11" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
 			<IMPORT NAME="commons-io-2.1.jar" MODULE="commons-io-2.1.jar" MVN="mvn:org.talend.libraries/commons-io-2.1/6.0.0" UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-io-2.1.jar" REQUIRED_IF="(DB_VERSION=='BONITA_724') AND (CLIENT_MODE=='JAVA_CLIENT')" />
 	     </IMPORTS>
 	</CODEGENERATION>