Revert "feat(TBD-13810): add dynamic schema on thdfsinputformat components (#5442 )"

This reverts commit a5df51204e.
Revert "feat(TUP-35808)Generate module name from maven url (#5425 )" (#5536 )
2022-08-18 10:02:06 +02:00 · 2022-08-11 15:03:30 +08:00 · 2022-08-09 16:21:30 +08:00 · 2022-08-09 11:12:08 +08:00 · 2022-08-09 11:00:19 +08:00 · 2022-08-08 13:42:28 +02:00
23 changed files with 82 additions and 120 deletions
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/exception/CommonExceptionHandler.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/exception/CommonExceptionHandler.java
@@ -52,10 +52,6 @@ public final class CommonExceptionHandler {
        log.log(Level.WARN, message);
    }

-    public static void error(String message) {
-        log.log(Level.ERROR, message);
-    }
-
    /**
     * Return priority corresponding to the exception implementation.
     *
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/version/EDatabaseVersion4Drivers.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/version/EDatabaseVersion4Drivers.java
@@ -56,14 +56,14 @@ public enum EDatabaseVersion4Drivers {
    HSQLDB_SERVER(new DbVersion4Drivers(EDatabaseTypeName.HSQLDB_SERVER, "hsqldb.jar")), //$NON-NLS-1$
    HSQLDB_WEBSERVER(new DbVersion4Drivers(EDatabaseTypeName.HSQLDB_WEBSERVER, "hsqldb.jar")), //$NON-NLS-1$

-    H2(new DbVersion4Drivers(EDatabaseTypeName.H2, "h2-2.1.210.jar")), //$NON-NLS-1$
+    H2(new DbVersion4Drivers(EDatabaseTypeName.H2, "h2-2.1.214.jar")), //$NON-NLS-1$

    //
    JAVADB_EMBEDED(new DbVersion4Drivers(EDatabaseTypeName.JAVADB_EMBEDED, "derby.jar")), //$NON-NLS-1$
    SQLITE(new DbVersion4Drivers(EDatabaseTypeName.SQLITE, "sqlitejdbc-v056.jar")), //$NON-NLS-1$
    FIREBIRD(new DbVersion4Drivers(EDatabaseTypeName.FIREBIRD, "jaybird-full-2.1.1.jar")), //$NON-NLS-1$
    TERADATA(new DbVersion4Drivers(EDatabaseTypeName.TERADATA,
-            new String[] { "terajdbc4-17.10.00.27.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
+            new String[] { "terajdbc4-17.10.00.27.jar" })), //$NON-NLS-1$
    JAVADB_DERBYCLIENT(new DbVersion4Drivers(EDatabaseTypeName.JAVADB_DERBYCLIENT, "derbyclient.jar")), //$NON-NLS-1$
    NETEZZA(new DbVersion4Drivers(EDatabaseTypeName.NETEZZA, "nzjdbc.jar")), //$NON-NLS-1$
    INFORMIX(new DbVersion4Drivers(EDatabaseTypeName.INFORMIX, "ifxjdbc.jar")), //$NON-NLS-1$
@@ -83,8 +83,7 @@ public enum EDatabaseVersion4Drivers {
            "Microsoft SQL Server 2012", "Microsoft SQL Server 2012", "jtds-1.3.1-patch-20190523.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    MSSQL_PROP(new DbVersion4Drivers(EDatabaseTypeName.MSSQL,
            "Microsoft", "MSSQL_PROP", //$NON-NLS-1$ //$NON-NLS-2$
-            new String[] { "mssql-jdbc-actual.jar", "slf4j-api-1.7.29.jar", "slf4j-log4j12-1.7.29.jar", //$NON-NLS-1$
-                    "msal4j-1.11.0.jar", 
+            new String[] { "mssql-jdbc.jar", "slf4j-api-1.7.29.jar", "slf4j-log4j12-1.7.29.jar", "msal4j-1.11.0.jar", //$NON-NLS-1$
                    "oauth2-oidc-sdk-9.7.jar", "reload4j-1.2.19.jar", "jackson-core-2.13.2.jar",
                    "jackson-databind-2.13.2.2.jar", "jackson-annotations-2.13.2.jar", "jcip-annotations-1.0-1.jar",
                    "json-smart-2.4.7.jar", "nimbus-jose-jwt-9.22.jar", "accessors-smart-2.4.7.jar", "asm-9.1.jar",
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/general/ModuleNeeded.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/general/ModuleNeeded.java
@@ -13,16 +13,17 @@
 package org.talend.core.model.general;

 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;

 import org.apache.commons.lang.StringUtils;
 import org.eclipse.core.runtime.Path;
 import org.osgi.framework.Version;
-import org.talend.commons.CommonsPlugin;
-import org.talend.commons.exception.CommonExceptionHandler;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.ILibraryManagerService;
@@ -107,7 +108,7 @@ public class ModuleNeeded {

    private Map<String, String> attributes;

-    ILibraryManagerService libManagerService = GlobalServiceRegister.getDefault()
+    ILibraryManagerService libManagerService = (ILibraryManagerService) GlobalServiceRegister.getDefault()
            .getService(ILibraryManagerService.class);
    

@@ -368,7 +369,7 @@ public class ModuleNeeded {
    }

    public ELibraryInstallStatus getStatus() {
-        ILibraryManagerService libManagerService = GlobalServiceRegister.getDefault()
+        ILibraryManagerService libManagerService = (ILibraryManagerService) GlobalServiceRegister.getDefault()
                .getService(ILibraryManagerService.class);
        libManagerService.checkModuleStatus(this);
        String mvnUriStatusKey = getMavenUri();
@@ -377,7 +378,7 @@ public class ModuleNeeded {
    }

    public ELibraryInstallStatus getDeployStatus() {
-        ILibraryManagerService libManagerService = GlobalServiceRegister.getDefault()
+        ILibraryManagerService libManagerService = (ILibraryManagerService) GlobalServiceRegister.getDefault()
                .getService(ILibraryManagerService.class);
        libManagerService.checkModuleStatus(this);
        String mvnUriStatusKey = getMavenUri();
@@ -714,19 +715,6 @@ public class ModuleNeeded {
        if (!StringUtils.isEmpty(mavenUriFromConfiguration)) {
            this.mavenUri = mavenUriFromConfiguration;
        }
-        String generateModuleName = MavenUrlHelper.generateModuleNameByMavenURI(this.mavenUri);
-        if (StringUtils.isNotBlank(generateModuleName)) {
-
-            if (!StringUtils.equals(getModuleName(), generateModuleName)) {
-                if (CommonsPlugin.isDebugMode() && StringUtils.isNotBlank(this.context)) {
-                    CommonExceptionHandler
-                            .warn("module name definition should be " + generateModuleName + ", not " + getModuleName()
-                                    + " :" + this.context);
-                }
-
-                setModuleName(generateModuleName);
-            }
-        }
    }

    public boolean usedByDynamicDistribution() {
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/SparkBatchMetadataTalendTypeFilter.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/SparkBatchMetadataTalendTypeFilter.java
@@ -16,10 +16,7 @@ public class SparkBatchMetadataTalendTypeFilter extends SparkMetadataTalendTypeF
            "tFileInputParquet",
            "tFileOutputParquet",
            "tJDBCInput",
-            "tJDBCOutput",
-            "tLogRow",
-            "tSqlRow",
-            "tFileInputDelimited"
+            "tJDBCOutput", "tLogRow", "tSqlRow"
            );

    public SparkBatchMetadataTalendTypeFilter(INode node) {
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/PendoTrackDataUtil.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/PendoTrackDataUtil.java
@@ -162,7 +162,7 @@ public class PendoTrackDataUtil {
        OPEN_IN_APITester("Open in API Tester"),
        OPEN_API_DOCUMENTATION("Open API Documentation"),
        AUTOMAP("tMap Automap"),
-        TMAP("Studio tMap");
+        TMAP("tMap");

        private String event;

--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/process/TalendProcessOptionConstants.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/process/TalendProcessOptionConstants.java
@@ -48,6 +48,10 @@ public interface TalendProcessOptionConstants {
    
    public static final int GENERATE_POM_NOT_CLEAR_CACHE = 1 << 11;

+    /**
+     * for DQ clean item
+     */
+    public static final int GENERATE_NO_RESET_DQ = 1 << 12;
    /**
     * clean options
     */
--- a/main/plugins/org.talend.core/src/main/java/org/talend/designer/runprocess/ProcessorUtilities.java
+++ b/main/plugins/org.talend.core/src/main/java/org/talend/designer/runprocess/ProcessorUtilities.java
@@ -278,6 +278,19 @@ public class ProcessorUtilities {
        needExportItemsForDQ = false;
    }

+    public static void resetExportConfig(boolean noResetDq) {
+        interpreter = null;
+        codeLocation = null;
+        libraryPath = null;
+        exportConfig = false;
+        exportAsOSGI = false;
+        exportTimeStamp = null;
+        exportJobAsMicroService = false;
+        if (!noResetDq) {
+            needExportItemsForDQ = false;
+        }
+    }
+
    public static String getInterpreter() {
        return interpreter;
    }
--- a/main/plugins/org.talend.designer.maven.tos/resources/tcompv1/pom.xml
+++ b/main/plugins/org.talend.designer.maven.tos/resources/tcompv1/pom.xml
@@ -11,7 +11,7 @@
    <packaging>pom</packaging>

    <properties>
-        <tcomp.version>1.46.1</tcomp.version>
+        <tcomp.version>1.47.1</tcomp.version>
        <slf4j.version>1.7.32</slf4j.version>
        <reload4j.version>1.2.19</reload4j.version>
    </properties>
--- a/main/plugins/org.talend.designer.maven.tos/resources/unzip/pom.xml
+++ b/main/plugins/org.talend.designer.maven.tos/resources/unzip/pom.xml
@@ -29,8 +29,22 @@
                    <groupId>com.fasterxml.jackson.core</groupId>
                    <artifactId>jackson-databind</artifactId>
                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-configuration2</artifactId>
+                </exclusion>
            </exclusions>
 		</dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-configuration2</artifactId>
+            <version>2.8.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>1.9</version>
+        </dependency>
 		<dependency>
            <groupId>com.fasterxml.jackson</groupId>
            <artifactId>jackson-bom</artifactId>
--- a/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/BuildCacheManager.java
+++ b/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/BuildCacheManager.java
@@ -241,7 +241,8 @@ public class BuildCacheManager {
                    property.getVersion(), true);
            if (obj != null) {
 				IRunProcessService.get().generatePom(obj.getProperty().getItem(),
-						TalendProcessOptionConstants.GENERATE_POM_NOT_CLEAR_CACHE);
+                        TalendProcessOptionConstants.GENERATE_POM_NOT_CLEAR_CACHE
+                                | TalendProcessOptionConstants.GENERATE_NO_RESET_DQ);
            }
        }
    }
@@ -331,7 +332,7 @@ public class BuildCacheManager {

    private ITalendProcessJavaProject getTalendJobJavaProject(Property property) {
        if (GlobalServiceRegister.getDefault().isServiceRegistered(IRunProcessService.class)) {
-            IRunProcessService service = (IRunProcessService) GlobalServiceRegister.getDefault()
+            IRunProcessService service = GlobalServiceRegister.getDefault()
                    .getService(IRunProcessService.class);
            return service.getTalendJobJavaProject(property);
        }
@@ -347,7 +348,7 @@ public class BuildCacheManager {

    private boolean isBuildJob() {
        if (GlobalServiceRegister.getDefault().isServiceRegistered(IRunProcessService.class)) {
-            IRunProcessService service = (IRunProcessService) GlobalServiceRegister.getDefault()
+            IRunProcessService service = GlobalServiceRegister.getDefault()
                    .getService(IRunProcessService.class);
            return service.isExportConfig();
        }
--- a/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/creator/AbstractMavenCodesTemplatePom.java
+++ b/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/creator/AbstractMavenCodesTemplatePom.java
@@ -140,8 +140,14 @@ public abstract class AbstractMavenCodesTemplatePom extends AbstractMavenGeneral
                        Exclusion jacksonExclusion = new Exclusion();
                        jacksonExclusion.setGroupId("com.fasterxml.jackson.core"); //$NON-NLS-1$
                        jacksonExclusion.setArtifactId("jackson-databind "); //$NON-NLS-1$
+
+                        Exclusion configuration2Exclusion = new Exclusion();
+                        configuration2Exclusion.setGroupId("org.apache.commons"); //$NON-NLS-1$
+                        configuration2Exclusion.setArtifactId("commons-configuration2"); //$NON-NLS-1$
+
                        dependency.addExclusion(exclusion);
                        dependency.addExclusion(jacksonExclusion);
+                        dependency.addExclusion(configuration2Exclusion);
                    }
                    existedDependencies.add(dependency);
                }
--- a/main/plugins/org.talend.libraries.jdbc.h2/.classpath
+++ b/main/plugins/org.talend.libraries.jdbc.h2/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="lib" path="lib/h2-2.1.210.jar"/>
+	<classpathentry kind="lib" path="lib/h2-2.1.214.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
--- a/main/plugins/org.talend.libraries.jdbc.h2/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.libraries.jdbc.h2/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: H2
 Bundle-SymbolicName: org.talend.libraries.jdbc.h2
 Bundle-Version: 8.0.1.qualifier
 Bundle-ClassPath: .,
- lib/h2-2.1.210.jar
+ lib/h2-2.1.214.jar
 Export-Package: org.h2,
 org.h2.api;uses:="org.h2.command.ddl,org.h2.table",
 org.h2.bnf;uses:="org.h2.server.web",
--- a/main/plugins/org.talend.libraries.jdbc.h2/build.properties
+++ b/main/plugins/org.talend.libraries.jdbc.h2/build.properties
@@ -1,4 +1,4 @@
 output.. = bin/
 bin.includes = META-INF/,\
               .,\
-               lib/h2-2.1.210.jar
+               lib/h2-2.1.214.jar
--- a/main/plugins/org.talend.libraries.jdbc.h2/pom.xml
+++ b/main/plugins/org.talend.libraries.jdbc.h2/pom.xml
@@ -28,7 +28,7 @@
 								<artifactItem>
 								    <groupId>com.h2database</groupId>
 								    <artifactId>h2</artifactId>
-								    <version>2.1.210</version>
+								    <version>2.1.214</version>
 								</artifactItem>
 							</artifactItems>
 						</configuration>
--- a/main/plugins/org.talend.librariesmanager/resources/java/routines/system/JSONObject.java
+++ b/main/plugins/org.talend.librariesmanager/resources/java/routines/system/JSONObject.java
@@ -268,11 +268,13 @@ public class JSONObject {
    public JSONObject(Object bean, Class<?> expectedClass) {
        this();
        
-        if(bean.getClass() != expectedClass) {
-            throw new JSONException("expectedClass doesn't match the bean or is null");
-        } 
+        Class<?> clazz = bean.getClass();
+        if((clazz == expectedClass) || (expectedClass!=null && expectedClass.isAssignableFrom(clazz))) {
+            populateMap(bean);
+            return;
+        }
        
-        populateMap(bean);
+        throw new JSONException("expectedClass doesn't match the bean or is null");
    }

    /**
--- a/main/plugins/org.talend.librariesmanager/src/main/java/org/talend/librariesmanager/model/ExtensionModuleManager.java
+++ b/main/plugins/org.talend.librariesmanager/src/main/java/org/talend/librariesmanager/model/ExtensionModuleManager.java
@@ -25,7 +25,6 @@ import java.util.Set;
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IContributor;
-import org.talend.commons.exception.CommonExceptionHandler;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.utils.workbench.extensions.ExtensionImplementationProvider;
 import org.talend.commons.utils.workbench.extensions.ExtensionPointLimiterImpl;
@@ -110,7 +109,7 @@ public class ExtensionModuleManager {

    private ExtensionModuleManager() {
        if (GlobalServiceRegister.getDefault().isServiceRegistered(ILibraryManagerService.class)) {
-            libManagerService = GlobalServiceRegister.getDefault().getService(
+            libManagerService = (ILibraryManagerService) GlobalServiceRegister.getDefault().getService(
                    ILibraryManagerService.class);
        }
        moduleGroupElementsCache = new ArrayList<>();
@@ -187,13 +186,6 @@ public class ExtensionModuleManager {
            if (!StringUtils.isEmpty(importType.getMVN())) {
                moduleNeeded.setMavenUri(importType.getMVN());
            }
-            if (StringUtils.isBlank(importType.getMVN())) {
-                if (importType.getMODULE() != null) {
-
-                    CommonExceptionHandler.error("Missing module MVN_URI definition: " + importType.getMODULE());
-                }
-            }
-
            if (importType.getUrlPath() != null && libManagerService.checkJarInstalledFromPlatform(importType.getUrlPath())) {
                moduleNeeded.setModuleLocaion(importType.getUrlPath());
            }
--- a/main/plugins/org.talend.librariesmanager/src/main/java/org/talend/librariesmanager/model/ModulesNeededProvider.java
+++ b/main/plugins/org.talend.librariesmanager/src/main/java/org/talend/librariesmanager/model/ModulesNeededProvider.java
@@ -30,7 +30,6 @@ import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.emf.common.util.EList;
-import org.talend.commons.CommonsPlugin;
 import org.talend.commons.exception.CommonExceptionHandler;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.PersistenceException;
@@ -130,10 +129,10 @@ public class ModulesNeededProvider {

    static {
        if (GlobalServiceRegister.getDefault().isServiceRegistered(IRepositoryService.class)) {
-            repositoryService = GlobalServiceRegister.getDefault().getService(IRepositoryService.class);
+            repositoryService = (IRepositoryService) GlobalServiceRegister.getDefault().getService(IRepositoryService.class);
        }
        if (GlobalServiceRegister.getDefault().isServiceRegistered(ILibraryManagerService.class)) {
-            libManagerService = GlobalServiceRegister.getDefault()
+            libManagerService = (ILibraryManagerService) GlobalServiceRegister.getDefault()
                    .getService(ILibraryManagerService.class);
        }
    }
@@ -331,17 +330,15 @@ public class ModulesNeededProvider {
                .collect(Collectors.toList());
    }

-    public static void collectModuleNeeded(String context, IMPORTType importType, List<ModuleNeeded> importNeedsList,
-            boolean isExtComponentProvider) {
-        collectModuleNeeded(context, importType, importNeedsList, null, isExtComponentProvider);
+    public static void collectModuleNeeded(String context, IMPORTType importType, List<ModuleNeeded> importNeedsList) {
+        collectModuleNeeded(context, importType, importNeedsList, null);
    }
    
-    public static void collectModuleNeeded(String context, IMPORTType importType, List<ModuleNeeded> importNeedsList,
-            String distribution, boolean isExtComponentProvider) {
+    public static void collectModuleNeeded(String context, IMPORTType importType, List<ModuleNeeded> importNeedsList, String distribution) {
        List<ModuleNeeded> importModuleFromExtension = ExtensionModuleManager.getInstance().getModuleNeededForComponent(context, importType);
        boolean foundModule = importModuleFromExtension.size() > 0;
        if (!foundModule) { // If cannot find the jar from extension point then do it like before.
-            createModuleNeededForComponent(context, importType, importNeedsList, distribution, isExtComponentProvider);
+            createModuleNeededForComponent(context, importType, importNeedsList, distribution);
        } else {
            if (!StringUtils.isEmpty(distribution)) {
                importModuleFromExtension.forEach(m -> m.setDynamicDistributionVersion(distribution));
@@ -351,29 +348,17 @@ public class ModulesNeededProvider {
    }


-    public static void createModuleNeededForComponent(String context, IMPORTType importType,
-            List<ModuleNeeded> importNeedsList, boolean isExtComponentProvider) {
-        createModuleNeededForComponent(context, importType, importNeedsList, null, isExtComponentProvider);
+    public static void createModuleNeededForComponent(String context, IMPORTType importType, List<ModuleNeeded> importNeedsList) {
+        createModuleNeededForComponent(context, importType, importNeedsList, null);
    }
-
-    public static void createModuleNeededForComponent(String context, IMPORTType importType,
-            List<ModuleNeeded> importNeedsList, String distribution, boolean isExtComponentProvider) {
+    
+    public static void createModuleNeededForComponent(String context, IMPORTType importType, List<ModuleNeeded> importNeedsList, String distribution) {
        if (importType.getMODULE() == null) {
            if (importType.getMODULEGROUP() != null) {
                CommonExceptionHandler.warn("Missing module group definition: " + importType.getMODULEGROUP());
            }
            return;
        }
-        if (StringUtils.isBlank(importType.getMVN())) {
-            if (importType.getMODULE() != null) {
-                if (isExtComponentProvider) {
-
-                    CommonExceptionHandler.warn("Missing module MVN_URI definition: " + importType.getMODULE());
-                } else {
-                    CommonExceptionHandler.error("Missing module MVN_URI definition: " + importType.getMODULE());
-                }
-            }
-        }
        String msg = importType.getMESSAGE();
        if (msg == null) {
            msg = Messages.getString("modules.required"); //$NON-NLS-1$
@@ -717,7 +702,7 @@ public class ModulesNeededProvider {
        if (!GlobalServiceRegister.getDefault().isServiceRegistered(ILibrariesService.class)) {
            return null;
        }
-        service = GlobalServiceRegister.getDefault().getService(ILibrariesService.class);
+        service = (ILibrariesService) GlobalServiceRegister.getDefault().getService(ILibrariesService.class);

        if (importNeedsListForRoutes.isEmpty()) {

@@ -745,7 +730,7 @@ public class ModulesNeededProvider {
        if (!GlobalServiceRegister.getDefault().isServiceRegistered(ILibrariesService.class)) {
            return null;
        }
-        service = GlobalServiceRegister.getDefault().getService(ILibrariesService.class);
+        service = (ILibrariesService) GlobalServiceRegister.getDefault().getService(ILibrariesService.class);
        
        if (importNeedsListForCamelCore.isEmpty()) {

@@ -781,7 +766,7 @@ public class ModulesNeededProvider {
        importType.setMODULEGROUP("esb-java-11-group");
        importType.setREQUIRED(true);

-        collectModuleNeeded("tRESTClient", importType, importNeedsListForRoutes, false);
+        collectModuleNeeded("tRESTClient", importType, importNeedsListForRoutes);
    }

    /**
@@ -883,16 +868,6 @@ public class ModulesNeededProvider {
        if (!StringUtils.isEmpty(mvn_rui)) {
            module.setMavenUri(mvn_rui);
        }
-        if (CommonsPlugin.isDebugMode() && StringUtils.isBlank(mvn_rui)) {
-
-            if (StringUtils.isNotBlank(module.getModuleName())) {
-                if (StringUtils.isNotBlank(context)) {
-
-                    CommonExceptionHandler
-                            .error("Missing module MVN_URI definition: " + context + ": " + module.getModuleName());
-                }
-            }
-        }
        module.setMavenUri(mvn_rui);
        String excludeDependencies = current.getAttribute(ExtensionModuleManager.EXCLUDE_DEPENDENCIES_ATTR);
        module.setExcludeDependencies(Boolean.valueOf(excludeDependencies));
--- a/main/plugins/org.talend.librariesmanager/src/main/java/org/talend/librariesmanager/model/service/LocalLibraryManager.java
+++ b/main/plugins/org.talend.librariesmanager/src/main/java/org/talend/librariesmanager/model/service/LocalLibraryManager.java
@@ -247,7 +247,6 @@ public class LocalLibraryManager implements ILibraryManagerService, IChangedLibr
        }
    }

-    @Override
    public void guessMavenRUIFromIndex(File jarFile, Map<String, String> sourceAndMavenUri) {
        guessMavenRUIFromIndex(jarFile, false, sourceAndMavenUri);

@@ -1302,7 +1301,6 @@ public class LocalLibraryManager implements ILibraryManagerService, IChangedLibr
        buildModulesIndexFromComponentAndExtension(monitorWrap);
    }
    
-    @Override
    public Map<String, String> buildModulesIndexFromComponentAndExtension(IProgressMonitor... monitorWrap) {
        // key: moduleName, value: platformURL
        Map<String, String> platformURLMap = new HashMap<>();
@@ -1417,7 +1415,7 @@ public class LocalLibraryManager implements ILibraryManagerService, IChangedLibr
        }
    }
    
-    public static boolean isExtComponentProvider(String id) {
+   private boolean isExtComponentProvider(String id) {
       if ("org.talend.designer.components.model.UserComponentsProvider".equals(id)
               || "org.talend.designer.codegen.components.model.SharedStudioUserComponentProvider".equals(id)
               || "org.talend.designer.components.exchange.ExchangeComponentsProvider".equals(id)
@@ -1747,7 +1745,6 @@ public class LocalLibraryManager implements ILibraryManagerService, IChangedLibr
        return isSameFile(jarFile, jarInLib);
    }

-    @Override
    public boolean isSameFile(File f1, File f2) {
        if (f1 == null || f2 == null) {
            return false;
--- a/main/plugins/org.talend.metadata.managment.ui/src/main/java/messages_fr.properties
+++ b/main/plugins/org.talend.metadata.managment.ui/src/main/java/messages_fr.properties
@@ -510,10 +510,12 @@ InegerCellEditorListener.NumeralMessage=Valeur d'entr\u00E9e invalide
 MetadataTalendTypeEditor.button.edit=Mo&difier
 MetadataTalendTypeEditor.button.export=E&xporter
 MetadataTalendTypeEditor.button.import=I&mporter
+MetadataTalendTypeEditor.button.restore=R&estaurer
 MetadataTalendTypeEditor.column1.Name=Fichier de mapping de m\u00E9tadonn\u00E9es
 MetadataTalendTypeEditor.editMappingDialog.title=Modifier le fichier de mapping
 MetadataTalendTypeEditor.error.message=Message d'erreur
 MetadataTalendTypeEditor.fileIsImported=Le fichier a d\u00E9j\u00E0 \u00E9t\u00E9 import\u00E9.
+MetadataTalendTypeEditor.fileOverwrite=Ce fichier existe d\u00E9j\u00E0. L'\u00E9craser\u00A0?
 MetadataTalendTypeEditor.fileIsInvalid=Le fichier de m\u00E9tadonn\u00E9es import\u00E9 n'est pas valide.
 MetadataTalendTypeEditor.fileNameStartRule=Le nom de fichier doit commencer par 'mapping_'.
 ContextModeSelectPage.contextModes=Cr\u00E9er un contexte ou r\u00E9utiliser le contexte existant
@@ -549,5 +551,5 @@ MetadataTalendTypeEditor.confirmMessage=Voulez-vous remplacer les param\u00E8tre
 PromptDialog.title=Ex\u00E9cuter le contexte {0} avec les param\u00E8tres\u00A0:
 PromptDialog.stringTip=Le texte d'entr\u00E9e doit \u00EAtre entour\u00E9 par des guillemets.
 PromptDialog.choose.title=Choisissez un contexte
-PromptDialog.variablePrompts.name=Variables
+PromptDialog.variablePrompts.name=Variables \u00E0 compl\u00E9ter
 PromptDialog.context.environments.name=Environnement
--- a/main/plugins/org.talend.metadata.managment/plugin.xml
+++ b/main/plugins/org.talend.metadata.managment/plugin.xml
@@ -14,7 +14,7 @@
      <!-- Seems those 3 are not useful -->
      <classloader
            index="HIVE:HORTONWORKS:HDP_1_0:EMBEDDED"
-            libraries="hive-hbase-handler-0.9.0.jar;hbase-0.92.0.jar;hadoop-core-1.0.3.jar;commons-logging-1.0.4.jar;datanucleus-api-jdo-3.0.7.jar;datanucleus-core-3.0.9.jar;datanucleus-rdbms-3.0.8.jar;hive-builtins-0.9.0.jar;hive-exec-0.9.0_hdp.jar;hive-jdbc-0.9.0_hdp.jar;hive-metastore-0.9.0_hdp.jar;hive-service-0.9.0_hdp.jar;libfb303-0.7.0.jar;libthrift-0.7.0.jar;commons-lang-2.4.jar;antlr-runtime-3.0.1.jar;commons-dbcp-1.4.jar;commons-pool-1.5.4.jar;derby-10.4.2.0.jar;commons-configuration-1.6.jar;jdo2-api-2.3-ec.jar;reload4j-1.2.19.jar;slf4j-api-1.6.1.jar;slf4j-log4j12-1.6.1.jar;jackson-core-asl-1.8.8.jar;jackson-mapper-asl-1.8.8.jar">
+            libraries="hive-hbase-handler-0.9.0.jar;hbase-0.92.0.jar;hadoop-core-1.0.3.jar;commons-logging-1.0.4.jar;datanucleus-api-jdo-3.0.7.jar;datanucleus-core-3.0.9.jar;datanucleus-rdbms-3.0.8.jar;hive-builtins-0.9.0.jar;hive-exec-0.9.0_hdp.jar;hive-jdbc-0.9.0_hdp.jar;hive-metastore-0.9.0_hdp.jar;hive-service-0.9.0_hdp.jar;libfb303-0.7.0.jar;libthrift-0.7.0.jar;commons-lang-2.4.jar;antlr-runtime-3.0.1.jar;commons-dbcp-1.4.jar;commons-pool-1.5.4.jar;derby-10.4.2.0.jar;commons-configuration2-2.8.0.jar;jdo2-api-2.3-ec.jar;reload4j-1.2.19.jar;slf4j-api-1.6.1.jar;slf4j-log4j12-1.6.1.jar;jackson-core-asl-1.8.8.jar;jackson-mapper-asl-1.8.8.jar">
      </classloader>
      <classloader
            index="HIVE:AMAZON_EMR:MapR_EMR:STANDALONE"
@@ -116,14 +116,6 @@
            name="sajdbc4-17.0.0.jar"
            required="true">
      </libraryNeeded>
-      <libraryNeeded
-            context="Microsoft wizard"
-            language="java"
-            message="Needed for create Microsoft connection"
-            mvn_uri="mvn:com.microsoft.sqlserver/mssql-jdbc/actual"
-            name="mssql-jdbc-actual.jar"
-            required="true">
-      </libraryNeeded>
      <libraryNeeded
            context="plugin:org.talend.metadata.managment"
            language="java"
--- a/main/plugins/org.talend.resources/resources/demoprojects/DI_DEMOs.zip
+++ b/main/plugins/org.talend.resources/resources/demoprojects/DI_DEMOs.zip
--- a/test/plugins/org.talend.core.runtime.test/src/org/talend/core/model/general/ModuleNeededTest.java
+++ b/test/plugins/org.talend.core.runtime.test/src/org/talend/core/model/general/ModuleNeededTest.java
@@ -166,20 +166,4 @@ public class ModuleNeededTest {
        Assert.assertEquals("mysql-connector-java-5.1.30-bin.jar", moduleNeeded.getModuleName());
    }

-    @Test
-    public void testSetMavenUri() {
-        String moduleValue = "sajdbc4-17.0.0.jar";
-        String mavenURI = "mvn:sap.jdbc4.sqlanywhere/sajdbc4/17.0.0";
-        ModuleNeeded moduleNeeded = new ModuleNeeded(null, null, true, mavenURI);
-        moduleNeeded.setMavenUri(mavenURI);
-        Assert.assertEquals(moduleValue, moduleNeeded.getModuleName());
-
-
-        moduleValue = "talend-codegen-utils.jar";
-        mavenURI = "mvn:org.talend.libraries/talend-codegen-utils/0.31.0";
-        moduleNeeded = new ModuleNeeded(null, null, true, mavenURI);
-        moduleNeeded.setMavenUri(mavenURI);
-        Assert.assertEquals(moduleValue, moduleNeeded.getModuleName());
-    }
-
 }
Author	SHA1	Message	Date
AlixMetivier	b528a033fa	Revert "feat(TBD-13810): add dynamic schema on thdfsinputformat components (#5442 )" This reverts commit `a5df51204e`.	2022-08-18 10:02:06 +02:00
jiezhang-tlnd	dc687f1a50	Revert "feat(TUP-35808)Generate module name from maven url (#5425 )" (#5536 ) This reverts commit `4c0b9c6f91`.	2022-08-11 15:03:30 +08:00
hzhao-talendbj	14a610a72b	fix(TUP-36341): Unable to run DQ reports with subjob+joblet on a cloud (#5517 ) * fix(TUP-36341): Unable to run DQ reports with subjob+joblet on a cloud * fix(TUP-36341): Unable to run DQ reports with subjob+joblet on a cloud * (TUP-36341): Unable to run DQ reports with subjob+joblet on a cloud	2022-08-09 16:21:30 +08:00
zyuan-talend	153a831b0b	fix(TUP-35909):add missed context items for demo. (#5518 )	2022-08-09 11:12:08 +08:00
hcyi	2bcc470833	fix(TUP-36012):CVE:com.h2database:h2:2.1.210 (#5454 )	2022-08-09 11:00:19 +08:00
ypiel	88d10b08ec	Chore: bump tck 1.47.0 on maintenance 8.0 (#5491 ) * bump to component-runtime 1.47.1 Co-authored-by: Emmanuel GALLOIS <egallois@talend.com>	2022-08-08 13:42:28 +02:00
jiezhang-tlnd	5687315bd2	fix(TUP-36127)Upgrade commons-configuration to 2.8.0 (#5514 ) * fix(TUP-36127)Upgrade commons-configuration to 2.8.0 * exclude commons-configuration2 * chore(TUP-36127) exclude commons-configuration2 * add dependency commons-text	2022-08-08 14:09:34 +08:00
wang wei	7cfce8de2a	fix(TDI-48203): fix for microservice case (#5526 )	2022-08-05 15:05:42 +08:00
Jane Ding	da7f173be2	feat(TUP-35644):tMap - possible simplified metrics to send to Pendo (#5524 ) https://jira.talendforge.org/browse/TUP-35644	2022-08-05 10:08:26 +08:00
jiezhang-tlnd	f5a6347377	Add localized files (#5520 ) (#5523 ) Co-authored-by: jenkins-git <jenkins-git@talend.com> Co-authored-by: Alexiane Yvonet <ayvonet@talend.com> Co-authored-by: jenkins-git <jenkins-git@talend.com>	2022-08-04 17:17:37 +08:00