APPINT-33088: surefire maven plugin updated

* feat(TUP-29701): upgrade eclipse

* change assert

* fix assert issue

* fix compilation error

* change StringMatcher

* change to apache StringUtils because split function was removed from
eclipse one

* change manifest

* TUP-29701 modify pom to fix NoClassDefFoundError:
com/sun/jna/platform/win32/VersionHelpers

* TUP-29701  change pom for jna

* TUP-29701 try add javax.inject to require bundle

* TUP-29701 try add javax.inject to manifest

* TUP-29701 fix missing required class when start studio

* TUP-29701 change to public

* TUP-31484 fix xerces issue

* TUP-31484 add plugins to features to make it exist in license

* try change version to force use 1.68.0
org.bouncycastle.bcprov 1.68.0

README.md

@@ -42,6 +42,6 @@ Feel free to share your Talend components on [Talend Exchange](http://www.talend
 
 ## License
 
-Copyright (c) 2006-2019 Talend
+Copyright (c) 2006-2021 Talend
 
 Licensed under the Apache V2 License

i18n/plugins/org.talend.model.migration.nl/.classpath

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="class"/>
-</classpath>

i18n/plugins/org.talend.model.migration.nl/.project

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.talend.model.migration.nl</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

i18n/plugins/org.talend.model.migration.nl/META-INF/MANIFEST.MF

@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Nl
-Bundle-SymbolicName: org.talend.model.migration.nl
-Bundle-Version: 7.4.1.qualifier
-Fragment-Host: org.talend.model.migration

i18n/plugins/org.talend.model.migration.nl/META-INF/eclipse.inf

@@ -1 +0,0 @@
-jarprocessor.exclude.children=true

i18n/plugins/org.talend.model.migration.nl/build.properties

@@ -1,13 +0,0 @@
-source.. = src/
-output.. = class/
-bin.includes = META-INF/,\
-               .\
-,plugin_ru.properties\
-,plugin_en.properties\
-,plugin_hr.properties\
-,plugin_fr.properties\
-,plugin_el.properties\
-,plugin_ja.properties\
-,plugin_it.properties\
-,plugin_de.properties\
-,plugin_swtbot.properties

i18n/plugins/org.talend.model.migration.nl/plugin_de.properties

@@ -1 +0,0 @@
-providerName=www.beispiel.de

i18n/plugins/org.talend.model.migration.nl/plugin_en.properties

@@ -1,2 +0,0 @@
-pluginName=Migration Model
-providerName=www.example.org

i18n/plugins/org.talend.model.migration.nl/plugin_fr.properties

@@ -1,2 +0,0 @@
-pluginName=Mod\u00E8le de migration
-providerName=www.example.org

i18n/plugins/org.talend.model.migration.nl/plugin_it.properties

@@ -1 +0,0 @@
-providerName=www.example.org

i18n/plugins/org.talend.model.migration.nl/plugin_ja.properties

@@ -1,2 +0,0 @@
-pluginName=\u79FB\u884C\u30E2\u30C7\u30EB
-providerName=www.example.org

i18n/plugins/org.talend.model.migration.nl/plugin_ru.properties

@@ -1 +0,0 @@
-providerName=www.example.org

i18n/plugins/org.talend.model.migration.nl/plugin_swtbot.properties

@@ -1,2 +0,0 @@
-pluginName = Migration Model
-providerName = www.example.org

i18n/plugins/org.talend.model.migration.nl/plugin_zh_CN.properties

@@ -1,2 +0,0 @@
-pluginName=\u8FC1\u79FB\u6A21\u578B
-providerName=www.example.org

i18n/plugins/org.talend.model.migration.nl/pom.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.model.migration.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>

i18n/plugins/org.talend.model.migration.nl/src/messages_en.properties

@@ -1,2 +0,0 @@
-TopMetadataMigrationFrom400to410usingGenericVM_top_error_log=error while loading the Transformation file : {0}
-TosMetadataMigrationFrom400to410_tos_error_log=error while loading the Transformation file : {0}

i18n/plugins/org.talend.model.migration.nl/src/messages_es.properties

@@ -1,2 +0,0 @@
-TopMetadataMigrationFrom400to410usingGenericVM_top_error_log=error mientras se cargaba el fichero de Transformaci\u00F3n: {0}
-TosMetadataMigrationFrom400to410_tos_error_log=error mientras se cargaba el fichero de Transformaci\u00F3n: {0}

i18n/plugins/org.talend.model.migration.nl/src/messages_fr.properties

@@ -1,2 +0,0 @@
-TopMetadataMigrationFrom400to410usingGenericVM_top_error_log=erreur lors du chargement du fichier de transformation : {0}
-TosMetadataMigrationFrom400to410_tos_error_log=Erreur lors du chargement du fichier de transformation : {0}

i18n/plugins/org.talend.model.migration.nl/src/messages_ja.properties

@@ -1,2 +0,0 @@
-TopMetadataMigrationFrom400to410usingGenericVM_top_error_log=\u5909\u63DB\u30D5\u30A1\u30A4\u30EB\u30ED\u30FC\u30C9\u4E2D\u306B\u30A8\u30E9\u30FC\uFF1A{0}
-TosMetadataMigrationFrom400to410_tos_error_log=\u5909\u63DB\u30D5\u30A1\u30A4\u30EB\u30ED\u30FC\u30C9\u4E2D\u306B\u30A8\u30E9\u30FC\uFF1A{0}

i18n/plugins/org.talend.model.migration.nl/src/messages_swtbot.properties

@@ -1,2 +0,0 @@
-TopMetadataMigrationFrom400to410usingGenericVM_top_error_log=error while loading the Transformation file : {0}
-TosMetadataMigrationFrom400to410_tos_error_log=error while loading the Transformation file : {0}

i18n/plugins/org.talend.model.migration.nl/src/messages_zh_CN.properties

@@ -1,2 +0,0 @@
-TopMetadataMigrationFrom400to410usingGenericVM_top_error_log=\u52A0\u8F7D\u8F6C\u6362\u6587\u4EF6\u65F6\u51FA\u9519\uFF1A{0}
-TosMetadataMigrationFrom400to410_tos_error_log=\u52A0\u8F7D\u8F6C\u6362\u6587\u4EF6\u65F6\u51FA\u9519\uFF1A{0}

i18n/plugins/org.talend.rcp.nl/plugin_de.properties

@@ -4,5 +4,5 @@ Version: {1}
 Build id: {0}
 
 
-(c) Copyright 2006-2020 Talend Inc.  All rights reserved.
+(c) Copyright 2006-2021 Talend Inc.  All rights reserved.
 Visit {3}

i18n/plugins/org.talend.rcp.nl/plugin_en.properties

@@ -4,5 +4,5 @@ Version: {1}
 Build id: {0}
 
 
-(c) Copyright 2006-2020 Talend Inc.  All rights reserved.
+(c) Copyright 2006-2021 Talend Inc.  All rights reserved.
 Visit {3}

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

@@ -8,8 +8,7 @@
     <discovery label="Talend web site" url="http://www.talend.com"/> 
   </url>  
   <requires>
-    <import feature="org.talend.model.migration.feature" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.bouncycastle.bcprov" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.bouncycastle.bcprov" version="1.68.0" match="greaterOrEqual"/>
     <import plugin="com.fasterxml.jackson.core.jackson-databind" version="2.9.8" match="greaterOrEqual"/>
     <import plugin="jackson-core-asl" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="jackson-mapper-asl" version="0.0.0" match="greaterOrEqual"/>

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

@@ -38,8 +38,8 @@
     <import plugin="org.apache.httpcomponents.httpcore" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.compare" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.compare.core" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.m2m.atl.emftvm.trace" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.ops4j.pax.url.mvn" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.collections" version="0.0.0" match="greaterOrEqual"/>
   </requires>  
   <plugin id="org.talend.core" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
   <plugin id="org.talend.core.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
@@ -63,11 +63,10 @@
   <plugin id="org.talend.metadata.managment.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
   <plugin id="org.talend.metadata.managment.ui.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.migrationTool" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.migrationTool.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.model" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
   <plugin id="org.talend.model.edit" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
   <plugin id="org.talend.model.edit.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.model.migration" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.talend.model.migration.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.model.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.osgi.lib.loader" download-size="0" install-size="0" version="0.0.0" unpack="false" fragment="true"/>
   <plugin id="org.talend.resources" download-size="0" install-size="0" version="0.0.0"/>

main/features/org.talend.fragment.jars.common.feature/feature.xml

@@ -57,11 +57,4 @@
          version="0.0.0"
          unpack="true"/>
 
-   <plugin
-         id="org.talend.libraries.apache.lucene4"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="true"/>
-
 </feature>

main/features/org.talend.help.di.feature/.project

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.talend.model.migration.feature</name>
+	<name>org.talend.help.di.feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>

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

@@ -1,36 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.talend.jdt.feature"
+      label="Feature"
+      version="7.4.1.qualifier">
+
+   <description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <requires>
+      <import plugin="org.eclipse.jdt" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.annotation" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.apt.core" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.apt.pluggable.core" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.apt.ui" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.compiler.apt" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.compiler.tool" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.core" version="3.16.0.xx-201903290056-e1812-RELEASE" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.core.manipulation" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.debug" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.debug.ui" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.launching" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.ui" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.hamcrest.core" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.junit" version="4.13.2" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.groovy.core" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.codehaus.groovy" version="2.4.16" match="equivalent"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.jdt.launching.macosx"
+         os="macosx"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jdt.launching.ui.macosx"
+         os="macosx"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-<feature id="org.talend.jdt.feature" label="Feature" version="7.4.1.qualifier"> 
-  <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
-  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
-  <license url="http://www.example.com/license">[Enter License Description here.]</license>  
-  <requires>
-    <!-- bonita requires org.codehaus.groovy version 2.4.16.xx-201903290056-e1812-RELEASE -->
-    <import plugin="org.codehaus.groovy" version="2.4.16.xx-201903290056-e1812-RELEASE" match="perfect"/>
-    <import plugin="org.eclipse.ant.launching" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.ant.ui" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.annotation" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.apt.core" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.apt.pluggable.core" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.apt.ui" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.compiler.apt" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.compiler.tool" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.core" version="3.16.0.xx-201903290056-e1812-RELEASE" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.core.manipulation" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.debug" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.debug.ui" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.doc.user" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.groovy.core" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.junit" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.junit.core" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.junit.runtime" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.junit4.runtime" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.launching" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.jdt.ui" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.hamcrest.core" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.junit" version="0.0.0" match="greaterOrEqual"/>
-  </requires>
-  <plugin id="org.eclipse.jdt.launching.macosx" os="macosx" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-  <plugin id="org.eclipse.jdt.launching.ui.macosx" os="macosx" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 </feature>

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

@@ -38,5 +38,7 @@
     <import plugin="org.slf4j.api" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.slf4j.impl.log4j12" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.wst.server.discovery" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.ui.genericeditor" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.e4.ui.ide" version="0.0.0" match="greaterOrEqual"/>
   </requires>
 </feature>

main/features/org.talend.model.migration.feature/build.properties

@@ -1 +0,0 @@
-bin.includes = feature.xml

main/features/org.talend.model.migration.feature/feature.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.talend.model.migration.feature"
-      label="model Migration feature"
-      version="7.4.1.qualifier">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <requires>
-      <import feature="org.eclipse.m2m.atl" version="0.0.0" match="greaterOrEqual"/>
-      <import feature="org.talend.utils.feature" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.bouncycastle.bcprov" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.objectweb.asm" version="0.0.0" match="greaterOrEqual"/>
-   </requires>
-
-</feature>

main/features/org.talend.model.migration.feature/pom.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.4.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.model.migration.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>

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

@@ -18,7 +18,7 @@
     <import plugin="org.apache.commons.lang3" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.apache.log4j" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.apache.servicemix.bundles.avro" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.junit" 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"/>
   </requires>  

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/geometry/Curve.java

@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-202121 Talend Inc. - www.talend.com
+// 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

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.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/swt/celleditor/ComboxCellEditorImproved.java

@@ -14,7 +14,7 @@ package org.talend.commons.ui.runtime.swt.celleditor;
 
 import java.text.MessageFormat;
 
-import org.eclipse.jface.util.Assert;
+import org.eclipse.core.runtime.Assert;
 import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.jface.viewers.ComboBoxCellEditor;
 import org.eclipse.swt.SWT;

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/swt/tableviewer/TableViewerCreatorNotModifiable.java

@@ -19,7 +19,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.log4j.Logger;
-import org.eclipse.jface.util.Assert;
+import org.eclipse.core.runtime.Assert;
 import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.jface.viewers.ColumnLayoutData;
 import org.eclipse.jface.viewers.ColumnPixelData;

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/swt/tableviewer/behavior/TableViewerCreatorLayout.java

@@ -22,7 +22,7 @@ package org.talend.commons.ui.runtime.swt.tableviewer.behavior;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.jface.util.Assert;
+import org.eclipse.core.runtime.Assert;
 import org.eclipse.jface.viewers.ColumnLayoutData;
 import org.eclipse.jface.viewers.ColumnPixelData;
 import org.eclipse.jface.viewers.ColumnWeightData;

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/VersionUtils.java

@@ -15,6 +15,7 @@ package org.talend.commons.utils;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Optional;
@@ -352,6 +353,12 @@ public class VersionUtils {
         }
     }
 
+    public static File getStudioConfigFile() throws Exception {
+        URL configLocation = new URL("platform:/config/config.ini"); //$NON-NLS-1$
+        URL fileUrl = FileLocator.toFileURL(configLocation);
+        return URIUtil.toFile(new URI(fileUrl.getProtocol(), fileUrl.getPath(), fileUrl.getQuery()));
+    }
+
     public static String getSimplifiedPatchName(String projectPatchName) {
 
         if (projectPatchName != null) {

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/time/PerformanceStatisticUtil.java

@@ -13,13 +13,13 @@
 package org.talend.commons.utils.time;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 import java.util.Properties;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
@@ -82,7 +82,7 @@ public class PerformanceStatisticUtil {
     public static void recordStartupEpapsedTime(double elapsedTimeInSeconds) {
         File file = getRecordingFile();
 
-        Properties props = read(file, true);
+        Properties props = PropertiesFileUtil.read(file, true);
         String propCount = props.getProperty(StatisticKeys.STARTUP_COUNT.get(), "0");
         String propMax = props.getProperty(StatisticKeys.STARTUP_MAX.get(), "0");
         String propAverage = props.getProperty(StatisticKeys.STARTUP_AVERAGE.get(), "0");
@@ -99,7 +99,7 @@ public class PerformanceStatisticUtil {
         props.setProperty(StatisticKeys.STARTUP_MAX.get(), "" + iPropMax);
         props.setProperty(StatisticKeys.STARTUP_AVERAGE.get(), "" + iPropAverage);
 
-        store(file, props);
+        PropertiesFileUtil.store(file, props);
     }
 
     public static File getRecordingFile() {
@@ -108,75 +108,41 @@ public class PerformanceStatisticUtil {
         }
 
         String configurationLocation = Platform.getConfigurationLocation().getURL().getPath();
-        File file = new File(configurationLocation + "/" + recordingFileName);
+        File file = new File(configurationLocation + "/data_collector/" + recordingFileName);
+        File oldFile = new File(configurationLocation + "/" + recordingFileName);
+        if(oldFile.exists()) {
+            if(!file.exists()) {
+                if(!file.getParentFile().exists()) {
+                    file.getParentFile().mkdirs();
+                }
+                try {
+                    Files.move(Paths.get(oldFile.toURI()), Paths.get(file.toURI()), StandardCopyOption.ATOMIC_MOVE);
+                } catch (IOException e) {
+                    CommonExceptionHandler.log(e.getMessage());
+                }
+            }
+            
+            try {
+                Files.deleteIfExists(Paths.get(oldFile.toURI()));
+            } catch (IOException e) {
+                CommonExceptionHandler.log(e.getMessage());
+            }
+        }
+        
         return file;
     }
 
     public static void setRecordingFile(File _recordingFile) {
         recordingFile = _recordingFile;
     }
-
-    public static synchronized Properties read(File recordFile, boolean createIfNotExist) {
-        Properties props = new Properties();
-        if (recordFile != null && exist(recordFile, createIfNotExist)) {
-            FileInputStream inStream = null;
-            try {
-                inStream = new FileInputStream(recordFile);
-                props.load(inStream);
-            } catch (Exception e) {
-                CommonExceptionHandler.log(e.getMessage());
-            } finally {
-                if (inStream != null) {
-                    try {
-                        inStream.close();
-                    } catch (IOException e) {//
-                    }
-                }
-            }
+    
+    public static void reset() {
+        File _recordingFile = getRecordingFile();
+        try {
+            Files.deleteIfExists(Paths.get(_recordingFile.toURI()));
+        } catch (IOException e) {
+            CommonExceptionHandler.log(e.getMessage());
         }
-
-        return props;
-    }
-
-    public static synchronized void store(File recordFile, Properties props) {
-        if (props == null) {
-            return;
-        }
-
-        if (recordFile != null && exist(recordFile, true)) {
-            FileOutputStream outputStream = null;
-            try {
-                outputStream = new FileOutputStream(recordFile);
-                props.store(outputStream, "");
-            } catch (IOException e) {
-                CommonExceptionHandler.log(e.getMessage());
-            } finally {
-                if (outputStream != null) {
-                    try {
-                        outputStream.close();
-                    } catch (IOException e) {
-                        //
-                    }
-                }
-            }
-        }
-    }
-
-    private static boolean exist(File recordFile, boolean createIfNotExist) {
-        boolean exists = recordFile.exists();
-        if (!exists && createIfNotExist) {
-            try {
-                exists = recordFile.createNewFile();
-                if (!exists) {
-                    throw new FileNotFoundException(recordFile.getName());
-                }
-            } catch (Exception e) {
-                CommonExceptionHandler.log(e.getMessage());
-                return false;
-            }
-        }
-
-        return exists;
     }
 
     private static Lock lock = new ReentrantLock();
@@ -210,7 +176,7 @@ public class PerformanceStatisticUtil {
 
     private static void _measureIO() {
         File file = getRecordingFile();
-        Properties props = read(file, true);
+        Properties props = PropertiesFileUtil.read(file, true);
 
         IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
         File workspace = root.getLocation().makeAbsolute().toFile();
@@ -221,7 +187,7 @@ public class PerformanceStatisticUtil {
             measureWrite(props, testFile);
             measureRead(props, testFile);
 
-            store(file, props);
+            PropertiesFileUtil.store(file, props);
         }
     }
     

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/time/PropertiesCollectorUtil.java

@@ -0,0 +1,55 @@
+// ============================================================================
+//
+// 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.utils.time;
+
+import java.io.File;
+import java.util.Properties;
+
+import org.eclipse.core.runtime.Platform;
+
+public class PropertiesCollectorUtil {
+
+    private static final String ROOT_NODE = "additional_packages_records"; // additional packages
+
+    private static final String PREF_ADDITIONAL_PACKAGES = "AdditionalPackages"; // preference node
+
+    private static final String ADDITONAL_PACKAGE_FILE = "additionalPackages";
+
+
+    public static String getAdditionalPackageRecording() {
+        File file = getRecordFile(ADDITONAL_PACKAGE_FILE);
+
+        Properties props = PropertiesFileUtil.read(file, true);
+        String records = props.getProperty(ROOT_NODE, "");
+
+        return records;
+    }
+
+    public static void storeAdditionalPackageRecording(String records) {
+        File file = getRecordFile(ADDITONAL_PACKAGE_FILE);
+        Properties props = PropertiesFileUtil.read(file, false);
+        props.setProperty(ROOT_NODE, records);
+        PropertiesFileUtil.store(file, props);
+    }
+
+    private static File getRecordFile(String fileName) {
+        String configurationLocation = Platform.getConfigurationLocation().getURL().getPath();
+        File file = new File(configurationLocation + "/data_collector/" + fileName);
+        return file;
+    }
+
+    public static String getAdditionalPackagePreferenceNode() {
+        return PREF_ADDITIONAL_PACKAGES;
+    }
+
+}

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/time/PropertiesFileUtil.java

@@ -0,0 +1,93 @@
+// ============================================================================
+//
+// 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.utils.time;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Properties;
+
+import org.talend.commons.exception.CommonExceptionHandler;
+
+/**
+ * DOC sbliu  class global comment. Detailled comment
+ */
+public class PropertiesFileUtil {
+    public static synchronized Properties read(File recordFile, boolean createIfNotExist) {
+        Properties props = new Properties();
+        if (recordFile != null && exist(recordFile, createIfNotExist)) {
+            FileInputStream inStream = null;
+            try {
+                inStream = new FileInputStream(recordFile);
+                props.load(inStream);
+            } catch (Exception e) {
+                CommonExceptionHandler.log(e.getMessage());
+            } finally {
+                if (inStream != null) {
+                    try {
+                        inStream.close();
+                    } catch (IOException e) {//
+                    }
+                }
+            }
+        }
+
+        return props;
+    }
+
+    public static synchronized void store(File recordFile, Properties props) {
+        if (props == null) {
+            return;
+        }
+
+        if (recordFile != null && exist(recordFile, true)) {
+            FileOutputStream outputStream = null;
+            try {
+                outputStream = new FileOutputStream(recordFile);
+                props.store(outputStream, "");
+            } catch (IOException e) {
+                CommonExceptionHandler.log(e.getMessage());
+            } finally {
+                if (outputStream != null) {
+                    try {
+                        outputStream.close();
+                    } catch (IOException e) {
+                        //
+                    }
+                }
+            }
+        }
+    }
+
+    public static boolean exist(File recordFile, boolean createIfNotExist) {
+        boolean exists = recordFile.exists();
+        if (!exists && createIfNotExist) {
+            try {
+                if(!recordFile.getParentFile().exists()) {
+                    recordFile.getParentFile().mkdirs();
+                }
+                exists = recordFile.createNewFile();
+                if (!exists) {
+                    throw new FileNotFoundException(recordFile.getName());
+                }
+            } catch (Exception e) {
+                CommonExceptionHandler.log(e.getMessage());
+                return false;
+            }
+        }
+
+        return exists;
+    }
+}

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/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/colorstyledtext/rules/CasedWordRule.java

@@ -15,12 +15,12 @@ package org.talend.commons.ui.swt.colorstyledtext.rules;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.eclipse.core.runtime.Assert;
 import org.eclipse.jface.text.rules.ICharacterScanner;
 import org.eclipse.jface.text.rules.IRule;
 import org.eclipse.jface.text.rules.IToken;
 import org.eclipse.jface.text.rules.IWordDetector;
 import org.eclipse.jface.text.rules.Token;
-import org.eclipse.jface.util.Assert;
 
 /**
  * An implementation of <code>IRule</code> capable of detecting words Word rules also allow for the association of

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/colorstyledtext/rules/DelegateToken.java

@@ -12,7 +12,7 @@
 // ============================================================================
 package org.talend.commons.ui.swt.colorstyledtext.rules;
 
-import org.eclipse.jface.util.Assert;
+import org.eclipse.core.runtime.Assert;
 import org.talend.commons.ui.swt.colorstyledtext.jedit.Rule;
 import org.talend.commons.ui.swt.colorstyledtext.jedit.Type;
 

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.commons.ui/src/main/java/org/talend/commons/ui/swt/proposal/ContentProposalAdapterExtended.java

@@ -27,6 +27,7 @@ import org.apache.oro.text.regex.PatternCompiler;
 import org.apache.oro.text.regex.PatternMatcher;
 import org.apache.oro.text.regex.Perl5Compiler;
 import org.apache.oro.text.regex.Perl5Matcher;
+import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.ListenerList;
 import org.eclipse.jface.bindings.keys.KeyStroke;
 import org.eclipse.jface.dialogs.PopupDialog;
@@ -34,7 +35,6 @@ import org.eclipse.jface.fieldassist.IContentProposal;
 import org.eclipse.jface.fieldassist.IContentProposalListener;
 import org.eclipse.jface.fieldassist.IContentProposalProvider;
 import org.eclipse.jface.fieldassist.IControlContentAdapter;
-import org.eclipse.jface.util.Assert;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StyledText;

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/utils/data/text/rules/StringRuleBasedScanner.java

@@ -12,7 +12,7 @@
 // ============================================================================
 package org.talend.commons.ui.utils.data.text.rules;
 
-import org.eclipse.jface.text.Assert;
+import org.eclipse.core.runtime.Assert;
 import org.eclipse.jface.text.rules.ICharacterScanner;
 import org.eclipse.jface.text.rules.IPredicateRule;
 import org.eclipse.jface.text.rules.IRule;

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/utils/workbench/preferences/ComboFieldEditor.java

@@ -12,8 +12,8 @@
 // ============================================================================
 package org.talend.commons.ui.utils.workbench.preferences;
 
+import org.eclipse.core.runtime.Assert;
 import org.eclipse.jface.preference.FieldEditor;
-import org.eclipse.jface.util.Assert;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;

main/plugins/org.talend.core.repository/schema/repository_provider.exsd

@@ -280,7 +280,7 @@
       </appInfo>
       <documentation>
          Talend Community Edition&lt;br&gt;
-Copyright (C) 2006-2019 Talend - www.talend.com
+Copyright (C) 2006-2021 Talend - www.talend.com
       </documentation>
    </annotation>
 

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);

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

@@ -123,6 +123,7 @@ import org.talend.core.model.repository.LockInfo;
 import org.talend.core.model.repository.RepositoryContentManager;
 import org.talend.core.model.repository.RepositoryObject;
 import org.talend.core.model.repository.RepositoryViewObject;
+import org.talend.core.model.routines.CodesJarInfo;
 import org.talend.core.repository.CoreRepositoryPlugin;
 import org.talend.core.repository.constants.Constant;
 import org.talend.core.repository.constants.FileConstants;
@@ -1368,21 +1369,15 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
     }
 
     @Override
-    public List<IRepositoryViewObject> getAllInnerCodes(ERepositoryObjectType codesJarType, Property jarProperty)
-            throws PersistenceException {
-        return getAllInnerCodes(projectManager.getCurrentProject(), codesJarType, jarProperty);
-    }
-
-    @Override
-    public List<IRepositoryViewObject> getAllInnerCodes(Project project, ERepositoryObjectType codesJarType, Property jarProperty)
-            throws PersistenceException {
+    public List<IRepositoryViewObject> getAllInnerCodes(CodesJarInfo info) throws PersistenceException {
+        Project project = ProjectManager.getInstance().getProjectFromProjectTechLabel(info.getProjectTechName());
         // empty folder won't be commit in git, create if not exist
-        IFolder folder = ResourceUtils.getProject(project).getFolder(ERepositoryObjectType.getFolderName(codesJarType))
-                .getFolder(jarProperty.getLabel());
+        IFolder folder = ResourceUtils.getProject(project).getFolder(ERepositoryObjectType.getFolderName(info.getType()))
+                .getFolder(info.getLabel());
         if (!folder.exists()) {
             ResourceUtils.createFolder(folder);
         }
-        return repositoryFactoryFromProvider.getAll(project, codesJarType, false, false, folder);
+        return repositoryFactoryFromProvider.getAll(project, info.getType(), false, false, folder);
     }
 
     @Override
@@ -2245,6 +2240,8 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                     ExceptionHandler.process(e);
                 }
 
+                CodesJarResourceCache.initCodesJarCache();
+
                 currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
                 currentMonitor.beginTask("Execute before logon migrations tasks", 1); //$NON-NLS-1$
                 ProjectManager.getInstance().getMigrationRecords().clear();
@@ -2311,8 +2308,6 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                     currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
                     currentMonitor.beginTask(Messages.getString("ProxyRepositoryFactory.synch.repo.items"), 1); //$NON-NLS-1$
 
-                    CodesJarResourceCache.initCodesJarCache();
-
                     if (!isCommandLineLocalRefProject) {
                         try {
                             coreService.syncAllRoutines();

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/ui/actions/CopyObjectAction.java

@@ -523,10 +523,10 @@ public class CopyObjectAction {
 
                 if (isInnerCode) {
                     CodesJarInfo info = CodesJarResourceCache.getCodesJarByInnerCode(item);
-                    if (info.getProperty() != null) {
+                    if (info != null) {
                         IDesignerMavenService designerMavenService = IDesignerMavenService.get();
                         if (designerMavenService != null) {
-                            designerMavenService.updateCodeJarMavenProject(info.getProperty(), false);
+                            designerMavenService.updateCodeJarMavenProject(info, false);
                         }
                     }
                 }

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/utils/ProjectDataJsonProvider.java

@@ -81,6 +81,12 @@ public class ProjectDataJsonProvider {
         return strBuilder.toString();
     }
 
+    public static String getMigrationTaskIndexPath() {
+        StringBuilder strBuilder = new StringBuilder();
+        strBuilder.append(FileConstants.SETTINGS_FOLDER_NAME).append("/").append(FileConstants.MIGRATION_TASK_FILE_NAME); //$NON-NLS-1$
+        return strBuilder.toString();
+    }
+
     public static void saveProjectData(Project project) throws PersistenceException {
         saveProjectData(project, CONTENT_ALL);
     }

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/utils/RoutineUtils.java

@@ -26,7 +26,6 @@ import org.apache.oro.text.regex.Util;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
 import org.talend.commons.utils.generation.JavaUtils;
-import org.talend.core.GlobalServiceRegister;
 import org.talend.core.model.properties.Item;
 import org.talend.core.model.properties.RoutineItem;
 import org.talend.core.model.repository.ERepositoryObjectType;
@@ -48,27 +47,34 @@ public final class RoutineUtils {
     public static void changeRoutinesPackage(Item item) {
         List<ERepositoryObjectType> allowedTypes = new ArrayList<ERepositoryObjectType>();
         allowedTypes.add(ERepositoryObjectType.ROUTINES);
-        doChangeRoutinesPackage(item, DEFAULT_PACKAGE_REGEX, DEFAULT_PACKAGE_STRING, allowedTypes, false);
+        doChangeRoutinesPackage(item, DEFAULT_PACKAGE_REGEX, DEFAULT_PACKAGE_STRING, allowedTypes, false, true);
     }
 
     public static void changeInnerCodePackage(Item item, boolean avoidSave) {
-        if (item instanceof RoutineItem
-                && GlobalServiceRegister.getDefault().isServiceRegistered(IDesignerMavenService.class)) {
-            IDesignerMavenService service = GlobalServiceRegister.getDefault().getService(IDesignerMavenService.class);
-            if (service != null) {
-                RoutineItem routineItem = (RoutineItem) item;
-                String codesJarPackageByInnerCode = service.getCodesJarPackageByInnerCode(routineItem);
-                if (StringUtils.isNotBlank(codesJarPackageByInnerCode)) {
-                    String newPackageString = "package " + StringUtils.replace(codesJarPackageByInnerCode, "/", ".") + ";";
-                    doChangeRoutinesPackage(item, INNER_ROUTINES_PACKAGE_REGEX, newPackageString,
-                            ERepositoryObjectType.getAllTypesOfCodes(), avoidSave);
+        changeInnerCodePackage(item, avoidSave, true);
+    }
+
+    public static void changeInnerCodePackage(Item item, boolean avoidSave, boolean commitMode) {
+        IDesignerMavenService service = IDesignerMavenService.get();
+        if (service != null && item instanceof RoutineItem) {
+            RoutineItem routineItem = (RoutineItem) item;
+            String codesJarPackageByInnerCode = service.getCodesJarPackageByInnerCode(routineItem);
+            if (StringUtils.isNotBlank(codesJarPackageByInnerCode)) {
+                String newPackageString = "package " + StringUtils.replace(codesJarPackageByInnerCode, "/", ".") + ";";
+                if (!routineItem.isBuiltIn()) {
+                    String routineContent = new String(routineItem.getContent().getInnerContent());
+                    if (routineContent != null && routineContent.contains(newPackageString)) {
+                        return;
+                    }
                 }
+                doChangeRoutinesPackage(item, INNER_ROUTINES_PACKAGE_REGEX, newPackageString,
+                        ERepositoryObjectType.getAllTypesOfCodes(), avoidSave, commitMode);
             }
         }
     }
 
     public static void doChangeRoutinesPackage(Item item, String packageRegex, String newPackage,
-            List<ERepositoryObjectType> allowedTypes, boolean avoidSave) {
+            List<ERepositoryObjectType> allowedTypes, boolean avoidSave, boolean commitMode) {
         if (item == null) {
             return;
         }
@@ -94,7 +100,12 @@ public final class RoutineUtils {
                         ProxyRepositoryFactory repFactory = ProxyRepositoryFactory.getInstance();
 
                         if (!avoidSave) {
-                            repFactory.save(rItem);
+                            if (commitMode) {
+                                repFactory.save(rItem);
+                            } else {
+                                // avoid deadlock in git pull event listener
+                                new XmiResourceManager().saveResource(rItem.eResource());
+                            }
                         }
                         // }
                     }

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

@@ -95,6 +95,7 @@ Export-Package: org.talend.commons.utils.generation,
  org.talend.repository.documentation.generation,
  org.talend.repository.model,
  org.talend.repository.model.nodes,
+ org.talend.repository.token,
  org.talend.repository.ui.actions,
  org.talend.repository.ui.dialog,
  org.talend.repository.ui.login.connections,
@@ -129,5 +130,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_Greenplum.xml

@@ -12,17 +12,26 @@
 			<dbType type="BPCHAR" ignoreLen="true" ignorePre="true" />
 			<dbType type="BYTEA" ignoreLen="true" ignorePre="true" />	
 			<dbType type="CHAR" defaultLength="50" ignorePre="true"/>
+			<dbType type="CHARACTER" defaultLength="50" ignorePre="true"/>
 			<dbType type="CID" ignoreLen="true" ignorePre="true" />
 			<dbType type="CIDR" ignoreLen="true" ignorePre="true" />
 			<dbType type="CIRCLE" ignoreLen="true" ignorePre="true" />
 			<dbType type="DATE" ignoreLen="true" ignorePre="true" />
 			<dbType type="FLOAT4" ignoreLen="true" ignorePre="true" />
+			<dbType type="REAL" ignoreLen="true" ignorePre="true" />
 			<dbType type="FLOAT8" ignoreLen="true" ignorePre="true" />
+			<dbType type="DOUBLE PRECISION" ignoreLen="true" ignorePre="true" />
 			<dbType type="INET" ignoreLen="true" ignorePre="true" />
 			<dbType type="INT2" ignoreLen="true" ignorePre="true" />
+			<dbType type="SMALLINT" ignoreLen="true" ignorePre="true" />
 			<dbType type="INT2VECTOR" ignoreLen="true" ignorePre="true" />
 			<dbType type="INT4" ignoreLen="true" ignorePre="true" />
 			<dbType type="INT8" ignoreLen="true" ignorePre="true" />
+			<dbType type="INTEGER" ignoreLen="true" ignorePre="true" />
+			<dbType type="CHARACTER VARYING" ignoreLen="true" ignorePre="true" />
+			<dbType type="BOOLEAN" ignoreLen="true" ignorePre="true" />
+			<dbType type="BIGINT" ignoreLen="true" ignorePre="true" />
+			<dbType type="BIT VARYING" ignoreLen="true" ignorePre="true" />
 			<dbType type="INTERVAL" ignorePre="true" />
 			<dbType type="LINE" ignoreLen="true" ignorePre="true" />
 			<dbType type="LSEG" ignoreLen="true" ignorePre="true" />
@@ -30,6 +39,7 @@
 			<dbType type="MONEY" ignoreLen="true" ignorePre="true" />	
 			<dbType type="NAME" ignoreLen="true" ignorePre="true" />
 			<dbType type="NUMERIC" defaultLength="20" defaultPrecision="10"/>
+			<dbType type="DECIMAL" defaultLength="20" defaultPrecision="10"/>
 			<dbType type="OID" ignoreLen="true" ignorePre="true"  />
 			<dbType type="OIDVECTOR" ignoreLen="true" ignorePre="true" />
 			<dbType type="PATH" ignoreLen="true" ignorePre="true" />
@@ -110,16 +120,19 @@
 			<talendToDbTypes><!-- Adviced mappings  -->
 				<talendType type="id_List"/>
 				<talendType type="id_Boolean">	
-					<dbType type="BOOL" default="true" />				
+					<dbType type="BOOL" default="true" />
+					<dbType type="BOOLEAN" />					
 				</talendType>
 				<talendType type="id_Byte">		
 				</talendType>
 				<talendType type="id_byte[]">
 					<dbType type="BIT" default="true" />
-					<dbType type="VARBIT" />				
+					<dbType type="VARBIT" />
+					<dbType type="BIT VARYING" />				
 				</talendType>
 				<talendType type="id_Character">
 					<dbType type="CHAR" default="true" />
+					<dbType type="CHARACTER" />
 					<dbType type="BPCHAR" />
 					<dbType type="VARCHAR" />
 					<dbType type="TEXT" />							
@@ -136,33 +149,47 @@
 					<dbType type="RELTIME" />						
 				</talendType>
 				<talendType type="id_BigDecimal">
-					<dbType type="NUMERIC" default="true" />							
+					<dbType type="NUMERIC" default="true" />
+					<dbType type="DECIMAL" />							
 					<dbType type="FLOAT4" />
+					<dbType type="REAL" />
 					<dbType type="FLOAT8"/>
+					<dbType type="DOUBLE PRECISION"/>
 				</talendType>
 				<talendType type="id_Double">
 					<dbType type="FLOAT4" />
+					<dbType type="REAL" />
 					<dbType type="FLOAT8" default="true" />
-					<dbType type="NUMERIC" />							
+					<dbType type="NUMERIC" />
+					<dbType type="DECIMAL" />	
+					<dbType type="DOUBLE PRECISION"/>						
 				</talendType>
 				<talendType type="id_Float">
 					<dbType type="FLOAT4" default="true" />
 					<dbType type="FLOAT8" />
-					<dbType type="NUMERIC" />				
+					<dbType type="REAL" />
+					<dbType type="NUMERIC" />
+					<dbType type="DECIMAL" />
+					<dbType type="DOUBLE PRECISION"/>				
 				</talendType>
 				<talendType type="id_Integer">
 					<dbType type="INT2" />
+					<dbType type="SMALLINT" />
 					<dbType type="INT4" default="true" />
 					<dbType type="SERIAL" />
 					<dbType type="INT8" />
-					<dbType type="BIGSERIAL" />										
+					<dbType type="BIGINT" />
+					<dbType type="BIGSERIAL" />
+					<dbType type="INTEGER" />										
 				</talendType>
 				<talendType type="id_Long">
 					<dbType type="INT2" />
 					<dbType type="INT4" />
 					<dbType type="SERIAL" />
 					<dbType type="INT8"  default="true" />
-					<dbType type="BIGSERIAL" />							
+					<dbType type="BIGINT" />
+					<dbType type="BIGSERIAL" />	
+					<dbType type="SMALLINT" />						
 				</talendType>
 				<talendType type="id_Object">
 					<dbType type="_POINT" />
@@ -209,18 +236,26 @@
 					<dbType type="_ABSTIME" />
 					<dbType type="_ACLITEM" />
 					<dbType type="_INT8" />
+					<dbType type="BIGINT" />
+					<dbType type="BIT VARYING" />
 					<dbType type="_VARBIT" />
 					<dbType type="_BIT" />			
 					<dbType type="_BOOL" />
+					<dbType type="BOOLEAN" />
 					<dbType type="BOX" />
 					<dbType type="_BOX" />
 					<dbType type="_BYTEA" />
 					<dbType type="_VARCHAR" />
+					<dbType type="CHARACTER VARYING" />
+					<dbType type="CHARACTER" />
+					<dbType type="INTEGER" />
+					<dbType type="REAL" />
 					<dbType type="_BPCHAR" />
 					<dbType type="_CID" />
 					<dbType type="_CIDR" />
 					<dbType type="_CIRCLE" />
 					<dbType type="_DATE" />
+					<dbType type="DOUBLE PRECISION"/>
 					<dbType type="_FLOAT8" />
 					<dbType type="_INET" />
 					<dbType type="INT2VECTOR" />
@@ -236,6 +271,7 @@
 					<dbType type="NAME" />
 					<dbType type="_NAME" />
 					<dbType type="_NUMERIC" />
+					<dbType type="DECIMAL" />
 					<dbType type="_OID" />
 					<dbType type="OIDVECTOR" />
 					<dbType type="_OIDVECTOR" />
@@ -247,26 +283,44 @@
 					<dbType type="INT4" />
 					<dbType type="SERIAL" />
 					<dbType type="INT8" />
-					<dbType type="BIGSERIAL" />					
+					<dbType type="BIGINT" />
+					<dbType type="BIGSERIAL" />
+					<dbType type="SMALLINT" />					
 				</talendType>
 				<talendType type="id_String">
 					<dbType type="BPCHAR" />
 					<dbType type="VARCHAR" default="true" />
+					<dbType type="CHARACTER VARYING" />
 					<dbType type="TEXT" />				
 				</talendType>
 			</talendToDbTypes>
 			<dbToTalendTypes>
 				<dbType type="INT2" >
 					<talendType type="id_Short" default="true" />				
+				</dbType>
+				<dbType type="SMALLINT" >
+					<talendType type="id_Short" default="true" />				
 				</dbType>				
 				<dbType type="INT4" >
 					<talendType type="id_Integer" default="true" />
-				</dbType>				
+				</dbType>
+				<dbType type="INTEGER" >
+     				<talendType type="id_Integer" default="true" />
+    			</dbType>
+    			<dbType type="CHARACTER VARYING" >
+					<talendType type="id_String" default="true" />				
+				</dbType>
+				<dbType type="BOOLEAN" >
+					<talendType type="id_Boolean" default="true" />				
+				</dbType> 				
 				<dbType type="SERIAL" >
 					<talendType type="id_Integer" default="true" />				
 				</dbType>				
 				<dbType type="INT8" >
 					<talendType type="id_Long" default="true" />				
+				</dbType>
+				<dbType type="BIGINT" >
+					<talendType type="id_Long" default="true" />				
 				</dbType>				
 				<dbType type="BIGSERIAL" >
 					<talendType type="id_Long" default="true" />				
@@ -274,14 +328,26 @@
 				<dbType type="FLOAT4" >
 					<talendType type="id_Float" default="true" />				
 					<talendType type="id_BigDecimal"/>			
-				</dbType>				
+				</dbType>
+				<dbType type="REAL" >
+					<talendType type="id_Float" default="true" />				
+					<talendType type="id_BigDecimal"/>			
+				</dbType>			
 				<dbType type="FLOAT8" >
 					<talendType type="id_Double" default="true" />				
 					<talendType type="id_BigDecimal"/>			
 				</dbType>
+				<dbType type="DOUBLE PRECISION" >
+					<talendType type="id_Double" default="true" />				
+					<talendType type="id_BigDecimal"/>			
+				</dbType>
 				<dbType type="NUMERIC">
 					<talendType type="id_Double"/>
 					<talendType type="id_BigDecimal" default="true" />			
+				</dbType>
+				<dbType type="DECIMAL">
+					<talendType type="id_Double"/>
+					<talendType type="id_BigDecimal" default="true" />			
 				</dbType>				
 				<dbType type="BOOL" >
 					<talendType type="id_Boolean" default="true" />				
@@ -291,9 +357,15 @@
 				</dbType>				
 				<dbType type="VARBIT" >
 					<talendType type="id_byte[]" default="true" />				
-				</dbType>							
+				</dbType>	
+				<dbType type="BIT VARYING" >
+					<talendType type="id_byte[]" default="true" />				
+				</dbType>						
 				<dbType type="CHAR" >
 					<talendType type="id_String" default="true" />				
+				</dbType>
+				<dbType type="CHARACTER" >
+					<talendType type="id_String" default="true" />				
 				</dbType>				
 				<dbType type="BPCHAR" >
 					<talendType type="id_String" default="true" />				

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/schema/filepreview_provider.exsd

@@ -110,7 +110,7 @@
       </appInfo>
       <documentation>
          Talend Community Edition&lt;br&gt;
-Copyright (C) 2006-2019 Talend - www.talend.com
+Copyright (C) 2006-2021 Talend - www.talend.com
       </documentation>
    </annotation>
 

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

@@ -1,34 +0,0 @@
-// ============================================================================
-//
-// 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.core;
-
-import org.talend.core.model.properties.Item;
-import org.talend.migration.IMigrationTask.ExecutionResult;
-
-/**
- * DOC bZhou class global comment. Detailled comment
- */
-public interface IMigrateDIMetadataItemService extends IService {
-
-    /**
-     * DOC bZhou Comment method "migrateDIItems".
-     *
-     * This method to invode the migration task in DI to do migration when import items from DQ perspective.
-     *
-     * It should be removed after merge the migrate mechanism.
-     *
-     * @param item
-     * @return
-     */
-    ExecutionResult migrateDIItems(Item item);
-}

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

@@ -12,13 +12,19 @@
 // ============================================================================
 package org.talend.core;
 
+import java.io.BufferedReader;
+import java.io.File;
 import java.io.IOException;
 import java.net.URL;
+import java.nio.file.Files;
+import java.util.Properties;
 
 import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Platform;
 import org.osgi.framework.Bundle;
+import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.utils.VersionUtils;
 
 /**
  * This class can check whether some specific plugins are loaded or not. <br/>
@@ -62,6 +68,8 @@ public class PluginChecker {
 
     private static final String PREVIEW_PLUGIN_ID = "org.talend.designer.component.preview"; //$NON-NLS-1$
 
+    private static final String REMOTE_PROVIDER_PLUGIN_ID = "org.talend.repository.remoteprovider"; //$NON-NLS-1$
+
     private static final String SVN_PROVIDER_PLUGIN_ID = "org.talend.repository.svnprovider"; //$NON-NLS-1$
 
     private static final String GIT_PROVIDER_PLUGIN_ID = "org.talend.repository.gitprovider"; //$NON-NLS-1$
@@ -140,6 +148,10 @@ public class PluginChecker {
 
     public static final String APACHE_CXF_PLUGIN_ID = "org.talend.libraries.apache.cxf"; //$NON-NLS-1$
 
+    public static final String SWTBOT_PLUGIN_ID = "org.eclipse.swtbot.eclipse.core"; //$NON-NLS-1$
+
+    private static Boolean isStudioLite;
+
     /**
      * Check if specific plug-in is loaded.
      *
@@ -158,6 +170,23 @@ public class PluginChecker {
         return isJobLetPluginLoaded();
     }
 
+    public static boolean isStudioLite() {
+        if (isStudioLite == null) {
+            try {
+                File studioConfigFile = VersionUtils.getStudioConfigFile();
+                Properties props = new Properties();
+                try (BufferedReader reader = Files.newBufferedReader(studioConfigFile.toPath())) {
+                    props.load(reader);
+                }
+                isStudioLite = Boolean.valueOf(props.getProperty("talend.studio.lite"));
+            } catch (Exception e) {
+                isStudioLite = false;
+                ExceptionHandler.process(e);
+            }
+        }
+        return isStudioLite;
+    }
+
     public static boolean isRefProjectLoaded() {
         return isPluginLoaded(REF_PROJECT_PLUGIN_ID);
     }
@@ -259,6 +288,10 @@ public class PluginChecker {
         return isPluginLoaded(PREVIEW_PLUGIN_ID);
     }
 
+    public static boolean isRemoteProviderPluginLoaded() {
+        return isPluginLoaded(REMOTE_PROVIDER_PLUGIN_ID);
+    }
+
     public static boolean isSVNProviderPluginLoaded() {
         return isPluginLoaded(SVN_PROVIDER_PLUGIN_ID);
     }
@@ -372,6 +405,10 @@ public class PluginChecker {
         return isPluginLoaded(BD_ROUTINE_PLUGIN_ID);
     }
 
+    public static boolean isSWTBotLoaded() {
+        return isPluginLoaded(SWTBOT_PLUGIN_ID);
+    }
+
     public static String getBundlePath(String bundleName) {
         String bundlePath = ""; //$NON-NLS-1$
         Bundle refBundle = Platform.getBundle(bundleName);

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

@@ -67,8 +67,8 @@ public enum EDatabase4DriverClassName {
     // if change the order, it might break the audit for PSQL.
     PSQL(EDatabaseTypeName.PSQL, "org.postgresql.Driver"), //$NON-NLS-1$
     PLUSPSQL(EDatabaseTypeName.PLUSPSQL, "org.postgresql.Driver"), //$NON-NLS-1$
-    GREENPLUM(EDatabaseTypeName.GREENPLUM, "org.postgresql.Driver"), //$NON-NLS-1$
-
+    GREENPLUM(EDatabaseTypeName.GREENPLUM, "com.pivotal.jdbc.GreenplumDriver"), //$NON-NLS-1$
+    GREENPLUM_PSQL(EDatabaseTypeName.GREENPLUM, "org.postgresql.Driver"), //$NON-NLS-1$
     SAS(EDatabaseTypeName.SAS, "com.sas.rio.MVADriver"), //$NON-NLS-1$
     SAPHana(EDatabaseTypeName.SAPHana, "com.sap.db.jdbc.Driver"), //$NON-NLS-1$
     SQLITE(EDatabaseTypeName.SQLITE, "org.sqlite.JDBC"), //$NON-NLS-1$

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

@@ -336,10 +336,19 @@ public enum EDatabaseTypeName {
                             .getProjectPreferenceManager()
                             .getBoolean(IProjectSettingPreferenceConstants.METADATA_DBCONNECTION_ODBC_ENABLE);
             isSupport = isSupportODBC;
+        } else if (EDatabaseTypeName.SAS == this) {
+            isSupport = false;
         }
 
         return isSupport;
     }
+    
+    public static boolean isDeprecateDbType(String dbType) {
+    	if (EDatabaseTypeName.SAS.getXmlName().equals(dbType)) {
+            return true;
+        }
+    	return false;
+    }
 
     /**
      * Getter for dbType.

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/DatabaseConnStrUtil.java

@@ -114,6 +114,13 @@ public class DatabaseConnStrUtil {
                 && EDatabaseVersion4Drivers.SYBASEIQ_16_SA.getVersionValue().equals(dbVersion)) {
         	connStr = EDatabaseConnTemplate.SYBASEASE_16_SA;
         }
+        if (EDatabaseTypeName.GREENPLUM.getDisplayName().equals(dbType)) {
+            if (EDatabaseVersion4Drivers.GREENPLUM.getVersionValue().equals(dbVersion)) {
+                connStr = EDatabaseConnTemplate.GREENPLUM;
+            }else if(EDatabaseVersion4Drivers.GREENPLUM_PSQL.getVersionValue().equals(dbVersion)) {
+                connStr = EDatabaseConnTemplate.GREENPLUM_PSQL;
+            }
+        }
         EDatabaseVersion4Drivers version = EDatabaseVersion4Drivers.indexOfByVersion(dbVersion);
         if (connStr != null) {
             String s = connStr.getUrlTemplate(version);
@@ -221,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;
@@ -369,9 +378,13 @@ 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);
+    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 = "principal="; //$NON-NLS-1$
         boolean hasPrinc = false;
         String[] urlArray = standardURlString.split(SEMICOLON);

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

@@ -54,6 +54,11 @@ public enum EDatabaseConnTemplate {
             "5432")), //$NON-NLS-1$
 
     GREENPLUM(new DbConnStr(EDatabaseTypeName.GREENPLUM, //
+            "jdbc:pivotal:greenplum://<host>:<port>;;DatabaseName=<sid>;<property>", //$NON-NLS-1$
+            "5432")), //$NON-NLS-1$
+    
+
+    GREENPLUM_PSQL(new DbConnStr(EDatabaseTypeName.GREENPLUM, //
             "jdbc:postgresql://<host>:<port>/<sid>?<property>", //$NON-NLS-1$
             "5432")), //$NON-NLS-1$
 
@@ -209,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

@@ -84,7 +84,11 @@ public enum EDatabaseVersion4Drivers {
     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.5.jar", //$NON-NLS-1$
+                    "commons-lang3-3.10.jar", "commons-codec-1.14.jar", "gson-2.8.6.jar", "oauth2-oidc-sdk-6.5.jar",
+                    "json-smart-2.4.2.jar", "nimbus-jose-jwt-8.11.jar", "javax.mail-1.6.2.jar", "log4j-1.2.17.jar",
+                    "accessors-smart-1.1.jar", "asm-5.0.3.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$
@@ -99,8 +103,8 @@ public enum EDatabaseVersion4Drivers {
     VERTICA_3(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 3 (Deprecated)", "VERTICA_3", "vertica_3.0_jdk_5.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
     // for bug 0017930
-
-    GREENPLUM(new DbVersion4Drivers(EDatabaseTypeName.GREENPLUM, "postgresql-8.4-703.jdbc4.jar")), //$NON-NLS-1$
+    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_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$

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

@@ -53,7 +53,7 @@ public class BigDataBasicUtil {
 
     private static IDynamicDistributionManager getDynamicDistributionManager(IProgressMonitor monitor) throws Exception {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IHadoopDistributionService.class)) {
-            IHadoopDistributionService hdService = (IHadoopDistributionService) GlobalServiceRegister.getDefault()
+            IHadoopDistributionService hdService = GlobalServiceRegister.getDefault()
                     .getService(IHadoopDistributionService.class);
             if (hdService != null) {
                 return hdService.getDynamicDistributionManager();

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/general/ILibrariesService.java

@@ -27,8 +27,8 @@ import org.talend.core.model.process.IElement;
 import org.talend.core.model.process.INode;
 import org.talend.core.model.process.IProcess;
 import org.talend.core.model.process.Problem;
-import org.talend.core.model.properties.Property;
 import org.talend.core.model.repository.ERepositoryObjectType;
+import org.talend.core.model.routines.CodesJarInfo;
 import org.talend.designer.codegen.PigTemplate;
 
 /**
@@ -120,7 +120,7 @@ public interface ILibrariesService extends IService {
 
     Set<ModuleNeeded> getAllCodesJarModuleNeededs();
 
-    Set<ModuleNeeded> getCodesJarModuleNeededs(Property property);
+    Set<ModuleNeeded> getCodesJarModuleNeededs(CodesJarInfo info);
 
     List<ModuleNeeded> getModuleNeeded(String id, boolean isGroup);
 

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

@@ -191,6 +191,23 @@ public class ModuleToInstall {
         }
     }
 
+    @Override
+    public ModuleToInstall clone() {
+        ModuleToInstall module = new ModuleToInstall();
+        module.setName(this.name);
+        module.setRequired(this.required);
+        module.setContext(this.context);
+        module.setDescription(this.description);
+        module.setDistribution(this.distribution);
+        module.setFromCustomNexus(this.fromCustomNexus);
+        module.setLicenseType(this.licenseType);
+        module.setLicenseUrl(this.licenseUrl);
+        module.setMavenUri(this.mavenUri);
+        module.setUrl_description(this.url_description);
+        module.setUrl_download(this.url_download);
+        return module;
+    }
+
     public static String removeAuthenrizationInfo(String mavenUri) throws Exception {
         MavenArtifact ma = MavenUrlHelper.parseMvnUrl(mavenUri);
         ma.setUsername(""); //$NON-NLS-1$

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

@@ -125,6 +125,10 @@ public interface IMetadataColumn {
 
     public void setCustom(boolean custom);
 
+    public boolean isIgnoreCustomSort();
+
+    public void setIgnoreCustomSort(boolean ignoreCustomSort);
+
     public void setCustomId(int customId); // only for custom columns to sort them
 
     public int getCustomId(); // only for custom columns to sort them

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$
+}