chore(Jenkins): Update DQ libs to 8.0.12 (#400 ) (#401 )

Jzhang/73/tup 30992 (#397 )
* chore(TUP-30092)CVE: junit-4.13.2 * fix(TUP-30992)CVE: junit-4.11,4.13 * add org.junit dependency
2021-04-22 11:19:14 +08:00 · 2021-04-15 16:13:38 +08:00 · 2021-04-15 14:20:56 +08:00 · 2021-04-13 13:42:50 +03:00 · 2021-04-13 11:42:24 +08:00 · 2021-04-09 16:14:55 +08:00
13 changed files with 555 additions and 541 deletions
--- a/build/dependencies.p2/dependencies.p2.tos/pom.xml
+++ b/build/dependencies.p2/dependencies.p2.tos/pom.xml
@@ -5,11 +5,12 @@
 	<parent>
 		<groupId>org.talend.repo</groupId>
 		<artifactId>dependencies.p2</artifactId>
-		<version>7.3.1-SNAPSHOT</version>
+		<version>7.3.1-PATCH</version>
 	</parent>

 	<artifactId>dependencies.p2.tos</artifactId>
 	<packaging>pom</packaging>
+	

    <repositories>
        <repository>
@@ -137,7 +138,7 @@
 		<dependency>
            <groupId>commons-beanutils</groupId>
            <artifactId>commons-beanutils</artifactId>
-            <version>1.9.3</version>
+            <version>1.9.4-talend</version>
        </dependency>
        <dependency>
            <groupId>org.apache.commons</groupId>
@@ -312,7 +313,7 @@
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.10</version>
+			<version>1.14-talend</version>
 		</dependency>
 		<!-- to avoid updatin the complete eclipse target platform we add these
 			single dependencies -->
@@ -329,7 +330,7 @@
 		<dependency>
 			<groupId>commons-beanutils</groupId>
 			<artifactId>commons-beanutils</artifactId>
-			<version>1.9.3</version>
+			<version>1.9.4-talend</version>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -369,7 +370,7 @@
 		<dependency>
 			<groupId>org.yaml</groupId>
 			<artifactId>snakeyaml</artifactId>
-			<version>1.25</version>
+			<version>1.26</version>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.woodstox</groupId>
@@ -381,6 +382,18 @@
 			<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>
 	</dependencies>

 </project>
--- a/build/dependencies.p2/pom.xml
+++ b/build/dependencies.p2/pom.xml
@@ -1,18 +1,21 @@
 <?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.3.1-SNAPSHOT</version>
    <packaging>pom</packaging>
    <properties>
        <talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
-        <components.version>0.28.1</components.version>
-        <dataquality.lib.version>8.0.0</dataquality.lib.version>
-        <fasterxml.jackson.version>2.10.1</fasterxml.jackson.version>
+        <dataquality.lib.version>8.0.12</dataquality.lib.version>
+        <fasterxml.jackson.version>2.11.4</fasterxml.jackson.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>
-        <daikon.version>0.31.10</daikon.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.3.1-SNAPSHOT</version>
+		<version>7.3.1-PATCH</version>
 		<relativePath />
 	</parent>

--- a/build/talend.studio.bom/pom.xml
+++ b/build/talend.studio.bom/pom.xml
@@ -1,14 +0,0 @@
-<?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.3.1-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>studio bom</name>
-    
-    <properties>
-        <daikon.version>0.31.6</daikon.version>
-    </properties>
-    
-</project>
--- 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.3.1-SNAPSHOT</version>
+		<version>7.3.1-PATCH</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>
--- a/build/talend.studio.tos.bd.product/config.ini
+++ b/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.6.0
+component.java.coordinates = org.talend.components:couchbase:1.20.0,org.talend.components:cosmosDB:1.20.0
--- 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.3.1-SNAPSHOT</version>
+		<version>7.3.1-PATCH</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>
--- 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.3.1-SNAPSHOT</version>
+		<version>7.3.1-PATCH</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>
--- 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.3.1-SNAPSHOT</version>
+		<version>7.3.1-PATCH</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>
--- 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.3.1-SNAPSHOT</version>
+        <version>7.3.1-PATCH</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>
--- 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.3.1-SNAPSHOT</version>
+        <version>7.3.1-PATCH</version>
        <relativePath />
    </parent>

@@ -290,11 +290,13 @@
                        <configuration>
                            <target>
                                <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
-                                <echo>Looking for ${studio.dir}/plugins/${product.branding.platform}_${product.version}*</echo>
+                                <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>buildQualifier=${buildQualifier}</echo>
                                <echo>product.timestamp=${product.timestamp}</echo>
                                <echo>version.full=${version.full}</echo>
-                                <fileset dir="${studio.dir}/plugins" includes="${product.branding.platform}_${product.version}*/about.mappings" id="aboutmappingspath_temp" />
+                                <fileset dir="${studio.dir}/plugins" includes="${product.branding.platform}_${unqualifiedVersion.short}*/about.mappings" id="aboutmappingspath_temp" />
                                <pathconvert property="aboutmappingspath" refid="aboutmappingspath_temp" />
                                <echo>aboutmappingspath=${aboutmappingspath}</echo>
                                <loadfile property="about" srcFile="${aboutmappingspath}">
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>7.3.1-SNAPSHOT</version>
+		<version>7.3.1-PATCH</version>
 		<relativePath />
 	</parent>

--- a/talend.studio.parent.pom/pom.xml
+++ b/talend.studio.parent.pom/pom.xml
Author	SHA1	Message	Date
Liu Xinquan	dc4fbf06e7	chore(Jenkins): Update DQ libs to 8.0.12 (#400 ) (#401 )	2021-04-22 11:19:14 +08:00
jiezhang-tlnd	74fc1892b9	Jzhang/73/tup 30992 (#397 ) * chore(TUP-30092)CVE: junit-4.13.2 * fix(TUP-30992)CVE: junit-4.11,4.13 * add org.junit dependency	2021-04-15 16:13:38 +08:00
build-talend-tdq	55962cbf90	chore(Jenkins): Update DQ libs to 8.0.11 (#398 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2021-04-15 14:20:56 +08:00
mbasiuk-talend	03d118eb0e	chore(TDI-45894): bump connectors version to 1.20.0 (#393 )	2021-04-13 13:42:50 +03:00
bhe-talendbj	f31347c758	fix(TUP-26813): upgrade org.bouncycastle.bcprov-jdk15on to 1.68 (#385 ) * fix(TUP-26813): upgrade org.bouncycastle.bcprov-jdk15on to 1.68 * fix(TUP-26813): upgrade org.bouncycastle.bcprov-jdk15on to 1.68 * fix(TUP-26813): upgrade bouncycastle	2021-04-13 11:42:24 +08:00
wang wei	4dee335b4f	fix(TDI-45896): upgrade tcompv0 connectors for studio (#395 )	2021-04-09 16:14:55 +08:00
build-talend-tdq	3a1cb67f59	chore(Jenkins): Update DQ libs to 8.0.10 (#383 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2021-03-11 13:09:17 +08:00
nrousseau	ed72ab400e	fix(TUP-30093) fix version of commons-codec (#377 ) * test p2 * fix(TUP-30093) use the version from orbit * set temp p2 version * revert tcmv0 to 0.28.16 * merge from 73 * use tcompv0 0.30.0 * Update pom.xml merge from TUP-29719 * Update pom.xml * Update pom.xml * Update pom.xml * Update pom.xml Co-authored-by: jiezhang-tlnd <jie.zhang@talend.com> Co-authored-by: wwang-talend <wwang@talend.com> Co-authored-by: jiezhang-tlnd <40561780+jiezhang-tlnd@users.noreply.github.com>	2021-03-09 11:52:18 +08:00
nrousseau	7c048b4cdb	fix(TUP-27154): upgrade beanutils (#363 ) * Update pom.xml * Update pom.xml	2021-03-08 14:32:18 +08:00
Dmytro Sylaiev	9cbf5294ed	feat(TDI-45721): Bump TCK for montlhy (#382 )	2021-03-05 14:03:30 +02:00
jiezhang-tlnd	c02c790c92	chore(TUP-27224)Update Daikon Crypto Utils to 1.15.0 (#368 )	2021-03-01 15:50:12 +08:00
iwangtalend	5c21c43bb8	Fix about.mappings replacement (#375 )	2021-02-27 09:50:21 +08:00
build-talend-tdq	0d2400a921	chore(Jenkins): Update DQ libs to 8.0.9 (#372 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2021-02-07 12:09:37 +08:00
wang wei	40c4265944	fix(TDI-45606): use tcompv0 0.28.16 for studio 7.3 R2021-02 (#369 )	2021-02-05 11:11:27 +08:00
Dmytro Sylaiev	8942dd7faa	fix(TDI-45470): Bump TCK versions for config.ini in 7.3 (#359 ) * fix(TDI-45470): Bump TCK versions for config.ini in 7.3 * fix(TDI-45470): bump connectors to 1.17.1 Co-authored-by: Maksym Basiuk <mbasiuk@talend.com>	2021-01-14 18:09:22 +08:00
build-talend-tdq	053b43d4a2	chore(Jenkins): Update DQ libs to 8.0.8 (#361 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2021-01-14 15:39:47 +08:00
wang wei	a9ce7e33ee	fix(TDI-45465): upgrade tcompv0 for studio 7.3 patch (#357 )	2021-01-11 11:12:49 +08:00
wang wei	0b6a63d1aa	Revert "fix(TDI-45465): upgrade tcompv0 for studio 7.3 patch and master (#354 )" (#356 ) This reverts commit `f85d9fe28b`.	2021-01-08 15:37:25 +08:00
wang wei	f85d9fe28b	fix(TDI-45465): upgrade tcompv0 for studio 7.3 patch and master (#354 )	2021-01-08 11:15:45 +08:00
build-talend-tdq	008a6264b8	chore(Jenkins): Update DQ libs to 8.0.7 (#339 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2020-12-10 16:34:01 +08:00
ypiel	61ec1150cf	chore(TDI-45347) : bump connectors 1.16.0 (#338 )	2020-12-10 16:23:59 +08:00
wang wei	79cf9b5364	bump tcompv0 to 0.28.13 for studio (#335 )	2020-12-04 11:13:12 +08:00
mbasiuk-talend	3193ec1bfd	chore(TDI-44770): upgrade snakeyaml version (#313 )	2020-12-01 19:45:21 +02:00
build-talend-tdq	66239f13ae	chore(Jenkins): Update DQ libs to 8.0.6 (#331 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2020-11-12 15:58:40 +08:00
chmyga	42cd952fb3	chore(TDI-45157): bump TCK components version (#327 ) Co-authored-by: Dmytro Chmyga <dmytro.chmyga@synapse.com>	2020-11-10 09:25:05 +02:00
Oleksandr Zhelezniak	a2b93ac265	chore(TDI-44523): resolve cve issue (#324 ) * update daikon-ee [1.5.0] -> [3.2.0] for tSetDynamicSchema	2020-11-06 15:55:43 +02:00
wang wei	769a2d9b0f	bump tcompv0 version in studio (#325 )	2020-11-06 11:10:15 +08:00
Roman	68080597b6	chore: bump components version to 0.28.10 (#323 )	2020-10-16 10:44:55 +08:00
build-talend-tdq	d0b073093b	chore(Jenkins): Update DQ libs to 8.0.5 (#321 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2020-09-17 12:42:30 +08:00
wang wei	f0c6f2e1ec	fix(TDI-44824): Observability: Update daikon-audit library version (#320 )	2020-09-15 20:26:21 +08:00
Oleksandr Zhelezniak	0ae0ada752	chore(TDI-44671): bump tck components (#318 ) * bump version of TCK components [1.9.0] -> [1.13.0]	2020-09-11 12:23:06 +03:00
Roman	7d75662d10	chore: bump components version to 0.28.9 (#317 )	2020-09-11 10:08:20 +08:00
ypiel	c719a1d614	Bump components to 0.28.8 (#307 )	2020-08-17 09:07:02 +02:00
build-talend-tdq	aededc597f	chore(Jenkins): Update DQ libs to 8.0.4 (#306 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2020-08-13 15:36:12 +08:00
Roman	4e2fba9165	chore: bump components version to 0.28.7 (#305 )	2020-08-12 19:19:00 +08:00
build-talend-tdq	2505066508	chore(Jenkins): Update DQ libs to 8.0.3 (#300 )	2020-07-16 10:56:02 +08:00
mbasiuk-talend	575596f5b8	chore: upgrade tcomp v0 version 0.28.6 (#299 )	2020-07-16 09:45:16 +08:00
Roman	fe4681c4e0	fix(TDI-44125): Bump daikon-ee.format version (#270 ) (#292 )	2020-07-09 15:32:27 +03:00
Zhiwei Xue	57719ae3ed	chore(TUP-27463):Backport TUP-26304 to 7.3:Re-use (#291 ) talend.studio.parent.pom as a root studio bom for SE/EE product	2020-07-02 15:38:42 +08:00
jzhao	d82bcc0756	chore: bump tcompV0 version to 0.28.5 (#286 )	2020-06-11 14:36:46 +08:00
build-talend-tdq	f8e1658e8c	chore(Jenkins): Update DQ libs to 8.0.2 (#285 )	2020-06-10 11:51:34 +08:00
mbasiuk-talend	cbce9b8c6b	chore: backport patch731 changes to maintenance/7.3 (#281 )	2020-05-22 21:47:13 +08:00
Liu Xinquan	650a00c919	chore(TDQ-18431) using DQ SE 8.0.1 on 7.3.1 monthly release (#277 )	2020-05-22 10:58:24 +08:00
pyzhou	50ad6ec014	fix(TDI-43717):backport cosmos to 7.3 (#275 )	2020-05-19 16:32:45 +08:00
nrousseau	1a9cb4dc28	chore(TUP-26710): fix tos p2 build from maintenance/7.3 (#273 )	2020-05-18 16:11:52 +08:00
nrousseau	20061950b5	chore(TUP-26710): update pom (#272 ) * chore(TUP-26710): update pom * chore(TUP-26710): update pom	2020-05-18 13:52:25 +08:00
Zhiwei Xue	e17c5b760d	chore(TUP-26710):update version (#268 ) * chore(TUP-26710):update version * Set version to 7.3.1 PATCH Co-authored-by: Jenkins Continuous Build server <jenkins@tal-rd02.talend.lan>	2020-05-11 17:01:09 +08:00
Ivan Gonchar	455396a79d	chore: bump Components version to 0.28.4-SNAPSHOT (#259 )	2020-03-26 07:57:01 +08:00
Ivan Gonchar	08a5fadc26	chore: bump TCK components version to 1.6.3-SNAPSHOT (#256 )	2020-03-20 11:06:30 +08:00
Ivan Gonchar	6d2df45139	chore: bump Components version to 0.28.3-SNAPSHOT (#255 )	2020-03-20 10:53:25 +08:00
build-talend-tdq	47243627ee	chore(Jenkins): Update DQ libs to 8.0.1-SNAPSHOT (#249 )	2020-02-28 14:53:00 +01:00
Jenkins Continuous Build server	8be6746d1e	Set version to 7.3.2 SNAPSHOT	2020-02-28 13:00:25 +01:00
Pierre Teyssier	d95215f5c7	chore(TDI-43696): cherry-pick on release (#246 )	2020-02-18 08:39:16 +08:00
Jenkins Continuous Build server	f9e05fa54c	Set version to 7.3.1	2020-02-14 13:38:42 +01:00