Set version to 7.0.1 M2

feat(TDI-39100): integrate partner couchbase components
chore: upgrade TCOMP to 0.21.0-SNAPSHOT, Daikon to 0.19.0-SNAPSHOT (#80 )
2017-12-19 12:59:40 +01:00 · 2017-12-07 19:41:32 +08:00 · 2017-10-31 10:33:52 +08:00 · 2017-10-26 10:24:39 +02:00 · 2017-10-20 10:21:52 +02:00 · 2017-09-13 14:38:54 +02:00
12 changed files with 66 additions and 76 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>6.5.2-SNAPSHOT</version>
+		<version>7.0.1-M2</version>
 	</parent>

 	<artifactId>dependencies.p2.tos</artifactId>
@@ -20,37 +20,37 @@
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-common</artifactId>
-			<version>1.6.6-SNAPSHOT</version>
+			<version>${dataquality.lib.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-semantic-model</artifactId>
-			<version>1.6.6-SNAPSHOT</version>
+			<version>${dataquality.lib.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-semantic</artifactId>
-			<version>1.6.6-SNAPSHOT</version>
+			<version>${dataquality.lib.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-statistics</artifactId>
-			<version>1.6.6-SNAPSHOT</version>
+			<version>${dataquality.lib.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-record-linkage</artifactId>
-			<version>3.3.6-SNAPSHOT</version>
+			<version>${dataquality.lib.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-standardization</artifactId>
-			<version>3.3.6-SNAPSHOT</version>
+			<version>${dataquality.lib.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-sampling</artifactId>
-			<version>2.4.6-SNAPSHOT</version>
+			<version>${dataquality.lib.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.daikon</groupId>
@@ -100,15 +100,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>
--- a/build/dependencies.p2/pom.xml
+++ b/build/dependencies.p2/pom.xml
@@ -5,12 +5,13 @@

    <groupId>org.talend.repo</groupId>
    <artifactId>dependencies.p2</artifactId>
-    <version>6.5.2-SNAPSHOT</version>
+    <version>7.0.1-M2</version>
    <packaging>pom</packaging>
    <properties>
        <talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
-        <components.version>0.19.9</components.version>
-        <daikon.version>0.17.2</daikon.version>
+        <components.version>0.21.0-SNAPSHOT</components.version>
+        <daikon.version>0.19.0-SNAPSHOT</daikon.version>
+        <dataquality.lib.version>4.0.0-SNAPSHOT</dataquality.lib.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>6.5.2-SNAPSHOT</version>
+		<version>7.0.1-M2</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.5.2-SNAPSHOT</version>
+		<version>7.0.1-M2</version>
 		<relativePath />
 	</parent>

 	<artifactId>talend-tos-p2-repo</artifactId>
 	<packaging>eclipse-repository</packaging>
+	<version>7.0.1.M2</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.5.2-SNAPSHOT</version>
+		<version>7.0.1-M2</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

 	<artifactId>org.talend.studio.tos.bigdata.product</artifactId>
 	<packaging>eclipse-repository</packaging>
+	<version>7.0.1.M2</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.5.2-SNAPSHOT</version>
+		<version>7.0.1-M2</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

 	<artifactId>org.talend.studio.tos.di.product</artifactId>
 	<packaging>eclipse-repository</packaging>
+	<version>7.0.1.M2</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.5.2-SNAPSHOT</version>
+		<version>7.0.1-M2</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

 	<artifactId>org.talend.studio.tos.dq.product</artifactId>
 	<packaging>eclipse-repository</packaging>
+	<version>7.0.1.M2</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.5.2-SNAPSHOT</version>
+        <version>7.0.1-M2</version>
        <relativePath>../talend.studio.tos.product.parent.pom</relativePath>
    </parent>

    <artifactId>org.talend.studio.tos.esb.product</artifactId>
    <packaging>eclipse-repository</packaging>
+	<version>7.0.1.M2</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.5.2-SNAPSHOT</version>
+        <version>7.0.1-M2</version>
        <relativePath>../talend.studio.tos.product.parent.pom</relativePath>
    </parent>

    <artifactId>org.talend.studio.tos.mdm.product</artifactId>
    <packaging>eclipse-repository</packaging>
+	<version>7.0.1.M2</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.5.2-SNAPSHOT</version>
+        <version>7.0.1-M2</version>
        <relativePath />
    </parent>

@@ -59,7 +59,7 @@
                            </files>
                        </configuration>
                    </execution>
-                </executions>      
+                </executions>
            </plugin>
            <plugin>
                <groupId>org.eclipse.tycho</groupId>
@@ -91,7 +91,7 @@
                            <id>${project.artifactId}</id>
                        </product>
                    </products>
-                </configuration>        
+                </configuration>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
@@ -305,7 +305,7 @@
                                <echo>product.timestamp=${product.timestamp}</echo>
                                <echo>version.full=${version.full}</echo>
                                <fileset dir="${studio.dir}/plugins" includes="${product.branding.platform}_${product.version}*/about.mappings" id="aboutmappingspath_temp" />
-                                <pathconvert property="aboutmappingspath" refid="aboutmappingspath_temp" />    
+                                <pathconvert property="aboutmappingspath" refid="aboutmappingspath_temp" />
                                <echo>aboutmappingspath=${aboutmappingspath}</echo>
                                <loadfile property="about" srcFile="${aboutmappingspath}">
                                    <filterchain>
@@ -520,7 +520,7 @@
                                    <artifacts>
                                        <artifact>
                                            <file>${project.build.directory}/products/${product.final.name}.zip</file>
-                                            <type>product</type>                           
+                                            <type>product</type>
                                        </artifact>
                                    </artifacts>
                                </configuration>
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>6.5.2-SNAPSHOT</version>
+		<version>7.0.1-M2</version>
 		<relativePath />
 	</parent>

--- a/talend.studio.parent.pom/pom.xml
+++ b/talend.studio.parent.pom/pom.xml
@@ -3,28 +3,29 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.talend.studio</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>6.5.2-SNAPSHOT</version>
+    <version>7.0.1-M2</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.5.2</base.version>
+        <base.version>7.0.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}.M2</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}-M2</maven.compatible.version>
+        <repo.type>Release</repo.type>
+	<doc.version>7.0.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.4.1-SNAPSHOT/talend-eclipse-p2-repo-6.4.1-SNAPSHOT.zip-unzip</eclipse-repo.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-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.5.1-SNAPSHOT/talend-doc-p2-repo-6.5.1-SNAPSHOT.zip-unzip/</doc-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>
        <opensourcesnapshot-repo.url>${talend.nexus.url}/TalendOpenSourceSnapshot</opensourcesnapshot-repo.url>
@@ -35,7 +36,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 +150,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 +165,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>
@@ -453,24 +454,5 @@
                </plugins>
            </build>
        </profile>
-        <profile>
-            <id>unpacked.plugins</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.eclipse.tycho</groupId>
-                        <artifactId>tycho-packaging-plugin</artifactId>
-                        <version>${tycho.version}</version>
-                        <configuration>
-                            <archive>
-                                <manifestEntries>
-                                    <Eclipse-BundleShape>dir</Eclipse-BundleShape>
-                                </manifestEntries>
-                            </archive>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
    </profiles>
 </project>
Author	SHA1	Message	Date
Jenkins Continuous Build server	0ee2e3c89f	Set version to 7.0.1 M2	2017-12-19 12:59:40 +01:00
Pierre Teyssier	4b1e96548f	feat(TDI-39100): integrate partner couchbase components	2017-12-07 19:41:32 +08:00
Ivan Gonchar	8993d85e29	chore: upgrade TCOMP to 0.21.0-SNAPSHOT, Daikon to 0.19.0-SNAPSHOT (#80 )	2017-10-31 10:33:52 +08:00
iwangtalend	11bf94cbe8	Use version 7.0.1-SNAPSHOT of doc	2017-10-26 10:24:39 +02:00
Jenkins Continuous Build server	0d95c759d3	Set version to 7.0.1 SNAPSHOT	2017-10-20 10:21:52 +02:00
Sizhao Liu	db3c918ce9	chore(TDQ-14331): update DQ libs to 4.0.0-SNAPSHOT	2017-09-13 14:38:54 +02:00
Emmanuel GALLOIS	488efc5402	chore(TDI-38416): split Marketo modules (#78 )	2017-09-13 17:31:11 +08:00
build-talend	0dd749233d	chore(Jenkins): update DQ libs to 1.7.2-SNAPSHOT (#77 )	2017-09-12 10:13:04 +02:00
iwangtalend	f08801de43	Merge pull request #75 from chmyga/master chore(TDI-39398): move components-ee	2017-09-06 14:38:05 +02:00
Dmytro Chmyga	2d9ea8d41b	chore(TDI-39398): move components-ee * Move version properties to parent pom	2017-09-06 15:28:25 +03:00
chmyga	091c4262dd	chore(TDI-39398): move components-ee (#73 ) * Move components-ee to enterprise repo	2017-09-06 12:09:36 +08:00
nrousseau	d5f8e2a967	feat(TUP-18351) update target platform to add new plugins (#72 ) Update target platform to add new plugins of aether	2017-09-04 10:46:03 +08:00
Irene Wang	2413ab2179	Remove PPC launcher	2017-08-25 11:52:34 +02:00
Jenkins Continuous Integration Server	c2b09b0cbf	Jenkins Robot: Update dq lib version to 1.7.1-SNAPSHOT	2017-08-24 12:28:53 +02:00
Jenkins Continuous Integration Server	c5462dcb98	Jenkins Robot: Update dq lib version to 1.7.0	2017-08-24 10:16:40 +02:00
iwangtalend	9d94dfe81b	Merge pull request #56 from Talend/bugfix/TDM-5858 TDM-5858 Upgrade avro from servicemix.bundles.avro:1.8.0_1 to service…	2017-08-16 14:38:00 +02:00
Irene Wang	6d5d8600c7	DEVOPS-2901 Remove 32-bit launcher binaries	2017-08-14 12:43:55 +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
Fady Moussallam	31ea9dd17b	TDM-5858 Upgrade avro from servicemix.bundles.avro:1.8.0_1 to servicemix.bundles.avro:1.8.2_1	2017-07-22 08:14:22 +02: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