Compare commits

..

22 Commits

Author SHA1 Message Date
Irene Wang
c59384e460 components-ee moved 2017-09-02 13:12:16 +02:00
Jenkins Continuous Build server
f84e93354f Set version to 6.3.2 2017-09-01 18:40:06 +02:00
Ivan Gonchar
1e0372e929 chore: upgrade TCOMP to 0.16.1, daikon to 0.14.1 (#71) 2017-09-01 11:43:31 +08:00
sizhaoliu
4379c0ab26 chore(TDQ-14277): bump DQ lib version to 1.5.8 release 2017-08-29 11:53:30 +02:00
Irene Wang
da625c94c8 Remove PPC launcher 2017-08-25 11:53:01 +02:00
Irene Wang
426a119c3a Remove all 32-bit INIs 2017-08-25 10:47:24 +02:00
Irene Wang
45bfc192a4 Remove Win 32-bit INI 2017-08-25 10:34:21 +02:00
iwangtalend
c891674749 Use doc version 6.3.2-SNAPSHOT 2017-08-18 17:46:43 +02:00
Irene Wang
95303863b2 DEVOPS-2901 Remove 32-bit launcher binaries 2017-08-14 12:48:20 +02:00
iwangtalend
0a13751ccd DEVOPS-2322 Fix Linux script 2017-04-18 11:07:32 +02:00
Ivan Gonchar
99cf0b5505 chore: upgrade TCOMP to 0.16.1-SNAPSHOT, daikon to 0.14.1-SNAPSHOT (#47) 2017-03-14 19:30:25 +08:00
iwangtalend
76c1c12ff2 Merge pull request #41 from Talend/feature/DEVOPS-1729/maintenance/6.3_nexus
DEVOPS-1729 Nexus migration: Update URLs [maintenance/6.3]
2017-02-28 15:27:53 +01:00
build-talend
d3396b693a DEVOPS-1729 Nexus migration: Update URLs 2017-02-28 15:25:19 +01:00
iwangtalend
03f5d443d2 Merge pull request #30 from Talend/feature/DEVOPS-1729/maintenance/6.3_nexus
DEVOPS-1729 Nexus migration: Update URLs [maintenance/6.3]
2017-02-27 22:03:42 +01:00
build-talend
a52d843626 DEVOPS-1729 Nexus migration: Update URLs 2017-02-27 17:22:54 +01:00
sizhaoliu
ee6a3c8a46 TDQ-13153 bump DQ lib version to 1.5.8-SNAPSHOT 2017-01-10 20:50:38 +01:00
Jenkins Continuous Build server
9c42abe264 Set version to 6.3.2 SNAPSHOT 2016-12-28 19:13:21 +01:00
Sizhao Liu
85b93322e8 TDQ-13022 bump DQ lib version to 1.5.7-SNAPSHOT on 6.3 branch 2016-12-23 15:01:54 +01:00
nrousseau
dc2e24395b Merge pull request #21 from lpw82gf/bugfix/TMDM-10422
TMDM-10422 : TDS components: wrong serialization of the properties (update version to 0.16.1)
2016-12-15 16:08:15 +08:00
Pingwen Lin
db1ebbf298 TMDM-10422 : TDS components: wrong serialization of the properties (update version to 0.16.1) 2016-12-15 15:32:35 +08:00
Sizhao Liu
a96531b846 TDQ-13022 bump DQ lib version to 1.5.6 2016-12-09 19:56:14 +01:00
Carsten Biermann
eddd516b09 Set versions for 6.3.1 2016-12-07 14:07:38 +00:00
15 changed files with 157 additions and 316 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

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?><target name="Talend Target Platform for Eclipse 4.4 definition" sequenceNumber="200">
<?pde version="3.8"?><target name="Talend Target Platform for Eclipse 4.4 definition" sequenceNumber="198">
<locations>
<location path="${project_loc:/Target Platform for Talend Studio and Luna}/included/emf_query2" type="Directory"/>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
@@ -153,6 +153,15 @@
<unit id="net.jeeeyul.swtend.feature.feature.group" version="2.2.5.I20140918-144458"/>
<repository location="http://eclipse.jeeeyul.net/update/"/>
</location>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.egit.source.feature.group" version="3.4.2.201412180340-r"/>
<unit id="org.eclipse.egit.feature.group" version="3.4.2.201412180340-r"/>
<unit id="org.eclipse.jgit.java7.feature.group" version="3.4.2.201412180340-r"/>
<unit id="org.eclipse.jgit.http.apache.feature.group" version="3.4.2.201412180340-r"/>
<unit id="org.eclipse.jgit.source.feature.group" version="3.4.2.201412180340-r"/>
<unit id="org.eclipse.jgit.feature.group" version="3.4.2.201412180340-r"/>
<repository location="http://download.eclipse.org/releases/luna/"/>
</location>
<location path="${project_loc:/Target Platform for Talend Studio and Luna}/included/drools" type="Directory"/>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.codehaus.groovy23.feature.feature.group" version="2.9.0.xx-201406301445-e44"/>
@@ -1274,19 +1283,7 @@
<repository location="http://download.eclipse.org/nebula/releases/1.0.0"/>
</location>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.jgit.lfs.feature.group" version="4.6.0.201612231935-r"/>
<unit id="org.eclipse.jgit.pgm.source.feature.group" version="4.6.0.201612231935-r"/>
<unit id="org.eclipse.egit.mylyn.feature.group" version="4.6.0.201612231935-r"/>
<unit id="org.eclipse.egit.source.feature.group" version="4.6.0.201612231935-r"/>
<unit id="org.eclipse.jgit.pgm.feature.group" version="4.6.0.201612231935-r"/>
<unit id="org.eclipse.egit.feature.group" version="4.6.0.201612231935-r"/>
<unit id="org.eclipse.jgit.feature.group" version="4.6.0.201612231935-r"/>
<unit id="org.eclipse.jgit.source.feature.group" version="4.6.0.201612231935-r"/>
<unit id="org.eclipse.jgit.http.apache.feature.group" version="4.6.0.201612231935-r"/>
<repository location="http://download.eclipse.org/egit/updates-4.6/"/>
</location>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.nebula.incubation.feature.feature.group" version="1.0.0.201701041652"/>
<unit id="org.eclipse.nebula.incubation.feature.feature.group" version="1.0.0.201607202302"/>
<repository location="http://download.eclipse.org/nebula/incubation/snapshot"/>
</location>
</locations>

View File

@@ -5,81 +5,57 @@
<parent>
<groupId>org.talend.repo</groupId>
<artifactId>dependencies.p2</artifactId>
<version>7.1.1</version>
<version>6.3.2</version>
</parent>
<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.16.1</components.version>
<daikon.version>0.14.1</daikon.version>
</properties>
<dependencies>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
<version>2.4.6-Talend</version>
<version>2.4.5-Talend</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
<artifactId>dataquality-common</artifactId>
<version>${dataquality.lib.version}</version>
<version>1.5.8</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
<artifactId>dataquality-semantic-model</artifactId>
<version>${dataquality.lib.version}</version>
<version>1.5.8</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
<artifactId>dataquality-semantic</artifactId>
<version>${dataquality.lib.version}</version>
<version>1.5.8</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
<artifactId>dataquality-statistics</artifactId>
<version>${dataquality.lib.version}</version>
<version>1.5.8</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
<artifactId>dataquality-record-linkage</artifactId>
<!-- TPS-3713 Only upgrade this jar to a new version -->
<version>6.1.7</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
<artifactId>dataquality-text-japanese</artifactId>
<version>${dataquality.lib.version}</version>
<version>3.2.8</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
<artifactId>dataquality-standardization</artifactId>
<version>${dataquality.lib.version}</version>
<version>3.2.8</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
<artifactId>dataquality-sampling</artifactId>
<version>${dataquality.lib.version}</version>
<version>2.3.8</version>
</dependency>
<dependency>
<groupId>org.talend.daikon</groupId>
@@ -87,38 +63,33 @@
<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>
<version>4.5.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.9.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.7</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.9.5</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.5</version>
</dependency>
<!-- end of daikon dependencies -->
<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.10</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.4</version>
</dependency>
<!-- end of daikon dependencies -->
<!-- ========================= -->
<!-- Added by TDM -->
@@ -126,24 +97,23 @@
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>1.9.14-TALEND</version>
<version>1.9.13</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>
<version>1.9.13</version>
</dependency>
<!-- Avro and dependencies -->
<!-- Kept just in case someone using this -->
<!-- above servicemix has less 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>
@@ -175,8 +145,6 @@
<!-- End added by TDM -->
<!-- ========================= -->
<!-- TCOMP v1 -->
<dependency>
<groupId>org.talend.components</groupId>
@@ -203,7 +171,7 @@
</dependency>
<dependency>
<groupId>org.talend.components</groupId>
<artifactId>components-salesforce-definition</artifactId>
<artifactId>components-salesforce</artifactId>
<version>${components.version}</version>
<classifier>bundle</classifier>
</dependency>
@@ -218,72 +186,8 @@
<artifactId>components-jira</artifactId>
<version>${components.version}</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>org.talend.components</groupId>
<artifactId>components-couchbase</artifactId>
<version>${components.version}</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>org.talend.components</groupId>
<artifactId>components-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>
</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
</dependency>
<!-- to avoid updatin the complete eclipse target platform we add these
single dependencies -->
<dependency>
<groupId>biz.aQute.bnd</groupId>
@@ -305,6 +209,11 @@
<artifactId>commons-configuration</artifactId>
<version>1.10</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.4</version>
</dependency>
</dependencies>
</project>

View File

@@ -5,13 +5,10 @@
<groupId>org.talend.repo</groupId>
<artifactId>dependencies.p2</artifactId>
<version>7.1.1</version>
<version>6.3.2</version>
<packaging>pom</packaging>
<properties>
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
<components.version>0.25.3</components.version>
<daikon.version>0.27.0</daikon.version>
<dataquality.lib.version>6.1.3</dataquality.lib.version>
</properties>
<distributionManagement>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.1.1</version>
<version>6.3.2</version>
<relativePath />
</parent>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.1.1</version>
<version>6.3.2</version>
<relativePath />
</parent>

View File

@@ -20,7 +20,6 @@
<feature id="org.talend.rcp.branding.tos.test.feature"/>
<feature id="org.talend.babel.all.tos.feature"/>
<feature id="org.talend.test.tos.feature"/>
<feature id="org.talend.bigdata.se.test.feature"/>
<feature id="org.talend.esb.tooling.test.feature"/>
<feature id="org.talend.bigdata.se.test.feature"/>
</features>
</product>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.1.1</version>
<version>6.3.2</version>
<relativePath />
</parent>
@@ -59,7 +59,7 @@
</files>
</configuration>
</execution>
</executions>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
@@ -91,7 +91,7 @@
<id>${project.artifactId}</id>
</product>
</products>
</configuration>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -118,7 +118,7 @@
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>eclipse-launcher-mac-${launcher.prefix}</artifactId>
<version>7.1.1</version>
<version>${base.version}</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${studio.dir}</outputDirectory>
@@ -134,7 +134,7 @@
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>eclipse-delta-pack</artifactId>
<version>4.4.1b</version>
<version>4.4.1</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${studio.dir}</outputDirectory>
@@ -235,35 +235,35 @@
</execution>
</executions>
</plugin>
<!-- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.3.2</version>
<executions>
<execution>
<id>generate-javajet</id>
<phase>package</phase>
<goals>
<goal>exec</goal>
</goals>
</execution>
</executions>
<configuration>
<executable>java</executable>
<workingDirectory>${studio.dir}</workingDirectory>
<arguments>
<argument>-Xmx1536m</argument>
<argument>-XX:MaxPermSize=512m</argument>
<argument>-classpath</argument>
<argument>${studio.dir}/plugins/${equinox.build}</argument>
<argument>org.eclipse.core.launcher.Main</argument>
<argument>-application</argument>
<argument>org.talend.designer.codegen.CodeGenInit</argument>
<argument>-nosplash</argument>
<argument>-consoleLog</argument>
<argument>-Dtalend.licence.path=${studio.dir}/license</argument>
</arguments>
</configuration>
<!-- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.3.2</version>
<executions>
<execution>
<id>generate-javajet</id>
<phase>package</phase>
<goals>
<goal>exec</goal>
</goals>
</execution>
</executions>
<configuration>
<executable>java</executable>
<workingDirectory>${studio.dir}</workingDirectory>
<arguments>
<argument>-Xmx1536m</argument>
<argument>-XX:MaxPermSize=512m</argument>
<argument>-classpath</argument>
<argument>${studio.dir}/plugins/${equinox.build}</argument>
<argument>org.eclipse.core.launcher.Main</argument>
<argument>-application</argument>
<argument>org.talend.designer.codegen.CodeGenInit</argument>
<argument>-nosplash</argument>
<argument>-consoleLog</argument>
<argument>-Dtalend.licence.path=${studio.dir}/license</argument>
</arguments>
</configuration>
</plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -305,7 +305,7 @@
<echo>product.timestamp=${product.timestamp}</echo>
<echo>version.full=${version.full}</echo>
<fileset dir="${studio.dir}/plugins" includes="${product.branding.platform}_${product.version}*/about.mappings" id="aboutmappingspath_temp" />
<pathconvert property="aboutmappingspath" refid="aboutmappingspath_temp" />
<pathconvert property="aboutmappingspath" refid="aboutmappingspath_temp" />
<echo>aboutmappingspath=${aboutmappingspath}</echo>
<loadfile property="about" srcFile="${aboutmappingspath}">
<filterchain>
@@ -503,29 +503,29 @@
<timestampProvider>default</timestampProvider>
</configuration>
</plugin>
<!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.7</version>
<executions>
<!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>-->
<!-- Attach product ZIP to Maven artifact -->
<!-- <id>attach-artifacts</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<file>${project.build.directory}/products/${product.final.name}.zip</file>
<type>product</type>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
<!-- <id>attach-artifacts</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<file>${project.build.directory}/products/${product.final.name}.zip</file>
<type>product</type>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.1.1</version>
<version>6.3.2</version>
<relativePath />
</parent>

View File

@@ -3,29 +3,28 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.1.1</version>
<version>6.3.2</version>
<packaging>pom</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tycho.version>0.22.0</tycho.version>
<tycho-extras.version>${tycho.version}</tycho-extras.version>
<base.version>7.1.1</base.version>
<base.version>6.3.2</base.version>
<!-- osgi.compatible.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}.<suffix> (milestones), or ${base.version} (GA)-->
<osgi.compatible.version>${base.version}</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}</maven.compatible.version>
<repo.type>Release</repo.type>
<doc.version>7.1.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>
<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.3.0-SNAPSHOT/talend-eclipse-p2-repo-6.3.0-SNAPSHOT.zip-unzip</eclipse-repo.url>
<eclipse-emf-repo.url>${opensourcesnapshot-unziprepo.url}/emf-compare-update/3.0.1-SNAPSHOT/emf-compare-update-3.0.1-SNAPSHOT.zip-unzip</eclipse-emf-repo.url>
<babel-repo.url>${opensourcesnapshot-unziprepo.url}/talend-babel-p2-repo/4.4.1-SNAPSHOT/talend-babel-p2-repo-4.4.1-SNAPSHOT.zip-unzip</babel-repo.url>
<doc-repo.url>${opensourcesnapshot-unziprepo.url}/talend-doc-p2-repo/${doc.version}/talend-doc-p2-repo-${doc.version}.zip-unzip/</doc-repo.url>
<doc-repo.url>${opensourcesnapshot-unziprepo.url}/talend-doc-p2-repo/6.3.2-SNAPSHOT/talend-doc-p2-repo-6.3.2-SNAPSHOT.zip-unzip/</doc-repo.url>
<bonita-open-repo.url>${opensourcerelease-unziprepo.url}/bonita-community-p2-repo/7.2.3a/bonita-community-p2-repo-7.2.3a.zip-unzip/</bonita-open-repo.url>
<equinox.build>org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar</equinox.build>
<opensourcesnapshot-repo.url>${talend.nexus.url}/TalendOpenSourceSnapshot</opensourcesnapshot-repo.url>
@@ -150,12 +149,12 @@
</environments>
<filters>
<!-- restrict version of a bundle -->
<!--<filter>
<type>eclipse-plugin</type>
<id>org.eclipse.ui.views.properties.tabbed</id>
<restrictTo>
<version>3.6.100.v20140519-0906</version>
</restrictTo>
<!--<filter>
<type>eclipse-plugin</type>
<id>org.eclipse.ui.views.properties.tabbed</id>
<restrictTo>
<version>3.6.100.v20140519-0906</version>
</restrictTo>
</filter>-->
<filter>
<type>eclipse-plugin</type>
@@ -165,22 +164,22 @@
</restrictTo>
</filter>
<!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence
<filter>
<type>java-package</type>
<id>javax.persistence</id>
<restrictTo>
<type>eclipse-plugin</type>
<id>javax.persistence</id>
</restrictTo>
</filter>
<!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence
<filter>
<type>java-package</type>
<id>javax.persistence</id>
<restrictTo>
<type>eclipse-plugin</type>
<id>javax.persistence</id>
</restrictTo>
</filter>
-->
<!-- example 3: work around Equinox bug 348045
<filter>
<type>p2-installable-unit</type>
<id>org.eclipse.equinox.servletbridge.extensionbundle</id>
<removeAll />
</filter>
<!-- example 3: work around Equinox bug 348045
<filter>
<type>p2-installable-unit</type>
<id>org.eclipse.equinox.servletbridge.extensionbundle</id>
<removeAll />
</filter>
-->
</filters>
</configuration>
@@ -199,67 +198,6 @@
</plugins>
</build>
<profiles>
<profile>
<id>patch</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<properties>
<product.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</product.version>
<timestamp>${maven.build.timestamp}</timestamp>
<maven.build.timestamp.format>yyyyMMdd'_'HHmm</maven.build.timestamp.format>
</properties>
<repositories>
<repository>
<id>talend_open_p2</id>
<url>${tos-p2-repo.url}</url>
<layout>p2</layout>
</repository>
</repositories>
<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>
<dependencies>
<dependency>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-buildtimestamp-jgit</artifactId>
<version>${tycho-extras.version}</version>
</dependency>
</dependencies>
<configuration>
<strictBinIncludes>false</strictBinIncludes>
<format>${timestamp}'-patch'</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>jgit</timestampProvider>
<jgit.ignore>pom.xml</jgit.ignore>
<jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>nonofficial</id>
<activation>