Compare commits
94 Commits
DEVOPS-384
...
release/7.
| Author | SHA1 | Date | |
|---|---|---|---|
|
79a7639c85 | ||
|
|
3e5cb4e267 | ||
|
|
3786678af3 | ||
|
|
935067366b | ||
|
|
e94d48371e | ||
|
|
a4045aca8a | ||
|
|
c68db342d2 | ||
|
|
7f67dd05e9 | ||
|
|
12fffc246f | ||
|
|
9dd74c6271 | ||
|
|
8ef366231f | ||
|
|
1bfad2c6e5 | ||
|
|
c1ee67259b | ||
|
|
2f9be800a5 | ||
|
|
72fe26ce26 | ||
|
|
d474c70d38 | ||
|
|
8cd6fcd334 | ||
|
|
cc9439c899 | ||
|
|
b6bcc7f7ae | ||
|
|
60bc7074f0 | ||
|
|
5cfb683aef | ||
|
|
d8680557a0 | ||
|
|
d79a477817 | ||
|
|
bc3e64196a | ||
|
|
2ec536f370 | ||
|
|
13909039a3 | ||
|
|
97ca3e1216 | ||
|
|
4e03b9d382 | ||
|
|
5c3a397035 | ||
|
|
67739cb628 | ||
|
|
2eb32f2d9a | ||
|
|
f0cd5c0674 | ||
|
|
c0a708baa9 | ||
|
|
407aabd4d9 | ||
|
|
13a069a49e | ||
|
|
0a6eaf4d8f | ||
|
|
e20abc03a9 | ||
|
|
97e66e8466 | ||
|
|
ba5e20f4c4 | ||
|
|
ae5c2e5bb8 | ||
|
|
f82e24b5ca | ||
|
|
78c31a2d7c | ||
|
|
2d1562ddd1 | ||
|
|
23c330c2a3 | ||
|
|
e6a4e58e77 | ||
|
|
982dd2182b | ||
|
|
c6b108f6be | ||
|
|
8aa8a7911a | ||
|
|
ae1b8c54bf | ||
|
|
cf1e71a8bb | ||
|
|
5e1e51ddce | ||
|
|
c23834f48e | ||
|
|
7579f09cc9 | ||
|
|
10965e336b | ||
|
|
743849c31e | ||
|
|
c4c5363835 | ||
|
|
845db385a7 | ||
|
|
e6da87ec56 | ||
|
|
5d4448ff9b | ||
|
|
07d7e0e35b | ||
|
|
261d97e2ef | ||
|
|
0dedb38c27 | ||
|
|
bfe7bf6a46 | ||
|
|
e83a26c208 | ||
|
|
1a9b3fcc73 | ||
|
|
0c774878d6 | ||
|
|
50988ef00a | ||
|
|
4d70d8c4ab | ||
|
|
f6b8645da6 | ||
|
|
5df540d9d4 | ||
|
|
4b1e96548f | ||
|
|
8993d85e29 | ||
|
|
11bf94cbe8 | ||
|
|
0d95c759d3 | ||
|
|
db3c918ce9 | ||
|
|
488efc5402 | ||
|
|
0dd749233d | ||
|
|
f08801de43 | ||
|
|
2d9ea8d41b | ||
|
|
091c4262dd | ||
|
|
d5f8e2a967 | ||
|
|
2413ab2179 | ||
|
|
c2b09b0cbf | ||
|
|
c5462dcb98 | ||
|
|
9d94dfe81b | ||
|
|
6d5d8600c7 | ||
|
|
c8f711ff29 | ||
|
|
31ea9dd17b | ||
|
|
377cc7c280 | ||
|
|
be4fdeb687 | ||
|
|
0cd5ee531d | ||
|
|
0fbb2783df | ||
|
|
c4e7752e9c | ||
|
|
6de5ec1608 |
@@ -4,7 +4,6 @@ http://www.talend.com
|
||||
|
||||
|
||||
> Content
|
||||
==========
|
||||
|
||||
Master repos using gitslave for aggregating the full Talend Studio open source repositories
|
||||
|
||||
|
||||
@@ -5,52 +5,85 @@
|
||||
<parent>
|
||||
<groupId>org.talend.repo</groupId>
|
||||
<artifactId>dependencies.p2</artifactId>
|
||||
<version>6.5.2-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</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>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.ops4j.pax.url</groupId>
|
||||
<artifactId>pax-url-aether</artifactId>
|
||||
<version>2.4.5-Talend</version>
|
||||
<version>2.4.6-Talend</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>dataquality-common</artifactId>
|
||||
<version>1.6.6-SNAPSHOT</version>
|
||||
<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>1.6.6-SNAPSHOT</version>
|
||||
<version>${dataquality.lib.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>dataquality-semantic</artifactId>
|
||||
<version>1.6.6-SNAPSHOT</version>
|
||||
<version>${dataquality.lib.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>dataquality-statistics</artifactId>
|
||||
<version>1.6.6-SNAPSHOT</version>
|
||||
<version>${dataquality.lib.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>dataquality-record-linkage</artifactId>
|
||||
<version>3.3.6-SNAPSHOT</version>
|
||||
<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>3.3.6-SNAPSHOT</version>
|
||||
<version>${dataquality.lib.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.dataquality</groupId>
|
||||
<artifactId>dataquality-sampling</artifactId>
|
||||
<version>2.4.6-SNAPSHOT</version>
|
||||
<version>${dataquality.lib.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.daikon</groupId>
|
||||
@@ -58,33 +91,38 @@
|
||||
<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.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 -->
|
||||
<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 -->
|
||||
|
||||
<!-- ========================= -->
|
||||
<!-- Added by TDM -->
|
||||
@@ -92,23 +130,24 @@
|
||||
<dependency>
|
||||
<groupId>org.codehaus.jackson</groupId>
|
||||
<artifactId>jackson-core-asl</artifactId>
|
||||
<version>1.9.13</version>
|
||||
<version>1.9.14-TALEND</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.codehaus.jackson</groupId>
|
||||
<artifactId>jackson-mapper-asl</artifactId>
|
||||
<version>1.9.13</version>
|
||||
<version>1.9.14-TALEND</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Avro and dependencies -->
|
||||
<!-- To be replaced when avro will be available -->
|
||||
<!-- from servicemix with less dependencies -->
|
||||
<!-- Avro with minimum depdencies -->
|
||||
<dependency>
|
||||
<groupId>org.apache.servicemix.bundles</groupId>
|
||||
<artifactId>org.apache.servicemix.bundles.avro</artifactId>
|
||||
<version>1.8.0_1</version>
|
||||
<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>
|
||||
@@ -140,6 +179,8 @@
|
||||
|
||||
<!-- End added by TDM -->
|
||||
<!-- ========================= -->
|
||||
|
||||
<!-- TCOMP v1 -->
|
||||
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
@@ -190,7 +231,19 @@
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.components</groupId>
|
||||
<artifactId>components-snowflake</artifactId>
|
||||
<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>
|
||||
@@ -223,7 +276,18 @@
|
||||
<version>${components.version}</version>
|
||||
<classifier>bundle</classifier>
|
||||
</dependency>
|
||||
<!-- to avoid updatin the complete eclipse target platform we add these
|
||||
<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>
|
||||
@@ -245,11 +309,6 @@
|
||||
<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,12 +5,13 @@
|
||||
|
||||
<groupId>org.talend.repo</groupId>
|
||||
<artifactId>dependencies.p2</artifactId>
|
||||
<version>6.5.2-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<packaging>pom</packaging>
|
||||
<properties>
|
||||
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
|
||||
<components.version>0.19.9</components.version>
|
||||
<daikon.version>0.17.2</daikon.version>
|
||||
<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>6.5.2-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -4,12 +4,13 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>6.5.2-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
<artifactId>talend-tos-p2-repo</artifactId>
|
||||
<packaging>eclipse-repository</packaging>
|
||||
<version>7.2.1.M2</version>
|
||||
|
||||
<properties>
|
||||
<product.final.name>${launcher.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
|
||||
|
||||
@@ -10,17 +10,61 @@
|
||||
<win32>config.ini</win32>
|
||||
</configIni>
|
||||
|
||||
<plugins>
|
||||
</plugins>
|
||||
|
||||
<features>
|
||||
<feature id="org.talend.fragment.jars.feature"/>
|
||||
<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.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.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.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"/>
|
||||
</features>
|
||||
|
||||
|
||||
</product>
|
||||
|
||||
@@ -4,10 +4,11 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.5.2-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
<artifactId>org.talend.studio.tos.bigdata.product</artifactId>
|
||||
<packaging>eclipse-repository</packaging>
|
||||
<version>7.2.1.M2</version>
|
||||
</project>
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
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=tos
|
||||
storage.dir=tosbd
|
||||
@@ -4,10 +4,11 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.5.2-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
<artifactId>org.talend.studio.tos.di.product</artifactId>
|
||||
<packaging>eclipse-repository</packaging>
|
||||
<version>7.2.1.M2</version>
|
||||
</project>
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
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,3 +10,5 @@ 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,25 +4,11 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.5.2-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</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>
|
||||
<version>7.2.1.M2</version>
|
||||
</project>
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
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,10 +4,11 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.5.2-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||
</parent>
|
||||
|
||||
<artifactId>org.talend.studio.tos.esb.product</artifactId>
|
||||
<packaging>eclipse-repository</packaging>
|
||||
<version>7.2.1.M2</version>
|
||||
</project>
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
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,13 +4,11 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>6.5.2-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</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>
|
||||
<version>7.2.1.M2</version>
|
||||
</project>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
launcher.prefix=TOS_MDM
|
||||
product.final.name.prefix=TOS_MDM-Studio
|
||||
storage.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
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>6.5.2-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
|
||||
<properties>
|
||||
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
|
||||
<product.final.name>${launcher.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
|
||||
<product.final.name>${storage.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
|
||||
<studio.dir>${project.build.directory}/products/${project.artifactId}/${osgi.os}/${osgi.ws}/${osgi.arch}</studio.dir>
|
||||
</properties>
|
||||
|
||||
@@ -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>
|
||||
@@ -134,7 +134,7 @@
|
||||
<artifactItem>
|
||||
<groupId>${project.groupId}</groupId>
|
||||
<artifactId>eclipse-delta-pack</artifactId>
|
||||
<version>4.4.1</version>
|
||||
<version>4.4.1b</version>
|
||||
<type>zip</type>
|
||||
<overWrite>true</overWrite>
|
||||
<outputDirectory>${studio.dir}</outputDirectory>
|
||||
@@ -235,36 +235,6 @@
|
||||
</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>-->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-antrun-plugin</artifactId>
|
||||
@@ -305,7 +275,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>
|
||||
@@ -376,43 +346,6 @@
|
||||
<goal>run</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
<execution>
|
||||
<!-- Generate javajet by launching product -->
|
||||
<id>generate-javajet</id>
|
||||
<phase>package</phase>
|
||||
<configuration>
|
||||
<target>
|
||||
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
|
||||
<!-- Generate javajet -->
|
||||
<java classname="org.eclipse.core.launcher.Main" dir="${studio.dir}" fork="true" failonerror="false" maxmemory="1536m">
|
||||
<arg line="-application org.talend.designer.codegen.CodeGenInit -nosplash -consoleLog" />
|
||||
<classpath>
|
||||
<pathelement location="${studio.dir}/plugins/${equinox.build}" />
|
||||
</classpath>
|
||||
<jvmarg value="-XX:MaxPermSize=512m" />
|
||||
<jvmarg value="-Dtalend.licence.path=${studio.dir}/license" />
|
||||
</java>
|
||||
<delete file="${studio.dir}/license" />
|
||||
<delete dir="${studio.dir}/lib" includeemptydirs="true" />
|
||||
<delete dir="${studio.dir}/temp" includeemptydirs="true" />
|
||||
<delete dir="${studio.dir}/workspace/.Java" includeemptydirs="true" />
|
||||
<delete dir="${studio.dir}/workspace/.Perl" includeemptydirs="true" />
|
||||
<delete dir="${studio.dir}/workspace/.metadata" includeemptydirs="true" />
|
||||
<delete dir="${studio.dir}/configuration/org.eclipse.core.runtime" includeemptydirs="true" />
|
||||
<delete dir="${studio.dir}/configuration/org.eclipse.equinox.app" includeemptydirs="true" />
|
||||
<delete dir="${studio.dir}/configuration/org.eclipse.osgi" includeemptydirs="true" />
|
||||
<delete dir="${studio.dir}/configuration/org.eclipse.update" includeemptydirs="true" />
|
||||
<delete dir="${studio.dir}/configuration/maven_repository" includeemptydirs="true" />
|
||||
<delete dir="${studio.dir}/configuration/.settings" includeemptydirs="true" />
|
||||
<delete file="${studio.dir}/configuration/maven_user_settings.xml" />
|
||||
<delete file="${studio.dir}/configuration/LibrariesIndex.xml" />
|
||||
<delete file="${studio.dir}/configuration/MavenUriIndex.xml" />
|
||||
</target>
|
||||
</configuration>
|
||||
<goals>
|
||||
<goal>run</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
<execution>
|
||||
<!-- Create final product ZIP -->
|
||||
<id>zip-product</id>
|
||||
@@ -520,7 +453,7 @@
|
||||
<artifacts>
|
||||
<artifact>
|
||||
<file>${project.build.directory}/products/${product.final.name}.zip</file>
|
||||
<type>product</type>
|
||||
<type>product</type>
|
||||
</artifact>
|
||||
</artifacts>
|
||||
</configuration>
|
||||
@@ -539,8 +472,7 @@
|
||||
<configuration>
|
||||
<target>
|
||||
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
|
||||
<propertyregex property="product.version.short" input="${product.version}" regexp="\." replace="" global="true" casesensitive="false" override="true" />
|
||||
<property name="product.build.path" value="${product.build.id}/${storage.dir}/V${product.version}${revision.filename}/${storage.dir}_${product.version.short}" />
|
||||
<property name="product.build.path" value="${product.build.id}/${storage.dir}/V${product.version}${revision.filename}" />
|
||||
<property name="product.dir" value="${storage}/${product.build.path}" />
|
||||
<mkdir dir="${product.dir}" />
|
||||
<echo>Moving product ZIP ${project.build.directory}/products/${product.final.name}.zip to ${product.dir}</echo>
|
||||
@@ -554,7 +486,12 @@
|
||||
<echo file="${storage}/lastnb.txt" append="true">http://newbuild.talend.com/builds/${product.build.path}/${product.final.name}.zip${line.separator}</echo>
|
||||
</then>
|
||||
</if>
|
||||
<checksum file="${product.dir}/${product.final.name}.zip" />
|
||||
<exec executable="openssl" dir="${product.dir}" outputproperty="sha256">
|
||||
<arg line="dgst" />
|
||||
<arg line="-sha256" />
|
||||
<arg line="${product.final.name}.zip" />
|
||||
</exec>
|
||||
<echo file="${product.dir}/${product.final.name}.zip.sha256" append="false">${sha256}</echo>
|
||||
</target>
|
||||
</configuration>
|
||||
<goals>
|
||||
|
||||
2
pom.xml
2
pom.xml
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>6.5.2-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -3,28 +3,29 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>6.5.2-SNAPSHOT</version>
|
||||
<version>7.2.1-M2</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<tycho.version>0.22.0</tycho.version>
|
||||
<tycho-extras.version>${tycho.version}</tycho-extras.version>
|
||||
<base.version>6.5.2</base.version>
|
||||
<base.version>7.2.1</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}.M2</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>
|
||||
<maven.compatible.version>${base.version}-M2</maven.compatible.version>
|
||||
<repo.type>Release</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>
|
||||
<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.4.1-SNAPSHOT/talend-eclipse-p2-repo-6.4.1-SNAPSHOT.zip-unzip</eclipse-repo.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-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/6.5.1-SNAPSHOT/talend-doc-p2-repo-6.5.1-SNAPSHOT.zip-unzip/</doc-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>
|
||||
<equinox.build>org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar</equinox.build>
|
||||
<opensourcesnapshot-repo.url>${talend.nexus.url}/TalendOpenSourceSnapshot</opensourcesnapshot-repo.url>
|
||||
@@ -35,7 +36,7 @@
|
||||
<osgi.ws>win32</osgi.ws>
|
||||
<osgi.os>win32</osgi.os>
|
||||
<osgi.arch>x86</osgi.arch>
|
||||
<strictVersions>true</strictVersions>
|
||||
<strictVersions>false</strictVersions>
|
||||
</properties>
|
||||
|
||||
<distributionManagement>
|
||||
@@ -79,6 +80,11 @@
|
||||
<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>
|
||||
@@ -149,12 +155,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>
|
||||
@@ -164,22 +170,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>
|
||||
@@ -231,12 +237,12 @@
|
||||
<dependency>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-buildtimestamp-jgit</artifactId>
|
||||
<version>${tycho-extras.version}</version>
|
||||
<version>${tycho.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<configuration>
|
||||
<strictBinIncludes>false</strictBinIncludes>
|
||||
<format>yyyyMMdd'_'HHmm'${release.suffix}'</format>
|
||||
<format>yyyyMMdd'_'HHmm</format>
|
||||
<archive>
|
||||
<addMavenDescriptor>false</addMavenDescriptor>
|
||||
<!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
|
||||
@@ -249,7 +255,19 @@
|
||||
<jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
<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>
|
||||
@@ -280,7 +298,7 @@
|
||||
<version>${tycho.version}</version>
|
||||
<configuration>
|
||||
<strictBinIncludes>false</strictBinIncludes>
|
||||
<format>yyyyMMdd'_'HHmm'${release.suffix}'</format>
|
||||
<format>yyyyMMdd'_'HHmm</format>
|
||||
<archive>
|
||||
<addMavenDescriptor>false</addMavenDescriptor>
|
||||
<!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
|
||||
@@ -324,12 +342,12 @@
|
||||
<dependency>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-buildtimestamp-jgit</artifactId>
|
||||
<version>${tycho-extras.version}</version>
|
||||
<version>${tycho.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<configuration>
|
||||
<strictBinIncludes>false</strictBinIncludes>
|
||||
<format>yyyyMMdd'_'HHmm'${release.suffix}'</format>
|
||||
<format>yyyyMMdd'_'HHmm</format>
|
||||
<archive>
|
||||
<addMavenDescriptor>false</addMavenDescriptor>
|
||||
<!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
|
||||
@@ -385,7 +403,7 @@
|
||||
</dependencies>
|
||||
<configuration>
|
||||
<strictBinIncludes>false</strictBinIncludes>
|
||||
<format>'${product.timestamp}${release.suffix}'</format>
|
||||
<format>yyyyMMdd'_'HHmm</format>
|
||||
<archive>
|
||||
<addMavenDescriptor>false</addMavenDescriptor>
|
||||
<!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
|
||||
@@ -393,6 +411,9 @@
|
||||
<Built-By />
|
||||
</manifestEntries>
|
||||
</archive>
|
||||
<timestampProvider>jgit</timestampProvider>
|
||||
<jgit.ignore>pom.xml</jgit.ignore>
|
||||
<jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
@@ -453,24 +474,5 @@
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>unpacked.plugins</id>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-packaging-plugin</artifactId>
|
||||
<version>${tycho.version}</version>
|
||||
<configuration>
|
||||
<archive>
|
||||
<manifestEntries>
|
||||
<Eclipse-BundleShape>dir</Eclipse-BundleShape>
|
||||
</manifestEntries>
|
||||
</archive>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
</profiles>
|
||||
</project>
|
||||
|
||||
Reference in New Issue
Block a user