chore(TDI-48275):Bump TCOMPv0 0.36.12 for 7.3.1-R2022-08 (#662 )

chore(Jenkins): Update DQ libs to 8.0.22 (#661 )
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-07-28 13:05:07 +08:00 · 2022-07-28 12:25:17 +08:00 · 2022-07-28 10:34:52 +08:00 · 2022-07-23 23:16:14 +08:00 · 2022-07-22 14:42:42 +08:00 · 2022-06-30 19:47:00 +08:00
13 changed files with 787 additions and 756 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-PATCH2</version>
+		<version>7.3.1-PATCH</version>
 	</parent>

 	<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>
@@ -127,7 +128,7 @@
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-databind</artifactId>
-            <version>${fasterxml.jackson.version}</version>
+            <version>${fasterxml.jackson.databind.version}</version>
        </dependency>
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
@@ -137,12 +138,17 @@
 		<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>
            <artifactId>commons-configuration2</artifactId>
-            <version>2.0</version>
+            <version>2.8.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>1.9</version>
        </dependency>
        <dependency>
            <groupId>org.apache.httpcomponents</groupId>
@@ -157,12 +163,12 @@
 		<dependency>
 			<groupId>org.codehaus.jackson</groupId>
 			<artifactId>jackson-core-asl</artifactId>
-			<version>1.9.14-TALEND</version>
+			<version>1.9.16-TALEND</version>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.jackson</groupId>
 			<artifactId>jackson-mapper-asl</artifactId>
-			<version>1.9.14-TALEND</version>
+			<version>1.9.16-TALEND</version>
 		</dependency>

 		<!-- Avro with minimum depdencies -->
@@ -312,7 +318,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,18 +335,14 @@
 		<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>
 			<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>
@@ -369,7 +371,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 +383,33 @@
 			<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>
 	</dependencies>

 </project>
--- a/build/dependencies.p2/pom.xml
+++ b/build/dependencies.p2/pom.xml
@@ -1,168 +1,172 @@
-<?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.repo</groupId>
-    <artifactId>dependencies.p2</artifactId>
-    <version>7.3.1-PATCH2</version>
-    <packaging>pom</packaging>
-    <properties>
-        <talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
-        <components.version>0.28.4</components.version>
-        <dataquality.lib.version>8.0.1</dataquality.lib.version>
-        <fasterxml.jackson.version>2.10.1</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>
-        <snapshotRepository>
-            <id>talend_nexus_deployment</id>
-            <url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
-            <snapshots><enabled>true</enabled></snapshots>
-            <releases><enabled>false</enabled></releases>
-        </snapshotRepository>
-        <repository>
-            <id>talend_nexus_deployment</id>
-            <url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceRelease/</url>
-            <snapshots><enabled>false</enabled></snapshots>
-            <releases><enabled>true</enabled></releases>
-        </repository>
-    </distributionManagement>
-
-    <repositories>
-        <repository>
-            <id>talend_open</id>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
-        </repository>
-        <repository>
-            <id>talend_open_snapshots</id>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
-        </repository>
-    </repositories>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.10</version>
-                <executions>
-                    <execution>
-                        <id>copy-dependencies</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/p2/plugins</outputDirectory>
-                            <excludeTransitive>true</excludeTransitive>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.8</version>
-                <executions>
-                    <execution>
-                        <id>zip-p2-repo</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <zip destfile="${project.build.directory}/${project.artifactId}.zip">
-                                    <fileset dir="${project.build.directory}/output">
-                                        <include name="**/*" />    
-                                    </fileset>
-                                </zip>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.groovy.maven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>choose-target-repository</id>
-                        <phase>initialize</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <source>
-                            if (project.version.endsWith("-SNAPSHOT")){
-                              project.properties.targetrepository = project.distributionManagement.snapshotRepository.url;
-                            }
-                            else {
-                              project.properties.targetrepository = project.distributionManagement.repository.url;
-                            }
-                            </source>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.8.2</version>
-                <executions>
-                    <execution>
-                        <id>deploy_p2_zip</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>deploy-file</goal>
-                        </goals>
-                        <configuration>
-                            <packaging>zip</packaging>
-                            <generatePom>true</generatePom>
-                            <url>${targetrepository}</url>
-                            <repositoryId>talend_nexus_deployment</repositoryId>
-                            <artifactId>${project.artifactId}</artifactId>
-                            <groupId>org.talend.repo</groupId>
-                            <version>${project.version}</version>
-                            <file>${project.build.directory}/${project.artifactId}.zip</file>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.eclipse.tycho.extras</groupId>
-                <artifactId>tycho-p2-extras-plugin</artifactId>
-                <version>0.22.0</version>
-                <executions>
-                    <execution>
-                        <id>create-p2-repository</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>publish-features-and-bundles</goal>
-                        </goals>
-                        <configuration>
-                            <metadataRepositoryLocation>${project.build.directory}/output</metadataRepositoryLocation>
-                            <artifactRepositoryLocation>${project.build.directory}/output</artifactRepositoryLocation>
-                            <sourceLocation>${project.build.directory}/p2</sourceLocation>
-                            <compress>true</compress>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<?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>
+    <packaging>pom</packaging>
+    <properties>
+        <talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
+        <dataquality.lib.version>8.0.22</dataquality.lib.version>
+        <fasterxml.jackson.version>2.13.2</fasterxml.jackson.version>
+        <fasterxml.jackson.databind.version>2.13.2.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>
+    </properties>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>talend_nexus_deployment</id>
+            <url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+            <snapshots><enabled>true</enabled></snapshots>
+            <releases><enabled>false</enabled></releases>
+        </snapshotRepository>
+        <repository>
+            <id>talend_nexus_deployment</id>
+            <url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceRelease/</url>
+            <snapshots><enabled>false</enabled></snapshots>
+            <releases><enabled>true</enabled></releases>
+        </repository>
+    </distributionManagement>
+
+    <repositories>
+        <repository>
+            <id>talend_open</id>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
+        </repository>
+        <repository>
+            <id>talend_open_snapshots</id>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+        </repository>
+    </repositories>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.10</version>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/p2/plugins</outputDirectory>
+                            <excludeTransitive>true</excludeTransitive>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.8</version>
+                <executions>
+                    <execution>
+                        <id>zip-p2-repo</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <zip destfile="${project.build.directory}/${project.artifactId}.zip">
+                                    <fileset dir="${project.build.directory}/output">
+                                        <include name="**/*" />    
+                                    </fileset>
+                                </zip>
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.groovy.maven</groupId>
+                <artifactId>gmaven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>choose-target-repository</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <source>
+                            if (project.version.endsWith("-SNAPSHOT")){
+                              project.properties.targetrepository = project.distributionManagement.snapshotRepository.url;
+                            }
+                            else {
+                              project.properties.targetrepository = project.distributionManagement.repository.url;
+                            }
+                            </source>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8.2</version>
+                <executions>
+                    <execution>
+                        <id>deploy_p2_zip</id>
+                        <phase>deploy</phase>
+                        <goals>
+                            <goal>deploy-file</goal>
+                        </goals>
+                        <configuration>
+                            <packaging>zip</packaging>
+                            <generatePom>true</generatePom>
+                            <url>${targetrepository}</url>
+                            <repositoryId>talend_nexus_deployment</repositoryId>
+                            <artifactId>${project.artifactId}</artifactId>
+                            <groupId>org.talend.repo</groupId>
+                            <version>${project.version}</version>
+                            <file>${project.build.directory}/${project.artifactId}.zip</file>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.eclipse.tycho.extras</groupId>
+                <artifactId>tycho-p2-extras-plugin</artifactId>
+                <version>0.22.0</version>
+                <executions>
+                    <execution>
+                        <id>create-p2-repository</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>publish-features-and-bundles</goal>
+                        </goals>
+                        <configuration>
+                            <metadataRepositoryLocation>${project.build.directory}/output</metadataRepositoryLocation>
+                            <artifactRepositoryLocation>${project.build.directory}/output</artifactRepositoryLocation>
+                            <sourceLocation>${project.build.directory}/p2</sourceLocation>
+                            <compress>true</compress>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
--- 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</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</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</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.27.12,org.talend.components:cosmosDB:1.27.12
--- 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</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</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</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</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</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}">
@@ -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/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>7.3.1</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
jzhao	5edb59118e	chore(TDI-48275):Bump TCOMPv0 0.36.12 for 7.3.1-R2022-08 (#662 )	2022-07-28 13:05:07 +08:00
build-talend-tdq	3b8944b8b2	chore(Jenkins): Update DQ libs to 8.0.22 (#661 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2022-07-28 12:25:17 +08:00
jiezhang-tlnd	37c2ffd4a0	chore(TUP-36127)Upgrade commons-configuration to 2.8.0 (#652 ) * chore(TUP-36127)Upgrade commons-configuration to 2.8.0 * remove commons-configuration-1.10 * add commons-text-1.9 to p2 * add org.talend.mdm.common bundle * change version * change version * change version * add org.talend.mdm.commmon to p2 * remove p2 dependency to tis * test * test	2022-07-28 10:34:52 +08:00
pyzhou	4d60520020	fix(TDI-48274) Upgrade tck in studio 7.3 (#659 )	2022-07-23 23:16:14 +08:00
jzhao	e22b65ab12	chore(TDI-48275):Bump TCOMPv0 0.36.11 for 7.3.1-R2022-08 (#658 )	2022-07-22 14:42:42 +08:00
pyzhou	448a58976d	fix(TDI-48189) Upgrade tck in studio 7.3 (#640 )	2022-06-30 19:47:00 +08:00
jzhao	6091c0b7f5	fix(TDI-48188):correct TCOMPv0 0.36.10 for 7.3.1-R2022-07 (#639 )	2022-06-30 18:11:52 +08:00
jzhao	3cacfad64a	chore(TDI-48188):Bump TCOMPv0 0.36.10 for 7.3.1-R2022-07 (#638 )	2022-06-30 17:40:52 +08:00
pyzhou	b95ac98de7	fix(TDI-48051): Upgrade tck 1.27.10 for 7.3 (#631 )	2022-05-31 14:41:59 +08:00
jzhao	b46733e5db	chore(TDI-48050):Bump TCOMPv0 0.36.9 for 7.3.1-R2022-06 (#630 )	2022-05-31 09:18:57 +08:00
pyzhou	76d5a4ee43	fix(TDI-47907):Bump up connector 1.27.9 (#618 )	2022-04-29 20:13:49 +08:00
jzhao	97f75d933a	chore(TDI-47906):Bump TCOMPv0 0.36.8 for 7.3.1-R2022-05 (#617 )	2022-04-29 15:44:33 +08:00
build-talend-tdq	c3aef7505b	chore(Jenkins): Update DQ libs to 8.0.21 (#615 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2022-04-29 11:33:02 +08:00
hzhao-talendbj	9fcfddf6ee	chore(TUP-35039):CVE: com.fasterxml.jackson (#613 ) * chore(TUP-35039):CVE: com.fasterxml.jackson * chore(TUP-35039):CVE: com.fasterxml.jackson	2022-04-26 09:38:44 +08:00
jiezhang-tlnd	d5e4b03c38	fix(TUP-35153)add org.apache.log4j (#600 ) * fix(TUP-35153)add org.apache.log4j * change to 1.2.19-TALEND * change the version to 1.2.19-TALEND * change version * change version * remove ORBIT * 1.2.19-TALEND * change to org.apache * add classfier * change version * rename verison * remove bundle * rename group id	2022-04-07 10:44:18 +08:00
wang wei	1bc9fe5469	fix(TDI-47751): upgrade tcompv0 and tck connectors for studio 73 (#597 )	2022-03-30 22:31:56 +08:00
jiezhang-tlnd	abdbdf2102	fix(TUP-34954): setup reload4j in p2 (#591 )	2022-03-30 17:33:28 +08:00
build-talend-tdq	b95b65b43b	chore(Jenkins): Update DQ libs to 8.0.20 (#574 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2022-02-24 12:16:11 +08:00
clesaec	2753570d48	bump copmponents to 0.36.6 (#573 )	2022-02-22 15:04:09 +01:00
pyzhou	14cf877362	fix(TDI-47445) Upgrade tck in studio 7.3 (#566 )	2022-01-27 16:29:07 +08:00
jzhao	099b42b62d	chore(TDI-47443):bump Version TCOMPV0 to 0.36.5 (#565 )	2022-01-26 14:17:06 +08:00
build-talend-tdq	d49a0a5e8f	chore(Jenkins): Update DQ libs to 8.0.19 (#549 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2022-01-02 16:49:27 +08:00
jzhao	a340385238	chore(TDI-47317):bump Version TCOMPV0 to 0.36.4 (#547 )	2021-12-31 18:03:44 +08:00
jiezhang-tlnd	b5f03c02d6	chore(TUP-34027)CVE jackson-mapper(core)-asl-1.9.15-TALEND (#529 )	2021-12-29 16:46:12 +08:00
jzhao	e663fd9939	chore(TDI-47298): bump tck connectors to 1.27.6 (#545 )	2021-12-29 11:55:50 +08:00
clesaec	7b85ce307e	Bump components version (#544 )	2021-12-29 11:33:11 +08:00
jzhao	513644e06f	chore(TDI-47298): bump tck connectors to 1.27.5 (#543 )	2021-12-28 10:17:02 +08:00
build-talend-tdq	95a3158b5b	chore(Jenkins): Update DQ libs to 8.0.18 (#538 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2021-12-15 15:38:10 +08:00
build-talend-tdq	1bff678e23	chore(Jenkins): Update DQ libs to 8.0.17 (#517 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2021-11-25 14:04:48 +08:00
jzhao	d36481b7cf	chore: bump tck connectors to 1.27.3 (#514 )	2021-11-23 09:34:04 +08:00
clesaec	f9be93c1c2	Update pom.xml (#513 )	2021-11-22 17:56:23 +01:00
jzhao	a6e0d474fc	Revert "chore(maintenance/7.3): bump tcompv0 to 0.36.1 (#507 )" (#512 ) This reverts commit `3e463ad9d6`.	2021-11-22 09:26:17 +08:00
Emmanuel GALLOIS	3e463ad9d6	chore(maintenance/7.3): bump tcompv0 to 0.36.1 (#507 )	2021-11-18 19:39:52 +01:00
pyzhou	8227fa30ad	fix(TDI-46994) Upgrade tck in studio 7.3 (#501 )	2021-11-08 11:08:40 +08:00
build-talend-tdq	d83af2f66b	chore(Jenkins): Update DQ libs to 8.0.16 (#489 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2021-10-14 15:23:40 +08:00
ypiel	6cf4f6a3fe	chore: bump TCOMP components version to 0.36.0 (#486 )	2021-10-13 10:53:28 +02:00
Oleksandr Zhelezniak	593c7b38d4	chore: bump connectors 1.26.0 (#481 )	2021-10-08 15:24:16 +03:00
build-talend-tdq	d4b582b5fd	chore(Jenkins): Update DQ libs to 8.0.15 (#471 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2021-09-16 12:00:51 +08:00
Oleksandr Zhelezniak	e11d543555	chore(TDI-46716): bump connectors 1.25.0 (#469 )	2021-09-13 10:32:04 +03:00
vyu-talend	71d2b60c12	chore(TDI-46713):bump 0.35.0 (#467 )	2021-09-10 17:46:11 +08:00
build-talend-tdq	682b529fd4	chore(Jenkins): Update DQ libs to 8.0.14 (#456 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2021-08-12 17:51:21 +08:00
Oleksandr Zhelezniak	8211db3e00	chore(TDI_46537): bump connectors 1.24.0 (#452 )	2021-08-05 23:03:37 +03:00
pyzhou	14ffc7709d	chore: bump Components version to 0.34.0 (#450 )	2021-08-05 18:39:47 +08:00
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
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