fix(TPS-3713) Upgrade 'dataquality-record-linkage' to 6.1.7 (#231 ) (#232 )

Co-authored-by: qiongli <qiongli@talend.com>
chore(TUP-21429) prepare update site for 7.0.1 (#210 )
2020-01-17 15:31:16 +08:00 · 2019-09-24 16:44:30 +08:00 · 2019-06-24 11:24:27 +02:00 · 2018-10-24 10:43:12 +08:00 · 2018-10-23 09:55:09 +08:00 · 2018-10-21 10:43:57 +02:00
12 changed files with 156 additions and 94 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.1.1-SNAPSHOT</version>
+		<version>7.1.1</version>
 	</parent>

 	<artifactId>dependencies.p2.tos</artifactId>
@@ -63,7 +63,8 @@
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
 			<artifactId>dataquality-record-linkage</artifactId>
-			<version>${dataquality.lib.version}</version>
+			<!-- TPS-3713 Only upgrade this jar to a new version -->
+			<version>6.1.7</version>
 		</dependency>
 		<dependency>
 			<groupId>org.talend.dataquality</groupId>
@@ -110,12 +111,12 @@
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-core</artifactId>
-            <version>2.9.4</version>
+            <version>2.9.5</version>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-databind</artifactId>
-            <version>2.9.4</version>
+            <version>2.9.5</version>
        </dependency>
        <!-- end of daikon dependencies -->

--- 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.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
    <packaging>pom</packaging>
    <properties>
        <talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
-        <components.version>0.25.0</components.version>
-        <daikon.version>0.26.1</daikon.version>
-        <dataquality.lib.version>6.1.2</dataquality.lib.version>
+        <components.version>0.25.3</components.version>
+        <daikon.version>0.27.0</daikon.version>
+        <dataquality.lib.version>6.1.3</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.1.1-SNAPSHOT</version>
+		<version>7.1.1</version>
 		<relativePath />
 	</parent>

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

--- a/build/talend.studio.tos.bd.product/pom.xml
+++ b/build/talend.studio.tos.bd.product/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.1.1</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

--- a/build/talend.studio.tos.di.product/pom.xml
+++ b/build/talend.studio.tos.di.product/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.1.1</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

--- a/build/talend.studio.tos.dq.product/pom.xml
+++ b/build/talend.studio.tos.dq.product/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.1.1</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

--- a/build/talend.studio.tos.esb.product/pom.xml
+++ b/build/talend.studio.tos.esb.product/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>org.talend.studio</groupId>
        <artifactId>tos-products-parent-pom</artifactId>
-        <version>7.1.1-SNAPSHOT</version>
+        <version>7.1.1</version>
        <relativePath>../talend.studio.tos.product.parent.pom</relativePath>
    </parent>

--- a/build/talend.studio.tos.mdm.product/pom.xml
+++ b/build/talend.studio.tos.mdm.product/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>org.talend.studio</groupId>
        <artifactId>tos-products-parent-pom</artifactId>
-        <version>7.1.1-SNAPSHOT</version>
+        <version>7.1.1</version>
        <relativePath>../talend.studio.tos.product.parent.pom</relativePath>
    </parent>

--- 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.1.1-SNAPSHOT</version>
+        <version>7.1.1</version>
        <relativePath />
    </parent>

@@ -118,7 +118,7 @@
                                <artifactItem>
                                    <groupId>${project.groupId}</groupId>
                                    <artifactId>eclipse-launcher-mac-${launcher.prefix}</artifactId>
-                                    <version>6.4.0</version>
+                                    <version>7.1.1</version>
                                    <type>zip</type>
                                    <overWrite>true</overWrite>
                                    <outputDirectory>${studio.dir}</outputDirectory>
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.1.1</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.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
    <packaging>pom</packaging>

    <properties>
@@ -12,10 +12,10 @@
        <tycho-extras.version>${tycho.version}</tycho-extras.version>
        <base.version>7.1.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}</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}</maven.compatible.version>
+        <repo.type>Release</repo.type>
 	<doc.version>7.1.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>
@@ -199,6 +199,67 @@
        </plugins>
    </build>
    <profiles>
+        <profile>
+            <id>patch</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+                <product.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</product.version>
+                <timestamp>${maven.build.timestamp}</timestamp>
+                <maven.build.timestamp.format>yyyyMMdd'_'HHmm</maven.build.timestamp.format>
+            </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>${timestamp}'-patch'</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>nonofficial</id>
            <activation>
Author	SHA1	Message	Date
Liu Xinquan	ff7aa661be	fix(TPS-3713) Upgrade 'dataquality-record-linkage' to 6.1.7 (#231 ) (#232 ) Co-authored-by: qiongli <qiongli@talend.com>	2020-01-17 15:31:16 +08:00
jiezhang-tlnd	88b9be3e9c	chore(TUP-21429) prepare update site for 7.0.1 (#210 )	2019-09-24 16:44:30 +08:00
Irene Wang	032adea707	Update Mac launcher version	2019-06-24 11:24:27 +02:00
Ivan Gonchar	0c664b95a5	chore: update Components version to 0.25.3 (#137 )	2018-10-24 10:43:12 +08:00
Ivan Gonchar	4863345769	chore: update Components version to 0.25.2 (#136 )	2018-10-23 09:55:09 +08:00
build-talend	e6f506e110	chore(Jenkins): Update DQ libs to 6.1.3 (#135 )	2018-10-21 10:43:57 +02:00
Nicolas Rousseau	a4e63734ec	fix(TUP-21000) fix jackson to 2.9.5	2018-10-20 14:09:53 +08:00
Ivan Gonchar	65b3f8aa97	chore: update Components version to 0.25.1 and daikon version to 0.27.0 (#134 )	2018-10-20 13:18:26 +08:00
build-talend	9aa255b82f	chore(Jenkins): Update DQ libs 6.1.3 + Daikon 0.27.0 (#133 )	2018-10-19 14:36:10 +02:00
Jenkins Continuous Build server	3764ab97ce	Set version to 7.1.1	2018-10-18 11:41:51 +02:00