Compare commits

...

77 Commits

Author SHA1 Message Date
Irene Wang
5403b66cd4 DEVOPS-13537 - Sign Studio launchers for 7.4.1 (Windows) 2021-04-30 15:45:34 +02:00
jiezhang-tlnd
fb547ac3f8 chore(TUP-30992)CVE: junit-4.11,4.13 (#392)
* chore(TUP-30992)CVE: junit-4.11,4.13

* remove classifier bundle

* Update pom.xml

* switch the place of eclipse_orbit
2021-04-15 16:15:22 +08:00
mbasiuk-talend
87e2aebfd2 chore(TDI-45894): prepare the next connectors iteration (#394) 2021-04-13 13:35:02 +03:00
wang wei
ea24fc1bc5 fix(TDI-45896): upgrade tcompv0 connectors for studio (#396) 2021-04-12 10:10:43 +08:00
Chao MENG
dfb55aa4fe feat(TUP-30475): Test of lite studio (#391) 2021-04-08 14:24:58 +08:00
bhe-talendbj
f282b61182 bugfix(TUP-26813): upgrade org.bouncycastle.bcprov to 1.68 (#387)
* fix(TUP-26813): upgrade org.bouncycastle.bcprov-jdk15on to 1.68

* fix(TUP-26813): upgrade org.bouncycastle.bcprov-jdk15on to 1.68

* fix(TUP-26813): upgrade org.bouncycastle.bcprov-jdk15on to 1.68

* fix(TUP-26813): deploy org.bouncycastle 1.68

* fix(TUP-26813): deploy org.bouncycastle 1.68

* fix(TUP-26813): update studio-utils
2021-04-02 18:19:22 +08:00
wang wei
0f1379f4ff fix(TDI-45748): use 0.30.1snapshot tcompv0 for studio master branch (#384) 2021-03-24 18:00:14 +08:00
Dmytro Sylaiev
b9f723571b feat(TDI-45721): Bump TCK for master (#381) 2021-03-05 14:03:23 +02:00
bhe-talendbj
460242307e chore(TUP-29719): upgrade jackson to 2.11.4 (#367)
* fix(TUP-29719): upgrade jackson to 2.11.0

* chore(TUP-29719): upgrade to 2.11.4

Co-authored-by: hzhao-talendbj <hzhao@talend.com>
2021-03-03 18:24:10 +08:00
pyzhou
0eb0a011ca fix(TDI-45607) Upgrade tck in studio (#370) 2021-02-07 10:25:08 +08:00
hzhao-talendbj
b80820929b chore(TUP-29869): upgrade bcprov-jdk15on to 1.68 (#364) 2021-02-03 16:11:22 +08:00
hzhao-talendbj
4daf03253e Revert "fix(TUP-29719): upgrade jackson to 2.11.0 (#351)" (#366)
This reverts commit 2ff6394bc9.
2021-01-27 11:55:16 +08:00
hzhao-talendbj
2ff6394bc9 fix(TUP-29719): upgrade jackson to 2.11.0 (#351) 2021-01-26 18:02:00 +08:00
wang wei
433a183c2f bump tcompv0 to 0.30.0snapshot for master (#362) 2021-01-19 11:29:15 +08:00
Dmytro Sylaiev
c4306a2dd9 fix(TDI-45470): Bump TCK version in config.ini (#358) 2021-01-14 14:53:09 +02:00
nrousseau
ef8d349dcf Update orbit following change of eclipse (#343) 2020-12-17 10:36:03 +08:00
bhe-talendbj
84442eac3c chore(TUP-21116): update osgi qualifier format (#342) 2020-12-16 19:02:01 +08:00
nrousseau
3836961cd3 chore(TUP-21116) upgrade tycho version to 1.7.0 (#298)
* chore(TUP-21116) upgrade tycho version to 1.7.0

* chore(TUP-21116) upgrade tycho version to 1.7.0

* chore(TUP-21116) upgrade tycho version to 1.7.0

* update pom

* update pom

* chore(TUP-21116): upgrade tycho

* chore(TUP-21116): upgrade tycho

* chore(TUP-21116): add version to talend.product

* chore(TUP-21116): reset qualifer format for snapshot build

* chore(TUP-21116): add compilation flag

Co-authored-by: bhe-talendbj <bhe@talend.com>
2020-12-15 15:31:47 +08:00
pyzhou
0f049a8c92 chore(TDI-45339): Bump TCK comp version (#341) 2020-12-14 16:02:59 +08:00
iwangtalend
02bb1ecc7c Update newbuild URL (#337) 2020-12-10 10:02:19 +01:00
build-talend-tdq
952acaf430 chore(Jenkins): Update DQ libs to 8.3.2-SNAPSHOT (#333)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2020-11-24 20:26:29 +08:00
mbasiuk-talend
0410f8032d chore(TDI-44770): update snakeyaml for master (#332) 2020-11-23 11:34:07 +02:00
iwangtalend
517669f07c Fix TOS DQ product name 2020-11-18 17:19:18 +01:00
iwangtalend
f29267c23e Fix TOS ESB name 2020-11-18 17:17:30 +01:00
chmyga
57567c15ed chore(TDI-45157): bump TCK components version (#329)
Co-authored-by: Dmytro Chmyga <dmytro.chmyga@synapse.com>
2020-11-10 14:40:26 +02:00
Oleksandr Zhelezniak
294f6b5836 chore(TDI-44523): resolve cve issue (#326)
* update daikon-ee [1.5.0] -> [3.2.0] for tSetDynamicSchema
2020-11-09 11:00:12 +02:00
wang wei
ffce1d5c4e fix(TDI-44824): Observability: Update daikon-audit library version (#322) 2020-09-18 15:07:38 +08:00
Oleksandr Zhelezniak
ba59819f49 chore(TDI-44671): bump tck components (#319)
* bump version of TCK components [1.12.0-SNAPSHOT] -> [1.14.0-SNAPSHOT]
2020-09-11 12:53:38 +03:00
bhe-talendbj
8dad0f7c70 fix(TUP-27438): restore org.apache.commons.codec (#315) 2020-09-08 15:26:27 +08:00
Oleksandr Zhelezniak
311822ac44 chore(TDI-44799): bump version of TCK components (#314)
* bump version of TCK components from [1.11.0-SNAPSHOT] to [1.12.0-SNAPSHOT]
2020-09-03 12:26:18 +03:00
jzhao
416d854b2b fix(TDI-44145):update common-codec for p2 (#311) 2020-09-01 11:56:18 +08:00
bhe-talendbj
7a4af470a4 feat(TUP-27438): Add studio-utils to dependencies.p2.tos (#310)
* feat(TUP-27438): Add studio-utils to dependencies.p2.tos

* feat(TUP-27438): update groupId
2020-08-31 09:47:23 +08:00
jiezhang-tlnd
b83a21f72b feat(TUP-28305)Update Talend logo for studio 7.4 launcher (#309) 2020-08-25 16:00:29 +08:00
build-talend-tdq
0d3e289820 chore(Jenkins): Update DQ libs to 8.3.1-SNAPSHOT (#304)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2020-07-20 14:19:57 +08:00
build-talend-tdq
d5a3675f25 chore(Jenkins): Update DQ libs to 8.1.1-SNAPSHOT (#303) 2020-07-19 09:22:51 +08:00
build-talend-tdq
81648c0cc8 chore(Jenkins): Update DQ libs to 8.3.1-SNAPSHOT (#302) 2020-07-17 16:05:40 +08:00
build-talend-tdq
056fc2d811 chore(Jenkins): Update DQ libs to 8.3.0 (#301) 2020-07-17 15:40:13 +08:00
hzhao-talendbj
429db0187b TUP-27154 - Update BeanUtils to 1.9.4 (#269) (#297)
Co-authored-by: Colm O hEigeartaigh <coheigea@users.noreply.github.com>
2020-07-14 12:14:40 +08:00
nrousseau
7474f094f2 Revert "TUP-27154 - Update BeanUtils to 1.9.4 (#269)" (#295)
This reverts commit d8c10ea4a3.
2020-07-13 18:11:27 +08:00
Colm O hEigeartaigh
d8c10ea4a3 TUP-27154 - Update BeanUtils to 1.9.4 (#269) 2020-07-03 12:26:12 +08:00
pyzhou
79db3f9919 fix(TDI-44402):update tacokit version studio (#287) 2020-06-19 11:50:07 +08:00
wang wei
9a81eaa34d fix(TDI-44306): adjust the audit event log integration in studio (#282) 2020-06-10 16:30:12 +08:00
bhe-talendbj
c7bfcae92b bugfix(TUP-27224): Upgrade crypto-utils and daikon to 0.31.11 (#279)
* fix(TUP-27224): Upgrade crypto-utils to 2.1.0

* fix(TUP-27224): Upgrade daikon version to 2.1.0

* fix(TUP-27224): Upgrade daikon version to 0.31.11
2020-05-26 19:56:32 +08:00
pyzhou
06e0945fa3 fix(TDI-44203):upgrade tacokit version to 1.10.0-SNAPSHOT for studio (#271) 2020-05-15 09:38:04 +08:00
Roman
8637c51f88 fix(TDI-44125): Bump daikon-ee.format version (#270) 2020-05-13 13:17:17 +03:00
bhe-talendbj
99dcdfb0db feat(TUP-26303): Copy jarlist and notice,report to bom folder (#267) 2020-04-14 10:58:44 +08:00
pyzhou
00780637ba feat(TDI-43717):integrate cosmosDB into studio (#266) 2020-04-14 10:04:01 +08:00
bhe-talendbj
d69a3c8a88 feat(TUP-26303): Integrate bom tool plugin (#261)
* feat(TUP-26303): Integrate cve tool plugin

* feat(TUP-26303): Add bom outputs

* feat(TUP-26303): Correct artifact id

* feat(TUP-26303): Copy bom only

* feat(TUP-26303): Fix unintentional changes

* feat(TUP-26303): Update directory of bom

* feat(TUP-26303): Add pluginRepository for bomtool

* feat(TUP-26303): Update echo message
2020-04-08 18:06:58 +08:00
Zhiwei Xue
d8f17f42f8 feat(TUP-26304):Have a root studio bom for SE/EE product (#251) 2020-04-01 15:06:52 +08:00
build-talend-tdq
05c09ee985 chore(Jenkins): Update DQ libs to 8.1.1-SNAPSHOT (#254)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2020-03-14 22:17:06 +01:00
Roman
51b442c2b4 chore: bump tacokit version for studio (#253) 2020-03-11 23:26:23 +08:00
mbasiuk-talend
9f9394fa0f chore: bump components-version to 0.29.0-SNAPSHOT (#250)
* chore: bump components-version to 0.29.0-SNAPSHOT
2020-03-04 18:22:49 +08:00
build-talend-tdq
cad210df20 chore(Jenkins): Update DQ libs to 8.0.1-SNAPSHOT (#248) 2020-02-25 15:17:06 +01:00
Jenkins Continuous Build server
69dfab2bf6 Set version to 7.4.1 SNAPSHOT 2020-02-21 15:34:46 +01:00
Roman
878d4211db chore: bump Components version to 0.28.2 (#245) 2020-02-14 22:02:43 +08:00
build-talend-tdq
8712de2933 chore(Jenkins): Update DQ libs to 8.0.0 (#244) 2020-02-13 18:44:21 +01:00
Ivan Gonchar
02d9cca2ad chore: bump tcompV0 version to 0.28.1 (#242) 2020-02-14 01:16:42 +08:00
wang wei
d240f4a4a8 fix(TDI-43678): bump tacokit version for studio (#239) 2020-02-10 17:06:10 +08:00
wang wei
48c7fcab7f fix(TDI-43671): bump tcompv0 and daikon in studio (#238) 2020-02-10 12:25:26 +08:00
wang wei
5ef43c83e6 fix(TDI-43574): update the reference point for tacokit in studio (#237) 2020-02-05 10:12:31 +08:00
build-talend-tdq
65816f5ea7 chore(Jenkins): Update DQ libs to 8.0.1-SNAPSHOT (#236) 2020-02-04 18:12:50 +01:00
Matthieu Debarre
733df4c762 DOCT-13317 (#233) 2020-01-24 19:00:34 +01:00
build-talend
078d0b5476 chore(Jenkins): Update DQ libs to 8.0.0-SNAPSHOT (#229) 2020-01-09 10:47:53 +01:00
kjwang
ec11efc3b6 Fix TUP-24523 Online Help in studio - refactor help features (Fix a (#228)
* Fix TUP-24523 Online Help in studio - refactor help features (Fix a
comiple error)
https://jira.talendforge.org/browse/TUP-24523

* Fix TUP-24523 Online Help in studio - refactor help features (Fix a
comiple error)
https://jira.talendforge.org/browse/TUP-24523
2019-12-30 19:16:15 +08:00
Pierre Teyssier
481c4a55a5 chore(TDI-43099): bump connectors (#227) 2019-12-30 18:36:19 +08:00
Liu Xinquan
44e4727bc4 Revert "chore(Jenkins): Update DQ libs to 8.0.0-SNAPSHOT (#225)" (#226)
This reverts commit 0d4b025d62.
2019-12-24 17:50:42 +08:00
build-talend
0d4b025d62 chore(Jenkins): Update DQ libs to 8.0.0-SNAPSHOT (#225) 2019-12-24 10:55:07 +08:00
build-talend
8f9f871822 chore(Jenkins): Update DQ libs to 7.4.2-SNAPSHOT (#224)
* chore(Jenkins): Update DQ libs to 8.0.0-SNAPSHOT

* use DQ lib SE 7.4.2-SNAPSHOT
2019-12-12 07:39:20 +01:00
Zhiwei Xue
e8ef341670 feat(TUP-24717):Activate/Deactivate plugins when install patch/update (#217)
* feat(TUP-24717):Activate/Deactivate plugins when install patch/update

* feat(TUP-25187): add test case.

* feat(TUP-25187): remove testing repository.
2019-12-11 16:05:26 +08:00
Chao MENG
4de7a06af0 fix(TUP-24026): update jackson to 2.10.0 (#223)
* fix(TUP-24026): update jackson to 2.10.0

make studio compatible with bonita plugins

* fix(TUP-24026): update jackson to 2.10.0

make studio compatible with bonita plugins
2019-12-11 11:06:08 +08:00
nrousseau
b00f29c951 fix(TUP-24026): update jackson to 2.10.1 2019-12-09 14:32:25 +08:00
nrousseau
e23c04ab2a fix(TUP-24026): update jackson to 2.10.1 2019-12-09 13:58:13 +08:00
Chao MENG
ad0c723115 fix(TUP-24026): update jackson to 2.10.0 (#215)
* fix(TUP-24026): update jackson to 2.10.0

https://jira.talendforge.org/browse/TUP-24026

* fix(TUP-24026): update jackson to 2.10.1

https://jira.talendforge.org/browse/TUP-24026
2019-12-09 10:55:57 +08:00
Emmanuel GALLOIS
ddebe7e96a fix(TDI-43300): fix tacokit component jar clash with locales (#222) 2019-12-02 21:34:51 +08:00
nrousseau
25836f9d3e Revert "chore(TUP-21116) upgrade tycho version to 1.5.1"
This reverts commit fc4e9b6159.
2019-12-02 14:47:54 +08:00
Nicolas Rousseau
fc4e9b6159 chore(TUP-21116) upgrade tycho version to 1.5.1 2019-12-02 14:45:54 +08:00
build-talend
32733397a5 chore(Jenkins): Update DQ libs to 7.4.1-SNAPSHOT (#216) 2019-10-31 16:42:14 +01:00
20 changed files with 243 additions and 87 deletions

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.talend.repo</groupId>
<artifactId>dependencies.p2</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.4.1-SNAPSHOT</version>
</parent>
<artifactId>dependencies.p2.tos</artifactId>
@@ -137,7 +137,7 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.3</version>
<version>1.9.4</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -189,7 +189,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.19</version>
<version>1.19</version>
</dependency>
<dependency>
<groupId>com.github.livesense</groupId>
@@ -312,9 +312,9 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.10</version>
<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>
@@ -329,7 +329,7 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.3</version>
<version>1.9.4</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -344,33 +344,61 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
<version>${fasterxml.jackson.version}</version>
<version>${fasterxml.jackson.bonita.compatible.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>${fasterxml.jackson.version}</version>
<version>${fasterxml.jackson.bonita.compatible.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-csv</artifactId>
<version>${fasterxml.jackson.version}</version>
<version>${fasterxml.jackson.bonita.compatible.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-smile</artifactId>
<version>${fasterxml.jackson.version}</version>
<version>${fasterxml.jackson.bonita.compatible.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<version>${fasterxml.jackson.version}</version>
<version>${fasterxml.jackson.bonita.compatible.version}</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.23</version>
<version>1.26</version>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
<version>4.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
<version>5.3.0</version>
</dependency>
<dependency>
<groupId>org.talend.studio</groupId>
<artifactId>studio-utils</artifactId>
<version>${studio-utils.version}</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov</artifactId>
<version>1.68.0</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<classifier>bundle</classifier>
</dependency>
</dependencies>
</project>

View File

@@ -1,16 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../talend.studio.parent.pom</relativePath>
</parent>
<groupId>org.talend.repo</groupId>
<artifactId>dependencies.p2</artifactId>
<version>7.3.1-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
<components.version>0.28.0-SNAPSHOT</components.version>
<dataquality.lib.version>7.4.0-SNAPSHOT</dataquality.lib.version>
<fasterxml.jackson.version>2.9.9</fasterxml.jackson.version>
<daikon.version>0.31.10-SNAPSHOT</daikon.version>
<dataquality.lib.version>8.3.2-SNAPSHOT</dataquality.lib.version>
<fasterxml.jackson.version>2.11.4</fasterxml.jackson.version>
<!-- jackson dataformat and jaxb should use version 2.9.10 to make studio compatible with bonita -->
<fasterxml.jackson.bonita.compatible.version>2.9.10</fasterxml.jackson.bonita.compatible.version>
</properties>
<distributionManagement>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath />
</parent>

View File

@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend.studio</groupId>
<artifactId>studio-bom</artifactId>
<version>7.3.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>studio bom</name>
<properties>
<daikon.version>0.31.6</daikon.version>
</properties>
</project>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath />
</parent>

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">
<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">
<configIni use="default">
<linux>config.ini</linux>
@@ -43,7 +43,6 @@
<feature id="org.talend.jdt.feature"/>
<feature id="org.talend.libraries.jdbc.feature"/>
<feature id="org.talend.m2e.feature"/>
<feature id="org.talend.model.migration.feature"/>
<feature id="org.talend.platform.feature"/>
<feature id="org.talend.rcp.feature"/>
<feature id="org.talend.repository.feature"/>
@@ -63,6 +62,9 @@
<feature id="org.talend.updates.feature"/>
<feature id="org.talend.utils.feature"/>
<feature id="org.talend.dataquality.se.test.feature"/>
<feature id="org.talend.help.di.feature"/>
<feature id="org.talend.help.bd.feature"/>
<feature id="org.talend.help.esb.feature"/>
</features>

View File

@@ -15,4 +15,4 @@ eclipse.p2.data.area=@config.dir/../p2/
eclipse.p2.profile=profile
default.update.site.url=https://update.talend.com/Studio/tos/
component.java.coordinates = org.talend.components:couchbase:1.3.0-SNAPSHOT
component.java.coordinates = org.talend.components:couchbase:1.21.0-SNAPSHOT,org.talend.components:cosmosDB:1.21.0-SNAPSHOT

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>

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">
<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">
<configIni use="default">
<linux>config.ini</linux>
@@ -16,7 +16,7 @@
</features>
<configurations>
<plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
<plugin id="org.apache.felix.scr" autoStart="true" version="2.0.14.v20180822-1822" startLevel="2" />
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>

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">
<product uid="org.talend.studio.tos.di.product" id="org.talend.rcp.branding.tos.product" useFeatures="true" includeLaunchers="false" version="7.4.1.qualifier">
<configIni use="default">
<linux>config.ini</linux>
@@ -18,7 +18,7 @@
</features>
<configurations>
<plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
<plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" version="2.0.14.v20180822-1822" />
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>

View File

@@ -1,8 +1,8 @@
launcher.prefix=TOS_DQ
storage.prefix=${launcher.prefix}
product.name=Talend Open Profiler
product.name=Talend Open Studio for Data Quality
product.branding.platform=org.talend.rcp.branding.top
product.branding.id=${product.branding.platform}.product
mac.launcher.info=${product.name} for Mac OS X, Copyright Talend. 2006-2015. All rights reserved.
product.website=http://www.talend.com\n
storage.dir=top
storage.dir=top

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">
<product uid="org.talend.studio.tos.dq.product" id="org.talend.rcp.branding.top.product" useFeatures="true" includeLaunchers="false" version="7.4.1.qualifier">
<configIni use="default">
<linux>config.ini</linux>
@@ -16,14 +16,13 @@
</features>
<configurations>
<plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
<plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" version="2.0.14.v20180822-1822" />
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
<plugin id="org.ops4j.pax.url.mvn" autoStart="true" startLevel="0" />
<plugin id="org.talend.components.api.service.osgi" autoStart="true" startLevel="0" />
<plugin id="org.talend.maven.resolver" autoStart="true" startLevel="0" />
</configurations>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>

View File

@@ -1,8 +1,8 @@
launcher.prefix=TOS_ESB
storage.prefix=TOS_ESB-Studio
product.name=Talend Open Studio
product.name=Talend Open Studio for ESB
product.branding.platform=org.talend.rcp.branding.esbstandard
product.branding.id=${product.branding.platform}.product
mac.launcher.info=${product.name} for Mac OS X, Copyright Talend. 2006-2015. All rights reserved.
product.website=http://www.talend.com\n
storage.dir=esb
storage.dir=esb

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">
<product uid="org.talend.studio.tos.esb.product" id="org.talend.rcp.branding.esbstandard.product" useFeatures="true" includeLaunchers="false" version="7.4.1.qualifier">
<configIni use="default">
<linux>config.ini</linux>
@@ -16,7 +16,7 @@
</features>
<configurations>
<plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
<plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" version="2.0.14.v20180822-1822" />
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath />
</parent>
@@ -33,11 +33,35 @@
<url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>releases</id>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceRelease/</url>
</pluginRepository>
<pluginRepository>
<id>snapshots</id>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
<url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
</pluginRepository>
</pluginRepositories>
<properties>
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
<product.final.name>${storage.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
<studio.dir>${project.build.directory}/products/${project.artifactId}/${osgi.os}/${osgi.ws}/${osgi.arch}</studio.dir>
<bom.out.dir>${project.build.directory}/products/${project.artifactId}-bom</bom.out.dir>
<bom.final.name.prefix>${storage.prefix}-${product.timestamp}-V${product.version}-${revision.filename}</bom.final.name.prefix>
<bom.final.name>${bom.final.name.prefix}-bom.xlsx</bom.final.name>
</properties>
<build>
@@ -110,7 +134,7 @@
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>eclipse-launcher-binaries</artifactId>
<version>4.4.1e</version>
<version>7.4.1a</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${studio.dir}</outputDirectory>
@@ -118,7 +142,7 @@
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>eclipse-launcher-mac-${launcher.prefix}</artifactId>
<version>7.3.1</version>
<version>7.4.1</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${studio.dir}</outputDirectory>
@@ -206,6 +230,24 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.talend.studio</groupId>
<artifactId>bomtool</artifactId>
<version>1.0.0-SNAPSHOT</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>genNotice</goal>
</goals>
</execution>
</executions>
<configuration>
<studioDirectory>${studio.dir}</studioDirectory>
<outputDirectory>${bom.out.dir}</outputDirectory>
<productVersion>${product.version}</productVersion>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
@@ -421,7 +463,7 @@
<version>${tycho.version}</version>
<configuration>
<strictBinIncludes>false</strictBinIncludes>
<format>yyyyMMdd'_'HHmm'${release.suffix}'</format>
<format>yyyyMMdd'_'HHmm</format>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
<!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
@@ -445,7 +487,7 @@
<version>${tycho.version}</version>
<configuration>
<strictBinIncludes>false</strictBinIncludes>
<format>'${product.timestamp}${release.suffix}'</format>
<format>yyyyMMdd'_'HHmm</format>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
<!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
@@ -497,13 +539,30 @@
<mkdir dir="${product.dir}" />
<echo>Moving product ZIP ${project.build.directory}/products/${product.final.name}.zip to ${product.dir}</echo>
<move todir="${product.dir}" file="${project.build.directory}/products/${product.final.name}.zip" />
<!-- Copy bom -->
<property name="bom.build.path" value="${product.build.id}/BOMS" />
<property name="bom.dir" value="${storage}/${bom.build.path}" />
<mkdir dir="${bom.dir}" />
<echo>Copying ${bom.out.dir}/BOM.xlsx to ${bom.dir}/${bom.final.name}</echo>
<copy tofile="${bom.dir}/${bom.final.name}" file="${bom.out.dir}/BOM.xlsx" />
<echo>Copying ${bom.out.dir}/jarlist.json to ${bom.dir}/${bom.final.name.prefix}-jarlist.json</echo>
<copy tofile="${bom.dir}/${bom.final.name.prefix}-jarlist.json" file="${bom.out.dir}/jarlist.json" />
<echo>Copying ${bom.out.dir}/NOTICE.txt to ${bom.dir}/${bom.final.name.prefix}-NOTICE.txt</echo>
<copy tofile="${bom.dir}/${bom.final.name.prefix}-NOTICE.txt" file="${bom.out.dir}/NOTICE.txt" />
<echo>Copying ${bom.out.dir}/report.txt to ${bom.dir}/${bom.final.name.prefix}-report.txt</echo>
<copy tofile="${bom.dir}/${bom.final.name.prefix}-report.txt" file="${bom.out.dir}/report.txt" />
<if>
<and>
<equals arg1="${env.HUDSON_URL}" arg2="http://newbuild.talend.com:8180/" />
<equals arg1="${env.HUDSON_URL}" arg2="https://ci-newbuild.talend.com/" />
<equals arg1="${automaticnb}" arg2="1" />
</and>
<then>
<echo file="${storage}/lastnb.txt" append="true">http://newbuild.talend.com/builds/${product.build.path}/${product.final.name}.zip${line.separator}</echo>
<echo file="${storage}/lastnb.txt" append="true">http://newbuild.talend.com/builds/${bom.build.path}/${bom.final.name}${line.separator}</echo>
<echo file="${storage}/lastnb.txt" append="true">http://newbuild.talend.com/builds/${bom.build.path}/${bom.final.name.prefix}-jarlist.json${line.separator}</echo>
<echo file="${storage}/lastnb.txt" append="true">http://newbuild.talend.com/builds/${bom.build.path}/${bom.final.name.prefix}-NOTICE.txt${line.separator}</echo>
<echo file="${storage}/lastnb.txt" append="true">http://newbuild.talend.com/builds/${bom.build.path}/${bom.final.name.prefix}-report.txt${line.separator}</echo>
</then>
</if>
<exec executable="openssl" dir="${product.dir}" outputproperty="sha256">

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.4.1-SNAPSHOT</version>
<relativePath />
</parent>

View File

@@ -3,20 +3,26 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tycho.version>0.22.0</tycho.version>
<components.version>0.30.2-SNAPSHOT</components.version>
<daikon.version>0.31.11</daikon.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.11</org.talend.daikon.crypto-utils.version>
<studio-utils.version>1.0.1</studio-utils.version>
<tycho.version>1.7.0</tycho.version>
<tycho-extras.version>${tycho.version}</tycho-extras.version>
<base.version>7.3.1</base.version>
<base.version>7.4.1</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)-->
<maven.compatible.version>${base.version}-SNAPSHOT</maven.compatible.version>
<repo.type>Snapshot</repo.type>
<doc.version>7.2.1-SNAPSHOT</doc.version>
<doc.version>7.3.1-SNAPSHOT</doc.version>
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
<talend.nexus.url>${talend.nexus.host}/nexus/content/repositories</talend.nexus.url>
<talend.nexus.p2unzip.url>${talend.nexus.host}/nexus/content/unzip</talend.nexus.p2unzip.url>
@@ -32,6 +38,7 @@
<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>
<tos-deps-p2-repo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSource${repo.type}/org/talend/repo/dependencies.p2.tos/${maven.compatible.version}/dependencies.p2.tos-${maven.compatible.version}.zip-unzip/</tos-deps-p2-repo.url>
<eclipse-orbit-p2-repo.url>${opensourcerelease-unziprepo.url}/orbit/7.4.1/orbit-7.4.1.zip-unzip</eclipse-orbit-p2-repo.url>
<jgit.dirtyWorkingTree.official>error</jgit.dirtyWorkingTree.official>
<osgi.ws>win32</osgi.ws>
<osgi.os>win32</osgi.os>
@@ -55,11 +62,17 @@
</distributionManagement>
<repositories>
<repository>
<id>tos-deps</id>
<url>${tos-deps-p2-repo.url}</url>
<layout>p2</layout>
</repository>
<repository>
<id>eclipse_orbit</id>
<url>${eclipse-orbit-p2-repo.url}</url>
<layout>p2</layout>
</repository>
<repository>
<id>eclipse_repo</id>
<url>${eclipse-repo.url}</url>
@@ -155,12 +168,12 @@
</environments>
<filters>
<!-- restrict version of a bundle -->
<!--<filter>
<type>eclipse-plugin</type>
<id>org.eclipse.ui.views.properties.tabbed</id>
<restrictTo>
<version>3.6.100.v20140519-0906</version>
</restrictTo>
<!--<filter>
<type>eclipse-plugin</type>
<id>org.eclipse.ui.views.properties.tabbed</id>
<restrictTo>
<version>3.6.100.v20140519-0906</version>
</restrictTo>
</filter>-->
<filter>
<type>eclipse-plugin</type>
@@ -170,22 +183,22 @@
</restrictTo>
</filter>
<!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence
<filter>
<type>java-package</type>
<id>javax.persistence</id>
<restrictTo>
<type>eclipse-plugin</type>
<id>javax.persistence</id>
</restrictTo>
</filter>
<!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence
<filter>
<type>java-package</type>
<id>javax.persistence</id>
<restrictTo>
<type>eclipse-plugin</type>
<id>javax.persistence</id>
</restrictTo>
</filter>
-->
<!-- example 3: work around Equinox bug 348045
<filter>
<type>p2-installable-unit</type>
<id>org.eclipse.equinox.servletbridge.extensionbundle</id>
<removeAll />
</filter>
<!-- example 3: work around Equinox bug 348045
<filter>
<type>p2-installable-unit</type>
<id>org.eclipse.equinox.servletbridge.extensionbundle</id>
<removeAll />
</filter>
-->
</filters>
</configuration>
@@ -195,7 +208,10 @@
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
<compilerArgument>-warn:+discouraged,forbidden</compilerArgument>
<compilerArgs>
<arg>-err:+discouraged,forbidden</arg>
<arg>-warn:+discouraged,forbidden</arg>
</compilerArgs>
<compilerVersion>1.8</compilerVersion>
<source>1.8</source>
<target>1.8</target>
@@ -204,6 +220,67 @@
</plugins>
</build>
<profiles>
<profile>
<id>patch</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<properties>
<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>
</properties>
<repositories>
<repository>
<id>talend_open_p2</id>
<url>${tos-p2-repo.url}</url>
<layout>p2</layout>
</repository>
</repositories>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<id>parse-version</id>
<goals>
<goal>parse-version</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho.version}</version>
<dependencies>
<dependency>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-buildtimestamp-jgit</artifactId>
<version>${tycho-extras.version}</version>
</dependency>
</dependencies>
<configuration>
<strictBinIncludes>false</strictBinIncludes>
<format>${timestamp}'-patch'</format>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
<!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
<manifestEntries>
<Built-By />
</manifestEntries>
</archive>
<timestampProvider>jgit</timestampProvider>
<jgit.ignore>pom.xml</jgit.ignore>
<jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>nonofficial</id>
<activation>