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

* fix(TDI-48676):ResumeUtil OOM

* replace duplicate variable

main/features/org.talend.fragment.jars.common.feature/feature.xml

@@ -56,5 +56,12 @@
          install-size="0"
          version="0.0.0"
          unpack="true"/>
+         
+   <plugin
+         id="org.talend.signon.util"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>    
 
 </feature>

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/exception/MessageBoxExceptionHandler.java

@@ -72,12 +72,27 @@ public final class MessageBoxExceptionHandler {
         }
     }
 
+    public static void process(Throwable ex, Shell shell, boolean wrapMessage) {
+        CommonExceptionHandler.process(ex);
+
+        if (CommonsPlugin.isHeadless() || CommonsPlugin.isJUnitTest()) {
+            return;
+        }
+
+        if (shell != null) {
+            showMessage(ex, shell, wrapMessage);
+        }
+    }
+
+    public static void showMessage(Throwable ex, Shell shell) {
+        showMessage(ex, shell, true);
+    }
     /**
      * Open a message box showing a generic message and exception message.
      *
      * @param ex - exception to show
      */
-    public static void showMessage(Throwable ex, Shell shell) {
+    public static void showMessage(Throwable ex, Shell shell, boolean wrapMessage) {
         if (ex.equals(lastShowedAction)) {
             return;
         }
@@ -85,10 +100,14 @@ public final class MessageBoxExceptionHandler {
 
         // TODO smallet use ErrorDialogWidthDetailArea ?
         String title = Messages.getString("commons.error"); //$NON-NLS-1$
-        String msg = Messages.getString("exception.errorOccured", ex.getMessage()); //$NON-NLS-1$
+        String excepMsg = ex.getMessage();
         //add for tup-19726/19790, as for exception detailMessage will show more details on log area.
         if(ex.getCause()!=null) {
-        	msg = Messages.getString("exception.errorOccured", ex.getCause().getMessage()); //$NON-NLS-1$
+            excepMsg = ex.getCause().getMessage();
+        }
+        String msg = Messages.getString("exception.errorOccured", excepMsg); //$NON-NLS-1$
+        if (!wrapMessage) {
+            msg = Messages.getString("exception.message", excepMsg); //$NON-NLS-1$
         }
         Priority priority = CommonExceptionHandler.getPriority(ex);
 

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/i18n/messages.properties

@@ -114,6 +114,7 @@ TableViewerCreator.Table.BeNull=table is null
 TableViewerCreator.TableColumn.AssertMsg=The TableColumn of TableEditorColumn with idProperty '{0}' has not the correct Table parent
 TreeToTablesLinker.Type.Unsupported=This type of currentControl is unsupported
 commons.error=Error
+exception.message={0}\nSee log for more details.
 exception.errorOccured=An error occured ({0}).\nSee log for more details.
 ModelSelectionDialog.Message=Please choose one option, or cancel.
 ModelSelectionDialog.Option=option

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/i18n/messages_fr.properties

@@ -114,6 +114,7 @@ TableViewerCreator.Table.BeNull=la table est null.
 TableViewerCreator.TableColumn.AssertMsg=La TableColumn de TableEditorColumn avec idProperty '{0}' n'a pas la bonne Table parente
 TreeToTablesLinker.Type.Unsupported=Ce type de currentControl n'est pas support\u00E9
 commons.error=Erreur
+exception.message={0}\nConsultez le log pour plus de d\u00E9tails.
 exception.errorOccured=Une erreur est survenue ({0}).\nConsultez le log pour plus de d\u00E9tails.
 ModelSelectionDialog.Message=S\u00E9lectionnez une option ou annulez.
 ModelSelectionDialog.Option=Option

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/i18n/messages_ja.properties

@@ -114,6 +114,7 @@ TableViewerCreator.Table.BeNull=\u30C6\u30FC\u30D6\u30EB\u304CNULL\u3067\u3059
 TableViewerCreator.TableColumn.AssertMsg=idProperty'{0}'\u304C\u3042\u308BTableEditorColumn\u306ETableColumn\u306B\u306F\u3001\u6B63\u3057\u3044\u89AA\u30C6\u30FC\u30D6\u30EB\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u305B\u3093
 TreeToTablesLinker.Type.Unsupported=currentControl\u306E\u3053\u306E\u30BF\u30A4\u30D7\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093
 commons.error=\u30A8\u30E9\u30FC
+exception.message={0}\n\u8A73\u7D30\u306F\u30ED\u30B0\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 exception.errorOccured=\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F({0})\u3002\n\u8A73\u7D30\u306F\u30ED\u30B0\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 ModelSelectionDialog.Message=\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\uFF11\u3064\u9078\u629E\u3059\u308B\u304B\u3001\u30AD\u30E3\u30F3\u30BB\u30EB\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 ModelSelectionDialog.Option=\u30AA\u30D7\u30B7\u30E7\u30F3

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/i18n/messages_zh_CN.properties

@@ -114,6 +114,7 @@ TableViewerCreator.Table.BeNull=\u8868\u4E3A null
 TableViewerCreator.TableColumn.AssertMsg=TableEditorColumn \u7684 idProperty \u4E3A '{0}' \u7684 TableColumn \u6CA1\u6709\u6B63\u786E\u7684 Table \u7236\u9879
 TreeToTablesLinker.Type.Unsupported=\u4E0D\u652F\u6301\u8FD9\u79CD\u7C7B\u578B\u7684 currentControl
 commons.error=\u9519\u8BEF
+exception.message={0}\n\u8BF7\u67E5\u770B\u65E5\u5FD7\u4EE5\u83B7\u53D6\u66F4\u591A\u8BE6\u7EC6\u4FE1\u606F\u3002
 exception.errorOccured=\u51FA\u73B0\u9519\u8BEF ({0})\u3002\n\u8BF7\u67E5\u770B\u65E5\u5FD7\u4EE5\u83B7\u53D6\u66F4\u591A\u8BE6\u7EC6\u4FE1\u606F\u3002
 ModelSelectionDialog.Message=\u8BF7\u9009\u62E9\u4E00\u4E2A\u9009\u9879\u6216\u53D6\u6D88\u3002
 ModelSelectionDialog.Option=\u9009\u9879

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/image/ImageUtils.java

@@ -16,8 +16,14 @@ import java.io.BufferedOutputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.SWT;
@@ -158,8 +164,35 @@ public class ImageUtils {
         return imageDes;
     }
 
-    private static Map<byte[], ImageDataProvider> imageFromDataCachedImages = new HashMap<byte[], ImageDataProvider>();
+    private static Map<byte[], ImageDataProvider> imageFromDataCachedImages = Collections.synchronizedMap(new HashMap<byte[], ImageDataProvider>());
+    private static Map<Long, byte[]> cachedImagesTimeKeeping = Collections.synchronizedMap(new HashMap<Long, byte[]>());
+    
+    private static Thread clearImageFromDataCachedImages = new Thread() {
+        @SuppressWarnings("static-access")
+        public void run() {
+            long timeout = 5 * 60 * 1000;
+            while(true) {//remove older than 5 mins
+                Set<Entry<Long, byte[]>> collect = cachedImagesTimeKeeping.entrySet().stream()
+                        .filter(entry -> (System.currentTimeMillis() - entry.getKey()) > timeout).collect(Collectors.toSet());
+                for(Entry<Long, byte[]> entry: collect) {
+                    Long key = entry.getKey();
+                    cachedImagesTimeKeeping.remove(key);
+                    imageFromDataCachedImages.remove(entry.getValue());
+                }
+                
+                try {
+                    sleep(timeout);
+                } catch (InterruptedException e) {//
+                }
+            }
+        };
+    };
 
+    static {
+        clearImageFromDataCachedImages.setDaemon(true);
+        clearImageFromDataCachedImages.start();
+    }
+    
     /**
      * By default, keep in memory the .
      *
@@ -169,12 +202,17 @@ public class ImageUtils {
      */
     public static ImageDescriptor createImageFromData(byte[] data, boolean... keepInMemory) {
         if (data != null) {
-            ImageDataProvider imageProvider = imageFromDataCachedImages.get(data);
+            ImageDataProvider imageProvider = null;
+            Optional<byte[]> findKey = imageFromDataCachedImages.keySet().stream().filter(key->Arrays.equals(key, data)).findAny();
+            if(findKey.isPresent()) {
+                imageProvider = imageFromDataCachedImages.get(findKey.get());
+            }
             if (imageProvider == null) {
                 ByteArrayInputStream bais = new ByteArrayInputStream(data);
                 ImageData img = new ImageData(bais);
                 imageProvider = new TalendImageProvider(img);
                 imageFromDataCachedImages.put(data, imageProvider);
+                cachedImagesTimeKeeping.put(System.currentTimeMillis(), data);
             }
             return ImageDescriptor.createFromImageDataProvider(imageProvider);
         }
@@ -183,8 +221,9 @@ public class ImageUtils {
 
     public static void disposeImages(byte[] data) {
         if (data != null) {
-            if (imageFromDataCachedImages.get(data) != null) {
-                imageFromDataCachedImages.remove(data);
+            Optional<byte[]> findKey = imageFromDataCachedImages.keySet().stream().filter(key->Arrays.equals(key, data)).findAny();
+            if(findKey.isPresent()) {
+                imageFromDataCachedImages.remove(findKey.get());
             }
         }
     }

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/utils/ZipFileUtils.java

@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Enumeration;
 import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
 import java.util.jar.JarOutputStream;
 
 import org.apache.tools.zip.ZipEntry;
@@ -169,8 +170,52 @@ public class ZipFileUtils {
             inputStream.close();
         }
     }
+    
+    public static void unZipFileEntry(File destFile, java.util.zip.ZipFile zipFile, java.util.zip.ZipEntry entry) throws IOException {
+        InputStream inputStream;
+        FileOutputStream fileOut;
+        if (entry.isDirectory()) {
+            destFile.mkdirs();
+        } else {
+            File parent = destFile.getParentFile();
+            if (parent != null && !parent.exists()) {
+                parent.mkdirs();
+            }
+
+            inputStream = zipFile.getInputStream(entry);
+
+            fileOut = new FileOutputStream(destFile);
+            byte[] buf = new byte[bufSize];
+            int readedBytes;
+            while ((readedBytes = inputStream.read(buf)) > 0) {
+                fileOut.write(buf, 0, readedBytes);
+            }
+            fileOut.close();
+
+            inputStream.close();
+        }
+    }
 
     public void setBufSize(int bufSize) {
         ZipFileUtils.bufSize = bufSize;
     }
+    
+    public static boolean isValidJarFile(String moduleFilePath) {
+        if (moduleFilePath == null) {
+            return false;
+        }
+
+        if (!new File(moduleFilePath).exists()) {
+            return false;
+        }
+
+        try (JarFile zip = new JarFile(moduleFilePath)) {
+            zip.getManifest();
+        } catch (IOException e) {
+            return false;
+        }
+
+        return true;
+    }
+
 }

main/plugins/org.talend.commons.runtime/pom_server.xml

@@ -97,7 +97,7 @@
         <dependency>
             <groupId>ch.qos.reload4j</groupId>
             <artifactId>reload4j</artifactId>
-            <version>1.2.19</version>
+            <version>1.2.22</version>
         </dependency>
     </dependencies>
 

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/system/EclipseCommandLine.java

@@ -96,7 +96,9 @@ public class EclipseCommandLine {
     static public final String PROP_KEY_PROFILE_ID = "eclipse.p2.profile";
 
     static public final String ARG_BRANCH = "-branch";
-
+    
+    static public final String ARG_PROJECT = "-project";
+    
     static public final String LOGIN_ONLINE_UPDATE = "--loginOnlineUpdate";
 
     static public final String ARG_TALEND_BUNDLES_CLEANED = "-talend.studio.bundles.cleaned"; //$NON-NLS-1$

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/dialogs/IConfigModuleDialog.java

@@ -12,6 +12,8 @@
 // ============================================================================
 package org.talend.commons.ui.swt.dialogs;
 
+import java.util.Map;
+
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.RGB;
 import org.talend.commons.ui.utils.image.ColorUtils;
@@ -29,5 +31,7 @@ public interface IConfigModuleDialog {
     public String getMavenURI();
 
     public int open();
+    
+    public Map<String, String> getModulesMVNUrls();
 
 }

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/constants/FileConstants.java

@@ -19,6 +19,8 @@ import org.talend.repository.model.RepositoryConstants;
  */
 public interface FileConstants {
 
+    String DOT = ".";
+
     String OLD_TALEND_PROJECT_FILENAME = "talendProject"; //$NON-NLS-1$
 
     String LOCAL_PROJECT_FILENAME = "talend.project"; //$NON-NLS-1$
@@ -112,5 +114,4 @@ public interface FileConstants {
     String TALEND_FOLDER_NAME = "TALEND-INF"; //$NON-NLS-1$
     
     String MAVEN_FOLDER_NAME = "MAVEN-INF";
-
 }

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/PendoItemSignatureManager.java

@@ -27,10 +27,6 @@ import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Level;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.core.ICoreService;
 import org.talend.core.PluginChecker;
@@ -39,22 +35,22 @@ import org.talend.core.model.properties.RoutineItem;
 import org.talend.core.model.properties.SQLPatternItem;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.model.repository.IRepositoryViewObject;
+import org.talend.core.pendo.AbstractPendoTrackManager;
+import org.talend.core.pendo.PendoDataTrackFactory;
 import org.talend.core.pendo.PendoItemSignatureUtil;
 import org.talend.core.pendo.PendoItemSignatureUtil.SignatureStatus;
 import org.talend.core.pendo.PendoItemSignatureUtil.TOSProdNameEnum;
 import org.talend.core.pendo.PendoItemSignatureUtil.ValueEnum;
 import org.talend.core.pendo.PendoTrackDataUtil;
-import org.talend.core.pendo.PendoTrackDataUtil.TrackEvent;
-import org.talend.core.pendo.PendoTrackSender;
+import org.talend.core.pendo.TrackEvent;
+import org.talend.core.pendo.properties.IPendoDataProperties;
 import org.talend.core.pendo.properties.PendoSignLogonProperties;
 import org.talend.utils.migration.MigrationTokenUtil;
 
 /**
  * DOC jding  class global comment. Detailled comment
  */
-public class PendoItemSignatureManager {
-
-    private PendoSignLogonProperties itemSignProperties = new PendoSignLogonProperties();
+public class PendoItemSignatureManager extends AbstractPendoTrackManager {
 
     private static PendoItemSignatureManager manager;
 
@@ -63,7 +59,7 @@ public class PendoItemSignatureManager {
     static {
         manager = new PendoItemSignatureManager();
         try {
-            isTrackAvailable = PluginChecker.isTIS() && PendoTrackSender.getInstance().isTrackSendAvailable();
+            isTrackAvailable = PluginChecker.isTIS() && PendoDataTrackFactory.getInstance().isTrackSendAvailable();
         } catch (Exception e) {
             ExceptionHandler.process(e, Level.WARN);
         }
@@ -87,11 +83,12 @@ public class PendoItemSignatureManager {
         }
     }
 
-    public void collectProperties() {
+    public IPendoDataProperties collectProperties() {
         ICoreService coreService = ICoreService.get();
         if (coreService == null || !isTrackAvailable) {
-            return;
+            return null;
         }
+        PendoSignLogonProperties itemSignProperties = new PendoSignLogonProperties();
         try {
             itemSignProperties.setSignByMigration(signByLoginMigrationItems.size());
 
@@ -188,6 +185,7 @@ public class PendoItemSignatureManager {
         } catch (Exception e) {
             ExceptionHandler.process(e, Level.WARN);
         }
+        return itemSignProperties;
 
     }
 
@@ -258,23 +256,12 @@ public class PendoItemSignatureManager {
         if (!isTrackAvailable) {
             return;
         }
-        Job job = new Job("send pendo track") {
+        super.sendTrackToPendo();
+    }
 
-            @Override
-            protected IStatus run(IProgressMonitor monitor) {
-                try {
-                    collectProperties();
-                    PendoTrackSender.getInstance().sendTrackData(TrackEvent.ITEM_SIGNATURE, itemSignProperties);
-                } catch (Exception e) {
-                    // warning only
-                    ExceptionHandler.process(e, Level.WARN);
-                }
-                return Status.OK_STATUS;
-            }
-        };
-        job.setUser(false);
-        job.setPriority(Job.INTERACTIVE);
-        job.schedule();
+    @Override
+    public TrackEvent getTrackEvent() {
+        return TrackEvent.ITEM_SIGNATURE;
     }
 
 }

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/RepositoryFactoryProvider.java

@@ -1,125 +1,127 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2021 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.repository.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.lang.ArrayUtils;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.swt.events.SelectionListener;
-import org.talend.commons.ui.runtime.exception.ExceptionHandler;
-import org.talend.commons.utils.workbench.extensions.ExtensionImplementationProvider;
-import org.talend.commons.utils.workbench.extensions.ExtensionPointLimiterImpl;
-import org.talend.commons.utils.workbench.extensions.IExtensionPointLimiter;
-import org.talend.core.GlobalServiceRegister;
-import org.talend.core.ui.branding.IBrandingService;
-
-/**
- * Provides, using extension points, implementation of many factories.
- *
- * <ul>
- * <li>IProcessFactory</li>
- * </ul>
- *
- * $Id: RepositoryFactoryProvider.java 38013 2010-03-05 14:21:59Z mhirt $
- */
-public class RepositoryFactoryProvider {
-
-    private static List<IRepositoryFactory> list = null;
-
-    public static final IExtensionPointLimiter REPOSITORY_PROVIDER = new ExtensionPointLimiterImpl(
-            "org.talend.core.repository.repository_provider", //$NON-NLS-1$
-            "RepositoryFactory", 1, -1); //$NON-NLS-1$
-
-    public static List<IRepositoryFactory> getAvailableRepositories() {
-        if (list == null) {
-            list = new ArrayList<IRepositoryFactory>();
-            List<IConfigurationElement> extension = ExtensionImplementationProvider.getInstanceV2(REPOSITORY_PROVIDER);
-            String hiddenRepos = System.getProperty("hidden.repositories"); //$NON-NLS-1$
-            String hiddenRepository[] = new String[]{};
-            if (hiddenRepos != null) {
-                hiddenRepository = hiddenRepos.split(";"); //$NON-NLS-1$
-            }
-
-            boolean isPoweredByTalend = false;
-            IBrandingService brandingService = (IBrandingService) GlobalServiceRegister.getDefault()
-                    .getService(IBrandingService.class);
-            isPoweredByTalend = brandingService.isPoweredbyTalend();
-            for (IConfigurationElement current : extension) {
-                try {
-                    String only4TalendStr = current.getAttribute("only4Talend"); //$NON-NLS-1$
-                    if (Boolean.valueOf(only4TalendStr) && !isPoweredByTalend) {
-                        continue;
-                    }
-                    String only4OemStr = current.getAttribute("only4Oem"); //$NON-NLS-1$
-                    if (Boolean.valueOf(only4OemStr) && isPoweredByTalend) {
-                        continue;
-                    }
-                    IRepositoryFactory currentAction = (IRepositoryFactory) current.createExecutableExtension("class"); //$NON-NLS-1$
-                    currentAction.setId(current.getAttribute("id")); //$NON-NLS-1$
-                    currentAction.setName(current.getAttribute("name")); //$NON-NLS-1$
-                    currentAction.setAuthenticationNeeded(new Boolean(current.getAttribute("authenticationNeeded"))); //$NON-NLS-1$
-                    currentAction.setDisplayToUser(new Boolean(current.getAttribute("displayToUser")).booleanValue()); //$NON-NLS-1$
-
-                    // Getting dynamic login fields:
-                    for (IConfigurationElement currentLoginField : current.getChildren("loginField")) { //$NON-NLS-1$
-                        DynamicFieldBean key = new DynamicFieldBean(currentLoginField.getAttribute("id"), //$NON-NLS-1$
-                                currentLoginField.getAttribute("name"), //$NON-NLS-1$
-                                currentLoginField.getAttribute("defaultValue"), //$NON-NLS-1$
-                                new Boolean(currentLoginField.getAttribute("required")), //$NON-NLS-1$
-                                new Boolean(currentLoginField.getAttribute("password")), //$NON-NLS-1$
-                                Boolean.valueOf(currentLoginField.getAttribute("readonly"))); //$NON-NLS-1$
-                        currentAction.getFields().add(key);
-                    }
-
-                    for (IConfigurationElement currentLoginField : current.getChildren("button")) { //$NON-NLS-1$
-                        DynamicButtonBean key = new DynamicButtonBean(currentLoginField.getAttribute("id"), //$NON-NLS-1$
-                                currentLoginField.getAttribute("name"), //$NON-NLS-1$
-                                (SelectionListener) currentLoginField.createExecutableExtension("selectionListener")); //$NON-NLS-1$
-                        currentAction.getButtons().add(key);
-                    }
-
-                    for (IConfigurationElement currentLoginField : current.getChildren("choiceField")) { //$NON-NLS-1$
-                        DynamicChoiceBean key = new DynamicChoiceBean(currentLoginField.getAttribute("id"), //$NON-NLS-1$
-                                currentLoginField.getAttribute("name")); //$NON-NLS-1$
-                        for (IConfigurationElement currentChoice : currentLoginField.getChildren("choice")) { //$NON-NLS-1$
-                            String value = currentChoice.getAttribute("value"); //$NON-NLS-1$
-                            String label = currentChoice.getAttribute("label"); //$NON-NLS-1$
-                            key.addChoice(value, label);
-                        }
-                        currentAction.getChoices().add(key);
-                    }
-                    if (ArrayUtils.contains(hiddenRepository, currentAction.getId())) {
-                        continue;
-                    }
-                    list.add(currentAction);
-                } catch (CoreException e) {
-                    // e.printStackTrace();
-                    ExceptionHandler.process(e);
-                }
-            }
-        }
-        return list;
-    }
-
-    public static IRepositoryFactory getRepositoriyById(String id) {
-        for (IRepositoryFactory current : getAvailableRepositories()) {
-            if (current.getId().equals(id)) {
-                return current;
-            }
-        }
-        return null;
-    }
-}
+// ============================================================================
+//
+// Copyright (C) 2006-2021 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.repository.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang.ArrayUtils;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.swt.events.SelectionListener;
+import org.talend.commons.CommonsPlugin;
+import org.talend.commons.ui.runtime.exception.ExceptionHandler;
+import org.talend.commons.utils.workbench.extensions.ExtensionImplementationProvider;
+import org.talend.commons.utils.workbench.extensions.ExtensionPointLimiterImpl;
+import org.talend.commons.utils.workbench.extensions.IExtensionPointLimiter;
+import org.talend.core.GlobalServiceRegister;
+import org.talend.core.ui.branding.IBrandingService;
+
+/**
+ * Provides, using extension points, implementation of many factories.
+ *
+ * <ul>
+ * <li>IProcessFactory</li>
+ * </ul>
+ *
+ * $Id: RepositoryFactoryProvider.java 38013 2010-03-05 14:21:59Z mhirt $
+ */
+public class RepositoryFactoryProvider {
+
+    private static List<IRepositoryFactory> list = null;
+
+    public static final IExtensionPointLimiter REPOSITORY_PROVIDER = new ExtensionPointLimiterImpl(
+            "org.talend.core.repository.repository_provider", //$NON-NLS-1$
+            "RepositoryFactory", 1, -1); //$NON-NLS-1$
+
+    public static synchronized List<IRepositoryFactory> getAvailableRepositories() {
+        if (list == null) {
+            list = new ArrayList<IRepositoryFactory>();
+            List<IConfigurationElement> extension = ExtensionImplementationProvider.getInstanceV2(REPOSITORY_PROVIDER);
+            String hiddenRepos = System.getProperty("hidden.repositories"); //$NON-NLS-1$
+            String hiddenRepository[] = new String[]{};
+            if (hiddenRepos != null) {
+                hiddenRepository = hiddenRepos.split(";"); //$NON-NLS-1$
+            }
+
+            boolean isPoweredByTalend = false;
+            IBrandingService brandingService = (IBrandingService) GlobalServiceRegister.getDefault()
+                    .getService(IBrandingService.class);
+            isPoweredByTalend = brandingService.isPoweredbyTalend();
+            for (IConfigurationElement current : extension) {
+                try {
+                    String only4TalendStr = current.getAttribute("only4Talend"); //$NON-NLS-1$
+                    if (Boolean.valueOf(only4TalendStr) && !isPoweredByTalend) {
+                        continue;
+                    }
+                    String only4OemStr = current.getAttribute("only4Oem"); //$NON-NLS-1$
+                    if (Boolean.valueOf(only4OemStr) && isPoweredByTalend) {
+                        continue;
+                    }
+                    IRepositoryFactory currentAction = (IRepositoryFactory) current.createExecutableExtension("class"); //$NON-NLS-1$
+                    currentAction.setId(current.getAttribute("id")); //$NON-NLS-1$
+                    currentAction.setName(current.getAttribute("name")); //$NON-NLS-1$
+                    currentAction.setAuthenticationNeeded(new Boolean(current.getAttribute("authenticationNeeded"))); //$NON-NLS-1$
+                    currentAction.setDisplayToUser(new Boolean(current.getAttribute("displayToUser")).booleanValue()); //$NON-NLS-1$
+
+                    // Getting dynamic login fields:
+                    for (IConfigurationElement currentLoginField : current.getChildren("loginField")) { //$NON-NLS-1$
+                        DynamicFieldBean key = new DynamicFieldBean(currentLoginField.getAttribute("id"), //$NON-NLS-1$
+                                currentLoginField.getAttribute("name"), //$NON-NLS-1$
+                                currentLoginField.getAttribute("defaultValue"), //$NON-NLS-1$
+                                new Boolean(currentLoginField.getAttribute("required")), //$NON-NLS-1$
+                                new Boolean(currentLoginField.getAttribute("password")), //$NON-NLS-1$
+                                Boolean.valueOf(currentLoginField.getAttribute("readonly"))); //$NON-NLS-1$
+                        currentAction.getFields().add(key);
+                    }
+
+                    for (IConfigurationElement currentLoginField : current.getChildren("button")) { //$NON-NLS-1$
+                        DynamicButtonBean key = new DynamicButtonBean(currentLoginField.getAttribute("id"), //$NON-NLS-1$
+                                currentLoginField.getAttribute("name"), //$NON-NLS-1$
+                                (SelectionListener) currentLoginField.createExecutableExtension("selectionListener")); //$NON-NLS-1$
+                        currentAction.getButtons().add(key);
+                    }
+
+                    for (IConfigurationElement currentLoginField : current.getChildren("choiceField")) { //$NON-NLS-1$
+                        DynamicChoiceBean key = new DynamicChoiceBean(currentLoginField.getAttribute("id"), //$NON-NLS-1$
+                                currentLoginField.getAttribute("name")); //$NON-NLS-1$
+                        for (IConfigurationElement currentChoice : currentLoginField.getChildren("choice")) { //$NON-NLS-1$
+                            String value = currentChoice.getAttribute("value"); //$NON-NLS-1$
+                            String label = currentChoice.getAttribute("label"); //$NON-NLS-1$
+                            key.addChoice(value, label);
+                        }
+                        currentAction.getChoices().add(key);
+                    }
+                    if (ArrayUtils.contains(hiddenRepository, currentAction.getId())) {
+                        continue;
+                    }
+                    list.add(currentAction);
+                } catch (CoreException e) {
+                    // e.printStackTrace();
+                    ExceptionHandler.process(e);
+                }
+            }
+        }
+        return list;
+    }
+
+    public static IRepositoryFactory getRepositoriyById(String id) {
+        for (IRepositoryFactory current : getAvailableRepositories()) {
+            if (current.getId().equals(id)) {
+                return current;
+            }
+        }
+        ExceptionHandler.log("Can't find repository factory for: " + id);
+        return null;
+    }
+}

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/utils/TalendResourceSet.java

@@ -48,6 +48,8 @@ import org.talend.commons.runtime.model.emf.provider.EmfResourcesFactoryReader;
  */
 public class TalendResourceSet extends ResourceSetImpl {
 
+    private boolean showLog;
+
     public TalendResourceSet() {
         super();
 
@@ -58,6 +60,14 @@ public class TalendResourceSet extends ResourceSetImpl {
         getLoadOptions().put(XMLResource.OPTION_USE_DEPRECATED_METHODS, Boolean.FALSE);
     }
 
+    public boolean isShowLog() {
+        return this.showLog;
+    }
+
+    public void setShowLog(boolean showLog) {
+        this.showLog = showLog;
+    }
+
     /*
      * (non-Javadoc)
      *
@@ -83,7 +93,13 @@ public class TalendResourceSet extends ResourceSetImpl {
             Resource resource = map.get(uri);
             if (resource != null) {
                 if (loadOnDemand && !resource.isLoaded()) {
-                    demandLoadHelper(resource);
+                    try {
+                        demandLoadHelper(resource);
+                    } catch (Exception e) {
+                        if (showLog) {
+                            throw new RuntimeException(e);
+                        }
+                    }
                 }
                 return resource;
             }
@@ -99,7 +115,13 @@ public class TalendResourceSet extends ResourceSetImpl {
                 }
                 if (theURIConverter.normalize(resource.getURI()).equals(normalizedURI)) {
                     if (loadOnDemand && !resource.isLoaded()) {
-                        demandLoadHelper(resource);
+                        try {
+                            demandLoadHelper(resource);
+                        } catch (Exception e) {
+                            if (showLog) {
+                                throw new RuntimeException(e);
+                            }
+                        }
                     }
 
                     if (map != null) {
@@ -125,7 +147,13 @@ public class TalendResourceSet extends ResourceSetImpl {
                         + "'; a registered resource factory is needed");
             }
 
-            demandLoadHelper(resource);
+            try {
+                demandLoadHelper(resource);
+            } catch (Exception e) {
+                if (showLog) {
+                    throw new RuntimeException(e);
+                }
+            }
 
             if (map != null) {
                 map.put(uri, resource);

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/utils/XmiResourceManager.java

@@ -390,6 +390,10 @@ public class XmiResourceManager {
     }
 
     public Resource getItemResource(ResourceSet resourceSet, Item item, boolean forceLoad) {
+        return getItemResource(getResourceSet(), item, forceLoad, false);
+    }
+
+    public Resource getItemResource(ResourceSet resourceSet, Item item, boolean forceLoad, boolean showLog) {
         if (item == null) {
             return null;
         }
@@ -402,13 +406,23 @@ public class XmiResourceManager {
         } else {
             itemResourceURI = getItemResourceURI(getItemURI(item));
         }
-        Resource itemResource = resourceSet.getResource(itemResourceURI, false);
-        if (forceLoad && itemResource == null) {
-            if (item instanceof FileItem) {
-                itemResource = new ByteArrayResource(itemResourceURI);
-                resourceSet.getResources().add(itemResource);
+        Resource itemResource = null;
+        try {
+            if (resourceSet instanceof TalendResourceSet) {
+                ((TalendResourceSet) resourceSet).setShowLog(showLog);
+            }
+            itemResource = resourceSet.getResource(itemResourceURI, false);
+            if (forceLoad && itemResource == null) {
+                if (item instanceof FileItem) {
+                    itemResource = new ByteArrayResource(itemResourceURI);
+                    resourceSet.getResources().add(itemResource);
+                }
+                itemResource = resourceSet.getResource(itemResourceURI, true);
+            }
+        } catch (Exception e) {
+            if (showLog) {
+                throw new RuntimeException(e);
             }
-            itemResource = resourceSet.getResource(itemResourceURI, true);
         }
         return itemResource;
     }
@@ -628,7 +642,7 @@ public class XmiResourceManager {
 
             boolean isTestContainer = false;
             if (GlobalServiceRegister.getDefault().isServiceRegistered(ITestContainerProviderService.class)) {
-                ITestContainerProviderService testContainerService = (ITestContainerProviderService) GlobalServiceRegister
+                ITestContainerProviderService testContainerService = GlobalServiceRegister
                         .getDefault().getService(ITestContainerProviderService.class);
                 if (testContainerService != null) {
                     isTestContainer = testContainerService.isTestContainerItem(property.getItem());

main/plugins/org.talend.core.runtime/META-INF/MANIFEST.MF

@@ -129,7 +129,8 @@ Require-Bundle: org.eclipse.jdt.core,
  jackson-core-asl,
  org.talend.libraries.jackson,
  org.eclipse.m2e.core,
- org.talend.libraries.apache.common
+ org.talend.libraries.apache.common,
+ org.talend.signon.util
 Bundle-Activator: org.talend.core.runtime.CoreRuntimePlugin
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,

main/plugins/org.talend.core.runtime/src/main/java/org/talend/analysistask/AnalysisReportRecorder.java

@@ -33,6 +33,13 @@ public class AnalysisReportRecorder extends ItemReportRecorder {
         this.detailMessage = detailMessage;
     }
 
+    public AnalysisReportRecorder(IItemAnalysisTask task, SeverityOption severity, String detailMessage) {
+        super();
+        this.task = task;
+        this.severity = severity;
+        this.detailMessage = detailMessage;
+    }
+
     public String getTaskName() {
         return task.getName();
     }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/analysistask/DefaultItemsAnalysisTask.java

@@ -0,0 +1,43 @@
+// ============================================================================
+//
+// 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.analysistask;
+
+import java.util.List;
+import java.util.Set;
+
+import org.talend.core.model.properties.Item;
+import org.talend.core.model.repository.ERepositoryObjectType;
+
+/**
+ * created by hcyi on Oct 26, 2022
+ * Detailled comment
+ *
+ */
+public class DefaultItemsAnalysisTask extends AbstractItemAnalysisTask {
+
+    public DefaultItemsAnalysisTask() {
+    }
+
+
+    @Override
+    public Set<ERepositoryObjectType> getRepositoryObjectTypeScope() {
+        return null;
+    }
+
+    @Override
+    public List<AnalysisReportRecorder> execute(Item item) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/analysistask/ItemAnalysisReportManager.java

@@ -20,6 +20,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.apache.commons.lang.StringUtils;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -50,7 +51,9 @@ import org.talend.core.model.general.Project;
 import org.talend.core.model.properties.Item;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.model.repository.IRepositoryViewObject;
+import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.runtime.i18n.Messages;
+import org.talend.designer.core.IDesignerCoreService;
 import org.talend.repository.ProjectManager;
 import org.talend.repository.model.IProxyRepositoryFactory;
 import org.talend.repository.model.IRepositoryService;
@@ -73,7 +76,7 @@ public class ItemAnalysisReportManager {
     private AtomicBoolean inGenerating = new AtomicBoolean(false);
 
     public List<AnalysisReportRecorder> executeAnalysisTask(Project project) {
-        IRepositoryService service = (IRepositoryService) GlobalServiceRegister.getDefault().getService(IRepositoryService.class);
+        IRepositoryService service = GlobalServiceRegister.getDefault().getService(IRepositoryService.class);
         IProxyRepositoryFactory repFactory = service.getProxyRepositoryFactory();
         List<AnalysisReportRecorder> analysisResultList = new ArrayList<AnalysisReportRecorder>();
         List<IItemAnalysisTask> analysisTasks = ItemAnalysisTaskRegistryReader.getInstance().getItemAnalysisTasks();
@@ -105,6 +108,16 @@ public class ItemAnalysisReportManager {
                     }
                 }
             }
+            //
+            ItemAnalysisTaskRegistryReader.getInstance().getAllItemURIsMap().clear();
+            ItemAnalysisTaskRegistryReader.getInstance().getDuplicatedItemURIsMap().clear();
+            IDesignerCoreService designerCoreService = CoreRuntimePlugin.getInstance().getDesignerCoreService();
+            if (designerCoreService != null) {
+                List<AnalysisReportRecorder> recorder = designerCoreService.analysis(project);
+                if (recorder != null && !recorder.isEmpty()) {
+                    analysisResultList.addAll(recorder);
+                }
+            }
         } catch (Exception e) {
             ExceptionHandler.process(e);
         }
@@ -190,6 +203,42 @@ public class ItemAnalysisReportManager {
         inGenerating.set(newValue);
     }
 
+    public String getCompleteObjectTypePath(ERepositoryObjectType itemType) {
+        ERepositoryObjectType rootItemType = itemType;
+        if (ERepositoryObjectType.JDBC != null && ERepositoryObjectType.JDBC.equals(rootItemType)) {
+            rootItemType = ERepositoryObjectType.METADATA_CONNECTIONS;
+        }
+        List<String> typeLabels = new ArrayList<String>();
+        findOutCompleteTypePath(rootItemType, typeLabels);
+        if (ERepositoryObjectType.PROCESS != null && ERepositoryObjectType.PROCESS.equals(rootItemType)) {
+            IRepositoryService repositoryService = IRepositoryService.get();
+            if (repositoryService != null) {
+                String standardNodeLabel = repositoryService.getStandardNodeLabel();
+                if (StringUtils.isNotBlank(standardNodeLabel)) {
+                    typeLabels.add(standardNodeLabel);
+                }
+            }
+        }
+        StringBuffer buffer = new StringBuffer();
+        if (!typeLabels.isEmpty()) {
+            for (int i = 0; i < typeLabels.size(); i++) {
+                if (i != 0) {
+                    buffer.append("/");
+                }
+                buffer.append(typeLabels.get(i));
+            }
+        }
+        return buffer.toString();
+    }
+
+    public void findOutCompleteTypePath(ERepositoryObjectType type, List<String> typeLabels) {
+        ERepositoryObjectType parentType = ERepositoryObjectType.findParentType(type);
+        if (parentType != null) {
+            findOutCompleteTypePath(parentType, typeLabels);
+        }
+        typeLabels.add(type.getLabel());
+    }
+
 }
 
 class AnalysisReportAccessDialog extends Dialog {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/analysistask/ItemAnalysisTaskRegistryReader.java

@@ -32,6 +32,10 @@ public class ItemAnalysisTaskRegistryReader extends RegistryReader {
 
     private static final ItemAnalysisTaskRegistryReader INSTANCE = new ItemAnalysisTaskRegistryReader();
 
+    private Map<String, String> allItemURIsMap = new HashMap<String, String>();
+
+    private Map<String, List<String>> duplicatedItemURIsMap = new HashMap<String, List<String>>();
+
     public static ItemAnalysisTaskRegistryReader getInstance() {
         return INSTANCE;
     }
@@ -81,4 +85,17 @@ public class ItemAnalysisTaskRegistryReader extends RegistryReader {
         idItemAnalysisTaskMap.clear();
     }
 
+    /**
+     * Getter for allItemURIsMap.
+     * 
+     * @return the allItemURIsMap
+     */
+    public Map<String, String> getAllItemURIsMap() {
+        return this.allItemURIsMap;
+    }
+
+    public Map<String, List<String>> getDuplicatedItemURIsMap() {
+        return this.duplicatedItemURIsMap;
+    }
+
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/commons/report/ItemReportRecorder.java

@@ -12,10 +12,8 @@
 // ============================================================================
 package org.talend.commons.report;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.apache.commons.lang.StringUtils;
+import org.talend.analysistask.ItemAnalysisReportManager;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.core.GlobalServiceRegister;
@@ -23,7 +21,6 @@ import org.talend.core.model.properties.Item;
 import org.talend.core.model.properties.Property;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.ui.ITestContainerCoreService;
-import org.talend.repository.model.IRepositoryService;
 
 /**
  * DOC jding  class global comment. Detailled comment
@@ -34,8 +31,15 @@ public class ItemReportRecorder {
 
     protected String detailMessage;
 
+    protected String currentItemPath;
+
+    protected String currentItemType;
+
     public String getItemType() {
         String type = "";
+        if (item == null) {
+            return currentItemType;
+        }
         ERepositoryObjectType itemType = ERepositoryObjectType.getItemType(item);
         if (itemType != null) {
             if (ERepositoryObjectType.getAllTypesOfTestContainer().contains(itemType)) {
@@ -43,7 +47,7 @@ public class ItemReportRecorder {
                 if (parentJobItem != null) {
                     ERepositoryObjectType parentJobType = ERepositoryObjectType.getItemType(parentJobItem);
                     if (parentJobType != null) {
-                        String parentTypePath = getCompleteObjectTypePath(parentJobType);
+                        String parentTypePath = ItemAnalysisReportManager.getInstance().getCompleteObjectTypePath(parentJobType);
                         if (StringUtils.isNotBlank(parentTypePath)) {
                             type = parentTypePath + "/";
                         }
@@ -51,7 +55,7 @@ public class ItemReportRecorder {
                 }
                 type += itemType;
             } else {
-                type = getCompleteObjectTypePath(itemType);
+                type = ItemAnalysisReportManager.getInstance().getCompleteObjectTypePath(itemType);
             }
         }
         return type;
@@ -59,6 +63,9 @@ public class ItemReportRecorder {
 
     public String getItemPath() {
         String path = "";
+        if (this.currentItemPath != null) {
+            return this.currentItemPath;
+        }
         StringBuffer buffer = new StringBuffer();
         ERepositoryObjectType itemType = ERepositoryObjectType.getItemType(item);
 
@@ -104,42 +111,6 @@ public class ItemReportRecorder {
         return parentJobItem;
     }
 
-    private String getCompleteObjectTypePath(ERepositoryObjectType itemType) {
-        ERepositoryObjectType rootItemType = itemType;
-        if (ERepositoryObjectType.JDBC != null && ERepositoryObjectType.JDBC.equals(rootItemType)) {
-            rootItemType = ERepositoryObjectType.METADATA_CONNECTIONS;
-        }
-        List<String> typeLabels = new ArrayList<String>();
-        findOutCompleteTypePath(rootItemType, typeLabels);
-        if (ERepositoryObjectType.PROCESS != null && ERepositoryObjectType.PROCESS.equals(rootItemType)) {
-            IRepositoryService repositoryService = IRepositoryService.get();
-            if (repositoryService != null) {
-                String standardNodeLabel = repositoryService.getStandardNodeLabel();
-                if (StringUtils.isNotBlank(standardNodeLabel)) {
-                    typeLabels.add(standardNodeLabel);
-                }
-            }
-        }
-        StringBuffer buffer = new StringBuffer();
-        if (!typeLabels.isEmpty()) {
-            for (int i = 0; i < typeLabels.size(); i++) {
-                if (i != 0) {
-                    buffer.append("/");
-                }
-                buffer.append(typeLabels.get(i));
-            }
-        }
-        return buffer.toString();
-    }
-
-    private void findOutCompleteTypePath(ERepositoryObjectType type, List<String> typeLabels) {
-        ERepositoryObjectType parentType = ERepositoryObjectType.findParentType(type);
-        if (parentType != null) {
-            findOutCompleteTypePath(parentType, typeLabels);
-        }
-        typeLabels.add(type.getLabel());
-    }
-
     public Item getItem() {
         return item;
     }
@@ -148,6 +119,22 @@ public class ItemReportRecorder {
         this.item = item;
     }
 
+    public String getCurrentItemPath() {
+        return this.currentItemPath;
+    }
+
+    public void setCurrentPath(String currentItemPath) {
+        this.currentItemPath = currentItemPath;
+    }
+
+    public String getCurrentItemType() {
+        return this.currentItemType;
+    }
+
+    public void setCurrentItemType(String currentItemType) {
+        this.currentItemType = currentItemType;
+    }
+
     public String getDetailMessage() {
         return detailMessage;
     }

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

@@ -53,5 +53,5 @@ public interface ILibraryManagerUIService extends IService {
 
     public boolean confirmDialog(String originalJarFileName);
 
-    public IConfigModuleDialog getConfigModuleDialog(Shell parentShell, String initValue);
+    public IConfigModuleDialog getConfigModuleDialog(Shell parentShell, String initValue, boolean allowDetectDependencies);
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/context/RepositoryContext.java

@@ -15,8 +15,10 @@ package org.talend.core.context;
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
+import org.talend.commons.exception.ExceptionHandler;
 import org.talend.core.model.general.Project;
 import org.talend.core.model.properties.User;
+import org.talend.core.service.ICloudSignOnService;
 
 /**
  * DOC smallet class global comment. Detailled comment <br/>
@@ -139,6 +141,14 @@ public class RepositoryContext {
      * @return the clearPassword
      */
     public String getClearPassword() {
+        try {
+            if (ICloudSignOnService.get() != null && ICloudSignOnService.get().isSignViaCloud()) {
+                return ICloudSignOnService.get().getLatestToken().getAccessToken();
+            }
+        }catch (Exception ex) {
+            ExceptionHandler.process(ex);
+        }
+
         return clearPassword;
     }
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/EDatabaseTypeName.java

@@ -147,8 +147,15 @@ public enum EDatabaseTypeName {
 
     MAPRDB(
             "MapRDB", "MapRDB", Boolean.FALSE, "MAPRDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true),//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
     SNOWFLAKE(
-            "SNOWFLAKE","SNOWFLAKE",Boolean.TRUE,"SNOWFLAKE",EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.None);
+            "SNOWFLAKE",
+            "SNOWFLAKE",
+            Boolean.TRUE,
+            "SNOWFLAKE",
+            EDatabaseSchemaOrCatalogMapping.None,
+            EDatabaseSchemaOrCatalogMapping.None,
+            true);
 
     // displayName is used in Java code.
     private String displayName;

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

@@ -387,6 +387,8 @@ public class ConnParameterKeys {
     
     public static final String CONN_PARA_KEY_KNOX_DIRECTORY="CONN_PARA_KEY_KNOX_DIRECTORY";
 
+    public static final String CONN_PARA_KEY_KNOX_TIMEOUT="CONN_PARA_KEY_KNOX_TIMEOUT";
+
     // CDE
     public static final String CONN_PARA_KEY_CDE_API_ENDPOINT="CONN_PARA_KEY_CDE_API_ENDPOINT";
     public static final String CONN_PARA_KEY_CDE_TOKEN="CONN_PARA_KEY_CDE_TOKEN";

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

@@ -27,8 +27,8 @@ import org.talend.core.database.conn.DatabaseConnConstants;
 public enum EDatabaseVersion4Drivers {
     // access
     ACCESS_JDBC(new DbVersion4Drivers(EDatabaseTypeName.ACCESS, new String[] {
-            "jackcess-2.1.0.jar", "ucanaccess-2.0.9.5.jar", "commons-lang-2.6.jar", "commons-logging-1.1.1.jar", "hsqldb.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            "jackcess-encrypt-2.1.0.jar", "bcprov-jdk15on-1.51.jar", "talend-ucanaccess-utils-1.0.0.jar" })),
+            "jackcess-2.1.12.jar", "ucanaccess-2.0.9.5.jar", "commons-lang-2.6.jar", "commons-logging-1.1.3.jar", "hsqldb.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "jackcess-encrypt-2.1.4.jar", "bcprov-jdk15on-1.70.jar", "talend-ucanaccess-utils-1.0.0.jar" })),
     ACCESS_2003(new DbVersion4Drivers(EDatabaseTypeName.ACCESS, "Access 2003", "Access_2003")), //$NON-NLS-1$ //$NON-NLS-2$
     ACCESS_2007(new DbVersion4Drivers(EDatabaseTypeName.ACCESS, "Access 2007", "Access_2007")), //$NON-NLS-1$ //$NON-NLS-2$
     // oracle
@@ -69,9 +69,9 @@ 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", "reload4j-1.2.19.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
+            "sas.intrnet.javatools.jar", "sas.svc.connection.jar", "reload4j-1.2.22.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", "reload4j-1.2.19.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
+            "SAS 9.2", "SAS_9.2", new String[] { "sas.core.jar", "sas.security.sspi.jar", "sas.svc.connection.jar", "reload4j-1.2.22.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
     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$
@@ -84,8 +84,8 @@ public enum EDatabaseVersion4Drivers {
     MSSQL_PROP(new DbVersion4Drivers(EDatabaseTypeName.MSSQL,
             "Microsoft", "MSSQL_PROP", //$NON-NLS-1$ //$NON-NLS-2$
             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",
+                    "oauth2-oidc-sdk-9.7.jar", "reload4j-1.2.22.jar", "jackson-core-2.13.4.jar",
+                    "jackson-databind-2.13.4.2.jar", "jackson-annotations-2.13.4.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",
                     "content-type-2.1.jar", "lang-tag-1.5.jar" })),
 
@@ -153,8 +153,8 @@ public enum EDatabaseVersion4Drivers {
     REDSHIFT(new DbVersion4Drivers(EDatabaseTypeName.REDSHIFT, "redshift", "REDSHIFT", //$NON-NLS-1$ //$NON-NLS-2$
             new String[]{ "redshift-jdbc42-no-awssdk-1.2.55.1083.jar", "antlr4-runtime-4.8-1.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
     REDSHIFT_SSO(new DbVersion4Drivers(EDatabaseTypeName.REDSHIFT_SSO, "redshift sso", "REDSHIFT_SSO", //$NON-NLS-1$ //$NON-NLS-2$
-            new String[] { "redshift-jdbc42-no-awssdk-1.2.55.1083.jar", "antlr4-runtime-4.8-1.jar", "aws-java-sdk-1.11.848.jar", "jackson-core-2.11.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-                    "jackson-databind-2.11.4.jar", "jackson-annotations-2.11.4.jar", "httpcore-4.4.13.jar", "httpclient-4.5.13.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$//$NON-NLS-4$
+            new String[] { "redshift-jdbc42-no-awssdk-1.2.55.1083.jar", "antlr4-runtime-4.8-1.jar", "aws-java-sdk-1.11.848.jar", "jackson-core-2.13.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+                    "jackson-databind-2.13.4.2.jar", "jackson-annotations-2.13.4.jar", "httpcore-4.4.13.jar", "httpclient-4.5.13.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$//$NON-NLS-4$
                     "joda-time-2.8.1.jar", "commons-logging-1.2.jar", "commons-codec-1.14.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                     "aws-java-sdk-redshift-internal-1.12.x.jar" })), //$NON-NLS-1$
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/HadoopClassLoaderFactory2.java

@@ -38,7 +38,10 @@ public class HadoopClassLoaderFactory2 {
     public static ClassLoader getHDFSClassLoader(String relatedClusterId, String distribution, String version, boolean useKrb) {
         return getClassLoader(relatedClusterId, EHadoopCategory.HDFS, distribution, version, useKrb);
     }
-
+    public static ClassLoader getHDFSKnoxClassLoader(String relatedClusterId, String distribution, String version, boolean useKrb) {
+        return HadoopClassLoaderFactory2.getClassLoader(relatedClusterId, EHadoopCategory.HDFS, distribution, version, useKrb,
+                IHadoopArgs.HDFS_ARG_KNOX);
+    }
     public static ClassLoader getMRClassLoader(String relatedClusterId, String distribution, String version, boolean useKrb) {
         return getClassLoader(relatedClusterId, EHadoopCategory.MAP_REDUCE, distribution, version, useKrb);
     }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/IHadoopArgs.java

@@ -22,4 +22,6 @@ public interface IHadoopArgs {
 
     public static final String HIVE_ARG_STANDALONE = "STANDALONE"; //$NON-NLS-1$
 
+    public static final String HDFS_ARG_KNOX = "USE_KNOX"; //$NON-NLS-1$
+
 }

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

@@ -222,6 +222,32 @@ public class ContextUtils {
         }
         return parameterType;
     }
+    
+    // TUP-36519:For possible duplicate internalid scenario(TUP-36667) after several times' renaming in joblet. Loop all and find the nearest
+    // one.
+    public static ContextParameterType getContextParameterTypeById(ContextType contextType, final String uuId,
+            boolean isFromContextItem, String paraName) {
+        if (contextType == null || uuId == null) {
+            return null;
+        }
+
+        ContextParameterType parameterType = null;
+        for (ContextParameterType param : (List<ContextParameterType>) contextType.getContextParameter()) {
+            String paramId = null;
+            if (isFromContextItem) {
+                paramId = ResourceHelper.getUUID(param);
+            } else {
+                paramId = param.getInternalId();
+            }
+            if (uuId.equals(paramId)) {
+                parameterType = param;
+                if (paraName != null && StringUtils.equals(paraName, param.getName())) {
+                    break;
+                }
+            }
+        }
+        return parameterType;
+    }
 
     public static ContextParameterType getContextParameterTypeById(ContextType contextType, final String uuId,
             boolean isFromContextItem) {
@@ -846,7 +872,7 @@ public class ContextUtils {
                         if (item != null) {
                             final ContextType repoContextType = ContextUtils.getContextTypeByName(item, contextType.getName());
                             ContextParameterType repoContextParam = ContextUtils.getContextParameterTypeById(repoContextType,
-                                    paramLink.getId(), item instanceof ContextItem);
+                                    paramLink.getId(), item instanceof ContextItem, contextParameterType.getName());
                             if (repoContextParam != null
                                     && !StringUtils.equals(repoContextParam.getName(), contextParameterType.getName())) {
                                 renamedMap.put(repoContextParam.getName(), contextParameterType.getName());
@@ -915,7 +941,7 @@ public class ContextUtils {
                                 if (item != null) {
                                     ContextType contextType = ContextUtils.getContextTypeByName(item, context.getName());
                                     ContextParameterType repoParameterType = ContextUtils.getContextParameterTypeById(contextType,
-                                            parameterLink.getId(), item instanceof ContextItem);
+                                            parameterLink.getId(), item instanceof ContextItem, parameterType.getName());
                                     if (repoParameterType != null
                                             && !StringUtils.equals(repoParameterType.getName(), parameterType.getName())) {
                                         renamedMap.put(repoParameterType.getName(), parameterType.getName());
@@ -975,7 +1001,7 @@ public class ContextUtils {
         ContextParameterType contextParameterType = null;
         if (paramLink != null && paramLink.getId() != null && contextType != null) {
             contextParameterType = getContextParameterTypeById(contextType, paramLink.getId(),
-                    contextItem instanceof ContextItem);
+                    contextItem instanceof ContextItem, paramName);
         }
         if (contextParameterType != null) {// Compare use UUID
             if (!StringUtils.equals(contextParameterType.getName(), paramName)) {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/general/ConnectionBean.java

@@ -17,10 +17,15 @@ import java.util.Iterator;
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
 import org.talend.commons.exception.ExceptionHandler;
-import org.talend.core.pendo.PendoTrackSender;
+import org.talend.core.pendo.PendoDataTrackFactory;
 import org.talend.core.runtime.i18n.Messages;
+import org.talend.core.service.ICloudSignOnService;
 import org.talend.repository.model.RepositoryConstants;
+import org.talend.signon.util.TMCRepositoryUtil;
+import org.talend.signon.util.TokenMode;
 import org.talend.utils.json.JSONException;
 import org.talend.utils.json.JSONObject;
 
@@ -58,12 +63,14 @@ public class ConnectionBean implements Cloneable {
 
     private static final String TOKEN = "token"; //$NON-NLS-1$
 
-    private static final String URL = "url"; //$NON-NLS-1$
-
     private static final String STORECREDENTIALS = "storeCredentials"; //$NON-NLS-1$
 
     private String credentials = ""; //$NON-NLS-1$
 
+    public static final String CLOUD_TOKEN_ID ="cloud_token"; //$NON-NLS-1$
+    
+    private static final String LOGIN_VIA_CLOUD = "login_via_cloud"; //$NON-NLS-1$
+    
     /**
      * DOC smallet ConnectionBean constructor comment.
      */
@@ -89,6 +96,24 @@ public class ConnectionBean implements Cloneable {
         newConnection.setPassword(""); //$NON-NLS-1$
         return newConnection;
     }
+    
+    public static ConnectionBean getDefaultCloudConnectionBean(String dataCenter) {
+        ConnectionBean newConnection = new ConnectionBean();
+        newConnection.setName(Messages.getString("ConnectionBean.Cloud.name", TMCRepositoryUtil.getDisplayNameByDatacenter(dataCenter))); //$NON-NLS-1$
+        newConnection.setDescription(Messages.getString("ConnectionBean.CloudConnection.description", TMCRepositoryUtil.getDisplayNameByDatacenter(dataCenter))); //$NON-NLS-1$
+        newConnection.setRepositoryId(TMCRepositoryUtil.getRepositoryId(dataCenter));
+        newConnection.setToken(true);
+        newConnection.setStoreCredentials(true);
+        newConnection.setComplete(true);
+        newConnection.setLoginViaCloud(true);
+        newConnection.setWorkSpace(getRecentWorkSpace());
+        return newConnection;
+    }
+    
+    protected static String getRecentWorkSpace() {
+        String filePath = new Path(Platform.getInstanceLocation().getURL().getPath()).toFile().getPath();
+        return filePath;
+    }
 
     /**
      * Getter for ID.
@@ -184,13 +209,22 @@ public class ConnectionBean implements Cloneable {
      */
     public String getPassword() {
         try {
+            
             if (conDetails.has(PASSWORD)) {
                 if (isStoreCredentials() && credentials != null) {
                     return this.credentials;
                 }
                 return conDetails.getString(PASSWORD);
+            }  else if (conDetails.has(CLOUD_TOKEN_ID)){ 
+                String object = conDetails.getString(CLOUD_TOKEN_ID);
+                TokenMode token = TokenMode.parseFromJson(object, null);
+                if (ICloudSignOnService.get() != null) {
+                    token = ICloudSignOnService.get().getLatestToken();
+                    this.setConnectionToken(token);
+                }
+                return token.getAccessToken();
             }
-        } catch (JSONException e) {
+        } catch (Exception e) {
             ExceptionHandler.process(e);
         }
         return "";
@@ -215,18 +249,18 @@ public class ConnectionBean implements Cloneable {
      * @return the user
      */
     public String getUser() {
-        try {
+        try {       
             if (conDetails.has(USER)) {
                 String user = conDetails.getString(USER);
                 if (isToken()) {
                     String url = getDynamicFields().get(RepositoryConstants.REPOSITORY_URL);
-                    user = PendoTrackSender.getInstance().getTmcUser(url, getPassword());
+                    user = PendoDataTrackFactory.getInstance().getTmcUser(url, getPassword());
                     if (StringUtils.isNotBlank(user)) {
                         setUser(user);
                     }
                 }
                 return user;
-            }
+            } 
         } catch (JSONException e) {
             ExceptionHandler.process(e);
         }
@@ -320,6 +354,25 @@ public class ConnectionBean implements Cloneable {
             ExceptionHandler.process(e);
         }
     }
+    
+    public boolean isLoginViaCloud() {
+        try {
+            if (conDetails.has(LOGIN_VIA_CLOUD)) {
+                return (Boolean) conDetails.get(LOGIN_VIA_CLOUD);
+            }
+        } catch (JSONException e) {
+            // do nothing
+        }
+        return false;
+    }
+    
+    public void setLoginViaCloud(boolean isLoginViaCloud) {
+        try {
+            conDetails.put(LOGIN_VIA_CLOUD, isLoginViaCloud);
+        } catch (JSONException e) {
+            // do nothing
+        }
+    }
 
     @Override
     public ConnectionBean clone() throws CloneNotSupportedException {
@@ -418,14 +471,21 @@ public class ConnectionBean implements Cloneable {
 
     public String getUrl() {
         try {
-            if (conDetails.has(URL)) {
-                return conDetails.getString(URL);
+            if (dynamicFields.containsKey(RepositoryConstants.REPOSITORY_URL)) {
+                return dynamicFields.get(RepositoryConstants.REPOSITORY_URL);
+            }
+            if (conDetails.has(RepositoryConstants.REPOSITORY_URL)) {
+                return conDetails.getString(RepositoryConstants.REPOSITORY_URL);
             }
         } catch (JSONException e) {
             ExceptionHandler.process(e);
         }
         return "";
     }
+    
+    public void setUrl(String url) {
+        dynamicFields.put(RepositoryConstants.REPOSITORY_URL, url);
+    }
 
     public boolean isStoreCredentials() {
         try {
@@ -453,4 +513,27 @@ public class ConnectionBean implements Cloneable {
     public void setCredentials(String credentials) {
         this.credentials = credentials;
     }
+
+    
+    public TokenMode getConnectionToken() {
+        try {
+            if (conDetails.has(CLOUD_TOKEN_ID)) {
+                String object = conDetails.getString(CLOUD_TOKEN_ID);
+                return TokenMode.parseFromJson(object, null);
+            }
+        } catch (JSONException e) {
+            ExceptionHandler.process(e);
+        }
+        return null;
+    }
+
+    
+    public void setConnectionToken(TokenMode connectionToken) {
+        try {
+            conDetails.put(CLOUD_TOKEN_ID, TokenMode.writeToJson(connectionToken));
+        } catch (JSONException e) {
+            ExceptionHandler.process(e);
+        }
+    }
+    
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/SparkBatchMetadataTalendTypeFilter.java

@@ -13,10 +13,17 @@ public class SparkBatchMetadataTalendTypeFilter extends SparkMetadataTalendTypeF
     public static List<String> dynamicTypeCompatibleComponents = Arrays.asList(
             "tDeltaLakeInput",
             "tDeltaLakeOutput",
+            "tFileInputDelimited",
             "tFileInputParquet",
             "tFileOutputParquet",
             "tJDBCInput",
-            "tJDBCOutput", "tLogRow", "tSqlRow"
+            "tJDBCOutput",
+            "tLogRow",
+            "tSqlRow",
+            "tAvroInput",
+            "tMongoDBInput",
+            "tMongoDBOutput",
+            "tSqlRow"
             );
 
     public SparkBatchMetadataTalendTypeFilter(INode node) {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/update/RepositoryUpdateManager.java

@@ -359,7 +359,9 @@ public abstract class RepositoryUpdateManager {
             List<UpdateResult> checkedResults = null;
 
             if (parameter == null) { // update all job
-                checkedResults = filterSpecialCheckedResult(results);
+                // TUP-36519: comment out the filter for only opening job
+                // checkedResults = filterSpecialCheckedResult(results);
+                checkedResults = results;
             } else { // filter
                 checkedResults = filterCheckedResult(results);
             }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/AbstractPendoTrackManager.java

@@ -10,7 +10,7 @@
 // 9 rue Pages 92150 Suresnes, France
 //
 // ============================================================================
-package org.talend.core.pendo.mapper;
+package org.talend.core.pendo;
 
 import org.apache.log4j.Level;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -18,16 +18,24 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.talend.commons.exception.ExceptionHandler;
-import org.talend.core.pendo.PendoTrackDataUtil.TrackEvent;
-import org.talend.core.pendo.PendoTrackSender;
-import org.talend.core.pendo.properties.PendoTMapProperties;
+import org.talend.core.pendo.properties.IPendoDataProperties;
 
 /**
  * DOC jding  class global comment. Detailled comment
  */
-public abstract class AbstractPendoTMapManager {
+public abstract class AbstractPendoTrackManager {
 
-    protected abstract PendoTMapProperties calculateProperties();
+    public abstract TrackEvent getTrackEvent();
+
+    public abstract IPendoDataProperties collectProperties();
+
+    public boolean isTrackSendAvailable() throws Exception {
+        return PendoDataTrackFactory.getInstance().isTrackSendAvailable();
+    }
+
+    public void sendTrackData(TrackEvent event, IPendoDataProperties properties) throws Exception {
+        PendoDataTrackFactory.getInstance().sendTrackData(event, properties);
+    }
 
     public void sendTrackToPendo() {
         Job job = new Job("send pendo track") {
@@ -35,9 +43,9 @@ public abstract class AbstractPendoTMapManager {
             @Override
             protected IStatus run(IProgressMonitor monitor) {
                 try {
-                    if (PendoTrackSender.getInstance().isTrackSendAvailable()) {
-                        PendoTMapProperties properties = calculateProperties();
-                        PendoTrackSender.getInstance().sendTrackData(TrackEvent.TMAP, properties);
+                    if (isTrackSendAvailable()) {
+                        IPendoDataProperties properties = collectProperties();
+                        sendTrackData(getTrackEvent(), properties);
                     }
                 } catch (Exception e) {
                     // warning only

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/PendoDataTrackFactory.java

@@ -0,0 +1,73 @@
+// ============================================================================
+//
+// 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.pendo;
+
+import org.talend.core.pendo.properties.IPendoDataProperties;
+import org.talend.core.service.IRemoteService;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class PendoDataTrackFactory {
+
+    private static PendoDataTrackFactory instance;
+
+    private static IRemoteService remoteService;
+
+    static {
+        instance = new PendoDataTrackFactory();
+        remoteService = IRemoteService.get();
+    }
+
+    private PendoDataTrackFactory() {
+    }
+
+    public static PendoDataTrackFactory getInstance() {
+        return instance;
+    }
+
+    public boolean isTrackSendAvailable() throws Exception {
+        if (remoteService != null) {
+            return remoteService.isPendoTrackAvailable();
+        }
+        return false;
+    }
+
+    public void sendTrackData(TrackEvent event, IPendoDataProperties properties) throws Exception {
+        if (remoteService != null) {
+            remoteService.sendPendoTrackData(event, properties);
+        }
+    }
+
+    public void sendProjectLoginTrack() {
+        if (remoteService != null) {
+            AbstractPendoTrackManager pendoProjectLoginManager = remoteService.getPendoProjectLoginManager();
+            pendoProjectLoginManager.sendTrackToPendo();
+        }
+    }
+
+    public void sendGenericTrack(TrackEvent event, IPendoDataProperties properties) {
+        if (remoteService != null) {
+            AbstractPendoTrackManager genericManager = remoteService.getPendoGenericManager(event, properties);
+            genericManager.sendTrackToPendo();
+        }
+    }
+
+    public String getTmcUser(String url, String token) {
+        if (remoteService != null) {
+            return remoteService.getTmcUser(url, token);
+        }
+        return "";
+    }
+
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/PendoTrackDataUtil.java

@@ -12,22 +12,12 @@
 // ============================================================================
 package org.talend.core.pendo;
 
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
 import org.talend.commons.exception.ExceptionHandler;
-import org.talend.commons.utils.VersionUtils;
-import org.talend.core.model.general.Project;
-import org.talend.core.model.properties.ProjectReference;
 import org.talend.core.pendo.properties.IPendoDataProperties;
-import org.talend.core.pendo.properties.PendoLoginProperties;
-import org.talend.core.service.IStudioLiteP2Service;
 import org.talend.core.ui.IInstalledPatchService;
-import org.talend.repository.ProjectManager;
 import org.talend.utils.json.JSONObject;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -60,35 +50,6 @@ public class PendoTrackDataUtil {
         return content;
     }
 
-    public static IPendoDataProperties getLoginEventProperties() {
-        String studioPatch = getLatestPatchInstalledVersion();
-        PendoLoginProperties loginEvent = new PendoLoginProperties();
-        IStudioLiteP2Service studioLiteP2Service = IStudioLiteP2Service.get();
-        try {
-            if (studioLiteP2Service != null) {
-                List<String> enabledFeatures = new ArrayList<String>();
-                List<String> enabledFeaturesList = studioLiteP2Service.getCurrentProjectEnabledFeatures();
-                enabledFeaturesList.stream().forEach(feature -> {
-                    String result = feature;
-                    if (result.startsWith(FEATURE_PREFIX)) {
-                        result = result.substring(FEATURE_PREFIX.toCharArray().length);
-                    }
-                    if (result.endsWith(FEATURE_TAIL)) {
-                        result = result.substring(0, result.lastIndexOf(FEATURE_TAIL));
-                    }
-                    enabledFeatures.add(result);
-                });
-                loginEvent.setEnabledFeatures(enabledFeatures);
-            }
-            setUpRefProjectsStructure(loginEvent);
-        } catch (Exception e) {
-            ExceptionHandler.process(e);
-        }
-        loginEvent.setStudioVersion(VersionUtils.getInternalMajorVersion());
-        loginEvent.setStudioPatch(studioPatch);
-        return loginEvent;
-    }
-
     public static String getLatestPatchInstalledVersion() {
         String studioPatch = "";
         IInstalledPatchService installedPatchService = IInstalledPatchService.get();
@@ -98,52 +59,6 @@ public class PendoTrackDataUtil {
         return studioPatch;
     }
 
-    private static void setUpRefProjectsStructure(PendoLoginProperties loginEvent) {
-        ProjectManager projectManager = ProjectManager.getInstance();
-        Project currentProject = projectManager.getCurrentProject();
-        Map<String, Project> teclabelProjectMap = new HashMap<String, Project>();
-        List<Project> allReferencedProjects = projectManager.getAllReferencedProjects();
-        allReferencedProjects.forEach(refProject -> {
-            String technicalLabel = refProject.getTechnicalLabel();
-            if (StringUtils.isNotBlank(technicalLabel)) {
-                teclabelProjectMap.put(technicalLabel, refProject);
-            }
-        });
-
-        int[] refCount = new int[] {0};
-        List<String> resultList = new ArrayList<String>();
-        Map<String, String> desensitiveLabelMap = new HashMap<String, String>();
-        findReferencePorjectPath(currentProject, "Main", resultList, refCount, desensitiveLabelMap, teclabelProjectMap);
-        loginEvent.setRefProjectList(resultList);
-        loginEvent.setRefProjectCount(String.valueOf(desensitiveLabelMap.keySet().size()));
-    }
-
-    public static void findReferencePorjectPath(Project currentProject, String path, List<String> resultList, int[] refCount,
-            Map<String, String> desensitiveLabelMap, Map<String, Project> teclabelProjectMap) {
-        List<ProjectReference> projectReferenceList = currentProject.getProjectReferenceList();
-        for (ProjectReference projectReference : projectReferenceList) {
-            String structPath = path;
-            if (projectReference.getReferencedProject() == null) {
-                continue;
-            }
-            String technicalLabel = projectReference.getReferencedProject().getTechnicalLabel();
-            Project refProject = teclabelProjectMap.get(technicalLabel);
-            if (StringUtils.isBlank(technicalLabel) || refProject == null) {
-                continue;
-            }
-            String desensitiveLabel = desensitiveLabelMap.get(technicalLabel);
-            if (StringUtils.isBlank(desensitiveLabel)) {
-                refCount[0] = refCount[0] + 1;
-                desensitiveLabel = "Ref" + refCount[0];
-                desensitiveLabelMap.put(technicalLabel, desensitiveLabel);
-            }
-            structPath = structPath + "/" + desensitiveLabel;
-            resultList.add(structPath);
-            findReferencePorjectPath(refProject, structPath, resultList, refCount, desensitiveLabelMap, teclabelProjectMap);
-        }
-
-    }
-
     public static String convertEntityJsonString(Object entity) {
         ObjectMapper mapper = new ObjectMapper();
         try {
@@ -157,30 +72,4 @@ public class PendoTrackDataUtil {
         return "";
     }
 
-    public enum TrackEvent {
-
-        PROJECT_LOGIN("Project Login"),
-        IMPORT_API_DEF("Import API Definition"),
-        UPDATE_API_DEF("Update API Definition"),
-        USE_API_DEF("Use API Definition"),
-        OPEN_IN_APIDesigner("Open in API Designer"),
-        OPEN_IN_APITester("Open in API Tester"),
-        OPEN_API_DOCUMENTATION("Open API Documentation"),
-        AUTOMAP("tMap Automap"),
-        TMAP("tMap"),
-        ITEM_IMPORT("Import items"),
-        ITEM_SIGNATURE("Item Signature");
-
-        private String event;
-
-        TrackEvent(String event) {
-            this.event = event;
-        }
-
-        public String getEvent() {
-            return event;
-        }
-
-    }
-
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/PendoTrackSender.java

@@ -1,325 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2021 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.pendo;
-
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.StatusLine;
-import org.apache.http.client.entity.EntityBuilder;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.entity.ContentType;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.util.EntityUtils;
-import org.apache.log4j.Level;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.talend.commons.exception.ExceptionHandler;
-import org.talend.commons.utils.network.IProxySelectorProvider;
-import org.talend.commons.utils.network.NetworkUtil;
-import org.talend.core.GlobalServiceRegister;
-import org.talend.core.context.Context;
-import org.talend.core.context.RepositoryContext;
-import org.talend.core.nexus.HttpClientTransport;
-import org.talend.core.pendo.PendoTrackDataUtil.TrackEvent;
-import org.talend.core.pendo.properties.IPendoDataProperties;
-import org.talend.core.runtime.CoreRuntimePlugin;
-import org.talend.core.service.IRemoteService;
-import org.talend.repository.model.RepositoryConstants;
-import org.talend.utils.json.JSONObject;
-
-/**
- * DOC jding  class global comment. Detailled comment
- */
-public class PendoTrackSender {
-    
-    public static final String PROP_PENDO_LOCAL_CHECK = "talend.pendo.localDebug";
-
-    public static final String PROP_PENDO_LOG_DATA = "talend.pendo.logRuntimeData";
-
-    private static final String PREFIX_API = "api";
-
-    private static final String PENDO_INFO = "/monitoring/pendo/info";
-
-    private static final String PENDO_TRACK = "/monitoring/pendo/track";
-
-    private static final String HEAD_AUTHORIZATION = "Authorization";
-
-    private static final String HEAD_CONTENT_TYPE = "Content-Type";
-
-    private static final String HEAD_PENDO_KEY = "x-pendo-integration-key";
-
-    private static PendoTrackSender instance;
-
-    private static String adminUrl;
-
-    private static String apiBaseUrl;
-
-    private static String pendoInfo;
-
-    private PendoTrackSender() {
-    }
-
-    static {
-        instance = new PendoTrackSender();
-        RepositoryContext repositoryContext = getRepositoryContext();
-        if (repositoryContext != null) {
-            adminUrl = repositoryContext.getFields().get(RepositoryConstants.REPOSITORY_URL);
-        }
-    }
-
-    public static PendoTrackSender getInstance() {
-        if (StringUtils.isBlank(adminUrl)) {
-            RepositoryContext repositoryContext = getRepositoryContext();
-            if (repositoryContext != null) {
-                adminUrl = repositoryContext.getFields().get(RepositoryConstants.REPOSITORY_URL);
-            }
-        }
-        return instance;
-    }
-
-    public void sendToPendo(TrackEvent event, IPendoDataProperties properties) {
-        Job job = new Job("send pendo track") {
-
-            @Override
-            protected IStatus run(IProgressMonitor monitor) {
-                try {
-                    if (isTrackSendAvailable()) {
-                        sendTrackData(event, properties);
-                    }
-                } catch (Exception e) {
-                    // warning only
-                    ExceptionHandler.process(e, Level.WARN);
-                }
-                return Status.OK_STATUS;
-            }
-        };
-        job.setUser(false);
-        job.setPriority(Job.INTERACTIVE);
-        job.schedule();
-    }
-
-    public void sendTrackData(TrackEvent event, IPendoDataProperties properties) throws Exception {
-        if (isPendoLocalDebug()) {
-            ExceptionHandler.log(event.getEvent() + ":" + PendoTrackDataUtil.convertEntityJsonString(properties));
-            return;
-        }
-        DefaultHttpClient client = null;
-        CloseableHttpResponse response = null;
-        IProxySelectorProvider proxySelectorProvider = null;
-        try {
-            String pendoInfo = getPendoInfo();
-            if (StringUtils.isBlank(pendoInfo)) {
-                throw new Exception("Pendo information is empty");
-            }
-            String pendoKey = getPendoKeyFromLicense();
-            if (StringUtils.isBlank(pendoKey)) {
-                throw new Exception("Pendo key is empty");
-            }
-            
-            client = new DefaultHttpClient();
-            String url = getBaseUrl() + PENDO_TRACK;
-            HttpPost httpPost = new HttpPost(url);
-            httpPost.setHeader(HEAD_CONTENT_TYPE, ContentType.APPLICATION_JSON.getMimeType());
-            httpPost.setHeader(HEAD_PENDO_KEY, pendoKey);
-
-            proxySelectorProvider = HttpClientTransport.addProxy(client, new URI(url));
-
-            EntityBuilder entityBuilder = EntityBuilder.create();
-            String trackData = PendoTrackDataUtil.generateTrackData(pendoInfo, event, properties);
-            entityBuilder.setText(trackData).setContentType(ContentType.APPLICATION_JSON);
-            HttpEntity entity = entityBuilder.build();
-            httpPost.setEntity(entity);
-            response = client.execute(httpPost, HttpClientContext.create());
-            StatusLine statusLine = response.getStatusLine();
-            String responseStr = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
-            if (isLogPendoData()) {
-                ExceptionHandler.log(trackData);
-            }
-            if (HttpURLConnection.HTTP_OK != statusLine.getStatusCode()) {
-                throw new Exception(statusLine.toString() + ", server message: [" + responseStr + "]");
-            }
-        } finally {
-            HttpClientTransport.removeProxy(proxySelectorProvider);
-            client.getConnectionManager().shutdown();
-            if (response != null) {
-                try {
-                    response.close();
-                } catch (Throwable e) {
-                    ExceptionHandler.process(e);
-                }
-            }
-            if (client != null) {
-                try {
-                    client.close();
-                } catch (Throwable e) {
-                    ExceptionHandler.process(e);
-                }
-            }
-        }
-    }
-
-    public boolean isTrackSendAvailable() throws Exception {
-        if (isPendoLocalDebug() || checkTokenUsed(adminUrl) && NetworkUtil.isNetworkValid()) {
-            return true;
-        }
-        return false;
-    }
-
-    public boolean isPendoLocalDebug() {
-        return Boolean.TRUE.toString().equals(System.getProperty(PROP_PENDO_LOCAL_CHECK));
-    }
-
-    public boolean isLogPendoData() {
-        return Boolean.TRUE.toString().equals(System.getProperty(PROP_PENDO_LOG_DATA));
-    }
-
-    private String getPendoInfo() throws Exception {
-        if (StringUtils.isBlank(pendoInfo)) {
-            pendoInfo = getPendoInfo(getBaseUrl(), getToken());
-        }
-        return pendoInfo;
-    }
-
-    private String getPendoInfo(String baseUrl, String token) throws Exception {
-        DefaultHttpClient client = null;
-        CloseableHttpResponse response = null;
-        IProxySelectorProvider proxySelectorProvider = null;
-        try {
-            client = new DefaultHttpClient();
-
-            String url = baseUrl + PENDO_INFO;
-
-            HttpGet httpGet = new HttpGet(url);
-            httpGet.setHeader(HEAD_AUTHORIZATION, "Bearer " + token);
-            proxySelectorProvider = HttpClientTransport.addProxy(client, new URI(url));
-
-            response = client.execute(httpGet, HttpClientContext.create());
-            StatusLine statusLine = response.getStatusLine();
-            String responseStr = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
-            if (HttpURLConnection.HTTP_OK != statusLine.getStatusCode()) {
-                throw new Exception(statusLine.toString() + ", server message: [" + responseStr + "]");
-            }
-            return responseStr;
-        } finally {
-            HttpClientTransport.removeProxy(proxySelectorProvider);
-            client.getConnectionManager().shutdown();
-            if (response != null) {
-                try {
-                    response.close();
-                } catch (Throwable e) {
-                    ExceptionHandler.process(e);
-                }
-            }
-            if (client != null) {
-                try {
-                    client.close();
-                } catch (Throwable e) {
-                    ExceptionHandler.process(e);
-                }
-            }
-        }
-    }
-
-    private boolean checkTokenUsed(String adminUrl) throws Exception {
-        if (StringUtils.isNotBlank(adminUrl) && GlobalServiceRegister.getDefault().isServiceRegistered(IRemoteService.class)) {
-            IRemoteService service = GlobalServiceRegister.getDefault().getService(IRemoteService.class);
-            return service.isTokenUsed(adminUrl);
-        }
-        return false;
-    }
-
-    public String getBaseUrl() throws Exception {
-        return getBaseUrl(adminUrl, false);
-    }
-
-    public String getBaseUrl(String adminUrl, boolean token) throws Exception {
-        if (StringUtils.isNotBlank(apiBaseUrl) && !token) {
-            return apiBaseUrl;
-        }
-
-        try {
-            URL url = new URL(adminUrl);
-            // tmc.int.cloud.talend.com
-            String authority = url.getAuthority();
-            String regex = "(\\w*\\-*\\w*\\.?){2}\\.(talend.com)";
-            Pattern  pattern= Pattern.compile(regex);
-            Matcher match = pattern.matcher(authority);
-            if (match.find()) {
-                // int.cloud.talend.com
-                authority = match.group(0);
-                URL apiURL = new URL(url.getProtocol(), PREFIX_API + "." + authority, "");
-                // https://api.int.cloud.talend.com
-                apiBaseUrl = apiURL.toString();
-            } else {
-                throw new Exception("Can't match pendo url from " + adminUrl);
-            }
-        } catch (MalformedURLException e) {
-            throw new Exception("Invalid url " + adminUrl, e.getCause());
-        }
-
-        return apiBaseUrl;
-    }
-
-    private String getToken() {
-        return getRepositoryContext().getClearPassword();
-    }
-
-    public String getTmcUser(String url, String token) {
-        try {
-            String pendoInfo = getPendoInfo(getBaseUrl(url, true), token);
-            if (StringUtils.isNotBlank(pendoInfo)) {
-                JSONObject infoJson = new JSONObject(pendoInfo);
-                return ((JSONObject) infoJson.get("visitor")).getString("id"); //$NON-NLS-1$ //$NON-NLS-2$
-            }
-        } catch (Exception e) {
-            ExceptionHandler.process(e);
-        }
-        return ""; //$NON-NLS-1$
-    }
-
-    private String getPendoKeyFromLicense() throws Exception {
-        if (GlobalServiceRegister.getDefault().isServiceRegistered(IRemoteService.class)) {
-            IRemoteService service = GlobalServiceRegister.getDefault().getService(IRemoteService.class);
-            return service.getPendoKeyFromLicense();
-        }
-        return null;
-    }
-
-    private static RepositoryContext getRepositoryContext() {
-        RepositoryContext repositoryContext = (RepositoryContext) CoreRuntimePlugin.getInstance().getContext()
-                .getProperty(Context.REPOSITORY_CONTEXT_KEY);
-        return repositoryContext;
-    }
-
-    public void setAdminUrl(String adminUrl) {
-        PendoTrackSender.adminUrl = adminUrl;
-    }
-
-    public void setApiBaseUrl(String apiBaseUrl) {
-        PendoTrackSender.apiBaseUrl = apiBaseUrl;
-    }
-
-}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/TrackEvent.java

@@ -0,0 +1,79 @@
+// ============================================================================
+//
+// 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.pendo;
+
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public enum TrackEvent {
+
+    /**
+     * create by TUP-33421 update by TUP-34791, TUP-35523, TUP-36780
+     */
+    PROJECT_LOGIN("Project Login"),
+
+    /**
+     * create by TUP-33990
+     */
+    IMPORT_API_DEF("Import API Definition"),
+    /**
+     * create by TUP-33990
+     */
+    UPDATE_API_DEF("Update API Definition"),
+    /**
+     * create by TUP-33990
+     */
+    USE_API_DEF("Use API Definition"),
+    /**
+     * create by TUP-33990
+     */
+    OPEN_IN_APIDesigner("Open in API Designer"),
+    /**
+     * create by TUP-33990
+     */
+    OPEN_IN_APITester("Open in API Tester"),
+    /**
+     * create by TUP-33990
+     */
+    OPEN_API_DOCUMENTATION("Open API Documentation"),
+
+    /**
+     * create by TUP-35644
+     */
+    AUTOMAP("tMap Automap"),
+    /**
+     * create by TUP-35644 update by TUP-36710
+     */
+    TMAP("tMap"),
+
+    /**
+     * create by TUP-35712 update by TUP-36893
+     */
+    ITEM_IMPORT("Import items"),
+    /**
+     * create by TUP-35712
+     */
+    ITEM_SIGNATURE("Item Signature");
+
+    private String event;
+
+    TrackEvent(String event) {
+        this.event = event;
+    }
+
+    public String getEvent() {
+        return event;
+    }
+
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/mapper/PendoAutoMapManager.java

@@ -12,8 +12,9 @@
 // ============================================================================
 package org.talend.core.pendo.mapper;
 
-import org.talend.core.pendo.PendoTrackDataUtil.TrackEvent;
-import org.talend.core.pendo.PendoTrackSender;
+import org.talend.core.pendo.AbstractPendoTrackManager;
+import org.talend.core.pendo.TrackEvent;
+import org.talend.core.pendo.properties.IPendoDataProperties;
 import org.talend.core.pendo.properties.PendoAutoMapProperties;
 
 /**
@@ -21,7 +22,7 @@ import org.talend.core.pendo.properties.PendoAutoMapProperties;
  * 
  * DOC jding class global comment. Detailled comment
  */
-public class PendoAutoMapManager {
+public class PendoAutoMapManager extends AbstractPendoTrackManager {
     
     private int mappingChangeCount = 0;
 
@@ -45,9 +46,18 @@ public class PendoAutoMapManager {
         if (mappingChangeCount < 1) {
             return;
         }
-        PendoAutoMapProperties properties = new PendoAutoMapProperties();
-        properties.setAutoMappings(mappingChangeCount);
-        PendoTrackSender.getInstance().sendToPendo(TrackEvent.AUTOMAP, properties);
+        super.sendTrackToPendo();
     }
 
+    @Override
+    public TrackEvent getTrackEvent() {
+        return TrackEvent.AUTOMAP;
+    }
+
+    @Override
+    public IPendoDataProperties collectProperties() {
+        PendoAutoMapProperties properties = new PendoAutoMapProperties();
+        properties.setAutoMappings(mappingChangeCount);
+        return properties;
+    }
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/properties/PendoLoginProperties.java

@@ -1,129 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2022 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.core.pendo.properties;
-
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-/**
- * DOC jding  class global comment. Detailled comment
- */
-public class PendoLoginProperties implements IPendoDataProperties {
-
-    @JsonProperty("studio_version")
-    private String studioVersion;
-
-    @JsonProperty("studio_patch")
-    private String studioPatch;
-
-    @JsonProperty("enabled_features")
-    private List<String> enabledFeatures;
-
-    @JsonProperty("referenced_project_number")
-    private String refProjectCount;
-
-    @JsonProperty("referenced_projects")
-    private List<String> refProjectList;
-
-    /**
-     * Getter for studio_version.
-     * 
-     * @return the studio_version
-     */
-    public String getStudioVersion() {
-        return studioVersion;
-    }
-
-    /**
-     * Sets the studio_version.
-     * 
-     * @param studio_version the studio_version to set
-     */
-    public void setStudioVersion(String studioVersion) {
-        this.studioVersion = studioVersion;
-    }
-
-    /**
-     * Getter for studio_patch.
-     * 
-     * @return the studio_patch
-     */
-    public String getStudioPatch() {
-        return studioPatch;
-    }
-
-    /**
-     * Sets the studio_patch.
-     * 
-     * @param studio_patch the studio_patch to set
-     */
-    public void setStudioPatch(String studioPatch) {
-        this.studioPatch = studioPatch;
-    }
-
-    /**
-     * Getter for enabled_features.
-     * 
-     * @return the enabled_features
-     */
-    public List<String> getEnabledFeatures() {
-        return enabledFeatures;
-    }
-
-    /**
-     * Sets the enabled_features.
-     * 
-     * @param enabled_features the enabled_features to set
-     */
-    public void setEnabledFeatures(List<String> enabledFeatures) {
-        this.enabledFeatures = enabledFeatures;
-    }
-
-    /**
-     * Getter for refProjectCount.
-     * 
-     * @return the refProjectCount
-     */
-    public String getRefProjectCount() {
-        return refProjectCount;
-    }
-
-    /**
-     * Sets the refProjectCount.
-     * 
-     * @param refProjectCount the refProjectCount to set
-     */
-    public void setRefProjectCount(String refProjectCount) {
-        this.refProjectCount = refProjectCount;
-    }
-
-    /**
-     * Getter for refProjectList.
-     * 
-     * @return the refProjectList
-     */
-    public List<String> getRefProjectList() {
-        return refProjectList;
-    }
-
-    /**
-     * Sets the refProjectList.
-     * 
-     * @param refProjectList the refProjectList to set
-     */
-    public void setRefProjectList(List<String> refProjectList) {
-        this.refProjectList = refProjectList;
-    }
-
-}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/properties/PendoSignImportProperties.java

@@ -48,6 +48,8 @@ public class PendoSignImportProperties implements IPendoDataProperties {
     @JsonProperty("valid_migration_token")
     private String validMigrationToken;
 
+    @JsonProperty("import_product")
+    private List<String> importProduct;
 
     /**
      * Getter for sourceVersion.
@@ -208,4 +210,23 @@ public class PendoSignImportProperties implements IPendoDataProperties {
         this.validMigrationToken = validMigrationToken;
     }
 
+
+    /**
+     * Getter for importProduct.
+     * @return the importProduct
+     */
+    public List<String> getImportProduct() {
+        return importProduct;
+    }
+
+
+    /**
+     * Sets the importProduct.
+     * @param importProduct the importProduct to set
+     */
+    public void setImportProduct(List<String> importProduct) {
+        this.importProduct = importProduct;
+    }
+
+
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/properties/PendoTMapProperties.java

@@ -91,13 +91,13 @@ public class PendoTMapProperties implements IPendoDataProperties {
      * Number of input columns which are mapped to multiple output columns, either mapped directly or mapped through the
      * Var column
      */
-    @JsonProperty("1-to-n mapping")
+    @JsonProperty("mapping_1_to_n")
     private int oneToNMappings;
 
     /**
      * Number of output columns which have multiple source columns, either input columns or var columns
      */
-    @JsonProperty("n-to-1 mapping")
+    @JsonProperty("mapping_n_to_1")
     private int nToOneMappings;
 
     /**

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages.properties

@@ -552,6 +552,8 @@ BusinessAppearanceComposite.textAlignment.vertical.centre=Centre
 ConnectionBean.Local=Local
 ConnectionBean.Remote=Remote
 ConnectionBean.DefaultConnection=Default connection
+ConnectionBean.Cloud.name=Signed in: Cloud ({0})
+ConnectionBean.CloudConnection.description=Remote connection to Cloud - Signed in: Cloud ({0})
 InegerCellEditorListener.NegativeNumberMessage=The value of {0} can't be set by negative number.
 InegerCellEditorListener.NumeralMessage=The value of {0} should be numeral.
 OpenXSDFileDialog.cancel=Cancel

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages_fr.properties

@@ -552,6 +552,8 @@ BusinessAppearanceComposite.textAlignment.vertical.centre=Centre
 ConnectionBean.Local=Local
 ConnectionBean.Remote=Distant
 ConnectionBean.DefaultConnection=Connexion par d\u00E9faut
+ConnectionBean.Cloud.name=Connect\u00E9(e) \u00E0\u00A0: Cloud ({0})
+ConnectionBean.CloudConnection.description=Connexion distante au Cloud - Connect\u00E9(e) \u00E0\u00A0: Cloud ({0})
 InegerCellEditorListener.NegativeNumberMessage=La valeur de {0} ne peut \u00EAtre un nombre n\u00E9gatif.
 InegerCellEditorListener.NumeralMessage=La valeur de {0} doit \u00EAtre num\u00E9rique.
 OpenXSDFileDialog.cancel=Annuler
@@ -575,7 +577,7 @@ repository.servicesPort=Port
 BinRepositoryNode.label=Corbeille
 HDFS=HDFS
 HCAT=HCAT
-AbstractRepositoryContentHandler.deleteNode.exception=\u00C9chec de la suppression des pertinences de noeud\u00A0: {0}
+AbstractRepositoryContentHandler.deleteNode.exception=\u00C9chec de la suppression des pertinences de n\u0153ud\u00A0: {0}
 HadoopCustomVersionDialog.topTitle=D\u00E9finition de la version Hadoop personnalis\u00E9e
 HadoopCustomVersionDialog.title=D\u00E9finir la distribution Hadoop personnalis\u00E9e
 HadoopCustomVersionDialog.msg=Configurer les biblioth\u00E8ques n\u00E9cessaires \u00E0 la version personnalis\u00E9e de Hadoop

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages_ja.properties

@@ -184,7 +184,7 @@ AbstractTalendFunctionParser.checkMethod=\u30EB\u30FC\u30C1\u30F3: "{0}.{1}\\"\u
 JavaGlobalVariableProposal.Description=\u8AAC\u660E: {0}
 JavaGlobalVariableProposal.VariableName=\n\n\u5909\u6570\u540D: {1}
 JavaSimpleDateFormatProposalProvider.displaySingleQuote= ' : \u4E00\u91CD\u5F15\u7528\u7B26\u3092\u8868\u793A
-JavaSimpleDateFormatProposalProvider.quoteDisplayError=\uFF12\u3064\u306E\u30B7\u30F3\u30B0\u30EB\u30AF\u30A9\u30FC\u30C8\u3067\uFF11\u3064\u306E\u30B7\u30F3\u30B0\u30EB\u30AF\u30A9\u30FC\u30C8\u3092\u793A\u3057\u307E\u3059\u3002
+JavaSimpleDateFormatProposalProvider.quoteDisplayError=\uFF12\u3064\u306E\u4E00\u91CD\u5F15\u7528\u7B26\u3067\uFF11\u3064\u306E\u4E00\u91CD\u5F15\u7528\u7B26\u3092\u793A\u3057\u307E\u3059\u3002
 JavaTypesManager.bigDecimal=BIGDECIMAL\u306F\u6570\u5024\u3067\u3059:
 JavaTypesManager.integer=INTEGER\u306F\u6570\u5024\u3067\u3059:
 JavaTypesManager.list=LIST\u306F\u6570\u5024\u3067\u3059:
@@ -552,6 +552,8 @@ BusinessAppearanceComposite.textAlignment.vertical.centre=\u4E2D\u5FC3
 ConnectionBean.Local=\u30ED\u30FC\u30AB\u30EB
 ConnectionBean.Remote=\u30EA\u30E2\u30FC\u30C8
 ConnectionBean.DefaultConnection=\u30C7\u30D5\u30A9\u30EB\u30C8\u63A5\u7D9A
+ConnectionBean.Cloud.name=\u30B5\u30A4\u30F3\u30A4\u30F3\u6E08\u307F: \u30AF\u30E9\u30A6\u30C9({0})
+ConnectionBean.CloudConnection.description=\u30AF\u30E9\u30A6\u30C9\u3078\u306E\u30EA\u30E2\u30FC\u30C8\u63A5\u7D9A - \u30B5\u30A4\u30F3\u30A4\u30F3\u6E08\u307F: \u30AF\u30E9\u30A6\u30C9({0})
 InegerCellEditorListener.NegativeNumberMessage={0}\u306B\u306F\u8CA0\u306E\u5024\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002
 InegerCellEditorListener.NumeralMessage={0}\u306B\u306F\u6570\u5024\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 OpenXSDFileDialog.cancel=\u30AD\u30E3\u30F3\u30BB\u30EB

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages_zh_CN.properties

@@ -552,6 +552,8 @@ BusinessAppearanceComposite.textAlignment.vertical.centre=\u4E2D\u592E
 ConnectionBean.Local=\u672C\u5730
 ConnectionBean.Remote=\u8FDC\u7A0B
 ConnectionBean.DefaultConnection=\u9ED8\u8BA4\u8FDE\u63A5
+ConnectionBean.Cloud.name=\u5DF2\u767B\u5F55: \u4E91\u7AEF ({0})
+ConnectionBean.CloudConnection.description=\u4E91\u7AEF\u8FDC\u7A0B\u8FDE\u63A5 - \u5DF2\u767B\u5F55: \u4E91\u7AEF ({0})
 InegerCellEditorListener.NegativeNumberMessage={0} \u7684\u503C\u4E0D\u80FD\u8BBE\u5B9A\u4E3A\u8D1F\u6570\u3002
 InegerCellEditorListener.NumeralMessage={0} \u7684\u503C\u5E94\u8BE5\u4E3A\u6570\u5B57\u3002
 OpenXSDFileDialog.cancel=\u53D6\u6D88

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/projectsetting/IProjectSettingPreferenceConstants.java

@@ -78,5 +78,10 @@ public interface IProjectSettingPreferenceConstants {
     public static final String TEMPLATE_DOCKER_PROFILE_POM = "template_docker_profile_pom_script"; //$NON-NLS-1$
     
     public static final String USE_STRICT_REFERENCE_JOBLET = "use_strict_reference_joblet"; //$NON-NLS-1$
+    
+    /*
+     * Default microservices application properties
+     */
+    public static final String MS_APPLICATION_PROPERTIES = "ms_application_properties";
 
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/projectsetting/IProjectSettingTemplateConstants.java

@@ -19,6 +19,8 @@ package org.talend.core.runtime.projectsetting;
 public interface IProjectSettingTemplateConstants {
 
     final static String PATH_RESOURCES = "resources";
+    
+    final static String PATH_APPLICATION_PROPERTIES = PATH_RESOURCES + '/' + "application.properties";
 
     final static String PATH_RESOURCES_TEMPLATES = PATH_RESOURCES + '/' + "templates";
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/projectsetting/ProjectPreferenceManager.java

@@ -231,6 +231,9 @@ public class ProjectPreferenceManager {
         if (isCurrentProject) {
             try {
                 Project currentProject = ProjectManager.getInstance().getCurrentProject();
+                if (qualifier == null) {
+                    qualifier = "org.talend.designer.maven";
+                }
                 init(ResourceUtils.getProject(currentProject), qualifier);
             } catch (PersistenceException e) {
                 ExceptionHandler.process(e);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/services/IFilterService.java

@@ -1,5 +1,6 @@
 package org.talend.core.runtime.services;
 
+import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
 import org.talend.core.model.properties.Item;
 
@@ -9,4 +10,11 @@ public interface IFilterService extends IService {
 
 	public boolean isFilterAccepted(Item item, String filter);
 
+    public static IFilterService get() {
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(IFilterService.class)) {
+            return GlobalServiceRegister.getDefault().getService(IFilterService.class);
+        }
+        return null;
+    }
+
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/ICloudSignOnService.java

@@ -0,0 +1,58 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2021 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.service;
+
+import org.talend.core.GlobalServiceRegister;
+import org.talend.core.IService;
+import org.talend.signon.util.TokenMode;
+import org.talend.signon.util.listener.LoginEventListener;
+
+public interface ICloudSignOnService extends IService {
+
+    TokenMode getToken(String authCode, String codeVerifier, String dataCenter) throws Exception;
+
+    void startHeartBeat() throws Exception;
+
+    void stopHeartBeat();
+
+    String generateCodeVerifier();
+
+    String getCodeChallenge(String seed) throws Exception;
+
+    boolean hasValidToken() throws Exception;
+
+    String getTokenUser(String url, TokenMode token) throws Exception;
+
+    void signonCloud(LoginEventListener listener) throws Exception;
+    
+    TokenMode getLatestToken() throws Exception;
+    
+    public boolean refreshToken() throws Exception;
+    
+    boolean isSignViaCloud();
+    
+    boolean isNeedShowSSOPage();
+    
+    public void showReloginDialog();
+    
+    public boolean isReloginDialogRunning();
+    
+    public void reload();
+
+    public static ICloudSignOnService get() {
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(ICloudSignOnService.class)) {
+            return GlobalServiceRegister.getDefault().getService(ICloudSignOnService.class);
+        }
+        return null;
+    }
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/IRemoteService.java

@@ -17,6 +17,9 @@ import org.talend.commons.exception.PersistenceException;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
 import org.talend.core.nexus.ArtifactRepositoryBean;
+import org.talend.core.pendo.AbstractPendoTrackManager;
+import org.talend.core.pendo.TrackEvent;
+import org.talend.core.pendo.properties.IPendoDataProperties;
 import org.talend.utils.json.JSONException;
 import org.talend.utils.json.JSONObject;
 
@@ -35,11 +38,17 @@ public interface IRemoteService extends IService {
             LoginException, JSONException;
 
     boolean isAuthorized(String value);
-
-    boolean isTokenUsed(String adminUrl) throws Exception;
-
-    String getPendoKeyFromLicense() throws Exception;
     
+    boolean isPendoTrackAvailable() throws Exception;
+
+    void sendPendoTrackData(TrackEvent event, IPendoDataProperties properties) throws Exception;
+
+    AbstractPendoTrackManager getPendoProjectLoginManager();
+
+    AbstractPendoTrackManager getPendoGenericManager(TrackEvent event, IPendoDataProperties peoperties);
+
+    String getTmcUser(String url, String token);
+
     public boolean isCloudConnection();
     
     public static IRemoteService get() {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/core/IDesignerCoreService.java

@@ -26,6 +26,8 @@ import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IEditorReference;
 import org.eclipse.ui.part.MultiPageEditorPart;
+import org.talend.analysistask.AnalysisReportRecorder;
+import org.talend.commons.exception.PersistenceException;
 import org.talend.core.IService;
 import org.talend.core.model.components.IComponent;
 import org.talend.core.model.general.ModuleNeeded;
@@ -206,4 +208,6 @@ public interface IDesignerCoreService extends IService {
 
     public IProcess getJobletProcessByItem(Item item);
 
+    public List<AnalysisReportRecorder> analysis(Project project) throws PersistenceException;
+
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/runprocess/IRunProcessService.java

@@ -160,6 +160,8 @@ public interface IRunProcessService extends IService {
 
     public void checkLastGenerationHasCompilationError(boolean updateProblemsView) throws ProcessorException;
 
+    public void checkLastGenerationHasCompilationError(boolean updateProblemsView, boolean isJob) throws ProcessorException;
+
     /**
      * DOC ycbai Comment method "getResourceFilePath".
      *

main/plugins/org.talend.core.runtime/src/main/java/org/talend/repository/ProjectManager.java

@@ -380,24 +380,27 @@ public final class ProjectManager {
         return null;
     }
 
+    /**
+     * @deprecated unable to get project when resource is unloaded, use {@link #getProject(EObject)} instead
+     */
     public org.talend.core.model.properties.Project getProject(Project project, EObject object) {
-        if (object != null) {
-            if (object instanceof org.talend.core.model.properties.Project) {
-                return (org.talend.core.model.properties.Project) object;
-            }
-            if (object instanceof Property) {
-                return getProject(project, ((Property) object).getItem());
-            }
-            if (object instanceof Item) {
-                return getProject(project, ((Item) object).getParent());
-            }
-        }
-
-        // default
-        if (project != null) {
-            return project.getEmfProject();
-        }
-        return null;
+        // if (object != null) {
+        // if (object instanceof org.talend.core.model.properties.Project) {
+        // return (org.talend.core.model.properties.Project) object;
+        // }
+        // if (object instanceof Property) {
+        // return getProject(project, ((Property) object).getItem());
+        // }
+        // if (object instanceof Item) {
+        // return getProject(project, ((Item) object).getParent());
+        // }
+        // }
+        //
+        // // default
+        // if (project != null) {
+        // return project.getEmfProject();
+        // }
+        return getProject(object);
     }
 
     public IProject getResourceProject(org.talend.core.model.properties.Project project) {
@@ -443,7 +446,7 @@ public final class ProjectManager {
 
     public boolean isInMainProject(Project mainProject, EObject object) {
         if (object != null) {
-            org.talend.core.model.properties.Project project = getProject(mainProject, object);
+            org.talend.core.model.properties.Project project = getProject(object);
             if (project != null && mainProject != null) {
                 return project.getTechnicalLabel().equals(mainProject.getEmfProject().getTechnicalLabel());
             }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/repository/ui/login/connections/ConnectionUserPerReader.java

@@ -32,6 +32,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.ui.PlatformUI;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.core.model.general.ConnectionBean;
+import org.talend.core.service.ICloudSignOnService;
 import org.talend.utils.json.JSONArray;
 import org.talend.utils.json.JSONException;
 import org.talend.utils.json.JSONObject;
@@ -158,6 +159,8 @@ public class ConnectionUserPerReader {
         }
         if (cons == null || cons.size() == 0) {
             proper.remove("connection.users");//$NON-NLS-1$
+            proper.remove("connection.define");//$NON-NLS-1$
+            proper.remove("connection.lastConnection");//$NON-NLS-1$
         } else {
             JSONArray usersJsonArray = new JSONArray();
             for (ConnectionBean currentConnection : cons) {
@@ -207,7 +210,6 @@ public class ConnectionUserPerReader {
         } catch (Exception e) {
             e.printStackTrace();
         }
-
     }
 
     public void createPropertyFile() {

main/plugins/org.talend.core.ui/src/main/java/messages_ja.properties

@@ -133,7 +133,7 @@ JavaFunctionParser.checkMethod=\u30EB\u30FC\u30C1\u30F3: "{0}.{1}"\u89E3\u6790\u
 JavaGlobalVariableProposal.Description=\u8AAC\u660E: {0}
 JavaGlobalVariableProposal.VariableName=\n\n\u5909\u6570\u540D: {1}
 JavaSimpleDateFormatProposalProvider.displaySingleQuote= ' : \u4E00\u91CD\u5F15\u7528\u7B26\u3092\u8868\u793A
-JavaSimpleDateFormatProposalProvider.quoteDisplayError=\uFF12\u3064\u306E\u30B7\u30F3\u30B0\u30EB\u30AF\u30A9\u30FC\u30C8\u3067\uFF11\u3064\u306E\u30B7\u30F3\u30B0\u30EB\u30AF\u30A9\u30FC\u30C8\u3092\u793A\u3057\u307E\u3059\u3002
+JavaSimpleDateFormatProposalProvider.quoteDisplayError=\uFF12\u3064\u306E\u4E00\u91CD\u5F15\u7528\u7B26\u3067\uFF11\u3064\u306E\u4E00\u91CD\u5F15\u7528\u7B26\u3092\u793A\u3057\u307E\u3059\u3002
 JavaTypesManager.bigDecimal=BIGDECIMAL\u306F\u6570\u5024\u3067\u3059:
 JavaTypesManager.integer=INTEGER\u306F\u6570\u5024\u3067\u3059:
 JavaTypesManager.list=LIST\u306F\u6570\u5024\u3067\u3059:

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/metadata/celleditor/ModuleListCellEditor.java

@@ -167,7 +167,7 @@ public class ModuleListCellEditor extends DialogCellEditor {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(ILibraryManagerUIService.class)) {
             ILibraryManagerUIService libUiService = (ILibraryManagerUIService) GlobalServiceRegister.getDefault().getService(
                    ILibraryManagerUIService.class);
-            IConfigModuleDialog dialog = libUiService.getConfigModuleDialog(cellEditorWindow.getShell(), "\"newLine\"".equals(value) ? "" : value);
+            IConfigModuleDialog dialog = libUiService.getConfigModuleDialog(cellEditorWindow.getShell(), "\"newLine\"".equals(value) ? "" : value, false);
             if (dialog.open() == IDialogConstants.OK_ID) {
                 String selecteModule = dialog.getMavenURI();
                 if (selecteModule != null && (value == null || !value.equals(selecteModule))) {

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/services/IGitUIProviderService.java

@@ -1,6 +1,8 @@
 package org.talend.core.ui.services;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.viewers.ISelection;
@@ -9,6 +11,7 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
+import org.talend.core.model.general.Project;
 import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.ui.properties.tab.IDynamicProperty;
 
@@ -28,6 +31,16 @@ public interface IGitUIProviderService extends IService {
     public void openPushFailedDialog(Object pushResult);
 
     boolean migrateOption(IProgressMonitor monitor, String newVersion, boolean hasUpdate) throws Exception;
+    
+    boolean openSwitchGitModeDialog();
+    
+    boolean canSwitchGitMode();
+    
+    boolean canShowSwitchGitModePopup();
+    
+    void showSwithGitModePopup();
+    
+    Map<Project, List<Project>> getInvalidReferencedProjects();
 
     public static IGitUIProviderService get() {
         GlobalServiceRegister register = GlobalServiceRegister.getDefault();

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

@@ -78,5 +78,12 @@
             serviceId="ICoreService">
       </Service>
    </extension>
+   <extension
+         point="org.talend.core.runtime.service">
+      <Service
+            class="org.talend.core.services.NotificationService"
+            serviceId="INotificationService">
+      </Service>
+   </extension>
 
 </plugin>

main/plugins/org.talend.core/src/main/java/messages_ja.properties

@@ -115,7 +115,7 @@ GlobalServiceRegister.ServiceNotRegistered=\u30B5\u30FC\u30D3\u30B9{0}\u304C\u76
 GroupByContextAction.groupContext=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3054\u3068\u306B\u30B0\u30EB\u30FC\u30D4\u30F3\u30B0
 GroupByVariableAction.groupVariable=\u5909\u6570\u3054\u3068\u306B\u30B0\u30EB\u30FC\u30D4\u30F3\u30B0
 JavaSimpleDateFormatProposalProvider.displaySingleQuote= ' : \u4E00\u91CD\u5F15\u7528\u7B26\u3092\u8868\u793A
-JavaSimpleDateFormatProposalProvider.quoteDisplayError=\uFF12\u3064\u306E\u30B7\u30F3\u30B0\u30EB\u30AF\u30A9\u30FC\u30C8\u3067\uFF11\u3064\u306E\u30B7\u30F3\u30B0\u30EB\u30AF\u30A9\u30FC\u30C8\u3092\u793A\u3057\u307E\u3059\u3002
+JavaSimpleDateFormatProposalProvider.quoteDisplayError=\uFF12\u3064\u306E\u4E00\u91CD\u5F15\u7528\u7B26\u3067\uFF11\u3064\u306E\u4E00\u91CD\u5F15\u7528\u7B26\u3092\u793A\u3057\u307E\u3059\u3002
 JavaTypesManager.bigDecimal=BIGDECIMAL\u306F\u6570\u5024\u3067\u3059:
 JavaTypesManager.integer=INTEGER\u306F\u6570\u5024\u3067\u3059:
 JavaTypesManager.list=LIST\u306F\u6570\u5024\u3067\u3059:

main/plugins/org.talend.core/src/main/java/org/talend/core/prefs/GeneralParametersProvider.java

@@ -1,86 +1,103 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2021 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.prefs;
-
-import java.util.Arrays;
-import java.util.ResourceBundle;
-
-import org.talend.commons.i18n.MessagesCore;
-
-/**
- * Use to retrieve general application parameters.<br/>
- *
- * $Id: Messages.java 1 2006-09-29 17:06:40 +0000 (ven., 29 sept. 2006) nrousseau $
- *
- */
-public class GeneralParametersProvider extends MessagesCore {
-
-    private static final String BUNDLE_NAME = "parameters"; //$NON-NLS-1$
-
-    private static final String PLUGIN_ID = "org.talend.core"; //$NON-NLS-1$
-
-    private static ResourceBundle resourceBundle;
-
-    private static ResourceBundle getBundle() {
-        if (resourceBundle == null) {
-            try {
-                resourceBundle = ResourceBundle.getBundle(BUNDLE_NAME);
-            } catch (Exception e) {
-                // Nothing to do (return null)
-            }
-        }
-        return resourceBundle;
-    }
-
-    /**
-     * Returns the value corresponding to the specified key.
-     */
-    public static String getString(GeneralParameters key) {
-        return getString(key.getParamName(), PLUGIN_ID, getBundle());
-    }
-
-    /**
-     * Returns a sorted string array containing values corresponding to the specified key.
-     */
-    public static String[] getStrings(GeneralParameters key) {
-        String value = getString(key);
-        String[] toReturn = value.split(","); //$NON-NLS-1$
-        Arrays.sort(toReturn);
-        return toReturn;
-    }
-
-    /**
-     * DOC smallet GeneralParametersProvider class global comment. Detailled comment <br/>
-     *
-     * $Id$
-     */
-    public enum GeneralParameters {
-        AUTHORIZED_LANGUAGE("param.authorizedlanguage"), //$NON-NLS-1$
-        DEFAULT_PERL_INTERPRETER_WIN32("param.defaultPerlInterpreterPath.win32"), //$NON-NLS-1$
-        DEFAULT_PERL_INTERPRETER_LINUX("param.defaultPerlInterpreterPath.linux"), //$NON-NLS-1$
-        DEFAULT_PERL_INTERPRETER_EMBEDDED_SUFFIX_WIN32("param.defaultPerlInterpreterEmbeddedSuffix.win32"), //$NON-NLS-1$
-        DEFAULT_JAVA_INTERPRETER_SUFFIX_WIN32("param.defaultJavaInterpreterSuffix.win32"), //$NON-NLS-1$
-        DEFAULT_JAVA_INTERPRETER_SUFFIX_LINUX("param.defaultJavaInterpreterSuffix.linux"), //$NON-NLS-1$
-        PROJECTS_EXCLUDED_FROM_EXPORT("param.projectsExcludedFromExport"); //$NON-NLS-1$
-
-        private String paramName;
-
-        GeneralParameters(String paramName) {
-            this.paramName = paramName;
-        }
-
-        public String getParamName() {
-            return this.paramName;
-        }
-    }
-}
+// ============================================================================
+//
+// Copyright (C) 2006-2021 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.prefs;
+
+import java.util.Arrays;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+import org.apache.commons.lang3.StringUtils;
+import org.talend.commons.i18n.MessagesCore;
+import org.talend.core.CorePlugin;
+
+/**
+ * Use to retrieve general application parameters.<br/>
+ *
+ * $Id: Messages.java 1 2006-09-29 17:06:40 +0000 (ven., 29 sept. 2006) nrousseau $
+ *
+ */
+public class GeneralParametersProvider extends MessagesCore {
+
+    private static final String BUNDLE_NAME = "parameters"; //$NON-NLS-1$
+
+    private static final String PLUGIN_ID = "org.talend.core"; //$NON-NLS-1$
+
+    private static ResourceBundle resourceBundle;
+
+    private static ResourceBundle getBundle() {
+        if (resourceBundle == null) {
+            try {
+                resourceBundle = ResourceBundle.getBundle(BUNDLE_NAME);
+            } catch (Exception e) {
+                // Nothing to do (return null)
+            }
+        }
+        return resourceBundle;
+    }
+
+    /**
+     * Returns the value corresponding to the specified key.
+     */
+    public static String getString(GeneralParameters key) {
+        return getString(key.getParamName(), PLUGIN_ID, getBundle());
+    }
+
+    /**
+     * Returns a sorted string array containing values corresponding to the specified key.
+     */
+    public static String[] getStrings(GeneralParameters key) {
+        String value = getString(key);
+        String[] toReturn = value.split(","); //$NON-NLS-1$
+        Arrays.sort(toReturn);
+        return toReturn;
+    }
+    
+    public static String getOnLineHelpLanguageSetting() {
+        String language = CorePlugin.getDefault().getPluginPreferences().getString(ITalendCorePrefConstants.LANGUAGE_SELECTOR);
+        if (StringUtils.isBlank(language)) {
+            language = Locale.getDefault().getLanguage();
+        }
+        if (Locale.FRENCH.getLanguage().equals(language)) {
+            return "fr";
+        }
+        if (Locale.JAPAN.getLanguage().equals(language)) {
+            return "ja";
+        }
+        return "en"; //$NON-NLS-1$ //$NON-NLS-2$
+    }
+
+    /**
+     * DOC smallet GeneralParametersProvider class global comment. Detailled comment <br/>
+     *
+     * $Id$
+     */
+    public enum GeneralParameters {
+        AUTHORIZED_LANGUAGE("param.authorizedlanguage"), //$NON-NLS-1$
+        DEFAULT_PERL_INTERPRETER_WIN32("param.defaultPerlInterpreterPath.win32"), //$NON-NLS-1$
+        DEFAULT_PERL_INTERPRETER_LINUX("param.defaultPerlInterpreterPath.linux"), //$NON-NLS-1$
+        DEFAULT_PERL_INTERPRETER_EMBEDDED_SUFFIX_WIN32("param.defaultPerlInterpreterEmbeddedSuffix.win32"), //$NON-NLS-1$
+        DEFAULT_JAVA_INTERPRETER_SUFFIX_WIN32("param.defaultJavaInterpreterSuffix.win32"), //$NON-NLS-1$
+        DEFAULT_JAVA_INTERPRETER_SUFFIX_LINUX("param.defaultJavaInterpreterSuffix.linux"), //$NON-NLS-1$
+        PROJECTS_EXCLUDED_FROM_EXPORT("param.projectsExcludedFromExport"); //$NON-NLS-1$
+
+        private String paramName;
+
+        GeneralParameters(String paramName) {
+            this.paramName = paramName;
+        }
+
+        public String getParamName() {
+            return this.paramName;
+        }
+    }
+}

main/plugins/org.talend.core/src/main/java/org/talend/core/services/ICoreTisService.java

@@ -88,12 +88,22 @@ public interface ICoreTisService extends IService {
     Integer getSignatureVerifyResult(Property property, IPath resourcePath, boolean considerGP) throws Exception;
 
     String getLicenseCustomer();
+    
+    void storeLicenseAndUpdateConfig(String licenseString) throws IOException;
 
     boolean isInValidGP();
 
     boolean hasNewPatchInPatchesFolder();
 
     boolean isDefaultLicenseAndProjectType();
+    
+    String getLicenseProductName(String licenseString) throws Exception;
+    
+    String getLicenseProductEdition(String licenseString) throws Exception; 
+    
+    boolean isLicenseExpired(String licenseString) throws Exception;
+    
+    boolean isLicenseVersionCorrect(String licenseString) throws Exception;
 
     void syncProjectUpdateSettingsFromServer(IProgressMonitor monitor, Project proj) throws Exception;
 

main/plugins/org.talend.core/src/main/java/org/talend/core/services/IGITProviderService.java

@@ -56,6 +56,29 @@ public interface IGITProviderService extends IService {
     void createOrUpdateGitIgnoreFile(IProject eclipseProject) throws CoreException;
 
     String getDefaultBranch(Project project);
+    
+    /**
+     * Whether git mode is standard mode
+     * @return
+     */
+    boolean isStandardMode();
+    
+    /**
+     * Set git mode
+     * @param standardMode
+     */
+    void setStandardMode(boolean standardMode);
+    
+    /**
+     * Get clean git repository url
+     * @param project project
+     * @return
+     */
+    String getCleanGitRepositoryUrl(org.talend.core.model.properties.Project project);
+    
+    boolean canShowSwitchGitModePopup();
+    
+    void showSwithGitModePopup();
 
     public static IGITProviderService get() {
         GlobalServiceRegister register = GlobalServiceRegister.getDefault();

main/plugins/org.talend.core/src/main/java/org/talend/core/services/INotificationService.java

@@ -0,0 +1,34 @@
+// ============================================================================
+//
+// 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.services;
+
+import org.eclipse.jface.window.WindowManager;
+import org.talend.core.GlobalServiceRegister;
+import org.talend.core.IService;
+
+/**
+ * @author bhe created on Oct 27, 2022
+ *
+ */
+public interface INotificationService extends IService {
+
+    WindowManager getNotificationWindowManager();
+
+    public static INotificationService get() {
+        GlobalServiceRegister register = GlobalServiceRegister.getDefault();
+        if (!register.isServiceRegistered(INotificationService.class)) {
+            return null;
+        }
+        return register.getService(INotificationService.class);
+    }
+}

main/plugins/org.talend.core/src/main/java/org/talend/core/services/NotificationService.java

@@ -0,0 +1,30 @@
+// ============================================================================
+//
+// 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.services;
+
+import org.eclipse.jface.window.WindowManager;
+
+/**
+ * @author bhe created on Oct 28, 2022
+ *
+ */
+public class NotificationService implements INotificationService {
+
+    private WindowManager manager = new WindowManager();
+
+    @Override
+    public WindowManager getNotificationWindowManager() {
+        return manager;
+    }
+
+}

main/plugins/org.talend.core/src/main/java/org/talend/designer/runprocess/ProcessorUtilities.java

@@ -819,7 +819,8 @@ public class ProcessorUtilities {
             // TDI-36930, just after compile, need check the compile errors first.
             // only check current build
             if (isMainJob) {
-                CorePlugin.getDefault().getRunProcessService().checkLastGenerationHasCompilationError(true);
+                CorePlugin.getDefault().getRunProcessService().checkLastGenerationHasCompilationError(true,
+                        !ComponentCategory.CATEGORY_4_CAMEL.getName().equals(currentProcess.getComponentsType()));
             }
         }
 

main/plugins/org.talend.cwm.mip.edit/plugin_fr.properties

@@ -56,7 +56,7 @@ _UI_TypeAlias_type=Type Alias
 _UI_Union_type=Union
 _UI_UnionMember_type=Membre de l'union
 _UI_ExpressionNode_type=N\u0153ud d'expression
-_UI_ConstantNode_type=Noeud constant
+_UI_ConstantNode_type=N\u0153ud constant
 _UI_ElementNode_type=N\u0153ud d'\u00E9l\u00E9ment
 _UI_FeatureNode_type=N\u0153ud de fonctionnalit\u00E9
 _UI_UniqueKey_type=Cl\u00E9 unique

main/plugins/org.talend.cwm.mip.edit/plugin_ja.properties

@@ -788,7 +788,7 @@ _UI_Term_concept_feature=\u30B3\u30F3\u30BB\u30D7\u30C8
 _UI_Term_relatedTerm_feature=\u95A2\u9023\u7528\u8A9E
 _UI_Term_term_feature=\u7528\u8A9E
 _UI_Term_preferredTerm_feature=\u597D\u307E\u3057\u3044Term
-_UI_Term_synonym_feature=\u540C\u7FA9\u8A9E
+_UI_Term_synonym_feature=\u30B7\u30CE\u30CB\u30E0
 _UI_Term_widerTerm_feature=\u5E45\u5E83\u3044Term
 _UI_Term_narrowerTerm_feature=Narrower Term
 _UI_WarehouseProcess_staticDefinition_feature=\u9759\u7684\u5B9A\u7FA9

main/plugins/org.talend.designer.maven.repo.tck/pom.xml

@@ -10,8 +10,8 @@
 	<artifactId>org.talend.designer.maven.repo.tck</artifactId>
 	<packaging>eclipse-plugin</packaging>
 	<properties>
-		<jackson.version>2.13.2</jackson.version>
-		<jackson-databind.version>2.13.2.2</jackson-databind.version>
+		<jackson.version>2.13.4</jackson.version>
+		<jackson-databind.version>2.13.4.2</jackson-databind.version>
 		<slf4j.version>1.7.32</slf4j.version>
 		<tycho.buildtimestamp.format>${timestamp}</tycho.buildtimestamp.format>
 	</properties>

main/plugins/org.talend.designer.maven.repo.tcksdk/pom.xml

@@ -1,480 +1,479 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.talend.studio</groupId>
-		<artifactId>tcommon-studio-se</artifactId>
-		<version>8.0.1-SNAPSHOT</version>
-		<relativePath>../../../</relativePath>
-	</parent>
-	<artifactId>org.talend.designer.maven.repo.tcksdk</artifactId>
-	<packaging>eclipse-plugin</packaging>
-	<properties>
-		<tcomp.version>${component-runtime.version}</tcomp.version>
-		<cxf.version>3.5.2</cxf.version>
-		<geronimo.version>1.0.2</geronimo.version>
-		<jcache.version>1.0.5</jcache.version>
-		<jcache_spec.version>1.0-alpha-1</jcache_spec.version>
-		<johnzon.version>1.2.16</johnzon.version>
-		<meecrowave.version>1.2.13</meecrowave.version>
-		<microprofile.version>1.2.1</microprofile.version>
-		<owb.version>2.0.26</owb.version>
-		<slf4j.version>1.7.33</slf4j.version>
-		<tomcat.version>9.0.63</tomcat.version>
-		<xbean.version>4.20</xbean.version>
-		<reload4j.version>1.2.19</reload4j.version>
-		<log4j2.version>2.17.2</log4j2.version>
-		<tycho.buildtimestamp.format>${timestamp}</tycho.buildtimestamp.format>
-	</properties>
-	<repositories>
-		<repository>
-			<id>talend_open</id>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-			<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
-		</repository>
-		<repository>
-			<id>talend_open_snapshots</id>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
-		</repository>
-		<repository>
-			<id>sonatype_snapshots</id>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-		</repository>
-	</repositories>
-
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.apache.logging.log4j</groupId>
-				<artifactId>log4j-core</artifactId>
-				<version>${log4j2.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.logging.log4j</groupId>
-				<artifactId>log4j-api</artifactId>
-				<version>${log4j2.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.logging.log4j</groupId>
-				<artifactId>log4j-slf4j-impl</artifactId>
-				<version>${log4j2.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.logging.log4j</groupId>
-				<artifactId>log4j-jul</artifactId>
-				<version>${log4j2.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.logging.log4j</groupId>
-				<artifactId>log4j-jcl</artifactId>
-				<version>${log4j2.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.logging.log4j</groupId>
-				<artifactId>log4j-1.2-api</artifactId>
-				<version>${log4j2.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.logging.log4j</groupId>
-				<artifactId>log4j-to-slf4j</artifactId>
-				<version>${log4j2.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.logging.log4j</groupId>
-				<artifactId>log4j-web</artifactId>
-				<version>${log4j2.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.talend.sdk.component</groupId>
-				<artifactId>component-runtime</artifactId>
-				<version>${component-runtime.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-core</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-integration-cdi</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-frontend-jaxrs</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-rs-client</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-security</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-transports-http</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo</groupId>
-			<artifactId>geronimo-jcache-simple</artifactId>
-			<version>${jcache.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo</groupId>
-			<artifactId>geronimo-opentracing-common</artifactId>
-			<version>${geronimo.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo</groupId>
-			<artifactId>geronimo-opentracing</artifactId>
-			<version>${geronimo.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jcache_1.0_spec</artifactId>
-			<version>${jcache_spec.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.johnzon</groupId>
-			<artifactId>johnzon-core</artifactId>
-			<version>${johnzon.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.johnzon</groupId>
-			<artifactId>johnzon-jaxrs</artifactId>
-			<version>${johnzon.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.johnzon</groupId>
-			<artifactId>johnzon-jsonb</artifactId>
-			<version>${johnzon.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.johnzon</groupId>
-			<artifactId>johnzon-mapper</artifactId>
-			<version>${johnzon.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.meecrowave</groupId>
-			<artifactId>meecrowave-core</artifactId>
-			<version>${meecrowave.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-el22</artifactId>
-			<version>${owb.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-impl</artifactId>
-			<version>${owb.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-se</artifactId>
-			<version>${owb.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-spi</artifactId>
-			<version>${owb.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-web</artifactId>
-			<version>${owb.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat</groupId>
-			<artifactId>tomcat-api</artifactId>
-			<version>${tomcat.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat</groupId>
-			<artifactId>tomcat-catalina</artifactId>
-			<version>${tomcat.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat</groupId>
-			<artifactId>tomcat-coyote</artifactId>
-			<version>${tomcat.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat</groupId>
-			<artifactId>tomcat-jaspic-api</artifactId>
-			<version>${tomcat.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat</groupId>
-			<artifactId>tomcat-jni</artifactId>
-			<version>${tomcat.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat</groupId>
-			<artifactId>tomcat-juli</artifactId>
-			<version>${tomcat.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat</groupId>
-			<artifactId>tomcat-servlet-api</artifactId>
-			<version>${tomcat.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat</groupId>
-			<artifactId>tomcat-util-scan</artifactId>
-			<version>${tomcat.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat</groupId>
-			<artifactId>tomcat-util</artifactId>
-			<version>${tomcat.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat</groupId>
-			<artifactId>tomcat-websocket-api</artifactId>
-			<version>${tomcat.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat</groupId>
-			<artifactId>tomcat-websocket</artifactId>
-			<version>${tomcat.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.xbean</groupId>
-			<artifactId>xbean-asm9-shaded</artifactId>
-			<version>${xbean.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.xbean</groupId>
-			<artifactId>xbean-finder-shaded</artifactId>
-			<version>${xbean.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.xbean</groupId>
-			<artifactId>xbean-finder</artifactId>
-			<version>${xbean.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.xbean</groupId>
-			<artifactId>xbean-reflect</artifactId>
-			<version>${xbean.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.microprofile.opentracing</groupId>
-			<artifactId>microprofile-opentracing-api</artifactId>
-			<version>${microprofile.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.sdk.component</groupId>
-			<artifactId>component-api</artifactId>
-			<version>${component-runtime.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.sdk.component</groupId>
-			<artifactId>component-runtime-design-extension</artifactId>
-			<version>${component-runtime.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.sdk.component</groupId>
-			<artifactId>component-runtime-di</artifactId>
-			<version>${component-runtime.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.sdk.component</groupId>
-			<artifactId>component-runtime-impl</artifactId>
-			<version>${component-runtime.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.sdk.component</groupId>
-			<artifactId>component-runtime-manager</artifactId>
-			<version>${component-runtime.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.sdk.component</groupId>
-			<artifactId>component-server</artifactId>
-			<version>${component-runtime.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.sdk.component</groupId>
-			<artifactId>component-server-api</artifactId>
-			<version>${component-runtime.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.sdk.component</groupId>
-			<artifactId>component-server-extension-api</artifactId>
-			<version>${component-runtime.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.sdk.component</groupId>
-			<artifactId>component-server-model</artifactId>
-			<version>${component-runtime.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.sdk.component</groupId>
-			<artifactId>component-spi</artifactId>
-			<version>${component-runtime.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.sdk.component</groupId>
-			<artifactId>container-core</artifactId>
-			<version>${component-runtime.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.sdk.component</groupId>
-			<artifactId>slf4j-standard</artifactId>
-			<version>${component-runtime.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.sdk.component</groupId>
-			<artifactId>vault-client</artifactId>
-			<version>${component-runtime.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>${slf4j.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-jdk14</artifactId>
-			<version>${slf4j.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<version>${slf4j.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>log4j</groupId>
-					<artifactId>log4j</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>ch.qos.reload4j</groupId>
-			<artifactId>reload4j</artifactId>
-			<version>${reload4j.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-simple</artifactId>
-			<version>${slf4j.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-cli</groupId>
-			<artifactId>commons-cli</artifactId>
-			<version>1.4</version>
-		</dependency>
-		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-text -->
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-text</artifactId>
-			<version>1.4</version>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.8.2</version>
-				<executions>
-					<execution>
-						<id>default-deploy</id>
-						<phase>deploy</phase>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-clean-plugin</artifactId>
-				<version>3.1.0</version>
-				<configuration>
-					<filesets>
-						<fileset>
-							<directory>${project.basedir}/repository</directory>
-							<includes>
-								<include>**/*</include>
-							</includes>
-							<followSymlinks>false</followSymlinks>
-						</fileset>
-						<fileset>
-							<directory>${project.basedir}/tmp</directory>
-							<includes>
-								<include>**/*</include>
-							</includes>
-							<followSymlinks>false</followSymlinks>
-						</fileset>
-					</filesets>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-dependencies-jar</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.basedir}/tmp</outputDirectory>
-							<includeScope>runtime</includeScope>
-							<useRepositoryLayout>true</useRepositoryLayout>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.8</version>
-				<executions>
-					<execution>
-						<id>zip-maven-repository</id>
-						<phase>generate-sources</phase>
-						<configuration>
-							<tasks>
-								<zip destfile="${project.basedir}/repository/maven_repository.zip" basedir="${project.basedir}/tmp/" />
-								<delete dir="${project.basedir}/tmp/" />
-							</tasks>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.talend.studio</groupId>
+		<artifactId>tcommon-studio-se</artifactId>
+		<version>8.0.1-SNAPSHOT</version>
+		<relativePath>../../../</relativePath>
+	</parent>
+	<artifactId>org.talend.designer.maven.repo.tcksdk</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	<properties>
+		<tcomp.version>${component-runtime.version}</tcomp.version>
+		<cxf.version>3.5.2</cxf.version>
+		<geronimo.version>1.0.2</geronimo.version>
+		<jcache.version>1.0.5</jcache.version>
+		<jcache_spec.version>1.0-alpha-1</jcache_spec.version>
+		<johnzon.version>1.2.19</johnzon.version>
+		<meecrowave.version>1.2.14</meecrowave.version>
+		<microprofile.version>1.2.1</microprofile.version>
+		<owb.version>2.0.27</owb.version>
+		<slf4j.version>1.7.34</slf4j.version>
+		<tomcat.version>9.0.63</tomcat.version>
+		<xbean.version>4.20</xbean.version>
+		<reload4j.version>1.2.22</reload4j.version>
+		<log4j2.version>2.17.2</log4j2.version>
+		<tycho.buildtimestamp.format>${timestamp}</tycho.buildtimestamp.format>
+	</properties>
+	<repositories>
+		<repository>
+			<id>talend_open</id>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+			<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
+		</repository>
+		<repository>
+			<id>talend_open_snapshots</id>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+		</repository>
+		<repository>
+			<id>sonatype_snapshots</id>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+		</repository>
+	</repositories>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-core</artifactId>
+				<version>${log4j2.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-api</artifactId>
+				<version>${log4j2.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-slf4j-impl</artifactId>
+				<version>${log4j2.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-jul</artifactId>
+				<version>${log4j2.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-jcl</artifactId>
+				<version>${log4j2.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-1.2-api</artifactId>
+				<version>${log4j2.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-to-slf4j</artifactId>
+				<version>${log4j2.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-web</artifactId>
+				<version>${log4j2.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.talend.sdk.component</groupId>
+				<artifactId>component-runtime</artifactId>
+				<version>${component-runtime.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-core</artifactId>
+			<version>${cxf.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-integration-cdi</artifactId>
+			<version>${cxf.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-frontend-jaxrs</artifactId>
+			<version>${cxf.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-rs-client</artifactId>
+			<version>${cxf.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-security</artifactId>
+			<version>${cxf.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-transports-http</artifactId>
+			<version>${cxf.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo</groupId>
+			<artifactId>geronimo-jcache-simple</artifactId>
+			<version>${jcache.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo</groupId>
+			<artifactId>geronimo-opentracing-common</artifactId>
+			<version>${geronimo.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo</groupId>
+			<artifactId>geronimo-opentracing</artifactId>
+			<version>${geronimo.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jcache_1.0_spec</artifactId>
+			<version>${jcache_spec.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.johnzon</groupId>
+			<artifactId>johnzon-core</artifactId>
+			<version>${johnzon.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.johnzon</groupId>
+			<artifactId>johnzon-jaxrs</artifactId>
+			<version>${johnzon.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.johnzon</groupId>
+			<artifactId>johnzon-jsonb</artifactId>
+			<version>${johnzon.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.johnzon</groupId>
+			<artifactId>johnzon-mapper</artifactId>
+			<version>${johnzon.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.meecrowave</groupId>
+			<artifactId>meecrowave-core</artifactId>
+			<version>${meecrowave.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.openwebbeans</groupId>
+			<artifactId>openwebbeans-el22</artifactId>
+			<version>${owb.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.openwebbeans</groupId>
+			<artifactId>openwebbeans-impl</artifactId>
+			<version>${owb.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.openwebbeans</groupId>
+			<artifactId>openwebbeans-se</artifactId>
+			<version>${owb.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.openwebbeans</groupId>
+			<artifactId>openwebbeans-spi</artifactId>
+			<version>${owb.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.openwebbeans</groupId>
+			<artifactId>openwebbeans-web</artifactId>
+			<version>${owb.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-api</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-catalina</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-coyote</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-jaspic-api</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-jni</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-juli</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-servlet-api</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-util-scan</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-util</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-websocket-api</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-websocket</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.xbean</groupId>
+			<artifactId>xbean-asm9-shaded</artifactId>
+			<version>${xbean.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.xbean</groupId>
+			<artifactId>xbean-finder-shaded</artifactId>
+			<version>${xbean.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.xbean</groupId>
+			<artifactId>xbean-finder</artifactId>
+			<version>${xbean.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.xbean</groupId>
+			<artifactId>xbean-reflect</artifactId>
+			<version>${xbean.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.microprofile.opentracing</groupId>
+			<artifactId>microprofile-opentracing-api</artifactId>
+			<version>${microprofile.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.sdk.component</groupId>
+			<artifactId>component-api</artifactId>
+			<version>${component-runtime.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.sdk.component</groupId>
+			<artifactId>component-runtime-design-extension</artifactId>
+			<version>${component-runtime.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.sdk.component</groupId>
+			<artifactId>component-runtime-di</artifactId>
+			<version>${component-runtime.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.sdk.component</groupId>
+			<artifactId>component-runtime-impl</artifactId>
+			<version>${component-runtime.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.sdk.component</groupId>
+			<artifactId>component-runtime-manager</artifactId>
+			<version>${component-runtime.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.sdk.component</groupId>
+			<artifactId>component-server</artifactId>
+			<version>${component-runtime.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.sdk.component</groupId>
+			<artifactId>component-server-api</artifactId>
+			<version>${component-runtime.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.sdk.component</groupId>
+			<artifactId>component-server-extension-api</artifactId>
+			<version>${component-runtime.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.sdk.component</groupId>
+			<artifactId>component-server-model</artifactId>
+			<version>${component-runtime.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.sdk.component</groupId>
+			<artifactId>component-spi</artifactId>
+			<version>${component-runtime.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.sdk.component</groupId>
+			<artifactId>container-core</artifactId>
+			<version>${component-runtime.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.sdk.component</groupId>
+			<artifactId>slf4j-standard</artifactId>
+			<version>${component-runtime.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.sdk.component</groupId>
+			<artifactId>vault-client</artifactId>
+			<version>${component-runtime.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-jdk14</artifactId>
+			<version>${slf4j.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<version>${slf4j.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>log4j</groupId>
+					<artifactId>log4j</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.reload4j</groupId>
+			<artifactId>reload4j</artifactId>
+			<version>${reload4j.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+			<version>${slf4j.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-cli</groupId>
+			<artifactId>commons-cli</artifactId>
+			<version>1.4</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-text</artifactId>
+			<version>1.10.0</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.8.2</version>
+				<executions>
+					<execution>
+						<id>default-deploy</id>
+						<phase>deploy</phase>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-clean-plugin</artifactId>
+				<version>3.1.0</version>
+				<configuration>
+					<filesets>
+						<fileset>
+							<directory>${project.basedir}/repository</directory>
+							<includes>
+								<include>**/*</include>
+							</includes>
+							<followSymlinks>false</followSymlinks>
+						</fileset>
+						<fileset>
+							<directory>${project.basedir}/tmp</directory>
+							<includes>
+								<include>**/*</include>
+							</includes>
+							<followSymlinks>false</followSymlinks>
+						</fileset>
+					</filesets>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-dependencies-jar</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.basedir}/tmp</outputDirectory>
+							<includeScope>runtime</includeScope>
+							<useRepositoryLayout>true</useRepositoryLayout>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.8</version>
+				<executions>
+					<execution>
+						<id>zip-maven-repository</id>
+						<phase>generate-sources</phase>
+						<configuration>
+							<tasks>
+								<zip destfile="${project.basedir}/repository/maven_repository.zip" basedir="${project.basedir}/tmp/" />
+								<delete dir="${project.basedir}/tmp/" />
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

main/plugins/org.talend.designer.maven.tos/resources/build/plugins/karaf-maven-plugin-4-2-10/pom.xml

@@ -118,7 +118,7 @@
 		<dependency>
 		    <groupId>com.fasterxml.jackson.core</groupId>
 		    <artifactId>jackson-databind</artifactId>
-		    <version>2.13.2.2</version>
+		    <version>2.13.4.2</version>
 		</dependency>
 		<dependency>
 		    <groupId>org.apache.httpcomponents</groupId>

main/plugins/org.talend.designer.maven.tos/resources/build/plugins/maven-bundle-plugin-5-1-1/pom.xml

@@ -89,7 +89,7 @@
 		<dependency>
 		    <groupId>com.fasterxml.jackson.core</groupId>
 		    <artifactId>jackson-databind</artifactId>
-		    <version>2.13.2.2</version>
+		    <version>2.13.4.2</version>
 		</dependency>
 		<dependency>
 		    <groupId>com.thoughtworks.xstream</groupId>

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

@@ -11,9 +11,9 @@
     <packaging>pom</packaging>
 
     <properties>
-        <tcomp.version>1.48.1</tcomp.version>
-        <slf4j.version>1.7.32</slf4j.version>
-        <reload4j.version>1.2.19</reload4j.version>
+        <tcomp.version>1.50.1</tcomp.version>
+        <slf4j.version>1.7.34</slf4j.version>
+        <reload4j.version>1.2.22</reload4j.version>
     </properties>
 
     <repositories>

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

@@ -43,7 +43,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
-            <version>1.9</version>
+            <version>1.10.0</version>
         </dependency>
 		<dependency>
             <groupId>com.fasterxml.jackson</groupId>
@@ -109,6 +109,7 @@
                                 <patternset>
                                         <exclude name="repository/org/apache/maven/maven-artifact-manager/2.0.9/"/>
                                         <exclude name="repository/org/apache/maven/maven-artifact-manager/2.0.6/"/>
+                                        <exclude name="repository/ch/qos/reload4j/reload4j/1.2.19/"/>
                                     </patternset>
                                 </unzip>
                             </tasks>

main/plugins/org.talend.designer.maven.ui/src/main/java/messages.properties

@@ -10,6 +10,7 @@ ProjectPomProjectSettingPage_ConfirmMessage=Will apply and update for project PO
 ProjectPomProjectSettingPage_FilterPomLabel=Filter to use to generate poms:
 ProjectPomProjectSettingPage_FilterErrorMessage=Filter is invalid.
 ProjectPomProjectSettingPage.syncAllPomsButtonText=Force full re-synchronize POMs
+ProjectPomProjectSettingPage.syncBuildTypesButtonText=Force full re-synchronize build types
 AbstractPersistentProjectSettingPage.syncAllPoms=Do you want to update all poms? \n This operation might take long time depends on your project size.
 MavenProjectSettingPage.filterExampleMessage=Filter examples:\nlabel=myJob       \t\t\t\t=> Generate only the job named "myJob"\n!(label=myJob)    \t\t\t\t=> Generate any job except the one named "myJob"\n(path=folder1/folder2)  \t\t\t=> Generate any job in the folder "folder1/folder2"\n(path=folder1/folder2)or(label=myJob)\t=> Generate any job in the folder "folder1/folder2" or named "myJob"\n(label=myJob)and(version=0.2)\t\t=> Generate only the job named "myJob" with version 0.2\n!((label=myJob)and(version=0.1))\t\t=> Generate every jobs except the "myJob" version 0.1
 MavenProjectSettingPage.refModuleText=Set reference project modules in profile
@@ -17,3 +18,4 @@ MavenProjectSettingPage.excludeDeletedItems=Exclude deleted items
 MavenProjectSettingPage.syncAllPomsWarning=Click the Force full re-synchronize POMs button to apply the new settings.
 MavenProjectSettingPage.skipFolders=Skip folders
 BuildProjectSettingPage.allowRecursiveJobsJoblets=Allow recursive Jobs and Joblets (not supported - for compatibility only)
+BuildProjectSettingPage.allowRecursiveJobs=Allow recursive jobs (Not recommended)

main/plugins/org.talend.designer.maven.ui/src/main/java/org/talend/designer/maven/ui/setting/project/page/MavenProjectSettingPage.java

@@ -26,6 +26,7 @@ import org.talend.core.runtime.maven.MavenConstants;
 import org.talend.core.runtime.projectsetting.AbstractProjectSettingPage;
 import org.talend.designer.maven.DesignerMavenPlugin;
 import org.talend.designer.maven.tools.AggregatorPomsHelper;
+import org.talend.designer.maven.tools.BuildTypeManager;
 import org.talend.designer.maven.ui.i18n.Messages;
 
 /**
@@ -85,7 +86,25 @@ public class MavenProjectSettingPage extends AbstractProjectSettingPage {
 
 		});
 
-	}
+        if (isSyncBuildTypeAllowed()) {
+            Button syncBuildTypes = new Button(parent, SWT.NONE);
+            syncBuildTypes.setText(Messages.getString("ProjectPomProjectSettingPage.syncBuildTypesButtonText")); //$NON-NLS-1$
+
+            syncBuildTypes.addSelectionListener(new SelectionAdapter() {
+
+                @Override
+                public void widgetSelected(SelectionEvent event) {
+                    try {
+                        new BuildTypeManager().syncBuildTypes(getCurrentPage());
+                    } catch (Exception e) {
+                        ExceptionHandler.process(e);
+                    }
+                }
+
+            });
+        }
+
+    }
 
     private void addSyncWarning() {
         setMessage(Messages.getString("MavenProjectSettingPage.syncAllPomsWarning"), IMessage.WARNING); //$NON-NLS-1$
@@ -100,4 +119,12 @@ public class MavenProjectSettingPage extends AbstractProjectSettingPage {
 		return ok;
 	}
 
+	private static boolean isSyncBuildTypeAllowed() {
+		return Boolean.getBoolean("talend.builtype.syncallowed");
+	}
+	
+	private MavenProjectSettingPage getCurrentPage() {
+		return this;
+	}
+
 }

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/migration/common/ItemReportRecorder.java

@@ -0,0 +1,149 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2021 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.designer.maven.migration.common;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang.StringUtils;
+import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.exception.PersistenceException;
+import org.talend.core.GlobalServiceRegister;
+import org.talend.core.model.properties.Item;
+import org.talend.core.model.properties.Property;
+import org.talend.core.model.repository.ERepositoryObjectType;
+import org.talend.core.ui.ITestContainerCoreService;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class ItemReportRecorder {
+
+    protected Item item;
+
+    protected String detailMessage;
+
+    public String getItemType() {
+        String type = "";
+        ERepositoryObjectType itemType = ERepositoryObjectType.getItemType(item);
+        if (itemType != null) {
+            if (ERepositoryObjectType.getAllTypesOfTestContainer().contains(itemType)) {
+                Item parentJobItem = getTestCaseParentJobItem(item);
+                if (parentJobItem != null) {
+                    ERepositoryObjectType parentJobType = ERepositoryObjectType.getItemType(parentJobItem);
+                    if (parentJobType != null) {
+                        String parentTypePath = getCompleteObjectTypePath(parentJobType);
+                        if (StringUtils.isNotBlank(parentTypePath)) {
+                            type = parentTypePath + "/";
+                        }
+                    }
+                }
+                type += itemType;
+            } else {
+                type = getCompleteObjectTypePath(itemType);
+            }
+        }
+        return type;
+    }
+
+    public String getItemPath() {
+        String path = "";
+        StringBuffer buffer = new StringBuffer();
+        ERepositoryObjectType itemType = ERepositoryObjectType.getItemType(item);
+
+        if (ERepositoryObjectType.getAllTypesOfTestContainer().contains(itemType)) {
+            StringBuffer testcaseBuffer = new StringBuffer();
+            Item parentJobItem = getTestCaseParentJobItem(item);
+            if (parentJobItem != null) {
+                if (parentJobItem.getState() != null && StringUtils.isNotBlank(parentJobItem.getState().getPath())) {
+                    testcaseBuffer.append(parentJobItem.getState().getPath()).append("/");
+                }
+                testcaseBuffer.append(parentJobItem.getProperty() != null ? parentJobItem.getProperty().getLabel() : "");
+                if (StringUtils.isNotBlank(testcaseBuffer.toString())) {
+                    buffer.append(testcaseBuffer.toString()).append("/");
+                }
+            }
+        } else {
+            if (item.getState() != null && StringUtils.isNotBlank(item.getState().getPath())) {
+                buffer.append(item.getState().getPath()).append("/");
+            }
+        }
+
+        Property property = item.getProperty();
+        if (property != null) {
+            buffer.append(property.getLabel() + "_" + property.getVersion());
+        }
+        path = buffer.toString();
+        return path;
+    }
+
+    private Item getTestCaseParentJobItem(Item testcaseItem) {
+        Item parentJobItem = null;
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(ITestContainerCoreService.class)) {
+            ITestContainerCoreService testcaseService = GlobalServiceRegister.getDefault()
+                    .getService(ITestContainerCoreService.class);
+            if (testcaseService != null) {
+                try {
+                    parentJobItem = testcaseService.getParentJobItem(item);
+                } catch (PersistenceException e) {
+                    ExceptionHandler.process(e);
+                }
+            }
+        }
+        return parentJobItem;
+    }
+
+    private String getCompleteObjectTypePath(ERepositoryObjectType itemType) {
+        ERepositoryObjectType rootItemType = itemType;
+        if (ERepositoryObjectType.JDBC != null && ERepositoryObjectType.JDBC.equals(rootItemType)) {
+            rootItemType = ERepositoryObjectType.METADATA_CONNECTIONS;
+        }
+        List<String> typeLabels = new ArrayList<String>();
+        findOutCompleteTypePath(rootItemType, typeLabels);
+        StringBuffer buffer = new StringBuffer();
+        if (!typeLabels.isEmpty()) {
+            for (int i = 0; i < typeLabels.size(); i++) {
+                if (i != 0) {
+                    buffer.append("/");
+                }
+                buffer.append(typeLabels.get(i));
+            }
+        }
+        return buffer.toString();
+    }
+
+    private void findOutCompleteTypePath(ERepositoryObjectType type, List<String> typeLabels) {
+        ERepositoryObjectType parentType = ERepositoryObjectType.findParentType(type);
+        if (parentType != null) {
+            findOutCompleteTypePath(parentType, typeLabels);
+        }
+        typeLabels.add(type.getLabel());
+    }
+
+    public Item getItem() {
+        return item;
+    }
+
+    public void setItem(Item item) {
+        this.item = item;
+    }
+
+    public String getDetailMessage() {
+        return detailMessage;
+    }
+
+    public void setDetailMessage(String detailMessage) {
+        this.detailMessage = detailMessage;
+    }
+
+}

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/migration/common/ItemsReportUtil.java

@@ -0,0 +1,81 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2021 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.designer.maven.migration.common;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.commons.lang.StringUtils;
+import org.eclipse.core.runtime.Path;
+import org.talend.core.utils.TalendQuoteUtils;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class ItemsReportUtil {
+    
+
+    public static boolean generateReportFile(File reportFile, String header, List<String> records) throws Exception {
+        boolean generateDone = false;
+        BufferedWriter printWriter = null;
+        try {
+            File parentFolder = new Path(reportFile.getAbsolutePath()).removeLastSegments(1).toFile();
+            // File parentFolder = new File(parentPath);
+            if (!parentFolder.exists()) {
+                parentFolder.mkdirs();
+            }
+            if (!reportFile.exists()) {
+                reportFile.createNewFile();
+            }
+            FileOutputStream fos = new FileOutputStream(reportFile);
+            fos.write(new byte[] { (byte) 0xEF, (byte) 0xBB, (byte) 0xBF });
+            OutputStreamWriter outputWriter = new OutputStreamWriter(fos, "UTF-8");
+            printWriter = new BufferedWriter(outputWriter);
+            printWriter.write(header);
+            printWriter.newLine();
+            for (String recordStr : records) {
+                printWriter.write(recordStr);
+                printWriter.newLine();
+            }
+            printWriter.flush();
+            generateDone = true;
+        } finally {
+            if (printWriter != null) {
+                printWriter.close();
+            }
+        }
+        return generateDone;
+    }
+
+    public static String handleColumnQuotes(String text) {
+        String quoteMark = TalendQuoteUtils.QUOTATION_MARK;
+        text = StringUtils.isBlank(text) ? "" : text;
+        if (text.contains(quoteMark)) {
+            // replace to double quote surround
+            text = text.replace(quoteMark, quoteMark + quoteMark);
+        }
+        return quoteMark + text + quoteMark;
+    }
+
+    public static String getCurrentTimeString() {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
+        String time = dateFormat.format(new Date());
+        return time;
+    }
+
+}

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/migration/common/MigrationReportHelper.java

@@ -0,0 +1,177 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2021 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.designer.maven.migration.common;
+
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.preferences.ConfigurationScope;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.IScopeContext;
+import org.osgi.service.prefs.BackingStoreException;
+import org.talend.commons.exception.ExceptionHandler;
+import org.talend.core.PluginChecker;
+import org.talend.core.model.properties.Item;
+import org.talend.core.model.properties.Property;
+import org.talend.migration.IProjectMigrationTask;
+
+/**
+ * DOC jding class global comment. Detailled comment
+ */
+public class MigrationReportHelper {
+
+	private static final String COMMA = ",";
+
+	private static final String PLUGIN_ID = "org.talend.designer.maven";
+
+	private static final String DO_NOT_SHOW_PREF_KEY = "talend.migrationReportDialog.doNotShowAgain";
+
+	private static final String MIGRATION_REPORT_HEAD = "Task name,Task description,Item type,Path to migrated item,Migration details";
+
+	private static final MigrationReportHelper instance = new MigrationReportHelper();
+
+	public static MigrationReportHelper getInstance() {
+		return instance;
+	}
+
+	private String reportGeneratedPath = "";
+
+	private Set<String> taskItemRecords = new HashSet<String>();
+
+	private List<MigrationReportRecorder> migrationReportRecorders = new ArrayList<MigrationReportRecorder>();
+
+	public void generateMigrationReport(String projectTecName) {
+		if (migrationReportRecorders == null || migrationReportRecorders.isEmpty()) {
+			return;
+		}
+
+		if (!PluginChecker.isTIS()) {
+			clearRecorders();
+			return;
+		}
+
+		File exportFolder = null;
+		File reportFile = null;
+		try {
+			String currentTime = getCurrentTime();
+			String filePath = getReportExportFolder(currentTime) + "/" + getReportFileName(currentTime, projectTecName);
+			reportGeneratedPath = filePath;
+			reportFile = new File(filePath);
+			List<String> recordLines = new ArrayList<String>();
+			for (MigrationReportRecorder record : migrationReportRecorders) {
+				StringBuffer buffer = new StringBuffer();
+				buffer.append(ItemsReportUtil.handleColumnQuotes(record.getTaskClassName())).append(COMMA);
+				buffer.append(ItemsReportUtil.handleColumnQuotes(record.getTaskDescription())).append(COMMA);
+				buffer.append(ItemsReportUtil.handleColumnQuotes(record.getItemType())).append(COMMA);
+				buffer.append(ItemsReportUtil.handleColumnQuotes(record.getItemPath())).append(COMMA);
+				buffer.append(ItemsReportUtil.handleColumnQuotes(record.getDetailMessage()));
+				recordLines.add(buffer.toString());
+			}
+			ItemsReportUtil.generateReportFile(reportFile, MIGRATION_REPORT_HEAD, recordLines);
+		} catch (Exception e) {
+			ExceptionHandler.process(e);
+			if (reportFile != null && reportFile.exists()) {
+				reportFile.delete();
+			}
+			if (exportFolder != null && exportFolder.exists()) {
+				exportFolder.delete();
+			}
+		} finally {
+			migrationReportRecorders.clear();
+			taskItemRecords.clear();
+		}
+
+	}
+
+	public boolean isRequireDefaultRecord(IProjectMigrationTask task, Item item) {
+		boolean require = true;
+		if (task.getOrder() != null) {
+			Calendar calendar = Calendar.getInstance();
+			calendar.setTime(task.getOrder());
+			int year = calendar.get(Calendar.YEAR);
+			if (year <= 2016) {
+				return false;
+			}
+		}
+		if (item.getProperty() != null) {
+			Property property = item.getProperty();
+			String key = task.getId() + "_" + property.getId() + "_" + property.getVersion();
+			if (taskItemRecords.contains(key)) {
+				return false;
+			}
+		}
+		return require;
+	}
+
+	private String getCurrentTime() {
+		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
+		String time = dateFormat.format(new Date());
+		return time;
+	}
+
+	private String getReportExportFolder(String time) {
+		String folderName = "migrationReport" + "_" + time;
+		String path = ResourcesPlugin.getWorkspace().getRoot().getLocation().toString() + "/report/" + folderName;
+		return path;
+	}
+
+	private String getReportFileName(String time, String projectTecName) {
+		String fileName = time + "_" + projectTecName + "_" + "Migration" + "_" + "Report.csv";
+		return fileName;
+	}
+
+	public static void storeDoNotShowAgainPref(boolean selected) {
+		IScopeContext scopeContext = ConfigurationScope.INSTANCE;
+		IEclipsePreferences pref = scopeContext.getNode(PLUGIN_ID);
+		pref.putBoolean(DO_NOT_SHOW_PREF_KEY, selected);
+		try {
+			pref.flush();
+		} catch (BackingStoreException e) {
+			ExceptionHandler.process(e);
+		}
+	}
+
+	public static boolean isReportDialogDisable() {
+		IScopeContext scopeContext = ConfigurationScope.INSTANCE;
+		IEclipsePreferences pref = scopeContext.getNode(PLUGIN_ID);
+		return pref.getBoolean(DO_NOT_SHOW_PREF_KEY, false);
+	}
+
+	public void addRecorder(MigrationReportRecorder recorder) {
+		if (recorder != null) {
+			migrationReportRecorders.add(recorder);
+			if (recorder.getItem() != null && recorder.getItem().getProperty() != null) {
+				Property property = recorder.getItem().getProperty();
+				taskItemRecords.add(recorder.getTask().getId() + "_" + property.getId() + "_" + property.getVersion());
+			}
+		}
+	}
+
+	public void clearRecorders() {
+		reportGeneratedPath = "";
+		migrationReportRecorders.clear();
+		taskItemRecords.clear();
+	}
+
+	public String getReportGeneratedPath() {
+		return reportGeneratedPath;
+	}
+
+}

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/migration/common/MigrationReportRecorder.java

@@ -0,0 +1,197 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2021 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.designer.maven.migration.common;
+
+import org.apache.commons.lang.StringUtils;
+import org.talend.core.model.components.ComponentUtilities;
+import org.talend.core.model.properties.Item;
+import org.talend.core.utils.TalendQuoteUtils;
+import org.talend.designer.core.model.utils.emf.talendfile.ElementParameterType;
+import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
+import org.talend.migration.IProjectMigrationTask;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class MigrationReportRecorder extends ItemReportRecorder {
+
+    private IProjectMigrationTask task;
+
+    private MigrationOperationType operationType;
+
+    private NodeType node;
+
+    private String paramName;
+
+    private String oldValue;
+
+    private String newValue;
+
+    public enum MigrationOperationType {
+        ADD,
+        MODIFY,
+        DELETE
+    }
+
+    public MigrationReportRecorder(IProjectMigrationTask task, Item item) {
+        super();
+        this.task = task;
+        this.item = item;
+    }
+
+    public MigrationReportRecorder(IProjectMigrationTask task, MigrationOperationType operationType, Item item, NodeType node,
+            String paramName, String oldValue, String newValue) {
+        super();
+        this.task = task;
+        this.operationType = operationType;
+        this.item = item;
+        this.node = node;
+        this.paramName = paramName;
+        this.oldValue = oldValue;
+        this.newValue = newValue;
+    }
+
+    public MigrationReportRecorder(IProjectMigrationTask task, Item item, String detailMessage) {
+        super();
+        this.task = task;
+        this.item = item;
+        this.detailMessage = detailMessage;
+    }
+
+    public String getTaskClassName() {
+        return task.getClass().getSimpleName();
+    }
+
+    public String getTaskDescription() {
+        String description = "";
+        if (StringUtils.isNotBlank(task.getDescription())) {
+            description = task.getDescription();
+        }
+        return description;
+    }
+
+    public String getDetailMessage() {
+        String details = detailMessage;
+        if (StringUtils.isNotBlank(detailMessage)) {
+            return details;
+        }
+
+        if (operationType == null || StringUtils.isBlank(paramName)) {
+            details = getTaskClassName() + " task is applied";
+            return details;
+        }
+
+        StringBuffer detailBuffer = new StringBuffer();
+        if (node != null) {
+            // migration for node, e.g. tRESTClient component "tRESTClient_2":
+            detailBuffer.append(node.getComponentName()).append(" component ");
+            ElementParameterType uniqueName = ComponentUtilities.getNodeProperty(node, "UNIQUE_NAME");
+            detailBuffer.append(TalendQuoteUtils.addQuotes(uniqueName.getValue())).append(":");
+        } else {
+            // migration for item, e.g. context item "testContext":
+            detailBuffer.append(getItemType() + " item ")
+                    .append(TalendQuoteUtils.addQuotes(item.getProperty().getLabel())).append(":");
+        }
+
+        detailBuffer.append(paramName).append(" was ");
+        switch (operationType) {
+        case ADD:
+            detailBuffer.append("added");
+            if (StringUtils.isNotBlank(newValue)) {
+                detailBuffer.append(" with ").append(newValue);
+            }
+            break;
+        case MODIFY:
+            detailBuffer.append("changed");
+            if (StringUtils.isNotBlank(oldValue)) {
+                detailBuffer.append(" from ").append(oldValue);
+            }
+            if (StringUtils.isNotBlank(newValue)) {
+                detailBuffer.append(" to ").append(newValue);
+            }
+            break;
+        case DELETE:
+            detailBuffer.append("deleted");
+            break;
+        default:
+            break;
+        }
+        details = detailBuffer.toString();
+
+        return details;
+    }
+
+    /**
+     * Getter for task.
+     * 
+     * @return the task
+     */
+    public IProjectMigrationTask getTask() {
+        return task;
+    }
+
+    /**
+     * Sets the task.
+     * 
+     * @param task the task to set
+     */
+    public void setTask(IProjectMigrationTask task) {
+        this.task = task;
+    }
+
+    /**
+     * Sets the operationType.
+     * 
+     * @param operationType the operationType to set
+     */
+    public void setOperationType(MigrationOperationType operationType) {
+        this.operationType = operationType;
+    }
+
+    /**
+     * Sets the node.
+     * 
+     * @param node the node to set
+     */
+    public void setNode(NodeType node) {
+        this.node = node;
+    }
+
+    /**
+     * Sets the paramName.
+     * 
+     * @param paramName the paramName to set
+     */
+    public void setParamName(String paramName) {
+        this.paramName = paramName;
+    }
+
+    /**
+     * Sets the oldValue.
+     * 
+     * @param oldValue the oldValue to set
+     */
+    public void setOldValue(String oldValue) {
+        this.oldValue = oldValue;
+    }
+
+    /**
+     * Sets the newValue.
+     * 
+     * @param newValue the newValue to set
+     */
+    public void setNewValue(String newValue) {
+        this.newValue = newValue;
+    }
+
+}

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/migration/tasks/AbstractCorrectBuildItemMigrationTask.java

@@ -0,0 +1,121 @@
+package org.talend.designer.maven.migration.tasks;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.talend.commons.exception.PersistenceException;
+import org.talend.commons.runtime.model.emf.EmfHelper;
+import org.talend.core.GlobalServiceRegister;
+import org.talend.core.model.components.filters.IComponentFilter;
+import org.talend.core.model.migration.AbstractItemMigrationTask;
+import org.talend.core.model.properties.Item;
+import org.talend.core.model.properties.JobletProcessItem;
+import org.talend.core.model.properties.ProcessItem;
+import org.talend.core.model.repository.ERepositoryObjectType;
+import org.talend.core.repository.utils.ConvertJobsUtil;
+import org.talend.designer.core.model.utils.emf.talendfile.ElementParameterType;
+import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
+import org.talend.designer.core.model.utils.emf.talendfile.ProcessType;
+import org.talend.designer.maven.migration.common.MigrationReportHelper;
+import org.talend.designer.maven.migration.common.MigrationReportRecorder;
+import org.talend.repository.model.IProxyRepositoryFactory;
+import org.talend.repository.model.IRepositoryService;
+
+public abstract class AbstractCorrectBuildItemMigrationTask extends AbstractItemMigrationTask implements ICorrectBuildTypeMigrationTask {
+
+	protected static final String BUILD_TYPE_PROPERTY = "BUILD_TYPE";
+	protected static final String BUILD_TYPE_STANDALONE = "STANDALONE";
+	protected static final String BUILD_TYPE_OSGI = "OSGI";
+	protected static final String BUILD_TYPE_ROUTE = "ROUTE";
+	protected static final String BUILD_TYPE_ROUTE_MICROSERVICE = "ROUTE_MICROSERVICE";
+	protected static final String REST_MS = "REST_MS";
+	
+	
+	protected static Map<String, String> migratedJobs = new HashMap<String, String>();
+	
+	protected static void clearMigratedJobs () {
+		migratedJobs.clear();
+	}
+	
+	protected static void skipMigrationForJob (String jobName, String migrationTask) {
+		migratedJobs.put(jobName, migrationTask);
+	}
+	
+	protected static void storeMigratedJob (String jobName, String migrationTask) {
+		migratedJobs.put(jobName, migrationTask);
+	}
+	
+	protected static boolean isJobMigrated (String jobName) {
+		return migratedJobs.containsKey(jobName);
+	}
+	
+	protected static String getStoredJobMigraionTask (String jobName) {
+		return migratedJobs.get(jobName);
+	}
+
+	public void generateReportRecord(MigrationReportRecorder recorder) {
+		MigrationReportHelper.getInstance().addRecorder(recorder);
+	}
+
+	public static List<NodeType> searchComponent(ProcessType processType, IComponentFilter filter) {
+		List<NodeType> list = new ArrayList<NodeType>();
+		if (filter == null || processType == null) {
+			return list;
+		}
+
+		for (Object o : processType.getNode()) {
+			if (filter.accept((NodeType) o)) {
+				list.add((NodeType) o);
+			}
+		}
+		return list;
+	}
+
+	public void save(Item item) throws PersistenceException {
+		IRepositoryService service = (IRepositoryService) GlobalServiceRegister.getDefault()
+				.getService(IRepositoryService.class);
+		IProxyRepositoryFactory factory = service.getProxyRepositoryFactory();
+		factory.save(item, true);
+	}
+
+	public ProcessType getProcessType(Item item) {
+		ProcessType processType = null;
+		if (item instanceof ProcessItem) {
+			processType = ((ProcessItem) item).getProcess();
+		}
+		if (item instanceof JobletProcessItem) {
+			processType = ((JobletProcessItem) item).getJobletProcess();
+		}
+		if (processType != null) {
+			EmfHelper.visitChilds(processType);
+			ERepositoryObjectType itemType = ERepositoryObjectType.getItemType(item);
+			if (itemType == ERepositoryObjectType.TEST_CONTAINER
+					&& !ConvertJobsUtil.JobType.STANDARD.getDisplayName().equalsIgnoreCase(processType.getJobType())) {
+				return null;
+			}
+
+		}
+		return processType;
+	}
+
+	/**
+	 * Find element parameter with a given parameter name
+	 *
+	 * @param paramName
+	 * @param elementParameterTypes
+	 * @return
+	 */
+	public static final ElementParameterType findElementParameterByName(String paramName, NodeType node) {
+		for (Object obj : node.getElementParameter()) {
+			ElementParameterType cpType = (ElementParameterType) obj;
+			if (paramName.equals(cpType.getName())) {
+				return cpType;
+			}
+		}
+		return null;
+	}
+	
+	abstract public void clear ();
+}

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/migration/tasks/AbstractDataServiceJobMigrationTask.java

@@ -0,0 +1,17 @@
+package org.talend.designer.maven.migration.tasks;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.talend.core.model.repository.ERepositoryObjectType;
+
+public abstract class AbstractDataServiceJobMigrationTask extends AbstractCorrectBuildItemMigrationTask {
+
+	@Override
+	public List<ERepositoryObjectType> getTypes() {
+		List<ERepositoryObjectType> toReturn = new ArrayList<ERepositoryObjectType>();
+		toReturn.add(ERepositoryObjectType.PROCESS);
+		return toReturn;
+	}
+
+}

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/migration/tasks/AbstractRouteMigrationTask.java

@@ -0,0 +1,18 @@
+package org.talend.designer.maven.migration.tasks;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.talend.core.model.repository.ERepositoryObjectType;
+
+public abstract class AbstractRouteMigrationTask extends AbstractCorrectBuildItemMigrationTask {
+
+	@Override
+	public List<ERepositoryObjectType> getTypes() {
+		List<ERepositoryObjectType> toReturn = new ArrayList<ERepositoryObjectType>();
+		toReturn.add(ERepositoryObjectType.PROCESS_ROUTE);
+		toReturn.add(ERepositoryObjectType.PROCESS_ROUTE_MICROSERVICE);
+		return toReturn;
+	}
+
+}

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/migration/tasks/CorrectBuildTypeForDIJobMigrationTask.java

@@ -0,0 +1,268 @@
+package org.talend.designer.maven.migration.tasks;
+
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.List;
+
+import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.exception.PersistenceException;
+import org.talend.core.model.components.filters.IComponentFilter;
+import org.talend.core.model.components.filters.NameComponentFilter;
+import org.talend.core.model.general.Project;
+import org.talend.core.model.properties.Item;
+import org.talend.core.model.properties.ProcessItem;
+import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
+import org.talend.designer.core.model.utils.emf.talendfile.ProcessType;
+import org.talend.designer.maven.migration.common.MigrationReportRecorder;
+import org.talend.designer.runprocess.ItemCacheManager;
+import org.talend.repository.ProjectManager;
+
+/*
+ * If Job does not contain any of the following components: "tRouteInput", "tRESTClient", "tESBConsumer" 
+ * then BUILD_TYPE must be STANDALONE
+ * Else (job contains one of "tRouteInput", "tRESTClient" or "tESBConsumer")
+ * If no BUILD_TYPE is set then default BUILD_TYPE must be STANDALONE
+ * Manage child jobs for jobs ( parent, target BUILD_TYPE = STANDALONE )
+ * If BUILD_TYPE is STANDALONE
+ * Manage child jobs for jobs ( parent, target BUILD_TYPE = STANDALONE )
+ * If BUILD_TYPE is ROUTE > EXCEPTION: need warning message! BUILD_TYPE was wrongly set to ROUTE from a previous migration task and has to be manually updated (all subjobs have to be checked manually). Value should be either STANDALONE (in most cases) or OSGI.
+ */
+
+public class CorrectBuildTypeForDIJobMigrationTask extends AbstractDataServiceJobMigrationTask {
+
+	private static final String[] ESB_COMPONENTS = { "tRouteInput", "tRESTClient", "tESBConsumer" };
+
+	private static final String T_RUB_JOB_COMPONENT = "tRunJob";
+
+	boolean failure = false;
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.talend.migration.IMigrationTask#getOrder()
+	 */
+	@Override
+	public Date getOrder() {
+		GregorianCalendar gc = new GregorianCalendar(2021, 7, 25, 12, 0, 0);
+		return gc.getTime();
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public ExecutionResult execute(Item item) {
+		
+		final ProcessType processType = getProcessType(item);
+		String jobName = item.getProperty().getLabel();
+		
+		/*
+		 * Migrating remaining jobs only (which was not migrated previously)
+		 */
+		if (isJobMigrated(jobName)) {
+			return ExecutionResult.NOTHING_TO_DO;
+		}
+		
+		
+		Object originalBuildType = item.getProperty().getAdditionalProperties().get(BUILD_TYPE_PROPERTY);
+
+		/*
+		 * If BUILD_TYPE is ROUTE > EXCEPTION: need warning message! BUILD_TYPE was
+		 * wrongly set to ROUTE from a previous migration task and has to be manually
+		 * updated (all subjobs have to be checked manually). Value should be either
+		 * STANDALONE (in most cases) or OSGI.
+		 */
+
+		if (originalBuildType != null && BUILD_TYPE_ROUTE.equalsIgnoreCase((String) originalBuildType)) {
+			ExceptionHandler.process(new RuntimeException("Job [" + jobName + "] has incorrect BUILD_TYPE ["
+					+ BUILD_TYPE_ROUTE
+					+ "] which has to be manually updated  (all subjobs have to be checked manually). Value should be either STANDALONE (in most cases) or OSGI"));
+			return ExecutionResult.FAILURE;
+		}
+
+		for (String name : ESB_COMPONENTS) {
+
+			boolean modified = false;
+
+			IComponentFilter filter = new NameComponentFilter(name);
+
+			List<NodeType> c = searchComponent(processType, filter);
+
+			if (!c.isEmpty()) {
+
+				/*
+				 * job contains one of "tRouteInput", "tRESTClient" or "tESBConsumer") If no
+				 * BUILD_TYPE is set then default BUILD_TYPE must be STANDALONE
+				 */
+
+				if (null == originalBuildType) {
+					item.getProperty().getAdditionalProperties().put(BUILD_TYPE_PROPERTY, BUILD_TYPE_STANDALONE);
+					try {
+						save(item);
+						modified |= true;
+						generateReportRecord(
+								new MigrationReportRecorder(this, MigrationReportRecorder.MigrationOperationType.MODIFY,
+										item, null, "Build Type", null, BUILD_TYPE_STANDALONE));
+					} catch (PersistenceException e) {
+						ExceptionHandler.process(e);
+						return ExecutionResult.FAILURE;
+					}
+				}
+
+				/*
+				 * Manage child jobs for jobs ( parent, target BUILD_TYPE = STANDALONE )
+				 */
+				String currentParentJobBuildType = (String) item.getProperty().getAdditionalProperties()
+						.get(BUILD_TYPE_PROPERTY);
+
+				if (BUILD_TYPE_STANDALONE.equalsIgnoreCase(currentParentJobBuildType)) {
+					updateBuildTypeForSubJobs(item, currentParentJobBuildType);
+				}
+
+				if (failure) {
+					return ExecutionResult.FAILURE;
+				}
+
+				if (modified) {
+					return ExecutionResult.SUCCESS_NO_ALERT;
+				}
+
+				return ExecutionResult.NOTHING_TO_DO;
+			}
+		}
+
+		/*
+		 * If Job does not contain any of the following components: "tRouteInput",
+		 * "tRESTClient", "tESBConsumer" then BUILD_TYPE must be STANDALONE
+		 * Manage child jobs for jobs ( parent, target BUILD_TYPE = STANDALONE )
+		 */
+
+		if (null == originalBuildType || !BUILD_TYPE_STANDALONE.equalsIgnoreCase(originalBuildType.toString())) {
+			item.getProperty().getAdditionalProperties().put(BUILD_TYPE_PROPERTY, BUILD_TYPE_STANDALONE);
+			boolean modified = false;
+			try {
+				save(item);
+				modified |= true;
+				generateReportRecord(new MigrationReportRecorder(this,
+						MigrationReportRecorder.MigrationOperationType.MODIFY, item, null, "Build Type",
+						(null == originalBuildType) ? null : originalBuildType.toString(), BUILD_TYPE_STANDALONE));
+				updateBuildTypeForSubJobs(item, BUILD_TYPE_STANDALONE);
+			} catch (PersistenceException e) {
+				ExceptionHandler.process(e);
+				return ExecutionResult.FAILURE;
+			}
+
+			if (failure) {
+				return ExecutionResult.FAILURE;
+			}
+
+			if (modified) {
+				return ExecutionResult.SUCCESS_NO_ALERT;
+			}
+		}
+		
+		/*
+		 * If Job does not contain any of the following components: "tRouteInput",
+		 * "tRESTClient", "tESBConsumer" and BUILD_TYPE is STANDALONE
+		 * Manage child jobs for jobs ( parent, target BUILD_TYPE = STANDALONE )
+		 */
+		if (BUILD_TYPE_STANDALONE.equalsIgnoreCase(originalBuildType.toString())) {
+			updateBuildTypeForSubJobs(item, BUILD_TYPE_STANDALONE);
+			if (failure) {
+				return ExecutionResult.FAILURE;
+			}
+		}
+
+		return ExecutionResult.NOTHING_TO_DO;
+	}
+
+	@Override
+	public String getDescription() {
+		return "Synchronize build types for DI jobs";
+	}
+
+	@Override
+	public void clear() {
+		clearMigratedJobs();
+	}
+
+	@SuppressWarnings("unchecked")
+	private void updateBuildTypeForSubJobs(Item parentJobItem, String parentJobBuiltType) {
+		IComponentFilter filter = new NameComponentFilter(T_RUB_JOB_COMPONENT);
+
+		ProcessType processType = getProcessType(parentJobItem);
+
+		List<NodeType> c = searchComponent(processType, filter);
+
+		if (!c.isEmpty()) {
+
+			for (NodeType tRunJobComponent : c) {
+				String processID = findElementParameterByName("SELECTED_JOB_NAME:PROCESS_TYPE_PROCESS",
+						tRunJobComponent) == null ? null
+								: findElementParameterByName("SELECTED_JOB_NAME:PROCESS_TYPE_PROCESS", tRunJobComponent)
+										.getValue();
+				if (processID == null) {
+					processID = findElementParameterByName("PROCESS:PROCESS_TYPE_PROCESS",
+							tRunJobComponent) == null ? null
+									: findElementParameterByName("PROCESS:PROCESS_TYPE_PROCESS", tRunJobComponent)
+											.getValue();
+				}
+				
+				String processVersion = findElementParameterByName("SELECTED_JOB_NAME:PROCESS_TYPE_VERSION",
+						tRunJobComponent) == null ? null
+								: findElementParameterByName("SELECTED_JOB_NAME:PROCESS_TYPE_VERSION", tRunJobComponent)
+										.getValue();
+				
+				if (processVersion == null) {
+					processVersion = findElementParameterByName("PROCESS:PROCESS_TYPE_VERSION",
+							tRunJobComponent) == null ? null
+									: findElementParameterByName("PROCESS:PROCESS_TYPE_VERSION", tRunJobComponent)
+											.getValue();
+				}
+
+				if (processID != null && processVersion != null) {
+					ProcessItem childItem = ItemCacheManager.getProcessItem(processID, processVersion);
+					Project childItemProject = ProjectManager.getInstance().getCurrentProject();
+
+					if (childItem == null) {
+						for (Project refProject : ProjectManager.getInstance().getAllReferencedProjects()) {
+							childItem = ItemCacheManager.getRefProcessItem(getProject(), processID);
+							if (childItem != null) {
+								childItemProject = refProject;
+								break;
+							}
+						}
+					}
+
+					if (childItem != null) {
+
+						Object currentChildBuildType = childItem.getProperty().getAdditionalProperties()
+								.get(BUILD_TYPE_PROPERTY);
+
+//						String jobID = childItem.getProperty().getLabel();
+
+						String currentChildBuildTypeStr = (null == currentChildBuildType) ? null
+								: (String) currentChildBuildType;
+
+						if (BUILD_TYPE_STANDALONE.equalsIgnoreCase(parentJobBuiltType)
+								&& !BUILD_TYPE_STANDALONE.equalsIgnoreCase(currentChildBuildTypeStr)) {
+
+							childItem.getProperty().getAdditionalProperties().put(BUILD_TYPE_PROPERTY,
+									BUILD_TYPE_STANDALONE);
+
+							try {
+								save(childItem);
+								generateReportRecord(new MigrationReportRecorder(this,
+										MigrationReportRecorder.MigrationOperationType.MODIFY, childItem, null,
+										"Build Type", currentChildBuildTypeStr, BUILD_TYPE_STANDALONE));
+							} catch (PersistenceException e) {
+								ExceptionHandler.process(e);
+								failure = true;
+							}
+						}
+
+						updateBuildTypeForSubJobs(childItem, parentJobBuiltType);
+					}
+				}
+			}
+		}
+	}
+}

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/migration/tasks/CorrectBuildTypeForDsRestMigrationTask.java

@@ -0,0 +1,107 @@
+package org.talend.designer.maven.migration.tasks;
+
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.List;
+
+import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.exception.PersistenceException;
+import org.talend.core.model.components.filters.IComponentFilter;
+import org.talend.core.model.components.filters.NameComponentFilter;
+import org.talend.core.model.properties.Item;
+import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
+import org.talend.designer.core.model.utils.emf.talendfile.ProcessType;
+import org.talend.designer.maven.migration.common.MigrationReportRecorder;
+
+/*
+* (non-Javadoc)
+* Data service REST (process) = Job with "tRESTRequest"
+* If no BUILD_TYPE is set then default BUILD_TYPE must be OSGI
+* If Job does not contain any of the following components: "tRouteInput", "tRESTClient", "tESBConsumer" then BUILD_TYPE must be STANDALONE
+*/
+
+public class CorrectBuildTypeForDsRestMigrationTask extends AbstractDataServiceJobMigrationTask {
+
+	private static final String T_REST_REQUEST = "tRESTRequest";
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.talend.migration.IMigrationTask#getOrder()
+	 */
+	@Override
+	public Date getOrder() {
+		GregorianCalendar gc = new GregorianCalendar(2021, 7, 25, 12, 0, 0);
+		return gc.getTime();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see
+	 * org.talend.core.model.migration.AbstractDataserviceMigrationTask#execute(org
+	 * .talend.core.model.properties.Item)
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public ExecutionResult execute(Item item) {
+		final ProcessType processType = getProcessType(item);
+
+		boolean modified = false;
+
+		/*
+		 * If no BUILD_TYPE is set then default BUILD_TYPE must be OSGI
+		 */
+
+		IComponentFilter filter = new NameComponentFilter(T_REST_REQUEST);
+
+		List<NodeType> c = searchComponent(processType, filter);
+
+		if (!c.isEmpty()) {
+			Object buildType = item.getProperty().getAdditionalProperties().get(BUILD_TYPE_PROPERTY);
+			if (null == buildType) {
+				item.getProperty().getAdditionalProperties().put(BUILD_TYPE_PROPERTY, BUILD_TYPE_OSGI);
+				try {
+					save(item);
+					modified |= true;
+					generateReportRecord(
+							new MigrationReportRecorder(this, MigrationReportRecorder.MigrationOperationType.MODIFY,
+									item, null, "Build Type", null, BUILD_TYPE_OSGI));
+					storeMigratedJob(item.getProperty().getLabel(), this.getClass().getName());
+				} catch (PersistenceException e) {
+					ExceptionHandler.process(e);
+					return ExecutionResult.FAILURE;
+				}
+				return ExecutionResult.SUCCESS_NO_ALERT;
+			} else if (BUILD_TYPE_OSGI.equalsIgnoreCase((String)buildType)){
+				// current job has correct build type 
+				// skip this job during next migrations
+				skipMigrationForJob(item.getProperty().getLabel(), this.getClass().getName());
+			} else if (REST_MS.equalsIgnoreCase((String)buildType)){
+				// current job has correct build type 
+				// skip this job during next migrations
+				skipMigrationForJob(item.getProperty().getLabel(), this.getClass().getName());
+			}
+			
+			
+			
+		}
+
+		if (modified) {
+			return ExecutionResult.SUCCESS_NO_ALERT;
+		} else {
+			return ExecutionResult.NOTHING_TO_DO;
+		}
+	}
+	
+	@Override
+	public String getDescription() {
+		return "Synchronize build types for DS Rest jobs";
+	}
+	
+	@Override
+	public void clear () {
+		clearMigratedJobs();
+	}
+
+}

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/migration/tasks/CorrectBuildTypeForRoutesMigrationTask.java

@@ -0,0 +1,255 @@
+package org.talend.designer.maven.migration.tasks;
+
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.exception.PersistenceException;
+import org.talend.core.model.components.filters.IComponentFilter;
+import org.talend.core.model.components.filters.NameComponentFilter;
+import org.talend.core.model.general.Project;
+import org.talend.core.model.properties.Item;
+import org.talend.core.model.properties.ProcessItem;
+import org.talend.core.repository.model.ProxyRepositoryFactory;
+import org.talend.core.runtime.process.TalendProcessArgumentConstant;
+import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
+import org.talend.designer.core.model.utils.emf.talendfile.ProcessType;
+import org.talend.designer.maven.migration.common.MigrationReportRecorder;
+import org.talend.designer.runprocess.ItemCacheManager;
+import org.talend.repository.ProjectManager;
+
+/*
+ * Routes
+ * If no BUILD_TYPE is set then Default BUILD_TYPE must be ROUTE
+ * - Manage child jobs for routes ( parent, target BUILD_TYPE = OSGI )
+ * Else if BUILD_TYPE is ROUTE
+ * - Manage child jobs for routes ( parent, target BUILD_TYPE = OSGI )
+ * Else if BUILD_TYPE is ROUTE_MICROSERVICE
+ * -Manage child jobs for jobs ( parent, target BUILD_TYPE = STANDALONE )
+ */
+
+public class CorrectBuildTypeForRoutesMigrationTask extends AbstractRouteMigrationTask {
+
+	private static final String C_TALEND_JOB = "cTalendJob";
+
+	protected Map<String, String> migratedChildJobs = new HashMap<String, String>();
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.talend.migration.IMigrationTask#getOrder()
+	 */
+	@Override
+	public Date getOrder() {
+		GregorianCalendar gc = new GregorianCalendar(2021, 7, 25, 12, 0, 0);
+		return gc.getTime();
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public ExecutionResult execute(Item item) {
+
+		final ProcessType processType = getProcessType(item);
+
+		boolean modified = false;
+		boolean migrationFailure = false;
+		/*
+		 * If no BUILD_TYPE is set then default BUILD_TYPE must be ROUTE
+		 */
+
+		Object buildType = item.getProperty().getAdditionalProperties().get(BUILD_TYPE_PROPERTY);
+		if (null == buildType) {
+			item.getProperty().getAdditionalProperties().put(BUILD_TYPE_PROPERTY, BUILD_TYPE_ROUTE);
+			try {
+				save(item);
+				modified |= true;
+				generateReportRecord(
+						new MigrationReportRecorder(this, MigrationReportRecorder.MigrationOperationType.MODIFY, item,
+								null, "Build Type", "null", BUILD_TYPE_OSGI));
+			} catch (PersistenceException e) {
+				ExceptionHandler.process(e);
+				return ExecutionResult.FAILURE;
+			}
+		}
+
+		/*
+		 * If no BUILD_TYPE is set then Default BUILD_TYPE must be ROUTE - Manage child
+		 * jobs for routes ( parent, target BUILD_TYPE = OSGI ) Else if BUILD_TYPE is
+		 * ROUTE - Manage child jobs for routes ( parent, target BUILD_TYPE = OSGI )
+		 * Else if BUILD_TYPE is ROUTE_MICROSERVICE -Manage child jobs for jobs (
+		 * parent, target BUILD_TYPE = STANDALONE )
+		 */
+
+		String currentRouteBuildType = (String) item.getProperty().getAdditionalProperties().get(BUILD_TYPE_PROPERTY);
+
+		String currentRouteID = item.getProperty().getLabel();
+
+		IComponentFilter filter = new NameComponentFilter(C_TALEND_JOB);
+
+		List<NodeType> c = searchComponent(processType, filter);
+
+		if (!c.isEmpty()) {
+
+			for (NodeType cTalendJobComponent : c) {
+
+				String processID = findElementParameterByName("SELECTED_JOB_NAME:PROCESS_TYPE_PROCESS",
+						cTalendJobComponent) == null ? null
+								: findElementParameterByName("SELECTED_JOB_NAME:PROCESS_TYPE_PROCESS",
+										cTalendJobComponent).getValue();
+				String processVersion = findElementParameterByName("SELECTED_JOB_NAME:PROCESS_TYPE_VERSION",
+						cTalendJobComponent) == null ? null
+								: findElementParameterByName("SELECTED_JOB_NAME:PROCESS_TYPE_VERSION",
+										cTalendJobComponent).getValue();
+
+				if (processID != null && processVersion != null) {
+					ProcessItem childItem = ItemCacheManager.getProcessItem(processID, processVersion);
+					Project childItemProject = ProjectManager.getInstance().getCurrentProject();
+
+					if (childItem == null) {
+						for (Project refProject : ProjectManager.getInstance().getAllReferencedProjects()) {
+							childItem = ItemCacheManager.getRefProcessItem(getProject(), processID);
+							if (childItem != null) {
+								childItemProject = refProject;
+								break;
+							}
+						}
+					}
+					if (childItem != null) {
+
+						Object currentChildBuildType = childItem.getProperty().getAdditionalProperties()
+								.get(BUILD_TYPE_PROPERTY);
+
+						String jobID = childItem.getProperty().getLabel();
+
+						String currentChildBuildTypeStr = (null == currentChildBuildType) ? null
+								: (String) currentChildBuildType;
+						
+						if (BUILD_TYPE_ROUTE.equalsIgnoreCase(currentRouteBuildType)
+								&& BUILD_TYPE_OSGI.equalsIgnoreCase(currentChildBuildTypeStr)) {
+							storeMigratedModel(jobID, currentRouteID);
+						}
+
+						if (BUILD_TYPE_ROUTE.equalsIgnoreCase(currentRouteBuildType)
+								&& !BUILD_TYPE_OSGI.equalsIgnoreCase(currentChildBuildTypeStr)) {
+
+							try {
+								if (isModelMigrated(jobID)) {
+									ExceptionHandler.process(new RuntimeException(
+											"Child Job is called by 2 or more different Routes which have different build types. Build type for child Job ["
+													+ jobID + "] was previously updated to [" + currentChildBuildTypeStr
+													+ "] to be compatible with parent Route ["
+													+ getStoredMigratedModelParentRoute(jobID)
+													+ "] which is not compatible with current parent Route ["
+													+ currentRouteID + "] with build type [" + currentRouteBuildType
+													+ "]. "));
+									migrationFailure = true;
+									continue;
+								} else {
+
+									childItem.getProperty().getAdditionalProperties()
+											.put(TalendProcessArgumentConstant.ARG_BUILD_TYPE, BUILD_TYPE_OSGI);
+
+									generateReportRecord(new MigrationReportRecorder(this,
+											MigrationReportRecorder.MigrationOperationType.MODIFY, childItem, null,
+											"Build Type", currentChildBuildTypeStr, BUILD_TYPE_OSGI));
+
+
+									ProxyRepositoryFactory.getInstance().save(childItemProject, childItem, true);
+								}
+
+							} catch (PersistenceException e) {
+								ExceptionHandler.process(e);
+								return ExecutionResult.FAILURE;
+							}
+						}
+						
+
+
+						if (BUILD_TYPE_ROUTE_MICROSERVICE.equalsIgnoreCase(currentRouteBuildType)
+								&& !BUILD_TYPE_STANDALONE.equalsIgnoreCase(currentChildBuildTypeStr)) {
+
+							try {
+
+								if (isModelMigrated(jobID)) {
+									ExceptionHandler.process(new RuntimeException(
+											"Child Job is called by 2 or more different Routes which have different build types. Build type for child Job ["
+													+ jobID + "] was previously updated to [" + currentChildBuildTypeStr
+													+ "] to be compatible with parent Route ["
+													+ getStoredMigratedModelParentRoute(jobID)
+													+ "] which is not compatible with current parent Route ["
+													+ currentRouteID + "] with build type [" + currentRouteBuildType
+													+ "]. "));
+									migrationFailure = true;
+									continue;
+								} else {
+
+									childItem.getProperty().getAdditionalProperties()
+											.put(TalendProcessArgumentConstant.ARG_BUILD_TYPE, BUILD_TYPE_STANDALONE);
+
+									generateReportRecord(new MigrationReportRecorder(this,
+											MigrationReportRecorder.MigrationOperationType.MODIFY, childItem, null,
+											"Build Type", currentChildBuildTypeStr, BUILD_TYPE_STANDALONE));
+
+									ProxyRepositoryFactory.getInstance().save(childItemProject, childItem, true);
+								}
+							} catch (PersistenceException e) {
+								ExceptionHandler.process(e);
+								return ExecutionResult.FAILURE;
+							}
+						}
+						
+						
+						if(!isModelMigrated(jobID)) {
+							storeMigratedModel(jobID, currentRouteID);
+						}
+						
+					}
+				}
+
+			}
+
+		}
+
+		if (migrationFailure) {
+			return ExecutionResult.FAILURE;
+		}
+
+		if (modified) {
+			return ExecutionResult.SUCCESS_NO_ALERT;
+		}
+
+		return ExecutionResult.NOTHING_TO_DO;
+
+	}
+
+	protected void clearMigratedChildJobs() {
+		migratedChildJobs.clear();
+	}
+
+	protected void storeMigratedModel(String jobName, String parentRouteName) {
+		migratedChildJobs.put(jobName, parentRouteName);
+	}
+
+	protected boolean isModelMigrated(String jobName) {
+		return migratedChildJobs.containsKey(jobName);
+	}
+
+	protected String getStoredMigratedModelParentRoute(String jobName) {
+		return migratedChildJobs.get(jobName);
+	}
+
+	@Override
+	public String getDescription() {
+		return "Synchronize build types for Routes (incuding child jobs)";
+	}
+
+	@Override
+	public void clear() {
+		clearMigratedChildJobs();
+		clearMigratedJobs();
+	}
+
+}

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/migration/tasks/CorrectBuildTypeForSOAPServiceJobMigrationTask.java

@@ -0,0 +1,103 @@
+package org.talend.designer.maven.migration.tasks;
+
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.List;
+
+import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.exception.PersistenceException;
+import org.talend.core.model.components.filters.IComponentFilter;
+import org.talend.core.model.components.filters.NameComponentFilter;
+import org.talend.core.model.properties.Item;
+import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
+import org.talend.designer.core.model.utils.emf.talendfile.ProcessType;
+import org.talend.designer.maven.migration.common.MigrationReportRecorder;
+
+/*
+ * Data service SOAP = Job with "tESBProviderRequest"
+ * Set BUILD_TYPE as OSGI
+ * Manage child jobs for jobs ( parent job, target BUILD_TYPE = OSGI )
+ */
+
+public class CorrectBuildTypeForSOAPServiceJobMigrationTask extends AbstractDataServiceJobMigrationTask {
+
+	private static final String T_ESB_PROVIDER_REQUEST = "tESBProviderRequest";
+	private static final String BUILD_TYPE_PROPERTY = "BUILD_TYPE";
+
+	private static final String BUILD_TYPE_OSGI = "OSGI";
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.talend.migration.IMigrationTask#getOrder()
+	 */
+	@Override
+	public Date getOrder() {
+		GregorianCalendar gc = new GregorianCalendar(2021, 7, 25, 12, 0, 0);
+		return gc.getTime();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see
+	 * org.talend.core.model.migration.AbstractDataserviceMigrationTask#execute(org
+	 * .talend.core.model.properties.Item)
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public ExecutionResult execute(Item item) {
+		final ProcessType processType = getProcessType(item);
+
+		boolean modified = false;
+
+		/*
+		 * If no BUILD_TYPE is set then default BUILD_TYPE must be OSGI
+		 */
+
+		IComponentFilter filter = new NameComponentFilter(T_ESB_PROVIDER_REQUEST);
+
+		List<NodeType> c = searchComponent(processType, filter);
+
+		if (!c.isEmpty()) {
+			Object originalBuildType = item.getProperty().getAdditionalProperties().get(BUILD_TYPE_PROPERTY);
+
+			if (null == originalBuildType || !BUILD_TYPE_OSGI.equalsIgnoreCase(originalBuildType.toString())) {
+				item.getProperty().getAdditionalProperties().put(BUILD_TYPE_PROPERTY, BUILD_TYPE_OSGI);
+				try {
+					save(item);
+					modified |= true;
+					generateReportRecord(new MigrationReportRecorder(this,
+							MigrationReportRecorder.MigrationOperationType.MODIFY, item, null, "Build Type",
+							(null == originalBuildType) ? null : originalBuildType.toString(), BUILD_TYPE_OSGI));
+					storeMigratedJob(item.getProperty().getLabel(), this.getClass().getName());
+				} catch (PersistenceException e) {
+					ExceptionHandler.process(e);
+					return ExecutionResult.FAILURE;
+				}
+				return ExecutionResult.SUCCESS_NO_ALERT;
+			} else if (BUILD_TYPE_OSGI.equalsIgnoreCase((String)originalBuildType)){
+				// current job has correct build type 
+				// skip this job during next migrations
+				skipMigrationForJob(item.getProperty().getLabel(), this.getClass().getName());
+			} 
+		}
+
+		if (modified) {
+			return ExecutionResult.SUCCESS_NO_ALERT;
+		}
+
+		return ExecutionResult.NOTHING_TO_DO;
+	}
+
+	@Override
+	public String getDescription() {
+		return "Synchronize build types for SOAP service Jobs";
+	}
+	
+	@Override
+	public void clear () {
+		clearMigratedJobs();
+	}
+	
+}

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/migration/tasks/ICorrectBuildTypeMigrationTask.java

@@ -0,0 +1,7 @@
+package org.talend.designer.maven.migration.tasks;
+
+import org.talend.migration.IProjectMigrationTask;
+
+public interface ICorrectBuildTypeMigrationTask extends IProjectMigrationTask {
+	public void clear ();
+}

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/AggregatorPomsHelper.java

@@ -14,15 +14,16 @@ package org.talend.designer.maven.tools;
 
 import static org.talend.designer.maven.model.TalendJavaProjectConstants.*;
 
+import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.BufferedInputStream;
 import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -64,8 +65,10 @@ import org.talend.core.model.general.ILibrariesService;
 import org.talend.core.model.general.ModuleNeeded;
 import org.talend.core.model.general.ModuleNeeded.ELibraryInstallStatus;
 import org.talend.core.model.general.Project;
+import org.talend.core.model.process.JobInfo;
 import org.talend.core.model.process.ProcessUtils;
 import org.talend.core.model.properties.Item;
+import org.talend.core.model.properties.ProcessItem;
 import org.talend.core.model.properties.ProjectReference;
 import org.talend.core.model.properties.Property;
 import org.talend.core.model.relationship.Relation;
@@ -525,7 +528,7 @@ public class AggregatorPomsHelper {
                     @Override
                     public void run(final IProgressMonitor monitor) throws CoreException {
                         try {
-                            syncAllPomsWithoutProgress(monitor, PomIdsHelper.getPomFilter());
+                            syncAllPomsWithoutProgress(monitor, PomIdsHelper.getPomFilter(), false);
                         } catch (Exception e) {
                             ExceptionHandler.process(e);
                         }
@@ -620,10 +623,11 @@ public class AggregatorPomsHelper {
     }
 
     public void syncAllPomsWithoutProgress(IProgressMonitor monitor) throws Exception {
-        syncAllPomsWithoutProgress(monitor, PomIdsHelper.getPomFilter());
+        syncAllPomsWithoutProgress(monitor, PomIdsHelper.getPomFilter(), false);
     }
 
-    public void syncAllPomsWithoutProgress(IProgressMonitor monitor, String pomFilter) throws Exception {
+    public void syncAllPomsWithoutProgress(IProgressMonitor monitor, String pomFilter, boolean withDependencies)
+            throws Exception {
         LOGGER.info("syncAllPomsWithoutProgress, pomFilter: " + pomFilter);
         IRunProcessService runProcessService = IRunProcessService.get();
         if (runProcessService == null) {
@@ -634,11 +638,43 @@ public class AggregatorPomsHelper {
         Boolean isCIMode = IRunProcessService.get().isCIMode();
 
         List<IRepositoryViewObject> objects = new ArrayList<>();
+        List<ERepositoryObjectType> allJobletTypes = ERepositoryObjectType.getAllTypesOfJoblet();
         for (ERepositoryObjectType type : ERepositoryObjectType.getAllTypesOfProcess2()) {
+            if (isCIMode && withDependencies && allJobletTypes.contains(type)) {
+                continue;
+            }
             objects.addAll(ProxyRepositoryFactory.getInstance().getAll(type, true, true));
         }
+        Iterator<IRepositoryViewObject> iterator = objects.iterator();
+        while (iterator.hasNext()) {
+            IRepositoryViewObject object = iterator.next();
+            if (object.getProperty() == null || object.getProperty().getItem() == null) {
+                iterator.remove();
+                continue;
+            }
+            if (isCIMode && !allJobletTypes.contains(object.getRepositoryObjectType()) && IFilterService.get() != null
+                    && !IFilterService.get().isFilterAccepted(object.getProperty().getItem(), pomFilter)) {
+                iterator.remove();
+                continue;
+            }
+            if (isCIMode && object.isDeleted() && PomIdsHelper.getIfExcludeDeletedItems()) {
+                iterator.remove();
+            }
+        }
+        Set<Item> allItems;
+        if (withDependencies) {
+            allItems = objects.stream().flatMap(object -> {
+                ProcessItem item = (ProcessItem) object.getProperty().getItem();
+                Set<JobInfo> allJobInfos = ProcessorUtilities.getChildrenJobInfo(item, false, true);
+                allJobInfos.add(new JobInfo(item, item.getProcess().getDefaultContext()));
+                return allJobInfos.stream();
+            }).map(info -> info.getJobletProperty() != null ? info.getJobletProperty().getItem() : info.getProcessItem())
+                    .collect(Collectors.toSet());
+        } else {
+            allItems = objects.stream().map(object -> object.getProperty().getItem()).collect(Collectors.toSet());
+        }
 
-        int size = 3 + objects.size();
+        int size = 3 + allItems.size();
         monitor.setTaskName("Synchronize all poms"); //$NON-NLS-1$
         monitor.beginTask("", size); //$NON-NLS-1$
         // project pom
@@ -674,41 +710,17 @@ public class AggregatorPomsHelper {
         }
         // all jobs pom
         List<String> modules = new ArrayList<>();
-        IFilterService filterService = null;
-        if (GlobalServiceRegister.getDefault().isServiceRegistered(IFilterService.class)) {
-            filterService = (IFilterService) GlobalServiceRegister.getDefault().getService(IFilterService.class);
-        }
-
         List<Property> serviceRefJobs = getAllServiceReferencedJobs();
-        List<ERepositoryObjectType> allJobletTypes = ERepositoryObjectType.getAllTypesOfJoblet();
-        for (IRepositoryViewObject object : objects) {
-            if (filterService != null) {
-                if (isCIMode && !allJobletTypes.contains(object.getRepositoryObjectType())
-                        && !filterService.isFilterAccepted(object.getProperty().getItem(), pomFilter)) {
-                    continue;
-                }
-            }
-            if (object.getProperty() != null && object.getProperty().getItem() != null) {
-                if (isCIMode && object.isDeleted() && PomIdsHelper.getIfExcludeDeletedItems()) {
-                    continue;
-                }
-                Item item = object.getProperty().getItem();
-                if (ProjectManager.getInstance().isInCurrentMainProject(item)) {
-                    monitor.subTask("Synchronize job pom: " + item.getProperty().getLabel() //$NON-NLS-1$
-                            + "_" + item.getProperty().getVersion()); //$NON-NLS-1$
-                    if (runProcessService != null) {
-                        // already filtered
-                        runProcessService.generatePom(item, TalendProcessOptionConstants.GENERATE_POM_NO_FILTER);
-                    } else {
-                        ExceptionHandler.log("Cannot generate pom for " + object.getLabel()
-                                + " - Reason: RunProcessService is null.");
-                    }
-                    IFile pomFile = getItemPomFolder(item.getProperty()).getFile(TalendMavenConstants.POM_FILE_NAME);
-                    // TODO if not work, use serviceRefJobs.contains(object.getProperty()) to judge
-                    // filter esb data service node
-                    if (isCIMode && !isSOAPServiceProvider(object.getProperty()) && pomFile.exists()) {
-                        modules.add(getModulePath(pomFile));
-                    }
+        for (Item item : allItems) {
+            if (ProjectManager.getInstance().isInCurrentMainProject(item)) {
+                monitor.subTask("Synchronize job pom: " + item.getProperty().getLabel() //$NON-NLS-1$
+                        + "_" + item.getProperty().getVersion()); //$NON-NLS-1$
+                runProcessService.generatePom(item, TalendProcessOptionConstants.GENERATE_POM_NO_FILTER);
+                IFile pomFile = getItemPomFolder(item.getProperty()).getFile(TalendMavenConstants.POM_FILE_NAME);
+                // filter esb data service node
+                // FIXME use serviceRefJobs.contains(item.getProperty()) if isSOAPServiceProvider() doesn't work.
+                if (isCIMode && !isSOAPServiceProvider(item.getProperty()) && pomFile.exists()) {
+                    modules.add(getModulePath(pomFile));
                 }
             }
             monitor.worked(1);

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/BuildTypeManager.java

@@ -0,0 +1,118 @@
+package org.talend.designer.maven.tools;
+
+import java.lang.reflect.InvocationTargetException;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.SubMonitor;
+import org.eclipse.core.runtime.jobs.ISchedulingRule;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.swt.widgets.Display;
+import org.talend.commons.exception.ExceptionHandler;
+import org.talend.core.model.general.Project;
+import org.talend.core.repository.model.ProxyRepositoryFactory;
+import org.talend.designer.maven.migration.common.MigrationReportHelper;
+import org.talend.designer.maven.migration.tasks.CorrectBuildTypeForDIJobMigrationTask;
+import org.talend.designer.maven.migration.tasks.CorrectBuildTypeForDsRestMigrationTask;
+import org.talend.designer.maven.migration.tasks.CorrectBuildTypeForRoutesMigrationTask;
+import org.talend.designer.maven.migration.tasks.CorrectBuildTypeForSOAPServiceJobMigrationTask;
+import org.talend.designer.maven.migration.tasks.ICorrectBuildTypeMigrationTask;
+import org.talend.migration.IMigrationTask;
+import org.talend.migration.IProjectMigrationTask;
+import org.talend.repository.ProjectManager;
+import org.talend.repository.RepositoryWorkUnit;
+
+public class BuildTypeManager {
+
+	private ICorrectBuildTypeMigrationTask[] syncBuildTypeMigrationTasks = {
+			new CorrectBuildTypeForRoutesMigrationTask(), new CorrectBuildTypeForSOAPServiceJobMigrationTask(),
+			new CorrectBuildTypeForDsRestMigrationTask(), new CorrectBuildTypeForDIJobMigrationTask() };
+	
+	
+	private boolean hasErrors = false;
+
+	public void syncBuildTypes(FieldEditorPreferencePage page) throws Exception {
+
+		IRunnableWithProgress runnableWithProgress = new IRunnableWithProgress() {
+
+			@Override
+			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
+
+				RepositoryWorkUnit<Object> workUnit = new RepositoryWorkUnit<Object>("Synchronize all build types") { //$NON-NLS-1$
+
+					@Override
+					protected void run() {
+						final IWorkspaceRunnable op = new IWorkspaceRunnable() {
+
+							@Override
+							public void run(final IProgressMonitor monitor) throws CoreException {
+								try {
+									syncAllBuildTypesWithProgress(monitor, page);
+								} catch (Exception e) {
+									ExceptionHandler.process(e);
+								}
+							}
+
+						};
+						IWorkspace workspace = ResourcesPlugin.getWorkspace();
+						try {
+							ISchedulingRule schedulingRule = workspace.getRoot();
+							workspace.run(op, schedulingRule, IWorkspace.AVOID_UPDATE, monitor);
+						} catch (CoreException e) {
+							ExceptionHandler.process(e);
+						}
+					}
+
+				};
+				workUnit.setAvoidUnloadResources(true);
+				ProxyRepositoryFactory.getInstance().executeRepositoryWorkUnit(workUnit);
+			}
+		};
+		
+		hasErrors = false;
+		
+		new ProgressMonitorDialog(Display.getDefault().getActiveShell()).run(true, true, runnableWithProgress);
+		
+		if (hasErrors) {
+			page.setErrorMessage("Build types synchronization finished with errors. Check workspace logs for details.");
+		} else {
+			page.setErrorMessage(null);
+		}
+	}
+
+	public void syncAllBuildTypesWithProgress(IProgressMonitor monitor, FieldEditorPreferencePage page)
+			throws Exception {
+
+		Project project = ProjectManager.getInstance().getCurrentProject();
+
+		SubMonitor subMonitor = SubMonitor.convert(monitor, syncBuildTypeMigrationTasks.length);
+
+		for (ICorrectBuildTypeMigrationTask task : syncBuildTypeMigrationTasks) {
+			task.clear();
+
+		}
+
+
+		for (ICorrectBuildTypeMigrationTask task : syncBuildTypeMigrationTasks) {
+			subMonitor.beginTask(task.getDescription(), syncBuildTypeMigrationTasks.length);
+			IMigrationTask.ExecutionResult result = task.execute(project);
+			if (IMigrationTask.ExecutionResult.FAILURE.equals(result)) {
+				hasErrors = true;
+			}
+			subMonitor.worked(1);
+
+		}
+
+		subMonitor.beginTask("Generate migration report", syncBuildTypeMigrationTasks.length);
+		MigrationReportHelper.getInstance().generateMigrationReport(project.getTechnicalLabel());
+
+		monitor.done();
+
+
+
+	}
+}

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/utils/PomIdsHelper.java

@@ -300,6 +300,114 @@ public class PomIdsHelper {
         return filter;
     }
 
+	private static String getPublishCloudVersion(String latestVersion) {
+		if (null == latestVersion) {
+			return null;
+		} else if (latestVersion.contains(MavenConstants.SNAPSHOT)) {
+			return latestVersion;
+		} else {
+			latestVersion = VersionUtils.getPublishVersion(latestVersion);
+			int i = latestVersion.lastIndexOf('.') + 1;
+			return latestVersion.substring(0, i) + (Long.parseLong(latestVersion.substring(i)) + 1);
+	  }
+	}
+
+    /**
+     * @return "<bundleVersion>".
+     */
+    public static String getNotIteratedBundleVersion(Property property, String bundleVersion) {
+        String version = null;
+        if (property != null) {
+            boolean useSnapshot = false;
+            if (property.getAdditionalProperties() != null) {
+                version = (String) property.getAdditionalProperties().get(MavenConstants.NAME_USER_VERSION);
+                useSnapshot = property.getAdditionalProperties().containsKey(MavenConstants.NAME_PUBLISH_AS_SNAPSHOT);
+            }
+            if(version == null) {
+                version = VersionUtils.getPublishVersion(bundleVersion);
+            }
+            if (version == null) {
+                version = VersionUtils.getPublishVersion(property.getVersion());
+            }
+            if (useSnapshot && version != null && !version.contains(MavenConstants.SNAPSHOT)) {
+                version += MavenConstants.SNAPSHOT;
+            }
+        }
+        return version;
+    }
+
+    /**
+     * @return "<featureVersion>".
+     */
+    public static String getNotIteratedFeatureVersion(Property property, String featureVersion) {
+        String version = null;
+        if (property != null) {
+            boolean useSnapshot = false;
+            if (property.getAdditionalProperties() != null) {
+                version = (String) property.getAdditionalProperties().get(MavenConstants.NAME_USER_VERSION);
+                useSnapshot = property.getAdditionalProperties().containsKey(MavenConstants.NAME_PUBLISH_AS_SNAPSHOT);
+            }
+            if(version == null) {
+                version = VersionUtils.getPublishVersion(featureVersion);
+            }
+            if (version == null) {
+                version = VersionUtils.getPublishVersion(property.getVersion());
+            }
+            if (useSnapshot && version != null && !version.contains(MavenConstants.SNAPSHOT)) {
+                version += MavenConstants.SNAPSHOT;
+            }
+        }
+        return version;
+    }
+
+    /**
+     * @return "<bundleVersion>".
+     */
+    public static String getBundleVersion(Property property, String bundleVersion) {
+        String version = null;
+        if (property != null) {
+            boolean useSnapshot = false;
+            if (property.getAdditionalProperties() != null) {
+                version = (String) property.getAdditionalProperties().get(MavenConstants.NAME_USER_VERSION);
+                useSnapshot = property.getAdditionalProperties().containsKey(MavenConstants.NAME_PUBLISH_AS_SNAPSHOT);
+            }
+            if(version == null) {
+                version = getPublishCloudVersion(bundleVersion);
+            }
+            if (version == null) {
+                version = VersionUtils.getPublishVersion(property.getVersion());
+            }
+            if (useSnapshot && version != null && !version.contains(MavenConstants.SNAPSHOT)) {
+                version += MavenConstants.SNAPSHOT;
+            }
+        }
+        return version;
+    }
+
+    /**
+     * @return "<featureVersion>".
+     */
+    public static String getFeatureVersion(Property property, String featureVersion) {
+        String version = null;
+        if (property != null) {
+            boolean useSnapshot = false;
+            if (property.getAdditionalProperties() != null) {
+                version = (String) property.getAdditionalProperties().get(MavenConstants.NAME_USER_VERSION);
+                useSnapshot = property.getAdditionalProperties().containsKey(MavenConstants.NAME_PUBLISH_AS_SNAPSHOT);
+            }
+            if(version == null) {
+                version = getPublishCloudVersion(featureVersion);
+            }
+            if (version == null) {
+                version = VersionUtils.getPublishVersion(property.getVersion());
+            }
+            if (useSnapshot && version != null && !version.contains(MavenConstants.SNAPSHOT)) {
+                version += MavenConstants.SNAPSHOT;
+            }
+        }
+        return version;
+    }
+
     public static boolean useProfileModule() {
         String useProfileModule = System.getProperty("talend.profile.module");
         if (useProfileModule != null) {
@@ -426,4 +534,4 @@ public class PomIdsHelper {
         return preferenceManagers.get(projectTechName);
     }
 
-}
+}

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/utils/PomUtil.java

@@ -19,9 +19,11 @@ import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
 import java.io.File;
 import java.io.FileFilter;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.security.SecureRandom;
 import java.util.ArrayList;
@@ -1097,4 +1099,16 @@ public class PomUtil {
         }
     }
 
+    public static boolean isValidPomFile(String pomfile) {
+        if (pomfile != null) {
+            MavenModelManager modelManager = MavenPlugin.getMavenModelManager();
+            try (InputStream inputStream = new FileInputStream(new File(pomfile))) {
+                modelManager.readMavenModel(inputStream);
+                return true;
+            } catch (IOException | CoreException e) {
+                return false;
+            }
+        }
+        return false;
+    }
 }

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

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="lib/commons-text-1.10.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-io-2.10.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-pool2-2.4.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-validator-1.5.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-math3-3.3.jar"/>
@@ -8,6 +10,5 @@
 	<classpathentry exported="true" kind="lib" path="lib/commons-digester-2.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-cli-2.0-SNAPSHOT.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.15.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-text-1.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

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

@@ -10,7 +10,7 @@ Bundle-ClassPath: .,
  lib/commons-math3-3.3.jar,
  lib/commons-validator-1.5.1.jar,
  lib/commons-pool2-2.4.2.jar,
- lib/commons-text-1.1.jar,
+ lib/commons-text-1.10.0.jar,
  lib/commons-io-2.10.0.jar
 Export-Package: org.apache.commons.cli2,
  org.apache.commons.cli2.builder,

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

@@ -58,6 +58,11 @@
 									<artifactId>commons-pool2</artifactId>
 									<version>2.4.2</version>
 								</artifactItem>
+								<artifactItem>
+									<groupId>org.apache.commons</groupId>
+									<artifactId>commons-text</artifactId>
+									<version>1.10.0</version>
+								</artifactItem>
 								<artifactItem>
 									<groupId>commons-io</groupId>
 									<artifactId>commons-io</artifactId>

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

@@ -10,7 +10,7 @@
 	<artifactId>org.talend.libraries.apache</artifactId>
 	<packaging>eclipse-plugin</packaging>
 	<properties>
-		<reload4j.version>1.2.19</reload4j.version>
+		<reload4j.version>1.2.22</reload4j.version>
 		<slf4j.version>1.7.29</slf4j.version>
 		<log4j2.version>2.17.1</log4j2.version>
 	</properties>

main/plugins/org.talend.libraries.jdbc.hsql/licenses/license.txt

@@ -6,9 +6,42 @@ COPYRIGHTS AND LICENSES
 
 ORIGINAL LICENSE (a.k.a. "hypersonic_lic.txt")
 
-For content, code, and products originally developed by Thomas Mueller and the Hypersonic SQL Group:
+For work developed by the HSQL Development Group:
 
-Copyright (c) 1995-2000 by the Hypersonic SQL Group.
+Copyright (c) 2001-2022, The HSQL Development Group
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+Neither the name of the HSQL Development Group nor the names of its
+contributors may be used to endorse or promote products derived from this
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG,
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+For work originally developed by the Hypersonic SQL Group:
+
+Copyright (c) 1995-2000, The Hypersonic SQL Group.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -37,12 +70,12 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-This software consists of voluntary contributions made by many individuals on behalf of the
-Hypersonic SQL Group.
+This software consists of voluntary contributions made by many individuals
+on behalf of the Hypersonic SQL Group.
 
 For work added by the HSQL Development Group (a.k.a. hsqldb_lic.txt):
 
-Copyright (c) 2001-2005, The HSQL Development Group
+Copyright (c) 2001-2022, The HSQL Development Group
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without