DEVOPS-2322 Fix Linux script

DEVOPS-1729 Nexus migration: Update URLs [maintenance/6.2]

README.md

@@ -1,9 +1,10 @@
 # Studio-se-master
 http://www.talend.com
 
-![alt text](https://www.talend.com/wp-content/uploads/2016/07/talend-logo.png "Talend")
+![alt text](http://www.talend.com/sites/all/themes/talend_responsive/images/logo.png "Talend")
 
 > Content
+==========
 
 Master repos using gitslave for aggregating the full Talend Studio open source repositories
 
@@ -13,8 +14,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 +26,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 +42,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,10 +76,11 @@ 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).
 
@@ -97,6 +99,6 @@ See the [CONTRIBUTORS.md](./CONTRIBUTORS.md) file for details.
 
 ## License
 
-Copyright (c) 2006-2019 Talend
+Copyright (c) 2006-2015 Talend
 
 Licensed under the Apache v2 and GPLv2 License

build/Target_Platform_for_Talend_Studio_and_Luna/Talend_Studio_Eclipse44_TargetPlatform.target

@@ -1,8 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Talend Target Platform for Eclipse 4.4 definition" sequenceNumber="200">
+<?pde version="3.8"?><target name="Talend Target Platform for Eclipse 4.4 definition" sequenceNumber="193">
 <locations>
 <location path="${project_loc:/Target Platform for Talend Studio and Luna}/included/emf_query2" type="Directory"/>
 <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.nebula.widgets.cdatetime.feature.feature.group" version="0.14.0.201409040043"/>
+<unit id="org.eclipse.nebula.widgets.pshelf.feature.feature.group" version="1.0.0.201409040043"/>
+<unit id="org.eclipse.nebula.widgets.compositetable.feature.feature.group" version="1.0.0.201409040043"/>
+<unit id="org.eclipse.nebula.widgets.grid.feature.feature.group" version="1.0.0.201409040043"/>
+<unit id="org.eclipse.nebula.widgets.gallery.feature.feature.group" version="1.0.0.201409040043"/>
+<unit id="org.eclipse.nebula.cwt.feature.feature.group" version="0.9.0.201409040043"/>
+<unit id="org.eclipse.nebula.widgets.calendarcombo.feature.feature.group" version="1.0.0.201409040043"/>
+<unit id="org.eclipse.nebula.effects.stw.feature.feature.group" version="1.0.0.201409040043"/>
+<unit id="org.eclipse.nebula.widgets.xviewer.feature.feature.group" version="0.9.9.201409040043"/>
+<unit id="org.eclipse.nebula.widgets.oscilloscope.feature.feature.group" version="1.2.0.201409040043"/>
+<unit id="org.eclipse.nebula.widgets.ganttchart.feature.feature.group" version="1.0.0.201409040043"/>
+<unit id="org.eclipse.nebula.widgets.pshelf.css.feature.feature.group" version="1.0.0.201409040043"/>
+<unit id="org.eclipse.nebula.widgets.paperclips.feature.feature.group" version="2.0.0.201409040043"/>
+<unit id="org.eclipse.nebula.visualization.feature.feature.group" version="0.9.9.201409040043"/>
+<unit id="org.eclipse.nebula.widgets.pgroup.feature.feature.group" version="1.0.0.201409040043"/>
+<unit id="org.eclipse.nebula.feature.feature.group" version="1.0.0.201409040043"/>
+<unit id="org.eclipse.nebula.widgets.tablecombo.feature.feature.group" version="1.0.0.201409040043"/>
+<repository location="http://download.eclipse.org/technology/nebula/archives/Q32014/release/"/>
+</location>
+<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.datatools.sdk.feature.feature.group" version="1.12.0.v201406061321-7PB21FEpPZQXdcX0z-_yMM0Hfz0w"/>
 <unit id="org.eclipse.datatools.enablement.sdk.feature.feature.group" version="1.12.0.v201406061321-7IAB-FE9JgeWjZZhMd-z0vb1ifD4"/>
 <repository location="http://download.eclipse.org/datatools/updates/1.12"/>
@@ -147,12 +167,37 @@
 <unit id="org.eclipse.swtbot.forms.source.feature.group" version="2.2.1.201402241301"/>
 <repository location="http://download.eclipse.org/technology/swtbot/releases/2.2.1/"/>
 </location>
+<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.jst.server_sdk.feature.feature.group" version="3.4.100.v201405011426"/>
+<unit id="org.eclipse.jsf_sdk.feature.feature.group" version="3.7.1.v201409111805"/>
+<unit id="org.eclipse.jst.server_adapters.ext.sdk.feature.feature.group" version="3.3.301.v201409112028"/>
+<unit id="org.eclipse.jst.server_adapters.sdk.feature.feature.group" version="3.3.200.v201405011426"/>
+<unit id="org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature.feature.group" version="2.5.0.v201405061851"/>
+<unit id="org.eclipse.jst.webpageeditor_sdk.feature.feature.group" version="2.6.1.v201409111805"/>
+<unit id="org.eclipse.jst.web_sdk.feature.feature.group" version="3.6.1.v201409111852"/>
+<unit id="org.eclipse.jst.ws.axis2tools_sdk.feature.feature.group" version="1.1.300.v201405061937"/>
+<unit id="org.eclipse.jst.ws.jaxws_sdk.feature.feature.group" version="1.2.200.v201405061937"/>
+<unit id="org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature.group" version="3.6.1.v201409111458"/>
+<unit id="org.eclipse.jst.ws.jaxws.dom_sdk.feature.feature.group" version="1.0.300.v201405061937"/>
+<unit id="org.eclipse.jst.enterprise_sdk.feature.feature.group" version="3.6.1.v201409042158"/>
+<unit id="org.eclipse.jst.ws.cxf_sdk.feature.feature.group" version="1.1.201.v201409111807"/>
+<repository location="http://download.eclipse.org/webtools/repository/luna/"/>
+</location>
 <location path="${project_loc:/Target Platform for Talend Studio and Luna}/included/dltk/eclipse" type="Directory"/>
 <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="net.jeeeyul.eclipse.themes.feature.feature.group" version="2.2.0.I20141210-114528"/>
 <unit id="net.jeeeyul.swtend.feature.feature.group" version="2.2.5.I20140918-144458"/>
 <repository location="http://eclipse.jeeeyul.net/update/"/>
 </location>
+<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.egit.source.feature.group" version="3.4.2.201412180340-r"/>
+<unit id="org.eclipse.egit.feature.group" version="3.4.2.201412180340-r"/>
+<unit id="org.eclipse.jgit.java7.feature.group" version="3.4.2.201412180340-r"/>
+<unit id="org.eclipse.jgit.http.apache.feature.group" version="3.4.2.201412180340-r"/>
+<unit id="org.eclipse.jgit.source.feature.group" version="3.4.2.201412180340-r"/>
+<unit id="org.eclipse.jgit.feature.group" version="3.4.2.201412180340-r"/>
+<repository location="http://download.eclipse.org/releases/luna/"/>
+</location>
 <location path="${project_loc:/Target Platform for Talend Studio and Luna}/included/drools" type="Directory"/>
 <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.codehaus.groovy23.feature.feature.group" version="2.9.0.xx-201406301445-e44"/>
@@ -1240,54 +1285,18 @@
 <repository location="http://download.eclipse.org/mmt/atl/updates/releases/3.5"/>
 </location>
 <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jst.ws.jaxws_sdk.feature.feature.group" version="1.2.201.v201410232139"/>
-<unit id="org.eclipse.jsf.feature.feature.group" version="3.7.2.v201410101742"/>
-<unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.301.v201410160332"/>
-<unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.6.3.v201502041526"/>
-<unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.3.302.v201501040116"/>
-<unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.301.v201410241731"/>
-<unit id="org.eclipse.jst.server_adapters.ext.sdk.feature.feature.group" version="3.3.302.v201501040116"/>
-<unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.6.2.v201409302019"/>
-<unit id="org.eclipse.jst.ws.cxf_sdk.feature.feature.group" version="1.1.202.v201410232139"/>
-<unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.2.201.v201410232139"/>
-<unit id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group" version="2.5.2.v201410101742"/>
-<unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.1.202.v201410232139"/>
-<unit id="org.eclipse.jst.ws.axis2tools_sdk.feature.feature.group" version="1.1.301.v201410160332"/>
-<unit id="org.eclipse.jst.web_sdk.feature.feature.group" version="3.6.3.v201502041526"/>
-<unit id="org.eclipse.jst.ws.jaxws.dom_sdk.feature.feature.group" version="1.0.301.v201410230748"/>
-<unit id="org.eclipse.jsf_sdk.feature.feature.group" version="3.7.2.v201410101742"/>
-<unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.6.3.v201501281502"/>
-<unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.4.101.v201410241731"/>
-<unit id="org.eclipse.jst.server_sdk.feature.feature.group" version="3.4.101.v201501191930"/>
-<unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.6.3.v201501141810"/>
-<unit id="org.eclipse.jst.enterprise_sdk.feature.feature.group" version="3.6.3.v201501281502"/>
-<unit id="org.eclipse.jst.webpageeditor_sdk.feature.feature.group" version="2.6.2.v201409302019"/>
-<unit id="org.eclipse.jst.server_adapters.sdk.feature.feature.group" version="3.3.200.v201410241731"/>
-<unit id="org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature.feature.group" version="2.5.2.v201410101742"/>
-<unit id="org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature.group" version="3.6.3.v201501141810"/>
-<unit id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="1.0.301.v201410230643"/>
-<repository location="http://download.eclipse.org/webtools/repository/luna/"/>
-</location>
-<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.nebula.feature.feature.group" version="1.0.0.201605312033"/>
-<unit id="org.eclipse.nebula.examples.release.feature.feature.group" version="1.0.4.201605312033"/>
-<repository location="http://download.eclipse.org/nebula/releases/1.0.0"/>
-</location>
-<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jgit.lfs.feature.group" version="4.6.0.201612231935-r"/>
-<unit id="org.eclipse.jgit.pgm.source.feature.group" version="4.6.0.201612231935-r"/>
-<unit id="org.eclipse.egit.mylyn.feature.group" version="4.6.0.201612231935-r"/>
-<unit id="org.eclipse.egit.source.feature.group" version="4.6.0.201612231935-r"/>
-<unit id="org.eclipse.jgit.pgm.feature.group" version="4.6.0.201612231935-r"/>
-<unit id="org.eclipse.egit.feature.group" version="4.6.0.201612231935-r"/>
-<unit id="org.eclipse.jgit.feature.group" version="4.6.0.201612231935-r"/>
-<unit id="org.eclipse.jgit.source.feature.group" version="4.6.0.201612231935-r"/>
-<unit id="org.eclipse.jgit.http.apache.feature.group" version="4.6.0.201612231935-r"/>
-<repository location="http://download.eclipse.org/egit/updates-4.6/"/>
-</location>
-<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.nebula.incubation.feature.feature.group" version="1.0.0.201701041652"/>
-<repository location="http://download.eclipse.org/nebula/incubation/snapshot"/>
+<unit id="org.eclipse.nebula.widgets.treemapper.feature.feature.group" version="0.1.0.201409040050"/>
+<unit id="org.eclipse.nebula.widgets.formattedtext.feature.feature.group" version="1.0.0.201409040050"/>
+<unit id="org.eclipse.nebula.examples.incubation.feature.feature.group" version="1.0.0.201409040050"/>
+<unit id="org.eclipse.nebula.widgets.geomap.feature.feature.group" version="0.1.0.201409040050"/>
+<unit id="org.eclipse.nebula.incubation.feature.feature.group" version="1.0.0.201409040050"/>
+<unit id="org.eclipse.nebula.examples.feature.feature.group" version="1.0.4.201409040050"/>
+<unit id="org.eclipse.nebula.widgets.picture.feature.feature.group" version="1.0.0.201409040050"/>
+<unit id="org.eclipse.nebula.widgets.collapsiblebuttons.feature.feature.group" version="1.0.0.201409040050"/>
+<unit id="org.eclipse.nebula.widgets.radiogroup.feature.feature.group" version="0.1.0.201409040050"/>
+<unit id="org.eclipse.nebula.widgets.datechooser.feature.feature.group" version="1.0.0.201409040050"/>
+<unit id="org.eclipse.nebula.widgets.pagination.feature.feature.group" version="1.0.0.201409040050"/>
+<repository location="http://download.eclipse.org/technology/nebula/archives/Q32014/incubation"/>
 </location>
 </locations>
 </target>

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

@@ -5,80 +5,42 @@
 	<parent>
 		<groupId>org.talend.repo</groupId>
 		<artifactId>dependencies.p2</artifactId>
-		<version>7.3.1-PATCH</version>
+		<version>6.2.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>dependencies.p2.tos</artifactId>
 	<packaging>pom</packaging>
 
-    <repositories>
-        <repository>
-            <id>sonatype_releases</id>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <url>https://oss.sonatype.org/content/repositories/releases/</url>
-        </repository>
-        <repository>
-            <id>sonatype_snapshots</id>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-        </repository>
-    </repositories>
+	<properties>
+		<components.version>0.13.1</components.version>
+		<daikon.version>0.12.1</daikon.version>
+	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.ops4j.pax.url</groupId>
 			<artifactId>pax-url-aether</artifactId>
-			<version>2.6.1-Talend</version>
+			<version>2.4.5-Talend</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
-			<artifactId>dataquality-common</artifactId>
-			<version>${dataquality.lib.version}</version>
+			<artifactId>org.talend.dataquality.common</artifactId>
+			<version>1.4.7-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
-			<artifactId>dataquality-phone</artifactId>
-			<version>${dataquality.lib.version}</version>
+			<artifactId>org.talend.dataquality.record.linkage</artifactId>
+			<version>3.1.7-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
-			<artifactId>dataquality-statistics</artifactId>
-			<version>${dataquality.lib.version}</version>
+			<artifactId>org.talend.dataquality.standardization</artifactId>
+			<version>3.1.7-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
-			<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>
-			<version>${dataquality.lib.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.dataquality</groupId>
-			<artifactId>dataquality-standardization</artifactId>
-			<version>${dataquality.lib.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.dataquality</groupId>
-			<artifactId>dataquality-sampling</artifactId>
-			<version>${dataquality.lib.version}</version>
+			<artifactId>org.talend.dataquality.sampling</artifactId>
+			<version>2.2.7-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.daikon</groupId>
@@ -86,70 +48,33 @@
 			<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>
-			<version>${daikon.version}</version>
-		</dependency>
 		<!-- daikon dependencies -->
 		<dependency>
 			<groupId>com.cedarsoftware</groupId>
 			<artifactId>json-io</artifactId>
-			<version>4.9.9-TALEND</version>
-		</dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>${fasterxml.jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.8.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>${fasterxml.jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${fasterxml.jackson.version}</version>
-        </dependency>
-		<dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>jaxb-api</artifactId>
-			<version>2.3.1</version>
+			<version>4.4.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-            <version>1.9.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-configuration2</artifactId>
-            <version>2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.7</version>
-        </dependency>
-        <!-- end of daikon dependencies -->
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>2.5.3</version><!-- version matches the studio org.talend.libraries.jackson -->
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>2.5.3</version><!-- version matches the studio org.talend.libraries.jackson -->
+		</dependency>
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.6</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>2.4</version>
+		</dependency>
+		<!-- end of daikon dependencies -->
 
 		<!-- ========================= -->
 		<!-- Added by TDM -->
@@ -157,24 +82,23 @@
 		<dependency>
 			<groupId>org.codehaus.jackson</groupId>
 			<artifactId>jackson-core-asl</artifactId>
-			<version>1.9.14-TALEND</version>
+			<version>1.9.13</version>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.jackson</groupId>
 			<artifactId>jackson-mapper-asl</artifactId>
-			<version>1.9.14-TALEND</version>
-		</dependency>
-
-		<!-- Avro with minimum depdencies -->
-		<dependency>
-			<groupId>org.apache.servicemix.bundles</groupId>
-			<artifactId>org.apache.servicemix.bundles.avro</artifactId>
-			<version>1.8.2_1</version>
+			<version>1.9.13</version>
 		</dependency>
 
 		<!-- Avro and dependencies -->
-		<!-- Kept just in case someone using this -->
-		<!-- above servicemix has less dependencies -->
+		<!-- To be replaced when avro will be available -->
+		<!-- from servicemix with less dependencies -->
+		<dependency>
+			<groupId>org.apache.servicemix.bundles</groupId>
+			<artifactId>org.apache.servicemix.bundles.avro</artifactId>
+			<version>1.8.0_1</version>
+		</dependency>
+
 		<dependency>
 			<groupId>org.apache.avro</groupId>
 			<artifactId>avro</artifactId>
@@ -189,7 +113,7 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-compress</artifactId>
-			<version>1.19</version>
+			<version>1.10</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.livesense</groupId>
@@ -206,8 +130,6 @@
 
 		<!-- End added by TDM -->
 		<!-- ========================= -->
-		
-		<!-- TCOMP v1 -->
 
 		<dependency>
 			<groupId>org.talend.components</groupId>
@@ -217,8 +139,9 @@
 		</dependency>
 		<dependency>
 			<groupId>org.talend.components</groupId>
-			<artifactId>components-api-service-osgi</artifactId>
+			<artifactId>components-api-service</artifactId>
 			<version>${components.version}</version>
+			<classifier>bundle</classifier>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.components</groupId>
@@ -234,8 +157,14 @@
 		</dependency>
 		<dependency>
 			<groupId>org.talend.components</groupId>
-			<artifactId>components-salesforce-definition</artifactId>
-			<version>${components.version}</version>
+			<artifactId>components-salesforce</artifactId>
+			<version>0.13.2</version>
+			<classifier>bundle</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.components</groupId>
+			<artifactId>components-dataprep</artifactId>
+			<version>0.13.3</version>
 			<classifier>bundle</classifier>
 		</dependency>
 		<dependency>
@@ -250,71 +179,7 @@
 			<version>${components.version}</version>
 			<classifier>bundle</classifier>
 		</dependency>
-		<dependency>
-			<groupId>org.talend.components</groupId>
-			<artifactId>components-couchbase</artifactId>
-			<version>${components.version}</version>
-			<classifier>bundle</classifier>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.components</groupId>
-			<artifactId>components-marklogic-definition</artifactId>
-			<version>${components.version}</version>
-			<classifier>bundle</classifier>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.components</groupId>
-			<artifactId>components-jdbc-definition</artifactId>
-			<version>${components.version}</version>
-			<classifier>bundle</classifier>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.components</groupId>
-			<artifactId>components-snowflake-definition</artifactId>
-			<version>${components.version}</version>
-			<classifier>bundle</classifier>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.components</groupId>
-			<artifactId>components-azurestorage</artifactId>
-			<version>${components.version}</version>
-			<classifier>bundle</classifier>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.components</groupId>
-			<artifactId>components-netsuite-definition</artifactId>
-			<version>${components.version}</version>
-			<classifier>bundle</classifier>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.components</groupId>
-			<artifactId>components-marketo-definition</artifactId>
-			<version>${components.version}</version>
-			<classifier>bundle</classifier>
-		</dependency>
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>2.8.2</version>
-        </dependency>
-		<dependency>
-			<groupId>org.talend.components</groupId>
-			<artifactId>hadoopcluster-definition</artifactId>
-			<version>${components.version}</version>
-			<classifier>bundle</classifier>
-		</dependency>
-		<dependency>
-			<groupId>org.talend.components</groupId>
-			<artifactId>components-googledrive-definition</artifactId>
-			<version>${components.version}</version>
-			<classifier>bundle</classifier>
-		</dependency>
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>1.10</version>
-		</dependency>
-		<!-- to avoid updatin the complete eclipse target platform we add these
+		<!-- to avoid updatin the complete eclipse target platform we add these 
 			single dependencies -->
         <dependency>
             <groupId>biz.aQute.bnd</groupId>
@@ -326,11 +191,6 @@
 			<artifactId>commons-logging</artifactId>
 			<version>1.2</version>
 		</dependency>
-		<dependency>
-			<groupId>commons-beanutils</groupId>
-			<artifactId>commons-beanutils</artifactId>
-			<version>1.9.3</version>
-		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>org-slf4j-api</artifactId>
@@ -342,44 +202,9 @@
 			<version>1.10</version>
 		</dependency>
 		<dependency>
-			<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>5.3.0</version>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.4</version>
 		</dependency>
 	</dependencies>
 

build/dependencies.p2/pom.xml

@@ -1,33 +1,23 @@
 <?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>parent-pom</artifactId>
-        <version>7.3.1-PATCH</version>
-        <relativePath>../../talend.studio.parent.pom</relativePath>
-    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
     <groupId>org.talend.repo</groupId>
     <artifactId>dependencies.p2</artifactId>
+    <version>6.2.3-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <properties>
-        <talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
-        <dataquality.lib.version>8.0.9</dataquality.lib.version>
-        <fasterxml.jackson.version>2.10.1</fasterxml.jackson.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>
         <snapshotRepository>
             <id>talend_nexus_deployment</id>
-            <url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+            <url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
             <snapshots><enabled>true</enabled></snapshots>
             <releases><enabled>false</enabled></releases>
         </snapshotRepository>
         <repository>
             <id>talend_nexus_deployment</id>
-            <url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceRelease/</url>
+            <url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
             <snapshots><enabled>false</enabled></snapshots>
             <releases><enabled>true</enabled></releases>
         </repository>

build/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>7.3.1-PATCH</version>
+		<version>6.2.3-SNAPSHOT</version>
 		<relativePath />
 	</parent>
 
@@ -44,6 +44,7 @@
 				<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>
@@ -59,6 +60,7 @@
 				<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>
@@ -131,6 +133,18 @@
 				<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,13 +4,12 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>7.3.1-PATCH</version>
+		<version>6.2.3-SNAPSHOT</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

@@ -10,63 +10,16 @@
       <win32>config.ini</win32>
    </configIni>
 
-   <plugins>
-   </plugins>
-
    <features>
-      <feature id="org.talend.fragment.jars.common.feature"/>
-      <feature id="org.talend.fragment.jars.di.feature"/>
-      <feature id="org.talend.fragment.jars.dq.feature"/>
+      <feature id="org.talend.fragment.jars.feature"/>
       <feature id="org.talend.rcp.branding.tos.bigdata.feature"/>
-      <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.tos.test.feature"/>
-      <feature id="org.talend.mdm.tom.test.feature"/>
-      <feature id="org.talend.babel.all.tos.feature"/>
-      <feature id="org.talend.bigdata.se.test.feature"/>
-      <feature id="org.talend.esb.tooling.test.feature"/>
-      <feature id="org.talend.camel.core.feature"/>
-      <feature id="org.talend.camel.designer.feature"/>
-      <feature id="org.talend.camel.feature"/>
-      <feature id="org.talend.commons.feature"/>
-      <feature id="org.talend.core.feature"/>
-      <feature id="org.talend.designer.business.feature"/>
-      <feature id="org.talend.designer.feature"/>
-      <feature id="org.talend.esb.tooling.feature"/>
-      <feature id="org.talend.esb.tooling.rs.provider.feature"/>
-      <feature id="org.talend.esb.tooling.ws.consumer.feature"/>
-      <feature id="org.talend.esb.tooling.ws.provider.feature"/>
-      <feature id="org.talend.esbstandard.feature"/>
-      <feature id="org.talend.hadoop.distribution.feature"/>
-      <feature id="org.talend.help.feature"/>
-      <feature id="org.talend.jdt.feature"/>
-      <feature id="org.talend.libraries.jdbc.feature"/>
-      <feature id="org.talend.m2e.feature"/>
-      <feature id="org.talend.model.migration.feature"/>
-      <feature id="org.talend.platform.feature"/>
-      <feature id="org.talend.rcp.feature"/>
-      <feature id="org.talend.repository.feature"/>
-      <feature id="org.talend.repository.services.feature"/>
-      <feature id="org.talend.sbi.feature"/>
-      <feature id="org.talend.spagic.feature"/>
-      <feature id="org.talend.tom.feature"/>
-      <feature id="org.talend.top.feature"/>
-      <feature id="org.talend.top.libraries.feature"/>
-      <feature id="org.talend.tos.bigdata.feature"/>
-      <feature id="org.talend.tos.bigdata.libraries.feature"/>
-      <feature id="org.talend.tos.components.feature"/>
-      <feature id="org.talend.tos.core.feature"/>
-      <feature id="org.talend.tos.feature"/>
-      <feature id="org.talend.tos.libraries.feature"/>
-      <feature id="org.talend.update.p2.feature"/>
-      <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"/>
+	  <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.babel.all.tos.feature"/>
+	  <feature id="org.talend.test.tos.feature"/>
+	<feature id="org.talend.bigdata.se.test.feature"/>
    </features>
-
-
 </product>

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

@@ -4,15 +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.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.framework=file\:plugins/org.eclipse.osgi_3.10.1.v20140909-1633.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@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/
-
-component.java.coordinates = org.talend.components:couchbase:1.17.1,org.talend.components:cosmosDB:1.17.1
+default.update.site.url=https://update.talend.com/Studio/tos/

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

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

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

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

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

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

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

@@ -4,11 +4,10 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>7.3.1-PATCH</version>
+		<version>6.2.3-SNAPSHOT</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/product.properties

@@ -1,8 +1,7 @@
 launcher.prefix=TOS_BD
-storage.prefix=${launcher.prefix}
 product.name=Talend Open Studio for Big Data
 product.branding.platform=org.talend.rcp.branding.tos.bigdata
 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=tosbd
+storage.dir=tos

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

@@ -14,16 +14,4 @@
       <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,11 @@ 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.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.framework=file\:plugins/org.eclipse.osgi_3.10.1.v20140909-1633.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@start
 osgi.bundles.defaultStartLevel=4
 osgi.bundlefile.limit=200
-osgi.framework.extensions=org.talend.osgi.lib.loader,org.eclipse.osgi.compatibility.state
+osgi.framework.extensions=org.talend.osgi.lib.loader
 file.encoding=UTF-8
 eclipse.p2.data.area=@config.dir/../p2/
 eclipse.p2.profile=profile

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

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

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

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

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

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

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

@@ -4,11 +4,10 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>7.3.1-PATCH</version>
+		<version>6.2.3-SNAPSHOT</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/product.properties

@@ -1,5 +1,4 @@
 launcher.prefix=TOS_DI
-storage.prefix=${launcher.prefix}
 product.name=Talend Open Studio for Data Integration
 product.branding.platform=org.talend.rcp.branding.tos
 product.branding.id=${product.branding.platform}.product

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

@@ -10,22 +10,8 @@
       <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,12 +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.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.framework=file\:plugins/org.eclipse.osgi_3.10.1.v20140909-1633.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.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

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

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

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

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

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

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

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

@@ -4,11 +4,25 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>7.3.1-PATCH</version>
+		<version>6.2.3-SNAPSHOT</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>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.7</version>
+				<executions>
+					<execution>
+						<id>generate-javajet</id>
+						<phase>none</phase>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>

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

@@ -1,5 +1,4 @@
 launcher.prefix=TOS_DQ
-storage.prefix=${launcher.prefix}
 product.name=Talend Open Profiler
 product.branding.platform=org.talend.rcp.branding.top
 product.branding.id=${product.branding.platform}.product

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

@@ -14,17 +14,4 @@
       <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,9 +4,8 @@ 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.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.framework=file\:plugins/org.eclipse.osgi_3.10.1.v20140909-1633.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@start
 osgi.bundles.defaultStartLevel=4
 osgi.bundlefile.limit=200
 osgi.framework.extensions=org.talend.osgi.lib.loader

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

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

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

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

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

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

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

@@ -4,11 +4,10 @@
     <parent>
         <groupId>org.talend.studio</groupId>
         <artifactId>tos-products-parent-pom</artifactId>
-        <version>7.3.1-PATCH</version>
+        <version>6.2.3-SNAPSHOT</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/product.properties

@@ -1,5 +1,4 @@
 launcher.prefix=TOS_ESB
-storage.prefix=TOS_ESB-Studio
 product.name=Talend Open Studio
 product.branding.platform=org.talend.rcp.branding.esbstandard
 product.branding.id=${product.branding.platform}.product

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

@@ -15,15 +15,5 @@
       <!--<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

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

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

@@ -0,0 +1,15 @@
+#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.1.v20140909-1633.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@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

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

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

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

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

@@ -0,0 +1,11 @@
+-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

@@ -0,0 +1,31 @@
+<?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>6.2.3-SNAPSHOT</version>
+        <relativePath>../talend.studio.tos.product.parent.pom</relativePath>
+    </parent>
+
+    <artifactId>org.talend.studio.tos.mdm.product</artifactId>
+    <packaging>eclipse-repository</packaging>
+    <properties>
+        <product.final.name>${product.final.name.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
+    </properties>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.8</version>
+                <executions>
+                    <execution>
+                        <id>copy-notice-txt</id>
+                        <phase>none</phase>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

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

@@ -0,0 +1,8 @@
+launcher.prefix=TOS_MDM
+product.final.name.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

@@ -0,0 +1,17 @@
+<?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>

pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>7.3.1-PATCH</version>
+		<version>6.2.3-SNAPSHOT</version>
 		<relativePath />
 	</parent>
 
@@ -54,8 +54,17 @@
 				<module>../tmdm-studio-se</module>
 			</modules>
 		</profile>
+		<profile>
+			<id>build-tos-products</id>
+			<activation>
+				<property>
+					<name>tos.products</name>
+					<value>!false</value>
+				</property>
+			</activation>
+			<modules>
+				<module>build</module>
+			</modules>
+		</profile>
 	</profiles>
-	<modules>
-		<module>build</module>
-	</modules>
 </project>

talend.studio.parent.pom/pom.xml

@@ -1,47 +1,41 @@
 <?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>
     <groupId>org.talend.studio</groupId>
     <artifactId>parent-pom</artifactId>
-    <version>7.3.1-PATCH</version>
+    <version>6.2.3-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <components.version>0.28.16</components.version>
-        <daikon.version>0.31.10</daikon.version>
-        <daikon-ee.format.verison>3.2.0</daikon-ee.format.verison>
-        <daikon.audit.version>1.16.1</daikon.audit.version>
-        <org.talend.daikon.crypto-utils.version>0.31.10</org.talend.daikon.crypto-utils.version>
         <tycho.version>0.22.0</tycho.version>
         <tycho-extras.version>${tycho.version}</tycho-extras.version>
-        <base.version>7.3.1</base.version>
+        <base.version>6.2.3</base.version>
         <!-- osgi.compatible.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}.<suffix> (milestones), or ${base.version} (GA)-->
-        <osgi.compatible.version>${base.version}</osgi.compatible.version>
+        <osgi.compatible.version>${base.version}-SNAPSHOT</osgi.compatible.version>
         <!-- maven.compatible.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}-<suffix> (milestones), or ${base.version} (GA)-->
-        <maven.compatible.version>${base.version}</maven.compatible.version>
-        <repo.type>Release</repo.type>
-		<doc.version>7.3.1-SNAPSHOT</doc.version>
+        <maven.compatible.version>${base.version}-SNAPSHOT</maven.compatible.version>
+        <repo.type>Snapshot</repo.type>
         <talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
         <talend.nexus.url>${talend.nexus.host}/nexus/content/repositories</talend.nexus.url>
         <talend.nexus.p2unzip.url>${talend.nexus.host}/nexus/content/unzip</talend.nexus.p2unzip.url>
         <opensourcesnapshot-unziprepo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSourceSnapshot/org/talend/repo</opensourcesnapshot-unziprepo.url>
         <opensourcerelease-unziprepo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSourceRelease/org/talend/repo</opensourcerelease-unziprepo.url>
-        <eclipse-repo.url>${opensourcerelease-unziprepo.url}/eclipse-p2-repo/4.10.0/eclipse-p2-repo-4.10.0.zip-unzip</eclipse-repo.url>
+        <eclipse-repo.url>${opensourcesnapshot-unziprepo.url}/talend-eclipse-p2-repo/6.1.0-SNAPSHOT/talend-eclipse-p2-repo-6.1.0-SNAPSHOT.zip-unzip</eclipse-repo.url>
         <eclipse-emf-repo.url>${opensourcesnapshot-unziprepo.url}/emf-compare-update/3.0.1-SNAPSHOT/emf-compare-update-3.0.1-SNAPSHOT.zip-unzip</eclipse-emf-repo.url>
-        <babel-repo.url>${opensourcerelease-unziprepo.url}/eclipse-babel-p2-repo/4.8.0/eclipse-babel-p2-repo-4.8.0.zip-unzip</babel-repo.url>
-        <doc-repo.url>${opensourcesnapshot-unziprepo.url}/talend-doc-p2-repo/${doc.version}/talend-doc-p2-repo-${doc.version}.zip-unzip/</doc-repo.url>
-        <bonita-open-repo.url>${opensourcerelease-unziprepo.url}/bonita-community-p2-repo/7.9.0/bonita-community-p2-repo-7.9.0.zip-unzip/</bonita-open-repo.url>
-        <equinox.build>org.eclipse.equinox.launcher_1.5.200.v20180922-1751.jar</equinox.build>
+        <babel-repo.url>${opensourcesnapshot-unziprepo.url}/talend-babel-p2-repo/4.4.1-SNAPSHOT/talend-babel-p2-repo-4.4.1-SNAPSHOT.zip-unzip</babel-repo.url>
+        <doc-repo.url>${opensourcesnapshot-unziprepo.url}/talend-doc-p2-repo/6.2.1-SNAPSHOT/talend-doc-p2-repo-6.2.1-SNAPSHOT.zip-unzip/</doc-repo.url>
+        <bonita-open-repo.url>${opensourcerelease-unziprepo.url}/bonita-community-p2-repo/6.5.0a/bonita-community-p2-repo-6.5.0a.zip-unzip/</bonita-open-repo.url>
+        <equinox.build>org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar</equinox.build>
         <opensourcesnapshot-repo.url>${talend.nexus.url}/TalendOpenSourceSnapshot</opensourcesnapshot-repo.url>
         <opensourcerelease-repo.url>${talend.nexus.url}/TalendOpenSourceRelease</opensourcerelease-repo.url>
-        <tos-p2-repo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSource${repo.type}/org/talend/studio/talend-tos-p2-repo/${osgi.compatible.version}.PATCH/talend-tos-p2-repo-${osgi.compatible.version}.PATCH.zip-unzip/</tos-p2-repo.url>
-        <tos-deps-p2-repo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSource${repo.type}/org/talend/repo/dependencies.p2.tos/${maven.compatible.version}-PATCH/dependencies.p2.tos-${maven.compatible.version}-PATCH.zip-unzip/</tos-deps-p2-repo.url>
+        <tos-p2-repo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSource${repo.type}/org/talend/studio/talend-tos-p2-repo/${osgi.compatible.version}/talend-tos-p2-repo-${osgi.compatible.version}.zip-unzip/</tos-p2-repo.url>
+        <tos-deps-p2-repo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSource${repo.type}/org/talend/repo/dependencies.p2.tos/${maven.compatible.version}/dependencies.p2.tos-${maven.compatible.version}.zip-unzip/</tos-deps-p2-repo.url>
         <jgit.dirtyWorkingTree.official>error</jgit.dirtyWorkingTree.official>
         <osgi.ws>win32</osgi.ws>
         <osgi.os>win32</osgi.os>
-        <osgi.arch>x86_64</osgi.arch>
-        <strictVersions>false</strictVersions>
+        <osgi.arch>x86</osgi.arch>
+        <strictVersions>true</strictVersions>
     </properties>
 
     <distributionManagement>
@@ -85,11 +79,6 @@
             <url>${bonita-open-repo.url}</url>
             <layout>p2</layout>
         </repository>
-        <repository>
-            <id>swtbot</id>
-            <url>https://artifacts-oss.talend.com/nexus/content/unzip/TalendP2UnzipOpenSourceRelease/org/talend/repo/talend-swtbot/2.7.0/talend-swtbot-2.7.0.zip-unzip</url>
-            <layout>p2</layout>
-        </repository>
         <repository>
             <id>talend_open</id>
             <releases>
@@ -160,37 +149,37 @@
                     </environments>
                     <filters>
                         <!-- restrict version of a bundle -->
-                        <!--<filter>
-							<type>eclipse-plugin</type>
-							<id>org.eclipse.ui.views.properties.tabbed</id>
-							<restrictTo>
-								<version>3.6.100.v20140519-0906</version>
-							</restrictTo>
+                        <!--<filter>
+							<type>eclipse-plugin</type>
+							<id>org.eclipse.ui.views.properties.tabbed</id>
+							<restrictTo>
+								<version>3.6.100.v20140519-0906</version>
+							</restrictTo>
 						</filter>-->
                         <filter>
                             <type>eclipse-plugin</type>
                             <id>org.eclipse.jdt.core</id>
                             <restrictTo>
-                                <version>3.16.0.xx-201903290056-e1812-RELEASE</version>
+                                <version>3.10.0.xx-201411061335-e44-RELEASE</version>
                             </restrictTo>
                         </filter>
 
-                        <!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence 
-				 <filter>
-					<type>java-package</type>
-					<id>javax.persistence</id>
-					<restrictTo>
-					   <type>eclipse-plugin</type>
-					   <id>javax.persistence</id>
-					</restrictTo>
-				 </filter>
+                        <!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence 
+				 <filter>
+					<type>java-package</type>
+					<id>javax.persistence</id>
+					<restrictTo>
+					   <type>eclipse-plugin</type>
+					   <id>javax.persistence</id>
+					</restrictTo>
+				 </filter>
 -->
-                        <!-- example 3: work around Equinox bug 348045 
-				 <filter>
-					<type>p2-installable-unit</type>
-					<id>org.eclipse.equinox.servletbridge.extensionbundle</id>
-					<removeAll />
-				 </filter>
+                        <!-- example 3: work around Equinox bug 348045 
+				 <filter>
+					<type>p2-installable-unit</type>
+					<id>org.eclipse.equinox.servletbridge.extensionbundle</id>
+					<removeAll />
+				 </filter>
 -->				 
                     </filters>
                 </configuration>
@@ -209,23 +198,16 @@
         </plugins>
     </build>
     <profiles>
-	 <profile>
-		<id>patch</id>
+        <profile>
+            <id>nonofficial</id>
             <activation>
-                <activeByDefault>false</activeByDefault>
+                <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
+                <release.suffix>-SNAPSHOT</release.suffix>
+                <revision.filename>SNAPSHOT</revision.filename>
                 <product.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</product.version>
-                <timestamp>${maven.build.timestamp}</timestamp>
-                <maven.build.timestamp.format>yyyyMMdd'_'HHmm</maven.build.timestamp.format>
             </properties>
-            <repositories>
-                <repository>
-                    <id>talend_open_p2</id>
-                    <url>${tos-p2-repo.url}</url>
-                    <layout>p2</layout>
-                </repository>
-            </repositories>
             <build>
                 <plugins>
                     <plugin>
@@ -254,7 +236,7 @@
                         </dependencies>
                         <configuration>
                             <strictBinIncludes>false</strictBinIncludes>
-                            <format>${timestamp}'-patch'</format>
+                            <format>yyyyMMdd'_'HHmm'${release.suffix}'</format>
                             <archive>
                                 <addMavenDescriptor>false</addMavenDescriptor>
                                 <!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
@@ -270,60 +252,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>nonofficial</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <release.suffix>-PATCH</release.suffix>
-                <revision.filename>PATCH</revision.filename>
-                <product.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</product.version>
-            </properties>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>1.8</version>
-                        <executions>
-                            <execution>
-                                <id>parse-version</id>
-                                <goals>
-                                    <goal>parse-version</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <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>yyyyMMdd'_'HHmm</format>
-                            <archive>
-                                <addMavenDescriptor>false</addMavenDescriptor>
-                                <!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
-                                <manifestEntries>
-                                    <Built-By />
-                                </manifestEntries>
-                            </archive>
-                            <timestampProvider>jgit</timestampProvider>
-                            <jgit.ignore>pom.xml</jgit.ignore>
-                            <jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
-                        </configuration>
-                    </plugin>
-                     </plugins>
-            </build>
-        </profile>
         <profile>
             <id>junit.product</id>
             <properties>
@@ -352,7 +280,7 @@
                         <version>${tycho.version}</version>
                         <configuration>
                             <strictBinIncludes>false</strictBinIncludes>
-                            <format>yyyyMMdd'_'HHmm</format>
+                            <format>yyyyMMdd'_'HHmm'${release.suffix}'</format>
                             <archive>
                                 <addMavenDescriptor>false</addMavenDescriptor>
                                 <!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
@@ -396,12 +324,12 @@
                             <dependency>
                                 <groupId>org.eclipse.tycho.extras</groupId>
                                 <artifactId>tycho-buildtimestamp-jgit</artifactId>
-                                <version>${tycho.version}</version>
+                                <version>${tycho-extras.version}</version>
                             </dependency>
                         </dependencies>
                         <configuration>
                             <strictBinIncludes>false</strictBinIncludes>
-                            <format>yyyyMMdd'_'HHmm</format>
+                            <format>yyyyMMdd'_'HHmm'${release.suffix}'</format>
                             <archive>
                                 <addMavenDescriptor>false</addMavenDescriptor>
                                 <!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
@@ -457,7 +385,7 @@
                         </dependencies>
                         <configuration>
                             <strictBinIncludes>false</strictBinIncludes>
-                            <format>yyyyMMdd'_'HHmm</format>
+                            <format>'${product.timestamp}${release.suffix}'</format>
                             <archive>
                                 <addMavenDescriptor>false</addMavenDescriptor>
                                 <!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
@@ -465,9 +393,6 @@
                                     <Built-By />
                                 </manifestEntries>
                             </archive>
-                            <timestampProvider>jgit</timestampProvider>
-                            <jgit.ignore>pom.xml</jgit.ignore>
-                            <jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
                         </configuration>
                     </plugin>
                 </plugins>

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,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,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