Set version to 7.2.1 M5

TMDM-13351 Fixed missing bundle org.yaml.snakeyaml [1.23.0,2.0.0) (#181 )
TMDM-13351 Update com.fasterxml.jackson* bundles to 2.9.8, add other com.fasterxml.jackson* bundles of version 2.9.8. (#180 )
2019-04-23 14:36:22 +02:00 · 2019-04-19 17:00:42 +08:00 · 2019-04-19 10:28:35 +08:00 · 2019-04-12 10:40:18 +08:00 · 2019-04-10 12:11:57 +02:00 · 2019-04-09 17:52:38 +02:00
22 changed files with 225 additions and 98 deletions
--- a/build/dependencies.p2/dependencies.p2.tos/pom.xml
+++ b/build/dependencies.p2/dependencies.p2.tos/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.talend.repo</groupId>
 		<artifactId>dependencies.p2</artifactId>
-		<version>7.2.1-SNAPSHOT</version>
+		<version>7.2.1-M5</version>
 	</parent>

 	<artifactId>dependencies.p2.tos</artifactId>
@@ -70,6 +70,11 @@
 			<artifactId>dataquality-record-linkage</artifactId>
 			<version>${dataquality.lib.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.talend.dataquality</groupId>
+			<artifactId>dataquality-converters</artifactId>
+			<version>${dataquality.lib.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-text-japanese</artifactId>
@@ -91,6 +96,12 @@
 			<version>${daikon.version}</version>
 			<classifier>bundle</classifier>
 		</dependency>
+		<dependency>
+			<groupId>org.talend.daikon</groupId>
+			<artifactId>daikon-exception</artifactId>
+			<version>${daikon.version}</version>
+			<classifier>bundle</classifier>
+		</dependency>
 		<dependency>
 			<groupId>org.talend.daikon</groupId>
 			<artifactId>multitenant-core</artifactId>
@@ -105,23 +116,28 @@
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-annotations</artifactId>
-            <version>2.9.0</version>
+            <version>${fasterxml.jackson.version}</version>
        </dependency>
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-lang3</artifactId>
-            <version>3.7</version>
+            <version>3.8.1</version>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-core</artifactId>
-            <version>2.9.5</version>
+            <version>${fasterxml.jackson.version}</version>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-databind</artifactId>
-            <version>2.9.5</version>
+            <version>${fasterxml.jackson.version}</version>
        </dependency>
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>2.3.1</version>
+		</dependency>
        <!-- end of daikon dependencies -->

 		<!-- ========================= -->
@@ -287,7 +303,7 @@
 			<artifactId>commons-codec</artifactId>
 			<version>1.10</version>
 		</dependency>
-		<!-- to avoid updatin the complete eclipse target platform we add these
+		<!-- to avoid updatin the complete eclipse target platform we add these
 			single dependencies -->
        <dependency>
            <groupId>biz.aQute.bnd</groupId>
@@ -309,6 +325,36 @@
 			<artifactId>commons-configuration</artifactId>
 			<version>1.10</version>
 		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.dataformat</groupId>
+			<artifactId>jackson-dataformat-xml</artifactId>
+			<version>${fasterxml.jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.dataformat</groupId>
+			<artifactId>jackson-dataformat-yaml</artifactId>
+			<version>${fasterxml.jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.dataformat</groupId>
+			<artifactId>jackson-dataformat-csv</artifactId>
+			<version>${fasterxml.jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.dataformat</groupId>
+			<artifactId>jackson-dataformat-smile</artifactId>
+			<version>${fasterxml.jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.module</groupId>
+			<artifactId>jackson-module-jaxb-annotations</artifactId>
+			<version>${fasterxml.jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.yaml</groupId>
+			<artifactId>snakeyaml</artifactId>
+		    <version>1.23</version>
+		</dependency>
 	</dependencies>

 </project>
--- a/build/dependencies.p2/pom.xml
+++ b/build/dependencies.p2/pom.xml
@@ -5,13 +5,14 @@

    <groupId>org.talend.repo</groupId>
    <artifactId>dependencies.p2</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.2.1-M5</version>
    <packaging>pom</packaging>
    <properties>
        <talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
        <components.version>0.26.0-SNAPSHOT</components.version>
-        <daikon.version>0.29.0-SNAPSHOT</daikon.version>
-        <dataquality.lib.version>6.2.0-SNAPSHOT</dataquality.lib.version>
+        <daikon.version>0.31.4-SNAPSHOT</daikon.version>
+        <dataquality.lib.version>6.4.0-SNAPSHOT</dataquality.lib.version>
+        <fasterxml.jackson.version>2.9.8</fasterxml.jackson.version>
    </properties>

    <distributionManagement>
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>7.2.1-SNAPSHOT</version>
+		<version>7.2.1-M5</version>
 		<relativePath />
 	</parent>

--- a/build/talend.studio.tos.all.p2.product/pom.xml
+++ b/build/talend.studio.tos.all.p2.product/pom.xml
@@ -4,12 +4,13 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>7.2.1-SNAPSHOT</version>
+		<version>7.2.1-M5</version>
 		<relativePath />
 	</parent>

 	<artifactId>talend-tos-p2-repo</artifactId>
 	<packaging>eclipse-repository</packaging>
+	<version>7.2.1.M5</version>

 	<properties>
 		<product.final.name>${launcher.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
--- a/build/talend.studio.tos.bd.product/config.ini
+++ b/build/talend.studio.tos.bd.product/config.ini
@@ -4,8 +4,9 @@ osgi.splashPath=platform:/base/plugins/${product.branding.platform}/
 talend.studio.version=${version.full}
 eclipse.product=${product.branding.id}
 #The following osgi.framework key is required for the p2 update feature not to override the osgi.bundles values.
-osgi.framework=file\:plugins/org.eclipse.osgi_3.10.100.v20150521-1310.jar
-osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start,org.talend.components.api.service.osgi@start
+osgi.framework=file\:plugins/org.eclipse.osgi_3.13.200.v20181130-2106.jar
+osgi.bundles=org.eclipse.equinox.simpleconfigurator@1\:start,org.eclipse.compare.win32@4,org.eclipse.core.filesystem.linux.x86_64@4,org.eclipse.core.filesystem.macosx@4,org.eclipse.core.filesystem.win32.x86_64@4,org.eclipse.core.net.linux.x86_64@4,org.eclipse.core.net.win32.x86_64@4,org.eclipse.core.resources.win32.x86_64@4,org.eclipse.e4.ui.swt.gtk@4,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@4,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@4,org.eclipse.equinox.launcher.gtk.linux.x86_64@4,org.eclipse.equinox.launcher.win32.win32.x86_64@4,org.eclipse.equinox.security.linux.x86_64@4,org.eclipse.equinox.security.macosx@4,org.eclipse.equinox.security.win32.x86_64@4,org.eclipse.gmf.runtime.common.ui.printing.win32@4,org.eclipse.jdt.launching.macosx@4,org.eclipse.jdt.launching.ui.macosx@4,org.eclipse.swt.cocoa.macosx.x86_64@4,org.eclipse.swt.gtk.linux.x86_64@4,org.eclipse.swt.win32.win32.x86_64@4,org.eclipse.ui.cocoa@4,org.eclipse.ui.win32@4
+org.eclipse.equinox.simpleconfigurator.configUrl=file\:org.eclipse.equinox.simpleconfigurator/bundles.info
 osgi.bundles.defaultStartLevel=4
 osgi.bundlefile.limit=200
 osgi.framework.extensions=org.talend.osgi.lib.loader
--- a/build/talend.studio.tos.bd.product/pom.xml
+++ b/build/talend.studio.tos.bd.product/pom.xml
@@ -4,10 +4,11 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>7.2.1-SNAPSHOT</version>
+		<version>7.2.1-M5</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

 	<artifactId>org.talend.studio.tos.bigdata.product</artifactId>
 	<packaging>eclipse-repository</packaging>
+	<version>7.2.1.M5</version>
 </project>
--- a/build/talend.studio.tos.bd.product/talend.product
+++ b/build/talend.studio.tos.bd.product/talend.product
@@ -14,4 +14,16 @@
      <feature id="org.talend.rcp.branding.tos.bigdata.feature"/>
      <!--<feature id="org.talend.babel.all.tos.feature"/>-->
   </features>
+
+   <configurations>
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+      <plugin id="org.ops4j.pax.url.mvn" autoStart="true" startLevel="0" />
+      <plugin id="org.talend.components.api.service.osgi" autoStart="true" startLevel="0" />
+      <plugin id="org.talend.maven.resolver" autoStart="true" startLevel="0" />
+   </configurations>
+
 </product>
--- a/build/talend.studio.tos.di.product/config.ini
+++ b/build/talend.studio.tos.di.product/config.ini
@@ -4,11 +4,12 @@ osgi.splashPath=platform:/base/plugins/${product.branding.platform}/
 talend.studio.version=${version.full}
 eclipse.product=${product.branding.id}
 #The following osgi.framework key is required for the p2 update feature not to override the osgi.bundles values.
-osgi.framework=file\:plugins/org.eclipse.osgi_3.10.100.v20150521-1310.jar
-osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start,org.talend.components.api.service.osgi@start
+osgi.framework=file\:plugins/org.eclipse.osgi_3.13.200.v20181130-2106.jar
+osgi.bundles=org.eclipse.equinox.simpleconfigurator@1\:start,org.eclipse.compare.win32@4,org.eclipse.core.filesystem.linux.x86_64@4,org.eclipse.core.filesystem.macosx@4,org.eclipse.core.filesystem.win32.x86_64@4,org.eclipse.core.net.linux.x86_64@4,org.eclipse.core.net.win32.x86_64@4,org.eclipse.core.resources.win32.x86_64@4,org.eclipse.e4.ui.swt.gtk@4,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@4,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@4,org.eclipse.equinox.launcher.gtk.linux.x86_64@4,org.eclipse.equinox.launcher.win32.win32.x86_64@4,org.eclipse.equinox.security.linux.x86_64@4,org.eclipse.equinox.security.macosx@4,org.eclipse.equinox.security.win32.x86_64@4,org.eclipse.gmf.runtime.common.ui.printing.win32@4,org.eclipse.jdt.launching.macosx@4,org.eclipse.jdt.launching.ui.macosx@4,org.eclipse.swt.cocoa.macosx.x86_64@4,org.eclipse.swt.gtk.linux.x86_64@4,org.eclipse.swt.win32.win32.x86_64@4,org.eclipse.ui.cocoa@4,org.eclipse.ui.win32@4
+org.eclipse.equinox.simpleconfigurator.configUrl=file\:org.eclipse.equinox.simpleconfigurator/bundles.info
 osgi.bundles.defaultStartLevel=4
 osgi.bundlefile.limit=200
-osgi.framework.extensions=org.talend.osgi.lib.loader
+osgi.framework.extensions=org.talend.osgi.lib.loader,org.eclipse.osgi.compatibility.state
 file.encoding=UTF-8
 eclipse.p2.data.area=@config.dir/../p2/
 eclipse.p2.profile=profile
--- a/build/talend.studio.tos.di.product/pom.xml
+++ b/build/talend.studio.tos.di.product/pom.xml
@@ -4,10 +4,11 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>7.2.1-SNAPSHOT</version>
+		<version>7.2.1-M5</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

 	<artifactId>org.talend.studio.tos.di.product</artifactId>
 	<packaging>eclipse-repository</packaging>
+	<version>7.2.1.M5</version>
 </project>
--- a/build/talend.studio.tos.di.product/talend.product
+++ b/build/talend.studio.tos.di.product/talend.product
@@ -10,8 +10,22 @@
      <win32>config.ini</win32>
   </configIni>

+   <plugins>
+   </plugins>
+
   <features>
      <feature id="org.talend.rcp.branding.tos.feature"/>
-      <!--<feature id="org.talend.babel.all.tos.feature"/>-->
   </features>
+
+   <configurations>
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+      <plugin id="org.ops4j.pax.url.mvn" autoStart="true" startLevel="0" />
+      <plugin id="org.talend.components.api.service.osgi" autoStart="true" startLevel="0" />
+      <plugin id="org.talend.maven.resolver" autoStart="true" startLevel="0" />
+   </configurations>
+
 </product>
--- a/build/talend.studio.tos.dq.product/config.ini
+++ b/build/talend.studio.tos.dq.product/config.ini
@@ -4,8 +4,9 @@ osgi.splashPath=platform:/base/plugins/${product.branding.platform}/
 talend.studio.version=${version.full}
 eclipse.product=${product.branding.id}
 #The following osgi.framework key is required for the p2 update feature not to override the osgi.bundles values.
-osgi.framework=file\:plugins/org.eclipse.osgi_3.10.100.v20150521-1310.jar
-osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start
+osgi.framework=file\:plugins/org.eclipse.osgi_3.13.200.v20181130-2106.jar
+osgi.bundles=org.eclipse.equinox.simpleconfigurator@1\:start,org.eclipse.compare.win32@4,org.eclipse.core.filesystem.linux.x86_64@4,org.eclipse.core.filesystem.macosx@4,org.eclipse.core.filesystem.win32.x86_64@4,org.eclipse.core.net.linux.x86_64@4,org.eclipse.core.net.win32.x86_64@4,org.eclipse.core.resources.win32.x86_64@4,org.eclipse.e4.ui.swt.gtk@4,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@4,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@4,org.eclipse.equinox.launcher.gtk.linux.x86_64@4,org.eclipse.equinox.launcher.win32.win32.x86_64@4,org.eclipse.equinox.security.linux.x86_64@4,org.eclipse.equinox.security.macosx@4,org.eclipse.equinox.security.win32.x86_64@4,org.eclipse.gmf.runtime.common.ui.printing.win32@4,org.eclipse.jdt.launching.macosx@4,org.eclipse.jdt.launching.ui.macosx@4,org.eclipse.swt.cocoa.macosx.x86_64@4,org.eclipse.swt.gtk.linux.x86_64@4,org.eclipse.swt.win32.win32.x86_64@4,org.eclipse.ui.cocoa@4,org.eclipse.ui.win32@4
+org.eclipse.equinox.simpleconfigurator.configUrl=file\:org.eclipse.equinox.simpleconfigurator/bundles.info
 osgi.bundles.defaultStartLevel=4
 osgi.bundlefile.limit=200
 osgi.framework.extensions=org.talend.osgi.lib.loader
--- a/build/talend.studio.tos.dq.product/pom.xml
+++ b/build/talend.studio.tos.dq.product/pom.xml
@@ -4,10 +4,11 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>7.2.1-SNAPSHOT</version>
+		<version>7.2.1-M5</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

 	<artifactId>org.talend.studio.tos.dq.product</artifactId>
 	<packaging>eclipse-repository</packaging>
+	<version>7.2.1.M5</version>
 </project>
--- a/build/talend.studio.tos.dq.product/talend.product
+++ b/build/talend.studio.tos.dq.product/talend.product
@@ -14,4 +14,17 @@
      <feature id="org.talend.rcp.branding.top.feature"/>
      <!--<feature id="org.talend.babel.all.tos.feature"/>-->
   </features>
+
+   <configurations>
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+      <plugin id="org.ops4j.pax.url.mvn" autoStart="true" startLevel="0" />
+      <plugin id="org.talend.components.api.service.osgi" autoStart="true" startLevel="0" />
+      <plugin id="org.talend.maven.resolver" autoStart="true" startLevel="0" />
+   </configurations>
+
 </product>
--- a/build/talend.studio.tos.esb.product/config.ini
+++ b/build/talend.studio.tos.esb.product/config.ini
@@ -4,8 +4,9 @@ osgi.splashPath=platform:/base/plugins/${product.branding.platform}/
 talend.studio.version=${version.full}
 eclipse.product=${product.branding.id}
 #The following osgi.framework key is required for the p2 update feature not to override the osgi.bundles values.
-osgi.framework=file\:plugins/org.eclipse.osgi_3.10.100.v20150521-1310.jar
-osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start,org.talend.components.api.service.osgi@start
+osgi.framework=file\:plugins/org.eclipse.osgi_3.13.200.v20181130-2106.jar
+osgi.bundles=org.eclipse.equinox.simpleconfigurator@1\:start,org.eclipse.compare.win32@4,org.eclipse.core.filesystem.linux.x86_64@4,org.eclipse.core.filesystem.macosx@4,org.eclipse.core.filesystem.win32.x86_64@4,org.eclipse.core.net.linux.x86_64@4,org.eclipse.core.net.win32.x86_64@4,org.eclipse.core.resources.win32.x86_64@4,org.eclipse.e4.ui.swt.gtk@4,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@4,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@4,org.eclipse.equinox.launcher.gtk.linux.x86_64@4,org.eclipse.equinox.launcher.win32.win32.x86_64@4,org.eclipse.equinox.security.linux.x86_64@4,org.eclipse.equinox.security.macosx@4,org.eclipse.equinox.security.win32.x86_64@4,org.eclipse.gmf.runtime.common.ui.printing.win32@4,org.eclipse.jdt.launching.macosx@4,org.eclipse.jdt.launching.ui.macosx@4,org.eclipse.swt.cocoa.macosx.x86_64@4,org.eclipse.swt.gtk.linux.x86_64@4,org.eclipse.swt.win32.win32.x86_64@4,org.eclipse.ui.cocoa@4,org.eclipse.ui.win32@4
+org.eclipse.equinox.simpleconfigurator.configUrl=file\:org.eclipse.equinox.simpleconfigurator/bundles.info
 osgi.bundles.defaultStartLevel=4
 osgi.bundlefile.limit=200
 osgi.framework.extensions=org.talend.osgi.lib.loader
--- a/build/talend.studio.tos.esb.product/pom.xml
+++ b/build/talend.studio.tos.esb.product/pom.xml
@@ -4,10 +4,11 @@
    <parent>
        <groupId>org.talend.studio</groupId>
        <artifactId>tos-products-parent-pom</artifactId>
-        <version>7.2.1-SNAPSHOT</version>
+        <version>7.2.1-M5</version>
        <relativePath>../talend.studio.tos.product.parent.pom</relativePath>
    </parent>

    <artifactId>org.talend.studio.tos.esb.product</artifactId>
    <packaging>eclipse-repository</packaging>
+	<version>7.2.1.M5</version>
 </project>
--- a/build/talend.studio.tos.esb.product/talend.product
+++ b/build/talend.studio.tos.esb.product/talend.product
@@ -15,5 +15,15 @@
      <!--<feature id="org.talend.babel.all.tos.feature"/>-->
   </features>

+   <configurations>
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+      <plugin id="org.ops4j.pax.url.mvn" autoStart="true" startLevel="0" />
+      <plugin id="org.talend.components.api.service.osgi" autoStart="true" startLevel="0" />
+      <plugin id="org.talend.maven.resolver" autoStart="true" startLevel="0" />
+   </configurations>

 </product>
--- a/build/talend.studio.tos.mdm.product/config.ini
+++ b/build/talend.studio.tos.mdm.product/config.ini
@@ -4,8 +4,9 @@ osgi.splashPath=platform:/base/plugins/${product.branding.platform}/
 talend.studio.version=${version.full}
 eclipse.product=${product.branding.id}
 #The following osgi.framework key is required for the p2 update feature not to override the osgi.bundles values.
-osgi.framework=file\:plugins/org.eclipse.osgi_3.10.100.v20150521-1310.jar
-osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start,org.talend.components.api.service.osgi@start
+osgi.framework=file\:plugins/org.eclipse.osgi_3.13.200.v20181130-2106.jar
+osgi.bundles=org.eclipse.equinox.simpleconfigurator@1\:start,org.eclipse.compare.win32@4,org.eclipse.core.filesystem.linux.x86_64@4,org.eclipse.core.filesystem.macosx@4,org.eclipse.core.filesystem.win32.x86_64@4,org.eclipse.core.net.linux.x86_64@4,org.eclipse.core.net.win32.x86_64@4,org.eclipse.core.resources.win32.x86_64@4,org.eclipse.e4.ui.swt.gtk@4,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@4,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@4,org.eclipse.equinox.launcher.gtk.linux.x86_64@4,org.eclipse.equinox.launcher.win32.win32.x86_64@4,org.eclipse.equinox.security.linux.x86_64@4,org.eclipse.equinox.security.macosx@4,org.eclipse.equinox.security.win32.x86_64@4,org.eclipse.gmf.runtime.common.ui.printing.win32@4,org.eclipse.jdt.launching.macosx@4,org.eclipse.jdt.launching.ui.macosx@4,org.eclipse.swt.cocoa.macosx.x86_64@4,org.eclipse.swt.gtk.linux.x86_64@4,org.eclipse.swt.win32.win32.x86_64@4,org.eclipse.ui.cocoa@4,org.eclipse.ui.win32@4
+org.eclipse.equinox.simpleconfigurator.configUrl=file\:org.eclipse.equinox.simpleconfigurator/bundles.info
 osgi.bundles.defaultStartLevel=4
 osgi.bundlefile.limit=200
 osgi.framework.extensions=org.talend.osgi.lib.loader
--- a/build/talend.studio.tos.mdm.product/pom.xml
+++ b/build/talend.studio.tos.mdm.product/pom.xml
@@ -4,10 +4,11 @@
    <parent>
        <groupId>org.talend.studio</groupId>
        <artifactId>tos-products-parent-pom</artifactId>
-        <version>7.2.1-SNAPSHOT</version>
+        <version>7.2.1-M5</version>
        <relativePath>../talend.studio.tos.product.parent.pom</relativePath>
    </parent>

    <artifactId>org.talend.studio.tos.mdm.product</artifactId>
    <packaging>eclipse-repository</packaging>
+	<version>7.2.1.M5</version>
 </project>
--- a/build/talend.studio.tos.mdm.product/talend.product
+++ b/build/talend.studio.tos.mdm.product/talend.product
@@ -14,4 +14,16 @@
      <feature id="org.talend.rcp.branding.tombundle.feature"/>
      <!--<feature id="org.talend.babel.all.tos.feature"/>-->
   </features>
+
+   <configurations>
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+      <plugin id="org.ops4j.pax.url.mvn" autoStart="true" startLevel="0" />
+      <plugin id="org.talend.components.api.service.osgi" autoStart="true" startLevel="0" />
+      <plugin id="org.talend.maven.resolver" autoStart="true" startLevel="0" />
+   </configurations>
+
 </product>
--- a/build/talend.studio.tos.product.parent.pom/pom.xml
+++ b/build/talend.studio.tos.product.parent.pom/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>org.talend.studio</groupId>
        <artifactId>parent-pom</artifactId>
-        <version>7.2.1-SNAPSHOT</version>
+        <version>7.2.1-M5</version>
        <relativePath />
    </parent>

@@ -134,7 +134,7 @@
                                <artifactItem>
                                    <groupId>${project.groupId}</groupId>
                                    <artifactId>eclipse-delta-pack</artifactId>
-                                    <version>4.4.1b</version>
+                                    <version>4.10.0</version>
                                    <type>zip</type>
                                    <overWrite>true</overWrite>
                                    <outputDirectory>${studio.dir}</outputDirectory>
@@ -163,6 +163,26 @@
                            </artifactItems>
                        </configuration>
                    </execution>
+					<execution>
+						<id>copy-studio-add-conf</id>
+						<phase>package</phase>
+						<goals>
+							<goal>unpack</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>${project.groupId}</groupId>
+									<artifactId>studio-add-conf</artifactId>
+									<version>7.2.1-SNAPSHOT</version>
+									<type>zip</type>
+									<classifier />
+									<overWrite>true</overWrite>
+									<outputDirectory>${studio.dir}/configuration</outputDirectory>
+								</artifactItem>
+							</artifactItems>
+						</configuration>
+					</execution>
                    <execution>
                        <id>copy-notice-txt</id>
                        <phase>package</phase>
@@ -436,29 +456,29 @@
                            <timestampProvider>default</timestampProvider>
                        </configuration>
                    </plugin>
-                    <!--
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>1.7</version>
-                        <executions>
+                    <!--
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <version>1.7</version>
+                        <executions>
                            <execution>-->
                    <!-- Attach product ZIP to Maven artifact -->
-                    <!--    <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/products/${product.final.name}.zip</file>
-                                            <type>product</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
+                    <!--    <id>attach-artifacts</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>attach-artifact</goal>
+                                </goals>
+                                <configuration>
+                                    <artifacts>
+                                        <artifact>
+                                            <file>${project.build.directory}/products/${product.final.name}.zip</file>
+                                            <type>product</type>
+                                        </artifact>
+                                    </artifacts>
+                                </configuration>
+                            </execution>
+                        </executions>
                    </plugin>-->
                    <plugin>
                        <groupId>org.apache.maven.plugins</groupId>
@@ -486,10 +506,10 @@
                                                <echo file="${storage}/lastnb.txt" append="true">http://newbuild.talend.com/builds/${product.build.path}/${product.final.name}.zip${line.separator}</echo>
                                            </then>
                                        </if>
-                                        <exec executable="openssl" dir="${product.dir}" outputproperty="sha256" >
+                                        <exec executable="openssl" dir="${product.dir}" outputproperty="sha256">
                                            <arg line="dgst" />
                                            <arg line="-sha256" />
-                                            <arg line="${product.final.name}.zip"/>
+                                            <arg line="${product.final.name}.zip" />
                                        </exec>
                                        <echo file="${product.dir}/${product.final.name}.zip.sha256" append="false">${sha256}</echo>
                                    </target>
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>7.2.1-SNAPSHOT</version>
+		<version>7.2.1-M5</version>
 		<relativePath />
 	</parent>

--- a/talend.studio.parent.pom/pom.xml
+++ b/talend.studio.parent.pom/pom.xml
@@ -3,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.talend.studio</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.2.1-M5</version>
    <packaging>pom</packaging>

    <properties>
@@ -12,22 +12,22 @@
        <tycho-extras.version>${tycho.version}</tycho-extras.version>
        <base.version>7.2.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}-SNAPSHOT</osgi.compatible.version>
+        <osgi.compatible.version>${base.version}.M5</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}-SNAPSHOT</maven.compatible.version>
-        <repo.type>Snapshot</repo.type>
+        <maven.compatible.version>${base.version}-M5</maven.compatible.version>
+        <repo.type>Release</repo.type>
 	<doc.version>7.2.1-SNAPSHOT</doc.version>
        <talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
        <talend.nexus.url>${talend.nexus.host}/nexus/content/repositories</talend.nexus.url>
        <talend.nexus.p2unzip.url>${talend.nexus.host}/nexus/content/unzip</talend.nexus.p2unzip.url>
        <opensourcesnapshot-unziprepo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSourceSnapshot/org/talend/repo</opensourcesnapshot-unziprepo.url>
        <opensourcerelease-unziprepo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSourceRelease/org/talend/repo</opensourcerelease-unziprepo.url>
-        <eclipse-repo.url>${opensourcesnapshot-unziprepo.url}/talend-eclipse-p2-repo/6.5.0-SNAPSHOT/talend-eclipse-p2-repo-6.5.0-SNAPSHOT.zip-unzip</eclipse-repo.url>
+        <eclipse-repo.url>${opensourcerelease-unziprepo.url}/eclipse-p2-repo/4.10.0/eclipse-p2-repo-4.10.0.zip-unzip</eclipse-repo.url>
        <eclipse-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>
+        <babel-repo.url>${opensourcerelease-unziprepo.url}/eclipse-babel-p2-repo/4.8.0/eclipse-babel-p2-repo-4.8.0.zip-unzip</babel-repo.url>
        <doc-repo.url>${opensourcesnapshot-unziprepo.url}/talend-doc-p2-repo/${doc.version}/talend-doc-p2-repo-${doc.version}.zip-unzip/</doc-repo.url>
-        <bonita-open-repo.url>${opensourcerelease-unziprepo.url}/bonita-community-p2-repo/7.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>
+        <bonita-open-repo.url>${opensourcerelease-unziprepo.url}/bonita-community-p2-repo/7.9.0/bonita-community-p2-repo-7.9.0.zip-unzip/</bonita-open-repo.url>
+        <equinox.build>org.eclipse.equinox.launcher_1.5.200.v20180922-1751.jar</equinox.build>
        <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>
@@ -35,8 +35,8 @@
        <jgit.dirtyWorkingTree.official>error</jgit.dirtyWorkingTree.official>
        <osgi.ws>win32</osgi.ws>
        <osgi.os>win32</osgi.os>
-        <osgi.arch>x86</osgi.arch>
-        <strictVersions>true</strictVersions>
+        <osgi.arch>x86_64</osgi.arch>
+        <strictVersions>false</strictVersions>
    </properties>

    <distributionManagement>
@@ -155,37 +155,37 @@
                    </environments>
                    <filters>
                        <!-- restrict version of a bundle -->
-                        <!--<filter>
-							<type>eclipse-plugin</type>
-							<id>org.eclipse.ui.views.properties.tabbed</id>
-							<restrictTo>
-								<version>3.6.100.v20140519-0906</version>
-							</restrictTo>
+                        <!--<filter>
+							<type>eclipse-plugin</type>
+							<id>org.eclipse.ui.views.properties.tabbed</id>
+							<restrictTo>
+								<version>3.6.100.v20140519-0906</version>
+							</restrictTo>
 						</filter>-->
                        <filter>
                            <type>eclipse-plugin</type>
                            <id>org.eclipse.jdt.core</id>
                            <restrictTo>
-                                <version>3.10.0.xx-201509250011-e44</version>
+                                <version>3.16.0.xx-201812291959-e2018-12-RELEASE</version>
                            </restrictTo>
                        </filter>

-                        <!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence 
-				 <filter>
-					<type>java-package</type>
-					<id>javax.persistence</id>
-					<restrictTo>
-					   <type>eclipse-plugin</type>
-					   <id>javax.persistence</id>
-					</restrictTo>
-				 </filter>
+                        <!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence 
+				 <filter>
+					<type>java-package</type>
+					<id>javax.persistence</id>
+					<restrictTo>
+					   <type>eclipse-plugin</type>
+					   <id>javax.persistence</id>
+					</restrictTo>
+				 </filter>
 -->
-                        <!-- example 3: work around Equinox bug 348045 
-				 <filter>
-					<type>p2-installable-unit</type>
-					<id>org.eclipse.equinox.servletbridge.extensionbundle</id>
-					<removeAll />
-				 </filter>
+                        <!-- example 3: work around Equinox bug 348045 
+				 <filter>
+					<type>p2-installable-unit</type>
+					<id>org.eclipse.equinox.servletbridge.extensionbundle</id>
+					<removeAll />
+				 </filter>
 -->				 
                    </filters>
                </configuration>
@@ -254,18 +254,6 @@
                            <jgit.ignore>pom.xml</jgit.ignore>
                            <jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.eclipse.tycho</groupId>
-                        <artifactId>tycho-p2-plugin</artifactId>
-                        <version>${tycho.version}</version>
-                        <configuration>
-                        <baselineRepositories>
-                            <repository>
-                            <url>http://localhost:8080/p2site/</url>
-                            </repository>
-                        </baselineRepositories>
-                        </configuration>
                    </plugin>
                     </plugins>
            </build>
Author	SHA1	Message	Date
Jenkins Continuous Build server	25341c97b4	Set version to 7.2.1 M5	2019-04-23 14:36:22 +02:00
hbhong	7117fe77d9	TMDM-13351 Fixed missing bundle org.yaml.snakeyaml [1.23.0,2.0.0) (#181 )	2019-04-19 17:00:42 +08:00
sbliu	c0a1736fcc	TMDM-13351 Update com.fasterxml.jackson* bundles to 2.9.8, add other com.fasterxml.jackson* bundles of version 2.9.8. (#180 ) * TMDM-13351 Update com.fasterxml.jackson* bundles to 2.9.8, add other com.fasterxml.jackson* bundles of version 2.9.8. * TMDM-13351 Extract reusable variable 'fasterxml.jackson.version' for jackson dependency lib.	2019-04-19 10:28:35 +08:00
kjwang-talend	6409d4a212	Fix: TUP-21866 Remove jar license fetch from studio startup (#179 ) * Fix: TUP-21866 Remove jar license fetch from studio startup https://jira.talendforge.org/browse/TUP-21866 * Fix: TUP-21866 Remove jar license fetch from studio startup https://jira.talendforge.org/browse/TUP-21866	2019-04-12 10:40:18 +08:00
build-talend	0bb1ddd9fa	chore(Jenkins): Update DQ libs to 6.4.0-SNAPSHOT (#178 )	2019-04-10 12:11:57 +02:00
build-talend	58d88fb407	chore(Jenkins): Update DQ libs to 6.3.6-SNAPSHOT (#177 )	2019-04-09 17:52:38 +02:00
Nicolas Rousseau	badbda5a30	feat(TDI-41943) update tcomp/daikon dependencies	2019-03-29 21:25:08 +08:00
nrousseau	6c867d962b	feat(TDI-41943) update tcomp/daikon dependencies	2019-03-29 17:59:29 +08:00
msjian	cd1777c1a0	fix(TDQ-16724): fix tos dq can auto recognize the plugins under dropins (#176 )	2019-03-29 11:13:44 +08:00
build-talend	3c8c047497	chore(Jenkins): Update DQ libs to 6.3.5-SNAPSHOT (#175 )	2019-03-22 16:23:14 +01:00
nrousseau	213f1c05e9	chore(TUP-22412) update commons.lang version (#174 )	2019-03-21 17:57:05 +08:00
Chao MENG	21c8daefce	Studio upgrade/eclipse 4.10.0 (#173 ) * chore(TUP-19969) eclipse upgrade * fix(TUP-19969): Eclipse upgrade - TOS need to work with eclipse 4.7.0 (#111) https://jira.talendforge.org/browse/TUP-19969 * fix(TUP-19969): Eclipse upgrade - TOS need to work with eclipse 4.7.0 (#112) https://jira.talendforge.org/browse/TUP-19969 Conflicts: build/talend.studio.tos.product.parent.pom/pom.xml * feat(TUP-19969): Eclipse upgrade - update all TOS * feat(TUP-19969): Eclipse upgrade - add babel * item(TUP-21339): Eclipse upgrade - TOS need to work with eclipse 4.10.0 https://jira.talendforge.org/browse/TUP-21339 * item(TUP-21339): Eclipse upgrade - TOS need to work with eclipse 4.10.0 https://jira.talendforge.org/browse/TUP-21339 * item(TUP-21729): Find a solution / fix the issue of bundles.info https://jira.talendforge.org/browse/TUP-21729 * feat(TUP-18064): [Studio] Update to more recent Eclipse (4.10) https://jira.talendforge.org/browse/TUP-18064 * feat(TUP-18064): [Studio] Update to more recent Eclipse (4.10) https://jira.talendforge.org/browse/TUP-18064 Add back the old version so that we can build tos successfully * item(TUP-21729): Find a solution / fix the issue of bundles.info https://jira.talendforge.org/browse/TUP-21729 * item(TUP-21701): Eclipse upgrade - make core part of EE product building https://jira.talendforge.org/browse/TUP-21701 * TMDM-11938 update bonita-open-repo url for bonita 7.9. (#169) * feat(TUP-18064): [Studio] Update to more recent Eclipse (4.10) https://jira.talendforge.org/browse/TUP-18064 Use x64_64 * feat(TUP-18064): [Studio] Update to more recent Eclipse (4.10) https://jira.talendforge.org/browse/TUP-18064	2019-03-07 10:25:13 +08:00
build-talend	bc38a7819f	chore(Jenkins): Update DQ libs to 6.2.4-SNAPSHOT (#170 )	2019-02-26 17:04:56 +01:00
build-talend	ec643892d3	chore(Jenkins): Update DQ libs to 6.2.1-SNAPSHOT (#168 )	2019-02-18 19:14:02 +01:00
Fangrou JI	f6b2633cc5	chore(TDQ-16572): add dataquality-converters into p2 (#167 )	2019-02-11 16:08:35 +01:00
sizhaoliu	09fcc65022	chore: rollback to daikon 0.29.1-SNAPSHOT (#165 )	2019-02-05 12:36:49 +01:00
Damien Prot	90a7458eea	feat(TDQ-16481): update daikon version (#163 )	2019-01-31 12:11:40 +01:00
Tao Tao	3e5cb4e267	Ttao/revert/tup 21205 fix daikon setup (#162 ) * Revert "fix(TUP-21205) add missing version" This reverts commit `935067366b`. * Revert "fix(TUP-21205) fix daikon setup" This reverts commit `3786678af3`. * Revert "Revert "Revert "fix(TUP-21205):Remove CryptoHelper from tcommon-studio-se + tcommon-studio-ee (#157)" (#158)" (#159)" This reverts commit `e94d48371e`. * Revert "Revert "fix(TUP-21205):Remove CryptoHelper from tcommon-studio-se + tcommon-studio-ee (#157)" (#158)" This reverts commit `a4045aca8a`. * Revert "fix(TUP-21205):Remove CryptoHelper from tcommon-studio-se + tcommon-studio-ee (#157)" This reverts commit `c68db342d2`.	2019-01-16 16:18:54 +08:00
Nicolas Rousseau	3786678af3	fix(TUP-21205) fix daikon setup	2019-01-16 14:33:16 +08:00
nrousseau	935067366b	fix(TUP-21205) add missing version	2019-01-16 14:15:06 +08:00
Tao Tao	e94d48371e	Revert "Revert "fix(TUP-21205):Remove CryptoHelper from tcommon-studio-se + tcommon-studio-ee (#157 )" (#158 )" (#159 ) This reverts commit `a4045aca8a`.	2019-01-16 13:17:02 +08:00
nrousseau	a4045aca8a	Revert "fix(TUP-21205):Remove CryptoHelper from tcommon-studio-se + tcommon-studio-ee (#157 )" (#158 ) This reverts commit `c68db342d2`.	2019-01-15 19:14:06 +08:00
Tao Tao	c68db342d2	fix(TUP-21205):Remove CryptoHelper from tcommon-studio-se + tcommon-studio-ee (#157 ) https://jira.talendforge.org/browse/TUP-21205	2019-01-15 10:59:46 +08:00