Compare commits

..

10 Commits

Author SHA1 Message Date
build-talend-tdq
a5f7575769 chore(Jenkins): Update DQ libs to 7.0.3-SNAPSHOT (#290)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2020-08-13 14:34:17 +08:00
Ivan Gonchar
f582b3d016 chore: bump Components version to 0.27.5-SNAPSHOT (#247) 2020-02-19 09:44:52 +08:00
qiongli
86b7894b7b fix(TDQ-17851) Upgrade the dq lib version to 7.0.2-SNAPSHOT (#235) 2020-02-04 10:12:08 +01:00
Emmanuel GALLOIS
1620894909 fix(TDI-43300): fix tacokit component jar clash with locales (#221) 2019-12-02 21:35:03 +08:00
Emmanuel GALLOIS
3dde4245b9 chore(couchbase): bump to release 1.2.3 (#218) 2019-11-08 21:40:10 +08:00
mbasiuk-talend
5ad9b4bb16 fix(TDI-42834): upgrade commons-compress to latest version (#213) 2019-10-10 15:24:02 +02:00
wang wei
b0a98cbda8 fix(TDI-42921): use snapshot tcompv0 for studio maintenance/7.2 (#207) 2019-09-04 12:13:40 +08:00
iwangtalend
0933b0b5ca TMDM-13727 Remove TOS MDM 2019-07-09 12:27:46 +08:00
iwangtalend
6da58b930c Update Mac launcher version 2019-06-24 12:37:50 +02:00
Jenkins Continuous Build server
08f336d5c8 Set version to 7.2.2 SNAPSHOT 2019-06-24 12:25:28 +02:00
14 changed files with 54 additions and 113 deletions

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.talend.repo</groupId>
<artifactId>dependencies.p2</artifactId>
<version>7.2.1</version>
<version>7.2.2-SNAPSHOT</version>
</parent>
<artifactId>dependencies.p2.tos</artifactId>
@@ -168,7 +168,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>

View File

@@ -3,12 +3,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend.repo</groupId>
<artifactId>dependencies.p2</artifactId>
<version>7.2.1</version>
<version>7.2.2-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>
<components.version>0.27.5-SNAPSHOT</components.version>
<dataquality.lib.version>7.0.3-SNAPSHOT</dataquality.lib.version>
<fasterxml.jackson.version>2.9.9</fasterxml.jackson.version>
<daikon.version>0.31.7</daikon.version>
</properties>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.2.1</version>
<version>7.2.2-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.2.2-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.2.2-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.2.4-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.2.2-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.2.2-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.2.2-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.2.2-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.2.2-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.2.2</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${studio.dir}</outputDirectory>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.2.1</version>
<version>7.2.2-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.2.2-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.2.2</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,67 +204,6 @@
</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>
@@ -298,12 +237,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 +254,8 @@
<jgit.ignore>pom.xml</jgit.ignore>
<jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
</configuration>
</plugin>
</plugins>
</plugin>
</plugins>
</build>
</profile>
<profile>
@@ -347,7 +286,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 +330,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 +391,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 +399,9 @@
<Built-By />
</manifestEntries>
</archive>
<timestampProvider>jgit</timestampProvider>
<jgit.ignore>pom.xml</jgit.ignore>
<jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
</configuration>
</plugin>
</plugins>