Merge pull request #21 from lpw82gf/bugfix/TMDM-10422

TMDM-10422 : TDS components: wrong serialization of the properties (update version to 0.16.1)

README.md

@@ -36,7 +36,7 @@ should you want to download a set of slave repositories, use
 No using Git slave
 ==================
 You may setup all the git repositories manually.
-The idea is to clone all the required repositories next to each other, including this one.
+The idea is to clone all the required repositories next to each other, including this one using the 'git clone' command.
 You will find the list of repositories in root [.gitslave](../master/.gitslave) file for each branch.
 
 Build The Open Source Studio

build/Target_Platform_for_Talend_Studio_and_Luna/Talend_Studio_Eclipse44_TargetPlatform.target

@@ -1,28 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Talend Target Platform for Eclipse 4.4 definition" sequenceNumber="193">
+<?pde version="3.8"?><target name="Talend Target Platform for Eclipse 4.4 definition" sequenceNumber="198">
 <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"/>
@@ -167,22 +147,6 @@
 <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"/>
@@ -1285,18 +1249,42 @@
 <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.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"/>
+<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.nebula.incubation.feature.feature.group" version="1.0.0.201607202302"/>
+<repository location="http://download.eclipse.org/nebula/incubation/snapshot"/>
 </location>
 </locations>
 </target>

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

@@ -1,163 +1,231 @@
-<?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.repo</groupId>
-        <artifactId>dependencies.p2</artifactId>
-        <version>6.2.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>dependencies.p2.tos</artifactId>
-    <packaging>pom</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.ops4j.pax.url</groupId>
-            <artifactId>pax-url-aether</artifactId>
-            <version>2.4.5-Talend</version>
-        </dependency>
-        <dependency>
-            <groupId>org.talend.dataquality</groupId>
-            <artifactId>org.talend.dataquality.common</artifactId>
-            <version>1.4.3-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.talend.dataquality</groupId>
-            <artifactId>org.talend.dataquality.record.linkage</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.talend.dataquality</groupId>
-            <artifactId>org.talend.dataquality.standardization</artifactId>
-            <version>3.0.3-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.talend.dataquality</groupId>
-            <artifactId>org.talend.dataquality.sampling</artifactId>
-            <version>2.1.6-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.talend.daikon</groupId>
-            <artifactId>daikon</artifactId>
-            <version>0.3.0.BUILD-SNAPSHOT</version>
-        </dependency>
-        <!-- daikon dependencies-->
-        <dependency>
-            <groupId>com.cedarsoftware</groupId>
-            <artifactId>json-io</artifactId>
-            <version>4.1.10</version>
-        </dependency>
-        <dependency>
-          <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                  -->
- 
-        <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-core-asl</artifactId>
-            <version>1.9.13</version>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
-            <version>1.9.13</version>
-        </dependency>
-        
-        <!-- Avro and dependencies                      -->
-        <!-- To be replaced when avro will be available -->
-        <!-- from servicemix with less dependencies     -->
-        <dependency>
-            <groupId>org.apache.avro</groupId>
-            <artifactId>avro</artifactId>
-            <version>1.7.7</version>
-        </dependency>
-        <dependency>
-            <groupId>com.thoughtworks.paranamer</groupId>
-            <artifactId>paranamer</artifactId>
-            <version>2.8</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-compress</artifactId>
-            <version>1.10</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.livesense</groupId>
-            <artifactId>org.liveSense.fragment.sun.misc</artifactId>
-            <version>1.0.5</version>
-        </dependency>
-
-        <!-- Keep version in sync with slf4j-api      -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.6.1</version>
-        </dependency>
-
-        <!-- End added by TDM              -->
-        <!-- ========================= -->
-        
-        <dependency>
-            <groupId>org.talend.components</groupId>
-            <artifactId>components-api</artifactId>
-            <version>0.3.0.BUILD-SNAPSHOT</version>
-            <classifier>bundle</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.talend.components</groupId>
-            <artifactId>components-common</artifactId>
-            <version>0.3.0.BUILD-SNAPSHOT</version>
-            <classifier>bundle</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.talend.components</groupId>
-            <artifactId>components-common-oauth</artifactId>
-            <version>0.3.0.BUILD-SNAPSHOT</version>
-            <classifier>bundle</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.talend.components</groupId>
-            <artifactId>components-salesforce</artifactId>
-            <version>0.3.0.BUILD-SNAPSHOT</version>
-            <classifier>bundle</classifier>
-        </dependency>
-        <!-- to avoid updatin the complete eclipse target platform we add these single dependencies -->
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.2</version>
-        </dependency>
-       <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.6.1</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-configuration</groupId>
-            <artifactId>commons-configuration</artifactId>
-            <version>1.10</version>
-        </dependency>
-    </dependencies>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.talend.repo</groupId>
+		<artifactId>dependencies.p2</artifactId>
+		<version>6.3.1</version>
+	</parent>
+
+	<artifactId>dependencies.p2.tos</artifactId>
+	<packaging>pom</packaging>
+
+	<properties>
+		<components.version>0.16.0</components.version>
+		<daikon.version>0.14.0</daikon.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.ops4j.pax.url</groupId>
+			<artifactId>pax-url-aether</artifactId>
+			<version>2.4.5-Talend</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.dataquality</groupId>
+			<artifactId>dataquality-common</artifactId>
+			<version>1.5.6</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.dataquality</groupId>
+			<artifactId>dataquality-semantic-model</artifactId>
+			<version>1.5.6</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.dataquality</groupId>
+			<artifactId>dataquality-semantic</artifactId>
+			<version>1.5.6</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.dataquality</groupId>
+			<artifactId>dataquality-statistics</artifactId>
+			<version>1.5.6</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.dataquality</groupId>
+			<artifactId>dataquality-record-linkage</artifactId>
+			<version>3.2.6</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.dataquality</groupId>
+			<artifactId>dataquality-standardization</artifactId>
+			<version>3.2.6</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.dataquality</groupId>
+			<artifactId>dataquality-sampling</artifactId>
+			<version>2.3.6</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.daikon</groupId>
+			<artifactId>daikon</artifactId>
+			<version>${daikon.version}</version>
+			<classifier>bundle</classifier>
+		</dependency>
+		<!-- daikon dependencies -->
+		<dependency>
+			<groupId>com.cedarsoftware</groupId>
+			<artifactId>json-io</artifactId>
+			<version>4.5.0</version>
+		</dependency>
+		<dependency>
+			<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.10</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>2.4</version>
+		</dependency>
+		<!-- end of daikon dependencies -->
+
+		<!-- ========================= -->
+		<!-- Added by TDM -->
+
+		<dependency>
+			<groupId>org.codehaus.jackson</groupId>
+			<artifactId>jackson-core-asl</artifactId>
+			<version>1.9.13</version>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.jackson</groupId>
+			<artifactId>jackson-mapper-asl</artifactId>
+			<version>1.9.13</version>
+		</dependency>
+
+		<!-- Avro and 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>
+			<version>1.7.7</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.thoughtworks.paranamer</groupId>
+			<artifactId>paranamer</artifactId>
+			<version>2.8</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-compress</artifactId>
+			<version>1.10</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.livesense</groupId>
+			<artifactId>org.liveSense.fragment.sun.misc</artifactId>
+			<version>1.0.5</version>
+		</dependency>
+
+		<!-- Keep version in sync with slf4j-api -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>org-slf4j-impl-log4j12</artifactId>
+			<version>1.7.2</version>
+		</dependency>
+
+		<!-- End added by TDM -->
+		<!-- ========================= -->
+
+		<dependency>
+			<groupId>org.talend.components</groupId>
+			<artifactId>components-api</artifactId>
+			<version>${components.version}</version>
+			<classifier>bundle</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.components</groupId>
+			<artifactId>components-api-service-osgi</artifactId>
+			<version>${components.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.components</groupId>
+			<artifactId>components-common</artifactId>
+			<version>${components.version}</version>
+			<classifier>bundle</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.components</groupId>
+			<artifactId>components-common-oauth</artifactId>
+			<version>${components.version}</version>
+			<classifier>bundle</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.components</groupId>
+			<artifactId>components-salesforce</artifactId>
+			<version>${components.version}</version>
+			<classifier>bundle</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.components</groupId>
+			<artifactId>components-dataprep</artifactId>
+			<version>${components.version}</version>
+			<classifier>bundle</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.components</groupId>
+			<artifactId>components-splunk</artifactId>
+			<version>${components.version}</version>
+			<classifier>bundle</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.talend.components</groupId>
+			<artifactId>components-jira</artifactId>
+			<version>${components.version}</version>
+			<classifier>bundle</classifier>
+		</dependency>
+        <dependency>
+            <groupId>org.talend.components</groupId>
+            <artifactId>components-datastewardship</artifactId>
+            <version>0.16.1</version>
+            <classifier>bundle</classifier>
+        </dependency>		
+		<!-- to avoid updatin the complete eclipse target platform we add these 
+			single dependencies -->
+        <dependency>
+            <groupId>biz.aQute.bnd</groupId>
+            <artifactId>annotation</artifactId>
+            <version>2.4.0</version>
+        </dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.2</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>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.4</version>
+		</dependency>
+	</dependencies>
+
+</project>

build/dependencies.p2/pom.xml

@@ -1,161 +1,164 @@
-<?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>
-
-    <groupId>org.talend.repo</groupId>
-    <artifactId>dependencies.p2</artifactId>
-    <version>6.2.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <distributionManagement>
-        <snapshotRepository>
-            <id>talend_nexus_deployment</id>
-            <url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
-            <snapshots><enabled>true</enabled></snapshots>
-            <releases><enabled>false</enabled></releases>
-        </snapshotRepository>
-        <repository>
-            <id>talend_nexus_deployment</id>
-            <url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceRelease/</url>
-            <snapshots><enabled>false</enabled></snapshots>
-            <releases><enabled>true</enabled></releases>
-        </repository>
-    </distributionManagement>
-
-    <repositories>
-        <repository>
-            <id>talend_open</id>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceRelease/</url>
-        </repository>
-        <repository>
-            <id>talend_open_snapshots</id>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
-        </repository>
-    </repositories>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.10</version>
-                <executions>
-                    <execution>
-                        <id>copy-dependencies</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/p2/plugins</outputDirectory>
-                            <excludeTransitive>true</excludeTransitive>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.8</version>
-                <executions>
-                    <execution>
-                        <id>zip-p2-repo</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <zip destfile="${project.build.directory}/${project.artifactId}.zip">
-                                    <fileset dir="${project.build.directory}/output">
-                                        <include name="**/*" />    
-                                    </fileset>
-                                </zip>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.groovy.maven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>choose-target-repository</id>
-                        <phase>initialize</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <source>
-                            if (project.version.endsWith("-SNAPSHOT")){
-                              project.properties.targetrepository = project.distributionManagement.snapshotRepository.url;
-                            }
-                            else {
-                              project.properties.targetrepository = project.distributionManagement.repository.url;
-                            }
-                            </source>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.8.2</version>
-                <executions>
-                    <execution>
-                        <id>deploy_p2_zip</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>deploy-file</goal>
-                        </goals>
-                        <configuration>
-                            <packaging>zip</packaging>
-                            <generatePom>true</generatePom>
-                            <url>${targetrepository}</url>
-                            <repositoryId>talend_nexus_deployment</repositoryId>
-                            <artifactId>${project.artifactId}</artifactId>
-                            <groupId>org.talend.repo</groupId>
-                            <version>${project.version}</version>
-                            <file>${project.build.directory}/${project.artifactId}.zip</file>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.eclipse.tycho.extras</groupId>
-                <artifactId>tycho-p2-extras-plugin</artifactId>
-                <version>0.22.0</version>
-                <executions>
-                    <execution>
-                        <id>create-p2-repository</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>publish-features-and-bundles</goal>
-                        </goals>
-                        <configuration>
-                            <metadataRepositoryLocation>${project.build.directory}/output</metadataRepositoryLocation>
-                            <artifactRepositoryLocation>${project.build.directory}/output</artifactRepositoryLocation>
-                            <sourceLocation>${project.build.directory}/p2</sourceLocation>
-                            <compress>true</compress>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.talend.repo</groupId>
+    <artifactId>dependencies.p2</artifactId>
+    <version>6.3.1</version>
+    <packaging>pom</packaging>
+    <properties>
+        <talend.nexus.host>newbuild.talend.com:8081</talend.nexus.host>
+    </properties>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>talend_nexus_deployment</id>
+            <url>http://${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+            <snapshots><enabled>true</enabled></snapshots>
+            <releases><enabled>false</enabled></releases>
+        </snapshotRepository>
+        <repository>
+            <id>talend_nexus_deployment</id>
+            <url>http://${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceRelease/</url>
+            <snapshots><enabled>false</enabled></snapshots>
+            <releases><enabled>true</enabled></releases>
+        </repository>
+    </distributionManagement>
+
+    <repositories>
+        <repository>
+            <id>talend_open</id>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceRelease/</url>
+        </repository>
+        <repository>
+            <id>talend_open_snapshots</id>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+        </repository>
+    </repositories>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.10</version>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/p2/plugins</outputDirectory>
+                            <excludeTransitive>true</excludeTransitive>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.8</version>
+                <executions>
+                    <execution>
+                        <id>zip-p2-repo</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <zip destfile="${project.build.directory}/${project.artifactId}.zip">
+                                    <fileset dir="${project.build.directory}/output">
+                                        <include name="**/*" />    
+                                    </fileset>
+                                </zip>
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.groovy.maven</groupId>
+                <artifactId>gmaven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>choose-target-repository</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <source>
+                            if (project.version.endsWith("-SNAPSHOT")){
+                              project.properties.targetrepository = project.distributionManagement.snapshotRepository.url;
+                            }
+                            else {
+                              project.properties.targetrepository = project.distributionManagement.repository.url;
+                            }
+                            </source>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8.2</version>
+                <executions>
+                    <execution>
+                        <id>deploy_p2_zip</id>
+                        <phase>deploy</phase>
+                        <goals>
+                            <goal>deploy-file</goal>
+                        </goals>
+                        <configuration>
+                            <packaging>zip</packaging>
+                            <generatePom>true</generatePom>
+                            <url>${targetrepository}</url>
+                            <repositoryId>talend_nexus_deployment</repositoryId>
+                            <artifactId>${project.artifactId}</artifactId>
+                            <groupId>org.talend.repo</groupId>
+                            <version>${project.version}</version>
+                            <file>${project.build.directory}/${project.artifactId}.zip</file>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.eclipse.tycho.extras</groupId>
+                <artifactId>tycho-p2-extras-plugin</artifactId>
+                <version>0.22.0</version>
+                <executions>
+                    <execution>
+                        <id>create-p2-repository</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>publish-features-and-bundles</goal>
+                        </goals>
+                        <configuration>
+                            <metadataRepositoryLocation>${project.build.directory}/output</metadataRepositoryLocation>
+                            <artifactRepositoryLocation>${project.build.directory}/output</artifactRepositoryLocation>
+                            <sourceLocation>${project.build.directory}/p2</sourceLocation>
+                            <compress>true</compress>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

build/pom.xml

@@ -1,173 +1,173 @@
-<?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>6.2.0-SNAPSHOT</version>
-		<relativePath />
-	</parent>
-
-	<repositories>
-		<repository>
-			<id>talend_open</id>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-			<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceRelease/</url>
-		</repository>
-		<repository>
-			<id>talend_open_snapshots</id>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
-		</repository>
-	</repositories>
-
-	<artifactId>tos-product-aggregator-pom</artifactId>
-	<packaging>pom</packaging>
-
-	<profiles>
-		<profile>
-			<id>default</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<modules>
-				<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>
-		<profile>
-			<id>all-tos-products</id>
-			<activation>
-				<property>
-					<name>tos.products</name>
-					<value>true</value>
-				</property>
-			</activation>
-			<modules>
-				<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>
-		</profile>
-		<profile>
-			<id>no-tos-products</id>
-			<activation>
-				<property>
-					<name>tos.products</name>
-					<value>false</value>
-				</property>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<version>1.5</version>
-						<executions>
-							<execution>
-								<id>no-tos-products-active</id>
-								<phase>validate</phase>
-								<goals>
-									<goal>run</goal>
-								</goals>
-								<configuration>
-									<target>
-										<echo>!!!NOT BUILDING TOS PRODUCTS, tos.products=false</echo>
-									</target>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<profile>
-			<id>tos.bd.product</id>
-			<activation>
-				<property>
-					<name>tos.bd</name>
-					<value>true</value>
-				</property>
-			</activation>
-			<modules>
-				<module>talend.studio.tos.bd.product</module>
-			</modules>
-		</profile>
-		<profile>
-			<id>tos.di.product</id>
-			<activation>
-				<property>
-					<name>tos.di</name>
-					<value>true</value>
-				</property>
-			</activation>
-			<modules>
-				<module>talend.studio.tos.di.product</module>
-			</modules>
-		</profile>
-		<profile>
-			<id>tos.dq.product</id>
-			<activation>
-				<property>
-					<name>tos.dq</name>
-					<value>true</value>
-				</property>
-			</activation>
-			<modules>
-				<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>
-				<property>
-					<name>tos.esb</name>
-					<value>true</value>
-				</property>
-			</activation>
-			<modules>
-				<module>talend.studio.tos.esb.product</module>
-			</modules>
-		</profile>
-		<profile>
-			<id>tos.all.p2.product</id>
-			<activation>
-				<property>
-					<name>tos.all.p2</name>
-					<value>true</value>
-				</property>
-			</activation>
-			<modules>
-				<module>talend.studio.tos.all.p2.product</module>
-			</modules>
-		</profile>
-	</profiles>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.talend.studio</groupId>
+		<artifactId>parent-pom</artifactId>
+		<version>6.3.1</version>
+		<relativePath />
+	</parent>
+
+	<repositories>
+		<repository>
+			<id>talend_open</id>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+			<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceRelease/</url>
+		</repository>
+		<repository>
+			<id>talend_open_snapshots</id>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+		</repository>
+	</repositories>
+
+	<artifactId>tos-product-aggregator-pom</artifactId>
+	<packaging>pom</packaging>
+
+	<profiles>
+		<profile>
+			<id>default</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<modules>
+				<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>
+		<profile>
+			<id>all-tos-products</id>
+			<activation>
+				<property>
+					<name>tos.products</name>
+					<value>true</value>
+				</property>
+			</activation>
+			<modules>
+				<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>
+		</profile>
+		<profile>
+			<id>no-tos-products</id>
+			<activation>
+				<property>
+					<name>tos.products</name>
+					<value>false</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<version>1.5</version>
+						<executions>
+							<execution>
+								<id>no-tos-products-active</id>
+								<phase>validate</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<target>
+										<echo>!!!NOT BUILDING TOS PRODUCTS, tos.products=false</echo>
+									</target>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>tos.bd.product</id>
+			<activation>
+				<property>
+					<name>tos.bd</name>
+					<value>true</value>
+				</property>
+			</activation>
+			<modules>
+				<module>talend.studio.tos.bd.product</module>
+			</modules>
+		</profile>
+		<profile>
+			<id>tos.di.product</id>
+			<activation>
+				<property>
+					<name>tos.di</name>
+					<value>true</value>
+				</property>
+			</activation>
+			<modules>
+				<module>talend.studio.tos.di.product</module>
+			</modules>
+		</profile>
+		<profile>
+			<id>tos.dq.product</id>
+			<activation>
+				<property>
+					<name>tos.dq</name>
+					<value>true</value>
+				</property>
+			</activation>
+			<modules>
+				<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>
+				<property>
+					<name>tos.esb</name>
+					<value>true</value>
+				</property>
+			</activation>
+			<modules>
+				<module>talend.studio.tos.esb.product</module>
+			</modules>
+		</profile>
+		<profile>
+			<id>tos.all.p2.product</id>
+			<activation>
+				<property>
+					<name>tos.all.p2</name>
+					<value>true</value>
+				</property>
+			</activation>
+			<modules>
+				<module>talend.studio.tos.all.p2.product</module>
+			</modules>
+		</profile>
+	</profiles>
+</project>

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

@@ -1,128 +1,128 @@
-<?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>6.2.0-SNAPSHOT</version>
-		<relativePath />
-	</parent>
-
-	<artifactId>talend-tos-p2-repo</artifactId>
-	<packaging>eclipse-repository</packaging>
-
-	<properties>
-		<product.final.name>${launcher.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
-	</properties>
-
-	<repositories>
-		<repository>
-			<id>talend_open</id>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-			<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceRelease/</url>
-		</repository>
-		<repository>
-			<id>talend_open_snapshots</id>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
-		</repository>
-	</repositories>
-	<profiles>
-		<profile>
-			<id>nonofficial</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<build>
-
-			</build>
-		</profile>
-		<profile>
-			<id>official</id>
-			<properties>
-				<official.activated>true</official.activated>
-			</properties>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>properties-maven-plugin</artifactId>
-						<version>1.0-alpha-2</version>
-						<executions>
-							<execution>
-								<id>read-product-properties</id>
-								<phase>initialize</phase>
-								<goals>
-									<goal>read-project-properties</goal>
-								</goals>
-								<configuration>
-									<files>
-										<file>${project.basedir}/product.properties</file>
-									</files>
-								</configuration>
-							</execution>
-						</executions>      
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<version>1.7</version>
-						<executions>
-							<execution>
-								<!-- Set property product.timestamp if not already set -->
-								<id>set-product-timestamp</id>
-								<phase>initialize</phase>
-								<configuration>
-									<exportAntProperties>true</exportAntProperties>
-									<target>
-										<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
-										<if>
-											<not><isset property="product.timestamp" /></not>
-											<then>
-												<propertyregex property="product.timestamp" input="${buildQualifier}" regexp="^([0-9_]{13})(.*)" select="\1" casesensitive="false" />
-											</then>
-										</if>
-										<echo>product.timestamp = ${product.timestamp}</echo>
-										<property name="version.full" value="${product.version}.${product.timestamp}${release.suffix}" />
-										<echo>version.full = ${version.full}</echo>
-									</target>
-								</configuration>
-								<goals>
-									<goal>run</goal>
-								</goals>
-							</execution>
-						</executions>
-						<dependencies>
-							<dependency>
-								<groupId>ant-contrib</groupId>
-								<artifactId>ant-contrib</artifactId>
-								<version>1.0b3</version>
-								<exclusions>
-									<exclusion>
-										<groupId>ant</groupId>
-										<artifactId>ant</artifactId>
-									</exclusion>
-								</exclusions>
-							</dependency>
-							<dependency>
-								<groupId>org.apache.ant</groupId>
-								<artifactId>ant-nodeps</artifactId>
-								<version>1.8.1</version>
-							</dependency>
-						</dependencies>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.talend.studio</groupId>
+		<artifactId>parent-pom</artifactId>
+		<version>6.3.1</version>
+		<relativePath />
+	</parent>
+
+	<artifactId>talend-tos-p2-repo</artifactId>
+	<packaging>eclipse-repository</packaging>
+
+	<properties>
+		<product.final.name>${launcher.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
+	</properties>
+
+	<repositories>
+		<repository>
+			<id>talend_open</id>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+			<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceRelease/</url>
+		</repository>
+		<repository>
+			<id>talend_open_snapshots</id>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+		</repository>
+	</repositories>
+	<profiles>
+		<profile>
+			<id>nonofficial</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<build>
+
+			</build>
+		</profile>
+		<profile>
+			<id>official</id>
+			<properties>
+				<official.activated>true</official.activated>
+			</properties>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>properties-maven-plugin</artifactId>
+						<version>1.0-alpha-2</version>
+						<executions>
+							<execution>
+								<id>read-product-properties</id>
+								<phase>initialize</phase>
+								<goals>
+									<goal>read-project-properties</goal>
+								</goals>
+								<configuration>
+									<files>
+										<file>${project.basedir}/product.properties</file>
+									</files>
+								</configuration>
+							</execution>
+						</executions>      
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<version>1.7</version>
+						<executions>
+							<execution>
+								<!-- Set property product.timestamp if not already set -->
+								<id>set-product-timestamp</id>
+								<phase>initialize</phase>
+								<configuration>
+									<exportAntProperties>true</exportAntProperties>
+									<target>
+										<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
+										<if>
+											<not><isset property="product.timestamp" /></not>
+											<then>
+												<propertyregex property="product.timestamp" input="${buildQualifier}" regexp="^([0-9_]{13})(.*)" select="\1" casesensitive="false" />
+											</then>
+										</if>
+										<echo>product.timestamp = ${product.timestamp}</echo>
+										<property name="version.full" value="${product.version}.${product.timestamp}${release.suffix}" />
+										<echo>version.full = ${version.full}</echo>
+									</target>
+								</configuration>
+								<goals>
+									<goal>run</goal>
+								</goals>
+							</execution>
+						</executions>
+						<dependencies>
+							<dependency>
+								<groupId>ant-contrib</groupId>
+								<artifactId>ant-contrib</artifactId>
+								<version>1.0b3</version>
+								<exclusions>
+									<exclusion>
+										<groupId>ant</groupId>
+										<artifactId>ant</artifactId>
+									</exclusion>
+								</exclusions>
+							</dependency>
+							<dependency>
+								<groupId>org.apache.ant</groupId>
+								<artifactId>ant-nodeps</artifactId>
+								<version>1.8.1</version>
+							</dependency>
+						</dependencies>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+</project>

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

@@ -20,5 +20,6 @@
 	  <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,9 +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.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@start
+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.bd.product/launcher.ini

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

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

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

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

@@ -1,5 +1,3 @@
---launcher.XXMaxPermSize
-512m
 -vmargs
 -Xms512m
 -Xmx1536m
@@ -7,4 +5,7 @@
 -XstartOnFirstThread
 -Dorg.eclipse.swt.internal.carbon.smallFonts
 -Dosgi.instance.area.default=../../../workspace
--Dfile.encoding=UTF-8
+-Dfile.encoding=UTF-8
+-Dosgi.requiredJavaVersion=1.8
+-XX:+UseG1GC
+-XX:+UseStringDeduplication

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

@@ -1,13 +1,13 @@
-<?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.0-SNAPSHOT</version>
-		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
-	</parent>
-
-	<artifactId>org.talend.studio.tos.bigdata.product</artifactId>
-	<packaging>eclipse-repository</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.talend.studio</groupId>
+		<artifactId>tos-products-parent-pom</artifactId>
+		<version>6.3.1</version>
+		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
+	</parent>
+
+	<artifactId>org.talend.studio.tos.bigdata.product</artifactId>
+	<packaging>eclipse-repository</packaging>
+</project>

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

@@ -4,9 +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.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@start
+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.di.product/launcher.ini

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

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

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

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

@@ -1,5 +1,3 @@
---launcher.XXMaxPermSize
-512m
 -vmargs
 -Xms512m
 -Xmx1536m
@@ -7,4 +5,7 @@
 -XstartOnFirstThread
 -Dorg.eclipse.swt.internal.carbon.smallFonts
 -Dosgi.instance.area.default=../../../workspace
--Dfile.encoding=UTF-8
+-Dfile.encoding=UTF-8
+-Dosgi.requiredJavaVersion=1.8
+-XX:+UseG1GC
+-XX:+UseStringDeduplication

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

@@ -1,13 +1,13 @@
-<?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.0-SNAPSHOT</version>
-		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
-	</parent>
-
-	<artifactId>org.talend.studio.tos.di.product</artifactId>
-	<packaging>eclipse-repository</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.talend.studio</groupId>
+		<artifactId>tos-products-parent-pom</artifactId>
+		<version>6.3.1</version>
+		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
+	</parent>
+
+	<artifactId>org.talend.studio.tos.di.product</artifactId>
+	<packaging>eclipse-repository</packaging>
+</project>

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

@@ -4,7 +4,7 @@ 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.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.bundles.defaultStartLevel=4
 osgi.bundlefile.limit=200

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

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

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

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

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

@@ -1,5 +1,3 @@
---launcher.XXMaxPermSize
-512m
 -vmargs
 -Xms512m
 -Xmx1536m
@@ -7,4 +5,7 @@
 -XstartOnFirstThread
 -Dorg.eclipse.swt.internal.carbon.smallFonts
 -Dosgi.instance.area.default=../../../workspace
--Dfile.encoding=UTF-8
+-Dfile.encoding=UTF-8
+-Dosgi.requiredJavaVersion=1.8
+-XX:+UseG1GC
+-XX:+UseStringDeduplication

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

@@ -1,28 +1,28 @@
-<?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.0-SNAPSHOT</version>
-		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
-	</parent>
-
-	<artifactId>org.talend.studio.tos.dq.product</artifactId>
-	<packaging>eclipse-repository</packaging>
-	<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>
+<?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.3.1</version>
+		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
+	</parent>
+
+	<artifactId>org.talend.studio.tos.dq.product</artifactId>
+	<packaging>eclipse-repository</packaging>
+	<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.esb.product/config.ini

@@ -4,9 +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.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@start
+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.esb.product/launcher.ini

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

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

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

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

@@ -1,5 +1,3 @@
---launcher.XXMaxPermSize
-512m
 -vmargs
 -Xms512m
 -Xmx1536m
@@ -7,4 +5,7 @@
 -XstartOnFirstThread
 -Dorg.eclipse.swt.internal.carbon.smallFonts
 -Dosgi.instance.area.default=../../../workspace
--Dfile.encoding=UTF-8
+-Dfile.encoding=UTF-8
+-Dosgi.requiredJavaVersion=1.8
+-XX:+UseG1GC
+-XX:+UseStringDeduplication

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

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

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

@@ -4,9 +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.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@start
+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,5 +1,7 @@
 -vmargs
 -Xms256m
 -Xmx768m
--XX:MaxPermSize=256m
 -Dfile.encoding=UTF-8
+-Dosgi.requiredJavaVersion=1.8
+-XX:+UseG1GC
+-XX:+UseStringDeduplication

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

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

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

@@ -1,5 +1,3 @@
---launcher.XXMaxPermSize
-512m
 -vmargs
 -Xms512m
 -Xmx1536m
@@ -7,4 +5,7 @@
 -XstartOnFirstThread
 -Dorg.eclipse.swt.internal.carbon.smallFonts
 -Dosgi.instance.area.default=../../../workspace
--Dfile.encoding=UTF-8
+-Dfile.encoding=UTF-8
+-Dosgi.requiredJavaVersion=1.8
+-XX:+UseG1GC
+-XX:+UseStringDeduplication

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

@@ -1,31 +1,16 @@
-<?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.0-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>
+<?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.3.1</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>
+</project>

pom.xml

@@ -1,70 +1,61 @@
-<?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>6.2.0-SNAPSHOT</version>
-		<relativePath />
-	</parent>
-
-	
-	<artifactId>tos</artifactId>
-	<packaging>pom</packaging>
-
-	<repositories>
-		<repository>
-			<id>talend_open</id>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-			<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceRelease/</url>
-		</repository>
-		<repository>
-			<id>talend_open_snapshots</id>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
-		</repository>
-	</repositories>
-	
-	<profiles>
-		<profile>
-			<id>build-tos</id>
-			<activation>
-				<property>
-					<name>tos.build</name>
-					<value>!false</value>
-				</property>
-			</activation>
-			<modules>
-				<module>../tbd-studio-se</module>
-				<module>../tcommon-studio-se</module>
-				<module>../tdi-studio-se</module>
-				<module>../tdq-studio-se</module>
-				<module>../tesb-studio-se</module>
-				<module>../tmdm-common</module>
-				<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>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.talend.studio</groupId>
+		<artifactId>parent-pom</artifactId>
+		<version>6.3.1</version>
+		<relativePath />
+	</parent>
+
+	
+	<artifactId>tos</artifactId>
+	<packaging>pom</packaging>
+
+	<repositories>
+		<repository>
+			<id>talend_open</id>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+			<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceRelease/</url>
+		</repository>
+		<repository>
+			<id>talend_open_snapshots</id>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+		</repository>
+	</repositories>
+	
+	<profiles>
+		<profile>
+			<id>build-tos</id>
+			<activation>
+				<property>
+					<name>tos.build</name>
+					<value>!false</value>
+				</property>
+			</activation>
+			<modules>
+				<module>../tbd-studio-se</module>
+				<module>../tcommon-studio-se</module>
+				<module>../tdi-studio-se</module>
+				<module>../tdq-studio-se</module>
+				<module>../tesb-studio-se</module>
+				<module>../tmdm-common</module>
+				<module>../tmdm-studio-se</module>
+			</modules>
+		</profile>
+	</profiles>
+	<modules>
+		<module>build</module>
+	</modules>
+</project>

talend.studio.parent.pom/pom.xml

@@ -1,168 +1,169 @@
-<?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>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>parent-pom</artifactId>
-    <version>6.2.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <tycho.version>0.22.0</tycho.version>
-        <tycho-extras.version>${tycho.version}</tycho-extras.version>
-        <base.version>6.2.0</base.version>
-        <!-- osgi.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}.<suffix> (milestones), or ${base.version} (GA)-->
-        <osgi.version>${base.version}-SNAPSHOT</osgi.version>
-        <!-- maven.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}-<suffix> (milestones), or ${base.version} (GA)-->
-        <maven.version>${base.version}-SNAPSHOT</maven.version>
-        <repo.type>Snapshot</repo.type>
-        <talend.nexus.host>newbuild.talend.com:8081</talend.nexus.host>
-        <talend.nexus.url>http://${talend.nexus.host}/nexus/content/repositories</talend.nexus.url>
-        <talend.nexus.p2unzip.url>http://${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>${opensourcesnapshot-unziprepo.url}/talend-eclipse-p2-repo/6.1.0-SNAPSHOT/talend-eclipse-p2-repo-6.1.0-SNAPSHOT.zip-unzip</eclipse-repo.url>
-        <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.1.1-SNAPSHOT/talend-doc-p2-repo-6.1.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.version}/talend-tos-p2-repo-${osgi.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.version}/dependencies.p2.tos-${maven.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</osgi.arch>
-        <strictVersions>false</strictVersions>
-    </properties>
-
-    <distributionManagement>
-        <snapshotRepository>
-            <id>talend_nexus_deployment</id>
-            <url>${opensourcesnapshot-repo.url}</url>
-            <snapshots><enabled>true</enabled></snapshots>
-            <releases><enabled>false</enabled></releases>
-        </snapshotRepository>
-        <repository>
-            <id>talend_nexus_deployment</id>
-            <url>${opensourcerelease-repo.url}</url>
-            <snapshots><enabled>false</enabled></snapshots>
-            <releases><enabled>true</enabled></releases>
-        </repository>
-    </distributionManagement>
-
-    <repositories>
-        <repository>
-            <id>eclipse_repo</id>
-            <url>${eclipse-repo.url}</url>
-            <layout>p2</layout>
-        </repository>
-        <repository>
-            <id>babel_repo</id>
-            <url>${babel-repo.url}</url>
-            <layout>p2</layout>
-        </repository>
-        <repository>
-            <id>doc_repo</id>
-            <url>${doc-repo.url}</url>
-            <layout>p2</layout>
-        </repository>
-        <repository>
-            <id>bonita_open_repo</id>
-            <url>${bonita-open-repo.url}</url>
-            <layout>p2</layout>
-        </repository>
-        <repository>
-            <id>talend_open</id>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <url>${opensourcerelease-repo.url}</url>
-        </repository>
-        <repository>
-            <id>talend_open_snapshots</id>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <url>${opensourcesnapshot-repo.url}</url>
-        </repository>
-        <repository>
-            <id>tos-deps</id>
-            <url>${tos-deps-p2-repo.url}</url>
-            <layout>p2</layout>
-        </repository>
-    </repositories>  
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.eclipse.tycho</groupId>
-                    <artifactId>tycho-p2-director-plugin</artifactId>
-                    <version>${tycho.version}</version>
-                    <configuration>
-                        <profile>profile</profile>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.eclipse.tycho</groupId>
-                <artifactId>tycho-packaging-plugin</artifactId>
-                <version>${tycho.version}</version>
-                <configuration>
-                    <strictVersions>${strictVersions}</strictVersions>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.eclipse.tycho</groupId>
-                <artifactId>tycho-maven-plugin</artifactId>
-                <version>${tycho.version}</version>
-                <extensions>true</extensions>
-            </plugin>  
-            <plugin>
-                <groupId>org.eclipse.tycho</groupId>
-                <artifactId>tycho-versions-plugin</artifactId>
-                <version>${tycho.version}</version>
-            </plugin>			
-            <plugin>
-                <groupId>org.eclipse.tycho</groupId>
-                <artifactId>target-platform-configuration</artifactId>
-                <version>${tycho.version}</version>
-                <configuration>
-                    <executionEnvironmentDefault>JavaSE-1.8</executionEnvironmentDefault>
-                    <environments>
-                        <environment>
-                            <os>${osgi.os}</os>
-                            <ws>${osgi.ws}</ws>
-                            <arch>${osgi.arch}</arch>
-                        </environment>
-                    </environments>
-                    <filters>
-                        <!-- restrict version of a bundle -->
+<?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>
+    <groupId>org.talend.studio</groupId>
+    <artifactId>parent-pom</artifactId>
+    <version>6.3.1</version>
+    <packaging>pom</packaging>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <tycho.version>0.22.0</tycho.version>
+        <tycho-extras.version>${tycho.version}</tycho-extras.version>
+        <base.version>6.3.1</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>
+        <!-- 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>
+        <talend.nexus.host>newbuild.talend.com:8081</talend.nexus.host>
+        <talend.nexus.url>http://${talend.nexus.host}/nexus/content/repositories</talend.nexus.url>
+        <talend.nexus.p2unzip.url>http://${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>${opensourcesnapshot-unziprepo.url}/talend-eclipse-p2-repo/6.3.0-SNAPSHOT/talend-eclipse-p2-repo-6.3.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>${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.3.1-SNAPSHOT/talend-doc-p2-repo-6.3.1-SNAPSHOT.zip-unzip/</doc-repo.url>
+        <bonita-open-repo.url>${opensourcerelease-unziprepo.url}/bonita-community-p2-repo/7.2.3a/bonita-community-p2-repo-7.2.3a.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}/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</osgi.arch>
+        <strictVersions>false</strictVersions>
+    </properties>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>talend_nexus_deployment</id>
+            <url>${opensourcesnapshot-repo.url}</url>
+            <snapshots><enabled>true</enabled></snapshots>
+            <releases><enabled>false</enabled></releases>
+        </snapshotRepository>
+        <repository>
+            <id>talend_nexus_deployment</id>
+            <url>${opensourcerelease-repo.url}</url>
+            <snapshots><enabled>false</enabled></snapshots>
+            <releases><enabled>true</enabled></releases>
+        </repository>
+    </distributionManagement>
+
+    <repositories>
+        <repository>
+            <id>tos-deps</id>
+            <url>${tos-deps-p2-repo.url}</url>
+            <layout>p2</layout>
+        </repository>
+        <repository>
+            <id>eclipse_repo</id>
+            <url>${eclipse-repo.url}</url>
+            <layout>p2</layout>
+        </repository>
+        <repository>
+            <id>babel_repo</id>
+            <url>${babel-repo.url}</url>
+            <layout>p2</layout>
+        </repository>
+        <repository>
+            <id>doc_repo</id>
+            <url>${doc-repo.url}</url>
+            <layout>p2</layout>
+        </repository>
+        <repository>
+            <id>bonita_open_repo</id>
+            <url>${bonita-open-repo.url}</url>
+            <layout>p2</layout>
+        </repository>
+        <repository>
+            <id>talend_open</id>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <url>${opensourcerelease-repo.url}</url>
+        </repository>
+        <repository>
+            <id>talend_open_snapshots</id>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <url>${opensourcesnapshot-repo.url}</url>
+        </repository>
+    </repositories>  
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.eclipse.tycho</groupId>
+                    <artifactId>tycho-p2-director-plugin</artifactId>
+                    <version>${tycho.version}</version>
+                    <configuration>
+                        <profile>profile</profile>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>tycho-packaging-plugin</artifactId>
+                <version>${tycho.version}</version>
+                <configuration>
+                    <strictVersions>${strictVersions}</strictVersions>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>tycho-maven-plugin</artifactId>
+                <version>${tycho.version}</version>
+                <extensions>true</extensions>
+            </plugin>  
+            <plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>tycho-versions-plugin</artifactId>
+                <version>${tycho.version}</version>
+            </plugin>			
+            <plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>target-platform-configuration</artifactId>
+                <version>${tycho.version}</version>
+                <configuration>
+                    <executionEnvironmentDefault>JavaSE-1.8</executionEnvironmentDefault>
+                    <environments>
+                        <environment>
+                            <os>${osgi.os}</os>
+                            <ws>${osgi.ws}</ws>
+                            <arch>${osgi.arch}</arch>
+                        </environment>
+                    </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>-->
-                        <filter>
-                            <type>eclipse-plugin</type>
-                            <id>org.eclipse.jdt.core</id>
-                            <restrictTo>
-                                <version>3.10.0.xx-201411061335-e44-RELEASE</version>
-                            </restrictTo>
-                        </filter>
-
+						</filter>-->
+                        <filter>
+                            <type>eclipse-plugin</type>
+                            <id>org.eclipse.jdt.core</id>
+                            <restrictTo>
+                                <version>3.10.0.xx-201509250011-e44</version>
+                            </restrictTo>
+                        </filter>
+
                         <!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence 
 				 <filter>
 					<type>java-package</type>
@@ -172,250 +173,285 @@
 					   <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>
--->				 
-                    </filters>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.eclipse.tycho</groupId>
-                <artifactId>tycho-compiler-plugin</artifactId>
-                <version>${tycho.version}</version>
-                <configuration>
-                    <compilerArgument>-warn:+discouraged,forbidden</compilerArgument>
-                    <compilerVersion>1.8</compilerVersion>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>nonofficial</id>
-            <activation>
-                <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>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>talend_open_p2</id>
-                    <url>${tos-p2-repo.url}</url>
-                    <layout>p2</layout>
-                </repository>
-            </repositories>
-            <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-extras.version}</version>
-                            </dependency>
-                        </dependencies>
-                        <configuration>
-                            <strictBinIncludes>false</strictBinIncludes>
-                            <format>yyyyMMdd'_'HHmm'${release.suffix}'</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>tuj</id>
-            <properties>
-                <release.suffix>-SNAPSHOT</release.suffix>
-                <revision.filename>SNAPSHOT</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-extras.version}</version>
-                            </dependency>
-                        </dependencies>
-                        <configuration>
-                            <strictBinIncludes>false</strictBinIncludes>
-                            <format>yyyyMMdd'_'HHmm'${release.suffix}'</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>official</id>
-            <properties>
-                <talendtargetplatform.path>${buildRootDir}/../targetplatform</talendtargetplatform.path>
-                <talendtargetplatformversion.path>${talendtargetplatform.path}/${product.version}</talendtargetplatformversion.path>
-            </properties>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>properties-maven-plugin</artifactId>
-                        <version>1.0-alpha-2</version>
-                        <executions>
-                            <execution>
-                                <id>read-build-properties</id>
-                                <phase>initialize</phase>
-                                <goals>
-                                    <goal>read-project-properties</goal>
-                                </goals>
-                                <configuration>
-                                    <files>
-                                        <file>${buildRootDir}/config/build.50more.properties</file>
-                                    </files>
-                                </configuration>
-                            </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>'${product.timestamp}${release.suffix}'</format>
-                            <archive>
-                                <addMavenDescriptor>false</addMavenDescriptor>
-                                <!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
-                                <manifestEntries>
-                                    <Built-By />
-                                </manifestEntries>
-                            </archive>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>sign</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.7</version>
-                        <executions>
-                            <execution>
-                                <id>sign</id>
-                                <phase>verify</phase>
-                                <configuration>
-                                    <target>
-                                        <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
-                                        <ac:for xmlns:ac="antlib:net.sf.antcontrib" param="jarFile">
-                                            <path>
-                                                <fileset dir="${project.basedir}/target" includes="*.jar" />
-                                            </path>
-                                            <sequential>
-                                                <echo>Signing @{jarFile}</echo>
-                                                <exec executable="${java.home}/../bin/jarsigner" dir="${project.basedir}/target/" failonerror="true">
-                                                    <arg line="-verbose -digestalg SHA1 -sigalg SHA1withRSA -keystore ${keystore.path} -storepass ${keystore.pass} @{jarFile} talend" /> 
-                                                </exec>
-                                            </sequential>
-                                        </ac:for>
-                                    </target>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>ant-contrib</groupId>
-                                <artifactId>ant-contrib</artifactId>
-                                <version>1.0b3</version>
-                                <exclusions>
-                                    <exclusion>
-                                        <groupId>ant</groupId>
-                                        <artifactId>ant</artifactId>
-                                    </exclusion>
-                                </exclusions>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.ant</groupId>
-                                <artifactId>ant-nodeps</artifactId>
-                                <version>1.8.1</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-</project>
+-->				 
+                    </filters>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>tycho-compiler-plugin</artifactId>
+                <version>${tycho.version}</version>
+                <configuration>
+                    <compilerArgument>-warn:+discouraged,forbidden</compilerArgument>
+                    <compilerVersion>1.8</compilerVersion>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <profiles>
+        <profile>
+            <id>nonofficial</id>
+            <activation>
+                <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>
+            </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-extras.version}</version>
+                            </dependency>
+                        </dependencies>
+                        <configuration>
+                            <strictBinIncludes>false</strictBinIncludes>
+                            <format>yyyyMMdd'_'HHmm'${release.suffix}'</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>
+                <release.suffix>-SNAPSHOT</release.suffix>
+                <revision.filename>SNAPSHOT</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>
+                        <configuration>
+                            <strictBinIncludes>false</strictBinIncludes>
+                            <format>yyyyMMdd'_'HHmm'${release.suffix}'</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>default</timestampProvider>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>tuj</id>
+            <properties>
+                <release.suffix>-SNAPSHOT</release.suffix>
+                <revision.filename>SNAPSHOT</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-extras.version}</version>
+                            </dependency>
+                        </dependencies>
+                        <configuration>
+                            <strictBinIncludes>false</strictBinIncludes>
+                            <format>yyyyMMdd'_'HHmm'${release.suffix}'</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>official</id>
+            <properties>
+                <talendtargetplatform.path>${buildRootDir}/../targetplatform</talendtargetplatform.path>
+                <talendtargetplatformversion.path>${talendtargetplatform.path}/${product.version}</talendtargetplatformversion.path>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>properties-maven-plugin</artifactId>
+                        <version>1.0-alpha-2</version>
+                        <executions>
+                            <execution>
+                                <id>read-build-properties</id>
+                                <phase>initialize</phase>
+                                <goals>
+                                    <goal>read-project-properties</goal>
+                                </goals>
+                                <configuration>
+                                    <files>
+                                        <file>${buildRootDir}/config/build.50more.properties</file>
+                                    </files>
+                                </configuration>
+                            </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>'${product.timestamp}${release.suffix}'</format>
+                            <archive>
+                                <addMavenDescriptor>false</addMavenDescriptor>
+                                <!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
+                                <manifestEntries>
+                                    <Built-By />
+                                </manifestEntries>
+                            </archive>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>sign</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <version>1.7</version>
+                        <executions>
+                            <execution>
+                                <id>sign</id>
+                                <phase>verify</phase>
+                                <configuration>
+                                    <target>
+                                        <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
+                                        <ac:for xmlns:ac="antlib:net.sf.antcontrib" param="jarFile">
+                                            <path>
+                                                <fileset dir="${project.basedir}/target" includes="*.jar" />
+                                            </path>
+                                            <sequential>
+                                                <echo>Signing @{jarFile}</echo>
+                                                <exec executable="${java.home}/../bin/jarsigner" dir="${project.basedir}/target/" failonerror="true">
+                                                    <arg line="-verbose -digestalg SHA1 -sigalg SHA1withRSA -keystore ${keystore.path} -storepass ${keystore.pass} @{jarFile} talend" /> 
+                                                </exec>
+                                            </sequential>
+                                        </ac:for>
+                                    </target>
+                                </configuration>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>ant-contrib</groupId>
+                                <artifactId>ant-contrib</artifactId>
+                                <version>1.0b3</version>
+                                <exclusions>
+                                    <exclusion>
+                                        <groupId>ant</groupId>
+                                        <artifactId>ant</artifactId>
+                                    </exclusion>
+                                </exclusions>
+                            </dependency>
+                            <dependency>
+                                <groupId>org.apache.ant</groupId>
+                                <artifactId>ant-nodeps</artifactId>
+                                <version>1.8.1</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>