Compare commits
17 Commits
pteyssier/
...
release/7.
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7da0832a56 | ||
|
|
32733397a5 | ||
|
|
405a0c1960 | ||
|
|
3157c8dbdf | ||
|
|
2d9e2e0dd8 | ||
|
|
9bdd384b29 | ||
|
|
61d9cec36c | ||
|
|
345a7c6491 | ||
|
|
5b15fbe489 | ||
|
|
ae30522551 | ||
|
|
1685507c3d | ||
|
|
a4ba9d6c22 | ||
|
|
3ba6621345 | ||
|
|
eb37dd885d | ||
|
|
8ee0358866 | ||
|
|
f5ae0c35db | ||
|
|
958ebc84e0 |
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.repo</groupId>
|
||||
<artifactId>dependencies.p2</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M4</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>
|
||||
|
||||
@@ -3,14 +3,14 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.talend.repo</groupId>
|
||||
<artifactId>dependencies.p2</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M4</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.0.1</dataquality.lib.version>
|
||||
<dataquality.lib.version>7.4.1-SNAPSHOT</dataquality.lib.version>
|
||||
<fasterxml.jackson.version>2.9.9</fasterxml.jackson.version>
|
||||
<daikon.version>0.31.9-SNAPSHOT</daikon.version>
|
||||
<daikon.version>0.31.10-SNAPSHOT</daikon.version>
|
||||
</properties>
|
||||
|
||||
<distributionManagement>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M4</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -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-M4</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>studio bom</name>
|
||||
|
||||
|
||||
@@ -4,12 +4,13 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M4</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
<artifactId>talend-tos-p2-repo</artifactId>
|
||||
<packaging>eclipse-repository</packaging>
|
||||
<version>7.3.1.M4</version>
|
||||
|
||||
<properties>
|
||||
<product.final.name>${launcher.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
|
||||
|
||||
@@ -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"/>
|
||||
|
||||
@@ -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.0-SNAPSHOT
|
||||
@@ -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-M4</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.M4</version>
|
||||
</project>
|
||||
|
||||
@@ -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-M4</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.M4</version>
|
||||
</project>
|
||||
|
||||
@@ -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-M4</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.M4</version>
|
||||
</project>
|
||||
|
||||
@@ -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-M4</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.M4</version>
|
||||
</project>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M4</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
@@ -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>
|
||||
@@ -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>
|
||||
|
||||
2
pom.xml
2
pom.xml
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<version>7.3.1-M4</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -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-M4</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}.M4</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}-M4</maven.compatible.version>
|
||||
<repo.type>Release</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>true</strictVersions>
|
||||
<strictVersions>false</strictVersions>
|
||||
</properties>
|
||||
|
||||
<distributionManagement>
|
||||
|
||||
Reference in New Issue
Block a user