Compare commits

..

5 Commits

Author SHA1 Message Date
nrousseau
b04058c7c9 TUP-4548: update the version of jars 2016-05-10 16:18:01 +02:00
nrousseau
3384456d1c TUP-4548: update the version of jars 2016-05-09 14:29:24 +02:00
nrousseau
a5bee01f23 TUP-4548: update the version of jars 2016-05-09 13:46:17 +02:00
nrousseau
dd146550ed TUP-4415: update URL of packages update for TOS 2016-05-09 13:09:54 +02:00
Carsten Biermann
2b7d413ce5 Set versions for 6.2.0 2016-05-04 13:56:22 +00:00
43 changed files with 1025 additions and 1148 deletions

View File

@@ -1,9 +1,10 @@
# Studio-se-master
http://www.talend.com
![alt text](https://www.talend.com/wp-content/uploads/2016/07/talend-logo.png "Talend")
![alt text](http://www.talend.com/sites/all/themes/talend_responsive/images/logo.png "Talend")
> Content
==========
Master repos using gitslave for aggregating the full Talend Studio open source repositories
@@ -35,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 using the 'git clone' command.
The idea is to clone all the required repositories next to each other, including this one.
You will find the list of repositories in root [.gitslave](../master/.gitslave) file for each branch.
Build The Open Source Studio

View File

@@ -1,8 +1,28 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?><target name="Talend Target Platform for Eclipse 4.4 definition" sequenceNumber="200">
<?pde version="3.8"?><target name="Talend Target Platform for Eclipse 4.4 definition" sequenceNumber="193">
<locations>
<location path="${project_loc:/Target Platform for Talend Studio and Luna}/included/emf_query2" type="Directory"/>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.cdatetime.feature.feature.group" version="0.14.0.201409040043"/>
<unit id="org.eclipse.nebula.widgets.pshelf.feature.feature.group" version="1.0.0.201409040043"/>
<unit id="org.eclipse.nebula.widgets.compositetable.feature.feature.group" version="1.0.0.201409040043"/>
<unit id="org.eclipse.nebula.widgets.grid.feature.feature.group" version="1.0.0.201409040043"/>
<unit id="org.eclipse.nebula.widgets.gallery.feature.feature.group" version="1.0.0.201409040043"/>
<unit id="org.eclipse.nebula.cwt.feature.feature.group" version="0.9.0.201409040043"/>
<unit id="org.eclipse.nebula.widgets.calendarcombo.feature.feature.group" version="1.0.0.201409040043"/>
<unit id="org.eclipse.nebula.effects.stw.feature.feature.group" version="1.0.0.201409040043"/>
<unit id="org.eclipse.nebula.widgets.xviewer.feature.feature.group" version="0.9.9.201409040043"/>
<unit id="org.eclipse.nebula.widgets.oscilloscope.feature.feature.group" version="1.2.0.201409040043"/>
<unit id="org.eclipse.nebula.widgets.ganttchart.feature.feature.group" version="1.0.0.201409040043"/>
<unit id="org.eclipse.nebula.widgets.pshelf.css.feature.feature.group" version="1.0.0.201409040043"/>
<unit id="org.eclipse.nebula.widgets.paperclips.feature.feature.group" version="2.0.0.201409040043"/>
<unit id="org.eclipse.nebula.visualization.feature.feature.group" version="0.9.9.201409040043"/>
<unit id="org.eclipse.nebula.widgets.pgroup.feature.feature.group" version="1.0.0.201409040043"/>
<unit id="org.eclipse.nebula.feature.feature.group" version="1.0.0.201409040043"/>
<unit id="org.eclipse.nebula.widgets.tablecombo.feature.feature.group" version="1.0.0.201409040043"/>
<repository location="http://download.eclipse.org/technology/nebula/archives/Q32014/release/"/>
</location>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.datatools.sdk.feature.feature.group" version="1.12.0.v201406061321-7PB21FEpPZQXdcX0z-_yMM0Hfz0w"/>
<unit id="org.eclipse.datatools.enablement.sdk.feature.feature.group" version="1.12.0.v201406061321-7IAB-FE9JgeWjZZhMd-z0vb1ifD4"/>
<repository location="http://download.eclipse.org/datatools/updates/1.12"/>
@@ -147,12 +167,37 @@
<unit id="org.eclipse.swtbot.forms.source.feature.group" version="2.2.1.201402241301"/>
<repository location="http://download.eclipse.org/technology/swtbot/releases/2.2.1/"/>
</location>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.jst.server_sdk.feature.feature.group" version="3.4.100.v201405011426"/>
<unit id="org.eclipse.jsf_sdk.feature.feature.group" version="3.7.1.v201409111805"/>
<unit id="org.eclipse.jst.server_adapters.ext.sdk.feature.feature.group" version="3.3.301.v201409112028"/>
<unit id="org.eclipse.jst.server_adapters.sdk.feature.feature.group" version="3.3.200.v201405011426"/>
<unit id="org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature.feature.group" version="2.5.0.v201405061851"/>
<unit id="org.eclipse.jst.webpageeditor_sdk.feature.feature.group" version="2.6.1.v201409111805"/>
<unit id="org.eclipse.jst.web_sdk.feature.feature.group" version="3.6.1.v201409111852"/>
<unit id="org.eclipse.jst.ws.axis2tools_sdk.feature.feature.group" version="1.1.300.v201405061937"/>
<unit id="org.eclipse.jst.ws.jaxws_sdk.feature.feature.group" version="1.2.200.v201405061937"/>
<unit id="org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature.group" version="3.6.1.v201409111458"/>
<unit id="org.eclipse.jst.ws.jaxws.dom_sdk.feature.feature.group" version="1.0.300.v201405061937"/>
<unit id="org.eclipse.jst.enterprise_sdk.feature.feature.group" version="3.6.1.v201409042158"/>
<unit id="org.eclipse.jst.ws.cxf_sdk.feature.feature.group" version="1.1.201.v201409111807"/>
<repository location="http://download.eclipse.org/webtools/repository/luna/"/>
</location>
<location path="${project_loc:/Target Platform for Talend Studio and Luna}/included/dltk/eclipse" type="Directory"/>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="net.jeeeyul.eclipse.themes.feature.feature.group" version="2.2.0.I20141210-114528"/>
<unit id="net.jeeeyul.swtend.feature.feature.group" version="2.2.5.I20140918-144458"/>
<repository location="http://eclipse.jeeeyul.net/update/"/>
</location>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.egit.source.feature.group" version="3.4.2.201412180340-r"/>
<unit id="org.eclipse.egit.feature.group" version="3.4.2.201412180340-r"/>
<unit id="org.eclipse.jgit.java7.feature.group" version="3.4.2.201412180340-r"/>
<unit id="org.eclipse.jgit.http.apache.feature.group" version="3.4.2.201412180340-r"/>
<unit id="org.eclipse.jgit.source.feature.group" version="3.4.2.201412180340-r"/>
<unit id="org.eclipse.jgit.feature.group" version="3.4.2.201412180340-r"/>
<repository location="http://download.eclipse.org/releases/luna/"/>
</location>
<location path="${project_loc:/Target Platform for Talend Studio and Luna}/included/drools" type="Directory"/>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.codehaus.groovy23.feature.feature.group" version="2.9.0.xx-201406301445-e44"/>
@@ -1240,54 +1285,18 @@
<repository location="http://download.eclipse.org/mmt/atl/updates/releases/3.5"/>
</location>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.jst.ws.jaxws_sdk.feature.feature.group" version="1.2.201.v201410232139"/>
<unit id="org.eclipse.jsf.feature.feature.group" version="3.7.2.v201410101742"/>
<unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.301.v201410160332"/>
<unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.6.3.v201502041526"/>
<unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.3.302.v201501040116"/>
<unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.301.v201410241731"/>
<unit id="org.eclipse.jst.server_adapters.ext.sdk.feature.feature.group" version="3.3.302.v201501040116"/>
<unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.6.2.v201409302019"/>
<unit id="org.eclipse.jst.ws.cxf_sdk.feature.feature.group" version="1.1.202.v201410232139"/>
<unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.2.201.v201410232139"/>
<unit id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group" version="2.5.2.v201410101742"/>
<unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.1.202.v201410232139"/>
<unit id="org.eclipse.jst.ws.axis2tools_sdk.feature.feature.group" version="1.1.301.v201410160332"/>
<unit id="org.eclipse.jst.web_sdk.feature.feature.group" version="3.6.3.v201502041526"/>
<unit id="org.eclipse.jst.ws.jaxws.dom_sdk.feature.feature.group" version="1.0.301.v201410230748"/>
<unit id="org.eclipse.jsf_sdk.feature.feature.group" version="3.7.2.v201410101742"/>
<unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.6.3.v201501281502"/>
<unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.4.101.v201410241731"/>
<unit id="org.eclipse.jst.server_sdk.feature.feature.group" version="3.4.101.v201501191930"/>
<unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.6.3.v201501141810"/>
<unit id="org.eclipse.jst.enterprise_sdk.feature.feature.group" version="3.6.3.v201501281502"/>
<unit id="org.eclipse.jst.webpageeditor_sdk.feature.feature.group" version="2.6.2.v201409302019"/>
<unit id="org.eclipse.jst.server_adapters.sdk.feature.feature.group" version="3.3.200.v201410241731"/>
<unit id="org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature.feature.group" version="2.5.2.v201410101742"/>
<unit id="org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature.group" version="3.6.3.v201501141810"/>
<unit id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="1.0.301.v201410230643"/>
<repository location="http://download.eclipse.org/webtools/repository/luna/"/>
</location>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.nebula.feature.feature.group" version="1.0.0.201605312033"/>
<unit id="org.eclipse.nebula.examples.release.feature.feature.group" version="1.0.4.201605312033"/>
<repository location="http://download.eclipse.org/nebula/releases/1.0.0"/>
</location>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.jgit.lfs.feature.group" version="4.6.0.201612231935-r"/>
<unit id="org.eclipse.jgit.pgm.source.feature.group" version="4.6.0.201612231935-r"/>
<unit id="org.eclipse.egit.mylyn.feature.group" version="4.6.0.201612231935-r"/>
<unit id="org.eclipse.egit.source.feature.group" version="4.6.0.201612231935-r"/>
<unit id="org.eclipse.jgit.pgm.feature.group" version="4.6.0.201612231935-r"/>
<unit id="org.eclipse.egit.feature.group" version="4.6.0.201612231935-r"/>
<unit id="org.eclipse.jgit.feature.group" version="4.6.0.201612231935-r"/>
<unit id="org.eclipse.jgit.source.feature.group" version="4.6.0.201612231935-r"/>
<unit id="org.eclipse.jgit.http.apache.feature.group" version="4.6.0.201612231935-r"/>
<repository location="http://download.eclipse.org/egit/updates-4.6/"/>
</location>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.nebula.incubation.feature.feature.group" version="1.0.0.201701041652"/>
<repository location="http://download.eclipse.org/nebula/incubation/snapshot"/>
<unit id="org.eclipse.nebula.widgets.treemapper.feature.feature.group" version="0.1.0.201409040050"/>
<unit id="org.eclipse.nebula.widgets.formattedtext.feature.feature.group" version="1.0.0.201409040050"/>
<unit id="org.eclipse.nebula.examples.incubation.feature.feature.group" version="1.0.0.201409040050"/>
<unit id="org.eclipse.nebula.widgets.geomap.feature.feature.group" version="0.1.0.201409040050"/>
<unit id="org.eclipse.nebula.incubation.feature.feature.group" version="1.0.0.201409040050"/>
<unit id="org.eclipse.nebula.examples.feature.feature.group" version="1.0.4.201409040050"/>
<unit id="org.eclipse.nebula.widgets.picture.feature.feature.group" version="1.0.0.201409040050"/>
<unit id="org.eclipse.nebula.widgets.collapsiblebuttons.feature.feature.group" version="1.0.0.201409040050"/>
<unit id="org.eclipse.nebula.widgets.radiogroup.feature.feature.group" version="0.1.0.201409040050"/>
<unit id="org.eclipse.nebula.widgets.datechooser.feature.feature.group" version="1.0.0.201409040050"/>
<unit id="org.eclipse.nebula.widgets.pagination.feature.feature.group" version="1.0.0.201409040050"/>
<repository location="http://download.eclipse.org/technology/nebula/archives/Q32014/incubation"/>
</location>
</locations>
</target>

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,314 +1,194 @@
<?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>7.2.1-SNAPSHOT</version>
</parent>
<parent>
<groupId>org.talend.repo</groupId>
<artifactId>dependencies.p2</artifactId>
<version>6.2.0</version>
</parent>
<artifactId>dependencies.p2.tos</artifactId>
<packaging>pom</packaging>
<artifactId>dependencies.p2.tos</artifactId>
<packaging>pom</packaging>
<repositories>
<repository>
<id>sonatype_releases</id>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>https://oss.sonatype.org/content/repositories/releases/</url>
</repository>
<repository>
<id>sonatype_snapshots</id>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</repository>
</repositories>
<properties>
<components.version>0.8.3</components.version>
<daikon.version>0.8.2</daikon.version>
</properties>
<dependencies>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
<version>2.4.6-Talend</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
<artifactId>dataquality-common</artifactId>
<version>${dataquality.lib.version}</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
<artifactId>dataquality-phone</artifactId>
<version>${dataquality.lib.version}</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
<artifactId>dataquality-semantic-model</artifactId>
<version>${dataquality.lib.version}</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
<artifactId>dataquality-semantic</artifactId>
<version>${dataquality.lib.version}</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
<artifactId>dataquality-statistics</artifactId>
<version>${dataquality.lib.version}</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
<artifactId>dataquality-record-linkage</artifactId>
<version>${dataquality.lib.version}</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
<artifactId>dataquality-text-japanese</artifactId>
<version>${dataquality.lib.version}</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
<artifactId>dataquality-standardization</artifactId>
<version>${dataquality.lib.version}</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
<artifactId>dataquality-sampling</artifactId>
<version>${dataquality.lib.version}</version>
</dependency>
<dependency>
<groupId>org.talend.daikon</groupId>
<artifactId>daikon</artifactId>
<version>${daikon.version}</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>org.talend.daikon</groupId>
<artifactId>multitenant-core</artifactId>
<version>${daikon.version}</version>
</dependency>
<!-- daikon dependencies -->
<dependency>
<groupId>com.cedarsoftware</groupId>
<artifactId>json-io</artifactId>
<version>4.9.9-TALEND</version>
</dependency>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.9.0</version>
<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.4</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
<artifactId>org.talend.dataquality.record.linkage</artifactId>
<version>3.1.2</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
<artifactId>org.talend.dataquality.standardization</artifactId>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
<artifactId>org.talend.dataquality.sampling</artifactId>
<version>2.2.1</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.0</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.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-lang3</artifactId>
<version>3.7</version>
<artifactId>commons-compress</artifactId>
<version>1.10</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.9.5</version>
<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>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.5</version>
<groupId>org.talend.components</groupId>
<artifactId>components-common</artifactId>
<version>${components.version}</version>
<classifier>bundle</classifier>
</dependency>
<!-- end of daikon dependencies -->
<!-- ========================= -->
<!-- Added by TDM -->
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>1.9.14-TALEND</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.9.14-TALEND</version>
</dependency>
<!-- Avro with minimum depdencies -->
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.avro</artifactId>
<version>1.8.2_1</version>
</dependency>
<!-- Avro and dependencies -->
<!-- Kept just in case someone using this -->
<!-- above servicemix has 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>org-slf4j-impl-log4j12</artifactId>
<version>1.7.2</version>
</dependency>
<!-- End added by TDM -->
<!-- ========================= -->
<!-- TCOMP v1 -->
<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-osgi</artifactId>
<version>${components.version}</version>
</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-definition</artifactId>
<version>${components.version}</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>
<dependency>
<groupId>org.talend.components</groupId>
<artifactId>components-couchbase</artifactId>
<version>${components.version}</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>org.talend.components</groupId>
<artifactId>components-marklogic-definition</artifactId>
<version>${components.version}</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>org.talend.components</groupId>
<artifactId>components-jdbc-definition</artifactId>
<version>${components.version}</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>org.talend.components</groupId>
<artifactId>components-snowflake-definition</artifactId>
<version>${components.version}</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>org.talend.components</groupId>
<artifactId>components-azurestorage</artifactId>
<version>${components.version}</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>org.talend.components</groupId>
<artifactId>components-netsuite-definition</artifactId>
<version>${components.version}</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>org.talend.components</groupId>
<artifactId>components-marketo-definition</artifactId>
<version>${components.version}</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.8.2</version>
<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>hadoopcluster-definition</artifactId>
<version>${components.version}</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>org.talend.components</groupId>
<artifactId>components-googledrive-definition</artifactId>
<version>${components.version}</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.10</version>
</dependency>
<!-- to avoid updatin the complete eclipse target platform we add these
single dependencies -->
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>annotation</artifactId>
<version>2.4.0</version>
<groupId>org.talend.components</groupId>
<artifactId>components-salesforce</artifactId>
<version>${components.version}</version>
<classifier>bundle</classifier>
</dependency>
<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>
</dependencies>
<dependency>
<groupId>org.talend.components</groupId>
<artifactId>components-dataprep</artifactId>
<version>${components.version}</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>org.talend.components</groupId>
<artifactId>components-splunk</artifactId>
<version>0.1.3</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>org.talend.components</groupId>
<artifactId>components-jira</artifactId>
<version>0.1.3</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>org-slf4j-api</artifactId>
<version>1.7.2</version>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>1.10</version>
</dependency>
</dependencies>
</project>

View File

@@ -5,25 +5,19 @@
<groupId>org.talend.repo</groupId>
<artifactId>dependencies.p2</artifactId>
<version>7.2.1-SNAPSHOT</version>
<version>6.2.0</version>
<packaging>pom</packaging>
<properties>
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
<components.version>0.26.0-SNAPSHOT</components.version>
<daikon.version>0.29.0-SNAPSHOT</daikon.version>
<dataquality.lib.version>6.2.0-SNAPSHOT</dataquality.lib.version>
</properties>
<distributionManagement>
<snapshotRepository>
<id>talend_nexus_deployment</id>
<url>${talend.nexus.host}/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>${talend.nexus.host}/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>
@@ -38,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>
@@ -48,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>7.2.1-SNAPSHOT</version>
<version>6.2.0</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>7.2.1-SNAPSHOT</version>
<version>6.2.0</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

@@ -10,61 +10,16 @@
<win32>config.ini</win32>
</configIni>
<plugins>
</plugins>
<features>
<feature id="org.talend.fragment.jars.common.feature"/>
<feature id="org.talend.fragment.jars.di.feature"/>
<feature id="org.talend.fragment.jars.dq.feature"/>
<feature id="org.talend.fragment.jars.feature"/>
<feature id="org.talend.rcp.branding.tos.bigdata.feature"/>
<feature id="org.talend.rcp.branding.tos.feature"/>
<feature id="org.talend.rcp.branding.top.feature"/>
<feature id="org.talend.rcp.branding.esbstandard.feature"/>
<feature id="org.talend.rcp.branding.tombundle.feature"/>
<feature id="org.talend.rcp.branding.tos.test.feature"/>
<feature id="org.talend.mdm.tom.test.feature"/>
<feature id="org.talend.babel.all.tos.feature"/>
<feature id="org.talend.bigdata.se.test.feature"/>
<feature id="org.talend.esb.tooling.test.feature"/>
<feature id="org.talend.camel.core.feature"/>
<feature id="org.talend.camel.designer.feature"/>
<feature id="org.talend.camel.feature"/>
<feature id="org.talend.commons.feature"/>
<feature id="org.talend.core.feature"/>
<feature id="org.talend.designer.business.feature"/>
<feature id="org.talend.designer.feature"/>
<feature id="org.talend.esb.tooling.feature"/>
<feature id="org.talend.esb.tooling.rs.provider.feature"/>
<feature id="org.talend.esb.tooling.ws.consumer.feature"/>
<feature id="org.talend.esb.tooling.ws.provider.feature"/>
<feature id="org.talend.esbstandard.feature"/>
<feature id="org.talend.hadoop.distribution.feature"/>
<feature id="org.talend.help.feature"/>
<feature id="org.talend.jdt.feature"/>
<feature id="org.talend.libraries.jdbc.feature"/>
<feature id="org.talend.m2e.feature"/>
<feature id="org.talend.model.migration.feature"/>
<feature id="org.talend.platform.feature"/>
<feature id="org.talend.rcp.feature"/>
<feature id="org.talend.repository.feature"/>
<feature id="org.talend.repository.services.feature"/>
<feature id="org.talend.sbi.feature"/>
<feature id="org.talend.spagic.feature"/>
<feature id="org.talend.tom.feature"/>
<feature id="org.talend.top.feature"/>
<feature id="org.talend.top.libraries.feature"/>
<feature id="org.talend.tos.bigdata.feature"/>
<feature id="org.talend.tos.bigdata.libraries.feature"/>
<feature id="org.talend.tos.components.feature"/>
<feature id="org.talend.tos.core.feature"/>
<feature id="org.talend.tos.feature"/>
<feature id="org.talend.tos.libraries.feature"/>
<feature id="org.talend.update.p2.feature"/>
<feature id="org.talend.updates.feature"/>
<feature id="org.talend.utils.feature"/>
<feature id="org.talend.dataquality.se.test.feature"/>
<feature id="org.talend.rcp.branding.tos.feature"/>
<feature id="org.talend.rcp.branding.top.feature"/>
<feature id="org.talend.rcp.branding.esbstandard.feature"/>
<feature id="org.talend.rcp.branding.tombundle.feature"/>
<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>

View File

@@ -4,12 +4,12 @@ osgi.splashPath=platform:/base/plugins/${product.branding.platform}/
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.100.v20150521-1310.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.service.osgi@start
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.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=https://update.talend.com/Studio/tos/
default.update.site.url=http://update.talend.com/Studio/tos/6.2.0/

View File

@@ -1,7 +1,5 @@
-vmargs
-Xms256m
-Xmx768m
-XX:MaxPermSize=256m
-Dfile.encoding=UTF-8
-Dosgi.requiredJavaVersion=1.8
-XX:+UseG1GC
-XX:+UseStringDeduplication

View File

@@ -1,7 +1,5 @@
-vmargs
-Xms512m
-Xmx1536m
-XX:MaxPermSize=512m
-Dfile.encoding=UTF-8
-Dosgi.requiredJavaVersion=1.8
-XX:+UseG1GC
-XX:+UseStringDeduplication

View File

@@ -1,3 +1,5 @@
--launcher.XXMaxPermSize
512m
-vmargs
-Xms512m
-Xmx1536m
@@ -5,7 +7,4 @@
-XstartOnFirstThread
-Dorg.eclipse.swt.internal.carbon.smallFonts
-Dosgi.instance.area.default=../../../workspace
-Dfile.encoding=UTF-8
-Dosgi.requiredJavaVersion=1.8
-XX:+UseG1GC
-XX:+UseStringDeduplication
-Dfile.encoding=UTF-8

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>7.2.1-SNAPSHOT</version>
<version>6.2.0</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>

View File

@@ -1,8 +1,7 @@
launcher.prefix=TOS_BD
storage.prefix=${launcher.prefix}
product.name=Talend Open Studio for Big Data
product.branding.platform=org.talend.rcp.branding.tos.bigdata
product.branding.id=${product.branding.platform}.product
mac.launcher.info=${product.name} for Mac OS X, Copyright Talend. 2006-2015. All rights reserved.
product.website=http://www.talend.com\n
storage.dir=tosbd
storage.dir=tos

View File

@@ -4,12 +4,12 @@ osgi.splashPath=platform:/base/plugins/${product.branding.platform}/
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.100.v20150521-1310.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.service.osgi@start
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.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=https://update.talend.com/Studio/tos/
default.update.site.url=http://update.talend.com/Studio/tos/6.2.0/

View File

@@ -1,7 +1,5 @@
-vmargs
-Xms256m
-Xmx768m
-XX:MaxPermSize=256m
-Dfile.encoding=UTF-8
-Dosgi.requiredJavaVersion=1.8
-XX:+UseG1GC
-XX:+UseStringDeduplication

View File

@@ -1,7 +1,5 @@
-vmargs
-Xms512m
-Xmx1536m
-XX:MaxPermSize=512m
-Dfile.encoding=UTF-8
-Dosgi.requiredJavaVersion=1.8
-XX:+UseG1GC
-XX:+UseStringDeduplication

View File

@@ -1,3 +1,5 @@
--launcher.XXMaxPermSize
512m
-vmargs
-Xms512m
-Xmx1536m
@@ -5,7 +7,4 @@
-XstartOnFirstThread
-Dorg.eclipse.swt.internal.carbon.smallFonts
-Dosgi.instance.area.default=../../../workspace
-Dfile.encoding=UTF-8
-Dosgi.requiredJavaVersion=1.8
-XX:+UseG1GC
-XX:+UseStringDeduplication
-Dfile.encoding=UTF-8

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>7.2.1-SNAPSHOT</version>
<version>6.2.0</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>

View File

@@ -1,5 +1,4 @@
launcher.prefix=TOS_DI
storage.prefix=${launcher.prefix}
product.name=Talend Open Studio for Data Integration
product.branding.platform=org.talend.rcp.branding.tos
product.branding.id=${product.branding.platform}.product

View File

@@ -4,11 +4,9 @@ osgi.splashPath=platform:/base/plugins/${product.branding.platform}/
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.100.v20150521-1310.jar
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.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

View File

@@ -1,7 +1,5 @@
-vmargs
-Xms256m
-Xmx768m
-XX:MaxPermSize=256m
-Dfile.encoding=UTF-8
-Dosgi.requiredJavaVersion=1.8
-XX:+UseG1GC
-XX:+UseStringDeduplication

View File

@@ -1,7 +1,5 @@
-vmargs
-Xms512m
-Xmx1536m
-XX:MaxPermSize=512m
-Dfile.encoding=UTF-8
-Dosgi.requiredJavaVersion=1.8
-XX:+UseG1GC
-XX:+UseStringDeduplication

View File

@@ -1,3 +1,5 @@
--launcher.XXMaxPermSize
512m
-vmargs
-Xms512m
-Xmx1536m
@@ -5,7 +7,4 @@
-XstartOnFirstThread
-Dorg.eclipse.swt.internal.carbon.smallFonts
-Dosgi.instance.area.default=../../../workspace
-Dfile.encoding=UTF-8
-Dosgi.requiredJavaVersion=1.8
-XX:+UseG1GC
-XX:+UseStringDeduplication
-Dfile.encoding=UTF-8

View File

@@ -4,10 +4,25 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>7.2.1-SNAPSHOT</version>
<version>6.2.0</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

@@ -1,5 +1,4 @@
launcher.prefix=TOS_DQ
storage.prefix=${launcher.prefix}
product.name=Talend Open Profiler
product.branding.platform=org.talend.rcp.branding.top
product.branding.id=${product.branding.platform}.product

View File

@@ -4,12 +4,12 @@ osgi.splashPath=platform:/base/plugins/${product.branding.platform}/
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.100.v20150521-1310.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.service.osgi@start
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.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=https://update.talend.com/Studio/tos/
default.update.site.url=http://update.talend.com/Studio/tos/6.2.0/

View File

@@ -1,7 +1,5 @@
-vmargs
-Xms256m
-Xmx768m
-XX:MaxPermSize=256m
-Dfile.encoding=UTF-8
-Dosgi.requiredJavaVersion=1.8
-XX:+UseG1GC
-XX:+UseStringDeduplication

View File

@@ -1,7 +1,5 @@
-vmargs
-Xms512m
-Xmx1536m
-XX:MaxPermSize=512m
-Dfile.encoding=UTF-8
-Dosgi.requiredJavaVersion=1.8
-XX:+UseG1GC
-XX:+UseStringDeduplication

View File

@@ -1,3 +1,5 @@
--launcher.XXMaxPermSize
512m
-vmargs
-Xms512m
-Xmx1536m
@@ -5,7 +7,4 @@
-XstartOnFirstThread
-Dorg.eclipse.swt.internal.carbon.smallFonts
-Dosgi.instance.area.default=../../../workspace
-Dfile.encoding=UTF-8
-Dosgi.requiredJavaVersion=1.8
-XX:+UseG1GC
-XX:+UseStringDeduplication
-Dfile.encoding=UTF-8

View File

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

@@ -1,5 +1,4 @@
launcher.prefix=TOS_ESB
storage.prefix=TOS_ESB-Studio
product.name=Talend Open Studio
product.branding.platform=org.talend.rcp.branding.esbstandard
product.branding.id=${product.branding.platform}.product

View File

@@ -4,12 +4,12 @@ osgi.splashPath=platform:/base/plugins/${product.branding.platform}/
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.100.v20150521-1310.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.service.osgi@start
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.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=https://update.talend.com/Studio/tos/
default.update.site.url=http://update.talend.com/Studio/tos/6.2.0/

View File

@@ -1,7 +1,5 @@
-vmargs
-Xms256m
-Xmx768m
-XX:MaxPermSize=256m
-Dfile.encoding=UTF-8
-Dosgi.requiredJavaVersion=1.8
-XX:+UseG1GC
-XX:+UseStringDeduplication

View File

@@ -1,7 +1,5 @@
-vmargs
-Xms512m
-Xmx1536m
-XX:MaxPermSize=512m
-Dfile.encoding=UTF-8
-Dosgi.requiredJavaVersion=1.8
-XX:+UseG1GC
-XX:+UseStringDeduplication

View File

@@ -1,3 +1,5 @@
--launcher.XXMaxPermSize
512m
-vmargs
-Xms512m
-Xmx1536m
@@ -5,7 +7,4 @@
-XstartOnFirstThread
-Dorg.eclipse.swt.internal.carbon.smallFonts
-Dosgi.instance.area.default=../../../workspace
-Dfile.encoding=UTF-8
-Dosgi.requiredJavaVersion=1.8
-XX:+UseG1GC
-XX:+UseStringDeduplication
-Dfile.encoding=UTF-8

View File

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

@@ -1,5 +1,5 @@
launcher.prefix=TOS_MDM
storage.prefix=TOS_MDM-Studio
product.final.name.prefix=TOS_MDM-Studio
product.name=Talend Open Studio for MDM
product.branding.platform=org.talend.rcp.branding.tombundle
product.branding.id=${product.branding.platform}.product

File diff suppressed because it is too large Load Diff

21
pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.2.1-SNAPSHOT</version>
<version>6.2.0</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>
@@ -54,8 +54,17 @@
<module>../tmdm-studio-se</module>
</modules>
</profile>
<profile>
<id>build-tos-products</id>
<activation>
<property>
<name>tos.products</name>
<value>!false</value>
</property>
</activation>
<modules>
<module>build</module>
</modules>
</profile>
</profiles>
<modules>
<module>build</module>
</modules>
</project>

View File

@@ -3,30 +3,29 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.2.1-SNAPSHOT</version>
<version>6.2.0</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>7.2.1</base.version>
<base.version>6.2.0</base.version>
<!-- osgi.compatible.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}.<suffix> (milestones), or ${base.version} (GA)-->
<osgi.compatible.version>${base.version}-SNAPSHOT</osgi.compatible.version>
<osgi.compatible.version>6.2.0</osgi.compatible.version>
<!-- maven.compatible.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}-<suffix> (milestones), or ${base.version} (GA)-->
<maven.compatible.version>${base.version}-SNAPSHOT</maven.compatible.version>
<repo.type>Snapshot</repo.type>
<doc.version>7.2.1-SNAPSHOT</doc.version>
<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.compatible.version>6.2.0</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.5.0-SNAPSHOT/talend-eclipse-p2-repo-6.5.0-SNAPSHOT.zip-unzip</eclipse-repo.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/${doc.version}/talend-doc-p2-repo-${doc.version}.zip-unzip/</doc-repo.url>
<bonita-open-repo.url>${opensourcerelease-unziprepo.url}/bonita-community-p2-repo/7.2.3a/bonita-community-p2-repo-7.2.3a.zip-unzip/</bonita-open-repo.url>
<doc-repo.url>${opensourcesnapshot-unziprepo.url}/talend-doc-p2-repo/6.2.0-SNAPSHOT/talend-doc-p2-repo-6.2.0-SNAPSHOT.zip-unzip/</doc-repo.url>
<bonita-open-repo.url>${opensourcerelease-unziprepo.url}/bonita-community-p2-repo/6.5.0a/bonita-community-p2-repo-6.5.0a.zip-unzip/</bonita-open-repo.url>
<equinox.build>org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar</equinox.build>
<opensourcesnapshot-repo.url>${talend.nexus.url}/TalendOpenSourceSnapshot</opensourcesnapshot-repo.url>
<opensourcerelease-repo.url>${talend.nexus.url}/TalendOpenSourceRelease</opensourcerelease-repo.url>
@@ -36,7 +35,7 @@
<osgi.ws>win32</osgi.ws>
<osgi.os>win32</osgi.os>
<osgi.arch>x86</osgi.arch>
<strictVersions>true</strictVersions>
<strictVersions>false</strictVersions>
</properties>
<distributionManagement>
@@ -55,11 +54,6 @@
</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>
@@ -80,11 +74,6 @@
<url>${bonita-open-repo.url}</url>
<layout>p2</layout>
</repository>
<repository>
<id>swtbot</id>
<url>https://artifacts-oss.talend.com/nexus/content/unzip/TalendP2UnzipOpenSourceRelease/org/talend/repo/talend-swtbot/2.7.0/talend-swtbot-2.7.0.zip-unzip</url>
<layout>p2</layout>
</repository>
<repository>
<id>talend_open</id>
<releases>
@@ -105,6 +94,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>
@@ -155,37 +149,37 @@
</environments>
<filters>
<!-- restrict version of a bundle -->
<!--<filter>
<type>eclipse-plugin</type>
<id>org.eclipse.ui.views.properties.tabbed</id>
<restrictTo>
<version>3.6.100.v20140519-0906</version>
</restrictTo>
<!--<filter>
<type>eclipse-plugin</type>
<id>org.eclipse.ui.views.properties.tabbed</id>
<restrictTo>
<version>3.6.100.v20140519-0906</version>
</restrictTo>
</filter>-->
<filter>
<type>eclipse-plugin</type>
<id>org.eclipse.jdt.core</id>
<restrictTo>
<version>3.10.0.xx-201509250011-e44</version>
<version>3.10.0.xx-201411061335-e44-RELEASE</version>
</restrictTo>
</filter>
<!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence
<filter>
<type>java-package</type>
<id>javax.persistence</id>
<restrictTo>
<type>eclipse-plugin</type>
<id>javax.persistence</id>
</restrictTo>
</filter>
<!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence
<filter>
<type>java-package</type>
<id>javax.persistence</id>
<restrictTo>
<type>eclipse-plugin</type>
<id>javax.persistence</id>
</restrictTo>
</filter>
-->
<!-- example 3: work around Equinox bug 348045
<filter>
<type>p2-installable-unit</type>
<id>org.eclipse.equinox.servletbridge.extensionbundle</id>
<removeAll />
</filter>
<!-- example 3: work around Equinox bug 348045
<filter>
<type>p2-installable-unit</type>
<id>org.eclipse.equinox.servletbridge.extensionbundle</id>
<removeAll />
</filter>
-->
</filters>
</configuration>
@@ -214,6 +208,13 @@
<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>
@@ -237,12 +238,12 @@
<dependency>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-buildtimestamp-jgit</artifactId>
<version>${tycho.version}</version>
<version>${tycho-extras.version}</version>
</dependency>
</dependencies>
<configuration>
<strictBinIncludes>false</strictBinIncludes>
<format>yyyyMMdd'_'HHmm</format>
<format>yyyyMMdd'_'HHmm'${release.suffix}'</format>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
<!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
@@ -255,60 +256,6 @@
<jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
<baselineRepositories>
<repository>
<url>http://localhost:8080/p2site/</url>
</repository>
</baselineRepositories>
</configuration>
</plugin>
</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</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>
@@ -342,12 +289,12 @@
<dependency>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-buildtimestamp-jgit</artifactId>
<version>${tycho.version}</version>
<version>${tycho-extras.version}</version>
</dependency>
</dependencies>
<configuration>
<strictBinIncludes>false</strictBinIncludes>
<format>yyyyMMdd'_'HHmm</format>
<format>yyyyMMdd'_'HHmm'${release.suffix}'</format>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
<!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
@@ -403,7 +350,7 @@
</dependencies>
<configuration>
<strictBinIncludes>false</strictBinIncludes>
<format>yyyyMMdd'_'HHmm</format>
<format>'${product.timestamp}${release.suffix}'</format>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
<!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
@@ -411,9 +358,6 @@
<Built-By />
</manifestEntries>
</archive>
<timestampProvider>jgit</timestampProvider>
<jgit.ignore>pom.xml</jgit.ignore>
<jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
</configuration>
</plugin>
</plugins>