Merge branch 'master' into csun/bugfix/master/TESB-32049

route with Studio 7.4.1

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

@@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.apache.log4j,
  org.talend.libraries.apache,
  org.talend.commons.runtime,
- org.talend.libraries.ui
+ org.talend.libraries.ui,
+ org.apache.ant
 Export-Package: 
  org.talend.commons.ui.runtime,
  org.talend.commons.ui.runtime.exception,

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

@@ -166,6 +166,7 @@ public enum ECoreImage implements IImage {
     RECYCLE_BIN_OVERLAY("/icons1/recycle_bin_overlay.gif"), //$NON-NLS-1$
     DELETED_OVERLAY("/icons1/deleted_overlay.gif"), //$NON-NLS-1$
     IMPORT_JAR("/icons1/importjar.gif"), //$NON-NLS-1$
+    SHARE_LIBS("/icons1/share.png"), //$NON-NLS-1$
     REFERENCED_ICON("/icons1/referenced.png"), //$NON-NLS-1$
 
     CDC_ADDED_OVERLAY("/icons1/cdc_added_overlay.png"), //$NON-NLS-1$

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/ws/WindowSystem.java

@@ -16,6 +16,8 @@ import org.eclipse.core.internal.runtime.InternalPlatform;
 import org.eclipse.core.runtime.Platform;
 import org.osgi.framework.BundleContext;
 
+
+
 /**
  *
  * DOC root class global comment. Detailled comment <br/>
@@ -52,5 +54,9 @@ public class WindowSystem {
     public static boolean isOSX() {
         return Platform.WS_CARBON.equals(ws) || Platform.WS_COCOA.equals(ws);
     }
+    
+    public static boolean isBigSurOrLater () {
+    	return isOSX() && ("10.16".compareTo(System.getProperty("os.version","0")) <= 0);
+    }
 
 }

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

@@ -120,8 +120,15 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.3.5</version>
+                <version>5.1.1</version>
                 <extensions>true</extensions>
+                <dependencies>
+                 <dependency>
+                  <groupId>com.google.guava</groupId>
+                  <artifactId>guava</artifactId>
+                  <version>30.0-jre</version>
+                 </dependency>
+                </dependencies>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/database/SAPHanaDataBaseMetadata.java

@@ -148,7 +148,7 @@ public class SAPHanaDataBaseMetadata extends FakeDatabaseMetaData {
         }
 
         // For Calculation View
-        if (ArrayUtils.contains(neededTypes, NEEDED_TYPES[3])) {
+        if (ArrayUtils.contains(neededTypes, NEEDED_TYPES[3]) && "_SYS_BIC".equalsIgnoreCase(schemaPattern)) { //$NON-NLS-1$
             // check if the type is contained is in the types needed.
             String sqlcv = "SELECT OBJECT_NAME,PACKAGE_ID FROM _SYS_REPO.ACTIVE_OBJECT WHERE OBJECT_SUFFIX = 'calculationview'"; //$NON-NLS-1$
             if (tableNamePattern != null && !tableNamePattern.equals("%")) { //$NON-NLS-1$
@@ -171,7 +171,7 @@ public class SAPHanaDataBaseMetadata extends FakeDatabaseMetaData {
                         packageId = packageId.trim();
                     }
                     String name = packageId + "/" + objectName; //$NON-NLS-1$
-                    String[] r = new String[] { "", "_SYS_BIC", name, NEEDED_TYPES[3], "", packageId }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                    String[] r = new String[] { "", schemaPattern, name, NEEDED_TYPES[3], "", packageId }; //$NON-NLS-1$ //$NON-NLS-2$
                     listcv.add(r);
                 }
             } catch (SQLException e) {
@@ -355,4 +355,16 @@ public class SAPHanaDataBaseMetadata extends FakeDatabaseMetaData {
         tableResultSet.setData(list);
         return tableResultSet;
     }
+
+    @Override
+    public String getDatabaseProductName() throws SQLException {
+        return this.connection.getMetaData().getDatabaseProductName();
+
+    }
+
+    @Override
+    public String getDatabaseProductVersion() throws SQLException {
+        return this.connection.getMetaData().getDatabaseProductVersion();
+    }
+
 }

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/drawing/background/BackgroundRefresher.java

@@ -240,7 +240,11 @@ public class BackgroundRefresher implements IBackgroundRefresher {
 
             gc.dispose();
 
-            drawableComposite.getBgDrawableComposite().setBackgroundImage(newImage);
+            if (WindowSystem.isBigSurOrLater()) {
+                drawableComposite.refreshBgDrawableCompsite(newImage);
+            } else {
+                drawableComposite.getBgDrawableComposite().setBackgroundImage(newImage);
+            }
 
             clearImage(oldImage);
             oldImage = newImage;

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/drawing/background/IBgDrawableComposite.java

@@ -13,6 +13,7 @@
 package org.talend.commons.ui.swt.drawing.background;
 
 import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Composite;
 
@@ -28,6 +29,8 @@ public interface IBgDrawableComposite {
 
     public Composite getBgDrawableComposite();
 
+    public void refreshBgDrawableCompsite(Image image);
+
     public void setOffset(Point offsetPoint);
 
     public Point getOffset();

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/linking/BgDrawableComposite.java

@@ -12,7 +12,12 @@
 // ============================================================================
 package org.talend.commons.ui.swt.linking;
 
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.PaintEvent;
+import org.eclipse.swt.events.PaintListener;
 import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Composite;
 import org.talend.commons.ui.swt.drawing.background.IBgDrawableComposite;
@@ -28,6 +33,8 @@ public abstract class BgDrawableComposite implements IBgDrawableComposite {
     private Composite commonParent;
 
     private Point offsetPoint = new Point(0, 0);
+    
+    private Image backgroundImage;
 
     /**
      * DOC amaumont DrawableBackground constructor comment.
@@ -36,9 +43,36 @@ public abstract class BgDrawableComposite implements IBgDrawableComposite {
      */
     public BgDrawableComposite(Composite commonParent) {
         this.commonParent = commonParent;
+        this.commonParent.addPaintListener(new PaintListener() {
+
+            @Override
+            public void paintControl(PaintEvent arg0) {
+                if (backgroundImage != null) {
+                    arg0.gc.drawImage(backgroundImage, 0, 0);
+                }
+            }
+        });
+        this.commonParent.addDisposeListener(new DisposeListener() {
+
+            @Override
+            public void widgetDisposed(DisposeEvent arg0) {
+                if (backgroundImage != null && !backgroundImage.isDisposed()) {
+                    backgroundImage.dispose();
+                }
+            }
+        });
     }
 
-    /*
+    @Override
+    public void refreshBgDrawableCompsite(Image image) {
+        if (backgroundImage != null) {
+            backgroundImage.dispose();
+        }
+        backgroundImage = image;
+        this.commonParent.redraw();
+    }
+
+	/*
      * (non-Javadoc)
      *
      * @see org.talend.commons.ui.swt.drawing.background.IDrawableComposite#drawBackground(org.eclipse.swt.graphics.GC)

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/linking/TreeToTablesLinker.java

@@ -15,6 +15,7 @@ package org.talend.commons.ui.swt.linking;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -77,6 +78,8 @@ public class TreeToTablesLinker<D1, D2> extends BgDrawableComposite implements I
 
     private List<LinkableTable> linkableTableList;
 
+    private HashMap<Table, Point> tableToCommonPointMap = new HashMap<Table, Point>();
+
     /**
      * DOC amaumont TreeToTableLinker constructor comment.
      *
@@ -258,8 +261,34 @@ public class TreeToTablesLinker<D1, D2> extends BgDrawableComposite implements I
 
             Point offset = getOffset();
 
-            gc.drawLine(pointStartStraight.x + offset.x, pointStartStraight.y + offset.y, pointEndStraight.x + offset.x,
-                    pointEndStraight.y + offset.y);
+            if (WindowSystem.isBigSurOrLater()) {
+                if (yStraight < tree.getBounds().y + treeItemHeight) {
+                    yStraight = tree.getBounds().y + treeItemHeight;
+                }
+                if (yStraight > tree.getBounds().height + tree.getBounds().y + treeItemHeight) {
+                    yStraight = tree.getBounds().height + tree.getBounds().y + treeItemHeight;
+                }
+                pointEndStraight = new Point(treeToCommonPoint.x + tree.getClientArea().width, yStraight);
+                if (tableToCommonPointMap.get(table) == null) {
+                    tableToCommonPointMap.put(table, display.map(table, getBgDrawableComposite(), new Point(0, 0)));
+                }
+                // scroll issue for table
+                if (tableToCommonPoint.y != tableToCommonPointMap.get(table).y) {
+                    pointEndCentralCurve.y = tableToCommonPoint.y + tableItemBounds.y 
+                            + table.getItemHeight() / 2;
+                }
+                if (pointEndCentralCurve.y < tableToCommonPointMap.get(table).y) {
+                    pointEndCentralCurve.y = tableToCommonPointMap.get(table).y;
+                }
+                if (pointEndCentralCurve.y > tableToCommonPointMap.get(table).y + tableBounds.height - table.getBorderWidth()
+                        - table.getHeaderHeight()) {
+                    pointEndCentralCurve.y = tableToCommonPointMap.get(table).y + tableBounds.height - table.getBorderWidth()
+                            - table.getHeaderHeight();
+                }
+            } else {
+                gc.drawLine(pointStartStraight.x + offset.x, pointStartStraight.y + offset.y, pointEndStraight.x + offset.x,
+                        pointEndStraight.y + offset.y);
+            }
 
             pointEndStraight.x += offset.x;
             pointEndStraight.y += offset.y;

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

@@ -108,5 +108,9 @@ public interface FileConstants {
     String BLUEPRINT_FOLDER_NAME = "OSGI-INF/blueprint"; //$NON-NLS-1$
 
     String SPRING_FOLDER_NAME = "META-INF/spring"; //$NON-NLS-1$
+    
+    String TALEND_FOLDER_NAME = "TALEND-INF"; //$NON-NLS-1$
+    
+    String MAVEN_FOLDER_NAME = "MAVEN-INF";
 
 }

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

@@ -135,6 +135,7 @@ import org.talend.core.runtime.repository.item.ItemProductKeys;
 import org.talend.core.runtime.services.IGenericWizardService;
 import org.talend.core.runtime.services.IMavenUIService;
 import org.talend.core.runtime.util.ItemDateParser;
+import org.talend.core.runtime.util.SharedStudioUtils;
 import org.talend.core.service.ICoreUIService;
 import org.talend.cwm.helper.SubItemHelper;
 import org.talend.cwm.helper.TableHelper;
@@ -1798,9 +1799,12 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * @throws PersistenceException
      */
     private void emptyTempFolder(Project project) throws PersistenceException {
-        String str = (System.getProperty("eclipse.home.location") + "temp").substring(5);
-        FilesUtils.deleteFolder(new File(str), false);
-
+    	try {
+            String str = SharedStudioUtils.getTempFolderPath().toPortableString();
+            FilesUtils.deleteFolder(new File(str), false);
+    	}catch (Exception ex) {
+    		ExceptionHandler.process(ex);
+    	}
         long start = System.currentTimeMillis();
         IProject fsProject = ResourceUtils.getProject(project);
         IFolder folder = ResourceUtils.getFolder(fsProject, RepositoryConstants.TEMP_DIRECTORY, false);
@@ -2195,6 +2199,14 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                     TimeMeasurePerformance.step("logOnProject", "Sync components libraries"); //$NON-NLS-1$
                 }
 
+                try {
+                    // for new added mapping file, sync to project mapping folder
+                    MetadataTalendType.syncNewMappingFileToProject();
+                } catch (SystemException e) {
+                    // ignore
+                    ExceptionHandler.process(e);
+                }
+
                 currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
                 currentMonitor.beginTask("Execute before logon migrations tasks", 1); //$NON-NLS-1$
                 ProjectManager.getInstance().getMigrationRecords().clear();
@@ -2296,8 +2308,6 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                         // set the project mappings url
                         System.setProperty("talend.mappings.url", url.toString()); // $NON-NLS-1$
                     }
-                    // for new added mapping file, sync to project mapping folder
-                    MetadataTalendType.syncNewMappingFileToProject();
                 } catch (SystemException e) {
                     // ignore
                     ExceptionHandler.process(e);

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

@@ -149,7 +149,6 @@ public class ConvertJobsUtil {
     }
 
     public static enum JobStreamingFramework {
-        STORMFRAMEWORK("Storm", "Storm (Deprecated)", "_STORM_STORM_FRAMEWORK_"), //$NON-NLS-1$ //$NON-NLS-2$
         SPARKSTREAMINGFRAMEWORK("Spark Streaming", "Spark Streaming", "_STORM_SPARKSTREAMING_FRAMEWORK_"); //$NON-NLS-1$ //$NON-NLS-2$
 
         private String name;
@@ -360,8 +359,7 @@ public class ConvertJobsUtil {
         if (JobBatchFramework.MAPREDUCEFRAMEWORK.getDisplayName().equals(frameworkObj)
                 || JobBatchFramework.SPARKFRAMEWORK.getDisplayName().equals(frameworkObj)) {
             return JobType.BIGDATABATCH.getDisplayName();
-        } else if (JobStreamingFramework.STORMFRAMEWORK.getName().equals(frameworkObj)
-                || JobStreamingFramework.SPARKSTREAMINGFRAMEWORK.getName().equals(frameworkObj)) {
+        } else if (JobStreamingFramework.SPARKSTREAMINGFRAMEWORK.getName().equals(frameworkObj)) {
             return JobType.BIGDATASTREAMING.getDisplayName();
         } else {
             return JobType.STANDARD.getDisplayName();
@@ -677,6 +675,18 @@ public class ConvertJobsUtil {
         final Path path = new Path(pathName.toString());
         return path;
     }
+    
+    public static String getTestCaseJobTypeByPath(String itemPath) {
+        if (JobType.BIGDATASTREAMING.repositoryObjectType != null
+                && itemPath.startsWith(JobType.BIGDATASTREAMING.repositoryObjectType.getFolder())) {
+            return ConvertJobsUtil.JobType.BIGDATASTREAMING.getDisplayName();
+        } else if (JobType.BIGDATABATCH.repositoryObjectType != null
+                && itemPath.startsWith(JobType.BIGDATABATCH.repositoryObjectType.getFolder())) {
+            return JobType.BIGDATABATCH.getDisplayName();
+        }
+        return ConvertJobsUtil.JobType.STANDARD.getDisplayName();
+    }
+
 
     /**
      * DOC nrousseau Comment method "getFrameworkItemsByJobType".

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

@@ -205,6 +205,27 @@ public class StandaloneConnectionContextUtils {
             cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HIVE_ADDITIONAL_JDBC_SETTINGS,
                     getOriginalValue(contextProperties, additionalJDBCSettings));
 
+            String dataprocProjectId = cloneConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HIVE_GOOGLE_PROJECT_ID);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HIVE_GOOGLE_PROJECT_ID,
+                    getOriginalValue(contextProperties, dataprocProjectId));
+
+            String dataprocClusterId = cloneConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HIVE_GOOGLE_CLUSTER_ID);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HIVE_GOOGLE_CLUSTER_ID,
+                    getOriginalValue(contextProperties, dataprocClusterId));
+
+            String dataprocRegion = cloneConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HIVE_GOOGLE_REGION);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HIVE_GOOGLE_REGION,
+                    getOriginalValue(contextProperties, dataprocRegion));
+
+            String dataprocJarsBucket = cloneConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HIVE_GOOGLE_JARS_BUCKET);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HIVE_GOOGLE_JARS_BUCKET,
+                    getOriginalValue(contextProperties, dataprocJarsBucket));
+
+            String dataprocPathToCredentials = cloneConn.getParameters()
+                    .get(ConnParameterKeys.CONN_PARA_KEY_HIVE_AUTHENTICATION_PATH_TO_GOOGLE_CREDENTIALS);
+            cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HIVE_AUTHENTICATION_PATH_TO_GOOGLE_CREDENTIALS,
+                    getOriginalValue(contextProperties, dataprocPathToCredentials));
+
             String hiveEnableHa = cloneConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HIVE_ENABLE_HA);
             cloneConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HIVE_ENABLE_HA,
                     getOriginalValue(contextProperties, hiveEnableHa));

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

@@ -123,7 +123,8 @@ Require-Bundle: org.eclipse.jdt.core,
  org.apache.servicemix.bundles.avro,
  jackson-core-asl,
  org.talend.libraries.jackson,
- org.eclipse.m2e.core
+ org.eclipse.m2e.core,
+ org.talend.libraries.apache.common
 Bundle-Activator: org.talend.core.runtime.CoreRuntimePlugin
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,

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

@@ -0,0 +1,288 @@
+<?xml version="1.0"?>
+<mapping>
+	<dbms product="SINGLESTORE" id="singlestore_id" label="Mapping SingleStore"
+		default="true">
+		<dbTypes>
+			<dbType type="BOOL" ignoreLen="true" ignorePre="true" />
+			<dbType type="BOOLEAN" ignoreLen="true" ignorePre="true" />
+			<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="false" />
+			<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="GEOGRAPHY" ignoreLen="true" ignorePre="true" />
+			<dbType type="GEOGRAPHYPOINT" 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="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="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"/>
+			<dbType type="JSON" ignoreLen="true" ignorePre="true"/>
+		</dbTypes>
+
+		<language name="java">
+			<talendToDbTypes><!-- Adviced mappings  -->
+				<talendType type="id_List"/>
+				<talendType type="id_Boolean">	
+					<dbType type="BOOL" 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="GEOGRAPHY" />
+					<dbType type="GEOGRAPHYPOINT" />
+					<dbType type="MEDIUMINT" />
+					<dbType type="LONGBLOB" />
+					<dbType type="MEDIUMBLOB" />
+					<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="LONGTEXT"/>
+					<dbType type="MEDIUMTEXT" />
+					<dbType type="TEXT" />
+					<dbType type="TINYTEXT" />
+					<dbType type="CHAR" />
+					<dbType type="JSON" />
+				</talendType>
+			</talendToDbTypes>
+			<dbToTalendTypes>
+				<dbType type="BOOL">
+					<talendType type="id_Boolean" default="true" />
+				</dbType>
+				<dbType type="BOOLEAN">
+					<talendType type="id_Boolean" default="true" />
+				</dbType>
+				<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="GEOGRAPHY">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="GEOGRAPHYPOINT">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="JSON">
+					<talendType type="id_String" default="true" />
+					<talendType type="id_Object" />
+				</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="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="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/src/main/java/org/talend/core/IESBService.java

@@ -94,4 +94,6 @@ public interface IESBService extends IService {
      * @return
      */
     public IProcessor createOSGIJavaProcessor(IProcess process, Property property, boolean filenameFromLabel);
+    
+    public boolean isSOAPServiceProvider(Item item);
 }

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

@@ -126,6 +126,8 @@ public class PluginChecker {
 
     public static final String BDEE_PLUGIN_ID = "org.talend.designer.bigdata"; //$NON-NLS-1$
 
+    public static final String BD_ROUTINE_PLUGIN_ID = "org.talend.designer.routines.bigdata"; //$NON-NLS-1$
+
     public static final String DOCKER_PLUGIN_ID = "org.talend.designer.docker"; //$NON-NLS-1$
 
     public static final String HELP_DI_EE_PLUGIN_ID = "org.talend.help.dataprep"; //$NON-NLS-1$
@@ -366,6 +368,10 @@ public class PluginChecker {
         return isPluginLoaded(ESBSE_PLUGIN_ID);
     }
 
+    public static boolean isBigdataRoutineLoaded() {
+        return isPluginLoaded(BD_ROUTINE_PLUGIN_ID);
+    }
+
     public static String getBundlePath(String bundleName) {
         String bundlePath = ""; //$NON-NLS-1$
         Bundle refBundle = Platform.getBundle(bundleName);

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

@@ -163,6 +163,18 @@ public class ConnParameterKeys {
 
     public static final String CONN_PARA_KEY_HIVE_AUTHENTICATION_MAPRTICKET_DURATION = "CONN_PARA_KEY_HIVE_AUTHENTICATION_MAPRTICKET_DURATION";//$NON-NLS-1$
 
+    public static final String CONN_PARA_KEY_HIVE_GOOGLE_PROJECT_ID = "CONN_PARA_KEY_HIVE_GOOGLE_PROJECT_ID";//$NON-NLS-1$
+
+    public static final String CONN_PARA_KEY_HIVE_GOOGLE_CLUSTER_ID = "CONN_PARA_KEY_HIVE_GOOGLE_CLUSTER_ID";//$NON-NLS-1$
+
+    public static final String CONN_PARA_KEY_HIVE_GOOGLE_REGION = "CONN_PARA_KEY_HIVE_GOOGLE_REGION";//$NON-NLS-1$
+
+    public static final String CONN_PARA_KEY_HIVE_GOOGLE_JARS_BUCKET = "CONN_PARA_KEY_HIVE_GOOGLE_JARS_BUCKET";//$NON-NLS-1$
+
+    public static final String CONN_PARA_KEY_HIVE_AUTHENTICATION_DEFINE_PATH_TO_GOOGLE_CREDENTIALS = "CONN_PARA_KEY_HIVE_AUTHENTICATION_DEFINE_PATH_TO_GOOGLE_CREDENTIALS";//$NON-NLS-1$
+
+    public static final String CONN_PARA_KEY_HIVE_AUTHENTICATION_PATH_TO_GOOGLE_CREDENTIALS = "CONN_PARA_KEY_HIVE_AUTHENTICATION_PATH_TO_GOOGLE_CREDENTIALS";//$NON-NLS-1$
+
     /**
      * The key is for metastore server.
      */

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

@@ -58,7 +58,7 @@ public enum EDatabaseVersion4Drivers {
     HSQLDB_SERVER(new DbVersion4Drivers(EDatabaseTypeName.HSQLDB_SERVER, "hsqldb.jar")), //$NON-NLS-1$
     HSQLDB_WEBSERVER(new DbVersion4Drivers(EDatabaseTypeName.HSQLDB_WEBSERVER, "hsqldb.jar")), //$NON-NLS-1$
 
-    H2(new DbVersion4Drivers(EDatabaseTypeName.H2, "h2-1.3.160.jar")), //$NON-NLS-1$
+    H2(new DbVersion4Drivers(EDatabaseTypeName.H2, "h2-1.4.198.jar")), //$NON-NLS-1$
 
     //
     JAVADB_EMBEDED(new DbVersion4Drivers(EDatabaseTypeName.JAVADB_EMBEDED, "derby.jar")), //$NON-NLS-1$

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

@@ -20,6 +20,8 @@ package org.talend.core.hadoop;
 public class HadoopConstants {
 
     public static final String SPARK_LOCAL_MODE = "SPARK_LOCAL_MODE";
+    
+    public static final String SPARK_LOCAL_VERSION = "SPARK_LOCAL_VERSION";
 
     public static final String SPARK_MODE = "SPARK_MODE";
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/conf/EHadoopConfs.java

@@ -40,8 +40,6 @@ public enum EHadoopConfs {
 
     SQOOP("SQOOP", new String[] { "sqoop-site.xml" }), //$NON-NLS-1$ //$NON-NLS-2$
 
-    STORM("STORM", new String[] { "storm-site.xml" }), //$NON-NLS-1$ //$NON-NLS-2$
-
     TEZ("TEZ", new String[] { "tez-site.xml" }), //$NON-NLS-1$ //$NON-NLS-2$
 
     ZOOKEEPER("ZOOKEEPER", new String[0]), //$NON-NLS-1$

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/components/ComponentUtilities.java

@@ -81,6 +81,11 @@ public final class ComponentUtilities {
 
     public static void setNodeValue(NodeType node, String name, String value) {
         ElementParameterType property = getNodeProperty(node, name);
+        
+        if (property == null) {
+            throw new IllegalArgumentException( "The component node "+node.getComponentName()+" doesn't have the property "+name );
+        }
+        
         property.setValue(value);
     }
 

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

@@ -560,10 +560,10 @@ public class ContextUtils {
                 return false;
             }
             if (sourceParam.getPrompt() == null) {
-                sourceParam.setPrompt(""); //$NON-NLS-1$
+                sourceParam.setPrompt(sourceParam.getName() + "?"); //$NON-NLS-1$
             }
             if (targetParamType.getPrompt() == null) {
-                targetParamType.setPrompt(""); //$NON-NLS-1$
+                targetParamType.setPrompt(targetParamType.getName() + "?"); //$NON-NLS-1$
             }
             if (!sourceParam.getPrompt().equals(targetParamType.getPrompt())) {
                 return false;

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

@@ -320,7 +320,8 @@ public class JobContextManager implements IContextManager {
                 contextParam = new JobContextParameter();
                 contextParam.setContext(context);
                 contextParam.setName(contextParamType.getName());
-                contextParam.setPrompt(contextParamType.getPrompt());
+                contextParam.setPrompt(
+                        contextParamType.getPrompt() == null ? (contextParamType.getName() + "?") : contextParamType.getPrompt());
                 contextParam.setInternalId(contextParamType.getInternalId());
                 originalParamerters.add(contextParam.getName());
                 boolean exists = true;

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

@@ -1769,6 +1769,37 @@ public class RepositoryToComponentProperty {
         if (StringUtils.equals("MAPPING", value)) {//$NON-NLS-1$
             return connection.getDbmsId();
         }
+        if (value.equals("GOOGLE_PROJECT_ID")) {
+            String projectId = connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HIVE_GOOGLE_PROJECT_ID);
+            return getAppropriateValue(connection, projectId);
+        }
+
+        if (value.equals("GOOGLE_CLUSTER_ID")) {
+            String clusterId = connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HIVE_GOOGLE_CLUSTER_ID);
+            return getAppropriateValue(connection, clusterId);
+        }
+
+        if (value.equals("GOOGLE_REGION")) {
+            String region = connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HIVE_GOOGLE_REGION);
+            return getAppropriateValue(connection, region);
+        }
+
+        if (value.equals("GOOGLE_JARS_BUCKET")) {
+            String jarsBucket = connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HIVE_GOOGLE_JARS_BUCKET);
+            return getAppropriateValue(connection, jarsBucket);
+        }
+
+        if (value.equals("DEFINE_PATH_TO_GOOGLE_CREDENTIALS")) {
+            String usePathToCredentials = connection.getParameters()
+                    .get(ConnParameterKeys.CONN_PARA_KEY_HIVE_AUTHENTICATION_DEFINE_PATH_TO_GOOGLE_CREDENTIALS);
+            return Boolean.parseBoolean(usePathToCredentials);
+        }
+
+        if (value.equals("PATH_TO_GOOGLE_CREDENTIALS")) {
+            String pathToCredentials = connection.getParameters()
+                    .get(ConnParameterKeys.CONN_PARA_KEY_HIVE_AUTHENTICATION_PATH_TO_GOOGLE_CREDENTIALS);
+            return getAppropriateValue(connection, pathToCredentials);
+        }
         return null;
     }
 

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

@@ -21,6 +21,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
+import org.eclipse.emf.common.util.EList;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.utils.VersionUtils;
@@ -53,6 +54,7 @@ import org.talend.core.utils.BitwiseOptionUtils;
 import org.talend.designer.core.IDesignerCoreService;
 import org.talend.designer.core.model.utils.emf.talendfile.ContextParameterType;
 import org.talend.designer.core.model.utils.emf.talendfile.ContextType;
+import org.talend.designer.core.model.utils.emf.talendfile.ElementParameterType;
 import org.talend.designer.core.model.utils.emf.talendfile.MetadataType;
 import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
 import org.talend.designer.core.model.utils.emf.talendfile.ProcessType;
@@ -60,6 +62,7 @@ import org.talend.designer.core.model.utils.emf.talendfile.RoutinesParameterType
 import org.talend.designer.runprocess.ItemCacheManager;
 import org.talend.repository.ProjectManager;
 import org.talend.repository.model.IProxyRepositoryFactory;
+import org.apache.commons.text.StringEscapeUtils;
 
 /**
  * DOC bqian class global comment. Detailled comment
@@ -1004,8 +1007,6 @@ public final class ProcessUtils {
         return false;
     }
 
-    
-
     public static boolean isChildRouteProcess(IProcess process) {
         List n = process.getNodesOfType("tRouteInput");
         if (n!=null && n.size()!=0) {
@@ -1013,4 +1014,37 @@ public final class ProcessUtils {
         }
         return false;
     }
+
+    public static String escapeJava(String input) {
+        return StringEscapeUtils.escapeJava(input);
+    }
+
+    public static boolean hasJettyEndpoint(ProcessType process) {
+
+        EList<NodeType> nodesList = process.getNode();
+
+        boolean hasJettyEndpoint = hasJettyEndpoint(nodesList);
+
+        return hasJettyEndpoint;
+    }
+
+    private static boolean hasJettyEndpoint(EList<NodeType> nodesList) {
+        for (NodeType node : nodesList) {
+            if ("cMessagingEndpoint".equals(node.getComponentName())) {
+                for (Object elementParameter : node.getElementParameter()) {
+                    ElementParameterType elementParameterType = (ElementParameterType)elementParameter;
+
+                    String name = elementParameterType.getName();
+                    String value = elementParameterType.getValue();
+
+                    if ("URI".equals(name) && (value != null && StringUtils.startsWith(value.trim(), "\"jetty:"))) {
+                        return true;
+                    }
+                }
+            }
+        }
+
+        return false;
+    }
+
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/temp/ECodePart.java

@@ -32,10 +32,6 @@ public enum ECodePart {
     MRCODE("mrcode"), //$NON-NLS-1$
     MRCONFIG("mrconfig"), //$NON-NLS-1$
     MRJOBFOOTER("mrjobfooter"), //$NON-NLS-1$
-    STORMCODE("stormcode"), //$NON-NLS-1$
-    STORMCONFIG("stormconfig"), //$NON-NLS-1$
-    STORMMONITOR("stormmonitor"), //$NON-NLS-1$
-    STORMJOBFOOTER("stormjobfooter"), //$NON-NLS-1$
     SPARKCODE("sparkcode"), //$NON-NLS-1$
     SPARKCONFIG("sparkconfig"), //$NON-NLS-1$
     SPARKJOBFOOTER("sparkjobfooter"), //$NON-NLS-1$

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/nexus/TalendLibsServerManager.java

@@ -231,7 +231,12 @@ public class TalendLibsServerManager {
         return canConnect;
     }
 
-    public ArtifactRepositoryBean getTalentArtifactServer() {
+    public boolean isProxyArtifactRepoConfigured() {
+        ArtifactRepositoryBean serverBean = getProxyArtifactServer();
+        return serverBean == null ? false : true;
+    }
+
+    public ArtifactRepositoryBean getProxyArtifactServer() {
         ArtifactRepositoryBean serverBean = new ArtifactRepositoryBean();
         // get from ini file first
         String url = System.getProperty(NEXUS_PROXY_URL);
@@ -255,9 +260,16 @@ public class TalendLibsServerManager {
                 serverBean.setType(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_TYPE));
             }
         }
-        hasProxySetting = StringUtils.isNotEmpty(serverBean.getServer());
-        // use default
-        if (!hasProxySetting) {
+        if (StringUtils.isNotEmpty(serverBean.getServer())) {
+            return serverBean;
+        }
+        return null;
+    }
+
+    public ArtifactRepositoryBean getTalentArtifactServer() {
+        ArtifactRepositoryBean serverBean = getProxyArtifactServer();
+        if (serverBean == null) {
+            serverBean = new ArtifactRepositoryBean();
             serverBean.setServer(TALEND_LIB_SERVER);
             serverBean.setUserName(TALEND_LIB_USER);
             serverBean.setPassword(TALEND_LIB_PASSWORD);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/prefs/ITalendCorePrefConstants.java

@@ -208,4 +208,8 @@ public interface ITalendCorePrefConstants {
 
     public static final int ARTIFACT_PROXY_SETTING = 1;
 
+    public static final String NEXUS_SHARE_LIBS = "NEXUS_SHARE_LIBS";
+
+    public static final boolean NEXUS_SHARE_LIBS_DEFAULT = false;
+
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/hd/IHDistribution.java

@@ -30,5 +30,7 @@ public interface IHDistribution {
     IHDistributionVersion getHDVersion(String v, boolean byDisplay);
 
     boolean useCustom();
+    
+    boolean isSparkLocal();
 
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/process/TalendProcessArgumentConstant.java

@@ -52,6 +52,8 @@ public interface TalendProcessArgumentConstant {
 
     static final String ARG_NEED_RULES = "NEED_RULES";
 
+    static final String ARG_NEED_JETTY_SERVER = "NEED_JETTY_SERVER";
+
     static final String ARG_ENABLE_WATCH = "ENABLE_WATCH";
 
     static final String ARG_NEED_PIGUDFS = "NEED_PIGUDFS";

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

@@ -13,7 +13,10 @@
 package org.talend.core.runtime.util;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.NullProgressMonitor;
@@ -84,6 +87,29 @@ public class SharedStudioUtils {
     	return false;
     }
     
+    public static boolean isNeedCleanOnSharedMode() {
+        if (SharedStudioUtils.isSharedStudioMode()) {
+            boolean isNeedClean = installedPatch();
+            String studioArtifactsFileSha256Hex = getStudioArtifactsFileSha256Hex();
+            if (updateArtifactsFileSha256Hex(studioArtifactsFileSha256Hex)) {
+                isNeedClean = true;
+            }
+            return isNeedClean;
+        }
+        return false;
+    }
+    
+    public static boolean updateArtifactsFileSha256Hex(String studioArtifactsFileSha256Hex) {
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(IUpdateService.class)) {
+            IUpdateService updateService = GlobalServiceRegister.getDefault().getService(IUpdateService.class);
+            try {
+                return updateService.updateArtifactsFileSha256Hex(new NullProgressMonitor(), studioArtifactsFileSha256Hex);
+            } catch (Exception e) {
+                ExceptionHandler.process(e);
+            }
+        }
+        return false;
+    }
     public static boolean installedPatch() {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IUpdateService.class)) {
             IUpdateService updateService = GlobalServiceRegister.getDefault().getService(IUpdateService.class);
@@ -108,4 +134,41 @@ public class SharedStudioUtils {
         File extchangeFolder = new File (componentFolder, path.toOSString());
 		return extchangeFolder;
 	}
+	
+	public static IPath getTempFolderPath() {
+		if (SharedStudioUtils.isSharedStudioMode()) {
+			Path wsPath = new Path(Platform.getInstanceLocation().getURL().getPath());
+			return wsPath.append("temp");
+		} else {
+			return new Path(System.getProperty("user.dir")).append("temp");
+		}
+	}
+	
+    public static String getStudioArtifactsFileSha256Hex() {
+        File studioArtifactsFile = new File(Platform.getInstallLocation().getURL().getPath(), "artifacts.xml");//$NON-NLS-1$
+        if (studioArtifactsFile.exists()) {
+            InputStream inputStream = null;
+            try {
+                inputStream = new FileInputStream(studioArtifactsFile);
+                return sha256Hex(inputStream);
+            } catch (FileNotFoundException e) {
+                ExceptionHandler.process(e);
+            } catch (IOException e) {
+                ExceptionHandler.process(e);
+            } finally {
+                if (inputStream != null) {
+                    try {
+                        inputStream.close();
+                    } catch (IOException ex) {
+                        ExceptionHandler.process(ex);
+                    }
+                }
+            }
+        }
+        return "";
+    }
+
+    private static String sha256Hex(final InputStream inputStream) throws IOException {
+        return org.apache.commons.codec.digest.DigestUtils.sha256Hex(inputStream);
+    }
 }

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

@@ -38,4 +38,12 @@ public interface IDQComponentService extends IService {
      * @param node The node which need to be modified
      */
     void correctlyCustomMatcherParameter(NodeType node);
+
+    /**
+     * Change the attribute of MatchingData and use Integer value instead of double value.
+     * 
+     * @param node The node which need to be modified
+     */
+    void covertConfindWeight2Int(NodeType node);
+
 }

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

@@ -18,13 +18,11 @@ import org.eclipse.ui.IEditorPart;
 import org.talend.commons.ui.runtime.image.IImage;
 import org.talend.core.IService;
 import org.talend.core.model.components.IComponentsHandler;
-import org.talend.core.model.general.Project;
 import org.talend.core.model.process.INode;
 import org.talend.core.model.process.IProcess2;
 import org.talend.core.model.properties.Item;
 import org.talend.core.model.properties.ProcessItem;
 import org.talend.core.model.repository.IRepositoryEditorInput;
-import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.repository.model.IRepositoryNode;
 import org.talend.repository.model.nodes.IProjectRepositoryNode;
 
@@ -33,8 +31,6 @@ import org.talend.repository.model.nodes.IProjectRepositoryNode;
  */
 public interface IStormProcessService extends IService {
 
-    boolean needStormProcess();
-
     IRepositoryNode getRootNode(IProjectRepositoryNode projectNode);
 
     public boolean collectStandardProcessNode(List<String> filteredContents, Object node);
@@ -43,8 +39,6 @@ public interface IStormProcessService extends IService {
 
     public boolean isStormEditor(IEditorPart editorPart);
 
-    public List<IRepositoryViewObject> getStormProcesses(Project project);
-
     /**
      * This method is responsible for creating additional information which are going to be registered in the Process
      * (and then in the Item). DOC rdubois Comment method "generateSparkStreamingInfosParameter".

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

@@ -17,9 +17,11 @@ import java.nio.file.Path;
 import java.util.Set;
 import java.util.stream.Stream;
 
+import org.eclipse.swt.graphics.Image;
 import org.talend.core.IService;
 import org.talend.core.model.components.IComponent;
 import org.talend.core.model.properties.Item;
+import org.talend.core.model.repository.ERepositoryObjectType;
 
 /**
  * For documentation, see implementation in org.talend.sdk.component.studio-integration plugin
@@ -33,4 +35,6 @@ public interface ITaCoKitDependencyService extends IService {
     Stream<IComponent> getJobComponents(Item item);
 
     Path findM2Path();
+
+    Image getTaCoKitImageByRepositoryType(ERepositoryObjectType repObjType);
 }

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

@@ -22,4 +22,6 @@ public interface IUpdateService extends IService {
     public boolean syncSharedStudioLibraryInPatch(IProgressMonitor monitor) throws Exception;
     
     public String getSharedStudioMissingPatchVersion();
+    
+    public boolean updateArtifactsFileSha256Hex(IProgressMonitor monitor, String studioArtifactsFileShaCodeHex);
 }

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

@@ -20,6 +20,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import java.util.WeakHashMap;
 
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.core.resources.IFile;
@@ -94,6 +95,8 @@ public final class ProjectManager {
 
     private Set<Project> tempProjects;
 
+    private WeakHashMap<IRepositoryViewObject, Boolean> cachedObjects = new WeakHashMap<IRepositoryViewObject, Boolean>();
+
     private ProjectManager() {
         beforeLogonRecords = new HashSet<String>();
         logonRecords = new HashSet<String>();
@@ -451,9 +454,15 @@ public final class ProjectManager {
                     if (object == null) {
                         return true;
                     }
+                    if (cachedObjects.containsKey(object)) {
+                        return cachedObjects.get(object);
+                    }
+
                     org.talend.core.model.properties.Project emfProject = getProject(object.getProperty().getItem());
                     org.talend.core.model.properties.Project curProject = curP.getEmfProject();
-                    return emfProject.equals(curProject);
+                    boolean ret = emfProject.equals(curProject);
+                    cachedObjects.put(object, ret);
+                    return ret;
 
                 } else {
                     IProjectRepositoryNode root = node.getRoot();

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

@@ -12,6 +12,8 @@
 // ============================================================================
 package org.talend.repository;
 
+import java.util.Set;
+
 import org.talend.commons.exception.LoginException;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.core.model.general.Project;
@@ -45,6 +47,8 @@ public abstract class RepositoryWorkUnit<T> {
 
     private boolean refreshRepository = true; // added for TDI-27085
 
+    private Set<String> specifiedCommitFiles;
+
     /**
      * Usefull for some save only actions, where we're sure everything is up to date.
      */
@@ -194,6 +198,13 @@ public abstract class RepositoryWorkUnit<T> {
         this.refreshRepository = refreshRepository;
     }
 
+    public Set<String> getSpecifiedCommitFiles() {
+        return specifiedCommitFiles;
+    }
+
+    public void setSpecifiedCommitFiles(Set<String> specifiedCommitFiles) {
+        this.specifiedCommitFiles = specifiedCommitFiles;
+    }
 
     /**
      * Getter for avoidUpdateLocks.

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

@@ -24,6 +24,7 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IEditorPart;
 import org.talend.core.IService;
 import org.talend.core.model.components.IComponentsFactory;
+import org.talend.core.model.general.ModuleNeeded;
 import org.talend.core.model.general.Project;
 import org.talend.core.model.metadata.builder.connection.DatabaseConnection;
 import org.talend.core.model.process.IContextManager;
@@ -144,4 +145,8 @@ public interface IRepositoryService extends IService {
 
     public void setShouldCheckRepoViewCommonNavigatorDirty(IRepositoryView repView, boolean shouldFlag);
 
+    boolean isProjectLevelLog4j2();
+
+    List<ModuleNeeded> getLog4j2Modules();
+
 }

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

@@ -34,7 +34,8 @@ Require-Bundle: org.apache.commons.lang,
  org.apache.commons.io,
  org.apache.httpcomponents.httpcore,
  org.apache.httpcomponents.httpclient,
- org.slf4j.api
+ org.slf4j.api,
+ org.apache.ant
 Import-Package: org.eclipse.jdt.internal.ui.workingsets
 Export-Package: org.talend.core.ui,
  org.talend.core.ui.actions,

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

@@ -562,10 +562,10 @@ ContextBuiltinToRepositoryCommand.addRelation=A context variable by the same nam
 ContextModifyCommand.label=Modify Context
 MetadataExportXmlCommand.title=Warning
 MetadataExportXmlCommand.message=Warning: this file already exist, do you want to override it?
-RoutinesFunctionProposal.Description=Description: {0}\n
-RoutinesFunctionProposal.CreatedBy=Created By: {1}\n\n
-RoutinesFunctionProposal.ReturnType=Return Type: {2}\n
-RoutinesFunctionProposal.VariableName=Example: {3}\n\n
+RoutinesFunctionProposal.Description.v1=Description: {0}\n
+RoutinesFunctionProposal.CreatedBy.v1=Created By: {1}\n\n
+RoutinesFunctionProposal.ReturnType.v1=Return Type: {2}\n
+RoutinesFunctionProposal.VariableName.v1=Example: {3}\n\n
 RoutinesFunctionProposal.User=User
 RoutinesFunctionProposal.System=System
 NodeReturnProposal.Description=Description: {0} : {1}\n\n
@@ -574,10 +574,10 @@ NodeReturnProposal.Type=Type: {3}\n
 NodeReturnProposal.Availability=Availability: {4}\n
 NodeReturnProposal.VariableName=Variable Name: {5}\n
 ContextParameterProposal.NoCommentAvaiable=No Comment Available
-ContextParameterProposal.Description=Description: {0}
-ContextParameterProposal.ContextVariable=Context Variable: {1}
-ContextParameterProposal.Type=Type: {2}
-ContextParameterProposal.VariableName=Variable Name: {3}
+ContextParameterProposal.Description.v1=Description: {0}
+ContextParameterProposal.ContextVariable.v1=Default context environment: {1}
+ContextParameterProposal.Type.v1=Type: {2}
+ContextParameterProposal.VariableName.v1=Value: {3}
 ArchiveFileExportOperationFullPath.cannotCreateDir=unable to create directory '{0}'
 WorkingSetConfigurationDialog_new_label=&New...
 WorkingSetConfigurationDialog_edit_label=&Edit...

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/images/CoreImageProvider.java

@@ -68,15 +68,11 @@ public class CoreImageProvider {
                 return ECoreImage.PROCESS_BATCH_MR_ICON;
             } else if (HadoopConstants.FRAMEWORK_SPARKSTREAMING.equals(framework)) {
                 return ECoreImage.PROCESS_STREAMING_SPARK_ICON;
-            } else if (HadoopConstants.FRAMEWORK_STORM.equals(framework)) {
-                return ECoreImage.PROCESS_STREAMING_STORM_ICON;
             }
             // the following statements are for the items exported from old studio versions since they have no framework
             // properties
             else if (itemType == ERepositoryObjectType.PROCESS_MR) {
                 return ECoreImage.PROCESS_BATCH_MR_ICON;
-            } else if (itemType == ERepositoryObjectType.PROCESS_STORM) {
-                return ECoreImage.PROCESS_STREAMING_STORM_ICON;
             }
         }
         return getIcon(itemType);

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/preference/I18nPreferencePage.java

@@ -40,6 +40,7 @@ import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 import org.eclipse.ui.PlatformUI;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
+import org.talend.commons.ui.runtime.update.PreferenceKeys;
 import org.talend.commons.ui.runtime.utils.ZipFileUtils;
 import org.talend.commons.ui.swt.advanced.dataeditor.LabelFieldEditor;
 import org.talend.commons.ui.utils.workbench.preferences.OneLineComboFieldEditor;
@@ -507,6 +508,7 @@ public abstract class I18nPreferencePage extends FieldEditorPreferencePage imple
         boolean ok = super.performOk();
         saveLanguageType();
         CorePlugin.getDefault().savePluginPreferences();
+        PlatformUI.getPreferenceStore().setValue(PreferenceKeys.NEED_OSGI_CLEAN, true);
         if (isBabiliButtonClicked) {
             refreshAll();
         }
@@ -524,6 +526,13 @@ public abstract class I18nPreferencePage extends FieldEditorPreferencePage imple
     protected void performApply() {
         saveLanguageType();
         CorePlugin.getDefault().savePluginPreferences();
+        PlatformUI.getPreferenceStore().setValue(PreferenceKeys.NEED_OSGI_CLEAN, true);
+    }
+
+    @Override
+    protected void performDefaults() {
+        super.performDefaults();
+        PlatformUI.getPreferenceStore().setValue(PreferenceKeys.NEED_OSGI_CLEAN, true);
     }
 
     /**

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/properties/tab/HorizontalTabFactory.java

@@ -102,7 +102,9 @@ public class HorizontalTabFactory {
      * @param descriptors
      */
     public void setInput(List<TalendPropertyTabDescriptor> descriptors) {
-        tabbedPropertyViewer.setInput(descriptors);
+        if (tabbedPropertyViewer != null && tabbedPropertyViewer.getControl() != null && !tabbedPropertyViewer.getControl().isDisposed()) {
+            tabbedPropertyViewer.setInput(descriptors);
+        }
     }
 
     public List<TalendPropertyTabDescriptor> getInput() {

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/proposal/ContextParameterProposal.java

@@ -80,7 +80,7 @@ public class ContextParameterProposal implements IContentProposal {
         MessageFormat format = new MessageFormat(getDescriptionMessagePattern());
         if (contextParameter.getContext() != null) {
             Object[] replaceArgs = new Object[] { desc, contextParameter.getContext().getName(), contextParameter.getType(),
-                    contextParameter.getName() };
+                    contextParameter.getValue() };
             return format.format(replaceArgs);
         }
         return desc;
@@ -88,10 +88,10 @@ public class ContextParameterProposal implements IContentProposal {
     }
 
     private String getDescriptionMessagePattern() {
-        String message = Messages.getString("ContextParameterProposal.Description") + "\n\n"; //$NON-NLS-1$ //$NON-NLS-2$
-        message += Messages.getString("ContextParameterProposal.ContextVariable") + "\n\n"; //$NON-NLS-1$ //$NON-NLS-2$
-        message += Messages.getString("ContextParameterProposal.Type") + "\n"; //$NON-NLS-1$ //$NON-NLS-2$
-        message += Messages.getString("ContextParameterProposal.VariableName") + "\n"; //$NON-NLS-1$ //$NON-NLS-2$
+        String message = Messages.getString("ContextParameterProposal.Description.v1") + "\n\n"; //$NON-NLS-1$ //$NON-NLS-2$
+        message += Messages.getString("ContextParameterProposal.ContextVariable.v1") + "\n\n"; //$NON-NLS-1$ //$NON-NLS-2$
+        message += Messages.getString("ContextParameterProposal.Type.v1") + "\n"; //$NON-NLS-1$ //$NON-NLS-2$
+        message += Messages.getString("ContextParameterProposal.VariableName.v1") + "\n"; //$NON-NLS-1$ //$NON-NLS-2$
         return message;
     }
 

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/proposal/RoutinesFunctionProposal.java

@@ -74,10 +74,10 @@ public class RoutinesFunctionProposal implements IContentProposal {
      */
     @Override
     public String getDescription() {
-        String message = Messages.getString("RoutinesFunctionProposal.Description");
-        message += Messages.getString("RoutinesFunctionProposal.CreatedBy");
-        message += Messages.getString("RoutinesFunctionProposal.ReturnType");
-        message += Messages.getString("RoutinesFunctionProposal.VariableName");
+        String message = Messages.getString("RoutinesFunctionProposal.Description.v1");
+        message += Messages.getString("RoutinesFunctionProposal.CreatedBy.v1");
+        message += Messages.getString("RoutinesFunctionProposal.ReturnType.v1");
+        message += Messages.getString("RoutinesFunctionProposal.VariableName.v1");
 
         MessageFormat format = new MessageFormat(message);
         Object[] args = new Object[] { function.getDescription(),

main/plugins/org.talend.core/src/main/java/org/talend/core/CorePlugin.java

@@ -12,6 +12,7 @@
 // ============================================================================
 package org.talend.core;
 
+import org.apache.logging.log4j.message.ThreadDumpMessage;
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.eclipse.jface.preference.IPreferenceStore;
@@ -208,4 +209,8 @@ public class CorePlugin extends Plugin {
         return (ICreateXtextProcessService) GlobalServiceRegister.getDefault().getService(ICreateXtextProcessService.class);
     }
 
+    public static String threadDump(String message) {
+        return new ThreadDumpMessage(message).toString();
+    }
+
 }

main/plugins/org.talend.core/src/main/java/org/talend/core/model/metadata/query/generator/PostgreQueryGenerator.java

@@ -13,6 +13,7 @@
 package org.talend.core.model.metadata.query.generator;
 
 import org.talend.core.database.EDatabaseTypeName;
+import org.talend.core.model.metadata.QueryUtil;
 import org.talend.core.model.metadata.query.AbstractQueryGenerator;
 import org.talend.core.model.process.IElement;
 
@@ -38,4 +39,23 @@ public class PostgreQueryGenerator extends AbstractQueryGenerator {
         }
         return super.getSchema(elem);
     }
+
+    @Override
+    protected String getTableNameWithDBAndSchema(final String dbName, final String schema, String tableName) {
+        if (tableName == null || EMPTY.equals(tableName.trim())) {
+            tableName = QueryUtil.DEFAULT_TABLE_NAME;
+        }
+
+        final StringBuffer tableNameWithDBAndSchema = new StringBuffer();
+
+        // postgres do not support db.schema.table_name, so only need schema.table_name
+        if (schema != null && !EMPTY.equals(schema)) {
+            tableNameWithDBAndSchema.append(checkContextAndAddQuote(schema));
+            tableNameWithDBAndSchema.append(getSQLFieldConnector());
+        }
+        //
+        tableNameWithDBAndSchema.append(checkContextAndAddQuote(tableName));
+
+        return tableNameWithDBAndSchema.toString();
+    }
 }

main/plugins/org.talend.core/src/main/java/org/talend/core/model/migration/AbstractJobMigrationTask.java

@@ -48,12 +48,20 @@ public abstract class AbstractJobMigrationTask extends AbstractItemMigrationTask
         if (processType != null) {
             EmfHelper.visitChilds(processType);
             ERepositoryObjectType itemType = ERepositoryObjectType.getItemType(item);
-            if(itemType == ERepositoryObjectType.TEST_CONTAINER &&
-            		!ConvertJobsUtil.JobType.STANDARD.getDisplayName().equalsIgnoreCase(processType.getJobType())){
-            	return null;
+            if (itemType == ERepositoryObjectType.TEST_CONTAINER
+                    && !ConvertJobsUtil.JobType.STANDARD.getDisplayName()
+                            .equalsIgnoreCase(getTestContainerJobType(item, processType))) {
+                return null;
             }
 
         }
         return processType;
     }
+
+    protected String getTestContainerJobType(Item item, ProcessType processType) {
+        if (item.getState() != null && item.getState().getPath() != null) {
+            return ConvertJobsUtil.getTestCaseJobTypeByPath(item.getState().getPath());
+        }
+        return processType.getJobType();
+    }
 }

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

@@ -16,13 +16,13 @@ import java.io.File;
 import java.util.Locale;
 
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import org.eclipse.core.runtime.preferences.DefaultScope;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.talend.core.CorePlugin;
 import org.talend.core.prefs.GeneralParametersProvider.GeneralParameters;
+import org.talend.core.runtime.util.SharedStudioUtils;
 
 /**
  * Intializer of core preferences. <br/>
@@ -54,7 +54,7 @@ public class CorePreferenceInitializer extends AbstractPreferenceInitializer {
         IEclipsePreferences node = new DefaultScope().getNode(CorePlugin.getDefault().getBundle().getSymbolicName());
 
         // Building temporary files directory path
-        IPath tempPath = new Path(System.getProperty("user.dir")).append("temp"); // NON-NLS-1$// NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-2$
+        IPath tempPath = SharedStudioUtils.getTempFolderPath();
         File tempFile = tempPath.toFile();
         if (!tempFile.exists()) {
             tempFile.mkdirs();

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

@@ -54,6 +54,17 @@
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-http</artifactId>
       <version>${wagon.version}</version>
+      <exclusions>
+      	<exclusion>
+            <groupId>org.jsoup</groupId>
+                <artifactId>jsoup</artifactId>
+            </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+	    <groupId>org.jsoup</groupId>
+	    <artifactId>jsoup</artifactId>
+	    <version>1.13.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>

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

@@ -40,6 +40,12 @@
             <version>${project.version}</version>
             <type>pom</type>
         </dependency>
+        <dependency>
+            <groupId>org.talend.studio</groupId>
+            <artifactId>studio-log4j-dependencies-tos</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+        </dependency>
         <dependency>
 			<groupId>org.talend.studio</groupId>
 			<artifactId>studio-maven-repository-build</artifactId>
@@ -48,19 +54,13 @@
 		</dependency>
 		<dependency>
 			<groupId>org.talend.studio</groupId>
-			<artifactId>maven-bundle-plugin-2-3-7-tos</artifactId>
+			<artifactId>maven-bundle-plugin-5-1-1-tos</artifactId>
 			<version>${project.version}</version>
 			<type>pom</type>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.studio</groupId>
-			<artifactId>maven-bundle-plugin-2-5-3-tos</artifactId>
-			<version>${project.version}</version>
-			<type>pom</type>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.studio</groupId>
-			<artifactId>maven-install-plugin-2-5-1-tos</artifactId>
+			<artifactId>maven-install-plugin-2-5-2-tos</artifactId>
 			<version>${project.version}</version>
 			<type>pom</type>
 		</dependency>
@@ -78,13 +78,7 @@
         </dependency>
 		<dependency>
 			<groupId>org.talend.studio</groupId>
-			<artifactId>karaf-maven-plugin-4-2-4-tos</artifactId>
-			<version>${project.version}</version>
-			<type>pom</type>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.studio</groupId>
-			<artifactId>karaf-maven-plugin-4-2-4-tos</artifactId>
+			<artifactId>karaf-maven-plugin-4-2-10-tos</artifactId>
 			<version>${project.version}</version>
 			<type>pom</type>
 		</dependency>
@@ -100,37 +94,10 @@
             <version>${project.version}</version>
             <type>pom</type>
         </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.15</version>
+         </dependency>
 	</dependencies>
-	<profiles>
-		<profile>
-            <id>official</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.eclipse.tycho</groupId>
-                        <artifactId>tycho-packaging-plugin</artifactId>
-                        <version>${tycho.version}</version>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.eclipse.tycho.extras</groupId>
-                                <artifactId>tycho-buildtimestamp-jgit</artifactId>
-                                <version>${tycho.version}</version>
-                            </dependency>
-                        </dependencies>
-                        <configuration>
-                            <strictBinIncludes>false</strictBinIncludes>
-                            <format>'${product.timestamp}'</format>
-                            <archive>
-                                <addMavenDescriptor>false</addMavenDescriptor>
-                                <!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
-                                <manifestEntries>
-                                    <Built-By />
-                                </manifestEntries>
-                            </archive>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-	</profiles>
 </project>

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

@@ -1,65 +1,120 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.talend.studio</groupId>
-		<artifactId>studio-maven-repository-tos</artifactId>
-		<version>7.4.1-SNAPSHOT</version>
-		<relativePath>../../../</relativePath>
-	</parent>
-	<artifactId>karaf-maven-plugin-4-2-4-tos</artifactId>
-	<packaging>pom</packaging>
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.karaf.tooling</groupId>
-			<artifactId>karaf-maven-plugin</artifactId>
-			<version>4.2.4</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
-			<version>1.7.12</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven.shared</groupId>
-			<artifactId>maven-dependency-tree</artifactId>
-			<version>3.0.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-framework-bom</artifactId>
-			<version>5.0.2.RELEASE</version>
-			<type>pom</type>
-		</dependency>
-		<dependency>
-			<groupId>org.tukaani</groupId>
-			<artifactId>xz</artifactId>
-			<version>1.6</version>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.8</version>
-				<executions>
-					<execution>
-						<id>copy-dependencies</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<addParentPoms>true</addParentPoms>
-							<copyPom>true</copyPom>
-							<includeScope>compile</includeScope>
-							<outputDirectory>${basedir}/../../../tmp/repository</outputDirectory>
-							<useRepositoryLayout>true</useRepositoryLayout>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.talend.studio</groupId>
+		<artifactId>studio-maven-repository-tos</artifactId>
+		<version>7.4.1-SNAPSHOT</version>
+		<relativePath>../../../</relativePath>
+	</parent>
+	<artifactId>karaf-maven-plugin-4-2-10-tos</artifactId>
+	<packaging>pom</packaging>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.karaf.tooling</groupId>
+			<artifactId>karaf-maven-plugin</artifactId>
+			<version>4.2.10</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-collections</groupId>
+					<artifactId>commons-collections</artifactId>
+				</exclusion>
+				<exclusion>
+	              <groupId>org.apache.maven.shared</groupId>
+	              <artifactId>maven-shared-utils</artifactId>
+	            </exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+			<version>1.7.29</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven.shared</groupId>
+			<artifactId>maven-dependency-tree</artifactId>
+			<version>3.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-framework-bom</artifactId>
+			<version>5.2.7.RELEASE</version>
+			<type>pom</type>
+		</dependency>
+		<dependency>
+		    <groupId>org.codehaus.plexus</groupId>
+		    <artifactId>plexus-component-annotations</artifactId>
+		    <version>2.1.0</version>
+		</dependency>
+		<dependency>
+		    <groupId>com.sun.istack</groupId>
+		    <artifactId>istack-commons-runtime</artifactId>
+		    <version>3.0.10</version>
+		</dependency>
+		<dependency>
+		    <groupId>biz.aQute.bnd</groupId>
+		    <artifactId>biz.aQute.bndlib</artifactId>
+		    <version>3.5.0</version>
+		</dependency>
+		<dependency>
+		    <groupId>com.sun.activation</groupId>
+		    <artifactId>jakarta.activation</artifactId>
+		    <version>1.2.2</version>
+		</dependency>
+		<dependency>
+		    <groupId>org.apache.maven.wagon</groupId>
+		    <artifactId>wagon-provider-api</artifactId>
+		    <version>3.2.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.tukaani</groupId>
+			<artifactId>xz</artifactId>
+			<version>1.6</version>
+		</dependency>
+		<dependency>
+		    <groupId>org.apache.ant</groupId>
+		    <artifactId>ant</artifactId>
+		    <version>1.10.9</version>
+		</dependency>
+		<dependency>
+		    <groupId>org.apache.maven.shared</groupId>
+		    <artifactId>maven-shared-utils</artifactId>
+		    <version>3.3.3</version>
+		</dependency>
+		<dependency>
+		    <groupId>org.bouncycastle</groupId>
+		    <artifactId>bcprov-jdk15on</artifactId>
+		    <version>1.68</version>
+		</dependency>
+		<dependency>
+		    <groupId>com.fasterxml.jackson.core</groupId>
+		    <artifactId>jackson-databind</artifactId>
+		    <version>2.12.0</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>2.8</version>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<addParentPoms>true</addParentPoms>
+							<copyPom>true</copyPom>
+							<includeScope>compile</includeScope>
+							<outputDirectory>${basedir}/../../../tmp/repository</outputDirectory>
+							<useRepositoryLayout>true</useRepositoryLayout>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

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

@@ -14,7 +14,17 @@
 		<dependency>
 			<groupId>org.apache.felix</groupId>
 			<artifactId>maven-bundle-plugin</artifactId>
-			<version>2.3.7</version>
+			<version>5.1.1</version>
+			<exclusions>
+    		 <exclusion>
+     		 <groupId>com.google.guava</groupId>
+     		 <artifactId>guava</artifactId>
+    		 </exclusion>
+    		 <exclusion>
+				<groupId>org.apache.maven.shared</groupId>
+				<artifactId>maven-shared-utils</artifactId>
+			</exclusion>
+   			</exclusions>
 		</dependency>
 		
 		<dependency>

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

@@ -20,7 +20,17 @@
 		<dependency>
 			<groupId>org.apache.felix</groupId>
 			<artifactId>maven-bundle-plugin</artifactId>
-			<version>2.5.3</version>
+			<version>5.1.1</version>
+			<exclusions>
+    		 <exclusion>
+     		 <groupId>com.google.guava</groupId>
+     		 <artifactId>guava</artifactId>
+    		</exclusion>
+    		<exclusion>
+              <groupId>org.apache.maven.shared</groupId>
+              <artifactId>maven-shared-utils</artifactId>
+            </exclusion>
+   			</exclusions>
 		</dependency>
 	</dependencies>
 	

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

@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.talend.studio</groupId>
+		<artifactId>studio-maven-repository-tos</artifactId>
+		<version>7.4.1-SNAPSHOT</version>
+		<relativePath>../../../</relativePath>
+	</parent>
+	<artifactId>maven-bundle-plugin-5-1-1-tos</artifactId>
+	<packaging>pom</packaging>
+	<properties>
+		<!-- Dependency versions -->
+		<features-maven-plugin.version>2.2.9</features-maven-plugin.version>
+		<maven-install-plugin.version>2.5.1</maven-install-plugin.version>
+		<plexus-utils.version>3.0.24</plexus-utils.version>
+	</properties>
+	<dependencies>
+
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>maven-bundle-plugin</artifactId>
+			<version>5.1.1</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-collections</groupId>
+					<artifactId>commons-collections</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.commons</groupId>
+					<artifactId>commons-lang3</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.codehaus.plexus</groupId>
+					<artifactId>plexus-utils</artifactId>
+				</exclusion>
+    		    <exclusion>
+		     		<groupId>com.google.guava</groupId>
+		     		<artifactId>guava</artifactId>
+    		    </exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.plexus</groupId>
+			<artifactId>plexus-utils</artifactId>
+			<version>${plexus-utils.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.8.1</version>
+		</dependency>
+		<dependency>
+		    <groupId>org.apache.ant</groupId>
+		    <artifactId>ant</artifactId>
+		    <version>1.10.9</version>
+		</dependency>
+		<dependency>
+		    <groupId>org.apache.maven.shared</groupId>
+		    <artifactId>maven-shared-utils</artifactId>
+		    <version>3.3.3</version>
+		</dependency>
+		<dependency>
+		    <groupId>org.bouncycastle</groupId>
+		    <artifactId>bcprov-jdk15on</artifactId>
+		    <version>1.68</version>
+		</dependency>
+		<dependency>
+		    <groupId>com.fasterxml.jackson.core</groupId>
+		    <artifactId>jackson-databind</artifactId>
+		    <version>2.12.0</version>
+		</dependency>
+		<dependency>
+		    <groupId>com.thoughtworks.xstream</groupId>
+		    <artifactId>xstream</artifactId>
+		    <version>1.4.15</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>5.1.1</version>
+				<extensions>true</extensions>
+				<dependencies>
+					<dependency>
+						<groupId>org.codehaus.plexus</groupId>
+						<artifactId>plexus-utils</artifactId>
+						<version>3.3.0</version>
+					</dependency>
+					<dependency>
+						<groupId>org.apache.commons</groupId>
+						<artifactId>commons-lang3</artifactId>
+						<version>3.8.1</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>2.8</version>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<addParentPoms>true</addParentPoms>
+							<copyPom>true</copyPom>
+							<includeScope>compile</includeScope>
+							<outputDirectory>${basedir}/../../../tmp/repository</outputDirectory>
+							<useRepositoryLayout>true</useRepositoryLayout>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

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

@@ -7,15 +7,35 @@
 		<version>7.4.1-SNAPSHOT</version>
 		<relativePath>../../../</relativePath>
 	</parent>
-	<artifactId>maven-install-plugin-2-5-1-tos</artifactId>
+	<artifactId>maven-install-plugin-2-5-2-tos</artifactId>
 	<packaging>pom</packaging>
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.maven.plugins</groupId>
 			<artifactId>maven-install-plugin</artifactId>
-			<version>2.5.1</version>
+			<version>2.5.2</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-codec</groupId>
+					<artifactId>commons-codec</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+            <groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.15</version>
+         </dependency>
+		<dependency>
+		    <groupId>org.apache.ant</groupId>
+		    <artifactId>ant</artifactId>
+		    <version>1.10.9</version>
+		</dependency>
+		<dependency>
+		    <groupId>org.bouncycastle</groupId>
+		    <artifactId>bcprov-jdk15on</artifactId>
+		    <version>1.68</version>
 		</dependency>
-
 	</dependencies>
 	<build>
 		<plugins>

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

@@ -14,6 +14,17 @@
             <groupId>org.talend.ci</groupId>
             <artifactId>osgihelper-maven-plugin</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+				<exclusion>
+					<groupId>commons-codec</groupId>
+					<artifactId>commons-codec</artifactId>
+				</exclusion>
+			</exclusions>
+        </dependency>
+        <dependency>
+           	<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.15</version>
         </dependency>
 		<dependency>
 			<groupId>org.codehaus.plexus</groupId>

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

@@ -13,7 +13,7 @@
 		<dependency>
 			<groupId>org.eclipse.tycho</groupId>
 			<artifactId>tycho-compiler-jdt</artifactId>
-			<version>1.4.0</version>
+			<version>1.6.0</version>
 		</dependency>
 	</dependencies>
 	<build>

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

@@ -10,10 +10,9 @@
 	<artifactId>studio-maven-repository-build</artifactId>
 	<packaging>pom</packaging>
 	<modules>
-		<module>plugins/maven-bundle-plugin-2-3-7</module>
-		<module>plugins/maven-bundle-plugin-2-5-3</module>
-		<module>plugins/karaf-maven-plugin-4-2-4</module>
-		<module>plugins/maven-install-plugin-2-5-1</module>
+		<module>plugins/maven-bundle-plugin-5-1-1</module>
+		<module>plugins/maven-install-plugin-2-5-2</module>
+		<module>plugins/karaf-maven-plugin-4-2-10</module>
 		<module>plugins/talend-compiler-plugin</module>
 		<module>plugins/talend-ci-osgihelper-maven-plugin</module>
 		<module>plugins/build-helper-maven-plugin-3-0-0</module>
@@ -37,13 +36,24 @@
 		<dependency>
 			<groupId>org.apache.maven.plugins</groupId>
 			<artifactId>maven-jar-plugin</artifactId>
-			<version>3.0.2</version>
+			<version>3.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.maven.plugins</groupId>
 			<artifactId>maven-assembly-plugin</artifactId>
 			<version>3.0.0</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-codec</groupId>
+					<artifactId>commons-codec</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
+		<dependency>
+            <groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.15</version>
+         </dependency>
 		<dependency>
 			<groupId>org.apache.maven.plugins</groupId>
 			<artifactId>maven-surefire-plugin</artifactId>

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

@@ -56,13 +56,13 @@
                 <version>17</version>
                 <type>pom</type>
             </dependency>             
-            <!-- It fixes provided dependency scope to compile, because maven-dependency-plugin is setup to include
-             only compile and runtime scopes, but provided is also required. It's not possible to setup plugin to
+            <!-- It fixes provided dependency scope to compile, because maven-dependency-plugin is setup to include
+             only compile and runtime scopes, but provided is also required. It's not possible to setup plugin to
              include all: compile, runtime and provided dependencies -->
             <dependency>
                 <groupId>biz.aQute.bnd</groupId>
                 <artifactId>annotation</artifactId>
-                <version>2.4.0</version>
+                <version>3.5.0</version>
                 <scope>compile</scope>
             </dependency>
             <dependency>
@@ -161,7 +161,7 @@
             <artifactId>components-api</artifactId>
             <version>${components.version}</version>
         </dependency>
-        <!-- Dependencies in provided scope should be explicitly added as dependency in this module,
+        <!-- Dependencies in provided scope should be explicitly added as dependency in this module,
             because provided scope is not transitive -->
 		<dependency>
             <groupId>org.osgi</groupId>

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

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.talend.studio</groupId>
+		<artifactId>studio-maven-repository-tos</artifactId>
+		<version>7.4.1-SNAPSHOT</version>
+		<relativePath>../</relativePath>
+	</parent>
+	<artifactId>studio-log4j-dependencies-tos</artifactId>
+	<packaging>pom</packaging>
+	<dependencies>
+        <!--add log4j dependency https://jira.talendforge.org/browse/TUP-29704  -->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <version>2.12.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.12.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.12.1</version>
+        </dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>2.10</version>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<includeScope>runtime</includeScope>
+							<outputDirectory>${basedir}/../tmp/repository</outputDirectory>
+							<useRepositoryLayout>true</useRepositoryLayout>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

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

@@ -16,6 +16,7 @@
         <module>tacokit/pom.xml</module>
         <module>tcompv1/pom.xml</module>
         <module>surefire/pom.xml</module>
+        <module>log4j/pom.xml</module>
         <module>zip/pom.xml</module>
     </modules>
     <properties>

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

@@ -10,7 +10,7 @@
 	<artifactId>studio-tacokit-dependencies</artifactId>
 	<packaging>pom</packaging>
 	<properties>
-		<tacokit.components.version>1.16.0-SNAPSHOT</tacokit.components.version>
+		<tacokit.components.version>1.19.0-SNAPSHOT</tacokit.components.version>
 	</properties>
 	<repositories>
 		<repository>

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

@@ -11,7 +11,7 @@
     <packaging>pom</packaging>
     
     <properties>
-        <tcomp.version>1.1.25</tcomp.version>
+        <tcomp.version>1.29.1</tcomp.version>
         <slf4j.version>1.7.25</slf4j.version>
     </properties>
     

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

@@ -33,7 +33,7 @@
                                 <artifactItem>
                                     <groupId>org.talend.studio</groupId>
                                     <artifactId>studio-maven-repository</artifactId>
-                                    <version>7.4.1.v20201111</version>
+                                    <version>7.4.1.v20201225</version>
                                     <type>zip</type>
                                     <overWrite>true</overWrite>
                                     <outputDirectory>${project.basedir}/../repository</outputDirectory>

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

@@ -34,7 +34,7 @@
 						<dependency>
 							<groupId>org.eclipse.tycho</groupId>
 							<artifactId>tycho-compiler-jdt</artifactId>
-							<version>1.4.0</version>
+							<version>1.6.0</version>
 						</dependency>
 						<dependency>
 							<groupId>org.codehaus.plexus</groupId>
@@ -65,6 +65,11 @@
 							<artifactId>plexus-utils</artifactId>
 							<version>3.0.24</version>
 						</dependency>
+						<dependency>
+							<groupId>org.apache.commons</groupId>
+							<artifactId>commons-compress</artifactId>
+							<version>1.19</version>
+						</dependency>
 					</dependencies>
 					<configuration>
 						<archive>
@@ -82,6 +87,16 @@
 							<artifactId>plexus-utils</artifactId>
 							<version>3.0.24</version>
 						</dependency>
+						<dependency>
+			              	<groupId>commons-codec</groupId>
+							<artifactId>commons-codec</artifactId>
+							<version>1.15</version>
+			            </dependency>
+			            <dependency>
+							<groupId>org.apache.commons</groupId>
+							<artifactId>commons-compress</artifactId>
+							<version>1.19</version>
+						</dependency>
 					</dependencies>
 				</plugin>
 				<plugin>
@@ -99,13 +114,18 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-install-plugin</artifactId>
-					<version>2.5.1</version>
+					<version>2.5.2</version>
 					<dependencies>
 						<dependency>
 							<groupId>org.codehaus.plexus</groupId>
 							<artifactId>plexus-utils</artifactId>
 							<version>3.0.24</version>
 						</dependency>
+						<dependency>
+							<groupId>commons-codec</groupId>
+							<artifactId>commons-codec</artifactId>
+							<version>1.15</version>
+						</dependency>
 					</dependencies>
 				</plugin>
 				<plugin>

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

@@ -52,6 +52,7 @@ import org.eclipse.swt.widgets.Display;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.core.GlobalServiceRegister;
+import org.talend.core.IESBService;
 import org.talend.core.ILibraryManagerService;
 import org.talend.core.context.Context;
 import org.talend.core.context.RepositoryContext;
@@ -168,6 +169,10 @@ public class AggregatorPomsHelper {
     }
 
     public void updateCodeProjects(IProgressMonitor monitor, boolean forceBuild) {
+        updateCodeProjects(monitor, forceBuild, false);
+    }
+
+    public void updateCodeProjects(IProgressMonitor monitor, boolean forceBuild, boolean ignoreM2Cache) {
         RepositoryWorkUnit workUnit = new RepositoryWorkUnit<Object>("update code project") { //$NON-NLS-1$
 
             @Override
@@ -175,8 +180,11 @@ public class AggregatorPomsHelper {
                 Project currentProject = ProjectManager.getInstance().getCurrentProject();
                 for (ERepositoryObjectType codeType : ERepositoryObjectType.getAllTypesOfCodes()) {
                     try {
-                        if (CodeM2CacheManager.needUpdateCodeProject(currentProject, codeType)) {
-                            ITalendProcessJavaProject codeProject = getCodesProject(codeType);
+                        ITalendProcessJavaProject codeProject = getCodesProject(codeType);
+                        if (ERepositoryObjectType.ROUTINES == codeType) {
+                            PomUtil.checkExistingLog4j2Dependencies4RoutinePom(projectTechName, codeProject.getProjectPom());
+                        }
+                        if (ignoreM2Cache || CodeM2CacheManager.needUpdateCodeProject(currentProject, codeType)) {
                             updateCodeProjectPom(monitor, codeType, codeProject.getProjectPom());
                             buildAndInstallCodesProject(monitor, codeType, true, forceBuild);
                             CodeM2CacheManager.updateCodeProjectCache(currentProject, codeType);
@@ -344,12 +352,8 @@ public class AggregatorPomsHelper {
     private static boolean checkIfCanAddToParentModules(Property property, boolean checkFilter) {
         // Check relation for ESB service job, should not be added into main pom
         if (property != null) {
-            List<Relation> relations = RelationshipItemBuilder.getInstance().getItemsRelatedTo(property.getId(),
-                    property.getVersion(), RelationshipItemBuilder.JOB_RELATION);
-            for (Relation relation : relations) {
-                if (RelationshipItemBuilder.SERVICES_RELATION.equals(relation.getType())) {
-                    return false;
-                }
+            if (isSOAPServiceProvider(property)) {
+                return false;
             }
 
             // for import won't add for exclude option
@@ -860,7 +864,7 @@ public class AggregatorPomsHelper {
         }
         // codes pom
         monitor.subTask("Synchronize code poms"); //$NON-NLS-1$
-        updateCodeProjects(monitor, true);
+        updateCodeProjects(monitor, true, true);
         monitor.worked(1);
         if (monitor.isCanceled()) {
             return;
@@ -896,7 +900,7 @@ public class AggregatorPomsHelper {
                     }
                     IFile pomFile = getItemPomFolder(item.getProperty()).getFile(TalendMavenConstants.POM_FILE_NAME);
                     // filter esb data service node
-                    if (!isDataServiceOperation(object.getProperty()) && pomFile.exists()) {
+                    if (!isSOAPServiceProvider(object.getProperty()) && pomFile.exists()) {
                         modules.add(getModulePath(pomFile));
                     }
                 }
@@ -937,7 +941,7 @@ public class AggregatorPomsHelper {
      * @param property
      * @return
      */
-    private boolean isDataServiceOperation(Property property) {
+    private static boolean isSOAPServiceProvider(Property property) {
         if (property != null) {
             List<Relation> relations = RelationshipItemBuilder.getInstance().getItemsRelatedTo(property.getId(),
                     property.getVersion(), RelationshipItemBuilder.JOB_RELATION);
@@ -946,6 +950,14 @@ public class AggregatorPomsHelper {
                     return true;
                 }
             }
+            if (GlobalServiceRegister.getDefault().isServiceRegistered(IESBService.class)) {
+                IESBService service = GlobalServiceRegister.getDefault().getService(IESBService.class);
+                if (service != null) {
+                    if (service.isSOAPServiceProvider(property.getItem())) {
+                        return true;
+                    }
+                }
+            }
         }
         return false;
     }

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

@@ -101,7 +101,7 @@ public class CodeM2CacheManager {
         }
     }
 
-    private static File getCacheFile(String projectTechName, ERepositoryObjectType codeType) {
+    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$
         return new File(MavenPlugin.getMaven().getLocalRepositoryPath(), cacheFileName);

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

@@ -118,6 +118,8 @@ public abstract class AbstractMavenCodesTemplatePom extends AbstractMavenGeneral
                 }
                 if (isDeployed) {
                     dependency = PomUtil.createModuleDependency(module.getMavenUri());
+                    if (module.isExcluded())
+                        dependency.setScope("provided");
                 }
                 if (dependency != null) {
                     existedDependencies.add(dependency);

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

@@ -12,6 +12,7 @@
 // ============================================================================
 package org.talend.designer.maven.tools.creator;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -46,7 +47,6 @@ import org.talend.core.runtime.maven.MavenArtifact;
 import org.talend.core.runtime.maven.MavenConstants;
 import org.talend.core.runtime.maven.MavenUrlHelper;
 import org.talend.core.runtime.process.LastGenerationInfo;
-import org.talend.core.runtime.process.TalendProcessArgumentConstant;
 import org.talend.core.runtime.projectsetting.IProjectSettingTemplateConstants;
 import org.talend.core.runtime.repository.build.IMavenPomCreator;
 import org.talend.core.ui.ITestContainerProviderService;
@@ -136,16 +136,15 @@ public abstract class AbstractMavenProcessorPom extends CreateMavenBundleTemplat
 
         Map<ETalendMavenVariables, String> variablesValuesMap = new HashMap<ETalendMavenVariables, String>();
         // no need check property is null or not, because if null, will get default ids.
-
-        if (JobUtils.isJob(property) && ProcessUtils.isChildRouteProcess(process)) {
-            JobInfo lastMainJob = LastGenerationInfo.getInstance().getLastMainJob();
+        JobInfo lastMainJob = LastGenerationInfo.getInstance().getLastMainJob(); 
+        if (JobUtils.isJob(property) && ProcessUtils.isChildRouteProcess(process) && lastMainJob != null) {
             variablesValuesMap.put(ETalendMavenVariables.JobGroupId, PomIdsHelper.getJobGroupId(lastMainJob.getProcessor().getProperty()));
             variablesValuesMap.put(ETalendMavenVariables.JobVersion, PomIdsHelper.getJobVersion(lastMainJob.getProcessor().getProperty()));	    	
         }else {
             variablesValuesMap.put(ETalendMavenVariables.JobGroupId, PomIdsHelper.getJobGroupId(property));
             variablesValuesMap.put(ETalendMavenVariables.JobVersion, PomIdsHelper.getJobVersion(property));	    	
         }
-        variablesValuesMap.put(ETalendMavenVariables.JobArtifactId, PomIdsHelper.getJobArtifactId(property));	
+        variablesValuesMap.put(ETalendMavenVariables.JobArtifactId, PomIdsHelper.getJobArtifactId(property));	 
         variablesValuesMap.put(ETalendMavenVariables.TalendJobVersion, property.getVersion());
         final String jobName = JavaResourcesHelper.escapeFileName(process.getName());
         variablesValuesMap.put(ETalendMavenVariables.JobName, jobName);
@@ -285,6 +284,11 @@ public abstract class AbstractMavenProcessorPom extends CreateMavenBundleTemplat
     }
 
     protected void addCodesDependencies(final List<Dependency> dependencies) {
+        dependencies.addAll(getCodesDependencies());
+    }
+
+    protected List<Dependency> getCodesDependencies() {
+        List<Dependency> dependencies = new ArrayList<Dependency>();
         String projectTechName = ProjectManager.getInstance().getProject(getJobProcessor().getProperty()).getTechnicalLabel();
         String codeVersion = PomIdsHelper.getCodesVersion(projectTechName);
 
@@ -301,6 +305,7 @@ public abstract class AbstractMavenProcessorPom extends CreateMavenBundleTemplat
             Dependency beansDependency = PomUtil.createDependency(beansGroupId, beansArtifactId, codeVersion, null);
             dependencies.add(beansDependency);
         }
+        return dependencies;
     }
 
     protected void addChildrenDependencies(final List<Dependency> dependencies) {
@@ -319,10 +324,18 @@ public abstract class AbstractMavenProcessorPom extends CreateMavenBundleTemplat
                 String type = null;
                 if (!jobInfo.isJoblet()) {
                     property = jobInfo.getProcessItem().getProperty();
-                    groupId = PomIdsHelper.getJobGroupId(property);
                     artifactId = PomIdsHelper.getJobArtifactId(jobInfo);
+                    
+                    JobInfo lastMainJob = LastGenerationInfo.getInstance().getLastMainJob();
+                    if (lastMainJob != null && JobUtils.isJob(jobInfo) && JobUtils.isRoute(getJobProcessor().getProperty())) {
+                        groupId = PomIdsHelper.getJobGroupId(lastMainJob.getProcessor().getProperty());
+                        version =  PomIdsHelper.getJobVersion(lastMainJob.getProcessor().getProperty()); 
+                    } else {
+                        groupId = PomIdsHelper.getJobGroupId(property);	
+                        version = PomIdsHelper.getJobVersion(property);
+                    }
 
-                    version = PomIdsHelper.getJobVersion(property);
+                    
                     // try to get the pom version of children job and load from the pom file.
                     String childPomFileName = PomUtil.getPomFileName(jobInfo.getJobName(), jobInfo.getJobVersion());
                     IProject codeProject = getJobProcessor().getCodeProject();

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

@@ -647,14 +647,16 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
 
         List<Dependency> dependencies = new ArrayList<>();
         // codes
-        addCodesDependencies(dependencies);
+        List<Dependency> codeDependencies = getCodesDependencies();
+        dependencies.addAll(codeDependencies);
 
         // codes dependencies (optional)
         ERepositoryObjectType.getAllTypesOfCodes().forEach(t -> dependencies.addAll(PomUtil.getCodesDependencies(t)));
 
         // libraries of talend/3rd party
         Set<Dependency> parentJobDependencies = processor.getNeededModules(TalendProcessOptionConstants.MODULES_EXCLUDE_SHADED).stream()
-                .filter(m -> !m.isExcluded()).map(m -> createDenpendency(m, false)).collect(Collectors.toSet());
+                .filter(m -> !m.isExcluded()).map(m -> createDenpendency(m, false))
+                .collect(Collectors.toSet());
         dependencies.addAll(parentJobDependencies);
 
         // missing modules from the job generation of children
@@ -684,7 +686,7 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
                     || _3rdLibCoordinate.contains(coordinate)) {
                 return;
             }
-            if (MavenConstants.DEFAULT_LIB_GROUP_ID.equals(groupId) || groupId.startsWith(projectGroupId)) {
+            if (MavenConstants.DEFAULT_LIB_GROUP_ID.equals(groupId) || codeDependencies.contains(d)) {
                 if (!optional) {
                     talendLibCoordinate.add(coordinate);
                 }
@@ -740,6 +742,7 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
         }
     }
 
+
     // remove duplicate job dependencies and only keep the latest one
     // keep high priority dependencies if set by tLibraryLoad
     // FIXME not used now since tacokit component use specific dependency version. so we must include all job dependencies.

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

@@ -12,16 +12,18 @@
 // ============================================================================
 package org.talend.designer.maven.tools.creator;
 
-import java.util.Collections;
+import java.util.HashSet;
 import java.util.Set;
 
 import org.apache.maven.model.Model;
 import org.eclipse.core.resources.IFile;
 import org.talend.core.GlobalServiceRegister;
+import org.talend.core.PluginChecker;
 import org.talend.core.model.general.ILibrariesService;
 import org.talend.core.model.general.ModuleNeeded;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.designer.maven.template.MavenTemplateManager;
+import org.talend.repository.model.IRepositoryService;
 
 /**
  * DOC ggu class global comment. Detailled comment
@@ -46,13 +48,18 @@ public class CreateMavenRoutinePom extends AbstractMavenCodesTemplatePom {
         // Set<ModuleNeeded> runningModules = routiensService.getRunningModules();
         // return runningModules;
         // }
+        Set<ModuleNeeded> runningModules = new HashSet<>();
         if (GlobalServiceRegister.getDefault().isServiceRegistered(ILibrariesService.class)) {
             ILibrariesService libService = (ILibrariesService) GlobalServiceRegister.getDefault().getService(
                     ILibrariesService.class);
-            Set<ModuleNeeded> runningModules = libService.getCodesModuleNeededs(ERepositoryObjectType.ROUTINES);
-            return runningModules;
+            runningModules.addAll(libService.getCodesModuleNeededs(ERepositoryObjectType.ROUTINES));
         }
-        return Collections.emptySet();
-
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(IRepositoryService.class)) {
+            IRepositoryService repositoryService = GlobalServiceRegister.getDefault().getService(IRepositoryService.class);
+            if (PluginChecker.isBigdataRoutineLoaded() && repositoryService.isProjectLevelLog4j2()) {
+                runningModules.addAll(repositoryService.getLog4j2Modules());
+            }
+        }
+        return runningModules;
     }
 }

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

@@ -76,6 +76,7 @@ import org.talend.commons.utils.io.FilesUtils;
 import org.talend.commons.utils.workbench.resources.ResourceUtils;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.ILibraryManagerService;
+import org.talend.core.PluginChecker;
 import org.talend.core.model.general.Project;
 import org.talend.core.model.process.IProcess;
 import org.talend.core.model.process.JobInfo;
@@ -98,10 +99,12 @@ import org.talend.designer.maven.model.TalendJavaProjectConstants;
 import org.talend.designer.maven.model.TalendMavenConstants;
 import org.talend.designer.maven.template.MavenTemplateManager;
 import org.talend.designer.maven.tools.AggregatorPomsHelper;
+import org.talend.designer.maven.tools.CodeM2CacheManager;
 import org.talend.designer.maven.tools.ProcessorDependenciesManager;
 import org.talend.designer.runprocess.IProcessor;
 import org.talend.designer.runprocess.IRunProcessService;
 import org.talend.repository.ProjectManager;
+import org.talend.repository.model.IRepositoryService;
 import org.talend.utils.xml.XmlUtils;
 import org.w3c.dom.Attr;
 import org.w3c.dom.DOMImplementation;
@@ -1178,7 +1181,7 @@ public class PomUtil {
             IRunProcessService runProcessService = GlobalServiceRegister.getDefault().getService(IRunProcessService.class);
             try {
                 Model model = MODEL_MANAGER.readMavenModel(runProcessService.getTalendCodeJavaProject(codeType).getProjectPom());
-                return model.getDependencies().stream().map(
+                return model.getDependencies().stream().filter(d -> !"provided".equals(d.getScope())).map(
                         d -> createDependency(d.getGroupId(), d.getArtifactId(), d.getVersion(), d.getType(), d.getClassifier()))
                         .peek(d -> ((SortableDependency) d).setAssemblyOptional(true)).collect(Collectors.toSet());
             } catch (CoreException e) {
@@ -1188,4 +1191,49 @@ public class PomUtil {
         return Collections.emptySet();
     }
 
+    public static void checkExistingLog4j2Dependencies4RoutinePom(String projectTechName, IFile pomFile) {
+        if (!PluginChecker.isBigdataRoutineLoaded()) {
+            return;
+        }
+        try {
+            if (GlobalServiceRegister.getDefault().isServiceRegistered(IRepositoryService.class)) {
+                Model model = MODEL_MANAGER.readMavenModel(pomFile);
+                IRepositoryService service = GlobalServiceRegister.getDefault().getService(IRepositoryService.class);
+                boolean isLog4j2 = service.isProjectLevelLog4j2();
+                Map<String, MavenArtifact> GAVMap = service.getLog4j2Modules().stream()
+                        .map(m -> MavenUrlHelper.parseMvnUrl(m.getMavenUri()))
+                        .collect(Collectors.toMap(MavenArtifact::getArtifactId, MavenArtifact -> MavenArtifact));
+                long existingDependenciesSize = model.getDependencies().stream()
+                        .filter(d -> GAVMap.containsKey(d.getArtifactId())
+                                && GAVMap.get(d.getArtifactId()).getGroupId().equals(d.getGroupId())
+                                && GAVMap.get(d.getArtifactId()).getVersion().equals(d.getVersion()))
+                        .count();
+                boolean clean = false;
+                // CAUTION
+                // with this fix, project level log4j2 user can use log4j2 api in routine directly in BD project
+                // user should NEVER manually setup log4j2 in routine dependencies
+                // or else routine install cache could always be cleaned
+                if (isLog4j2 && existingDependenciesSize != GAVMap.size()) {
+                    // if project level log4j1 -> log4j2
+                    // if first time add log4j2 dependencies
+                    // if log4j2 upgrade version
+                    // then clean cache to add
+                    clean = true;
+                } else if (!isLog4j2 && existingDependenciesSize > 0) {
+                    // if project level log4j2 -> log4j1
+                    // then clean cache to remove
+                    clean = true;
+                }
+                if (clean) {
+                    File cacheFile = CodeM2CacheManager.getCacheFile(projectTechName, ERepositoryObjectType.ROUTINES);
+                    if (cacheFile.exists()) {
+                        cacheFile.delete();
+                    }
+                }
+            }
+        } catch (CoreException e) {
+            ExceptionHandler.process(e);
+        }
+    }
+
 }

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

@@ -96,10 +96,14 @@ public final class TalendCodeProjectUtil {
                 return true;
             }
 
-            // because some cases, the project is not opened.
-            if (!codeProject.isOpen()) {
-                // if not opened, will have exception when check nature or such
-                codeProject.open(monitor);
+            try {
+                // because some cases, the project is not opened.
+                if (!codeProject.isOpen()) {
+                    // if not opened, will have exception when check nature or such
+                    codeProject.open(monitor);
+                }
+            } catch (Exception e) {
+                return true;
             }
 
             codeProject.refreshLocal(IResource.DEPTH_ONE, monitor);

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

@@ -3,10 +3,10 @@
 	<classpathentry exported="true" kind="lib" path="lib/woden-api-1.0M9.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/axiom-api-1.2.13.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/axiom-impl-1.2.13.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/axis2-adb-1.6.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/axis2-kernel-1.6.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/axis2-transport-http-1.6.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/axis2-transport-local-1.6.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/axis2-adb-1.7.9.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/axis2-kernel-1.7.9.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/axis2-transport-http-1.7.9.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/axis2-transport-local-1.7.9.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/geronimo-stax-api_1.0_spec-1.0.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/httpcore-4.0.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/neethi-3.0.1.jar"/>

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

@@ -13,10 +13,10 @@ Require-Bundle: org.eclipse.core.runtime,
 Bundle-ClassPath: lib/activation-1.1.jar,
  lib/axiom-api-1.2.13.jar,
  lib/axiom-impl-1.2.13.jar,
- lib/axis2-adb-1.6.2.jar,
- lib/axis2-kernel-1.6.2.jar,
- lib/axis2-transport-http-1.6.2.jar,
- lib/axis2-transport-local-1.6.2.jar,
+ lib/axis2-adb-1.7.9.jar,
+ lib/axis2-kernel-1.7.9.jar,
+ lib/axis2-transport-http-1.7.9.jar,
+ lib/axis2-transport-local-1.7.9.jar,
  lib/geronimo-stax-api_1.0_spec-1.0.1.jar,
  lib/httpcore-4.0.1.jar,
  lib/mail-1.4.jar,

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

@@ -9,4 +9,48 @@
   </parent>
   <artifactId>org.talend.libraries.apache.axis2</artifactId>
   <packaging>eclipse-plugin</packaging>
+  
+  <build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>3.0.2</version>
+				<executions>
+					<execution>
+						<id>copy</id>
+						<phase>generate-resources</phase>
+						<goals>
+							<goal>copy</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.basedir}/lib</outputDirectory>
+							<artifactItems>
+								<artifactItem>
+									<groupId>org.apache.axis2</groupId>
+								    <artifactId>axis2-kernel</artifactId>
+								    <version>1.7.9</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.apache.axis2</groupId>
+									<artifactId>axis2-adb</artifactId>
+									<version>1.7.9</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.apache.axis2</groupId>
+									<artifactId>axis2-transport-http</artifactId>
+									<version>1.7.9</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.apache.axis2</groupId>
+									<artifactId>axis2-transport-local</artifactId>
+									<version>1.7.9</version>
+								</artifactItem>
+							</artifactItems>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>

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

@@ -7,7 +7,7 @@
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-digester-2.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-cli-2.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.6.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.15.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-text-1.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

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

@@ -4,7 +4,7 @@ Bundle-Name: Common
 Bundle-SymbolicName: org.talend.libraries.apache.common
 Bundle-Version: 7.4.1.qualifier
 Bundle-ClassPath: .,
- lib/commons-codec-1.6.jar,
+ lib/commons-codec-1.15.jar,
  lib/commons-cli-2.0-SNAPSHOT.jar,
  lib/commons-digester-2.1.jar,
  lib/commons-math3-3.3.jar,
@@ -44,6 +44,7 @@ Export-Package: org.apache.commons.cli2,
  org.apache.commons.math3.stat.descriptive;version="3.3.0",
  org.apache.commons.math3.stat.descriptive.rank;version="3.3.0",
  org.apache.commons.math3.util;version="3.3.0",
+ org.apache.commons.text,
  org.apache.commons.text.similarity,
  org.apache.commons.validator;version="1.5.1",
  org.apache.commons.validator.routines;version="1.5.1"

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

@@ -36,7 +36,7 @@
 								<artifactItem>
 									<groupId>commons-codec</groupId>
 									<artifactId>commons-codec</artifactId>
-									<version>1.6</version>
+									<version>1.15</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>commons-digester</groupId>

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

@@ -3,7 +3,6 @@
 	<classpathentry exported="true" kind="lib" path="lib/xml-apis.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="lib/ant.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/apache-mime4j-0.6.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/castor-1.0.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jakarta-oro-2.0.8.jar"/>

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

@@ -4,7 +4,6 @@ Bundle-Name: Apache Plug-in
 Bundle-SymbolicName: org.talend.libraries.apache
 Bundle-Version: 7.4.1.qualifier
 Bundle-ClassPath: .,
- lib/ant.jar,
  lib/apache-mime4j-0.6.jar,
  lib/castor-1.0.3.jar,
  lib/jakarta-oro-2.0.8.jar,
@@ -41,11 +40,6 @@ Export-Package:
  org.apache.oro.text.perl,
  org.apache.oro.text.regex,
  org.apache.oro.util,
- org.apache.tools.ant,
- org.apache.tools.bzip2,
- org.apache.tools.mail,
- org.apache.tools.tar,
- org.apache.tools.zip,
  org.apache.xmlbeans,
  org.apache.xmlbeans.impl.common,
  org.apache.xmlbeans.impl.config,

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

@@ -11,7 +11,7 @@
 	<packaging>eclipse-plugin</packaging>
 	<properties>
 		<log4j.version>1.2.17</log4j.version>
-		<slf4j.version>1.7.25</slf4j.version>
+		<slf4j.version>1.7.29</slf4j.version>
 		<log4j2.version>2.12.1</log4j2.version>
 	</properties>
 	<dependencies>
@@ -35,6 +35,11 @@
 			<artifactId>jcl-over-slf4j</artifactId>
 			<version>${slf4j.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jul-to-slf4j</artifactId>
@@ -73,6 +78,16 @@
 	</dependencies>
 	<build>
 		<plugins>
+			<plugin>
+		        <groupId>org.eclipse.tycho</groupId>
+		        <artifactId>target-platform-configuration</artifactId>
+		        <version>${tycho.version}</version>
+		        <configuration>
+		            <dependency-resolution>
+		                <optionalDependencies>ignore</optionalDependencies>
+		            </dependency-resolution>
+		        </configuration>
+	      	</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
@@ -88,6 +103,7 @@
 							<excludeTypes>pom</excludeTypes>
 							<excludeTransitive>true</excludeTransitive>
 							<outputDirectory>${project.basedir}/lib</outputDirectory>
+							<includeGroupIds>log4j,org.slf4j,org.apache.logging.log4j</includeGroupIds>
 						</configuration>
 					</execution>
 				</executions>

main/plugins/org.talend.libraries.jdbc.h2/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/h2-1.3.160.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/h2-1.4.198.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

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

@@ -4,7 +4,7 @@ Bundle-Name: H2
 Bundle-SymbolicName: org.talend.libraries.jdbc.h2
 Bundle-Version: 7.4.1.qualifier
 Bundle-ClassPath: .,
- lib/h2-1.3.160.jar
+ lib/h2-1.4.198.jar
 Export-Package: org.h2,
  org.h2.api;uses:="org.h2.command.ddl,org.h2.table",
  org.h2.bnf;uses:="org.h2.server.web",

main/plugins/org.talend.libraries.jdbc.h2/build.properties

@@ -1,6 +1,4 @@
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               lib/h2-1.3.160.jar,\
-               lib/h2-1.2.139.jar,\
-               lib/h2-1.2.132.jar
+               lib/h2-1.4.198.jar