Compare commits
5 Commits
master
...
patch/7.0.
| Author | SHA1 | Date | |
|---|---|---|---|
|
2d0d02c039 | ||
|
|
823af4128e | ||
|
|
dbba943b51 | ||
|
|
a99ec8d0f7 | ||
|
|
5bb9378ec2 |
@@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.repo</groupId>
|
<groupId>org.talend.repo</groupId>
|
||||||
<artifactId>dependencies.p2</artifactId>
|
<artifactId>dependencies.p2</artifactId>
|
||||||
<version>7.0.1-SNAPSHOT</version>
|
<version>7.0.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>dependencies.p2.tos</artifactId>
|
<artifactId>dependencies.p2.tos</artifactId>
|
||||||
@@ -277,7 +277,7 @@
|
|||||||
<artifactId>commons-codec</artifactId>
|
<artifactId>commons-codec</artifactId>
|
||||||
<version>1.10</version>
|
<version>1.10</version>
|
||||||
</dependency>
|
</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 -->
|
single dependencies -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>biz.aQute.bnd</groupId>
|
<groupId>biz.aQute.bnd</groupId>
|
||||||
|
|||||||
@@ -5,13 +5,13 @@
|
|||||||
|
|
||||||
<groupId>org.talend.repo</groupId>
|
<groupId>org.talend.repo</groupId>
|
||||||
<artifactId>dependencies.p2</artifactId>
|
<artifactId>dependencies.p2</artifactId>
|
||||||
<version>7.0.1-SNAPSHOT</version>
|
<version>7.0.1</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<properties>
|
<properties>
|
||||||
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
|
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
|
||||||
<components.version>0.23.0</components.version>
|
<components.version>0.23.1</components.version>
|
||||||
<daikon.version>0.23.0</daikon.version>
|
<daikon.version>0.23.0</daikon.version>
|
||||||
<dataquality.lib.version>5.0.2-SNAPSHOT</dataquality.lib.version>
|
<dataquality.lib.version>5.0.2</dataquality.lib.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<distributionManagement>
|
<distributionManagement>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>parent-pom</artifactId>
|
<artifactId>parent-pom</artifactId>
|
||||||
<version>7.0.1-SNAPSHOT</version>
|
<version>7.0.1</version>
|
||||||
<relativePath />
|
<relativePath />
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>parent-pom</artifactId>
|
<artifactId>parent-pom</artifactId>
|
||||||
<version>7.0.1-SNAPSHOT</version>
|
<version>7.0.1</version>
|
||||||
<relativePath />
|
<relativePath />
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tos-products-parent-pom</artifactId>
|
<artifactId>tos-products-parent-pom</artifactId>
|
||||||
<version>7.0.1-SNAPSHOT</version>
|
<version>7.0.1</version>
|
||||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tos-products-parent-pom</artifactId>
|
<artifactId>tos-products-parent-pom</artifactId>
|
||||||
<version>7.0.1-SNAPSHOT</version>
|
<version>7.0.1</version>
|
||||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tos-products-parent-pom</artifactId>
|
<artifactId>tos-products-parent-pom</artifactId>
|
||||||
<version>7.0.1-SNAPSHOT</version>
|
<version>7.0.1</version>
|
||||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tos-products-parent-pom</artifactId>
|
<artifactId>tos-products-parent-pom</artifactId>
|
||||||
<version>7.0.1-SNAPSHOT</version>
|
<version>7.0.1</version>
|
||||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tos-products-parent-pom</artifactId>
|
<artifactId>tos-products-parent-pom</artifactId>
|
||||||
<version>7.0.1-SNAPSHOT</version>
|
<version>7.0.1</version>
|
||||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>parent-pom</artifactId>
|
<artifactId>parent-pom</artifactId>
|
||||||
<version>7.0.1-SNAPSHOT</version>
|
<version>7.0.1</version>
|
||||||
<relativePath />
|
<relativePath />
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
@@ -118,7 +118,7 @@
|
|||||||
<artifactItem>
|
<artifactItem>
|
||||||
<groupId>${project.groupId}</groupId>
|
<groupId>${project.groupId}</groupId>
|
||||||
<artifactId>eclipse-launcher-mac-${launcher.prefix}</artifactId>
|
<artifactId>eclipse-launcher-mac-${launcher.prefix}</artifactId>
|
||||||
<version>6.4.0</version>
|
<version>7.0.1</version>
|
||||||
<type>zip</type>
|
<type>zip</type>
|
||||||
<overWrite>true</overWrite>
|
<overWrite>true</overWrite>
|
||||||
<outputDirectory>${studio.dir}</outputDirectory>
|
<outputDirectory>${studio.dir}</outputDirectory>
|
||||||
@@ -235,35 +235,35 @@
|
|||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<!-- <plugin>
|
<!-- <plugin>
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
<artifactId>exec-maven-plugin</artifactId>
|
<artifactId>exec-maven-plugin</artifactId>
|
||||||
<version>1.3.2</version>
|
<version>1.3.2</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>generate-javajet</id>
|
<id>generate-javajet</id>
|
||||||
<phase>package</phase>
|
<phase>package</phase>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>exec</goal>
|
<goal>exec</goal>
|
||||||
</goals>
|
</goals>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
<configuration>
|
<configuration>
|
||||||
<executable>java</executable>
|
<executable>java</executable>
|
||||||
<workingDirectory>${studio.dir}</workingDirectory>
|
<workingDirectory>${studio.dir}</workingDirectory>
|
||||||
<arguments>
|
<arguments>
|
||||||
<argument>-Xmx1536m</argument>
|
<argument>-Xmx1536m</argument>
|
||||||
<argument>-XX:MaxPermSize=512m</argument>
|
<argument>-XX:MaxPermSize=512m</argument>
|
||||||
<argument>-classpath</argument>
|
<argument>-classpath</argument>
|
||||||
<argument>${studio.dir}/plugins/${equinox.build}</argument>
|
<argument>${studio.dir}/plugins/${equinox.build}</argument>
|
||||||
<argument>org.eclipse.core.launcher.Main</argument>
|
<argument>org.eclipse.core.launcher.Main</argument>
|
||||||
<argument>-application</argument>
|
<argument>-application</argument>
|
||||||
<argument>org.talend.designer.codegen.CodeGenInit</argument>
|
<argument>org.talend.designer.codegen.CodeGenInit</argument>
|
||||||
<argument>-nosplash</argument>
|
<argument>-nosplash</argument>
|
||||||
<argument>-consoleLog</argument>
|
<argument>-consoleLog</argument>
|
||||||
<argument>-Dtalend.licence.path=${studio.dir}/license</argument>
|
<argument>-Dtalend.licence.path=${studio.dir}/license</argument>
|
||||||
</arguments>
|
</arguments>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>-->
|
</plugin>-->
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
@@ -503,29 +503,29 @@
|
|||||||
<timestampProvider>default</timestampProvider>
|
<timestampProvider>default</timestampProvider>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<!--
|
<!--
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
<artifactId>build-helper-maven-plugin</artifactId>
|
<artifactId>build-helper-maven-plugin</artifactId>
|
||||||
<version>1.7</version>
|
<version>1.7</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>-->
|
<execution>-->
|
||||||
<!-- Attach product ZIP to Maven artifact -->
|
<!-- Attach product ZIP to Maven artifact -->
|
||||||
<!-- <id>attach-artifacts</id>
|
<!-- <id>attach-artifacts</id>
|
||||||
<phase>package</phase>
|
<phase>package</phase>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>attach-artifact</goal>
|
<goal>attach-artifact</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<artifacts>
|
<artifacts>
|
||||||
<artifact>
|
<artifact>
|
||||||
<file>${project.build.directory}/products/${product.final.name}.zip</file>
|
<file>${project.build.directory}/products/${product.final.name}.zip</file>
|
||||||
<type>product</type>
|
<type>product</type>
|
||||||
</artifact>
|
</artifact>
|
||||||
</artifacts>
|
</artifacts>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>-->
|
</plugin>-->
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
|||||||
2
pom.xml
2
pom.xml
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>parent-pom</artifactId>
|
<artifactId>parent-pom</artifactId>
|
||||||
<version>7.0.1-SNAPSHOT</version>
|
<version>7.0.1</version>
|
||||||
<relativePath />
|
<relativePath />
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>parent-pom</artifactId>
|
<artifactId>parent-pom</artifactId>
|
||||||
<version>7.0.1-SNAPSHOT</version>
|
<version>7.0.1</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
@@ -12,10 +12,10 @@
|
|||||||
<tycho-extras.version>${tycho.version}</tycho-extras.version>
|
<tycho-extras.version>${tycho.version}</tycho-extras.version>
|
||||||
<base.version>7.0.1</base.version>
|
<base.version>7.0.1</base.version>
|
||||||
<!-- osgi.compatible.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}.<suffix> (milestones), or ${base.version} (GA)-->
|
<!-- 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 is either ${base.version}-SNAPSHOT (snapshots), ${base.version}-<suffix> (milestones), or ${base.version} (GA)-->
|
||||||
<maven.compatible.version>${base.version}-SNAPSHOT</maven.compatible.version>
|
<maven.compatible.version>${base.version}</maven.compatible.version>
|
||||||
<repo.type>Snapshot</repo.type>
|
<repo.type>Release</repo.type>
|
||||||
<doc.version>7.0.1-SNAPSHOT</doc.version>
|
<doc.version>7.0.1-SNAPSHOT</doc.version>
|
||||||
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
|
<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.url>${talend.nexus.host}/nexus/content/repositories</talend.nexus.url>
|
||||||
@@ -36,7 +36,7 @@
|
|||||||
<osgi.ws>win32</osgi.ws>
|
<osgi.ws>win32</osgi.ws>
|
||||||
<osgi.os>win32</osgi.os>
|
<osgi.os>win32</osgi.os>
|
||||||
<osgi.arch>x86</osgi.arch>
|
<osgi.arch>x86</osgi.arch>
|
||||||
<strictVersions>true</strictVersions>
|
<strictVersions>false</strictVersions>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<distributionManagement>
|
<distributionManagement>
|
||||||
@@ -199,6 +199,67 @@
|
|||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
<profiles>
|
<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>
|
<profile>
|
||||||
<id>nonofficial</id>
|
<id>nonofficial</id>
|
||||||
<activation>
|
<activation>
|
||||||
|
|||||||
Reference in New Issue
Block a user