chore(Jenkins): Update DQ libs to 9.0.4 (#536 ) (#537 )

fix(TUP-34105): update plugin version (#533 ) (#534 )
* fix(TUP-34105): update plugin version * fix(TUP-34105): update jgit
2021-12-15 12:23:52 +08:00 · 2021-12-15 10:22:53 +08:00 · 2021-12-14 17:16:29 +08:00 · 2021-12-13 16:34:13 +08:00 · 2021-12-08 17:02:30 +08:00 · 2021-12-08 14:48:50 +08:00
14 changed files with 588 additions and 600 deletions
--- a/build/dependencies.p2/dependencies.p2.tos/pom.xml
+++ b/build/dependencies.p2/dependencies.p2.tos/pom.xml
@@ -300,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>
@@ -351,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.2</dataquality.lib.version>
+        <dataquality.lib.version>9.0.4</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" version="7.4.1.qualifier" 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" version="8.0.1.qualifier" useFeatures="true" includeLaunchers="false">

   <configIni use="default">
      <linux>config.ini</linux>
--- 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/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/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/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
@@ -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>8.0.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}">
--- a/talend.studio.parent.pom/pom.xml
+++ b/talend.studio.parent.pom/pom.xml
Author	SHA1	Message	Date
msjian	f93a5e6f47	chore(Jenkins): Update DQ libs to 9.0.4 (#536 ) (#537 )	2021-12-15 12:23:52 +08:00
bhe-talendbj	97a06f599d	fix(TUP-34105): update plugin version (#533 ) (#534 ) * fix(TUP-34105): update plugin version * fix(TUP-34105): update jgit	2021-12-15 10:22:53 +08:00
pyzhou	8c54f6bad3	chore: upgrade component version to 0.37.2	2021-12-14 17:16:29 +08:00
jzhao	6f6e26ba48	chore:bump up connector 1.28.1 (#532 )	2021-12-13 16:34:13 +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