fix(TUP-37016):CVE-2022-41853, upgrade org.hsqldb:hsqldb:2.3.1 to 2.7.1. (#5766)

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

@@ -16,7 +16,6 @@ import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.util.Collection;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -155,8 +154,6 @@ public interface ILibraryManagerService extends IService {
     public boolean contains(String jarName);
 
     public void clearCache();
-    
-    public void deployLibsFromCustomComponents(File componentFolder, List<ModuleNeeded> modulesNeeded);
 
     @Deprecated
     public Set<String> list(boolean withComponent, IProgressMonitor... monitorWrap);

main/plugins/org.talend.designer.maven.aether/src/main/java/org/talend/designer/maven/aether/RepositorySystemFactory.java

@@ -46,8 +46,6 @@ import org.talend.designer.maven.aether.util.TalendAetherProxySelector;
  */
 public class RepositorySystemFactory {
 
-    private static Boolean ignoreArtifactDescriptorRepositories;
-
     private static Map<LocalRepository, DefaultRepositorySystemSession> sessions = new HashMap<LocalRepository, DefaultRepositorySystemSession>();
 
     private static DefaultRepositorySystemSession newRepositorySystemSession(String localRepositoryPath)
@@ -63,8 +61,6 @@ public class RepositorySystemFactory {
             repositorySystemSession.setTransferListener(new ChainedTransferListener());
             repositorySystemSession.setRepositoryListener(new ChainedRepositoryListener());
             repositorySystemSession.setProxySelector(new TalendAetherProxySelector());
-            repositorySystemSession.setIgnoreArtifactDescriptorRepositories(
-                    RepositorySystemFactory.isIgnoreArtifactDescriptorRepositories());
             sessions.put(localRepo, repositorySystemSession);
         }
 
@@ -161,13 +157,4 @@ public class RepositorySystemFactory {
         doDeploy(content, pomFile, localRepository, repositoryId, repositoryUrl, userName, password, groupId, artifactId,
                 classifier, extension, version);
     }
-
-    public static boolean isIgnoreArtifactDescriptorRepositories() {
-        if (ignoreArtifactDescriptorRepositories == null) {
-            ignoreArtifactDescriptorRepositories = Boolean.valueOf(
-                    System.getProperty("talend.studio.aether.ignoreArtifactDescriptorRepositories", Boolean.TRUE.toString()));
-        }
-        return ignoreArtifactDescriptorRepositories;
-    }
-
 }

main/plugins/org.talend.designer.maven.aether/src/main/java/org/talend/designer/maven/aether/util/DynamicDistributionAetherUtils.java

@@ -63,7 +63,6 @@ import org.eclipse.m2e.core.MavenPlugin;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.designer.maven.aether.DummyDynamicMonitor;
 import org.talend.designer.maven.aether.IDynamicMonitor;
-import org.talend.designer.maven.aether.RepositorySystemFactory;
 import org.talend.designer.maven.aether.node.DependencyNode;
 import org.talend.designer.maven.aether.node.ExclusionNode;
 import org.talend.designer.maven.aether.selector.DynamicDependencySelector;
@@ -514,7 +513,6 @@ public class DynamicDistributionAetherUtils {
         LocalRepository localRepo = new LocalRepository(repositoryPath);
         session.setLocalRepositoryManager(system.newLocalRepositoryManager(session, localRepo));
         session.setProxySelector(new TalendAetherProxySelector());
-        session.setIgnoreArtifactDescriptorRepositories(RepositorySystemFactory.isIgnoreArtifactDescriptorRepositories());
 
         updateDependencySelector(session, monitor);
 

main/plugins/org.talend.designer.maven.aether/src/main/java/org/talend/designer/maven/aether/util/MavenLibraryResolverProvider.java

@@ -34,6 +34,7 @@ import org.codehaus.plexus.PlexusContainerException;
 import org.eclipse.aether.DefaultRepositorySystemSession;
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
 import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory;
 import org.eclipse.aether.impl.DefaultServiceLocator;
@@ -56,7 +57,6 @@ import org.talend.core.nexus.ArtifactRepositoryBean;
 import org.talend.core.nexus.NexusConstants;
 import org.talend.core.nexus.TalendLibsServerManager;
 import org.talend.core.runtime.maven.MavenArtifact;
-import org.talend.designer.maven.aether.RepositorySystemFactory;
 
 public class MavenLibraryResolverProvider {
 
@@ -283,9 +283,8 @@ public class MavenLibraryResolverProvider {
         LocalRepository localRepo = new LocalRepository( /* "target/local-repo" */target);
         session.setLocalRepositoryManager(system.newLocalRepositoryManager(session, localRepo));
         session.setProxySelector(new TalendAetherProxySelector());
-        session.setIgnoreArtifactDescriptorRepositories(RepositorySystemFactory.isIgnoreArtifactDescriptorRepositories());
 
-        return session; 
+        return session;
     }
 
     private String getLocalMVNRepository() {

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

@@ -139,15 +139,10 @@
 			<version>1.21</version>
 		</dependency>
 		<dependency>
-			<groupId>org.apache-extras.beanshell</groupId>
-			<artifactId>bsh</artifactId>
-			<version>2.0b6</version>
-		</dependency>
-		 <dependency>
-			<groupId>org.jboss.marshalling</groupId>
-			<artifactId>jboss-marshalling</artifactId>
-			<version>2.0.12.Final</version>
-		</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.18</tacokit.components.version>
+		<tacokit.components.version>1.27.15</tacokit.components.version>
 	</properties>
 	<repositories>
 		<repository>

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

@@ -11,7 +11,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <tcomp.version>1.38.8</tcomp.version>
+        <tcomp.version>1.38.6</tcomp.version>
         <slf4j.version>1.7.32</slf4j.version>
         <log4j2.version>2.17.1</log4j2.version>
         <reload4j.version>1.2.19</reload4j.version>

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

@@ -6,23 +6,23 @@
 	<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.4.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-core-3.5.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-bindings-soap-3.5.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-bindings-xml-3.5.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-databinding-jaxb-3.5.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-features-clustering-3.5.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-frontend-jaxrs-3.5.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-frontend-jaxws-3.5.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-frontend-simple-3.5.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-rs-client-3.5.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-security-3.5.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-security-saml-3.5.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-transports-http-3.5.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-ws-addr-3.5.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-wsdl-3.5.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-ws-policy-3.5.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-ws-security-3.5.5.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/jakarta.activation-api-1.2.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jakarta.annotation-api-1.3.5.jar"/>

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

@@ -5,22 +5,22 @@ Bundle-SymbolicName: org.talend.libraries.apache.cxf;singleton:=true
 Bundle-Version: 7.3.1.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
- lib/cxf-core-3.5.5.jar,
- lib/cxf-rt-bindings-soap-3.5.5.jar,
- lib/cxf-rt-bindings-xml-3.5.5.jar,
- lib/cxf-rt-databinding-jaxb-3.5.5.jar,
- lib/cxf-rt-features-clustering-3.5.5.jar,
- lib/cxf-rt-frontend-jaxrs-3.5.5.jar,
- lib/cxf-rt-frontend-jaxws-3.5.5.jar,
- lib/cxf-rt-frontend-simple-3.5.5.jar,
- lib/cxf-rt-rs-client-3.5.5.jar,
- lib/cxf-rt-security-3.5.5.jar,
- lib/cxf-rt-security-saml-3.5.5.jar,
- lib/cxf-rt-transports-http-3.5.5.jar,
- lib/cxf-rt-ws-addr-3.5.5.jar,
- lib/cxf-rt-wsdl-3.5.5.jar,
- lib/cxf-rt-ws-security-3.5.5.jar,
- lib/cxf-rt-ws-policy-3.5.5.jar,
+ 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,
@@ -35,7 +35,7 @@ Bundle-ClassPath: .,
  lib/stax2-api-4.2.1.jar,
  lib/txw2-2.3.4.jar,
  lib/xmlschema-core-2.2.5.jar,
- lib/woodstox-core-6.4.0.jar,
+ lib/woodstox-core-6.2.6.jar,
  lib/wsdl4j-1.6.3.jar
 Export-Package: javax.jws,
  javax.ws.rs,

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

@@ -11,7 +11,7 @@
   <packaging>eclipse-plugin</packaging>
   
   <properties>
-    <cxf.version>3.5.5</cxf.version>
+    <cxf.version>3.4.7</cxf.version>
   </properties>
   
   <repositories>
@@ -170,7 +170,7 @@
 		<dependency>
 			<groupId>com.fasterxml.woodstox</groupId>
 			<artifactId>woodstox-core</artifactId>
-			<version>6.4.0</version>
+			<version>6.2.6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.ws.xmlschema</groupId>

main/plugins/org.talend.libraries.persist.lookup/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/advancedPersistentLookupLib-1.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/advancedPersistentLookupLib-1.2.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.persist.lookup/META-INF/MANIFEST.MF

@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.libraries.persist.lookup
 Bundle-SymbolicName: org.talend.libraries.persist.lookup
 Bundle-Version: 7.3.1.qualifier
-Bundle-ClassPath: .,
- lib/advancedPersistentLookupLib-1.4.jar
+Bundle-ClassPath: lib/advancedPersistentLookupLib-1.2.jar,
+ .
 Export-Package: org.talend.commons.utils.data.map,
  org.talend.commons.utils.time,
  org.talend.core.model.process,

main/plugins/org.talend.libraries.persist.lookup/build.properties

@@ -2,6 +2,4 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               lib/advancedPersistentLookupLib-1.4.jar,\
-			   lib/advancedPersistentLookupLib-1.3.jar,\
                lib/advancedPersistentLookupLib-1.2.jar

main/plugins/org.talend.libraries.persist.lookup/export_advancedPersistentLookupLib.jardesc

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <jardesc>
-    <jar path="D:/studio_code/tcommon-studio-se/main/plugins/org.talend.libraries.persist.lookup/lib/advancedPersistentLookupLib-1.4.jar"/>
+    <jar path="D:/studio_code/tcommon-studio-se/main/plugins/org.talend.libraries.persist.lookup/lib/advancedPersistentLookupLib-1.2.jar"/>
     <options buildIfNeeded="true" compress="true" descriptionLocation="/org.talend.libraries.persist.lookup/export_advancedPersistentLookupLib.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="true" saveDescription="false" storeRefactorings="false" useSourceFolders="false"/>
     <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
     <selectedProjects/>

main/plugins/org.talend.librariesmanager/.classpath

@@ -2,7 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="resources/java"/>
-	<classpathentry exported="true" kind="lib" path="lib/jboss-marshalling-2.0.12.Final.jar"/>
 	<classpathentry kind="lib" path="lib/crypto-utils.jar"/>
 	<classpathentry kind="lib" path="lib/slf4j-api-1.7.25.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

main/plugins/org.talend.librariesmanager/META-INF/MANIFEST.MF

@@ -28,8 +28,7 @@ Eclipse-LazyStart: true
 Bundle-ClassPath: .,
  lib/crypto-utils.jar,
  lib/slf4j-api-1.7.25.jar
-Export-Package: org.jboss.marshalling,
- org.talend.librariesmanager.emf.librariesindex,
+Export-Package: org.talend.librariesmanager.emf.librariesindex,
  org.talend.librariesmanager.librarydata,
  org.talend.librariesmanager.maven,
  org.talend.librariesmanager.model,
@@ -41,5 +40,3 @@ Export-Package: org.jboss.marshalling,
 Import-Package: org.eclipse.emf.ecore.xmi.impl,
  org.talend.osgi.hook.notification
 Eclipse-BundleShape: dir
-Bundle-ClassPath: lib/jboss-marshalling-2.0.12.Final.jar,
- .

main/plugins/org.talend.librariesmanager/plugin.xml

@@ -69,12 +69,6 @@
                name="crypto-utils-0.31.12.jar">
          </library>
       </systemRoutine>
-      <systemRoutine
-            name="IPersistableLookupRow">
-         <library
-               name="mvn:org.jboss.marshalling/jboss-marshalling/2.0.12.Final">
-         </library>
-      </systemRoutine>
    </extension>
    <extension
          point="org.talend.core.runtime.artifact_handler">

main/plugins/org.talend.librariesmanager/pom.xml

@@ -51,11 +51,6 @@
 									<version>1.7.25</version>
 									<overWrite>true</overWrite>
 								</artifactItem>
-								<artifactItem>
-									<groupId>org.jboss.marshalling</groupId>
-									<artifactId>jboss-marshalling</artifactId>
-									<version>2.0.12.Final</version>
-								</artifactItem>
 							</artifactItems>
 						</configuration>
 					</execution>

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

@@ -5,9 +5,6 @@ import java.io.DataOutputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
-import org.jboss.marshalling.Marshaller;
-import org.jboss.marshalling.Unmarshaller;
-
 public interface IPersistableLookupRow<R> {
 
     public void writeKeysData(ObjectOutputStream out);
@@ -22,25 +19,4 @@ public interface IPersistableLookupRow<R> {
 
     public void copyKeysDataTo(R other);
 
-    default public void writeKeysData(Marshaller marshaller){
-        //sub-class need to override this method
-        throw new UnsupportedOperationException("Method need to be override");
-    }
-
-    default public void readKeysData(Unmarshaller in){
-        throw new UnsupportedOperationException("Method need to be override");
-    }
-
-    default public void writeValuesData(DataOutputStream dataOut, Marshaller objectOut){
-        throw new UnsupportedOperationException("Method need to be override");
-    }
-
-    default public void readValuesData(DataInputStream dataIn, Unmarshaller objectIn){
-        throw new UnsupportedOperationException("Method need to be override");
-    }
-
-    default public boolean supportMarshaller(){
-        //Override this method to return true after implement the Jboss methods above
-        return false;
-    }
 }

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

@@ -3,28 +3,10 @@ package routines.system;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
-import org.jboss.marshalling.Marshaller;
-import org.jboss.marshalling.Unmarshaller;
-
 public interface IPersistableRow<R> {
 
     public void writeData(ObjectOutputStream out);
 
     public void readData(ObjectInputStream in);
 
-
-    default public void writeData(Marshaller marshaller){
-        //sub-class need to override this method
-        throw new UnsupportedOperationException("Method need to be override");
-    }
-
-    default public void readData(Unmarshaller in){
-        throw new UnsupportedOperationException("Method need to be override");
-    }
-
-    default public boolean supportJboss(){
-        //Override this method to return true after implement the Jboss methods above
-        return false;
-    }
-
 }

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

@@ -1319,81 +1319,11 @@ public class LocalLibraryManager implements ILibraryManagerService, IChangedLibr
         saveMavenIndex(mavenURIMap, monitorWrap);
         savePlatfromURLIndex(platformURLMap, monitorWrap);
 
+        if (service != null) {
+            deployLibsFromCustomComponents(service, platformURLMap);
+        }
         return mavenURIMap;
     }
-    
-    public void deployLibsFromCustomComponents(File componentFolder, List<ModuleNeeded> modulesNeeded) {
-        if (modulesNeeded == null || modulesNeeded.isEmpty()) {
-            return;
-        }
-        Map<File, Set<MavenArtifact>> needToDeploy = new HashMap<File, Set<MavenArtifact>>();
-        modulesNeeded.forEach(module -> {
-            if (module != null) {
-                boolean needDeploy = false;
-                String mvnUri = module.getMavenUri();
-                String jarPathFromMaven = getJarPathFromMaven(StringUtils.isNotBlank(mvnUri) ? mvnUri : module.getModuleName());
-                if (StringUtils.isBlank(jarPathFromMaven)) {
-                    needDeploy = true;
-                } else {
-                    File jarFromMaven = new File(jarPathFromMaven);
-                    if (!jarFromMaven.exists()) {
-                        needDeploy = true;
-                    }
-                }
-
-                if (needDeploy) {
-                    File deployFile = getDeployJarFileByModule(componentFolder, module);
-                    if (deployFile != null) {
-
-                        install(deployFile, mvnUri, false, true, null);
-
-                        if (needToDeploy.get(deployFile) == null) {
-                            needToDeploy.put(deployFile, new HashSet<MavenArtifact>());
-                        }
-                        if (StringUtils.isNotBlank(mvnUri)) {
-                            MavenArtifact mavenArtifact = MavenUrlHelper.parseMvnUrl(mvnUri);
-                            needToDeploy.get(deployFile).add(mavenArtifact);
-                        } else {
-                            Map<String, String> sourceAndMavenUri = new HashMap<>();
-                            guessMavenRUIFromIndex(deployFile, true, sourceAndMavenUri);
-                            Set<MavenArtifact> MavenArtifactSet = new HashSet<MavenArtifact>();
-                            sourceAndMavenUri.keySet().forEach(mavenUri -> {
-                                if (StringUtils.isNotBlank(mvnUri)) {
-                                    MavenArtifactSet.add(MavenUrlHelper.parseMvnUrl(mavenUri));
-                                }
-                            });
-                            needToDeploy.get(deployFile).addAll(MavenArtifactSet);
-                        }
-                    }
-                }
-            }
-        });
-
-        if (!needToDeploy.isEmpty()) {
-            ShareComponentsLibsJob shareJob = new ShareComponentsLibsJob(
-                    Messages.getString("LocalLibraryManager.shareLibsForCustomponents"), needToDeploy, deployer);
-            shareJob.schedule();
-        }
-    }
-
-    private File getDeployJarFileByModule(File componentFolder, ModuleNeeded module) {
-        String mvnUri = module.getMavenUri();
-        if (StringUtils.isNotBlank(mvnUri)) {
-            MavenArtifact mavenArtifact = MavenUrlHelper.parseMvnUrl(mvnUri);
-            String fileName = mavenArtifact.getFileName();
-            File jarFile = new File(componentFolder, fileName);
-            if (jarFile.exists()) {
-                return jarFile;
-            }
-
-        }
-        // try module name
-        File jarFile = new File(componentFolder, module.getModuleName());
-        if (jarFile.exists()) {
-            return jarFile;
-        }
-        return null;
-    }
 
     /**
      *
@@ -1452,6 +1382,86 @@ public class LocalLibraryManager implements ILibraryManagerService, IChangedLibr
 		return false;
 	}
 
+    private void deployLibsFromCustomComponents(IComponentsService service, Map<String, String> platformURLMap) {
+        boolean deployToRemote = true;
+        if (!LibrariesManagerUtils.shareLibsAtStartup()) {
+            log.info("Skip deploying libs from custom components");
+            deployToRemote = false;
+        }
+
+        Map<File, Set<MavenArtifact>> needToDeploy = new HashMap<File, Set<MavenArtifact>>();
+        List<ComponentProviderInfo> componentsFolders = service.getComponentsFactory().getComponentsProvidersInfo();
+        for (ComponentProviderInfo providerInfo : componentsFolders) {
+            String id = providerInfo.getId();
+            try {
+                File file = new File(providerInfo.getLocation());
+                if (isExtComponentProvider(id)) {
+                    if (file.isDirectory()) {
+                        List<File> jarFiles = FilesUtils.getJarFilesFromFolder(file, null);
+                        if (jarFiles.size() > 0) {
+                            for (File jarFile : jarFiles) {
+                                String name = jarFile.getName();
+                                if (!canDeployFromCustomComponentFolder(name) || platformURLMap.get(name) != null) {
+                                    continue;
+                                }
+
+                                collectLibModules(jarFile, needToDeploy);
+                            }
+                        }
+                    } else {
+                        if (!canDeployFromCustomComponentFolder(file.getName()) || platformURLMap.get(file.getName()) != null) {
+                            continue;
+                        }
+                        collectLibModules(file, needToDeploy);
+                    }
+                }
+            } catch (Exception e) {
+                ExceptionHandler.process(e);
+                continue;
+            }
+        }
+
+        // first install them locally
+        needToDeploy.forEach((k, v) -> {
+            try {
+                // install as release version if can't find mvn url from index
+                install(k, null, false, true);
+            } catch (Exception e) {
+                ExceptionHandler.process(e);
+            }
+        });
+
+        if (!deployToRemote) {
+            return;
+        }
+
+        ShareComponentsLibsJob shareJob = new ShareComponentsLibsJob(
+                Messages.getString("LocalLibraryManager.shareLibsForCustomponents"), needToDeploy, deployer);
+        shareJob.schedule();
+    }
+
+    private void collectLibModules(File jarFile, Map<File, Set<MavenArtifact>> needToDeploy) {
+        Map<String,String> mavenUris = new HashMap<String,String>();
+        guessMavenRUIFromIndex(jarFile, true, mavenUris);
+        
+        Set<MavenArtifact> artifacts = new HashSet<MavenArtifact>();
+        for(String uri: mavenUris.keySet()) {
+            MavenArtifact art = MavenUrlHelper.parseMvnUrl(uri);
+            if(art!=null) {
+                artifacts.add(art);
+            }
+        }
+        
+        needToDeploy.put(jarFile, artifacts);
+    }
+
+    private boolean canDeployFromCustomComponentFolder(String fileName) {
+        if (isSystemCacheFile(fileName) || isComponentDefinitionFileType(fileName)) {
+            return false;
+        }
+        return true;
+    }
+
     private void warnDuplicated(List<ModuleNeeded> modules, Set<String> duplicates, String type) {
         for (String lib : duplicates) {
             Set<String> components = new HashSet<>();

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

@@ -140,14 +140,6 @@
                   name="orai18n-19.3.0.0.jar"
                   required="true">
       </libraryNeeded>
-      <libraryNeeded
-            context="plugin:org.talend.metadata.managment"
-            language="java"
-            message="Needed for plugin org.talend.metadata.managment"
-            name="hsqldb.jar" mvn_uri="mvn:org.hsqldb/hsqldb/2.7.1" 
-            required="true"
-            uripath="platform:/plugin/org.talend.libraries.jdbc.hsql/lib/hsqldb.jar">
-      </libraryNeeded>
    </extension>
    <extension
          point="org.talend.core.migrationTask">

main/plugins/org.talend.repository.items.importexport.ui/src/main/java/org/talend/repository/items/importexport/ui/wizard/imports/ImportItemsWizardPage.java

@@ -721,10 +721,6 @@ public class ImportItemsWizardPage extends WizardPage {
 
         ImportDependencyRelationsHelper.getInstance().checkImportRelationDependency(checkedNodeList, toSelectSet,
                 nodesBuilder.getAllImportItemNode());
-
-
-        // to make doCheckStateChanged execute from ContainerCheckedTreeViewer.setCheckedElements(Object[])
-        filteredCheckboxTree.getViewer().setCheckedElements(new Object[0]);
         filteredCheckboxTree.getViewer().setCheckedElements(toSelectSet.toArray());
     }
 

main/plugins/org.talend.repository.items.importexport/src/main/java/org/talend/repository/items/importexport/handlers/imports/ImportDependencyRelationsHelper.java

@@ -132,12 +132,11 @@ public class ImportDependencyRelationsHelper {
                     id = split[1];
                 }
             }
-            boolean isGlobalRoutine = RelationshipItemBuilder.ROUTINE_RELATION.equals(relation.getType());
             if (RelationshipItemBuilder.LATEST_VERSION.equals(relation.getVersion())) {
-                relatedNode = getLatestVersionItemImportNode(id, projectLabel, allImportItemNodesList, isGlobalRoutine);
+                relatedNode = getLatestVersionItemImportNode(id, projectLabel, allImportItemNodesList);
             } else {
-                relatedNode = getItemImportNodeByIdVersion(id, relation.getVersion(), projectLabel,
-                        allImportItemNodesList, isGlobalRoutine);
+                relatedNode = getItemImportNodeByIdVersion(id, projectLabel, relation.getVersion(),
+                        allImportItemNodesList);
             }
             if (relatedNode != null && !toSelectSet.contains(relatedNode)) {
                 // avoid loop
@@ -149,14 +148,13 @@ public class ImportDependencyRelationsHelper {
     }
 
     public ItemImportNode getLatestVersionItemImportNode(String id, String projectTecLabel,
-            List<ItemImportNode> allImportItemNodesList, boolean isGlobalRoutine) {
+            List<ItemImportNode> allImportItemNodesList) {
         List<ItemImportNode> allItemImportNodesById = getItemImportNode(allImportItemNodesList, node -> {
-            Property property = node.getItemRecord().getProperty();
             boolean projectFlag = true;
             if (StringUtils.isNotBlank(projectTecLabel)) {
                 projectFlag = node.getProjectNode().getProject().getTechnicalLabel().equals(projectTecLabel);
             }
-            return (isGlobalRoutine ? property.getLabel().equals(id) : property.getId().equals(id)) && projectFlag;
+            return node.getItemRecord().getProperty().getId().equals(id) && projectFlag;
         });
         Optional<ItemImportNode> optional = allItemImportNodesById.stream().max((node1, node2) -> VersionUtils
                 .compareTo(node1.getItemRecord().getProperty().getVersion(), node2.getItemRecord().getProperty().getVersion()));
@@ -164,15 +162,14 @@ public class ImportDependencyRelationsHelper {
     }
 
     public ItemImportNode getItemImportNodeByIdVersion(String id, String version, String projectTecLabel,
-            List<ItemImportNode> allImportItemNodesList, boolean isGlobalRoutine) {
+            List<ItemImportNode> allImportItemNodesList) {
         List<ItemImportNode> importNodeList = getItemImportNode(allImportItemNodesList, node -> {
             boolean projectFlag = true;
             if (StringUtils.isNotBlank(projectTecLabel)) {
                 projectFlag = node.getProjectNode().getProject().getTechnicalLabel().equals(projectTecLabel);
             }
             Property property = node.getItemRecord().getProperty();
-            return (isGlobalRoutine ? property.getLabel().equals(id) : property.getId().equals(id))
-                    && property.getVersion().equals(version) && projectFlag;
+            return property.getId().equals(id) && property.getVersion().equals(version) && projectFlag;
         });
         return importNodeList == null || importNodeList.isEmpty() ? null : importNodeList.get(0);
     }

test/plugins/org.talend.repository.items.importexport.test/src/org/talend/repository/items/importexport/handlers/imports/ImportDependencyRelationsHelperTest.java

@@ -16,7 +16,6 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 
 import org.eclipse.core.resources.IProject;
@@ -42,7 +41,6 @@ import org.talend.core.model.properties.ItemRelations;
 import org.talend.core.model.properties.ProcessItem;
 import org.talend.core.model.properties.PropertiesFactory;
 import org.talend.core.model.properties.Property;
-import org.talend.core.model.properties.RoutineItem;
 import org.talend.core.model.properties.User;
 import org.talend.core.model.properties.impl.PropertiesFactoryImpl;
 import org.talend.core.model.relationship.Relation;
@@ -95,10 +93,8 @@ public class ImportDependencyRelationsHelperTest {
             allImportItemNodesList.add(importNode);
             propertyList.add(property);
         }
-        // test0 --> test1 --> test2
         createRelations(propertyList);
         Property property2 = propertyList.get(2);
-        // label test2 version 0.7
         Property property3 = PropertiesFactory.eINSTANCE.createProperty();
         property3.setId(property2.getId());
         property3.setLabel(property2.getLabel());
@@ -112,34 +108,6 @@ public class ImportDependencyRelationsHelperTest {
         projectNode.addChild(importNode);
         allImportItemNodesList.add(importNode);
         propertyList.add(property3);
-
-        Property routineProperty = PropertiesFactory.eINSTANCE.createProperty();
-        routineProperty.setId(ProxyRepositoryFactory.getInstance().getNextId());
-        routineProperty.setLabel("testRoutine");
-        routineProperty.setVersion("0.1");
-        RoutineItem routineItem = PropertiesFactory.eINSTANCE.createRoutineItem();
-        routineProperty.setItem(routineItem);
-        ImportItem routineItemRecord = new ImportItem(new Path(fakePath + "/" + technicalLabel + "/code/routines"
-                + routineProperty.getLabel() + "_" + routineProperty.getVersion() + ".item"));
-        routineItemRecord.setProperty(routineProperty);
-        ItemImportNode routineImportNode = new ItemImportNode(routineItemRecord);
-        projectNode.addChild(routineImportNode);
-        allImportItemNodesList.add(routineImportNode);
-        propertyList.add(routineProperty);
-        Property routineProperty1 = PropertiesFactory.eINSTANCE.createProperty();
-        routineProperty1.setId(routineProperty.getId());
-        routineProperty1.setLabel("testRoutine");
-        routineProperty1.setVersion("0.7");
-        RoutineItem routineItem1 = PropertiesFactory.eINSTANCE.createRoutineItem();
-        routineProperty1.setItem(routineItem1);
-        ImportItem routineItemRecord1 = new ImportItem(new Path(fakePath + "/" + technicalLabel + "/code/routines"
-                + routineProperty1.getLabel() + "_" + routineProperty1.getVersion() + ".item"));
-        routineItemRecord1.setProperty(routineProperty1);
-        ItemImportNode routineImportNode1 = new ItemImportNode(routineItemRecord1);
-        projectNode.addChild(routineImportNode1);
-        allImportItemNodesList.add(routineImportNode1);
-        propertyList.add(routineProperty1);
-
         ImportCacheHelper.getInstance().getPathWithProjects().put(fakeProjectPath, project.getEmfProject());
     }
 
@@ -163,35 +131,7 @@ public class ImportDependencyRelationsHelperTest {
         helperInstance.checkImportRelationDependency(checkedNodeList, toSelectSet, allImportItemNodesList);
         Assert.assertTrue(toSelectSet.size() == 3);
 
-        Map<Relation, Set<Relation>> importItemsRelations = helperInstance.getImportItemsRelations(fakeProjectPath);
-        Property jobProperty = propertyList.get(3);
-        Relation baseRelation = new Relation();
-        baseRelation.setId(jobProperty.getId());
-        baseRelation.setType(RelationshipItemBuilder.JOB_RELATION);
-        baseRelation.setVersion(jobProperty.getVersion());
-        Relation relatedRelation = new Relation();
-        relatedRelation.setId(propertyList.get(4).getLabel());
-        relatedRelation.setType(RelationshipItemBuilder.ROUTINE_RELATION);
-        relatedRelation.setVersion(RelationshipItemBuilder.LATEST_VERSION);
-        Set<Relation> relationSet = new HashSet<Relation>();
-        relationSet.add(relatedRelation);
-        importItemsRelations.put(baseRelation, relationSet);
-        toSelectSet.clear();
-        toSelectSet.add(allImportItemNodesList.get(0));
-        helperInstance.checkImportRelationDependency(checkedNodeList, toSelectSet, allImportItemNodesList);
-        Assert.assertTrue(toSelectSet.size() == 4);
-
-    }
-
-    @Test
-    public void checkImportRelationWithLoopDependency() {
-        helperInstance.clear();
-        helperInstance.loadRelations(fakeProjectPath, project.getEmfProject().getItemsRelations());
-        Set<ItemImportNode> toSelectSet = new HashSet<ItemImportNode>();
-        List<ItemImportNode> checkedNodeList = new ArrayList<ItemImportNode>();
-        checkedNodeList.add(allImportItemNodesList.get(0));
-        toSelectSet.add(allImportItemNodesList.get(0));
-        // to test loop dependency test0 --> test1 --> test2 --> test0
+        // to test loop dependency
         Map<Relation, Set<Relation>> importItemsRelations = helperInstance.getImportItemsRelations(fakeProjectPath);
         Property property3 = propertyList.get(3);
         Relation baseRelation = new Relation();
@@ -205,87 +145,20 @@ public class ImportDependencyRelationsHelperTest {
         Set<Relation> relationSet = new HashSet<Relation>();
         relationSet.add(relatedRelation);
         importItemsRelations.put(baseRelation, relationSet);
-        helperInstance.checkImportRelationDependency(checkedNodeList, toSelectSet, allImportItemNodesList);
-        Assert.assertTrue(toSelectSet.size() == 3);
-    }
-
-    @Test
-    public void checkImportRelationDependencyWithMultiVersion() {
-        helperInstance.clear();
-        helperInstance.loadRelations(fakeProjectPath, project.getEmfProject().getItemsRelations());
-        Set<ItemImportNode> toSelectSet = new HashSet<ItemImportNode>();
-        List<ItemImportNode> checkedNodeList = new ArrayList<ItemImportNode>();
-
-        // test1 --> test2 latest (0.7)
-        // test1 --> test2 0.1
-        Relation relatedRelation = new Relation();
-        relatedRelation.setId(propertyList.get(3).getId());
-        relatedRelation.setType(RelationshipItemBuilder.JOB_RELATION);
-        relatedRelation.setVersion("0.1");
-
-        Map<Relation, Set<Relation>> importItemsRelations = helperInstance.getImportItemsRelations(fakeProjectPath);
-        String test1_id = propertyList.get(1).getId();
-        Optional<Relation> optional = importItemsRelations.keySet().stream().filter(relation -> relation.getId().equals(test1_id))
-                .findFirst();
-        Assert.assertTrue(optional.isPresent());
-        importItemsRelations.get(optional.get()).add(relatedRelation);
-        checkedNodeList.add(allImportItemNodesList.get(1));
-        toSelectSet.add(allImportItemNodesList.get(1));
-        helperInstance.checkImportRelationDependency(checkedNodeList, toSelectSet, allImportItemNodesList);
-        Assert.assertTrue(toSelectSet.size() == 3);
-
         toSelectSet.clear();
-        checkedNodeList.add(allImportItemNodesList.get(0));
         toSelectSet.add(allImportItemNodesList.get(0));
         helperInstance.checkImportRelationDependency(checkedNodeList, toSelectSet, allImportItemNodesList);
-        Assert.assertTrue(toSelectSet.size() == 4);
-    }
-
-    @Test
-    public void testGetItemImportNodeByIdVersion() {
-        ItemImportNode theVersionNode = helperInstance.getItemImportNodeByIdVersion(propertyList.get(2).getId(), "0.1", null,
-                allImportItemNodesList, false);
-        Property imporRecordProperty = theVersionNode.getItemRecord().getProperty();
-        Property property3 = propertyList.get(3);
-        Assert.assertEquals(property3.getId(), imporRecordProperty.getId());
-        Assert.assertEquals("0.1", imporRecordProperty.getVersion());
-        theVersionNode = helperInstance.getItemImportNodeByIdVersion(propertyList.get(2).getId(), "0.7", null,
-                allImportItemNodesList, false);
-        imporRecordProperty = theVersionNode.getItemRecord().getProperty();
-        Assert.assertEquals(property3.getId(), imporRecordProperty.getId());
-        Assert.assertEquals("0.7", imporRecordProperty.getVersion());
-
-        Property routineProperty = propertyList.get(4);
-        ItemImportNode routineImportNode = helperInstance.getItemImportNodeByIdVersion(routineProperty.getLabel(), "0.1", null,
-                allImportItemNodesList, true);
-        Property routineImportProperty = routineImportNode.getItemRecord().getProperty();
-        Assert.assertEquals(routineProperty.getId(), routineImportProperty.getId());
-        Assert.assertEquals(routineProperty.getLabel(), routineImportProperty.getLabel());
-        Assert.assertEquals("0.1", routineImportProperty.getVersion());
-        routineImportNode = helperInstance.getItemImportNodeByIdVersion(routineProperty.getLabel(), "0.7", null,
-                allImportItemNodesList, true);
-        routineImportProperty = routineImportNode.getItemRecord().getProperty();
-        Assert.assertEquals(routineProperty.getId(), routineImportProperty.getId());
-        Assert.assertEquals(routineProperty.getLabel(), routineImportProperty.getLabel());
-        Assert.assertEquals("0.7", routineImportProperty.getVersion());
+        Assert.assertTrue(toSelectSet.size() == 3);
     }
 
     @Test
     public void testGetLatestVersionItemImportNode() {
         ItemImportNode latestVersionNode = helperInstance.getLatestVersionItemImportNode(propertyList.get(2).getId(),
-                null, allImportItemNodesList, false);
+                null, allImportItemNodesList);
         Property latestVersionProperty = latestVersionNode.getItemRecord().getProperty();
         Property property3 = propertyList.get(3);
         Assert.assertEquals(latestVersionProperty.getId(), property3.getId());
         Assert.assertEquals(latestVersionProperty.getVersion(), property3.getVersion());
-
-        ItemImportNode latestRoutineNode = helperInstance.getLatestVersionItemImportNode(propertyList.get(4).getLabel(), null,
-                allImportItemNodesList, true);
-        Property latestRoutineProperty = latestRoutineNode.getItemRecord().getProperty();
-        Property property5 = propertyList.get(5);
-        Assert.assertEquals(latestRoutineProperty.getId(), property5.getId());
-        Assert.assertEquals(latestRoutineProperty.getLabel(), property5.getLabel());
-        Assert.assertEquals(latestRoutineProperty.getVersion(), property5.getVersion());
     }
 
     private void createRelations(List<Property> propertyList) {