Compare commits

..

37 Commits

Author SHA1 Message Date
jzhao
3d9bcdb0d5 chore: bump tcompV0 version to 0.28.5 2020-06-11 10:53:32 +08:00
build-talend-tdq
f8e1658e8c chore(Jenkins): Update DQ libs to 8.0.2 (#285) 2020-06-10 11:51:34 +08:00
mbasiuk-talend
cbce9b8c6b chore: backport patch731 changes to maintenance/7.3 (#281) 2020-05-22 21:47:13 +08:00
Liu Xinquan
650a00c919 chore(TDQ-18431) using DQ SE 8.0.1 on 7.3.1 monthly release (#277) 2020-05-22 10:58:24 +08:00
pyzhou
50ad6ec014 fix(TDI-43717):backport cosmos to 7.3 (#275) 2020-05-19 16:32:45 +08:00
nrousseau
1a9cb4dc28 chore(TUP-26710): fix tos p2 build from maintenance/7.3 (#273) 2020-05-18 16:11:52 +08:00
nrousseau
20061950b5 chore(TUP-26710): update pom (#272)
* chore(TUP-26710): update pom

* chore(TUP-26710): update pom
2020-05-18 13:52:25 +08:00
Zhiwei Xue
e17c5b760d chore(TUP-26710):update version (#268)
* chore(TUP-26710):update version

* Set version to 7.3.1 PATCH

Co-authored-by: Jenkins Continuous Build server <jenkins@tal-rd02.talend.lan>
2020-05-11 17:01:09 +08:00
Ivan Gonchar
455396a79d chore: bump Components version to 0.28.4-SNAPSHOT (#259) 2020-03-26 07:57:01 +08:00
Ivan Gonchar
08a5fadc26 chore: bump TCK components version to 1.6.3-SNAPSHOT (#256) 2020-03-20 11:06:30 +08:00
Ivan Gonchar
6d2df45139 chore: bump Components version to 0.28.3-SNAPSHOT (#255) 2020-03-20 10:53:25 +08:00
build-talend-tdq
47243627ee chore(Jenkins): Update DQ libs to 8.0.1-SNAPSHOT (#249) 2020-02-28 14:53:00 +01:00
Jenkins Continuous Build server
8be6746d1e Set version to 7.3.2 SNAPSHOT 2020-02-28 13:00:25 +01:00
Pierre Teyssier
d95215f5c7 chore(TDI-43696): cherry-pick on release (#246) 2020-02-18 08:39:16 +08:00
Jenkins Continuous Build server
f9e05fa54c Set version to 7.3.1 2020-02-14 13:38:42 +01: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
14 changed files with 132 additions and 56 deletions

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.talend.repo</groupId>
<artifactId>dependencies.p2</artifactId>
<version>7.3.1-M3</version>
<version>7.3.1-PATCH</version>
</parent>
<artifactId>dependencies.p2.tos</artifactId>
@@ -344,32 +344,42 @@
<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.25</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>
</dependencies>

View File

@@ -3,14 +3,16 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend.repo</groupId>
<artifactId>dependencies.p2</artifactId>
<version>7.3.1-M3</version>
<version>7.3.1-PATCH</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>
<components.version>0.28.5</components.version>
<dataquality.lib.version>8.0.2</dataquality.lib.version>
<fasterxml.jackson.version>2.10.1</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>
<daikon.version>0.31.10</daikon.version>
</properties>
<distributionManagement>

View File

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

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend.studio</groupId>
<artifactId>studio-bom</artifactId>
<version>7.3.1-M3</version>
<version>7.3.1-PATCH</version>
<packaging>pom</packaging>
<name>studio bom</name>

View File

@@ -4,13 +4,13 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.3.1-M3</version>
<version>7.3.1-PATCH</version>
<relativePath />
</parent>
<artifactId>talend-tos-p2-repo</artifactId>
<packaging>eclipse-repository</packaging>
<version>7.3.1.M3</version>
<version>7.3.1.PATCH</version>
<properties>
<product.final.name>${launcher.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>

View File

@@ -63,6 +63,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.9.0,org.talend.components:cosmosDB:1.9.0

View File

@@ -4,11 +4,11 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>7.3.1-M3</version>
<version>7.3.1-PATCH</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>
<artifactId>org.talend.studio.tos.bigdata.product</artifactId>
<packaging>eclipse-repository</packaging>
<version>7.3.1.M3</version>
<version>7.3.1.PATCH</version>
</project>

View File

@@ -4,11 +4,11 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>7.3.1-M3</version>
<version>7.3.1-PATCH</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>
<artifactId>org.talend.studio.tos.di.product</artifactId>
<packaging>eclipse-repository</packaging>
<version>7.3.1.M3</version>
<version>7.3.1.PATCH</version>
</project>

View File

@@ -4,11 +4,11 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>7.3.1-M3</version>
<version>7.3.1-PATCH</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>
<artifactId>org.talend.studio.tos.dq.product</artifactId>
<packaging>eclipse-repository</packaging>
<version>7.3.1.M3</version>
<version>7.3.1.PATCH</version>
</project>

View File

@@ -4,11 +4,11 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>7.3.1-M3</version>
<version>7.3.1-PATCH</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>
<artifactId>org.talend.studio.tos.esb.product</artifactId>
<packaging>eclipse-repository</packaging>
<version>7.3.1.M3</version>
<version>7.3.1.PATCH</version>
</project>

View File

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

View File

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

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.3.1-M3</version>
<version>7.3.1-PATCH</version>
<packaging>pom</packaging>
<properties>
@@ -12,11 +12,11 @@
<tycho-extras.version>${tycho.version}</tycho-extras.version>
<base.version>7.3.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}.M3</osgi.compatible.version>
<osgi.compatible.version>${base.version}</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}-M3</maven.compatible.version>
<maven.compatible.version>${base.version}</maven.compatible.version>
<repo.type>Release</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>
@@ -30,8 +30,8 @@
<equinox.build>org.eclipse.equinox.launcher_1.5.200.v20180922-1751.jar</equinox.build>
<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>
<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>
<tos-p2-repo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSource${repo.type}/org/talend/studio/talend-tos-p2-repo/${osgi.compatible.version}.PATCH/talend-tos-p2-repo-${osgi.compatible.version}.PATCH.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}-PATCH/dependencies.p2.tos-${maven.compatible.version}-PATCH.zip-unzip/</tos-deps-p2-repo.url>
<jgit.dirtyWorkingTree.official>error</jgit.dirtyWorkingTree.official>
<osgi.ws>win32</osgi.ws>
<osgi.os>win32</osgi.os>
@@ -155,12 +155,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 +170,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>
@@ -204,14 +204,75 @@
</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>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<release.suffix>-SNAPSHOT</release.suffix>
<revision.filename>SNAPSHOT</revision.filename>
<release.suffix>-PATCH</release.suffix>
<revision.filename>PATCH</revision.filename>
<product.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</product.version>
</properties>
<build>