Compare commits

..

96 Commits

Author SHA1 Message Date
Fabien Désiles
d2e9d18d2a Update pom.xml
non existing version for testing.
2023-06-19 15:44:32 +02:00
Fabien Désiles
9d00abc99d Update pom.xml 2023-06-01 17:14:10 +02:00
build-talend-tdq
69f61d2c8e chore(Jenkins): Update DQ libs to 9.1.14-SNAPSHOT (#812)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2023-05-26 16:58:42 +08:00
Emmanuel GALLOIS
e5127ffad0 feat(TDI-49707): bump component-runtime to 1.56.1 (#800) 2023-05-10 15:36:54 +02:00
jzhao
8c83abf561 chore(TDI-49777):bump tck connector version to 1.46.0-snapshot in studio (#805) 2023-05-05 14:35:04 +08:00
Emmanuel GALLOIS
0d2e429b11 feat(TDI-49562): bump component-runtime to 1.55 (#786) 2023-04-13 12:06:38 +02:00
bhe-talendbj
63d117f363 fix(TUP-38561): upgrade pax-url (#798) 2023-04-13 10:06:06 +08:00
bhe-talendbj
0d3aebfdce fix(TUP-38561): [performance] Studio crash when continuously run more than 2hours from automation test (#792)
* fix(TUP-38561): upgrade pax-url

* fix(TUP-38561): upgrade pax-url
2023-04-07 15:59:49 +08:00
pyzhou
11388aad62 fix(TDI-49648) Upgrade tck 1.45-snapshot in studio master (#795) 2023-04-07 11:04:43 +08:00
Zhiwei Xue
02f8807244 fix(TUP-37899):Upgrade org.ops4j.pax.url:pax-url-aether:2.6.(2,11) (#772) 2023-03-30 23:53:12 +08:00
jiezhang-tlnd
6a7b93fb36 chore(TUP-37462)CVE-2022-1471,org.yaml:snakeyaml:1.31,1.32,1.33,1.4-1.33 (#788) 2023-03-20 10:42:08 +08:00
Oleksandr Zhelezniak
801c5d2dd7 chore(TDI-49472): bump connectors 1.44.0-SNAPSHOT (#783) 2023-03-03 10:22:33 +02:00
Emmanuel GALLOIS
fce2ff66db feat(TDI-49432): bump component-runtime to 1.54.0 (#781) 2023-03-01 16:48:15 +01:00
ypiel
a6455c0d73 Revert "chore(TDI-49432): bump component-runtime:1.54.0 (#775)" (#777)
This reverts commit e0181e16de.
2023-02-22 14:19:48 +01:00
ypiel
e0181e16de chore(TDI-49432): bump component-runtime:1.54.0 (#775) 2023-02-22 14:04:35 +01:00
Oleksandr Zhelezniak
3c0b7960da chore(TDI-49328): bump connectors (#767) 2023-02-02 17:24:44 +02:00
Emmanuel GALLOIS
bbad0f3ab7 feat(TDI-49275): bump component-runtime to 1.53.0 (#765) 2023-02-01 11:21:50 +01:00
Oleksandr Zhelezniak
6e7ee45128 chore(TDI-49175): bump connectors 1.42.0-SNAPSHOT (#760) 2023-01-05 17:14:22 +02:00
Emmanuel GALLOIS
7ccc7d4ec6 feat(TCOMP-2235): bump component-runtime to 1.52.1 (#754) 2023-01-05 11:57:32 +01:00
build-talend-tdq
e6e373b705 chore(Jenkins): Update DQ libs to 9.1.13-SNAPSHOT (#759)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2023-01-05 18:53:50 +08:00
hzhao
8e70c328d5 chore(TUP-35265): upgrade 'crypto-utils' jar in low level (#756) 2023-01-05 17:47:58 +08:00
jiezhang-tlnd
a55a14d1c2 chore(TUP-37524)CVE-2022-46364,org.apache.cxf:cxf-core:3.4.4,3.5.2 (#757) 2023-01-05 11:45:34 +08:00
pyzhou
a049535734 fix(TDI-49103):bump up tck 1.52.0 (#746) 2022-12-22 10:34:38 +08:00
Oleksandr Zhelezniak
3c2e4da40d chore(TDI-49010): bump connectors version (#739) 2022-12-08 15:11:20 +02:00
Emmanuel GALLOIS
d9de3968e4 feat(TDI-48896): bump component-runtime to 1.51.2 (#732) 2022-12-05 18:40:39 +01:00
build-talend-tdq
d2f86763ee chore(Jenkins): Update DQ libs to 9.1.11-SNAPSHOT (#737)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-12-02 14:22:11 +08:00
Zhiwei Xue
decc3432cd fix(TUP-37394):[Bug] miss parameter when run job with jobserver (#736) 2022-12-01 18:42:10 +08:00
sbliu
3929dade74 chore(TUP-36969) upgrade studio-util & slf4j-api (#730) 2022-11-26 10:19:36 +08:00
Colm O hEigeartaigh
47d534b16a Create SECURITY.md (#729) 2022-11-23 09:40:03 +00:00
Zhiwei Xue
7d19df9ed5 fix(TUP-34407):[Java 17] --add-opens parameters in .ini file are ignored (#687)
on Windows
2022-11-23 11:45:46 +08:00
Emmanuel GALLOIS
fc2cf3a6b8 feat(TDI-48644): bump component-runtime to 1.50 (#695) 2022-11-09 13:17:01 +01:00
zyuan-talend
79780b8e6f fix(TUP-36566):CVE:upgrade reload4j to 1.2.22. (#710) (#722) 2022-11-09 17:15:15 +08:00
sbliu
5e57ba6264 chore(TUP-36964) upgrade commons-text to 1.10.0, studio-utils.version to 1.0.11 (#723) 2022-11-09 14:40:54 +08:00
ypiel
6c8219dcad chore(TDI-48806): bump to connectors 1.40.0-SNAPSHOT (#721) 2022-11-07 12:21:04 +01:00
sbliu
6c48d107cb chore(TUP-36930) upgrade jackson-databind to 2.13.4.2,jackson-core/jackson-annotations to 2.13.4 (#707) 2022-11-01 14:38:46 +08:00
build-talend-tdq
633d52cb5d chore(Jenkins): Update DQ libs to 9.1.10-SNAPSHOT (#712)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-10-26 12:24:24 +08:00
Emmanuel GALLOIS
a8f64699ce feat(TDI-48595): REVERT bump component-runtime dependencies (#701)
- revert slf4j to 1.7.29
2022-10-19 11:40:30 +08:00
Emmanuel GALLOIS
012547184b feat(TDI-48595): bump component-runtime to 1.49 (#693) 2022-10-12 10:21:31 +02:00
Fabien Désiles
0ff0611726 feat(TDI-48655): Bump connector to 1.39.0-SNAPSHOT (#698)
https://jira.talendforge.org/browse/TDI-48655
2022-10-12 09:56:30 +08:00
build-talend-tdq
61d6515b12 chore(Jenkins): Update DQ libs to 9.1.9-SNAPSHOT (#686)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-09-22 14:34:17 +08:00
Emmanuel GALLOIS
7193709fff feat(TDI-48418): Bump component-runtime to 1.48 (#679) 2022-09-15 11:42:12 +02:00
Oleksandr Zhelezniak
277ea999be chore(TDI-48494): bump connectors 1.38.0-SNAP (#677) 2022-09-08 19:02:44 +03:00
sbliu
94c32a6c7f chore(TUP-36395) upgrade commons-compress to 1.21 (#670) (#675) 2022-09-02 15:34:14 +08:00
build-talend-tdq
38e70c951a chore(Jenkins): Update DQ libs to 9.1.8-SNAPSHOT (#672)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-08-17 12:03:20 +08:00
jiezhang-tlnd
edab8db120 chore(TUP-36127)Upgrade commons-configuration to 2.8.0 (#664) 2022-08-09 09:48:55 +08:00
ypiel
2865132676 chore: bump to component-runtime 1.47.0 (#656)
* bump to component-runtime 1.47.1

Co-authored-by: Emmanuel GALLOIS <egallois@talend.com>
2022-08-08 13:42:41 +02:00
ypiel
7bf55beb55 chore: bump to connectors:1.37.0-SNAPSHOT (#667) 2022-08-05 11:56:39 +02:00
Zhiwei Xue
3a3314bf5f fix(TUP-36175):align bcprov-jdk15on to 1.70 (#651) (#663) 2022-08-02 15:31:55 +08:00
hzhao-talendbj
e7e4f975af Revert "chore(TUP-35265): upgrade 'crypto-utils' jar in low level (#632) (#645)" (#655)
This reverts commit 42b6b0dc91.
2022-07-19 16:55:09 +08:00
build-talend-tdq
8fc590d200 chore(Jenkins): Update DQ libs to 9.1.7-SNAPSHOT (#650)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-07-14 16:53:57 +08:00
Oleksandr Zhelezniak
51765fa537 chore(TDI-48225): bump connectors 1.36.0-SNAPSHOT (#647) 2022-07-08 14:45:17 +03:00
kjwang
5f4437b689 Fix compile error that align with job server (#643) 2022-07-07 18:17:19 +08:00
Emmanuel GALLOIS
8d62b1d9f2 feat(TDI-48200) bump component-runtime to 1.46 (#641)
* feat(TDI-48200): bump component-runtime to 1.46.1
2022-07-07 10:28:59 +02:00
hzhao-talendbj
42b6b0dc91 chore(TUP-35265): upgrade 'crypto-utils' jar in low level (#632) (#645) 2022-07-06 09:53:35 +08:00
ypiel
324d16e36e chore(TDI-48098): bump connectors 1.35.0-SNAPSHOT (#634) 2022-06-10 11:22:24 +08:00
Emmanuel GALLOIS
7a0dc907fe feat(TDI-48010): bump component-runtime to 1.45.2 (#628)
* feat(TDI-48010): bump component-runtime to 1.45.0
* feat(TDI-48010): bump component-runtime to 1.45.1
2022-06-09 10:12:02 +02:00
ypiel
a812217267 chore(TDI-47964): Bump tck-component:1.34.0-SNAPSHOT (#626) 2022-05-13 18:23:24 +08:00
Emmanuel GALLOIS
f416172f71 feat(TDI-47911): bump component-runtime to 1.44.3 (#621) 2022-05-13 09:54:53 +02:00
hzhao-talendbj
b51fc60991 chore(TUP-35039): fix p2 pom (#616) 2022-04-29 11:33:22 +08:00
Oleksandr Zhelezniak
61b65a9452 fix(TDI-47338): bump json-io (#604) 2022-04-27 16:35:00 +03:00
hzhao-talendbj
d9743b182e chore(TUP-35039):CVE: com.fasterxml.jackson (#614) 2022-04-26 16:01:30 +08:00
build-talend-tdq
117ff27b9e chore(Jenkins): Update DQ libs to 9.1.5-SNAPSHOT (#612)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-04-14 19:22:08 +08:00
ypiel
fc78dd601a chore(TDI-47806): bump tck/connectors 1.33.0-SNAPSHOT (#607) 2022-04-08 17:26:28 +02:00
jiezhang-tlnd
371393c12d fix(TUP-35153)create a new plugin of org.apache.log4j to avoid the (#603)
modified plugin of orbit
2022-04-08 16:13:24 +08:00
jiezhang-tlnd
a4e4121f7b fix(TUP-34954): setup reload4j in p2 (#592) (#599) 2022-04-01 15:37:05 +08:00
zyuan-talend
e1038076ac fix(TUP-34788):Upgrade org.ops4j.pax.url:pax-url-aether:2.6.2-Talend. (#589) 2022-04-01 14:32:13 +08:00
Emmanuel GALLOIS
94d51690c0 feat(TDI-47414): bump component-runtime to 1.43.1 (#598)
- fix misaligned openwebbeans-spi dependency
2022-03-30 18:37:40 +02:00
Emmanuel GALLOIS
7894864ea9 feat(TDI-47414): bump component-runtime to 1.43.0 (#586) 2022-03-23 17:58:48 +01:00
Emmanuel GALLOIS
96edaa9b59 feat(TDI-47609): bump component-runtime to 1.42.0 (#578) 2022-03-08 11:10:07 +01:00
ypiel
4f147c0d58 chore(TDI-47610): bump connectors 1.32.0-SNAPSHOT (#583) 2022-03-08 09:48:12 +01:00
Chao MENG
423c6d685b fix(TUP-33381): Remove all the logs related to other OS (#581)
https://jira.talendforge.org/browse/TUP-33381
2022-03-07 19:10:06 +08:00
build-talend-tdq
e3f3939b2a chore(Jenkins): Update DQ libs to 9.1.4-SNAPSHOT (#575)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-03-03 17:04:15 +08:00
build-talend-tdq
509cacf539 chore(Jenkins): Update DQ libs to 9.1.3-SNAPSHOT (#572)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-02-18 17:49:55 +08:00
pyzhou
2d6c24cbb5 chore:update connector to 1.30.1-SNAPSHOR (#569) 2022-02-17 14:37:09 +08:00
Emmanuel GALLOIS
3674b4dac1 feat(TDI-47414): bump component-runtime to 1.41.0 (#560) 2022-01-27 09:19:59 +01:00
jiezhang-tlnd
30ac2e6c7b fix(TUP-31581)Remove CryptoHelper from test-studio-commandline (#563)
* fix(TUP-31581)Remove CryptoHelper from test-studio-commandline

* set version to 1.0.8
2022-01-27 09:37:12 +08:00
hzhao-talendbj
34235d0ddf fix(TUP-33675):Throw "Invalid key name: mdm.encryption.key" in error log (#564) 2022-01-26 09:37:34 +08:00
pyzhou
5204646bfd chore(TDI-47364):upgrade connector 1.30.0-snapshot (#557) 2022-01-12 00:01:17 +08:00
build-talend-tdq
27482a5b52 chore(Jenkins): Update DQ libs to 9.1.2-SNAPSHOT (#552)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-01-07 18:26:39 +08:00
wang wei
9d9dc41900 fix(TDI-47212): CVE: jackson-mapper(core)-asl-1.9.15-TALEND (#531) 2022-01-07 10:41:07 +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
13 changed files with 78 additions and 57 deletions

14
SECURITY.md Normal file
View File

@@ -0,0 +1,14 @@
# Security Policy
## Supported Versions
| Version | Supported |
| ------- | ------------------ |
| 8.0.x | :white_check_mark: |
| 7.3.x | :white_check_mark: |
| < 7.3.x | :x: |
## Reporting a Vulnerability
For information on how to report a new security problem please see [here](https://www.talend.com/security/vulnerability-disclosure/).
Our existing security advisories are published [here](https://www.talend.com/security/incident-response/).

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>
@@ -164,7 +164,7 @@
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>1.11.2</version>
<version>1.7.7</version>
</dependency>
<dependency>
@@ -175,7 +175,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.23.0</version>
<version>1.21</version>
</dependency>
<dependency>
<groupId>com.github.livesense</groupId>
@@ -224,6 +224,18 @@
<version>${components.version}</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>org.talend.components</groupId>
<artifactId>components-splunk</artifactId>
<version>${components.version}</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>org.talend.components</groupId>
<artifactId>components-jira</artifactId>
<version>${components.version}</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>org.talend.components</groupId>
<artifactId>components-couchbase</artifactId>
@@ -313,7 +325,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
<version>2.9.0</version>
<version>2.8.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -323,7 +335,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>2.2</version>
<version>1.33</version>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</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>../../talend.studio.parent.pom</relativePath>
</parent>
<groupId>org.talend.repo</groupId>
@@ -12,9 +12,9 @@
<packaging>pom</packaging>
<properties>
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
<dataquality.lib.version>9.1.16</dataquality.lib.version>
<fasterxml.jackson.version>2.14.3</fasterxml.jackson.version>
<fasterxml.jackson.databind.version>2.14.3</fasterxml.jackson.databind.version>
<dataquality.lib.version>9.1.14-SNAPSHOT</dataquality.lib.version>
<fasterxml.jackson.version>2.13.4</fasterxml.jackson.version>
<fasterxml.jackson.databind.version>2.13.4.2</fasterxml.jackson.databind.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

@@ -65,6 +65,8 @@
<feature id="org.talend.studio.components.tcompv0.marketo.feature"/>
<feature id="org.talend.studio.components.tcompv0.azurestorage.feature"/>
<feature id="org.talend.studio.components.tcompv0.snowflake.feature"/>
<feature id="org.talend.studio.components.tcompv0.jira.feature"/>
<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"/>

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,27 @@
<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.61.2</component-runtime.version>
<components.version>0.37.25</components.version>
<tacokit.components.version>1.50.0</tacokit.components.version>
<m2.fasterxml.jackson.version>2.14.3</m2.fasterxml.jackson.version>
<m2.fasterxml.jackson.databind.version>2.14.3</m2.fasterxml.jackson.databind.version>
<component-runtime.version>1.59.0</component-runtime.version>
<components.version>0.38.0-SNAPSHOT</components.version>
<tacokit.components.version>1.46.0-SNAPSHOT-FAKE</tacokit.components.version>
<m2.fasterxml.jackson.version>2.13.4</m2.fasterxml.jackson.version>
<m2.fasterxml.jackson.databind.version>2.13.4.2</m2.fasterxml.jackson.databind.version>
<jackson-codehaus.version>1.9.16-TALEND</jackson-codehaus.version>
<daikon.version>7.1.16</daikon.version>
<daikon.version>7.0.5</daikon.version>
<slf4j-api.version>1.7.34</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>7.1.16</org.talend.daikon.crypto-utils.version>
<org.talend.daikon.crypto-utils.version>7.0.5</org.talend.daikon.crypto-utils.version>
<studio-utils.version>1.0.13</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)-->
@@ -511,7 +511,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>