Compare commits

..

20 Commits

Author SHA1 Message Date
iwang
8c86d1f723 Set compile and execution level to Java 8 2016-02-18 11:07:45 +01:00
iwang
cdc9203eb6 Add commons-configuration for org.talend.mdm.commmon 2016-02-16 21:50:50 +01:00
Sebastien Gandon
3fffa234c5 Updated jackson version in tos deps to fix a studio issue. 2016-02-09 19:48:36 +01:00
Sebastien Gandon
7339347382 update tos dependencies with json-io artifact 2016-02-04 13:40:19 +01:00
sizhaoliu
51c4f2f333 bump DQ library version to 1.4.3-SNAPSHOT 2016-01-27 16:17:48 +01:00
fady@legsem.com
03df29ee5c TDM-5017 Move common jars out of TDM into a shared p2 repo (align slf4j version with studio) 2016-01-23 11:13:48 +01:00
Sebastien Gandon
de76aaceb6 Fixed a tos dependency pom.xml encoding/formating issue. 2016-01-22 14:44:43 +01:00
fady@legsem.com
d4fe953cbd TDM-5017 Move common jars out of TDM into a shared p2 repo (more Avro dependencies) 2016-01-22 09:14:11 +01:00
fady@legsem.com
9291346017 TDM-5017 Move common jars out of TDM into a shared p2 repo (Adds Avro and dependencies) 2016-01-20 18:59:27 +01:00
iwangtalend
9589ae8785 Add slf4j for AMC 2016-01-18 18:39:12 +01:00
Sebastien Gandon
0aed6ad7e5 added pax.url 2.4.5-Talend to the dynamic target platform 2016-01-13 12:43:12 +01:00
sizhaoliu
a93e354860 TDQ-8970 bump record linkage library version
for T-Swoosh support in tMatchGroup component
2016-01-12 15:50:02 +01:00
fady@legsem.com
e249a19463 TDM-5017 Move common jars out of TDM into a shared p2 repo 2016-01-11 17:31:48 +01:00
sizhaoliu
0e58fd9d05 TDQ-11448 bump DQ library versions 2016-01-08 15:12:38 +01:00
sizhaoliu
a08363ca2c bump version for DQ library 1.4.0 2015-12-21 18:26:20 +01:00
Sebastien Gandon
58d5f2ef66 made tos p2 dep not use transitive deps and add complete set of deps in pom. 2015-12-09 12:20:34 +01:00
Sebastien Gandon
63eea05636 update component and daikon studio deps to version to 0.3.0.BUILD-SNAPSHOT on master 2015-12-08 15:26:58 +01:00
Sebastien Gandon
88822d74b2 update daikon and componet deps version to 0.2.0.RELEASE 2015-12-08 14:32:56 +01:00
Irene Wang
4d83f9f46f Update versions to 6.2.0-SNAPSHOT 2015-12-08 11:00:24 +01:00
Irene Wang
f1557728ad Update versions for 6.1.2-SNAPSHOT 2015-12-07 18:56:13 +01:00
30 changed files with 317 additions and 325 deletions

View File

@@ -3,5 +3,5 @@
3) eclipse export fails to update the content.xml and artifact so we need to regenerate the p2 repository with the following command
Applications/java/eclipse/4.2/eclipse/eclipse -application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher -metadataRepository file:/Applications/java/talend/TargetPlatformE44/p2site/ -artifactRepository file:/Applications/java/talend/TargetPlatformE44/p2site/ -source /Applications/java/talend/TargetPlatformE44 -config ANY -publishArtifacts
4) Deploy ZIP of target to Nexus (features/, plugins/, artifacts.jar, contents.jar at the root):
mvn deploy:deploy-file -Dfile=/Applications/java/talend/TargetPlatformE44/p2site/TargetPlatformE44.zip -DgroupId=org.talend.repo -DartifactId=talend-eclipse-p2-repo -Dversion=4.4.1-SNAPSHOT -Dpackaging=zip -Durl=https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot -DrepositoryId=talend_nexus_deployment
Nexus p2 repository will be available at https://artifacts-zl.talend.com/nexus/content/unzip/TalendP2UnzipOpenSourceSnapshot/org/talend/repo/talend-eclipse-p2-repo/4.4.1-SNAPSHOT/talend-eclipse-p2-repo-4.4.1-SNAPSHOT.zip-unzip/plugins/
mvn deploy:deploy-file -Dfile=/Applications/java/talend/TargetPlatformE44/p2site/TargetPlatformE44.zip -DgroupId=org.talend.repo -DartifactId=talend-eclipse-p2-repo -Dversion=4.4.1-SNAPSHOT -Dpackaging=zip -Durl=http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot -DrepositoryId=talend_nexus_deployment
Nexus p2 repository will be available at http://newbuild.talend.com:8081/nexus/content/unzip/TalendP2UnzipOpenSourceSnapshot/org/talend/repo/talend-eclipse-p2-repo/4.4.1-SNAPSHOT/talend-eclipse-p2-repo-4.4.1-SNAPSHOT.zip-unzip/plugins/

View File

@@ -4,6 +4,6 @@
<properties size='0'>
</properties>
<children size='1'>
<child location='https://artifacts-zl.talend.com/nexus/content/unzip/TalendP2UnzipOpenSourceSnapshot/org/talend/repo/dependency.p2.tos/6.1.0-SNAPSHOT/dependency.p2.tos-6.1.0-SNAPSHOT.zip-unzip/'/>
<child location='http://newbuild.talend.com:8081/nexus/content/unzip/TalendP2UnzipOpenSourceSnapshot/org/talend/repo/dependency.p2.tos/6.1.0-SNAPSHOT/dependency.p2.tos-6.1.0-SNAPSHOT.zip-unzip/'/>
</children>
</repository>

View File

@@ -5,6 +5,6 @@
<property name='p2.atomic.composite.loading' value='true'/>
</properties>
<children size='1'>
<child location='https://artifacts-zl.talend.com/nexus/content/unzip/TalendP2UnzipOpenSourceSnapshot/org/talend/repo/dependency.p2.tos/6.1.0-SNAPSHOT/dependency.p2.tos-6.1.0-SNAPSHOT.zip-unzip/'/>
<child location='http://newbuild.talend.com:8081/nexus/content/unzip/TalendP2UnzipOpenSourceSnapshot/org/talend/repo/dependency.p2.tos/6.1.0-SNAPSHOT/dependency.p2.tos-6.1.0-SNAPSHOT.zip-unzip/'/>
</children>
</repository>

View File

@@ -1,99 +1,163 @@
<?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.repo</groupId>
<artifactId>dependencies.p2</artifactId>
<version>6.1.2</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.1</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
<artifactId>org.talend.dataquality.record.linkage</artifactId>
<version>3.0.4</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
<artifactId>org.talend.dataquality.standardization</artifactId>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
<artifactId>org.talend.dataquality.sampling</artifactId>
<version>2.1.5</version>
</dependency>
<dependency>
<groupId>org.talend.daikon</groupId>
<artifactId>daikon</artifactId>
<version>0.2.0.RELEASE</version>
</dependency>
<!-- daikon dependencies-->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.4.5</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.4.6</version>
</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-->
<dependency>
<groupId>org.talend.components</groupId>
<artifactId>components-api</artifactId>
<version>0.2.1.RELEASE</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>org.talend.components</groupId>
<artifactId>components-common</artifactId>
<version>0.2.0.RELEASE</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>org.talend.components</groupId>
<artifactId>components-common-oauth</artifactId>
<version>0.2.0.RELEASE</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>org.talend.components</groupId>
<artifactId>components-salesforce</artifactId>
<version>0.2.0.RELEASE</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>
</dependencies>
</project>
<?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.repo</groupId>
<artifactId>dependencies.p2</artifactId>
<version>6.2.0-SNAPSHOT</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>
</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-->
<!-- ========================= -->
<!-- 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>
<classifier>bundle</classifier>
</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>
</project>

View File

@@ -5,19 +5,19 @@
<groupId>org.talend.repo</groupId>
<artifactId>dependencies.p2</artifactId>
<version>6.1.2</version>
<version>6.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<distributionManagement>
<snapshotRepository>
<id>talend_nexus_deployment</id>
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
<snapshots><enabled>true</enabled></snapshots>
<releases><enabled>false</enabled></releases>
</snapshotRepository>
<repository>
<id>talend_nexus_deployment</id>
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceRelease/</url>
<snapshots><enabled>false</enabled></snapshots>
<releases><enabled>true</enabled></releases>
</repository>
@@ -32,7 +32,7 @@
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceRelease/</url>
</repository>
<repository>
<id>talend_open_snapshots</id>
@@ -42,7 +42,7 @@
<snapshots>
<enabled>true</enabled>
</snapshots>
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
</repository>
</repositories>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>6.1.2</version>
<version>6.2.0-SNAPSHOT</version>
<relativePath />
</parent>
@@ -17,7 +17,7 @@
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceRelease/</url>
</repository>
<repository>
<id>talend_open_snapshots</id>
@@ -27,7 +27,7 @@
<snapshots>
<enabled>true</enabled>
</snapshots>
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
</repository>
</repositories>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>6.1.2</version>
<version>6.2.0-SNAPSHOT</version>
<relativePath />
</parent>
@@ -24,7 +24,7 @@
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceRelease/</url>
</repository>
<repository>
<id>talend_open_snapshots</id>
@@ -34,7 +34,7 @@
<snapshots>
<enabled>true</enabled>
</snapshots>
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
</repository>
</repositories>
<profiles>

View File

@@ -3,5 +3,3 @@
-Xmx768m
-XX:MaxPermSize=256m
-Dfile.encoding=UTF-8
-XX:+UseG1GC
-XX:+UseStringDeduplication

View File

@@ -3,5 +3,3 @@
-Xmx1536m
-XX:MaxPermSize=512m
-Dfile.encoding=UTF-8
-XX:+UseG1GC
-XX:+UseStringDeduplication

View File

@@ -7,6 +7,4 @@
-XstartOnFirstThread
-Dorg.eclipse.swt.internal.carbon.smallFonts
-Dosgi.instance.area.default=../../../workspace
-Dfile.encoding=UTF-8
-XX:+UseG1GC
-XX:+UseStringDeduplication
-Dfile.encoding=UTF-8

View File

@@ -1,13 +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.1.2</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>
<artifactId>org.talend.studio.tos.bigdata.product</artifactId>
<packaging>eclipse-repository</packaging>
</project>
<?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>
<artifactId>org.talend.studio.tos.bigdata.product</artifactId>
<packaging>eclipse-repository</packaging>
</project>

View File

@@ -3,5 +3,3 @@
-Xmx768m
-XX:MaxPermSize=256m
-Dfile.encoding=UTF-8
-XX:+UseG1GC
-XX:+UseStringDeduplication

View File

@@ -3,5 +3,3 @@
-Xmx1536m
-XX:MaxPermSize=512m
-Dfile.encoding=UTF-8
-XX:+UseG1GC
-XX:+UseStringDeduplication

View File

@@ -7,6 +7,4 @@
-XstartOnFirstThread
-Dorg.eclipse.swt.internal.carbon.smallFonts
-Dosgi.instance.area.default=../../../workspace
-Dfile.encoding=UTF-8
-XX:+UseG1GC
-XX:+UseStringDeduplication
-Dfile.encoding=UTF-8

View File

@@ -1,13 +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.1.2</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>
<artifactId>org.talend.studio.tos.di.product</artifactId>
<packaging>eclipse-repository</packaging>
</project>
<?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>
<artifactId>org.talend.studio.tos.di.product</artifactId>
<packaging>eclipse-repository</packaging>
</project>

View File

@@ -3,5 +3,3 @@
-Xmx768m
-XX:MaxPermSize=256m
-Dfile.encoding=UTF-8
-XX:+UseG1GC
-XX:+UseStringDeduplication

View File

@@ -3,5 +3,3 @@
-Xmx1536m
-XX:MaxPermSize=512m
-Dfile.encoding=UTF-8
-XX:+UseG1GC
-XX:+UseStringDeduplication

View File

@@ -7,6 +7,4 @@
-XstartOnFirstThread
-Dorg.eclipse.swt.internal.carbon.smallFonts
-Dosgi.instance.area.default=../../../workspace
-Dfile.encoding=UTF-8
-XX:+UseG1GC
-XX:+UseStringDeduplication
-Dfile.encoding=UTF-8

View File

@@ -1,28 +1,28 @@
<?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.1.2</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>
<artifactId>org.talend.studio.tos.dq.product</artifactId>
<packaging>eclipse-repository</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>
<id>generate-javajet</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
<?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>
<artifactId>org.talend.studio.tos.dq.product</artifactId>
<packaging>eclipse-repository</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>
<id>generate-javajet</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@@ -3,5 +3,3 @@
-Xmx768m
-XX:MaxPermSize=256m
-Dfile.encoding=UTF-8
-XX:+UseG1GC
-XX:+UseStringDeduplication

View File

@@ -3,5 +3,3 @@
-Xmx1536m
-XX:MaxPermSize=512m
-Dfile.encoding=UTF-8
-XX:+UseG1GC
-XX:+UseStringDeduplication

View File

@@ -7,6 +7,4 @@
-XstartOnFirstThread
-Dorg.eclipse.swt.internal.carbon.smallFonts
-Dosgi.instance.area.default=../../../workspace
-Dfile.encoding=UTF-8
-XX:+UseG1GC
-XX:+UseStringDeduplication
-Dfile.encoding=UTF-8

View File

@@ -1,28 +1,28 @@
<?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.1.2</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>
</project>
<?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>
<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>
</project>

View File

@@ -3,5 +3,3 @@
-Xmx768m
-XX:MaxPermSize=256m
-Dfile.encoding=UTF-8
-XX:+UseG1GC
-XX:+UseStringDeduplication

View File

@@ -3,5 +3,3 @@
-Xmx1536m
-XX:MaxPermSize=512m
-Dfile.encoding=UTF-8
-XX:+UseG1GC
-XX:+UseStringDeduplication

View File

@@ -7,6 +7,4 @@
-XstartOnFirstThread
-Dorg.eclipse.swt.internal.carbon.smallFonts
-Dosgi.instance.area.default=../../../workspace
-Dfile.encoding=UTF-8
-XX:+UseG1GC
-XX:+UseStringDeduplication
-Dfile.encoding=UTF-8

View File

@@ -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.1.2</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>
</project>
<?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>
<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>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>6.1.2</version>
<version>6.2.0-SNAPSHOT</version>
<relativePath />
</parent>
@@ -20,7 +20,7 @@
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceRelease/</url>
<url>http://${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceRelease/</url>
</repository>
<repository>
<id>talend_open_snapshots</id>
@@ -30,12 +30,12 @@
<snapshots>
<enabled>true</enabled>
</snapshots>
<url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
<url>http://${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
</repository>
</repositories>
<properties>
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
<talend.nexus.host>newbuild.talend.com:8081</talend.nexus.host>
<product.final.name>${launcher.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
<studio.dir>${project.build.directory}/products/${project.artifactId}/${osgi.os}/${osgi.ws}/${osgi.arch}</studio.dir>
</properties>
@@ -344,7 +344,7 @@
</filterchain>
</loadfile>
<echo file="${studio.dir}/${launcher.prefix}-linux-gtk-x86.sh">${launcher_sh}</echo>
<ac:for xmlns:ac="antlib:net.sf.antcontrib" list="linux-gtk-ppc,linux-gtk-x86,solaris-gtk-sparc,solaris-gtk-x86,win32-x86" param="platform">
<ac:for xmlns:ac="antlib:net.sf.antcontrib" list="linux-gtk-ppc,linux-gtk-x86,solaris-gtk,solaris-gtk-x86,win32-x86" param="platform">
<sequential>
<copy tofile="${studio.dir}/${launcher.prefix}-@{platform}.ini" file="${project.basedir}/launcher.ini" />
</sequential>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>6.1.2</version>
<version>6.2.0-SNAPSHOT</version>
<relativePath />
</parent>
@@ -21,7 +21,7 @@
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceRelease/</url>
</repository>
<repository>
<id>talend_open_snapshots</id>
@@ -31,7 +31,7 @@
<snapshots>
<enabled>true</enabled>
</snapshots>
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
</repository>
</repositories>

View File

@@ -3,27 +3,27 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>6.1.2</version>
<version>6.2.0-SNAPSHOT</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.1.2</base.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>6.1.2</osgi.version>
<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>6.1.2</maven.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>
<maven.version>${base.version}-SNAPSHOT</maven.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>
<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>
<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.2-SNAPSHOT/talend-doc-p2-repo-6.1.2-SNAPSHOT.zip-unzip/</doc-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>
<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>
@@ -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>
@@ -258,48 +258,6 @@
</plugins>
</build>
</profile>
<profile>
<id>junit.product</id>
<properties>
<release.suffix>-SNAPSHOT</release.suffix>
<revision.filename>SNAPSHOT</revision.filename>
<product.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</product.version>
</properties>
<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>
<configuration>
<strictBinIncludes>false</strictBinIncludes>
<format>yyyyMMdd'_'HHmm'${release.suffix}'</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>default</timestampProvider>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>tuj</id>
<properties>