Compare commits

...

8 Commits

Author SHA1 Message Date
Zhiwei Xue
5308ee6851 chore(TUP-26710):update version 2020-05-08 15:44:41 +08:00
Jenkins Continuous Build server
26101471c1 Set version to 7.3.1 PATCH 2020-03-20 15:49:27 +01: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
13 changed files with 48 additions and 43 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.3.1-PATCH</version>
</parent>
<artifactId>dependencies.p2.tos</artifactId>
@@ -314,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>

View File

@@ -3,11 +3,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend.repo</groupId>
<artifactId>dependencies.p2</artifactId>
<version>7.3.1-SNAPSHOT</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.1</components.version>
<components.version>0.28.3</components.version>
<dataquality.lib.version>8.0.0</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 -->

View File

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

View File

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

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

View File

@@ -4,10 +4,11 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>7.3.1-SNAPSHOT</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.PATCH</version>
</project>

View File

@@ -4,10 +4,11 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>7.3.1-SNAPSHOT</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.PATCH</version>
</project>

View File

@@ -4,10 +4,11 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>7.3.1-SNAPSHOT</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.PATCH</version>
</project>

View File

@@ -4,10 +4,11 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>7.3.1-SNAPSHOT</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.PATCH</version>
</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.3.1-PATCH</version>
<relativePath />
</parent>
@@ -456,29 +456,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.3.1-SNAPSHOT</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-SNAPSHOT</version>
<version>7.3.1-PATCH</version>
<packaging>pom</packaging>
<properties>
@@ -12,10 +12,10 @@
<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}-SNAPSHOT</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}-SNAPSHOT</maven.compatible.version>
<repo.type>Snapshot</repo.type>
<maven.compatible.version>${base.version}</maven.compatible.version>
<repo.type>Release</repo.type>
<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>
@@ -31,12 +31,12 @@
<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-deps-p2-repo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSource${repo.type}/org/talend/repo/dependencies.p2.tos/${maven.compatible.version}-PATCH2/dependencies.p2.tos-${maven.compatible.version}-PATCH2.zip-unzip/</tos-deps-p2-repo.url>
<jgit.dirtyWorkingTree.official>error</jgit.dirtyWorkingTree.official>
<osgi.ws>win32</osgi.ws>
<osgi.os>win32</osgi.os>
<osgi.arch>x86_64</osgi.arch>
<strictVersions>true</strictVersions>
<strictVersions>false</strictVersions>
</properties>
<distributionManagement>
@@ -271,8 +271,8 @@
<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>