chore(Jenkins): Update DQ libs to 7.0.3 (#293)

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</version>
 	</parent>
 
 	<artifactId>dependencies.p2.tos</artifactId>

build/dependencies.p2/pom.xml

@@ -3,12 +3,12 @@
 	<modelVersion>4.0.0</modelVersion>
     <groupId>org.talend.repo</groupId>
     <artifactId>dependencies.p2</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.2.1</version>
     <packaging>pom</packaging>
     <properties>
         <talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
         <components.version>0.27.3</components.version>
-        <dataquality.lib.version>7.0.1</dataquality.lib.version>
+        <dataquality.lib.version>7.0.3</dataquality.lib.version>
         <fasterxml.jackson.version>2.9.9</fasterxml.jackson.version>
         <daikon.version>0.31.7</daikon.version>
     </properties>

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</version>
 		<relativePath />
 	</parent>
 

build/talend.studio.bom/pom.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.talend.studio</groupId>
     <artifactId>studio-bom</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.2.1</version>
     <packaging>pom</packaging>
     <name>studio bom</name>
     

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.2.1-SNAPSHOT</version>
+		<version>7.2.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.2.1-SNAPSHOT</version>
+		<version>7.2.1</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>
 

build/talend.studio.tos.di.product/config.ini

@@ -14,5 +14,3 @@ file.encoding=UTF-8
 eclipse.p2.data.area=@config.dir/../p2/
 eclipse.p2.profile=profile
 default.update.site.url=https://update.talend.com/Studio/tos/
-
-component.java.coordinates = org.talend.components:couchbase:1.1.0

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.2.1-SNAPSHOT</version>
+		<version>7.2.1</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>
 

build/talend.studio.tos.dq.product/config.ini

@@ -13,5 +13,3 @@ osgi.framework.extensions=org.talend.osgi.lib.loader
 file.encoding=UTF-8
 eclipse.p2.data.area=@config.dir/../p2/
 eclipse.p2.profile=profile
-
-component.java.coordinates = org.talend.components:couchbase:1.1.0

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.2.1-SNAPSHOT</version>
+		<version>7.2.1</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>
 

build/talend.studio.tos.esb.product/config.ini

@@ -14,5 +14,3 @@ file.encoding=UTF-8
 eclipse.p2.data.area=@config.dir/../p2/
 eclipse.p2.profile=profile
 default.update.site.url=https://update.talend.com/Studio/tos/
-
-component.java.coordinates = org.talend.components:couchbase:1.1.0

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.2.1-SNAPSHOT</version>
+        <version>7.2.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.2.1-SNAPSHOT</version>
+        <version>7.2.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.2.1</version>
                                     <type>zip</type>
                                     <overWrite>true</overWrite>
                                     <outputDirectory>${studio.dir}</outputDirectory>
@@ -176,7 +176,7 @@
 									<artifactId>studio-add-conf</artifactId>
 									<version>7.2.1-SNAPSHOT</version>
 									<type>zip</type>
-									<classifier></classifier>
+									<classifier />
 									<overWrite>true</overWrite>
 									<outputDirectory>${studio.dir}/configuration</outputDirectory>
 								</artifactItem>
@@ -506,10 +506,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>

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</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.2.1-SNAPSHOT</version>
+    <version>7.2.1</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}</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.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_64</osgi.arch>
-        <strictVersions>true</strictVersions>
+        <strictVersions>false</strictVersions>
     </properties>
 
     <distributionManagement>
@@ -204,6 +204,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>
@@ -237,12 +298,12 @@
                             <dependency>
                                 <groupId>org.eclipse.tycho.extras</groupId>
                                 <artifactId>tycho-buildtimestamp-jgit</artifactId>
-                                <version>${tycho.version}</version>
+                                <version>${tycho-extras.version}</version>
                             </dependency>
                         </dependencies>
                         <configuration>
                             <strictBinIncludes>false</strictBinIncludes>
-                            <format>yyyyMMdd'_'HHmm</format>
+                            <format>yyyyMMdd'_'HHmm'${release.suffix}'</format>
                             <archive>
                                 <addMavenDescriptor>false</addMavenDescriptor>
                                 <!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
@@ -255,7 +316,7 @@
                             <jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
                         </configuration>
                     </plugin>
-                     </plugins>
+                </plugins>
             </build>
         </profile>
         <profile>
@@ -286,7 +347,7 @@
                         <version>${tycho.version}</version>
                         <configuration>
                             <strictBinIncludes>false</strictBinIncludes>
-                            <format>yyyyMMdd'_'HHmm</format>
+                            <format>yyyyMMdd'_'HHmm'${release.suffix}'</format>
                             <archive>
                                 <addMavenDescriptor>false</addMavenDescriptor>
                                 <!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
@@ -330,12 +391,12 @@
                             <dependency>
                                 <groupId>org.eclipse.tycho.extras</groupId>
                                 <artifactId>tycho-buildtimestamp-jgit</artifactId>
-                                <version>${tycho.version}</version>
+                                <version>${tycho-extras.version}</version>
                             </dependency>
                         </dependencies>
                         <configuration>
                             <strictBinIncludes>false</strictBinIncludes>
-                            <format>yyyyMMdd'_'HHmm</format>
+                            <format>yyyyMMdd'_'HHmm'${release.suffix}'</format>
                             <archive>
                                 <addMavenDescriptor>false</addMavenDescriptor>
                                 <!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
@@ -391,7 +452,7 @@
                         </dependencies>
                         <configuration>
                             <strictBinIncludes>false</strictBinIncludes>
-                            <format>yyyyMMdd'_'HHmm</format>
+                            <format>'${product.timestamp}${release.suffix}'</format>
                             <archive>
                                 <addMavenDescriptor>false</addMavenDescriptor>
                                 <!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
@@ -399,9 +460,6 @@
                                     <Built-By />
                                 </manifestEntries>
                             </archive>
-                            <timestampProvider>jgit</timestampProvider>
-                            <jgit.ignore>pom.xml</jgit.ignore>
-                            <jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
                         </configuration>
                     </plugin>
                 </plugins>