chore(TUP-31163): upgrade daikon to 0.31.12 (#424 )

chore(TDI-46405): bump connectors to 1.23.0 (#435 )
Co-authored-by: Dmytro Chmyga <dmytro.chmyga@globallogic.com>
2021-07-13 15:27:46 +08:00 · 2021-07-09 18:02:19 +03:00 · 2021-07-09 10:45:07 +08:00 · 2021-07-06 17:09:21 +08:00 · 2021-06-10 16:46:53 +08:00 · 2021-06-09 13:44:14 +03:00
5 changed files with 591 additions and 566 deletions
--- a/build/dependencies.p2/dependencies.p2.tos/pom.xml
+++ b/build/dependencies.p2/dependencies.p2.tos/pom.xml
@@ -10,6 +10,7 @@

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

    <repositories>
        <repository>
@@ -117,7 +118,7 @@
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-lang3</artifactId>
-            <version>3.8.1</version>
+            <version>3.10</version>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
@@ -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>
@@ -157,12 +158,12 @@
 		<dependency>
 			<groupId>org.codehaus.jackson</groupId>
 			<artifactId>jackson-core-asl</artifactId>
-			<version>1.9.14-TALEND</version>
+			<version>1.9.15-TALEND</version>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.jackson</groupId>
 			<artifactId>jackson-mapper-asl</artifactId>
-			<version>1.9.14-TALEND</version>
+			<version>1.9.15-TALEND</version>
 		</dependency>

 		<!-- Avro with minimum depdencies -->
@@ -312,9 +313,9 @@
 		<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
+		<!-- to avoid updatin the complete eclipse target platform we add these
 			single dependencies -->
        <dependency>
            <groupId>biz.aQute.bnd</groupId>
@@ -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>
@@ -381,6 +382,28 @@
 			<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>
 	</dependencies>

 </project>
--- a/build/dependencies.p2/pom.xml
+++ b/build/dependencies.p2/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
        <groupId>org.talend.studio</groupId>
        <artifactId>parent-pom</artifactId>
-        <version>7.3.1-PATCH</version>
+	<version>7.3.1-PATCH</version>
        <relativePath>../../talend.studio.parent.pom</relativePath>
    </parent>
    <groupId>org.talend.repo</groupId>
@@ -12,8 +12,8 @@
    <packaging>pom</packaging>
    <properties>
        <talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
-        <dataquality.lib.version>8.0.9</dataquality.lib.version>
-        <fasterxml.jackson.version>2.10.1</fasterxml.jackson.version>
+        <dataquality.lib.version>8.0.13</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>
    </properties>
--- 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.17.1,org.talend.components:cosmosDB:1.17.1
+component.java.coordinates = org.talend.components:couchbase:1.23.0,org.talend.components:cosmosDB:1.23.0
--- a/build/talend.studio.tos.product.parent.pom/pom.xml
+++ b/build/talend.studio.tos.product.parent.pom/pom.xml
@@ -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}">
@@ -456,29 +458,29 @@
                            <timestampProvider>default</timestampProvider>
                        </configuration>
                    </plugin>
-                    <!--
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>1.7</version>
-                        <executions>
+                    <!--
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <version>1.7</version>
+                        <executions>
                            <execution>-->
                    <!-- Attach product ZIP to Maven artifact -->
-                    <!--    <id>attach-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            <file>${project.build.directory}/products/${product.final.name}.zip</file>
-                                            <type>product</type>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
+                    <!--    <id>attach-artifacts</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>attach-artifact</goal>
+                                </goals>
+                                <configuration>
+                                    <artifacts>
+                                        <artifact>
+                                            <file>${project.build.directory}/products/${product.final.name}.zip</file>
+                                            <type>product</type>
+                                        </artifact>
+                                    </artifacts>
+                                </configuration>
+                            </execution>
+                        </executions>
                    </plugin>-->
                    <plugin>
                        <groupId>org.apache.maven.plugins</groupId>
--- a/talend.studio.parent.pom/pom.xml
+++ b/talend.studio.parent.pom/pom.xml
Author	SHA1	Message	Date
bhe-talendbj	2305da028b	chore(TUP-31163): upgrade daikon to 0.31.12 (#424 )	2021-07-13 15:27:46 +08:00
chmyga	2e28c62c6d	chore(TDI-46405): bump connectors to 1.23.0 (#435 ) Co-authored-by: Dmytro Chmyga <dmytro.chmyga@globallogic.com>	2021-07-09 18:02:19 +03:00
pyzhou	28feadd37c	fix(TDI-46260): bump tcompv0 connectors to 0.33.0 (#433 )	2021-07-09 10:45:07 +08:00
jiezhang-tlnd	5c4a678284	chore(TUP-31549)Align commons-lang3 dependency version in all components (#413 ) https://jira.talendforge.org/browse/TUP-31549	2021-07-06 17:09:21 +08:00
build-talend-tdq	e00b580862	chore(Jenkins): Update DQ libs to 8.0.13 (#421 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2021-06-10 16:46:53 +08:00
chmyga	14bad8f528	chore(TDI-46267): bump connectors to 1.22.0 (#419 ) Co-authored-by: Dmytro Chmyga <dmytro.chmyga@globallogic.com>	2021-06-09 13:44:14 +03:00
pyzhou	0189c9b290	fix(TDI-46260): bump tcompv0 connectors to 0.32.1 (#417 )	2021-06-09 11:13:04 +08:00
hzhao-talendbj	d8f4ca3e61	chore(TUP-30255): Upgrade httpclient-4.5.5,4.5.7 to 4.5.13 (#403 ) * chore(TUP-30255): Upgrade httpclient-4.5.5,4.5.7 to 4.5.13 * tup-30255 change httpcore to 4.4.14-talend * TUP-30255 use temp p2 to build patch and test * TUP-30255 change p2 back to normal * TUP-30255 change p2 back	2021-05-10 17:29:09 +08:00
mbasiuk-talend	71b4fb154b	chore(TDI-46032): bump connectors version to 1.21.0 (#408 )	2021-05-08 17:05:12 +08:00
jzhao	db2b45ce90	fix(TDI-46033): bump tcompv0 connectors to 0.31.0 (#409 )	2021-05-08 13:51:33 +08:00
jiezhang-tlnd	98139e7cab	fix(TUP-30960)CVE: jackson-mapper-1.9.14.TALEND (#399 )	2021-05-06 11:47:34 +08:00
build-talend-tdq	93efd732dc	chore(Jenkins): Update DQ libs to 8.0.12 (#400 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2021-04-22 11:01:44 +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