Compare commits

..

17 Commits

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
11 changed files with 49 additions and 88 deletions

View File

@@ -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>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
<version>2.6.3-Talend</version>
<version>2.6.2-Talend</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
@@ -112,7 +112,7 @@
<dependency>
<groupId>com.cedarsoftware</groupId>
<artifactId>json-io</artifactId>
<version>4.13.1-TALEND</version>
<version>4.13.0-TALEND</version>
</dependency>
<dependency>
@@ -323,15 +323,10 @@
<version>1.7.2</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
<version>2.8.0</version>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>1.10</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.9</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
@@ -356,7 +351,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov</artifactId>
<version>1.70.0</version>
<version>1.69.0</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
@@ -365,26 +360,6 @@
<version>4.13.2</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
<version>1.2.19-TALEND</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${fasterxml.jackson.databind.version}</version>
</dependency>
</dependencies>
</project>

View File

@@ -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,9 +12,8 @@
<packaging>pom</packaging>
<properties>
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
<dataquality.lib.version>9.1.7</dataquality.lib.version>
<fasterxml.jackson.version>2.13.2</fasterxml.jackson.version>
<fasterxml.jackson.databind.version>2.13.2.2</fasterxml.jackson.databind.version>
<dataquality.lib.version>9.1.0-SNAPSHOT</dataquality.lib.version>
<fasterxml.jackson.version>2.11.4</fasterxml.jackson.version>
</properties>
<distributionManagement>

View File

@@ -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>

View File

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

View File

@@ -4,11 +4,10 @@
<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>
<artifactId>org.talend.studio.tos.bigdata.product</artifactId>
<packaging>eclipse-repository</packaging>
</project>

View File

@@ -4,11 +4,10 @@
<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>
<artifactId>org.talend.studio.tos.di.product</artifactId>
<packaging>eclipse-repository</packaging>
</project>

View File

@@ -4,11 +4,10 @@
<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>
<artifactId>org.talend.studio.tos.dq.product</artifactId>
<packaging>eclipse-repository</packaging>
</project>

View File

@@ -4,11 +4,10 @@
<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>
<artifactId>org.talend.studio.tos.esb.product</artifactId>
<packaging>eclipse-repository</packaging>
</project>

View File

@@ -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>
@@ -312,13 +312,11 @@
<configuration>
<target>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
<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>Looking for ${studio.dir}/plugins/${product.branding.platform}_${product.version}*</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}_${version.majorminor}*/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}">
@@ -474,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>

View File

@@ -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>

View File

@@ -3,27 +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>
<component-runtime.version>1.47.1</component-runtime.version>
<components.version>0.37.11</components.version>
<tacokit.components.version>1.36.0</tacokit.components.version>
<m2.fasterxml.jackson.version>2.13.2</m2.fasterxml.jackson.version>
<m2.fasterxml.jackson.databind.version>2.13.2.2</m2.fasterxml.jackson.databind.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.16-TALEND</jackson-codehaus.version>
<daikon.version>0.31.12</daikon.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.10</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)-->
@@ -468,11 +467,6 @@
<url>${fullp2_url}</url>
<layout>p2</layout>
</repository>
<repository>
<id>eclipse_repo</id>
<url>${eclipse-repo.url}</url>
<layout>p2</layout>
</repository>
</repositories>
<build>
<plugins>
@@ -511,7 +505,7 @@
</manifestEntries>
</archive>
<timestampProvider>jgit</timestampProvider>
<!--jgit.ignore>pom.xml</jgit.ignore-->
<jgit.ignore>pom.xml</jgit.ignore>
<jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
</configuration>
</plugin>