Set version to 7.2.1 M3

chore(Jenkins): Update DQ libs to 6.2.1-SNAPSHOT (#168 )
chore(TDQ-16572): add dataquality-converters into p2 (#167 )
2019-02-26 12:51:16 +01:00 · 2019-02-18 19:14:02 +01:00 · 2019-02-11 16:08:35 +01:00 · 2019-02-05 12:36:49 +01:00 · 2019-01-31 12:11:40 +01:00 · 2019-01-16 16:18:54 +08:00
12 changed files with 74 additions and 63 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-M3</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>
@@ -287,7 +292,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>
--- a/build/dependencies.p2/pom.xml
+++ b/build/dependencies.p2/pom.xml
@@ -5,13 +5,13 @@

    <groupId>org.talend.repo</groupId>
    <artifactId>dependencies.p2</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.2.1-M3</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.29.1-SNAPSHOT</daikon.version>
+        <dataquality.lib.version>6.2.1-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>7.2.1-SNAPSHOT</version>
+		<version>7.2.1-M3</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-M3</version>
 		<relativePath />
 	</parent>

 	<artifactId>talend-tos-p2-repo</artifactId>
 	<packaging>eclipse-repository</packaging>
+	<version>7.2.1.M3</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>7.2.1-SNAPSHOT</version>
+		<version>7.2.1-M3</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.M3</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>7.2.1-SNAPSHOT</version>
+		<version>7.2.1-M3</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.M3</version>
 </project>
--- 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-M3</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.M3</version>
 </project>
--- 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-M3</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.M3</version>
 </project>
--- 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-M3</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.M3</version>
 </project>
--- 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-M3</version>
        <relativePath />
    </parent>

@@ -436,29 +436,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 +486,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-M3</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-M3</version>
    <packaging>pom</packaging>

    <properties>
@@ -12,10 +12,10 @@
        <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}.M3</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}-M3</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>
@@ -36,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>
@@ -155,12 +155,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>
@@ -170,22 +170,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	dd7beeb497	Set version to 7.2.1 M3	2019-02-26 12:51:16 +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