Compare commits

...

83 Commits

Author SHA1 Message Date
hzhao-talendbj
7704cdecc4 Revert "chore(TUP-35265): upgrade 'crypto-utils' jar in low level (#632)" (#653)
This reverts commit 81dd959e07.
2022-07-19 16:24:01 +08:00
build-talend-tdq
114c7b2d2e chore(Jenkins): Update DQ libs to 9.1.6 (#649)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-07-14 13:22:26 +08:00
Oleksandr Zhelezniak
46f01059c0 chore(TDI-48225): bump connectors 1.35.0 (#648) 2022-07-08 14:45:27 +03:00
jzhao
07a1d22cd3 chore(TDI-48224):bump TCOMPv0 0.37.9 for 8.0.1-R2022-07 (#646) 2022-07-07 19:39:28 +08:00
Emmanuel GALLOIS
639b74a648 feat(TDI-48200) bump component-runtime to 1.46 (#642)
* feat(TDI-48200): bump component-runtime to 1.46.1
2022-07-07 10:29:35 +02:00
hzhao-talendbj
81dd959e07 chore(TUP-35265): upgrade 'crypto-utils' jar in low level (#632) 2022-07-04 17:41:48 +08:00
ypiel
47903d257e chore: bump tck connectors 1.34.1 (#636) 2022-06-14 08:45:59 +02:00
jzhao
fea5b52f15 chore(TDI-48099):bump TCOMPv0 0.37.8 for 8.0.1-R2022-06 (#635) 2022-06-10 15:19:40 +08:00
ypiel
a162260521 chore(TDI-48098): bump connectors 1.34.0 (#633) 2022-06-10 11:22:41 +08:00
Emmanuel GALLOIS
7d512489e8 feat(TDI-48010): bump component-runtime to 1.45.2 (#629)
* 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:17 +02:00
ypiel
905085836e chore(TDI-47964): Bump tck-component:1.33.1 (#625) 2022-05-13 18:23:16 +08:00
Emmanuel GALLOIS
034717ec85 feat(TDI-47911): bump component-runtime to 1.44.3 (#620) 2022-05-13 09:55:20 +02:00
build-talend-tdq
9d9e2f93cc chore(Jenkins): Update DQ libs to 9.1.5 (#624)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-05-12 12:24:13 +08:00
pyzhou
cbf500ec89 fix(TDI-47953):Bump TCOMPv0 0.37.7 for 8.0.1-R2022-05 (#622) 2022-05-06 18:22:34 +08:00
Oleksandr Zhelezniak
9985fd2dbf fix(TDI-47338): bump json-io (#604) (#619) 2022-05-05 10:54:33 +03:00
hzhao-talendbj
265f837c65 chore(TUP-35039):CVE: com.fasterxml.jackson (#611)
* chore(TUP-35039):CVE: com.fasterxml.jackson

* chore(TUP-35039):CVE: com.fasterxml.jackson
2022-04-26 09:37:01 +08:00
build-talend-tdq
452f66915a chore(Jenkins): Update DQ libs to 9.1.4 (#609)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-04-14 17:09:46 +08:00
Emmanuel GALLOIS
ddb9a6cc1d feat(TDI-47693): bump component-runtime to 1.43.1 (#587)
* feat(TDI-47693): bump component-runtime to 1.43.0
* fix(TDI-47693): component-runtime 1.43.1
- fix misaligned openwebbeans-spi dependency
2022-04-13 09:14:06 +02:00
ypiel
11603bfd16 chore: bump tck/connectors 1.32.1 (#608) 2022-04-08 17:36:09 +02:00
jzhao
3454ffbcd3 chore(TDI-47808):bump tcompv0 to 0.37.6 (#605) 2022-04-08 18:09:39 +08:00
jiezhang-tlnd
bd6155d707 fix(TUP-35153)create a new plugin of org.apache.log4j to avoid the (#602)
modified plugin of orbit
2022-04-08 16:13:02 +08:00
jiezhang-tlnd
e8a5638347 fix(TUP-34954): setup reload4j in p2 (#592) 2022-04-01 14:14:49 +08:00
zyuan-talend
76d6effdfc fix(TUP-34788):Upgrade org.ops4j.pax.url:pax-url-aether:2.6.2-Talend. (#588) 2022-04-01 11:56:37 +08:00
build-talend-tdq
2cefa2c663 chore(Jenkins): Update DQ libs to 9.1.3 (#595)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-03-29 19:02:39 +08:00
pyzhou
8f61cf15b9 fix(TDI-47662): Bump up connector 1.31.1 (#584) 2022-03-14 18:35:51 +08:00
Emmanuel GALLOIS
115c035f18 feat(TDI-47609): bump component-runtime to 1.42.0 (#577) 2022-03-10 08:44:36 +01:00
ypiel
22f981c99f chore(TDI-47610): bump connectors 1.31.0 (#582) 2022-03-08 09:28:43 +01:00
Chao MENG
c8fbdc19e8 fix(TUP-33381): Remove all the logs related to other OS (#580)
https://jira.talendforge.org/browse/TUP-33381
2022-03-07 19:06:21 +08:00
clesaec
afe006376c bump tcomp to 0.37.5 (#579) 2022-03-04 15:45:01 +01:00
build-talend-tdq
c18002c20f chore(Jenkins): Update DQ libs to 9.0.6 (#576)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2022-03-04 18:05:03 +08:00
pyzhou
56aacbd26d chore:upgrade connector to 1.30.2 (#571) 2022-02-16 17:17:24 +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
Oleksandr Zhelezniak
6f8dbb24db chore(TDI-46716): bump connectors 1.26.0-SNAPSHOT (#470) 2021-09-13 10:32:15 +03:00
Emmanuel GALLOIS
4664cd2acd feat(TDI-46568): bump to component-runtime 1.36.1 (#466)
* feat(TDI-46568): bump component-runtime to 1.36.0 in Studio 8
* feat(TDI-46568): bump to component-runtime 1.36.1
2021-09-10 12:49:51 +02:00
vyu-talend
5202500915 chore(TDI-46713):bump 0.36.0-snapshot (#468) 2021-09-10 17:46:19 +08:00
18 changed files with 91 additions and 87 deletions

View File

@@ -43,7 +43,7 @@
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
<version>2.6.2-Talend</version>
<version>2.6.3-Talend</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
@@ -112,7 +112,7 @@
<dependency>
<groupId>com.cedarsoftware</groupId>
<artifactId>json-io</artifactId>
<version>4.9.9-TALEND</version>
<version>4.13.1-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>
@@ -365,6 +360,26 @@
<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

@@ -12,8 +12,9 @@
<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>
<fasterxml.jackson.version>2.11.4</fasterxml.jackson.version>
<dataquality.lib.version>9.1.6</dataquality.lib.version>
<fasterxml.jackson.version>2.13.2</fasterxml.jackson.version>
<fasterxml.jackson.databind.version>2.13.2.2</fasterxml.jackson.databind.version>
</properties>
<distributionManagement>

View File

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

View File

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

View File

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

View File

@@ -10,4 +10,5 @@
<artifactId>org.talend.studio.tos.bigdata.product</artifactId>
<packaging>eclipse-repository</packaging>
</project>

View File

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

View File

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

View File

@@ -10,4 +10,5 @@
<artifactId>org.talend.studio.tos.di.product</artifactId>
<packaging>eclipse-repository</packaging>
</project>

View File

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

View File

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

View File

@@ -10,4 +10,5 @@
<artifactId>org.talend.studio.tos.dq.product</artifactId>
<packaging>eclipse-repository</packaging>
</project>

View File

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

View File

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

View File

@@ -10,4 +10,5 @@
<artifactId>org.talend.studio.tos.esb.product</artifactId>
<packaging>eclipse-repository</packaging>
</project>

View File

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

View File

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

View File

@@ -8,18 +8,19 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<components.version>0.35.0-SNAPSHOT</components.version>
<tacokit.components.version>1.25.0-SNAPSHOT</tacokit.components.version>
<component-runtime.version>1.36.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>
<component-runtime.version>1.46.1</component-runtime.version>
<components.version>0.37.9</components.version>
<tacokit.components.version>1.35.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>
<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.4</studio-utils.version>
<compcache.creator.version>1.0.0-SNAPSHOT</compcache.creator.version>
<studio-utils.version>1.0.8</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>
@@ -35,7 +36,7 @@
<opensourcesnapshot-unziprepo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSourceSnapshot/org/talend/repo</opensourcesnapshot-unziprepo.url>
<opensourcerelease-unziprepo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSourceRelease/org/talend/repo</opensourcerelease-unziprepo.url>
<eclipse-repo.url>${opensourcerelease-unziprepo.url}/eclipse-p2-repo/4.20/eclipse-p2-repo-4.20.zip-unzip/</eclipse-repo.url>
<babel-repo.url>https://download.eclipse.org/technology/babel/update-site/R0.19.0/2021-06/</babel-repo.url>
<babel-repo.url>${opensourcerelease-unziprepo.url}/babel-r2021-06/0.19.0/babel-r2021-06-0.19.0.zip-unzip/</babel-repo.url>
<opensourcesnapshot-repo.url>${talend.nexus.url}/TalendOpenSourceSnapshot</opensourcesnapshot-repo.url>
<opensourcerelease-repo.url>${talend.nexus.url}/TalendOpenSourceRelease</opensourcerelease-repo.url>
<tos-p2-repo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSource${repo.type}/org/talend/studio/talend-tos-p2-repo/${osgi.compatible.version}/talend-tos-p2-repo-${osgi.compatible.version}.zip-unzip/</tos-p2-repo.url>
@@ -419,7 +420,7 @@
</files>
</configuration>
</execution>
</executions>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
@@ -459,6 +460,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>
@@ -466,6 +468,11 @@
<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>
@@ -495,7 +502,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 -->
@@ -504,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>