Compare commits
22 Commits
DEVOPS-384
...
release/6.
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c59384e460 | ||
|
|
f84e93354f | ||
|
|
1e0372e929 | ||
|
|
4379c0ab26 | ||
|
|
da625c94c8 | ||
|
|
426a119c3a | ||
|
|
45bfc192a4 | ||
|
|
c891674749 | ||
|
|
95303863b2 | ||
|
|
0a13751ccd | ||
|
|
99cf0b5505 | ||
|
|
76c1c12ff2 | ||
|
|
d3396b693a | ||
|
|
03f5d443d2 | ||
|
|
a52d843626 | ||
|
|
ee6a3c8a46 | ||
|
|
9c42abe264 | ||
|
|
85b93322e8 | ||
|
|
dc2e24395b | ||
|
|
db1ebbf298 | ||
|
|
a96531b846 | ||
|
|
eddd516b09 |
@@ -1,7 +1,7 @@
|
||||
# Studio-se-master
|
||||
http://www.talend.com
|
||||
|
||||

|
||||

|
||||
|
||||
> Content
|
||||
==========
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<?pde version="3.8"?><target name="Talend Target Platform for Eclipse 4.4 definition" sequenceNumber="200">
|
||||
<?pde version="3.8"?><target name="Talend Target Platform for Eclipse 4.4 definition" sequenceNumber="198">
|
||||
<locations>
|
||||
<location path="${project_loc:/Target Platform for Talend Studio and Luna}/included/emf_query2" type="Directory"/>
|
||||
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
|
||||
@@ -153,6 +153,15 @@
|
||||
<unit id="net.jeeeyul.swtend.feature.feature.group" version="2.2.5.I20140918-144458"/>
|
||||
<repository location="http://eclipse.jeeeyul.net/update/"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.egit.source.feature.group" version="3.4.2.201412180340-r"/>
|
||||
<unit id="org.eclipse.egit.feature.group" version="3.4.2.201412180340-r"/>
|
||||
<unit id="org.eclipse.jgit.java7.feature.group" version="3.4.2.201412180340-r"/>
|
||||
<unit id="org.eclipse.jgit.http.apache.feature.group" version="3.4.2.201412180340-r"/>
|
||||
<unit id="org.eclipse.jgit.source.feature.group" version="3.4.2.201412180340-r"/>
|
||||
<unit id="org.eclipse.jgit.feature.group" version="3.4.2.201412180340-r"/>
|
||||
<repository location="http://download.eclipse.org/releases/luna/"/>
|
||||
</location>
|
||||
<location path="${project_loc:/Target Platform for Talend Studio and Luna}/included/drools" type="Directory"/>
|
||||
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
|
||||
<unit id="org.codehaus.groovy23.feature.feature.group" version="2.9.0.xx-201406301445-e44"/>
|
||||
@@ -1274,19 +1283,7 @@
|
||||
<repository location="http://download.eclipse.org/nebula/releases/1.0.0"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jgit.lfs.feature.group" version="4.6.0.201612231935-r"/>
|
||||
<unit id="org.eclipse.jgit.pgm.source.feature.group" version="4.6.0.201612231935-r"/>
|
||||
<unit id="org.eclipse.egit.mylyn.feature.group" version="4.6.0.201612231935-r"/>
|
||||
<unit id="org.eclipse.egit.source.feature.group" version="4.6.0.201612231935-r"/>
|
||||
<unit id="org.eclipse.jgit.pgm.feature.group" version="4.6.0.201612231935-r"/>
|
||||
<unit id="org.eclipse.egit.feature.group" version="4.6.0.201612231935-r"/>
|
||||
<unit id="org.eclipse.jgit.feature.group" version="4.6.0.201612231935-r"/>
|
||||
<unit id="org.eclipse.jgit.source.feature.group" version="4.6.0.201612231935-r"/>
|
||||
<unit id="org.eclipse.jgit.http.apache.feature.group" version="4.6.0.201612231935-r"/>
|
||||
<repository location="http://download.eclipse.org/egit/updates-4.6/"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.nebula.incubation.feature.feature.group" version="1.0.0.201701041652"/>
|
||||
<unit id="org.eclipse.nebula.incubation.feature.feature.group" version="1.0.0.201607202302"/>
|
||||
<repository location="http://download.eclipse.org/nebula/incubation/snapshot"/>
|
||||
</location>
|
||||
</locations>
|
||||
|
||||
@@ -5,12 +5,17 @@
|
||||
<parent>
|
||||
<groupId>org.talend.repo</groupId>
|
||||
<artifactId>dependencies.p2</artifactId>
|
||||
<version>6.5.2-SNAPSHOT</version>
|
||||
<version>6.3.2</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>dependencies.p2.tos</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<properties>
|
||||
<components.version>0.16.1</components.version>
|
||||
<daikon.version>0.14.1</daikon.version>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.ops4j.pax.url</groupId>
|
||||
@@ -20,37 +25,37 @@
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>dataquality-common</artifactId>
|
||||
<version>1.6.6-SNAPSHOT</version>
|
||||
<version>1.5.8</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>dataquality-semantic-model</artifactId>
|
||||
<version>1.6.6-SNAPSHOT</version>
|
||||
<version>1.5.8</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>dataquality-semantic</artifactId>
|
||||
<version>1.6.6-SNAPSHOT</version>
|
||||
<version>1.5.8</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>dataquality-statistics</artifactId>
|
||||
<version>1.6.6-SNAPSHOT</version>
|
||||
<version>1.5.8</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>dataquality-record-linkage</artifactId>
|
||||
<version>3.3.6-SNAPSHOT</version>
|
||||
<version>3.2.8</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>dataquality-standardization</artifactId>
|
||||
<version>3.3.6-SNAPSHOT</version>
|
||||
<version>3.2.8</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>dataquality-sampling</artifactId>
|
||||
<version>2.4.6-SNAPSHOT</version>
|
||||
<version>2.3.8</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.daikon</groupId>
|
||||
@@ -62,7 +67,7 @@
|
||||
<dependency>
|
||||
<groupId>com.cedarsoftware</groupId>
|
||||
<artifactId>json-io</artifactId>
|
||||
<version>4.9.9-TALEND</version>
|
||||
<version>4.5.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
@@ -166,7 +171,7 @@
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-salesforce-definition</artifactId>
|
||||
<artifactId>components-salesforce</artifactId>
|
||||
<version>${components.version}</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
@@ -181,49 +186,8 @@
|
||||
<artifactId>components-jira</artifactId>
|
||||
<version>${components.version}</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-couchbase</artifactId>
|
||||
<version>${components.version}</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-snowflake</artifactId>
|
||||
<version>${components.version}</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-azurestorage</artifactId>
|
||||
<version>${components.version}</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-netsuite-definition</artifactId>
|
||||
<version>${components.version}</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-marketo-definition</artifactId>
|
||||
<version>${components.version}</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>joda-time</groupId>
|
||||
<artifactId>joda-time</artifactId>
|
||||
<version>2.8.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>hadoopcluster-definition</artifactId>
|
||||
<version>${components.version}</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<!-- to avoid updatin the complete eclipse target platform we add these
|
||||
</dependency>
|
||||
<!-- to avoid updatin the complete eclipse target platform we add these
|
||||
single dependencies -->
|
||||
<dependency>
|
||||
<groupId>biz.aQute.bnd</groupId>
|
||||
|
||||
@@ -5,12 +5,10 @@
|
||||
|
||||
<groupId>org.talend.repo</groupId>
|
||||
<artifactId>dependencies.p2</artifactId>
|
||||
<version>6.5.2-SNAPSHOT</version>
|
||||
<version>6.3.2</version>
|
||||
<packaging>pom</packaging>
|
||||
<properties>
|
||||
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
|
||||
<components.version>0.19.9</components.version>
|
||||
<daikon.version>0.17.2</daikon.version>
|
||||
</properties>
|
||||
|
||||
<distributionManagement>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>6.5.2-SNAPSHOT</version>
|
||||
<version>6.3.2</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>6.5.2-SNAPSHOT</version>
|
||||
<version>6.3.2</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
<feature id="org.talend.rcp.branding.tos.test.feature"/>
|
||||
<feature id="org.talend.babel.all.tos.feature"/>
|
||||
<feature id="org.talend.test.tos.feature"/>
|
||||
<feature id="org.talend.bigdata.se.test.feature"/>
|
||||
<feature id="org.talend.esb.tooling.test.feature"/>
|
||||
<feature id="org.talend.bigdata.se.test.feature"/>
|
||||
</features>
|
||||
</product>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.5.2-SNAPSHOT</version>
|
||||
<version>6.3.2</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.5.2-SNAPSHOT</version>
|
||||
<version>6.3.2</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.5.2-SNAPSHOT</version>
|
||||
<version>6.3.2</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.5.2-SNAPSHOT</version>
|
||||
<version>6.3.2</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.5.2-SNAPSHOT</version>
|
||||
<version>6.3.2</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.5.2-SNAPSHOT</version>
|
||||
<version>6.3.2</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
@@ -118,7 +118,7 @@
|
||||
<artifactItem>
|
||||
<groupId>${project.groupId}</groupId>
|
||||
<artifactId>eclipse-launcher-mac-${launcher.prefix}</artifactId>
|
||||
<version>6.4.0</version>
|
||||
<version>${base.version}</version>
|
||||
<type>zip</type>
|
||||
<overWrite>true</overWrite>
|
||||
<outputDirectory>${studio.dir}</outputDirectory>
|
||||
|
||||
2
pom.xml
2
pom.xml
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>6.5.2-SNAPSHOT</version>
|
||||
<version>6.3.2</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -3,28 +3,28 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>6.5.2-SNAPSHOT</version>
|
||||
<version>6.3.2</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.5.2</base.version>
|
||||
<base.version>6.3.2</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>
|
||||
<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.p2unzip.url>${talend.nexus.host}/nexus/content/unzip</talend.nexus.p2unzip.url>
|
||||
<opensourcesnapshot-unziprepo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSourceSnapshot/org/talend/repo</opensourcesnapshot-unziprepo.url>
|
||||
<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.4.1-SNAPSHOT/talend-eclipse-p2-repo-6.4.1-SNAPSHOT.zip-unzip</eclipse-repo.url>
|
||||
<eclipse-repo.url>${opensourcesnapshot-unziprepo.url}/talend-eclipse-p2-repo/6.3.0-SNAPSHOT/talend-eclipse-p2-repo-6.3.0-SNAPSHOT.zip-unzip</eclipse-repo.url>
|
||||
<eclipse-emf-repo.url>${opensourcesnapshot-unziprepo.url}/emf-compare-update/3.0.1-SNAPSHOT/emf-compare-update-3.0.1-SNAPSHOT.zip-unzip</eclipse-emf-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.5.1-SNAPSHOT/talend-doc-p2-repo-6.5.1-SNAPSHOT.zip-unzip/</doc-repo.url>
|
||||
<doc-repo.url>${opensourcesnapshot-unziprepo.url}/talend-doc-p2-repo/6.3.2-SNAPSHOT/talend-doc-p2-repo-6.3.2-SNAPSHOT.zip-unzip/</doc-repo.url>
|
||||
<bonita-open-repo.url>${opensourcerelease-unziprepo.url}/bonita-community-p2-repo/7.2.3a/bonita-community-p2-repo-7.2.3a.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>
|
||||
@@ -35,7 +35,7 @@
|
||||
<osgi.ws>win32</osgi.ws>
|
||||
<osgi.os>win32</osgi.os>
|
||||
<osgi.arch>x86</osgi.arch>
|
||||
<strictVersions>true</strictVersions>
|
||||
<strictVersions>false</strictVersions>
|
||||
</properties>
|
||||
|
||||
<distributionManagement>
|
||||
@@ -149,12 +149,12 @@
|
||||
</environments>
|
||||
<filters>
|
||||
<!-- restrict version of a bundle -->
|
||||
<!--<filter>
|
||||
<type>eclipse-plugin</type>
|
||||
<id>org.eclipse.ui.views.properties.tabbed</id>
|
||||
<restrictTo>
|
||||
<version>3.6.100.v20140519-0906</version>
|
||||
</restrictTo>
|
||||
<!--<filter>
|
||||
<type>eclipse-plugin</type>
|
||||
<id>org.eclipse.ui.views.properties.tabbed</id>
|
||||
<restrictTo>
|
||||
<version>3.6.100.v20140519-0906</version>
|
||||
</restrictTo>
|
||||
</filter>-->
|
||||
<filter>
|
||||
<type>eclipse-plugin</type>
|
||||
@@ -164,22 +164,22 @@
|
||||
</restrictTo>
|
||||
</filter>
|
||||
|
||||
<!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence
|
||||
<filter>
|
||||
<type>java-package</type>
|
||||
<id>javax.persistence</id>
|
||||
<restrictTo>
|
||||
<type>eclipse-plugin</type>
|
||||
<id>javax.persistence</id>
|
||||
</restrictTo>
|
||||
</filter>
|
||||
<!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence
|
||||
<filter>
|
||||
<type>java-package</type>
|
||||
<id>javax.persistence</id>
|
||||
<restrictTo>
|
||||
<type>eclipse-plugin</type>
|
||||
<id>javax.persistence</id>
|
||||
</restrictTo>
|
||||
</filter>
|
||||
-->
|
||||
<!-- example 3: work around Equinox bug 348045
|
||||
<filter>
|
||||
<type>p2-installable-unit</type>
|
||||
<id>org.eclipse.equinox.servletbridge.extensionbundle</id>
|
||||
<removeAll />
|
||||
</filter>
|
||||
<!-- example 3: work around Equinox bug 348045
|
||||
<filter>
|
||||
<type>p2-installable-unit</type>
|
||||
<id>org.eclipse.equinox.servletbridge.extensionbundle</id>
|
||||
<removeAll />
|
||||
</filter>
|
||||
-->
|
||||
</filters>
|
||||
</configuration>
|
||||
@@ -453,24 +453,5 @@
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>unpacked.plugins</id>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-packaging-plugin</artifactId>
|
||||
<version>${tycho.version}</version>
|
||||
<configuration>
|
||||
<archive>
|
||||
<manifestEntries>
|
||||
<Eclipse-BundleShape>dir</Eclipse-BundleShape>
|
||||
</manifestEntries>
|
||||
</archive>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
</profiles>
|
||||
</project>
|
||||
|
||||
Reference in New Issue
Block a user