chore(TUP-35979)Adjust nimbus-jose-jwt-9.3.jar to (#5415)

nimbus-jose-jwt-9.22.jar

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/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/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/designer/runprocess/ProcessorUtilities.java

@@ -706,6 +706,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 +723,7 @@ public class ProcessorUtilities {
          */
         generateBuildInfo(jobInfo, progressMonitor, isMainJob, currentProcess, currentJobName, processor, option);
 
-        handelDQComponents(selectedProcessItem, currentProcess);
+        checkNeedExportItemsForDQ(currentProcess);
 
         copyDependenciedResources(currentProcess, progressMonitor);
 
@@ -1251,6 +1253,8 @@ public class ProcessorUtilities {
 
             processor.setArguments(argumentsMap);
 
+            handelDQComponents(selectedProcessItem, currentProcess);
+
             generateContextInfo(jobInfo, selectedContextName, statistics, trace, needContext, progressMonitor,
                     currentProcess, currentJobName, processor, isMainJob, codeGenerationNeeded);
 
@@ -1266,7 +1270,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 +1359,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 +1401,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/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/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/plugin.xml

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