Compare commits
2 Commits
DEVOPS-274
...
release/6.
| Author | SHA1 | Date | |
|---|---|---|---|
|
970679ed74 | ||
|
|
43999f081b |
@@ -4,6 +4,7 @@ http://www.talend.com
|
||||
|
||||
|
||||
> Content
|
||||
==========
|
||||
|
||||
Master repos using gitslave for aggregating the full Talend Studio open source repositories
|
||||
|
||||
|
||||
@@ -5,85 +5,57 @@
|
||||
<parent>
|
||||
<groupId>org.talend.repo</groupId>
|
||||
<artifactId>dependencies.p2</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>6.4.0</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.18.0</components.version>
|
||||
<daikon.version>0.16.0</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>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>dataquality-phone</artifactId>
|
||||
<version>${dataquality.lib.version}</version>
|
||||
<version>1.6.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>dataquality-semantic-model</artifactId>
|
||||
<version>${dataquality.lib.version}</version>
|
||||
<version>1.6.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>dataquality-semantic</artifactId>
|
||||
<version>${dataquality.lib.version}</version>
|
||||
<version>1.6.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>dataquality-statistics</artifactId>
|
||||
<version>${dataquality.lib.version}</version>
|
||||
<version>1.6.1</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>
|
||||
<version>3.3.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>dataquality-standardization</artifactId>
|
||||
<version>${dataquality.lib.version}</version>
|
||||
<version>3.3.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>dataquality-sampling</artifactId>
|
||||
<version>${dataquality.lib.version}</version>
|
||||
<version>2.4.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.daikon</groupId>
|
||||
@@ -91,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>
|
||||
</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 -->
|
||||
@@ -130,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>
|
||||
@@ -179,8 +145,6 @@
|
||||
|
||||
<!-- End added by TDM -->
|
||||
<!-- ========================= -->
|
||||
|
||||
<!-- TCOMP v1 -->
|
||||
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
@@ -211,6 +175,12 @@
|
||||
<version>${components.version}</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<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>
|
||||
@@ -225,25 +195,13 @@
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-couchbase</artifactId>
|
||||
<artifactId>components-datastewardship</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>
|
||||
<artifactId>components-snowflake</artifactId>
|
||||
<version>${components.version}</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
@@ -261,33 +219,17 @@
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-marketo-definition</artifactId>
|
||||
<artifactId>components-marketo</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
|
||||
<!-- to avoid updatin the complete eclipse target platform we add these
|
||||
single dependencies -->
|
||||
<dependency>
|
||||
<groupId>biz.aQute.bnd</groupId>
|
||||
@@ -309,6 +251,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>
|
||||
|
||||
@@ -5,13 +5,10 @@
|
||||
|
||||
<groupId>org.talend.repo</groupId>
|
||||
<artifactId>dependencies.p2</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>6.4.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>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>6.4.0</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>6.4.0</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>6.4.0</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>6.4.0</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -10,5 +10,3 @@ 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
|
||||
|
||||
@@ -4,10 +4,25 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>6.4.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>
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>6.4.0</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -4,10 +4,13 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>6.4.0</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
<artifactId>org.talend.studio.tos.mdm.product</artifactId>
|
||||
<packaging>eclipse-repository</packaging>
|
||||
<properties>
|
||||
<product.final.name>${product.final.name.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
|
||||
</properties>
|
||||
</project>
|
||||
|
||||
@@ -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
2
pom.xml
2
pom.xml
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>6.4.0</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -3,29 +3,28 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>6.4.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.4.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>${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}-SNAPSHOT</maven.compatible.version>
|
||||
<repo.type>Snapshot</repo.type>
|
||||
<doc.version>7.2.1-SNAPSHOT</doc.version>
|
||||
<maven.compatible.version>${base.version}</maven.compatible.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>
|
||||
<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.4.1-SNAPSHOT/talend-eclipse-p2-repo-6.4.1-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.4.0-SNAPSHOT/talend-doc-p2-repo-6.4.0-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>
|
||||
@@ -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>
|
||||
@@ -80,11 +79,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>
|
||||
@@ -155,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>
|
||||
@@ -170,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>
|
||||
@@ -237,12 +231,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,19 +249,7 @@
|
||||
<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>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
<profile>
|
||||
@@ -298,7 +280,7 @@
|
||||
<version>${tycho.version}</version>
|
||||
<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 -->
|
||||
@@ -342,12 +324,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 +385,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 +393,6 @@
|
||||
<Built-By />
|
||||
</manifestEntries>
|
||||
</archive>
|
||||
<timestampProvider>jgit</timestampProvider>
|
||||
<jgit.ignore>pom.xml</jgit.ignore>
|
||||
<jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
|
||||
Reference in New Issue
Block a user