Compare commits
56 Commits
feature/TU
...
maintenanc
| Author | SHA1 | Date | |
|---|---|---|---|
|
766b52cb8d | ||
|
|
9982a9bc2c | ||
|
|
bbd009c009 | ||
|
|
909016cb1a | ||
|
|
365a100dd9 | ||
|
|
974b9eb7ec | ||
|
|
852ac23bcb | ||
|
|
cce658d1cf | ||
|
|
c1ea2ea20e | ||
|
|
d6d7eae99a | ||
|
|
8d01cefa64 | ||
|
|
803a8bf12d | ||
|
|
659aecc690 | ||
|
|
6dccb4fdfd | ||
|
|
652f0128ee | ||
|
|
601759eca2 | ||
|
|
9b1b4a0a4f | ||
|
|
d987967a27 | ||
|
|
2050335d33 | ||
|
|
2aa697d46d | ||
|
|
f874fc0405 | ||
|
|
45efd93321 | ||
|
|
6563b13348 | ||
|
|
6d86d3b5f0 | ||
|
|
b4cb221f0f | ||
|
|
cbd32b831a | ||
|
|
b76c851b88 | ||
|
|
5a28d0f740 | ||
|
|
531d5d0701 | ||
|
|
dd442d9bf7 | ||
|
|
3a455e3a8d | ||
|
|
0de59c4d21 | ||
|
|
32475486b0 | ||
|
|
0badb923cd | ||
|
|
26dece22cd | ||
|
|
5851ac96ed | ||
|
|
66e01d349a | ||
|
|
49ffccb4f9 | ||
|
|
3a653300b7 | ||
|
|
b96fee274a | ||
|
|
5a0fb7845f | ||
|
|
9b949cc838 | ||
|
|
898e422f16 | ||
|
|
78b04b6d5a | ||
|
|
b71968678c | ||
|
|
2e7d7e8eb1 | ||
|
|
b86f658864 | ||
|
|
a21f00fcbb | ||
|
|
78b369e616 | ||
|
|
f787026708 | ||
|
|
10e634fbcd | ||
|
|
5558bf1e67 | ||
|
|
257db4c95b | ||
|
|
5af92fb269 | ||
|
|
7feaa9cbc5 | ||
|
|
af8c598b21 |
@@ -36,7 +36,7 @@ should you want to download a set of slave repositories, use
|
||||
No using Git slave
|
||||
==================
|
||||
You may setup all the git repositories manually.
|
||||
The idea is to clone all the required repositories next to each other, including this one.
|
||||
The idea is to clone all the required repositories next to each other, including this one using the 'git clone' command.
|
||||
You will find the list of repositories in root [.gitslave](../master/.gitslave) file for each branch.
|
||||
|
||||
Build The Open Source Studio
|
||||
|
||||
@@ -1,163 +1,211 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
<groupId>org.talend.repo</groupId>
|
||||
<artifactId>dependencies.p2</artifactId>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
<parent>
|
||||
<groupId>org.talend.repo</groupId>
|
||||
<artifactId>dependencies.p2</artifactId>
|
||||
<version>6.2.1</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>dependencies.p2.tos</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<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>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>org.talend.dataquality.record.linkage</artifactId>
|
||||
<version>3.1.1-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>org.talend.dataquality.standardization</artifactId>
|
||||
<version>3.0.3-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>org.talend.dataquality.sampling</artifactId>
|
||||
<version>2.1.6-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.daikon</groupId>
|
||||
<artifactId>daikon</artifactId>
|
||||
<version>0.3.0.BUILD-SNAPSHOT</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-->
|
||||
</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-->
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-codec</groupId>
|
||||
<artifactId>commons-codec</artifactId>
|
||||
<version>1.6</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-lang</groupId>
|
||||
<artifactId>commons-lang</artifactId>
|
||||
<version>2.4</version>
|
||||
</dependency>
|
||||
<!-- end of daikon dependencies-->
|
||||
<properties>
|
||||
<components.version>0.13.1</components.version>
|
||||
<daikon.version>0.12.1</daikon.version>
|
||||
</properties>
|
||||
|
||||
<!-- ========================= -->
|
||||
<!-- 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>
|
||||
<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.5</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>org.talend.dataquality.record.linkage</artifactId>
|
||||
<version>3.1.3</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>org.talend.dataquality.standardization</artifactId>
|
||||
<version>3.1.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>org.talend.dataquality.sampling</artifactId>
|
||||
<version>2.2.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.daikon</groupId>
|
||||
<artifactId>daikon</artifactId>
|
||||
<version>${daikon.version}</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<!-- daikon dependencies -->
|
||||
<dependency>
|
||||
<groupId>com.cedarsoftware</groupId>
|
||||
<artifactId>json-io</artifactId>
|
||||
<version>4.4.1-SNAPSHOT</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 -->
|
||||
</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 -->
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-codec</groupId>
|
||||
<artifactId>commons-codec</artifactId>
|
||||
<version>1.6</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-lang</groupId>
|
||||
<artifactId>commons-lang</artifactId>
|
||||
<version>2.4</version>
|
||||
</dependency>
|
||||
<!-- end of daikon dependencies -->
|
||||
|
||||
<!-- Keep version in sync with slf4j-api -->
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-log4j12</artifactId>
|
||||
<version>1.6.1</version>
|
||||
</dependency>
|
||||
<!-- ========================= -->
|
||||
<!-- Added by TDM -->
|
||||
|
||||
<!-- End 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.servicemix.bundles</groupId>
|
||||
<artifactId>org.apache.servicemix.bundles.avro</artifactId>
|
||||
<version>1.8.0_1</version>
|
||||
</dependency>
|
||||
|
||||
<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>org-slf4j-impl-log4j12</artifactId>
|
||||
<version>1.7.2</version>
|
||||
</dependency>
|
||||
|
||||
<!-- End added by TDM -->
|
||||
<!-- ========================= -->
|
||||
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-api</artifactId>
|
||||
<version>${components.version}</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-api-service</artifactId>
|
||||
<version>${components.version}</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-common</artifactId>
|
||||
<version>${components.version}</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-common-oauth</artifactId>
|
||||
<version>${components.version}</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-salesforce</artifactId>
|
||||
<version>0.13.2</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-dataprep</artifactId>
|
||||
<version>0.13.3</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-splunk</artifactId>
|
||||
<version>${components.version}</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-jira</artifactId>
|
||||
<version>${components.version}</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<!-- to avoid updatin the complete eclipse target platform we add these
|
||||
single dependencies -->
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-api</artifactId>
|
||||
<version>0.3.0.BUILD-SNAPSHOT</version>
|
||||
<classifier>bundle</classifier>
|
||||
<groupId>biz.aQute.bnd</groupId>
|
||||
<artifactId>annotation</artifactId>
|
||||
<version>2.4.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-common</artifactId>
|
||||
<version>0.3.0.BUILD-SNAPSHOT</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-common-oauth</artifactId>
|
||||
<version>0.3.0.BUILD-SNAPSHOT</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-salesforce</artifactId>
|
||||
<version>0.3.0.BUILD-SNAPSHOT</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<!-- to avoid updatin the complete eclipse target platform we add these single dependencies -->
|
||||
<dependency>
|
||||
<groupId>commons-logging</groupId>
|
||||
<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>
|
||||
<dependency>
|
||||
<groupId>commons-logging</groupId>
|
||||
<artifactId>commons-logging</artifactId>
|
||||
<version>1.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>org-slf4j-api</artifactId>
|
||||
<version>1.7.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-configuration</groupId>
|
||||
<artifactId>commons-configuration</artifactId>
|
||||
<version>1.10</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-lang3</artifactId>
|
||||
<version>3.4</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.2.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.2.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.2.1</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -20,5 +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"/>
|
||||
</features>
|
||||
</product>
|
||||
|
||||
@@ -5,8 +5,11 @@ talend.studio.version=${version.full}
|
||||
eclipse.product=${product.branding.id}
|
||||
#The following osgi.framework key is required for the p2 update feature not to override the osgi.bundles values.
|
||||
osgi.framework=file\:plugins/org.eclipse.osgi_3.10.1.v20140909-1633.jar
|
||||
osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start,org.talend.components.api@start
|
||||
osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start,org.talend.components.api.service@start
|
||||
osgi.bundles.defaultStartLevel=4
|
||||
osgi.bundlefile.limit=200
|
||||
osgi.framework.extensions=org.talend.osgi.lib.loader
|
||||
file.encoding=UTF-8
|
||||
eclipse.p2.data.area=@config.dir/../p2/
|
||||
eclipse.p2.profile=profile
|
||||
default.update.site.url=http://update.talend.com/Studio/tos/
|
||||
@@ -1,5 +1,4 @@
|
||||
-vmargs
|
||||
-Xms256m
|
||||
-Xmx768m
|
||||
-XX:MaxPermSize=256m
|
||||
-Dfile.encoding=UTF-8
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
-vmargs
|
||||
-Xms512m
|
||||
-Xmx1536m
|
||||
-XX:MaxPermSize=512m
|
||||
-Dfile.encoding=UTF-8
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
--launcher.XXMaxPermSize
|
||||
512m
|
||||
-vmargs
|
||||
-Xms512m
|
||||
-Xmx1536m
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -5,8 +5,11 @@ talend.studio.version=${version.full}
|
||||
eclipse.product=${product.branding.id}
|
||||
#The following osgi.framework key is required for the p2 update feature not to override the osgi.bundles values.
|
||||
osgi.framework=file\:plugins/org.eclipse.osgi_3.10.1.v20140909-1633.jar
|
||||
osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start,org.talend.components.api@start
|
||||
osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start,org.talend.components.api.service@start
|
||||
osgi.bundles.defaultStartLevel=4
|
||||
osgi.bundlefile.limit=200
|
||||
osgi.framework.extensions=org.talend.osgi.lib.loader
|
||||
file.encoding=UTF-8
|
||||
eclipse.p2.data.area=@config.dir/../p2/
|
||||
eclipse.p2.profile=profile
|
||||
default.update.site.url=http://update.talend.com/Studio/tos/
|
||||
@@ -1,5 +1,4 @@
|
||||
-vmargs
|
||||
-Xms256m
|
||||
-Xmx768m
|
||||
-XX:MaxPermSize=256m
|
||||
-Dfile.encoding=UTF-8
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
-vmargs
|
||||
-Xms512m
|
||||
-Xmx1536m
|
||||
-XX:MaxPermSize=512m
|
||||
-Dfile.encoding=UTF-8
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
--launcher.XXMaxPermSize
|
||||
512m
|
||||
-vmargs
|
||||
-Xms512m
|
||||
-Xmx1536m
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
-vmargs
|
||||
-Xms256m
|
||||
-Xmx768m
|
||||
-XX:MaxPermSize=256m
|
||||
-Dfile.encoding=UTF-8
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
-vmargs
|
||||
-Xms512m
|
||||
-Xmx1536m
|
||||
-XX:MaxPermSize=512m
|
||||
-Dfile.encoding=UTF-8
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
--launcher.XXMaxPermSize
|
||||
512m
|
||||
-vmargs
|
||||
-Xms512m
|
||||
-Xmx1536m
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -5,8 +5,11 @@ talend.studio.version=${version.full}
|
||||
eclipse.product=${product.branding.id}
|
||||
#The following osgi.framework key is required for the p2 update feature not to override the osgi.bundles values.
|
||||
osgi.framework=file\:plugins/org.eclipse.osgi_3.10.1.v20140909-1633.jar
|
||||
osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start,org.talend.components.api@start
|
||||
osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start,org.talend.components.api.service@start
|
||||
osgi.bundles.defaultStartLevel=4
|
||||
osgi.bundlefile.limit=200
|
||||
osgi.framework.extensions=org.talend.osgi.lib.loader
|
||||
file.encoding=UTF-8
|
||||
eclipse.p2.data.area=@config.dir/../p2/
|
||||
eclipse.p2.profile=profile
|
||||
default.update.site.url=http://update.talend.com/Studio/tos/
|
||||
@@ -1,5 +1,4 @@
|
||||
-vmargs
|
||||
-Xms256m
|
||||
-Xmx768m
|
||||
-XX:MaxPermSize=256m
|
||||
-Dfile.encoding=UTF-8
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
-vmargs
|
||||
-Xms512m
|
||||
-Xmx1536m
|
||||
-XX:MaxPermSize=512m
|
||||
-Dfile.encoding=UTF-8
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
--launcher.XXMaxPermSize
|
||||
512m
|
||||
-vmargs
|
||||
-Xms512m
|
||||
-Xmx1536m
|
||||
|
||||
@@ -1,28 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
<artifactId>org.talend.studio.tos.esb.product</artifactId>
|
||||
<packaging>eclipse-repository</packaging>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-dependency-plugin</artifactId>
|
||||
<version>2.8</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>copy-notice-txt</id>
|
||||
<phase>none</phase>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
<artifactId>org.talend.studio.tos.esb.product</artifactId>
|
||||
<packaging>eclipse-repository</packaging>
|
||||
</project>
|
||||
|
||||
@@ -5,8 +5,11 @@ talend.studio.version=${version.full}
|
||||
eclipse.product=${product.branding.id}
|
||||
#The following osgi.framework key is required for the p2 update feature not to override the osgi.bundles values.
|
||||
osgi.framework=file\:plugins/org.eclipse.osgi_3.10.1.v20140909-1633.jar
|
||||
osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start,org.talend.components.api@start
|
||||
osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start,org.talend.components.api.service@start
|
||||
osgi.bundles.defaultStartLevel=4
|
||||
osgi.bundlefile.limit=200
|
||||
osgi.framework.extensions=org.talend.osgi.lib.loader
|
||||
file.encoding=UTF-8
|
||||
eclipse.p2.data.area=@config.dir/../p2/
|
||||
eclipse.p2.profile=profile
|
||||
default.update.site.url=http://update.talend.com/Studio/tos/
|
||||
@@ -1,5 +1,4 @@
|
||||
-vmargs
|
||||
-Xms256m
|
||||
-Xmx768m
|
||||
-XX:MaxPermSize=256m
|
||||
-Dfile.encoding=UTF-8
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
-vmargs
|
||||
-Xms512m
|
||||
-Xmx1536m
|
||||
-XX:MaxPermSize=512m
|
||||
-Dfile.encoding=UTF-8
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
--launcher.XXMaxPermSize
|
||||
512m
|
||||
-vmargs
|
||||
-Xms512m
|
||||
-Xmx1536m
|
||||
|
||||
@@ -1,31 +1,31 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.2.1</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
<artifactId>org.talend.studio.tos.mdm.product</artifactId>
|
||||
<packaging>eclipse-repository</packaging>
|
||||
<properties>
|
||||
<product.final.name>${product.final.name.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
|
||||
</properties>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-dependency-plugin</artifactId>
|
||||
<version>2.8</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>copy-notice-txt</id>
|
||||
<phase>none</phase>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
<artifactId>org.talend.studio.tos.mdm.product</artifactId>
|
||||
<packaging>eclipse-repository</packaging>
|
||||
<properties>
|
||||
<product.final.name>${product.final.name.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
|
||||
</properties>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-dependency-plugin</artifactId>
|
||||
<version>2.8</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>copy-notice-txt</id>
|
||||
<phase>none</phase>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
<version>6.2.1</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
@@ -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,12 +174,12 @@
|
||||
<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>
|
||||
<outputDirectory>${studio.dir}</outputDirectory>
|
||||
<destFileName>license.txt</destFileName>
|
||||
<destFileName>NOTICE.txt</destFileName>
|
||||
</artifactItem>
|
||||
</artifactItems>
|
||||
</configuration>
|
||||
|
||||
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.2.1</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -3,33 +3,34 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>6.2.0-SNAPSHOT</version>
|
||||
<version>6.2.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>
|
||||
<!-- 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>
|
||||
<repo.type>Snapshot</repo.type>
|
||||
<base.version>6.2.1</base.version>
|
||||
<!-- osgi.compatible.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}.<suffix> (milestones), or ${base.version} (GA)-->
|
||||
<osgi.compatible.version>6.2.1</osgi.compatible.version>
|
||||
<!-- maven.compatible.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}-<suffix> (milestones), or ${base.version} (GA)-->
|
||||
<maven.compatible.version>6.2.1</maven.compatible.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>
|
||||
<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.1.0-SNAPSHOT/talend-eclipse-p2-repo-6.1.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.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.1-SNAPSHOT/talend-doc-p2-repo-6.2.1-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>
|
||||
@@ -53,6 +54,11 @@
|
||||
</distributionManagement>
|
||||
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>tos-deps</id>
|
||||
<url>${tos-deps-p2-repo.url}</url>
|
||||
<layout>p2</layout>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>eclipse_repo</id>
|
||||
<url>${eclipse-repo.url}</url>
|
||||
@@ -93,11 +99,6 @@
|
||||
</snapshots>
|
||||
<url>${opensourcesnapshot-repo.url}</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>tos-deps</id>
|
||||
<url>${tos-deps-p2-repo.url}</url>
|
||||
<layout>p2</layout>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
<build>
|
||||
@@ -207,13 +208,6 @@
|
||||
<revision.filename>SNAPSHOT</revision.filename>
|
||||
<product.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</product.version>
|
||||
</properties>
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>talend_open_p2</id>
|
||||
<url>${tos-p2-repo.url}</url>
|
||||
<layout>p2</layout>
|
||||
</repository>
|
||||
</repositories>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
|
||||
Reference in New Issue
Block a user