Compare commits
6 Commits
feature/TU
...
maintenanc
| Author | SHA1 | Date | |
|---|---|---|---|
|
e1273a2ae7 | ||
|
|
3fb5386145 | ||
|
|
e642506a2a | ||
|
|
64d20c0b5e | ||
|
|
f1b156bb90 | ||
|
|
e74cebe5aa |
@@ -5,58 +5,48 @@
|
||||
<parent>
|
||||
<groupId>org.talend.repo</groupId>
|
||||
<artifactId>dependencies.p2</artifactId>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>dependencies.p2.tos</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.ops4j.pax.url</groupId>
|
||||
<artifactId>pax-url-aether</artifactId>
|
||||
<version>2.4.5-Talend</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>org.talend.dataquality.common</artifactId>
|
||||
<version>1.4.3-SNAPSHOT</version>
|
||||
<version>1.3.3</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>org.talend.dataquality.record.linkage</artifactId>
|
||||
<version>3.1.1-SNAPSHOT</version>
|
||||
<version>3.0.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>org.talend.dataquality.standardization</artifactId>
|
||||
<version>3.0.3-SNAPSHOT</version>
|
||||
<version>3.0.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>org.talend.dataquality.sampling</artifactId>
|
||||
<version>2.1.6-SNAPSHOT</version>
|
||||
<version>2.1.4</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.daikon</groupId>
|
||||
<artifactId>daikon</artifactId>
|
||||
<version>0.3.0.BUILD-SNAPSHOT</version>
|
||||
<version>0.2.0.RELEASE</version>
|
||||
</dependency>
|
||||
<!-- daikon dependencies-->
|
||||
<dependency>
|
||||
<groupId>com.cedarsoftware</groupId>
|
||||
<artifactId>json-io</artifactId>
|
||||
<version>4.1.10</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-->
|
||||
<version>2.4.5</version>
|
||||
</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-->
|
||||
<version>2.4.6</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-codec</groupId>
|
||||
@@ -68,78 +58,30 @@
|
||||
<artifactId>commons-lang</artifactId>
|
||||
<version>2.4</version>
|
||||
</dependency>
|
||||
|
||||
<!-- end of daikon dependencies-->
|
||||
|
||||
<!-- ========================= -->
|
||||
<!-- Added by TDM -->
|
||||
|
||||
<dependency>
|
||||
<groupId>org.codehaus.jackson</groupId>
|
||||
<artifactId>jackson-core-asl</artifactId>
|
||||
<version>1.9.13</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.codehaus.jackson</groupId>
|
||||
<artifactId>jackson-mapper-asl</artifactId>
|
||||
<version>1.9.13</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Avro and dependencies -->
|
||||
<!-- To be replaced when avro will be available -->
|
||||
<!-- from servicemix with less dependencies -->
|
||||
<dependency>
|
||||
<groupId>org.apache.avro</groupId>
|
||||
<artifactId>avro</artifactId>
|
||||
<version>1.7.7</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.thoughtworks.paranamer</groupId>
|
||||
<artifactId>paranamer</artifactId>
|
||||
<version>2.8</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-compress</artifactId>
|
||||
<version>1.10</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.github.livesense</groupId>
|
||||
<artifactId>org.liveSense.fragment.sun.misc</artifactId>
|
||||
<version>1.0.5</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Keep version in sync with slf4j-api -->
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-log4j12</artifactId>
|
||||
<version>1.6.1</version>
|
||||
</dependency>
|
||||
|
||||
<!-- End added by TDM -->
|
||||
<!-- ========================= -->
|
||||
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-api</artifactId>
|
||||
<version>0.3.0.BUILD-SNAPSHOT</version>
|
||||
<version>0.2.1.RELEASE</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-common</artifactId>
|
||||
<version>0.3.0.BUILD-SNAPSHOT</version>
|
||||
<version>0.2.0.RELEASE</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-common-oauth</artifactId>
|
||||
<version>0.3.0.BUILD-SNAPSHOT</version>
|
||||
<version>0.2.0.RELEASE</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-salesforce</artifactId>
|
||||
<version>0.3.0.BUILD-SNAPSHOT</version>
|
||||
<version>0.2.0.RELEASE</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<!-- to avoid updatin the complete eclipse target platform we add these single dependencies -->
|
||||
@@ -148,16 +90,5 @@
|
||||
<artifactId>commons-logging</artifactId>
|
||||
<version>1.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
<version>1.6.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-configuration</groupId>
|
||||
<artifactId>commons-configuration</artifactId>
|
||||
<version>1.10</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
<groupId>org.talend.repo</groupId>
|
||||
<artifactId>dependencies.p2</artifactId>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<distributionManagement>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
2
pom.xml
2
pom.xml
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
<version>6.1.1</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -3,19 +3,19 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
<version>6.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>6.2.0</base.version>
|
||||
<base.version>6.1.1</base.version>
|
||||
<!-- osgi.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}.<suffix> (milestones), or ${base.version} (GA)-->
|
||||
<osgi.version>${base.version}-SNAPSHOT</osgi.version>
|
||||
<osgi.version>6.1.1</osgi.version>
|
||||
<!-- maven.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}-<suffix> (milestones), or ${base.version} (GA)-->
|
||||
<maven.version>${base.version}-SNAPSHOT</maven.version>
|
||||
<repo.type>Snapshot</repo.type>
|
||||
<maven.version>6.1.1</maven.version>
|
||||
<repo.type>Release</repo.type>
|
||||
<talend.nexus.host>newbuild.talend.com:8081</talend.nexus.host>
|
||||
<talend.nexus.url>http://${talend.nexus.host}/nexus/content/repositories</talend.nexus.url>
|
||||
<talend.nexus.p2unzip.url>http://${talend.nexus.host}/nexus/content/unzip</talend.nexus.p2unzip.url>
|
||||
@@ -138,7 +138,7 @@
|
||||
<artifactId>target-platform-configuration</artifactId>
|
||||
<version>${tycho.version}</version>
|
||||
<configuration>
|
||||
<executionEnvironmentDefault>JavaSE-1.8</executionEnvironmentDefault>
|
||||
<executionEnvironmentDefault>JavaSE-1.7</executionEnvironmentDefault>
|
||||
<environments>
|
||||
<environment>
|
||||
<os>${osgi.os}</os>
|
||||
@@ -189,9 +189,9 @@
|
||||
<version>${tycho.version}</version>
|
||||
<configuration>
|
||||
<compilerArgument>-warn:+discouraged,forbidden</compilerArgument>
|
||||
<compilerVersion>1.8</compilerVersion>
|
||||
<source>1.8</source>
|
||||
<target>1.8</target>
|
||||
<compilerVersion>1.7</compilerVersion>
|
||||
<source>1.7</source>
|
||||
<target>1.7</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
|
||||
Reference in New Issue
Block a user