test jackson

feat(TDI-47278): bump component-runtime to 1.40.0 (#541 )
fix(TDI-46665): upgrade json-io for studio p2 part (#546 )
2022-01-07 10:30:41 +08:00 · 2022-01-04 12:34:34 +01:00 · 2021-12-31 14:51:13 +08:00 · 2021-12-29 15:41:01 +08:00 · 2021-12-09 11:53:17 +08:00 · 2021-12-09 11:24:16 +08:00
16 changed files with 51 additions and 70 deletions
--- a/build/dependencies.p2/dependencies.p2.tos/pom.xml
+++ b/build/dependencies.p2/dependencies.p2.tos/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.talend.repo</groupId>
 		<artifactId>dependencies.p2</artifactId>
-		<version>8.0.1-SNAPSHOT</version>
+		<version>8.8.8-SNAPSHOT</version>
 	</parent>

 	<artifactId>dependencies.p2.tos</artifactId>
@@ -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>
@@ -143,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 -->
@@ -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
@@ -4,7 +4,7 @@
    <parent>
        <groupId>org.talend.studio</groupId>
        <artifactId>parent-pom</artifactId>
-        <version>8.0.1-SNAPSHOT</version>
+        <version>8.8.8-SNAPSHOT</version>
        <relativePath>../../talend.studio.parent.pom</relativePath>
    </parent>
    <groupId>org.talend.repo</groupId>
@@ -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.1.0-SNAPSHOT</dataquality.lib.version>
        <fasterxml.jackson.version>2.11.4</fasterxml.jackson.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>8.0.1-SNAPSHOT</version>
+		<version>8.8.8-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,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>parent-pom</artifactId>
-		<version>8.0.1-SNAPSHOT</version>
+		<version>8.8.8-SNAPSHOT</version>
 		<relativePath />
 	</parent>

--- 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
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>8.0.1-SNAPSHOT</version>
+		<version>8.8.8-SNAPSHOT</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

--- 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
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>8.0.1-SNAPSHOT</version>
+		<version>8.8.8-SNAPSHOT</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

--- 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
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.talend.studio</groupId>
 		<artifactId>tos-products-parent-pom</artifactId>
-		<version>8.0.1-SNAPSHOT</version>
+		<version>8.8.8-SNAPSHOT</version>
 		<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
 	</parent>

--- 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
@@ -4,7 +4,7 @@
    <parent>
        <groupId>org.talend.studio</groupId>
        <artifactId>tos-products-parent-pom</artifactId>
-        <version>8.0.1-SNAPSHOT</version>
+        <version>8.8.8-SNAPSHOT</version>
        <relativePath>../talend.studio.tos.product.parent.pom</relativePath>
    </parent>

--- 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
@@ -4,7 +4,7 @@
    <parent>
        <groupId>org.talend.studio</groupId>
        <artifactId>parent-pom</artifactId>
-        <version>8.0.1-SNAPSHOT</version>
+        <version>8.8.8-SNAPSHOT</version>
        <relativePath />
    </parent>

@@ -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>
@@ -492,29 +472,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>8.0.1-SNAPSHOT</version>
+		<version>8.8.8-SNAPSHOT</version>
 		<relativePath />
 	</parent>

--- a/talend.studio.parent.pom/pom.xml
+++ b/talend.studio.parent.pom/pom.xml
@@ -3,26 +3,26 @@
 	<modelVersion>4.0.0</modelVersion>
    <groupId>org.talend.studio</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.8.8-SNAPSHOT</version>
    <packaging>pom</packaging>

    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <components.version>0.37.0</components.version>
-        <tacokit.components.version>1.26.0</tacokit.components.version>
-        <component-runtime.version>1.37.0</component-runtime.version>
+        <components.version>0.38.0-SNAPSHOT</components.version>
+        <tacokit.components.version>1.29.0-SNAPSHOT</tacokit.components.version>
+        <component-runtime.version>1.40.0</component-runtime.version>
        <m2.fasterxml.jackson.version>2.11.4</m2.fasterxml.jackson.version>
-        <jackson-codehaus.version>1.9.15-TALEND</jackson-codehaus.version>
+        <jackson-codehaus.version>1.9.16-TALEND</jackson-codehaus.version>
        <daikon.version>0.31.12</daikon.version>
-        <slf4j-api.version>1.7.25</slf4j-api.version>
+        <slf4j-api.version>1.7.29</slf4j-api.version>
        <daikon-ee.format.verison>3.2.0</daikon-ee.format.verison>
        <daikon.audit.version>1.16.1</daikon.audit.version>
        <org.talend.daikon.crypto-utils.version>0.31.12</org.talend.daikon.crypto-utils.version>
-        <studio-utils.version>1.0.5</studio-utils.version>
+        <studio-utils.version>1.0.6</studio-utils.version>
        <compcache.creator.version>1.0.0</compcache.creator.version>
        <tycho.version>1.7.0</tycho.version>
        <tycho-extras.version>${tycho.version}</tycho-extras.version>
-        <base.version>8.0.1</base.version>
+        <base.version>8.8.8</base.version>
        <!-- osgi.compatible.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}.<suffix> (milestones), or ${base.version} (GA)-->
        <osgi.compatible.version>${base.version}-SNAPSHOT</osgi.compatible.version>
        <!-- maven.compatible.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}-<suffix> (milestones), or ${base.version} (GA)-->
@@ -459,6 +459,7 @@
                <product.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</product.version>
                <timestamp>${maven.build.timestamp}</timestamp>
                <maven.build.timestamp.format>yyyyMMdd'_'HHmm</maven.build.timestamp.format>
+                <tycho.buildtimestamp.format>${maven.build.timestamp.format}</tycho.buildtimestamp.format>
            </properties>
            <repositories>
                <repository>
@@ -495,7 +496,7 @@
                        </dependencies>
                        <configuration>
                            <strictBinIncludes>false</strictBinIncludes>
-                            <format>yyyyMMdd'_'HHmm</format>
+                            <format>${tycho.buildtimestamp.format}</format>
                            <archive>
                                <addMavenDescriptor>false</addMavenDescriptor>
                                <!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
Author	SHA1	Message	Date
jiezhang-tlnd	a8c3406248	test jackson	2022-01-07 10:30:41 +08:00
Emmanuel GALLOIS	b4db65ee24	feat(TDI-47278): bump component-runtime to 1.40.0 (#541 )	2022-01-04 12:34:34 +01:00
wang wei	9e247cdef3	fix(TDI-46665): upgrade json-io for studio p2 part (#546 )	2021-12-31 14:51:13 +08:00
jiezhang-tlnd	fedcb1fdad	chore(TUP-34027)CVE jackson-mapper(core)-asl-1.9.15-TALEND (#528 )	2021-12-29 15:41:01 +08:00
build-talend-tdq	f865fc00d3	chore(Jenkins): Update DQ libs to 9.1.0-SNAPSHOT (#527 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2021-12-09 11:53:17 +08:00
hzhao-talendbj	22ae3cc59d	feat(TUP-32064): Build up to date Studio index automatically (#518 ) (#525 )	2021-12-09 11:24:16 +08:00
pyzhou	571055fc08	fix(TDI-47214): bump up connector 1.29.0-SNAPSHOT (#523 )	2021-12-08 10:00:11 +08:00
Emmanuel GALLOIS	c2759b80bf	feat(TDI-46838): bump component-runtime to 1.39.2 (#479 )	2021-12-07 09:31:43 +01:00
Zhiwei Xue	e0e2fb359f	chore(TUP-33614):Update each component plugin, make sure it generates a (#503 ) new timestamp at each build	2021-11-18 14:47:53 +08:00
nrousseau	e0fc22c297	chore(TUP-33832): setup next version	2021-11-18 10:32:48 +08:00
build-talend	07e5e2b2fb	Set version to 8.8.8 SNAPSHOT (#505 ) Co-authored-by: Jenkins Continuous Build server <jenkins@tal-rd02.talend.lan>	2021-11-16 15:29:51 +01:00
pyzhou	425af43512	fix(TDI-46994) Upgrade tck in studio master (#502 )	2021-11-05 18:11:55 +08:00
Liu Xinquan	74621febb5	Revert "chore(Jenkins): Update DQ libs to 9.1.0-SNAPSHOT (#499 )" (#500 ) This reverts commit `748ef8b4d2`.	2021-11-02 18:11:34 +08:00
build-talend-tdq	748ef8b4d2	chore(Jenkins): Update DQ libs to 9.1.0-SNAPSHOT (#499 ) Co-authored-by: jenkins-git <jenkins-git@talend.com>	2021-11-02 17:27:18 +08:00
iwangtalend	c6cf1f24d7	Update version to 8.0.1 (#497 )	2021-10-28 19:10:24 +08:00
wang wei	3b2e882f73	fix(TDI-46286): upgrade org.slf4j version to 1.7.29 from 1.7.25 (#485 )	2021-10-27 15:33:16 +08:00
jiezhang-tlnd	e0dd3e77d3	fix(TUP-33312)CWE-327: upgrade bcprov-jdk15on to 1.69 (#488 ) * fix(TUP-33312)CWE-327: upgrade bcprov-jdk15on to 1.69 * fix(TUP-33312)CWE-327: upgrade bcprov-jdk15on to 1.69	2021-10-27 11:29:55 +08:00