Compare commits

..

42 Commits

Author SHA1 Message Date
Liu Xinquan
ff7aa661be fix(TPS-3713) Upgrade 'dataquality-record-linkage' to 6.1.7 (#231) (#232)
Co-authored-by: qiongli <qiongli@talend.com>
2020-01-17 15:31:16 +08:00
jiezhang-tlnd
88b9be3e9c chore(TUP-21429) prepare update site for 7.0.1 (#210) 2019-09-24 16:44:30 +08:00
Irene Wang
032adea707 Update Mac launcher version 2019-06-24 11:24:27 +02:00
Ivan Gonchar
0c664b95a5 chore: update Components version to 0.25.3 (#137) 2018-10-24 10:43:12 +08:00
Ivan Gonchar
4863345769 chore: update Components version to 0.25.2 (#136) 2018-10-23 09:55:09 +08:00
build-talend
e6f506e110 chore(Jenkins): Update DQ libs to 6.1.3 (#135) 2018-10-21 10:43:57 +02:00
Nicolas Rousseau
a4e63734ec fix(TUP-21000) fix jackson to 2.9.5 2018-10-20 14:09:53 +08:00
Ivan Gonchar
65b3f8aa97 chore: update Components version to 0.25.1 and daikon version to 0.27.0 (#134) 2018-10-20 13:18:26 +08:00
build-talend
9aa255b82f chore(Jenkins): Update DQ libs 6.1.3 + Daikon 0.27.0 (#133) 2018-10-19 14:36:10 +02:00
Jenkins Continuous Build server
3764ab97ce Set version to 7.1.1 2018-10-18 11:41:51 +02:00
Nicolas Rousseau
2eb32f2d9a fix(TDI-41112): upgrade apache commons lang3 2018-10-18 12:40:15 +08:00
nrousseau
f0cd5c0674 fix(TDI-41112): upgrade apache commons lang3 (#131) 2018-10-18 10:25:05 +08:00
Ivan Gonchar
c0a708baa9 chore(release): bump Components version to 0.25.0 (#130) 2018-10-18 09:59:12 +08:00
build-talend
407aabd4d9 chore(Jenkins): Update DQ libs to 6.1.2 (#129) 2018-10-16 17:20:03 +02:00
build-talend
13a069a49e chore(Jenkins): Update DQ libs to 6.1.1 (#128) 2018-10-16 13:01:10 +02:00
build-talend
0a6eaf4d8f chore(Jenkins): Update DQ libs to 6.1.1-SNAPSHOT (#127)
* chore(Jenkins): Update DQ libs to 6.1.1-SNAPSHOT

* update daikon version to 0.26.1-SNAPSHOT
2018-09-28 10:10:00 +02:00
Stéphane Bouchet
e20abc03a9 fix content section (#109) 2018-08-30 11:22:50 +08:00
Ivan Gonchar
97e66e8466 chore: bump Daikon to 0.26.0-SNAPSHOT and Components to 0.25.0-SNAPSHOT (#126) 2018-07-13 15:00:56 +08:00
Liu Xinquan
ba5e20f4c4 chore(TDQ-15542): update dq lib version to 6.1.0-SNAPSHOT (#125) 2018-07-06 09:50:13 +02:00
build-talend
ae5c2e5bb8 chore(Jenkins): Update DQ libs to 6.0.0 (#123) 2018-07-03 14:59:41 +02:00
Fangrou JI
f82e24b5ca wi(TDQ-15345): Rename dataquality-tokenization to dataquality-text-japanese (#122) 2018-06-12 11:25:40 +02:00
Pierre Teyssier
78c31a2d7c feat(TDI-40477): Split Snowflake components (#118)
* split logic of components on definition and runtime
2018-05-28 11:51:31 +08:00
Damien Prot
2d1562ddd1 feat(TDQ-15283): Add DQ tokenization plugin (#117) 2018-05-25 11:15:29 +02:00
Matthieu Debarre
23c330c2a3 docs(DEVOPS-4434) Update documentation dependencies in Sudio to 7.1.1-SNAPSHOT (#116) 2018-05-17 19:05:49 +02:00
Jenkins Continuous Build server
e6a4e58e77 Set version to 7.1.1 SNAPSHOT 2018-05-11 17:08:05 +02:00
nrousseau
982dd2182b fix(TUP-19313) fix startup on mac (#115) 2018-05-07 16:22:40 +08:00
Pierre Teyssier
c6b108f6be chore: bump tcomp and daikon to 0.24.0-SNAPSHOT 2018-04-26 14:53:44 +08:00
build-talend
8aa8a7911a chore(Jenkins): update DQ libs to 6.0.0-SNAPSHOT (#110) 2018-04-24 12:14:57 +02:00
build-talend
ae1b8c54bf chore(Jenkins): update DQ libs to 5.1.0-SNAPSHOT (#107) 2018-04-09 14:32:08 +02:00
Ivan Gonchar
cf1e71a8bb chore: bump Components version to 0.23.1 (#106) 2018-04-06 15:56:41 +08:00
build-talend
5e1e51ddce chore(Jenkins): update DQ libs to 5.0.3-SNAPSHOT (#104) 2018-04-04 17:31:14 +02:00
Jenkins Continuous Build server
c23834f48e Set version to 7.1.0 SNAPSHOT 2018-04-04 14:26:08 +02:00
build-talend
7579f09cc9 chore(Jenkins): Release DQ libraries 5.0.2 (#103) 2018-04-04 12:29:16 +02:00
nrousseau
10965e336b fix(TUP-19667) upgrade ops4j for http/https support 2018-03-30 22:35:15 +08:00
Pierre Teyssier
743849c31e chore(release): daikon and tcomp release 0.23.0 2018-03-30 18:59:23 +08:00
build-talend
c4c5363835 chore(Jenkins): update DQ libs to 5.0.2-SNAPSHOT (#101) 2018-03-28 17:22:41 +02:00
nrousseau
845db385a7 chore(TDI-39894) upgrade jackson
add back commons-codec dependency (not used anymore in daikon but still in other components)
2018-03-20 21:07:24 +08:00
nrousseau
e6da87ec56 chore(TDI-39894) upgrade jackson 2018-03-20 16:01:40 +08:00
build-talend
5d4448ff9b chore(Jenkins): update DQ libs to 5.0.1-SNAPSHOT (#99) 2018-03-07 11:13:25 +01:00
Romain Manni-Bucau
07d7e0e35b removing old org.talend.sdk.component.studio-integration dependency (#98) 2018-03-06 10:21:22 +08:00
build-talend
261d97e2ef chore(Jenkins): Release DQ libraries 5.0.0 (#95) 2018-02-12 17:25:49 +01:00
Pierre Teyssier
0dedb38c27 chore(TDI-40061): bump daikon (#94) 2018-02-12 10:59:06 +08:00
13 changed files with 188 additions and 135 deletions

View File

@@ -4,7 +4,6 @@ http://www.talend.com
![alt text](https://www.talend.com/wp-content/uploads/2016/07/talend-logo.png "Talend")
> Content
==========
Master repos using gitslave for aggregating the full Talend Studio open source repositories

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.talend.repo</groupId>
<artifactId>dependencies.p2</artifactId>
<version>7.0.1-EP</version>
<version>7.1.1</version>
</parent>
<artifactId>dependencies.p2.tos</artifactId>
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
<version>2.4.5-Talend</version>
<version>2.4.6-Talend</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
@@ -63,6 +63,12 @@
<dependency>
<groupId>org.talend.dataquality</groupId>
<artifactId>dataquality-record-linkage</artifactId>
<!-- TPS-3713 Only upgrade this jar to a new version -->
<version>6.1.7</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
<artifactId>dataquality-text-japanese</artifactId>
<version>${dataquality.lib.version}</version>
</dependency>
<dependency>
@@ -92,27 +98,27 @@
<artifactId>json-io</artifactId>
<version>4.9.9-TALEND</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.5.3</version><!-- version matches the studio org.talend.libraries.jackson -->
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.5.3</version><!-- version matches the studio org.talend.libraries.jackson -->
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.10</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.4</version>
</dependency>
<!-- end of daikon dependencies -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.9.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.7</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.9.5</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.5</version>
</dependency>
<!-- end of daikon dependencies -->
<!-- ========================= -->
<!-- Added by TDM -->
@@ -170,13 +176,6 @@
<!-- End added by TDM -->
<!-- ========================= -->
<!-- TCOMP v1 -->
<dependency>
<groupId>org.talend.sdk.component</groupId>
<artifactId>org.talend.sdk.component.studio-integration</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<!-- TCOMP v1 -->
<dependency>
@@ -240,7 +239,7 @@
</dependency>
<dependency>
<groupId>org.talend.components</groupId>
<artifactId>components-snowflake</artifactId>
<artifactId>components-snowflake-definition</artifactId>
<version>${components.version}</version>
<classifier>bundle</classifier>
</dependency>
@@ -279,7 +278,12 @@
<version>${components.version}</version>
<classifier>bundle</classifier>
</dependency>
<!-- to avoid updatin the complete eclipse target platform we add these
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.10</version>
</dependency>
<!-- to avoid updatin the complete eclipse target platform we add these
single dependencies -->
<dependency>
<groupId>biz.aQute.bnd</groupId>
@@ -301,11 +305,6 @@
<artifactId>commons-configuration</artifactId>
<version>1.10</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.4</version>
</dependency>
</dependencies>
</project>

View File

@@ -5,13 +5,13 @@
<groupId>org.talend.repo</groupId>
<artifactId>dependencies.p2</artifactId>
<version>7.0.1-EP</version>
<version>7.1.1</version>
<packaging>pom</packaging>
<properties>
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
<components.version>0.22.0-SNAPSHOT</components.version>
<daikon.version>0.21.0-SNAPSHOT</daikon.version>
<dataquality.lib.version>5.0.0-SNAPSHOT</dataquality.lib.version>
<components.version>0.25.3</components.version>
<daikon.version>0.27.0</daikon.version>
<dataquality.lib.version>6.1.3</dataquality.lib.version>
</properties>
<distributionManagement>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.0.1-EP</version>
<version>7.1.1</version>
<relativePath />
</parent>

View File

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

View File

@@ -4,11 +4,10 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>7.0.1-EP</version>
<version>7.1.1</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>
<artifactId>org.talend.studio.tos.bigdata.product</artifactId>
<packaging>eclipse-repository</packaging>
<version>7.0.1.EP</version>
</project>

View File

@@ -4,11 +4,10 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>7.0.1-EP</version>
<version>7.1.1</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>
<artifactId>org.talend.studio.tos.di.product</artifactId>
<packaging>eclipse-repository</packaging>
<version>7.0.1.EP</version>
</project>

View File

@@ -4,13 +4,12 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>7.0.1-EP</version>
<version>7.1.1</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>
<artifactId>org.talend.studio.tos.dq.product</artifactId>
<packaging>eclipse-repository</packaging>
<version>7.0.1.EP</version>
<build>
<plugins>
<plugin>

View File

@@ -4,11 +4,10 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>7.0.1-EP</version>
<version>7.1.1</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>
<artifactId>org.talend.studio.tos.esb.product</artifactId>
<packaging>eclipse-repository</packaging>
<version>7.0.1.EP</version>
</project>

View File

@@ -4,13 +4,12 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>7.0.1-EP</version>
<version>7.1.1</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>
<artifactId>org.talend.studio.tos.mdm.product</artifactId>
<packaging>eclipse-repository</packaging>
<version>7.0.1.EP</version>
<properties>
<product.final.name>${product.final.name.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
</properties>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.0.1-EP</version>
<version>7.1.1</version>
<relativePath />
</parent>
@@ -118,7 +118,7 @@
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>eclipse-launcher-mac-${launcher.prefix}</artifactId>
<version>6.4.0</version>
<version>7.1.1</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${studio.dir}</outputDirectory>
@@ -134,7 +134,7 @@
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>eclipse-delta-pack</artifactId>
<version>4.4.1</version>
<version>4.4.1b</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${studio.dir}</outputDirectory>
@@ -235,35 +235,35 @@
</execution>
</executions>
</plugin>
<!-- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.3.2</version>
<executions>
<execution>
<id>generate-javajet</id>
<phase>package</phase>
<goals>
<goal>exec</goal>
</goals>
</execution>
</executions>
<configuration>
<executable>java</executable>
<workingDirectory>${studio.dir}</workingDirectory>
<arguments>
<argument>-Xmx1536m</argument>
<argument>-XX:MaxPermSize=512m</argument>
<argument>-classpath</argument>
<argument>${studio.dir}/plugins/${equinox.build}</argument>
<argument>org.eclipse.core.launcher.Main</argument>
<argument>-application</argument>
<argument>org.talend.designer.codegen.CodeGenInit</argument>
<argument>-nosplash</argument>
<argument>-consoleLog</argument>
<argument>-Dtalend.licence.path=${studio.dir}/license</argument>
</arguments>
</configuration>
<!-- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.3.2</version>
<executions>
<execution>
<id>generate-javajet</id>
<phase>package</phase>
<goals>
<goal>exec</goal>
</goals>
</execution>
</executions>
<configuration>
<executable>java</executable>
<workingDirectory>${studio.dir}</workingDirectory>
<arguments>
<argument>-Xmx1536m</argument>
<argument>-XX:MaxPermSize=512m</argument>
<argument>-classpath</argument>
<argument>${studio.dir}/plugins/${equinox.build}</argument>
<argument>org.eclipse.core.launcher.Main</argument>
<argument>-application</argument>
<argument>org.talend.designer.codegen.CodeGenInit</argument>
<argument>-nosplash</argument>
<argument>-consoleLog</argument>
<argument>-Dtalend.licence.path=${studio.dir}/license</argument>
</arguments>
</configuration>
</plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -503,29 +503,29 @@
<timestampProvider>default</timestampProvider>
</configuration>
</plugin>
<!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.7</version>
<executions>
<!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>-->
<!-- Attach product ZIP to Maven artifact -->
<!-- <id>attach-artifacts</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<file>${project.build.directory}/products/${product.final.name}.zip</file>
<type>product</type>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
<!-- <id>attach-artifacts</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<file>${project.build.directory}/products/${product.final.name}.zip</file>
<type>product</type>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.0.1-EP</version>
<version>7.1.1</version>
<relativePath />
</parent>

View File

@@ -3,20 +3,20 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.0.1-EP</version>
<version>7.1.1</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.0.1</base.version>
<base.version>7.1.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}.EP</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}-EP</maven.compatible.version>
<maven.compatible.version>${base.version}</maven.compatible.version>
<repo.type>Release</repo.type>
<doc.version>7.0.1-SNAPSHOT</doc.version>
<doc.version>7.1.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>
@@ -150,12 +150,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>
@@ -165,22 +165,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>
@@ -199,6 +199,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>