Set version to 6.5.0 M1

TDM-5858 Upgrade avro from servicemix.bundles.avro:1.8.0_1 to servicemix.bundles.avro:1.8.2_1 (#55 )
Revert "TESB-19962: Add esbenterprise test feature (#53 )" (#54 )
2017-07-25 13:17:00 +02:00 · 2017-07-24 15:22:15 +08:00 · 2017-07-07 14:37:49 +08:00 · 2017-07-06 13:24:34 +08:00 · 2017-07-05 12:56:49 +02:00 · 2017-07-04 16:28:44 +08:00
12 changed files with 60 additions and 53 deletions
--- a/build/dependencies.p2/dependencies.p2.tos/pom.xml
+++ b/build/dependencies.p2/dependencies.p2.tos/pom.xml
@@ -5,15 +5,15 @@
 	<parent>
 		<groupId>org.talend.repo</groupId>
 		<artifactId>dependencies.p2</artifactId>
-		<version>6.4.1-SNAPSHOT</version>
+		<version>6.5.0-M1</version>
 	</parent>

 	<artifactId>dependencies.p2.tos</artifactId>
 	<packaging>pom</packaging>

 	<properties>
-		<components.version>0.19.0</components.version>
-		<daikon.version>0.17.0</daikon.version>
+		<components.version>0.20.0-SNAPSHOT</components.version>
+		<daikon.version>0.18.0-SNAPSHOT</daikon.version>
 	</properties>

 	<dependencies>
@@ -25,37 +25,37 @@
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-common</artifactId>
-			<version>1.6.3</version>
+			<version>1.7.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-semantic-model</artifactId>
-			<version>1.6.3</version>
+			<version>1.7.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-semantic</artifactId>
-			<version>1.6.3</version>
+			<version>1.7.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-statistics</artifactId>
-			<version>1.6.3</version>
+			<version>1.7.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-record-linkage</artifactId>
-			<version>3.3.3</version>
+			<version>3.4.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-standardization</artifactId>
-			<version>3.3.3</version>
+			<version>3.4.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-sampling</artifactId>
-			<version>2.4.3</version>
+			<version>2.5.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.daikon</groupId>
@@ -105,15 +105,16 @@
 			<version>1.9.13</version>
 		</dependency>

-		<!-- Avro and dependencies -->
-		<!-- To be replaced when avro will be available -->
-		<!-- from servicemix with less dependencies -->
+		<!-- Avro with minimum depdencies -->
 		<dependency>
 			<groupId>org.apache.servicemix.bundles</groupId>
 			<artifactId>org.apache.servicemix.bundles.avro</artifactId>
-			<version>1.8.0_1</version>
+			<version>1.8.2_1</version>
 		</dependency>

+		<!-- Avro and dependencies -->
+		<!-- Kept just in case someone using this -->
+		<!-- above servicemix has less dependencies -->
 		<dependency>
 			<groupId>org.apache.avro</groupId>
 			<artifactId>avro</artifactId>
@@ -234,7 +235,7 @@
 			<version>${components.version}</version>
 			<classifier>bundle</classifier>
 		</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>
--- a/build/dependencies.p2/pom.xml
+++ b/build/dependencies.p2/pom.xml
@@ -5,7 +5,7 @@

    <groupId>org.talend.repo</groupId>
    <artifactId>dependencies.p2</artifactId>
-    <version>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M1</version>
    <packaging>pom</packaging>
    <properties>
        <talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>6.4.1-SNAPSHOT</version>
+		<version>6.5.0-M1</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>6.4.1-SNAPSHOT</version>
+		<version>6.5.0-M1</version>
 		<relativePath />
 	</parent>

 	<artifactId>talend-tos-p2-repo</artifactId>
 	<packaging>eclipse-repository</packaging>
+	<version>6.5.0.M1</version>

 	<properties>
 		<product.final.name>${launcher.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
--- 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>6.4.1-SNAPSHOT</version>
+		<version>6.5.0-M1</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

 	<artifactId>org.talend.studio.tos.bigdata.product</artifactId>
 	<packaging>eclipse-repository</packaging>
+	<version>6.5.0.M1</version>
 </project>
--- 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>6.4.1-SNAPSHOT</version>
+		<version>6.5.0-M1</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

 	<artifactId>org.talend.studio.tos.di.product</artifactId>
 	<packaging>eclipse-repository</packaging>
+	<version>6.5.0.M1</version>
 </project>
--- a/build/talend.studio.tos.dq.product/pom.xml
+++ b/build/talend.studio.tos.dq.product/pom.xml
@@ -4,12 +4,13 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>6.4.1-SNAPSHOT</version>
+		<version>6.5.0-M1</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

 	<artifactId>org.talend.studio.tos.dq.product</artifactId>
 	<packaging>eclipse-repository</packaging>
+	<version>6.5.0.M1</version>
 	<build>
 		<plugins>
 			<plugin>
--- 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>6.4.1-SNAPSHOT</version>
+        <version>6.5.0-M1</version>
        <relativePath>../talend.studio.tos.product.parent.pom</relativePath>
    </parent>

    <artifactId>org.talend.studio.tos.esb.product</artifactId>
    <packaging>eclipse-repository</packaging>
+	<version>6.5.0.M1</version>
 </project>
--- a/build/talend.studio.tos.mdm.product/pom.xml
+++ b/build/talend.studio.tos.mdm.product/pom.xml
@@ -4,12 +4,13 @@
    <parent>
        <groupId>org.talend.studio</groupId>
        <artifactId>tos-products-parent-pom</artifactId>
-        <version>6.4.1-SNAPSHOT</version>
+        <version>6.5.0-M1</version>
        <relativePath>../talend.studio.tos.product.parent.pom</relativePath>
    </parent>

    <artifactId>org.talend.studio.tos.mdm.product</artifactId>
    <packaging>eclipse-repository</packaging>
+	<version>6.5.0.M1</version>
    <properties>
        <product.final.name>${product.final.name.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
    </properties>
--- 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>6.4.1-SNAPSHOT</version>
+		<version>6.5.0-M1</version>
 		<relativePath />
 	</parent>

--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>6.4.1-SNAPSHOT</version>
+		<version>6.5.0-M1</version>
 		<relativePath />
 	</parent>

--- a/talend.studio.parent.pom/pom.xml
+++ b/talend.studio.parent.pom/pom.xml
@@ -3,19 +3,19 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.talend.studio</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>6.4.1-SNAPSHOT</version>
+    <version>6.5.0-M1</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.4.1</base.version>
+        <base.version>6.5.0</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}.M1</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}-M1</maven.compatible.version>
+        <repo.type>Release</repo.type>
        <talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
        <talend.nexus.url>${talend.nexus.host}/nexus/content/repositories</talend.nexus.url>
        <talend.nexus.p2unzip.url>${talend.nexus.host}/nexus/content/unzip</talend.nexus.p2unzip.url>
@@ -24,7 +24,7 @@
        <eclipse-repo.url>${opensourcesnapshot-unziprepo.url}/talend-eclipse-p2-repo/6.4.1-SNAPSHOT/talend-eclipse-p2-repo-6.4.1-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.4.1-SNAPSHOT/talend-doc-p2-repo-6.4.1-SNAPSHOT.zip-unzip/</doc-repo.url>
+        <doc-repo.url>${opensourcesnapshot-unziprepo.url}/talend-doc-p2-repo/6.5.0-SNAPSHOT/talend-doc-p2-repo-6.5.0-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>
@@ -35,7 +35,7 @@
        <osgi.ws>win32</osgi.ws>
        <osgi.os>win32</osgi.os>
        <osgi.arch>x86</osgi.arch>
-        <strictVersions>true</strictVersions>
+        <strictVersions>false</strictVersions>
    </properties>

    <distributionManagement>
@@ -149,12 +149,12 @@
                    </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>
@@ -164,22 +164,22 @@
                            </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>
Author	SHA1	Message	Date
Jenkins Continuous Build server	c462d4e3d3	Set version to 6.5.0 M1	2017-07-25 13:17:00 +02:00
Fady Moussallam	c8f711ff29	TDM-5858 Upgrade avro from servicemix.bundles.avro:1.8.0_1 to servicemix.bundles.avro:1.8.2_1 (#55 )	2017-07-24 15:22:15 +08:00
nrousseau	377cc7c280	Revert "TESB-19962: Add esbenterprise test feature (#53 )" (#54 ) This reverts commit `be4fdeb687`.	2017-07-07 14:37:49 +08:00
Mike Yan	be4fdeb687	TESB-19962: Add esbenterprise test feature (#53 )	2017-07-06 13:24:34 +08:00
Carsten Biermann	0cd5ee531d	[DEVOPS-2753] Updated doc version to 6.5.0-SNAPSHOT	2017-07-05 12:56:49 +02:00
Ivan Gonchar	0fbb2783df	chore: update Components and Daikon version to 0.20.0-SNAPSHOT ans 0.18.0-SNAPSHOT (#52 )	2017-07-04 16:28:44 +08:00
Sizhao Liu	c4e7752e9c	bump DQ lib version to 1.7.0-SNAPSHOT	2017-06-29 17:53:18 +02:00
Jenkins Continuous Build server	6de5ec1608	Set version to 6.5.0 SNAPSHOT	2017-06-14 13:27:32 +02:00