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

build/dependencies.p2/dependencies.p2.tos/pom.xml

@@ -5,12 +5,11 @@
 	<parent>
 		<groupId>org.talend.repo</groupId>
 		<artifactId>dependencies.p2</artifactId>
-		<version>7.3.1-PATCH</version>
+		<version>7.2.1</version>
 	</parent>
 
 	<artifactId>dependencies.p2.tos</artifactId>
 	<packaging>pom</packaging>
-	
 
     <repositories>
         <repository>
@@ -87,12 +86,6 @@
 			<version>${daikon.version}</version>
 			<classifier>bundle</classifier>
 		</dependency>
-		<dependency>
-			<groupId>org.talend.daikon</groupId>
-			<artifactId>crypto-utils</artifactId>
-			<version>${daikon.version}</version>
-			<classifier>bundle</classifier>
-		</dependency>
 		<dependency>
 			<groupId>org.talend.daikon</groupId>
 			<artifactId>daikon-exception</artifactId>
@@ -118,7 +111,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.10</version>
+            <version>3.8.1</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -128,33 +121,13 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${fasterxml.jackson.databind.version}</version>
+            <version>${fasterxml.jackson.version}</version>
         </dependency>
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
 			<artifactId>jaxb-api</artifactId>
 			<version>2.3.1</version>
 		</dependency>
-		<dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-            <version>1.9.4-talend</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-configuration2</artifactId>
-            <version>2.8.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-text</artifactId>
-            <version>1.10.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.7</version>
-        </dependency>
         <!-- end of daikon dependencies -->
 
 		<!-- ========================= -->
@@ -163,12 +136,12 @@
 		<dependency>
 			<groupId>org.codehaus.jackson</groupId>
 			<artifactId>jackson-core-asl</artifactId>
-			<version>1.9.16-TALEND</version>
+			<version>1.9.14-TALEND</version>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.jackson</groupId>
 			<artifactId>jackson-mapper-asl</artifactId>
-			<version>1.9.16-TALEND</version>
+			<version>1.9.14-TALEND</version>
 		</dependency>
 
 		<!-- Avro with minimum depdencies -->
@@ -195,7 +168,7 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-compress</artifactId>
-			<version>1.19</version>
+			<version>1.10</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.livesense</groupId>
@@ -318,9 +291,9 @@
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.14-talend</version>
+			<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>
@@ -335,85 +308,47 @@
 		<dependency>
 			<groupId>commons-beanutils</groupId>
 			<artifactId>commons-beanutils</artifactId>
-			<version>1.9.4-talend</version>
+			<version>1.9.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>org-slf4j-api</artifactId>
 			<version>1.7.2</version>
 		</dependency>
-		
+		<dependency>
+			<groupId>commons-configuration</groupId>
+			<artifactId>commons-configuration</artifactId>
+			<version>1.10</version>
+		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-xml</artifactId>
-			<version>${fasterxml.jackson.bonita.compatible.version}</version>
+			<version>${fasterxml.jackson.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-yaml</artifactId>
-			<version>${fasterxml.jackson.bonita.compatible.version}</version>
+			<version>${fasterxml.jackson.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-csv</artifactId>
-			<version>${fasterxml.jackson.bonita.compatible.version}</version>
+			<version>${fasterxml.jackson.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-smile</artifactId>
-			<version>${fasterxml.jackson.bonita.compatible.version}</version>
+			<version>${fasterxml.jackson.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.module</groupId>
 			<artifactId>jackson-module-jaxb-annotations</artifactId>
-			<version>${fasterxml.jackson.bonita.compatible.version}</version>
+			<version>${fasterxml.jackson.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.yaml</groupId>
 			<artifactId>snakeyaml</artifactId>
-			<version>1.26</version>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.woodstox</groupId>
-			<artifactId>stax2-api</artifactId>
-			<version>4.2</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.woodstox</groupId>
-			<artifactId>woodstox-core</artifactId>
-			<version>5.3.0</version>
-		</dependency>
-		 <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov</artifactId>
-            <version>1.68.0</version>
-            <classifier>bundle</classifier>
-        </dependency>
-		<dependency>
-			<groupId>org.junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.13.2</version>
-			<classifier>bundle</classifier>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-			<version>4.5.13-talend</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpcore</artifactId>
-			<version>4.4.14-talend</version>
-		</dependency>
-		<dependency>
-			<groupId>ch.qos.reload4j</groupId>
-			<artifactId>reload4j</artifactId>
-			<version>1.2.19-TALEND</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ant</groupId>
-			<artifactId>ant</artifactId>
-			<version>1.10.12-ORBIT</version>
+		    <version>1.23</version>
 		</dependency>
 	</dependencies>
 

build/dependencies.p2/pom.xml

@@ -1,22 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
 	<modelVersion>4.0.0</modelVersion>
-	<parent>
-        <groupId>org.talend.studio</groupId>
-        <artifactId>parent-pom</artifactId>
-	<version>7.3.1-PATCH</version>
-        <relativePath>../../talend.studio.parent.pom</relativePath>
-    </parent>
     <groupId>org.talend.repo</groupId>
     <artifactId>dependencies.p2</artifactId>
+    <version>7.2.1</version>
     <packaging>pom</packaging>
     <properties>
         <talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
-        <dataquality.lib.version>8.0.26</dataquality.lib.version>
-        <fasterxml.jackson.version>2.13.4</fasterxml.jackson.version>
-        <fasterxml.jackson.databind.version>2.13.4.2</fasterxml.jackson.databind.version>
-        <!-- jackson dataformat and jaxb should use version 2.9.10 to make studio compatible with bonita -->
-        <fasterxml.jackson.bonita.compatible.version>2.9.10</fasterxml.jackson.bonita.compatible.version>
+        <components.version>0.27.3</components.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>
 
     <distributionManagement>

build/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>7.3.1-PATCH</version>
+		<version>7.2.1</version>
 		<relativePath />
 	</parent>
 

build/talend.studio.bom/pom.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.talend.studio</groupId>
+    <artifactId>studio-bom</artifactId>
+    <version>7.2.1</version>
+    <packaging>pom</packaging>
+    <name>studio bom</name>
+    
+    <properties>
+        <daikon.version>0.31.6</daikon.version>
+    </properties>
+    
+</project>

build/talend.studio.tos.all.p2.product/pom.xml

@@ -4,13 +4,12 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>7.3.1-PATCH</version>
+		<version>7.2.1</version>
 		<relativePath />
 	</parent>
 
 	<artifactId>talend-tos-p2-repo</artifactId>
 	<packaging>eclipse-repository</packaging>
-	<version>7.3.1.PATCH</version>
 
 	<properties>
 		<product.final.name>${launcher.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>

build/talend.studio.tos.all.p2.product/talend.product

@@ -21,6 +21,7 @@
       <feature id="org.talend.rcp.branding.tos.feature"/>
       <feature id="org.talend.rcp.branding.top.feature"/>
       <feature id="org.talend.rcp.branding.esbstandard.feature"/>
+      <feature id="org.talend.rcp.branding.tombundle.feature"/>
       <feature id="org.talend.rcp.branding.tos.test.feature"/>
       <feature id="org.talend.mdm.tom.test.feature"/>
       <feature id="org.talend.babel.all.tos.feature"/>
@@ -63,9 +64,6 @@
       <feature id="org.talend.updates.feature"/>
       <feature id="org.talend.utils.feature"/>
       <feature id="org.talend.dataquality.se.test.feature"/>
-      <feature id="org.talend.help.di.feature"/>
-      <feature id="org.talend.help.bd.feature"/>
-      <feature id="org.talend.help.esb.feature"/>
    </features>
 
 

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

@@ -15,4 +15,4 @@ 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.27.16,org.talend.components:cosmosDB:1.27.16
+component.java.coordinates = org.talend.components:couchbase:1.1.0

build/talend.studio.tos.bd.product/pom.xml

@@ -4,11 +4,10 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>7.3.1-PATCH</version>
+		<version>7.2.1</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>
 
 	<artifactId>org.talend.studio.tos.bigdata.product</artifactId>
 	<packaging>eclipse-repository</packaging>
-	<version>7.3.1.PATCH</version>
 </project>

build/talend.studio.tos.di.product/pom.xml

@@ -4,11 +4,10 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>7.3.1-PATCH</version>
+		<version>7.2.1</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>
 
 	<artifactId>org.talend.studio.tos.di.product</artifactId>
 	<packaging>eclipse-repository</packaging>
-	<version>7.3.1.PATCH</version>
 </project>

build/talend.studio.tos.dq.product/pom.xml

@@ -4,11 +4,10 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>7.3.1-PATCH</version>
+		<version>7.2.1</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>
 
 	<artifactId>org.talend.studio.tos.dq.product</artifactId>
 	<packaging>eclipse-repository</packaging>
-	<version>7.3.1.PATCH</version>
 </project>

build/talend.studio.tos.esb.product/pom.xml

@@ -4,11 +4,10 @@
     <parent>
         <groupId>org.talend.studio</groupId>
         <artifactId>tos-products-parent-pom</artifactId>
-        <version>7.3.1-PATCH</version>
+        <version>7.2.1</version>
         <relativePath>../talend.studio.tos.product.parent.pom</relativePath>
     </parent>
 
     <artifactId>org.talend.studio.tos.esb.product</artifactId>
     <packaging>eclipse-repository</packaging>
-	<version>7.3.1.PATCH</version>
 </project>

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.3.1-PATCH</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>7.3.1</version>
+                                    <version>7.2.1</version>
                                     <type>zip</type>
                                     <overWrite>true</overWrite>
                                     <outputDirectory>${studio.dir}</outputDirectory>
@@ -174,7 +174,7 @@
 								<artifactItem>
 									<groupId>${project.groupId}</groupId>
 									<artifactId>studio-add-conf</artifactId>
-									<version>7.3.1-SNAPSHOT</version>
+									<version>7.2.1-SNAPSHOT</version>
 									<type>zip</type>
 									<classifier />
 									<overWrite>true</overWrite>
@@ -290,13 +290,11 @@
                         <configuration>
                             <target>
                                 <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
-                                <propertyregex property="unqualifiedVersion.short" input="${product.version}" regexp="^([0-9])\.([0-9])\.([0-9])" select="\1.\2" casesensitive="false" />
-                                <echo>unqualifiedVersion.short: ${unqualifiedVersion.short}</echo>
-                                <echo>Looking for ${studio.dir}/plugins/${product.branding.platform}_${unqualifiedVersion.short}*</echo>
+                                <echo>Looking for ${studio.dir}/plugins/${product.branding.platform}_${product.version}*</echo>
                                 <echo>buildQualifier=${buildQualifier}</echo>
                                 <echo>product.timestamp=${product.timestamp}</echo>
                                 <echo>version.full=${version.full}</echo>
-                                <fileset dir="${studio.dir}/plugins" includes="${product.branding.platform}_${unqualifiedVersion.short}*/about.mappings" id="aboutmappingspath_temp" />
+                                <fileset dir="${studio.dir}/plugins" includes="${product.branding.platform}_${product.version}*/about.mappings" id="aboutmappingspath_temp" />
                                 <pathconvert property="aboutmappingspath" refid="aboutmappingspath_temp" />
                                 <echo>aboutmappingspath=${aboutmappingspath}</echo>
                                 <loadfile property="about" srcFile="${aboutmappingspath}">

pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>7.3.1-PATCH</version>
+		<version>7.2.1</version>
 		<relativePath />
 	</parent>