chore(TDI-49426): bump to tcompV0 0.36.20 (#773)

Co-authored-by: jenkins-git <jenkins-git@talend.com>

README.md

@@ -13,8 +13,8 @@ It is a simple git repo but allows working with all Talend Studio open source re
 Install GitSlave
 ================
 GitSlave is the tool you can use to perform multi-repo command, in order to use it to its full potential please
-install : 
-* perl 
+install :
+* perl
 * clone this repostitory locally if not already done.
 * move the folder tools/gitslave-2.0.2 to you own user folders.
 * Then you can make an alias to the main script called "gits" (use gits_for_mac if you are on a mac).
@@ -25,7 +25,7 @@ The list of repositories handled by this gitslave repo can be found in the file
 All Gitslave command are available hre : http://gitslave.sourceforge.net/gits-man-page.html
 
 if you want to dowload (clone) all slave studio repositories, use the command
-        
+
         gits populate --with-ifpresent
 
 should you want to download a set of slave repositories, use
@@ -41,7 +41,7 @@ You will find the list of repositories in root [.gitslave](../master/.gitslave)
 Build The Open Source Studio
 ================
 To build the Studio you may need to increase the java memory heap size used, therefor you need to setup a specific Maven environment variable with the following values assuming you have anought ram on you machine :)
-here is how to do it on linux or mac 
+here is how to do it on linux or mac
 ```
 export MAVEN_OPTS='-Xmx8000m -XX:MaxPermSize=512m -XX:-UseConcMarkSweepGC'
 ```
@@ -75,11 +75,10 @@ If you want to only build one or any number of products you may use one or many
 -Dtos.bd=true
 -Dtos.di=true
 -Dtos.dq=true
--Dtos.mdm=true 
 -Dtos.esb=true
 ```
 
-## Support 
+## Support
 
 You can ask for help on our [Forum](http://www.talend.com/services/global-technical-support).
 
@@ -98,6 +97,6 @@ See the [CONTRIBUTORS.md](./CONTRIBUTORS.md) file for details.
 
 ## License
 
-Copyright (c) 2006-2015 Talend
+Copyright (c) 2006-2019 Talend
 
 Licensed under the Apache v2 and GPLv2 License

build/dependencies.p2/dependencies.p2.tos/pom.xml

@@ -5,11 +5,12 @@
 	<parent>
 		<groupId>org.talend.repo</groupId>
 		<artifactId>dependencies.p2</artifactId>
-		<version>7.2.1-SNAPSHOT</version>
+		<version>7.3.1-PATCH</version>
 	</parent>
 
 	<artifactId>dependencies.p2.tos</artifactId>
 	<packaging>pom</packaging>
+	
 
     <repositories>
         <repository>
@@ -38,7 +39,7 @@
 		<dependency>
 			<groupId>org.ops4j.pax.url</groupId>
 			<artifactId>pax-url-aether</artifactId>
-			<version>2.4.6-Talend</version>
+			<version>2.6.1-Talend</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
@@ -50,16 +51,6 @@
 			<artifactId>dataquality-phone</artifactId>
 			<version>${dataquality.lib.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.talend.dataquality</groupId>
-			<artifactId>dataquality-semantic-model</artifactId>
-			<version>${dataquality.lib.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.dataquality</groupId>
-			<artifactId>dataquality-semantic</artifactId>
-			<version>${dataquality.lib.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-statistics</artifactId>
@@ -70,6 +61,11 @@
 			<artifactId>dataquality-record-linkage</artifactId>
 			<version>${dataquality.lib.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.talend.dataquality</groupId>
+			<artifactId>dataquality-converters</artifactId>
+			<version>${dataquality.lib.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-text-japanese</artifactId>
@@ -91,6 +87,18 @@
 			<version>${daikon.version}</version>
 			<classifier>bundle</classifier>
 		</dependency>
+		<dependency>
+			<groupId>org.talend.daikon</groupId>
+			<artifactId>crypto-utils</artifactId>
+			<version>${daikon.version}</version>
+			<classifier>bundle</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.daikon</groupId>
+			<artifactId>daikon-exception</artifactId>
+			<version>${daikon.version}</version>
+			<classifier>bundle</classifier>
+		</dependency>
 		<dependency>
 			<groupId>org.talend.daikon</groupId>
 			<artifactId>multitenant-core</artifactId>
@@ -105,22 +113,47 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.9.0</version>
+            <version>${fasterxml.jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.7</version>
+            <version>3.10</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.9.5</version>
+            <version>${fasterxml.jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.9.5</version>
+            <version>${fasterxml.jackson.databind.version}</version>
+        </dependency>
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>2.3.1</version>
+		</dependency>
+		<dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.9.4-talend</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-configuration2</artifactId>
+            <version>2.8.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>1.10.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.7</version>
         </dependency>
         <!-- end of daikon dependencies -->
 
@@ -130,12 +163,12 @@
 		<dependency>
 			<groupId>org.codehaus.jackson</groupId>
 			<artifactId>jackson-core-asl</artifactId>
-			<version>1.9.14-TALEND</version>
+			<version>1.9.16-TALEND</version>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.jackson</groupId>
 			<artifactId>jackson-mapper-asl</artifactId>
-			<version>1.9.14-TALEND</version>
+			<version>1.9.16-TALEND</version>
 		</dependency>
 
 		<!-- Avro with minimum depdencies -->
@@ -162,7 +195,7 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-compress</artifactId>
-			<version>1.10</version>
+			<version>1.19</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.livesense</groupId>
@@ -285,7 +318,7 @@
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.10</version>
+			<version>1.14-talend</version>
 		</dependency>
 		<!-- to avoid updatin the complete eclipse target platform we add these
 			single dependencies -->
@@ -299,15 +332,88 @@
 			<artifactId>commons-logging</artifactId>
 			<version>1.2</version>
 		</dependency>
+		<dependency>
+			<groupId>commons-beanutils</groupId>
+			<artifactId>commons-beanutils</artifactId>
+			<version>1.9.4-talend</version>
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>org-slf4j-api</artifactId>
 			<version>1.7.2</version>
 		</dependency>
+		
 		<dependency>
-			<groupId>commons-configuration</groupId>
-			<artifactId>commons-configuration</artifactId>
-			<version>1.10</version>
+			<groupId>com.fasterxml.jackson.dataformat</groupId>
+			<artifactId>jackson-dataformat-xml</artifactId>
+			<version>${fasterxml.jackson.bonita.compatible.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.dataformat</groupId>
+			<artifactId>jackson-dataformat-yaml</artifactId>
+			<version>${fasterxml.jackson.bonita.compatible.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.dataformat</groupId>
+			<artifactId>jackson-dataformat-csv</artifactId>
+			<version>${fasterxml.jackson.bonita.compatible.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.dataformat</groupId>
+			<artifactId>jackson-dataformat-smile</artifactId>
+			<version>${fasterxml.jackson.bonita.compatible.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.module</groupId>
+			<artifactId>jackson-module-jaxb-annotations</artifactId>
+			<version>${fasterxml.jackson.bonita.compatible.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.yaml</groupId>
+			<artifactId>snakeyaml</artifactId>
+			<version>1.26</version>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.woodstox</groupId>
+			<artifactId>stax2-api</artifactId>
+			<version>4.2</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.woodstox</groupId>
+			<artifactId>woodstox-core</artifactId>
+			<version>6.4.0</version>
+		</dependency>
+		 <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov</artifactId>
+            <version>1.68.0</version>
+            <classifier>bundle</classifier>
+        </dependency>
+		<dependency>
+			<groupId>org.junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.13.2</version>
+			<classifier>bundle</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<version>4.5.13-talend</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpcore</artifactId>
+			<version>4.4.14-talend</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.reload4j</groupId>
+			<artifactId>reload4j</artifactId>
+			<version>1.2.19-TALEND</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.ant</groupId>
+			<artifactId>ant</artifactId>
+			<version>1.10.12-ORBIT</version>
 		</dependency>
 	</dependencies>
 

build/dependencies.p2/pom.xml

@@ -1,17 +1,22 @@
 <?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>
-
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+        <groupId>org.talend.studio</groupId>
+        <artifactId>parent-pom</artifactId>
+	<version>7.3.1-PATCH</version>
+        <relativePath>../../talend.studio.parent.pom</relativePath>
+    </parent>
     <groupId>org.talend.repo</groupId>
     <artifactId>dependencies.p2</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <properties>
         <talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
-        <components.version>0.26.0-SNAPSHOT</components.version>
-        <daikon.version>0.29.0-SNAPSHOT</daikon.version>
-        <dataquality.lib.version>6.2.0-SNAPSHOT</dataquality.lib.version>
+        <dataquality.lib.version>8.0.26</dataquality.lib.version>
+        <fasterxml.jackson.version>2.13.4</fasterxml.jackson.version>
+        <fasterxml.jackson.databind.version>2.13.4.2</fasterxml.jackson.databind.version>
+        <!-- jackson dataformat and jaxb should use version 2.9.10 to make studio compatible with bonita -->
+        <fasterxml.jackson.bonita.compatible.version>2.9.10</fasterxml.jackson.bonita.compatible.version>
     </properties>
 
     <distributionManagement>

build/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>7.2.1-SNAPSHOT</version>
+		<version>7.3.1-PATCH</version>
 		<relativePath />
 	</parent>
 
@@ -44,7 +44,6 @@
 				<module>talend.studio.tos.bd.product</module>
 				<module>talend.studio.tos.di.product</module>
 				<module>talend.studio.tos.dq.product</module>
-				<module>talend.studio.tos.mdm.product</module>
 				<module>talend.studio.tos.esb.product</module>
 			</modules>
 		</profile>
@@ -60,7 +59,6 @@
 				<module>talend.studio.tos.bd.product</module>
 				<module>talend.studio.tos.di.product</module>
 				<module>talend.studio.tos.dq.product</module>
-				<module>talend.studio.tos.mdm.product</module>
 				<module>talend.studio.tos.esb.product</module>
 				<module>talend.studio.tos.all.p2.product</module>
 			</modules>
@@ -133,18 +131,6 @@
 				<module>talend.studio.tos.dq.product</module>
 			</modules>
 		</profile>
-		<profile>
-			<id>tos.mdm.product</id>
-			<activation>
-				<property>
-					<name>tos.mdm</name>
-					<value>true</value>
-				</property>
-			</activation>
-			<modules>
-				<module>talend.studio.tos.mdm.product</module>
-			</modules>
-		</profile>
 		<profile>
 			<id>tos.esb.product</id>
 			<activation>

build/talend.studio.tos.all.p2.product/pom.xml

@@ -4,12 +4,13 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>7.2.1-SNAPSHOT</version>
+		<version>7.3.1-PATCH</version>
 		<relativePath />
 	</parent>
 
 	<artifactId>talend-tos-p2-repo</artifactId>
 	<packaging>eclipse-repository</packaging>
+	<version>7.3.1.PATCH</version>
 
 	<properties>
 		<product.final.name>${launcher.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>

build/talend.studio.tos.all.p2.product/talend.product

@@ -21,7 +21,6 @@
       <feature id="org.talend.rcp.branding.tos.feature"/>
       <feature id="org.talend.rcp.branding.top.feature"/>
       <feature id="org.talend.rcp.branding.esbstandard.feature"/>
-      <feature id="org.talend.rcp.branding.tombundle.feature"/>
       <feature id="org.talend.rcp.branding.tos.test.feature"/>
       <feature id="org.talend.mdm.tom.test.feature"/>
       <feature id="org.talend.babel.all.tos.feature"/>
@@ -64,6 +63,9 @@
       <feature id="org.talend.updates.feature"/>
       <feature id="org.talend.utils.feature"/>
       <feature id="org.talend.dataquality.se.test.feature"/>
+      <feature id="org.talend.help.di.feature"/>
+      <feature id="org.talend.help.bd.feature"/>
+      <feature id="org.talend.help.esb.feature"/>
    </features>
 
 

build/talend.studio.tos.bd.product/config.ini

@@ -4,8 +4,9 @@ osgi.splashPath=platform:/base/plugins/${product.branding.platform}/
 talend.studio.version=${version.full}
 eclipse.product=${product.branding.id}
 #The following osgi.framework key is required for the p2 update feature not to override the osgi.bundles values.
-osgi.framework=file\:plugins/org.eclipse.osgi_3.10.100.v20150521-1310.jar
-osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start,org.talend.components.api.service.osgi@start
+osgi.framework=file\:plugins/org.eclipse.osgi_3.13.200.v20181130-2106.jar
+osgi.bundles=org.eclipse.equinox.simpleconfigurator@1\:start,org.eclipse.compare.win32@4,org.eclipse.core.filesystem.linux.x86_64@4,org.eclipse.core.filesystem.macosx@4,org.eclipse.core.filesystem.win32.x86_64@4,org.eclipse.core.net.linux.x86_64@4,org.eclipse.core.net.win32.x86_64@4,org.eclipse.core.resources.win32.x86_64@4,org.eclipse.e4.ui.swt.gtk@4,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@4,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@4,org.eclipse.equinox.launcher.gtk.linux.x86_64@4,org.eclipse.equinox.launcher.win32.win32.x86_64@4,org.eclipse.equinox.security.linux.x86_64@4,org.eclipse.equinox.security.macosx@4,org.eclipse.equinox.security.win32.x86_64@4,org.eclipse.gmf.runtime.common.ui.printing.win32@4,org.eclipse.jdt.launching.macosx@4,org.eclipse.jdt.launching.ui.macosx@4,org.eclipse.swt.cocoa.macosx.x86_64@4,org.eclipse.swt.gtk.linux.x86_64@4,org.eclipse.swt.win32.win32.x86_64@4,org.eclipse.ui.cocoa@4,org.eclipse.ui.win32@4
+org.eclipse.equinox.simpleconfigurator.configUrl=file\:org.eclipse.equinox.simpleconfigurator/bundles.info
 osgi.bundles.defaultStartLevel=4
 osgi.bundlefile.limit=200
 osgi.framework.extensions=org.talend.osgi.lib.loader
@@ -13,3 +14,5 @@ file.encoding=UTF-8
 eclipse.p2.data.area=@config.dir/../p2/
 eclipse.p2.profile=profile
 default.update.site.url=https://update.talend.com/Studio/tos/
+
+component.java.coordinates = org.talend.components:couchbase:1.27.20,org.talend.components:cosmosDB:1.27.20

build/talend.studio.tos.bd.product/launcher.ini

@@ -4,4 +4,5 @@
 -Dfile.encoding=UTF-8
 -Dosgi.requiredJavaVersion=1.8
 -XX:+UseG1GC
--XX:+UseStringDeduplication
+-XX:+UseStringDeduplication
+-XX:MaxMetaspaceSize=512m

build/talend.studio.tos.bd.product/launcher_64.ini

@@ -4,4 +4,5 @@
 -Dfile.encoding=UTF-8
 -Dosgi.requiredJavaVersion=1.8
 -XX:+UseG1GC
--XX:+UseStringDeduplication
+-XX:+UseStringDeduplication
+-XX:MaxMetaspaceSize=512m

build/talend.studio.tos.bd.product/launcher_macosx.ini

@@ -8,4 +8,5 @@
 -Dfile.encoding=UTF-8
 -Dosgi.requiredJavaVersion=1.8
 -XX:+UseG1GC
--XX:+UseStringDeduplication
+-XX:+UseStringDeduplication
+-XX:MaxMetaspaceSize=512m

build/talend.studio.tos.bd.product/pom.xml

@@ -4,10 +4,11 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>7.2.1-SNAPSHOT</version>
+		<version>7.3.1-PATCH</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>
 
 	<artifactId>org.talend.studio.tos.bigdata.product</artifactId>
 	<packaging>eclipse-repository</packaging>
+	<version>7.3.1.PATCH</version>
 </project>

build/talend.studio.tos.bd.product/talend.product

@@ -14,4 +14,16 @@
       <feature id="org.talend.rcp.branding.tos.bigdata.feature"/>
       <!--<feature id="org.talend.babel.all.tos.feature"/>-->
    </features>
+
+   <configurations>
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+      <plugin id="org.ops4j.pax.url.mvn" autoStart="true" startLevel="0" />
+      <plugin id="org.talend.components.api.service.osgi" autoStart="true" startLevel="0" />
+      <plugin id="org.talend.maven.resolver" autoStart="true" startLevel="0" />
+   </configurations>
+
 </product>

build/talend.studio.tos.di.product/config.ini

@@ -4,12 +4,13 @@ osgi.splashPath=platform:/base/plugins/${product.branding.platform}/
 talend.studio.version=${version.full}
 eclipse.product=${product.branding.id}
 #The following osgi.framework key is required for the p2 update feature not to override the osgi.bundles values.
-osgi.framework=file\:plugins/org.eclipse.osgi_3.10.100.v20150521-1310.jar
-osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start,org.talend.components.api.service.osgi@start
+osgi.framework=file\:plugins/org.eclipse.osgi_3.13.200.v20181130-2106.jar
+osgi.bundles=org.eclipse.equinox.simpleconfigurator@1\:start,org.eclipse.compare.win32@4,org.eclipse.core.filesystem.linux.x86_64@4,org.eclipse.core.filesystem.macosx@4,org.eclipse.core.filesystem.win32.x86_64@4,org.eclipse.core.net.linux.x86_64@4,org.eclipse.core.net.win32.x86_64@4,org.eclipse.core.resources.win32.x86_64@4,org.eclipse.e4.ui.swt.gtk@4,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@4,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@4,org.eclipse.equinox.launcher.gtk.linux.x86_64@4,org.eclipse.equinox.launcher.win32.win32.x86_64@4,org.eclipse.equinox.security.linux.x86_64@4,org.eclipse.equinox.security.macosx@4,org.eclipse.equinox.security.win32.x86_64@4,org.eclipse.gmf.runtime.common.ui.printing.win32@4,org.eclipse.jdt.launching.macosx@4,org.eclipse.jdt.launching.ui.macosx@4,org.eclipse.swt.cocoa.macosx.x86_64@4,org.eclipse.swt.gtk.linux.x86_64@4,org.eclipse.swt.win32.win32.x86_64@4,org.eclipse.ui.cocoa@4,org.eclipse.ui.win32@4
+org.eclipse.equinox.simpleconfigurator.configUrl=file\:org.eclipse.equinox.simpleconfigurator/bundles.info
 osgi.bundles.defaultStartLevel=4
 osgi.bundlefile.limit=200
-osgi.framework.extensions=org.talend.osgi.lib.loader
+osgi.framework.extensions=org.talend.osgi.lib.loader,org.eclipse.osgi.compatibility.state
 file.encoding=UTF-8
 eclipse.p2.data.area=@config.dir/../p2/
 eclipse.p2.profile=profile
-default.update.site.url=https://update.talend.com/Studio/tos/
+default.update.site.url=https://update.talend.com/Studio/tos/

build/talend.studio.tos.di.product/launcher.ini

@@ -4,4 +4,5 @@
 -Dfile.encoding=UTF-8
 -Dosgi.requiredJavaVersion=1.8
 -XX:+UseG1GC
--XX:+UseStringDeduplication
+-XX:+UseStringDeduplication
+-XX:MaxMetaspaceSize=512m

build/talend.studio.tos.di.product/launcher_64.ini

@@ -4,4 +4,5 @@
 -Dfile.encoding=UTF-8
 -Dosgi.requiredJavaVersion=1.8
 -XX:+UseG1GC
--XX:+UseStringDeduplication
+-XX:+UseStringDeduplication
+-XX:MaxMetaspaceSize=512m

build/talend.studio.tos.di.product/launcher_macosx.ini

@@ -8,4 +8,5 @@
 -Dfile.encoding=UTF-8
 -Dosgi.requiredJavaVersion=1.8
 -XX:+UseG1GC
--XX:+UseStringDeduplication
+-XX:+UseStringDeduplication
+-XX:MaxMetaspaceSize=512m

build/talend.studio.tos.di.product/pom.xml

@@ -4,10 +4,11 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>7.2.1-SNAPSHOT</version>
+		<version>7.3.1-PATCH</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>
 
 	<artifactId>org.talend.studio.tos.di.product</artifactId>
 	<packaging>eclipse-repository</packaging>
+	<version>7.3.1.PATCH</version>
 </project>

build/talend.studio.tos.di.product/talend.product

@@ -10,8 +10,22 @@
       <win32>config.ini</win32>
    </configIni>
 
+   <plugins>
+   </plugins>
+
    <features>
       <feature id="org.talend.rcp.branding.tos.feature"/>
-      <!--<feature id="org.talend.babel.all.tos.feature"/>-->
    </features>
+
+   <configurations>
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+      <plugin id="org.ops4j.pax.url.mvn" autoStart="true" startLevel="0" />
+      <plugin id="org.talend.components.api.service.osgi" autoStart="true" startLevel="0" />
+      <plugin id="org.talend.maven.resolver" autoStart="true" startLevel="0" />
+   </configurations>
+
 </product>

build/talend.studio.tos.dq.product/config.ini

@@ -4,11 +4,12 @@ osgi.splashPath=platform:/base/plugins/${product.branding.platform}/
 talend.studio.version=${version.full}
 eclipse.product=${product.branding.id}
 #The following osgi.framework key is required for the p2 update feature not to override the osgi.bundles values.
-osgi.framework=file\:plugins/org.eclipse.osgi_3.10.100.v20150521-1310.jar
-osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start
+osgi.framework=file\:plugins/org.eclipse.osgi_3.13.200.v20181130-2106.jar
+osgi.bundles=org.eclipse.equinox.simpleconfigurator@1\:start,org.eclipse.compare.win32@4,org.eclipse.core.filesystem.linux.x86_64@4,org.eclipse.core.filesystem.macosx@4,org.eclipse.core.filesystem.win32.x86_64@4,org.eclipse.core.net.linux.x86_64@4,org.eclipse.core.net.win32.x86_64@4,org.eclipse.core.resources.win32.x86_64@4,org.eclipse.e4.ui.swt.gtk@4,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@4,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@4,org.eclipse.equinox.launcher.gtk.linux.x86_64@4,org.eclipse.equinox.launcher.win32.win32.x86_64@4,org.eclipse.equinox.security.linux.x86_64@4,org.eclipse.equinox.security.macosx@4,org.eclipse.equinox.security.win32.x86_64@4,org.eclipse.gmf.runtime.common.ui.printing.win32@4,org.eclipse.jdt.launching.macosx@4,org.eclipse.jdt.launching.ui.macosx@4,org.eclipse.swt.cocoa.macosx.x86_64@4,org.eclipse.swt.gtk.linux.x86_64@4,org.eclipse.swt.win32.win32.x86_64@4,org.eclipse.ui.cocoa@4,org.eclipse.ui.win32@4
+org.eclipse.equinox.simpleconfigurator.configUrl=file\:org.eclipse.equinox.simpleconfigurator/bundles.info
 osgi.bundles.defaultStartLevel=4
 osgi.bundlefile.limit=200
 osgi.framework.extensions=org.talend.osgi.lib.loader
 file.encoding=UTF-8
 eclipse.p2.data.area=@config.dir/../p2/
-eclipse.p2.profile=profile
+eclipse.p2.profile=profile

build/talend.studio.tos.dq.product/launcher.ini

@@ -4,4 +4,5 @@
 -Dfile.encoding=UTF-8
 -Dosgi.requiredJavaVersion=1.8
 -XX:+UseG1GC
--XX:+UseStringDeduplication
+-XX:+UseStringDeduplication
+-XX:MaxMetaspaceSize=512m

build/talend.studio.tos.dq.product/launcher_64.ini

@@ -4,4 +4,5 @@
 -Dfile.encoding=UTF-8
 -Dosgi.requiredJavaVersion=1.8
 -XX:+UseG1GC
--XX:+UseStringDeduplication
+-XX:+UseStringDeduplication
+-XX:MaxMetaspaceSize=512m

build/talend.studio.tos.dq.product/launcher_macosx.ini

@@ -8,4 +8,5 @@
 -Dfile.encoding=UTF-8
 -Dosgi.requiredJavaVersion=1.8
 -XX:+UseG1GC
--XX:+UseStringDeduplication
+-XX:+UseStringDeduplication
+-XX:MaxMetaspaceSize=512m

build/talend.studio.tos.dq.product/pom.xml

@@ -4,10 +4,11 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>7.2.1-SNAPSHOT</version>
+		<version>7.3.1-PATCH</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>
 
 	<artifactId>org.talend.studio.tos.dq.product</artifactId>
 	<packaging>eclipse-repository</packaging>
+	<version>7.3.1.PATCH</version>
 </project>

build/talend.studio.tos.dq.product/talend.product

@@ -14,4 +14,17 @@
       <feature id="org.talend.rcp.branding.top.feature"/>
       <!--<feature id="org.talend.babel.all.tos.feature"/>-->
    </features>
+
+   <configurations>
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+      <plugin id="org.ops4j.pax.url.mvn" autoStart="true" startLevel="0" />
+      <plugin id="org.talend.components.api.service.osgi" autoStart="true" startLevel="0" />
+      <plugin id="org.talend.maven.resolver" autoStart="true" startLevel="0" />
+   </configurations>
+
 </product>

build/talend.studio.tos.esb.product/config.ini

@@ -4,12 +4,13 @@ osgi.splashPath=platform:/base/plugins/${product.branding.platform}/
 talend.studio.version=${version.full}
 eclipse.product=${product.branding.id}
 #The following osgi.framework key is required for the p2 update feature not to override the osgi.bundles values.
-osgi.framework=file\:plugins/org.eclipse.osgi_3.10.100.v20150521-1310.jar
-osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start,org.talend.components.api.service.osgi@start
+osgi.framework=file\:plugins/org.eclipse.osgi_3.13.200.v20181130-2106.jar
+osgi.bundles=org.eclipse.equinox.simpleconfigurator@1\:start,org.eclipse.compare.win32@4,org.eclipse.core.filesystem.linux.x86_64@4,org.eclipse.core.filesystem.macosx@4,org.eclipse.core.filesystem.win32.x86_64@4,org.eclipse.core.net.linux.x86_64@4,org.eclipse.core.net.win32.x86_64@4,org.eclipse.core.resources.win32.x86_64@4,org.eclipse.e4.ui.swt.gtk@4,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@4,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@4,org.eclipse.equinox.launcher.gtk.linux.x86_64@4,org.eclipse.equinox.launcher.win32.win32.x86_64@4,org.eclipse.equinox.security.linux.x86_64@4,org.eclipse.equinox.security.macosx@4,org.eclipse.equinox.security.win32.x86_64@4,org.eclipse.gmf.runtime.common.ui.printing.win32@4,org.eclipse.jdt.launching.macosx@4,org.eclipse.jdt.launching.ui.macosx@4,org.eclipse.swt.cocoa.macosx.x86_64@4,org.eclipse.swt.gtk.linux.x86_64@4,org.eclipse.swt.win32.win32.x86_64@4,org.eclipse.ui.cocoa@4,org.eclipse.ui.win32@4
+org.eclipse.equinox.simpleconfigurator.configUrl=file\:org.eclipse.equinox.simpleconfigurator/bundles.info
 osgi.bundles.defaultStartLevel=4
 osgi.bundlefile.limit=200
 osgi.framework.extensions=org.talend.osgi.lib.loader
 file.encoding=UTF-8
 eclipse.p2.data.area=@config.dir/../p2/
 eclipse.p2.profile=profile
-default.update.site.url=https://update.talend.com/Studio/tos/
+default.update.site.url=https://update.talend.com/Studio/tos/

build/talend.studio.tos.esb.product/launcher.ini

@@ -4,4 +4,5 @@
 -Dfile.encoding=UTF-8
 -Dosgi.requiredJavaVersion=1.8
 -XX:+UseG1GC
--XX:+UseStringDeduplication
+-XX:+UseStringDeduplication
+-XX:MaxMetaspaceSize=512m

build/talend.studio.tos.esb.product/launcher_64.ini

@@ -4,4 +4,5 @@
 -Dfile.encoding=UTF-8
 -Dosgi.requiredJavaVersion=1.8
 -XX:+UseG1GC
--XX:+UseStringDeduplication
+-XX:+UseStringDeduplication
+-XX:MaxMetaspaceSize=512m

build/talend.studio.tos.esb.product/launcher_macosx.ini

@@ -8,4 +8,5 @@
 -Dfile.encoding=UTF-8
 -Dosgi.requiredJavaVersion=1.8
 -XX:+UseG1GC
--XX:+UseStringDeduplication
+-XX:+UseStringDeduplication
+-XX:MaxMetaspaceSize=512m

build/talend.studio.tos.esb.product/pom.xml

@@ -4,10 +4,11 @@
     <parent>
         <groupId>org.talend.studio</groupId>
         <artifactId>tos-products-parent-pom</artifactId>
-        <version>7.2.1-SNAPSHOT</version>
+        <version>7.3.1-PATCH</version>
         <relativePath>../talend.studio.tos.product.parent.pom</relativePath>
     </parent>
 
     <artifactId>org.talend.studio.tos.esb.product</artifactId>
     <packaging>eclipse-repository</packaging>
+	<version>7.3.1.PATCH</version>
 </project>

build/talend.studio.tos.esb.product/talend.product

@@ -15,5 +15,15 @@
       <!--<feature id="org.talend.babel.all.tos.feature"/>-->
    </features>
 
+   <configurations>
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+      <plugin id="org.ops4j.pax.url.mvn" autoStart="true" startLevel="0" />
+      <plugin id="org.talend.components.api.service.osgi" autoStart="true" startLevel="0" />
+      <plugin id="org.talend.maven.resolver" autoStart="true" startLevel="0" />
+   </configurations>
 
 </product>

build/talend.studio.tos.mdm.product/.eclipseproduct

@@ -1,3 +0,0 @@
-name=${product.name}
-id=${product.branding.id}
-version=${version.full}

build/talend.studio.tos.mdm.product/config.ini

@@ -1,15 +0,0 @@
-#Product Runtime Configuration File
-
-osgi.splashPath=platform:/base/plugins/${product.branding.platform}/
-talend.studio.version=${version.full}
-eclipse.product=${product.branding.id}
-#The following osgi.framework key is required for the p2 update feature not to override the osgi.bundles values.
-osgi.framework=file\:plugins/org.eclipse.osgi_3.10.100.v20150521-1310.jar
-osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start,org.talend.components.api.service.osgi@start
-osgi.bundles.defaultStartLevel=4
-osgi.bundlefile.limit=200
-osgi.framework.extensions=org.talend.osgi.lib.loader
-file.encoding=UTF-8
-eclipse.p2.data.area=@config.dir/../p2/
-eclipse.p2.profile=profile
-default.update.site.url=https://update.talend.com/Studio/tos/

build/talend.studio.tos.mdm.product/launcher.ini

@@ -1,7 +0,0 @@
--vmargs
--Xms256m
--Xmx768m
--Dfile.encoding=UTF-8
--Dosgi.requiredJavaVersion=1.8
--XX:+UseG1GC
--XX:+UseStringDeduplication

build/talend.studio.tos.mdm.product/launcher_64.ini

@@ -1,7 +0,0 @@
--vmargs
--Xms512m
--Xmx1536m
--Dfile.encoding=UTF-8
--Dosgi.requiredJavaVersion=1.8
--XX:+UseG1GC
--XX:+UseStringDeduplication

build/talend.studio.tos.mdm.product/launcher_macosx.ini

@@ -1,11 +0,0 @@
--vmargs
--Xms512m
--Xmx1536m
--Xdock:icon=../Resources/talend.icns
--XstartOnFirstThread
--Dorg.eclipse.swt.internal.carbon.smallFonts
--Dosgi.instance.area.default=../../../workspace
--Dfile.encoding=UTF-8
--Dosgi.requiredJavaVersion=1.8
--XX:+UseG1GC
--XX:+UseStringDeduplication

build/talend.studio.tos.mdm.product/pom.xml

@@ -1,13 +0,0 @@
-<?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>tos-products-parent-pom</artifactId>
-        <version>7.2.1-SNAPSHOT</version>
-        <relativePath>../talend.studio.tos.product.parent.pom</relativePath>
-    </parent>
-
-    <artifactId>org.talend.studio.tos.mdm.product</artifactId>
-    <packaging>eclipse-repository</packaging>
-</project>

build/talend.studio.tos.mdm.product/product.properties

@@ -1,8 +0,0 @@
-launcher.prefix=TOS_MDM
-storage.prefix=TOS_MDM-Studio
-product.name=Talend Open Studio for MDM
-product.branding.platform=org.talend.rcp.branding.tombundle
-product.branding.id=${product.branding.platform}.product
-mac.launcher.info=${product.name} for Mac OS X, Copyright Talend. 2006-2015. All rights reserved.
-product.website=http://www.talend.com\n
-storage.dir=tmdmce

build/talend.studio.tos.mdm.product/talend.product

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product uid="org.talend.studio.tos.mdm.product" id="org.talend.rcp.branding.tombundle.product" useFeatures="true" includeLaunchers="false">
-
-   <configIni use="default">
-      <linux>config.ini</linux>
-      <macosx>config.ini</macosx>
-      <solaris>config.ini</solaris>
-      <win32>config.ini</win32>
-   </configIni>
-
-   <features>
-      <feature id="org.talend.rcp.branding.tombundle.feature"/>
-      <!--<feature id="org.talend.babel.all.tos.feature"/>-->
-   </features>
-</product>

build/talend.studio.tos.product.parent.pom/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.talend.studio</groupId>
         <artifactId>parent-pom</artifactId>
-        <version>7.2.1-SNAPSHOT</version>
+        <version>7.3.1-PATCH</version>
         <relativePath />
     </parent>
 
@@ -118,7 +118,7 @@
                                 <artifactItem>
                                     <groupId>${project.groupId}</groupId>
                                     <artifactId>eclipse-launcher-mac-${launcher.prefix}</artifactId>
-                                    <version>6.4.0</version>
+                                    <version>7.3.1</version>
                                     <type>zip</type>
                                     <overWrite>true</overWrite>
                                     <outputDirectory>${studio.dir}</outputDirectory>
@@ -134,7 +134,7 @@
                                 <artifactItem>
                                     <groupId>${project.groupId}</groupId>
                                     <artifactId>eclipse-delta-pack</artifactId>
-                                    <version>4.4.1b</version>
+                                    <version>4.10.0</version>
                                     <type>zip</type>
                                     <overWrite>true</overWrite>
                                     <outputDirectory>${studio.dir}</outputDirectory>
@@ -163,6 +163,26 @@
                             </artifactItems>
                         </configuration>
                     </execution>
+					<execution>
+						<id>copy-studio-add-conf</id>
+						<phase>package</phase>
+						<goals>
+							<goal>unpack</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>${project.groupId}</groupId>
+									<artifactId>studio-add-conf</artifactId>
+									<version>7.3.1-SNAPSHOT</version>
+									<type>zip</type>
+									<classifier />
+									<overWrite>true</overWrite>
+									<outputDirectory>${studio.dir}/configuration</outputDirectory>
+								</artifactItem>
+							</artifactItems>
+						</configuration>
+					</execution>
                     <execution>
                         <id>copy-notice-txt</id>
                         <phase>package</phase>
@@ -270,11 +290,13 @@
                         <configuration>
                             <target>
                                 <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
-                                <echo>Looking for ${studio.dir}/plugins/${product.branding.platform}_${product.version}*</echo>
+                                <propertyregex property="unqualifiedVersion.short" input="${product.version}" regexp="^([0-9])\.([0-9])\.([0-9])" select="\1.\2" casesensitive="false" />
+                                <echo>unqualifiedVersion.short: ${unqualifiedVersion.short}</echo>
+                                <echo>Looking for ${studio.dir}/plugins/${product.branding.platform}_${unqualifiedVersion.short}*</echo>
                                 <echo>buildQualifier=${buildQualifier}</echo>
                                 <echo>product.timestamp=${product.timestamp}</echo>
                                 <echo>version.full=${version.full}</echo>
-                                <fileset dir="${studio.dir}/plugins" includes="${product.branding.platform}_${product.version}*/about.mappings" id="aboutmappingspath_temp" />
+                                <fileset dir="${studio.dir}/plugins" includes="${product.branding.platform}_${unqualifiedVersion.short}*/about.mappings" id="aboutmappingspath_temp" />
                                 <pathconvert property="aboutmappingspath" refid="aboutmappingspath_temp" />
                                 <echo>aboutmappingspath=${aboutmappingspath}</echo>
                                 <loadfile property="about" srcFile="${aboutmappingspath}">
@@ -486,10 +508,10 @@
                                                 <echo file="${storage}/lastnb.txt" append="true">http://newbuild.talend.com/builds/${product.build.path}/${product.final.name}.zip${line.separator}</echo>
                                             </then>
                                         </if>
-                                        <exec executable="openssl" dir="${product.dir}" outputproperty="sha256" >
+                                        <exec executable="openssl" dir="${product.dir}" outputproperty="sha256">
                                             <arg line="dgst" />
                                             <arg line="-sha256" />
-                                            <arg line="${product.final.name}.zip"/>
+                                            <arg line="${product.final.name}.zip" />
                                         </exec>
                                         <echo file="${product.dir}/${product.final.name}.zip.sha256" append="false">${sha256}</echo>
                                     </target>

pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>7.2.1-SNAPSHOT</version>
+		<version>7.3.1-PATCH</version>
 		<relativePath />
 	</parent>
 

tools/scripts/updateVersions.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 cd ../../
-mvn -Dtycho.mode=maven org.eclipse.tycho:tycho-versions-plugin:0.21.0:set-version -DnewVersion=6.0.0-SNAPSHOT -Dartifacts=parent-pom,tos-products-parent-pom,tos,org.talend.studio.tos.bigdata.product,org.talend.studio.tos.di.product,org.talend.studio.tos.dq.product,org.talend.studio.tos.esb.product,org.talend.studio.tos.mdm.product,tbd-studio-se,tcommon-studio-se,tdi-studio-se,tdq-studio-se,tesb-studio-se,tmdm-common,tmdm-studio-se,toem-studio-se
+mvn -Dtycho.mode=maven org.eclipse.tycho:tycho-versions-plugin:0.21.0:set-version -DnewVersion=6.0.0-SNAPSHOT -Dartifacts=parent-pom,tos-products-parent-pom,tos,org.talend.studio.tos.bigdata.product,org.talend.studio.tos.di.product,org.talend.studio.tos.dq.product,org.talend.studio.tos.esb.product,tbd-studio-se,tcommon-studio-se,tdi-studio-se,tdq-studio-se,tesb-studio-se,tmdm-common,tmdm-studio-se,toem-studio-se