chore:upgrade connector to 1.30.2 (#571 )

fix(TDI-47488): Upgrade tck to 1.30.1 (#570 )
chore:update connector to 1.30.0 (#568 )
2022-02-16 17:19:11 +08:00 · 2022-02-15 16:23:50 +08:00 · 2022-02-11 18:14:53 +08:00 · 2022-02-10 16:20:02 +01:00 · 2022-01-27 09:20:27 +01:00 · 2022-01-27 09:36:20 +08:00
18 changed files with 620 additions and 643 deletions
--- a/build/dependencies.p2/dependencies.p2.tos/pom.xml
+++ b/build/dependencies.p2/dependencies.p2.tos/pom.xml
@@ -112,7 +112,7 @@
 		<dependency>
 			<groupId>com.cedarsoftware</groupId>
 			<artifactId>json-io</artifactId>
-			<version>4.9.9-TALEND</version>
+			<version>4.13.0-TALEND</version>
 		</dependency>

        <dependency>
@@ -130,11 +130,6 @@
            <artifactId>commons-beanutils</artifactId>
            <version>1.9.4</version>
        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-configuration2</artifactId>
-            <version>2.0</version>
-        </dependency>
        <dependency>
            <groupId>org.apache.httpcomponents</groupId>
            <artifactId>httpclient</artifactId>
@@ -148,12 +143,12 @@
 		<dependency>
 			<groupId>org.codehaus.jackson</groupId>
 			<artifactId>jackson-core-asl</artifactId>
-			<version>1.9.15-TALEND</version>
+			<version>1.9.16-TALEND</version>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.jackson</groupId>
 			<artifactId>jackson-mapper-asl</artifactId>
-			<version>1.9.15-TALEND</version>
+			<version>1.9.16-TALEND</version>
 		</dependency>

 		<!-- Avro with minimum depdencies -->
@@ -305,7 +300,7 @@
 			<artifactId>commons-codec</artifactId>
 			<version>1.14</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>
@@ -356,7 +351,7 @@
        <dependency>
            <groupId>org.bouncycastle</groupId>
            <artifactId>bcprov</artifactId>
-            <version>1.68.0</version>
+            <version>1.69.0</version>
            <classifier>bundle</classifier>
        </dependency>
        <dependency>
--- a/build/dependencies.p2/pom.xml
+++ b/build/dependencies.p2/pom.xml
@@ -12,7 +12,7 @@
    <packaging>pom</packaging>
    <properties>
        <talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
-        <dataquality.lib.version>9.0.1-SNAPSHOT</dataquality.lib.version>
+        <dataquality.lib.version>9.0.5</dataquality.lib.version>
        <fasterxml.jackson.version>2.11.4</fasterxml.jackson.version>
    </properties>

--- a/build/talend.studio.tos.all.p2.product/pom.xml
+++ b/build/talend.studio.tos.all.p2.product/pom.xml
@@ -10,6 +10,7 @@

 	<artifactId>talend-tos-p2-repo</artifactId>
 	<packaging>eclipse-repository</packaging>
+	

 	<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" version="7.4.1.qualifier">
+<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" version="8.0.1.qualifier" useFeatures="true" includeLaunchers="false">

   <configIni use="default">
      <linux>config.ini</linux>
@@ -39,7 +39,6 @@
      <feature id="org.talend.hadoop.distribution.feature"/>
      <feature id="org.talend.help.feature"/>
      <feature id="org.talend.libraries.jdbc.feature"/>
-      <!--feature id="org.talend.platform.feature"/-->
      <feature id="org.talend.rcp.feature"/>
      <feature id="org.talend.repository.feature"/>
      <feature id="org.talend.repository.services.feature"/>
@@ -70,6 +69,7 @@
      <feature id="org.talend.studio.components.tcompv0.splunk.feature"/>
      <feature id="org.talend.studio.components.tcompv0.salesforce.feature"/>
      <feature id="org.talend.gmf.feature"/>
+      <feature id="org.talend.platform.feature"/>
   </features>


--- a/build/talend.studio.tos.bd.product/config.ini
+++ b/build/talend.studio.tos.bd.product/config.ini
@@ -5,7 +5,7 @@ talend.studio.version=${version.full}
 eclipse.product=${product.branding.id}
 #The following osgi.framework key is required for the p2 update feature not to override the osgi.bundles values.
 osgi.framework=file\:plugins/org.eclipse.osgi_3.16.300.v20210525-1715.jar
-osgi.bundles=org.eclipse.equinox.simpleconfigurator@1\:start,org.eclipse.compare.win32@4,org.eclipse.core.filesystem.linux.x86_64@4,org.eclipse.core.filesystem.macosx@4,org.eclipse.core.filesystem.win32.x86_64@4,org.eclipse.core.net.linux.x86_64@4,org.eclipse.core.net.win32.x86_64@4,org.eclipse.core.resources.win32.x86_64@4,org.eclipse.e4.ui.swt.gtk@4,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@4,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@4,org.eclipse.equinox.launcher.gtk.linux.x86_64@4,org.eclipse.equinox.launcher.win32.win32.x86_64@4,org.eclipse.equinox.security.linux.x86_64@4,org.eclipse.equinox.security.macosx@4,org.eclipse.equinox.security.win32.x86_64@4,org.eclipse.jdt.launching.macosx@4,org.eclipse.jdt.launching.ui.macosx@4,org.eclipse.swt.cocoa.macosx.x86_64@4,org.eclipse.swt.gtk.linux.x86_64@4,org.eclipse.swt.win32.win32.x86_64@4,org.eclipse.ui.cocoa@4,org.eclipse.ui.win32@4
+osgi.bundles=org.eclipse.equinox.simpleconfigurator@1\:start,org.eclipse.compare.win32@4,org.eclipse.core.filesystem.linux.x86_64@4,org.eclipse.core.filesystem.macosx@4,org.eclipse.core.filesystem.win32.x86_64@4,org.eclipse.core.net.linux.x86_64@4,org.eclipse.core.net.win32.x86_64@4,org.eclipse.core.resources.win32.x86_64@4,org.eclipse.e4.ui.swt.gtk@4,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@4,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@4,org.eclipse.equinox.launcher.gtk.linux.x86_64@4,org.eclipse.equinox.launcher.win32.win32.x86_64@4,org.eclipse.equinox.security.linux.x86_64@4,org.eclipse.equinox.security.macosx@4,org.eclipse.equinox.security.win32.x86_64@4,org.eclipse.jdt.launching.macosx@4,org.eclipse.jdt.launching.ui.macosx@4,org.eclipse.swt.cocoa.macosx.x86_64@4,org.eclipse.swt.gtk.linux.x86_64@4,org.eclipse.swt.win32.win32.x86_64@4,org.eclipse.ui.cocoa@4,org.eclipse.ui.win32@4,org.eclipse.swt.gtk.linux.aarch64@4,org.eclipse.core.filesystem.linux.aarch64@4,org.eclipse.equinox.launcher.cocoa.macosx.aarch64@4,org.eclipse.equinox.launcher.gtk.linux.aarch64@4,org.eclipse.swt.cocoa.macosx.aarch64@4
 org.eclipse.equinox.simpleconfigurator.configUrl=file\:org.eclipse.equinox.simpleconfigurator/bundles.info
 osgi.bundles.defaultStartLevel=4
 osgi.bundlefile.limit=200
--- a/build/talend.studio.tos.bd.product/pom.xml
+++ b/build/talend.studio.tos.bd.product/pom.xml
@@ -10,4 +10,5 @@

 	<artifactId>org.talend.studio.tos.bigdata.product</artifactId>
 	<packaging>eclipse-repository</packaging>
+	
 </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" version="7.4.1.qualifier">
+<product uid="org.talend.studio.tos.bigdata.product" id="org.talend.rcp.branding.tos.bigdata.product" useFeatures="true" includeLaunchers="false" version="8.0.1.qualifier">

   <configIni use="default">
      <linux>config.ini</linux>
--- a/build/talend.studio.tos.di.product/config.ini
+++ b/build/talend.studio.tos.di.product/config.ini
@@ -5,7 +5,7 @@ talend.studio.version=${version.full}
 eclipse.product=${product.branding.id}
 #The following osgi.framework key is required for the p2 update feature not to override the osgi.bundles values.
 osgi.framework=file\:plugins/org.eclipse.osgi_3.16.300.v20210525-1715.jar
-osgi.bundles=org.eclipse.equinox.simpleconfigurator@1\:start,org.eclipse.compare.win32@4,org.eclipse.core.filesystem.linux.x86_64@4,org.eclipse.core.filesystem.macosx@4,org.eclipse.core.filesystem.win32.x86_64@4,org.eclipse.core.net.linux.x86_64@4,org.eclipse.core.net.win32.x86_64@4,org.eclipse.core.resources.win32.x86_64@4,org.eclipse.e4.ui.swt.gtk@4,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@4,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@4,org.eclipse.equinox.launcher.gtk.linux.x86_64@4,org.eclipse.equinox.launcher.win32.win32.x86_64@4,org.eclipse.equinox.security.linux.x86_64@4,org.eclipse.equinox.security.macosx@4,org.eclipse.equinox.security.win32.x86_64@4,org.eclipse.jdt.launching.macosx@4,org.eclipse.jdt.launching.ui.macosx@4,org.eclipse.swt.cocoa.macosx.x86_64@4,org.eclipse.swt.gtk.linux.x86_64@4,org.eclipse.swt.win32.win32.x86_64@4,org.eclipse.ui.cocoa@4,org.eclipse.ui.win32@4
+osgi.bundles=org.eclipse.equinox.simpleconfigurator@1\:start,org.eclipse.compare.win32@4,org.eclipse.core.filesystem.linux.x86_64@4,org.eclipse.core.filesystem.macosx@4,org.eclipse.core.filesystem.win32.x86_64@4,org.eclipse.core.net.linux.x86_64@4,org.eclipse.core.net.win32.x86_64@4,org.eclipse.core.resources.win32.x86_64@4,org.eclipse.e4.ui.swt.gtk@4,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@4,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@4,org.eclipse.equinox.launcher.gtk.linux.x86_64@4,org.eclipse.equinox.launcher.win32.win32.x86_64@4,org.eclipse.equinox.security.linux.x86_64@4,org.eclipse.equinox.security.macosx@4,org.eclipse.equinox.security.win32.x86_64@4,org.eclipse.jdt.launching.macosx@4,org.eclipse.jdt.launching.ui.macosx@4,org.eclipse.swt.cocoa.macosx.x86_64@4,org.eclipse.swt.gtk.linux.x86_64@4,org.eclipse.swt.win32.win32.x86_64@4,org.eclipse.ui.cocoa@4,org.eclipse.ui.win32@4,org.eclipse.swt.gtk.linux.aarch64@4,org.eclipse.core.filesystem.linux.aarch64@4,org.eclipse.equinox.launcher.cocoa.macosx.aarch64@4,org.eclipse.equinox.launcher.gtk.linux.aarch64@4,org.eclipse.swt.cocoa.macosx.aarch64@4
 org.eclipse.equinox.simpleconfigurator.configUrl=file\:org.eclipse.equinox.simpleconfigurator/bundles.info
 osgi.bundles.defaultStartLevel=4
 osgi.bundlefile.limit=200
--- a/build/talend.studio.tos.di.product/pom.xml
+++ b/build/talend.studio.tos.di.product/pom.xml
@@ -10,4 +10,5 @@

 	<artifactId>org.talend.studio.tos.di.product</artifactId>
 	<packaging>eclipse-repository</packaging>
+	
 </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" version="7.4.1.qualifier">
+<product uid="org.talend.studio.tos.di.product" id="org.talend.rcp.branding.tos.product" useFeatures="true" includeLaunchers="false" version="8.0.1.qualifier">

   <configIni use="default">
      <linux>config.ini</linux>
--- a/build/talend.studio.tos.dq.product/config.ini
+++ b/build/talend.studio.tos.dq.product/config.ini
@@ -5,7 +5,7 @@ talend.studio.version=${version.full}
 eclipse.product=${product.branding.id}
 #The following osgi.framework key is required for the p2 update feature not to override the osgi.bundles values.
 osgi.framework=file\:plugins/org.eclipse.osgi_3.16.300.v20210525-1715.jar
-osgi.bundles=org.eclipse.equinox.simpleconfigurator@1\:start,org.eclipse.compare.win32@4,org.eclipse.core.filesystem.linux.x86_64@4,org.eclipse.core.filesystem.macosx@4,org.eclipse.core.filesystem.win32.x86_64@4,org.eclipse.core.net.linux.x86_64@4,org.eclipse.core.net.win32.x86_64@4,org.eclipse.core.resources.win32.x86_64@4,org.eclipse.e4.ui.swt.gtk@4,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@4,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@4,org.eclipse.equinox.launcher.gtk.linux.x86_64@4,org.eclipse.equinox.launcher.win32.win32.x86_64@4,org.eclipse.equinox.security.linux.x86_64@4,org.eclipse.equinox.security.macosx@4,org.eclipse.equinox.security.win32.x86_64@4,org.eclipse.jdt.launching.macosx@4,org.eclipse.jdt.launching.ui.macosx@4,org.eclipse.swt.cocoa.macosx.x86_64@4,org.eclipse.swt.gtk.linux.x86_64@4,org.eclipse.swt.win32.win32.x86_64@4,org.eclipse.ui.cocoa@4,org.eclipse.ui.win32@4
+osgi.bundles=org.eclipse.equinox.simpleconfigurator@1\:start,org.eclipse.compare.win32@4,org.eclipse.core.filesystem.linux.x86_64@4,org.eclipse.core.filesystem.macosx@4,org.eclipse.core.filesystem.win32.x86_64@4,org.eclipse.core.net.linux.x86_64@4,org.eclipse.core.net.win32.x86_64@4,org.eclipse.core.resources.win32.x86_64@4,org.eclipse.e4.ui.swt.gtk@4,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@4,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@4,org.eclipse.equinox.launcher.gtk.linux.x86_64@4,org.eclipse.equinox.launcher.win32.win32.x86_64@4,org.eclipse.equinox.security.linux.x86_64@4,org.eclipse.equinox.security.macosx@4,org.eclipse.equinox.security.win32.x86_64@4,org.eclipse.jdt.launching.macosx@4,org.eclipse.jdt.launching.ui.macosx@4,org.eclipse.swt.cocoa.macosx.x86_64@4,org.eclipse.swt.gtk.linux.x86_64@4,org.eclipse.swt.win32.win32.x86_64@4,org.eclipse.ui.cocoa@4,org.eclipse.ui.win32@4,org.eclipse.swt.gtk.linux.aarch64@4,org.eclipse.core.filesystem.linux.aarch64@4,org.eclipse.equinox.launcher.cocoa.macosx.aarch64@4,org.eclipse.equinox.launcher.gtk.linux.aarch64@4,org.eclipse.swt.cocoa.macosx.aarch64@4
 org.eclipse.equinox.simpleconfigurator.configUrl=file\:org.eclipse.equinox.simpleconfigurator/bundles.info
 osgi.bundles.defaultStartLevel=4
 osgi.bundlefile.limit=200
--- a/build/talend.studio.tos.dq.product/pom.xml
+++ b/build/talend.studio.tos.dq.product/pom.xml
@@ -10,4 +10,5 @@

 	<artifactId>org.talend.studio.tos.dq.product</artifactId>
 	<packaging>eclipse-repository</packaging>
+	
 </project>
--- 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" version="7.4.1.qualifier">
+<product uid="org.talend.studio.tos.dq.product" id="org.talend.rcp.branding.top.product" useFeatures="true" includeLaunchers="false" version="8.0.1.qualifier">

   <configIni use="default">
      <linux>config.ini</linux>
--- a/build/talend.studio.tos.esb.product/config.ini
+++ b/build/talend.studio.tos.esb.product/config.ini
@@ -5,7 +5,7 @@ talend.studio.version=${version.full}
 eclipse.product=${product.branding.id}
 #The following osgi.framework key is required for the p2 update feature not to override the osgi.bundles values.
 osgi.framework=file\:plugins/org.eclipse.osgi_3.16.300.v20210525-1715.jar
-osgi.bundles=org.eclipse.equinox.simpleconfigurator@1\:start,org.eclipse.compare.win32@4,org.eclipse.core.filesystem.linux.x86_64@4,org.eclipse.core.filesystem.macosx@4,org.eclipse.core.filesystem.win32.x86_64@4,org.eclipse.core.net.linux.x86_64@4,org.eclipse.core.net.win32.x86_64@4,org.eclipse.core.resources.win32.x86_64@4,org.eclipse.e4.ui.swt.gtk@4,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@4,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@4,org.eclipse.equinox.launcher.gtk.linux.x86_64@4,org.eclipse.equinox.launcher.win32.win32.x86_64@4,org.eclipse.equinox.security.linux.x86_64@4,org.eclipse.equinox.security.macosx@4,org.eclipse.equinox.security.win32.x86_64@4,org.eclipse.jdt.launching.macosx@4,org.eclipse.jdt.launching.ui.macosx@4,org.eclipse.swt.cocoa.macosx.x86_64@4,org.eclipse.swt.gtk.linux.x86_64@4,org.eclipse.swt.win32.win32.x86_64@4,org.eclipse.ui.cocoa@4,org.eclipse.ui.win32@4
+osgi.bundles=org.eclipse.equinox.simpleconfigurator@1\:start,org.eclipse.compare.win32@4,org.eclipse.core.filesystem.linux.x86_64@4,org.eclipse.core.filesystem.macosx@4,org.eclipse.core.filesystem.win32.x86_64@4,org.eclipse.core.net.linux.x86_64@4,org.eclipse.core.net.win32.x86_64@4,org.eclipse.core.resources.win32.x86_64@4,org.eclipse.e4.ui.swt.gtk@4,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@4,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@4,org.eclipse.equinox.launcher.gtk.linux.x86_64@4,org.eclipse.equinox.launcher.win32.win32.x86_64@4,org.eclipse.equinox.security.linux.x86_64@4,org.eclipse.equinox.security.macosx@4,org.eclipse.equinox.security.win32.x86_64@4,org.eclipse.jdt.launching.macosx@4,org.eclipse.jdt.launching.ui.macosx@4,org.eclipse.swt.cocoa.macosx.x86_64@4,org.eclipse.swt.gtk.linux.x86_64@4,org.eclipse.swt.win32.win32.x86_64@4,org.eclipse.ui.cocoa@4,org.eclipse.ui.win32@4,org.eclipse.swt.gtk.linux.aarch64@4,org.eclipse.core.filesystem.linux.aarch64@4,org.eclipse.equinox.launcher.cocoa.macosx.aarch64@4,org.eclipse.equinox.launcher.gtk.linux.aarch64@4,org.eclipse.swt.cocoa.macosx.aarch64@4
 org.eclipse.equinox.simpleconfigurator.configUrl=file\:org.eclipse.equinox.simpleconfigurator/bundles.info
 osgi.bundles.defaultStartLevel=4
 osgi.bundlefile.limit=200
--- a/build/talend.studio.tos.esb.product/pom.xml
+++ b/build/talend.studio.tos.esb.product/pom.xml
@@ -10,4 +10,5 @@

    <artifactId>org.talend.studio.tos.esb.product</artifactId>
    <packaging>eclipse-repository</packaging>
+	
 </project>
--- 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" version="7.4.1.qualifier">
+<product uid="org.talend.studio.tos.esb.product" id="org.talend.rcp.branding.esbstandard.product" useFeatures="true" includeLaunchers="false" version="8.0.1.qualifier">

   <configIni use="default">
      <linux>config.ini</linux>
--- a/build/talend.studio.tos.product.parent.pom/pom.xml
+++ b/build/talend.studio.tos.product.parent.pom/pom.xml
@@ -134,7 +134,7 @@
                                <artifactItem>
                                    <groupId>${project.groupId}</groupId>
                                    <artifactId>eclipse-launcher-binaries</artifactId>
-                                    <version>7.4.1</version>
+                                    <version>8.0.1</version>
                                    <type>zip</type>
                                    <overWrite>true</overWrite>
                                    <outputDirectory>${studio.dir}</outputDirectory>
@@ -142,7 +142,7 @@
                                <artifactItem>
                                    <groupId>${project.groupId}</groupId>
                                    <artifactId>eclipse-launcher-mac-${launcher.prefix}</artifactId>
-                                    <version>7.4.1</version>
+                                    <version>8.0.1</version>
                                    <type>zip</type>
                                    <overWrite>true</overWrite>
                                    <outputDirectory>${studio.dir}</outputDirectory>
@@ -187,26 +187,6 @@
                            </artifactItems>
                        </configuration>
                    </execution>
-					<execution>
-						<id>copy-studio-add-conf</id>
-						<phase>package</phase>
-						<goals>
-							<goal>unpack</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>${project.groupId}</groupId>
-									<artifactId>studio-add-conf</artifactId>
-									<version>7.3.1-SNAPSHOT</version>
-									<type>zip</type>
-									<classifier />
-									<overWrite>true</overWrite>
-									<outputDirectory>${studio.dir}/configuration</outputDirectory>
-								</artifactItem>
-							</artifactItems>
-						</configuration>
-					</execution>
                    <execution>
                        <id>copy-notice-txt</id>
                        <phase>package</phase>
@@ -332,11 +312,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="version.majorminor" input="${product.version}" regexp="^([0-9_]+)\.([0-9_]+)\.(.*)" select="\1.\2" casesensitive="false" />
+                                <echo>Looking for ${studio.dir}/plugins/${product.branding.platform}_${version.majorminor}*</echo>
                                <echo>buildQualifier=${buildQualifier}</echo>
                                <echo>product.timestamp=${product.timestamp}</echo>
+                                <echo>version.majorminor=${version.majorminor}</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}_${version.majorminor}*/about.mappings" id="aboutmappingspath_temp" />
                                <pathconvert property="aboutmappingspath" refid="aboutmappingspath_temp" />
                                <echo>aboutmappingspath=${aboutmappingspath}</echo>
                                <loadfile property="about" srcFile="${aboutmappingspath}">
@@ -370,13 +352,7 @@
                                        <mapper type="regexp" from="(.*)launcher(.*)" to="\1${launcher.prefix}\2" />
                                    </mapper>
                                </move>
-                                <loadfile property="launcher_sh" srcFile="${studio.dir}/${launcher.prefix}-linux-gtk-x86.sh">
-                                    <filterchain>
-                                        <expandproperties />
-                                    </filterchain>
-                                </loadfile>
-                                <echo file="${studio.dir}/${launcher.prefix}-linux-gtk-x86.sh">${launcher_sh}</echo>
-                                <ac:for xmlns:ac="antlib:net.sf.antcontrib" list="linux-gtk-x86_64,win-x86_64" param="platform">
+                                <ac:for xmlns:ac="antlib:net.sf.antcontrib" list="linux-gtk-x86_64,linux-gtk-aarch64,win-x86_64" param="platform">
                                    <sequential>
                                        <copy tofile="${studio.dir}/${launcher.prefix}-@{platform}.ini" file="${project.basedir}/launcher_64.ini" />
                                    </sequential>
@@ -498,29 +474,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
pyzhou	002639a1de	chore:upgrade connector to 1.30.2 (#571 )	2022-02-16 17:19:11 +08:00
pyzhou	54b2c1cfa0	fix(TDI-47488): Upgrade tck to 1.30.1 (#570 )	2022-02-15 16:23:50 +08:00
pyzhou	50d15ecce9	chore:update connector to 1.30.0 (#568 )	2022-02-11 18:14:53 +08:00
ypiel	a3ec4b77d2	chore: bump to tcompv0 0.37.4 (#567 )	2022-02-10 16:20:02 +01:00
Emmanuel GALLOIS	e6d037cb57	feat(TDI-47414): bump component-runtime to 1.41.0 (#561 )	2022-01-27 09:20:27 +01:00
jiezhang-tlnd	f174e30acf	fix(TUP-31581)Remove CryptoHelper from test-studio-commandline (#562 ) * fix(TUP-31581)Remove CryptoHelper from test-studio-commandline * set version to 1.0.8	2022-01-27 09:36:20 +08:00
hzhao-talendbj	25f720e67b	fix(TUP-33675):Throw "Invalid key name: mdm.encryption.key" in error log (#551 )	2022-01-25 14:29:01 +08:00
build-talend-tdq	b3d21bde5c	chore(Jenkins): Update DQ libs to 9.0.5 (#558 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2022-01-13 13:28:49 +08:00
pyzhou	123981fb94	Chore:upgrade connector to 1.29.0 (#556 )	2022-01-11 15:01:59 +08:00
wang wei	5bb46c5a84	fix(TDI-47212): CVE: jackson-mapper(core)-asl-1.9.15-TALEND (#555 )	2022-01-10 15:14:38 +08:00
wang wei	cb06d0ec37	fix(TDI-46665): upgrade json-io for studio p2 part (#546 ) (#554 )	2022-01-10 14:52:59 +08:00
ypiel	76d7abc7a7	chore: bump tcompV0 0.37.3 (#553 )	2022-01-07 18:12:14 +01:00
Emmanuel GALLOIS	142a0eb357	feat(TDI-47278): bump component-runtime to 1.40.0 (#540 )	2022-01-04 12:35:04 +01:00
jiezhang-tlnd	645df3a00e	chore(TUP-34027)CVE jackson-mapper(core)-asl-1.9.15-TALEND (#530 )	2021-12-29 16:46:56 +08:00
pyzhou	4d52ca3d76	chore: upgrade component version to 0.37.2 (#535 )	2021-12-16 12:39:48 +08:00
build-talend-tdq	479518aef1	chore(Jenkins): Update DQ libs to 9.0.4 (#536 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2021-12-15 11:10:01 +08:00
bhe-talendbj	922f830b48	fix(TUP-34105): update plugin version (#533 ) * fix(TUP-34105): update plugin version * fix(TUP-34105): update jgit	2021-12-14 15:40:53 +08:00
jzhao	59ba1cce06	chore:bump up connector 1.28.1 (#532 )	2021-12-13 16:30:14 +08:00
build-talend-tdq	b6b14b8a96	chore(Jenkins): Update DQ libs to 9.0.3 (#526 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2021-12-08 17:02:30 +08:00
hzhao-talendbj	69f48ec968	feat(TUP-32064): Build up to date Studio index automatically (#518 )	2021-12-08 14:48:50 +08:00
pyzhou	59297dd5a8	fix(TDI-47214): bump up connector 1.28.0 (#522 )	2021-12-08 10:04:53 +08:00
Emmanuel GALLOIS	9500ec33ef	feat(TDI-46838): bump component-runtime to 1.39.2 (#520 )	2021-12-07 09:30:36 +01:00
clesaec	241111a35d	bump tcomp version (#519 )	2021-12-02 15:13:17 +01:00
build-talend-tdq	e9009d45bd	chore(Jenkins): Update DQ libs to 9.0.2 (#516 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2021-11-25 13:31:15 +08:00
build-talend-tdq	bfc9c7364c	chore(Jenkins): Update DQ libs to 9.0.3 (#515 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2021-11-25 13:04:30 +08:00
Zhiwei Xue	adf22f763f	chore(TUP-33614):Update each component plugin, make sure it generates a (#503 ) (#511 ) new timestamp at each build	2021-11-19 17:26:01 +08:00
iwangtalend	2d0905ff00	Use two-digit version to find branding plugin (#508 )	2021-11-19 09:32:57 +08:00
bhe-talendbj	12a0580237	Update version from 8.0.2-SNAPSHOT to 8.0.1-SNAPSHOT (#506 )	2021-11-18 12:02:32 +08:00
build-talend	9827d80c4a	Set version to 8.0.2 SNAPSHOT (#504 ) Co-authored-by: Jenkins Continuous Build server <jenkins@tal-rd02.talend.lan>	2021-11-16 14:41:50 +01:00
Jenkins Continuous Build server	ca6eefb80c	Set version to 8.0.1	2021-11-03 17:02:09 +01:00
Irene Wang	ec9f75fc13	Update version to 8.0.1	2021-10-28 13:08:24 +02:00
jiezhang-tlnd	486ac12331	fix(TUP-33312)CWE-327: upgrade bcprov-jdk15on to 1.69 (#488 ) (#496 ) * fix(TUP-33312)CWE-327: upgrade bcprov-jdk15on to 1.69 * fix(TUP-33312)CWE-327: upgrade bcprov-jdk15on to 1.69 Conflicts: talend.studio.parent.pom/pom.xml	2021-10-28 11:52:05 +08:00
wang wei	5ef4ec9663	fix(TDI-46286): upgrade org.slf4j version to 1.7.29 from 1.7.25 (#485 ) Conflicts: talend.studio.parent.pom/pom.xml	2021-10-27 15:42:21 +08:00
Jenkins Continuous Build server	a0eb63bd5b	Set version to 8.0.1	2021-10-21 16:11:22 +02:00
build-talend-tdq	a275eaed0c	chore(Jenkins): Update DQ libs to 9.0.2 (#495 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2021-10-21 16:47:37 +08:00
jzhao	af95b5ccda	chore(TDI-46906): bump connectors 1.26.0 (#493 )	2021-10-21 14:40:39 +08:00
ypiel	c4a349eb61	chore(TDI-46897): bump to 0.37.0 (#492 )	2021-10-20 16:25:21 +02:00
build-talend-tdq	559075276e	chore(Jenkins): Update DQ libs to 9.0.3-SNAPSHOT (#490 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2021-10-15 12:19:09 +08:00
hzhao-talendbj	f105ad11c8	update index file (#487 )	2021-10-13 18:27:15 +08:00
ypiel	dce730edc5	chore: bump TCOMP components version to 0.37.0-SNAPSHOT (#484 )	2021-10-13 16:49:21 +08:00
Oleksandr Zhelezniak	aae8dbff4e	chore: bump connectors 1.27.0-SNAPSHOT (#480 )	2021-10-12 16:08:52 +03:00
build-talend-tdq	9ace19c3c1	chore(Jenkins): Update DQ libs to 9.0.2-SNAPSHOT (#483 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2021-10-09 15:33:33 +08:00
Zhiwei Xue	41f613bf79	chore(TUP-31991):upgrade component-cache-creator version to 1.0.0 (#482 )	2021-10-09 14:06:20 +08:00
Nicolas Rousseau	fef6ee7ba3	fix eclipse p2 babel to talend	2021-10-07 12:00:39 +08:00
nrousseau	302ecdf4f0	fix(TUP-32626): fix EE build / new feature added (#478 )	2021-10-06 10:23:01 +08:00
Emmanuel GALLOIS	f4226c18a7	feat(TDI-46769): bump to component-runtime 1.37.0 (#473 )	2021-10-04 10:52:38 +02:00
nrousseau	033de9c096	feat(TUP-32212): add support of arms64 (#476 )	2021-09-27 14:17:57 +08:00
nrousseau	883c5d9530	fix(TUP-26490): remove configuration jar (#475 ) * fix(TUP-26490): Update configuration2 jar * fix(TUP-26490): Update configuration2 jar	2021-09-26 10:45:26 +08:00
nrousseau	527c0a8f86	feat(TUP-32212): Support of ARMS processor (#472 ) * feat(TUP-32212): Support of ARMS processor * feat(TUP-32212): Support of ARMS processor	2021-09-18 18:43:00 +08:00
bhe-talendbj	9f00d3438b	chore(TUP-30247): upgrade commons-io (#365 )	2021-09-17 12:00:10 +08:00