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

Co-authored-by: qiongli <qiongli@talend.com>

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 -->
 

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>
+        <components.version>0.25.3</components.version>
-        <daikon.version>0.26.1</daikon.version>
+        <daikon.version>0.27.0</daikon.version>
-        <dataquality.lib.version>6.1.2</dataquality.lib.version>
+        <dataquality.lib.version>6.1.3</dataquality.lib.version>
     </properties>
 
     <distributionManagement>

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
@@ -235,35 +235,35 @@
                     </execution>
                 </executions>
             </plugin>
-            <!--    <plugin>
+            <!--    <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
+                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.3.2</version>
+                <version>1.3.2</version>
-                <executions>
+                <executions>
-                    <execution>
+                    <execution>
-                        <id>generate-javajet</id>
+                        <id>generate-javajet</id>
-                        <phase>package</phase>
+                        <phase>package</phase>
-                        <goals>
+                        <goals>
-                            <goal>exec</goal>
+                            <goal>exec</goal>
-                        </goals>
+                        </goals>
-                    </execution>
+                    </execution>
-                </executions>
+                </executions>
-                <configuration>
+                <configuration>
-                    <executable>java</executable>
+                    <executable>java</executable>
-                    <workingDirectory>${studio.dir}</workingDirectory>
+                    <workingDirectory>${studio.dir}</workingDirectory>
-                    <arguments>
+                    <arguments>
-                        <argument>-Xmx1536m</argument>
+                        <argument>-Xmx1536m</argument>
-                        <argument>-XX:MaxPermSize=512m</argument>
+                        <argument>-XX:MaxPermSize=512m</argument>
-                        <argument>-classpath</argument>
+                        <argument>-classpath</argument>
-                        <argument>${studio.dir}/plugins/${equinox.build}</argument>
+                        <argument>${studio.dir}/plugins/${equinox.build}</argument>
-                        <argument>org.eclipse.core.launcher.Main</argument>
+                        <argument>org.eclipse.core.launcher.Main</argument>
-                        <argument>-application</argument>
+                        <argument>-application</argument>
-                        <argument>org.talend.designer.codegen.CodeGenInit</argument>
+                        <argument>org.talend.designer.codegen.CodeGenInit</argument>
-                        <argument>-nosplash</argument>
+                        <argument>-nosplash</argument>
-                        <argument>-consoleLog</argument>
+                        <argument>-consoleLog</argument>
-                        <argument>-Dtalend.licence.path=${studio.dir}/license</argument>
+                        <argument>-Dtalend.licence.path=${studio.dir}/license</argument>
-                    </arguments>
+                    </arguments>
-                </configuration>
+                </configuration>
             </plugin>-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -503,29 +503,29 @@
                             <timestampProvider>default</timestampProvider>
                         </configuration>
                     </plugin>
-                    <!--
+                    <!--
-                    <plugin>
+                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
+                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>1.7</version>
+                        <version>1.7</version>
-                        <executions>
+                        <executions>
                             <execution>-->
                     <!-- Attach product ZIP to Maven artifact -->
-                    <!--    <id>attach-artifacts</id>
+                    <!--    <id>attach-artifacts</id>
-                                <phase>package</phase>
+                                <phase>package</phase>
-                                <goals>
+                                <goals>
-                                    <goal>attach-artifact</goal>
+                                    <goal>attach-artifact</goal>
-                                </goals>
+                                </goals>
-                                <configuration>
+                                <configuration>
-                                    <artifacts>
+                                    <artifacts>
-                                        <artifact>
+                                        <artifact>
-                                            <file>${project.build.directory}/products/${product.final.name}.zip</file>
+                                            <file>${project.build.directory}/products/${product.final.name}.zip</file>
-                                            <type>product</type>
+                                            <type>product</type>
-                                        </artifact>
+                                        </artifact>
-                                    </artifacts>
+                                    </artifacts>
-                                </configuration>
+                                </configuration>
-                            </execution>
+                            </execution>
-                        </executions>
+                        </executions>
                     </plugin>-->
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>

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>
 

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>
+        <maven.compatible.version>${base.version}</maven.compatible.version>
-        <repo.type>Snapshot</repo.type>
+        <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>
@@ -150,12 +150,12 @@
                     </environments>
                     <filters>
                         <!-- restrict version of a bundle -->
-                        <!--<filter>
+                        <!--<filter>
-							<type>eclipse-plugin</type>
+							<type>eclipse-plugin</type>
-							<id>org.eclipse.ui.views.properties.tabbed</id>
+							<id>org.eclipse.ui.views.properties.tabbed</id>
-							<restrictTo>
+							<restrictTo>
-								<version>3.6.100.v20140519-0906</version>
+								<version>3.6.100.v20140519-0906</version>
-							</restrictTo>
+							</restrictTo>
 						</filter>-->
                         <filter>
                             <type>eclipse-plugin</type>
@@ -165,22 +165,22 @@
                             </restrictTo>
                         </filter>
 
-                        <!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence 
+                        <!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence 
-				 <filter>
+				 <filter>
-					<type>java-package</type>
+					<type>java-package</type>
-					<id>javax.persistence</id>
+					<id>javax.persistence</id>
-					<restrictTo>
+					<restrictTo>
-					   <type>eclipse-plugin</type>
+					   <type>eclipse-plugin</type>
-					   <id>javax.persistence</id>
+					   <id>javax.persistence</id>
-					</restrictTo>
+					</restrictTo>
-				 </filter>
+				 </filter>
 -->
-                        <!-- example 3: work around Equinox bug 348045 
+                        <!-- example 3: work around Equinox bug 348045 
-				 <filter>
+				 <filter>
-					<type>p2-installable-unit</type>
+					<type>p2-installable-unit</type>
-					<id>org.eclipse.equinox.servletbridge.extensionbundle</id>
+					<id>org.eclipse.equinox.servletbridge.extensionbundle</id>
-					<removeAll />
+					<removeAll />
-				 </filter>
+				 </filter>
 -->				 
                     </filters>
                 </configuration>
@@ -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>