Compare commits
8 Commits
feature/TU
...
feature/TU
| Author | SHA1 | Date | |
|---|---|---|---|
|
03799a4d4c | ||
|
|
f787026708 | ||
|
|
10e634fbcd | ||
|
|
5558bf1e67 | ||
|
|
257db4c95b | ||
|
|
5af92fb269 | ||
|
|
7feaa9cbc5 | ||
|
|
af8c598b21 |
@@ -40,7 +40,8 @@
|
||||
<dependency>
|
||||
<groupId>org.talend.daikon</groupId>
|
||||
<artifactId>daikon</artifactId>
|
||||
<version>0.3.0.BUILD-SNAPSHOT</version>
|
||||
<version>0.5.0-SNAPSHOT</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<!-- daikon dependencies-->
|
||||
<dependency>
|
||||
@@ -87,12 +88,12 @@
|
||||
<!-- 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>
|
||||
<dependency>
|
||||
<groupId>org.apache.servicemix.bundles</groupId>
|
||||
<artifactId>org.apache.servicemix.bundles.avro</artifactId>
|
||||
<version>1.8.0_1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.thoughtworks.paranamer</groupId>
|
||||
<artifactId>paranamer</artifactId>
|
||||
<version>2.8</version>
|
||||
@@ -102,11 +103,6 @@
|
||||
<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>
|
||||
@@ -121,25 +117,25 @@
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-api</artifactId>
|
||||
<version>0.3.0.BUILD-SNAPSHOT</version>
|
||||
<version>0.5.0-SNAPSHOT</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-common</artifactId>
|
||||
<version>0.3.0.BUILD-SNAPSHOT</version>
|
||||
<version>0.5.0-SNAPSHOT</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.5.0-SNAPSHOT</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-salesforce</artifactId>
|
||||
<version>0.3.0.BUILD-SNAPSHOT</version>
|
||||
<version>0.5.0-SNAPSHOT</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<!-- to avoid updatin the complete eclipse target platform we add these single dependencies -->
|
||||
|
||||
@@ -153,7 +153,7 @@
|
||||
<artifactItem>
|
||||
<groupId>${project.groupId}</groupId>
|
||||
<artifactId>${product.branding.platform}</artifactId>
|
||||
<version>${maven.version}</version>
|
||||
<version>${maven.compatible.version}</version>
|
||||
<type>txt</type>
|
||||
<classifier>license</classifier>
|
||||
<overWrite>true</overWrite>
|
||||
@@ -174,7 +174,7 @@
|
||||
<artifactItem>
|
||||
<groupId>${project.groupId}</groupId>
|
||||
<artifactId>${product.branding.platform}</artifactId>
|
||||
<version>${maven.version}</version>
|
||||
<version>${maven.compatible.version}</version>
|
||||
<type>txt</type>
|
||||
<classifier>notice</classifier>
|
||||
<overWrite>true</overWrite>
|
||||
|
||||
@@ -11,10 +11,10 @@
|
||||
<tycho.version>0.22.0</tycho.version>
|
||||
<tycho-extras.version>${tycho.version}</tycho-extras.version>
|
||||
<base.version>6.2.0</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>
|
||||
<!-- maven.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}-<suffix> (milestones), or ${base.version} (GA)-->
|
||||
<maven.version>${base.version}-SNAPSHOT</maven.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>
|
||||
<!-- 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>
|
||||
<talend.nexus.host>newbuild.talend.com:8081</talend.nexus.host>
|
||||
<talend.nexus.url>http://${talend.nexus.host}/nexus/content/repositories</talend.nexus.url>
|
||||
@@ -23,13 +23,13 @@
|
||||
<opensourcerelease-unziprepo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSourceRelease/org/talend/repo</opensourcerelease-unziprepo.url>
|
||||
<eclipse-repo.url>${opensourcesnapshot-unziprepo.url}/talend-eclipse-p2-repo/6.1.0-SNAPSHOT/talend-eclipse-p2-repo-6.1.0-SNAPSHOT.zip-unzip</eclipse-repo.url>
|
||||
<babel-repo.url>${opensourcesnapshot-unziprepo.url}/talend-babel-p2-repo/4.4.1-SNAPSHOT/talend-babel-p2-repo-4.4.1-SNAPSHOT.zip-unzip</babel-repo.url>
|
||||
<doc-repo.url>${opensourcesnapshot-unziprepo.url}/talend-doc-p2-repo/6.1.1-SNAPSHOT/talend-doc-p2-repo-6.1.1-SNAPSHOT.zip-unzip/</doc-repo.url>
|
||||
<doc-repo.url>${opensourcesnapshot-unziprepo.url}/talend-doc-p2-repo/6.2.0-SNAPSHOT/talend-doc-p2-repo-6.2.0-SNAPSHOT.zip-unzip/</doc-repo.url>
|
||||
<bonita-open-repo.url>${opensourcerelease-unziprepo.url}/bonita-community-p2-repo/6.5.0a/bonita-community-p2-repo-6.5.0a.zip-unzip/</bonita-open-repo.url>
|
||||
<equinox.build>org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar</equinox.build>
|
||||
<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.version}/talend-tos-p2-repo-${osgi.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.version}/dependencies.p2.tos-${maven.version}.zip-unzip/</tos-deps-p2-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>
|
||||
<jgit.dirtyWorkingTree.official>error</jgit.dirtyWorkingTree.official>
|
||||
<osgi.ws>win32</osgi.ws>
|
||||
<osgi.os>win32</osgi.os>
|
||||
@@ -138,7 +138,7 @@
|
||||
<artifactId>target-platform-configuration</artifactId>
|
||||
<version>${tycho.version}</version>
|
||||
<configuration>
|
||||
<executionEnvironmentDefault>JavaSE-1.7</executionEnvironmentDefault>
|
||||
<executionEnvironmentDefault>JavaSE-1.8</executionEnvironmentDefault>
|
||||
<environments>
|
||||
<environment>
|
||||
<os>${osgi.os}</os>
|
||||
@@ -189,9 +189,9 @@
|
||||
<version>${tycho.version}</version>
|
||||
<configuration>
|
||||
<compilerArgument>-warn:+discouraged,forbidden</compilerArgument>
|
||||
<compilerVersion>1.7</compilerVersion>
|
||||
<source>1.7</source>
|
||||
<target>1.7</target>
|
||||
<compilerVersion>1.8</compilerVersion>
|
||||
<source>1.8</source>
|
||||
<target>1.8</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
|
||||
Reference in New Issue
Block a user