Test Java 11

chore(TDI-46267): bump connectors to 1.23.0-SNAPSHOT (#420 )
Co-authored-by: Dmytro Chmyga <dmytro.chmyga@globallogic.com>
2021-06-15 17:28:11 +02:00 · 2021-06-09 14:13:55 +03:00 · 2021-06-09 11:13:01 +08:00 · 2021-05-10 18:14:07 +08:00 · 2021-05-08 17:09:37 +08:00 · 2021-05-08 17:03:14 +08:00
19 changed files with 663 additions and 619 deletions
--- a/build/dependencies.p2/dependencies.p2.tos/pom.xml
+++ b/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.4.1-SNAPSHOT</version>
 	</parent>

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

    <repositories>
        <repository>
@@ -118,7 +117,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,7 +127,7 @@
        <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>
@@ -138,17 +137,12 @@
 		<dependency>
            <groupId>commons-beanutils</groupId>
            <artifactId>commons-beanutils</artifactId>
-            <version>1.9.4-talend</version>
+            <version>1.9.4</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>
+            <version>2.0</version>
        </dependency>
        <dependency>
            <groupId>org.apache.httpcomponents</groupId>
@@ -163,12 +157,12 @@
 		<dependency>
 			<groupId>org.codehaus.jackson</groupId>
 			<artifactId>jackson-core-asl</artifactId>
-			<version>1.9.16-TALEND</version>
+			<version>1.9.15-TALEND</version>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.jackson</groupId>
 			<artifactId>jackson-mapper-asl</artifactId>
-			<version>1.9.16-TALEND</version>
+			<version>1.9.15-TALEND</version>
 		</dependency>

 		<!-- Avro with minimum depdencies -->
@@ -318,7 +312,7 @@
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.14-talend</version>
+			<version>1.14</version>
 		</dependency>
 		<!-- to avoid updatin the complete eclipse target platform we add these
 			single dependencies -->
@@ -335,14 +329,18 @@
 		<dependency>
 			<groupId>commons-beanutils</groupId>
 			<artifactId>commons-beanutils</artifactId>
-			<version>1.9.4-talend</version>
+			<version>1.9.4</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>
@@ -383,38 +381,24 @@
 			<artifactId>woodstox-core</artifactId>
 			<version>5.3.0</version>
 		</dependency>
-		 <dependency>
+        <dependency>
+            <groupId>org.talend.studio</groupId>
+            <artifactId>studio-utils</artifactId>
+            <version>${studio-utils.version}</version>
+            <classifier>bundle</classifier>
+        </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>
-		</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,10 +1,10 @@
 <?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>
+    <parent>
        <groupId>org.talend.studio</groupId>
        <artifactId>parent-pom</artifactId>
-	<version>7.3.1-PATCH</version>
+        <version>7.4.1-SNAPSHOT</version>
        <relativePath>../../talend.studio.parent.pom</relativePath>
    </parent>
    <groupId>org.talend.repo</groupId>
@@ -12,9 +12,8 @@
    <packaging>pom</packaging>
    <properties>
        <talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
-        <dataquality.lib.version>8.0.25</dataquality.lib.version>
-        <fasterxml.jackson.version>2.13.4</fasterxml.jackson.version>
-        <fasterxml.jackson.databind.version>2.13.4.2</fasterxml.jackson.databind.version>
+        <dataquality.lib.version>8.3.2-SNAPSHOT</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/pom.xml
+++ b/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.4.1-SNAPSHOT</version>
 		<relativePath />
 	</parent>

--- a/build/talend.studio.tos.all.p2.product/pom.xml
+++ b/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.4.1-SNAPSHOT</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.all.p2.product/talend.product
+++ b/build/talend.studio.tos.all.p2.product/talend.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>

-<product name="Talend Open Studio" uid="org.talend.studio.tos.all.p2.product" id="org.talend.rcp.branding.tos.all.p2.product" application="org.talend.rcp.branding.tos.application" useFeatures="true" includeLaunchers="false">
+<product name="Talend Open Studio" uid="org.talend.studio.tos.all.p2.product" id="org.talend.rcp.branding.tos.all.p2.product" application="org.talend.rcp.branding.tos.application" useFeatures="true" includeLaunchers="false" version="7.4.1.qualifier">

   <configIni use="default">
      <linux>config.ini</linux>
@@ -43,7 +43,6 @@
      <feature id="org.talend.jdt.feature"/>
      <feature id="org.talend.libraries.jdbc.feature"/>
      <feature id="org.talend.m2e.feature"/>
-      <feature id="org.talend.model.migration.feature"/>
      <feature id="org.talend.platform.feature"/>
      <feature id="org.talend.rcp.feature"/>
      <feature id="org.talend.repository.feature"/>
--- 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.27.15,org.talend.components:cosmosDB:1.27.15
+component.java.coordinates = org.talend.components:couchbase:1.23.0-SNAPSHOT,org.talend.components:cosmosDB:1.23.0-SNAPSHOT
--- a/build/talend.studio.tos.bd.product/pom.xml
+++ b/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.4.1-SNAPSHOT</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.bd.product/talend.product
+++ b/build/talend.studio.tos.bd.product/talend.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>

-<product uid="org.talend.studio.tos.bigdata.product" id="org.talend.rcp.branding.tos.bigdata.product" useFeatures="true" includeLaunchers="false">
+<product uid="org.talend.studio.tos.bigdata.product" id="org.talend.rcp.branding.tos.bigdata.product" useFeatures="true" includeLaunchers="false" version="7.4.1.qualifier">

   <configIni use="default">
      <linux>config.ini</linux>
@@ -16,7 +16,7 @@
   </features>

   <configurations>
-      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+      <plugin id="org.apache.felix.scr" autoStart="true" version="2.0.14.v20180822-1822" startLevel="2" />
      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
--- a/build/talend.studio.tos.di.product/pom.xml
+++ b/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.4.1-SNAPSHOT</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.di.product/talend.product
+++ b/build/talend.studio.tos.di.product/talend.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>

-<product uid="org.talend.studio.tos.di.product" id="org.talend.rcp.branding.tos.product" useFeatures="true" includeLaunchers="false">
+<product uid="org.talend.studio.tos.di.product" id="org.talend.rcp.branding.tos.product" useFeatures="true" includeLaunchers="false" version="7.4.1.qualifier">

   <configIni use="default">
      <linux>config.ini</linux>
@@ -18,7 +18,7 @@
   </features>

   <configurations>
-      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" version="2.0.14.v20180822-1822" />
      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
--- a/build/talend.studio.tos.dq.product/pom.xml
+++ b/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.4.1-SNAPSHOT</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.dq.product/product.properties
+++ b/build/talend.studio.tos.dq.product/product.properties
@@ -1,8 +1,8 @@
 launcher.prefix=TOS_DQ
 storage.prefix=${launcher.prefix}
-product.name=Talend Open Profiler
+product.name=Talend Open Studio for Data Quality
 product.branding.platform=org.talend.rcp.branding.top
 product.branding.id=${product.branding.platform}.product
 mac.launcher.info=${product.name} for Mac OS X, Copyright Talend. 2006-2015. All rights reserved.
 product.website=http://www.talend.com\n
-storage.dir=top
+storage.dir=top
--- a/build/talend.studio.tos.dq.product/talend.product
+++ b/build/talend.studio.tos.dq.product/talend.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>

-<product uid="org.talend.studio.tos.dq.product" id="org.talend.rcp.branding.top.product" useFeatures="true" includeLaunchers="false">
+<product uid="org.talend.studio.tos.dq.product" id="org.talend.rcp.branding.top.product" useFeatures="true" includeLaunchers="false" version="7.4.1.qualifier">

   <configIni use="default">
      <linux>config.ini</linux>
@@ -16,14 +16,13 @@
   </features>

   <configurations>
-      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" version="2.0.14.v20180822-1822" />
      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="0" />
      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
      <plugin id="org.ops4j.pax.url.mvn" autoStart="true" startLevel="0" />
-      <plugin id="org.talend.components.api.service.osgi" autoStart="true" startLevel="0" />
      <plugin id="org.talend.maven.resolver" autoStart="true" startLevel="0" />
   </configurations>

--- a/build/talend.studio.tos.esb.product/pom.xml
+++ b/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.4.1-SNAPSHOT</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.esb.product/product.properties
+++ b/build/talend.studio.tos.esb.product/product.properties
@@ -1,8 +1,8 @@
 launcher.prefix=TOS_ESB
 storage.prefix=TOS_ESB-Studio
-product.name=Talend Open Studio
+product.name=Talend Open Studio for ESB
 product.branding.platform=org.talend.rcp.branding.esbstandard
 product.branding.id=${product.branding.platform}.product
 mac.launcher.info=${product.name} for Mac OS X, Copyright Talend. 2006-2015. All rights reserved.
 product.website=http://www.talend.com\n
-storage.dir=esb
+storage.dir=esb
--- a/build/talend.studio.tos.esb.product/talend.product
+++ b/build/talend.studio.tos.esb.product/talend.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>

-<product uid="org.talend.studio.tos.esb.product" id="org.talend.rcp.branding.esbstandard.product" useFeatures="true" includeLaunchers="false">
+<product uid="org.talend.studio.tos.esb.product" id="org.talend.rcp.branding.esbstandard.product" useFeatures="true" includeLaunchers="false" version="7.4.1.qualifier">

   <configIni use="default">
      <linux>config.ini</linux>
@@ -16,7 +16,7 @@
   </features>

   <configurations>
-      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" version="2.0.14.v20180822-1822" />
      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
--- 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-PATCH</version>
+        <version>7.4.1-SNAPSHOT</version>
        <relativePath />
    </parent>

@@ -33,11 +33,35 @@
            <url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
        </repository>
    </repositories>
-
+    <pluginRepositories>
+        <pluginRepository>
+            <id>releases</id>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceRelease/</url>
+        </pluginRepository>
+        <pluginRepository>
+            <id>snapshots</id>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+        </pluginRepository>
+    </pluginRepositories>
    <properties>
        <talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
        <product.final.name>${storage.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
        <studio.dir>${project.build.directory}/products/${project.artifactId}/${osgi.os}/${osgi.ws}/${osgi.arch}</studio.dir>
+        <bom.out.dir>${project.build.directory}/products/${project.artifactId}-bom</bom.out.dir>
+        <bom.final.name.prefix>${storage.prefix}-${product.timestamp}-V${product.version}-${revision.filename}</bom.final.name.prefix>
+        <bom.final.name>${bom.final.name.prefix}-bom.xlsx</bom.final.name>
    </properties>

    <build>
@@ -110,7 +134,7 @@
                                <artifactItem>
                                    <groupId>${project.groupId}</groupId>
                                    <artifactId>eclipse-launcher-binaries</artifactId>
-                                    <version>4.4.1e</version>
+                                    <version>7.4.1</version>
                                    <type>zip</type>
                                    <overWrite>true</overWrite>
                                    <outputDirectory>${studio.dir}</outputDirectory>
@@ -118,7 +142,7 @@
                                <artifactItem>
                                    <groupId>${project.groupId}</groupId>
                                    <artifactId>eclipse-launcher-mac-${launcher.prefix}</artifactId>
-                                    <version>7.3.1</version>
+                                    <version>7.4.1</version>
                                    <type>zip</type>
                                    <overWrite>true</overWrite>
                                    <outputDirectory>${studio.dir}</outputDirectory>
@@ -206,6 +230,24 @@
                    </execution>
                </executions>
            </plugin>
+            <plugin>
+                <groupId>org.talend.studio</groupId>
+                <artifactId>bomtool</artifactId>
+                <version>1.0.0-SNAPSHOT</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>genNotice</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <studioDirectory>${studio.dir}</studioDirectory>
+                    <outputDirectory>${bom.out.dir}</outputDirectory>
+                    <productVersion>${product.version}</productVersion>
+                </configuration>
+            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-resources-plugin</artifactId>
@@ -290,13 +332,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}">
@@ -423,7 +463,7 @@
                        <version>${tycho.version}</version>
                        <configuration>
                            <strictBinIncludes>false</strictBinIncludes>
-                            <format>yyyyMMdd'_'HHmm'${release.suffix}'</format>
+                            <format>yyyyMMdd'_'HHmm</format>
                            <archive>
                                <addMavenDescriptor>false</addMavenDescriptor>
                                <!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
@@ -447,7 +487,7 @@
                        <version>${tycho.version}</version>
                        <configuration>
                            <strictBinIncludes>false</strictBinIncludes>
-                            <format>'${product.timestamp}${release.suffix}'</format>
+                            <format>yyyyMMdd'_'HHmm</format>
                            <archive>
                                <addMavenDescriptor>false</addMavenDescriptor>
                                <!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
@@ -499,13 +539,30 @@
                                        <mkdir dir="${product.dir}" />
                                        <echo>Moving product ZIP ${project.build.directory}/products/${product.final.name}.zip to ${product.dir}</echo>
                                        <move todir="${product.dir}" file="${project.build.directory}/products/${product.final.name}.zip" />
+
+                                        <!-- Copy bom -->
+                                        <property name="bom.build.path" value="${product.build.id}/BOMS" />
+                                        <property name="bom.dir" value="${storage}/${bom.build.path}" />
+                                        <mkdir dir="${bom.dir}" />
+                                        <echo>Copying ${bom.out.dir}/BOM.xlsx to ${bom.dir}/${bom.final.name}</echo>
+                                        <copy tofile="${bom.dir}/${bom.final.name}" file="${bom.out.dir}/BOM.xlsx" />
+                                        <echo>Copying ${bom.out.dir}/jarlist.json to ${bom.dir}/${bom.final.name.prefix}-jarlist.json</echo>
+                                        <copy tofile="${bom.dir}/${bom.final.name.prefix}-jarlist.json" file="${bom.out.dir}/jarlist.json" />
+                                        <echo>Copying ${bom.out.dir}/NOTICE.txt to ${bom.dir}/${bom.final.name.prefix}-NOTICE.txt</echo>
+                                        <copy tofile="${bom.dir}/${bom.final.name.prefix}-NOTICE.txt" file="${bom.out.dir}/NOTICE.txt" />
+                                        <echo>Copying ${bom.out.dir}/report.txt to ${bom.dir}/${bom.final.name.prefix}-report.txt</echo>
+                                        <copy tofile="${bom.dir}/${bom.final.name.prefix}-report.txt" file="${bom.out.dir}/report.txt" />
                                        <if>
                                            <and>
-                                                <equals arg1="${env.HUDSON_URL}" arg2="http://newbuild.talend.com:8180/" />
+                                                <equals arg1="${env.HUDSON_URL}" arg2="https://ci-newbuild.talend.com/" />
                                                <equals arg1="${automaticnb}" arg2="1" />
                                            </and>
                                            <then>
                                                <echo file="${storage}/lastnb.txt" append="true">http://newbuild.talend.com/builds/${product.build.path}/${product.final.name}.zip${line.separator}</echo>
+                                                <echo file="${storage}/lastnb.txt" append="true">http://newbuild.talend.com/builds/${bom.build.path}/${bom.final.name}${line.separator}</echo>
+                                                <echo file="${storage}/lastnb.txt" append="true">http://newbuild.talend.com/builds/${bom.build.path}/${bom.final.name.prefix}-jarlist.json${line.separator}</echo>
+                                                <echo file="${storage}/lastnb.txt" append="true">http://newbuild.talend.com/builds/${bom.build.path}/${bom.final.name.prefix}-NOTICE.txt${line.separator}</echo>
+                                                <echo file="${storage}/lastnb.txt" append="true">http://newbuild.talend.com/builds/${bom.build.path}/${bom.final.name.prefix}-report.txt${line.separator}</echo>
                                            </then>
                                        </if>
                                        <exec executable="openssl" dir="${product.dir}" outputproperty="sha256">
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>7.3.1-PATCH</version>
+		<version>7.4.1-SNAPSHOT</version>
 		<relativePath />
 	</parent>

--- a/talend.studio.parent.pom/pom.xml
+++ b/talend.studio.parent.pom/pom.xml
Author	SHA1	Message	Date
Irene Wang	34a2d1725e	Test Java 11	2021-06-15 17:28:11 +02:00
chmyga	848c8c958d	chore(TDI-46267): bump connectors to 1.23.0-SNAPSHOT (#420 ) Co-authored-by: Dmytro Chmyga <dmytro.chmyga@globallogic.com>	2021-06-09 14:13:55 +03:00
pyzhou	17f5d98efa	fix(TDI-46260): bump tcompv0 connectors to 0.33.0-SNAPSHOT (#418 )	2021-06-09 11:13:01 +08:00
hzhao-talendbj	53ee776d01	chore(TUP-30255): upgrade studio-util version (#404 )	2021-05-10 18:14:07 +08:00
mbasiuk-talend	40762313c2	chore(TDI-46032): bump connectors version to 1.22.0-SNAPSHOT (#407 )	2021-05-08 17:09:37 +08:00
jzhao	eba2b2d52b	fix(TDI-46033): bump tcompv0 connectors to 0.32.0-SNAPSHOT (#410 )	2021-05-08 17:03:14 +08:00
jiezhang-tlnd	5e4c564fa6	fix(TUP-30960)CVE: jackson-mapper-1.9.14.TALEND (#402 ) * fix(TUP-30960)CVE: jackson-mapper-1.9.14.TALEND * plan deploy p2 * test p2 * test p2 * test p2 * test p2 * test p2 * test p2 * test p2 * change back temp p2	2021-05-06 11:47:29 +08:00
jiezhang-tlnd	fb547ac3f8	chore(TUP-30992)CVE: junit-4.11,4.13 (#392 ) * chore(TUP-30992)CVE: junit-4.11,4.13 * remove classifier bundle * Update pom.xml * switch the place of eclipse_orbit	2021-04-15 16:15:22 +08:00
mbasiuk-talend	87e2aebfd2	chore(TDI-45894): prepare the next connectors iteration (#394 )	2021-04-13 13:35:02 +03:00
wang wei	ea24fc1bc5	fix(TDI-45896): upgrade tcompv0 connectors for studio (#396 )	2021-04-12 10:10:43 +08:00
Chao MENG	dfb55aa4fe	feat(TUP-30475): Test of lite studio (#391 )	2021-04-08 14:24:58 +08:00
bhe-talendbj	f282b61182	bugfix(TUP-26813): upgrade org.bouncycastle.bcprov to 1.68 (#387 ) * 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 org.bouncycastle.bcprov-jdk15on to 1.68 * fix(TUP-26813): deploy org.bouncycastle 1.68 * fix(TUP-26813): deploy org.bouncycastle 1.68 * fix(TUP-26813): update studio-utils	2021-04-02 18:19:22 +08:00
wang wei	0f1379f4ff	fix(TDI-45748): use 0.30.1snapshot tcompv0 for studio master branch (#384 )	2021-03-24 18:00:14 +08:00
Dmytro Sylaiev	b9f723571b	feat(TDI-45721): Bump TCK for master (#381 )	2021-03-05 14:03:23 +02:00
bhe-talendbj	460242307e	chore(TUP-29719): upgrade jackson to 2.11.4 (#367 ) * fix(TUP-29719): upgrade jackson to 2.11.0 * chore(TUP-29719): upgrade to 2.11.4 Co-authored-by: hzhao-talendbj <hzhao@talend.com>	2021-03-03 18:24:10 +08:00
pyzhou	0eb0a011ca	fix(TDI-45607) Upgrade tck in studio (#370 )	2021-02-07 10:25:08 +08:00
hzhao-talendbj	b80820929b	chore(TUP-29869): upgrade bcprov-jdk15on to 1.68 (#364 )	2021-02-03 16:11:22 +08:00
hzhao-talendbj	4daf03253e	Revert "fix(TUP-29719): upgrade jackson to 2.11.0 (#351 )" (#366 ) This reverts commit `2ff6394bc9`.	2021-01-27 11:55:16 +08:00
hzhao-talendbj	2ff6394bc9	fix(TUP-29719): upgrade jackson to 2.11.0 (#351 )	2021-01-26 18:02:00 +08:00
wang wei	433a183c2f	bump tcompv0 to 0.30.0snapshot for master (#362 )	2021-01-19 11:29:15 +08:00
Dmytro Sylaiev	c4306a2dd9	fix(TDI-45470): Bump TCK version in config.ini (#358 )	2021-01-14 14:53:09 +02:00
nrousseau	ef8d349dcf	Update orbit following change of eclipse (#343 )	2020-12-17 10:36:03 +08:00
bhe-talendbj	84442eac3c	chore(TUP-21116): update osgi qualifier format (#342 )	2020-12-16 19:02:01 +08:00
nrousseau	3836961cd3	chore(TUP-21116) upgrade tycho version to 1.7.0 (#298 ) * chore(TUP-21116) upgrade tycho version to 1.7.0 * chore(TUP-21116) upgrade tycho version to 1.7.0 * chore(TUP-21116) upgrade tycho version to 1.7.0 * update pom * update pom * chore(TUP-21116): upgrade tycho * chore(TUP-21116): upgrade tycho * chore(TUP-21116): add version to talend.product * chore(TUP-21116): reset qualifer format for snapshot build * chore(TUP-21116): add compilation flag Co-authored-by: bhe-talendbj <bhe@talend.com>	2020-12-15 15:31:47 +08:00
pyzhou	0f049a8c92	chore(TDI-45339): Bump TCK comp version (#341 )	2020-12-14 16:02:59 +08:00
iwangtalend	02bb1ecc7c	Update newbuild URL (#337 )	2020-12-10 10:02:19 +01:00
build-talend-tdq	952acaf430	chore(Jenkins): Update DQ libs to 8.3.2-SNAPSHOT (#333 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2020-11-24 20:26:29 +08:00
mbasiuk-talend	0410f8032d	chore(TDI-44770): update snakeyaml for master (#332 )	2020-11-23 11:34:07 +02:00
iwangtalend	517669f07c	Fix TOS DQ product name	2020-11-18 17:19:18 +01:00
iwangtalend	f29267c23e	Fix TOS ESB name	2020-11-18 17:17:30 +01:00
chmyga	57567c15ed	chore(TDI-45157): bump TCK components version (#329 ) Co-authored-by: Dmytro Chmyga <dmytro.chmyga@synapse.com>	2020-11-10 14:40:26 +02:00
Oleksandr Zhelezniak	294f6b5836	chore(TDI-44523): resolve cve issue (#326 ) * update daikon-ee [1.5.0] -> [3.2.0] for tSetDynamicSchema	2020-11-09 11:00:12 +02:00
wang wei	ffce1d5c4e	fix(TDI-44824): Observability: Update daikon-audit library version (#322 )	2020-09-18 15:07:38 +08:00
Oleksandr Zhelezniak	ba59819f49	chore(TDI-44671): bump tck components (#319 ) * bump version of TCK components [1.12.0-SNAPSHOT] -> [1.14.0-SNAPSHOT]	2020-09-11 12:53:38 +03:00
bhe-talendbj	8dad0f7c70	fix(TUP-27438): restore org.apache.commons.codec (#315 )	2020-09-08 15:26:27 +08:00
Oleksandr Zhelezniak	311822ac44	chore(TDI-44799): bump version of TCK components (#314 ) * bump version of TCK components from [1.11.0-SNAPSHOT] to [1.12.0-SNAPSHOT]	2020-09-03 12:26:18 +03:00
jzhao	416d854b2b	fix(TDI-44145):update common-codec for p2 (#311 )	2020-09-01 11:56:18 +08:00
bhe-talendbj	7a4af470a4	feat(TUP-27438): Add studio-utils to dependencies.p2.tos (#310 ) * feat(TUP-27438): Add studio-utils to dependencies.p2.tos * feat(TUP-27438): update groupId	2020-08-31 09:47:23 +08:00
jiezhang-tlnd	b83a21f72b	feat(TUP-28305)Update Talend logo for studio 7.4 launcher (#309 )	2020-08-25 16:00:29 +08:00
build-talend-tdq	0d3e289820	chore(Jenkins): Update DQ libs to 8.3.1-SNAPSHOT (#304 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2020-07-20 14:19:57 +08:00
build-talend-tdq	d5a3675f25	chore(Jenkins): Update DQ libs to 8.1.1-SNAPSHOT (#303 )	2020-07-19 09:22:51 +08:00
build-talend-tdq	81648c0cc8	chore(Jenkins): Update DQ libs to 8.3.1-SNAPSHOT (#302 )	2020-07-17 16:05:40 +08:00
build-talend-tdq	056fc2d811	chore(Jenkins): Update DQ libs to 8.3.0 (#301 )	2020-07-17 15:40:13 +08:00
hzhao-talendbj	429db0187b	TUP-27154 - Update BeanUtils to 1.9.4 (#269 ) (#297 ) Co-authored-by: Colm O hEigeartaigh <coheigea@users.noreply.github.com>	2020-07-14 12:14:40 +08:00
nrousseau	7474f094f2	Revert "TUP-27154 - Update BeanUtils to 1.9.4 (#269 )" (#295 ) This reverts commit `d8c10ea4a3`.	2020-07-13 18:11:27 +08:00
Colm O hEigeartaigh	d8c10ea4a3	TUP-27154 - Update BeanUtils to 1.9.4 (#269 )	2020-07-03 12:26:12 +08:00
pyzhou	79db3f9919	fix(TDI-44402):update tacokit version studio (#287 )	2020-06-19 11:50:07 +08:00
wang wei	9a81eaa34d	fix(TDI-44306): adjust the audit event log integration in studio (#282 )	2020-06-10 16:30:12 +08:00
bhe-talendbj	c7bfcae92b	bugfix(TUP-27224): Upgrade crypto-utils and daikon to 0.31.11 (#279 ) * fix(TUP-27224): Upgrade crypto-utils to 2.1.0 * fix(TUP-27224): Upgrade daikon version to 2.1.0 * fix(TUP-27224): Upgrade daikon version to 0.31.11	2020-05-26 19:56:32 +08:00
pyzhou	06e0945fa3	fix(TDI-44203):upgrade tacokit version to 1.10.0-SNAPSHOT for studio (#271 )	2020-05-15 09:38:04 +08:00
Roman	8637c51f88	fix(TDI-44125): Bump daikon-ee.format version (#270 )	2020-05-13 13:17:17 +03:00
bhe-talendbj	99dcdfb0db	feat(TUP-26303): Copy jarlist and notice,report to bom folder (#267 )	2020-04-14 10:58:44 +08:00
pyzhou	00780637ba	feat(TDI-43717):integrate cosmosDB into studio (#266 )	2020-04-14 10:04:01 +08:00
bhe-talendbj	d69a3c8a88	feat(TUP-26303): Integrate bom tool plugin (#261 ) * feat(TUP-26303): Integrate cve tool plugin * feat(TUP-26303): Add bom outputs * feat(TUP-26303): Correct artifact id * feat(TUP-26303): Copy bom only * feat(TUP-26303): Fix unintentional changes * feat(TUP-26303): Update directory of bom * feat(TUP-26303): Add pluginRepository for bomtool * feat(TUP-26303): Update echo message	2020-04-08 18:06:58 +08:00
Zhiwei Xue	d8f17f42f8	feat(TUP-26304):Have a root studio bom for SE/EE product (#251 )	2020-04-01 15:06:52 +08:00
build-talend-tdq	05c09ee985	chore(Jenkins): Update DQ libs to 8.1.1-SNAPSHOT (#254 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2020-03-14 22:17:06 +01:00
Roman	51b442c2b4	chore: bump tacokit version for studio (#253 )	2020-03-11 23:26:23 +08:00
mbasiuk-talend	9f9394fa0f	chore: bump components-version to 0.29.0-SNAPSHOT (#250 ) * chore: bump components-version to 0.29.0-SNAPSHOT	2020-03-04 18:22:49 +08:00
build-talend-tdq	cad210df20	chore(Jenkins): Update DQ libs to 8.0.1-SNAPSHOT (#248 )	2020-02-25 15:17:06 +01:00
Jenkins Continuous Build server	69dfab2bf6	Set version to 7.4.1 SNAPSHOT	2020-02-21 15:34:46 +01:00
Roman	878d4211db	chore: bump Components version to 0.28.2 (#245 )	2020-02-14 22:02:43 +08:00