TUP-34420 In 8.0 patch, there are some libraries plugin's version can't

update that cause Studio can't apply it.
https://jira.talendforge.org/browse/TUP-34420

main/features/org.talend.commons.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.commons.feature</artifactId>

main/features/org.talend.core.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.core.feature</artifactId>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.fragment.jars.common.feature</artifactId>

main/features/org.talend.help.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.help.feature</artifactId>

main/features/org.talend.libraries.jdbc.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.libraries.jdbc.feature</artifactId>

main/features/org.talend.platform.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.platform.feature</artifactId>

main/features/org.talend.rcp.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.rcp.feature</artifactId>

main/features/org.talend.update.p2.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.update.p2.feature</artifactId>

main/features/org.talend.updates.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.updates.feature</artifactId>

main/features/org.talend.utils.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.utils.feature</artifactId>

main/plugins/org.talend.common.ui.runtime/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.common.ui.runtime</artifactId>

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

@@ -65,7 +65,7 @@ EventUtil.typeNull=NULL
 EventUtil.UnknowDetail=\u30A4\u30D9\u30F3\u30C8\u8A73\u7D30\u306E\u4E0D\u660E\u306A???\u5024:
 EventUtil.UnknowType=\u30A4\u30D9\u30F3\u30C8\u30BF\u30A4\u30D7\u306E\u4E0D\u660E\u306A???\u5024:
 EventUtil.verify=\u78BA\u8A8D
-ExceptionHandler.Parameter.BeNull=ex \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306B\u306Fnull\u3092\u8A2D\u5B9A\u51FA\u6765\u307E\u305B\u3093
+ExceptionHandler.Parameter.BeNull=ex \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306B\u306Fnull\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093
 ExceptionMessageDialog.Cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
 ExceptionMessageDialog.log=\u30ED\u30B0
 ExceptionMessageDialog.No=\u3044\u3044\u3048
@@ -73,12 +73,12 @@ ExceptionMessageDialog.OK=OK
 ExceptionMessageDialog.Yes=\u306F\u3044
 ExportPushButton.ExportButton.Tip=\u3059\u3079\u3066\u306E\u884C\u3092XML\u30D5\u30A1\u30A4\u30EB\u306B\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
 ExportPushButtonForExtendedTable.ErrorMsg.Text=\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-ExtendedTableAddCommand.Add.Label=\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30921\u3064\u4EE5\u4E0A\u8FFD\u52A0
-ExtendedTableCopyCommand.Copy.Label=\u5185\u90E8\u30AF\u30EA\u30FC\u30F3\u30DC\u30FC\u30C9\u306B\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30921\u3064\u4EE5\u4E0A\u30B3\u30D4\u30FC
+ExtendedTableAddCommand.Add.Label=\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30FC\u30921\u3064\u4EE5\u4E0A\u8FFD\u52A0
+ExtendedTableCopyCommand.Copy.Label=\u5185\u90E8\u30AF\u30EA\u30FC\u30F3\u30DC\u30FC\u30C9\u306B\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30FC\u30921\u3064\u4EE5\u4E0A\u30B3\u30D4\u30FC
 ExtendedTableModel.ModifiedObject.Error=\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u4F7F\u7528\u3059\u308B\u524D\u306BModifiedBeanListenable\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3092\u8A2D\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-ExtendedTableMoveCommand.MoveLabel=\u8907\u6570\u306E\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u3092\u4E0A\u4E0B\u306B\u79FB\u52D5
+ExtendedTableMoveCommand.MoveLabel=\u8907\u6570\u306E\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u4E0A\u4E0B\u306B\u79FB\u52D5
 ExtendedTablePasteCommand.Paste.Label=\u5185\u90E8\u30AF\u30EA\u30C3\u30D7\u30DC\u30FC\u30C9\u304B\u3089\u30C7\u30FC\u30BF\u3092\u8CBC\u308A\u4ED8\u3051\u308B
-ExtendedTableRemoveCommand.Romve.Label=\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u3092\u524A\u9664
+ExtendedTableRemoveCommand.Romve.Label=\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u524A\u9664
 ExtendedTableResetDBTypesCommand.ResetDBTypes.Label=DB\u30BF\u30A4\u30D7\u3092\u3059\u3079\u3066\u30EA\u30BB\u30C3\u30C8\u3057\u3066\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u53D6\u5F97
 ImportPushButton.ImportButton.Tip=\u884C\u3092\u3059\u3079\u3066XML\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u306B\u7F6E\u63DB
 ImportPushButtonForExtendedTable.ErrorMsg.Text=\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F

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

@@ -74,6 +74,7 @@ public enum ECoreImage implements IImage {
     CONTEXT_WIZ("/icons1/context_wiz.png"), //$NON-NLS-1$
     CODE_ICON("/icons1/code.png"), //$NON-NLS-1$
     ROUTES_ICON("/icons1/routes_icon.png"), //$NON-NLS-1$
+    ROUTELET_ICON("/icons1/routelet.png"), //$NON-NLS-1$
     ROUTINE_ICON("/icons1/routine.png"), //$NON-NLS-1$
     ROUTINE_EDITOR_ICON("/icons1/routine_editor.png"), //$NON-NLS-1$
     ROUTINESJAR_ICON("/icons1/routinesjar.png"), //$NON-NLS-1$

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.commons.runtime</artifactId>

main/plugins/org.talend.commons.runtime/src/org/talend/commons/i18n/internal/messages_ja.properties

@@ -11,7 +11,7 @@ SybaseResultSet.unknowCloumn=\u7121\u52B9\u306A\u5F15\u6570: \u30AB\u30E9\u30E0\
 AbstractFakeResultSet.unknowCloumn=\u7121\u52B9\u306A\u5F15\u6570: {0}\u304C\u4E0D\u660E\u306A\u30AB\u30E9\u30E0\u540D
 AbstractFakeResultSet.parameterIndexOutOfRange=\u7121\u52B9\u306A\u5F15\u6570: \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9{0}\u304C\u7BC4\u56F2\u5916
 EntryLocation.returnTableName={tableName={0}, \u30AB\u30E9\u30E0\u540D={1}}
-ExceptionHandler.Parameter.BeNull=ex \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306B\u306Fnull\u3092\u8A2D\u5B9A\u51FA\u6765\u307E\u305B\u3093
+ExceptionHandler.Parameter.BeNull=ex \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306B\u306Fnull\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093
 ExtensionImplementationProviders.ExtensionPointError=\u62E1\u5F35\u30DD\u30A4\u30F3\u30C8\u306F1\u3064\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u8A8D\u8A3C\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 ListenableList.IndexSameLength.Error=indexOrigin\u3068indexDestination\u304C\u540C\u3058\u9577\u3055\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 ReflectionPropertyException.Access.ErrorMsg3=\u30AF\u30E9\u30B9'{2}'\u306E\u30D7\u30ED\u30D1\u30C6\u30A3'{1}'\u306E{0}\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F

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

@@ -394,7 +394,7 @@ public class EclipseCommandLine {
                                 + (isValueNull ? "" : value + EclipseCommandLine.NEW_LINE)
                                 + currentProperty.substring(indexOfVmArgs);
                     } else {// vmargs command not found so don't know where to set it to throw Exception
-                        currentProperty = currentProperty.substring(0, indexOfVmArgs) + command + EclipseCommandLine.NEW_LINE
+                        currentProperty = currentProperty + command + EclipseCommandLine.NEW_LINE
                                 + (isValueNull ? "" : value + EclipseCommandLine.NEW_LINE);
 //                        throw new IllegalArgumentException("the property :" + org.eclipse.equinox.app.IApplicationContext.EXIT_DATA_PROPERTY + "must constain " + EclipseCommandLine.CMD_VMARGS);
                     }

main/plugins/org.talend.commons.ui/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.commons.ui</artifactId>

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

@@ -63,16 +63,16 @@ EventUtil.typeNull=NULL
 EventUtil.UnknowDetail=\u30A4\u30D9\u30F3\u30C8\u8A73\u7D30\u306E\u4E0D\u660E\u306A???\u5024:
 EventUtil.UnknowType=\u30A4\u30D9\u30F3\u30C8\u30BF\u30A4\u30D7\u306E\u4E0D\u660E\u306A???\u5024:
 EventUtil.verify=\u78BA\u8A8D
-ExceptionHandler.Parameter.BeNull=ex \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306B\u306Fnull\u3092\u8A2D\u5B9A\u51FA\u6765\u307E\u305B\u3093
+ExceptionHandler.Parameter.BeNull=ex \u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306B\u306Fnull\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u305B\u3093
 ExceptionMessageDialog.log=\u30ED\u30B0
 ExportPushButton.ExportButton.Tip=\u3059\u3079\u3066\u306E\u884C\u3092XML\u30D5\u30A1\u30A4\u30EB\u306B\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
 ExportPushButtonForExtendedTable.ErrorMsg.Text=\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-ExtendedTableAddCommand.Add.Label=\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30921\u3064\u4EE5\u4E0A\u8FFD\u52A0
-ExtendedTableCopyCommand.Copy.Label=\u5185\u90E8\u30AF\u30EA\u30FC\u30F3\u30DC\u30FC\u30C9\u306B\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30921\u3064\u4EE5\u4E0A\u30B3\u30D4\u30FC
+ExtendedTableAddCommand.Add.Label=\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30FC\u30921\u3064\u4EE5\u4E0A\u8FFD\u52A0
+ExtendedTableCopyCommand.Copy.Label=\u5185\u90E8\u30AF\u30EA\u30FC\u30F3\u30DC\u30FC\u30C9\u306B\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30FC\u30921\u3064\u4EE5\u4E0A\u30B3\u30D4\u30FC
 ExtendedTableModel.ModifiedObject.Error=\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u3092\u4F7F\u7528\u3059\u308B\u524D\u306BModifiedBeanListenable\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3092\u8A2D\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-ExtendedTableMoveCommand.MoveLabel=\u8907\u6570\u306E\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u3092\u4E0A\u4E0B\u306B\u79FB\u52D5
+ExtendedTableMoveCommand.MoveLabel=\u8907\u6570\u306E\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u4E0A\u4E0B\u306B\u79FB\u52D5
 ExtendedTablePasteCommand.Paste.Label=\u5185\u90E8\u30AF\u30EA\u30C3\u30D7\u30DC\u30FC\u30C9\u304B\u3089\u30C7\u30FC\u30BF\u3092\u8CBC\u308A\u4ED8\u3051\u308B
-ExtendedTableRemoveCommand.Romve.Label=\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u3092\u524A\u9664
+ExtendedTableRemoveCommand.Romve.Label=\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u524A\u9664
 ExtendedTableResetDBTypesCommand.ResetDBTypes.Label=DB\u30BF\u30A4\u30D7\u3092\u3059\u3079\u3066\u30EA\u30BB\u30C3\u30C8\u3057\u3066\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u53D6\u5F97
 ExtendedTableCaseCommand.case.Label=\u9078\u629E\u3055\u308C\u305FDB\u30AB\u30E9\u30E0\u3092\u5927\u6587\u5B57/\u5C0F\u6587\u5B57\u306B\u5909\u66F4
 ExtendedTableQuoteCommand.Quote.Label=\u9078\u629E\u3055\u308C\u305FDB\u30AB\u30E9\u30E0\u3092\u56F2\u3080

main/plugins/org.talend.core.repository/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.core.repository</artifactId>

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

@@ -72,7 +72,7 @@ PropertiesWizardPage.Version.Major=M
 PropertiesWizardPage.Version.Minor=m
 PropertiesWizardPage.ImageSizeError=S\u00E9lectionnez une image de taille 32*32.
 EAuthenticationMethod.anonymousAuth=Authentification anonyme
-EAuthenticationMethod.simpleAuth=Authentification simple
+EAuthenticationMethod.simpleAuth=Authentification basique
 AdvancedSocketFactory.failedInitial=Erreur : impossible d'initialiser :
 LDAPCATruster.failedCreateCert=Impossible de cr\u00E9er le stockage du certificat
 LDAPCATruster.failedCreateTmp=Impossible de cr\u00E9er le

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

@@ -75,10 +75,10 @@ EAuthenticationMethod.anonymousAuth=\u533F\u540D\u8A8D\u8A3C
 EAuthenticationMethod.simpleAuth=\u5358\u7D14\u306A\u8A8D\u8A3C
 AdvancedSocketFactory.failedInitial=\u30A8\u30E9\u30FC : \u521D\u671F\u5316\u306B\u5931\u6557\u3057\u307E\u3057\u305F :
 LDAPCATruster.failedCreateCert=\u8A3C\u660E\u66F8\u30B9\u30C8\u30A2\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
-LDAPCATruster.failedCreateTmp=tmp\u4FE1\u983C\u30B9\u30C8\u30A2\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
+LDAPCATruster.failedCreateTmp=\u4E00\u6642\u30C8\u30E9\u30B9\u30C8\u30B9\u30C8\u30A2\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
 LDAPCATruster.failedInitialTrust=\u521D\u671F\u4FE1\u983C\u30DE\u30CD\u30FC\u30B8\u30E3\u30FC\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
 LDAPCATruster.failedLoadCert=\u8A3C\u660E\u66F8\u30B9\u30C8\u30A2\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-LDAPCATruster.failedSaveTrust=\u4FE1\u983C\u30B9\u30C8\u30A2\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
+LDAPCATruster.failedSaveTrust=\u30C8\u30E9\u30B9\u30C8\u30B9\u30C8\u30A2\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
 LDAPCATruster.locationInvalid=\u8A3C\u660E\u66F8\u30B9\u30C8\u30A2\u30D5\u30A1\u30A4\u30EB\u306E\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3\u304C\u7121\u52B9\u3067\u3059:
 LDAPCATruster.noCertificate=\n\u30AD\u30FC\u30C4\u30FC\u30EB\u30B3\u30DE\u30F3\u30C9\u3092\u4F7F\u3063\u3066\u3001\u30B5\u30FC\u30D0\u30FC\u8A3C\u660E\u66F8\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 LDAPCATruster.sslError1=SSL\u30A8\u30E9\u30FC\uFF1A\u30B5\u30FC\u30D0\u30FC\u8A3C\u660E\u66F8\u3092\u691C\u8A3C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002

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

@@ -59,6 +59,8 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.navigator.CommonNavigator;
+import org.eclipse.ui.navigator.CommonViewer;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
@@ -133,6 +135,8 @@ import org.talend.core.model.repository.RepositoryContentManager;
 import org.talend.core.model.repository.RepositoryObject;
 import org.talend.core.model.repository.RepositoryViewObject;
 import org.talend.core.model.routines.CodesJarInfo;
+import org.talend.core.model.routines.RoutinesUtil;
+import org.talend.core.model.utils.RepositoryManagerHelper;
 import org.talend.core.repository.CoreRepositoryPlugin;
 import org.talend.core.repository.constants.Constant;
 import org.talend.core.repository.constants.FileConstants;
@@ -163,6 +167,7 @@ import org.talend.repository.RepositoryWorkUnit;
 import org.talend.repository.documentation.ERepositoryActionName;
 import org.talend.repository.model.IProxyRepositoryFactory;
 import org.talend.repository.model.RepositoryConstants;
+import org.talend.repository.ui.views.IRepositoryView;
 import org.talend.utils.io.FilesUtils;
 
 import orgomg.cwm.objectmodel.core.ModelElement;
@@ -2495,8 +2500,8 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
 
             };
             job.setUser(false);
-            job.setPriority(Job.LONG);
             job.schedule();
+            RoutinesUtil.setSyncCodesjob(job);
         }
     }
 
@@ -2566,6 +2571,21 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 root.setEnableDisposed(true);
                 root.dispose();
             }
+            
+            /*Dispose the tree nodes after log off project*/
+            Display.getDefault().syncExec(new Runnable() {
+
+                @Override
+                public void run() {
+                    IRepositoryView repositoryView = RepositoryManagerHelper.findRepositoryView();
+                    if (repositoryView instanceof CommonNavigator) {
+                        ProjectRepositoryNode.getInstance().cleanup();
+                        CommonViewer commonViewer = ((CommonNavigator) repositoryView).getCommonViewer();
+                        Object input = commonViewer.getInput();
+                        commonViewer.setInput(input);
+                    }
+                }
+            });
         }
         IRunProcessService runProcessService = getRunProcessService();
         if (runProcessService != null) {

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/recyclebin/RecycleBinManager.java

@@ -108,46 +108,48 @@ public class RecycleBinManager {
     }
 
     public List<IRepositoryViewObject> getDeletedObjects(Project project) {
-        loadRecycleBin(project.getEmfProject(), true);
         List<IRepositoryViewObject> deletedObjects = new ArrayList<IRepositoryViewObject>();
-        final EList<TalendItem> deletedItems = projectRecyclebins.get(project.getTechnicalLabel()).getDeletedItems();
-        List<TalendItem> notDeletedItems = new ArrayList<TalendItem>();
-        List<TalendItem> dup_deletedItems = new ArrayList<>(deletedItems);
-        for (TalendItem deletedItem : dup_deletedItems) {
-            try {
-                final ERepositoryObjectType type = ERepositoryObjectType.getType(deletedItem.getType());
-                // ignore the generated doc in recycle bin
-                if (type != null && (type.equals(ERepositoryObjectType.JOB_DOC) || type.equals(ERepositoryObjectType.JOBLET_DOC)
-                        || type.equals(ERepositoryObjectType.valueOf("ROUTE_DOC")))) { //$NON-NLS-1$
-                    continue;
-                }
-                IRepositoryViewObject object = ProxyRepositoryFactory.getInstance().getLastVersion(project, deletedItem.getId(),
-                        deletedItem.getPath(), type);
-                if (object == null) {
-                    object = ProxyRepositoryFactory.getInstance().getLastVersion(project, deletedItem.getId());
-                }
-                if (object != null) {
-                    Item item = object.getProperty().getItem();
-                    boolean hasSubItem = false;
-                    if (item instanceof ConnectionItem) {
-                        hasSubItem = ProjectRepositoryNode.getInstance().hasDeletedSubItem((ConnectionItem) item);
+        if (project != null) {
+            loadRecycleBin(project.getEmfProject(), true);
+            final EList<TalendItem> deletedItems = projectRecyclebins.get(project.getTechnicalLabel()).getDeletedItems();
+            List<TalendItem> notDeletedItems = new ArrayList<TalendItem>();
+            List<TalendItem> dup_deletedItems = new ArrayList<>(deletedItems);
+            for (TalendItem deletedItem : dup_deletedItems) {
+                try {
+                    final ERepositoryObjectType type = ERepositoryObjectType.getType(deletedItem.getType());
+                    // ignore the generated doc in recycle bin
+                    if (type != null && (type.equals(ERepositoryObjectType.JOB_DOC) || type.equals(ERepositoryObjectType.JOBLET_DOC)
+                            || type.equals(ERepositoryObjectType.valueOf("ROUTE_DOC")))) { //$NON-NLS-1$
+                        continue;
                     }
-                    if (object.isDeleted() || hasSubItem) {
-                        deletedObjects.add(object);
+                    IRepositoryViewObject object = ProxyRepositoryFactory.getInstance().getLastVersion(project, deletedItem.getId(),
+                            deletedItem.getPath(), type);
+                    if (object == null) {
+                        object = ProxyRepositoryFactory.getInstance().getLastVersion(project, deletedItem.getId());
+                    }
+                    if (object != null) {
+                        Item item = object.getProperty().getItem();
+                        boolean hasSubItem = false;
+                        if (item instanceof ConnectionItem) {
+                            hasSubItem = ProjectRepositoryNode.getInstance().hasDeletedSubItem((ConnectionItem) item);
+                        }
+                        if (object.isDeleted() || hasSubItem) {
+                            deletedObjects.add(object);
+                        } else {
+                            // need remove it.
+                            notDeletedItems.add(deletedItem);
+                        }
                     } else {
                         // need remove it.
                         notDeletedItems.add(deletedItem);
                     }
-                } else {
-                    // need remove it.
-                    notDeletedItems.add(deletedItem);
+                } catch (PersistenceException e) {
+                    ExceptionHandler.process(e);
                 }
-            } catch (PersistenceException e) {
-                ExceptionHandler.process(e);
             }
-        }
-        // clean
-        deletedItems.removeAll(notDeletedItems);
+            // clean
+            deletedItems.removeAll(notDeletedItems);
+        }       
         return deletedObjects;
     }
 

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/services/IGitInfoService.java

@@ -15,6 +15,7 @@ package org.talend.core.repository.services;
 import java.util.Map;
 
 import org.eclipse.core.runtime.IPath;
+import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
 import org.talend.core.model.general.Project;
 import org.talend.core.model.properties.Property;
@@ -50,5 +51,13 @@ public interface IGitInfoService extends IService {
      */
     public Map<String, String> getGitInfo(Property property) throws Exception;
 
+    public boolean isPushedToRemote(Property property) throws Exception;
+
+    public static IGitInfoService get() {
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(IGitInfoService.class)) {
+            return GlobalServiceRegister.getDefault().getService(IGitInfoService.class);
+        }
+        return null;
+    }
 
 }

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

@@ -14,10 +14,13 @@ package org.talend.core.repository.utils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 
 import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.ui.internal.navigator.NavigatorContentServiceContentProvider;
+import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.runtime.service.ITaCoKitService;
 import org.talend.commons.ui.runtime.image.ECoreImage;
 import org.talend.core.model.metadata.builder.connection.Connection;
 import org.talend.core.model.metadata.builder.connection.MetadataColumn;
@@ -139,4 +142,17 @@ public class RepositoryNodeManager {
         return new Object[0];
     }
 
+    public static boolean isTacokit(ERepositoryObjectType repoType) {
+        if (repoType == null) {
+            return false;
+        }
+        boolean isTacokit = false;
+        try {
+            isTacokit = Optional.ofNullable(ITaCoKitService.getInstance()).map(s -> s.isTaCoKitType(repoType)).orElse(false);
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+        return isTacokit;
+    }
+
 }

main/plugins/org.talend.core.runtime/mappings/mapping_AmazonAurora.xml

@@ -1,280 +1,304 @@
-<?xml version="1.0"?>
-<mapping>
-	<dbms product="AMAZON_AURORA" id="amazon_aurora_id" label="Mapping AMAZON_AURORA"
-		default="true">
-		<dbTypes>
-			<dbType type="BIGINT" ignorePre="true"/>
-			<dbType type="BIGINT UNSIGNED" ignoreLen="true" ignorePre="true" />
-			<dbType type="BINARY" ignorePre="true"/>
-			<dbType type="BIT" ignorePre="true" />
-			<dbType type="BLOB" ignoreLen="true" ignorePre="true" />
-			<dbType type="CHAR" defaultLength="200" ignorePre="true"/>
-			<dbType type="DATE" ignoreLen="true" ignorePre="true" />
-			<dbType type="DATETIME" ignoreLen="true" ignorePre="true" />
-			<dbType type="DECIMAL" defaultLength="20" defaultPrecision="10" preBeforelen="false"/>
-			<dbType type="DOUBLE" defaultLength="20" defaultPrecision="10"/>
-			<dbType type="DOUBLE UNSIGNED" ignoreLen="true" ignorePre="true" />
-			<dbType type="ENUM" ignoreLen="true" ignorePre="true" />
-			<dbType type="FLOAT" defaultPrecision="2"/>
-			<dbType type="FLOAT UNSIGNED" ignoreLen="true" ignorePre="true" />
-			<dbType type="GEOMETRY" ignoreLen="true" ignorePre="true" />
-			<dbType type="GEOMETRYCOLLECTION" ignoreLen="true" ignorePre="true" />
-			<dbType type="INT" ignorePre="true" />
-			<dbType type="INT UNSIGNED" ignoreLen="true" ignorePre="true" />
-			<dbType type="LINESTRING" ignoreLen="true" ignorePre="true" />
-			<dbType type="LONGTEXT" ignoreLen="true" ignorePre="true" />
-			<dbType type="LONGBLOB" ignoreLen="true" ignorePre="true"/>
-			<dbType type="MEDIUMBLOB" ignoreLen="true" ignorePre="true" />
-			<dbType type="MEDIUMINT" ignorePre="true" />
-			<dbType type="MEDIUMINT UNSIGNED" ignoreLen="true" ignorePre="true" />
-			<dbType type="MEDIUMTEXT" ignoreLen="true" ignorePre="true" />
-			<dbType type="MULTILINESTRING" ignoreLen="true" ignorePre="true" />
-			<dbType type="MULTIPOINT" ignoreLen="true" ignorePre="true" />
-			<dbType type="MULTIPOLYGON" ignoreLen="true" ignorePre="true" />
-			<dbType type="POINT" ignoreLen="true" ignorePre="true" />
-			<dbType type="POLYGON" ignoreLen="true" ignorePre="true" />
-			<dbType type="SMALLINT" ignorePre="true" />
-			<dbType type="SMALLINT UNSIGNED" ignoreLen="true" ignorePre="true" />
-			<dbType type="SET" ignoreLen="true" ignorePre="true" />
-			<dbType type="TEXT" ignoreLen="true" ignorePre="true" />
-			<dbType type="TIME" ignoreLen="true" ignorePre="true" />
-			<dbType type="TIMESTAMP" ignoreLen="true" ignorePre="true" />
-			<dbType type="TINYBLOB" ignoreLen="true" ignorePre="true" />
-			<dbType type="TINYINT" ignorePre="true" />
-			<dbType type="TINYINT UNSIGNED" ignoreLen="true" ignorePre="true" />
-			<dbType type="TINYTEXT" ignoreLen="true" ignorePre="true" />
-			<dbType type="VARBINARY" ignorePre="true" />
-			<dbType type="VARCHAR" default="true" defaultLength="100" ignorePre="true"/>
-			<dbType type="YEAR" ignorePre="true"/>
-		</dbTypes>
-
-		<language name="java">
-			<talendToDbTypes><!-- Adviced mappings  -->
-				<talendType type="id_List"/>
-				<talendType type="id_Boolean">	
-					<dbType type="BIT" default="true" />				
-				</talendType>
-				<talendType type="id_Byte">
-					<dbType type="TINYINT" default="true" />
-					<dbType type="BIGINT" />
-					<dbType type="INT" />
-					<dbType type="MEDIUMINT" />
-					<dbType type="SMALLINT" />				
-				</talendType>
-				<talendType type="id_byte[]">
-				</talendType>
-				<talendType type="id_Character">
-					<dbType type="CHAR" default="true" />
-					<dbType type="VARCHAR"/>
-				</talendType>
-				<talendType type="id_Date">
-					<dbType type="DATE" />
-					<dbType type="DATETIME" default="true" />	
-					<dbType type="TIME" />
-					<dbType type="YEAR" />
-					<dbType type="TIMESTAMP" />				
-				</talendType>
-				<talendType type="id_BigDecimal">
-					<dbType type="DECIMAL" default="true" />
-					<dbType type="FLOAT"/>
-					<dbType type="DOUBLE" />				
-				</talendType>
-				<talendType type="id_Double">
-					<dbType type="DOUBLE" default="true" />
-					<dbType type="FLOAT"/>
-					<dbType type="DECIMAL" />				
-				</talendType>
-				<talendType type="id_Float">
-					<dbType type="FLOAT" default="true" />
-					<dbType type="DOUBLE"/>
-					<dbType type="DECIMAL" />
-				</talendType>
-				<talendType type="id_Integer">
-					<dbType type="INT" default="true" />
-					<dbType type="BIGINT" />
-				</talendType>
-				<talendType type="id_Long">
-					<dbType type="BIGINT" default="true" />		
-				</talendType>
-				<talendType type="id_Object">
-					<dbType type="BLOB" default="true"/>
-					<dbType type="ENUM" />
-					<dbType type="GEOMETRY" />
-					<dbType type="GEOMETRYCOLLECTION" />
-					<dbType type="MEDIUMINT" />
-					<dbType type="LONGBLOB" />
-					<dbType type="MEDIUMBLOB" />
-					<dbType type="MULTIPOINT" />
-					<dbType type="MULTIPOLYGON" />
-					<dbType type="POINT" />
-					<dbType type="POLYGON" />
-					<dbType type="SET" />
-					<dbType type="TINYBLOB" />
-				</talendType>
-				<talendType type="id_Short">
-					<dbType type="SMALLINT" default="true" />
-					<dbType type="INT" />
-					<dbType type="BIGINT"/>
-					<dbType type="MEDIUMINT" />
-				</talendType>
-				<talendType type="id_String">
-					<dbType type="VARCHAR" default="true" />
-					<dbType type="LINESTRING" />
-					<dbType type="LONGTEXT"/>
-					<dbType type="MEDIUMTEXT" />
-					<dbType type="MULTILINESTRING" />		
-					<dbType type="TEXT" />
-					<dbType type="TINYTEXT" />
-				</talendType>
-			</talendToDbTypes>
-			<dbToTalendTypes>
-				<dbType type="BIGINT">
-					<talendType type="id_Long" default="true" />
-				</dbType>
-				<dbType type="BINARY">
-					<talendType type="id_Boolean" default="true" />
-				</dbType>
-				<dbType type="BIT">
-					<talendType type="id_Boolean" default="true" />
-				</dbType>
-				<dbType type="BLOB">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="CHAR">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="DATE">
-					<talendType type="id_Date" default="true" />
-				</dbType>
-				<dbType type="DATETIME">
-					<talendType type="id_Date" default="true" />
-				</dbType>
-				<dbType type="DECIMAL">
-					<talendType type="id_Float"/>
-					<talendType type="id_Double"/>
-					<talendType type="id_BigDecimal" default="true"/>
-				</dbType>
-				<dbType type="DOUBLE">
-					<talendType type="id_Double" default="true" />
-					<talendType type="id_BigDecimal"/>
-				</dbType>
-				<dbType type="ENUM">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="FLOAT">
-					<talendType type="id_Float" default="true" />
-					<talendType type="id_Double"/>
-					<talendType type="id_BigDecimal"/>
-				</dbType>
-				<dbType type="GEOMETRY">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="GEOMETRYCOLLECTION">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="INT">
-					<talendType type="id_Integer" default="true" />
-					<talendType type="id_Long"/>
-				</dbType>
-				<dbType type="LINESTRING">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="LONGTEXT">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="LONGBLOB">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="MEDIUMBLOB">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="MEDIUMINT">
-					<talendType type="id_Integer" default="true" />
-					<talendType type="id_Long"/>
-				</dbType>
-				<dbType type="MEDIUMTEXT">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="MULTILINESTRING">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="MULTIPOINT">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="MULTIPOLYGON">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="POINT">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="POLYGON">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="SMALLINT">
-					<talendType type="id_Short" default="true" />
-					<talendType type="id_Long"/>
-					<talendType type="id_Integer"/>
-				</dbType>
-				<dbType type="SET">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="TEXT">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="TIME">
-					<talendType type="id_Date" default="true" />
-				</dbType>
-				<dbType type="TIMESTAMP">
-					<talendType type="id_Date" default="true" />
-				</dbType>
-				<dbType type="TINYBLOB">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="TINYINT">
-					<talendType type="id_Byte" default="true" />
-					<talendType type="id_Integer"/>
-					<talendType type="id_Long"/>
-					<talendType type="id_Short"/>
-				</dbType>
-				<dbType type="TINYTEXT">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="VARBINARY">
-				</dbType>
-				<dbType type="VARCHAR">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="YEAR">
-					<talendType type="id_Date" default="true" />
-				</dbType>		
-				<dbType type="BIGINT UNSIGNED" >
-				</dbType>
-				<dbType type="DOUBLE UNSIGNED" >		
-					<talendType type="id_Double" default="true" />
-					<talendType type="id_BigDecimal"/>
-				</dbType>
-				<dbType type="FLOAT UNSIGNED" >
-					<talendType type="id_Double" default="true" />
-					<talendType type="id_BigDecimal"/>
-				</dbType>
-				<dbType type="INT UNSIGNED" >
-					<talendType type="id_Long" default="true" />
-				</dbType>
-				<dbType type="MEDIUMINT UNSIGNED" >
-					<talendType type="id_Integer" default="true" />
-					<talendType type="id_Long" />
-				</dbType>
-				<dbType type="SMALLINT UNSIGNED" >
-					<talendType type="id_Integer" default="true" />
-					<talendType type="id_Long" />
-				</dbType>
-				<dbType type="TINYINT UNSIGNED" >
-					<talendType type="id_Short" default="true" />
-					<talendType type="id_Integer" />
-					<talendType type="id_Long" />
-				</dbType>
-			</dbToTalendTypes>
-		</language>
-	</dbms>
-
-</mapping>
+<?xml version="1.0"?>
+<mapping>
+	<dbms product="AMAZON_AURORA" id="amazon_aurora_id" label="Mapping AMAZON_AURORA"
+		default="true">
+		<dbTypes>
+			<dbType type="BIGINT" ignorePre="true"/>
+			<dbType type="BIGINT UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="BINARY" ignorePre="true"/>
+			<dbType type="BIT" ignorePre="true" />
+			<dbType type="BLOB" ignoreLen="true" ignorePre="true" />
+			<dbType type="CHAR" defaultLength="200" ignorePre="true"/>
+			<dbType type="DATE" ignoreLen="true" ignorePre="true" />
+			<dbType type="DATETIME" ignoreLen="true" ignorePre="true" />
+			<dbType type="DECIMAL" defaultLength="20" defaultPrecision="10" preBeforelen="false"/>
+			<dbType type="DOUBLE" defaultLength="20" defaultPrecision="10"/>
+			<dbType type="DOUBLE UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="ENUM" ignoreLen="true" ignorePre="true" />
+			<dbType type="FLOAT" defaultPrecision="2"/>
+			<dbType type="FLOAT UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="GEOMETRY" ignoreLen="true" ignorePre="true" />
+			<dbType type="GEOMETRYCOLLECTION" ignoreLen="true" ignorePre="true" />
+			<dbType type="INT" ignorePre="true" />
+			<dbType type="INT UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="INTEGER" ignorePre="true" />
+			<dbType type="INTEGER UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="LINESTRING" ignoreLen="true" ignorePre="true" />
+			<dbType type="LONGTEXT" ignoreLen="true" ignorePre="true" />
+			<dbType type="LONGBLOB" ignoreLen="true" ignorePre="true"/>
+			<dbType type="MEDIUMBLOB" ignoreLen="true" ignorePre="true" />
+			<dbType type="MEDIUMINT" ignorePre="true" />
+			<dbType type="MEDIUMINT UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="MEDIUMTEXT" ignoreLen="true" ignorePre="true" />
+			<dbType type="MULTILINESTRING" ignoreLen="true" ignorePre="true" />
+			<dbType type="MULTIPOINT" ignoreLen="true" ignorePre="true" />
+			<dbType type="MULTIPOLYGON" ignoreLen="true" ignorePre="true" />
+			<dbType type="POINT" ignoreLen="true" ignorePre="true" />
+			<dbType type="POLYGON" ignoreLen="true" ignorePre="true" />
+			<dbType type="SMALLINT" ignorePre="true" />
+			<dbType type="SMALLINT UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="SET" ignoreLen="true" ignorePre="true" />
+			<dbType type="TEXT" ignoreLen="true" ignorePre="true" />
+			<dbType type="TIME" ignoreLen="true" ignorePre="true" />
+			<dbType type="TIMESTAMP" ignoreLen="true" ignorePre="false" />
+			<dbType type="TINYBLOB" ignoreLen="true" ignorePre="true" />
+			<dbType type="TINYINT" ignorePre="true" />
+			<dbType type="TINYINT UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="TINYTEXT" ignoreLen="true" ignorePre="true" />
+			<dbType type="VARBINARY" ignorePre="true" />
+			<dbType type="VARCHAR" default="true" defaultLength="100" ignorePre="true"/>
+			<dbType type="YEAR" ignorePre="true"/>
+		</dbTypes>
+
+		<language name="java">
+			<talendToDbTypes><!-- Adviced mappings  -->
+				<talendType type="id_List"/>
+				<talendType type="id_Boolean">	
+					<dbType type="BIT" default="true" />				
+				</talendType>
+				<talendType type="id_Byte">
+					<dbType type="TINYINT" default="true" />
+					<dbType type="BIGINT" />
+					<dbType type="INT" />
+					<dbType type="MEDIUMINT" />
+					<dbType type="SMALLINT" />				
+				</talendType>
+				<talendType type="id_byte[]">
+				    <dbType type="VARBINARY" default="true" />
+				    <dbType type="BINARY" />
+				    <dbType type="BIT" />
+				    <dbType type="BLOB" />
+				    <dbType type="LONGBLOB" />
+				    <dbType type="MEDIUMBLOB" />
+				    <dbType type="TINYBLOB" />
+				</talendType>
+				<talendType type="id_Character">
+					<dbType type="CHAR" default="true" />
+					<dbType type="VARCHAR"/>
+				</talendType>
+				<talendType type="id_Date">
+					<dbType type="DATE" />
+					<dbType type="DATETIME" default="true" />	
+					<dbType type="TIME" />
+					<dbType type="YEAR" />
+					<dbType type="TIMESTAMP" />				
+				</talendType>
+				<talendType type="id_BigDecimal">
+					<dbType type="DECIMAL" default="true" />
+					<dbType type="FLOAT"/>
+					<dbType type="DOUBLE" />				
+				</talendType>
+				<talendType type="id_Double">
+					<dbType type="DOUBLE" default="true" />
+					<dbType type="FLOAT"/>
+					<dbType type="DECIMAL" />				
+				</talendType>
+				<talendType type="id_Float">
+					<dbType type="FLOAT" default="true" />
+					<dbType type="DOUBLE"/>
+					<dbType type="DECIMAL" />
+				</talendType>
+				<talendType type="id_Integer">
+					<dbType type="INT" default="true" />
+					<dbType type="BIGINT" />
+				</talendType>
+				<talendType type="id_Long">
+					<dbType type="BIGINT" default="true" />		
+				</talendType>
+				<talendType type="id_Object">
+					<dbType type="BLOB" default="true"/>
+					<dbType type="ENUM" />
+					<dbType type="GEOMETRY" />
+					<dbType type="GEOMETRYCOLLECTION" />
+					<dbType type="MEDIUMINT" />
+					<dbType type="LONGBLOB" />
+					<dbType type="MEDIUMBLOB" />
+					<dbType type="MULTIPOINT" />
+					<dbType type="MULTIPOLYGON" />
+					<dbType type="POINT" />
+					<dbType type="POLYGON" />
+					<dbType type="SET" />
+					<dbType type="TINYBLOB" />
+				</talendType>
+				<talendType type="id_Short">
+					<dbType type="SMALLINT" default="true" />
+					<dbType type="INT" />
+					<dbType type="BIGINT"/>
+					<dbType type="MEDIUMINT" />
+				</talendType>
+				<talendType type="id_String">
+					<dbType type="VARCHAR" default="true" />
+					<dbType type="LINESTRING" />
+					<dbType type="LONGTEXT"/>
+					<dbType type="MEDIUMTEXT" />
+					<dbType type="MULTILINESTRING" />		
+					<dbType type="TEXT" />
+					<dbType type="TINYTEXT" />
+					<dbType type="CHAR" />
+				</talendType>
+			</talendToDbTypes>
+			<dbToTalendTypes>
+				<dbType type="BIGINT">
+					<talendType type="id_Long" default="true" />
+				</dbType>
+				<dbType type="BINARY">
+					<talendType type="id_byte[]" />
+					<talendType type="id_Boolean" default="true" />
+				</dbType>
+				<dbType type="BIT">
+					<talendType type="id_byte[]" />
+					<talendType type="id_Boolean" default="true" />
+				</dbType>
+				<dbType type="BLOB">
+					<talendType type="id_byte[]" default="true" />
+					<talendType type="id_Object" />
+				</dbType>
+				<dbType type="CHAR">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="DATE">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="DATETIME">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="DECIMAL">
+					<talendType type="id_Float"/>
+					<talendType type="id_Double"/>
+					<talendType type="id_BigDecimal" default="true"/>
+				</dbType>
+				<dbType type="DOUBLE">
+					<talendType type="id_Double" default="true" />
+					<talendType type="id_BigDecimal"/>
+				</dbType>
+				<dbType type="ENUM">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="FLOAT">
+					<talendType type="id_Float" default="true" />
+					<talendType type="id_Double"/>
+					<talendType type="id_BigDecimal"/>
+				</dbType>
+				<dbType type="GEOMETRY">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="GEOMETRYCOLLECTION">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="INT">
+					<talendType type="id_Integer" default="true" />
+					<talendType type="id_Long"/>
+				</dbType>
+				<dbType type="INTEGER">
+					<talendType type="id_Integer" default="true" />
+					<talendType type="id_Long"/>
+				</dbType>
+				<dbType type="LINESTRING">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="LONGTEXT">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="LONGBLOB">
+					<talendType type="id_byte[]" default="true" />
+					<talendType type="id_Object" />
+				</dbType>
+				<dbType type="MEDIUMBLOB">
+					<talendType type="id_byte[]" default="true" />
+					<talendType type="id_Object" />
+				</dbType>
+				<dbType type="MEDIUMINT">
+					<talendType type="id_Integer" default="true" />
+					<talendType type="id_Long"/>
+				</dbType>
+				<dbType type="MEDIUMTEXT">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="MULTILINESTRING">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="MULTIPOINT">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="MULTIPOLYGON">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="POINT">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="POLYGON">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="SMALLINT">
+					<talendType type="id_Short" default="true" />
+					<talendType type="id_Long"/>
+					<talendType type="id_Integer"/>
+				</dbType>
+				<dbType type="SET">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="TEXT">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="TIME">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="TIMESTAMP">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="TINYBLOB">
+					<talendType type="id_byte[]" default="true" />
+					<talendType type="id_Object" />
+				</dbType>
+				<dbType type="TINYINT">
+					<talendType type="id_Byte" default="true" />
+					<talendType type="id_Integer"/>
+					<talendType type="id_Long"/>
+					<talendType type="id_Short"/>
+				</dbType>
+				<dbType type="TINYTEXT">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="VARBINARY">
+				    <talendType type="id_byte[]" default="true" />
+				</dbType>
+				<dbType type="VARCHAR">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="YEAR">
+					<talendType type="id_Date" default="true" />
+				</dbType>		
+				<dbType type="BIGINT UNSIGNED" >
+				</dbType>
+				<dbType type="DOUBLE UNSIGNED" >		
+					<talendType type="id_Double" default="true" />
+					<talendType type="id_BigDecimal"/>
+				</dbType>
+				<dbType type="FLOAT UNSIGNED" >
+					<talendType type="id_Double" default="true" />
+					<talendType type="id_BigDecimal"/>
+				</dbType>
+				<dbType type="INT UNSIGNED" >
+					<talendType type="id_Long" default="true" />
+				</dbType>
+				<dbType type="INTEGER UNSIGNED" >
+					<talendType type="id_Long" default="true" />
+				</dbType>
+				<dbType type="MEDIUMINT UNSIGNED" >
+					<talendType type="id_Integer" default="true" />
+					<talendType type="id_Long" />
+				</dbType>
+				<dbType type="SMALLINT UNSIGNED" >
+					<talendType type="id_Integer" default="true" />
+					<talendType type="id_Long" />
+				</dbType>
+				<dbType type="TINYINT UNSIGNED" >
+					<talendType type="id_Short" default="true" />
+					<talendType type="id_Integer" />
+					<talendType type="id_Long" />
+				</dbType>
+			</dbToTalendTypes>
+		</language>
+	</dbms>
+
+</mapping>

main/plugins/org.talend.core.runtime/mappings/mapping_Mysql.xml

@@ -22,7 +22,7 @@
 			<dbType type="INT" ignorePre="true" />
 			<dbType type="INT UNSIGNED" ignoreLen="true" ignorePre="true" />
 			<dbType type="INTEGER" ignorePre="true" />
-            <dbType type="INTEGER UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="INTEGER UNSIGNED" ignoreLen="true" ignorePre="true" />
 			<dbType type="LINESTRING" ignoreLen="true" ignorePre="true" />
 			<dbType type="LONGTEXT" ignoreLen="true" ignorePre="true" />
 			<dbType type="LONGBLOB" ignoreLen="true" ignorePre="true"/>
@@ -190,9 +190,9 @@
 					<talendType type="id_Long"/>
 				</dbType>
 				<dbType type="INTEGER">
-                    <talendType type="id_Integer" default="true" />
-                    <talendType type="id_Long"/>
-                </dbType>
+					<talendType type="id_Integer" default="true" />
+					<talendType type="id_Long"/>
+				</dbType>
 				<dbType type="LINESTRING">
 					<talendType type="id_String" default="true" />
 				</dbType>
@@ -282,8 +282,8 @@
 					<talendType type="id_Long" default="true" />
 				</dbType>
 				<dbType type="INTEGER UNSIGNED" >
-                    <talendType type="id_Long" default="true" />
-                </dbType>
+					<talendType type="id_Long" default="true" />
+				</dbType>
 				<dbType type="MEDIUMINT UNSIGNED" >
 					<talendType type="id_Integer" default="true" />
 					<talendType type="id_Long" />

main/plugins/org.talend.core.runtime/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.core.runtime</artifactId>

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

@@ -77,6 +77,8 @@ public interface ILibraryManagerService extends IService {
     public void saveMavenIndex(Map<String, String> libsToMavenUri, IProgressMonitor... monitorWrap);
 
     public void createModulesIndexFromComponentAndExtension(IProgressMonitor... monitorWrap);
+    
+    public Map<String,String> buildModulesIndexFromComponentAndExtension(IProgressMonitor... monitorWrap);
 
     /**
      * DOC ycbai Comment method "retrieve".

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

@@ -75,12 +75,18 @@ public enum EDatabaseTypeName {
 
     JAVADB(
             "JavaDB", "JavaDB", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    INGRES(
+            "Ingres", "Ingres", Boolean.FALSE, "INGRES", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), // "INGRES"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    INTERBASE(
+            "Interbase", "Interbase", Boolean.FALSE, "INTERBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "INTERBASE"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     SQLITE(
             "SQLite", "SQLite", Boolean.FALSE, "SQLITE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "SQLITE"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     FIREBIRD(
             "FireBird", "FireBird", Boolean.FALSE, "FIREBIRD", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "FIREBIRD"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     INFORMIX(
             "Informix", "Informix", Boolean.TRUE, "INFORMIX", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "INFORMIX"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    VECTORWISE(
+            "VectorWise", "VectorWise", Boolean.FALSE, "VECTORWISE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$  //$NON-NLS-3$
 
     ACCESS(
             "Access", "Access", Boolean.FALSE, "ACCESS", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Default_Name), // "ACCESS"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -104,6 +110,8 @@ public enum EDatabaseTypeName {
 
     GREENPLUM(
             "Greenplum", "Greenplum", Boolean.TRUE, "GREENPLUM", "GREENPLUM", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    PARACCEL(
+            "ParAccel", "ParAccel", Boolean.TRUE, "PARACCEL", "PARACCEL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
     NETEZZA(
             "Netezza", "Netezza", Boolean.FALSE, "NETEZZA", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     SAS("SAS", "SAS", Boolean.TRUE, "SAS", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -332,6 +340,9 @@ public enum EDatabaseTypeName {
             isSupport = isSupportODBC;
         } else if (EDatabaseTypeName.SAS == this) {
             isSupport = false;
+        } else if (EDatabaseTypeName.INGRES == this || EDatabaseTypeName.INTERBASE == this || EDatabaseTypeName.VECTORWISE == this
+                || EDatabaseTypeName.PARACCEL == this) {
+            return false;
         }
 
         return isSupport;

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

@@ -81,10 +81,10 @@ public enum EDatabaseVersion4Drivers {
             "Microsoft SQL Server 2012", "Microsoft SQL Server 2012", "jtds-1.3.1-patch-20190523.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     MSSQL_PROP(new DbVersion4Drivers(EDatabaseTypeName.MSSQL,
             "Microsoft", "MSSQL_PROP", //$NON-NLS-1$ //$NON-NLS-2$
-            new String[] { "mssql-jdbc.jar", "slf4j-api-1.7.29.jar", "slf4j-log4j12-1.7.29.jar", "adal4j-1.6.5.jar", //$NON-NLS-1$
-                    "commons-lang3-3.10.jar", "commons-codec-1.14.jar", "gson-2.8.6.jar", "oauth2-oidc-sdk-6.5.jar",
+            new String[] { "mssql-jdbc.jar", "slf4j-api-1.7.29.jar", "slf4j-log4j12-1.7.29.jar", "adal4j-1.6.7.jar", //$NON-NLS-1$
+                    "commons-lang3-3.10.jar", "commons-codec-1.14.jar", "gson-2.8.6.jar", "oauth2-oidc-sdk-9.7.jar",
                     "json-smart-2.4.7.jar", "nimbus-jose-jwt-8.11.jar", "javax.mail-1.6.2.jar", "log4j-1.2.17.jar",
-                    "accessors-smart-2.4.7.jar", "asm-9.1.jar" })),
+                    "accessors-smart-2.4.7.jar", "asm-9.1.jar","content-type-2.1.jar" })),
 
     VERTICA_9(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 9.X", "VERTICA_9_0", "vertica-jdbc-9.3.1-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 

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

@@ -16,7 +16,9 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import org.apache.commons.lang.StringUtils;
 import org.talend.commons.exception.ExceptionHandler;
+import org.talend.core.pendo.PendoTrackSender;
 import org.talend.core.runtime.i18n.Messages;
 import org.talend.repository.model.RepositoryConstants;
 import org.talend.utils.json.JSONException;
@@ -215,7 +217,15 @@ public class ConnectionBean implements Cloneable {
     public String getUser() {
         try {
             if (conDetails.has(USER)) {
-                return conDetails.getString(USER);
+                String user = conDetails.getString(USER);
+                if (isToken()) {
+                    String url = getDynamicFields().get(RepositoryConstants.REPOSITORY_URL);
+                    user = PendoTrackSender.getInstance().getTmcUser(url, getPassword());
+                    if (StringUtils.isNotBlank(user)) {
+                        setUser(user);
+                    }
+                }
+                return user;
             }
         } catch (JSONException e) {
             ExceptionHandler.process(e);

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

@@ -13,10 +13,13 @@
 package org.talend.core.model.general;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.core.runtime.Path;
@@ -45,6 +48,8 @@ public class ModuleNeeded {
 
     public static final String ATTR_USED_BY_DYNAMIC_DISTRIBUTION = "dynamicDistribution";
 
+    public static final String ATTR_DYNAMIC_DISTRIBUTION_VERSION = "distributionVersion";
+    
     private String id;
 
     private String context;
@@ -105,6 +110,7 @@ public class ModuleNeeded {
 
     ILibraryManagerService libManagerService = (ILibraryManagerService) GlobalServiceRegister.getDefault()
             .getService(ILibraryManagerService.class);
+    
 
     /**
      * DOC smallet ModuleNeeded class global comment. Detailled comment <br/>
@@ -753,5 +759,12 @@ public class ModuleNeeded {
     public void setUseReleaseVersion(boolean useReleaseVersion) {
         this.useReleaseVersion = useReleaseVersion;
     }
-
+    
+    public String getDynamicDistributionVersion() {
+        return attributes.get(ATTR_DYNAMIC_DISTRIBUTION_VERSION);
+    }
+    
+    public void setDynamicDistributionVersion(String distribution) {
+        attributes.put(ATTR_DYNAMIC_DISTRIBUTION_VERSION, distribution);
+    }
 }

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

@@ -94,6 +94,8 @@ public interface ISAPConstant {
 
     public static final String OUTPUT_XML_META_NAME = PARAM_OUTPUT + SCHEMA_SUFIX;
 
+    public static final String ADSO_CONNECTION_TYPE = "adsoConnectionType";//$NON-NLS-1$
+
     // Hana database properties
     public static final String PROP_USE_HANA = "db.useHana";//$NON-NLS-1$
 
@@ -108,4 +110,9 @@ public interface ISAPConstant {
     public static final String PROP_DB_PASSWORD = "db.password";//$NON-NLS-1$
 
     public static final String PROP_DB_ADDITIONAL_PROPERTIES = "db.additionalProperties";//$NON-NLS-1$
+
+    public static final String SAP_JCO = "SAP_JCO"; //$NON-NLS-1$
+
+    public static final String HANA_JDBC = "HANA_JDBC";//$NON-NLS-1$
+
 }

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

@@ -300,6 +300,9 @@ public class MetadataTable implements IMetadataTable, Cloneable {
                 // no matter if this one is custom or not (all custom must be propagated too)
                 for (int i = 0; i < inputColumnListWithUnselected.size(); i++) {
                     IMetadataColumn inputColumn = inputColumnListWithUnselected.get(i);
+                    if(inputColumn.isCustom()) {
+                        continue;
+                    }
                     IMetadataColumn myColumn = this.getColumn(inputColumn.getLabel());
                     outputColumnsNotTested.remove(myColumn);
                     if (!inputColumn.sameMetacolumnAs(myColumn, options)) {

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

@@ -86,6 +86,7 @@ import org.talend.core.model.update.UpdatesConstants;
 import org.talend.core.model.utils.IDragAndDropServiceHandler;
 import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.runtime.services.IGenericWizardService;
+import org.talend.core.runtime.util.SAPUtils;
 import org.talend.core.service.IMetadataManagmentService;
 import org.talend.core.service.IMetadataManagmentUiService;
 import org.talend.core.utils.KeywordsValidator;
@@ -406,6 +407,8 @@ public class RepositoryToComponentProperty {
                 }
             }
             return values;
+        } else if ("CONNECTION_TYPE".equals(value)) { //$NON-NLS-1$
+            return SAPUtils.isHana(connection) ? ISAPConstant.HANA_JDBC : ISAPConstant.SAP_JCO;
         } else if ("SAPHANA_HOST".equals(value)) { //$NON-NLS-1$
             String dbHost = TaggedValueHelper.getValueString(ISAPConstant.PROP_DB_HOST, connection);
             if (isContextMode(connection, dbHost)) {
@@ -2286,7 +2289,7 @@ public class RepositoryToComponentProperty {
                 for (int j = 0; j < schemaTargets.size(); j++) {
                     SchemaTarget schemaTarget = schemaTargets.get(j);
                     if (schemaTarget.getTagName() != null && !schemaTarget.getTagName().equals("")) { //$NON-NLS-1$
-                        tagName = "" + schemaTarget.getTagName().trim(); //$NON-NLS-1$ //$NON-NLS-2$
+                        tagName = "" + schemaTarget.getTagName().trim(); //$NON-NLS-1$
                         tagName = MetadataToolHelper.validateColumnName(tagName, j);
                         Map<String, Object> map = new HashMap<String, Object>();
                         map.put("SCHEMA_COLUMN", tagName); //$NON-NLS-1$

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/AbstractNode.java

@@ -1084,6 +1084,7 @@ public abstract class AbstractNode implements INode {
     @Override
     public void setLabel(String label) {
         // TODO Auto-generated method stub
+    	this.label = label;
 
     }
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/routines/RoutinesUtil.java

@@ -22,6 +22,7 @@ import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.jobs.Job;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.exception.SystemException;
@@ -51,6 +52,8 @@ import org.talend.repository.model.IProxyRepositoryFactory;
  */
 public final class RoutinesUtil {
 
+    private static Job syncCodesjob;
+
     private RoutinesUtil() {
     }
 
@@ -304,7 +307,7 @@ public final class RoutinesUtil {
         }
         ICodeGeneratorService codegenService = null;
         if (GlobalServiceRegister.getDefault().isServiceRegistered(ICodeGeneratorService.class)) {
-            codegenService = (ICodeGeneratorService) GlobalServiceRegister.getDefault().getService(ICodeGeneratorService.class);
+            codegenService = GlobalServiceRegister.getDefault().getService(ICodeGeneratorService.class);
         }
         if (codegenService == null) {
             return errorItems;
@@ -328,7 +331,7 @@ public final class RoutinesUtil {
             return;
         }
         if (synchronizer == null && GlobalServiceRegister.getDefault().isServiceRegistered(ICodeGeneratorService.class)) {
-            ICodeGeneratorService codegenService = (ICodeGeneratorService) GlobalServiceRegister.getDefault().getService(
+            ICodeGeneratorService codegenService = GlobalServiceRegister.getDefault().getService(
                     ICodeGeneratorService.class);
             synchronizer = codegenService.createRoutineSynchronizer();
         }
@@ -409,4 +412,12 @@ public final class RoutinesUtil {
         return routinesParameters;
     }
 
+    public static Job getSyncCodesjob() {
+        return syncCodesjob;
+    }
+
+    public static void setSyncCodesjob(Job syncCodesjob) {
+        RoutinesUtil.syncCodesjob = syncCodesjob;
+    }
+
 }

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

@@ -1522,4 +1522,36 @@ public class NodeUtil {
         }
         return isDatabaseFamily;
     }
+    
+    public static String getLabel(INode node) {
+        String label = node.getLabel();
+        if(label == null) {
+            label = node.getUniqueName();
+        }
+        
+        if(isValidJavaStringLiteral(label)) {
+            return "\"" + label + "\"";
+        }
+        
+        return label;
+    }
+    
+    private static boolean isValidJavaStringLiteral(String value) {
+        boolean escape = false;
+        for(int i=0;i<value.length();i++) {
+            char c = value.charAt(i);
+            
+            if(c == '"' && !escape) {
+                return false;
+            }
+            
+            if(c == '\\') {
+                escape = !escape;
+            } else {
+                escape = false;
+            }
+        }
+        
+        return true;
+    }
 }

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

@@ -86,7 +86,10 @@ public class PendoTrackSender {
             instance = new PendoTrackSender();
         }
         if (StringUtils.isBlank(adminUrl)) {
-            adminUrl = getRepositoryContext().getFields().get(RepositoryConstants.REPOSITORY_URL);
+            RepositoryContext repositoryContext = getRepositoryContext();
+            if (repositoryContext != null) {
+                adminUrl = repositoryContext.getFields().get(RepositoryConstants.REPOSITORY_URL);
+            }
         }
         return instance;
     }
@@ -206,14 +209,18 @@ public class PendoTrackSender {
     }
 
     private String getPendoInfo() throws Exception {
+        return getPendoInfo(getBaseUrl(), getToken());
+    }
+
+    private String getPendoInfo(String baseUrl, String token) throws Exception {
         CloseableHttpClient client = null;
         CloseableHttpResponse response = null;
         try {
             client = HttpClients.createDefault();
-            String url = getBaseUrl() + PENDO_INFO;
+            String url = baseUrl + PENDO_INFO;
 
             HttpGet httpGet = new HttpGet(url);
-            httpGet.setHeader(HEAD_AUTHORIZATION, "Bearer " + getToken());
+            httpGet.setHeader(HEAD_AUTHORIZATION, "Bearer " + token);
             response = client.execute(httpGet, HttpClientContext.create());
             StatusLine statusLine = response.getStatusLine();
             String responseStr = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
@@ -248,7 +255,11 @@ public class PendoTrackSender {
     }
 
     public String getBaseUrl() throws Exception {
-        if (StringUtils.isNotBlank(apiBaseUrl)) {
+        return getBaseUrl(adminUrl, false);
+    }
+
+    public String getBaseUrl(String adminUrl, boolean token) throws Exception {
+        if (StringUtils.isNotBlank(apiBaseUrl) && !token) {
             return apiBaseUrl;
         }
 
@@ -279,6 +290,19 @@ public class PendoTrackSender {
         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);

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

@@ -190,10 +190,10 @@ JavaTypesManager.integer=INTEGER\u306F\u6570\u5024\u3067\u3059:
 JavaTypesManager.list=LIST\u306F\u6570\u5024\u3067\u3059:
 JavaTypesManager.string=STRING\u306F\u6570\u5024\u3067\u3059:
 LDAPCATruster.failedCreateCert=\u8A3C\u660E\u66F8\u30B9\u30C8\u30A2\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
-LDAPCATruster.failedCreateTmp=tmp\u4FE1\u983C\u30B9\u30C8\u30A2\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
+LDAPCATruster.failedCreateTmp=\u4E00\u6642\u30C8\u30E9\u30B9\u30C8\u30B9\u30C8\u30A2\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
 LDAPCATruster.failedInitialTrust=\u521D\u671F\u4FE1\u983C\u30DE\u30CD\u30FC\u30B8\u30E3\u30FC\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
 LDAPCATruster.failedLoadCert=\u8A3C\u660E\u66F8\u30B9\u30C8\u30A2\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-LDAPCATruster.failedSaveTrust=\u4FE1\u983C\u30B9\u30C8\u30A2\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
+LDAPCATruster.failedSaveTrust=\u30C8\u30E9\u30B9\u30C8\u30B9\u30C8\u30A2\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
 LDAPCATruster.locationInvalid=\u8A3C\u660E\u66F8\u30B9\u30C8\u30A2\u30D5\u30A1\u30A4\u30EB\u306E\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3\u304C\u7121\u52B9\u3067\u3059:
 LDAPCATruster.noCertificate=\n\u30AD\u30FC\u30C4\u30FC\u30EB\u30B3\u30DE\u30F3\u30C9\u3092\u4F7F\u3063\u3066\u3001\u30B5\u30FC\u30D0\u30FC\u8A3C\u660E\u66F8\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 LDAPCATruster.sslError1=SSL\u30A8\u30E9\u30FC\uFF1A\u30B5\u30FC\u30D0\u30FC\u8A3C\u660E\u66F8\u3092\u691C\u8A3C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
@@ -635,7 +635,7 @@ DynamicPlugin.addExtension.empty=ExtensionPoint\u307E\u305F\u306FID\u304C\u7A7A\
 BigDataBasicUtil.loadDynamicDistribution.IDynamicDistributionManager.notFound={0}\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
 TalendLibsServerManager.connectUserLibraryFailureMessage=\u7BA1\u7406\u8005\u30E2\u30FC\u30C9\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u30E6\u30FC\u30B6\u30FC\u30E9\u30A4\u30D6\u30E9\u30EA\u30FC\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u304C\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093\u3002{0}\u3078\u306E\u63A5\u7D9A\u304C\u62D2\u5426\u3055\u308C\u307E\u3057\u305F
 TalendLibsServerManager.cannotGetUserLibraryServer=\u30EA\u30E2\u30FC\u30C8\u7BA1\u7406\u8005\u304B\u3089\u30E6\u30FC\u30B6\u30FC\u30E9\u30A4\u30D6\u30E9\u30EA\u30FC\u30B5\u30FC\u30D0\u30FC\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093
-MigrationReportAccessDialog.title=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30A2\u30A4\u30C6\u30E0\u306E\u79FB\u884C
+MigrationReportAccessDialog.title=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30A2\u30A4\u30C6\u30E0\u3092\u79FB\u884C
 MigrationReportAccessDialog.migrateSuccess=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30A2\u30A4\u30C6\u30E0\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
@@ -649,7 +649,7 @@ MigrationReportAccessDialog.notNowButton=\u5F8C\u3067
 ItemAnalysisReportManager.Information.title=\u60C5\u5831
 ItemAnalysisReportManager.Information.message=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u5206\u6790\u304C\u6B63\u3057\u304F\u5B8C\u4E86\u3057\u307E\u3057\u305F\u3002\u4F8B\u5916\u30EC\u30B3\u30FC\u30C9\u306F\u751F\u6210\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002
 ItemAnalysisReportManager.Warning.title=\u8B66\u544A
-ItemAnalysisReportManager.Warning.message=\u65B0\u3057\u3044\u5206\u6790\u3092\u5B9F\u884C\u3067\u304D\u307E\u305B\u3093\u3002\u73FE\u5728\u306E\u5206\u6790\u304C\u5B8C\u4E86\u3057\u3066\u304B\u3089\u3001\u3082\u3046\u4E00\u5EA6\u8A66\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+ItemAnalysisReportManager.Warning.message=\u65B0\u3057\u3044\u5206\u6790\u3092\u5B9F\u884C\u3067\u304D\u307E\u305B\u3093\u3002\u73FE\u5728\u306E\u5206\u6790\u304C\u5B8C\u4E86\u3057\u3066\u304B\u3089\u3001\u3084\u308A\u76F4\u3057\u3066\u307F\u3066\u304F\u3060\u3055\u3044\u3002
 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

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

@@ -12,6 +12,11 @@
 // ============================================================================
 package org.talend.core.runtime.services;
 
+import java.util.List;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jdt.core.IClasspathEntry;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
 import org.talend.core.model.properties.RoutineItem;
@@ -24,6 +29,10 @@ public interface IDesignerMavenService extends IService {
     String getImportGAVPackageForCodesJar(CodesJarInfo info);
 
     void updateCodeJarMavenProject(CodesJarInfo info, boolean needReSync) throws Exception;
+    
+    void enableMavenNature(IProgressMonitor monitor, IProject project);
+
+    void addProjectClasspathEntry(IProgressMonitor monitor, IProject project, List<IClasspathEntry> entries);
 
     String getLocalRepositoryPath() throws Exception;
 

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

@@ -0,0 +1,42 @@
+// ============================================================================
+//
+// 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.runtime.util;
+
+import org.apache.commons.lang.StringUtils;
+import org.talend.core.model.metadata.ISAPConstant;
+import org.talend.core.model.metadata.builder.connection.SAPConnection;
+import org.talend.cwm.helper.TaggedValueHelper;
+
+/**
+ * created by hcyi on Nov 29, 2021
+ * Detailled comment
+ *
+ */
+public class SAPUtils {
+
+    public static boolean isHana(SAPConnection connection) {
+        if (connection != null) {
+            String connectionType = TaggedValueHelper.getValueString(ISAPConstant.ADSO_CONNECTION_TYPE, connection);
+            if (StringUtils.isBlank(connectionType)) {
+                String dbHost = TaggedValueHelper.getValueString(ISAPConstant.PROP_DB_HOST, connection);
+                if (StringUtils.isNotBlank(dbHost)) {
+                    return true;
+                }
+            } else if (ISAPConstant.HANA_JDBC.equals(connectionType)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+}

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

@@ -234,6 +234,8 @@ public interface IRunProcessService extends IService {
 
     void clearProjectRelatedSettings();
 
+    void clearAllBuildCaches();
+
     void batchDeleteAllVersionTalendJobProject(List<String> idList);
 
     boolean isExportConfig();

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

@@ -40,7 +40,6 @@ import org.talend.repository.IRepositoryChangedListener;
 import org.talend.repository.IRepositoryElementDelta;
 import org.talend.repository.ui.actions.AContextualAction;
 import org.talend.repository.ui.views.IRepositoryView;
-import org.talend.utils.json.JSONException;
 
 /**
  * DOC qian class global comment. Interface for RepositoryService. <br/>
@@ -134,9 +133,9 @@ public interface IRepositoryService extends IService {
      * @param project
      * @param onlyLocalIfPossible try to only get branches from local repository to improve performance
      * @return
-     * @throws JSONException
+     * @throws Exception
      */
-    public List<String> getProjectBranch(Project project, boolean onlyLocalIfPossible) throws JSONException;
+    public List<String> getProjectBranch(Project project, boolean onlyLocalIfPossible) throws Exception;
 
     public boolean askRetryForNetworkIssue(Throwable ex);
 

main/plugins/org.talend.core.ui/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.core.ui</artifactId>

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

@@ -579,5 +579,5 @@ I18nPreferencePage.restart=Red\u00E9marrer
 I18nPreferencePage.restartButton=Red\u00E9marrage requis pour prendre en compte les modifications.
 I18nPreferencePage.restoreDefault=Restaurer les param\u00E8tres par d\u00E9faut
 I18nPreferencePage.wait_process=Le processus va prendre plusieurs minutes, patientez...
-MetadataPreferencePage.EnableBasic.name=Autorise l'en-t\u00EAte d'authentification simple
+MetadataPreferencePage.EnableBasic.name=Autorise l'en-t\u00EAte d'authentification basique
 MetadataPreferencePage.MessageDialog.Restart=Le Studio doit red\u00E9marrer pour que ce param\u00E8tre soit pris en compte.\n\u00CAtes-vous s\u00FBr(e)\u00A0?

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

@@ -139,10 +139,10 @@ JavaTypesManager.integer=INTEGER\u306F\u6570\u5024\u3067\u3059:
 JavaTypesManager.list=LIST\u306F\u6570\u5024\u3067\u3059:
 JavaTypesManager.string=STRING\u306F\u6570\u5024\u3067\u3059:
 LDAPCATruster.failedCreateCert=\u8A3C\u660E\u66F8\u30B9\u30C8\u30A2\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
-LDAPCATruster.failedCreateTmp=tmp\u4FE1\u983C\u30B9\u30C8\u30A2\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
+LDAPCATruster.failedCreateTmp=\u4E00\u6642\u30C8\u30E9\u30B9\u30C8\u30B9\u30C8\u30A2\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
 LDAPCATruster.failedInitialTrust=\u521D\u671F\u4FE1\u983C\u30DE\u30CD\u30FC\u30B8\u30E3\u30FC\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
 LDAPCATruster.failedLoadCert=\u8A3C\u660E\u66F8\u30B9\u30C8\u30A2\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-LDAPCATruster.failedSaveTrust=\u4FE1\u983C\u30B9\u30C8\u30A2\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
+LDAPCATruster.failedSaveTrust=\u30C8\u30E9\u30B9\u30C8\u30B9\u30C8\u30A2\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F:
 LDAPCATruster.locationInvalid=\u8A3C\u660E\u66F8\u30B9\u30C8\u30A2\u30D5\u30A1\u30A4\u30EB\u306E\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3\u304C\u7121\u52B9\u3067\u3059:
 LDAPCATruster.noCertificate=\n\u30AD\u30FC\u30C4\u30FC\u30EB\u30B3\u30DE\u30F3\u30C9\u3092\u4F7F\u3063\u3066\u3001\u30B5\u30FC\u30D0\u30FC\u8A3C\u660E\u66F8\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 LDAPCATruster.sslError1=SSL\u30A8\u30E9\u30FC\uFF1A\u30B5\u30FC\u30D0\u30FC\u8A3C\u660E\u66F8\u3092\u691C\u8A3C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002

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

@@ -6,6 +6,7 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.swt.widgets.Composite;
 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.repository.IRepositoryViewObject;
 import org.talend.core.ui.properties.tab.IDynamicProperty;
@@ -21,4 +22,16 @@ public interface IGitUIProviderService extends IService {
 
     public String[] changeCredentials(Shell parent, Serializable uriIsh, String initUser, boolean canStoreCredentials);
 
+    boolean checkPendingChanges();
+
+    public void openPushFailedDialog(Object pushResult);
+
+    public static IGitUIProviderService get() {
+        GlobalServiceRegister register = GlobalServiceRegister.getDefault();
+        if (!register.isServiceRegistered(IGitUIProviderService.class)) {
+            return null;
+        }
+        return register.getService(IGitUIProviderService.class);
+    }
+
 }

main/plugins/org.talend.core/.classpath

@@ -1,13 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="lib/log4j-api-2.13.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/log4j-core-2.13.2.jar"/>
-	<classpathentry kind="src" path="src/main/java/"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry exported="true" kind="lib" path="lib/log4j-api-2.17.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/log4j-core-2.17.1.jar"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

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

@@ -59,6 +59,6 @@ Import-Package: org.eclipse.m2e.core,
  org.eclipse.m2e.core.embedder,
  org.slf4j,
  org.slf4j.spi
-Bundle-ClassPath: lib/log4j-api-2.13.2.jar,
- lib/log4j-core-2.13.2.jar,
+Bundle-ClassPath: lib/log4j-api-2.17.1.jar,
+ lib/log4j-core-2.17.1.jar,
  .

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.core</artifactId>
@@ -13,7 +13,7 @@
   		<dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.13.2</version>
+            <version>2.17.1</version>
         </dependency>
   </dependencies>
   <build>

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

@@ -251,12 +251,12 @@ HTMLDocGenerator.label=LABEL
 HTMLDocGenerator.language=\u8A00\u8A9E
 HTMLDocGenerator.length=\u9577\u3055
 HTMLDocGenerator.mapper.alias=\u30A8\u30A4\u30EA\u30A2\u30B9
-HTMLDocGenerator.mapper.entries=\u30AB\u30B9\u30BF\u30E0\u6761\u4EF6\u30A8\u30F3\u30C8\u30EA
+HTMLDocGenerator.mapper.entries=\u30AB\u30B9\u30BF\u30E0\u6761\u4EF6\u30A8\u30F3\u30C8\u30EA\u30FC
 HTMLDocGenerator.mapper.expression=\u5F0F
 HTMLDocGenerator.mapper.iaminimized=isMinimized
 HTMLDocGenerator.mapper.isjoin=isJoin
 HTMLDocGenerator.mapper.join.type=\u30B8\u30E7\u30A4\u30F3\u30BF\u30A4\u30D7
-HTMLDocGenerator.mapper.metadatatable.entries=\u30E1\u30BF\u30C7\u30FC\u30BF\u30C6\u30FC\u30D7\u30EB\u30A8\u30F3\u30C8\u30EA
+HTMLDocGenerator.mapper.metadatatable.entries=\u30E1\u30BF\u30C7\u30FC\u30BF\u30C6\u30FC\u30D7\u30EB\u30A8\u30F3\u30C8\u30EA\u30FC
 HTMLDocGenerator.mapper.operator=\u6F14\u7B97\u5B50
 HTMLDocGenerator.mapper.table.for=\u30DE\u30C3\u30D1\u30FC\u30C6\u30FC\u30D6\u30EB
 HTMLDocGenerator.mapper.table.name=\u30C6\u30FC\u30D6\u30EB\u540D
@@ -283,7 +283,7 @@ HTMLDocGenerator.source_code=\u30BD\u30FC\u30B9\u30B3\u30FC\u30C9
 HTMLDocGenerator.stats_logs=\u7D71\u8A08\u3068\u30ED\u30B0
 HTMLDocGenerator.status=\u30B9\u30C6\u30FC\u30BF\u30B9
 HTMLDocGenerator.summary=\u30B5\u30DE\u30EA\u30FC
-HTMLDocGenerator.tmap.constraint.entries=\u5236\u7D04\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA
+HTMLDocGenerator.tmap.constraint.entries=\u5236\u7D04\u30C6\u30FC\u30D6\u30EB\u30A8\u30F3\u30C8\u30EA\u30FC
 HTMLDocGenerator.tmap.isinnerjoin=isInnerJoin
 HTMLDocGenerator.tmap.expressionfilter=expressionFilter
 HTMLDocGenerator.tmap.isnullable=isNullable

main/plugins/org.talend.core/src/main/java/org/talend/core/model/utils/BaseComponentInstallerTask.java

@@ -47,7 +47,7 @@ abstract public class BaseComponentInstallerTask implements IComponentInstallerT
     private static final Logger LOGGER = LoggerFactory.getLogger(BaseComponentInstallerTask.class);
     private static final String SYS_PROP_TCOMPV0 = "tcompv0.update";
     private static final String SYS_PROP_OVERWRITE = "m2.overwrite";
-    private static final String SYS_PROP_OVERWRITE_DEFAULT = "false";
+    private static final String SYS_PROP_OVERWRITE_DEFAULT = Boolean.FALSE.toString();
 
     private static final String SYS_CUSTOM_MAVEN_REPO = "maven.local.repository";
     
@@ -58,7 +58,10 @@ abstract public class BaseComponentInstallerTask implements IComponentInstallerT
     private Set<ComponentGAV> gavs = new HashSet<ComponentGAV>();
     
     protected boolean overWriteM2() {
-        String prop = System.getProperty(SYS_PROP_OVERWRITE, SYS_PROP_OVERWRITE_DEFAULT);
+        /**
+         * force to overwrite, since need to sync maven-metadata-local.xml
+         */
+        String prop = System.getProperty(SYS_PROP_OVERWRITE, Boolean.TRUE.toString());
         return Boolean.valueOf(prop);
     }
     

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

@@ -41,7 +41,7 @@ public interface IGITProviderService extends IService {
      * @param onlyLocalIfPossible try to only get branches from local repository to improve performance
      * @return
      */
-    public String[] getBranchList(Project project, boolean onlyLocalIfPossible);
+    public String[] getBranchList(Project project, boolean onlyLocalIfPossible) throws Exception;
 
     public boolean isGITProject(Project p) throws PersistenceException;
 

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

@@ -34,6 +34,7 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.IWorkspaceDescription;
@@ -44,13 +45,15 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.jdt.core.IClasspathAttribute;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.ui.IEditorPart;
 import org.talend.commons.CommonsPlugin;
 import org.talend.commons.exception.CommonExceptionHandler;
 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.utils.io.FileCopyUtils;
 import org.talend.commons.utils.PasswordEncryptUtil;
 import org.talend.commons.utils.generation.JavaUtils;
 import org.talend.commons.utils.time.TimeMeasure;
@@ -106,6 +109,7 @@ import org.talend.core.runtime.process.TalendProcessArgumentConstant;
 import org.talend.core.runtime.process.TalendProcessOptionConstants;
 import org.talend.core.runtime.projectsetting.ProjectPreferenceManager;
 import org.talend.core.runtime.repository.build.BuildExportManager;
+import org.talend.core.runtime.services.IDesignerMavenService;
 import org.talend.core.service.IResourcesDependenciesService;
 import org.talend.core.services.ICoreTisService;
 import org.talend.core.services.IGITProviderService;
@@ -1263,39 +1267,6 @@ public class ProcessorUtilities {
         }
     }
 
-    private static void syncContextResourcesForParentJob(IProcess currentProcess, IProgressMonitor progressMonitor) {
-        ITalendProcessJavaProject processJavaProject = mainJobInfo.getProcessor().getTalendJavaProject();
-
-        final IFolder mainResourcesFolder = processJavaProject.getExternalResourcesFolder();
-        final File targetFolder = mainResourcesFolder.getLocation().toFile();
-
-        final Set<JobInfo> dependenciesItems = mainJobInfo.getProcessor().getBuildChildrenJobs();
-
-        final IRunProcessService runProcessService = (IRunProcessService) GlobalServiceRegister.getDefault().getService(
-                IRunProcessService.class);
-
-        List<ProcessItem> dependenciesItemsFiltered = dependenciesItems.stream().filter(jobInfo -> !jobInfo.isJoblet())
-                .map(JobInfo::getProcessItem).collect(Collectors.toList());
-        
-        if (dependenciesItemsFiltered.size() > 0) {
-            dependenciesItemsFiltered.forEach(item -> {
-                ITalendProcessJavaProject childJavaProject = runProcessService.getTalendJobJavaProject(item.getProperty());
-                if (childJavaProject != null) {
-                    final IFolder childResourcesFolder = childJavaProject.getExternalResourcesFolder();
-                    if (childResourcesFolder.exists()) {
-                        FileCopyUtils.syncFolder(childResourcesFolder.getLocation().toFile(), targetFolder, false);
-                    }
-                }
-            });
-
-            try {
-                mainResourcesFolder.refreshLocal(IResource.DEPTH_INFINITE, progressMonitor);
-            } catch (CoreException e) {
-                ExceptionHandler.process(e);
-            }
-        }
-    }
-
     private static Set<ModuleNeeded> getAllJobTestcaseModules(ProcessItem selectedProcessItem) {
         Set<ModuleNeeded> neededLibraries = new HashSet<>();
         if (GlobalServiceRegister.getDefault().isServiceRegistered(ITestContainerProviderService.class)) {
@@ -1499,7 +1470,6 @@ public class ProcessorUtilities {
                 }
             }
         }
-        syncContextResourcesForParentJob(currentProcess, null);
     }
 
     /**
@@ -1555,6 +1525,7 @@ public class ProcessorUtilities {
         }
         jobInfo.setProcessItem(null);
         if (!BitwiseOptionUtils.containOption(option, GENERATE_MAIN_ONLY)) {
+            List<JobInfo> firstSubjobs = new ArrayList<JobInfo>();
             // handle subjob in joblet. see bug 004937: tRunJob in a Joblet
             for (INode node : currentProcess.getGeneratingNodes()) {
                 String componentName = node.getComponent().getName();
@@ -1643,6 +1614,8 @@ public class ProcessorUtilities {
 
                                 if (!BitwiseOptionUtils.containOption(option, GENERATE_WITH_FIRST_CHILD)) {
                                     currentProcess.setNeedRegenerateCode(true);
+                                } else {
+                                    firstSubjobs.add(subJobInfo);
                                 }
                             }
 
@@ -1651,6 +1624,9 @@ public class ProcessorUtilities {
                     }
                 }
             }
+            if (BitwiseOptionUtils.containOption(option, GENERATE_WITH_FIRST_CHILD)) {
+                handleGenerateFirstChildOnlyClasspath(progressMonitor, jobInfo, firstSubjobs);
+            }
         }
     }
 
@@ -1659,6 +1635,32 @@ public class ProcessorUtilities {
         includeESBFlag |= esbIncludingOption;
         jobInfo.setIncludeESBFlag(includeESBFlag);
     }
+    
+    private static void handleGenerateFirstChildOnlyClasspath(IProgressMonitor progressMonitor, JobInfo jobInfo,
+            List<JobInfo> subjobInfoList) {
+        IDesignerMavenService mavenService = IDesignerMavenService.get();
+        if (mavenService == null || jobInfo == null || subjobInfoList.isEmpty()) {
+            return;
+        }
+        List<IClasspathEntry> classpathEntries = new ArrayList<IClasspathEntry>();
+        for (JobInfo subJobInfo : subjobInfoList) {
+            if (subJobInfo.getProcessor() != null) {
+                IProject codeProject = subJobInfo.getProcessor().getCodeProject();
+                if (codeProject != null) {
+                    mavenService.enableMavenNature(progressMonitor, codeProject);
+                    IClasspathEntry classpathEntry = JavaCore.newSourceEntry(codeProject.getFullPath(), new IPath[0],
+                            new IPath[0], null, new IClasspathAttribute[] {});
+                    classpathEntries.add(classpathEntry);
+                }
+            }
+        }
+        if (jobInfo.getProcessor() != null) {
+            IProject codeProject = jobInfo.getProcessor().getCodeProject();
+            if (codeProject != null) {
+                mavenService.addProjectClasspathEntry(progressMonitor, codeProject, classpathEntries);
+            }
+        }
+    }
 
     static void setGenerationInfoWithChildrenJob(INode node, JobInfo jobInfo, final JobInfo subJobInfo) {
         final LastGenerationInfo generationInfo = LastGenerationInfo.getInstance();
@@ -2040,13 +2042,12 @@ public class ProcessorUtilities {
     }
 
     public static IProcessor generateCode(IProcess process, IContext context, boolean statistics, boolean trace,
-            boolean properties, int option) throws ProcessorException {
+            boolean properties, int option, IProgressMonitor monitor) throws ProcessorException {
         updateCodeSources();
         // achen modify to fix 0006107
         JobInfo jobInfo = new JobInfo(process, context);
         resetBuildFlagsAndCaches();
-        IProcessor genCode = generateCode(jobInfo, context.getName(), statistics, trace, properties, option,
-                new NullProgressMonitor());
+        IProcessor genCode = generateCode(jobInfo, context.getName(), statistics, trace, properties, option, monitor);
         resetBuildFlagsAndCaches();
         return genCode;
     }

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

@@ -992,7 +992,7 @@ _UI_PCB_list_feature=\u30EA\u30B9\u30C8
 _UI_PCB_keyLength_feature=\u30AD\u30FC\u306E\u9577\u3055
 _UI_PCB_processingOptions_feature=\u51E6\u7406\u30AA\u30D7\u30B7\u30E7\u30F3
 _UI_PCB_positioning_feature=\u4F4D\u7F6E\u6C7A\u3081
-_UI_PCB_sequentialBuffering_feature=\u30B7\u30FC\u30B1\u30F3\u30B7\u30E3\u30EB\u30D0\u30C3\u30D5\u30A1\u30FC\u30EA\u30F3\u30B0
+_UI_PCB_sequentialBuffering_feature=\u30B7\u30FC\u30B1\u30F3\u30B7\u30E3\u30EB\u30D0\u30C3\u30D5\u30A1\u30EA\u30F3\u30B0
 _UI_PCB_alternateResponse_feature=\u4E92\u3044\u9055\u3044\u306E\u5FDC\u7B54
 _UI_PCB_express_feature=\u8868\u73FE
 _UI_PCB_modify_feature=\u5909\u66F4

main/plugins/org.talend.cwm.mip.edit/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.cwm.mip.edit</artifactId>

main/plugins/org.talend.cwm.mip.editor/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.cwm.mip.editor</artifactId>

main/plugins/org.talend.cwm.mip/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.cwm.mip</artifactId>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.datatools.xml</artifactId>

main/plugins/org.talend.designer.maven.aether/.classpath

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+
 	<classpathentry exported="true" kind="lib" path="lib/wagon-http-lightweight.jar" sourcepath="D:/.m2/repository/org/apache/maven/wagon/wagon-http-lightweight/3.0.0/wagon-http-lightweight-3.0.0-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-transport-file.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-transport-http.jar"/>

main/plugins/org.talend.designer.maven.aether/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.maven.aether</artifactId>
@@ -63,6 +63,10 @@
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </exclusion>
+        <exclusion>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -75,6 +79,11 @@
 	    <artifactId>commons-io</artifactId>
 	    <version>2.8.0</version>
     </dependency>
+    <dependency>
+        <groupId>commons-codec</groupId>
+        <artifactId>commons-codec</artifactId>
+        <version>1.15</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-http-lightweight</artifactId>

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

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tcommon-studio-se</artifactId>
-		<version>8.0.1</version>
+		<version>8.0.1-SNAPSHOT</version>
 		<relativePath>../../../</relativePath>
 	</parent>
 	<artifactId>org.talend.designer.maven.repo.tck</artifactId>
@@ -12,6 +12,7 @@
 	<properties>
 		<jackson.version>2.12.1</jackson.version>
 		<slf4j.version>1.7.32</slf4j.version>
+        <tycho.buildtimestamp.format>${timestamp}</tycho.buildtimestamp.format>
 	</properties>
 	<repositories>
 		<repository>

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

@@ -4,25 +4,27 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tcommon-studio-se</artifactId>
-		<version>8.0.1</version>
+		<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.4.4</cxf.version>
+		<cxf.version>3.4.5</cxf.version>
 		<geronimo.version>1.0.2</geronimo.version>
 		<jackson.version>2.12.1</jackson.version>
 		<jcache.version>1.0.5</jcache.version>
 		<jcache_spec.version>1.0-alpha-1</jcache_spec.version>
-		<johnzon.version>1.2.10</johnzon.version>
+		<johnzon.version>1.2.15</johnzon.version>
 		<meecrowave.version>1.2.12</meecrowave.version>
 		<microprofile.version>1.2.1</microprofile.version>
 		<owb.version>2.0.23</owb.version>
 		<slf4j.version>1.7.32</slf4j.version>
-		<tomcat.version>9.0.50</tomcat.version>
+		<tomcat.version>9.0.54</tomcat.version>
 		<xbean.version>4.20</xbean.version>
+		<log4j2.version>2.17.1</log4j2.version>
+        <tycho.buildtimestamp.format>${timestamp}</tycho.buildtimestamp.format>
 	</properties>
 	<repositories>
 		<repository>
@@ -59,6 +61,47 @@
 
 	<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>
@@ -423,4 +466,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
+</project>

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

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tcommon-studio-se</artifactId>
-		<version>8.0.1</version>
+		<version>8.0.1-SNAPSHOT</version>
 		<relativePath>../../../</relativePath>
 	</parent>
 	<artifactId>org.talend.designer.maven.repo.tcompv0</artifactId>
@@ -17,6 +17,7 @@
 		<talend_releases>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</talend_releases>
 		<talend_snapshots_ee>https://artifacts-zl.talend.com/nexus/content/repositories/snapshots/</talend_snapshots_ee>
 		<talend_releases_ee>https://artifacts-zl.talend.com/nexus/content/repositories/releases/</talend_releases_ee>
+        <tycho.buildtimestamp.format>${timestamp}</tycho.buildtimestamp.format>
 	</properties>
 	<repositories>
 		<repository>

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

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tcommon-studio-se</artifactId>
-		<version>8.0.1</version>
+		<version>8.0.1-SNAPSHOT</version>
 		<relativePath>../../../</relativePath>
 	</parent>
 	<artifactId>org.talend.designer.maven.tos</artifactId>

main/plugins/org.talend.designer.maven.tos/resources/build/plugins/build-helper-maven-plugin-3-0-0/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>studio-maven-repository-tos</artifactId>
-		<version>8.0.1</version>
+		<version>8.0.1-SNAPSHOT</version>
 		<relativePath>../../../</relativePath>
 	</parent>
 	<artifactId>build-helper-maven-plugin-3-0-0-tos</artifactId>

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

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>studio-maven-repository-tos</artifactId>
-		<version>8.0.1</version>
+		<version>8.0.1-SNAPSHOT</version>
 		<relativePath>../../../</relativePath>
 	</parent>
 	<artifactId>karaf-maven-plugin-4-2-10-tos</artifactId>
@@ -103,7 +103,7 @@
 		<dependency>
 		    <groupId>org.apache.ant</groupId>
 		    <artifactId>ant</artifactId>
-		    <version>1.10.9</version>
+		    <version>1.10.11</version>
 		</dependency>
 		<dependency>
 		    <groupId>org.apache.maven.shared</groupId>

main/plugins/org.talend.designer.maven.tos/resources/build/plugins/maven-bundle-plugin-2-3-7/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>studio-maven-repository-tos</artifactId>
-		<version>8.0.1</version>
+		<version>8.0.1-SNAPSHOT</version>
 		<relativePath>../../../</relativePath>
 	</parent>
 	<artifactId>maven-bundle-plugin-2-3-7-tos</artifactId>

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

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>studio-maven-repository-tos</artifactId>
-		<version>8.0.1</version>
+		<version>8.0.1-SNAPSHOT</version>
 		<relativePath>../../../</relativePath>
 	</parent>
 	<artifactId>maven-bundle-plugin-2-5-3-tos</artifactId>

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

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>studio-maven-repository-tos</artifactId>
-		<version>8.0.1</version>
+		<version>8.0.1-SNAPSHOT</version>
 		<relativePath>../../../</relativePath>
 	</parent>
 	<artifactId>maven-bundle-plugin-5-1-1-tos</artifactId>
@@ -69,7 +69,7 @@
 		<dependency>
 		    <groupId>org.apache.ant</groupId>
 		    <artifactId>ant</artifactId>
-		    <version>1.10.9</version>
+		    <version>1.10.11</version>
 		</dependency>
 		<dependency>
 		    <groupId>org.apache.maven.shared</groupId>

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

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>studio-maven-repository-tos</artifactId>
-		<version>8.0.1</version>
+		<version>8.0.1-SNAPSHOT</version>
 		<relativePath>../../../</relativePath>
 	</parent>
 	<artifactId>maven-install-plugin-2-5-2-tos</artifactId>
@@ -29,7 +29,7 @@
 		<dependency>
 		    <groupId>org.apache.ant</groupId>
 		    <artifactId>ant</artifactId>
-		    <version>1.10.9</version>
+		    <version>1.10.11</version>
 		</dependency>
 		<dependency>
 		    <groupId>org.bouncycastle</groupId>

main/plugins/org.talend.designer.maven.tos/resources/build/plugins/talend-ci-osgihelper-maven-plugin/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>studio-maven-repository-tos</artifactId>
-		<version>8.0.1</version>
+		<version>8.0.1-SNAPSHOT</version>
 		<relativePath>../../../</relativePath>
 	</parent>
 	<artifactId>talend-ci-osgihelper-maven-plugin-tos</artifactId>
@@ -13,7 +13,7 @@
         <dependency>
             <groupId>org.talend.ci</groupId>
             <artifactId>osgihelper-maven-plugin</artifactId>
-            <version>${project.version}</version>
+            <version>8.0.1</version>
             <exclusions>
 				<exclusion>
 					<groupId>commons-codec</groupId>

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

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>studio-maven-repository-tos</artifactId>
-		<version>8.0.1</version>
+		<version>8.0.1-SNAPSHOT</version>
 		<relativePath>../../../</relativePath>
 	</parent>
 	<artifactId>talend-compiler-plugin-tos</artifactId>
@@ -13,7 +13,7 @@
 	 	<dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
-            <version>3.8.1</version>
+            <version>3.8.3</version>
         </dependency>
 		<dependency>
 			<groupId>org.eclipse.tycho</groupId>

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

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>studio-maven-repository-tos</artifactId>
-		<version>8.0.1</version>
+		<version>8.0.1-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>studio-maven-repository-build</artifactId>
@@ -32,7 +32,7 @@
 		<dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
-            <version>3.8.1</version>
+            <version>3.8.3</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-io</groupId>
@@ -150,6 +150,11 @@
 			<artifactId>jboss-marshalling</artifactId>
 			<version>2.0.12.Final</version>
 		</dependency>
+		<dependency>
+			<groupId>org.codehaus.plexus</groupId>
+			<artifactId>plexus-utils</artifactId>
+			<version>3.3.0</version>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

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

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.talend.studio</groupId>
         <artifactId>studio-maven-repository-tos</artifactId>
-        <version>8.0.1</version>
+        <version>8.0.1-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 	<artifactId>studio-components-dependencies</artifactId>

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

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>studio-maven-repository-tos</artifactId>
-		<version>8.0.1</version>
+		<version>8.0.1-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>studio-log4j-dependencies-tos</artifactId>
@@ -14,17 +14,17 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.13.2</version>
+            <version>2.17.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.13.2</version>
+            <version>2.17.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.13.2</version>
+            <version>2.17.1</version>
         </dependency>
 	</dependencies>
 	<build>

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

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.talend.studio</groupId>
         <artifactId>tcommon-studio-se</artifactId>
-        <version>8.0.1</version>
+        <version>8.0.1-SNAPSHOT</version>
         <relativePath>../../../../</relativePath>
     </parent>
 	<artifactId>studio-maven-repository-tos</artifactId>

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

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>studio-maven-repository-tos</artifactId>
-		<version>8.0.1</version>
+		<version>8.0.1-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>studio-surefire-dependencies</artifactId>

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

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.talend.studio</groupId>
         <artifactId>studio-maven-repository-tos</artifactId>
-        <version>8.0.1</version>
+        <version>8.0.1-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 	<artifactId>studio-tacokit-dependencies</artifactId>

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

@@ -4,14 +4,14 @@
     <parent>
         <groupId>org.talend.studio</groupId>
         <artifactId>studio-maven-repository-tos</artifactId>
-        <version>8.0.1</version>
+        <version>8.0.1-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>studio-tcompv1-dependencies</artifactId>
     <packaging>pom</packaging>
     
     <properties>
-        <tcomp.version>1.37.0</tcomp.version>
+        <tcomp.version>1.40.0</tcomp.version>
         <slf4j.version>1.7.32</slf4j.version>
     </properties>
     

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

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.talend.studio</groupId>
         <artifactId>studio-maven-repository-tos</artifactId>
-        <version>8.0.1</version>
+        <version>8.0.1-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>studio-maven-repository-unzip</artifactId>
@@ -20,6 +20,12 @@
 			<groupId>org.talend.daikon</groupId>
 			<artifactId>crypto-utils</artifactId>
 			<version>${org.talend.daikon.crypto-utils.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-codec</groupId>
+                    <artifactId>commons-codec</artifactId>
+                </exclusion>
+            </exclusions>
 		</dependency>
 		<dependency>
             <groupId>com.fasterxml.jackson</groupId>

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

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.talend.studio</groupId>
         <artifactId>studio-maven-repository-tos</artifactId>
-        <version>8.0.1</version>
+        <version>8.0.1-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>studio-maven-repository-zip</artifactId>

main/plugins/org.talend.designer.maven.ui/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.maven.ui</artifactId>

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

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tcommon-studio-se</artifactId>
-		<version>8.0.1</version>
+		<version>8.0.1-SNAPSHOT</version>
 		<relativePath>../../../</relativePath>
 	</parent>
 	<artifactId>org.talend.designer.maven</artifactId>

main/plugins/org.talend.designer.maven/resources/templates/general/pom_project_template.xml

@@ -68,7 +68,7 @@
 						<dependency>
 							<groupId>org.apache.maven</groupId>
 							<artifactId>maven-core</artifactId>
-							<version>3.8.1</version>
+							<version>3.8.3</version>
 						</dependency>
 					</dependencies>
 				</plugin>
@@ -95,7 +95,7 @@
 						<dependency>
 							<groupId>org.apache.maven</groupId>
 							<artifactId>maven-core</artifactId>
-							<version>3.8.1</version>
+							<version>3.8.3</version>
 						</dependency>
 					</dependencies>
 				</plugin>
@@ -137,7 +137,7 @@
 						<dependency>
 							<groupId>org.apache.maven</groupId>
 							<artifactId>maven-core</artifactId>
-							<version>3.8.1</version>
+							<version>3.8.3</version>
 						</dependency>
 					</dependencies>
 					<configuration>
@@ -189,7 +189,7 @@
 						<dependency>
 							<groupId>org.apache.maven</groupId>
 							<artifactId>maven-core</artifactId>
-							<version>3.8.1</version>
+							<version>3.8.3</version>
 						</dependency>
 					</dependencies>
 				</plugin>

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/DesignerMavenService.java

@@ -12,7 +12,12 @@
 // ============================================================================
 package org.talend.designer.maven;
 
+import java.util.List;
+
 import org.apache.maven.settings.Settings;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.m2e.core.MavenPlugin;
 import org.eclipse.m2e.core.embedder.IMaven;
 import org.talend.core.model.properties.RoutineItem;
@@ -20,6 +25,7 @@ import org.talend.core.model.routines.CodesJarInfo;
 import org.talend.core.runtime.services.IDesignerMavenService;
 import org.talend.designer.maven.tools.CodesJarM2CacheManager;
 import org.talend.designer.maven.utils.CodesJarMavenUtil;
+import org.talend.designer.maven.utils.MavenProjectUtils;
 
 public class DesignerMavenService implements IDesignerMavenService {
 
@@ -37,6 +43,16 @@ public class DesignerMavenService implements IDesignerMavenService {
     public void updateCodeJarMavenProject(CodesJarInfo info, boolean needReSync) throws Exception {
         CodesJarM2CacheManager.updateCodesJarProject(info, needReSync);
     }
+    
+    @Override
+    public void enableMavenNature(IProgressMonitor monitor, IProject project) {
+        MavenProjectUtils.enableMavenNature(monitor, project);
+    }
+
+    @Override
+    public void addProjectClasspathEntry(IProgressMonitor monitor, IProject project, List<IClasspathEntry> entries) {
+        MavenProjectUtils.addProjectClasspathEntry(monitor, project, entries);
+    }
 
     @Override
     public String getLocalRepositoryPath() throws Exception {

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

@@ -47,6 +47,7 @@ import org.eclipse.m2e.core.MavenPlugin;
 import org.eclipse.swt.widgets.Display;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.PersistenceException;
+import org.talend.commons.utils.workbench.resources.ResourceUtils;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IESBService;
 import org.talend.core.ILibraryManagerService;
@@ -154,7 +155,15 @@ public class AggregatorPomsHelper {
 
     public IFolder getProjectPomsFolder() {
         IWorkspace workspace = ResourcesPlugin.getWorkspace();
-        return workspace.getRoot().getFolder(new Path(projectTechName + "/" + DIR_POMS)); //$NON-NLS-1$
+        IFolder pomsFolder = workspace.getRoot().getFolder(new Path(projectTechName + "/" + DIR_POMS)); //$NON-NLS-1$
+        if (!pomsFolder.exists()) {
+            try {
+                ResourceUtils.createFolder(pomsFolder);
+            } catch (PersistenceException e) {
+                ExceptionHandler.process(e);
+            }
+        }
+        return pomsFolder;
     }
 
     public void updateCodeProjects(IProgressMonitor monitor, boolean forceBuild) {

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

@@ -22,10 +22,12 @@ import java.util.Properties;
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.m2e.core.MavenPlugin;
 import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.utils.VersionUtils;
 import org.talend.core.model.general.Project;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.designer.maven.utils.PomIdsHelper;
 import org.talend.repository.ProjectManager;
+import org.talend.utils.io.FilesUtils;
 
 public class CodeM2CacheManager {
 
@@ -65,7 +67,15 @@ public class CodeM2CacheManager {
 
     public static void updateCacheStatus(String projectTechName, ERepositoryObjectType codeType, boolean isUpdated) {
         if (projectTechName == null) {
-            projectTechName = ProjectManager.getInstance().getCurrentProject().getTechnicalLabel();
+            Project currentProject = ProjectManager.getInstance().getCurrentProject();
+            if (currentProject == null) {
+                if (cacheFolder.exists()) {
+                    FilesUtils.deleteFolder(cacheFolder, true);
+                }
+                cacheFolder.mkdirs();
+                return;
+            }
+            projectTechName = currentProject.getTechnicalLabel();
         }
         File cacheFile = getCacheFile(projectTechName, codeType);
         try (OutputStream out = new FileOutputStream(cacheFile)) {
@@ -79,7 +89,7 @@ public class CodeM2CacheManager {
 
     public static File getCacheFile(String projectTechName, ERepositoryObjectType codeType) {
         String cacheFileName = PomIdsHelper.getProjectGroupId(projectTechName) + "." + codeType.name().toLowerCase() + "-" //$NON-NLS-1$ //$NON-NLS-2$
-                + PomIdsHelper.getCodesVersion(projectTechName) + ".cache"; // $NON-NLS-1$
+                + PomIdsHelper.getCodesVersion(projectTechName) + "-" + VersionUtils.getInternalVersion() + ".cache"; // $NON-NLS-1$
         return new File(cacheFolder, cacheFileName);
     }
 

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

@@ -97,6 +97,10 @@ public class ProcessorDependenciesManager {
             if (uniqueDependencies.contains(mavenUri)) {
                 continue; // must be same GAV, avoid the different other attrs for modules
             }
+            Object object = module.getExtraAttributes().get("ROUTINE_EXCLUDE");
+            if (object != null && Boolean.valueOf(object.toString())) {
+                continue;
+            }
             uniqueDependencies.add(mavenUri);
             Dependency dependency = PomUtil.createModuleDependency(mavenUri);
             if (dependency != null) {

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

@@ -19,7 +19,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Exclusion;
 import org.apache.maven.model.Model;
 import org.eclipse.core.resources.IFile;
 import org.talend.core.GlobalServiceRegister;
@@ -130,6 +132,13 @@ public abstract class AbstractMavenCodesTemplatePom extends AbstractMavenGeneral
                         dependency.setScope("provided");
                 }
                 if (dependency != null) {
+                    if (StringUtils.equals(dependency.getGroupId(), "org.talend.daikon")//$NON-NLS-1$
+                            && StringUtils.equals(dependency.getArtifactId(), "crypto-utils")) {//$NON-NLS-1$
+                        Exclusion exclusion = new Exclusion();
+                        exclusion.setGroupId("commons-codec"); //$NON-NLS-1$
+                        exclusion.setArtifactId("commons-codec"); //$NON-NLS-1$
+                        dependency.addExclusion(exclusion);
+                    }
                     existedDependencies.add(dependency);
                 }
             }

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

@@ -207,6 +207,38 @@ public abstract class AbstractMavenProcessorPom extends CreateMavenBundleTemplat
                 shade.setGroupId("org.apache.maven.plugins"); //$NON-NLS-1$
                 shade.setArtifactId("maven-shade-plugin"); //$NON-NLS-1$
                 shade.setVersion("3.1.0"); //$NON-NLS-1$
+                
+                Dependency codecDep = new Dependency();
+                codecDep.setGroupId("commons-codec");
+                codecDep.setArtifactId("commons-codec");
+                codecDep.setVersion("1.15");
+                
+                Dependency guavaDep = new Dependency();
+                guavaDep.setGroupId("com.google.guava");
+                guavaDep.setArtifactId("guava");
+                guavaDep.setVersion("30.0-jre");
+                
+                Dependency ioDep = new Dependency();
+                ioDep.setGroupId("commons-io");
+                ioDep.setArtifactId("commons-io");
+                ioDep.setVersion("2.8.0");
+                
+                Dependency sharedUtilsDep = new Dependency();
+                sharedUtilsDep.setGroupId("org.apache.maven.shared");
+                sharedUtilsDep.setArtifactId("maven-shared-utils");
+                sharedUtilsDep.setVersion("3.3.3");
+                
+                Dependency mavenCoreDep = new Dependency();
+                mavenCoreDep.setGroupId("org.apache.maven");
+                mavenCoreDep.setArtifactId("maven-core");
+                mavenCoreDep.setVersion("3.8.3");
+                
+                shade.getDependencies().add(guavaDep);
+                shade.getDependencies().add(codecDep);
+                shade.getDependencies().add(ioDep);
+                shade.getDependencies().add(sharedUtilsDep);
+                shade.getDependencies().add(mavenCoreDep);
+                              
                 List<PluginExecution> executions = shade.getExecutions();
                 PluginExecution execution = new PluginExecution();
                 executions.add(execution);

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

@@ -12,6 +12,7 @@
 // ============================================================================
 package org.talend.designer.maven.tools.creator;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
@@ -40,6 +41,8 @@ public abstract class CreateMaven {
 
     private Map<String, Object> argumentsMap;
 
+    protected Map<String, String> additionalProperties = new HashMap<>();
+
     public String getVersion() {
         return this.version;
     }

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

@@ -274,6 +274,37 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
         checkPomProperty(properties, "talend.job.type", ETalendMavenVariables.JobType,
                 jobInfoProp.getProperty(JobInfoProperties.JOB_TYPE));
 
+        org.talend.core.model.general.Project currentProject = ProjectManager.getInstance()
+                .getProjectFromProjectTechLabel(project.getTechnicalLabel());
+        String branchName = ProjectManager.getInstance().getMainProjectBranch(project);
+        try {
+            if (branchName == null) {
+                ProjectPreferenceManager preferenceManager =
+                        new ProjectPreferenceManager(currentProject, "org.talend.repository", false);
+                branchName = preferenceManager.getValue(RepositoryConstants.PROJECT_BRANCH_ID);
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+        if (null != branchName && branchName.startsWith("branches/")) {
+            branchName = branchName.substring(9);
+            properties.setProperty("talend.project.branch.name", branchName);
+        }
+
+        try {
+            if ((ProcessorUtilities.isCIMode() || !currentProject.isLocal()) && IGITProviderService.get() != null
+                    && IGITProviderService.get().isGITProject(currentProject) && IGitInfoService.get() != null) {
+                additionalProperties.clear();
+                additionalProperties.putAll(IGitInfoService.get().getGitInfo(property));
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+        properties.setProperty("talend.job.git.author", additionalProperties.getOrDefault(IGitInfoService.GIT_AUTHOR, ""));
+        properties.setProperty("talend.job.git.commit.id", additionalProperties.getOrDefault(IGitInfoService.GIT_COMMIT_ID, ""));
+        properties.setProperty("talend.job.git.commit.date",
+                additionalProperties.getOrDefault(IGitInfoService.GIT_COMMIT_DATE, ""));
+
         boolean publishAsSnapshot = BooleanUtils
                 .toBoolean((String) property.getAdditionalProperties().get(MavenConstants.NAME_PUBLISH_AS_SNAPSHOT));
 
@@ -543,7 +574,7 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
                                 "${talend.job.bat.addition}" },
                         new String[] { jvmArgsStr.toString().trim(), getWindowsClasspath(), jobClass,
                                 windowsScriptAdditionValue.toString() });
-        batContent = normalizeSpaces(batContent);
+        batContent = normalizeSpaces(batContent, "\r\n");
         String shContent = MavenTemplateManager.getProjectSettingValue(IProjectSettingPreferenceConstants.TEMPLATE_SH,
                 templateParameters);
         shContent = StringUtils
@@ -583,32 +614,13 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
         if (!isOptionChecked(TalendProcessArgumentConstant.ARG_AVOID_BRANCH_NAME)) {
             jobInfoContent = StringUtils.replace(jobInfoContent, "${talend.project.branch}", mainProjectBranch);
         }
-        String gitAuthor = "";
-        String gitCommitId = "";
-        String gitCommitDate = "";
-        Map<String, String> gitInfo = null;
-        GlobalServiceRegister serviceRegister = GlobalServiceRegister.getDefault();
-        IGITProviderService gitProviderService = null;
-        if (serviceRegister.isServiceRegistered(IGITProviderService.class)) {
-            gitProviderService = (IGITProviderService) GlobalServiceRegister.getDefault().getService(IGITProviderService.class);
-        }
-        if (!ProcessorUtilities.isCIMode() && !project.isLocal() && gitProviderService != null
-                && gitProviderService.isGITProject(project)) {
-            try {
-                if (serviceRegister.isServiceRegistered(IGitInfoService.class)) {
-                    IGitInfoService gitInfoService = serviceRegister.getService(IGitInfoService.class);
-                    gitInfo = gitInfoService.getGitInfo(property);
-                    gitAuthor = gitInfo.get(IGitInfoService.GIT_AUTHOR);
-                    gitCommitId = gitInfo.get(IGitInfoService.GIT_COMMIT_ID);
-                    gitCommitDate = gitInfo.get(IGitInfoService.GIT_COMMIT_DATE);
-                }
-            } catch (Exception e) {
-                ExceptionHandler.process(e);
-            }
-        }
-        jobInfoContent = StringUtils.replace(jobInfoContent, "${talend.git.author}", gitAuthor);
-        jobInfoContent = StringUtils.replace(jobInfoContent, "${talend.git.commitId}", gitCommitId);
-        jobInfoContent = StringUtils.replace(jobInfoContent, "${talend.git.commitDate}", gitCommitDate);
+
+        jobInfoContent = StringUtils.replace(jobInfoContent, "${talend.git.author}",
+                additionalProperties.getOrDefault(IGitInfoService.GIT_AUTHOR, ""));
+        jobInfoContent = StringUtils.replace(jobInfoContent, "${talend.git.commitId}",
+                additionalProperties.getOrDefault(IGitInfoService.GIT_COMMIT_ID, ""));
+        jobInfoContent = StringUtils.replace(jobInfoContent, "${talend.git.commitDate}",
+                additionalProperties.getOrDefault(IGitInfoService.GIT_COMMIT_DATE, ""));
 
         IFolder templateFolder = codeProject.getTemplatesFolder();
         IFile shFile = templateFolder.getFile(IProjectSettingTemplateConstants.JOB_RUN_SH_TEMPLATE_FILE_NAME);
@@ -936,7 +948,6 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
         
         IMaven maven = MavenPlugin.getMaven();
         ArtifactRepository repository = maven.getLocalRepository();
-        boolean isDIJob = ERepositoryObjectType.getItemType(getJobProcessor().getProperty().getItem()) == ERepositoryObjectType.PROCESS;
         for (Dependency dependency : duplicateDependencies) {
             if (((SortableDependency) dependency).isAssemblyOptional()) {
                 continue;
@@ -947,7 +958,7 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
             sourceLocation = path.toString();
             
             boolean latestVersionOrLowerVersionInChildJob = isLatestVersionOrLowerVersionInChildJob(parentJobDependencies, childJobDependencies, duplicateLibs, dependency);
-            if (isDIJob && !latestVersionOrLowerVersionInChildJob && !new File(sourceLocation).exists()) {
+            if (!latestVersionOrLowerVersionInChildJob && !new File(sourceLocation).exists()) {
                 CommonExceptionHandler.warn("Job dependency [" + sourceLocation + "] does not exist!");
                 continue;
             }
@@ -1049,6 +1060,10 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
 
     // https://jira.talendforge.org/browse/TUP-27053
     public static String normalizeSpaces(String src) {
+        return normalizeSpaces(src,"\n");
+    }
+    
+    public static String normalizeSpaces(String src, String lineSeparator) {
         StringBuffer sb = new StringBuffer();
         try (Scanner scanner = new Scanner(src)) {
             while (scanner.hasNextLine()) {
@@ -1057,7 +1072,7 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
                 if (!line.isEmpty()) {
                     sb.append(line);
                 }
-                sb.append('\n');
+                sb.append(lineSeparator);
             }
         } catch (Exception e) {
 

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

@@ -14,6 +14,7 @@ package org.talend.designer.maven.utils;
 
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -145,6 +146,23 @@ public class MavenProjectUtils {
         }
     }
 
+    public static void addProjectClasspathEntry(IProgressMonitor monitor, IProject project, List<IClasspathEntry> entries) {
+        try {
+            Set<IClasspathEntry> classpathentries = new LinkedHashSet<IClasspathEntry>();
+            IJavaProject javaProject = JavaCore.create(project);
+            IClasspathEntry[] rawClasspathEntries = javaProject.getRawClasspath();
+            for (IClasspathEntry entry : rawClasspathEntries) {
+                classpathentries.add(entry);
+            }
+            classpathentries.addAll(entries);
+            rawClasspathEntries = classpathentries.toArray(new IClasspathEntry[] {});
+            javaProject.setRawClasspath(rawClasspathEntries, monitor);
+            javaProject.setOutputLocation(project.getFolder(MavenSystemFolders.JAVA.getOutputPath()).getFullPath(), monitor);
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+    }
+
 
     /**
      * Clear compliance settings from project, and set them into Eclipse compliance settings

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.developpement</artifactId>

main/plugins/org.talend.help.external/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.help.external</artifactId>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1</version>
+    <version>8.0.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.helpers</artifactId>