chore(TUP-36127)Upgrade commons-configuration to 2.8.0 (#5472)

* chore(TUP-36127)Upgrade commons-configuration to 2.8.0

* move commons-configuration-1.6 to commons-configuration2-2.8.0

* chore(TUP-36127)update in feature

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

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

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

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

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

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

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

@@ -16,7 +16,6 @@ import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Dictionary;
@@ -89,7 +88,6 @@ import org.talend.core.hadoop.BigDataBasicUtil;
 import org.talend.core.model.general.ILibrariesService;
 import org.talend.core.model.general.ModuleNeeded;
 import org.talend.core.model.general.Project;
-import org.talend.core.model.metadata.MetadataTalendType;
 import org.talend.core.model.metadata.builder.connection.AbstractMetadataObject;
 import org.talend.core.model.metadata.builder.connection.MetadataTable;
 import org.talend.core.model.migration.IMigrationToolService;
@@ -2241,14 +2239,6 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                     TimeMeasurePerformance.step("logOnProject", "Sync components libraries"); //$NON-NLS-1$
                 }
 
-                try {
-                    // for new added mapping file, sync to project mapping folder
-                    MetadataTalendType.syncNewMappingFileToProject();
-                } catch (SystemException e) {
-                    // ignore
-                    ExceptionHandler.process(e);
-                }
-
                 CodesJarResourceCache.initCodesJarCache();
 
                 currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
@@ -2349,17 +2339,6 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                     TimeMeasurePerformance.step("logOnProject", "sync log4j"); //$NON-NLS-1$ //$NON-NLS-2$
                 }
 
-                try {
-                    URL url = MetadataTalendType.getProjectForderURLOfMappingsFile();
-                    if (url != null) {
-                        // set the project mappings url
-                        System.setProperty("talend.mappings.url", url.toString()); // $NON-NLS-1$
-                    }
-                } catch (SystemException e) {
-                    // ignore
-                    ExceptionHandler.process(e);
-                }
-
                 if (runProcessService != null && !isCommandLineLocalRefProject) {
                     runProcessService.initializeRootPoms(monitor);
 

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

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

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

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

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

@@ -21,6 +21,7 @@ import java.util.Set;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.talend.core.model.general.ModuleNeeded;
+import org.talend.core.model.general.RetrieveResult;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.nexus.ArtifactRepositoryBean;
 import org.talend.core.nexus.TalendLibsServerManager;
@@ -109,6 +110,8 @@ public interface ILibraryManagerService extends IService {
 
     public boolean retrieve(ModuleNeeded module, String pathToStore, boolean showDialog, IProgressMonitor... monitorWrap);
 
+    RetrieveResult retrieveModules(ERepositoryObjectType codeType, Set<ModuleNeeded> modulesNeeded, String pathToStore,
+            boolean showDialog, IProgressMonitor... monitorWrap);
     /**
      *
      * Resolve the jar from custom nexus

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

@@ -71,9 +71,10 @@ public enum EDatabaseVersion4Drivers {
     INFORMIX(new DbVersion4Drivers(EDatabaseTypeName.INFORMIX, "ifxjdbc.jar")), //$NON-NLS-1$
 
     SAS_9_1(new DbVersion4Drivers(EDatabaseTypeName.SAS, "SAS 9.1", "SAS_9.1", new String[] { "sas.core.jar", //$NON-NLS-1$
-            "sas.intrnet.javatools.jar", "sas.svc.connection.jar", "org.apache.log4j_1.2.15.v201012070815.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
+            "sas.intrnet.javatools.jar", "sas.svc.connection.jar", "reload4j-1.2.19.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
     SAS_9_2(new DbVersion4Drivers(EDatabaseTypeName.SAS,
-            "SAS 9.2", "SAS_9.2", new String[] { "sas.core.jar", "sas.security.sspi.jar", "sas.svc.connection.jar", "org.apache.log4j_1.2.15.v201012070815.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
+            "SAS 9.2", "SAS_9.2", //$NON-NLS-1$ //$NON-NLS-2$
+            new String[] { "sas.core.jar", "sas.security.sspi.jar", "sas.svc.connection.jar", "reload4j-1.2.19jar" })),
     SAPHana(new DbVersion4Drivers(EDatabaseTypeName.SAPHana, "HDB 1.0", "HDB_1_0", "ngdbc.jar")), //$NON-NLS-1$
     // MYSQL, add for 9594
     MYSQL_8(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MySQL 8", "MYSQL_8", "mysql-connector-java-8.0.18.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -87,7 +88,7 @@ public enum EDatabaseVersion4Drivers {
             "Microsoft", "MSSQL_PROP", //$NON-NLS-1$ //$NON-NLS-2$
             new String[] { "mssql-jdbc.jar", "slf4j-api-1.7.25.jar", "slf4j-log4j12-1.7.25.jar", "adal4j-1.6.7.jar", //$NON-NLS-1$
                     "commons-lang3-3.10.jar", "commons-codec-1.14.jar", "gson-2.8.6.jar", "oauth2-oidc-sdk-9.7.jar",
-                    "json-smart-2.4.7.jar", "nimbus-jose-jwt-8.11.jar", "javax.mail-1.6.2.jar", "reload4j-1.2.19.jar",
+                    "json-smart-2.4.7.jar", "nimbus-jose-jwt-9.22.jar", "javax.mail-1.6.2.jar", "reload4j-1.2.19.jar",
                     "accessors-smart-2.4.7.jar", "asm-9.1.jar", "content-type-2.1.jar" })),
 
     VERTICA_9(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 9.X", "VERTICA_9_0", "vertica-jdbc-9.3.1-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -106,12 +107,12 @@ public enum EDatabaseVersion4Drivers {
     GREENPLUM_PSQL(new DbVersion4Drivers(EDatabaseTypeName.GREENPLUM,"PostgreSQL", "POSTGRESQL", "postgresql-8.4-703.jdbc4.jar")), //$NON-NLS-1$
     GREENPLUM(new DbVersion4Drivers(EDatabaseTypeName.GREENPLUM,"Greenplum", "GREENPLUM", "greenplum-5.1.4.000275.jar")), //$NON-NLS-1$
 //    PSQL_V10(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "v10", "V10", "postgresql-42.2.5.jar")),
-    PSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "v9 and later", "V9_X", "postgresql-42.2.14.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    PSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "v9 and later", "V9_X", "postgresql-42.2.25.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     PSQL_PRIOR_TO_V9(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "Prior to v9", "PRIOR_TO_V9", "postgresql-8.4-703.jdbc4.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
     PLUSPSQL_PRIOR_TO_V9(new DbVersion4Drivers(EDatabaseTypeName.PLUSPSQL,
             "Prior to v9", "PRIOR_TO_V9", "postgresql-8.4-703.jdbc4.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    PLUSPSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PLUSPSQL, "v9 and later", "V9_X", "postgresql-42.2.14.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    PLUSPSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PLUSPSQL, "v9 and later", "V9_X", "postgresql-42.2.25.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     IBMDB2(new DbVersion4Drivers(EDatabaseTypeName.IBMDB2, new String[] { "db2jcc4.jar", "db2jcc_license_cu.jar", //$NON-NLS-1$ //$NON-NLS-2$
             "db2jcc_license_cisuz.jar" })), //$NON-NLS-1$
     IBMDB2ZOS(new DbVersion4Drivers(EDatabaseTypeName.IBMDB2ZOS, new String[] { "db2jcc4.jar", "db2jcc_license_cu.jar", //$NON-NLS-1$ //$NON-NLS-2$

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

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

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

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

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

@@ -94,7 +94,11 @@ public interface IDetectCVEService extends IService {
             if (art == null) {
                 return null;
             }
-            return String.format("%s:%s:%s", art.getGroupId(), art.getArtifactId(), art.getVersion());
+            String gavc = String.format("%s:%s:%s", art.getGroupId(), art.getArtifactId(), art.getVersion());
+            if (!StringUtils.isEmpty(art.getClassifier())) {
+                gavc += ":" + art.getClassifier();
+            }
+            return gavc;
         }
         return null;
     }
@@ -112,6 +116,8 @@ public interface IDetectCVEService extends IService {
         private String a;
 
         private String v;
+        
+        private String c;
 
         /**
          * @return the g
@@ -155,8 +161,28 @@ public interface IDetectCVEService extends IService {
             this.v = v;
         }
 
+        
+        /**
+         * @return the c
+         */
+        public String getC() {
+            return c;
+        }
+
+        
+        /**
+         * @param c the c to set
+         */
+        public void setC(String c) {
+            this.c = c;
+        }
+
         public String getGAVString() {
-            return String.format("%s:%s:%s", g, a, v);
+            String gav = String.format("%s:%s:%s", g, a, v);
+            if (!StringUtils.isEmpty(c)) {
+                gav += ":" + c;
+            }
+            return gav;
         }
 
         public String getGA() {
@@ -168,13 +194,16 @@ public interface IDetectCVEService extends IService {
                 return null;
             }
             String[] gavs = gav.split(":");
-            if (gavs.length != 3) {
+            if (gavs.length < 3) {
                 return null;
             }
             GAV ret = new GAV();
             ret.setG(gavs[0]);
             ret.setA(gavs[1]);
             ret.setV(gavs[2]);
+            if (gavs.length > 3) {
+                ret.setC(gavs[3]);
+            }
             return ret;
         }
 
@@ -184,19 +213,7 @@ public interface IDetectCVEService extends IService {
             }
 
             String gav = mavenUri2GAV(mavenURI);
-            if (StringUtils.isEmpty(gav)) {
-                return null;
-            }
-
-            String[] gavs = gav.split(":");
-            if (gavs.length != 3) {
-                return null;
-            }
-            GAV ret = new GAV();
-            ret.setG(gavs[0]);
-            ret.setA(gavs[1]);
-            ret.setV(gavs[2]);
-            return ret;
+            return parseFromGAV(gav);
         }
 
         public GAV clone() throws CloneNotSupportedException {
@@ -224,6 +241,12 @@ public interface IDetectCVEService extends IService {
                 sb.append(v);
                 sb.append(",");
             }
+            
+            if (!StringUtils.isEmpty(c)) {
+                sb.append("c:");
+                sb.append(c);
+                sb.append(",");
+            }
 
             if (sb.lastIndexOf(",") > 0) {
                 sb.deleteCharAt(sb.length() - 1);
@@ -245,6 +268,9 @@ public interface IDetectCVEService extends IService {
             if (!StringUtils.isEmpty(v)) {
                 hash += hash * 31 + v.hashCode();
             }
+            if (!StringUtils.isEmpty(c)) {
+                hash += hash * 31 + c.hashCode();
+            }
             return hash;
         }
 
@@ -267,8 +293,12 @@ public interface IDetectCVEService extends IService {
             if (!StringUtils.equals(a, gav.getA())) {
                 return false;
             }
+            
+            if (!StringUtils.equals(v, gav.getV())) {
+                return false;
+            }
 
-            return StringUtils.equals(v, gav.getV());
+            return StringUtils.equals(c, gav.getC());
 
         }
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/runprocess/IRunProcessService.java

@@ -133,7 +133,7 @@ public interface IRunProcessService extends IService {
     public void updateLibraries(Set<ModuleNeeded> jobModuleList, IProcess process, Set<ModuleNeeded> alreadyRetrievedModules)
             throws ProcessorException;
 
-    public void updateLibraries(Item routineItem);
+    public boolean updateLibraries(Item routineItem);
 
     public void refreshView();
 

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/ContextNebulaGridComposite.java

@@ -636,6 +636,7 @@ public class ContextNebulaGridComposite extends AbstractContextTabEditComposite
             visibleItemCount = 20;
         }
         contextsCombo.setVisibleItemCount(visibleItemCount);
+        contextsCombo.getParent().getParent().pack();
     }
 
     private void checkContextGroupSource() {

main/plugins/org.talend.core/src/main/java/org/talend/core/CoreService.java

@@ -12,20 +12,10 @@
 // ============================================================================
 package org.talend.core;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.net.URL;
 import java.util.List;
 import java.util.Map;
 
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
 import org.apache.log4j.Logger;
-import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
@@ -40,15 +30,12 @@ import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.LoginException;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.exception.SystemException;
-import org.talend.commons.runtime.xml.XmlUtil;
 import org.talend.commons.ui.runtime.image.OverlayImageProvider;
-import org.talend.commons.utils.generation.JavaUtils;
 import org.talend.commons.utils.workbench.resources.ResourceUtils;
 import org.talend.core.model.general.LibraryInfo;
 import org.talend.core.model.general.Project;
 import org.talend.core.model.metadata.ColumnNameChanged;
 import org.talend.core.model.metadata.IMetadataTable;
-import org.talend.core.model.metadata.MetadataTalendType;
 import org.talend.core.model.metadata.MetadataToolHelper;
 import org.talend.core.model.metadata.QueryUtil;
 import org.talend.core.model.metadata.builder.ConvertionHelper;
@@ -74,16 +61,9 @@ import org.talend.designer.codegen.ITalendSynchronizer;
 import org.talend.designer.core.IDesignerCoreService;
 import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
 import org.talend.designer.runprocess.IRunProcessService;
-import org.talend.designer.runprocess.ProcessorUtilities;
 import org.talend.repository.ProjectManager;
 import org.talend.repository.RepositoryWorkUnit;
 import org.talend.repository.model.RepositoryConstants;
-import org.talend.utils.xml.XmlUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
 
 /**
  * DOC Administrator class global comment. Detailled comment
@@ -354,121 +334,15 @@ public class CoreService implements ICoreService {
     }
 
     @Override
+    @Deprecated
     public void synchronizeMapptingXML(ITalendProcessJavaProject talendJavaProject) {
-        try {
-            if (talendJavaProject == null) {
-                return;
-            }
-            URL url = MetadataTalendType.getProjectForderURLOfMappingsFile();
-            if (url != null) {
-                // set the project mappings url
-                System.setProperty(ProcessorUtilities.PROP_MAPPINGS_URL, url.toString()); //$NON-NLS-1$
-                IFolder xmlMappingFolder = talendJavaProject.getResourceSubFolder(null, JavaUtils.JAVA_XML_MAPPING);
-
-                File mappingSource = new File(url.getPath());
-                FilenameFilter filter = new FilenameFilter() {
-
-                    @Override
-                    public boolean accept(File dir, String name) {
-                        if (XmlUtil.isXMLFile(name)) {
-                            return true;
-                        }
-                        return false;
-                    }
-                };
-
-                for (File file : mappingSource.listFiles(filter)) {
-                    String targetName = getTargetName(file);
-                    IFile targetFile = xmlMappingFolder.getFile(targetName);
-                    copyFile(file, targetFile);
-                }
-            }
-        } catch (CoreException e) {
-            ExceptionHandler.process(e);
-        } catch (IOException e) {
-            ExceptionHandler.process(e);
-        } catch (SystemException e) {
-            ExceptionHandler.process(e);
-        }
+        //
     }
 
     @Override
+    @Deprecated
     public void syncMappingsFileFromSystemToProject() {
-        RepositoryWorkUnit workUnit = new RepositoryWorkUnit("Sync mapping files from system to project") { //$NON-NLS-1$
-
-            @Override
-            protected void run() throws LoginException, PersistenceException {
-                try {
-                    File sysMappingfolder = new File(MetadataTalendType.getSystemForderURLOfMappingsFile().getPath());
-                    IFolder projectMappingFolder = ResourceUtils.getProject(ProjectManager.getInstance().getCurrentProject())
-                            .getFolder(MetadataTalendType.PROJECT_MAPPING_FOLDER);
-                    if (!projectMappingFolder.exists()) {
-                        projectMappingFolder.create(true, true, null);
-                    }
-                    for (File in : sysMappingfolder.listFiles()) {
-                        IFile out = projectMappingFolder.getFile(in.getName());
-                        copyFile(in, out);
-                    }
-                } catch (SystemException | CoreException | IOException e) {
-                    ExceptionHandler.process(e);
-                }
-            }
-        };
-        workUnit.setAvoidUnloadResources(true);
-        ProxyRepositoryFactory.getInstance().executeRepositoryWorkUnit(workUnit);
-    }
-
-    public String getTargetName(File file) {
-        String targetName = file.getName();
-        try {
-            DocumentBuilderFactory documentBuilderFactory = XmlUtils.getSecureDocumentBuilderFactory();
-            DocumentBuilder analyser = documentBuilderFactory.newDocumentBuilder();
-            Document document = analyser.parse(file);
-            NodeList dbmsNodes = document.getElementsByTagName("dbms"); //$NON-NLS-1$
-            String dbmsIdValue = "";
-            for (int iDbms = 0; iDbms < dbmsNodes.getLength(); iDbms++) {
-                Node dbmsNode = dbmsNodes.item(iDbms);
-                NamedNodeMap dbmsAttributes = dbmsNode.getAttributes();
-                dbmsIdValue = dbmsAttributes.getNamedItem("id").getNodeValue(); //$NON-NLS-1$
-
-            }
-            if (dbmsIdValue != null && !"".equals(dbmsIdValue)) {
-                final String[] fileNameSplit = targetName.split("_");
-                String idA = "_id";
-                String idB = "id_";
-                final int indexA = dbmsIdValue.indexOf(idA);
-                final int indexB = dbmsIdValue.indexOf(idB);
-                String secondeName = "";
-                if (indexA > 0) {
-                    secondeName = dbmsIdValue.substring(0, dbmsIdValue.length() - idA.length());
-                } else if (indexB == 0) {
-                    secondeName = dbmsIdValue.substring(idB.length(), dbmsIdValue.length());
-                } else if (indexA == -1 && indexB == -1) {
-                    secondeName = dbmsIdValue;
-                }
-                if (secondeName != null && !"".equals(secondeName)) {
-                    targetName = fileNameSplit[0] + "_" + secondeName.toLowerCase() + XmlUtil.FILE_XML_SUFFIX;
-                }
-
-            }
-        } catch (ParserConfigurationException e) {
-            ExceptionHandler.process(e);
-        } catch (SAXException e) {
-            ExceptionHandler.process(e);
-        } catch (IOException e) {
-            ExceptionHandler.process(e);
-        }
-        return targetName;
-    }
-
-    public void copyFile(File in, IFile out) throws CoreException, IOException {
-        FileInputStream fis = new FileInputStream(in);
-        if (out.exists()) {
-            out.setContents(fis, true, false, null);
-        } else {
-            out.create(fis, true, null);
-        }
-        fis.close();
+        //
     }
 
     @Override

main/plugins/org.talend.core/src/main/java/org/talend/designer/runprocess/ProcessorUtilities.java

@@ -71,7 +71,6 @@ import org.talend.commons.utils.generation.JavaUtils;
 import org.talend.commons.utils.time.TimeMeasure;
 import org.talend.core.CorePlugin;
 import org.talend.core.GlobalServiceRegister;
-import org.talend.core.ICoreService;
 import org.talend.core.ITDQItemService;
 import org.talend.core.PluginChecker;
 import org.talend.core.context.Context;
@@ -115,13 +114,11 @@ import org.talend.core.model.routines.CodesJarInfo;
 import org.talend.core.model.routines.RoutinesUtil;
 import org.talend.core.model.utils.JavaResourcesHelper;
 import org.talend.core.repository.model.ProxyRepositoryFactory;
-import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.runtime.maven.MavenConstants;
 import org.talend.core.runtime.process.ITalendProcessJavaProject;
 import org.talend.core.runtime.process.LastGenerationInfo;
 import org.talend.core.runtime.process.TalendProcessArgumentConstant;
 import org.talend.core.runtime.process.TalendProcessOptionConstants;
-import org.talend.core.runtime.projectsetting.ProjectPreferenceManager;
 import org.talend.core.runtime.repository.build.BuildExportManager;
 import org.talend.core.runtime.services.IDesignerMavenService;
 import org.talend.core.service.IResourcesDependenciesService;
@@ -152,8 +149,6 @@ public class ProcessorUtilities {
 
     private static Logger log = Logger.getLogger(ProcessorUtilities.class);
 
-    public static final String PROP_MAPPINGS_URL = "talend.mappings.url"; //$NON-NLS-1$
-
     /**
      * For generating code in CI without param -pl
      */
@@ -706,6 +701,8 @@ public class ProcessorUtilities {
 
         processor.setArguments(argumentsMap);
 
+        handelDQComponents(selectedProcessItem, currentProcess);
+
         // generate the code of the father after the childrens
         // so the code won't have any error during the check, and it will help to check
         // if the generation is really needed.
@@ -721,7 +718,7 @@ public class ProcessorUtilities {
          */
         generateBuildInfo(jobInfo, progressMonitor, isMainJob, currentProcess, currentJobName, processor, option);
 
-        handelDQComponents(selectedProcessItem, currentProcess);
+        checkNeedExportItemsForDQ(currentProcess);
 
         copyDependenciedResources(currentProcess, progressMonitor);
 
@@ -744,30 +741,10 @@ public class ProcessorUtilities {
         boolean hasDynamicMetadata = hasMetadataDynamic(currentProcess, jobInfo);
         LastGenerationInfo.getInstance().setUseDynamic(jobInfo.getJobId(), jobInfo.getJobVersion(), hasDynamicMetadata);
         if (hasDynamicMetadata) {
-            try {
-                URL url = MetadataTalendType.getProjectForderURLOfMappingsFile();
-                if (url != null) {
-                    // set the project mappings url
-                    System.setProperty(ProcessorUtilities.PROP_MAPPINGS_URL, url.toString()); // $NON-NLS-1$
-
-                    IFolder xmlMappingFolder = jobInfo.getProcessor().getTalendJavaProject().getResourceSubFolder(null,
-                            JavaUtils.JAVA_XML_MAPPING);
-                    ProjectPreferenceManager manager = CoreRuntimePlugin.getInstance().getProjectPreferenceManager();
-                    boolean updated = manager.getBoolean(MetadataTalendType.UPDATED_MAPPING_FILES);
-                    if ((xmlMappingFolder.members().length == 0 || updated)
-                            && GlobalServiceRegister.getDefault().isServiceRegistered(ICoreService.class)) {
-                        ICoreService coreService =
-                                GlobalServiceRegister.getDefault().getService(ICoreService.class);
-                        coreService.synchronizeMapptingXML(jobInfo.getProcessor().getTalendJavaProject());
-                        // reset
-                        if (updated) {
-                            manager.setValue(MetadataTalendType.UPDATED_MAPPING_FILES, false);
-                            manager.save();
-                        }
-                    }
-                }
-            } catch (Exception e) {
-                ExceptionHandler.process(e);
+            ITalendProcessJavaProject talendJavaProject = jobInfo.getProcessor().getTalendJavaProject();
+            if (talendJavaProject != null) {
+                IFolder xmlMappingFolder = talendJavaProject.getResourceSubFolder(null, JavaUtils.JAVA_XML_MAPPING);
+                MetadataTalendType.syncMappingFiles(xmlMappingFolder.getLocation().toFile(), true);
             }
         }
     }
@@ -1251,6 +1228,8 @@ public class ProcessorUtilities {
 
             processor.setArguments(argumentsMap);
 
+            handelDQComponents(selectedProcessItem, currentProcess);
+
             generateContextInfo(jobInfo, selectedContextName, statistics, trace, needContext, progressMonitor,
                     currentProcess, currentJobName, processor, isMainJob, codeGenerationNeeded);
 
@@ -1266,7 +1245,7 @@ public class ProcessorUtilities {
             generateBuildInfo(jobInfo, progressMonitor, isMainJob, currentProcess, currentJobName, processor, option);
             TimeMeasure.step(idTimer, "generateBuildInfo");
 
-            handelDQComponents(selectedProcessItem, currentProcess);
+            checkNeedExportItemsForDQ(currentProcess);
 
             copyDependenciedResources(currentProcess, progressMonitor);
 
@@ -1355,10 +1334,34 @@ public class ProcessorUtilities {
     }
 
     /**
-    *
-    * Specail operation for DQ components:
-    * - For tdqReportRun, set 'needExportItemsForDQ'to true so as the item folder can be exported
-    * - For tRuleSurvivorship, copy the current item's drools file from 'workspace/metadata/survivorship' to '.Java/src/resources'
+     * if the job includes tdqReportRun, set 'needExportItemsForDQ'to true so as the item folder can be exported
+     * 
+     * @param processItem
+     * @param currentProcess
+     */
+    private static void checkNeedExportItemsForDQ(IProcess currentProcess) {
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(ITDQItemService.class)) {
+            ITDQItemService tdqItemService =
+                    GlobalServiceRegister.getDefault().getService(ITDQItemService.class);
+            // TDQ-19637 if it includes 'tDqReportRun',must export item folder
+            if (tdqItemService != null && !needExportItemsForDQ) {
+                for (INode node : currentProcess.getGeneratingNodes()) {
+                    String componentName = node.getComponent().getName();
+                    if ("tDqReportRun".equals(componentName)) {
+                        needExportItemsForDQ = true;
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     *
+     * Specail operation for DQ components:
+     * - For tRuleSurvivorship, copy the current item's drools file from 'workspace/metadata/survivorship' to
+     * '.Java/src/resources'
+     *
      * @param processItem
      */
     private static void handelDQComponents(ProcessItem processItem,IProcess currentProcess) {
@@ -1373,17 +1376,7 @@ public class ProcessorUtilities {
                 return;
             }
             try {
-                // TDQ-19637 if it includes 'tDqReportRun',must export item folder
-                if (!needExportItemsForDQ) {
-                    for (INode node : currentProcess.getGeneratingNodes()) {
-                        String componentName = node.getComponent().getName();
-                        if ("tDqReportRun".equals(componentName)) {
-                            needExportItemsForDQ = true;
-                            break;
-                        }
-                    }
-                }
-                /* 1.TDQ-12474 copy the "metadata/survivorship/rulePackage" to ".Java/src/main/resources/". so that it will be
+            	/* 1.TDQ-12474 copy the "metadata/survivorship/rulePackage" to ".Java/src/main/resources/". so that it will be
                      used by maven command 'include-survivorship-rules' to export.
                    2.TDQ-14308 current drools file in 'src/resourcesmetadata/survivorship/' should be included to job jar.
                 */

main/plugins/org.talend.designer.maven.tos/resources/build/plugins/build-helper-maven-plugin-3-0-0/pom.xml

@@ -23,6 +23,10 @@
 		          <groupId>org.apache.maven</groupId>
    				  <artifactId>maven-compat</artifactId>
 		        </exclusion>
+		        <exclusion>
+                  <groupId>org.beanshell</groupId>
+                  <artifactId>bsh</artifactId>
+                </exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>

main/plugins/org.talend.designer.maven.tos/resources/build/plugins/karaf-maven-plugin-4-2-7/pom.xml

@@ -97,7 +97,18 @@
 		    <groupId>org.apache.maven</groupId>
 		    <artifactId>maven-core</artifactId>
 		    <version>3.8.1</version>
+		    <exclusions>
+            	<exclusion>
+            		<groupId>org.apache.maven.shared</groupId>
+            		<artifactId>maven-shared-utils</artifactId>
+            	</exclusion>
+            </exclusions>
 		</dependency>
+		<dependency>
+       		<groupId>org.apache.maven.shared</groupId>
+       		<artifactId>maven-shared-utils</artifactId>
+       		<version>3.3.3</version>
+        </dependency>
 		<dependency>
 		    <groupId>org.jsoup</groupId>
 		    <artifactId>jsoup</artifactId>

main/plugins/org.talend.designer.maven.tos/resources/build/plugins/talend-compiler-plugin/pom.xml

@@ -14,6 +14,17 @@
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
             <version>3.8.1</version>
+            <exclusions>
+            	<exclusion>
+            		<groupId>org.apache.maven.shared</groupId>
+            		<artifactId>maven-shared-utils</artifactId>
+            	</exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+       		<groupId>org.apache.maven.shared</groupId>
+       		<artifactId>maven-shared-utils</artifactId>
+       		<version>3.3.3</version>
         </dependency>
 		<dependency>
 			<groupId>org.eclipse.tycho</groupId>

main/plugins/org.talend.designer.maven.tos/resources/build/pom.xml

@@ -34,6 +34,17 @@
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
             <version>3.8.1</version>
+            <exclusions>
+            	<exclusion>
+            		<groupId>org.apache.maven.shared</groupId>
+            		<artifactId>maven-shared-utils</artifactId>
+            	</exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+       		<groupId>org.apache.maven.shared</groupId>
+       		<artifactId>maven-shared-utils</artifactId>
+       		<version>3.3.3</version>
         </dependency>
 		<dependency>
 			<groupId>org.apache.maven.plugins</groupId>
@@ -127,6 +138,11 @@
 			<artifactId>commons-compress</artifactId>
 			<version>1.21</version>
 		</dependency>
+		<dependency>
+            <groupId>org.apache-extras.beanshell</groupId>
+            <artifactId>bsh</artifactId>
+            <version>2.0b6</version>
+        </dependency>
 	</dependencies>
 	<build>
 		<plugins>

main/plugins/org.talend.designer.maven.tos/resources/tacokit/pom.xml

@@ -10,7 +10,7 @@
 	<artifactId>studio-tacokit-dependencies</artifactId>
 	<packaging>pom</packaging>
 	<properties>
-		<tacokit.components.version>1.27.8</tacokit.components.version>
+		<tacokit.components.version>1.27.10</tacokit.components.version>
 	</properties>
 	<repositories>
 		<repository>

main/plugins/org.talend.designer.maven.tos/resources/zip/pom.xml

@@ -20,7 +20,11 @@
                         <phase>generate-sources</phase>
                         <configuration>
                             <tasks>
-                                <zip destfile="${basedir}/../repository/maven_repository.zip" basedir="${basedir}/../tmp/" />
+                                <zip destfile="${basedir}/../repository/maven_repository.zip" basedir="${basedir}/../tmp/" >
+                                <fileset dir="${basedir}/../tmp/">
+                                    <exclude name="repository/dom4j/dom4j/1.6.1/**" />
+                                </fileset>
+                                </zip>
                                  <delete dir="${basedir}/../tmp/" />
                             </tasks>
                         </configuration>

main/plugins/org.talend.designer.maven/resources/templates/general/pom_project_template.xml

@@ -125,6 +125,11 @@
 						    <artifactId>plexus-io</artifactId>
 						    <version>3.0.0</version>
 						</dependency>
+						<dependency>
+                            <groupId>org.apache.maven.shared</groupId>
+                            <artifactId>maven-shared-utils</artifactId>
+                            <version>3.3.3</version>
+                        </dependency>
                         <dependency>
                             <groupId>org.apache.maven</groupId>
                             <artifactId>maven-core</artifactId>
@@ -184,6 +189,11 @@
 							<artifactId>plexus-utils</artifactId>
 							<version>3.0.24</version>
 						</dependency>
+						<dependency>
+                            <groupId>org.apache.maven.shared</groupId>
+                            <artifactId>maven-shared-utils</artifactId>
+                            <version>3.3.3</version>
+                        </dependency>
                             <dependency>
                                 <groupId>org.apache.maven</groupId>
                                 <artifactId>maven-core</artifactId>

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/AggregatorPomsHelper.java

@@ -214,31 +214,36 @@ public class AggregatorPomsHelper {
 
             @Override
             protected void run() {
-                Project currentProject = ProjectManager.getInstance().getCurrentProject();
                 try {
                     for (ERepositoryObjectType codeType : ERepositoryObjectType.getAllTypesOfCodes()) {
-                        ITalendProcessJavaProject codeProject = getCodesProject(codeType);
-                        if (ERepositoryObjectType.ROUTINES == codeType) {
-                            PomUtil.checkExistingLog4j2Dependencies4RoutinePom(projectTechName, codeProject.getProjectPom());
-                        }
-                        if (ignoreM2Cache || CodeM2CacheManager.needUpdateCodeProject(currentProject, codeType)) {
-                            updateCodeProjectPom(monitor, codeType, codeProject.getProjectPom());
-                            MavenProjectUtils.updateMavenProject(monitor, codeProject.getProject());
-                            buildAndInstallCodesProject(monitor, codeType, true, forceBuild);
-                            CodeM2CacheManager.updateCodeProjectCache(currentProject, codeType);
-                        } else if (buildIfNoUpdate) {
-                            buildAndInstallCodesProject(monitor, codeType, false, true);
-                        }
+                        updateCodeProject(monitor, codeType, forceBuild, ignoreM2Cache, buildIfNoUpdate);
                     }
                 } catch (Exception e) {
                     ExceptionHandler.process(e);
                 }
             }
+
         };
         workUnit.setAvoidUnloadResources(true);
         ProxyRepositoryFactory.getInstance().executeRepositoryWorkUnit(workUnit);
     }
-
+    
+    public void updateCodeProject(IProgressMonitor monitor, ERepositoryObjectType codeType, boolean forceBuild, boolean ignoreM2Cache,
+            boolean buildIfNoUpdate) throws Exception, CoreException {
+        Project currentProject = ProjectManager.getInstance().getCurrentProject();
+        ITalendProcessJavaProject codeProject = getCodesProject(codeType);
+        if (ERepositoryObjectType.ROUTINES == codeType) {
+            PomUtil.checkExistingLog4j2Dependencies4RoutinePom(projectTechName, codeProject.getProjectPom());
+        }
+        if (ignoreM2Cache || CodeM2CacheManager.needUpdateCodeProject(currentProject, codeType)) {
+            updateCodeProjectPom(monitor, codeType, codeProject.getProjectPom());
+            MavenProjectUtils.updateMavenProject(monitor, codeProject.getProject());
+            buildAndInstallCodesProject(monitor, codeType, true, forceBuild);
+            CodeM2CacheManager.updateCodeProjectCache(currentProject, codeType);
+        } else if (buildIfNoUpdate) {
+            buildAndInstallCodesProject(monitor, codeType, false, true);
+        }
+    }
     public void updateCodeProjectPom(IProgressMonitor monitor, ERepositoryObjectType type, IFile pomFile)
             throws Exception {
         if (type != null) {

main/plugins/org.talend.libraries.apache.cxf/.classpath

@@ -1,35 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry exported="true" kind="lib" path="lib/txw2-2.3.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jakarta.xml.ws-api-2.3.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/wsdl4j-1.6.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/istack-commons-runtime-3.0.12.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jaxb-runtime-2.3.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/woodstox-core-6.2.6.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-core-3.4.7.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-bindings-soap-3.4.7.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-bindings-xml-3.4.7.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-databinding-jaxb-3.4.7.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-features-clustering-3.4.7.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-frontend-jaxrs-3.4.7.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-frontend-jaxws-3.4.7.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-frontend-simple-3.4.7.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-rs-client-3.4.7.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-security-3.4.7.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-security-saml-3.4.7.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-transports-http-3.4.7.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-ws-addr-3.4.7.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-wsdl-3.4.7.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-ws-policy-3.4.7.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-ws-security-3.4.7.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jakarta.activation-1.2.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-wsdl-3.3.10.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jakarta.activation-api-1.2.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/woodstox-core-6.2.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jakarta.annotation-api-1.3.5.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/stax2-api-4.2.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/neethi-3.1.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jakarta.ws.rs-api-2.1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-core-3.3.10.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-bindings-xml-3.3.10.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-frontend-jaxrs-3.3.10.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-rs-client-3.3.10.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-transports-http-3.3.10.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-bindings-soap-3.3.10.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-databinding-jaxb-3.3.10.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-features-clustering-3.3.10.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-frontend-jaxws-3.3.10.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-frontend-simple-3.3.10.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-security-3.3.10.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-security-saml-3.3.10.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-ws-addr-3.3.10.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-ws-policy-3.3.10.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-ws-security-3.3.10.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/javax.ws.rs-api-2.0-m10.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jakarta.xml.bind-api-2.3.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xmlschema-core-2.2.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jaxb-runtime-2.3.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jakarta.jws-api-2.1.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/istack-commons-runtime-3.0.11.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jakarta.xml.soap-api-1.4.2.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

main/plugins/org.talend.libraries.apache.cxf/META-INF/MANIFEST.MF

@@ -5,66 +5,39 @@ Bundle-SymbolicName: org.talend.libraries.apache.cxf;singleton:=true
 Bundle-Version: 7.3.1.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
+ lib/cxf-core-3.4.7.jar,
+ lib/cxf-rt-bindings-soap-3.4.7.jar,
+ lib/cxf-rt-bindings-xml-3.4.7.jar,
+ lib/cxf-rt-databinding-jaxb-3.4.7.jar,
+ lib/cxf-rt-features-clustering-3.4.7.jar,
+ lib/cxf-rt-frontend-jaxrs-3.4.7.jar,
+ lib/cxf-rt-frontend-jaxws-3.4.7.jar,
+ lib/cxf-rt-frontend-simple-3.4.7.jar,
+ lib/cxf-rt-rs-client-3.4.7.jar,
+ lib/cxf-rt-security-3.4.7.jar,
+ lib/cxf-rt-security-saml-3.4.7.jar,
+ lib/cxf-rt-transports-http-3.4.7.jar,
+ lib/cxf-rt-ws-addr-3.4.7.jar,
+ lib/cxf-rt-wsdl-3.4.7.jar,
+ lib/cxf-rt-ws-security-3.4.7.jar,
+ lib/cxf-rt-ws-policy-3.4.7.jar,
+ lib/istack-commons-runtime-3.0.12.jar,
+ lib/jakarta.activation-1.2.2.jar,
+ lib/jakarta.activation-api-1.2.2.jar,
+ lib/jakarta.annotation-api-1.3.5.jar,
+ lib/jakarta.jws-api-2.1.0.jar,
+ lib/jakarta.ws.rs-api-2.1.6.jar,
+ lib/jakarta.xml.bind-api-2.3.3.jar,
+ lib/jakarta.xml.soap-api-1.4.2.jar,
+ lib/jakarta.xml.ws-api-2.3.3.jar,
+ lib/jaxb-runtime-2.3.4.jar,
  lib/neethi-3.1.1.jar,
  lib/stax2-api-4.2.1.jar,
- lib/javax.activation-1.2.0.jar,
- lib/cxf-core-3.3.10.jar,
- lib/cxf-rt-bindings-xml-3.3.10.jar,
- lib/cxf-rt-frontend-jaxrs-3.3.10.jar,
- lib/cxf-rt-rs-client-3.3.10.jar,
- lib/cxf-rt-transports-http-3.3.10.jar,
- lib/cxf-rt-wsdl-3.3.10.jar,
- lib/cxf-rt-bindings-soap-3.3.10.jar,
- lib/cxf-rt-databinding-jaxb-3.3.10.jar,
- lib/cxf-rt-features-clustering-3.3.10.jar,
- lib/cxf-rt-frontend-jaxws-3.3.10.jar,
- lib/cxf-rt-frontend-simple-3.3.10.jar,
- lib/cxf-rt-security-3.3.10.jar,
- lib/cxf-rt-security-saml-3.3.10.jar,
- lib/cxf-rt-ws-addr-3.3.10.jar,
- lib/cxf-rt-ws-policy-3.3.10.jar,
- lib/cxf-rt-ws-security-3.3.10.jar,
- lib/jakarta.ws.rs-api-2.1.6.jar,
- lib/jakarta.annotation-api-1.3.5.jar,
- lib/woodstox-core-6.2.1.jar,
- lib/jakarta.xml.bind-api-2.3.3.jar,
- lib/jakarta.activation-api-1.2.2.jar,
- lib/jakarta.activation-1.2.2.jar,
- lib/javax.ws.rs-api-2.0-m10.jar,
+ lib/txw2-2.3.4.jar,
  lib/xmlschema-core-2.2.5.jar,
- lib/jaxb-runtime-2.3.3.jar,
- lib/jakarta.jws-api-2.1.0.jar,
- lib/istack-commons-runtime-3.0.11.jar,
- lib/jakarta.xml.soap-api-1.4.2.jar
-Export-Package: com.sun.istack,
- com.sun.istack.localization,
- com.sun.istack.logging,
- com.sun.xml.bind,
- com.sun.xml.bind.annotation,
- com.sun.xml.bind.api,
- com.sun.xml.bind.api.impl,
- com.sun.xml.bind.marshaller,
- com.sun.xml.bind.unmarshaller,
- com.sun.xml.bind.util,
- com.sun.xml.bind.v2,
- com.sun.xml.bind.v2.bytecode,
- com.sun.xml.bind.v2.model.annotation,
- com.sun.xml.bind.v2.model.core,
- com.sun.xml.bind.v2.model.impl,
- com.sun.xml.bind.v2.model.nav,
- com.sun.xml.bind.v2.model.runtime,
- com.sun.xml.bind.v2.model.util,
- com.sun.xml.bind.v2.runtime,
- com.sun.xml.bind.v2.runtime.output,
- com.sun.xml.bind.v2.runtime.property,
- com.sun.xml.bind.v2.runtime.reflect,
- com.sun.xml.bind.v2.runtime.reflect.opt,
- com.sun.xml.bind.v2.runtime.unmarshaller,
- com.sun.xml.bind.v2.schemagen,
- com.sun.xml.bind.v2.schemagen.episode,
- com.sun.xml.bind.v2.schemagen.xmlschema,
- com.sun.xml.bind.v2.util,
- javax.jws,
+ lib/woodstox-core-6.2.6.jar,
+ lib/wsdl4j-1.6.3.jar
+Export-Package: javax.jws,
  javax.ws.rs,
  javax.ws.rs.client,
  javax.ws.rs.container,
@@ -76,6 +49,15 @@ Export-Package: com.sun.istack,
  javax.xml.bind.attachment,
  javax.xml.bind.helpers,
  javax.xml.bind.util,
+ javax.xml.soap,
+ javax.xml.ws,
+ javax.xml.ws.handler,
+ javax.xml.ws.handler.soap,
+ javax.xml.ws.http,
+ javax.xml.ws.soap,
+ javax.xml.ws.spi,
+ javax.xml.ws.spi.http,
+ javax.xml.ws.wsaddressing,
  org.apache.cxf,
  org.apache.cxf.annotations,
  org.apache.cxf.attachment,
@@ -192,7 +174,6 @@ Export-Package: com.sun.istack,
  org.apache.cxf.wsdl11,
  org.apache.neethi,
  org.apache.neethi.builders,
- javax.xml.ws,
  org.talend.libraries.apache.cxf
 Require-Bundle: javax.wsdl;bundle-version="1.6.2",
  org.apache.log4j,

main/plugins/org.talend.libraries.apache.cxf/pom.xml

@@ -10,6 +10,10 @@
   <artifactId>org.talend.libraries.apache.cxf</artifactId>
   <packaging>eclipse-plugin</packaging>
   
+  <properties>
+    <cxf.version>3.4.7</cxf.version>
+  </properties>
+  
   <repositories>
 		<repository>
 			<id>talend-update</id>
@@ -21,83 +25,88 @@
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-core</artifactId>
-			<version>3.3.10</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-bindings-xml</artifactId>
-			<version>3.3.10</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-frontend-jaxrs</artifactId>
-			<version>3.3.10</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-rs-client</artifactId>
-			<version>3.3.10</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-transports-http</artifactId>
-			<version>3.3.10</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-wsdl</artifactId>
-			<version>3.3.10</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-bindings-soap</artifactId>
-			<version>3.3.10</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-databinding-jaxb</artifactId>
-			<version>3.3.10</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-features-clustering</artifactId>
-			<version>3.3.10</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-frontend-jaxws</artifactId>
-			<version>3.3.10</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-frontend-simple</artifactId>
-			<version>3.3.10</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-security</artifactId>
-			<version>3.3.10</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-security-saml</artifactId>
-			<version>3.3.10</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-ws-addr</artifactId>
-			<version>3.3.10</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-ws-policy</artifactId>
-			<version>3.3.10</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-ws-security</artifactId>
-			<version>3.3.10</version>
+			<version>${cxf.version}</version>
 		</dependency>
+		<dependency>
+            <groupId>com.sun.istack</groupId>
+            <artifactId>istack-commons-runtime</artifactId>
+            <version>3.0.12</version>
+        </dependency>
 		<dependency>
 			<groupId>com.sun.activation</groupId>
 			<artifactId>jakarta.activation</artifactId>
@@ -108,15 +117,40 @@
 			<artifactId>jakarta.activation-api</artifactId>
 			<version>1.2.2</version>
 		</dependency>
+		<dependency>
+			<groupId>jakarta.annotation</groupId>
+			<artifactId>jakarta.annotation-api</artifactId>
+			<version>1.3.5</version>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.jws</groupId>
+			<artifactId>jakarta.jws-api</artifactId>
+			<version>2.1.0</version>
+		</dependency>
 		<dependency>
 			<groupId>jakarta.ws.rs</groupId>
 			<artifactId>jakarta.ws.rs-api</artifactId>
 			<version>2.1.6</version>
 		</dependency>
 		<dependency>
-			<groupId>jakarta.annotation</groupId>
-			<artifactId>jakarta.annotation-api</artifactId>
-			<version>1.3.5</version>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
+			<version>2.3.3</version>
+		</dependency>
+        <dependency>
+		    <groupId>jakarta.xml.soap</groupId>
+		    <artifactId>jakarta.xml.soap-api</artifactId>
+		    <version>1.4.2</version>
+		</dependency>
+		<dependency>
+		  	<groupId>jakarta.xml.ws</groupId>
+		  	<artifactId>jakarta.xml.ws-api</artifactId>
+		  	<version>2.3.3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
+			<version>2.3.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.neethi</groupId>
@@ -129,14 +163,14 @@
 			<version>4.2.1</version>
 		</dependency>
 		<dependency>
-			<groupId>com.fasterxml.woodstox</groupId>
-			<artifactId>woodstox-core</artifactId>
-			<version>6.2.1</version>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>txw2</artifactId>
+			<version>2.3.4</version>
 		</dependency>
 		<dependency>
-			<groupId>javax.ws.rs</groupId>
-			<artifactId>javax.ws.rs-api</artifactId>
-			<version>2.0-m10</version>
+			<groupId>com.fasterxml.woodstox</groupId>
+			<artifactId>woodstox-core</artifactId>
+			<version>6.2.6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.ws.xmlschema</groupId>
@@ -144,29 +178,9 @@
 			<version>2.2.5</version>
 		</dependency>
 		<dependency>
-			<groupId>jakarta.jws</groupId>
-			<artifactId>jakarta.jws-api</artifactId>
-			<version>2.1.0</version>
-		</dependency>
-		<dependency>
-			<groupId>jakarta.xml.bind</groupId>
-			<artifactId>jakarta.xml.bind-api</artifactId>
-			<version>2.3.3</version>
-		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jaxb</groupId>
-			<artifactId>jaxb-runtime</artifactId>
-			<version>2.3.3</version>
-		</dependency>
-        <dependency>
-            <groupId>com.sun.istack</groupId>
-            <artifactId>istack-commons-runtime</artifactId>
-            <version>3.0.11</version>
-        </dependency>
-        <dependency>
-		    <groupId>jakarta.xml.soap</groupId>
-		    <artifactId>jakarta.xml.soap-api</artifactId>
-		    <version>1.4.2</version>
+		  	<groupId>wsdl4j</groupId>
+		  	<artifactId>wsdl4j</artifactId>
+		  	<version>1.6.3</version>
 		</dependency>
 	</dependencies>
   <build>
@@ -194,6 +208,7 @@
 							<goal>copy-dependencies</goal>
 						</goals>
 						<configuration>
+							<includeScope>runtime</includeScope>
 							<excludeTypes>pom</excludeTypes>
 							<excludeTransitive>true</excludeTransitive>
 							<outputDirectory>${project.basedir}/lib</outputDirectory>

main/plugins/org.talend.libraries.apache.xml/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/xmlbeans-3.1.0.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>

main/plugins/org.talend.libraries.apache.xml/META-INF/MANIFEST.MF

@@ -22,9 +22,6 @@ Export-Package: org.apache.xmlbeans,
  org.apache.xmlbeans.impl.jam.provider,
  org.apache.xmlbeans.impl.jam.visitor,
  org.apache.xmlbeans.impl.jam.xml,
- org.apache.xmlbeans.impl.piccolo.io,
- org.apache.xmlbeans.impl.piccolo.util,
- org.apache.xmlbeans.impl.piccolo.xml,
  org.apache.xmlbeans.impl.regex,
  org.apache.xmlbeans.impl.richParser,
  org.apache.xmlbeans.impl.schema,
@@ -51,8 +48,6 @@ Export-Package: org.apache.xmlbeans,
  org.apache.xmlbeans.xml.stream,
  org.apache.xmlbeans.xml.stream.events,
  org.apache.xmlbeans.xml.stream.utils,
- org.w3c.dom,
- repackage,
  schemaorg_apache_xmlbeans.system.sXMLCONFIG,
  schemaorg_apache_xmlbeans.system.sXMLLANG,
  schemaorg_apache_xmlbeans.system.sXMLSCHEMA,

main/plugins/org.talend.libraries.apache.xml/lib/.gitignore

@@ -1,4 +1,3 @@
 xmlschema-core-2.0.1.jar
-xmlbeans-2.3.0.jar
-xmlbeans-2.6.0.jar
+xmlbeans-3.1.0.jar
 xercesImpl-2.12.0.jar

main/plugins/org.talend.libraries.apache.xml/pom.xml

@@ -26,16 +26,6 @@
 						<configuration>
 							<outputDirectory>${project.basedir}/lib</outputDirectory>
 							<artifactItems>
-								<artifactItem>
-									<groupId>org.apache.xmlbeans</groupId>
-									<artifactId>xmlbeans</artifactId>
-									<version>2.3.0</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.apache.xmlbeans</groupId>
-									<artifactId>xmlbeans</artifactId>
-									<version>2.6.0</version>
-								</artifactItem>
 								<artifactItem>
 									<groupId>org.apache.xmlbeans</groupId>
 									<artifactId>xmlbeans</artifactId>

main/plugins/org.talend.libraries.apache/.classpath

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="lib/xmlbeans-3.1.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xml-apis.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
@@ -7,6 +8,5 @@
 	<classpathentry exported="true" kind="lib" path="lib/apache-mime4j-0.6.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/castor-1.0.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jakarta-oro-2.0.8.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

main/plugins/org.talend.libraries.apache/META-INF/MANIFEST.MF

@@ -8,8 +8,8 @@ Bundle-ClassPath: .,
  lib/apache-mime4j-0.6.jar,
  lib/castor-1.0.3.jar,
  lib/jakarta-oro-2.0.8.jar,
- lib/xmlbeans-2.3.0.jar,
- lib/xml-apis.jar
+ lib/xml-apis.jar,
+ lib/xmlbeans-3.1.0.jar
 Bundle-Vendor: .Talend SA.
 Require-Bundle: org.apache.log4j;resolution:=optional,
  org.talend.libraries.apache.common;visibility:=reexport,
@@ -63,9 +63,6 @@ Export-Package:
  org.apache.xmlbeans.impl.jam.provider,
  org.apache.xmlbeans.impl.jam.visitor,
  org.apache.xmlbeans.impl.jam.xml,
- org.apache.xmlbeans.impl.piccolo.io,
- org.apache.xmlbeans.impl.piccolo.util,
- org.apache.xmlbeans.impl.piccolo.xml,
  org.apache.xmlbeans.impl.regex,
  org.apache.xmlbeans.impl.richParser,
  org.apache.xmlbeans.impl.schema,

main/plugins/org.talend.libraries.apache/build.properties

@@ -3,7 +3,8 @@ bin.includes = META-INF/,\
                .,\
                licences/,\
                lib/,\
-               lib/xml-apis.jar
+               lib/xml-apis.jar,\
+               lib/xmlbeans-3.1.0.jar
 bin.excludes = libs_not_used/commons-betwixt-0.8.jar,\
                libs_not_used/commons-digester-1.7.jar,\
                libs_not_used/commons-discovery-0.2.jar,\

main/plugins/org.talend.libraries.apache/pom.xml

@@ -76,6 +76,11 @@
 			<artifactId>log4j-1.2-api</artifactId>
 			<version>${log4j2.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.xmlbeans</groupId>
+			<artifactId>xmlbeans</artifactId>
+			<version>3.1.0</version>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
@@ -94,7 +99,7 @@
 							<excludeTypes>pom</excludeTypes>
 							<excludeTransitive>true</excludeTransitive>
 							<outputDirectory>${project.basedir}/lib</outputDirectory>
-							<includeGroupIds>ch.qos.reload4j,org.slf4j,org.apache.logging.log4j</includeGroupIds>
+							<includeGroupIds>ch.qos.reload4j,org.slf4j,org.apache.xmlbeans,org.apache.logging.log4j</includeGroupIds>
 						</configuration>
 					</execution>
 				</executions>

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

@@ -69,7 +69,7 @@ Module.view.download.external.modules.action.text=Download external modules
 Module.view.download.external.modules.action.description=Download external modules
 download.external.dialog.title=The following modules are not yet installed. Please download and install all required modules.
 download.external.dialog.desciption=List of modules to be downloaded automatically or imported manually.
-download.external.dialog.help.url=https://help.talend.com/display/KB/How+to+install+external+modules+in+the+Talend+products
+download.external.dialog.help.url=https://document-link.us.cloud.talend.com/ts_ig_install-external-modules?version=73&lang=en&env=prd
 download.external.dialog.warning=Warning
 download.external.dialog.message=Select at least one module not installed.
 Module.view.sharelibsAction.title=Share libraries

main/plugins/org.talend.librariesmanager/resources/java/routines/system/JSONObject.java

@@ -243,10 +243,37 @@ public class JSONObject {
      * 
      * @param bean An object that has getter methods that should be used to make a JSONObject.
      */
+    @Deprecated
     public JSONObject(Object bean) {
         this();
         populateMap(bean);
     }
+    
+    /**
+     * Construct a JSONObject from an Object using bean getters. It reflects on all of the public methods of the object.
+     * For each of the methods with no parameters and a name starting with <code>"get"</code> or <code>"is"</code>
+     * followed by an uppercase letter, the method is invoked, and a key and the value returned from the getter method
+     * are put into the new JSONObject.
+     * 
+     * The key is formed by removing the <code>"get"</code> or <code>"is"</code> prefix. If the second remaining
+     * character is not upper case, then the first character is converted to lower case.
+     * 
+     * For example, if an object has a method named <code>"getName"</code>, and if the result of calling
+     * <code>object.getName()</code> is <code>"Larry Fine"</code>, then the JSONObject will contain
+     * <code>"name": "Larry Fine"</code>.
+     * 
+     * @param bean An object that has getter methods that should be used to make a JSONObject.
+     * @param expectedClass Bean must be the instance of this class, for safe to avoid evil script inject
+     */
+    public JSONObject(Object bean, Class<?> expectedClass) {
+        this();
+        
+        if(bean.getClass() != expectedClass) {
+            throw new JSONException("expectedClass doesn't match the bean or is null");
+        } 
+        
+        populateMap(bean);
+    }
 
     /**
      * Construct a JSONObject from an Object, using reflection to find the public members. The resulting JSONObject's

main/plugins/org.talend.librariesmanager/resources/java/routines/system/ResumeUtil.java

@@ -105,7 +105,7 @@ public class ResumeUtil {
                         csvWriter.write("stackTrace");// stackTrace
                         csvWriter.write("dynamicData");// dynamicData
                         csvWriter.endRecord();
-                        csvWriter.flush();
+                        csvWriter.flush(true);
                     }
                     // shared
                     sharedWriterMap.put(this.root_pid, this.csvWriter);
@@ -171,7 +171,7 @@ public class ResumeUtil {
                 csvWriter.write(item.stackTrace);// stackTrace
                 csvWriter.write(item.dynamicData);// dynamicData--->it is the 17th field. @see:feature:11296
                 csvWriter.endRecord();
-                csvWriter.flush();
+                csvWriter.flush(false);
                 fileLock.release();
             }
             // for test the order
@@ -193,6 +193,12 @@ public class ResumeUtil {
             }
         }
     }
+    
+    public void flush() {
+    	if(csvWriter != null) {
+    		csvWriter.flush(true);
+    	}
+    }
 
     // Util: invoke target check point
     @Deprecated
@@ -353,13 +359,12 @@ public class ResumeUtil {
         String str = out.toString();
         return str;
     }
-
-    // to support encrypt the password in the resume
-    public static String convertToJsonText(Object context, List<String> parametersToEncrypt) {
+    
+    public static String convertToJsonText(Object context, Class<?> expectedClass, List<String> parametersToEncrypt) {
         String jsonText = "";
         try {
             JSONObject firstNode = new JSONObject();
-            JSONObject secondNode = new JSONObject(context);
+            JSONObject secondNode = new JSONObject(context, expectedClass);
             if (parametersToEncrypt != null) {
                 for (String parameterToEncrypt : parametersToEncrypt) {
                     if (secondNode.isNull(parameterToEncrypt)) {
@@ -379,9 +384,15 @@ public class ResumeUtil {
         return jsonText;
     }
 
+    // to support encrypt the password in the resume
+    @Deprecated
+    public static String convertToJsonText(Object context, List<String> parametersToEncrypt) {
+        return convertToJsonText(context, context == null ? null : context.getClass(), parametersToEncrypt);
+    }
+
     // Util: convert the context variable to json style text.
     // feature:11296
-    // @Deprecated
+    @Deprecated
     public static String convertToJsonText(Object context) {
         return convertToJsonText(context, null);
     }
@@ -459,6 +470,8 @@ public class ResumeUtil {
         USER_DEF_LOG,
         JOB_ENDED;
     }
+    
+
 
     /**
      * this class is reference with CsvWriter.
@@ -503,7 +516,10 @@ public class ResumeUtil {
 
         private String lineSeparator = System.getProperty("line.separator");
         
-        private int capibility = 2<<14; //32k
+        private int capibility = 2 << 22; //8M
+        
+        private int FLUSH_FACTOR = 6 *1024 *1024; //6M
+        
 
         public SimpleCsvWriter(FileChannel channel) {
             this.channel = channel;
@@ -534,10 +550,8 @@ public class ResumeUtil {
             }
             
             byte[] contentByte = content.getBytes();
-            if(contentByte.length > capibility - 1024) {
-            	flush();
-            	capibility = contentByte.length * 2;
-            	buf = ByteBuffer.allocate(capibility);
+            if(contentByte.length > capibility - buf.position()) {
+            	flush(true);
             }
 
             buf.put(contentByte);
@@ -562,18 +576,20 @@ public class ResumeUtil {
         /**
          * flush
          */
-        public void flush() {
-            try {
-                ((Buffer) buf).flip();
-                channel.position(channel.size());
-                while(buf.hasRemaining()) {
-                    channel.write(buf);
+        public void flush(boolean force) {
+        	if(force || buf.position() > FLUSH_FACTOR) {
+                try {
+                    ((Buffer) buf).flip();
+                    channel.position(channel.size());
+                    while(buf.hasRemaining()) {
+                        channel.write(buf);
+                    }
+                    channel.force(true);
+                    ((Buffer) buf).clear();
+                } catch (IOException e) {
+                    e.printStackTrace();
                 }
-                channel.force(true);
-                ((Buffer) buf).clear();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
+        	}
         }
 
         /**

main/plugins/org.talend.librariesmanager/src/main/java/org/talend/librariesmanager/model/service/LocalLibraryManager.java

@@ -64,6 +64,7 @@ import org.talend.core.model.general.ILibrariesService.IChangedLibrariesListener
 import org.talend.core.model.general.ModuleNeeded;
 import org.talend.core.model.general.ModuleNeeded.ELibraryInstallStatus;
 import org.talend.core.model.general.ModuleStatusProvider;
+import org.talend.core.model.general.RetrieveResult;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.nexus.ArtifactRepositoryBean;
 import org.talend.core.nexus.NexusConstants;
@@ -372,6 +373,10 @@ public class LocalLibraryManager implements ILibraryManagerService, IChangedLibr
                     .process(new Exception(getClass().getSimpleName() + " resolve " + module.getModuleName() + " failed !"));
         }
         try {
+            // try maven uri first
+            if (jarFile == null) {
+                jarFile = getJarFile(module.getMavenUri());
+            }
             // try the jar name if can't get jar with uri.
             if (jarFile == null) {
                 jarFile = getJarFile(jarNeeded);
@@ -383,7 +388,10 @@ public class LocalLibraryManager implements ILibraryManagerService, IChangedLibr
                         ILibraryManagerUIService libUiService = GlobalServiceRegister.getDefault()
                                 .getService(ILibraryManagerUIService.class);
 
-                        libUiService.installModules(new String[] { jarNeeded });
+                        // libUiService.installModules(new String[] { jarNeeded });
+                        List<ModuleNeeded> moduleList = new ArrayList<ModuleNeeded>();
+                        moduleList.add(module);
+                        libUiService.installModules(moduleList);
                     }
                     jarFile = retrieveJarFromLocal(module);
                     if (jarFile == null) {
@@ -702,8 +710,15 @@ public class LocalLibraryManager implements ILibraryManagerService, IChangedLibr
     @Override
     public boolean retrieve(ERepositoryObjectType codeType, Set<ModuleNeeded> modulesNeeded, String pathToStore,
             boolean showDialog, IProgressMonitor... monitorWrap) {
+        return retrieveModules(codeType, modulesNeeded, pathToStore, showDialog, monitorWrap).isAllResolved();
+    }
+
+    @Override
+    public RetrieveResult retrieveModules(ERepositoryObjectType codeType, Set<ModuleNeeded> modulesNeeded, String pathToStore,
+            boolean showDialog, IProgressMonitor... monitorWrap) {
+        RetrieveResult result = new RetrieveResult();
         if (modulesNeeded == null || modulesNeeded.size() == 0) {
-            return false;
+            return result;
         }
         Set<ModuleNeeded> jarNotFound = new HashSet<>();
         boolean allIsOK = true;
@@ -726,8 +741,10 @@ public class LocalLibraryManager implements ILibraryManagerService, IChangedLibr
                     if (!retrieve(jar, pathToStore, false, false)) {
                         jarNotFound.add(jar);
                         allIsOK = false;
+                        result.getUnresolvedModules().add(jar);
                     } else {
                         needResetModulesNeeded = true;
+                        result.getResovledModules().add(jar);
                     }
                 }
                 if (needResetModulesNeeded) {
@@ -744,8 +761,8 @@ public class LocalLibraryManager implements ILibraryManagerService, IChangedLibr
                 }
             }
         }
-
-        return allIsOK;
+        result.setAllResolved(allIsOK);
+        return result;
     }
 
     @Override
@@ -1337,7 +1354,7 @@ public class LocalLibraryManager implements ILibraryManagerService, IChangedLibr
                                 if (path.equals(moduleLocation)) {
                                     continue;
                                 } else {
-                                    if (CommonsPlugin.isDebugMode()) {
+                                    if (CommonsPlugin.isDebugMode() && !CommonsPlugin.isHeadless()) {
                                         CommonExceptionHandler
                                                 .warn(name + " is duplicated, locations:" + path + " and:" + moduleLocation);
                                     }

main/plugins/org.talend.metadata.managment.ui/src/main/java/messages.properties

@@ -510,10 +510,12 @@ InegerCellEditorListener.NumeralMessage=Input value invalid
 MetadataTalendTypeEditor.button.edit=E&dit
 MetadataTalendTypeEditor.button.export=E&xport Mapping
 MetadataTalendTypeEditor.button.import=I&mport Mapping
+MetadataTalendTypeEditor.button.restore=R&estore
 MetadataTalendTypeEditor.column1.Name=Metadata Mapping File
 MetadataTalendTypeEditor.editMappingDialog.title=Edit Mapping File
 MetadataTalendTypeEditor.error.message=Error Message
 MetadataTalendTypeEditor.fileIsImported=This file is already imported.
+MetadataTalendTypeEditor.fileOverwrite=This file already exists. Do you want to overwrite it?
 MetadataTalendTypeEditor.fileIsInvalid=The imported metadata file is not valid.
 MetadataTalendTypeEditor.fileNameStartRule=File name must start with 'mapping_'.
 ContextModeSelectPage.contextModes=Create a new context or reuse the existing one

main/plugins/org.talend.metadata.managment.ui/src/main/java/org/talend/metadata/managment/ui/editor/MetadataTalendTypeEditor.java

@@ -12,16 +12,23 @@
 // ============================================================================
 package org.talend.metadata.managment.ui.editor;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IStatus;
@@ -33,6 +40,7 @@ import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.preference.FieldEditor;
 import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
@@ -61,19 +69,16 @@ import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.osgi.framework.Bundle;
 import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.exception.LoginException;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.exception.SystemException;
 import org.talend.commons.utils.io.FilesUtils;
 import org.talend.commons.utils.workbench.resources.ResourceUtils;
-import org.talend.core.GlobalServiceRegister;
-import org.talend.core.ICoreService;
 import org.talend.core.model.metadata.Dbms;
 import org.talend.core.model.metadata.MetadataTalendType;
 import org.talend.core.model.utils.ResourceModelHelper;
 import org.talend.core.model.utils.XSDValidater;
 import org.talend.core.repository.model.ProxyRepositoryFactory;
-import org.talend.core.runtime.CoreRuntimePlugin;
-import org.talend.core.runtime.projectsetting.ProjectPreferenceManager;
 import org.talend.metadata.managment.ui.MetadataManagmentUiPlugin;
 import org.talend.metadata.managment.ui.dialog.MappingFileCheckViewerDialog;
 import org.talend.metadata.managment.ui.i18n.Messages;
@@ -131,6 +136,16 @@ public class MetadataTalendTypeEditor extends FieldEditor {
 
         IDocument fileContent;
 
+        FileType type;
+
+        boolean isDeleted;
+
+    }
+
+    enum FileType {
+        USER_DEFINED,
+        SYSTEM_DEFAULT,
+        USER_EXTERNAL,
     }
 
     /**
@@ -141,7 +156,7 @@ public class MetadataTalendTypeEditor extends FieldEditor {
      */
     class TmpFilesManager {
 
-        // store the editing tempertory files
+        // store the editing temporary files
         private List<FileInfo> tmpFiles = new ArrayList<FileInfo>();
 
         TmpFilesManager() {
@@ -149,13 +164,30 @@ public class MetadataTalendTypeEditor extends FieldEditor {
         }
 
         private void init() {
-            List<File> files = MetadataTalendType.getMetadataMappingFiles();
-            tmpFiles.clear();
-            for (File file : files) {
-                FileInfo info = new FileInfo();
-                info.file = file;
-                info.fileName = file.getName();
-                this.addFile(info);
+            try {
+                tmpFiles.clear();
+                java.nio.file.Path systemMappingPath = new File(MetadataTalendType.getSystemFolderURLOfMappingsFile().getFile())
+                        .toPath();
+                Map<String, File> systemFileMap = Stream
+                        .of(systemMappingPath.toFile()
+                                .listFiles(f -> f.getName().matches(MetadataTalendType.MAPPING_FILE_PATTERN)))
+                        .collect(Collectors.toMap(File::getName, Function.identity()));
+                List<File> files = MetadataTalendType.getMetadataMappingFiles();
+                for (File file : files) {
+                    FileInfo info = new FileInfo();
+                    info.file = file;
+                    info.fileName = file.getName();
+                    if (file.toPath().startsWith(systemMappingPath)) {
+                        info.type = FileType.SYSTEM_DEFAULT;
+                    } else if (systemFileMap.containsKey(file.getName())) {
+                        info.type = FileType.USER_DEFINED;
+                    } else {
+                        info.type = FileType.USER_EXTERNAL;
+                    }
+                    this.addFile(info);
+                }
+            } catch (SystemException e) {
+                ExceptionHandler.process(e);
             }
         }
 
@@ -163,8 +195,9 @@ public class MetadataTalendTypeEditor extends FieldEditor {
             tmpFiles.add(file);
         }
 
-        List<FileInfo> getTempFiles() {
-            return tmpFiles;
+        List<FileInfo> getTempFiles(boolean includeDeleted) {
+            return tmpFiles.stream().filter(f -> includeDeleted || !f.isDeleted || FileType.SYSTEM_DEFAULT == f.type)
+                    .sorted((f1, f2) -> f1.fileName.compareTo(f2.fileName)).collect(Collectors.toList());
         }
 
         boolean contains(String fileName) {
@@ -176,15 +209,6 @@ public class MetadataTalendTypeEditor extends FieldEditor {
             return false;
         }
 
-        boolean contains(File file) {
-            for (FileInfo info : tmpFiles) {
-                if (info.file.equals(file)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
         void remove(FileInfo file) {
             tmpFiles.remove(file);
         }
@@ -297,8 +321,29 @@ public class MetadataTalendTypeEditor extends FieldEditor {
             sourceViewerDialog.setDocument(fileSelected.file);
         }
         if (sourceViewerDialog.open() == IDialogConstants.OK_ID) {
-            System.out.println(sourceViewerDialog.getDocument().get());
-            fileSelected.fileContent = sourceViewerDialog.getDocument();
+            System.out.println(sourceViewerDialog.getResult());
+            try {
+                File systemFile = new File(MetadataTalendType.getSystemFolderURLOfMappingsFile().getFile(),
+                        fileSelected.fileName);
+                if (systemFile.exists()) {
+                    String currentSha1 = MetadataTalendType.getSha1OfText(sourceViewerDialog.getDocument().get());
+                    String systemSha1 = MetadataTalendType.getSha1OfFile(systemFile);
+                    if (currentSha1 != null && currentSha1.equals(systemSha1)) {
+                        fileSelected.type = FileType.SYSTEM_DEFAULT;
+                        fileSelected.file = systemFile;
+                        setControlEnable(removeButton, false);
+                    } else {
+                        fileSelected.type = FileType.USER_DEFINED;
+                        fileSelected.file = new File(MetadataTalendType.getProjectFolderURLOfMappingsFile().getFile(),
+                                fileSelected.fileName);
+                        setControlEnable(removeButton, true);
+                    }
+                }
+                fileSelected.fileContent = sourceViewerDialog.getDocument();
+                fileSelected.isDeleted = false;
+            } catch (SystemException e) {
+                ExceptionHandler.process(e);
+            }
         }
     }
 
@@ -382,7 +427,16 @@ public class MetadataTalendTypeEditor extends FieldEditor {
      */
     protected void removeItem() {
         FileInfo info = getSelection();
-        tmpFileManager.remove(info);
+        info.isDeleted = true;
+        if (FileType.USER_DEFINED == info.type) {
+            try {
+                info.type = FileType.SYSTEM_DEFAULT;
+                info.file = new File(MetadataTalendType.getSystemFolderURLOfMappingsFile().getFile(), info.fileName);
+                info.fileContent = null;
+            } catch (SystemException e) {
+                ExceptionHandler.process(e);
+            }
+        }
         refreshViewer();
     }
 
@@ -413,16 +467,21 @@ public class MetadataTalendTypeEditor extends FieldEditor {
     }
 
     private void exportItem() {
-        File existing = getSelection().file;
+        FileInfo selectedFileInfo = getSelection();
         FileDialog dia = new FileDialog(getShell(), SWT.SAVE);
-        dia.setFileName(existing.getName());
+        dia.setFileName(selectedFileInfo.fileName);
         dia.setFilterExtensions(new String[] { "*.xml" }); //$NON-NLS-1$
         String destination = dia.open();
         if (destination == null) {
             return;
         }
+        File destinationFile = new File(destination);
         try {
-            FilesUtils.copyFile(existing, new File(destination));
+            if (selectedFileInfo.fileContent != null) {
+                Files.write(destinationFile.toPath(), selectedFileInfo.fileContent.get().getBytes());
+            } else {
+                FilesUtils.copyFile(selectedFileInfo.file, destinationFile);
+            }
         } catch (Exception e) {
             ExceptionHandler.process(e);
         }
@@ -472,17 +531,39 @@ public class MetadataTalendTypeEditor extends FieldEditor {
     private void importItem() {
         setPresentsDefaultValue(false);
         File input = getNewInputObject();
-
         if (input != null) {
-            FileInfo fileInfo = new FileInfo();
-            fileInfo.file = input;
-            fileInfo.fileName = input.getName();
-            tmpFileManager.addFile(fileInfo);
+            Optional<FileInfo> optional = tmpFileManager.getTempFiles(true).stream()
+                    .filter(f -> f.fileName.equals(input.getName())).findAny();
+            if (optional.isPresent()) {
+                FileInfo tmpFileInfo = optional.get();
+                try {
+                    String content = new String(Files.readAllBytes(input.toPath()));
+                    if (FileType.SYSTEM_DEFAULT == tmpFileInfo.type) {
+                        String systemSha1 = MetadataTalendType.getSha1OfSystemMappingFile(tmpFileInfo.fileName);
+                        String inputSha1 = MetadataTalendType.getSha1OfText(content);
+                        if (inputSha1.equals(systemSha1)) {
+                            return;
+                        }
+                        tmpFileInfo.type = FileType.USER_DEFINED;
+                    }
+                    tmpFileInfo.fileContent = new Document(content);
+                    tmpFileInfo.isDeleted = false;
+                } catch (IOException e) {
+                    ExceptionHandler.process(e);
+                }
+            } else {
+                FileInfo fileInfo = new FileInfo();
+                fileInfo.file = input;
+                fileInfo.fileName = input.getName();
+                fileInfo.type = FileType.USER_EXTERNAL;
+                tmpFileManager.addFile(fileInfo);
+            }
             refreshViewer();
         }
     }
 
     private void refreshViewer() {
+        viewer.setInput(tmpFileManager.getTempFiles(false));
         viewer.refresh();
         selectionChanged();
     }
@@ -497,11 +578,11 @@ public class MetadataTalendTypeEditor extends FieldEditor {
         }
         File xmlFile = new File(fileName);
         if (tmpFileManager.contains(xmlFile.getName())) {
-            MessageDialog
-                    .openWarning(
+            boolean confirm = MessageDialog.openConfirm(
                             shell,
-                            Messages.getString("MetadataTalendTypeEditor.error.message"), Messages.getString("MetadataTalendTypeEditor.fileIsImported")); //$NON-NLS-1$ //$NON-NLS-2$
-            return null;
+                    Messages.getString("MetadataTalendTypeEditor.confirmTitle"), //$NON-NLS-1$
+                    Messages.getString("MetadataTalendTypeEditor.fileOverwrite")); //$NON-NLS-1$
+            return confirm ? xmlFile : null;
         }
 
         if (!xmlFile.getName().startsWith("mapping_")) { //$NON-NLS-1$
@@ -536,13 +617,21 @@ public class MetadataTalendTypeEditor extends FieldEditor {
         boolean selected = !viewer.getSelection().isEmpty();
         setControlEnable(exportButton, selected);
         setControlEnable(editButton, selected);
-        setControlEnable(removeButton, selected);
 
+        boolean removeEnable = selected;
         StructuredSelection select = (StructuredSelection) viewer.getSelection();
 
         if (select != null) {
             FileInfo info = (FileInfo) select.getFirstElement();
             if (info != null) {
+                String buttonText = null;
+                if (FileType.USER_DEFINED == info.type || FileType.SYSTEM_DEFAULT == info.type) {
+                    buttonText = Messages.getString("MetadataTalendTypeEditor.button.restore"); //$NON-NLS-1$
+                } else if (FileType.USER_EXTERNAL == info.type) {
+                    buttonText = JFaceResources.getString("ListEditor.remove"); //$NON-NLS-1$
+                }
+                removeButton.setText(buttonText);
+                removeEnable = FileType.SYSTEM_DEFAULT != info.type;
                 String id = null;
                 String infoName = info.fileName;
                 for (Dbms allDbm : allDbms) {
@@ -553,6 +642,7 @@ public class MetadataTalendTypeEditor extends FieldEditor {
                 setSelectId(id); 
             }
         }
+        setControlEnable(removeButton, removeEnable);
     }
 
     protected void setControlEnable(Control control, boolean enable) {
@@ -569,13 +659,31 @@ public class MetadataTalendTypeEditor extends FieldEditor {
                 Messages.getString("MetadataTalendTypeEditor.confirmTitle"), //$NON-NLS-1$
                 Messages.getString("MetadataTalendTypeEditor.confirmMessage")); //$NON-NLS-1$
         if (confirm) {
-            ICoreService coreService = null;
-            if (GlobalServiceRegister.getDefault().isServiceRegistered(ICoreService.class)) {
-                coreService = GlobalServiceRegister.getDefault().getService(ICoreService.class);
-                coreService.syncMappingsFileFromSystemToProject();
-                tmpFileManager.reload();
-            }
+            RepositoryWorkUnit workUnit = new RepositoryWorkUnit("Restore mapping files") { //$NON-NLS-1$
+
+                @Override
+                protected void run() throws LoginException, PersistenceException {
+                    try {
+                        File[] projectMappingFiles = new File(MetadataTalendType.getProjectFolderURLOfMappingsFile().getFile())
+                                .listFiles();
+                        if (projectMappingFiles != null) {
+                            Set<String> systemFileNames = Stream
+                                    .of(new File(MetadataTalendType.getSystemFolderURLOfMappingsFile().getFile())
+                                            .listFiles(f -> f.getName().matches(MetadataTalendType.MAPPING_FILE_PATTERN)))
+                                    .map(File::getName).collect(Collectors.toSet());
+                            Stream.of(projectMappingFiles).filter(f -> systemFileNames.contains(f.getName()))
+                                    .forEach(File::delete);
+                        }
+                    } catch (SystemException e) {
+                        ExceptionHandler.process(e);
+                    }
+                }
+            };
+            workUnit.setAvoidUnloadResources(true);
+            ProxyRepositoryFactory.getInstance().executeRepositoryWorkUnit(workUnit);
+            tmpFileManager.reload();
             super.load();
+            viewer.refresh();
         }
     }
 
@@ -586,7 +694,7 @@ public class MetadataTalendTypeEditor extends FieldEditor {
      */
     @Override
     protected void doLoad() {
-        viewer.setInput(tmpFileManager.getTempFiles());
+        viewer.setInput(tmpFileManager.getTempFiles(false));
     }
 
     /**
@@ -595,7 +703,7 @@ public class MetadataTalendTypeEditor extends FieldEditor {
      * DOC YeXiaowei Comment method "forceLoad".
      */
     public void forceLoad() {
-        viewer.setInput(tmpFileManager.getTempFiles());
+        viewer.setInput(tmpFileManager.getTempFiles(false));
     }
 
     /**
@@ -635,98 +743,44 @@ public class MetadataTalendTypeEditor extends FieldEditor {
         }
 
         boolean needReload = false;
-
-        List<FileInfo> tempFiles = tmpFileManager.getTempFiles();
-        List<File> realFiles = MetadataTalendType.getMetadataMappingFiles();
-
-        // delete the removed files
-        for (File file : realFiles) {
-            if (!tmpFileManager.contains(file.getName())) {
-                IFile iFile = mappingFolder.getFile(file.getName());
+        List<FileInfo> tmpFiles = tmpFileManager.getTempFiles(true);
+        for (FileInfo info : tmpFiles) {
+            IFile file = mappingFolder.getFile(info.fileName);
+            if (FileType.SYSTEM_DEFAULT == info.type || info.isDeleted) {
                 try {
-                    iFile.delete(true, null);
-                    needReload = true;
+                    if (file.exists()) {
+                        file.delete(true, null);
+                        needReload = true;
+                    }
                 } catch (CoreException e) {
                     ExceptionHandler.process(e);
                 }
+                continue;
             }
-        }
-
-        // add the new files;
-        for (FileInfo newFile : tempFiles) {
-            if (!realFiles.contains(newFile.file)) {
+            if (FileType.USER_DEFINED == info.type || FileType.USER_EXTERNAL == info.type) {
                 try {
-                    importFileIntoTalend(newFile.file);
+                    byte[] newContent = info.fileContent == null ? Files.readAllBytes(info.file.toPath())
+                            : info.fileContent.get().getBytes();
+                    InputStream inputStream = new ByteArrayInputStream(newContent);
+                    if (file.exists()) {
+                        file.setContents(inputStream, true, false, null);
+                    } else {
+                        if (!mappingFolder.exists()) {
+                            ResourceUtils.createFolder(mappingFolder);
+                        }
+                        file.create(inputStream, true, null);
+                    }
                     needReload = true;
                 } catch (Exception e) {
                     ExceptionHandler.process(e);
                 }
             }
         }
-
-        // for editing files
-        for (FileInfo tempFile : tempFiles) {
-            for (File realFile : realFiles) {
-                if (realFile.equals(tempFile.file)) {
-                    if (tempFile.fileContent != null) {
-                        try {
-                            updateFileContent(realFile, tempFile.fileContent.get());
-                            needReload = true;
-                            break;
-                        } catch (Exception e) {
-                            ExceptionHandler.process(e);
-                        }
-
-                    }
-                }
-            }
-        }
-        try {
-            mappingFolder.refreshLocal(IResource.DEPTH_ONE, null);
-        } catch (CoreException e) {
-            ExceptionHandler.process(e);
-        }
         if (needReload) {
             tmpFileManager.reload();
-            ProjectPreferenceManager manager = CoreRuntimePlugin.getInstance().getProjectPreferenceManager();
-            manager.setValue(MetadataTalendType.UPDATED_MAPPING_FILES, true);
-            manager.save();
         }
     }
 
-    /**
-     * bqian Comment method "updateFileContent".
-     *
-     * @param realFile
-     * @param string
-     */
-    private void updateFileContent(File realFile, String string) throws Exception {
-        FileWriter fw = null;
-        try {
-            fw = new FileWriter(realFile);
-            fw.write(string);
-            fw.flush();
-        } finally {
-            fw.close();
-        }
-    }
-
-    /**
-     * Import the selected file into talend.
-     *
-     * @param xmlFile
-     * @throws SystemException
-     */
-    private File importFileIntoTalend(File xmlFile) throws IOException, SystemException {
-        String fileName = xmlFile.getName();
-
-        URL url = MetadataTalendType.getProjectForderURLOfMappingsFile();
-        File targetFile = new File(url.getPath(), fileName);
-
-        FilesUtils.copyFile(xmlFile, targetFile);
-        return targetFile;
-    }
-
     /*
      * (non-Javadoc) Method declared on FieldEditor.
      */

main/plugins/org.talend.metadata.managment/plugin.xml

@@ -14,7 +14,7 @@
       <!-- Seems those 3 are not useful -->
       <classloader
             index="HIVE:HORTONWORKS:HDP_1_0:EMBEDDED"
-            libraries="hive-hbase-handler-0.9.0.jar;hbase-0.92.0.jar;hadoop-core-1.0.3.jar;commons-logging-1.0.4.jar;datanucleus-api-jdo-3.0.7.jar;datanucleus-core-3.0.9.jar;datanucleus-rdbms-3.0.8.jar;hive-builtins-0.9.0.jar;hive-exec-0.9.0_hdp.jar;hive-jdbc-0.9.0_hdp.jar;hive-metastore-0.9.0_hdp.jar;hive-service-0.9.0_hdp.jar;libfb303-0.7.0.jar;libthrift-0.7.0.jar;commons-lang-2.4.jar;antlr-runtime-3.0.1.jar;commons-dbcp-1.4.jar;commons-pool-1.5.4.jar;derby-10.4.2.0.jar;commons-configuration-1.6.jar;jdo2-api-2.3-ec.jar;reload4j-1.2.19.jar;slf4j-api-1.6.1.jar;slf4j-log4j12-1.6.1.jar;jackson-core-asl-1.8.8.jar;jackson-mapper-asl-1.8.8.jar">
+            libraries="hive-hbase-handler-0.9.0.jar;hbase-0.92.0.jar;hadoop-core-1.0.3.jar;commons-logging-1.0.4.jar;datanucleus-api-jdo-3.0.7.jar;datanucleus-core-3.0.9.jar;datanucleus-rdbms-3.0.8.jar;hive-builtins-0.9.0.jar;hive-exec-0.9.0_hdp.jar;hive-jdbc-0.9.0_hdp.jar;hive-metastore-0.9.0_hdp.jar;hive-service-0.9.0_hdp.jar;libfb303-0.7.0.jar;libthrift-0.7.0.jar;commons-lang-2.4.jar;antlr-runtime-3.0.1.jar;commons-dbcp-1.4.jar;commons-pool-1.5.4.jar;derby-10.4.2.0.jar;commons-configuration2-2.8.0.jar;jdo2-api-2.3-ec.jar;reload4j-1.2.19.jar;slf4j-api-1.6.1.jar;slf4j-log4j12-1.6.1.jar;jackson-core-asl-1.8.8.jar;jackson-mapper-asl-1.8.8.jar">
       </classloader>
       <classloader
             index="HIVE:CLOUDERA:Cloudera_CDH3:STANDALONE"
@@ -40,8 +40,8 @@
             context="PostgresPlus wizard"
             language="java"
             message="wizard for PostgresPlus"
-            mvn_uri="mvn:org.postgresql/postgresql/42.2.14"
-            name="postgresql-42.2.14.jar"
+            mvn_uri="mvn:org.postgresql/postgresql/42.2.25"
+            name="postgresql-42.2.25.jar"
             required="true">
       </libraryNeeded>
       <libraryNeeded

main/plugins/org.talend.metadata.managment/src/main/java/org/talend/core/model/metadata/builder/database/ExtractMetaDataUtils.java

@@ -1075,8 +1075,10 @@ public class ExtractMetaDataUtils {
                             }
                         }
                     } else {
-                        if (driverJarPathArg.startsWith(MavenUrlHelper.MVN_PROTOCOL)) {
-                            setDriverPath(librairesManagerService, jarPathList, driverJarPathArg);
+                        if (TalendQuoteUtils.removeQuotesIfExist(driverJarPathArg)
+                                .startsWith(MavenUrlHelper.MVN_PROTOCOL)) {
+                            setDriverPath(librairesManagerService, jarPathList,
+                                    TalendQuoteUtils.removeQuotesIfExist(driverJarPathArg));
                         } else {
                             String jarName = librairesManagerService.getJarNameFromMavenuri(driverJarPathArg);
                             if (jarName == null) {

main/plugins/org.talend.metadata.managment/src/main/java/org/talend/metadata/managment/connection/manager/ImpalaConnectionManager.java

@@ -12,6 +12,7 @@
 // ============================================================================
 package org.talend.metadata.managment.connection.manager;
 
+import java.security.PrivilegedExceptionAction;
 import java.sql.Connection;
 import java.sql.Driver;
 import java.sql.SQLException;
@@ -26,6 +27,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
+import org.talend.commons.exception.CommonExceptionHandler;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.classloader.ClassLoaderFactory;
 import org.talend.core.classloader.DynamicClassLoader;
@@ -58,37 +60,34 @@ public class ImpalaConnectionManager extends DataBaseConnectionManager {
         return manager;
     }
 
-    public void checkConnection(IMetadataConnection metadataConn) throws ClassNotFoundException, InstantiationException,
-            IllegalAccessException, SQLException {
+    public void checkConnection(IMetadataConnection metadataConn) throws ClassNotFoundException, InstantiationException, IllegalAccessException, SQLException {
         createConnection(metadataConn);
     }
 
-    public Connection createConnection(final IMetadataConnection metadataConn) throws ClassNotFoundException,
-            InstantiationException, IllegalAccessException, SQLException {
+    public Connection createConnection(final IMetadataConnection metadataConn) throws ClassNotFoundException, InstantiationException, IllegalAccessException, SQLException {
         FutureTask<Connection> futureTask = new FutureTask<Connection>(new Callable<Connection>() {
 
             @Override
             public Connection call() throws Exception {
                 Connection conn = null;
-                
+
                 if( !("".equals( metadataConn.getPassword() ) ||  "\"\"".equals( metadataConn.getPassword() )) ) {
                     String url = metadataConn.getUrl().replace(";auth=noSasl", "");
 
-                    
+
                     if (url.startsWith("jdbc:hive2") && !url.contains(";user=")) {
                         url = url + ";user=" + metadataConn.getUsername() + ";password=" + metadataConn.getPassword();
                     } else if (!url.contains(";AuthMech=3;UID=")) {
                         url = url + ";AuthMech=3;UID=" + metadataConn.getUsername() + ";PWD=" + metadataConn.getPassword();
                     }
-                    
+
                     metadataConn.setUrl(url);
                 }
-                
-                
+
                 String connURL = metadataConn.getUrl();
                 String username = metadataConn.getUsername();
-                String password = metadataConn.getPassword();                
-                
+                String password = metadataConn.getPassword();
+
                 // 1. Get class loader.
                 ClassLoader currClassLoader = Thread.currentThread().getContextClassLoader();
                 ClassLoader impalaClassLoader = getClassLoader(metadataConn);
@@ -98,35 +97,43 @@ public class ImpalaConnectionManager extends DataBaseConnectionManager {
                     String driverClass = EDatabase4DriverClassName.IMPALA.getDriverClass();
 
                     Map<String, Object> otherParametersMap = metadataConn.getOtherParameters();
+                    Object userGroupInformation = null;
+                    boolean useKerberos = false;
+                    boolean useKeytab = false;
                     if (otherParametersMap != null) {
-                        if (Boolean.valueOf((String) otherParametersMap.get(ConnParameterKeys.CONN_PARA_KEY_USE_KRB))) {
-                            if (Boolean.valueOf((String) metadataConn.getParameter(ConnParameterKeys.CONN_PARA_KEY_USEKEYTAB))) {
+
+                        // driver
+                        Object driverObj = otherParametersMap.get(ConnParameterKeys.IMPALA_DRIVER);
+                        String driverType = null;
+                        if (driverObj != null) {
+                            driverType = String.valueOf(driverObj);
+                        }
+
+                        useKerberos = Boolean.valueOf((String) otherParametersMap.get(ConnParameterKeys.CONN_PARA_KEY_USE_KRB));
+                        if (useKerberos) {
+                            // Set hadoop.security.authentication to Kerberos
+                            Object conf = Class.forName("org.apache.hadoop.conf.Configuration", true, impalaClassLoader) //$NON-NLS-1$
+                                    .newInstance();
+                            EHadoopConfProperties.AUTHENTICATION.set(conf, "KERBEROS"); //$NON-NLS-1$
+                            ReflectionUtils.invokeStaticMethod("org.apache.hadoop.security.UserGroupInformation", //$NON-NLS-1$
+                                    impalaClassLoader, "setConfiguration", new Object[] { conf }); //$NON-NLS-1$
+
+                            useKeytab = Boolean.valueOf((String) metadataConn.getParameter(ConnParameterKeys.CONN_PARA_KEY_USEKEYTAB));
+                            if (useKeytab) {
+                                // Login user using keytab
                                 String principal = (String) metadataConn
                                         .getParameter(ConnParameterKeys.CONN_PARA_KEY_KEYTAB_PRINCIPAL);
                                 String keytabPath = (String) metadataConn.getParameter(ConnParameterKeys.CONN_PARA_KEY_KEYTAB);
                                 try {
-                                    ReflectionUtils.invokeStaticMethod("org.apache.hadoop.security.UserGroupInformation", //$NON-NLS-1$
-                                            impalaClassLoader, "loginUserFromKeytab", new String[] { principal, keytabPath });
+                                    userGroupInformation = ReflectionUtils.invokeStaticMethod("org.apache.hadoop.security.UserGroupInformation", //$NON-NLS-1$
+                                            impalaClassLoader, "loginUserFromKeytabAndReturnUGI", new String[] { principal, keytabPath }); //$NON-NLS-1$
                                 } catch (Exception e) {
                                     throw new SQLException(e);
                                 }
-                            } else {
-                                Object conf = Class.forName("org.apache.hadoop.conf.Configuration", true, impalaClassLoader) //$NON-NLS-1$
-                                        .newInstance();
-                                EHadoopConfProperties.AUTHENTICATION.set(conf, "KERBEROS"); //$NON-NLS-1$
-                                ReflectionUtils.invokeStaticMethod("org.apache.hadoop.security.UserGroupInformation", //$NON-NLS-1$
-                                        impalaClassLoader, "setConfiguration", new Object[] { conf }); //$NON-NLS-1$
                             }
                         }
                         IHadoopDistributionService hadoopService = getHadoopDistributionService();
                         if ((hadoopService != null)) {
-                            // driver
-                            Object driverObj = otherParametersMap.get(ConnParameterKeys.IMPALA_DRIVER);
-                            String driverType = null;
-                            String impalaDriver = null;
-                            if (driverObj != null) {
-                                driverType = String.valueOf(driverObj);
-                            }
                             // distribution
                             Object distObj = otherParametersMap.get(ConnParameterKeys.CONN_PARA_KEY_IMPALA_DISTRIBUTION);
                             String distribution = null;
@@ -163,12 +170,25 @@ public class ImpalaConnectionManager extends DataBaseConnectionManager {
                     Properties info = new Properties();
                     username = username != null ? username : ""; //$NON-NLS-1$
                     password = password != null ? password : "";//$NON-NLS-1$
-                    
-                    
-//	                    info.setProperty("user", username);//$NON-NLS-1$
-//	                    info.setProperty("password", password);//$NON-NLS-1$
-                    
-                    conn = hiveDriver.connect(connURL, info);
+
+                    if (!useKeytab) {
+                        conn = hiveDriver.connect(connURL, info);
+                    } else {
+                        PrivilegedExceptionAction<Object> privilegedExceptionAction = new java.security.PrivilegedExceptionAction<Object>() {
+                            @Override
+                            public Object run() {
+                                java.sql.Connection con = null;
+
+                                try {
+                                    con = hiveDriver.connect(connURL, info);
+                                } catch (java.sql.SQLException e) {
+                                    CommonExceptionHandler.process(e);
+                                }
+                                return con;
+                            }
+                        };
+                        conn = (Connection) ReflectionUtils.invokeMethod(userGroupInformation, "doAs", new Object[] {privilegedExceptionAction}, PrivilegedExceptionAction.class ); //$NON-NLS-1$
+                    }
                 } finally {
                     Thread.currentThread().setContextClassLoader(currClassLoader);
                 }
@@ -240,7 +260,7 @@ public class ImpalaConnectionManager extends DataBaseConnectionManager {
 
     private IHadoopDistributionService getHadoopDistributionService() {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IHadoopDistributionService.class)) {
-            return (IHadoopDistributionService) GlobalServiceRegister.getDefault().getService(IHadoopDistributionService.class);
+            return GlobalServiceRegister.getDefault().getService(IHadoopDistributionService.class);
         }
         return null;
     }

main/plugins/org.talend.model/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <fixed facet="jst.java"/>
-  <fixed facet="jst.utility"/>
-  <installed facet="jst.utility" version="1.0"/>
-  <installed facet="jst.java" version="5.0"/>
-</faceted-project>

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

@@ -1006,7 +1006,7 @@ DatabaseForm.genaralJDBC.mappingFileAlert=Mapping File must be specified
 DatabaseForm.hc.link.none=None
 DatabaseForm.hc.link.repository=Repository
 DatabaseForm.hc.link.title=Hadoop Cluster
-DatabaseForm.helpInfo.installDriverLink.url=https://help.talend.com/pages/viewpage.action?pageId=14230347
+DatabaseForm.helpInfo.installDriverLink.url=https://document-link.us.cloud.talend.com/ts_ig_install-external-modules?version=73&lang=en&env=prd
 DatabaseForm.helpInfo.installDriverLink.label=How to install a driver
 DatabaseTableFilterForm.allSynonyms=All synonyms
 DatabaseTableFilterForm.edit=Edit...

main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/utils/UpdateTools.java

@@ -18,6 +18,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -253,8 +255,9 @@ public class UpdateTools {
             dropList.addAll(list);
         });
         // collect from drop.bundle.info
-        dropBundles.forEach((b, v) -> plugins.stream().filter(f -> f.getName().contains(b + "_" + v))
-                .forEach(f -> dropList.add(f.getAbsolutePath())));
+        dropBundles.forEach((b,vs) -> {
+            Arrays.asList(vs.split("\\|")).forEach(v -> plugins.stream().filter(f -> f.getName().contains(b + "_"+v)).forEach(f -> dropList.add(f.getAbsolutePath())));
+        });
         File dropFile = new File(pluginFolderFile, "droplist");
         if (!dropFile.exists()) {
             dropFile.createNewFile();
@@ -291,5 +294,4 @@ public class UpdateTools {
         }
         return !file.delete();
     }
-
 }

test/plugins/org.talend.core.runtime.test/src/org/talend/core/model/metadata/MetadataTalendTypeTest.java

@@ -1,19 +1,182 @@
 package org.talend.core.model.metadata;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.junit.Before;
 import org.junit.Test;
 import org.talend.commons.exception.SystemException;
+import org.talend.commons.utils.generation.JavaUtils;
+import org.talend.commons.utils.workbench.resources.ResourceUtils;
+import org.talend.core.runtime.process.ITalendProcessJavaProject;
+import org.talend.designer.runprocess.IRunProcessService;
 import org.talend.repository.ProjectManager;
+import org.talend.repository.model.RepositoryConstants;
 
 public class MetadataTalendTypeTest {
 
+    private ITalendProcessJavaProject talendProcessJavaProject;
+
+    @Before
+    public void setUp() throws Exception {
+        if (IRunProcessService.get() != null) {
+            IRunProcessService runProcessService = IRunProcessService.get();
+            talendProcessJavaProject = runProcessService.getTempJavaProject();
+        }
+    }
+
     @Test
     public void testGetProjectForderURLOfMappingsFile() throws SystemException {
-        URL url = MetadataTalendType.getProjectForderURLOfMappingsFile();
+        URL url = MetadataTalendType.getProjectFolderURLOfMappingsFile();
         String projectLabel = ProjectManager.getInstance().getCurrentProject().getTechnicalLabel();
-        assertTrue(url.getFile().endsWith(projectLabel + "/.settings/mappings/"));
+        assertTrue(StringUtils.removeEnd(url.getFile(), "/").endsWith(projectLabel + "/.settings/mappings"));
+    }
+
+    @Test
+    public void testRestoreMappingFiles() throws Exception {
+        IFolder projectMappingFolder = ResourceUtils.getProject(ProjectManager.getInstance().getCurrentProject())
+                .getFolder(MetadataTalendType.PROJECT_MAPPING_FOLDER);
+        if (!projectMappingFolder.exists()) {
+            projectMappingFolder.create(true, true, null);
+        }
+
+        MetadataTalendType.restoreMappingFiles();
+        IFile keep = null;
+        IFile restore = null;
+        IFile externalKeep = null;
+        try {
+            keep = projectMappingFolder.getFile("mapping_Access.xml");
+            if (keep.exists()) {
+                keep.delete(true, null);
+            }
+            keep.create(new ByteArrayInputStream("test1".getBytes()), true, null);
+            String keepSha1_before = MetadataTalendType.getSha1OfFile(keep.getLocation().toFile());
+
+            restore = projectMappingFolder.getFile("mapping_Firebird.xml");
+            if (restore.exists()) {
+                restore.delete(true, null);
+            }
+            restore.create(new ByteArrayInputStream(Files.readAllBytes(
+                    new File(MetadataTalendType.getSystemFolderURLOfMappingsFile().getFile(), restore.getName()).toPath())), true,
+                    null);
+
+            externalKeep = projectMappingFolder.getFile("mapping_ExternalTest.xml");
+            if (externalKeep.exists()) {
+                externalKeep.delete(true, null);
+            }
+            externalKeep.create(new ByteArrayInputStream("test2".getBytes()), true, null);
+            String externalKeepSha1_before = MetadataTalendType.getSha1OfFile(externalKeep.getLocation().toFile());
+
+            MetadataTalendType.restoreMappingFiles();
+
+            // kept
+            assertTrue(keep.getLocation().toFile().exists());
+            String keepSha1_after = MetadataTalendType.getSha1OfFile(keep.getLocation().toFile());
+            assertEquals(keepSha1_before, keepSha1_after);
+
+            // restored(migration)
+            assertFalse(restore.getLocation().toFile().exists());
+
+            // not impacted
+            assertTrue(externalKeep.getLocation().toFile().exists());
+            String externalKeepSha1_after = MetadataTalendType.getSha1OfFile(externalKeep.getLocation().toFile());
+            assertEquals(externalKeepSha1_before, externalKeepSha1_after);
+        } finally {
+            if (keep != null && keep.getLocation().toFile().exists()) {
+                keep.getLocation().toFile().delete();
+            }
+            if (restore != null && restore.getLocation().toFile().exists()) {
+                restore.getLocation().toFile().delete();
+            }
+            if (externalKeep != null && externalKeep.getLocation().toFile().exists()) {
+                externalKeep.getLocation().toFile().delete();
+            }
+            projectMappingFolder.refreshLocal(IResource.DEPTH_ONE, null);
+        }
+    }
+
+    @Test
+    public void testSyncMappingFilesToTempMappingFolder() throws Exception {
+        boolean renamed = false;
+        List<File> workingMappingFiles = MetadataTalendType.getWorkingMappingFiles();
+        IProject project = ResourceUtils.getProject(ProjectManager.getInstance().getCurrentProject());
+        IFolder tmpMappingFolder = ResourceUtils.getFolder(project,
+                RepositoryConstants.TEMP_DIRECTORY + "/" + MetadataTalendType.INTERNAL_MAPPINGS_FOLDER, false);
+
+        MetadataTalendType.getProjectTempMappingFolder();
+
+        modifyTargetFolder(tmpMappingFolder, renamed);
+
+        MetadataTalendType.getProjectTempMappingFolder();
+
+        List<File> tmpMappingFiles = Arrays.asList(tmpMappingFolder.getLocation().toFile()
+                .listFiles(f -> f.getName().matches(MetadataTalendType.MAPPING_FILE_PATTERN)));
+        validateConsistence(workingMappingFiles, tmpMappingFiles, renamed);
+    }
+
+    @Test
+    public void testSyncMappingFilesToJobProjectMappingFolder() throws Exception {
+        boolean renamed = true;
+
+        List<File> workingMappingFiles = MetadataTalendType.getWorkingMappingFiles();
+        IFolder jobProjectMappingFolder = talendProcessJavaProject.getResourceSubFolder(null, JavaUtils.JAVA_XML_MAPPING);
+
+        MetadataTalendType.syncMappingFiles(jobProjectMappingFolder.getLocation().toFile(), renamed);
+
+        modifyTargetFolder(jobProjectMappingFolder, renamed);
+
+        MetadataTalendType.syncMappingFiles(jobProjectMappingFolder.getLocation().toFile(), renamed);
+
+        List<File> jobMappingFiles = Arrays.asList(jobProjectMappingFolder.getLocation().toFile()
+                .listFiles(f -> f.getName().matches(MetadataTalendType.MAPPING_FILE_PATTERN)));
+        validateConsistence(workingMappingFiles, jobMappingFiles, renamed);
+    }
+
+    private void modifyTargetFolder(IFolder folder, boolean renamed) throws CoreException {
+        folder.refreshLocal(IResource.DEPTH_ONE, null);
+        String fileName1 = "mapping_Access.xml";
+        IFile file1 = folder.getFile(renamed ? fileName1.toLowerCase() : fileName1);
+        assertTrue(file1.getLocation().toFile().exists());
+        file1.delete(true, null);
+        String fileName2 = "mapping_AS400.xml";
+        IFile file2 = folder.getFile(renamed ? fileName2.toLowerCase() : fileName2);
+        assertTrue(file2.getLocation().toFile().exists());
+        String content = "test modification";
+        InputStream in = new ByteArrayInputStream(content.getBytes());
+        file2.setContents(in, true, false, null);
+    }
+
+    private void validateConsistence(List<File> sources, List<File> targets, boolean renamed) throws IOException {
+        assertEquals(sources.size(), targets.size());
+        for (File source : sources) {
+            boolean isFound = false;
+            String sourceSha1 = MetadataTalendType.getSha1OfFile(source);
+            String sourceFileName = MetadataTalendType.getTargetName(source, renamed);
+            for (File target : targets) {
+                if (target.getName().equals(sourceFileName)) {
+                    isFound = true;
+                    String targetSha1 = MetadataTalendType.getSha1OfFile(target);
+                    assertEquals(sourceSha1, targetSha1);
+                }
+            }
+            assertTrue(isFound);
+        }
     }
 
 }

test/plugins/org.talend.core.test/src/org/talend/core/CoreServiceTest.java

@@ -1,12 +1,9 @@
 package org.talend.core;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -15,38 +12,16 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.runtime.CoreException;
 import org.junit.Before;
-import org.junit.FixMethodOrder;
 import org.junit.Test;
-import org.junit.runners.MethodSorters;
-import org.talend.commons.runtime.xml.XmlUtil;
-import org.talend.commons.utils.generation.JavaUtils;
-import org.talend.commons.utils.workbench.resources.ResourceUtils;
-import org.talend.core.model.metadata.MetadataTalendType;
 import org.talend.core.runtime.process.ITalendProcessJavaProject;
 import org.talend.designer.runprocess.IRunProcessService;
-import org.talend.repository.ProjectManager;
-import org.talend.utils.io.FilesUtils;
 
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class CoreServiceTest {
     
-    private boolean withFilter = false;
-    
     private CoreService service;
 
     private ITalendProcessJavaProject talendProcessJavaProject;
 
-    private FilenameFilter filter = new FilenameFilter() {
-
-        @Override
-        public boolean accept(File dir, String name) {
-            if (XmlUtil.isXMLFile(name)) {
-                return true;
-            }
-            return false;
-        }
-    };
-
     @Before
     public void setUp() throws Exception {
         service = new CoreService();
@@ -54,45 +29,11 @@ public class CoreServiceTest {
             IRunProcessService runProcessService = (IRunProcessService) GlobalServiceRegister.getDefault()
                     .getService(IRunProcessService.class);
             talendProcessJavaProject = runProcessService.getTempJavaProject();
-            //TODO create a temp job code project
         }
     }
 
     @Test
-    public void testASyncMappingsFileFromSystemToProject() throws Exception {
-        withFilter = false;
-        
-        String sysMappingFolder = MetadataTalendType.getSystemForderURLOfMappingsFile().getPath();
-        IFolder projectMappingFolder = ResourceUtils.getProject(ProjectManager.getInstance().getCurrentProject())
-                .getFolder(MetadataTalendType.PROJECT_MAPPING_FOLDER);
-
-        service.syncMappingsFileFromSystemToProject();
-
-        modifyTargetFolder(projectMappingFolder);
-
-        service.syncMappingsFileFromSystemToProject();
-
-        validateConsistence(sysMappingFolder, projectMappingFolder.getLocation().toPortableString());
-    }
-
-    @Test
-    public void testBSynchronizeMapptingXML() throws Exception {
-        withFilter = true;
-        
-        IFolder resourceMappingFolder = talendProcessJavaProject.getResourceSubFolder(null, JavaUtils.JAVA_XML_MAPPING);
-        String projectMappingFolder = MetadataTalendType.getProjectForderURLOfMappingsFile().getPath();
-
-        service.synchronizeMapptingXML(talendProcessJavaProject);
-
-        modifyTargetFolder(resourceMappingFolder);
-
-        service.synchronizeMapptingXML(talendProcessJavaProject);
-
-        validateConsistence(projectMappingFolder, resourceMappingFolder.getLocation().toPortableString());
-    }
-
-    @Test
-    public void testCSyncLog4jSettings() throws CoreException, IOException {
+    public void testSyncLog4jSettings() throws CoreException, IOException {
         IRunProcessService runProcessService = null;
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IRunProcessService.class)) {
             runProcessService = (IRunProcessService) GlobalServiceRegister.getDefault().getService(IRunProcessService.class);
@@ -144,38 +85,4 @@ public class CoreServiceTest {
         return log4jStrFromResouce;
     }
 
-    private void modifyTargetFolder(IFolder folder) throws CoreException {
-        String fileName1 = "mapping_Access.xml";
-        IFile file1 = folder.getFile(withFilter? fileName1.toLowerCase() : fileName1);
-        assertTrue(file1.exists());
-        file1.delete(true, null);
-        String fileName2 = "mapping_AS400.xml";
-        IFile file2 = folder.getFile(withFilter? fileName2.toLowerCase() : fileName2);
-        assertTrue(file2.exists());
-        String content = "test modification";
-        InputStream in = new ByteArrayInputStream(content.getBytes());
-        file2.setContents(in, true, false, null);
-    }
-
-    private void validateConsistence(String folder1, String folder2) throws IOException {
-        File dir1 = new File(folder1);
-        File dir2 = new File(folder2);
-        File[] subFiles1 = withFilter ? dir1.listFiles(filter) : dir1.listFiles();
-        File[] subFiles2 = withFilter ? dir2.listFiles(filter) : dir2.listFiles();
-        assertTrue(subFiles1.length == subFiles2.length);
-        for (File subFile1 : subFiles1) {
-            boolean isFound = false;
-            long file1CRC = FilesUtils.getChecksumAlder32(subFile1);
-            String subFile1Name = withFilter ? service.getTargetName(subFile1) : subFile1.getName();
-            for (File subFile2 : subFiles2) {
-                if (subFile2.getName().equals(subFile1Name)) {
-                    isFound = true;
-                    long file2CRC = FilesUtils.getChecksumAlder32(subFile2);
-                    assertEquals(file1CRC, file2CRC);
-                }
-            }
-            assertTrue(isFound);
-        }
-    }
-
 }

test/plugins/org.talend.librariesmanager.test/src/routines/system/JSONObjectTest.java

@@ -24,10 +24,23 @@ public class JSONObjectTest extends TestCase {
 		}
 	}
 	
+	public class EvilBean {
+		public int id;
+		
+		public int getId() {
+			//do something evil
+			return this.id;
+		}
+		
+		public EvilBean(int id) {
+			this.id = id;
+		}
+	}
+	
 	@Test
 	public void test() throws JSONException {
 		Bean bean = new Bean(1,"wangwei");
-		JSONObject object = new JSONObject(bean);
+		JSONObject object = new JSONObject(bean, Bean.class);
 		
 		assertEquals(false, object.isNull("id"));
 		assertEquals(1, object.get("id"));
@@ -36,4 +49,15 @@ public class JSONObjectTest extends TestCase {
 		assertEquals(false, object.isNull("Name"));
 		assertEquals("wangwei", object.get("Name"));
 	}
+
+	@Test
+	public void testScriptInject() {
+		EvilBean evil = new EvilBean(1);
+		try {
+			new JSONObject(evil, Bean.class);
+			fail();
+		} catch(JSONException e) {
+		}
+	}
+	
 }

test/plugins/org.talend.updates.runtime.test/src/org/talend/updates/runtime/utils/UpdateToolsTest.java

@@ -56,7 +56,9 @@ public class UpdateToolsTest {
 
         String _3rdBundleNameA = "third.party.a";
         String _3rdBundleNameB = "third.party.b";
+        String _3rdBundleNameC = "third.party.c";
         String old3rdVersion = "7.3.1.20180101_0000";
+        String old3rdVersion2 = "7.3.1.20190101_0000";
         String new3rdVersion = "7.3.1.20190701_2222";
 
         Set<IInstallableUnit> validInstall = new HashSet<>();
@@ -68,17 +70,20 @@ public class UpdateToolsTest {
         // new third-party patch bundle
         validInstall.add(createIU(_3rdBundleNameA, Version.create(new3rdVersion), false));
         validInstall.add(createIU(_3rdBundleNameB, Version.create(new3rdVersion), false));
+        validInstall.add(createIU(_3rdBundleNameC, Version.create(new3rdVersion), false));
 
         // bundles defined in new_feature.index
         Map<String, String> extraBundles = new HashMap<>();
         extraBundles.put("org.talend.new.c", "");
         extraBundles.put("third.party.a", new3rdVersion);
         extraBundles.put("third.party.b", new3rdVersion);
+        extraBundles.put("third.party.c", new3rdVersion);
 
         // drop bundles defined in new_feature.index
         Map<String, String> dropBundleInfo = new HashMap<>();
         dropBundleInfo.put(_3rdBundleNameA, old3rdVersion);
         dropBundleInfo.put(_3rdBundleNameB, old3rdVersion);
+        dropBundleInfo.put(_3rdBundleNameC, old3rdVersion+"|"+old3rdVersion2);
 
         // create test plugins
         createFile(talendBundleNameA, oldTalendVersion, false);
@@ -87,6 +92,9 @@ public class UpdateToolsTest {
         createFile(_3rdBundleNameA, new3rdVersion, false);
         createFile(_3rdBundleNameB, old3rdVersion, false);
         createFile(_3rdBundleNameB, new3rdVersion, false);
+        createFile(_3rdBundleNameC, old3rdVersion, false);
+        createFile(_3rdBundleNameC, old3rdVersion2, false);
+        createFile(_3rdBundleNameC, new3rdVersion, false);
 
         File pluginFolder = UpdateTools.getProductRootFolder().toPath().resolve("plugins").toFile();
         File dropFile = new File(pluginFolder, "droplist");
@@ -96,6 +104,8 @@ public class UpdateToolsTest {
         pluginsToDrop.add(new File(pluginFolder, talendBundleNameB + "_" + oldTalendVersion));
         pluginsToDrop.add(new File(pluginFolder, _3rdBundleNameA + "_" + old3rdVersion + ".jar"));
         pluginsToDrop.add(new File(pluginFolder, _3rdBundleNameB + "_" + old3rdVersion + ".jar"));
+        pluginsToDrop.add(new File(pluginFolder, _3rdBundleNameC + "_" + old3rdVersion + ".jar"));
+        pluginsToDrop.add(new File(pluginFolder, _3rdBundleNameC + "_" + old3rdVersion2 + ".jar"));
 
         UpdateTools.collectDropBundles(validInstall, extraBundles, dropBundleInfo);