Compare commits

..

30 Commits

Author SHA1 Message Date
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
build-talend
405a0c1960 chore(Jenkins): Update DQ libs to 7.4.0-SNAPSHOT (#214) 2019-10-22 11:09:27 +02:00
nrousseau
3157c8dbdf Update studio configuration for 7.3.1 2019-10-18 10:23:58 +08:00
mbasiuk-talend
2d9e2e0dd8 fix(TDI-42834): update commons-compress lib version (#205)
* fix(TDI-42834): update commons-compress lib version

* fix(TDI-42834): upgrade commons-compress to latest version
2019-10-09 02:00:33 +02:00
build-talend
9bdd384b29 chore(Jenkins): Update DQ libs to 7.3.0-SNAPSHOT (#212) 2019-09-24 17:26:45 +02:00
build-talend
61d9cec36c chore(Jenkins): Update DQ libs to 7.2.2-SNAPSHOT (#209) 2019-09-16 19:22:13 +02:00
build-talend
345a7c6491 chore(Jenkins): Update DQ libs to 7.2.1 (#208) 2019-09-16 17:42:17 +02:00
build-talend
5b15fbe489 chore(Jenkins): Update DQ libs to 7.2.1-SNAPSHOT (#206) 2019-08-26 22:22:34 +02:00
kjwang
ae30522551 Fix TUP-24170 Set crypto-utils as bundle to make the master compile with daikon 0.31.10-SNAPSHOT (#204)
* Fix TUP-24170 Set crypto-utils as bundle to make the master compile with
daikon 0.31.10-SNAPSHOT
https://jira.talendforge.org/browse/TUP-24170

* Fix TUP-24170 Set crypto-utils as bundle to make the master compile with
daikon 0.31.10-SNAPSHOT
https://jira.talendforge.org/browse/TUP-24170

* Fix TUP-24170 Set crypto-utils as bundle to make the master compile with
daikon 0.31.10-SNAPSHOT
https://jira.talendforge.org/browse/TUP-24170
2019-08-22 09:59:02 +02:00
nrousseau
1685507c3d Set back temporary old daikon version 2019-08-08 08:52:07 +02:00
build-talend
a4ba9d6c22 chore(Jenkins): Update DQ libs to 7.2.0-SNAPSHOT (#203) 2019-08-07 11:58:31 +02:00
build-talend
3ba6621345 chore(Jenkins): Update DQ libs to 7.1.2-SNAPSHOT (#202) 2019-08-05 17:11:37 +02:00
build-talend
eb37dd885d chore(Jenkins): Update DQ libs to 7.1.1-SNAPSHOT (#201) 2019-07-10 15:25:49 +02:00
iwangtalend
8ee0358866 TMDM-13727 Remove TOS MDM 2019-07-08 14:24:45 +02:00
build-talend
f5ae0c35db chore(Jenkins): Update DQ libs to 7.1.0-SNAPSHOT (#200) 2019-07-04 16:42:50 +02:00
Pierre Teyssier
958ebc84e0 TDI-42616 : bump tacokit/connector to 1.3.0-SNAPSHOT (#199) 2019-07-03 15:20:28 +08:00
Ivan Gonchar
5f3de19d05 chore(TDI-42600): update Components version to 0.28.0-SNAPSHOT and Daikon version to 0.31.9-SNAPSHOT (#198) 2019-07-03 09:25:24 +08:00
iwangtalend
48a9dda162 Update Mac launcher version 2019-06-24 12:23:00 +02:00
Jenkins Continuous Build server
cab7900f21 Set version to 7.3.1 SNAPSHOT 2019-06-24 12:17:43 +02:00
iwangtalend
4143eb57a5 Update Mac launcher version 2019-06-24 11:22:30 +02:00
Nicolas Rousseau
55950270f3 feat(TDI-40635) enable couchbase for TOS_BD 2019-06-18 14:30:50 +08:00
14 changed files with 99 additions and 64 deletions

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.talend.repo</groupId>
<artifactId>dependencies.p2</artifactId>
<version>7.2.1</version>
<version>7.3.1-SNAPSHOT</version>
</parent>
<artifactId>dependencies.p2.tos</artifactId>
@@ -86,6 +86,12 @@
<version>${daikon.version}</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>org.talend.daikon</groupId>
<artifactId>crypto-utils</artifactId>
<version>${daikon.version}</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>org.talend.daikon</groupId>
<artifactId>daikon-exception</artifactId>
@@ -128,6 +134,21 @@
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.3</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>
<version>4.5.7</version>
</dependency>
<!-- end of daikon dependencies -->
<!-- ========================= -->
@@ -168,7 +189,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.10</version>
<version>1.19</version>
</dependency>
<dependency>
<groupId>com.github.livesense</groupId>
@@ -293,7 +314,7 @@
<artifactId>commons-codec</artifactId>
<version>1.10</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>
@@ -323,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.2.1</version>
<version>7.3.1-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
<components.version>0.27.3</components.version>
<dataquality.lib.version>7.0.3</dataquality.lib.version>
<fasterxml.jackson.version>2.9.9</fasterxml.jackson.version>
<daikon.version>0.31.7</daikon.version>
<components.version>0.28.0-SNAPSHOT</components.version>
<dataquality.lib.version>7.4.2-SNAPSHOT</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-SNAPSHOT</daikon.version>
</properties>
<distributionManagement>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.2.1</version>
<version>7.3.1-SNAPSHOT</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.2.1</version>
<version>7.3.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>studio bom</name>

View File

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

View File

@@ -21,7 +21,6 @@
<feature id="org.talend.rcp.branding.tos.feature"/>
<feature id="org.talend.rcp.branding.top.feature"/>
<feature id="org.talend.rcp.branding.esbstandard.feature"/>
<feature id="org.talend.rcp.branding.tombundle.feature"/>
<feature id="org.talend.rcp.branding.tos.test.feature"/>
<feature id="org.talend.mdm.tom.test.feature"/>
<feature id="org.talend.babel.all.tos.feature"/>

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.1.0
component.java.coordinates = org.talend.components:couchbase:1.3.2-SNAPSHOT

View File

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

View File

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

View File

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

View File

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

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.2.1</version>
<version>7.3.1-SNAPSHOT</version>
<relativePath />
</parent>
@@ -118,7 +118,7 @@
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>eclipse-launcher-mac-${launcher.prefix}</artifactId>
<version>7.2.1</version>
<version>7.3.1</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${studio.dir}</outputDirectory>
@@ -174,7 +174,7 @@
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>studio-add-conf</artifactId>
<version>7.2.1-SNAPSHOT</version>
<version>7.3.1-SNAPSHOT</version>
<type>zip</type>
<classifier />
<overWrite>true</overWrite>

View File

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

View File

@@ -3,19 +3,19 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.2.1</version>
<version>7.3.1-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tycho.version>0.22.0</tycho.version>
<tycho-extras.version>${tycho.version}</tycho-extras.version>
<base.version>7.2.1</base.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}</osgi.compatible.version>
<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}</maven.compatible.version>
<repo.type>Release</repo.type>
<maven.compatible.version>${base.version}-SNAPSHOT</maven.compatible.version>
<repo.type>Snapshot</repo.type>
<doc.version>7.2.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>
@@ -36,7 +36,7 @@
<osgi.ws>win32</osgi.ws>
<osgi.os>win32</osgi.os>
<osgi.arch>x86_64</osgi.arch>
<strictVersions>false</strictVersions>
<strictVersions>true</strictVersions>
</properties>
<distributionManagement>
@@ -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,8 +204,8 @@
</plugins>
</build>
<profiles>
<profile>
<id>patch</id>
<profile>
<id>patch</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
@@ -298,12 +298,12 @@
<dependency>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-buildtimestamp-jgit</artifactId>
<version>${tycho-extras.version}</version>
<version>${tycho.version}</version>
</dependency>
</dependencies>
<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 -->
@@ -315,8 +315,8 @@
<jgit.ignore>pom.xml</jgit.ignore>
<jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
</configuration>
</plugin>
</plugins>
</plugin>
</plugins>
</build>
</profile>
<profile>
@@ -347,7 +347,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 -->
@@ -391,12 +391,12 @@
<dependency>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-buildtimestamp-jgit</artifactId>
<version>${tycho-extras.version}</version>
<version>${tycho.version}</version>
</dependency>
</dependencies>
<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 -->
@@ -452,7 +452,7 @@
</dependencies>
<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 -->
@@ -460,6 +460,9 @@
<Built-By />
</manifestEntries>
</archive>
<timestampProvider>jgit</timestampProvider>
<jgit.ignore>pom.xml</jgit.ignore>
<jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
</configuration>
</plugin>
</plugins>