fix(TUP-35541): replace log4j1 by reload4j (#5292 )

2022-05-13 10:38:44 +08:00
28 changed files with 189 additions and 240 deletions
--- a/i18n/plugins/org.talend.librariesmanager.ui.nl/src/main/java/messages_en.properties
+++ b/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://document-link.us.cloud.talend.com/ts_ig_install-external-modules?version=73&lang=en&env=prd
+download.external.dialog.help.url=https://help.talend.com/display/KB/How+to+install+external+modules+in+the+Talend+products
 AcceptModuleLicensesWizard.title=Download external modules
 AcceptModuleLicensesWizardDialog.button.acceptAll=Accept all
 AcceptModuleLicensesWizardDialog.cancelConfirmation.title=Confirmation
--- a/i18n/plugins/org.talend.repository.metadata.nl/src/main/java/org/talend/repository/metadata/i18n/messages_en.properties
+++ b/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://document-link.us.cloud.talend.com/ts_ig_install-external-modules?version=73&lang=en&env=prd
+DatabaseForm.helpInfo.installDriverLink.url=https://help.talend.com/pages/viewpage.action?pageId=14230347
 DatabaseForm.helpInfo.installDriverLink.label=How to install a driver
 SelectorTableForm.toolTip=Not available with this database
 FileStep1.modeButText=Read excel2007 file format(xlsx)
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ILibraryManagerService.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ILibraryManagerService.java
@@ -21,7 +21,6 @@ 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;
@@ -110,8 +109,6 @@ 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
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/version/EDatabaseVersion4Drivers.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/version/EDatabaseVersion4Drivers.java
@@ -107,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.25.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.14.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    PSQL_PRIOR_TO_V9(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "Prior to v9", "PRIOR_TO_V9", "postgresql-8.4-703.jdbc4.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

    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.25.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$
    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$
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/general/RetrieveResult.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/general/RetrieveResult.java
@@ -1,42 +0,0 @@
-// ============================================================================
-//
-// 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;
-    }
-
-}
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/runprocess/IRunProcessService.java
+++ b/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 boolean updateLibraries(Item routineItem);
+    public void updateLibraries(Item routineItem);

    public void refreshView();

--- a/main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/ContextNebulaGridComposite.java
+++ b/main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/ContextNebulaGridComposite.java
@@ -636,7 +636,6 @@ public class ContextNebulaGridComposite extends AbstractContextTabEditComposite
            visibleItemCount = 20;
        }
        contextsCombo.setVisibleItemCount(visibleItemCount);
-        contextsCombo.getParent().getParent().pack();
    }

    private void checkContextGroupSource() {
--- a/main/plugins/org.talend.designer.maven.tos/resources/tacokit/pom.xml
+++ b/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.10</tacokit.components.version>
+		<tacokit.components.version>1.27.8</tacokit.components.version>
 	</properties>
 	<repositories>
 		<repository>
--- a/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/AggregatorPomsHelper.java
+++ b/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/AggregatorPomsHelper.java
@@ -214,36 +214,31 @@ public class AggregatorPomsHelper {

            @Override
            protected void run() {
+                Project currentProject = ProjectManager.getInstance().getCurrentProject();
                try {
                    for (ERepositoryObjectType codeType : ERepositoryObjectType.getAllTypesOfCodes()) {
-                        updateCodeProject(monitor, codeType, forceBuild, ignoreM2Cache, buildIfNoUpdate);
+                        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);
+                        }
                    }
                } 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) {
--- a/main/plugins/org.talend.libraries.apache.cxf/.classpath
+++ b/main/plugins/org.talend.libraries.apache.cxf/.classpath
@@ -1,37 +1,35 @@
 <?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"/>
--- a/main/plugins/org.talend.libraries.apache.cxf/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.libraries.apache.cxf/META-INF/MANIFEST.MF
@@ -5,39 +5,66 @@ 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/txw2-2.3.4.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/xmlschema-core-2.2.5.jar,
- lib/woodstox-core-6.2.6.jar,
- lib/wsdl4j-1.6.3.jar
-Export-Package: javax.jws,
+ 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,
 javax.ws.rs,
 javax.ws.rs.client,
 javax.ws.rs.container,
@@ -49,15 +76,6 @@ Export-Package: javax.jws,
 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,
@@ -174,6 +192,7 @@ Export-Package: javax.jws,
 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,
--- a/main/plugins/org.talend.libraries.apache.cxf/pom.xml
+++ b/main/plugins/org.talend.libraries.apache.cxf/pom.xml
@@ -10,10 +10,6 @@
  <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>
@@ -25,88 +21,83 @@
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-core</artifactId>
-			<version>${cxf.version}</version>
+			<version>3.3.10</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-bindings-xml</artifactId>
-			<version>${cxf.version}</version>
+			<version>3.3.10</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-frontend-jaxrs</artifactId>
-			<version>${cxf.version}</version>
+			<version>3.3.10</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-rs-client</artifactId>
-			<version>${cxf.version}</version>
+			<version>3.3.10</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-transports-http</artifactId>
-			<version>${cxf.version}</version>
+			<version>3.3.10</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-wsdl</artifactId>
-			<version>${cxf.version}</version>
+			<version>3.3.10</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-bindings-soap</artifactId>
-			<version>${cxf.version}</version>
+			<version>3.3.10</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-databinding-jaxb</artifactId>
-			<version>${cxf.version}</version>
+			<version>3.3.10</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-features-clustering</artifactId>
-			<version>${cxf.version}</version>
+			<version>3.3.10</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-frontend-jaxws</artifactId>
-			<version>${cxf.version}</version>
+			<version>3.3.10</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-frontend-simple</artifactId>
-			<version>${cxf.version}</version>
+			<version>3.3.10</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-security</artifactId>
-			<version>${cxf.version}</version>
+			<version>3.3.10</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-security-saml</artifactId>
-			<version>${cxf.version}</version>
+			<version>3.3.10</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-ws-addr</artifactId>
-			<version>${cxf.version}</version>
+			<version>3.3.10</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-ws-policy</artifactId>
-			<version>${cxf.version}</version>
+			<version>3.3.10</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-ws-security</artifactId>
-			<version>${cxf.version}</version>
+			<version>3.3.10</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>
@@ -117,40 +108,15 @@
 			<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.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>
+			<groupId>jakarta.annotation</groupId>
+			<artifactId>jakarta.annotation-api</artifactId>
+			<version>1.3.5</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.neethi</groupId>
@@ -162,15 +128,15 @@
 			<artifactId>stax2-api</artifactId>
 			<version>4.2.1</version>
 		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jaxb</groupId>
-			<artifactId>txw2</artifactId>
-			<version>2.3.4</version>
-		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.woodstox</groupId>
 			<artifactId>woodstox-core</artifactId>
-			<version>6.2.6</version>
+			<version>6.2.1</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.ws.rs</groupId>
+			<artifactId>javax.ws.rs-api</artifactId>
+			<version>2.0-m10</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.ws.xmlschema</groupId>
@@ -178,9 +144,29 @@
 			<version>2.2.5</version>
 		</dependency>
 		<dependency>
-		  	<groupId>wsdl4j</groupId>
-		  	<artifactId>wsdl4j</artifactId>
-		  	<version>1.6.3</version>
+			<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>
 		</dependency>
 	</dependencies>
  <build>
@@ -208,7 +194,6 @@
 							<goal>copy-dependencies</goal>
 						</goals>
 						<configuration>
-							<includeScope>runtime</includeScope>
 							<excludeTypes>pom</excludeTypes>
 							<excludeTransitive>true</excludeTransitive>
 							<outputDirectory>${project.basedir}/lib</outputDirectory>
--- a/main/plugins/org.talend.libraries.apache.xml/.classpath
+++ b/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-3.1.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.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"/>
--- a/main/plugins/org.talend.libraries.apache.xml/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.libraries.apache.xml/META-INF/MANIFEST.MF
@@ -22,6 +22,9 @@ 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,
@@ -48,6 +51,8 @@ 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,
--- a/main/plugins/org.talend.libraries.apache.xml/lib/.gitignore
+++ b/main/plugins/org.talend.libraries.apache.xml/lib/.gitignore
@@ -1,3 +1,4 @@
 xmlschema-core-2.0.1.jar
-xmlbeans-3.1.0.jar
+xmlbeans-2.3.0.jar
+xmlbeans-2.6.0.jar
 xercesImpl-2.12.0.jar
--- a/main/plugins/org.talend.libraries.apache.xml/pom.xml
+++ b/main/plugins/org.talend.libraries.apache.xml/pom.xml
@@ -26,6 +26,16 @@
 						<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>
--- a/main/plugins/org.talend.libraries.apache/.classpath
+++ b/main/plugins/org.talend.libraries.apache/.classpath
@@ -1,6 +1,5 @@
 <?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"/>
@@ -8,5 +7,6 @@
 	<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>
--- a/main/plugins/org.talend.libraries.apache/META-INF/MANIFEST.MF
+++ b/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/xml-apis.jar,
- lib/xmlbeans-3.1.0.jar
+ lib/xmlbeans-2.3.0.jar,
+ lib/xml-apis.jar
 Bundle-Vendor: .Talend SA.
 Require-Bundle: org.apache.log4j;resolution:=optional,
 org.talend.libraries.apache.common;visibility:=reexport,
@@ -63,6 +63,9 @@ 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,
--- a/main/plugins/org.talend.libraries.apache/build.properties
+++ b/main/plugins/org.talend.libraries.apache/build.properties
@@ -3,8 +3,7 @@ bin.includes = META-INF/,\
               .,\
               licences/,\
               lib/,\
-               lib/xml-apis.jar,\
-               lib/xmlbeans-3.1.0.jar
+               lib/xml-apis.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,\
--- a/main/plugins/org.talend.libraries.apache/lib/xmlbeans-2.3.0.jar
+++ b/main/plugins/org.talend.libraries.apache/lib/xmlbeans-2.3.0.jar
--- a/main/plugins/org.talend.libraries.apache/pom.xml
+++ b/main/plugins/org.talend.libraries.apache/pom.xml
@@ -76,11 +76,6 @@
 			<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>
@@ -99,7 +94,7 @@
 							<excludeTypes>pom</excludeTypes>
 							<excludeTransitive>true</excludeTransitive>
 							<outputDirectory>${project.basedir}/lib</outputDirectory>
-							<includeGroupIds>ch.qos.reload4j,org.slf4j,org.apache.xmlbeans,org.apache.logging.log4j</includeGroupIds>
+							<includeGroupIds>ch.qos.reload4j,org.slf4j,org.apache.logging.log4j</includeGroupIds>
 						</configuration>
 					</execution>
 				</executions>
--- a/main/plugins/org.talend.librariesmanager.ui/src/main/java/messages.properties
+++ b/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://document-link.us.cloud.talend.com/ts_ig_install-external-modules?version=73&lang=en&env=prd
+download.external.dialog.help.url=https://help.talend.com/display/KB/How+to+install+external+modules+in+the+Talend+products
 download.external.dialog.warning=Warning
 download.external.dialog.message=Select at least one module not installed.
 Module.view.sharelibsAction.title=Share libraries
--- a/main/plugins/org.talend.librariesmanager/src/main/java/org/talend/librariesmanager/model/service/LocalLibraryManager.java
+++ b/main/plugins/org.talend.librariesmanager/src/main/java/org/talend/librariesmanager/model/service/LocalLibraryManager.java
@@ -64,7 +64,6 @@ 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;
@@ -703,15 +702,8 @@ 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 result;
+            return false;
        }
        Set<ModuleNeeded> jarNotFound = new HashSet<>();
        boolean allIsOK = true;
@@ -734,10 +726,8 @@ 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) {
@@ -754,8 +744,8 @@ public class LocalLibraryManager implements ILibraryManagerService, IChangedLibr
                }
            }
        }
-        result.setAllResolved(allIsOK);
-        return result;
+
+        return allIsOK;
    }

    @Override
--- a/main/plugins/org.talend.metadata.managment/plugin.xml
+++ b/main/plugins/org.talend.metadata.managment/plugin.xml
@@ -40,8 +40,8 @@
            context="PostgresPlus wizard"
            language="java"
            message="wizard for PostgresPlus"
-            mvn_uri="mvn:org.postgresql/postgresql/42.2.25"
-            name="postgresql-42.2.25.jar"
+            mvn_uri="mvn:org.postgresql/postgresql/42.2.14"
+            name="postgresql-42.2.14.jar"
            required="true">
      </libraryNeeded>
      <libraryNeeded
--- a/main/plugins/org.talend.model/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/main/plugins/org.talend.model/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,7 @@
+<?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>
--- a/main/plugins/org.talend.repository.metadata/src/main/java/org/talend/repository/metadata/i18n/messages.properties
+++ b/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://document-link.us.cloud.talend.com/ts_ig_install-external-modules?version=73&lang=en&env=prd
+DatabaseForm.helpInfo.installDriverLink.url=https://help.talend.com/pages/viewpage.action?pageId=14230347
 DatabaseForm.helpInfo.installDriverLink.label=How to install a driver
 DatabaseTableFilterForm.allSynonyms=All synonyms
 DatabaseTableFilterForm.edit=Edit...
--- a/main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/utils/UpdateTools.java
+++ b/main/plugins/org.talend.updates.runtime/src/main/java/org/talend/updates/runtime/utils/UpdateTools.java
@@ -18,8 +18,6 @@ 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;
@@ -255,9 +253,8 @@ public class UpdateTools {
            dropList.addAll(list);
        });
        // collect from drop.bundle.info
-        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())));
-        });
+        dropBundles.forEach((b, 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();
@@ -294,4 +291,5 @@ public class UpdateTools {
        }
        return !file.delete();
    }
+
 }
--- a/test/plugins/org.talend.updates.runtime.test/src/org/talend/updates/runtime/utils/UpdateToolsTest.java
+++ b/test/plugins/org.talend.updates.runtime.test/src/org/talend/updates/runtime/utils/UpdateToolsTest.java
@@ -56,9 +56,7 @@ 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<>();
@@ -70,20 +68,17 @@ 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);
@@ -92,9 +87,6 @@ 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");
@@ -104,8 +96,6 @@ 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);