fix(TUP-39467): CVE-2022-29599,maven-shared-utils:0.9.0. (#6272)

slowly in Studio

i18n/plugins/org.talend.librariesmanager.ui.nl/src/main/java/messages_en.properties

@@ -65,7 +65,7 @@ Module.view.download.external.modules.action.text=Download external modules
 Module.view.download.external.modules.action.description=Download external modules
 download.external.dialog.title=The following modules are not yet installed. Please download and install all required modules.
 download.external.dialog.desciption=List of modules to be downloaded automatically or imported manually.
-download.external.dialog.help.url=https://help.talend.com/display/KB/How+to+install+external+modules+in+the+Talend+products
+download.external.dialog.help.url=https://document-link.us.cloud.talend.com/ts_ig_install-external-modules?version=73&lang=en&env=prd
 AcceptModuleLicensesWizard.title=Download external modules
 AcceptModuleLicensesWizardDialog.button.acceptAll=Accept all
 AcceptModuleLicensesWizardDialog.cancelConfirmation.title=Confirmation

i18n/plugins/org.talend.repository.metadata.nl/src/main/java/org/talend/repository/metadata/i18n/messages_en.properties

@@ -1136,7 +1136,7 @@ DatabaseForm.hc.link.none=None
 DatabaseForm.hc.link.repository=Repository
 DatabaseForm.hc.link.title=Hadoop Cluster
 DatabaseForm.checkFileExist=The file {0} is invalid or doesn't exist
-DatabaseForm.helpInfo.installDriverLink.url=https://help.talend.com/pages/viewpage.action?pageId=14230347
+DatabaseForm.helpInfo.installDriverLink.url=https://document-link.us.cloud.talend.com/ts_ig_install-external-modules?version=73&lang=en&env=prd
 DatabaseForm.helpInfo.installDriverLink.label=How to install a driver
 SelectorTableForm.toolTip=Not available with this database
 FileStep1.modeButText=Read excel2007 file format(xlsx)

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

@@ -20,7 +20,7 @@
     <import plugin="org.apache.servicemix.bundles.avro" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.junit" version="4.13.2" match="greaterOrEqual"/>
     <import plugin="org.slf4j.api" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.apache.commons.configuration" version="2.0.0" match="greaterOrEqual"/>
+    <import plugin="org.apache.commons.commons-configuration2" version="2.8.0" match="greaterOrEqual"/>
   </requires>  
   <plugin id="org.talend.daikon" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
   <plugin id="org.talend.daikon.exception" download-size="0" install-size="0" version="0.0.0" unpack="false"/>

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/i18n/messages.properties

@@ -132,3 +132,8 @@ GlobalServiceRegister.ServiceNotRegistered=The service {0} has not been register
 MessageBoxExceptionHandler.showMessageForSchemaImportXml.unParseXML.title=The xml can't parse.
 MessageBoxExceptionHandler.showMessageForSchemaImportXml.unParseXML.msg=The xml can't parse in this format.
 HibernateUtils.auditDBIsNotUsable=The audit database must be empty or only contains tables related to audit.
+CasePushButton.CaseButton.Tip=Uppercase/Lowercase Db column
+QuotePushButton.QuoteButton.Tip=Add/Remove Quote on Db column
+QuoteManipulateDialog.title=Add/Remove quote on Db column
+QuoteManipulateDialog.addQuote=Add quote
+QuoteManipulateDialog.removeQuote=Remove quote

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/image/EImage.java

@@ -88,6 +88,8 @@ public enum EImage implements IImage {
     LEFTX_ICON("/icons/leftx.png"), //$NON-NLS-1$
     RIGHT_ICON("/icons/right.gif"), //$NON-NLS-1$
     RIGHTX_ICON("/icons/rightx.png"), //$NON-NLS-1$
+    LOWERCASE_ICON("/icons/lowercase.jpg"), //$NON-NLS-1$
+    UPPERCASE_ICON("/icons/uppercase.jpg"), //$NON-NLS-1$
 
     KEY_ICON("/icons/key.gif"), //$NON-NLS-1$
     HIERARCHY_ICON("/icons/hierarchicalLayout.gif"), //$NON-NLS-1$

main/plugins/org.talend.commons.runtime/pom_server.xml

@@ -92,14 +92,13 @@
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
-            <version>2.12.0</version>
+            <version>2.12.2</version>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.16</version>
-            <type>bundle</type>
-        </dependency>
+			<groupId>ch.qos.reload4j</groupId>
+			<artifactId>reload4j</artifactId>
+			<version>1.2.19</version>
+		</dependency>
     </dependencies>
 
     <build>

main/plugins/org.talend.commons.runtime/src/org/talend/commons/CommonsPlugin.java

@@ -57,6 +57,8 @@ public class CommonsPlugin implements BundleActivator {
     // TESB-17856: For commandline builds ESB Micorservice bundle
     private static boolean isESBMicorservice = false;
 
+    private static Boolean isJunitWorking;
+
     private static ServiceTracker proxyTracker;
 
     public static boolean isWorkbenchCreated() {
@@ -123,6 +125,35 @@ public class CommonsPlugin implements BundleActivator {
         return "org.talend.rcp.branding.tuj.product".equals(Platform.getProduct().getId()); //$NON-NLS-1$
     }
 
+    public static boolean isJunitWorking() {
+        if (isJunitWorking == null) {
+            try {
+                String[] args = Platform.getCommandLineArgs();
+                String applicationId = null;
+
+                for (int i = 0; i < args.length - 1; i++) {
+                    if (args[i].equalsIgnoreCase("-application")) { //$NON-NLS-1$
+                        applicationId = args[i + 1];
+                    }
+                }
+
+                if (applicationId != null
+                        && (applicationId.equals("org.eclipse.swtbot.eclipse.junit.headless.swtbottestapplication") //$NON-NLS-1$
+                                || applicationId.equals("org.eclipse.pde.junit.runtime.uitestapplication"))) { //$NON-NLS-1$
+                    isJunitWorking = true;
+                } else {
+                    isJunitWorking = false;
+                }
+            } catch (Throwable e) {
+                isJunitWorking = false;
+            }
+        }
+        if (isJunitWorking == null) {
+            isJunitWorking = false;
+        }
+        return isJunitWorking;
+    }
+
     /**
      * Answer the file associated with name. This handles the case of running as a plugin and running standalone which
      * happens during testing.

main/plugins/org.talend.commons.runtime/src/org/talend/commons/runtime/service/ICollectDataService.java

@@ -0,0 +1,56 @@
+package org.talend.commons.runtime.service;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Properties;
+
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
+import org.talend.commons.exception.CommonExceptionHandler;
+
+public interface ICollectDataService {
+
+    final String KEY_SOURCE = "source";
+
+    //
+    final String AMC_FILE_TYPE_USED = "FILE_TYPE_USED";
+
+    final String AMC_DATABASE_TYPE_USED = "DATABASE_TYPE_USED";
+
+    final String AMC_PREVIEW_KEY = "amc.datasource";
+
+    final String AMC_PREVIEW_FILEVALUE = "File";
+
+    final String AMC_PREVIEW_DATABASEVALUE = "Database";
+
+    /**
+     * @return json string
+     */
+    String getCollectedDataJSON();
+
+    Properties getCollectedData();
+
+    public static ICollectDataService getInstance(String from) throws Exception {
+        BundleContext bc = FrameworkUtil.getBundle(ICollectDataService.class).getBundleContext();
+        Collection<ServiceReference<ICollectDataService>> tacokitServices = Collections.emptyList();
+        try {
+            tacokitServices = bc.getServiceReferences(ICollectDataService.class, null);
+        } catch (InvalidSyntaxException e) {
+            CommonExceptionHandler.process(e);
+        }
+
+        if (tacokitServices != null) {
+            for (ServiceReference<ICollectDataService> sr : tacokitServices) {
+                if (from == null || from.equals(sr.getProperty(KEY_SOURCE))) {
+                    ICollectDataService tacokitService = bc.getService(sr);
+                    if (tacokitService != null) {
+                        return tacokitService;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+}

main/plugins/org.talend.commons.runtime/src/org/talend/commons/runtime/service/P2InstallComponent.java

@@ -12,6 +12,8 @@
 // ============================================================================
 package org.talend.commons.runtime.service;
 
+import org.eclipse.core.runtime.IProgressMonitor;
+
 /**
  * DOC ggu class global comment. Detailled comment
  */
@@ -19,6 +21,10 @@ public interface P2InstallComponent {
 
     boolean install();
 
+    default boolean install(IProgressMonitor monitor) {
+        return false;
+    }
+
     boolean needRelaunch();
 
     String getInstalledMessages();

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/Hex.java

@@ -56,6 +56,19 @@ public class Hex {
 
         return out;
     }
+    
+    public static boolean isNeedConvertToHex(String value) {
+        if (value == null || "".equals(value.trim())) {
+            return false;
+        }
+        for (int i = 0; i < value.length(); i++) {
+            int ch = value.charAt(i);
+            if (ch < 32) {
+                return true;
+            }
+        }
+        return false;
+    }
 
     private static int toDigit(char ch, int index) {
         int digit = Character.digit(ch, 16);

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/data/list/IExtendedList.java

@@ -29,6 +29,8 @@ public interface IExtendedList<T> extends List<T> {
     public void swapElements(List<Integer> indicesOrigin, List<Integer> indicesTarget);
 
     public void swapElement(T object1, T object2);
+    
+    public void replaceElement(int index, T object2);
 
     /**
      * Getter for useEquals.

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/data/list/ListenableList.java

@@ -537,6 +537,11 @@ public class ListenableList<T> implements IExtendedList<T> {
         fireReplacedEvent(index, replacedObject, element, false);
         return replacedObject;
     }
+    
+    @Override
+    public void replaceElement(int index, T element) {
+        this.list.set(index, element);
+    }
 
     /*
      * (non-Javadoc)

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/database/DB2ForZosDataBaseMetadata.java

@@ -16,7 +16,6 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -109,11 +108,11 @@ public class DB2ForZosDataBaseMetadata extends PackageFakeDatabaseMetadata {
         // MOD yyin 2012-05-15 TDQ-5190
         String sql = "SELECT DISTINCT CREATOR FROM SYSIBM.SYSTABLES"; //$NON-NLS-1$
         ResultSet rs = null;
-        Statement stmt = null;
+        PreparedStatement stmt = null;
         List<String[]> list = new ArrayList<String[]>();
         try {
-            stmt = connection.createStatement();
-            rs = stmt.executeQuery(sql);
+            stmt = connection.prepareStatement(sql);
+            rs = stmt.executeQuery();
 
             while (rs.next()) {
                 String creator = rs.getString("CREATOR"); //$NON-NLS-1$
@@ -331,18 +330,20 @@ public class DB2ForZosDataBaseMetadata extends PackageFakeDatabaseMetadata {
     public ResultSet getColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern)
             throws SQLException {
         // for real
-        String sql = "SELECT * FROM SYSIBM.SYSCOLUMNS where TBNAME='" + tableNamePattern + "' AND  TBCREATOR = '" //$NON-NLS-1$ //$NON-NLS-2$
-                + schemaPattern + "' ORDER BY TBCREATOR, TBNAME, COLNO"; //$NON-NLS-1$
+        String sql = "SELECT * FROM SYSIBM.SYSCOLUMNS where TBNAME=? AND  TBCREATOR = ? ORDER BY TBCREATOR, TBNAME, COLNO"; //$NON-NLS-1$
 
         // for test
         // String sql = "SELECT * FROM SYSIBM.SYSCOLUMNS where NAME='NAME'";
 
         ResultSet rs = null;
-        Statement stmt = null;
+        PreparedStatement stmt = null;
         List<String[]> list = new ArrayList<String[]>();
         try {
-            stmt = connection.createStatement();
-            rs = stmt.executeQuery(sql);
+            stmt = connection.prepareStatement(sql);
+            stmt.setString(1, tableNamePattern);
+            stmt.setString(2, schemaPattern);
+
+            rs = stmt.executeQuery();
             while (rs.next()) {
 
                 // For real db2 for zos, should use these code.

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/database/JtdsDatabaseMetadata.java

@@ -25,7 +25,6 @@ public class JtdsDatabaseMetadata extends PackageFakeDatabaseMetadata {
 
     @Override
     public ResultSet getSchemas() throws SQLException {
-        java.sql.Statement statement = connection.createStatement();
         String sql;
         if (((PackageFakeDatabaseMetadata) connection).getDatabaseMajorVersion() >= 9) {
             sql = JDBC3 ? "SELECT name AS TABLE_SCHEM, NULL as TABLE_CATALOG FROM " + connection.getCatalog() + ".sys.schemas"
@@ -36,6 +35,7 @@ public class JtdsDatabaseMetadata extends PackageFakeDatabaseMetadata {
         }
 
         sql += " ORDER BY TABLE_SCHEM";
-        return statement.executeQuery(sql);
+        java.sql.PreparedStatement statement = connection.prepareStatement(sql);
+        return statement.executeQuery();
     }
 }

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/database/SAPHanaDataBaseMetadata.java

@@ -13,9 +13,9 @@
 package org.talend.commons.utils.database;
 
 import java.sql.Connection;
+import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -152,15 +152,19 @@ public class SAPHanaDataBaseMetadata extends FakeDatabaseMetaData {
             // check if the type is contained is in the types needed.
             String sqlcv = "SELECT OBJECT_NAME,PACKAGE_ID FROM _SYS_REPO.ACTIVE_OBJECT WHERE OBJECT_SUFFIX = 'calculationview'"; //$NON-NLS-1$
             if (tableNamePattern != null && !tableNamePattern.equals("%")) { //$NON-NLS-1$
-                sqlcv += " AND (OBJECT_NAME LIKE '" + tableNamePattern + "'"; //$NON-NLS-1$ //$NON-NLS-2$
-                sqlcv += " OR PACKAGE_ID LIKE '" + tableNamePattern + "')"; //$NON-NLS-1$ //$NON-NLS-2$
+                sqlcv += " AND (OBJECT_NAME LIKE ?"; //$NON-NLS-1$ //$NON-NLS-2$
+                sqlcv += " OR PACKAGE_ID LIKE ? )"; //$NON-NLS-1$ //$NON-NLS-2$
             }
             ResultSet rscv = null;
-            Statement stmtcv = null;
+            PreparedStatement stmtcv = null;
             List<String[]> listcv = new ArrayList<String[]>();
             try {
-                stmtcv = connection.createStatement();
-                rscv = stmtcv.executeQuery(sqlcv);
+                stmtcv = connection.prepareStatement(sqlcv);
+                if (tableNamePattern != null && !tableNamePattern.equals("%")) {
+                    stmtcv.setString(1, tableNamePattern);
+                    stmtcv.setString(2, tableNamePattern);
+                }
+                rscv = stmtcv.executeQuery();
                 while (rscv.next()) {
                     String objectName = rscv.getString("OBJECT_NAME"); //$NON-NLS-1$
                     if (objectName != null) {
@@ -303,11 +307,11 @@ public class SAPHanaDataBaseMetadata extends FakeDatabaseMetaData {
         if (!load) {
             String sqlcv = "SELECT * from \"" + schemaPattern + "\".\"" + tableNamePattern + "\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
             ResultSet rscv = null;
-            Statement stmtcv = null;
+            PreparedStatement stmtcv = null;
             List<String[]> listcv = new ArrayList<String[]>();
             try {
-                stmtcv = connection.createStatement();
-                rscv = stmtcv.executeQuery(sqlcv);
+                stmtcv = connection.prepareStatement(sqlcv);
+                rscv = stmtcv.executeQuery();
                 int i = 1;
                 while (rscv.next()) {
                     String tableName = tableNamePattern;

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/database/SASDataBaseMetadata.java

@@ -13,9 +13,9 @@
 package org.talend.commons.utils.database;
 
 import java.sql.Connection;
+import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -62,11 +62,11 @@ public class SASDataBaseMetadata extends FakeDatabaseMetaData {
         // see the feature 5827
         String sql = "SELECT DISTINCT LIBNAME FROM SASHELP.VTABLE"; //$NON-NLS-1$
         ResultSet rs = null;
-        Statement stmt = null;
+        PreparedStatement stmt = null;
         List<String[]> list = new ArrayList<String[]>();
         try {
-            stmt = connection.createStatement();
-            rs = stmt.executeQuery(sql);
+            stmt = connection.prepareStatement(sql);
+            rs = stmt.executeQuery();
 
             while (rs.next()) {
                 String creator = rs.getString("LIBNAME"); //$NON-NLS-1$
@@ -147,17 +147,21 @@ public class SASDataBaseMetadata extends FakeDatabaseMetaData {
     public ResultSet getTables(String catalog, String schema, String tableNamePattern, String[] types) throws SQLException {
         String sql;
         if (schema != null) {
-            sql = "SELECT * FROM SASHELP.VTABLE where LIBNAME = '" + schema + "'"; //$NON-NLS-1$ //$NON-NLS-2$
+            sql = "SELECT * FROM SASHELP.VTABLE where LIBNAME = ?"; //$NON-NLS-1$ //$NON-NLS-2$
 
         } else {
             sql = "SELECT * FROM SASHELP.VTABLE"; //$NON-NLS-1$
         }
         ResultSet rs = null;
-        Statement stmt = null;
+        PreparedStatement stmt = null;
         List<String[]> list = new ArrayList<String[]>();
         try {
-            stmt = connection.createStatement();
-            rs = stmt.executeQuery(sql);
+            stmt = connection.prepareStatement(sql);
+            if (schema != null) {
+                stmt.setString(1, schema);
+            }
+
+            rs = stmt.executeQuery();
 
             while (rs.next()) {
                 String name = rs.getString("MEMNAME"); //$NON-NLS-1$
@@ -229,18 +233,20 @@ public class SASDataBaseMetadata extends FakeDatabaseMetaData {
     public ResultSet getColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern)
             throws SQLException {
         // for real
-        String sql = "SELECT * FROM SASHELP.VCOLUMN where MEMNAME='" + tableNamePattern + "' AND  LIBNAME = '" //$NON-NLS-1$ //$NON-NLS-2$
-                + schemaPattern + "' ORDER BY LIBNAME, MEMNAME, VARNUM"; //$NON-NLS-1$
+        String sql = "SELECT * FROM SASHELP.VCOLUMN where MEMNAME=? AND  LIBNAME = ? ORDER BY LIBNAME, MEMNAME, VARNUM"; //$NON-NLS-1$
 
         // for test
         // String sql = "SELECT * FROM SYSIBM.SYSCOLUMNS where NAME='NAME'";
 
         ResultSet rs = null;
-        Statement stmt = null;
+        PreparedStatement stmt = null;
         List<String[]> list = new ArrayList<String[]>();
         try {
-            stmt = connection.createStatement();
-            rs = stmt.executeQuery(sql);
+            stmt = connection.prepareStatement(sql);
+            stmt.setString(1, tableNamePattern);
+            stmt.setString(2, schemaPattern);
+
+            rs = stmt.executeQuery();
             while (rs.next()) {
                 String tableName = rs.getString("MEMNAME"); //$NON-NLS-1$
                 if (tableName != null) {

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/database/Sybase16SADatabaseMetaData.java

@@ -13,9 +13,9 @@
 package org.talend.commons.utils.database;
 
 import java.sql.Connection;
+import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -52,10 +52,12 @@ public class Sybase16SADatabaseMetaData extends SybaseDatabaseMetaData {
         for (String catalogName : catList) {
             String sql = createSqlByLoginAndCatalog(login, catalogName);
             ResultSet rs = null;
-            Statement stmt = null;
+            PreparedStatement stmt = null;
             try {
-                stmt = connection.createStatement();
-                rs = stmt.executeQuery(sql);
+                stmt = connection.prepareStatement(sql);
+                stmt.setString(1, login);
+
+                rs = stmt.executeQuery();
 
                 while (rs.next()) {
                     int temp = rs.getInt(1);
@@ -113,8 +115,7 @@ public class Sybase16SADatabaseMetaData extends SybaseDatabaseMetaData {
      */
     protected String createSqlByLoginAndCatalog(String loginName, String catalogName) {
         String sql = "select count(*) from " + catalogName
-                + ".dbo.sysusers where suid in (select suid from "+catalogName+".dbo.syslogins where name = '" + loginName
-                + "')";
+                + ".dbo.sysusers where suid in (select suid from " + catalogName + ".dbo.syslogins where name = ? )";
         return sql;
     }
 

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/database/SybaseDatabaseMetaData.java

@@ -13,9 +13,9 @@
 package org.talend.commons.utils.database;
 
 import java.sql.Connection;
+import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -54,10 +54,13 @@ public class SybaseDatabaseMetaData extends PackageFakeDatabaseMetadata {
         for (String catalogName : catList) {
             String sql = createSqlByLoginAndCatalog(login, catalogName);
             ResultSet rs = null;
-            Statement stmt = null;
+            PreparedStatement stmt = null;
             try {
-                stmt = connection.createStatement();
-                rs = stmt.executeQuery(sql);
+                stmt = connection.prepareStatement(sql);
+                stmt.setString(1, login);
+                stmt.setString(2, login);
+
+                rs = stmt.executeQuery();
 
                 while (rs.next()) {
                     int temp = rs.getInt(1);
@@ -92,11 +95,11 @@ public class SybaseDatabaseMetaData extends PackageFakeDatabaseMetadata {
     public ResultSet getSchemas(String catalog, String schemaPattern) throws SQLException {
         String sql = "SELECT DISTINCT name FROM " + catalog + ".dbo.sysusers where suid > 0"; //$NON-NLS-1$ //$NON-NLS-2$
         ResultSet rs = null;
-        Statement stmt = null;
+        PreparedStatement stmt = null;
         List<String[]> list = new ArrayList<String[]>();
         try {
-            stmt = connection.createStatement();
-            rs = stmt.executeQuery(sql);
+            stmt = connection.prepareStatement(sql);
+            rs = stmt.executeQuery();
 
             while (rs.next()) {
                 String name = rs.getString("name"); //$NON-NLS-1$
@@ -136,9 +139,9 @@ public class SybaseDatabaseMetaData extends PackageFakeDatabaseMetadata {
      */
     protected String createSqlByLoginAndCatalog(String loginName, String catalogName) {
         return "select count(*) from " + catalogName //$NON-NLS-1$
-                + ".dbo.sysusers where suid in (select suid from master.dbo.syslogins where name = '" + loginName //$NON-NLS-1$
-                + "') or suid in (select altsuid from " + catalogName //$NON-NLS-1$
-                + ".dbo.sysalternates a, master.dbo.syslogins b where b.name = '" + loginName + "' and a.suid = b.suid)"; //$NON-NLS-1$ //$NON-NLS-2$
+                + ".dbo.sysusers where suid in (select suid from master.dbo.syslogins where name = ?"
+                + ") or suid in (select altsuid from " + catalogName //$NON-NLS-1$
+                + ".dbo.sysalternates a, master.dbo.syslogins b where b.name = ? and a.suid = b.suid)"; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     @Override

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/database/TeradataDataBaseMetadata.java

@@ -13,9 +13,9 @@
 package org.talend.commons.utils.database;
 
 import java.sql.Connection;
+import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -97,13 +97,12 @@ public class TeradataDataBaseMetadata extends FakeDatabaseMetaData {
         int dbMajorVersion = connection.getMetaData().getDatabaseMajorVersion();
         String sql = "HELP COLUMN \"" + schema + "\".\"" + table + "\".* ";//$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
         ResultSet rs = null;
-        Statement stmt = null;
+        PreparedStatement stmt = null;
         String columnName = null;
         List<String[]> list = new ArrayList<String[]>();
         try {
             if (dbMajorVersion > 12) {
-                sql = "SELECT * from DBC.INDICESV WHERE UPPER(databasename) = UPPER('" + schema //$NON-NLS-1$
-                        + "') AND UPPER(tablename) = UPPER('" + table + "') AND UPPER(UniqueFlag) = UPPER('Y')"; //$NON-NLS-1$//$NON-NLS-2$
+                sql = "SELECT * from DBC.INDICESV WHERE UPPER(databasename) = UPPER(?) AND UPPER(tablename) = UPPER(?) AND UPPER(UniqueFlag) = UPPER('Y')"; //$NON-NLS-1$ //$NON-NLS-2$
                 rs = getResultSet(catalog, schema, table, sql);
                 while (rs.next()) {
                     columnName = rs.getString("ColumnName").trim(); //$NON-NLS-1$
@@ -112,8 +111,11 @@ public class TeradataDataBaseMetadata extends FakeDatabaseMetaData {
                     list.add(r);
                 }
             } else {
-                stmt = connection.createStatement();
-                rs = stmt.executeQuery(sql);
+                stmt = connection.prepareStatement(sql);
+                stmt.setString(1, schema);
+                stmt.setString(2, table);
+
+                rs = stmt.executeQuery();
                 while (rs.next()) {
                     columnName = rs.getString("Column Name").trim(); //$NON-NLS-1$
                     String pk = rs.getString("Primary?");//$NON-NLS-1$
@@ -138,10 +140,10 @@ public class TeradataDataBaseMetadata extends FakeDatabaseMetaData {
 
     public ResultSet getResultSet(String catalog, String schema, String table, String sql) throws SQLException {
         ResultSet rs = null;
-        Statement stmt = null;
+        PreparedStatement stmt = null;
         try {
-            stmt = connection.createStatement();
-            rs = stmt.executeQuery(sql);
+            stmt = connection.prepareStatement(sql);
+            rs = stmt.executeQuery();
         } catch (SQLException e) {
             throw new RuntimeException(e);
         }
@@ -203,17 +205,15 @@ public class TeradataDataBaseMetadata extends FakeDatabaseMetaData {
             sysTable = "DBC.TABLESV";//$NON-NLS-1$
         }
         if (types != null && types.length > 0) {
-            sql = "SELECT * from " + sysTable + " WHERE UPPER(databasename) = UPPER('" + database //$NON-NLS-1$//$NON-NLS-2$
-                    + "') AND tablekind " + addTypesToSql(types); //$NON-NLS-1$
+            sql = "SELECT * from " + sysTable + " WHERE UPPER(databasename) = UPPER(?) AND tablekind " + addTypesToSql(types); //$NON-NLS-1$
         } else {
             // When the types is empty, all the tables and views will be retrieved.
-            sql = "SELECT * from " + sysTable + " WHERE UPPER(databasename) = UPPER('" + database //$NON-NLS-1$//$NON-NLS-2$
-                    + "') AND (tablekind = 'T' or tablekind = 'V')"; //$NON-NLS-1$
+            sql = "SELECT * from " + sysTable + " WHERE UPPER(databasename) = UPPER(?) AND (tablekind = 'T' or tablekind = 'V')"; //$NON-NLS-1$
         }
 
         // add the filter for table/views
         if (!StringUtils.isEmpty(tableNamePattern)) {
-            sql = sql + " AND tablename LIKE '" + tableNamePattern + "'";//$NON-NLS-1$//$NON-NLS-2$
+            sql = sql + " AND tablename LIKE ?";//$NON-NLS-1$ //$NON-NLS-2$
         }
 
         if (types != null && types.length > 0) {
@@ -223,11 +223,18 @@ public class TeradataDataBaseMetadata extends FakeDatabaseMetaData {
         }
 
         ResultSet rs = null;
-        Statement stmt = null;
+        PreparedStatement stmt = null;
         List<String[]> list = new ArrayList<String[]>();
         try {
-            stmt = connection.createStatement();
-            rs = stmt.executeQuery(sql);
+            stmt = connection.prepareStatement(sql);
+            stmt.setString(1, database);
+
+            // add the filter for table/views
+            if (!StringUtils.isEmpty(tableNamePattern)) {
+                stmt.setString(2, tableNamePattern);
+            }
+
+            rs = stmt.executeQuery();
 
             while (rs.next()) {
                 String name = rs.getString("TableName").trim(); //$NON-NLS-1$
@@ -326,21 +333,33 @@ public class TeradataDataBaseMetadata extends FakeDatabaseMetaData {
         if (!StringUtils.isEmpty(database)) {
             sql = "HELP COLUMN \"" + database + "\".\"" + tableNamePattern + "\".* ";//$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
             if (dbMajorVersion > 12) {
-                sql = "SELECT * from DBC.COLUMNSV WHERE UPPER(databasename) = UPPER('" + database //$NON-NLS-1$
-                        + "') AND UPPER(tablename) = UPPER('" + tableNamePattern + "')" + " Order by tablename "; //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
+                sql = "SELECT * from DBC.COLUMNSV WHERE UPPER(databasename) = UPPER(?) AND UPPER(tablename) = UPPER(?)" //$NON-NLS-1$
+                        + " Order by tablename "; //$NON-NLS-1$ //$NON-NLS-3$
             }
         } else {
             sql = "HELP COLUMN \"" + tableNamePattern + "\".* ";//$NON-NLS-1$//$NON-NLS-2$
             if (dbMajorVersion > 12) {
-                sql = "SELECT * from DBC.COLUMNSV WHERE UPPER(tablename) = UPPER('" + tableNamePattern + "')" + " Order by tablename "; //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
+                sql = "SELECT * from DBC.COLUMNSV WHERE UPPER(tablename) = UPPER(?)" + " Order by tablename "; //$NON-NLS-1$//$NON-NLS-2$
+                                                                                                               // //$NON-NLS-3$
             }
         }
         ResultSet rs = null;
-        Statement stmt = null;
+        PreparedStatement stmt = null;
         List<String[]> list = new ArrayList<String[]>();
         try {
-            stmt = connection.createStatement();
-            rs = stmt.executeQuery(sql);
+            stmt = connection.prepareStatement(sql);
+            if (!StringUtils.isEmpty(database)) {
+                if (dbMajorVersion > 12) {
+                    stmt.setString(1, database);
+                    stmt.setString(2, tableNamePattern);
+                }
+            } else {
+                if (dbMajorVersion > 12) {
+                    stmt.setString(1, tableNamePattern);
+                }
+            }
+
+            rs = stmt.executeQuery();
             while (rs.next()) {
                 String tableName = tableNamePattern;
                 String columnName = null;

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/network/NetworkUtil.java

@@ -277,6 +277,10 @@ public class NetworkUtil {
         if (wrapIpV6 && Inet6Address.class.isInstance(inetAddress)) {
             String addr = inetAddress.getHostAddress();
             if (!addr.startsWith("[") || !addr.endsWith("]")) {
+                int idx = addr.indexOf("%");
+                if (idx > 0) {
+                    addr = addr.substring(0, idx);
+                }
                 addr = "[" + addr + "]";
             }
             return addr;

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/workbench/extensions/ExtensionImplementationProvider.java

@@ -12,16 +12,28 @@
 // ============================================================================
 package org.talend.commons.utils.workbench.extensions;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;
 import org.eclipse.core.runtime.IExtensionPoint;
 import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.preferences.ConfigurationScope;
+import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.IllegalPluginConfigurationException;
 import org.talend.commons.i18n.internal.Messages;
+import org.talend.utils.json.JSONException;
+import org.talend.utils.json.JSONObject;
 
 /**
  * Utilities class uses to get implementation of extension points defined by plug-ins. <br/>
@@ -36,6 +48,10 @@ public abstract class ExtensionImplementationProvider<I> {
 
     private String plugInId;
 
+    public final static String FILE_FEATURES_INDEX = "extra_feature.index";
+
+    public final static String DROP_BUNDLE_INFO = "drop.bundle.info";
+
     /**
      * Default Constructor. Must not be used.
      */
@@ -166,9 +182,17 @@ public abstract class ExtensionImplementationProvider<I> {
         }
 
         IExtension[] extensions = pt.getExtensions();
-
+        Map<String, String> dropBundles = null;
+        try {
+            dropBundles = getDropBundleInfo();
+        } catch (IOException e) {
+            ExceptionHandler.process(e);
+        }
         for (IExtension extension : extensions) {
-
+            if (dropBundles != null && dropBundles.containsKey(extension.getNamespaceIdentifier())
+                    && StringUtils.isEmpty(dropBundles.get(extension.getNamespaceIdentifier()))) {
+                continue;
+            }
             if (plugInId == null || extension.getNamespaceIdentifier().equals(plugInId)) {
                 String configurationElementName = extensionPointLimiter.getConfigurationElementName();
                 if (configurationElementName != null) {
@@ -196,6 +220,32 @@ public abstract class ExtensionImplementationProvider<I> {
         return toReturn;
     }
 
+    /**********************************************************
+     * Copied from org.talend.commons.configurator
+     **********************************************************/
+    public Map<String, String> getDropBundleInfo() throws IOException {
+        File indexFile = new File(ConfigurationScope.INSTANCE.getLocation().toFile(), FILE_FEATURES_INDEX);
+        if (!indexFile.exists()) {
+            return Collections.emptyMap();
+        }
+        Map<String, String> dropInfoMap = new HashMap<>();
+        try {
+            String jsonStr = new String(Files.readAllBytes(indexFile.toPath()));
+            if (!jsonStr.isEmpty()) {
+                JSONObject obj = new JSONObject(jsonStr);
+                JSONObject dropInfo = obj.getJSONObject(DROP_BUNDLE_INFO);
+                Iterator<String> iterator = dropInfo.keys();
+                while (iterator.hasNext()) {
+                    String key = iterator.next();
+                    dropInfoMap.put(key, dropInfo.getString(key));
+                }
+            }
+        } catch (JSONException e) {
+            throw new IOException(e);
+        }
+        return dropInfoMap;
+    }
+
     /**
      * DOC amaumont Comment method "createAndAddImplementation".
      *

main/plugins/org.talend.commons.ui/src/main/java/messages.properties

@@ -76,6 +76,8 @@ ExtendedTableMoveCommand.MoveLabel=Move up or down, one or more table entries
 ExtendedTablePasteCommand.Paste.Label=Paste data from the internal clipoard
 ExtendedTableRemoveCommand.Romve.Label=Remove table entries
 ExtendedTableResetDBTypesCommand.ResetDBTypes.Label=Reset all DB Types to get the defaults
+ExtendedTableCaseCommand.case.Label=Change selected DB columns to uppercase/lowercase
+ExtendedTableQuoteCommand.Quote.Label=Quote selected DB columns
 ImportPushButton.ImportButton.Tip=Replace all rows by import from xml file
 ImportPushButtonForExtendedTable.ErrorMsg.Text=Error occurred
 LabelledFileField.BrowseButton.Text=Browse...

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/advanced/composite/TwoCompositesSashForm.java

@@ -0,0 +1,172 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.commons.ui.swt.advanced.composite;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Sash;
+
+/**
+ * This class is used for constructing 2 composites, putting 1 sashes in the middle composite, which is used for
+ * changing other 2 composites.
+ *
+ */
+public class TwoCompositesSashForm extends Composite {
+
+    public static final int SASH_WIDTH = 3;
+
+    private Composite leftComposite;
+
+    private Composite rightComposite;
+
+    private Sash midSash;
+
+    /**
+     * Initialize.
+     *
+     * @param parent
+     * @param style
+     */
+    public TwoCompositesSashForm(Composite parent, int style) {
+        super(parent, style);
+        final GridLayout gridLayout = new GridLayout();
+        gridLayout.numColumns = 3;
+        gridLayout.marginBottom = 0;
+        gridLayout.marginHeight = 0;
+        gridLayout.marginLeft = 0;
+        gridLayout.marginRight = 0;
+        gridLayout.marginTop = 0;
+        gridLayout.marginWidth = 0;
+        gridLayout.horizontalSpacing = 0;
+
+        setLayout(gridLayout);
+        final GridData gridData = new GridData(GridData.FILL_BOTH);
+        setLayoutData(gridData);
+
+        addComponents();
+        addSashListeners();
+    }
+
+    /**
+     * Changes all widgets's position when sash was moved.
+     *
+     * @param shift
+     */
+    private void setCompositesBounds(int shift) {
+        // Set mid Composite Width.
+        int midSashPreLocation = midSash.getBounds().x;
+        midSash.setLocation(midSashPreLocation + shift, midSash.getBounds().y);
+        if (midSash.getBounds().x > 0) {
+            if (midSashPreLocation < 0) {
+                leftComposite.setSize(leftComposite.getBounds().width + shift + midSashPreLocation, leftComposite
+                        .getBounds().height);
+            } else {
+                leftComposite.setSize(leftComposite.getBounds().width + shift, leftComposite.getBounds().height);
+            }
+        } else {
+            leftComposite.setSize(0, leftComposite.getBounds().height);
+        }
+        // Set Right Composte Width.
+        rightComposite.setLocation(rightComposite.getBounds().x + shift, rightComposite.getBounds().y);
+        rightComposite.setSize(rightComposite.getBounds().width - shift, rightComposite.getBounds().height);
+    }
+
+    public Composite getLeftComposite() {
+        return this.leftComposite;
+    }
+
+    public Composite getRightComposite() {
+        return this.rightComposite;
+    }
+
+    private void addSashListeners() {
+        midSash.addListener(SWT.Selection, new Listener() {
+
+            /*
+             * (non-Java)
+             *
+             * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
+             */
+            public void handleEvent(Event event) {
+                int shift = event.x - midSash.getBounds().x;
+                setCompositesBounds(shift);
+            }
+
+        });
+    }
+
+    private void addComponents() {
+        leftComposite = new Composite(this, SWT.NONE);
+        GridLayout gridLayout = new GridLayout();
+        gridLayout.marginBottom = 0;
+        gridLayout.marginHeight = 0;
+        gridLayout.marginLeft = 0;
+        gridLayout.marginRight = 0;
+        gridLayout.marginTop = 0;
+        gridLayout.marginWidth = 0;
+        gridLayout.horizontalSpacing = 0;
+        GridData gridData = new GridData(GridData.FILL_BOTH);
+
+        leftComposite.setLayout(gridLayout);
+        leftComposite.setLayoutData(gridData);
+
+        midSash = new Sash(this, SWT.VERTICAL | SWT.SMOOTH);
+        GridData gridData2 = new GridData(GridData.FILL_VERTICAL);
+        midSash.setLayoutData(gridData2);
+        midSash.setSize(SASH_WIDTH, midSash.getBounds().height);
+
+        rightComposite = new Composite(this, SWT.NONE);
+        GridLayout gridLayout3 = new GridLayout();
+        gridLayout3.marginBottom = 0;
+        gridLayout3.marginHeight = 0;
+        gridLayout3.marginLeft = 0;
+        gridLayout3.marginRight = 0;
+        gridLayout3.marginTop = 0;
+        gridLayout3.marginWidth = 0;
+        gridLayout3.horizontalSpacing = 0;
+        rightComposite.setLayout(gridLayout3);
+        GridData gridData4 = new GridData(GridData.FILL_BOTH);
+        rightComposite.setLayoutData(gridData4);
+    }
+
+    public void setGridDatas() {
+        Composite composite = (Composite) leftComposite.getChildren()[0];
+        GridLayout gridLayout2 = new GridLayout();
+        gridLayout2.marginBottom = 0;
+        gridLayout2.marginHeight = 0;
+        gridLayout2.marginLeft = 0;
+        gridLayout2.marginRight = 0;
+        gridLayout2.marginTop = 0;
+        gridLayout2.marginWidth = 0;
+        gridLayout2.horizontalSpacing = 0;
+        composite.setLayout(gridLayout2);
+        composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+        Composite composite2 = (Composite) rightComposite.getChildren()[0];
+        gridLayout2 = new GridLayout();
+        gridLayout2.marginBottom = 0;
+        gridLayout2.marginHeight = 0;
+        gridLayout2.marginLeft = 0;
+        gridLayout2.marginRight = 0;
+        gridLayout2.marginTop = 0;
+        gridLayout2.marginWidth = 0;
+        gridLayout2.horizontalSpacing = 0;
+        composite2.setLayout(gridLayout2);
+        composite2.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+    }
+}

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/advanced/dataeditor/ExtendedToolbarView.java

@@ -27,11 +27,13 @@ import org.talend.commons.ui.swt.advanced.dataeditor.button.MoveDownPushButtonFo
 import org.talend.commons.ui.swt.advanced.dataeditor.button.MoveUpPushButton;
 import org.talend.commons.ui.swt.advanced.dataeditor.button.MoveUpPushButtonForExtendedTable;
 import org.talend.commons.ui.swt.advanced.dataeditor.button.PastePushButton;
+import org.talend.commons.ui.swt.advanced.dataeditor.button.QuotePushButton;
 import org.talend.commons.ui.swt.advanced.dataeditor.button.RemovePushButton;
 import org.talend.commons.ui.swt.advanced.dataeditor.button.RemovePushButtonForExtendedTable;
 import org.talend.commons.ui.swt.advanced.dataeditor.button.ResetDBTypesPushButton;
 import org.talend.commons.ui.swt.advanced.dataeditor.button.SaveAsGenericSchemaPushButton;
 import org.talend.commons.ui.swt.advanced.dataeditor.button.SelectContextVariablesPushButton;
+import org.talend.commons.ui.swt.advanced.dataeditor.button.CasePushButton;
 import org.talend.commons.ui.swt.advanced.dataeditor.control.ExtendedPushButton;
 import org.talend.commons.ui.swt.extended.table.AbstractExtendedTableViewer;
 
@@ -67,7 +69,11 @@ public class ExtendedToolbarView extends AbstractExtendedToolbar {
     protected ResetDBTypesPushButton resetDBTypesButton;
 
     protected SelectContextVariablesPushButton selectContextVariablesButton;
+    
+    protected CasePushButton caseButton;
 
+    protected QuotePushButton quoteButton;
+    
     /**
      * DOC amaumont MatadataToolbarEditor constructor comment.
      *
@@ -103,7 +109,11 @@ public class ExtendedToolbarView extends AbstractExtendedToolbar {
         pasteButton = createPastePushButton();
 
         addallButton = createAddAllPushButton();
-
+        
+        caseButton = createCasePushButton();
+        
+        quoteButton = createQuotePushButton();
+        
         exportButton = createExportPushButton();
 
         importButton = createImportPushButton();
@@ -169,6 +179,14 @@ public class ExtendedToolbarView extends AbstractExtendedToolbar {
     protected SelectContextVariablesPushButton createSelectContextVariablesPushButton() {
         return null;
     }
+    
+    protected CasePushButton createCasePushButton() {
+        return null;
+    }
+    
+    protected QuotePushButton createQuotePushButton() {
+        return null;
+    }
 
     /**
      * Getter for addButton.
@@ -327,6 +345,14 @@ public class ExtendedToolbarView extends AbstractExtendedToolbar {
         if (getAddallButton() != null) {
             list.add(getAddallButton());
         }
+        
+        if (getCaseButton() != null) {
+            list.add(getCaseButton());
+        }
+        
+        if (getQuoteButton() != null) {
+            list.add(getQuoteButton());
+        }
 
         return list;
     }
@@ -348,6 +374,26 @@ public class ExtendedToolbarView extends AbstractExtendedToolbar {
     public AddAllPushButton getAddallButton() {
         return this.addallButton;
     }
+    
+    /**
+     * Getter for caseButton.
+     *
+     * @return the caseButton
+     */
+    public CasePushButton getCaseButton() {
+        return this.caseButton;
+    }
+    
+    
+    /**
+     * Getter for quoteButton.
+     *
+     * @return the quoteButton
+     */
+    public QuotePushButton getQuoteButton() {
+        return this.quoteButton;
+    }
+    
 }
 
 //

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/advanced/dataeditor/button/CasePushButton.java

@@ -0,0 +1,48 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.commons.ui.swt.advanced.dataeditor.button;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.swt.widgets.Composite;
+import org.talend.commons.ui.runtime.i18n.Messages;
+import org.talend.commons.ui.runtime.image.EImage;
+import org.talend.commons.ui.runtime.image.ImageProvider;
+import org.talend.commons.ui.swt.advanced.dataeditor.control.ExtendedPushButton;
+import org.talend.commons.ui.swt.extended.table.AbstractExtendedControlViewer;
+
+public abstract class CasePushButton extends ExtendedPushButton {
+
+    /**
+     * DOC  CasePushButton constructor comment.
+     *
+     * @param parent
+     * @param extendedControlViewer
+     */
+    public CasePushButton(Composite parent, AbstractExtendedControlViewer extendedControlViewer) {
+        super(parent, extendedControlViewer,
+                Messages.getString("CasePushButton.CaseButton.Tip"), ImageProvider.getImage(EImage.UPPERCASE_ICON)); //$NON-NLS-1$
+    }
+
+    protected abstract Command getCommandToExecute();
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.talend.commons.ui.swt.advanced.dataeditor.control.ExtendedPushButton#getEnabledState()
+     */
+    @Override
+    public boolean getEnabledState() {
+        return super.getEnabledState() && !getExtendedControlViewer().isReadOnly();
+    }
+
+}

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/advanced/dataeditor/button/CasePushButtonForExtendedTable.java

@@ -0,0 +1,87 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.commons.ui.swt.advanced.dataeditor.button;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.swt.widgets.Composite;
+import org.talend.commons.ui.runtime.i18n.Messages;
+import org.talend.commons.ui.runtime.image.EImage;
+import org.talend.commons.ui.runtime.image.ImageProvider;
+import org.talend.commons.ui.swt.extended.table.AbstractExtendedTableViewer;
+import org.talend.commons.ui.swt.extended.table.ExtendedTableModel;
+
+public abstract class CasePushButtonForExtendedTable extends CasePushButton implements IExtendedTablePushButton {
+
+    private EnableStateListenerForTableButton enableStateHandler;
+    private boolean isUpperCase = true;
+
+    /**
+     * DOC  CasePushButtonForExtendedTable constructor comment.
+     *
+     * @param parent
+     * @param extendedControlViewer
+     */
+    public CasePushButtonForExtendedTable(Composite parent, AbstractExtendedTableViewer extendedTableViewer) {
+        super(parent, extendedTableViewer);
+        this.enableStateHandler = new EnableStateListenerForTableButton(this);
+    }
+    
+    @Override
+    protected void afterCommandExecution(Command executedCommand) {
+       super.afterCommandExecution(executedCommand);
+       if (isUpperCase) {
+           this.getButton().setToolTipText( Messages.getString("CasePushButton.CaseButton.Tip"));
+           this.getButton().setImage(ImageProvider.getImage(EImage.LOWERCASE_ICON));
+           this.isUpperCase = false;
+       } else {
+           this.getButton().setToolTipText( Messages.getString("CasePushButton.CaseButton.Tip"));
+           this.getButton().setImage(ImageProvider.getImage(EImage.UPPERCASE_ICON));
+           this.isUpperCase = true;
+       }
+    }
+
+    @Override
+    protected Command getCommandToExecute() {
+        AbstractExtendedTableViewer extendedTableViewer = (AbstractExtendedTableViewer) extendedControlViewer;
+        ExtendedTableModel extendedTableModel = extendedTableViewer.getExtendedTableModel();
+        TableViewer tableViewer = extendedTableViewer.getTableViewerCreator().getTableViewer();
+        ISelection selection = tableViewer.getSelection();
+        StructuredSelection structuredSelection = (StructuredSelection) selection;
+        Object[] objects = structuredSelection.toArray();
+        int[] selectionIndices = extendedTableViewer.getTableViewerCreator().getTable().getSelectionIndices();
+        return getCommandToExecute(extendedTableModel, Arrays.asList(objects), selectionIndices, isUpperCase);
+    }
+    
+    protected abstract Command getCommandToExecute(ExtendedTableModel extendedTable, List beansToUppercase, int[] selectionIndices, boolean isUpperCase);
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.talend.core.ui.extended.button.IExtendedTablePushButton#getExtendedTableViewer()
+     */
+    public AbstractExtendedTableViewer getExtendedTableViewer() {
+        return (AbstractExtendedTableViewer) getExtendedControlViewer();
+    }
+
+    @Override
+    public boolean getEnabledState() {
+        return super.getEnabledState() && this.enableStateHandler.getEnabledState();
+    }
+
+}

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/advanced/dataeditor/button/QuotePushButton.java

@@ -0,0 +1,57 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.commons.ui.swt.advanced.dataeditor.button;
+
+import org.eclipse.swt.widgets.Composite;
+import org.talend.commons.ui.runtime.i18n.Messages;
+import org.talend.commons.ui.runtime.image.EImage;
+import org.talend.commons.ui.runtime.image.ImageProvider;
+import org.talend.commons.ui.swt.advanced.dataeditor.control.ExtendedPushButton;
+import org.talend.commons.ui.swt.extended.table.AbstractExtendedControlViewer;
+
+public abstract class QuotePushButton extends ExtendedPushButton {
+    
+    private String dbmsId = null;
+
+    /**
+     * DOC QuotePushButton constructor comment.
+     *
+     * @param parent
+     * @param extendedControlViewer
+     */
+    public QuotePushButton(Composite parent, AbstractExtendedControlViewer extendedControlViewer) {
+        super(parent, extendedControlViewer,
+                Messages.getString("QuotePushButton.QuoteButton.Tip"), ImageProvider.getImage(EImage.EDIT_ICON)); //$NON-NLS-1$
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.talend.commons.ui.swt.advanced.dataeditor.control.ExtendedPushButton#getEnabledState()
+     */
+    @Override
+    public boolean getEnabledState() {
+        return super.getEnabledState() && !getExtendedControlViewer().isReadOnly();
+    }
+
+    
+    public String getDbmsId() {
+        return dbmsId;
+    }
+
+    
+    public void setDbmsId(String dbmsId) {
+        this.dbmsId = dbmsId;
+    }
+    
+}

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/advanced/dataeditor/button/QuotePushButtonForExtendedTable.java

@@ -0,0 +1,205 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.commons.ui.swt.advanced.dataeditor.button;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.window.Window;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.talend.commons.ui.runtime.i18n.Messages;
+import org.talend.commons.ui.swt.extended.table.AbstractExtendedTableViewer;
+import org.talend.commons.ui.swt.extended.table.ExtendedTableModel;
+
+public abstract class QuotePushButtonForExtendedTable extends QuotePushButton implements IExtendedTablePushButton {
+
+    private String quote = null;
+    private boolean isAddingQuote = true;
+    private EnableStateListenerForTableButton enableStateHandler;
+
+    /**
+     * DOC SchemaTargetAddPushButton constructor comment.
+     *
+     * @param parent
+     * @param extendedControlViewer
+     */
+    public QuotePushButtonForExtendedTable(Composite parent, AbstractExtendedTableViewer extendedTableViewer) {
+        super(parent, extendedTableViewer);
+        this.enableStateHandler = new EnableStateListenerForTableButton(this);
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.talend.commons.ui.swt.advanced.dataeditor.control.ExtendedPushButton#beforeCommandExecution()
+     */
+    @Override
+    protected void beforeCommandExecution() {
+        QuoteManipulateDialog dlg = new QuoteManipulateDialog(getButton().getShell());
+        if (dlg.open() == Window.OK) {
+            this.quote = dlg.getQuote();
+            this.isAddingQuote = dlg.isAddingQuote();
+        }
+    }
+
+    protected Command getCommandToExecute() {
+        if (quote == null) return null;
+        AbstractExtendedTableViewer extendedTableViewer = (AbstractExtendedTableViewer) extendedControlViewer;
+        ExtendedTableModel extendedTableModel = extendedTableViewer.getExtendedTableModel();
+        TableViewer tableViewer = extendedTableViewer.getTableViewerCreator().getTableViewer();
+        ISelection selection = tableViewer.getSelection();
+        StructuredSelection structuredSelection = (StructuredSelection) selection;
+        Object[] objects = structuredSelection.toArray();
+        int[] selectionIndices = extendedTableViewer.getTableViewerCreator().getTable().getSelectionIndices();
+        return getCommandToExecute(extendedTableModel, Arrays.asList(objects), selectionIndices, quote, isAddingQuote );
+    }
+
+    protected abstract Command getCommandToExecute(ExtendedTableModel extendedTable, List beansToUppercase, int[] selectionIndices, String quote, boolean isAddingQuote);
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.talend.core.ui.extended.button.IExtendedTablePushButton#getExtendedTableViewer()
+     */
+    public AbstractExtendedTableViewer getExtendedTableViewer() {
+        return (AbstractExtendedTableViewer) getExtendedControlViewer();
+    }
+    
+    @Override
+    public boolean getEnabledState() {
+        return super.getEnabledState() && this.enableStateHandler.getEnabledState();
+    }
+    
+    class QuoteManipulateDialog extends Dialog {
+        
+        private Button addBtn;
+        private Button removeBtn;
+        private Text quoteTxt;
+        private Button okBtn;
+        boolean isAddingQuote = true;
+        String quote = "";
+
+        public QuoteManipulateDialog(Shell parentShel) {
+            super(parentShel);
+        }
+        
+        /*
+         * (non-Javadoc)
+         *
+         * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
+         */
+        protected void configureShell(Shell shell) {
+            super.configureShell(shell);
+            shell.setText(Messages.getString("QuoteManipulateDialog.title"));
+        }
+        
+        /*
+         * (non-Javadoc)
+         *
+         * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite)
+         */
+        protected void createButtonsForButtonBar(Composite parent) {
+            // create OK and Cancel buttons by default
+            okBtn = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
+            createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
+            okBtn.setEnabled(false);
+        }
+        
+        /*
+         * (non-Javadoc) Method declared on Dialog.
+         */
+        protected Control createDialogArea(Composite parent) {
+            Composite composite = new Composite(parent, SWT.NONE);
+            GridLayout layout = new GridLayout();
+            layout.numColumns = 4;
+            composite.setLayout(layout);
+            GridData layoutData = new GridData(GridData.FILL_BOTH);
+            layoutData.widthHint = 400;
+            composite.setLayoutData(layoutData);
+            addBtn = new Button(composite, SWT.RADIO);
+            addBtn.setSelection(true);
+            Label label = new Label(composite, SWT.WRAP);
+            label.setText(Messages.getString("QuoteManipulateDialog.addQuote")); //$NON-NLS-1$
+            
+            removeBtn = new Button(composite, SWT.RADIO);
+            Label label1 = new Label(composite, SWT.WRAP);
+            label1.setText(Messages.getString("QuoteManipulateDialog.removeQuote")); //$NON-NLS-1$
+            
+            quoteTxt = new Text(composite, SWT.SINGLE | SWT.BORDER);
+            layoutData = new GridData(GridData.FILL_HORIZONTAL);
+            layoutData.horizontalSpan = 4;
+            quoteTxt.setLayoutData(layoutData);
+            quoteTxt.setText("");
+            quoteTxt.setFocus();
+            
+            addBtn.addSelectionListener(new SelectionAdapter() {
+                @Override
+                public void widgetSelected(SelectionEvent e) {
+                    isAddingQuote = true;
+                    quoteTxt.setFocus();
+                    quote = quoteTxt.getText();
+                }
+            });
+            
+            removeBtn.addSelectionListener(new SelectionAdapter() {
+                @Override
+                public void widgetSelected(SelectionEvent e) {
+                    isAddingQuote = false;
+                    quoteTxt.setFocus();
+                    quote = quoteTxt.getText();
+                }
+            });
+            
+            quoteTxt.addModifyListener(new ModifyListener() {
+
+                public void modifyText(ModifyEvent e) {
+                    quote = quoteTxt.getText();
+                    if ( quote != null && quote.length() > 0) {
+                        okBtn.setEnabled(true);
+                    } else {
+                        okBtn.setEnabled(false);
+                    }
+                }
+            });
+            
+            
+            return composite;
+        }
+        
+        public boolean isAddingQuote() {
+            return this.isAddingQuote;
+        }
+        
+        public String getQuote() {
+            return this.quote;
+        }
+    }
+}

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/advanced/dataeditor/commands/ExtendedTableCaseCommand.java

@@ -0,0 +1,88 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.commons.ui.swt.advanced.dataeditor.commands;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.gef.commands.Command;
+import org.talend.commons.ui.runtime.i18n.Messages;
+import org.talend.commons.ui.swt.extended.table.ExtendedTableModel;
+
+public abstract class ExtendedTableCaseCommand extends Command implements IExtendedTableCommand {
+
+    private ExtendedTableModel extendedTable;
+
+    private List beansToCovertCase;
+    
+    private int[]  selectionIndices;
+    
+    private boolean isUpperCase;
+    
+
+    public static final String LABEL = Messages.getString("ExtendedTableCaseCommand.case.Label"); //$NON-NLS-1$
+
+    /**
+     * DOC ExtendedTableCaseCommand constructor comment.
+     */
+    @SuppressWarnings("unchecked")//$NON-NLS-1$
+    public ExtendedTableCaseCommand(ExtendedTableModel extendedTable, List beansToCovertCase, int[] selectionIndices, boolean isUpperCase) {
+        super(LABEL);
+        this.extendedTable = extendedTable;
+        this.beansToCovertCase = new ArrayList(beansToCovertCase);
+        this.selectionIndices = selectionIndices;
+        this.isUpperCase = isUpperCase;
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.eclipse.gef.commands.Command#execute()
+     */
+    @Override
+    public void execute() {
+        convertCase(extendedTable, beansToCovertCase, selectionIndices, isUpperCase);
+        
+    }
+    
+    public abstract void convertCase(ExtendedTableModel extendedTable, List copiedObjectsList, int[] selectionIndices, boolean isUpperCase);
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.talend.commons.ui.command.CommonCommand#canUndo()
+     */
+    @Override
+    public boolean canUndo() {
+        return false;
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.talend.commons.ui.command.CommonCommand#redo()
+     */
+    @Override
+    public void redo() {
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.talend.commons.ui.command.CommonCommand#undo()
+     */
+    @Override
+    public void undo() {
+    }
+
+}

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/advanced/dataeditor/commands/ExtendedTableQuoteCommand.java

@@ -0,0 +1,90 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.commons.ui.swt.advanced.dataeditor.commands;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.eclipse.gef.commands.Command;
+import org.talend.commons.ui.runtime.i18n.Messages;
+import org.talend.commons.ui.swt.extended.table.ExtendedTableModel;
+
+public abstract class ExtendedTableQuoteCommand extends Command implements IExtendedTableCommand {
+
+    private ExtendedTableModel extendedTable;
+
+    private List beansToQuote;
+    
+    private int[]  selectionIndices;
+    
+    private String quote;
+    
+    boolean isAddingQuote;
+    
+
+    public static final String LABEL = Messages.getString("ExtendedTableQuoteCommand.Quote.Label"); //$NON-NLS-1$
+
+    /**
+     * DOC ExtendedTableQuoteCommand constructor comment.
+     */
+    @SuppressWarnings("unchecked")//$NON-NLS-1$
+    public ExtendedTableQuoteCommand(ExtendedTableModel extendedTable, List beansToQuote, int[] selectionIndices, String quote, boolean isAddingQuote) {
+        super(LABEL);
+        this.extendedTable = extendedTable;
+        this.beansToQuote = new ArrayList(beansToQuote);
+        this.selectionIndices = selectionIndices;
+        this.quote = quote;
+        this.isAddingQuote = isAddingQuote;
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.eclipse.gef.commands.Command#execute()
+     */
+    @Override
+    public void execute() {
+        toQuote(extendedTable, beansToQuote, selectionIndices, quote, isAddingQuote);
+        
+    }
+    
+    public abstract void toQuote(ExtendedTableModel extendedTable, List copiedObjectsList, int[] selectionIndices, String quote, boolean isAddingQuote);
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.talend.commons.ui.command.CommonCommand#canUndo()
+     */
+    @Override
+    public boolean canUndo() {
+        return false;
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.talend.commons.ui.command.CommonCommand#redo()
+     */
+    @Override
+    public void redo() {
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.talend.commons.ui.command.CommonCommand#undo()
+     */
+    @Override
+    public void undo() {
+    }
+
+}

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/extended/table/ExtendedTableModel.java

@@ -178,6 +178,23 @@ public class ExtendedTableModel<B> extends AbstractExtendedControlModel {
     public void setUseEquals(boolean useEquals) {
         beansList.setUseEquals(useEquals);
     }
+    
+   /**
+    *
+    * Replace bean.
+    *
+    * @param bean
+    * @param index can be null
+    */
+   public void replace(B bean, Integer index) {
+       
+       if (tableViewer != null && !tableViewer.getTable().isDisposed()) {
+           tableViewer.replace(bean, index);
+           tableViewer.refresh(bean, true, true);
+       }
+       this.beansList.replaceElement(index, bean);
+   }
+
 
     /**
      * DOC amaumont Comment method "remove".

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/AbstractEMFRepositoryFactory.java

@@ -12,11 +12,14 @@
 // ============================================================================
 package org.talend.core.repository.model;
 
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -623,8 +626,7 @@ public abstract class AbstractEMFRepositoryFactory extends AbstractRepositoryFac
             stream.close();
 
             byte[] currentContent = item.getContent().getInnerContent();
-
-            if (!Arrays.equals(innerContent, currentContent)) {
+            if (!isSameStringContent(innerContent, currentContent)) {
                 item.getContent().setInnerContent(innerContent);
                 Project project = getRepositoryContext().getProject();
                 save(project, item);
@@ -641,6 +643,44 @@ public abstract class AbstractEMFRepositoryFactory extends AbstractRepositoryFac
             throw new PersistenceException(ioe);
         }
     }
+    
+    protected boolean isSameStringContent(byte[] data1, byte[] data2) throws IOException {
+        boolean isSame = true;
+        BufferedReader br1 = null, br2 = null;
+        try {
+            br1 = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(data1), StandardCharsets.UTF_8.toString()));
+            br2 = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(data2), StandardCharsets.UTF_8.toString()));
+            String line1 = null, line2 = null;
+            while (isSame) {
+                line1 = br1.readLine();
+                line2 = br2.readLine();
+                if ((line1 == null && line2 == null)) {
+                    break;
+                }
+                if (!StringUtils.equals(line1, line2)) {
+                    isSame = false;
+                    break;
+                }
+            }
+        } finally {
+            if (br1 != null) {
+                try {
+                    br1.close();
+                } catch (IOException e) {
+                    ExceptionHandler.process(e);
+                }
+            }
+            if (br2 != null) {
+                try {
+                    br2.close();
+                } catch (IOException e) {
+                    ExceptionHandler.process(e);
+                }
+            }
+        }
+
+        return isSame;
+    }
 
     private void createSQLPattern(URL url, String sqlPatternLabel, String categoryName) throws PersistenceException {
         if (url == null) {
@@ -693,8 +733,7 @@ public abstract class AbstractEMFRepositoryFactory extends AbstractRepositoryFac
             stream.close();
 
             byte[] currentContent = item.getContent().getInnerContent();
-
-            if (!Arrays.equals(innerContent, currentContent)) {
+            if (!isSameStringContent(innerContent, currentContent)) {
                 item.getContent().setInnerContent(innerContent);
                 Project project = getRepositoryContext().getProject();
                 save(project, item);
@@ -833,25 +872,38 @@ public abstract class AbstractEMFRepositoryFactory extends AbstractRepositoryFac
     @Override
     public IRepositoryViewObject getLastVersion(Project project, String id, String relativeFolder, ERepositoryObjectType type)
             throws PersistenceException {
-        List<IRepositoryViewObject> serializableAllVersion = null;
-        Object fullFolder = getFullFolder(project, type, relativeFolder);
-        serializableAllVersion = getSerializableFromFolder(project, fullFolder, id, type, false, false, true, true);
+        List<IRepositoryViewObject> serializableAllVersion = new ArrayList<>();
+        if (lastFolderForItemMap.containsKey(id)) {
+            ERepositoryObjectType itemType = lastRepositoryTypeForItemMap.get(id);
+            String currentPath = lastFolderForItemMap.get(id);
+            Object fullFolder = getFullFolder(project, itemType, currentPath);
+            try {
+                if (fullFolder != null && (fullFolder instanceof FolderItem || ((IFolder) fullFolder).exists())) {
+                    serializableAllVersion.addAll(getSerializableFromFolder(project, fullFolder, id, itemType, false, false, true, true));
+                }
+            } catch (PersistenceException e) {
+                // do nothing.
+                // if any exception happen or can't find the item, just try to look for it everywhere.
+            }
+        }
         if (serializableAllVersion.isEmpty()) {
-            // look in all folders for this item type
-            serializableAllVersion = getSerializableFromFolder(project, fullFolder, id, type, false, true, true, true, true);
+            Object fullFolder = getFullFolder(project, type, relativeFolder);
+            serializableAllVersion = getSerializableFromFolder(project, fullFolder, id, type, false, false, true, true);
+            if (serializableAllVersion.isEmpty()) {
+                // look in all folders for this item type
+                serializableAllVersion = getSerializableFromFolder(project, fullFolder, id, type, false, true, true, true, true);
+            }
         }
         int size = serializableAllVersion.size();
-
         if (size > 1) {
             String message = getItemsMessages(serializableAllVersion, size);
-
             throw new PersistenceException(Messages.getString(
                     "AbstractEMFRepositoryFactory.presistenceException.OnlyOneOccurenceMustbeFound", message)); //$NON-NLS-1$
-        } else if (size == 1) {
-            return serializableAllVersion.get(0);
-        } else {
-            return null;
         }
+        if (size == 1) {
+            return serializableAllVersion.get(0);
+        }
+        return null;
     }
 
     protected void computePropertyMaxInformationLevel(Property property) {

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/IRepositoryFactory.java

@@ -463,4 +463,8 @@ public interface IRepositoryFactory {
     public boolean isRepositoryBusy();
 
     public RepositoryWorkUnit getWorkUnitInProgress();
+    
+    public void deleteOldVersionPhysical(Project project, IRepositoryViewObject objToDelete, String version) throws PersistenceException;
+    
+    public void batchDeleteOldVersionsPhysical(Project project, List<IRepositoryViewObject> objToDeleteList, boolean isDeleteOnRemote, IProgressMonitor monitor) throws PersistenceException;
 }

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/ProxyRepositoryFactory.java

@@ -16,7 +16,6 @@ import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Dictionary;
@@ -89,7 +88,6 @@ import org.talend.core.hadoop.BigDataBasicUtil;
 import org.talend.core.model.general.ILibrariesService;
 import org.talend.core.model.general.ModuleNeeded;
 import org.talend.core.model.general.Project;
-import org.talend.core.model.metadata.MetadataTalendType;
 import org.talend.core.model.metadata.builder.connection.AbstractMetadataObject;
 import org.talend.core.model.metadata.builder.connection.MetadataTable;
 import org.talend.core.model.migration.IMigrationToolService;
@@ -110,6 +108,7 @@ import org.talend.core.model.properties.Property;
 import org.talend.core.model.properties.RoutineItem;
 import org.talend.core.model.properties.SpagoBiServer;
 import org.talend.core.model.properties.Status;
+import org.talend.core.model.properties.TDQItem;
 import org.talend.core.model.properties.User;
 import org.talend.core.model.properties.impl.FolderItemImpl;
 import org.talend.core.model.relationship.RelationshipItemBuilder;
@@ -141,6 +140,7 @@ import org.talend.core.runtime.util.ItemDateParser;
 import org.talend.core.runtime.util.SharedStudioUtils;
 import org.talend.core.service.ICoreUIService;
 import org.talend.core.service.IUpdateService;
+import org.talend.core.service.IDetectCVEService;
 import org.talend.core.utils.CodesJarResourceCache;
 import org.talend.cwm.helper.SubItemHelper;
 import org.talend.cwm.helper.TableHelper;
@@ -411,7 +411,8 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 }
 
                 boolean isThrow = true;
-                if (tdqRepService != null && CoreRuntimePlugin.getInstance().isDataProfilePerspectiveSelected()) {
+                if (tdqRepService != null && (CoreRuntimePlugin.getInstance().isDataProfilePerspectiveSelected()
+                        || item instanceof TDQItem)) {
                     // change MessageBox to DeleteModelElementConfirmDialog
                     InputDialog inputDialog = tdqRepService.getInputDialog(item);
                     if (MessageDialog.OK == inputDialog.open()) {
@@ -2238,14 +2239,6 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                     TimeMeasurePerformance.step("logOnProject", "Sync components libraries"); //$NON-NLS-1$
                 }
 
-                try {
-                    // for new added mapping file, sync to project mapping folder
-                    MetadataTalendType.syncNewMappingFileToProject();
-                } catch (SystemException e) {
-                    // ignore
-                    ExceptionHandler.process(e);
-                }
-
                 CodesJarResourceCache.initCodesJarCache();
 
                 currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
@@ -2281,6 +2274,9 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 IRunProcessService runProcessService = getRunProcessService();
                 if (runProcessService != null) {
                     runProcessService.initMavenJavaProject(monitor, project);
+
+                    // before afterLogon migration execute, check and update daikon dependency
+                    runProcessService.checkAndUpdateDaikonDependencies();
                 }
 
                 currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
@@ -2343,17 +2339,6 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                     TimeMeasurePerformance.step("logOnProject", "sync log4j"); //$NON-NLS-1$ //$NON-NLS-2$
                 }
 
-                try {
-                    URL url = MetadataTalendType.getProjectForderURLOfMappingsFile();
-                    if (url != null) {
-                        // set the project mappings url
-                        System.setProperty("talend.mappings.url", url.toString()); // $NON-NLS-1$
-                    }
-                } catch (SystemException e) {
-                    // ignore
-                    ExceptionHandler.process(e);
-                }
-
                 if (runProcessService != null && !isCommandLineLocalRefProject) {
                     runProcessService.initializeRootPoms(monitor);
 
@@ -2462,6 +2447,15 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         if (runProcessService != null) {
             runProcessService.clearProjectRelatedSettings();
         }
+
+        // clear detect CVE cache
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(IDetectCVEService.class)) {
+            IDetectCVEService detectCVESvc = GlobalServiceRegister.getDefault().getService(IDetectCVEService.class);
+            if (detectCVESvc != null) {
+                detectCVESvc.clearCache();
+            }
+        }
+
         ReferenceProjectProvider.clearTacReferenceList();
         ReferenceProjectProblemManager.getInstance().clearAll();
         fullLogonFinished = false;
@@ -2784,4 +2778,81 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
             }
         }
     }
+    
+    @Override
+    public void deleteOldVersionPhysical(Project project, IRepositoryViewObject objToDelete, String version) throws PersistenceException {
+        if (project == null || objToDelete == null || objToDelete.getProperty() == null) {
+            return;
+        }
+        // RepositoryViewObject is dynamic, so force to use in all case the RepositoryObject with fixed object.
+        IRepositoryViewObject object = new RepositoryObject(objToDelete.getProperty());
+
+        ERepositoryObjectType repositoryObjectType = object.getRepositoryObjectType();
+
+        ICoreService coreService = getCoreService();
+        if (coreService != null) {
+            if (repositoryObjectType == ERepositoryObjectType.PROCESS) {
+                // delete the job launch, for bug 8878
+                coreService.removeJobLaunch(object);
+            }
+        }
+        
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(IRunProcessService.class)) {
+            IRunProcessService service = GlobalServiceRegister.getDefault()
+                    .getService(IRunProcessService.class);
+            service.deleteOldVersionTalendJobProject(objToDelete);
+        }
+
+        this.repositoryFactoryFromProvider.deleteOldVersionPhysical(project, object, version);
+        
+        // i18n
+        //log.info("Physical deletion [" + objToDelete + "] by " + getRepositoryContext().getUser() + ".");
+        String str[] = new String[] { object.toString()+ "_" + version, getRepositoryContext().getUser().toString() };
+        log.info(Messages.getString("ProxyRepositoryFactory.log.physicalDeletion", str)); //$NON-NLS-1$    }
+    }
+    
+    @Override
+    public void batchDeleteOldVersionPhysical4Remote(Project project, List<IRepositoryViewObject> objToDeleteList, IProgressMonitor monitor) throws PersistenceException {
+        if (project == null || objToDeleteList == null || objToDeleteList.size() == 0) {
+            return;
+        }
+
+        List<String> idList = new ArrayList<>();
+        List<IRepositoryViewObject> repositoryObjectList = new ArrayList<>();
+        String label = "",lastLabel = "";
+        for (IRepositoryViewObject objToDelete : objToDeleteList) {
+            label = objToDelete.getProperty().getLabel();
+            String versionedLabel = objToDelete.getProperty().getLabel() + "_" + objToDelete.getProperty().getVersion();
+            monitor.setTaskName("Removing " + objToDelete.getRepositoryObjectType() + ":"+  versionedLabel);
+            
+            IRepositoryViewObject object = new RepositoryObject(objToDelete.getProperty());
+            boolean isExtendPoint = false;
+
+            idList.add(object.getProperty().getId());
+            ERepositoryObjectType repositoryObjectType = object.getRepositoryObjectType();
+
+            ICoreService coreService = getCoreService();
+            if (coreService != null) {
+                if (repositoryObjectType == ERepositoryObjectType.PROCESS) {
+                    // delete the job launch, for bug 8878
+                    coreService.removeJobLaunch(object);
+                }
+            }
+
+            repositoryObjectList.add(object);
+            
+            if (GlobalServiceRegister.getDefault().isServiceRegistered(IRunProcessService.class)) {
+                IRunProcessService service = GlobalServiceRegister.getDefault()
+                        .getService(IRunProcessService.class);
+                service.deleteOldVersionTalendJobProject(objToDelete);
+            }
+            this.repositoryFactoryFromProvider.deleteOldVersionPhysical(project, objToDelete,objToDelete.getProperty().getVersion());
+            if (label != null && !label.equals(lastLabel)) monitor.worked(1); //for different versions in progress bar
+            lastLabel = label;
+        }
+        
+        // save project will handle git/svn update
+        this.repositoryFactoryFromProvider.saveProject(project);
+    }
+    
 }

main/plugins/org.talend.core.runtime/.classpath

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry exported="true" kind="lib" path="lib/resty-0.3.2.jar" />
+	<classpathentry exported="true" kind="lib" path="lib/delight-rhino-sandbox-0.0.15.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/rhino-1.7.13.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/resty-0.3.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/json_simple-1.1.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

main/plugins/org.talend.core.runtime/META-INF/MANIFEST.MF

@@ -129,5 +129,7 @@ Bundle-Activator: org.talend.core.runtime.CoreRuntimePlugin
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
  lib/resty-0.3.2.jar,
- lib/json_simple-1.1.jar
+ lib/json_simple-1.1.jar,
+ lib/delight-rhino-sandbox-0.0.15.jar,
+ lib/rhino-1.7.13.jar
 Eclipse-RegisterBuddy: org.talend.testutils

main/plugins/org.talend.core.runtime/build.properties

@@ -12,7 +12,9 @@ bin.includes = META-INF/,\
                lib/,\
                talend_metadata_columns_schema.xsd,\
                talend_targetschema_columns_schema.xsd,\
-               dist/
+               dist/,\
+               lib/delight-rhino-sandbox-0.0.15.jar,\
+               lib/rhino-1.7.13.jar
 src.includes = META-INF/,\
                mappingMetadataTypes.xml,\
                mappings/,\

main/plugins/org.talend.core.runtime/mappings/mapping_AmazonAurora.xml

@@ -1,280 +1,304 @@
-<?xml version="1.0"?>
-<mapping>
-	<dbms product="AMAZON_AURORA" id="amazon_aurora_id" label="Mapping AMAZON_AURORA"
-		default="true">
-		<dbTypes>
-			<dbType type="BIGINT" ignorePre="true"/>
-			<dbType type="BIGINT UNSIGNED" ignoreLen="true" ignorePre="true" />
-			<dbType type="BINARY" ignorePre="true"/>
-			<dbType type="BIT" ignorePre="true" />
-			<dbType type="BLOB" ignoreLen="true" ignorePre="true" />
-			<dbType type="CHAR" defaultLength="200" ignorePre="true"/>
-			<dbType type="DATE" ignoreLen="true" ignorePre="true" />
-			<dbType type="DATETIME" ignoreLen="true" ignorePre="true" />
-			<dbType type="DECIMAL" defaultLength="20" defaultPrecision="10" preBeforelen="false"/>
-			<dbType type="DOUBLE" defaultLength="20" defaultPrecision="10"/>
-			<dbType type="DOUBLE UNSIGNED" ignoreLen="true" ignorePre="true" />
-			<dbType type="ENUM" ignoreLen="true" ignorePre="true" />
-			<dbType type="FLOAT" defaultPrecision="2"/>
-			<dbType type="FLOAT UNSIGNED" ignoreLen="true" ignorePre="true" />
-			<dbType type="GEOMETRY" ignoreLen="true" ignorePre="true" />
-			<dbType type="GEOMETRYCOLLECTION" ignoreLen="true" ignorePre="true" />
-			<dbType type="INT" ignorePre="true" />
-			<dbType type="INT UNSIGNED" ignoreLen="true" ignorePre="true" />
-			<dbType type="LINESTRING" ignoreLen="true" ignorePre="true" />
-			<dbType type="LONGTEXT" ignoreLen="true" ignorePre="true" />
-			<dbType type="LONGBLOB" ignoreLen="true" ignorePre="true"/>
-			<dbType type="MEDIUMBLOB" ignoreLen="true" ignorePre="true" />
-			<dbType type="MEDIUMINT" ignorePre="true" />
-			<dbType type="MEDIUMINT UNSIGNED" ignoreLen="true" ignorePre="true" />
-			<dbType type="MEDIUMTEXT" ignoreLen="true" ignorePre="true" />
-			<dbType type="MULTILINESTRING" ignoreLen="true" ignorePre="true" />
-			<dbType type="MULTIPOINT" ignoreLen="true" ignorePre="true" />
-			<dbType type="MULTIPOLYGON" ignoreLen="true" ignorePre="true" />
-			<dbType type="POINT" ignoreLen="true" ignorePre="true" />
-			<dbType type="POLYGON" ignoreLen="true" ignorePre="true" />
-			<dbType type="SMALLINT" ignorePre="true" />
-			<dbType type="SMALLINT UNSIGNED" ignoreLen="true" ignorePre="true" />
-			<dbType type="SET" ignoreLen="true" ignorePre="true" />
-			<dbType type="TEXT" ignoreLen="true" ignorePre="true" />
-			<dbType type="TIME" ignoreLen="true" ignorePre="true" />
-			<dbType type="TIMESTAMP" ignoreLen="true" ignorePre="true" />
-			<dbType type="TINYBLOB" ignoreLen="true" ignorePre="true" />
-			<dbType type="TINYINT" ignorePre="true" />
-			<dbType type="TINYINT UNSIGNED" ignoreLen="true" ignorePre="true" />
-			<dbType type="TINYTEXT" ignoreLen="true" ignorePre="true" />
-			<dbType type="VARBINARY" ignorePre="true" />
-			<dbType type="VARCHAR" default="true" defaultLength="100" ignorePre="true"/>
-			<dbType type="YEAR" ignorePre="true"/>
-		</dbTypes>
-
-		<language name="java">
-			<talendToDbTypes><!-- Adviced mappings  -->
-				<talendType type="id_List"/>
-				<talendType type="id_Boolean">	
-					<dbType type="BIT" default="true" />				
-				</talendType>
-				<talendType type="id_Byte">
-					<dbType type="TINYINT" default="true" />
-					<dbType type="BIGINT" />
-					<dbType type="INT" />
-					<dbType type="MEDIUMINT" />
-					<dbType type="SMALLINT" />				
-				</talendType>
-				<talendType type="id_byte[]">
-				</talendType>
-				<talendType type="id_Character">
-					<dbType type="CHAR" default="true" />
-					<dbType type="VARCHAR"/>
-				</talendType>
-				<talendType type="id_Date">
-					<dbType type="DATE" />
-					<dbType type="DATETIME" default="true" />	
-					<dbType type="TIME" />
-					<dbType type="YEAR" />
-					<dbType type="TIMESTAMP" />				
-				</talendType>
-				<talendType type="id_BigDecimal">
-					<dbType type="DECIMAL" default="true" />
-					<dbType type="FLOAT"/>
-					<dbType type="DOUBLE" />				
-				</talendType>
-				<talendType type="id_Double">
-					<dbType type="DOUBLE" default="true" />
-					<dbType type="FLOAT"/>
-					<dbType type="DECIMAL" />				
-				</talendType>
-				<talendType type="id_Float">
-					<dbType type="FLOAT" default="true" />
-					<dbType type="DOUBLE"/>
-					<dbType type="DECIMAL" />
-				</talendType>
-				<talendType type="id_Integer">
-					<dbType type="INT" default="true" />
-					<dbType type="BIGINT" />
-				</talendType>
-				<talendType type="id_Long">
-					<dbType type="BIGINT" default="true" />		
-				</talendType>
-				<talendType type="id_Object">
-					<dbType type="BLOB" default="true"/>
-					<dbType type="ENUM" />
-					<dbType type="GEOMETRY" />
-					<dbType type="GEOMETRYCOLLECTION" />
-					<dbType type="MEDIUMINT" />
-					<dbType type="LONGBLOB" />
-					<dbType type="MEDIUMBLOB" />
-					<dbType type="MULTIPOINT" />
-					<dbType type="MULTIPOLYGON" />
-					<dbType type="POINT" />
-					<dbType type="POLYGON" />
-					<dbType type="SET" />
-					<dbType type="TINYBLOB" />
-				</talendType>
-				<talendType type="id_Short">
-					<dbType type="SMALLINT" default="true" />
-					<dbType type="INT" />
-					<dbType type="BIGINT"/>
-					<dbType type="MEDIUMINT" />
-				</talendType>
-				<talendType type="id_String">
-					<dbType type="VARCHAR" default="true" />
-					<dbType type="LINESTRING" />
-					<dbType type="LONGTEXT"/>
-					<dbType type="MEDIUMTEXT" />
-					<dbType type="MULTILINESTRING" />		
-					<dbType type="TEXT" />
-					<dbType type="TINYTEXT" />
-				</talendType>
-			</talendToDbTypes>
-			<dbToTalendTypes>
-				<dbType type="BIGINT">
-					<talendType type="id_Long" default="true" />
-				</dbType>
-				<dbType type="BINARY">
-					<talendType type="id_Boolean" default="true" />
-				</dbType>
-				<dbType type="BIT">
-					<talendType type="id_Boolean" default="true" />
-				</dbType>
-				<dbType type="BLOB">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="CHAR">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="DATE">
-					<talendType type="id_Date" default="true" />
-				</dbType>
-				<dbType type="DATETIME">
-					<talendType type="id_Date" default="true" />
-				</dbType>
-				<dbType type="DECIMAL">
-					<talendType type="id_Float"/>
-					<talendType type="id_Double"/>
-					<talendType type="id_BigDecimal" default="true"/>
-				</dbType>
-				<dbType type="DOUBLE">
-					<talendType type="id_Double" default="true" />
-					<talendType type="id_BigDecimal"/>
-				</dbType>
-				<dbType type="ENUM">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="FLOAT">
-					<talendType type="id_Float" default="true" />
-					<talendType type="id_Double"/>
-					<talendType type="id_BigDecimal"/>
-				</dbType>
-				<dbType type="GEOMETRY">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="GEOMETRYCOLLECTION">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="INT">
-					<talendType type="id_Integer" default="true" />
-					<talendType type="id_Long"/>
-				</dbType>
-				<dbType type="LINESTRING">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="LONGTEXT">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="LONGBLOB">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="MEDIUMBLOB">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="MEDIUMINT">
-					<talendType type="id_Integer" default="true" />
-					<talendType type="id_Long"/>
-				</dbType>
-				<dbType type="MEDIUMTEXT">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="MULTILINESTRING">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="MULTIPOINT">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="MULTIPOLYGON">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="POINT">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="POLYGON">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="SMALLINT">
-					<talendType type="id_Short" default="true" />
-					<talendType type="id_Long"/>
-					<talendType type="id_Integer"/>
-				</dbType>
-				<dbType type="SET">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="TEXT">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="TIME">
-					<talendType type="id_Date" default="true" />
-				</dbType>
-				<dbType type="TIMESTAMP">
-					<talendType type="id_Date" default="true" />
-				</dbType>
-				<dbType type="TINYBLOB">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="TINYINT">
-					<talendType type="id_Byte" default="true" />
-					<talendType type="id_Integer"/>
-					<talendType type="id_Long"/>
-					<talendType type="id_Short"/>
-				</dbType>
-				<dbType type="TINYTEXT">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="VARBINARY">
-				</dbType>
-				<dbType type="VARCHAR">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="YEAR">
-					<talendType type="id_Date" default="true" />
-				</dbType>		
-				<dbType type="BIGINT UNSIGNED" >
-				</dbType>
-				<dbType type="DOUBLE UNSIGNED" >		
-					<talendType type="id_Double" default="true" />
-					<talendType type="id_BigDecimal"/>
-				</dbType>
-				<dbType type="FLOAT UNSIGNED" >
-					<talendType type="id_Double" default="true" />
-					<talendType type="id_BigDecimal"/>
-				</dbType>
-				<dbType type="INT UNSIGNED" >
-					<talendType type="id_Long" default="true" />
-				</dbType>
-				<dbType type="MEDIUMINT UNSIGNED" >
-					<talendType type="id_Integer" default="true" />
-					<talendType type="id_Long" />
-				</dbType>
-				<dbType type="SMALLINT UNSIGNED" >
-					<talendType type="id_Integer" default="true" />
-					<talendType type="id_Long" />
-				</dbType>
-				<dbType type="TINYINT UNSIGNED" >
-					<talendType type="id_Short" default="true" />
-					<talendType type="id_Integer" />
-					<talendType type="id_Long" />
-				</dbType>
-			</dbToTalendTypes>
-		</language>
-	</dbms>
-
-</mapping>
+<?xml version="1.0"?>
+<mapping>
+	<dbms product="AMAZON_AURORA" id="amazon_aurora_id" label="Mapping AMAZON_AURORA"
+		default="true">
+		<dbTypes>
+			<dbType type="BIGINT" ignorePre="true"/>
+			<dbType type="BIGINT UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="BINARY" ignorePre="true"/>
+			<dbType type="BIT" ignorePre="true" />
+			<dbType type="BLOB" ignoreLen="true" ignorePre="true" />
+			<dbType type="CHAR" defaultLength="200" ignorePre="true"/>
+			<dbType type="DATE" ignoreLen="true" ignorePre="true" />
+			<dbType type="DATETIME" ignoreLen="true" ignorePre="true" />
+			<dbType type="DECIMAL" defaultLength="20" defaultPrecision="10" preBeforelen="false"/>
+			<dbType type="DOUBLE" defaultLength="20" defaultPrecision="10"/>
+			<dbType type="DOUBLE UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="ENUM" ignoreLen="true" ignorePre="true" />
+			<dbType type="FLOAT" defaultPrecision="2"/>
+			<dbType type="FLOAT UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="GEOMETRY" ignoreLen="true" ignorePre="true" />
+			<dbType type="GEOMETRYCOLLECTION" ignoreLen="true" ignorePre="true" />
+			<dbType type="INT" ignorePre="true" />
+			<dbType type="INT UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="INTEGER" ignorePre="true" />
+			<dbType type="INTEGER UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="LINESTRING" ignoreLen="true" ignorePre="true" />
+			<dbType type="LONGTEXT" ignoreLen="true" ignorePre="true" />
+			<dbType type="LONGBLOB" ignoreLen="true" ignorePre="true"/>
+			<dbType type="MEDIUMBLOB" ignoreLen="true" ignorePre="true" />
+			<dbType type="MEDIUMINT" ignorePre="true" />
+			<dbType type="MEDIUMINT UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="MEDIUMTEXT" ignoreLen="true" ignorePre="true" />
+			<dbType type="MULTILINESTRING" ignoreLen="true" ignorePre="true" />
+			<dbType type="MULTIPOINT" ignoreLen="true" ignorePre="true" />
+			<dbType type="MULTIPOLYGON" ignoreLen="true" ignorePre="true" />
+			<dbType type="POINT" ignoreLen="true" ignorePre="true" />
+			<dbType type="POLYGON" ignoreLen="true" ignorePre="true" />
+			<dbType type="SMALLINT" ignorePre="true" />
+			<dbType type="SMALLINT UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="SET" ignoreLen="true" ignorePre="true" />
+			<dbType type="TEXT" ignoreLen="true" ignorePre="true" />
+			<dbType type="TIME" ignoreLen="true" ignorePre="true" />
+			<dbType type="TIMESTAMP" ignoreLen="true" ignorePre="false" />
+			<dbType type="TINYBLOB" ignoreLen="true" ignorePre="true" />
+			<dbType type="TINYINT" ignorePre="true" />
+			<dbType type="TINYINT UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="TINYTEXT" ignoreLen="true" ignorePre="true" />
+			<dbType type="VARBINARY" ignorePre="true" />
+			<dbType type="VARCHAR" default="true" defaultLength="100" ignorePre="true"/>
+			<dbType type="YEAR" ignorePre="true"/>
+		</dbTypes>
+
+		<language name="java">
+			<talendToDbTypes><!-- Adviced mappings  -->
+				<talendType type="id_List"/>
+				<talendType type="id_Boolean">	
+					<dbType type="BIT" default="true" />				
+				</talendType>
+				<talendType type="id_Byte">
+					<dbType type="TINYINT" default="true" />
+					<dbType type="BIGINT" />
+					<dbType type="INT" />
+					<dbType type="MEDIUMINT" />
+					<dbType type="SMALLINT" />				
+				</talendType>
+				<talendType type="id_byte[]">
+				    <dbType type="VARBINARY" default="true" />
+				    <dbType type="BINARY" />
+				    <dbType type="BIT" />
+				    <dbType type="BLOB" />
+				    <dbType type="LONGBLOB" />
+				    <dbType type="MEDIUMBLOB" />
+				    <dbType type="TINYBLOB" />
+				</talendType>
+				<talendType type="id_Character">
+					<dbType type="CHAR" default="true" />
+					<dbType type="VARCHAR"/>
+				</talendType>
+				<talendType type="id_Date">
+					<dbType type="DATE" />
+					<dbType type="DATETIME" default="true" />	
+					<dbType type="TIME" />
+					<dbType type="YEAR" />
+					<dbType type="TIMESTAMP" />				
+				</talendType>
+				<talendType type="id_BigDecimal">
+					<dbType type="DECIMAL" default="true" />
+					<dbType type="FLOAT"/>
+					<dbType type="DOUBLE" />				
+				</talendType>
+				<talendType type="id_Double">
+					<dbType type="DOUBLE" default="true" />
+					<dbType type="FLOAT"/>
+					<dbType type="DECIMAL" />				
+				</talendType>
+				<talendType type="id_Float">
+					<dbType type="FLOAT" default="true" />
+					<dbType type="DOUBLE"/>
+					<dbType type="DECIMAL" />
+				</talendType>
+				<talendType type="id_Integer">
+					<dbType type="INT" default="true" />
+					<dbType type="BIGINT" />
+				</talendType>
+				<talendType type="id_Long">
+					<dbType type="BIGINT" default="true" />		
+				</talendType>
+				<talendType type="id_Object">
+					<dbType type="BLOB" default="true"/>
+					<dbType type="ENUM" />
+					<dbType type="GEOMETRY" />
+					<dbType type="GEOMETRYCOLLECTION" />
+					<dbType type="MEDIUMINT" />
+					<dbType type="LONGBLOB" />
+					<dbType type="MEDIUMBLOB" />
+					<dbType type="MULTIPOINT" />
+					<dbType type="MULTIPOLYGON" />
+					<dbType type="POINT" />
+					<dbType type="POLYGON" />
+					<dbType type="SET" />
+					<dbType type="TINYBLOB" />
+				</talendType>
+				<talendType type="id_Short">
+					<dbType type="SMALLINT" default="true" />
+					<dbType type="INT" />
+					<dbType type="BIGINT"/>
+					<dbType type="MEDIUMINT" />
+				</talendType>
+				<talendType type="id_String">
+					<dbType type="VARCHAR" default="true" />
+					<dbType type="LINESTRING" />
+					<dbType type="LONGTEXT"/>
+					<dbType type="MEDIUMTEXT" />
+					<dbType type="MULTILINESTRING" />		
+					<dbType type="TEXT" />
+					<dbType type="TINYTEXT" />
+					<dbType type="CHAR" />
+				</talendType>
+			</talendToDbTypes>
+			<dbToTalendTypes>
+				<dbType type="BIGINT">
+					<talendType type="id_Long" default="true" />
+				</dbType>
+				<dbType type="BINARY">
+					<talendType type="id_byte[]" />
+					<talendType type="id_Boolean" default="true" />
+				</dbType>
+				<dbType type="BIT">
+					<talendType type="id_byte[]" />
+					<talendType type="id_Boolean" default="true" />
+				</dbType>
+				<dbType type="BLOB">
+					<talendType type="id_byte[]" default="true" />
+					<talendType type="id_Object" />
+				</dbType>
+				<dbType type="CHAR">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="DATE">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="DATETIME">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="DECIMAL">
+					<talendType type="id_Float"/>
+					<talendType type="id_Double"/>
+					<talendType type="id_BigDecimal" default="true"/>
+				</dbType>
+				<dbType type="DOUBLE">
+					<talendType type="id_Double" default="true" />
+					<talendType type="id_BigDecimal"/>
+				</dbType>
+				<dbType type="ENUM">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="FLOAT">
+					<talendType type="id_Float" default="true" />
+					<talendType type="id_Double"/>
+					<talendType type="id_BigDecimal"/>
+				</dbType>
+				<dbType type="GEOMETRY">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="GEOMETRYCOLLECTION">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="INT">
+					<talendType type="id_Integer" default="true" />
+					<talendType type="id_Long"/>
+				</dbType>
+				<dbType type="INTEGER">
+					<talendType type="id_Integer" default="true" />
+					<talendType type="id_Long"/>
+				</dbType>
+				<dbType type="LINESTRING">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="LONGTEXT">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="LONGBLOB">
+					<talendType type="id_byte[]" default="true" />
+					<talendType type="id_Object" />
+				</dbType>
+				<dbType type="MEDIUMBLOB">
+					<talendType type="id_byte[]" default="true" />
+					<talendType type="id_Object" />
+				</dbType>
+				<dbType type="MEDIUMINT">
+					<talendType type="id_Integer" default="true" />
+					<talendType type="id_Long"/>
+				</dbType>
+				<dbType type="MEDIUMTEXT">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="MULTILINESTRING">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="MULTIPOINT">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="MULTIPOLYGON">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="POINT">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="POLYGON">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="SMALLINT">
+					<talendType type="id_Short" default="true" />
+					<talendType type="id_Long"/>
+					<talendType type="id_Integer"/>
+				</dbType>
+				<dbType type="SET">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="TEXT">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="TIME">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="TIMESTAMP">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="TINYBLOB">
+					<talendType type="id_byte[]" default="true" />
+					<talendType type="id_Object" />
+				</dbType>
+				<dbType type="TINYINT">
+					<talendType type="id_Byte" default="true" />
+					<talendType type="id_Integer"/>
+					<talendType type="id_Long"/>
+					<talendType type="id_Short"/>
+				</dbType>
+				<dbType type="TINYTEXT">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="VARBINARY">
+				    <talendType type="id_byte[]" default="true" />
+				</dbType>
+				<dbType type="VARCHAR">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="YEAR">
+					<talendType type="id_Date" default="true" />
+				</dbType>		
+				<dbType type="BIGINT UNSIGNED" >
+				</dbType>
+				<dbType type="DOUBLE UNSIGNED" >		
+					<talendType type="id_Double" default="true" />
+					<talendType type="id_BigDecimal"/>
+				</dbType>
+				<dbType type="FLOAT UNSIGNED" >
+					<talendType type="id_Double" default="true" />
+					<talendType type="id_BigDecimal"/>
+				</dbType>
+				<dbType type="INT UNSIGNED" >
+					<talendType type="id_Long" default="true" />
+				</dbType>
+				<dbType type="INTEGER UNSIGNED" >
+					<talendType type="id_Long" default="true" />
+				</dbType>
+				<dbType type="MEDIUMINT UNSIGNED" >
+					<talendType type="id_Integer" default="true" />
+					<talendType type="id_Long" />
+				</dbType>
+				<dbType type="SMALLINT UNSIGNED" >
+					<talendType type="id_Integer" default="true" />
+					<talendType type="id_Long" />
+				</dbType>
+				<dbType type="TINYINT UNSIGNED" >
+					<talendType type="id_Short" default="true" />
+					<talendType type="id_Integer" />
+					<talendType type="id_Long" />
+				</dbType>
+			</dbToTalendTypes>
+		</language>
+	</dbms>
+
+</mapping>

main/plugins/org.talend.core.runtime/mappings/mapping_Mysql.xml

@@ -22,7 +22,7 @@
 			<dbType type="INT" ignorePre="true" />
 			<dbType type="INT UNSIGNED" ignoreLen="true" ignorePre="true" />
 			<dbType type="INTEGER" ignorePre="true" />
-            <dbType type="INTEGER UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="INTEGER UNSIGNED" ignoreLen="true" ignorePre="true" />
 			<dbType type="LINESTRING" ignoreLen="true" ignorePre="true" />
 			<dbType type="LONGTEXT" ignoreLen="true" ignorePre="true" />
 			<dbType type="LONGBLOB" ignoreLen="true" ignorePre="true"/>
@@ -190,9 +190,9 @@
 					<talendType type="id_Long"/>
 				</dbType>
 				<dbType type="INTEGER">
-                    <talendType type="id_Integer" default="true" />
-                    <talendType type="id_Long"/>
-                </dbType>
+					<talendType type="id_Integer" default="true" />
+					<talendType type="id_Long"/>
+				</dbType>
 				<dbType type="LINESTRING">
 					<talendType type="id_String" default="true" />
 				</dbType>
@@ -282,8 +282,8 @@
 					<talendType type="id_Long" default="true" />
 				</dbType>
 				<dbType type="INTEGER UNSIGNED" >
-                    <talendType type="id_Long" default="true" />
-                </dbType>
+					<talendType type="id_Long" default="true" />
+				</dbType>
 				<dbType type="MEDIUMINT UNSIGNED" >
 					<talendType type="id_Integer" default="true" />
 					<talendType type="id_Long" />

main/plugins/org.talend.core.runtime/mappings/mapping_revision.json

@@ -0,0 +1,238 @@
+{
+	"mapping_AS400.xml": {
+		"28fe6b6c94e4e486d431873ba556c1c18ae09140": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"3d4845af057220e02773029683a0fd99dee489e5": "a9861e98b581dfdafa7839238710bd930989960a",
+		"458d597928478f43c94098dfe47d9bb8d07e89e2": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"76a4aa354d986ed5682797337817a8ddbb80ae89": "d568bf814d7b27fc7c63cbd07ea6b4a3b0ad3ff8"
+	},
+	"mapping_Access.xml": {
+		"55d314ed9708263bfcec193abb57a1e25806626e": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"718db25f8e86d6b61284a4ffdc1fd19faffb98a9": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8"
+	},
+	"mapping_AmazonAurora.xml": {
+		"a93c809bdf8e5df8095580e3f23b29658e044302": "ebc9394c2728a3f3850fcbafac4156ef15aab37f",
+		"ba16c203a8a993e13ebab0da5cccb7a5e1c01e56": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_BigQuery.xml": {
+		"db723e5b4a38bbc8316593be33ab9d74f57776e6": "e1770847f656589810753c19d420228326462f34",
+		"e12df204d9f5081971d03c64b43de2456557e02e": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"e9c02d3e9bc3a3649fd33803353e61db6fcd2ea8": "01749151dcc171ebb6457ba872ee352d58a1dfd4"
+	},
+	"mapping_Cassandra.xml": {
+		"20ed188f8824c14852304920cf82ca7119eb1be0": "ab7b23e6c94946ca2358cc0cfd82c4d77a4c5839",
+		"692353c474569bafd44854b7f7343929beddee83": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"e42bdadd0009e7595773edcc1652f181a8fdf151": "76ed27054255165c23d8c0c8db081a41a50430c9",
+		"ff005c2bfc47789e5715e949f98bd6d72c934b54": "ebe76b0edd0eda3488527b95f2a6d925d091a408"
+	},
+	"mapping_Cassandra22_datastax.xml": {
+		"2ddd561eac2a04a7b08949c0764c5e76f80c89f5": "b0378fb45ae238b884417db468872341e156f138",
+		"33b483680a44a8229b09698df3803f5834987f18": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Cassandra40.xml": {
+		"e92b373950021eb425db9e3eba8391f98ce7e4a8": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Cassandra_datastax.xml": {
+		"3cb6b5cf167fb5ba82b3ebdc602f22ecdacdafb5": "56fad9370b27d03a9636d8368350274480fc2bce",
+		"ca09b169eee6e6dcfa81f976bd98ef4aae81cdf2": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"e1620c54d6793c6d1885e3e2fcdf242c0e3a4059": "df28e2b92f57ba0486215f334edb649a58788712"
+	},
+	"mapping_Databricks_Delta_Lake.xml": {
+		"d48793d7173ea7d07090f5e683045c3f60cc12c8": "21f5ac777158fc55288af7337737aa675e20bdf3",
+		"dcbe4533fe16fee70f24702edddec78b81e26463": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Exasol.xml": {
+		"21ff2b1a69b7242fa48a1218b0d5f8a6b0ba607e": "a0d36282ff5d6825b206ab6f794d13e048ac2192",
+		"3768b1e7a941e66f8a70ad7e1a65aa7d2b598daa": "7ef9ede0f988f10489c1f5ffe16ea24d2d14ecdd",
+		"6babf3080a3baa05bcd8a2815d2f31a0b15e1550": "02a98e53d3b6457272768ce0ae5c82992b403465",
+		"7de8a81bc2eb7c4da639af148c2c67b5c6de4bc0": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"a728306274b817e8afa0101d3b7621398addc2f3": "b5b116b3758f58e7500058e1805bf93bf5a2f0c1",
+		"dc2eba14e50ce7c413fb7696355e67d26fe5fb9b": "57bacf1f97951fcf6f650f1afdec35b5ea22638c",
+		"f670268dfd5a8f80fbdbe6fe4ad668cb6c8f25d6": "ead0fb11f124cf05ad0f7fde21cdedbb3cf2160b"
+	},
+	"mapping_Firebird.xml": {
+		"51a041d0b43678433f6303aebac5f92bfdb7b8a6": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"d504ece6ca9e10e23f5e0f05660e5f49e7d999ff": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8"
+	},
+	"mapping_Greenplum.xml": {
+		"16418522006e4505c7fb7d44c4d06928de20eaf8": "ec04f46618ef0586081fd3b17ad7b85239958194",
+		"4f3e1b53baca729eef796979e97592c8724a2d91": "caf54e3d2b6c6d685cdcf2a243c28c408a9cd652",
+		"525a7ca1a48599a840b1feca641ef6a413d7384b": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"c4ed635e67d7d82c24008677f313e17df98f5d08": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8"
+	},
+	"mapping_H2.xml": {
+		"4e3ed630d3133326a0cf4728865b3efa4cbecc63": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"84b0b863c0532f93bffc0ab54d98a449f331e319": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"cb093084dc1dc3f999707a1b9d1474f87bbf6d17": "341b1220b6bc6bf59eef81e97c694d06134bd8a2"
+	},
+	"mapping_HSQLDB.xml": {
+		"0a37e2aec423d0c401aff092e4fda9e01c5dd4ff": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"73af8e3e8646ea58f4cfe60fe4905e90340b3e12": "890a391388725c112ffbbd2dd8b8d267305df4a7",
+		"98819a80cd8994a02579ea1d9b0992a0b68a5403": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Hive.xml": {
+		"0265c6f16ab2c9eea7da660e4e1c8a3ec7bc0ab3": "37ef13c438cda4cd1c3e091d99a00036b328e57f",
+		"1f5811f41b2836cd7baeb23daef91d2ea313f2c6": "3646a1bcd980a3209501a5c846338823f55d74b2",
+		"21a44cd9d32a5478a4de61a86b398a9ef80401ac": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"5444fa9a484704d774259430623e0db1495a867f": "ef872732cde37c6c7684dc773641be0b78f5c57c",
+		"e7f128915578dd29538a7debeb5f47528b5a6e59": "86ba7c19d9300a02dbcb0801852e728acd261132"
+	},
+	"mapping_IBMDB2.xml": {
+		"dc42cf143f3a0f10ad8c280f16ef44ae1f907123": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"f8aea23cc5b48ebb3cdd229be3f66b28890ff4f8": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Impala.xml": {
+		"55ed99aa28c989bd5777f41b7c87ed4eb9f245a8": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Informix.xml": {
+		"40da9213cf85b1712f38474dea4f2ec3447dfe3c": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"938e41f3719c29248d4f58c303464bbfb50e343a": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8"
+	},
+	"mapping_Ingres.xml": {
+		"811e8bf4e7bc2e6b9c3fcb5f074601a873f15e1d": "15afc1b074c8a6e4aee39c1d5a3347555dbe36a0",
+		"95873faa81ee3de2eea02efab5c127e6188df796": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"9c5682f564e861e1db3b5184fd40e718e0912a4a": "d51edc7e08871897572c9b1f1cd2d2d2df347dfb"
+	},
+	"mapping_Interbase.xml": {
+		"4d37474d07991154aa0148e7a030c4725d45ef0d": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"71e8386c3e21f726550234c52d3ca50dcfa655de": "d51edc7e08871897572c9b1f1cd2d2d2df347dfb"
+	},
+	"mapping_JavaDB.xml": {
+		"652fd7f2f11fc27903d333e1699cc419804caa66": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"66dbe13a0043798498f37b6e5495bc3aaa8fb90b": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8"
+	},
+	"mapping_MSSQL.xml": {
+		"305eeb294ae8bb07bee7d1e182e431e2e7f6273d": "d7761630e63b399f89eaaeb9e19e775bf1579dde",
+		"b93c0825ffd799d89608239385d7e4b60de96209": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_MaxDB.xml": {
+		"586fc7ac94a9abec8a76a587dc6aa0fae0079bf3": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_MicrosoftCrm.xml": {
+		"e1c5e77e19adea1406e5bb511a1c6adb8b610bfe": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_MicrosoftCrm_odata.xml": {
+		"1166b9ce6ce163d11a57046db5ee2dc9d5e496df": "e86fd3fd5c3b4ba9ff613155fba014a80c40cf01",
+		"3f25ced1039b99d1c07b23e3d27cac1562e52a6f": "c1190dfa35e839496745516dbcfeb8a309fa49d0",
+		"750541f00f3c5da6007623f3514add6dc3417a5f": "54331fa4ec501557eb9c32d434c332cf3d121349",
+		"9612a2611bd29461dd46fc70f0e2841892f3f096": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_MsOdbc.xml": {
+		"01561cb7b5630a4a6aed576215ccdb3991d2db52": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"a9c94a6255061e8100b15590da35196464b77d46": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Mysql.xml": {
+		"128d7d66eb994a032128949fcbe0c953c158beaa": "956802047d6623ba61e2da68aba2db8f38bca48a",
+		"522654fad6fa3d008ef386fc9360ae51df910729": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"5dfc7b71e1f6a9fad6ebf47a1d748893c85bbe5e": "341b1220b6bc6bf59eef81e97c694d06134bd8a2",
+		"894b0d1d2c23c98f2e14920013b82524334dd255": "74b3640e2923d4c60c92042ff03d15b4ac4e9341",
+		"8cb3d2b06d8a2b12e8673e6e9519f85ec08b35ec": "f22d442cbde13623a1b96c15ea2df8dd1a7d755e",
+		"a94341e5bd6c4ba0eef57f9d6d3cc6c0006c785b": "ebc9394c2728a3f3850fcbafac4156ef15aab37f",
+		"d7e74c8e9f8a47ab258472ec43236d2933c70838": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"edc9d1453c8f9ac8548822ff2f90a4defcd02094": "fd4d974c755ced1969b27126844b3f462bca1a52"
+	},
+	"mapping_Netezza.xml": {
+		"0c769aa277190990fb33a918cc57189b9ba6306f": "c8ca64da55ceb677fd97169f6a924ec80f01b2fc",
+		"0f5e9677f936a5414ce6593229aa47ea5b757276": "3074a57eee1407a413e460ed27e31d48d21d609b",
+		"b3e25e55f8281cb616b3f549e6a2e5a83d4ad62a": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Oracle.xml": {
+		"0407cea7e87144cb601bc9a3f039121feca79b65": "cb6b87dabdc71be0f1db4bdca694bcb61b679c05",
+		"064d2a5940379346638412dd7f4cb7dbcc30e672": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"26a2295f6401de6e17feb61b261f7fbdfc4d609d": "e7604a488f339028a3cf14ae4031b0fb3fd50bcc",
+		"9b0306aacec772d9d82be49ab702254ce1e08bea": "912702dc8ea921a34ea0522235db65f8655bf8e9",
+		"df2537b329d0b09828c281e62208daf379f7b60a": "544faa63bbe63dd070a94c84139c705ac6432314"
+	},
+	"mapping_ParAccel.xml": {
+		"1ba71027d3a60773c7c008143c2146e4db2ef112": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"5085a1e922f77895a2f7c85e2347acfe03034493": "d51edc7e08871897572c9b1f1cd2d2d2df347dfb"
+	},
+	"mapping_Postgres.xml": {
+		"ce8b7f58644b8f7814a5522d172b4192ff89bd4f": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"e1c1f04f95222bcadda336d6a4f0ea07c6ebb08e": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8"
+	},
+	"mapping_PostgresPlus.xml": {
+		"69b7d7f722538a322fb0bf867177d1ce5a0d7ad6": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"f576a7bb0327eeff1fd63a9a09106ae33f3ec90e": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8"
+	},
+	"mapping_Redshift.xml": {
+		"0cc6e153fe35041a009cb222e0276e35ddbc92f1": "2023289b9965fc14b959463ba5050be6aead361a",
+		"3b941be88a5f13bd8fd905fb1fa5f2a241e89ed9": "915a307b629c7a75bcbedc86267db1e8995b77f3",
+		"85ba89fdadfca4a2d755856a75e904f6015926a9": "de08533f6561319fc2914181a2705ccd75e29c40",
+		"8f3eda24c1f413b17b2b8c48695dbd786fa29b6b": "93112768d7eea6df44d92a3efbd4f1dfa20e06b6",
+		"ab86d7fda94e0b368f739f73994ce2a2147be12d": "0fd3f58b7aa78aaae6fb40d042780bec64da75e6",
+		"ad0eecc7e9f25c3b904cc11b062a8185456478ee": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Redshift_new.xml": {
+		"43085952e178e2c570ab7d2a262278dd2896dd96": "699efe42a33aab3ca0bbaa7a1abee23368e61606"
+	},
+	"mapping_SAPHana.xml": {
+		"1a07a8174468a5a1d55378dd0e21d7c1f9e531bc": "48ea42be6b348a3c993760e7f2c94c58ac08fdae",
+		"331ae8a035e6b1f2cd722be6411df4ae4a95bb33": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_SQLite.xml": {
+		"0a97b6e8acf8bd16aa34a3c01707f1e2a9eeff1f": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"b7b7b7c690efacc208316c911571a8513b5ea713": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8"
+	},
+	"mapping_SingleStore.xml": {
+		"9da7d92af5e9b0697436f74fffd190e8af061567": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Snowflake.xml": {
+		"d459c6be3786f9358615eaf692a1c7920b4c6e74": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Sybase.xml": {
+		"081038547cac8342cf5cadf8bfd02fe4d2929323": "1ff9877dce90e2ef39b267ea60de534796035a95",
+		"09a0f4dc71ff9a844e1162600409317e92e1ff18": "28534ffb4ae599adec53853776856e82c23c815a",
+		"4ee2c12f372953e77404481a962b3aca14abadb0": "f02b1b6902098b2da90cde6b22a9a49ec328970a",
+		"5752dcfa409e903af77587f151d580c68c9e4ac7": "3db0fa1fbed8ae378d52aa8c36b6fed55d184e5b",
+		"6f4e7913b4b31e8fb4e097690c8b903a58842283": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"7676e2d94473564322ce37cad92b7f8b09751b1b": "1cc6237de63892e097c77637ac8457cf8fefbf6f",
+		"8bbad7895713f3a399ddb195c40353e18d3e83b9": "984ca27e4ee0177793b2111797700390424cb746",
+		"bbc091c50a7bd8a8fe630d99a9c2e3f2f878ac88": "67a9b521c9d698b3411fb49410ac61a15f4bc7db",
+		"d841719dcf79a12d0189301e40c0e9e973a45c4f": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"e103a9671d9bcf360fd2e61ee97f4547d0d52241": "e19031add3dc54bf9d0e731f3a05738af48ebb6d",
+		"e1c42d74cc0dc3681b5bd45a901a3bedeb53ec68": "75df15acaa5c8d1dcd4a8e855e0df969fdea25d5",
+		"e30d1f01e88bdaf926855e00d1aef3a37a7eb6e4": "c91dd79086a42dce5417de77bb7ce61c0bd6cbbf",
+		"ee5d7f5f9510f63c340f87862327b869bf4cb743": "607764748cdbff669d2ccfcbaafdaa0d83598f32"
+	},
+	"mapping_Teradata.xml": {
+		"10ed107c1d66b38d51739ffdd0820db676c42cef": "45dbf10541f6dd32283038bcc5b04b10e305770a",
+		"55e6a511c2cb39aca11de302a3850eb2d1f6e3a5": "fc652f1cc70f6caa05d5c65e57115f86653f7841",
+		"ac9ffae887ab4d20d4eca0eddc83163e99507ec8": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"f9b0367424f721cd8029d3540c9a82f39d74a6b4": "c002b50a69b8a0193780e7c0d1788bbd9a5145c3"
+	},
+	"mapping_VectorWise.xml": {
+		"06f86121a9492b3104047691b19718a5d9d49be9": "d51edc7e08871897572c9b1f1cd2d2d2df347dfb",
+		"edf255202bcfad77ff6f3fac11714891934225c4": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8"
+	},
+	"mapping_Vertica.xml": {
+		"28153eaab1c47b8718ca3c49553ec40b047d2878": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"2ee78d7679d4201ad29adba4cc0a48084f161e25": "eecc481d671d330bfb46406ab2533830c668bf22",
+		"819be4680c04a7f77c51fc65ebd1d964a714aa78": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"9218d5e7b682513ddf1b891f5f0467ab9938fec3": "341b1220b6bc6bf59eef81e97c694d06134bd8a2",
+		"d9745a57d9f1b6c638ebd57cd5281be020e0614c": "e8f788c5c260f9b82eaaa88d0402423d86a5680d",
+		"dec55a19094d1bcc20f12a8888b27460e83c2e67": "3b582b21fc5ac7ccfb05321c7923591433ced716"
+	},
+	"mapping_XSD.xml": {
+		"1ef837521e274c5b93f5f228955204285b3dd28a": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"9c454252343dfe1400d356cbf41bf88e842b4e1e": "c615b3a622e2f6ba8577e812e71977d9f1b1930d"
+	},
+	"mapping_dynamodb.xml": {
+		"891099e88d8074570dc029f9b7d8b04bbc241383": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_ebcdic.xml": {
+		"b47b25edc9e40d312b548270dbb3f978475be4e7": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_sap.xml": {
+		"0339bc60ae47e3796c343eee7e2fb1cb1869cefa": "ee49a27e5c3ba3217ab497b1cd4467c088e59f5e",
+		"1f41a55f6f7f1d6d2118e766daf7e3dbfd77551d": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"64c23be0c363ab703528677c999e4ef707d54497": "27908d5685066221f02cd3890a5319838215eb8b",
+		"83688cf3134e60d9f5a08b316643a41246717e92": "740c431e0b623cc7d41166588961028ad3efab80",
+		"9df72b6a1f1a72d9be1a4a7fd428873ad9b75bff": "94804b5e96a71d63a294eb9bcfbbb5290824009f",
+		"a300fcd290aa65c254c44d683d30a9fa6ae14a2f": "45e5d88e9c49cb87b47413468073c571f60c0117",
+		"b74c01dff88a52afca5f8c84fbe41d71a34eb6b5": "32832fe0edfbd10d50ed85528481e5c9ca2ec8e0",
+		"c814f616005e1637ec107dd8c0f269bd69661d2e": "7d07608dceb06f7364b5bb8babc0f6e921fc443a"
+	},
+	"mapping_sas.xml": {
+		"4aeb0deb41f61dbe69e85e780fb1e985c9f3d758": "fd44bfb0ee3fc8288465507b937c53619f43c0ec"
+	}
+}

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

@@ -9,19 +9,61 @@
   </parent>
   <artifactId>org.talend.core.runtime</artifactId>
   <packaging>eclipse-plugin</packaging>
+  <dependencies>
+	<!-- https://mvnrepository.com/artifact/org.javadelight/delight-rhino-sandbox -->
+	<dependency>
+		<groupId>org.javadelight</groupId>
+		<artifactId>delight-rhino-sandbox</artifactId>
+		<version>0.0.15</version>
+	</dependency>
+	<!-- https://mvnrepository.com/artifact/org.mozilla/rhino -->
+	<dependency>
+		<groupId>org.mozilla</groupId>
+		<artifactId>rhino</artifactId>
+		<version>1.7.13</version>
+	</dependency>
+  </dependencies>
   <build>
 	<plugins>
-	  <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-		<version>2.8.2</version>
-        <executions>
-          <execution>
-            <id>default-deploy</id>
-            <phase>deploy</phase>
-          </execution>
-        </executions>
-      </plugin>
-	</plugins>
+		<plugin>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-dependency-plugin</artifactId>
+			<executions>
+				<execution>
+					<id>copy-dependencies</id>
+					<phase>generate-sources</phase>
+					<goals>
+						<goal>copy</goal>
+					</goals>
+					<configuration>
+						<outputDirectory>${project.basedir}/lib</outputDirectory>
+						<artifactItems>
+							<artifactItem>
+								<groupId>org.javadelight</groupId>
+								<artifactId>delight-rhino-sandbox</artifactId>
+								<version>0.0.15</version>
+							</artifactItem>
+							<artifactItem>
+								<groupId>org.mozilla</groupId>
+								<artifactId>rhino</artifactId>
+								<version>1.7.13</version>
+							</artifactItem>
+						</artifactItems>
+					</configuration>
+				</execution>
+			</executions>
+		</plugin>
+		<plugin>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-deploy-plugin</artifactId>
+			<version>2.8.2</version>
+			<executions>
+				<execution>
+					<id>default-deploy</id>
+					<phase>deploy</phase>
+				</execution>
+			</executions>
+		</plugin>
+    </plugins>
   </build>
 </project>

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ICoreService.java

@@ -116,6 +116,7 @@ public interface ICoreService extends IService {
 
     public String validateValueForDBType(String columnName);
 
+    @Deprecated
     public void synchronizeMapptingXML(ITalendProcessJavaProject talendJavaProject);
 
     public IPreferenceStore getPreferenceStore();
@@ -124,6 +125,14 @@ public interface ICoreService extends IService {
 
     public IMetadataTable convert(MetadataTable originalTable);
 
+    @Deprecated
     public void syncMappingsFileFromSystemToProject();
 
+    public static ICoreService get() {
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(ICoreService.class)) {
+            return GlobalServiceRegister.getDefault().getService(ICoreService.class);
+        }
+        return null;
+    }
+
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ILibraryManagerService.java

@@ -16,11 +16,13 @@ import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.talend.core.model.general.ModuleNeeded;
+import org.talend.core.model.general.RetrieveResult;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.nexus.ArtifactRepositoryBean;
 import org.talend.core.nexus.TalendLibsServerManager;
@@ -77,6 +79,8 @@ public interface ILibraryManagerService extends IService {
     public void saveMavenIndex(Map<String, String> libsToMavenUri, IProgressMonitor... monitorWrap);
 
     public void createModulesIndexFromComponentAndExtension(IProgressMonitor... monitorWrap);
+    
+    public Map<String,String> buildModulesIndexFromComponentAndExtension(IProgressMonitor... monitorWrap);
 
     /**
      * DOC ycbai Comment method "retrieve".
@@ -107,6 +111,8 @@ public interface ILibraryManagerService extends IService {
 
     public boolean retrieve(ModuleNeeded module, String pathToStore, boolean showDialog, IProgressMonitor... monitorWrap);
 
+    RetrieveResult retrieveModules(ERepositoryObjectType codeType, Set<ModuleNeeded> modulesNeeded, String pathToStore,
+            boolean showDialog, IProgressMonitor... monitorWrap);
     /**
      *
      * Resolve the jar from custom nexus
@@ -149,19 +155,14 @@ public interface ILibraryManagerService extends IService {
     public boolean contains(String jarName);
 
     public void clearCache();
+    
+    public void deployLibsFromCustomComponents(File componentFolder, List<ModuleNeeded> modulesNeeded);
 
     @Deprecated
     public Set<String> list(boolean withComponent, IProgressMonitor... monitorWrap);
 
     public boolean checkJarInstalledFromPlatform(String uriPath);
 
-    /**
-     * deploy jars from lib/java to local maven if any jar already exist in maven and need update , for jars that not
-     * exist in maven won't be deploy by this funciton , those jars should be deploy when it is needed Comment method
-     * "synToLocalMaven".
-     */
-    public void synToLocalMaven();
-
     public String getMavenUriFromIndex(String jarName);
 
     public void setCustomMavenURI(String orignalURI, String customURI);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/EDatabaseTypeName.java

@@ -114,7 +114,10 @@ public enum EDatabaseTypeName {
             "ParAccel", "ParAccel", Boolean.TRUE, "PARACCEL", "PARACCEL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
     NETEZZA(
             "Netezza", "Netezza", Boolean.FALSE, "NETEZZA", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    SAS("SAS", "SAS", Boolean.TRUE, "SAS", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    /**
+     * @deprecated 
+     */
+    SAS("SAS", "SAS (Deprecated)", Boolean.TRUE, "SAS", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     // General JDBC not support schema defalut
     GENERAL_JDBC(
             "General JDBC", "General JDBC", Boolean.FALSE, "JDBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -146,7 +149,9 @@ public enum EDatabaseTypeName {
             "HBase", "HBase", Boolean.FALSE, "HBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
     MAPRDB(
-            "MapRDB", "MapRDB", Boolean.FALSE, "MAPRDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true);//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "MapRDB", "MapRDB", Boolean.FALSE, "MAPRDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true),//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    SNOWFLAKE(
+            "SNOWFLAKE","SNOWFLAKE",Boolean.TRUE,"SNOWFLAKE",EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.None);
 
     // displayName is used in Java code.
     private String displayName;

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/EImpalaDriver.java

@@ -22,14 +22,14 @@ import org.talend.core.runtime.hd.hive.HiveMetadataHelper;
  */
 public enum EImpalaDriver {
 
-    HIVE2("HIVE2", "HIVE2", "org.apache.hive.jdbc.HiveDriver"),
-    IMPALA40("IMPALA40", "IMPALA40", "com.cloudera.impala.jdbc4.Driver"),
-    IMPALA41("IMPALA41", "IMPALA41", "com.cloudera.impala.jdbc41.Driver");
+    HIVE2("HIVE2", "HIVE2", "org.apache.hive.jdbc.HiveDriver", "doSupportHive2"),
+    IMPALA("IMPALA", "IMPALA", "com.cloudera.impala.jdbc.Driver", "doSupportImpalaConnector");
 
-    EImpalaDriver(String displayName, String name, String driver) {
+    EImpalaDriver(String displayName, String name, String driver, String supportDriverMethodName) {
         this.displayName = displayName;
         this.name = name;
         this.driver = driver;
+        this.supportDriverMethodName = supportDriverMethodName;
     }
 
     private String displayName;
@@ -38,6 +38,8 @@ public enum EImpalaDriver {
 
     private String driver;
 
+    private String supportDriverMethodName;
+
     public String getDisplayName() {
         return displayName;
     }
@@ -50,6 +52,10 @@ public enum EImpalaDriver {
         return driver;
     }
 
+    public String getSupportDriverMethodName() {
+        return supportDriverMethodName;
+    }
+
     public static boolean isSupport(String distribution, String version, boolean byDisplay, String supportMethodName) {
         return HiveMetadataHelper.doSupportMethod(distribution, version, byDisplay, supportMethodName);
     }
@@ -57,7 +63,7 @@ public enum EImpalaDriver {
     public static String[] getImpalaDriverDisplay(String distribution, String version, boolean byDisplay) {
         List<String> list = new ArrayList<>(0);
         for (EImpalaDriver driver : EImpalaDriver.values()) {
-            if (isSupport(distribution, version, byDisplay, "doSupportImpalaConnector")) {
+            if (isSupport(distribution, version, byDisplay, driver.getSupportDriverMethodName())) {
                 list.add(driver.getDisplayName());
             }
         }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/ConnParameterKeys.java

@@ -214,6 +214,36 @@ public class ConnParameterKeys {
 
     /******************************************/
 
+    /*********** Azure Synapse keys ***************/
+    
+    public static final String CONN_PARA_KEY_SYNAPSE_HOST = "CONN_PARA_KEY_SYNAPSE_HOST"; //$NON-NLS-1$
+    
+    public static final String CONN_PARA_KEY_SYNAPSE_AUTH_TOKEN = "CONN_PARA_KEY_SYNAPSE_AUTH_TOKEN"; //$NON-NLS-1$
+
+    public static final String CONN_PARA_KEY_SYNAPSE_SPARK_POOLS = "CONN_PARA_KEY_SYNAPSE_SPARK_POOLS"; //$NON-NLS-1$
+
+    public static final String CONN_PARA_KEY_SYNAPSE_FS_HOSTNAME = "CONN_PARA_KEY_SYNAPSE_FS_HOSTNAME"; //$NON-NLS-1$
+
+    public static final String CONN_PARA_KEY_SYNAPSE_FS_CONTAINER = "CONN_PARA_KEY_SYNAPSE_FS_CONTAINER"; //$NON-NLS-1$
+
+    public static final String CONN_PARA_KEY_SYNAPSE_FS_USERNAME = "CONN_PARA_KEY_SYNAPSE_FS_USERNAME"; //$NON-NLS-1$
+
+    public static final String CONN_PARA_KEY_SYNAPSE_FS_PASSWORD = "CONN_PARA_KEY_SYNAPSE_FS_PASSWORD"; //$NON-NLS-1$
+    
+    public static final String CONN_PARA_KEY_SYNAPSE_FS_STORAGE = "CONN_PARA_KEY_SYNAPSE_FS_STORAGE"; //$NON-NLS-1$
+
+    public static final String CONN_PARA_KEY_SYNAPSE_DEPLOY_BLOB = "CONN_PARA_KEY_SYNAPSE_DEPLOY_BLOB"; //$NON-NLS-1$
+    
+    public static final String CONN_PARA_KEY_DRIVER_MEMORY = "CONN_PARA_KEY_DRIVER_MEMORY"; //$NON-NLS-1$
+    
+    public static final String CONN_PARA_KEY_DRIVER_CORES = "CONN_PARA_KEY_DRIVER_CORES"; //$NON-NLS-1$
+    
+    public static final String CONN_PARA_KEY_EXECUTOR_MEMORY = "CONN_PARA_KEY_EXECUTOR_MEMORY"; //$NON-NLS-1$
+    
+    public static final String CONN_PARA_KEY_TUNING_PROPERTIES = "CONN_PARA_KEY_TUNING_PROPERTIES"; //$NON-NLS-1$
+
+    /******************************************/
+
     /**
      * HBase keys.
      */
@@ -321,6 +351,8 @@ public class ConnParameterKeys {
     public static final String CONN_PARA_KEY_DATABRICKS_ENDPOINT="CONN_PARA_KEY_DATABRICKS_ENDPOINT";
 
     public static final String CONN_PARA_KEY_DATABRICKS_CLOUD_PROVIDER = "CONN_PARA_KEY_DATABRICKS_CLOUD_PROVIDER";
+    
+    public static final String CONN_PARA_KEY_DATABRICKS_RUN_MODE = "CONN_PARA_KEY_DATABRICKS_RUN_MODE";
 
     public static final String CONN_PARA_KEY_DATABRICKS_CLUSTER_ID="CONN_PARA_KEY_DATABRICKS_CLUSTER_ID";
 
@@ -334,5 +366,20 @@ public class ConnParameterKeys {
     public static final String CONN_PARA_KEY_SET_HADOOP_CONF = "CONN_PARA_KEY_SET_HADOOP_CONF";
 
     public static final String CONN_PARA_KEY_HADOOP_CONF_SPECIFIC_JAR = "CONN_PARA_KEY_HADOOP_CONF_SPECIFIC_JAR";
+    
+    /**Knox*/
+    public static final String CONN_PARA_KEY_SPARK_MODE="CONN_PARA_KEY_SPARK_MODE";
+    
+    public static final String CONN_PARA_KEY_USE_KNOX="CONN_PARA_KEY_USE_KNOX";
+    
+    public static final String CONN_PARA_KEY_KNOX_URL="CONN_PARA_KEY_KNOX_URL";
+
+    public static final String CONN_PARA_KEY_KNOX_USER = "CONN_PARA_KEY_KNOX_USER";
+
+    public static final String CONN_PARA_KEY_KNOX_PASSWORD="CONN_PARA_KEY_KNOX_PASSWORD";
+    
+    public static final String CONN_PARA_KEY_KNOX_DIRECTORY="CONN_PARA_KEY_KNOX_DIRECTORY";
+
+    public static final String CONN_PARA_KEY_KNOX_TIMEOUT="CONN_PARA_KEY_KNOX_TIMEOUT";
 
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/DatabaseConnStrUtil.java

@@ -228,8 +228,10 @@ public class DatabaseConnStrUtil {
                     .get(ConnParameterKeys.IMPALA_AUTHENTICATION_PRINCIPLA));
         }
         String url = null;
-        if (template.startsWith(DbConnStrForHive.URL_HIVE_2_TEMPLATE)) {
-            url = getImpalaURLString(false, server, port, sidOrDatabase, impalaPrincipal);
+        String driver = dbConn.getParameters().get(ConnParameterKeys.IMPALA_DRIVER);
+        if (template.startsWith(DbConnStrForHive.URL_HIVE_2_TEMPLATE)
+                || template.startsWith(DbConnStrForHive.URL_IMPALA_TEMPLATE)) {
+            url = getImpalaURLString(false, server, port, sidOrDatabase, impalaPrincipal, driver);
         }
         url = attachAdditionalHiveParameters(url, dbConn, false);
         return url;
@@ -298,13 +300,20 @@ public class DatabaseConnStrUtil {
             if (!url.endsWith(";")) { //$NON-NLS-1$
                 url = url + ";"; //$NON-NLS-1$
             }
-            url = url + "ssl=true;"; //$NON-NLS-1$
+            
+            boolean isHiveDriver = url.startsWith(DbConnStrForHive.URL_HIVE_2_TEMPLATE);
+          
+            url = url + ( isHiveDriver ? "ssl=true;" : "SSL=1;" ); //$NON-NLS-1$
+            
             String trustStorePath = dbConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_SSL_TRUST_STORE_PATH);
+            
             if (trustStorePath != null) {
-                url = url + "sslTrustStore=" + trustStorePath + ";"; //$NON-NLS-1$//$NON-NLS-2$
+                url = url + ( isHiveDriver ? "sslTrustStore=" : "SSLTrustStore=" )  + trustStorePath + ";"; //$NON-NLS-1$//$NON-NLS-2$
             }
+            
             String trustStorePassword = null;
             trustStorePassword = dbConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_SSL_TRUST_STORE_PASSWORD);
+            
             if (trustStorePassword != null) {
                 if (encryptPassword) {
                     trustStorePassword = "encrypted"; //$NON-NLS-1$
@@ -316,7 +325,7 @@ public class DatabaseConnStrUtil {
                 if (trustStorePassword == null) {
                     trustStorePassword = ""; //$NON-NLS-1$
                 }
-                url = url + "trustStorePassword=" + trustStorePassword; //$NON-NLS-1$
+                url = url + ( isHiveDriver ? "trustStorePassword=" : "SSLTrustStorePwd=" ) + trustStorePassword; //$NON-NLS-1$
             }
             if (url.endsWith(";")) { //$NON-NLS-1$
                 url = url.substring(0, url.length() - 1);
@@ -376,10 +385,15 @@ public class DatabaseConnStrUtil {
         return s;
     }
 
-    private static String getImpalaURLString(boolean supportContext, String server, String port, String sid, String Principal) {
-        String s = EDatabaseConnTemplate.IMPALA.getUrlTemplate(null);
-        String standardURlString = getImpalaURlString(s, supportContext, server, port, sid);
-        String principalSuffix = "principal="; //$NON-NLS-1$
+    private static String getImpalaURLString(boolean supportContext, String server, String port, String sid, String Principal,
+            String driver) {
+        String template = EDatabaseConnTemplate.IMPALA.getUrlTemplate(null);
+        if (EDatabaseTypeName.IMPALA.getDbType().equals(driver)) {
+            template = EDatabaseConnTemplate.IMPALA_IMPALA_DRIVER.getUrlTemplate(null);
+        }
+        String standardURlString = getImpalaURlString(template, supportContext, server, port, sid);
+        
+        String principalSuffix = "IMPALA".equals(driver) ? "AuthMech=1" : "principal="; //$NON-NLS-1$
         boolean hasPrinc = false;
         String[] urlArray = standardURlString.split(SEMICOLON);
         if (urlArray[urlArray.length - 1].startsWith(principalSuffix)) {
@@ -391,7 +405,21 @@ public class DatabaseConnStrUtil {
             }
         } else {
             if (Principal != null) {
-                standardURlString = urlArray[0].concat(SEMICOLON).concat(principalSuffix).concat(Principal);
+                
+                if("IMPALA".equals(driver)) {
+                    String krbServiceName  = (Principal.split("/")[0]);
+                    String krbHostFQDN = (Principal.split("/")[1].split("@")[0]);
+                    String krbRealm = (Principal.split("/")[1].split("@")[1]);
+                    String urlKerberosParameter = ";KrbServiceName=" + krbServiceName
+                                                     + ";KrbHostFQDN=" + krbHostFQDN
+                                                     + ";KrbRealm=" + krbRealm;
+                    
+                    standardURlString = urlArray[0].concat(SEMICOLON).concat(principalSuffix).concat(urlKerberosParameter);
+                    
+                } else {
+                
+                    standardURlString = urlArray[0].concat(SEMICOLON).concat(principalSuffix).concat(Principal);
+                }
             }
         }
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/template/DbConnStrForHive.java

@@ -30,6 +30,8 @@ public class DbConnStrForHive extends DbConnStr {
 
     public static final String URL_HIVE_2_TEMPLATE = "jdbc:hive2://";//$NON-NLS-1$
 
+    public static final String URL_IMPALA_TEMPLATE = "jdbc:impala://";//$NON-NLS-1$
+
     /**
      * DOC Marvin DbConnStrForHive constructor comment.
      *

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/template/EDatabaseConnTemplate.java

@@ -33,7 +33,7 @@ public enum EDatabaseConnTemplate {
     MYSQL(new DbConnStr(EDatabaseTypeName.MYSQL, //
             "jdbc:mysql://<host>:<port>/<sid>?<property>", //$NON-NLS-1$
             "3306", //$NON-NLS-1$
-            "noDatetimeStringSync=true")), //$NON-NLS-1$
+            "noDatetimeStringSync=true&enabledTLSProtocols=TLSv1.2,TLSv1.1,TLSv1")), //$NON-NLS-1$
 
     AMAZON_AURORA(new DbConnStr(EDatabaseTypeName.AMAZON_AURORA, //
             "jdbc:mysql://<host>:<port>/<sid>?<property>", //$NON-NLS-1$
@@ -214,6 +214,9 @@ public enum EDatabaseConnTemplate {
     IMPALA(new DbConnStr(EDatabaseTypeName.IMPALA, "jdbc:hive2://<host>:<port>/<sid>;auth=noSasl", //$NON-NLS-1$
             "21050", null, null, "localhost", "default")), //$NON-NLS-1$
 
+    IMPALA_IMPALA_DRIVER(new DbConnStr(EDatabaseTypeName.IMPALA, "jdbc:impala://<host>:<port>/<sid>;auth=noSasl", //$NON-NLS-1$
+            "21050", null, null, "localhost", "default")), //$NON-NLS-1$
+
     HBASE(new DbConnStr(EDatabaseTypeName.HBASE, "127.0.0.1", //$NON-NLS-1$
             "2181")), //$NON-NLS-1$
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/version/EDatabaseVersion4Drivers.java

@@ -25,8 +25,8 @@ import org.talend.core.database.conn.DatabaseConnConstants;
 public enum EDatabaseVersion4Drivers {
     // access
     ACCESS_JDBC(new DbVersion4Drivers(EDatabaseTypeName.ACCESS, new String[] {
-            "jackcess-2.1.0.jar", "ucanaccess-2.0.9.5.jar", "commons-lang-2.6.jar", "commons-logging-1.1.1.jar", "hsqldb.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            "jackcess-encrypt-2.1.0.jar", "bcprov-jdk15on-1.51.jar", "talend-ucanaccess-utils-1.0.0.jar" })),
+            "jackcess-2.1.12.jar", "ucanaccess-2.0.9.5.jar", "commons-lang-2.6.jar", "commons-logging-1.1.3.jar", "hsqldb.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "jackcess-encrypt-2.1.4.jar", "bcprov-jdk15on-1.69.jar", "talend-ucanaccess-utils-1.0.0.jar" })),
     ACCESS_2003(new DbVersion4Drivers(EDatabaseTypeName.ACCESS, "Access 2003", "Access_2003")), //$NON-NLS-1$ //$NON-NLS-2$
     ACCESS_2007(new DbVersion4Drivers(EDatabaseTypeName.ACCESS, "Access 2007", "Access_2007")), //$NON-NLS-1$ //$NON-NLS-2$
     // oracle
@@ -58,7 +58,7 @@ public enum EDatabaseVersion4Drivers {
     HSQLDB_SERVER(new DbVersion4Drivers(EDatabaseTypeName.HSQLDB_SERVER, "hsqldb.jar")), //$NON-NLS-1$
     HSQLDB_WEBSERVER(new DbVersion4Drivers(EDatabaseTypeName.HSQLDB_WEBSERVER, "hsqldb.jar")), //$NON-NLS-1$
 
-    H2(new DbVersion4Drivers(EDatabaseTypeName.H2, "h2-1.4.198.jar")), //$NON-NLS-1$
+    H2(new DbVersion4Drivers(EDatabaseTypeName.H2, "h2-2.1.210.jar")), //$NON-NLS-1$
 
     //
     JAVADB_EMBEDED(new DbVersion4Drivers(EDatabaseTypeName.JAVADB_EMBEDED, "derby.jar")), //$NON-NLS-1$
@@ -71,20 +71,25 @@ public enum EDatabaseVersion4Drivers {
     INFORMIX(new DbVersion4Drivers(EDatabaseTypeName.INFORMIX, "ifxjdbc.jar")), //$NON-NLS-1$
 
     SAS_9_1(new DbVersion4Drivers(EDatabaseTypeName.SAS, "SAS 9.1", "SAS_9.1", new String[] { "sas.core.jar", //$NON-NLS-1$
-            "sas.intrnet.javatools.jar", "sas.svc.connection.jar", "org.apache.log4j_1.2.15.v201012070815.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
+            "sas.intrnet.javatools.jar", "sas.svc.connection.jar", "reload4j-1.2.19.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
     SAS_9_2(new DbVersion4Drivers(EDatabaseTypeName.SAS,
-            "SAS 9.2", "SAS_9.2", new String[] { "sas.core.jar", "sas.security.sspi.jar", "sas.svc.connection.jar", "org.apache.log4j_1.2.15.v201012070815.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
+            "SAS 9.2", "SAS_9.2", //$NON-NLS-1$ //$NON-NLS-2$
+            new String[] { "sas.core.jar", "sas.security.sspi.jar", "sas.svc.connection.jar", "reload4j-1.2.19jar" })),
     SAPHana(new DbVersion4Drivers(EDatabaseTypeName.SAPHana, "HDB 1.0", "HDB_1_0", "ngdbc.jar")), //$NON-NLS-1$
     // MYSQL, add for 9594
     MYSQL_8(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MySQL 8", "MYSQL_8", "mysql-connector-java-8.0.18.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    MYSQL_5(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MySQL 5", "MYSQL_5", "mysql-connector-java-5.1.30-bin.jar")), //$NON-NLS-1$  //$NON-NLS-2$ //$NON-NLS-3$
+    MYSQL_5(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MySQL 5", "MYSQL_5", "mysql-connector-java-5.1.49.jar")), //$NON-NLS-1$  //$NON-NLS-2$ //$NON-NLS-3$
     MARIADB(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MariaDB", "MARIADB", "mariadb-java-client-2.5.3.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     // add for 9594
     MSSQL(new DbVersion4Drivers(EDatabaseTypeName.MSSQL,"Open source JTDS", "JTDS", "jtds-1.3.1-patch-20190523.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     MSSQL_2012(new DbVersion4Drivers(EDatabaseTypeName.MSSQL,
             "Microsoft SQL Server 2012", "Microsoft SQL Server 2012", "jtds-1.3.1-patch-20190523.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     MSSQL_PROP(new DbVersion4Drivers(EDatabaseTypeName.MSSQL,
-            "Microsoft", "MSSQL_PROP", "mssql-jdbc.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "Microsoft", "MSSQL_PROP", //$NON-NLS-1$ //$NON-NLS-2$
+            new String[] { "mssql-jdbc.jar", "slf4j-api-1.7.25.jar", "slf4j-log4j12-1.7.25.jar", "adal4j-1.6.7.jar", //$NON-NLS-1$
+                    "commons-lang3-3.10.jar", "commons-codec-1.14.jar", "gson-2.8.9.jar", "oauth2-oidc-sdk-9.7.jar",
+                    "json-smart-2.4.11.jar", "nimbus-jose-jwt-9.22.jar", "javax.mail-1.6.2.jar", "reload4j-1.2.19.jar",
+                    "accessors-smart-2.4.11.jar", "asm-9.5.jar", "content-type-2.1.jar" })),
 
     VERTICA_9(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 9.X", "VERTICA_9_0", "vertica-jdbc-9.3.1-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     VERTICA_7_1_X(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 7.1.X (Deprecated)", "VERTICA_7_1_X", "vertica-jdbc-7.1.2-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -102,12 +107,12 @@ public enum EDatabaseVersion4Drivers {
     GREENPLUM_PSQL(new DbVersion4Drivers(EDatabaseTypeName.GREENPLUM,"PostgreSQL", "POSTGRESQL", "postgresql-8.4-703.jdbc4.jar")), //$NON-NLS-1$
     GREENPLUM(new DbVersion4Drivers(EDatabaseTypeName.GREENPLUM,"Greenplum", "GREENPLUM", "greenplum-5.1.4.000275.jar")), //$NON-NLS-1$
 //    PSQL_V10(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "v10", "V10", "postgresql-42.2.5.jar")),
-    PSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "v9 and later", "V9_X", "postgresql-42.2.14.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    PSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "v9 and later", "V9_X", "postgresql-42.2.26.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     PSQL_PRIOR_TO_V9(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "Prior to v9", "PRIOR_TO_V9", "postgresql-8.4-703.jdbc4.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
     PLUSPSQL_PRIOR_TO_V9(new DbVersion4Drivers(EDatabaseTypeName.PLUSPSQL,
             "Prior to v9", "PRIOR_TO_V9", "postgresql-8.4-703.jdbc4.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    PLUSPSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PLUSPSQL, "v9 and later", "V9_X", "postgresql-42.2.14.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    PLUSPSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PLUSPSQL, "v9 and later", "V9_X", "postgresql-42.2.26.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     IBMDB2(new DbVersion4Drivers(EDatabaseTypeName.IBMDB2, new String[] { "db2jcc4.jar", "db2jcc_license_cu.jar", //$NON-NLS-1$ //$NON-NLS-2$
             "db2jcc_license_cisuz.jar" })), //$NON-NLS-1$
     IBMDB2ZOS(new DbVersion4Drivers(EDatabaseTypeName.IBMDB2ZOS, new String[] { "db2jcc4.jar", "db2jcc_license_cu.jar", //$NON-NLS-1$ //$NON-NLS-2$
@@ -164,13 +169,15 @@ public enum EDatabaseVersion4Drivers {
     MAPRDB(new DbVersion4Drivers(EDatabaseTypeName.MAPRDB, new String[] {})),
 
     REDSHIFT(new DbVersion4Drivers(EDatabaseTypeName.REDSHIFT, "redshift", "REDSHIFT", //$NON-NLS-1$ //$NON-NLS-2$
-            "redshift-jdbc42-no-awssdk-1.2.37.1061.jar")), //$NON-NLS-1$
+            new String[]{ "redshift-jdbc42-no-awssdk-1.2.55.1083.jar", "antlr4-runtime-4.8-1.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
     REDSHIFT_SSO(new DbVersion4Drivers(EDatabaseTypeName.REDSHIFT_SSO, "redshift sso", "REDSHIFT_SSO", //$NON-NLS-1$ //$NON-NLS-2$
-            new String[] { "redshift-jdbc42-no-awssdk-1.2.37.1061.jar", "aws-java-sdk-1.11.848.jar", "jackson-core-2.10.1.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                    "jackson-databind-2.10.1.jar", "jackson-annotations-2.10.1.jar", "httpcore-4.4.11.jar", "httpclient-4.5.9.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$//$NON-NLS-4$
+            new String[] { "redshift-jdbc42-no-awssdk-1.2.55.1083.jar", "antlr4-runtime-4.8-1.jar", "aws-java-sdk-1.11.848.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                    "jackson-core-2.13.4.jar", //$NON-NLS-1$
+                    "jackson-databind-2.13.4.2.jar", "jackson-annotations-2.13.4.jar", "httpcore-4.4.11.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                    "httpclient-4.5.9.jar", //$NON-NLS-1$
                     "joda-time-2.8.1.jar", "commons-logging-1.2.jar", "commons-codec-1.11.jar" })), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
-    AMAZON_AURORA(new DbVersion4Drivers(EDatabaseTypeName.AMAZON_AURORA, "mysql-connector-java-5.1.30-bin.jar")); //$NON-NLS-1$
+    AMAZON_AURORA(new DbVersion4Drivers(EDatabaseTypeName.AMAZON_AURORA, "mysql-connector-java-5.1.49.jar")); //$NON-NLS-1$
 
     private DbVersion4Drivers dbVersionBean;
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/HadoopClassLoaderFactory2.java

@@ -38,7 +38,10 @@ public class HadoopClassLoaderFactory2 {
     public static ClassLoader getHDFSClassLoader(String relatedClusterId, String distribution, String version, boolean useKrb) {
         return getClassLoader(relatedClusterId, EHadoopCategory.HDFS, distribution, version, useKrb);
     }
-
+    public static ClassLoader getHDFSKnoxClassLoader(String relatedClusterId, String distribution, String version, boolean useKrb) {
+        return HadoopClassLoaderFactory2.getClassLoader(relatedClusterId, EHadoopCategory.HDFS, distribution, version, useKrb,
+                IHadoopArgs.HDFS_ARG_KNOX);
+    }
     public static ClassLoader getMRClassLoader(String relatedClusterId, String distribution, String version, boolean useKrb) {
         return getClassLoader(relatedClusterId, EHadoopCategory.MAP_REDUCE, distribution, version, useKrb);
     }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/IHadoopArgs.java

@@ -22,4 +22,6 @@ public interface IHadoopArgs {
 
     public static final String HIVE_ARG_STANDALONE = "STANDALONE"; //$NON-NLS-1$
 
+    public static final String HDFS_ARG_KNOX = "USE_KNOX"; //$NON-NLS-1$
+
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/conf/EHadoopProperties.java

@@ -101,22 +101,59 @@ public enum EHadoopProperties {
     HD_AZURE_DEPLOYBOLB,
 
     HD_JOB_RESULT_FOLDER,
-
+  
+    SYNAPSE_ENDPOINT,
+    
+    SYNAPSE_TOKEN,
+    
+    SPARK_POOL_NAME,
+    
+    SYNAPSE_STORAGE_HOST,
+    
+    SYNAPSE_STORAGE_CONTAINER,
+    
+    SYNAPSE_STORAGE_USERNAME,
+    
+    SYNAPSE_STORAGE_PASSWORD,
+    
+    DEPLOY_FOLDER,
+    
+    SPARK_DRIVER_MEM,
+    
+    SPARK_DRIVER_CORES,
+    
+    SPARK_EXECUTOR_MEMORY,
+    
     QUBOLE_API_TOKEN,
+    
     QUBOLE_CLUSTER,
+    
     QUBOLE_CLUSTER_LABEL,
+    
     QUBOLE_ENDPOINT,
+    
     QUBOLE_ENDPOINT_URL,
+    
     QUBOLE_S3_ACCESS_KEY,
+    
     QUBOLE_S3_SECRET_KEY,
+    
     QUBOLE_S3_BUCKET_NAME,
+    
     QUBOLE_S3_BUCKET_KEY,
+    
     QUBOLE_S3_REGION,
 
     DATABRICKS_ENDPOINT,
+    
     DATABRICKS_CLOUD_PROVIDER,
+
+    DATABRICKS_RUN_MODE,
+
     DATABRICKS_CLUSTER_ID,
+    
     DATABRICKS_TOKEN,
+    
     DATABRICKS_DBFS_DEP_FOLDER;
 
     public String getName() {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/version/EHadoopDistributions.java

@@ -34,6 +34,8 @@ public enum EHadoopDistributions {
     PIVOTAL_HD("Pivotal HD"), //$NON-NLS-1$
 
     MICROSOFT_HD_INSIGHT("Microsoft HD Insight"), //$NON-NLS-1$
+    
+    AZURE_SYNAPSE("Azure Synapse Runtime for Apache Spark 3.0"), //$NON-NLS-1$
 
     GOOGLE_CLOUD_DATAPROC("Google Cloud Dataproc"), //$NON-NLS-1$
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/version/ESynapseStorage.java

@@ -0,0 +1,73 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2020 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.hadoop.version;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public enum ESynapseStorage {
+
+	ADLS_GEN2("ADLS Gen2"); //$NON-NLS-1$
+
+    private String displayName;
+
+    ESynapseStorage(String displayName) {
+        this.displayName = displayName;
+    }
+
+    public String getName() {
+        return name();
+    }
+
+    public String getDisplayName() {
+        return this.displayName;
+    }
+
+    public static List<String> getAllSynapseStorageDisplayNames() {
+        return getAllSynapseStorageNames(true);
+    }
+
+    public static List<String> getAllSynapseStorageNames(boolean display) {
+        List<String> names = new ArrayList<String>();
+        ESynapseStorage[] values = values();
+        for (ESynapseStorage storage : values) {
+            if (display) {
+                names.add(storage.getDisplayName());
+            } else {
+                names.add(storage.getName());
+            }
+        }
+        return names;
+    }
+
+    public static ESynapseStorage getSynapseStoragenByDisplayName(String name) {
+        return getSynapseStorageByName(name, true);
+    }
+
+    public static ESynapseStorage getSynapseStorageByName(String name, boolean display) {
+        if (name != null) {
+            for (ESynapseStorage storage : values()) {
+                if (display) {
+                    if (name.equalsIgnoreCase(storage.getDisplayName())) {
+                        return storage;
+                    }
+                } else {
+                    if (name.equalsIgnoreCase(storage.getName())) {
+                        return storage;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/version/custom/ECustomVersionGroup.java

@@ -26,11 +26,6 @@ public enum ECustomVersionGroup {
 
     MAPRDB,
 
-    PIG,
-
-    PIG_HBASE,
-    PIG_HCATALOG,
-
     MAP_REDUCE,
 
     SPARK,

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/version/custom/ECustomVersionType.java

@@ -18,12 +18,6 @@ public enum ECustomVersionType {
 
     MAPRDB("Maprdb", ECustomVersionGroup.MAPRDB), //$NON-NLS-1$
 
-    PIG("Pig", ECustomVersionGroup.PIG), //$NON-NLS-1$
-
-    PIG_HBASE("Pig for HBase", ECustomVersionGroup.PIG_HBASE), //$NON-NLS-1$
-
-    PIG_HCATALOG("Pig for Hcatalog", ECustomVersionGroup.PIG_HCATALOG), //$NON-NLS-1$
-
     MAP_REDUCE("Map Reduce", ECustomVersionGroup.MAP_REDUCE), //$NON-NLS-1$
 
     SPARK("Spark", ECustomVersionGroup.SPARK), //$NON-NLS-1$

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/version/custom/HadoopCustomVersionDefineDialog.java

@@ -483,7 +483,7 @@ public class HadoopCustomVersionDefineDialog extends TitleAreaDialog {
 
     private boolean isSupportHadoop() {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IHadoopService.class)) {
-            hadoopService = (IHadoopService) GlobalServiceRegister.getDefault().getService(IHadoopService.class);
+            hadoopService = GlobalServiceRegister.getDefault().getService(IHadoopService.class);
         }
 
         return hadoopService != null;
@@ -503,11 +503,7 @@ public class HadoopCustomVersionDefineDialog extends TitleAreaDialog {
     private ECustomVersionType[] filterTypes(Object[] types) {
         Object[] filteredTypes = ArrayUtils.removeElement(types, ECustomVersionType.ALL);
         IDesignerCoreService designerCoreService = CoreRuntimePlugin.getInstance().getDesignerCoreService();
-        INode node = designerCoreService.getRefrenceNode("tPigLoad"); //$NON-NLS-1$
-        if (node == null) {
-            filteredTypes = ArrayUtils.removeElement(filteredTypes, ECustomVersionType.PIG);
-        }
-        node = designerCoreService.getRefrenceNode("tMRConfiguration", ComponentCategory.CATEGORY_4_MAPREDUCE.getName());//$NON-NLS-1$
+        INode node = designerCoreService.getRefrenceNode("tMRConfiguration", ComponentCategory.CATEGORY_4_MAPREDUCE.getName());//$NON-NLS-1$
         if (node == null) {
             filteredTypes = ArrayUtils.removeElement(filteredTypes, ECustomVersionType.MAP_REDUCE);
         }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/version/custom/HadoopVersionDialog.java

@@ -425,7 +425,7 @@ public class HadoopVersionDialog extends TitleAreaDialog {
         if (isFromExistVersion) {
             IHadoopService hadoopService = null;
             if (GlobalServiceRegister.getDefault().isServiceRegistered(IHadoopService.class)) {
-                hadoopService = (IHadoopService) GlobalServiceRegister.getDefault().getService(IHadoopService.class);
+                hadoopService = GlobalServiceRegister.getDefault().getService(IHadoopService.class);
             }
             if (hadoopService != null) {
                 for (ECustomVersionGroup group : existVersionSelectionMap.keySet()) {
@@ -437,10 +437,7 @@ public class HadoopVersionDialog extends TitleAreaDialog {
                             for (ECustomVersionType type : types) {
                                 if (type.getGroup() == group) {
                                     Set<String> hadoopLibraries = new HashSet<String>();
-                                    if (ECustomVersionType.PIG == type || ECustomVersionType.PIG_HBASE == type
-                                            || ECustomVersionType.PIG_HCATALOG == type) {
-                                        hadoopLibraries = getLibrariesForPig(type);
-                                    } else if (ECustomVersionType.MAP_REDUCE == type) {
+                                    if (ECustomVersionType.MAP_REDUCE == type) {
                                         hadoopLibraries = getLibrariesForMapReduce(type);
                                     } else if (ECustomVersionType.SPARK == type || ECustomVersionType.SPARK_STREAMING == type) {
                                         hadoopLibraries = getLibrariesForSpark(type);
@@ -542,42 +539,6 @@ public class HadoopVersionDialog extends TitleAreaDialog {
         return neededLibraries;
     }
 
-    private Set<String> getLibrariesForPig(ECustomVersionType type) {
-        Set<String> neededLibraries = new HashSet<String>();
-        INode node = CoreRuntimePlugin.getInstance().getDesignerCoreService().getRefrenceNode("tPigLoad");//$NON-NLS-1$
-
-        IElementParameter elementParameter = node.getElementParameter("MAPREDUCE");//$NON-NLS-1$
-        if (elementParameter != null) {
-            elementParameter.setValue(true);
-        }
-        elementParameter = node.getElementParameter("DISTRIBUTION");//$NON-NLS-1$
-        if (elementParameter != null) {
-            elementParameter.setValue(distribution);
-        }
-
-        elementParameter = node.getElementParameter("PIG_VERSION");//$NON-NLS-1$
-        if (elementParameter != null) {
-            elementParameter.setValue(version);
-        }
-
-        elementParameter = node.getElementParameter("LOAD");//$NON-NLS-1$
-        if (elementParameter != null) {
-            if (ECustomVersionType.PIG_HBASE == type) {
-                elementParameter.setValue("HBASESTORAGE");//$NON-NLS-1$
-            } else if (ECustomVersionType.PIG_HCATALOG == type) {
-                elementParameter.setValue("HCATLOADER");//$NON-NLS-1$
-            }
-        }
-
-        List<ModuleNeeded> modulesNeeded = node.getModulesNeeded();
-        for (ModuleNeeded module : modulesNeeded) {
-            if (module.isRequired(node.getElementParameters())) {
-                neededLibraries.add(module.getModuleName());
-            }
-        }
-        return neededLibraries;
-    }
-
     public Map<ECustomVersionType, Map<String, Object>> getTypeConfigurations() {
         return this.typeConfigurations;
     }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/context/ContextUtils.java

@@ -495,11 +495,16 @@ public class ContextUtils {
         }
         return itemMap;
     }
+    
+    private static Set<String> missingContexts = new HashSet<>();
+
+    public static void clearMissingContextCache() {
+        missingContexts.clear();
+    }
 
     /**
-     *
-     * get the repository context item,now contextId can be either joblet node or context node.
-     */
+    * get the repository context item, now contextId can be either joblet node or context node.
+    */
     public static Item getRepositoryContextItemById(String contextId) {
         if (IContextParameter.BUILT_IN.equals(contextId)) {
             return null;
@@ -507,6 +512,9 @@ public class ContextUtils {
         if (checkObject(contextId)) {
             return null;
         }
+        if (missingContexts.contains(contextId)) {
+            return null;
+        }
 
         List<ERepositoryObjectType> possibleTypes = new ArrayList<ERepositoryObjectType>();
         possibleTypes.add(ERepositoryObjectType.CONTEXT);
@@ -521,6 +529,8 @@ public class ContextUtils {
                     return item;
                 }
             }
+            missingContexts.add(contextId);
+            ExceptionHandler.log("Can't find Context item[id=" + contextId + "].");
         } catch (PersistenceException e) {
             ExceptionHandler.process(e);
         }
@@ -831,6 +841,7 @@ public class ContextUtils {
             ItemContextLink itemContextLink) {
         Map<String, String> renamedMap = new HashMap<String, String>();
         Map<String, Item> tempItemMap = new HashMap<String, Item>();
+        clearMissingContextCache();
         for (ContextType contextType : contextTypeList) {
             for (Object obj : contextType.getContextParameter()) {
                 if (obj instanceof ContextParameterType) {
@@ -893,6 +904,7 @@ public class ContextUtils {
      */
     public static Map<String, String> calculateRenamedMapFromLinkFile(String projectLabel, String itemId,
             List<IContext> contextList) {
+        clearMissingContextCache();
         Map<String, String> renamedMap = new HashMap<String, String>();
         Map<String, Item> idToItemMap = new HashMap<String, Item>();
         try {
@@ -951,6 +963,14 @@ public class ContextUtils {
             params.add(param);
         }
 
+        public boolean remove(Item item, String param) {
+            Set<String> params = map.get(item);
+            if (params != null && params.contains(param)) {
+                return params.remove(param);
+            }
+            return false;
+        }
+
         @SuppressWarnings("unchecked")
         public Set<String> get(Item item) {
             Set<String> params = map.get(item);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/context/JobContextManager.java

@@ -299,6 +299,7 @@ public class JobContextManager implements IContextManager {
         }
         List<ContextItem> contextItemList = ContextUtils.getAllContextItem();
         boolean setDefault = false;
+        ContextUtils.clearMissingContextCache();
         for (int i = 0; i < contextTypeList.size(); i++) {
             contextType = (ContextType) contextTypeList.get(i);
             String name = contextType.getName();
@@ -526,6 +527,7 @@ public class JobContextManager implements IContextManager {
 
         EList newcontextTypeList = new BasicEList();
         Map<String, Item> idToItemMap = new HashMap<String, Item>();
+        ContextUtils.clearMissingContextCache();
         for (int i = 0; i < listContext.size(); i++) {
             IContext context = listContext.get(i);
             String contextGroupName = renameGroupContext.get(context);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/context/link/AbstractItemContextLinkService.java

@@ -51,6 +51,7 @@ public abstract class AbstractItemContextLinkService implements IItemContextLink
         itemContextLink.setItemId(itemId);
         Map<String, Item> tempCache = new HashMap<String, Item>();
         if (contextTypeList != null && contextTypeList.size() > 0) {
+            ContextUtils.clearMissingContextCache();
             for (Object object : contextTypeList) {
                 if (object instanceof ContextType) {
                     ContextType jobContextType = (ContextType) object;

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/context/link/ContextLinkService.java

@@ -206,6 +206,7 @@ public class ContextLinkService {
             Map<String, Map<String, String>> changedContextParameterId) throws PersistenceException {
         List<Relation> relationList = RelationshipItemBuilder.getInstance()
                 .getItemsHaveRelationWith(sourceId, RelationshipItemBuilder.LATEST_VERSION, false);
+        ContextUtils.clearMissingContextCache();
         for (Relation relation : relationList) {
             String id = relation.getId();
             IFile linkFile = calContextLinkFile(ProjectManager.getInstance().getCurrentProject().getTechnicalLabel(), id);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/general/ConnectionBean.java

@@ -57,6 +57,11 @@ public class ConnectionBean implements Cloneable {
     private static final String TOKEN = "token"; //$NON-NLS-1$
 
     private static final String URL = "url"; //$NON-NLS-1$
+
+    private static final String STORECREDENTIALS = "storeCredentials"; //$NON-NLS-1$
+
+    private String credentials = ""; //$NON-NLS-1$
+
     /**
      * DOC smallet ConnectionBean constructor comment.
      */
@@ -178,6 +183,9 @@ public class ConnectionBean implements Cloneable {
     public String getPassword() {
         try {
             if (conDetails.has(PASSWORD)) {
+                if (isStoreCredentials() && credentials != null) {
+                    return this.credentials;
+                }
                 return conDetails.getString(PASSWORD);
             }
         } catch (JSONException e) {
@@ -326,6 +334,7 @@ public class ConnectionBean implements Cloneable {
             toReturn.setWorkSpace(st[i++]);
             toReturn.setComplete(new Boolean(st[i++]));
             toReturn.setToken(new Boolean(st[i++]));
+            toReturn.setStoreCredentials(new Boolean(st[i++]));
             JSONObject dynamicJson = new JSONObject();
             toReturn.getConDetails().put(DYNAMICFIELDS, dynamicJson);
             while (i < st.length) {
@@ -408,4 +417,30 @@ public class ConnectionBean implements Cloneable {
         return "";
     }
 
+    public boolean isStoreCredentials() {
+        try {
+            if (conDetails.has(STORECREDENTIALS)) {
+                return (Boolean) conDetails.get(STORECREDENTIALS);
+            }
+        } catch (JSONException e) {
+            ExceptionHandler.process(e);
+        }
+        return false;
+    }
+
+    public void setStoreCredentials(boolean store) {
+        try {
+            conDetails.put(STORECREDENTIALS, store);
+        } catch (JSONException e) {
+            ExceptionHandler.process(e);
+        }
+    }
+
+    public String getCredentials() {
+        return this.credentials;
+    }
+
+    public void setCredentials(String credentials) {
+        this.credentials = credentials;
+    }
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/general/ModuleNeeded.java

@@ -14,12 +14,14 @@ package org.talend.core.model.general;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.core.runtime.Path;
 import org.osgi.framework.Version;
+import org.talend.commons.exception.ExceptionHandler;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.ILibraryManagerService;
 import org.talend.core.database.conn.version.DatabaseDriversCache;
@@ -29,6 +31,9 @@ import org.talend.core.runtime.maven.MavenArtifact;
 import org.talend.core.runtime.maven.MavenConstants;
 import org.talend.core.runtime.maven.MavenUrlHelper;
 import org.talend.core.utils.TalendQuoteUtils;
+import org.talend.utils.json.JSONException;
+import org.talend.utils.json.JSONObject;
+import org.talend.utils.json.JSONTokener;
 
 /**
  * This bean is use to manage needed moduless (perl) and libraries (java).<br/>
@@ -38,6 +43,10 @@ import org.talend.core.utils.TalendQuoteUtils;
  */
 public class ModuleNeeded {
 
+    public static final String ATTR_USED_BY_DYNAMIC_DISTRIBUTION = "dynamicDistribution";
+
+    public static final String ATTR_DYNAMIC_DISTRIBUTION_VERSION = "distributionVersion";
+    
     private String id;
 
     private String context;
@@ -94,8 +103,11 @@ public class ModuleNeeded {
      */
     private boolean useReleaseVersion = false;
 
+    private Map<String, String> attributes;
+
     ILibraryManagerService libManagerService = (ILibraryManagerService) GlobalServiceRegister.getDefault()
             .getService(ILibraryManagerService.class);
+    
 
     /**
      * DOC smallet ModuleNeeded class global comment. Detailled comment <br/>
@@ -162,6 +174,10 @@ public class ModuleNeeded {
         this.required = required;
         this.installURL = installURL;
         this.requiredIf = requiredIf;
+        this.attributes = analyseMessage(informationMsg);
+        if (!this.attributes.isEmpty()) {
+            this.informationMsg = "";
+        }
         String name = moduleName;
         String uri = mavenUrl;
         if (moduleName != null) {
@@ -184,6 +200,32 @@ public class ModuleNeeded {
         setMavenUri(uri);
     }
 
+    private Map<String, String> analyseMessage(String msg) {
+        Map<String, String> attrMap = new HashMap<>();
+        if (StringUtils.isBlank(msg) || !msg.startsWith("{") || !msg.endsWith("}")) {
+            return attrMap;
+        }
+        try {
+            JSONObject jo = new JSONObject(new JSONTokener(msg));
+            Iterator<String> keys = jo.keys();
+            keys.forEachRemaining(key -> {
+                try {
+                    Object object = jo.get(key);
+                    if (object != null) {
+                        attrMap.put(key, object.toString());
+                    }
+                } catch (JSONException e) {
+                    ExceptionHandler.process(e);
+                }
+            });
+        } catch (Exception e) {
+            if (Boolean.getBoolean("talend.studio.moduleNeeded.init.debug")) {
+                ExceptionHandler.process(e);
+            }
+        }
+        return attrMap;
+    }
+
     @Override
     public ModuleNeeded clone() {
         ModuleNeeded cloned = new ModuleNeeded(context, moduleName, informationMsg, mrRequired, installURL, requiredIf, mavenUri);
@@ -212,6 +254,7 @@ public class ModuleNeeded {
         cloned.requiredIf = requiredIf;
         cloned.status = status;
         cloned.useReleaseVersion = useReleaseVersion;
+        cloned.attributes = attributes;
 
         return cloned;
     }
@@ -671,6 +714,10 @@ public class ModuleNeeded {
         }
     }
 
+    public boolean usedByDynamicDistribution() {
+        return Boolean.valueOf(attributes.get(ATTR_USED_BY_DYNAMIC_DISTRIBUTION));
+    }
+
     public boolean isDynamic() {
         return this.dynamic;
     }
@@ -709,5 +756,12 @@ public class ModuleNeeded {
     public void setUseReleaseVersion(boolean useReleaseVersion) {
         this.useReleaseVersion = useReleaseVersion;
     }
-
+    
+    public String getDynamicDistributionVersion() {
+        return attributes.get(ATTR_DYNAMIC_DISTRIBUTION_VERSION);
+    }
+    
+    public void setDynamicDistributionVersion(String distribution) {
+        attributes.put(ATTR_DYNAMIC_DISTRIBUTION_VERSION, distribution);
+    }
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/general/RetrieveResult.java

@@ -0,0 +1,42 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.model.general;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class RetrieveResult {
+
+    private boolean allResolved;
+
+    private Set<ModuleNeeded> resovledModules = new HashSet<>();
+
+    private Set<ModuleNeeded> unresolvedModules = new HashSet<>();
+
+    public boolean isAllResolved() {
+        return allResolved;
+    }
+
+    public void setAllResolved(boolean allResolved) {
+        this.allResolved = allResolved;
+    }
+
+    public Set<ModuleNeeded> getResovledModules() {
+        return resovledModules;
+    }
+
+    public Set<ModuleNeeded> getUnresolvedModules() {
+        return unresolvedModules;
+    }
+
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/IMetadataConnection.java

@@ -194,6 +194,10 @@ public interface IMetadataConnection extends IMetadata {
     public String getContextName();
 
     public void setContextName(String contextName);
+    
+    public boolean isSupportNLS();
+    
+    public void setSupportNLS(boolean newSupportNLS);
 
     /**
      * Returns the value that you stored in the data collection by the key. Normally, it is like this key-value. For

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/IMetadataTable.java

@@ -69,6 +69,8 @@ public interface IMetadataTable {
 
     public boolean sameMetadataAs(IMetadataTable other, int options);
 
+    public boolean sameMetadataAs(List<IMetadataColumn> otherMetadataTableColumns, int options);
+
     public void sortCustomColumns();
 
     public boolean isReadOnly();

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/ISAPConstant.java

@@ -106,4 +106,6 @@ public interface ISAPConstant {
     public static final String PROP_DB_USERNAME = "db.username";//$NON-NLS-1$
 
     public static final String PROP_DB_PASSWORD = "db.password";//$NON-NLS-1$
-}
+
+    public static final String PROP_DB_ADDITIONAL_PROPERTIES = "db.additionalProperties";//$NON-NLS-1$
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataTable.java

@@ -252,8 +252,13 @@ public class MetadataTable implements IMetadataTable, Cloneable {
         if (!(input instanceof IMetadataTable)) {
             return false;
         }
-        List<IMetadataColumn> thisColumnListWithUnselected = this.getListColumns(true);
         List<IMetadataColumn> inputColumnListWithUnselected = input.getListColumns(true);
+        return sameMetadataAs(inputColumnListWithUnselected, options);
+    }
+
+    @Override
+    public boolean sameMetadataAs(List<IMetadataColumn> inputColumnListWithUnselected, int options) {
+        List<IMetadataColumn> thisColumnListWithUnselected = this.getListColumns(true);
         if (thisColumnListWithUnselected == null) {
             if (inputColumnListWithUnselected != null) {
                 return false;

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataTalendType.java

@@ -16,6 +16,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.net.URL;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -24,18 +25,20 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang.StringUtils;
 import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ProjectScope;
 import org.eclipse.core.runtime.CoreException;
@@ -46,9 +49,9 @@ import org.eclipse.core.runtime.Platform;
 import org.osgi.framework.Bundle;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.SystemException;
+import org.talend.commons.runtime.xml.XmlUtil;
+import org.talend.commons.utils.io.FilesUtils;
 import org.talend.commons.utils.workbench.resources.ResourceUtils;
-import org.talend.core.GlobalServiceRegister;
-import org.talend.core.ICoreService;
 import org.talend.core.database.EDatabaseTypeName;
 import org.talend.core.language.ECodeLanguage;
 import org.talend.core.language.LanguageManager;
@@ -59,6 +62,8 @@ import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.runtime.i18n.Messages;
 import org.talend.core.utils.TalendQuoteUtils;
 import org.talend.repository.ProjectManager;
+import org.talend.repository.model.RepositoryConstants;
+import org.talend.utils.json.JSONObject;
 import org.talend.utils.xml.XmlUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
@@ -75,14 +80,13 @@ import org.xml.sax.SAXException;
  */
 public final class MetadataTalendType {
 
-    /**
-     *
-     */
     public static final String INTERNAL_MAPPINGS_FOLDER = "mappings"; //$NON-NLS-1$
 
     public static final String PROJECT_MAPPING_FOLDER = ".settings/mappings"; //$NON-NLS-1$
 
-    public static final String UPDATED_MAPPING_FILES = "updated.mapping.files"; //$NON-NLS-1$
+    public static final String FILE_MAPPING_REVISION = "mapping_revision.json"; //$NON-NLS-1$
+
+    public static final String MAPPING_FILE_PATTERN = "^mapping_.*\\.xml$"; //$NON-NLS-1$
 
     private static ECodeLanguage codeLanguage;
 
@@ -459,13 +463,14 @@ public final class MetadataTalendType {
         return list;
     }
 
-    public static URL getSystemForderURLOfMappingsFile() throws SystemException {
+    public static URL getSystemFolderURLOfMappingsFile() throws SystemException {
         String dirPath = "/" + INTERNAL_MAPPINGS_FOLDER; //$NON-NLS-1$
         URL url = null;
         Path filePath = new Path(dirPath);
         Bundle b = Platform.getBundle(CoreRuntimePlugin.PLUGIN_ID);
         if (b != null) {
             try {
+                // Enumeration<URL> entries = b.findEntries(dirPath, "mapping_*.xml", false);
                 url = FileLocator.toFileURL(FileLocator.find(b, filePath, null));
             } catch (IOException e) {
                 throw new SystemException(e);
@@ -474,46 +479,169 @@ public final class MetadataTalendType {
         return url;
     }
 
-    public static URL getProjectForderURLOfMappingsFile() throws SystemException {
+    public static URL getProjectFolderURLOfMappingsFile() throws SystemException {
         try {
             String dirPath = "/" + INTERNAL_MAPPINGS_FOLDER; //$NON-NLS-1$
             IProject project = ResourceUtils.getProject(ProjectManager.getInstance().getCurrentProject());
             IPath settingPath = new ProjectScope(project).getLocation();
-            IPath mappingPath = settingPath.append(dirPath);
-            File mappingFolder = mappingPath.toFile();
-            if (!mappingFolder.exists() || mappingFolder.listFiles().length < 1) {
-                ICoreService service = null;
-                if (GlobalServiceRegister.getDefault().isServiceRegistered(ICoreService.class)) {
-                    service = GlobalServiceRegister.getDefault().getService(ICoreService.class);
-                    service.syncMappingsFileFromSystemToProject();
-                }
-            }
-            return mappingFolder.toURL();
+            File mappingFolder = settingPath.append(dirPath).toFile();
+            return mappingFolder.toURI().toURL();
         } catch (Exception e) {
             throw new SystemException(e);
         }
     }
 
-    private static String getSha1OfFile(File file) {
-        String sha1 = null;
-        FileInputStream fileInputStream = null;
+    public static URL getProjectTempMappingFolder() {
         try {
-            fileInputStream = new FileInputStream(file);
-            sha1 = DigestUtils.shaHex(fileInputStream);
+            IProject project = ResourceUtils.getProject(ProjectManager.getInstance().getCurrentProject());
+            File folder = ResourceUtils
+                    .getFolder(project, RepositoryConstants.TEMP_DIRECTORY + "/" + INTERNAL_MAPPINGS_FOLDER, false).getLocation()
+                    .toFile();
+            syncMappingFiles(folder, false);
+            return folder.toURI().toURL();
         } catch (Exception e) {
             ExceptionHandler.process(e);
-        } finally {
-            if (fileInputStream != null) {
-                try {
-                    fileInputStream.close();
-                } catch (IOException e) {
-                    e.printStackTrace(); // Just print the exception for debug.
+            return null;
+        }
+    }
+
+    public static void syncMappingFiles(File target, boolean rename) {
+        if (!target.exists()) {
+            target.mkdir();
+        }
+        File[] arr = target.listFiles(f -> f.getName().matches(MAPPING_FILE_PATTERN));
+        if (arr == null) {
+            arr = new File[0];
+        }
+        try {
+            Map<String, File> targetFileMap = Stream.of(arr).collect(Collectors.toMap(File::getName, Function.identity()));
+            Map<String, File> workingFileMap = getWorkingMappingFiles().stream()
+                    .collect(Collectors.toMap(f -> getTargetName(f, rename), Function.identity(), (f1, f2) -> f1));
+
+            targetFileMap.entrySet().stream().filter(entry -> !workingFileMap.containsKey(entry.getKey()))
+                    .forEach(entry -> entry.getValue().delete());
+
+            for (Entry<String, File> entry : workingFileMap.entrySet()) {
+                String targetName = entry.getKey();
+                File workingMappingFile = entry.getValue();
+                boolean needUpdate = false;
+                File targetMappingFile = targetFileMap.get(targetName);
+                if (targetMappingFile == null) {
+                    targetMappingFile = new File(target, targetName);
+                    needUpdate = true;
+                } else if (!getSha1OfFile(workingMappingFile).equals(getSha1OfFile(targetMappingFile))) {
+                    needUpdate = true;
+                }
+                if (needUpdate) {
+                    if (targetMappingFile.exists()) {
+                        targetMappingFile.delete();
+                    }
+                    FilesUtils.copyFile(workingMappingFile, targetMappingFile);
                 }
             }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
         }
-        return sha1;
+    }
+
+    public static String getTargetName(File file, boolean rename) {
+        String targetName = file.getName();
+        if (!rename) {
+            return targetName;
+        }
+        try {
+            DocumentBuilderFactory documentBuilderFactory = XmlUtils.getSecureDocumentBuilderFactory();
+            DocumentBuilder analyser = documentBuilderFactory.newDocumentBuilder();
+            Document document = analyser.parse(file);
+            NodeList dbmsNodes = document.getElementsByTagName("dbms"); //$NON-NLS-1$
+            String dbmsIdValue = "";
+            for (int iDbms = 0; iDbms < dbmsNodes.getLength(); iDbms++) {
+                Node dbmsNode = dbmsNodes.item(iDbms);
+                NamedNodeMap dbmsAttributes = dbmsNode.getAttributes();
+                dbmsIdValue = dbmsAttributes.getNamedItem("id").getNodeValue(); //$NON-NLS-1$
+
+            }
+            if (dbmsIdValue != null && !"".equals(dbmsIdValue)) {
+                final String[] fileNameSplit = targetName.split("_");
+                String idA = "_id";
+                String idB = "id_";
+                final int indexA = dbmsIdValue.indexOf(idA);
+                final int indexB = dbmsIdValue.indexOf(idB);
+                String secondeName = "";
+                if (indexA > 0) {
+                    secondeName = dbmsIdValue.substring(0, dbmsIdValue.length() - idA.length());
+                } else if (indexB == 0) {
+                    secondeName = dbmsIdValue.substring(idB.length(), dbmsIdValue.length());
+                } else if (indexA == -1 && indexB == -1) {
+                    secondeName = dbmsIdValue;
+                }
+                if (secondeName != null && !"".equals(secondeName)) {
+                    targetName = fileNameSplit[0] + "_" + secondeName.toLowerCase() + XmlUtil.FILE_XML_SUFFIX;
+                }
+
+            }
+        } catch (ParserConfigurationException e) {
+            ExceptionHandler.process(e);
+        } catch (SAXException e) {
+            ExceptionHandler.process(e);
+        } catch (IOException e) {
+            ExceptionHandler.process(e);
+        }
+        return targetName;
+    }
+
+    public static JSONObject getRevisionObject() {
+        try {
+            File revisonFile = new File(MetadataTalendType.getSystemFolderURLOfMappingsFile().getFile(),
+                    MetadataTalendType.FILE_MAPPING_REVISION);
+            String jsonStr = new String(Files.readAllBytes(revisonFile.toPath()));
+            return new JSONObject(jsonStr);
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+        return new JSONObject();
+    }
+
+    public static boolean restoreMappingFiles() throws Exception {
+        List<File> toDelete = new ArrayList<>();
+        JSONObject revision = getRevisionObject();
+        File projectMappingFolder = new File(getProjectFolderURLOfMappingsFile().getFile());
+        if (projectMappingFolder.exists()) {
+            File[] projectMappingFiles = projectMappingFolder.listFiles(f -> f.getName().matches(MAPPING_FILE_PATTERN));
+            if (projectMappingFiles != null) {
+                for (File file : projectMappingFiles) {
+                    if (revision.has(file.getName())) {
+                        String sha1 = MetadataTalendType.getSha1OfFile(file);
+                        if (revision.getJSONObject(file.getName()).has(sha1)) {
+                            toDelete.add(file);
+                        }
+                    }
+                }
+            }
+            File xsd = new File(projectMappingFolder, "mapping_validate.xsd"); //$NON-NLS-1$
+            if (xsd.exists()) {
+                xsd.delete();
+            }
+        }
+        toDelete.forEach(File::delete);
+        return !toDelete.isEmpty();
+    }
+
+    public static String getSha1OfFile(File file) {
+        try {
+            String text = new String(Files.readAllBytes(file.toPath()));
+            return getSha1OfText(text);
+        } catch (IOException e) {
+            ExceptionHandler.process(e);
+        }
+        return null;
     }
     
+    public static String getSha1OfText(String text) {
+        text = text.replace("\r\n", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
+        return DigestUtils.sha1Hex(text);
+    }
+
     public static void copyFile(File in, IFile out) throws CoreException, IOException {
         FileInputStream fis = new FileInputStream(in);
         if (out.exists()) {
@@ -524,49 +652,6 @@ public final class MetadataTalendType {
         fis.close();
     }
 
-    public static void syncNewMappingFileToProject() throws SystemException {
-        try {
-            File sysMappingFiles = new File(MetadataTalendType.getSystemForderURLOfMappingsFile().getPath());
-            IFolder projectMappingFolder = ResourceUtils.getProject(ProjectManager.getInstance().getCurrentProject())
-                    .getFolder(MetadataTalendType.PROJECT_MAPPING_FOLDER);
-            File projectMappingFiles = new File(projectMappingFolder.getLocationURI());
-            if (!sysMappingFiles.exists() || !projectMappingFiles.exists()) {
-                return;
-            }
-            for (File sysMapping : sysMappingFiles.listFiles()) {
-                IFile projectMapping = projectMappingFolder.getFile(sysMapping.getName());
-                if (projectMapping.exists() && StringUtils.equals(sysMapping.getName(), "mapping_Greenplum.xml")) {
-
-                    String sha1OfFile = DigestUtils.shaHex(projectMapping.getContents());
-                    String shalOfOldSystem = "8431f19215dacb3caa126778ae695954552cce2a";
-                    if (StringUtils.equals(sha1OfFile, shalOfOldSystem)) {
-                        copyFile(sysMapping, projectMapping);
-                    }
-                }
-                if (!projectMapping.exists()) {
-                    FileInputStream fis = null;
-                    try {
-                        fis = new FileInputStream(sysMapping);
-                        projectMapping.create(fis, true, null);
-                    } catch (CoreException coreExc) {
-                        throw new SystemException(coreExc);
-                    } finally {
-                        if (fis != null) {
-                            try {
-                                fis.close();
-                            } catch (IOException ioExc) {
-                                throw new SystemException(ioExc);
-                            }
-                        }
-                    }
-                }
-            }
-
-        } catch (Exception e) {
-            throw new SystemException(e);
-        }
-    }
-
     /**
      *
      * Load db types and mapping with the current activated language (Java, Perl, ...).
@@ -574,20 +659,38 @@ public final class MetadataTalendType {
      * @throws SystemException
      */
     public static void loadCommonMappings() throws SystemException {
-        URL url = getProjectForderURLOfMappingsFile();
-        File dir = new File(url.getPath());
         metadataMappingFiles = new ArrayList<File>();
         dbmsSet.clear();
-        if (dir.isDirectory()) {
-            File[] files = dir.listFiles();
-            for (File file : files) {
-                if (file.getName().matches("^mapping_.*\\.xml$")) { //$NON-NLS-1$
-                    loadMapping(file);
-                    metadataMappingFiles.add(file);
-                }
-            }
+        for (File file : getWorkingMappingFiles()) {
+            loadMapping(file);
+            metadataMappingFiles.add(file);
         }
+    }
 
+    public static List<File> getWorkingMappingFiles() throws SystemException {
+        File projectMappingFolder = new File(getProjectFolderURLOfMappingsFile().getFile());
+        File[] projectMappingFiles = projectMappingFolder.listFiles(f -> f.getName().matches(MAPPING_FILE_PATTERN));
+        File systemMappingFolder = new File(getSystemFolderURLOfMappingsFile().getFile());
+        File[] systemMappingFiles = systemMappingFolder.listFiles(f -> f.getName().matches(MAPPING_FILE_PATTERN));
+        if (projectMappingFiles == null || projectMappingFiles.length == 0) {
+            return Arrays.asList(systemMappingFiles);
+        }
+        List<File> workingMappingFiles = new ArrayList<>();
+        Map<String, File> projectMappingFilesMap = Stream.of(projectMappingFiles)
+                .collect(Collectors.toMap(File::getName, Function.identity()));
+        workingMappingFiles.addAll(projectMappingFilesMap.values());
+        Stream.of(systemMappingFiles).filter(f -> !projectMappingFilesMap.containsKey(f.getName()))
+                .forEach(f -> workingMappingFiles.add(f));
+        return workingMappingFiles;
+    }
+
+    public static String getSha1OfSystemMappingFile(String fileName) {
+        try {
+            return getSha1OfFile(new File(getSystemFolderURLOfMappingsFile().getFile(), fileName));
+        } catch (SystemException e) {
+            ExceptionHandler.process(e);
+            return null;
+        }
     }
 
     private static void loadMapping(File file) throws SystemException {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataToolHelper.java

@@ -281,9 +281,7 @@ public final class MetadataToolHelper {
     }
 
     public static boolean isAllowSpecificCharacters() {
-        IEclipsePreferences coreUIPluginNode = new InstanceScope().getNode(ITalendCorePrefConstants.CoreUIPlugin_ID);
-        return coreUIPluginNode
-                .getBoolean(IRepositoryPrefConstants.ALLOW_SPECIFIC_CHARACTERS_FOR_SCHEMA_COLUMNS, false);
+        return CoreRuntimePlugin.getInstance().getProjectPreferenceManager().isAllowSpecificCharacters();
     }
 
     /**

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/builder/ConvertionHelper.java

@@ -254,6 +254,7 @@ public final class ConvertionHelper {
         result.setContentModel(connection.isContextMode());
         result.setContextId(sourceConnection.getContextId());
         result.setContextName(sourceConnection.getContextName());
+        result.setSupportNLS(sourceConnection.isSupportNLS());
         // handle oracle database connnection of general_jdbc.
         result.setSchema(getMeataConnectionSchema(result));
         convertOtherParameters(result, connection);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/builder/MetadataConnection.java

@@ -113,6 +113,7 @@ public class MetadataConnection implements IMetadataConnection {
 
     private String contextName;
 
+    private boolean supportNLS = false;
     // ~
 
     private String comment;
@@ -729,6 +730,14 @@ public class MetadataConnection implements IMetadataConnection {
     public void setContextName(String contextName) {
         this.contextName = contextName;
     }
+    
+    public boolean isSupportNLS() {
+        return supportNLS;
+    }
+    
+    public void setSupportNLS(boolean supportNLS) {
+        this.supportNLS = supportNLS;
+    }
 
     /*
      * (non-Javadoc)

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/designerproperties/RepositoryToComponentProperty.java

@@ -32,9 +32,7 @@ import org.talend.core.database.EDatabaseTypeName;
 import org.talend.core.database.conn.ConnParameterKeys;
 import org.talend.core.database.conn.template.EDatabaseConnTemplate;
 import org.talend.core.database.conn.version.EDatabaseVersion4Drivers;
-import org.talend.core.hadoop.IHadoopClusterService;
 import org.talend.core.hadoop.repository.HadoopRepositoryUtil;
-import org.talend.core.hadoop.version.custom.ECustomVersionGroup;
 import org.talend.core.language.ECodeLanguage;
 import org.talend.core.language.LanguageManager;
 import org.talend.core.model.metadata.EMetadataEncoding;
@@ -443,6 +441,13 @@ public class RepositoryToComponentProperty {
             } else {
                 return TalendQuoteUtils.addQuotes(connection.getValue(dbPassword, false));
             }
+        } else if ("SAPHANA_PROPERTIES_STRING".equals(value)) { //$NON-NLS-1$
+            String dbParameters = TaggedValueHelper.getValueString(ISAPConstant.PROP_DB_ADDITIONAL_PROPERTIES, connection);
+            if (isContextMode(connection, dbParameters)) {
+                return dbParameters;
+            } else {
+                return TalendQuoteUtils.addQuotes(dbParameters);
+            }
         }
         return null;
     }
@@ -1220,6 +1225,11 @@ public class RepositoryToComponentProperty {
             return value2;
 
         }
+        
+        if(value.equals("SUPPORT_NLS")) {
+            return connection.isSupportNLS();
+        }
+        
         if (value.equals("CDC_TYPE_MODE")) { //$NON-NLS-1$
             return new Boolean(CDCTypeMode.LOG_MODE.getName().equals(connection.getCdcTypeMode()));
         }
@@ -1536,22 +1546,6 @@ public class RepositoryToComponentProperty {
         }
 
         if (value.equals("HADOOP_CUSTOM_JARS")) {
-            if (targetComponent != null && targetComponent.startsWith("tPig")) {
-                // for pig component
-                String clusterID = connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HADOOP_CLUSTER_ID);
-                if (clusterID != null) {
-                    if (GlobalServiceRegister.getDefault().isServiceRegistered(IHadoopClusterService.class)) {
-                        IHadoopClusterService hadoopClusterService = GlobalServiceRegister.getDefault()
-                                .getService(IHadoopClusterService.class);
-                        Map<String, String> hadoopCustomLibraries = hadoopClusterService.getHadoopCustomLibraries(clusterID);
-
-                        if (EDatabaseTypeName.HBASE.getDisplayName().equals(connection.getDatabaseType())) {
-                            return hadoopCustomLibraries.get(ECustomVersionGroup.PIG_HBASE.getName()) == null ? ""
-                                    : hadoopCustomLibraries.get(ECustomVersionGroup.PIG_HBASE.getName());
-                        }
-                    }
-                }
-            }
             return connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HADOOP_CUSTOM_JARS);
         }
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/designerproperties/SapJcoVersion.java

@@ -16,8 +16,8 @@ package org.talend.core.model.metadata.designerproperties;
  * DOC talend class global comment. Detailled comment
  */
 public enum SapJcoVersion {
-    SAP2("sap jco 2.*", "sapjco.jar"), //$NON-NLS-1$
-    SAP3("sap jco 3.*", "sapjco3.jar");//$NON-NLS-1$
+    SAP2("sap jco 2.*", "sapjco.jar"), //$NON-NLS-1$ //$NON-NLS-2$
+    SAP3("sap jco 3.*", "com.sap.conn.jco.sapjco.jar");//$NON-NLS-1$ //$NON-NLS-2$
 
     private String displayName;
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/EParameterFieldType.java

@@ -139,4 +139,8 @@ public enum EParameterFieldType {
         }
         return TEXT; // Default Value
     }
+    
+    public static boolean isPassword(EParameterFieldType type) {
+        return EParameterFieldType.PASSWORD.equals(type) || EParameterFieldType.LICENSEKEY.equals(type);
+    }
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/ElementParameterParser.java

@@ -24,6 +24,7 @@ import org.eclipse.ui.preferences.ScopedPreferenceStore;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.utils.PasswordEncryptUtil;
 import org.talend.commons.utils.generation.CodeGenerationUtils;
+import org.talend.core.GlobalServiceRegister;
 import org.talend.core.language.ECodeLanguage;
 import org.talend.core.language.LanguageManager;
 import org.talend.core.model.metadata.types.JavaType;
@@ -37,6 +38,7 @@ import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.model.utils.JavaResourcesHelper;
 import org.talend.core.model.utils.SQLPatternUtils;
 import org.talend.core.runtime.CoreRuntimePlugin;
+import org.talend.core.service.IDesignerXMLMapperService;
 import org.talend.core.utils.TalendQuoteUtils;
 import org.talend.designer.core.model.utils.emf.talendfile.ContextType;
 import org.talend.designer.core.model.utils.emf.talendfile.ElementParameterType;
@@ -293,8 +295,7 @@ public final class ElementParameterParser {
 
         List<IElementParameter> params = (List<IElementParameter>) element.getElementParametersWithChildrens();
         if (params != null && !params.isEmpty()) {
-            for (int i = 0; i < params.size(); i++) {
-                IElementParameter param = params.get(i);
+            for (IElementParameter param : params) {
                 if (text.indexOf(param.getVariableName()) != -1
                         || (param.getVariableName() != null && param.getVariableName().contains(text))) {
                     if (param.getFieldType() == EParameterFieldType.TABLE) {
@@ -422,8 +423,8 @@ public final class ElementParameterParser {
         }
         IElementParameter param;
 
-        for (int i = 0; i < element.getElementParameters().size(); i++) {
-            param = element.getElementParameters().get(i);
+        for (IElementParameter element2 : element.getElementParameters()) {
+            param = element2;
             if (text.indexOf(param.getVariableName()) != -1) {
                 if (param.getFieldType() == EParameterFieldType.TABLE) {
                     return createTableValuesXML((List<Map<String, Object>>) param.getValue(), param);
@@ -483,7 +484,21 @@ public final class ElementParameterParser {
         if (element instanceof INode) {
             INode node = (INode) element;
             if (node.getExternalNode() != null) {
-                return EcoreUtil.copy(node.getExternalNode().getExternalEmfData());
+                Object obj = null;
+                if (node.isVirtualGenerateNode()) {
+                    if (GlobalServiceRegister.getDefault().isServiceRegistered(IDesignerXMLMapperService.class)) {
+                        final IDesignerXMLMapperService service = GlobalServiceRegister.getDefault()
+                                .getService(IDesignerXMLMapperService.class);
+                        if (service != null) {
+                            obj = service.rebuildXmlMapData(node.getExternalNode());
+                        }
+                    }
+                }
+                if (obj != null) {
+                    return obj;
+                } else {
+                    return EcoreUtil.copy(node.getExternalNode().getExternalEmfData());
+                }
             }
         }
         return null;
@@ -496,8 +511,8 @@ public final class ElementParameterParser {
         }
         IElementParameter param;
         newText = text;
-        for (int i = 0; i < element.getElementParameters().size(); i++) {
-            param = element.getElementParameters().get(i);
+        for (IElementParameter element2 : element.getElementParameters()) {
+            param = element2;
             if (newText.contains(param.getVariableName())) {
                 String value = getDisplayValue(param);
                 newText = newText.replace(param.getVariableName(), value);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/IProcess.java

@@ -12,6 +12,7 @@
 // ============================================================================
 package org.talend.core.model.process;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
@@ -57,6 +58,11 @@ public interface IProcess extends IElement {
 
     public static final String SCREEN_OFFSET_Y = "SCREEN_OFFSET_Y"; //$NON-NLS-1$
 
+    public static final String PROP_ERR_ON_COMPONENT_MISSING = "error.on.component.missing";
+
+    public static final boolean ERR_ON_COMPONENT_MISSING = Boolean
+            .valueOf(System.getProperty(PROP_ERR_ON_COMPONENT_MISSING, Boolean.TRUE.toString()));
+
     public String getName();
 
     public String getId();
@@ -133,4 +139,8 @@ public interface IProcess extends IElement {
     public String getComponentsType();
 
     public INode getNodeByUniqueName(String uniqueName);
+
+    default List<? extends INode> getProcessNodes() {
+        return new ArrayList<INode>();
+    }
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/JobInfo.java

@@ -67,6 +67,8 @@ public class JobInfo {
 
     private boolean needUnloadProcessor;
 
+    private int includeESBFlag = 0;
+
     public JobInfo(String jobId, String contextName, String version) {
         this.jobId = jobId;
         this.contextName = contextName;
@@ -572,4 +574,13 @@ public class JobInfo {
     public boolean isNeedUnloadProcessor() {
         return this.needUnloadProcessor;
     }
+
+    public int getIncludeESBFlag() {
+        return includeESBFlag;
+    }
+
+    public void setIncludeESBFlag(int includeESBFlag) {
+        this.includeESBFlag = includeESBFlag;
+    }
+
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/ProcessUtils.java

@@ -728,6 +728,46 @@ public final class ProcessUtils {
         }
         return null;
     }
+	
+    private static boolean isRoute(Property property) {
+    	return  property!= null && (ERepositoryObjectType.getType(property).equals(ERepositoryObjectType.PROCESS_ROUTE) || 
+		ERepositoryObjectType.getType(property).equals(ERepositoryObjectType.PROCESS_ROUTE_MICROSERVICE));
+    }
+
+    public static boolean isRouteWithChildJobs(IProcess process) {
+
+        if (process instanceof IProcess2) {
+        	Property p = ((IProcess2) process).getProperty();
+        	if (isRoute(p)) {
+        		return false;
+        	}
+            Item item = p.getItem();
+            return isRouteWithChildJobs(item);
+        } else {
+            for (INode node : process.getGraphicalNodes()) {
+                if (node.getComponent().getName().equals("cTalendJob")) {
+                    return true;
+                }
+            }
+        }
+    	return false;
+    }
+
+
+    public static boolean isRouteWithChildJobs(Item item) {
+
+        if (item!= null && item instanceof ProcessItem) {
+            for (Object obj : ((ProcessItem) item).getProcess().getNode()) {
+                if (obj instanceof NodeType) {
+                    if (((NodeType) obj).getComponentName().equals("cTalendJob")) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+
+    }
 
     public static int getAssertAmount(IProcess process) {
         int count = 0;
@@ -1046,6 +1086,18 @@ public final class ProcessUtils {
 					}
 				}
 			}
+			if ("cHttp".equals(node.getComponentName())) {
+				for (Object elementParameter : node.getElementParameter()) {
+					ElementParameterType elementParameterType = (ElementParameterType)elementParameter;
+
+					String name = elementParameterType.getName();
+					String value = elementParameterType.getValue();
+
+					if ("SERVER".equals(name) && (value != null && "true".equals(value.toString()))) {
+						return true;
+					}
+				}
+			}
 		}
 
 		return false;

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/repository/IRepositoryPrefConstants.java

@@ -52,4 +52,12 @@ public interface IRepositoryPrefConstants {
     public static final String ALLOW_SPECIFIC_CHARACTERS_FOR_SCHEMA_COLUMNS = "allow_specific_characters_for_schema_columns";
 
     public static final String REF_PROJECT_BRANCH_SETTING = "ref_project_branch_setting";
+    
+    public static final String ITEM_EXPORT_DEPENDENCIES = "item_export_dependencies";
+
+    public static final String ITEM_IMPORT_DEPENDENCIES = "item_import_dependencies";
+
+    public static final String ITEM_IMPORT_BRANCH_DEPENDENCIES = "item_import_from_branch_dependencies";
+
+    public static final String ITEM_DISABLE_SCREENSHOT = "item_disable_screenshot";
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/update/RepositoryUpdateManager.java

@@ -2023,8 +2023,8 @@ public abstract class RepositoryUpdateManager {
 
         };
         repositoryUpdateManager.checkAddContextGroup = detectAddContextGroup;
-        repositoryUpdateManager.isConfigContextGroup = repositoryContextManager.isConfigContextGroup();
         if (repositoryContextManager != null) {
+            repositoryUpdateManager.isConfigContextGroup = repositoryContextManager.isConfigContextGroup();
             // add for bug 9119 context group
             Map<ContextItem, List<IContext>> repositoryContextGroupMap = new HashMap<ContextItem, List<IContext>>();
             List<IContext> addGroupContext = repositoryContextManager.getAddGroupContext();

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/update/extension/UpdateManagerProviderDetector.java

@@ -310,8 +310,8 @@ public enum UpdateManagerProviderDetector {
         Item item = node.getObject().getProperty().getItem();
         List<Relation> allRelations = new ArrayList<Relation>();
         if (node.getObject() != null) {
-            List<Relation> relations = RelationshipItemBuilder.getInstance().getItemsRelatedTo(item.getProperty().getId(),
-                    RelationshipItemBuilder.LATEST_VERSION, RelationshipItemBuilder.PROPERTY_RELATION);
+            List<Relation> relations = RelationshipItemBuilder.getInstance().getItemsHaveRelationWith(item.getProperty().getId(),
+                    RelationshipItemBuilder.LATEST_VERSION);
             if (relations != null && relations.size() > 0) {
                 allRelations.addAll(relations);
             }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/utils/ContextParameterUtils.java

@@ -21,14 +21,13 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.script.Bindings;
-import javax.script.ScriptContext;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.oro.text.regex.MalformedPatternException;
 import org.apache.oro.text.regex.PatternCompiler;
@@ -36,8 +35,7 @@ import org.apache.oro.text.regex.Perl5Compiler;
 import org.apache.oro.text.regex.Perl5Matcher;
 import org.apache.oro.text.regex.Perl5Substitution;
 import org.apache.oro.text.regex.Util;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.core.runtime.Platform;
 import org.talend.commons.utils.PasswordEncryptUtil;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.language.ECodeLanguage;
@@ -50,14 +48,16 @@ import org.talend.core.model.metadata.types.JavaTypesManager;
 import org.talend.core.model.process.IContext;
 import org.talend.core.model.process.IContextManager;
 import org.talend.core.model.process.IContextParameter;
-import org.talend.core.model.repository.IRepositoryPrefConstants;
-import org.talend.core.prefs.ITalendCorePrefConstants;
+import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.runtime.services.IGenericDBService;
 import org.talend.core.utils.TalendQuoteUtils;
 import org.talend.designer.core.model.utils.emf.talendfile.ContextParameterType;
 import org.talend.designer.core.model.utils.emf.talendfile.ContextType;
 import org.talend.repository.model.RepositoryConstants;
 
+import delight.rhinosandox.RhinoSandbox;
+import delight.rhinosandox.RhinoSandboxes;
+
 /**
  * Utilities to work with IContextParamet objects. <br/>
  *
@@ -84,6 +84,12 @@ public final class ContextParameterUtils {
 
     private static final String NON_CONTEXT_PATTERN = "[^a-zA-Z0-9_]"; //$NON-NLS-1$
 
+    private static final RhinoSandbox SANDBOX = RhinoSandboxes.create();
+
+    private static final Map<String, Object> CTX_VARS_LAST = new HashMap<String, Object>();
+
+    private static ReadWriteLock CTX_VARS_LOCK = new ReentrantReadWriteLock();
+
     /**
      * Constructs a new ContextParameterUtils.
      */
@@ -206,10 +212,37 @@ public final class ContextParameterUtils {
         }
     }
 
-    private static ScriptEngine engine = new ScriptEngineManager().getEngineByName("JavaScript");
-    
-    public static ScriptEngine getScriptEngine() {
-        return engine;
+    private static String preProcessScript(String script) {
+        String newCode = script;
+        CTX_VARS_LOCK.readLock().lock();
+        try {
+            Set<Entry<String, Object>> entries = CTX_VARS_LAST.entrySet();
+
+            for (Entry<String, Object> entry : entries) {
+                String val = entry.getValue().toString();
+                if (entry.getValue() instanceof String) {
+                    val = "\"" + val.replace("\"", "\\\"") + "\"";
+                }
+
+                newCode = newCode.replace(JAVA_NEW_CONTEXT_PREFIX + entry.getKey(), val);
+            }
+        } finally {
+            CTX_VARS_LOCK.readLock().unlock();
+        }
+
+        return newCode;
+    }
+
+    public static boolean isValidLiteralValue(String value) {
+        String newCode = preProcessScript(value);
+        try {
+            SANDBOX.eval(null, newCode);
+            return true;
+        } catch (Exception e) {
+            // ignore
+        }
+
+        return false;
     }
 
     public static String convertContext2Literal4AnyVar(final String code, final IContext context) {
@@ -223,23 +256,22 @@ public final class ContextParameterUtils {
 
         Object result = code;
 
-        if (engine == null) {
-            engine = new ScriptEngineManager().getEngineByName("JavaScript");
+        Map<String, Object> varMap = getVarMapForScriptEngine(context);
+
+        CTX_VARS_LOCK.writeLock().lock();
+        try {
+            CTX_VARS_LAST.clear();
+            CTX_VARS_LAST.putAll(varMap);
+        } finally {
+            CTX_VARS_LOCK.writeLock().unlock();
         }
 
-        if (engine == null) {
-            throw new RuntimeException("can't find the script engine");
-        }
+        String newCode = preProcessScript(code);
 
-        Bindings binding = engine.getBindings(ScriptContext.ENGINE_SCOPE);
-        if (binding != null) {
-            binding.clear();
-            Map<String, Object> varMap = getVarMapForScriptEngine(context);
-            binding.put("context", varMap);
-        }
         try {
             String replacement = " ";
-            result = engine.eval(code.replace("\r\n", replacement).replace("\n", replacement).replace("\r", replacement));
+            result = SANDBOX.eval(null,
+                    newCode.replace("\r\n", replacement).replace("\n", replacement).replace("\r", replacement));
         } catch (Exception e) {
             // ignore the exception
         }
@@ -296,7 +328,7 @@ public final class ContextParameterUtils {
         List<String> mvnValues = new ArrayList<>();
         IGenericDBService dbService = null;
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericDBService.class)) {
-            dbService = (IGenericDBService) GlobalServiceRegister.getDefault().getService(IGenericDBService.class);
+            dbService = GlobalServiceRegister.getDefault().getService(IGenericDBService.class);
         }
         for (String value : values) {
             try {
@@ -617,8 +649,11 @@ public final class ContextParameterUtils {
     }
 
     private static boolean isAllowSpecificCharacters() {
-        IEclipsePreferences coreUIPluginNode = new InstanceScope().getNode(ITalendCorePrefConstants.CoreUIPlugin_ID);
-        return coreUIPluginNode.getBoolean(IRepositoryPrefConstants.ALLOW_SPECIFIC_CHARACTERS_FOR_SCHEMA_COLUMNS, false);
+        if (Platform.isRunning()) {
+            return CoreRuntimePlugin.getInstance().getProjectPreferenceManager().isAllowSpecificCharacters();
+        } else {
+            return false;
+        }
     }
 
     public static boolean isEmptyParameter(String source) {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/utils/NodeUtil.java

@@ -27,9 +27,6 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.script.ScriptEngine;
-import javax.script.ScriptException;
-
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.model.components.ComponentCategory;
 import org.talend.core.model.components.IComponent;
@@ -418,6 +415,52 @@ public class NodeUtil {
         return conns;
     }
 
+    /**
+     * DOC
+     * <p>
+     * The method searches for the incoming node connections of type
+     * on a processing path and returns the first ones only
+     * </p>
+     *
+     * @param node
+     * @param type - node type to look for
+     * @return
+     */
+    public static List<? extends IConnection> getFirstIncomingLineConnectionsOfType(INode node, String type) {
+        if (type == null)
+            return new ArrayList<IConnection>();
+
+        Set<String> uniqueNamesDone = new HashSet<String>();
+        List<? extends IConnection> allIncomingConnections = getFirstIncomingLineConnectionsOfType(node, uniqueNamesDone, type);
+
+        return allIncomingConnections;
+    }
+
+    private static List<? extends IConnection> getFirstIncomingLineConnectionsOfType(INode node, Set<String> uniqueNamesDone, String type) {
+        List<IConnection> conns = new ArrayList<IConnection>();
+
+        List<? extends IConnection> incomingConnections = node.getIncomingConnections();
+        if (incomingConnections != null) {
+
+            for (int i = 0; i < incomingConnections.size(); i++) {
+
+                IConnection connection = incomingConnections.get(i);
+                INode nextNode = connection.getSource();
+
+                if (!uniqueNamesDone.contains(nextNode.getUniqueName())) {
+                    uniqueNamesDone.add(nextNode.getUniqueName());
+
+                    if (type.equals((String)nextNode.getElementParameter("COMPONENT_NAME").getValue())) {
+                        conns.add(connection);
+                    } else {
+                        conns.addAll(getFirstIncomingLineConnectionsOfType(nextNode, uniqueNamesDone, type)); // follow this way
+                    }
+                }
+            }
+        }
+        return conns;
+    }
+
     public static INode getFirstMergeNode(INode node) {
         INode mergeNode = null;
         for (IConnection connection : node.getOutgoingConnections()) {
@@ -1040,14 +1083,7 @@ public class NodeUtil {
     }
     
     private static boolean isValidLiteralValue(String value) {
-        ScriptEngine se = ContextParameterUtils.getScriptEngine();
-        if(se==null) return true;
-        try {
-            se.eval(value);
-            return true;
-        } catch (ScriptException e) {
-            return false;
-        }
+        return ContextParameterUtils.isValidLiteralValue(value);
     }
     
     private static String checkStringQuotationMarks(String str) {
@@ -1456,4 +1492,29 @@ public class NodeUtil {
         }
         return false;
     }
+    
+    /**
+     * TUP-32758:Used to judge if two components are compatible from name 
+     * for example tAmazonMysqlConnection and tMysqlConnection ,tAmazonOracleCommit and tOracleCommit
+     */
+    public static boolean isCompatibleByName(String componentName1, String componentName2) {
+        boolean isCompatable = false;
+        if ( componentName1 ==null || componentName2 == null 
+                || componentName1.length()<1 || componentName2.length() < 1) return false;
+        if (componentName1.replaceFirst("t", "tAmazon").equals(componentName2) ||
+                componentName2.replaceFirst("t", "tAmazon").equals(componentName1)) {
+            isCompatable = true;
+        }
+        return isCompatable;
+    }
+    
+    public static boolean isDatabaseFamily(String orginalFamilyName) {
+        boolean isDatabaseFamily = false;
+        String rootFamily = "";
+        rootFamily = orginalFamilyName != null ? orginalFamilyName.split("/")[0] : "";
+        if (rootFamily.equals("Databases")) {
+            isDatabaseFamily = true;
+        }
+        return isDatabaseFamily;
+    }
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/utils/TalendPropertiesUtil.java

@@ -79,4 +79,8 @@ public final class TalendPropertiesUtil {
     public static String getProductApp() {
         return System.getProperty(PROD_APP);
     }
+
+    public static boolean isEnabledUseShortJobletName() {
+        return isEnabled("talend.job.build.useShortJobletName"); //$NON-NLS-1$
+    }
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/nexus/TalendLibsServerManager.java

@@ -27,6 +27,7 @@ import org.talend.core.runtime.projectsetting.ProjectPreferenceManager;
 import org.talend.core.service.IRemoteService;
 import org.talend.repository.model.IProxyRepositoryFactory;
 import org.talend.repository.model.RepositoryConstants;
+import org.talend.utils.security.StudioEncryption;
 
 /**
  * created by wchen on 2015年6月16日 Detailled comment
@@ -255,7 +256,7 @@ public class TalendLibsServerManager {
             if (enableProxyFlag) {
                 serverBean.setServer(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_URL));
                 serverBean.setUserName(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_USERNAME));
-                serverBean.setPassword(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_PASSWORD));
+                serverBean.setPassword(StudioEncryption.getStudioEncryption(StudioEncryption.EncryptionKeyName.SYSTEM).decrypt(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_PASSWORD)));
                 serverBean.setRepositoryId(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_REPOSITORY_ID));
                 serverBean.setType(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_TYPE));
             }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/nexus/TalendMavenResolver.java

@@ -22,8 +22,6 @@ import org.ops4j.pax.url.mvn.MavenResolver;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.cm.ManagedService;
-import org.osgi.util.tracker.ServiceTracker;
-import org.osgi.util.tracker.ServiceTrackerCustomizer;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.utils.network.IProxySelectorProvider;
 import org.talend.commons.utils.network.TalendProxySelector;
@@ -47,39 +45,6 @@ public class TalendMavenResolver {
 
     private static MavenResolver mavenResolver = null;
 
-    /**
-     *
-     * DOC wchen TalendMavenResolver constructor comment.
-     */
-    static {
-        // the tracker is use in case the service is modifed
-        final BundleContext context = CoreRuntimePlugin.getInstance().getBundle().getBundleContext();
-        ServiceTracker<org.ops4j.pax.url.mvn.MavenResolver, org.ops4j.pax.url.mvn.MavenResolver> serviceTracker = new ServiceTracker<org.ops4j.pax.url.mvn.MavenResolver, org.ops4j.pax.url.mvn.MavenResolver>(
-                context, org.ops4j.pax.url.mvn.MavenResolver.class,
-                new ServiceTrackerCustomizer<org.ops4j.pax.url.mvn.MavenResolver, org.ops4j.pax.url.mvn.MavenResolver>() {
-
-                    @Override
-                    public org.ops4j.pax.url.mvn.MavenResolver addingService(
-                            ServiceReference<org.ops4j.pax.url.mvn.MavenResolver> reference) {
-                        return context.getService(reference);
-                    }
-
-                    @Override
-                    public void modifiedService(ServiceReference<org.ops4j.pax.url.mvn.MavenResolver> reference,
-                            org.ops4j.pax.url.mvn.MavenResolver service) {
-                        mavenResolver = null;
-
-                    }
-
-                    @Override
-                    public void removedService(ServiceReference<org.ops4j.pax.url.mvn.MavenResolver> reference,
-                            org.ops4j.pax.url.mvn.MavenResolver service) {
-                        mavenResolver = null;
-                    }
-                });
-        serviceTracker.open();
-    }
-
     public static void updateMavenResolver(String resolverKey, Dictionary<String, String> props) throws Exception {
         if (!needUpdate(resolverKey)) {
             return;

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/evaluator/AbstractPropertyValueEvaluator.java

@@ -126,6 +126,9 @@ public abstract class AbstractPropertyValueEvaluator implements PropertyValueEva
         }
 
         if (GenericTypeUtils.isStringType(property)) {
+            if (property.isFlag(Property.Flags.ENCRYPT)) {
+                return TalendQuoteUtils.removeQuotes(stringValue);
+            }
             return TalendQuoteUtils.removeQuotes(StringEscapeUtils.unescapeJava(stringValue));
         }
         return rawValue;

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/maven/MavenConstants.java

@@ -46,6 +46,8 @@ public interface MavenConstants {
 
     static final String EXCLUDE_DELETED_ITEMS = "EXCLUDE_DELETED_ITEMS";
 
+    static final String SKIP_LOOP_DEPENDENCY_CHECK = "SKIP_LOOP_DEPENDENCY_CHECK";
+
     static final String SKIP_FOLDERS = "SKIP_FOLDERS";
 
     /*

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/process/TalendProcessOptionConstants.java

@@ -80,4 +80,13 @@ public interface TalendProcessOptionConstants {
      */
     public static final int MODULES_WITH_CODESJAR = 1 << 6;
 
+    /**
+     * flag for check if is ESB job
+     */
+    public static final int ISESB_CHECKED = 1;
+
+    public static final int ISESB_CHILDREN_INCLUDE = 1 << 1;
+
+    public static final int ISESB_CURRENT_INCLUDE = 1 << 2;
+
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/projectsetting/ProjectPreferenceManager.java

@@ -15,6 +15,7 @@ package org.talend.core.runtime.projectsetting;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ProjectScope;
 import org.eclipse.core.runtime.Assert;
@@ -27,6 +28,7 @@ import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.utils.workbench.resources.ResourceUtils;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.model.general.Project;
+import org.talend.core.model.repository.IRepositoryPrefConstants;
 import org.talend.designer.runprocess.IRunProcessService;
 import org.talend.repository.ProjectManager;
 import org.talend.repository.documentation.ERepositoryActionName;
@@ -195,6 +197,26 @@ public class ProjectPreferenceManager {
         // return qulifierPreference.getBoolean(key, false);
         return getPreferenceStore().getBoolean(key);
     }
+    
+    public boolean isAllowSpecificCharacters() {
+        String value = getValue(IRepositoryPrefConstants.ALLOW_SPECIFIC_CHARACTERS_FOR_SCHEMA_COLUMNS);
+        if (StringUtils.isNotEmpty(value)) {
+            return Boolean.valueOf(value);
+        }       
+        return false; // Default value
+    }
+    
+    public void setAllowSpecificCharacters(boolean isAllow) {
+       setValue(IRepositoryPrefConstants.ALLOW_SPECIFIC_CHARACTERS_FOR_SCHEMA_COLUMNS, isAllow);
+    }
+    
+    public boolean isDisableScreenshot() {
+        return getPreferenceStore().getBoolean(IRepositoryPrefConstants.ITEM_DISABLE_SCREENSHOT);
+    }
+
+    public void setDisableScreenshot(boolean isDisable) {
+        getPreferenceStore().setValue(IRepositoryPrefConstants.ITEM_DISABLE_SCREENSHOT, isDisable);
+    }
 
     /**
      * Save the configurations.

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/services/IDesignerMavenService.java

@@ -12,6 +12,11 @@
 // ============================================================================
 package org.talend.core.runtime.services;
 
+import java.util.List;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jdt.core.IClasspathEntry;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
 import org.talend.core.model.properties.RoutineItem;
@@ -25,6 +30,10 @@ public interface IDesignerMavenService extends IService {
 
     void updateCodeJarMavenProject(CodesJarInfo info, boolean needReSync) throws Exception;
 
+    void enableMavenNature(IProgressMonitor monitor, IProject project);
+
+    void addProjectClasspathEntry(IProgressMonitor monitor, IProject project, List<IClasspathEntry> entries);
+
     public static IDesignerMavenService get() {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IDesignerMavenService.class)) {
             return GlobalServiceRegister.getDefault().getService(IDesignerMavenService.class);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/services/IGenericWizardService.java

@@ -150,6 +150,8 @@ public interface IGenericWizardService extends IService {
      */
     public ITreeContextualAction getDefaultAction(RepositoryNode node);
 
+    public ITreeContextualAction getGenericAction(String typeName, String location);
+
     public void loadAdditionalJDBC();
 
     public List<String> getAllAdditionalJDBCTypes();

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/util/SharedStudioUtils.java

@@ -27,47 +27,12 @@ import org.talend.core.GlobalServiceRegister;
 import org.talend.core.model.components.IComponentsFactory;
 import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.service.IUpdateService;
-import org.talend.utils.io.FilesUtils;
 import org.talend.utils.string.DigestUtil;
 
 public class SharedStudioUtils {
 
-    public static final String FILE_EXTRA_FEATURE_INDEX = "extra_feature.index"; //$NON-NLS-1$
-
-    public static final String SIGNATURE_FILE_NAME_SUFFIX = ".sig"; //$NON-NLS-1$
     public static final String PROP_DEVMODE = "osgi.dev"; //$NON-NLS-1$
     
-    public static boolean updateExtraFeatureFile() {
-        File userConfigFolder = new File(Platform.getConfigurationLocation().getURL().getPath());
-        File studioConfigFolder = new File(Platform.getInstallLocation().getURL().getPath(), "configuration");//$NON-NLS-1$
-        if (!userConfigFolder.getAbsolutePath().equals(studioConfigFolder.getAbsolutePath())) {
-            File studioExtraFile = new File(studioConfigFolder, FILE_EXTRA_FEATURE_INDEX);
-            File studioExtraSignFile = new File(studioConfigFolder, FILE_EXTRA_FEATURE_INDEX + SIGNATURE_FILE_NAME_SUFFIX);
-            File userExtraFile = new File(userConfigFolder, FILE_EXTRA_FEATURE_INDEX);
-            File userExtraSignFile = new File(userConfigFolder, FILE_EXTRA_FEATURE_INDEX + SIGNATURE_FILE_NAME_SUFFIX);
-            boolean isNeedUpdate = false;
-            if (!studioExtraSignFile.exists() && userExtraSignFile.exists()) {
-                userExtraSignFile.delete();
-                if (userExtraFile.exists()) {
-                    userExtraFile.delete();
-                }
-                return true;
-            } else if (studioExtraSignFile.exists()) {
-                isNeedUpdate = true;
-            } 
-            if (isNeedUpdate) {
-                try {
-                    FilesUtils.copyFile(studioExtraFile, userExtraFile);
-                    FilesUtils.copyFile(studioExtraSignFile, userExtraSignFile);
-                } catch (IOException ex) {
-                    ExceptionHandler.process(ex);
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-    
     public static boolean isSharedStudioMode() {
     	if (isDevEnvironment()) {
     		return false;

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/IDesignerXMLMapperService.java

@@ -30,4 +30,6 @@ public interface IDesignerXMLMapperService extends IService {
      */
     public boolean isVirtualComponent(final INode node);
 
+    public Object rebuildXmlMapData(final INode node);
+
 }