Compare commits

..

77 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
Sizhao Liu
0a65489f9f bump version of record.linkage library to 3.0.2 2015-12-01 13:42:27 +01:00
Sebastien Gandon
e5301d88d1 Merge branch 'feature/6.1/TUP-3462_addGenericWizard' 2015-12-01 10:48:03 +01:00
Sebastien Gandon
14a0b2359a udpate component framwork version in tos deps 2015-11-30 14:02:48 +01:00
Sebastien Gandon
1d8650e5ed update the tos dep to add commons-loggin 1.2 2015-11-30 09:44:40 +01:00
Sebastien Gandon
078f39ddd1 update the tos dep to add commons-loggin 1.2 2015-11-30 09:03:23 +01:00
Sebastien Gandon
10008c4912 Merge remote-tracking branch 'origin/master' into feature/6.1/TUP-3462_addGenericWizard 2015-11-27 16:04:08 +01:00
Irene Wang
4faaeebbfb Used versioned Mac launchers 2015-11-26 17:32:29 +01:00
sizhaoliu
2eb1193821 Merge pull request #10 from zshen-talend/master
bug fixed TDQ-11187 modify org.talend.dataquality.sampling version from
2015-11-26 12:54:12 +01:00
zshen-talend
cfe84c40cd bug fixed TDQ-11187 modify org.talend.dataquality.sampling version from
2.1.3 to 2.1.4
2015-11-26 19:00:57 +08:00
Sebastien Gandon
e977378db5 Merge remote-tracking branch 'origin/master' into feature/6.1/TUP-3462_addGenericWizard 2015-11-25 17:28:48 +01:00
Sebastien Gandon
34771bd8bb --amend 2015-11-24 16:03:55 +01:00
Sebastien Gandon
a52c6cb24a update the p2 tos depenencies to get the latest component bundles 2015-11-24 16:03:55 +01:00
Sebastien Gandon
1ebdb789f1 fixed javajet generation with the new component framework 2015-11-24 15:58:38 +01:00
Sebastien Gandon
b6dc94588c Merge remote-tracking branch 'origin/master' into feature/6.1/TUP-3462_addGenericWizard 2015-11-24 15:48:50 +01:00
Sebastien Gandon
8b9dee3087 --amend 2015-11-24 15:45:07 +01:00
sizhaoliu
dd8c6a6821 bump version for DQ library 1.3.3 2015-11-24 15:03:36 +01:00
Sizhao Liu
f33840c2e3 TDQ-11292 bump sampling library version 2015-11-20 10:58:01 +01:00
Sizhao Liu
8b7fffc9df TDQ-11187 bump DQ sampling library version to 2.1.2 2015-11-18 16:10:17 +01:00
Sebastien Gandon
fa9cf6a41f update the p2 tos depenencies to get the latest component bundles 2015-11-12 14:10:59 +01:00
Sebastien Gandon
600e2a8c42 TDI-34419 : increase all JVM memory settings for TOS for MacOs 2015-11-12 14:10:59 +01:00
iwangtalend
dcaaca9101 Update doc version to 6.1.1-SNAPSHOT 2015-11-12 14:10:59 +01:00
sizhaoliu
21e362b8a6 TDQ-6567 include DQ standardization library into p2 dependencies 2015-11-12 14:10:59 +01:00
sizhaoliu
a257f6245b bump version for DQ library 1.3.2 2015-11-12 14:10:59 +01:00
Sizhao Liu
8dcd480c5c bump versions of DQ libraries for release/6.1.0 2015-11-12 14:10:59 +01:00
Irene Wang
8f449d059d Update versions for 6.1.1-SNAPSHOT 2015-11-12 14:10:59 +01:00
iwangtalend
1c9ebd1912 Update doc version to 6.1.0 2015-11-12 14:10:59 +01:00
Sebastien Gandon
024729e359 TDI-34419 : increase all JVM memory settings for TOS for MacOs 2015-11-10 16:15:16 +01:00
iwangtalend
350e6a6d4a Update doc version to 6.1.1-SNAPSHOT 2015-11-10 10:32:01 +01:00
sizhaoliu
9e715eef65 TDQ-6567 include DQ standardization library into p2 dependencies 2015-11-03 19:00:28 +01:00
sizhaoliu
ffda81595c bump version for DQ library 1.3.2 2015-10-29 18:50:47 +01:00
Irene Wang
54ddbeb75e Merge branch 'master' of github.com:Talend/studio-se-master 2015-10-23 13:31:30 +02:00
Sizhao Liu
c0e37278c0 bump versions of DQ libraries for release/6.1.0 2015-10-23 13:12:49 +02:00
Irene Wang
5d8400ebab Update versions for 6.1.1-SNAPSHOT 2015-10-23 12:46:57 +02:00
iwangtalend
69aceb6d1b Update doc version to 6.1.0 2015-10-21 11:43:21 +02:00
Sebastien Gandon
0502565281 fixed javajet generation with the new component framework 2015-10-20 17:14:08 +02:00
Francis Upton IV
b3fdf95ad8 TUP-3313 New Component Framework (add to build) 2015-10-16 11:56:27 +02:00
Irene Wang
8d9320072b Use Maven version for p2 dependencies repo 2015-09-23 19:02:54 +02:00
Irene Wang
014222ec83 Set deployment repo 2015-09-23 18:43:08 +02:00
sizhaoliu
70dfa80a9b bump DQ library versions 2015-09-23 01:39:23 +02:00
sgandon
7c7707f1e4 Merge pull request #9 from sizhaoliu/patch-1
Update pom.xml with new DQ library versions
2015-09-18 19:02:53 +02:00
sizhaoliu
2c3d5c3840 Update pom.xml with new DQ library versions 2015-09-18 18:56:14 +02:00
nrousseau
1e1a2da1aa Merge pull request #7 from ggu-talend/master
TDI-33874: The build didn't delete the configration settings folder.
2015-09-18 14:07:48 +08:00
GGu
8b3c077cc3 TDI-33874: The build didn't delete the configration settings folder. 2015-09-18 11:53:27 +08:00
iwangtalend
6c1706d3be Use patched Bonita target platform 2015-09-16 16:36:47 +02:00
Irene Wang
41a4468276 Merge branch 'TDQ-10888' 2015-09-11 16:39:56 +02:00
iwangtalend
cce860df6e Update dependency versions 2015-09-10 19:00:11 +02:00
Irene Wang
f9c150eb16 Merge branch 'TDQ-10888' 2015-09-09 17:30:29 +02:00
Irene Wang
e5fccb4cfa Remove unnecessary dependency 2015-09-08 12:16:22 +02:00
Irene Wang
9df14de89e Add commons-math3 2015-09-07 17:42:53 +02:00
Irene Wang
d237405fb2 Fix indentation 2015-09-07 17:41:10 +02:00
Irene Wang
03e48a710c Add more libraries from Nexus 2015-09-07 15:54:23 +02:00
nrousseau
0d5e880a3f TUP-3480: delete repository folder created during the build step 2015-09-07 15:34:00 +08:00
iwangtalend
32f844f2c7 Update pom.xml 2015-09-04 17:37:17 +02:00
iwangtalend
96f911cc7e Set p2 repo layout 2015-09-04 17:35:04 +02:00
iwangtalend
c91c48a248 Update pom.xml 2015-09-04 17:31:13 +02:00
Irene Wang
f4ef88de1f Test p2 deps on TOS 2015-09-04 17:08:16 +02:00
Irene Wang
2459101a01 Add dependency p2 repo publication 2015-09-04 16:55:24 +02:00
24 changed files with 399 additions and 55 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

@@ -0,0 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<?compositeArtifactRepository version='1.0.0'?>
<repository name='Talend Enterprise Composite Repository' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
<properties size='0'>
</properties>
<children size='1'>
<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

@@ -0,0 +1,10 @@
<?xml version='1.0' encoding='UTF-8'?>
<?compositeMetadataRepository version='1.0.0'?>
<repository name='Talend Open Source Composite Repository' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
<properties size='1'>
<property name='p2.atomic.composite.loading' value='true'/>
</properties>
<children size='1'>
<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

@@ -0,0 +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.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

@@ -0,0 +1,161 @@
<?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>
<groupId>org.talend.repo</groupId>
<artifactId>dependencies.p2</artifactId>
<version>6.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<distributionManagement>
<snapshotRepository>
<id>talend_nexus_deployment</id>
<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>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceRelease/</url>
<snapshots><enabled>false</enabled></snapshots>
<releases><enabled>true</enabled></releases>
</repository>
</distributionManagement>
<repositories>
<repository>
<id>talend_open</id>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceRelease/</url>
</repository>
<repository>
<id>talend_open_snapshots</id>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
</repository>
</repositories>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/p2/plugins</outputDirectory>
<excludeTransitive>true</excludeTransitive>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<id>zip-p2-repo</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<zip destfile="${project.build.directory}/${project.artifactId}.zip">
<fileset dir="${project.build.directory}/output">
<include name="**/*" />
</fileset>
</zip>
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.groovy.maven</groupId>
<artifactId>gmaven-plugin</artifactId>
<executions>
<execution>
<id>choose-target-repository</id>
<phase>initialize</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<source>
if (project.version.endsWith("-SNAPSHOT")){
project.properties.targetrepository = project.distributionManagement.snapshotRepository.url;
}
else {
project.properties.targetrepository = project.distributionManagement.repository.url;
}
</source>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<executions>
<execution>
<id>deploy_p2_zip</id>
<phase>deploy</phase>
<goals>
<goal>deploy-file</goal>
</goals>
<configuration>
<packaging>zip</packaging>
<generatePom>true</generatePom>
<url>${targetrepository}</url>
<repositoryId>talend_nexus_deployment</repositoryId>
<artifactId>${project.artifactId}</artifactId>
<groupId>org.talend.repo</groupId>
<version>${project.version}</version>
<file>${project.build.directory}/${project.artifactId}.zip</file>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-p2-extras-plugin</artifactId>
<version>0.22.0</version>
<executions>
<execution>
<id>create-p2-repository</id>
<phase>prepare-package</phase>
<goals>
<goal>publish-features-and-bundles</goal>
</goals>
<configuration>
<metadataRepositoryLocation>${project.build.directory}/output</metadataRepositoryLocation>
<artifactRepositoryLocation>${project.build.directory}/output</artifactRepositoryLocation>
<sourceLocation>${project.build.directory}/p2</sourceLocation>
<compress>true</compress>
</configuration>
</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.0-M2</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,13 +4,12 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>6.1.0-M2</version>
<version>6.2.0-SNAPSHOT</version>
<relativePath />
</parent>
<artifactId>talend-tos-p2-repo</artifactId>
<packaging>eclipse-repository</packaging>
<version>6.1.0.M2</version>
<properties>
<product.final.name>${launcher.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
@@ -25,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>
@@ -35,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

@@ -5,7 +5,7 @@ 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
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.defaultStartLevel=4
osgi.bundlefile.limit=200
osgi.framework.extensions=org.talend.osgi.lib.loader

View File

@@ -1,8 +1,8 @@
--launcher.XXMaxPermSize
512m
-vmargs
-Xms64m
-Xmx768m
-Xms512m
-Xmx1536m
-Xdock:icon=../Resources/talend.icns
-XstartOnFirstThread
-Dorg.eclipse.swt.internal.carbon.smallFonts

View File

@@ -4,11 +4,10 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>6.1.0-M2</version>
<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>
<version>6.1.0.M2</version>
</project>

View File

@@ -5,7 +5,7 @@ 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
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.defaultStartLevel=4
osgi.bundlefile.limit=200
osgi.framework.extensions=org.talend.osgi.lib.loader

View File

@@ -1,8 +1,8 @@
--launcher.XXMaxPermSize
512m
-vmargs
-Xms64m
-Xmx768m
-Xms512m
-Xmx1536m
-Xdock:icon=../Resources/talend.icns
-XstartOnFirstThread
-Dorg.eclipse.swt.internal.carbon.smallFonts

View File

@@ -4,11 +4,10 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>6.1.0-M2</version>
<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>
<version>6.1.0.M2</version>
</project>

View File

@@ -1,8 +1,8 @@
--launcher.XXMaxPermSize
512m
-vmargs
-Xms64m
-Xmx768m
-Xms512m
-Xmx1536m
-Xdock:icon=../Resources/talend.icns
-XstartOnFirstThread
-Dorg.eclipse.swt.internal.carbon.smallFonts

View File

@@ -4,13 +4,12 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>6.1.0-M2</version>
<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>
<version>6.1.0.M2</version>
<build>
<plugins>
<plugin>

View File

@@ -5,7 +5,7 @@ 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
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.defaultStartLevel=4
osgi.bundlefile.limit=200
osgi.framework.extensions=org.talend.osgi.lib.loader

View File

@@ -1,8 +1,8 @@
--launcher.XXMaxPermSize
512m
-vmargs
-Xms64m
-Xmx768m
-Xms512m
-Xmx1536m
-Xdock:icon=../Resources/talend.icns
-XstartOnFirstThread
-Dorg.eclipse.swt.internal.carbon.smallFonts

View File

@@ -4,13 +4,12 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>6.1.0-M2</version>
<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>
<version>6.1.0.M2</version>
<build>
<plugins>
<plugin>

View File

@@ -5,7 +5,7 @@ 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
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.defaultStartLevel=4
osgi.bundlefile.limit=200
osgi.framework.extensions=org.talend.osgi.lib.loader

View File

@@ -1,8 +1,8 @@
--launcher.XXMaxPermSize
512m
-vmargs
-Xms64m
-Xmx768m
-Xms512m
-Xmx1536m
-Xdock:icon=../Resources/talend.icns
-XstartOnFirstThread
-Dorg.eclipse.swt.internal.carbon.smallFonts

View File

@@ -4,13 +4,12 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>6.1.0-M2</version>
<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>
<version>6.1.0.M2</version>
<properties>
<product.final.name>${product.final.name.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
</properties>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>6.1.0-M2</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>
@@ -118,7 +118,7 @@
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>eclipse-launcher-mac-${launcher.prefix}</artifactId>
<version>4.4.1a</version>
<version>${base.version}</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${studio.dir}</outputDirectory>
@@ -408,6 +408,7 @@
<delete dir="${studio.dir}/configuration/org.eclipse.osgi" includeemptydirs="true" />
<delete dir="${studio.dir}/configuration/org.eclipse.update" includeemptydirs="true" />
<delete dir="${studio.dir}/configuration/maven_repository" includeemptydirs="true" />
<delete dir="${studio.dir}/configuration/.settings" includeemptydirs="true" />
<delete file="${studio.dir}/configuration/maven_user_settings.xml" />
<delete file="${studio.dir}/configuration/LibrariesIndex.xml" />
<delete file="${studio.dir}/configuration/MavenUriIndex.xml" />

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>6.1.0-M2</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,32 +3,33 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>6.1.0-M2</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.0</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.0.M2</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.0-M2</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.0.1-SNAPSHOT/talend-doc-p2-repo-6.0.1-SNAPSHOT.zip-unzip/</doc-repo.url>
<bonita-open-repo.url>${opensourcerelease-unziprepo.url}/bonita-community-p2-repo/6.5.0/bonita-community-p2-repo-6.5.0.zip-unzip/</bonita-open-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>
<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>
<jgit.dirtyWorkingTree.official>error</jgit.dirtyWorkingTree.official>
<osgi.ws>win32</osgi.ws>
<osgi.os>win32</osgi.os>
@@ -92,6 +93,11 @@
</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>
@@ -132,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>
@@ -183,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>