fix(TUP-41249): update manifest timestamp (#6665)

* fix(TUP-41249): update manifest timestamp

* fix(TUP-41249): update type of time

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/network/NetworkUtil.java

@@ -24,6 +24,7 @@ import java.net.URI;
 import java.net.URL;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -31,6 +32,10 @@ import java.util.Set;
 import java.util.regex.Pattern;
 
 import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.eclipse.core.internal.net.ProxyManager;
+import org.eclipse.core.net.proxy.IProxyData;
+import org.eclipse.core.net.proxy.IProxyService;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.talend.commons.exception.CommonExceptionHandler;
@@ -42,6 +47,8 @@ import org.talend.commons.runtime.utils.io.FileCopyUtils;
  */
 public class NetworkUtil {
 
+    private static final Logger LOGGER = Logger.getLogger(NetworkUtil.class);
+
     private static final String[] windowsCommand = { "ipconfig", "/all" }; //$NON-NLS-1$ //$NON-NLS-2$
 
     private static final String[] linuxCommand = { "/sbin/ifconfig", "-a" }; //$NON-NLS-1$ //$NON-NLS-2$
@@ -72,6 +79,136 @@ public class NetworkUtil {
 
     private static final String PROP_NETWORK_STATUS = "network.status"; //$NON-NLS-1$
 
+    private static final String SYSTEM_PROXY_ENABLED = "talend.studio.proxy.enableSystemProxyByDefault";
+
+    public static void applyProxyFromSystemProperties() throws Exception {
+        if (!Boolean.valueOf(System.getProperty("talend.studio.proxy.applySystemProps", Boolean.FALSE.toString()))) {
+            return;
+        }
+        final String passwordMask = "***";
+        String httpProxyHost = System.getProperty("http.proxyHost");
+        String httpProxyPort = System.getProperty("http.proxyPort");
+        String httpUser = System.getProperty("http.proxyUser");
+        String httpPassword = System.getProperty("http.proxyPassword");
+        if (StringUtils.isNotBlank(httpPassword)) {
+            System.setProperty("http.proxyPassword", passwordMask);
+        }
+        String httpNonProxyHosts = System.getProperty("http.nonProxyHosts");
+        String httpsProxyHost = System.getProperty("https.proxyHost");
+        String httpsProxyPort = System.getProperty("https.proxyPort");
+        String httpsUser = System.getProperty("https.proxyUser");
+        String httpsPassword = System.getProperty("https.proxyPassword");
+        if (StringUtils.isNotBlank(httpsPassword)) {
+            System.setProperty("https.proxyPassword", passwordMask);
+        }
+        String httpsNonProxyHosts = System.getProperty("https.nonProxyHosts");
+        String socksProxyHost = System.getProperty("socksProxyHost");
+        String socksProxyPort = System.getProperty("socksProxyPort");
+        String socksProxyUser = System.getProperty("socksProxyUser");
+        if (socksProxyUser == null) {
+            socksProxyUser = System.getProperty("java.net.socks.username");
+        }
+        String socksProxyPassword = System.getProperty("socksProxyPassword");
+        if (StringUtils.isNotBlank(socksProxyPassword)) {
+            System.setProperty("socksProxyPassword", passwordMask);
+        }
+        if (socksProxyPassword == null) {
+            socksProxyPassword = System.getProperty("java.net.socks.password");
+        }
+        IProxyService proxyService = ProxyManager.getProxyManager();
+        boolean isHttpProxyEnabled = StringUtils.isNotBlank(httpProxyHost) && StringUtils.isNotBlank(httpProxyPort);
+        boolean isHttpsProxyEnabled = StringUtils.isNotBlank(httpsProxyHost) && StringUtils.isNotBlank(httpsProxyPort);
+        boolean isSocksProxyEnabled = StringUtils.isNotBlank(socksProxyHost) && StringUtils.isNotBlank(socksProxyPort);
+        if (!isHttpProxyEnabled && !isHttpsProxyEnabled && !isSocksProxyEnabled) {
+            proxyService
+                    .setSystemProxiesEnabled(Boolean.valueOf(System.getProperty(SYSTEM_PROXY_ENABLED, Boolean.TRUE.toString())));
+            proxyService.setProxiesEnabled(false);
+            LOGGER.info("No proxy specified, disabled.");
+        } else {
+            proxyService.setSystemProxiesEnabled(false);
+            proxyService.setProxiesEnabled(true);
+            List<IProxyData> proxies = new ArrayList<>();
+            String initedProxyTypes = "";
+            if (isHttpProxyEnabled) {
+                try {
+                    IProxyData httpProxy = proxyService.getProxyData(IProxyData.HTTP_PROXY_TYPE);
+                    httpProxy.setHost(httpProxyHost);
+                    httpProxy.setPort(Integer.valueOf(httpProxyPort));
+                    if (StringUtils.isNotBlank(httpUser)) {
+                        httpProxy.setUserid(httpUser);
+                        if (httpPassword == null) {
+                            httpPassword = "";
+                        }
+                        httpProxy.setPassword(httpPassword);
+                    }
+                    proxies.add(httpProxy);
+                    initedProxyTypes += IProxyData.HTTP_PROXY_TYPE + " ";
+                } catch (Throwable e) {
+                    LOGGER.error(e.getMessage(), e);
+                }
+            }
+            if (isHttpsProxyEnabled) {
+                try {
+                    IProxyData httpsProxy = proxyService.getProxyData(IProxyData.HTTPS_PROXY_TYPE);
+                    httpsProxy.setHost(httpsProxyHost);
+                    httpsProxy.setPort(Integer.valueOf(httpsProxyPort));
+                    if (StringUtils.isNotBlank(httpsUser)) {
+                        httpsProxy.setUserid(httpsUser);
+                        if (httpsPassword == null) {
+                            httpsPassword = "";
+                        }
+                        httpsProxy.setPassword(httpsPassword);
+                    }
+                    proxies.add(httpsProxy);
+                    initedProxyTypes += IProxyData.HTTPS_PROXY_TYPE + " ";
+                } catch (Throwable e) {
+                    LOGGER.error(e.getMessage(), e);
+                }
+            }
+            if (isSocksProxyEnabled) {
+                try {
+                    IProxyData socksProxy = proxyService.getProxyData(IProxyData.SOCKS_PROXY_TYPE);
+                    socksProxy.setHost(socksProxyHost);
+                    socksProxy.setPort(Integer.valueOf(socksProxyPort));
+                    if (StringUtils.isNotBlank(socksProxyUser)) {
+                        socksProxy.setUserid(socksProxyUser);
+                        if (socksProxyPassword == null) {
+                            socksProxyPassword = "";
+                        }
+                        socksProxy.setPassword(socksProxyPassword);
+                    }
+                    proxies.add(socksProxy);
+                    initedProxyTypes += IProxyData.SOCKS_PROXY_TYPE;
+                } catch (Throwable e) {
+                    LOGGER.error(e.getMessage(), e);
+                }
+            }
+            proxyService.setProxyData(proxies.toArray(new IProxyData[0]));
+            List<String> nonProxyHosts = new ArrayList<>();
+            if (StringUtils.isNotBlank(httpNonProxyHosts)) {
+                String[] split = httpNonProxyHosts.split("|");
+                nonProxyHosts.addAll(Arrays.asList(split));
+            }
+            if (StringUtils.isNotBlank(httpsNonProxyHosts)) {
+                String[] split = httpsNonProxyHosts.split("|");
+                nonProxyHosts.addAll(Arrays.asList(split));
+            }
+            proxyService.setNonProxiedHosts(nonProxyHosts.toArray(new String[0]));
+
+            if (passwordMask.equals(System.getProperty("http.proxyPassword"))) {
+                System.setProperty("http.proxyPassword", httpPassword);
+            }
+            if (passwordMask.equals(System.getProperty("https.proxyPassword"))) {
+                System.setProperty("https.proxyPassword", httpsPassword);
+            }
+            if (passwordMask.equals(System.getProperty("socksProxyPassword"))) {
+                System.setProperty("socksProxyPassword", socksProxyPassword);
+            }
+
+            LOGGER.info("Succeed to init proxy: " + initedProxyTypes);
+        }
+    }
+
     public static boolean isNetworkValid() {
         return isNetworkValid(DEFAULT_TIMEOUT);
     }

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

@@ -155,7 +155,6 @@ ProjectRepositoryNode.invalidItem=Invalid item
 ProjectRepositoryNode.columns=Columns
 ProjectRepositoryNode.validationRules=Validation Rules
 ProjectRepositoryNode.cdcFoundation=CDC Foundation
-ProjectRepositoryNode.cdcFoundation.deprecated=CDC Foundation (deprecated)
 ProjectRepositoryNode.genericSchema=Generic schemas
 ProjectRepositoryNode.queries=Queries
 ProjectRepositoryNode.synonymSchemas=Synonym schemas

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

@@ -35,6 +35,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.runtime.model.repository.ERepositoryStatus;
+import org.talend.commons.runtime.service.ITaCoKitService;
 import org.talend.commons.ui.runtime.exception.RuntimeExceptionHandler;
 import org.talend.commons.ui.runtime.image.ECoreImage;
 import org.talend.commons.ui.runtime.repository.IExtendRepositoryNode;
@@ -823,7 +824,8 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
      * @return
      */
     private RepositoryNode getFolder(ERepositoryObjectType currentType, String path, List<IRepositoryNode> rootNodes) {
-        if (RepositoryNodeUtilities.isGenericDBExtraType(currentType) || RepositoryNodeManager.isSnowflake(currentType)) {
+        if (RepositoryNodeUtilities.isGenericDBExtraType(currentType) || RepositoryNodeManager.isSnowflake(currentType)
+                || (ITaCoKitService.getInstance() != null && ITaCoKitService.getInstance().isTaCoKitType(currentType))) {
             currentType = ERepositoryObjectType.METADATA_CONNECTIONS;
         }
         if (path == null || path.isEmpty()) {
@@ -1721,11 +1723,11 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
                 DatabaseConnectionItem connectionItem = (DatabaseConnectionItem) item;
                 DatabaseConnection connection = (DatabaseConnection) connectionItem.getConnection();
                 if (PluginChecker.isCDCPluginLoaded()) {
-                    ICDCProviderService service = GlobalServiceRegister.getDefault().getService(ICDCProviderService.class);
-
+                    ICDCProviderService service = GlobalServiceRegister.getDefault()
+                            .getService(ICDCProviderService.class);
                     if (service != null && service.canCreateCDCConnection(connection)) {
                         RepositoryNode cdcNode = new StableRepositoryNode(node,
-                                Messages.getString("ProjectRepositoryNode.cdcFoundation.deprecated"), //$NON-NLS-1$
+                                Messages.getString("ProjectRepositoryNode.cdcFoundation"), //$NON-NLS-1$
                                 ECoreImage.FOLDER_CLOSE_ICON);
                         node.getChildren().add(cdcNode);
                         service.createCDCTypes(recBinNode, cdcNode, connection.getCdcConns());

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

@@ -144,7 +144,7 @@ Require-Bundle: org.eclipse.jdt.core,
  com.fasterxml.jackson.core.jackson-annotations,
  com.fasterxml.jackson.core.jackson-databind,
  com.fasterxml.jackson.core.jackson-core,
- avro;bundle-version="1.11.2"
+ avro
 Bundle-Activator: org.talend.core.runtime.CoreRuntimePlugin
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,

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

@@ -54,4 +54,6 @@ public interface ILibraryManagerUIService extends IService {
     public boolean confirmDialog(String originalJarFileName);
 
     public IConfigModuleDialog getConfigModuleDialog(Shell parentShell, String initValue, boolean allowDetectDependencies);
+
+    public String getLicenseUrlByName(String licenceName);
 }

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

@@ -60,8 +60,6 @@ public interface ITDQRepositoryService extends IService {
      */
     public void notifySQLExplorer(Item... items);
 
-    public void fillMetadata(ConnectionItem connItem);
-
     public void refresh();
 
     // Added 20120503 yyin

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

@@ -22,7 +22,7 @@ import org.talend.core.database.EDatabaseTypeName;
  */
 public class DbVersion4DriversForOracle11 extends DbVersion4Drivers {
 
-    public static final String DRIVER_1_6 = "ojdbc6.jar"; //$NON-NLS-1$
+    public static final String DRIVER_1_6 = "ojdbc6-11.2.0.4.jar"; //$NON-NLS-1$
 
     public static final String DRIVER_1_5 = "ojdbc5.jar"; //$NON-NLS-1$
 

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

@@ -54,12 +54,12 @@ public enum EDatabaseVersion4Drivers {
     H2(new DbVersion4Drivers(EDatabaseTypeName.H2, "h2-2.1.214.jar")), //$NON-NLS-1$
 
     //
-    JAVADB_EMBEDED(new DbVersion4Drivers(EDatabaseTypeName.JAVADB_EMBEDED, "derby.jar")), //$NON-NLS-1$
+    JAVADB_EMBEDED(new DbVersion4Drivers(EDatabaseTypeName.JAVADB_EMBEDED, "derby-10.14.2.0.jar")), //$NON-NLS-1$
     SQLITE(new DbVersion4Drivers(EDatabaseTypeName.SQLITE, "sqlite-jdbc-3.40.0.0.jar")), //$NON-NLS-1$
-    FIREBIRD(new DbVersion4Drivers(EDatabaseTypeName.FIREBIRD, "jaybird-full-2.1.1.jar")), //$NON-NLS-1$
+    FIREBIRD(new DbVersion4Drivers(EDatabaseTypeName.FIREBIRD, "jaybird-2.1.1.jar")), //$NON-NLS-1$
     TERADATA(new DbVersion4Drivers(EDatabaseTypeName.TERADATA,
             new String[] { "terajdbc4-17.10.00.27.jar" })), //$NON-NLS-1$
-    JAVADB_DERBYCLIENT(new DbVersion4Drivers(EDatabaseTypeName.JAVADB_DERBYCLIENT, "derbyclient.jar")), //$NON-NLS-1$
+    JAVADB_DERBYCLIENT(new DbVersion4Drivers(EDatabaseTypeName.JAVADB_DERBYCLIENT, "derbyclient-10.14.2.0.jar")), //$NON-NLS-1$
     NETEZZA(new DbVersion4Drivers(EDatabaseTypeName.NETEZZA, "nzjdbc.jar")), //$NON-NLS-1$
     INFORMIX(new DbVersion4Drivers(EDatabaseTypeName.INFORMIX, "ifxjdbc.jar")), //$NON-NLS-1$
 

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

@@ -640,7 +640,7 @@ TalendLibsServerManager.cannotGetUserLibraryServer=Impossible d'obtenir le serve
 MigrationReportAccessDialog.title=Migration des \u00E9l\u00E9ments du projet
 MigrationReportAccessDialog.migrateSuccess=Les \u00E9l\u00E9ments du projet ont bien \u00E9t\u00E9 migr\u00E9s.
 MigrationReportAccessDialog.completeReportAvailable=Consulter le rapport
-MigrationReportAccessDialog.accessReport=ici
+MigrationReportAccessDialog.accessBrowse=Parcourir...
 MigrationReportAccessDialog.provideAnalysisTool=Vous pouvez ex\u00E9cuter une analyse de projet pour analyser votre projet migr\u00E9. Cet outil exp\u00E9rimental va g\u00E9n\u00E9rer un rapport contenant\u00A0:
 MigrationReportAccessDialog.listOfProblems=- la liste des \u00E9l\u00E9ments \u00E0 corriger manuellement,
 MigrationReportAccessDialog.listItems=- la liste des \u00E9l\u00E9ments \u00E0 v\u00E9rifier.
@@ -655,7 +655,7 @@ ItemAnalysisReportManager.Warning.message=Impossible d'ex\u00E9cuter une analyse
 AnalysisReportAccessDialog.shellTitle=Analyse du projet
 AnalysisReportAccessDialog.generateSuccess=Analyse du projet termin\u00E9e.
 AnalysisReportAccessDialog.completeReportAvailable=Consulter le rapport
-AnalysisReportAccessDialog.accessReport=ici
+AnalysisReportAccessDialog.accessBrowse=Parcourir...
 AbstractPomTemplateProjectSettingPage.defaultTabLabel=Par d\u00E9faut
 AbstractPomTemplateProjectSettingPage.customTabLabel=Personnalis\u00E9
 AbstractPomTemplateProjectSettingPage.previewButton=Aper\u00E7u

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

@@ -640,7 +640,7 @@ TalendLibsServerManager.cannotGetUserLibraryServer=\u30EA\u30E2\u30FC\u30C8\u7BA
 MigrationReportAccessDialog.title=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u9805\u76EE\u3092\u79FB\u884C
 MigrationReportAccessDialog.migrateSuccess=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u9805\u76EE\u304C\u6B63\u3057\u304F\u79FB\u884C\u3055\u308C\u307E\u3057\u305F\u3002
 MigrationReportAccessDialog.completeReportAvailable=\u30EC\u30DD\u30FC\u30C8\u3092\u30C1\u30A7\u30C3\u30AF
-MigrationReportAccessDialog.accessReport=\u3053\u3061\u3089
+MigrationReportAccessDialog.accessBrowse=\u53C2\u7167...
 MigrationReportAccessDialog.provideAnalysisTool=\u4ECA\u3059\u3050\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u5206\u6790\u3092\u5B9F\u884C\u3057\u3066\u3001\u79FB\u884C\u3055\u308C\u305F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u5206\u6790\u3067\u304D\u307E\u3059\u3002\u3053\u306E\u8A66\u9A13\u7684\u306A\u30C4\u30FC\u30EB\u306B\u3088\u3063\u3066\u3001\u4EE5\u4E0B\u304C\u542B\u307E\u308C\u308B\u30EC\u30DD\u30FC\u30C8\u304C\u751F\u6210\u3055\u308C\u307E\u3059:
 MigrationReportAccessDialog.listOfProblems=- \u624B\u52D5\u3067\u4FEE\u6B63\u3059\u308B\u30A2\u30A4\u30C6\u30E0\u306E\u30EA\u30B9\u30C8\u3002
 MigrationReportAccessDialog.listItems=- \u30C1\u30A7\u30C3\u30AF\u3059\u308B\u30A2\u30A4\u30C6\u30E0\u306E\u30EA\u30B9\u30C8\u3002
@@ -655,7 +655,7 @@ ItemAnalysisReportManager.Warning.message=\u65B0\u3057\u3044\u5206\u6790\u3092\u
 AnalysisReportAccessDialog.shellTitle=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u5206\u6790
 AnalysisReportAccessDialog.generateSuccess=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u5206\u6790\u304C\u6B63\u3057\u304F\u5B8C\u4E86\u3057\u307E\u3057\u305F\u3002
 AnalysisReportAccessDialog.completeReportAvailable=\u30EC\u30DD\u30FC\u30C8\u3092\u30C1\u30A7\u30C3\u30AF
-AnalysisReportAccessDialog.accessReport=\u3053\u3061\u3089
+AnalysisReportAccessDialog.accessBrowse=\u53C2\u7167...
 AbstractPomTemplateProjectSettingPage.defaultTabLabel=\u30C7\u30D5\u30A9\u30EB\u30C8
 AbstractPomTemplateProjectSettingPage.customTabLabel=\u30AB\u30B9\u30BF\u30E0
 AbstractPomTemplateProjectSettingPage.previewButton=\u30D7\u30EC\u30D3\u30E5\u30FC

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

@@ -640,7 +640,7 @@ TalendLibsServerManager.cannotGetUserLibraryServer=\u65E0\u6CD5\u4ECE\u8FDC\u7A0
 MigrationReportAccessDialog.title=\u5DE5\u7A0B\u9879\u76EE\u8FC1\u79FB
 MigrationReportAccessDialog.migrateSuccess=\u5DE5\u7A0B\u9879\u76EE\u8FC1\u79FB\u6210\u529F\u3002
 MigrationReportAccessDialog.completeReportAvailable=\u8BF7\u68C0\u67E5\u62A5\u544A
-MigrationReportAccessDialog.accessReport=\u6B64\u5904
+MigrationReportAccessDialog.accessBrowse=\u6D4F\u89C8...
 MigrationReportAccessDialog.provideAnalysisTool=\u60A8\u73B0\u5728\u53EF\u4EE5\u8FD0\u884C\u5DE5\u7A0B\u5206\u6790\u4EE5\u5206\u6790\u8FC1\u79FB\u7684\u5DE5\u7A0B\u3002\u6B64\u5B9E\u9A8C\u6027\u5DE5\u5177\u5C06\u751F\u6210\u4E00\u4EFD\u5206\u6790\u62A5\u544A\uFF0C\u5176\u4E2D\u5305\u542B:
 MigrationReportAccessDialog.listOfProblems=- \u9700\u8981\u624B\u52A8\u4FEE\u590D\u7684\u9879\u76EE\u6E05\u5355\u3002
 MigrationReportAccessDialog.listItems=- \u9700\u8981\u68C0\u67E5\u7684\u9879\u76EE\u6E05\u5355\u3002
@@ -655,7 +655,7 @@ ItemAnalysisReportManager.Warning.message=\u73B0\u5728\u65E0\u6CD5\u8FD0\u884C\u
 AnalysisReportAccessDialog.shellTitle=\u5DE5\u7A0B\u5206\u6790
 AnalysisReportAccessDialog.generateSuccess=\u5DE5\u7A0B\u5206\u6790\u6210\u529F\u5B8C\u6210\u3002
 AnalysisReportAccessDialog.completeReportAvailable=\u8BF7\u68C0\u67E5\u62A5\u544A
-AnalysisReportAccessDialog.accessReport=\u6B64\u5904
+AnalysisReportAccessDialog.accessBrowse=\u6D4F\u89C8...
 AbstractPomTemplateProjectSettingPage.defaultTabLabel=\u9ED8\u8BA4
 AbstractPomTemplateProjectSettingPage.customTabLabel=\u81EA\u5B9A\u4E49
 AbstractPomTemplateProjectSettingPage.previewButton=\u9884\u89C8

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/util/ModuleAccessHelper.java

@@ -211,6 +211,9 @@ public class ModuleAccessHelper {
     }
 
     private static boolean hasExtraSettings(EList<ElementParameterType> parameters) {
+        if (parameters == null) {
+            return false;
+        }
         Map<String, String> paramMap = parameters.stream().filter(p -> p.getName() != null && p.getValue() != null)
                 .collect(Collectors.toMap(ElementParameterType::getName, ElementParameterType::getValue, (a1, a2) -> a1));
         // Implicit context

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

@@ -14,6 +14,7 @@ package org.talend.core.service;
 
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
+import org.talend.signon.util.PAT;
 import org.talend.signon.util.TokenMode;
 import org.talend.signon.util.listener.LoginEventListener;
 
@@ -53,4 +54,21 @@ public interface ICloudSignOnService extends IService {
         }
         return null;
     }
+    
+    /**
+     * Introspect PAT to retrieve the pat_created date and user info
+     * @param pat Personal access token of TMC
+     * @param dataCenter data center of TMC
+     * @return Introspected PAT
+     */
+    PAT introspectPAT(String pat, String dataCenter);
+    
+    /**
+     * Introspect pat and check whether pat is allowed
+     * 
+     * @param pat Personal access token
+     * @param tmcUrl tmc url
+     * @return valid or not
+     */
+    boolean validatePAT(String pat, String tmcUrl);
 }

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

@@ -19,6 +19,7 @@ import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.swt.graphics.Image;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
+import org.talend.core.model.components.IComponent;
 import org.talend.core.model.metadata.builder.connection.Connection;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.model.repository.IRepositoryViewObject;
@@ -42,6 +43,8 @@ public interface ITCKUIService extends IService {
     Wizard createTCKWizard(String type, IPath path, boolean isNew);
 
     Wizard editTCKWizard(RepositoryNode node);
+       
+    String getComponentFamilyName(IComponent component);
 
     public static ITCKUIService get() {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(ITCKUIService.class)) {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/repository/model/RepositoryNodeUtilities.java

@@ -718,7 +718,7 @@ public class RepositoryNodeUtilities {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericWizardService.class)) {
             wizardService = GlobalServiceRegister.getDefault().getService(IGenericWizardService.class);
         }
-        if (wizardService != null && wizardService.isGenericType(type)) {
+        if (wizardService != null && wizardService.isGenericType(type) || ERepositoryObjectType.METADATA_TACOKIT_JDBC == type) {
             return getGenericSchemaNode(connection, tableName);
         }
         if (repType == ERepositoryObjectType.METADATA_CON_QUERY) {

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

@@ -1085,7 +1085,7 @@ public class ProcessorUtilities {
                 if (childBuildType == null) {
                     Property parentProperty = parentJobInfo.getProcessor().getProperty();
                     String parentBuildType = (String)parentProperty.getAdditionalProperties().get(TalendProcessArgumentConstant.ARG_BUILD_TYPE);
-                    if ("ROUTE".equalsIgnoreCase(parentBuildType)) {
+                    if (parentBuildType!= null && parentBuildType.contains("ROUTE")) {
                     	childProperty.getAdditionalProperties().put(TalendProcessArgumentConstant.ARG_BUILD_TYPE, "OSGI");
                     }
                 }

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

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

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

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

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

@@ -11,7 +11,7 @@
     <packaging>pom</packaging>
     <repositories>
         <repository>
-            <id>Talend OpenSource Release</id>
+            <id>talend_open</id>
             <url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
         </repository>
     </repositories>

main/plugins/org.talend.designer.maven.ui/src/main/java/org/talend/designer/maven/ui/setting/preference/M2eUserSettingForTalendLoginTask.java

@@ -26,7 +26,9 @@ import java.util.List;
 import java.util.Properties;
 
 import javax.xml.parsers.DocumentBuilder;
+
 import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
 import org.apache.maven.cli.configuration.SettingsXmlConfigurationProcessor;
 import org.apache.maven.settings.Profile;
 import org.apache.maven.settings.Proxy;
@@ -66,6 +68,8 @@ import org.w3c.dom.Node;
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class M2eUserSettingForTalendLoginTask extends AbstractLoginTask {
 
+    private static final Logger LOGGER = Logger.getLogger(M2eUserSettingForTalendLoginTask.class);
+
     public static final String MAVEN_REPO_CONFIG = "maven.repository"; //$NON-NLS-1$
 
     public static final String VERSION_KEY = "version"; //$NON-NLS-1$
@@ -444,6 +448,8 @@ public class M2eUserSettingForTalendLoginTask extends AbstractLoginTask {
                 proxyService.setNonProxiedHosts(bypassHosts.toArray(new String[bypassHosts.size()]));
             }
         }
+
+        LOGGER.info("Updated studio proxy settings from maven settings.");
     }
 
     private boolean updateProfileSettings(IProgressMonitor monitor, IMaven maven, Settings settings, Path configPath,

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/creator/CreateMavenBundleTemplatePom.java

@@ -135,6 +135,31 @@ public class CreateMavenBundleTemplatePom extends CreateMaven {
         }
         return null;
     }
+    
+    protected Model createFeatureModel() {
+        InputStream inputStream = null;
+        try {
+            Model model = null;
+            inputStream = getFeatureTemplateStream();
+            if (inputStream != null) {
+                model = MODEL_MANAGER.readMavenModel(inputStream);
+            }
+            return model;
+        } catch (IOException e) {
+            ExceptionHandler.process(e);
+        } catch (CoreException e) {
+            ExceptionHandler.process(e);
+        } finally {
+            if (inputStream != null) {
+                try {
+                    inputStream.close();
+                } catch (IOException e) {
+                    //
+                }
+            }
+        }
+        return null;
+    }
 
     protected InputStream getTemplateStream() throws IOException {
         try {
@@ -143,6 +168,16 @@ public class CreateMavenBundleTemplatePom extends CreateMaven {
             throw new IOException(e);
         }
     }
+    
+    protected InputStream getFeatureTemplateStream() throws IOException {
+        try {
+            return MavenTemplateManager.getBundleTemplateStream(JOB_TEMPLATE_BUNDLE, getBundleTemplatePath());
+        } catch (Exception e) {
+            throw new IOException(e);
+        }
+    }
+    
+    
 
     /*
      * (non-Javadoc)

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

@@ -5,6 +5,6 @@ Bundle-SymbolicName: org.talend.libraries.javacsv;singleton:=true
 Bundle-Version: 8.0.1.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
- lib/javacsv.jar
+ lib/javacsv-2.0.jar;mvn:net.sourceforge.javacsv/javacsv/2.0
 Export-Package: com.csvreader
 Eclipse-BundleShape: dir

main/plugins/org.talend.libraries.javacsv/plugin.xml

@@ -6,7 +6,7 @@
               context="plugin:org.talend.libraries.javacsv"
               language="java"
               message="Needed for Java CVS Reader and Writer"
-              name="javacsv.jar" mvn_uri="mvn:org.talend.libraries/javacsv/6.0.0" 
+              name="javacsv-2.0.jar" mvn_uri="mvn:net.sourceforge.javacsv/javacsv/2.0"
               required="true">
       </libraryNeeded>
    </extension>

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

@@ -5,7 +5,7 @@ Bundle-Name: Jboss
 Bundle-SymbolicName: org.talend.libraries.jboss;singleton:=true
 Bundle-Version: 8.0.1.qualifier
 Bundle-ClassPath: .,
- lib/trove.jar,
+ lib/trove-1.0.2.jar;mvn:trove/trove/1.0.2,
  lib/jboss-serialization.jar
 Eclipse-BuddyPolicy: registered
 Export-Package: org.jboss.serial,

main/plugins/org.talend.libraries.jboss/plugin.xml

@@ -6,14 +6,14 @@
               context="plugin:org.talend.libraries.jboss"
               language="java"
               message="Needed for JBoss"
-              name="jboss-serialization.jar" mvn_uri="mvn:org.talend.libraries/jboss-serialization/6.0.0" 
+              name="jboss-serialization-1.0.3.GA.jar" mvn_uri="mvn:jboss/jboss-serialization/1.0.3.GA"
               required="true">
       </libraryNeeded>
       <libraryNeeded
             context="plugin:org.talend.libraries.jboss"
             language="java"
             message="Needed for JBoss"
-            name="trove.jar" mvn_uri="mvn:org.talend.libraries/trove/6.0.0" 
+            name="trove-1.0.2.jar" mvn_uri="mvn:trove/trove/1.0.2"
             required="true">
       </libraryNeeded>
    </extension>

main/plugins/org.talend.libraries.jdbc.mysql/plugin.xml

@@ -13,7 +13,7 @@
               context="plugin:org.talend.libraries.jdbc.mysql"
               language="java"
               message="Needed for Mysql jdbc plugin"
-              name="mysql-connector-java-5.1.30-bin.jar" mvn_uri="mvn:org.talend.libraries/mysql-connector-java-5.1.30-bin/6.0.0" 
+              name="mysql-connector-java-5.1.30.jar" mvn_uri="mvn:mysql/mysql-connector-java/5.1.30"
               required="true">
         </libraryNeeded>
         <libraryNeeded
@@ -29,8 +29,8 @@
               context="plugin:org.talend.libraries.jdbc.mysql"
               language="java"
               message="Needed for Mysql jdbc plugin"
-              mvn_uri="mvn:org.talend.libraries/mysql-connector-java-3.1.14-bin/6.0.0"
-              name="mysql-connector-java-3.1.14-bin.jar"
+              mvn_uri="mvn:mysql/mysql-connector-java/3.1.14"
+              name="mysql-connector-java-3.1.14.jar"
               required="true">
         </libraryNeeded>
     </extension>

main/plugins/org.talend.libraries.jexcel/plugin.xml

@@ -6,7 +6,7 @@
               context="plugin:org.talend.libraries.jexcel"
               language="java"
               message="Needed for jexcel component"
-              name="jxl.jar" mvn_uri="mvn:org.talend.libraries/jxl/6.0.0" 
+              name="jxl-2.6.12.jar" mvn_uri="mvn:net.sourceforge.jexcelapi/jxl/2.6.12"
               required="true">
         </libraryNeeded>
       <libraryNeeded

main/plugins/org.talend.librariesmanager.ui/licenseTexts/APACHE-1.1.txt

@@ -0,0 +1,61 @@
+
+<!-- saved from url=(0042)http://www.apache.org/licenses/LICENSE-1.1 -->
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"></head><body><pre style="word-wrap: break-word; white-space: pre-wrap;">/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. 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.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *    if any, must include the following acknowledgment:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself,
+ *    if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" must
+ *    not be used to endorse or promote products derived from this
+ *    software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ *    nor may "Apache" appear in their name, without prior written
+ *    permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 THE APACHE SOFTWARE FOUNDATION OR
+ * ITS 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.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * &lt;http://www.apache.org/&gt;.
+ *
+ * Portions of this software are based upon public domain software
+ * originally written at the National Center for Supercomputing Applications,
+ * University of Illinois, Urbana-Champaign.
+ */
+
+</pre></body></html>

main/plugins/org.talend.librariesmanager.ui/licenseTexts/licenseMap.json

@@ -1,6 +1,7 @@
 [
 	{"licenseUrl":"http://www.talendforge.org/modules/licenses/PUBLIC_DOMAIN.txt","licenseName":"PUBLIC_DOMAIN"},
 	{"licenseUrl":"http://www.talendforge.org/modules/licenses/APACHE_v2.txt","licenseName":"Apache-2.0"},
+	{"licenseUrl":"http://www.talendforge.org/modules/licenses/APACHE_v1.1.txt","licenseName":"Apache-1.1"},
 	{"licenseUrl":"http://www.talendforge.org/modules/licenses/Oracle-Binary.txt","licenseName":"Oracle-Binary"},
 	{"licenseUrl":"http://www.talendforge.org/modules/licenses/BSD_v2.txt","licenseName":"BSD-2-Clause"},
 	{"licenseUrl":"http://www.talendforge.org/modules/licenses/BSD_v3.txt","licenseName":"BSD-3-Clause"},

main/plugins/org.talend.librariesmanager.ui/src/main/java/org/talend/librariesmanager/ui/LibraryManagerUIService.java

@@ -40,6 +40,7 @@ import org.talend.librariesmanager.prefs.LibrariesManagerUtils;
 import org.talend.librariesmanager.ui.dialogs.ConfigModuleDialog;
 import org.talend.librariesmanager.ui.i18n.Messages;
 import org.talend.librariesmanager.ui.service.RoutineProviderManager;
+import org.talend.librariesmanager.utils.LicenseTextUtil;
 import org.talend.librariesmanager.utils.ModulesInstaller;
 
 /**
@@ -188,4 +189,8 @@ public class LibraryManagerUIService implements ILibraryManagerUIService {
     public IConfigModuleDialog getConfigModuleDialog(Shell parentShell, String initValue, boolean allowDetectDependencies) {
         return new ConfigModuleDialog(parentShell, initValue, allowDetectDependencies);
     }
+
+    public String getLicenseUrlByName(String licenceName) {
+        return LicenseTextUtil.getLicenseUrlByName(licenceName);
+    }
 }

main/plugins/org.talend.librariesmanager.ui/src/main/java/org/talend/librariesmanager/utils/LicenseTextUtil.java

@@ -102,6 +102,15 @@ public class LicenseTextUtil {
         return null;
     }
 
+    public static String getLicenseUrlByName(String name) {
+        for (String url : licenseMap.keySet()) {
+            if (name != null && name.equalsIgnoreCase(licenseMap.get(url))) {
+                return url;
+            }
+        }
+        return "";
+    }
+
     private static String getStringFromText(File file) throws Exception {
         StringBuilder sb = new StringBuilder();
         List<String> lines = Files.readAllLines(file.toPath(), StandardCharsets.UTF_8);

main/plugins/org.talend.librariesmanager.ui/src/main/java/org/talend/librariesmanager/utils/RemoteModulesHelper.java

@@ -622,15 +622,17 @@ public class RemoteModulesHelper {
             message.put("module", child);//$NON-NLS-1$
             String url = serviceUrl + "?data=" + message;
             JSONObject resultStr = readJsonFromUrl(url);
-            JSONArray jsonArray = resultStr.getJSONArray("result");//$NON-NLS-1$
-            if (jsonArray != null) {
-                JSONObject object = jsonArray.getJSONObject(0);
-                if (object != null) {
-                    String licenseText = object.getString("licenseText");//$NON-NLS-1$
-                    if (licenseText != null) {
-                        licenseText.replace("http://", "https://");//$NON-NLS-1$ //$NON-NLS-2$
+            if (resultStr != null) {
+                JSONArray jsonArray = resultStr.getJSONArray("result");//$NON-NLS-1$
+                if (jsonArray != null) {
+                    JSONObject object = jsonArray.getJSONObject(0);
+                    if (object != null) {
+                        String licenseText = object.getString("licenseText");//$NON-NLS-1$
+                        if (licenseText != null) {
+                            licenseText.replace("http://", "https://");//$NON-NLS-1$ //$NON-NLS-2$
+                        }
+                        return licenseText;
                     }
-                    return licenseText;
                 }
             }
         } catch (JSONException e) {

main/plugins/org.talend.librariesmanager/src/main/java/org/talend/librariesmanager/librarydata/LibraryDataService.java

@@ -153,8 +153,14 @@ public class LibraryDataService {
     }
 
     public void buildLibraryLicenseData(Set<String> mvnUrlList) {
+        buildLibraryLicenseData(mvnUrlList, null);
+    }
+
+    public void buildLibraryLicenseData(Set<String> mvnUrlList, Map<String, List<String[]>> licenseMap) {
         for (String mvnUrl : mvnUrlList) {
-            Library libraryObj = resolve(mvnUrl);
+            Library libraryObj = getLicenseDataFromMap(mvnUrl, licenseMap);
+            if (libraryObj == null)
+                libraryObj = resolve(mvnUrl);
             if (!libraryObj.isLicenseMissing() || !libraryObj.isPomMissing()) {
                 mvnToLibraryMap.put(getShortMvnUrl(mvnUrl), libraryObj);
             }
@@ -171,10 +177,10 @@ public class LibraryDataService {
                     isRemoved = true;
                 }
             }
-            if(lib.isPomMissing()) {
+            if (lib.isPomMissing()) {
                 lib.getLicenses().clear();
                 lib.getLicenses().add(unknownLicense);
-            }else {
+            } else {
                 if ((isRemoved && licenses.size() == 0)) {
                     licenses.add(unknownLicense);
                     lib.setLicenseMissing(true);
@@ -183,6 +189,38 @@ public class LibraryDataService {
         }
         dataProvider.saveLicenseData(mvnToLibraryMap);
     }
+    
+    private Library getLicenseDataFromMap(String mvnUrl, Map<String, List<String[]>> licenseMap) {
+        if (licenseMap == null)
+            return null;
+        MavenArtifact artifact = MavenUrlHelper.parseMvnUrl(mvnUrl);
+        String shourtMvnUrl = getShortMvnUrl(mvnUrl);
+        String gav = String.format("%s:%s:%s", artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion());
+        List<String[]> licenses = licenseMap.get(gav);
+        Library libraryObj = null;
+        if (licenses != null && licenses.size() > 0) {
+            libraryObj = new Library();
+            libraryObj.setGroupId(artifact.getGroupId());
+            libraryObj.setArtifactId(artifact.getArtifactId());
+            libraryObj.setVersion(artifact.getVersion());
+            libraryObj.setMvnUrl(shourtMvnUrl);
+            libraryObj.setType(artifact.getType());
+            libraryObj.setClassifier(artifact.getClassifier());
+            libraryObj.setPomMissing(false);
+            for (String[] licenseContent : licenses) {
+                LibraryLicense license = new LibraryLicense();
+                if (licenseContent != null && licenseContent.length == 2) {
+                    license.setName(licenseContent[0]);
+                    license.setUrl(licenseContent[1]);
+                }
+                libraryObj.getLicenses().add(license);
+            }
+        } else {
+            return null;
+        }
+
+        return libraryObj;
+    }
 
     private Library resolve(String mvnUrl) {
         MavenArtifact artifact = MavenUrlHelper.parseMvnUrl(mvnUrl);

main/plugins/org.talend.metadata.managment.ui/META-INF/MANIFEST.MF

@@ -34,7 +34,7 @@ Require-Bundle: org.eclipse.ui,
  org.talend.daikon,
  org.talend.libraries.apache,
  org.talend.studio.studio-utils,
- avro;bundle-version="1.11.2"
+ avro
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: .Talend SA.
 Bundle-Localization: plugin

main/plugins/org.talend.metadata.managment.ui/src/main/java/org/talend/metadata/managment/ui/utils/ConnectionContextHelper.java

@@ -48,7 +48,6 @@ import org.talend.core.model.context.JobContext;
 import org.talend.core.model.context.JobContextParameter;
 import org.talend.core.model.metadata.IMetadataConnection;
 import org.talend.core.model.metadata.MetadataTalendType;
-import org.talend.core.model.metadata.builder.connection.AdditionalConnectionProperty;
 import org.talend.core.model.metadata.builder.connection.Connection;
 import org.talend.core.model.metadata.builder.connection.DatabaseConnection;
 import org.talend.core.model.metadata.builder.connection.FTPConnection;
@@ -382,12 +381,7 @@ public final class ConnectionContextHelper {
             } catch (JSONException e) {
                 ExceptionHandler.process(e);
             }
-        } else if (currentConnection instanceof SAPConnection) {
-            SAPConnection sapConn = (SAPConnection) currentConnection;
-            for (AdditionalConnectionProperty sapProperty : sapConn.getAdditionalProperties()) {
-                varList.add(sapProperty.getPropertyName());
-            }
-        } else if (currentConnection instanceof DatabaseConnection && !(currentConnection instanceof TacokitDatabaseConnection)) {
+        }else if (currentConnection instanceof DatabaseConnection && !(currentConnection instanceof TacokitDatabaseConnection)) {
             DatabaseConnection dbConn = (DatabaseConnection) currentConnection;
             List<Map<String, Object>> hadoopPropertiesList = DBConnectionContextUtils.getHiveOrHbaseHadoopProperties(dbConn);
             if (!hadoopPropertiesList.isEmpty()) {

main/plugins/org.talend.metadata.managment.ui/src/main/java/org/talend/metadata/managment/ui/utils/OtherConnectionContextUtils.java

@@ -620,11 +620,6 @@ public final class OtherConnectionContextUtils {
                 }
             }
         }
-        // Create sap context parameters for additional properties
-        for (AdditionalConnectionProperty sapProperty : conn.getAdditionalProperties()) {
-            String sapPropertyContextName = getValidSapContextName(sapProperty.getPropertyName());
-            ConnectionContextHelper.createParameters(varList, sapPropertyContextName, sapProperty.getValue());
-        }
 
         return varList;
     }
@@ -652,7 +647,6 @@ public final class OtherConnectionContextUtils {
                 setSAPConnnectionBasicPropertiesForContextMode(sapCon, sapParam, sapVariableName);
             }
         }
-        setSAPConnectionAdditionPropertiesForContextMode(sapCon);
     }
 
     static void setSAPConnectionPropertiesForExistContextMode(SAPConnection sapConn, Set<IConnParamName> paramSet,
@@ -682,7 +676,6 @@ public final class OtherConnectionContextUtils {
                 setSAPConnnectionBasicPropertiesForContextMode(sapConn, sapParam, sapVariableName);
             }
         }
-        setSAPConnectionAdditionPropertiesForContextMode(sapConn);
     }
 
     static void setSAPConnnectionBasicPropertiesForContextMode(SAPConnection sapConn, EParamName sapParam,
@@ -735,12 +728,6 @@ public final class OtherConnectionContextUtils {
         }
     }
 
-    static void setSAPConnectionAdditionPropertiesForContextMode(SAPConnection sapConn) {
-        for (AdditionalConnectionProperty sapProperty : sapConn.getAdditionalProperties()) {
-            String sapPropertyContextName = getValidSapContextName(sapProperty.getPropertyName());
-            sapProperty.setValue(ContextParameterUtils.getNewScriptCode(sapPropertyContextName, LANGUAGE));
-        }
-    }
 
     static void revertSAPPropertiesForContextMode(SAPConnection conn, ContextType contextType) {
         String client = TalendQuoteUtils.removeQuotes(ConnectionContextHelper.getOriginalValue(contextType, conn.getClient()));

main/plugins/org.talend.metadata.managment.ui/src/main/java/org/talend/metadata/managment/ui/wizard/CheckLastVersionRepositoryWizard.java

@@ -28,6 +28,7 @@ import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
 import org.talend.commons.utils.VersionUtils;
 import org.talend.core.GlobalServiceRegister;
+import org.talend.core.ITDQRepositoryService;
 import org.talend.core.model.metadata.builder.connection.MetadataTable;
 import org.talend.core.model.properties.ConnectionItem;
 import org.talend.core.model.properties.Item;
@@ -176,11 +177,34 @@ public abstract class CheckLastVersionRepositoryWizard extends RepositoryWizard
         workspace.run(operation, schedulingRule, IWorkspace.AVOID_UPDATE, new NullProgressMonitor());
     }
 
-    @Override
-    public boolean performCancel() {
-        // connectionCopy = null;
-        // metadataTableCopy = null;
-        return super.performCancel();
+
+    protected void updateDQDependency(boolean isModified, String originaleObjectLabel) {
+        if (isModified) {
+            if (GlobalServiceRegister.getDefault().isServiceRegistered(ITDQRepositoryService.class)) {
+                ITDQRepositoryService tdqRepService = GlobalServiceRegister.getDefault()
+                        .getService(ITDQRepositoryService.class);
+                if (tdqRepService != null) {
+                    // TDQ-6395, save all dependency of the connection when the name is changed.
+                    tdqRepService.saveConnectionWithDependency(connectionItem);
+
+                    // TDQ-7438, If the analysis editor is opened, popup the dialog which ask user refresh
+                    // the editor or not once should enough(use hasReloaded to control,because the reload will refresh)
+                    tdqRepService.refreshCurrentAnalysisEditor(connectionItem);
+
+                    tdqRepService.updateAliasInSQLExplorer(connectionItem, originaleObjectLabel);
+                }
+            }
+        }
+    }
+
+    protected void notifyDQSQLExplorer() {
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(ITDQRepositoryService.class)) {
+            ITDQRepositoryService tdqRepService = GlobalServiceRegister.getDefault()
+                    .getService(ITDQRepositoryService.class);
+            if (tdqRepService != null) {
+                tdqRepService.notifySQLExplorer(connectionItem);
+            }
+        }
     }
 
     protected void refreshInFinish(boolean isModified) {

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

@@ -82,8 +82,8 @@
               context="plugin:org.talend.libraries.jdbc.oracle"
               language="java"
               message="Needed for Oracle jdbc plugin"
-              mvn_uri="mvn:org.talend.libraries/ojdbc6/6.0.0"
-              name="ojdbc6.jar"
+              mvn_uri="mvn:com.oracle.database.jdbc/ojdbc6/11.2.0.4"
+              name="ojdbc6-11.2.0.4.jar"
               required="true">
         </libraryNeeded>
         <libraryNeeded

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

@@ -1085,8 +1085,8 @@ public class ExtractMetaDataUtils {
                 } else if (driverJarPathArg.contains("/")) {
                     if (driverJarPathArg.contains(";")) {
                         String jars[] = driverJarPathArg.split(";");
-                        List<String> jarNames = new ArrayList<>();
                         for (String jar : jars) {
+                            jar = TalendQuoteUtils.removeQuotesIfExist(jar);
                             if (jar.startsWith(MavenUrlHelper.MVN_PROTOCOL)) {
                                 setDriverPath(librairesManagerService, jarPathList, jar);
                             } else {

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

@@ -223,10 +223,6 @@ public final class JavaSqlFactory {
             } // else we are ok
             return driverClassName;
         }
-        MDMConnection mdmConn = SwitchHelpers.MDMCONNECTION_SWITCH.doSwitch(conn);
-        if (mdmConn != null) {
-            return ""; //$NON-NLS-1$
-        }
         DelimitedFileConnection dfConn = SwitchHelpers.DELIMITEDFILECONNECTION_SWITCH.doSwitch(conn);
         if (dfConn != null) {
             return ""; //$NON-NLS-1$
@@ -246,10 +242,6 @@ public final class JavaSqlFactory {
         if (dbConn != null) {
             dbConn.setURL(url);
         }
-        MDMConnection mdmConn = SwitchHelpers.MDMCONNECTION_SWITCH.doSwitch(conn);
-        if (mdmConn != null) {
-            mdmConn.setPathname(url);
-        }
         // MOD qiongli 2011-1-9 feature 16796
         DelimitedFileConnection dfConnection = SwitchHelpers.DELIMITEDFILECONNECTION_SWITCH.doSwitch(conn);
         if (dfConnection != null) {
@@ -268,11 +260,6 @@ public final class JavaSqlFactory {
         DatabaseConnection dbConn = SwitchHelpers.DATABASECONNECTION_SWITCH.doSwitch(conn);
         if (dbConn != null) {
             userName = getOriginalValueConnection(dbConn).getUsername();// root
-        } else {
-            MDMConnection mdmConn = SwitchHelpers.MDMCONNECTION_SWITCH.doSwitch(conn);
-            if (mdmConn != null) {
-                userName = mdmConn.getUsername();
-            }
         }
         if (userName == null) {
             userName = "";//$NON-NLS-1$
@@ -296,11 +283,6 @@ public final class JavaSqlFactory {
             } else {
                 psw = getOriginalValueConnection(dbConn).getRawPassword();// ""
             }
-        } else {
-            MDMConnection mdmConn = SwitchHelpers.MDMCONNECTION_SWITCH.doSwitch(conn);
-            if (mdmConn != null) {
-                psw = ConnectionHelper.getPassword(mdmConn);
-            }
         }
         if (psw == null) {
             psw = "";//$NON-NLS-1$
@@ -553,10 +535,6 @@ public final class JavaSqlFactory {
             }
             return url;
         }
-        MDMConnection mdmConn = SwitchHelpers.MDMCONNECTION_SWITCH.doSwitch(conn);
-        if (mdmConn != null) {
-            return mdmConn.getPathname();
-        }
         // MOD qiongli 2011-1-11 feature 16796.
         DelimitedFileConnection dfConnection = SwitchHelpers.DELIMITEDFILECONNECTION_SWITCH.doSwitch(conn);
         if (dfConnection != null) {
@@ -720,10 +698,6 @@ public final class JavaSqlFactory {
         if (dbConn != null) {
             return getOriginalValueConnection(dbConn).getServerName();
         }
-        MDMConnection mdmConn = SwitchHelpers.MDMCONNECTION_SWITCH.doSwitch(conn);
-        if (mdmConn != null) {
-            return mdmConn.getServer();
-        }
         return null;
     }
 
@@ -751,10 +725,6 @@ public final class JavaSqlFactory {
         if (dbConn != null) {
             dbConn.setServerName(serverName);
         }
-        MDMConnection mdmConn = SwitchHelpers.MDMCONNECTION_SWITCH.doSwitch(conn);
-        if (mdmConn != null) {
-            mdmConn.setServer(serverName);
-        }
     }
 
     /**
@@ -768,10 +738,6 @@ public final class JavaSqlFactory {
         if (dbConn != null) {
             return getOriginalValueConnection(dbConn).getPort();
         }
-        MDMConnection mdmConn = SwitchHelpers.MDMCONNECTION_SWITCH.doSwitch(conn);
-        if (mdmConn != null) {
-            return mdmConn.getPort();
-        }
         return null;
     }
 
@@ -786,10 +752,6 @@ public final class JavaSqlFactory {
         if (dbConn != null) {
             dbConn.setPort(port);
         }
-        MDMConnection mdmConn = SwitchHelpers.MDMCONNECTION_SWITCH.doSwitch(conn);
-        if (mdmConn != null) {
-            mdmConn.setPort(port);
-        }
     }
 
     /**
@@ -803,10 +765,6 @@ public final class JavaSqlFactory {
         if (dbConn != null) {
             return getOriginalValueConnection(dbConn).getSID();
         }
-        MDMConnection mdmConn = SwitchHelpers.MDMCONNECTION_SWITCH.doSwitch(conn);
-        if (mdmConn != null) {
-            return mdmConn.getContext();
-        }
         return null;
     }
 
@@ -821,10 +779,6 @@ public final class JavaSqlFactory {
         if (dbConn != null) {
             dbConn.setSID(sid);
         }
-        MDMConnection mdmConn = SwitchHelpers.MDMCONNECTION_SWITCH.doSwitch(conn);
-        if (mdmConn != null) {
-            mdmConn.setContext(sid);
-        }
     }
 
     /**

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/impl/TacokitDatabaseConnectionImpl.java

@@ -120,7 +120,10 @@ public class TacokitDatabaseConnectionImpl extends DatabaseConnectionImpl implem
             HashMap<String, Object> map = new HashMap<String, Object>();
             map.put(KEY_DRIVER_PATH, driverJar);
             map.put(KEY_DRIVER_NAME, null);
-            drivers.add(map);
+            // TDQ-21562: fix add twice when import the project from login
+            if (!drivers.contains(map)) {
+                drivers.add(map);
+            }
         }
         this.getProperties().put(KEY_DRIVER, drivers.toString());
     }
@@ -254,7 +257,11 @@ public class TacokitDatabaseConnectionImpl extends DatabaseConnectionImpl implem
      */
     @Override
     public String getDbmsId() {
-        return getDatabaseMappingFile();
+        String mappingFile = getDatabaseMappingFile();
+        if ("null".equals(mappingFile)) {
+            return null;
+        }
+        return mappingFile;
     }
 
     /**

main/plugins/org.talend.model/src/main/java/org/talend/cwm/helper/ConnectionHelper.java

@@ -606,27 +606,9 @@ public class ConnectionHelper {
      * @return
      */
     public static String getUniverse(Connection element) {
-        MDMConnection mdmConnection = SwitchHelpers.MDMCONNECTION_SWITCH.doSwitch(element);
-        if (mdmConnection != null) {
-            return getUniverse(mdmConnection);
-        }
         return "";
     }
 
-    /**
-     * DOC xqliu Comment method "setUniverse".
-     *
-     * @param universe
-     * @param element
-     */
-    public static void setUniverse(String universe, Connection element) {
-        MDMConnection mdmConnection = SwitchHelpers.MDMCONNECTION_SWITCH.doSwitch(element);
-        if (mdmConnection != null) {
-            setUniverse(universe, mdmConnection);
-        }
-    }
-
-    // MOD klliu 2010-10-09 feature 15821
     /**
      *
      * DOC klliu Comment method "getOtherParameter".
@@ -1310,10 +1292,6 @@ public class ConnectionHelper {
         if (dbConn != null) {
             dbConn.setServerName(serverName);
         }
-        MDMConnection mdmConn = SwitchHelpers.MDMCONNECTION_SWITCH.doSwitch(conn);
-        if (mdmConn != null) {
-            mdmConn.setServer(serverName);
-        }
     }
 
     /**
@@ -1327,10 +1305,6 @@ public class ConnectionHelper {
         if (dbConn != null) {
             dbConn.setPort(port);
         }
-        MDMConnection mdmConn = SwitchHelpers.MDMCONNECTION_SWITCH.doSwitch(conn);
-        if (mdmConn != null) {
-            mdmConn.setPort(port);
-        }
     }
 
     /**
@@ -1344,10 +1318,6 @@ public class ConnectionHelper {
         if (dbConn != null) {
             dbConn.setSID(sid);
         }
-        MDMConnection mdmConn = SwitchHelpers.MDMCONNECTION_SWITCH.doSwitch(conn);
-        if (mdmConn != null) {
-            mdmConn.setContext(sid);
-        }
     }
 
     /**
@@ -1361,10 +1331,6 @@ public class ConnectionHelper {
         if (dbConn != null) {
             dbConn.setURL(url);
         }
-        MDMConnection mdmConn = SwitchHelpers.MDMCONNECTION_SWITCH.doSwitch(conn);
-        if (mdmConn != null) {
-            mdmConn.setPathname(url);
-        }
     }
 
     /**
@@ -1378,10 +1344,6 @@ public class ConnectionHelper {
         if (dbConn != null) {
             dbConn.setUsername(username);
         }
-        MDMConnection mdmConn = SwitchHelpers.MDMCONNECTION_SWITCH.doSwitch(conn);
-        if (mdmConn != null) {
-            mdmConn.setUsername(username);
-        }
     }
 
     /**
@@ -1395,10 +1357,6 @@ public class ConnectionHelper {
         if (dbConn != null) {
             dbConn.setRawPassword(password);
         }
-        MDMConnection mdmConn = SwitchHelpers.MDMCONNECTION_SWITCH.doSwitch(conn);
-        if (mdmConn != null) {
-            mdmConn.setPassword(mdmConn.getValue(password, true));
-        }
     }
 
     /**
@@ -1412,10 +1370,6 @@ public class ConnectionHelper {
         if (dbConn != null) {
             return dbConn.getRawPassword();
         }
-        MDMConnection mdmConn = SwitchHelpers.MDMCONNECTION_SWITCH.doSwitch(conn);
-        if (mdmConn != null) {
-            return mdmConn.getValue(mdmConn.getPassword(), false);
-        }
         return null;
     }
 

main/plugins/org.talend.model/src/main/java/org/talend/cwm/helper/SwitchHelpers.java

@@ -241,15 +241,6 @@ public final class SwitchHelpers {
         }
     };
 
-    public static final ConnectionSwitch<MDMConnection> MDMCONNECTION_SWITCH = new ConnectionSwitch<MDMConnection>() {
-
-        @Override
-        public MDMConnection caseMDMConnection(MDMConnection object) {
-            return object;
-        }
-
-    };
-
     public static final ConnectionSwitch<MetadataColumn> METADATA_COLUMN_SWITCH = new ConnectionSwitch<MetadataColumn>() {
 
         @Override

main/plugins/org.talend.rcp/src/main/java/org/talend/rcp/intro/Application.java

@@ -171,6 +171,12 @@ public class Application implements IApplication {
                 EclipseCommandLine.updateOrCreateExitDataPropertyWithCommand(EclipseCommandLine.CLEAN, null, false);
                 return IApplication.EXIT_RELAUNCH;
             }
+            try {
+                NetworkUtil.applyProxyFromSystemProperties();
+            } catch (Throwable e) {
+                LOGGER.error("Failed to init proxy.", e);
+            }
+
             StudioSSLContextProvider.setSSLSystemProperty();
             HttpProxyUtil.initializeHttpProxy();
             TalendProxySelector.getInstance();

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

@@ -93,10 +93,10 @@ TalendForgeDialog.notValid=\u7121\u52B9
 TalendForgeDialog.loginLabel=\u30ED\u30B0\u30A4\u30F3
 TalendForgeDialog.linkToCreate=(\u307E\u305F\u306F\u65B0\u898F\u30A2\u30AB\u30A6\u30F3\u30C8\u3092\u4F5C\u6210):
 TalendForgeDialog.connectButton.v1=\u30DE\u30A4\u30A2\u30AB\u30A6\u30F3\u30C8\u3067\u63A5\u7D9A
-TalendForgeDialog.MessageTitle=Talend Forge
-TalendForgeDialog.Message=Talend Forge\u306B\u767B\u9332\u3067\u304D\u307E\u3057\u305F!
-TalendForgeDialog.ConnectSuccessMessage=Talend Forge\u306B\u63A5\u7D9A\u3067\u304D\u307E\u3057\u305F!
-TalendForgeDialog.ConnectFailureMessage=Talend Forge\u306B\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093!
+TalendForgeDialog.MessageTitle=TalendForge
+TalendForgeDialog.Message=TalendForge\u306B\u767B\u9332\u3067\u304D\u307E\u3057\u305F!
+TalendForgeDialog.ConnectSuccessMessage=TalendForge\u306B\u63A5\u7D9A\u3067\u304D\u307E\u3057\u305F!
+TalendForgeDialog.ConnectFailureMessage=TalendForge\u306B\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093!
 TalendForgeDialog.ConnectExistingButton=\u65E2\u5B58\u306E\u30A2\u30AB\u30A6\u30F3\u30C8\u306B\u63A5\u7D9A
 TalendForgeDialog.CreateNewButton=\u65B0\u898F\u30A2\u30AB\u30A6\u30F3\u30C8\u3092\u4F5C\u6210
 TalendForgeDialog.form.userName.hint=\u30E6\u30FC\u30B6\u30FC\u540D

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

@@ -23,6 +23,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -388,6 +389,9 @@ public class ImportBasicHandler extends AbstractImportExecutableHandler {
                     repObjectcache.initialize(curProcessType);
                 }
             } else {
+                if (ERepositoryObjectType.JDBC != null && ERepositoryObjectType.JDBC.equals(itemType)) {
+                    itemType = ERepositoryObjectType.METADATA_TACOKIT_JDBC;
+                }
                 repObjectcache.initialize(itemType);
             }
 
@@ -558,6 +562,11 @@ public class ImportBasicHandler extends AbstractImportExecutableHandler {
         if (type1 == type2) {
             return true;
         }
+        List<ERepositoryObjectType> jdbcTacokitList = Arrays.asList(ERepositoryObjectType.METADATA_TACOKIT_JDBC,
+                ERepositoryObjectType.JDBC);
+        if (jdbcTacokitList.contains(type1) && jdbcTacokitList.contains(type2)) {
+            return true;
+        }
         IGenericWizardService wizardService = null;
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericWizardService.class)) {
             wizardService = (IGenericWizardService) GlobalServiceRegister.getDefault().getService(IGenericWizardService.class);

main/plugins/org.talend.repository.items.importexport/src/main/java/org/talend/repository/items/importexport/wizard/models/ImportNodesBuilder.java

@@ -34,6 +34,7 @@ import org.talend.core.model.properties.Project;
 import org.talend.core.model.properties.RoutinesJarItem;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.model.routines.RoutinesUtil;
+import org.talend.core.repository.utils.RepositoryNodeManager;
 import org.talend.core.ui.ITestContainerProviderService;
 import org.talend.repository.items.importexport.handlers.model.EmptyFolderImportItem;
 import org.talend.repository.items.importexport.handlers.model.ImportItem;
@@ -282,7 +283,7 @@ public class ImportNodesBuilder {
     }
 
     private TypeImportNode findAndCreateParentTypeNode(ProjectImportNode projectNode, ERepositoryObjectType curType) {
-        if (curType == ERepositoryObjectType.METADATA_TACOKIT_JDBC || curType == ERepositoryObjectType.SNOWFLAKE) {
+        if (curType == ERepositoryObjectType.METADATA_TACOKIT_JDBC || RepositoryNodeManager.isSnowflake(curType)) {
             curType = ERepositoryObjectType.METADATA_CONNECTIONS;
         }
         ERepositoryObjectType parentParentType = ERepositoryObjectType.findParentType(curType);

main/plugins/org.talend.repository.mdm/src/main/java/org/talend/repository/mdm/ui/wizard/MDMWizard.java

@@ -229,10 +229,6 @@ public class MDMWizard extends RepositoryWizard implements INewWizard {
                 connectionProperty.setId(nextId);
                 factory.create(connectionItem, propertiesWizardPage.getDestinationPath());
 
-                // feature 17159
-                if (tdqRepService != null) {
-                    tdqRepService.fillMetadata(connectionItem);
-                }
             } else {
                 connectionItem.getConnection().setLabel(connectionProperty.getDisplayName());
                 connectionItem.getConnection().setName(connectionProperty.getDisplayName());

main/plugins/org.talend.repository.metadata/src/main/java/org/talend/repository/metadata/i18n/messages_ja.properties

@@ -492,7 +492,7 @@ TalendForgeDialog.countryLabel=\u56FD:
 TalendForgeDialog.link=(\u307E\u305F\u306F\u65E2\u5B58\u306E\u30A2\u30AB\u30A6\u30F3\u30C8\u306B\u63A5\u7D9A):
 TalendForgeDialog.passwordLabel=\u30D1\u30B9\u30EF\u30FC\u30C9:
 TalendForgeDialog.passwordAgainLabel=\u30D1\u30B9\u30EF\u30FC\u30C9(\u518D\u5165\u529B):
-TalendForgeDialog.agreeButton=Talend Forge\u306E\u5229\u7528\u898F\u7D04\u306B\u540C\u610F\u3059\u308B
+TalendForgeDialog.agreeButton=TalendForge\u306E\u5229\u7528\u898F\u7D04\u306B\u540C\u610F\u3059\u308B
 TalendForgeDialog.improveButton=Talend\u306E\u6539\u5584\u306E\u305F\u3081\u306B\u533F\u540D\u3067\u4F7F\u7528\u72B6\u6CC1\u3092\u5171\u6709\u3059\u308B
 TalendForgeDialog.readMore=(\u8A73\u7D30...)
 TalendForgeDialog.createAccountButton=\u30A2\u30AB\u30A6\u30F3\u30C8\u3092\u4F5C\u6210
@@ -507,10 +507,10 @@ TalendForgeDialog.notValid=\u7121\u52B9
 TalendForgeDialog.loginLabel=\u30ED\u30B0\u30A4\u30F3
 TalendForgeDialog.linkToCreate=(\u307E\u305F\u306F\u65B0\u898F\u30A2\u30AB\u30A6\u30F3\u30C8\u3092\u4F5C\u6210):
 TalendForgeDialog.connectButton=\u63A5\u7D9A
-TalendForgeDialog.MessageTitle=Talend Forge
-TalendForgeDialog.Message=Talend Forge\u306B\u767B\u9332\u3067\u304D\u307E\u3057\u305F!
-TalendForgeDialog.ConnectSuccessMessage=Talend Forge\u306B\u63A5\u7D9A\u3067\u304D\u307E\u3057\u305F!
-TalendForgeDialog.ConnectFailureMessage=Talend Forge\u306B\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093!
+TalendForgeDialog.MessageTitle=TalendForge
+TalendForgeDialog.Message=TalendForge\u306B\u767B\u9332\u3067\u304D\u307E\u3057\u305F!
+TalendForgeDialog.ConnectSuccessMessage=TalendForge\u306B\u63A5\u7D9A\u3067\u304D\u307E\u3057\u305F!
+TalendForgeDialog.ConnectFailureMessage=TalendForge\u306B\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093!
 NewImportProjectWizard.windowTitle=\u30C7\u30E2\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u30A4\u30F3\u30DD\u30FC\u30C8...
 LoginDialog.newProjectTitle=\u65B0\u898F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8
 LoginDialog.title={0}

main/plugins/org.talend.repository.metadata/src/main/java/org/talend/repository/ui/wizards/metadata/connection/database/DatabaseWizard.java

@@ -389,16 +389,7 @@ public class DatabaseWizard extends CheckLastVersionRepositoryWizard implements
                 try {
                     dbService.dbWizardPerformFinish(connectionItem, databaseWizardPage.getForm(), isCreation(), pathToSave, new ArrayList<IMetadataTable>(),contextName);
                     boolean isNameModified = propertiesWizardPage.isNameModifiedByUser();
-                    if (isNameModified) {
-                        if (GlobalServiceRegister.getDefault().isServiceRegistered(IDesignerCoreService.class)) {
-                            IDesignerCoreService service = GlobalServiceRegister.getDefault()
-                                    .getService(IDesignerCoreService.class);
-                            if (service != null) {
-                                service.refreshComponentView(connectionItem);
-                            }
-                        }
-
-                    }
+                    refreshInFinish(isNameModified);
                     closeLockStrategy();
                 } catch (CoreException e) {
                     new ErrorDialogWidthDetailArea(getShell(), PID, Messages.getString("CommonWizard.persistenceException"), //$NON-NLS-1$
@@ -668,16 +659,7 @@ public class DatabaseWizard extends CheckLastVersionRepositoryWizard implements
         }
         // ~
         
-        if (isNameModified) {
-            if (GlobalServiceRegister.getDefault().isServiceRegistered(IDesignerCoreService.class)) {
-                IDesignerCoreService service = GlobalServiceRegister.getDefault().getService(
-                        IDesignerCoreService.class);
-                if (service != null) {
-                    service.refreshComponentView(connectionItem);
-                }
-            }
-            
-        }
+        refreshInFinish(isNameModified);
     }
     
     /**

main/plugins/org.talend.repository.metadata/src/main/java/org/talend/repository/ui/wizards/metadata/connection/genericshema/GenericSchemaWizard.java

@@ -404,9 +404,7 @@ public class GenericSchemaWizard extends CheckLastVersionRepositoryWizard implem
                     updateConnectionItem();
                     // 0005170: Schema renamed - new name not pushed out to dependant jobs
                     boolean isModified = genericSchemaWizardPage0.isNameModifiedByUser();
-                    if (isModified) {
-                        CoreRuntimePlugin.getInstance().getDesignerCoreService().refreshComponentView(connectionItem);
-                    }
+                    refreshInFinish(isModified);
                 }
             } catch (Exception e) {
                 String detailError = e.toString();

main/plugins/org.talend.resources/plugin_ja.properties

@@ -1 +1 @@
-demo.description=\u30C7\u30FC\u30BF\u30A4\u30F3\u30C6\u30B0\u30EC\u30FC\u30B7\u30E7\u30F3\u30C7\u30E2
+demo.description=\u30C7\u30FC\u30BF\u7D71\u5408\u30C7\u30E2

main/plugins/org.talend.signon.util/META-INF/MANIFEST.MF

@@ -8,7 +8,8 @@ Eclipse-LazyStart: true
 Bundle-ClassPath: .,
  lib/commons-exec.jar
 Bundle-Vendor: .Talend SA.
-Import-Package: org.osgi.framework;version="1.10.0",
+Import-Package: com.fasterxml.jackson.annotation,
+ org.osgi.framework;version="1.10.0",
  org.talend.utils.json
 Export-Package: org.talend.signon.util,
  org.talend.signon.util.i18n,

main/plugins/org.talend.signon.util/src/main/java/org/talend/signon/util/PAT.java

@@ -0,0 +1,95 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2023 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.signon.util;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * @author PCW created on Nov 7, 2023
+ *
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class PAT {
+
+    @JsonProperty("active")
+    private boolean active;
+
+    @JsonProperty("login")
+    private String login;
+
+    @JsonProperty("pat_created")
+    private Date pat_created;
+
+    @JsonProperty("email")
+    private String email;
+
+    /**
+     * @return the active
+     */
+    public boolean isActive() {
+        return active;
+    }
+
+    /**
+     * @param active the active to set
+     */
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    /**
+     * @return the login
+     */
+    public String getLogin() {
+        return login;
+    }
+
+    /**
+     * @param login the login to set
+     */
+    public void setLogin(String login) {
+        this.login = login;
+    }
+
+    /**
+     * @return the pat_created
+     */
+    public Date getPat_created() {
+        return pat_created;
+    }
+
+    /**
+     * @param pat_created the pat_created to set
+     */
+    public void setPat_created(Date pat_created) {
+        this.pat_created = pat_created;
+    }
+
+    /**
+     * @return the email
+     */
+    public String getEmail() {
+        return email;
+    }
+
+    /**
+     * @param email the email to set
+     */
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+}

main/plugins/org.talend.signon.util/src/main/java/org/talend/signon/util/TMCRepositoryUtil.java

@@ -13,11 +13,13 @@
 package org.talend.signon.util;
 
 
+import java.util.regex.Pattern;
+
 import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.preferences.ConfigurationScope;
 import org.osgi.service.prefs.BackingStoreException;
 import org.osgi.service.prefs.Preferences;
-
+
 
 public class TMCRepositoryUtil {
     private static Logger LOGGER = Logger.getLogger(TMCRepositoryUtil.class);
@@ -58,6 +60,15 @@ public class TMCRepositoryUtil {
     
     public static final String ORG_TALEND_RECENT_DATA_CENTERR = "org.talend.recent.datacenter";
 
+    public static final String TOKEN_INTROSPECT_URL = "https://iam.%s.cloud.talend.com/oidc/oauth2/introspect"; //$NON-NLS-1$
+
+    public static final int ALLOWED_PAT_MAX_DAYS = 60;
+
+    public static final long ALLOWED_PAT_MAX_MILLI_SECONDS = 1000L * ALLOWED_PAT_MAX_DAYS * 24 * 60 * 60;
+
+    public static final Pattern DATA_CENTER_PATTERN = Pattern.compile("^http[s?]://tmc\\.(.*)(\\.cloud\\.talend\\.com.*)", Pattern.CASE_INSENSITIVE);
+
+    
     public static String getBaseLoginURL(String dataCenter) {
         if (dataCenter == null) {
             dataCenter = TMCRepositoryUtil.getDefaultDataCenter();
@@ -149,4 +160,7 @@ public class TMCRepositoryUtil {
         return REPOSITORY_CLOUD_CUSTOM_ID;
     }
 
+    public static String getTokenIntrospectURL(String dataCenter) {
+        return String.format(TOKEN_INTROSPECT_URL, dataCenter);
+    }
 }

test/plugins/org.talend.core.runtime.test/src/org/talend/core/model/general/ModuleNeededTest.java

@@ -72,9 +72,9 @@ public class ModuleNeededTest {
         Assert.assertEquals(module1.getMavenURIFromConfiguration(), "mvn:org.talend.libraries/test1/6.1.0/exe");
         Assert.assertEquals(module1.getMavenUri(), "mvn:org.talend.libraries/test1/6.1.0/exe");
 
-        ModuleNeeded module2 = new ModuleNeeded("tMysqlInput", "mysql-connector-java-5.1.30-bin.jar", null, false);
+        ModuleNeeded module2 = new ModuleNeeded("tMysqlInput", "mysql-connector-java-5.1.30.jar", null, false);
         Assert.assertEquals(module2.getMavenURIFromConfiguration(), null);
-        Assert.assertEquals(module2.getMavenUri(), "mvn:org.talend.libraries/mysql-connector-java-5.1.30-bin/6.0.0/jar");
+        Assert.assertEquals(module2.getMavenUri(), "mvn:mysql/mysql-connector-java/5.1.30/jar");
 
         // jar not in configuration
         ModuleNeeded module3 = new ModuleNeeded("tMysqlInput", "ModuleNeededTest.jar", null, false);
@@ -161,9 +161,9 @@ public class ModuleNeededTest {
         Assert.assertEquals(moduleValue, moduleNeeded.getModuleName());
 
 
-        moduleValue = "mysql-connector-java-5.1.30-bin.jar";
+        moduleValue = "mysql-connector-java-5.1.30.jar";
         moduleNeeded.setModuleName(moduleValue);
-        Assert.assertEquals("mysql-connector-java-5.1.30-bin.jar", moduleNeeded.getModuleName());
+        Assert.assertEquals("mysql-connector-java-5.1.30.jar", moduleNeeded.getModuleName());
     }
 
 }

test/plugins/org.talend.core.runtime.test/src/org/talend/core/model/utils/ContextParameterUtilsTest.java

@@ -346,16 +346,16 @@ public class ContextParameterUtilsTest {
     @Test
     public void testGetOriginalList() {
         ContextType contextType = createContextType("TEST");
-        ContextParameterType param1 = createContextParameterType("Copy_of_jdbc14_drivers", "mvn:org.talend.libraries/mysql-connector-java-5.1.30-bin/6.0.0");
+        ContextParameterType param1 = createContextParameterType("Copy_of_jdbc14_drivers", "mvn:mysql/mysql-connector-java/5.1.30");
         param1.setType(JavaTypesManager.STRING.getId());
         contextType.getContextParameter().add(param1);
 
         List<String> values = ContextParameterUtils.getOriginalList(contextType, "context.Copy_of_jdbc14_drivers");
         assertTrue(values.size() == 1);
-        assertTrue(values.get(0).equals("mvn:org.talend.libraries/mysql-connector-java-5.1.30-bin/6.0.0"));
+        assertTrue(values.get(0).equals("mvn:mysql/mysql-connector-java/5.1.30"));
 
         contextType = createContextType("TEST");
-        param1 = createContextParameterType("Copy_of_jdbc14_drivers", "mvn:org.talend.libraries/mysql-connector-java-5.1.30-bin/6.0.0;mvn:org.talend.libraries/mysql-connector-java-5.1.40-bin/6.0.0");
+        param1 = createContextParameterType("Copy_of_jdbc14_drivers", "mvn:mysql/mysql-connector-java/5.1.30;mvn:org.talend.libraries/mysql-connector-java-5.1.40-bin/6.0.0");
         param1.setType(JavaTypesManager.STRING.getId());
         contextType.getContextParameter().add(param1);
 
@@ -381,15 +381,15 @@ public class ContextParameterUtilsTest {
         IContextParameter contextParam = contextParam = new JobContextParameter();
         contextParam.setName("jdbc1_drivers");
         contextParam.setType(JavaTypesManager.STRING.getId());//id_List Of Value
-        contextParam.setValue("mvn:org.talend.libraries/mysql-connector-java-5.1.30-bin/6.0.0;mvn:org.talend.libraries/mysql-connector-java-5.1.40-bin/6.0.0");
+        contextParam.setValue("mvn:mysql/mysql-connector-java/5.1.30;mvn:org.talend.libraries/mysql-connector-java-5.1.40-bin/6.0.0");
 //        contextParam.setValue("mvn:org.talend.libraries/mysql-connector-java-5.1.30-bin/6.0.0;mvn:org.talend.libraries/mysql-connector-java-5.1.40-bin/6.0.0");
         testGroup.getContextParameterList().add(contextParam);
 
         contextParam = new JobContextParameter();
         contextParam.setName("jdbc1_drivers2");
         contextParam.setType(JavaTypesManager.STRING.getId());//id_List Of Value
-        contextParam.setValue("mvn:org.talend.libraries/mysql-connector-java-5.1.30-bin/6.0.0");
-        String [] vs2 = {"mvn:org.talend.libraries/mysql-connector-java-5.1.30-bin/6.0.0"};
+        contextParam.setValue("mvn:mysql/mysql-connector-java/5.1.30");
+        String [] vs2 = {"mvn:mysql/mysql-connector-java/5.1.30"};
         contextParam.setValueList(vs2);
         testGroup.getContextParameterList().add(contextParam);
 
@@ -397,14 +397,14 @@ public class ContextParameterUtilsTest {
         l.add("context.jdbc1_drivers");
         List v1 = ContextParameterUtils.parseScriptContextCodeList(l, testGroup, true);
         assertTrue(v1.size() == 2);
-        assertTrue(v1.get(0).equals("mvn:org.talend.libraries/mysql-connector-java-5.1.30-bin/6.0.0"));
+        assertTrue(v1.get(0).equals("mvn:mysql/mysql-connector-java/5.1.30"));
         assertTrue(v1.get(1).equals("mvn:org.talend.libraries/mysql-connector-java-5.1.40-bin/6.0.0"));
 
         l = new ArrayList<String>();
         l.add("context.jdbc1_drivers2");
         List v2 = ContextParameterUtils.parseScriptContextCodeList(l, testGroup, true);
         assertTrue(v2.size() == 1);
-        assertTrue(v2.get(0).equals("mvn:org.talend.libraries/mysql-connector-java-5.1.30-bin/6.0.0"));
+        assertTrue(v2.get(0).equals("mvn:mysql/mysql-connector-java/5.1.30"));
     }
 
     @Test

test/plugins/org.talend.librariesmanager.test/src/org/talend/librariesmanager/model/service/LocalLibraryManagerTest.java

@@ -188,7 +188,7 @@ public class LocalLibraryManagerTest {
     @Test
     public void testRetrieveStringStringIProgressMonitorArray() throws IOException {
         String pathToStore = LibrariesManagerUtils.getLibrariesPath(ECodeLanguage.JAVA);
-        String jarNeeded = "mysql-connector-java-5.1.0-bin.jar";
+        String jarNeeded = "mysql-connector-java-5.1.13.jar";
         String sourcePath = null, targetPath = pathToStore;
         List<File> jarFiles = FilesUtils.getJarFilesFromFolder(getStorageDirectory(), jarNeeded);
         if (jarFiles.size() > 0) {

test/plugins/org.talend.metadata.managment.test/src/org/talend/core/model/metadata/builder/ConvertionHelperTest.java

@@ -182,7 +182,6 @@ public class ConvertionHelperTest {
         ConnectionHelper.setAuthor("test@talend.com", dbProvider); //$NON-NLS-1$
         ConnectionHelper.setDevStatus("DEV", dbProvider); //$NON-NLS-1$
         ConnectionHelper.setVersion("1.1", dbProvider); //$NON-NLS-1$
-        ConnectionHelper.setUniverse("", dbProvider); //$NON-NLS-1$
         return true;
     }
 

test/plugins/test.all.test.suite/conf/global.swtbot.properties

@@ -96,7 +96,7 @@ mysqlodbc.source.tdq.China=odbcmysql
 # -- jdbc.mysql--
 # TDI
 jdbc.mysql.url.tdi.China=jdbc:mysql://192.168.30.200:3306/tis?noDatetimeStringSync=true
-jdbc.mysql.driver.tdi=mysql-connector-java-5.1.0-bin.jar
+jdbc.mysql.driver.tdi=mysql-connector-java-5.1.13.jar
 jdbc.mysql.className.tdi=com.mysql.jdbc.Driver
 jdbc.mysql.userName.tdi=root
 jdbc.mysql.password.tdi.China=root
@@ -414,7 +414,7 @@ reportdb.oracle.password=123456
 mysqljdbc.login=root
 mysqljdbc.password=root
 mysqljdbc.url=jdbc:mysql://192.168.30.44:3306/tbi?noDatetimeStringSync=true
-mysqljdbc.driverpath=mysql-connector-java-5.1.0-bin.jar
+mysqljdbc.driverpath=mysql-connector-java-5.1.13.jar
 
 # -- postgre  --
 # TDQ