Revert "fix(TUP-37227):Issue building when items names too long (#5941)" (#6020)

This reverts commit 8d3832fdfb.

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

@@ -88,8 +88,8 @@ 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.9.jar", "oauth2-oidc-sdk-9.7.jar",
-                    "json-smart-2.4.9.jar", "nimbus-jose-jwt-9.22.jar", "javax.mail-1.6.2.jar", "reload4j-1.2.19.jar",
-                    "accessors-smart-2.4.9.jar", "asm-9.5.jar", "content-type-2.1.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$
     VERTICA_7_1_X(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 7.1.X (Deprecated)", "VERTICA_7_1_X", "vertica-jdbc-7.1.2-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/context/ContextUtils.java

@@ -951,14 +951,6 @@ public class ContextUtils {
             params.add(param);
         }
 
-        public boolean remove(Item item, String param) {
-            Set<String> params = map.get(item);
-            if (params != null && params.contains(param)) {
-                return params.remove(param);
-            }
-            return false;
-        }
-
         @SuppressWarnings("unchecked")
         public Set<String> get(Item item) {
             Set<String> params = map.get(item);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/utils/TalendPropertiesUtil.java

@@ -79,8 +79,4 @@ public final class TalendPropertiesUtil {
     public static String getProductApp() {
         return System.getProperty(PROD_APP);
     }
-
-    public static boolean isEnabledUseShortJobletName() {
-        return isEnabled("talend.job.build.useShortJobletName"); //$NON-NLS-1$
-    }
 }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/token/TokenInforUtil.java

@@ -134,7 +134,7 @@ public final class TokenInforUtil {
                     targetArray = new JSONArray();
                     Map<String,List<JSONObject>> objectMap = new HashMap<String,List<JSONObject>>();
                     for (Object obj : data) {
-                        if((obj instanceof JSONObject) && ((JSONObject)obj).has("component_name") && ((JSONObject)obj).get("component_name")!=null){//$NON-NLS-1$
+                        if((obj instanceof JSONObject) && ((JSONObject)obj).get("component_name")!=null){//$NON-NLS-1$
                             List<JSONObject> dataList = new ArrayList<JSONObject>();
                             String componentName = (String) ((JSONObject)obj).get("component_name");//$NON-NLS-1$
                             if(objectMap.containsKey(componentName)){

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

@@ -42,7 +42,7 @@
 			<dependency>
                 <groupId>org.json</groupId>
                 <artifactId>json</artifactId>
-                <version>20230227</version>
+                <version>20140107</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.dataformat</groupId>

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.23</tacokit.components.version>
+		<tacokit.components.version>1.27.20</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.9</tcomp.version>
+        <tcomp.version>1.38.8</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.metadata.managment/plugin.xml

@@ -48,9 +48,9 @@
             context="plugin:org.talend.metadata.managment"
             language="java"
             message="Needed for create snowflake connection"
-            mvn_uri="mvn:net.snowflake/snowflake-jdbc/3.13.29"
-            name="snowflake-jdbc-3.13.29.jar"
-            required="true">
+            mvn_uri="mvn:net.snowflake/snowflake-jdbc/3.11.0"
+            name="snowflake-jdbc-3.11.0.jar"
+            required="false">
       </libraryNeeded>
       <libraryNeeded
             context="plugin:org.talend.metadata.managment"
@@ -148,33 +148,6 @@
             required="true"
             uripath="platform:/plugin/org.talend.libraries.jdbc.hsql/lib/hsqldb.jar">
       </libraryNeeded>
-      <libraryNeeded
-            context="plugin:org.talend.metadata.managment"
-            language="java"
-            message="Needed for create Microsoft SQL Server db connection"
-            mvn_uri="mvn:net.minidev/json-smart/2.4.9"
-            name="json-smart-2.4.9.jar"
-            required="true"
-            uripath="platform:/plugin/org.talend.libraries.tis.custom/lib/json-smart-2.4.9.jar">
-     </libraryNeeded>
-     <libraryNeeded
-           context="plugin:org.talend.metadata.managment"
-           language="java"
-           message="Needed for create Microsoft SQL Server db connection"
-           mvn_uri="mvn:net.minidev/accessors-smart/2.4.9"
-           name="accessors-smart-2.4.9.jar"
-           required="true"
-           uripath="platform:/plugin/org.talend.libraries.tis.custom/lib/accessors-smart-2.4.9.jar">
-     </libraryNeeded>
-     <libraryNeeded
-           context="plugin:org.talend.metadata.managment"
-           language="java"
-           message="Needed for create Microsoft SQL Server db connection"
-           mvn_uri="mvn:org.ow2.asm/asm/9.5"
-           name="asm-9.5.jar"
-           required="true"
-           uripath="platform:/plugin/org.talend.libraries.tis.custom/lib/asm-9.5.jar">
-     </libraryNeeded>
    </extension>
    <extension
          point="org.talend.core.migrationTask">

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

@@ -126,7 +126,7 @@ public class ExtractMetaDataUtils {
 
     public static final String SNOWFLAKE = "Snowflake"; //$NON-NLS-1$
 
-    public static final String SNOWFLAKE_DRIVER_JAR = "snowflake-jdbc-3.13.29.jar"; //$NON-NLS-1$
+    public static final String SNOWFLAKE_DRIVER_JAR = "snowflake-jdbc-3.11.0.jar"; //$NON-NLS-1$
 
     private ExtractMetaDataUtils() {
     }

main/plugins/org.talend.migrationTool/src/org/talend/migrationtool/MigrationToolService.java

@@ -23,7 +23,6 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Stream;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
@@ -241,14 +240,20 @@ public class MigrationToolService implements IMigrationToolService {
         sortMigrationTasks(toExecute);
 
         final List<MigrationTask> done = new ArrayList<MigrationTask>(storedMigrations);
-        boolean hasTaskToExecute = toExecute.stream()
-                .anyMatch(task -> !task.isDeprecated() && MigrationUtil.findMigrationTask(done, task) == null);
+        int nbMigrationsToDo = 0;
+        for (IProjectMigrationTask task : toExecute) {
+            MigrationTask mgTask = MigrationUtil.findMigrationTask(done, task);
+            if (mgTask == null && !task.isDeprecated()) {
+                nbMigrationsToDo++;
+            }
+        }
 
         // force to redo the migration task for the relations only if user ask for "clean" or if relations is empty
         // or if there is at least another migration to do.
-        if (!beforeLogon && (!RelationshipItemBuilder.INDEX_VERSION.equals(project.getEmfProject().getItemsRelationVersion())
-                || hasTaskToExecute)) {
+        if (!beforeLogon
+                && (!RelationshipItemBuilder.INDEX_VERSION.equals(project.getEmfProject().getItemsRelationVersion()) || nbMigrationsToDo > 0)) {
             // force to redo this migration task, to make sure the relationship is done correctly
+            // done.remove(RELATION_TASK);
             MigrationUtil.removeMigrationTaskById(done, RELATION_TASK);
             RelationshipItemBuilder.getInstance().unloadRelations();
 
@@ -259,37 +264,41 @@ public class MigrationToolService implements IMigrationToolService {
                     RelationshipItemBuilder.JOBLET_RELATION, true);
             // reset
             RelationshipItemBuilder.getInstance().unloadRelations();
-            hasTaskToExecute = true;
-        }
 
-        boolean checkDupContext = !beforeLogon && Boolean.getBoolean("duplicate.context.reference.check");
-        if (!hasTaskToExecute && !checkDupContext) {
+            nbMigrationsToDo++;
+        }
+        if (nbMigrationsToDo == 0) {
             return;
         }
 
-        if (checkDupContext) {
-            MigrationUtil.removeMigrationTaskById(done,
-                    "org.talend.repository.model.migration.RemoveDuplicateContextReferencesMigrationTask");
-        }
-        if (hasTaskToExecute) {
-            // force execute migration in case user copy-past items with diffrent path on the file system and refresh
-            // the studio,it may cause bug TDI-19229
-            MigrationUtil.removeMigrationTaskById(done, "org.talend.repository.model.migration.FixProjectResourceLink");
-            // force to re-generate all job poms
-            MigrationUtil.removeMigrationTaskById(done, "org.talend.repository.model.migration.GenerateJobPomMigrationTask");
+        // force execute migration in case user copy-past items with diffrent path on the file system and refresh
+        // the studio,it may cause bug TDI-19229
+        MigrationUtil.removeMigrationTaskById(done, "org.talend.repository.model.migration.FixProjectResourceLink");
+        // force to re-generate all job poms
+        MigrationUtil.removeMigrationTaskById(done, "org.talend.repository.model.migration.GenerateJobPomMigrationTask");
 
-            if (beforeLogon) {
-                // for every migration, force reset to default maven template
-                MigrationUtil.removeMigrationTaskById(done,
-                        "org.talend.repository.model.migration.ResetMavenTemplateMigrationTask");
+        if (beforeLogon) {
+            // for every migration, force reset to default maven template
+            MigrationUtil.removeMigrationTaskById(done, "org.talend.repository.model.migration.ResetMavenTemplateMigrationTask");
+        }
+
+        boolean haveAnyBinFolder = false; // to avoid some problems of migration, sometimes
+        for (ERepositoryObjectType type : (ERepositoryObjectType[]) ERepositoryObjectType.values()) {
+            if (!type.hasFolder()) {
+                continue;
             }
-            boolean hasBinFolder = Stream.of((ERepositoryObjectType[]) ERepositoryObjectType.values())
-                    .filter(type -> type.hasFolder()).map(ERepositoryObjectType::getFolderName).filter(StringUtils::isNotBlank)
-                    .map(folderName -> fsProject.getFolder(folderName))
-                    .anyMatch(folder -> folder.exists() && folder.getFolder("bin").exists());
-            if (hasBinFolder) {
-                MigrationUtil.removeMigrationTaskById(done, "org.talend.repository.model.migration.RemoveBinFolderMigrationTask");
+            String folderName = ERepositoryObjectType.getFolderName(type);
+            if (folderName == null || "".equals(folderName)) {
+                continue;
             }
+            IFolder folder = fsProject.getFolder(folderName);
+            if (folder.exists() && folder.getFolder("bin").exists()) { //$NON-NLS-1$
+                haveAnyBinFolder = true;
+                break;
+            }
+        }
+        if (haveAnyBinFolder) {
+            MigrationUtil.removeMigrationTaskById(done, "org.talend.repository.model.migration.RemoveBinFolderMigrationTask");
         }
 
         final SubProgressMonitor subProgressMonitor = new SubProgressMonitor(monitorWrap, toExecute.size());

main/plugins/org.talend.repository.view.example/components/tExampleComponent/tExampleComponent_java.xml

@@ -201,8 +201,8 @@ SHOW_IF="USE_FILE_AMBIGUOUS=='true'">
 	<CODEGENERATION>
 		<IMPORTS>
 			<IMPORT NAME="Talen File Enhanced"
-				MODULE="talend_file_enhanced-1.3.jar"
-				MVN="mvn:org.talend.components.lib/talend_file_enhanced/1.3" REQUIRED="true" />
+				MODULE="talend_file_enhanced-1.1.jar"
+				MVN="mvn:org.talend.components.lib/talend_file_enhanced/1.1" REQUIRED="true" />
 			<IMPORT NAME="Talend_CSV" MODULE="talendcsv.jar"
 				MVN="mvn:org.talend.libraries/talendcsv/6.0.0"
 				REQUIRED="true" />