Compare commits

..

1 Commits

Author SHA1 Message Date
Jenkins Continuous Build server
79a7639c85 Set version to 7.2.1 M2 2019-01-29 16:18:29 +01:00
44 changed files with 267 additions and 470 deletions

View File

@@ -13,8 +13,8 @@ It is a simple git repo but allows working with all Talend Studio open source re
Install GitSlave
================
GitSlave is the tool you can use to perform multi-repo command, in order to use it to its full potential please
install :
* perl
install :
* perl
* clone this repostitory locally if not already done.
* move the folder tools/gitslave-2.0.2 to you own user folders.
* Then you can make an alias to the main script called "gits" (use gits_for_mac if you are on a mac).
@@ -25,7 +25,7 @@ The list of repositories handled by this gitslave repo can be found in the file
All Gitslave command are available hre : http://gitslave.sourceforge.net/gits-man-page.html
if you want to dowload (clone) all slave studio repositories, use the command
gits populate --with-ifpresent
should you want to download a set of slave repositories, use
@@ -41,7 +41,7 @@ You will find the list of repositories in root [.gitslave](../master/.gitslave)
Build The Open Source Studio
================
To build the Studio you may need to increase the java memory heap size used, therefor you need to setup a specific Maven environment variable with the following values assuming you have anought ram on you machine :)
here is how to do it on linux or mac
here is how to do it on linux or mac
```
export MAVEN_OPTS='-Xmx8000m -XX:MaxPermSize=512m -XX:-UseConcMarkSweepGC'
```
@@ -75,10 +75,11 @@ If you want to only build one or any number of products you may use one or many
-Dtos.bd=true
-Dtos.di=true
-Dtos.dq=true
-Dtos.mdm=true
-Dtos.esb=true
```
## Support
## Support
You can ask for help on our [Forum](http://www.talend.com/services/global-technical-support).
@@ -97,6 +98,6 @@ See the [CONTRIBUTORS.md](./CONTRIBUTORS.md) file for details.
## License
Copyright (c) 2006-2019 Talend
Copyright (c) 2006-2015 Talend
Licensed under the Apache v2 and GPLv2 License

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.talend.repo</groupId>
<artifactId>dependencies.p2</artifactId>
<version>7.4.1-SNAPSHOT</version>
<version>7.2.1-M2</version>
</parent>
<artifactId>dependencies.p2.tos</artifactId>
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
<version>2.6.1-Talend</version>
<version>2.4.6-Talend</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
@@ -50,6 +50,16 @@
<artifactId>dataquality-phone</artifactId>
<version>${dataquality.lib.version}</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
<artifactId>dataquality-semantic-model</artifactId>
<version>${dataquality.lib.version}</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
<artifactId>dataquality-semantic</artifactId>
<version>${dataquality.lib.version}</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
<artifactId>dataquality-statistics</artifactId>
@@ -60,11 +70,6 @@
<artifactId>dataquality-record-linkage</artifactId>
<version>${dataquality.lib.version}</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
<artifactId>dataquality-converters</artifactId>
<version>${dataquality.lib.version}</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
<artifactId>dataquality-text-japanese</artifactId>
@@ -86,18 +91,6 @@
<version>${daikon.version}</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>org.talend.daikon</groupId>
<artifactId>crypto-utils</artifactId>
<version>${daikon.version}</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>org.talend.daikon</groupId>
<artifactId>daikon-exception</artifactId>
<version>${daikon.version}</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>org.talend.daikon</groupId>
<artifactId>multitenant-core</artifactId>
@@ -112,42 +105,22 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${fasterxml.jackson.version}</version>
<version>2.9.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.8.1</version>
<version>3.7</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${fasterxml.jackson.version}</version>
<version>2.9.5</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.4</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
<version>2.0</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.7</version>
<version>2.9.5</version>
</dependency>
<!-- end of daikon dependencies -->
@@ -157,12 +130,12 @@
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>1.9.15-TALEND</version>
<version>1.9.14-TALEND</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.9.15-TALEND</version>
<version>1.9.14-TALEND</version>
</dependency>
<!-- Avro with minimum depdencies -->
@@ -189,7 +162,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.19</version>
<version>1.10</version>
</dependency>
<dependency>
<groupId>com.github.livesense</groupId>
@@ -312,9 +285,9 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.14</version>
<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>
@@ -326,11 +299,6 @@
<artifactId>commons-logging</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.4</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>org-slf4j-api</artifactId>
@@ -341,64 +309,6 @@
<artifactId>commons-configuration</artifactId>
<version>1.10</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
<version>${fasterxml.jackson.bonita.compatible.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>${fasterxml.jackson.bonita.compatible.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-csv</artifactId>
<version>${fasterxml.jackson.bonita.compatible.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-smile</artifactId>
<version>${fasterxml.jackson.bonita.compatible.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<version>${fasterxml.jackson.bonita.compatible.version}</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.26</version>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
<version>4.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
<version>5.3.0</version>
</dependency>
<dependency>
<groupId>org.talend.studio</groupId>
<artifactId>studio-utils</artifactId>
<version>${studio-utils.version}</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov</artifactId>
<version>1.68.0</version>
<classifier>bundle</classifier>
</dependency>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<classifier>bundle</classifier>
</dependency>
</dependencies>
</project>

View File

@@ -1,21 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.4.1-SNAPSHOT</version>
<relativePath>../../talend.studio.parent.pom</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend.repo</groupId>
<artifactId>dependencies.p2</artifactId>
<version>7.2.1-M2</version>
<packaging>pom</packaging>
<properties>
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
<dataquality.lib.version>8.3.2-SNAPSHOT</dataquality.lib.version>
<fasterxml.jackson.version>2.11.4</fasterxml.jackson.version>
<!-- jackson dataformat and jaxb should use version 2.9.10 to make studio compatible with bonita -->
<fasterxml.jackson.bonita.compatible.version>2.9.10</fasterxml.jackson.bonita.compatible.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>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.4.1-SNAPSHOT</version>
<version>7.2.1-M2</version>
<relativePath />
</parent>
@@ -44,6 +44,7 @@
<module>talend.studio.tos.bd.product</module>
<module>talend.studio.tos.di.product</module>
<module>talend.studio.tos.dq.product</module>
<module>talend.studio.tos.mdm.product</module>
<module>talend.studio.tos.esb.product</module>
</modules>
</profile>
@@ -59,6 +60,7 @@
<module>talend.studio.tos.bd.product</module>
<module>talend.studio.tos.di.product</module>
<module>talend.studio.tos.dq.product</module>
<module>talend.studio.tos.mdm.product</module>
<module>talend.studio.tos.esb.product</module>
<module>talend.studio.tos.all.p2.product</module>
</modules>
@@ -131,6 +133,18 @@
<module>talend.studio.tos.dq.product</module>
</modules>
</profile>
<profile>
<id>tos.mdm.product</id>
<activation>
<property>
<name>tos.mdm</name>
<value>true</value>
</property>
</activation>
<modules>
<module>talend.studio.tos.mdm.product</module>
</modules>
</profile>
<profile>
<id>tos.esb.product</id>
<activation>

View File

@@ -4,12 +4,13 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.4.1-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>

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
<product name="Talend Open Studio" uid="org.talend.studio.tos.all.p2.product" id="org.talend.rcp.branding.tos.all.p2.product" application="org.talend.rcp.branding.tos.application" useFeatures="true" includeLaunchers="false" version="7.4.1.qualifier">
<product name="Talend Open Studio" uid="org.talend.studio.tos.all.p2.product" id="org.talend.rcp.branding.tos.all.p2.product" application="org.talend.rcp.branding.tos.application" useFeatures="true" includeLaunchers="false">
<configIni use="default">
<linux>config.ini</linux>
@@ -21,6 +21,7 @@
<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"/>
@@ -43,6 +44,7 @@
<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"/>
@@ -62,9 +64,6 @@
<feature id="org.talend.updates.feature"/>
<feature id="org.talend.utils.feature"/>
<feature id="org.talend.dataquality.se.test.feature"/>
<feature id="org.talend.help.di.feature"/>
<feature id="org.talend.help.bd.feature"/>
<feature id="org.talend.help.esb.feature"/>
</features>

View File

@@ -4,9 +4,8 @@ osgi.splashPath=platform:/base/plugins/${product.branding.platform}/
talend.studio.version=${version.full}
eclipse.product=${product.branding.id}
#The following osgi.framework key is required for the p2 update feature not to override the osgi.bundles values.
osgi.framework=file\:plugins/org.eclipse.osgi_3.13.200.v20181130-2106.jar
osgi.bundles=org.eclipse.equinox.simpleconfigurator@1\:start,org.eclipse.compare.win32@4,org.eclipse.core.filesystem.linux.x86_64@4,org.eclipse.core.filesystem.macosx@4,org.eclipse.core.filesystem.win32.x86_64@4,org.eclipse.core.net.linux.x86_64@4,org.eclipse.core.net.win32.x86_64@4,org.eclipse.core.resources.win32.x86_64@4,org.eclipse.e4.ui.swt.gtk@4,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@4,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@4,org.eclipse.equinox.launcher.gtk.linux.x86_64@4,org.eclipse.equinox.launcher.win32.win32.x86_64@4,org.eclipse.equinox.security.linux.x86_64@4,org.eclipse.equinox.security.macosx@4,org.eclipse.equinox.security.win32.x86_64@4,org.eclipse.gmf.runtime.common.ui.printing.win32@4,org.eclipse.jdt.launching.macosx@4,org.eclipse.jdt.launching.ui.macosx@4,org.eclipse.swt.cocoa.macosx.x86_64@4,org.eclipse.swt.gtk.linux.x86_64@4,org.eclipse.swt.win32.win32.x86_64@4,org.eclipse.ui.cocoa@4,org.eclipse.ui.win32@4
org.eclipse.equinox.simpleconfigurator.configUrl=file\:org.eclipse.equinox.simpleconfigurator/bundles.info
osgi.framework=file\:plugins/org.eclipse.osgi_3.10.100.v20150521-1310.jar
osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start,org.talend.components.api.service.osgi@start
osgi.bundles.defaultStartLevel=4
osgi.bundlefile.limit=200
osgi.framework.extensions=org.talend.osgi.lib.loader
@@ -14,5 +13,3 @@ file.encoding=UTF-8
eclipse.p2.data.area=@config.dir/../p2/
eclipse.p2.profile=profile
default.update.site.url=https://update.talend.com/Studio/tos/
component.java.coordinates = org.talend.components:couchbase:1.23.0-SNAPSHOT,org.talend.components:cosmosDB:1.23.0-SNAPSHOT

View File

@@ -4,5 +4,4 @@
-Dfile.encoding=UTF-8
-Dosgi.requiredJavaVersion=1.8
-XX:+UseG1GC
-XX:+UseStringDeduplication
-XX:MaxMetaspaceSize=512m
-XX:+UseStringDeduplication

View File

@@ -4,5 +4,4 @@
-Dfile.encoding=UTF-8
-Dosgi.requiredJavaVersion=1.8
-XX:+UseG1GC
-XX:+UseStringDeduplication
-XX:MaxMetaspaceSize=512m
-XX:+UseStringDeduplication

View File

@@ -8,5 +8,4 @@
-Dfile.encoding=UTF-8
-Dosgi.requiredJavaVersion=1.8
-XX:+UseG1GC
-XX:+UseStringDeduplication
-XX:MaxMetaspaceSize=512m
-XX:+UseStringDeduplication

View File

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

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
<product uid="org.talend.studio.tos.bigdata.product" id="org.talend.rcp.branding.tos.bigdata.product" useFeatures="true" includeLaunchers="false" version="7.4.1.qualifier">
<product uid="org.talend.studio.tos.bigdata.product" id="org.talend.rcp.branding.tos.bigdata.product" useFeatures="true" includeLaunchers="false">
<configIni use="default">
<linux>config.ini</linux>
@@ -14,16 +14,4 @@
<feature id="org.talend.rcp.branding.tos.bigdata.feature"/>
<!--<feature id="org.talend.babel.all.tos.feature"/>-->
</features>
<configurations>
<plugin id="org.apache.felix.scr" autoStart="true" version="2.0.14.v20180822-1822" startLevel="2" />
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
<plugin id="org.ops4j.pax.url.mvn" autoStart="true" startLevel="0" />
<plugin id="org.talend.components.api.service.osgi" autoStart="true" startLevel="0" />
<plugin id="org.talend.maven.resolver" autoStart="true" startLevel="0" />
</configurations>
</product>

View File

@@ -4,13 +4,12 @@ osgi.splashPath=platform:/base/plugins/${product.branding.platform}/
talend.studio.version=${version.full}
eclipse.product=${product.branding.id}
#The following osgi.framework key is required for the p2 update feature not to override the osgi.bundles values.
osgi.framework=file\:plugins/org.eclipse.osgi_3.13.200.v20181130-2106.jar
osgi.bundles=org.eclipse.equinox.simpleconfigurator@1\:start,org.eclipse.compare.win32@4,org.eclipse.core.filesystem.linux.x86_64@4,org.eclipse.core.filesystem.macosx@4,org.eclipse.core.filesystem.win32.x86_64@4,org.eclipse.core.net.linux.x86_64@4,org.eclipse.core.net.win32.x86_64@4,org.eclipse.core.resources.win32.x86_64@4,org.eclipse.e4.ui.swt.gtk@4,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@4,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@4,org.eclipse.equinox.launcher.gtk.linux.x86_64@4,org.eclipse.equinox.launcher.win32.win32.x86_64@4,org.eclipse.equinox.security.linux.x86_64@4,org.eclipse.equinox.security.macosx@4,org.eclipse.equinox.security.win32.x86_64@4,org.eclipse.gmf.runtime.common.ui.printing.win32@4,org.eclipse.jdt.launching.macosx@4,org.eclipse.jdt.launching.ui.macosx@4,org.eclipse.swt.cocoa.macosx.x86_64@4,org.eclipse.swt.gtk.linux.x86_64@4,org.eclipse.swt.win32.win32.x86_64@4,org.eclipse.ui.cocoa@4,org.eclipse.ui.win32@4
org.eclipse.equinox.simpleconfigurator.configUrl=file\:org.eclipse.equinox.simpleconfigurator/bundles.info
osgi.framework=file\:plugins/org.eclipse.osgi_3.10.100.v20150521-1310.jar
osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start,org.talend.components.api.service.osgi@start
osgi.bundles.defaultStartLevel=4
osgi.bundlefile.limit=200
osgi.framework.extensions=org.talend.osgi.lib.loader,org.eclipse.osgi.compatibility.state
osgi.framework.extensions=org.talend.osgi.lib.loader
file.encoding=UTF-8
eclipse.p2.data.area=@config.dir/../p2/
eclipse.p2.profile=profile
default.update.site.url=https://update.talend.com/Studio/tos/
default.update.site.url=https://update.talend.com/Studio/tos/

View File

@@ -4,5 +4,4 @@
-Dfile.encoding=UTF-8
-Dosgi.requiredJavaVersion=1.8
-XX:+UseG1GC
-XX:+UseStringDeduplication
-XX:MaxMetaspaceSize=512m
-XX:+UseStringDeduplication

View File

@@ -4,5 +4,4 @@
-Dfile.encoding=UTF-8
-Dosgi.requiredJavaVersion=1.8
-XX:+UseG1GC
-XX:+UseStringDeduplication
-XX:MaxMetaspaceSize=512m
-XX:+UseStringDeduplication

View File

@@ -8,5 +8,4 @@
-Dfile.encoding=UTF-8
-Dosgi.requiredJavaVersion=1.8
-XX:+UseG1GC
-XX:+UseStringDeduplication
-XX:MaxMetaspaceSize=512m
-XX:+UseStringDeduplication

View File

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

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
<product uid="org.talend.studio.tos.di.product" id="org.talend.rcp.branding.tos.product" useFeatures="true" includeLaunchers="false" version="7.4.1.qualifier">
<product uid="org.talend.studio.tos.di.product" id="org.talend.rcp.branding.tos.product" useFeatures="true" includeLaunchers="false">
<configIni use="default">
<linux>config.ini</linux>
@@ -10,22 +10,8 @@
<win32>config.ini</win32>
</configIni>
<plugins>
</plugins>
<features>
<feature id="org.talend.rcp.branding.tos.feature"/>
<!--<feature id="org.talend.babel.all.tos.feature"/>-->
</features>
<configurations>
<plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" version="2.0.14.v20180822-1822" />
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
<plugin id="org.ops4j.pax.url.mvn" autoStart="true" startLevel="0" />
<plugin id="org.talend.components.api.service.osgi" autoStart="true" startLevel="0" />
<plugin id="org.talend.maven.resolver" autoStart="true" startLevel="0" />
</configurations>
</product>

View File

@@ -4,12 +4,11 @@ osgi.splashPath=platform:/base/plugins/${product.branding.platform}/
talend.studio.version=${version.full}
eclipse.product=${product.branding.id}
#The following osgi.framework key is required for the p2 update feature not to override the osgi.bundles values.
osgi.framework=file\:plugins/org.eclipse.osgi_3.13.200.v20181130-2106.jar
osgi.bundles=org.eclipse.equinox.simpleconfigurator@1\:start,org.eclipse.compare.win32@4,org.eclipse.core.filesystem.linux.x86_64@4,org.eclipse.core.filesystem.macosx@4,org.eclipse.core.filesystem.win32.x86_64@4,org.eclipse.core.net.linux.x86_64@4,org.eclipse.core.net.win32.x86_64@4,org.eclipse.core.resources.win32.x86_64@4,org.eclipse.e4.ui.swt.gtk@4,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@4,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@4,org.eclipse.equinox.launcher.gtk.linux.x86_64@4,org.eclipse.equinox.launcher.win32.win32.x86_64@4,org.eclipse.equinox.security.linux.x86_64@4,org.eclipse.equinox.security.macosx@4,org.eclipse.equinox.security.win32.x86_64@4,org.eclipse.gmf.runtime.common.ui.printing.win32@4,org.eclipse.jdt.launching.macosx@4,org.eclipse.jdt.launching.ui.macosx@4,org.eclipse.swt.cocoa.macosx.x86_64@4,org.eclipse.swt.gtk.linux.x86_64@4,org.eclipse.swt.win32.win32.x86_64@4,org.eclipse.ui.cocoa@4,org.eclipse.ui.win32@4
org.eclipse.equinox.simpleconfigurator.configUrl=file\:org.eclipse.equinox.simpleconfigurator/bundles.info
osgi.framework=file\:plugins/org.eclipse.osgi_3.10.100.v20150521-1310.jar
osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start
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
eclipse.p2.profile=profile

View File

@@ -4,5 +4,4 @@
-Dfile.encoding=UTF-8
-Dosgi.requiredJavaVersion=1.8
-XX:+UseG1GC
-XX:+UseStringDeduplication
-XX:MaxMetaspaceSize=512m
-XX:+UseStringDeduplication

View File

@@ -4,5 +4,4 @@
-Dfile.encoding=UTF-8
-Dosgi.requiredJavaVersion=1.8
-XX:+UseG1GC
-XX:+UseStringDeduplication
-XX:MaxMetaspaceSize=512m
-XX:+UseStringDeduplication

View File

@@ -8,5 +8,4 @@
-Dfile.encoding=UTF-8
-Dosgi.requiredJavaVersion=1.8
-XX:+UseG1GC
-XX:+UseStringDeduplication
-XX:MaxMetaspaceSize=512m
-XX:+UseStringDeduplication

View File

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

View File

@@ -1,8 +1,8 @@
launcher.prefix=TOS_DQ
storage.prefix=${launcher.prefix}
product.name=Talend Open Studio for Data Quality
product.name=Talend Open Profiler
product.branding.platform=org.talend.rcp.branding.top
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=top
storage.dir=top

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
<product uid="org.talend.studio.tos.dq.product" id="org.talend.rcp.branding.top.product" useFeatures="true" includeLaunchers="false" version="7.4.1.qualifier">
<product uid="org.talend.studio.tos.dq.product" id="org.talend.rcp.branding.top.product" useFeatures="true" includeLaunchers="false">
<configIni use="default">
<linux>config.ini</linux>
@@ -14,16 +14,4 @@
<feature id="org.talend.rcp.branding.top.feature"/>
<!--<feature id="org.talend.babel.all.tos.feature"/>-->
</features>
<configurations>
<plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" version="2.0.14.v20180822-1822" />
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
<plugin id="org.ops4j.pax.url.mvn" autoStart="true" startLevel="0" />
<plugin id="org.talend.maven.resolver" autoStart="true" startLevel="0" />
</configurations>
</product>

View File

@@ -4,13 +4,12 @@ osgi.splashPath=platform:/base/plugins/${product.branding.platform}/
talend.studio.version=${version.full}
eclipse.product=${product.branding.id}
#The following osgi.framework key is required for the p2 update feature not to override the osgi.bundles values.
osgi.framework=file\:plugins/org.eclipse.osgi_3.13.200.v20181130-2106.jar
osgi.bundles=org.eclipse.equinox.simpleconfigurator@1\:start,org.eclipse.compare.win32@4,org.eclipse.core.filesystem.linux.x86_64@4,org.eclipse.core.filesystem.macosx@4,org.eclipse.core.filesystem.win32.x86_64@4,org.eclipse.core.net.linux.x86_64@4,org.eclipse.core.net.win32.x86_64@4,org.eclipse.core.resources.win32.x86_64@4,org.eclipse.e4.ui.swt.gtk@4,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@4,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@4,org.eclipse.equinox.launcher.gtk.linux.x86_64@4,org.eclipse.equinox.launcher.win32.win32.x86_64@4,org.eclipse.equinox.security.linux.x86_64@4,org.eclipse.equinox.security.macosx@4,org.eclipse.equinox.security.win32.x86_64@4,org.eclipse.gmf.runtime.common.ui.printing.win32@4,org.eclipse.jdt.launching.macosx@4,org.eclipse.jdt.launching.ui.macosx@4,org.eclipse.swt.cocoa.macosx.x86_64@4,org.eclipse.swt.gtk.linux.x86_64@4,org.eclipse.swt.win32.win32.x86_64@4,org.eclipse.ui.cocoa@4,org.eclipse.ui.win32@4
org.eclipse.equinox.simpleconfigurator.configUrl=file\:org.eclipse.equinox.simpleconfigurator/bundles.info
osgi.framework=file\:plugins/org.eclipse.osgi_3.10.100.v20150521-1310.jar
osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start,org.talend.components.api.service.osgi@start
osgi.bundles.defaultStartLevel=4
osgi.bundlefile.limit=200
osgi.framework.extensions=org.talend.osgi.lib.loader
file.encoding=UTF-8
eclipse.p2.data.area=@config.dir/../p2/
eclipse.p2.profile=profile
default.update.site.url=https://update.talend.com/Studio/tos/
default.update.site.url=https://update.talend.com/Studio/tos/

View File

@@ -4,5 +4,4 @@
-Dfile.encoding=UTF-8
-Dosgi.requiredJavaVersion=1.8
-XX:+UseG1GC
-XX:+UseStringDeduplication
-XX:MaxMetaspaceSize=512m
-XX:+UseStringDeduplication

View File

@@ -4,5 +4,4 @@
-Dfile.encoding=UTF-8
-Dosgi.requiredJavaVersion=1.8
-XX:+UseG1GC
-XX:+UseStringDeduplication
-XX:MaxMetaspaceSize=512m
-XX:+UseStringDeduplication

View File

@@ -8,5 +8,4 @@
-Dfile.encoding=UTF-8
-Dosgi.requiredJavaVersion=1.8
-XX:+UseG1GC
-XX:+UseStringDeduplication
-XX:MaxMetaspaceSize=512m
-XX:+UseStringDeduplication

View File

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

View File

@@ -1,8 +1,8 @@
launcher.prefix=TOS_ESB
storage.prefix=TOS_ESB-Studio
product.name=Talend Open Studio for ESB
product.name=Talend Open Studio
product.branding.platform=org.talend.rcp.branding.esbstandard
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=esb
storage.dir=esb

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
<product uid="org.talend.studio.tos.esb.product" id="org.talend.rcp.branding.esbstandard.product" useFeatures="true" includeLaunchers="false" version="7.4.1.qualifier">
<product uid="org.talend.studio.tos.esb.product" id="org.talend.rcp.branding.esbstandard.product" useFeatures="true" includeLaunchers="false">
<configIni use="default">
<linux>config.ini</linux>
@@ -15,15 +15,5 @@
<!--<feature id="org.talend.babel.all.tos.feature"/>-->
</features>
<configurations>
<plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" version="2.0.14.v20180822-1822" />
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
<plugin id="org.ops4j.pax.url.mvn" autoStart="true" startLevel="0" />
<plugin id="org.talend.components.api.service.osgi" autoStart="true" startLevel="0" />
<plugin id="org.talend.maven.resolver" autoStart="true" startLevel="0" />
</configurations>
</product>

View File

@@ -0,0 +1,3 @@
name=${product.name}
id=${product.branding.id}
version=${version.full}

View File

@@ -0,0 +1,15 @@
#Product Runtime Configuration File
osgi.splashPath=platform:/base/plugins/${product.branding.platform}/
talend.studio.version=${version.full}
eclipse.product=${product.branding.id}
#The following osgi.framework key is required for the p2 update feature not to override the osgi.bundles values.
osgi.framework=file\:plugins/org.eclipse.osgi_3.10.100.v20150521-1310.jar
osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.equinox.ds@2:start,org.eclipse.core.runtime@start,org.talend.maven.resolver@start,org.ops4j.pax.url.mvn@start,org.talend.components.api.service.osgi@start
osgi.bundles.defaultStartLevel=4
osgi.bundlefile.limit=200
osgi.framework.extensions=org.talend.osgi.lib.loader
file.encoding=UTF-8
eclipse.p2.data.area=@config.dir/../p2/
eclipse.p2.profile=profile
default.update.site.url=https://update.talend.com/Studio/tos/

View File

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

View File

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

View File

@@ -0,0 +1,11 @@
-vmargs
-Xms512m
-Xmx1536m
-Xdock:icon=../Resources/talend.icns
-XstartOnFirstThread
-Dorg.eclipse.swt.internal.carbon.smallFonts
-Dosgi.instance.area.default=../../../workspace
-Dfile.encoding=UTF-8
-Dosgi.requiredJavaVersion=1.8
-XX:+UseG1GC
-XX:+UseStringDeduplication

View File

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>7.2.1-M2</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>
<artifactId>org.talend.studio.tos.mdm.product</artifactId>
<packaging>eclipse-repository</packaging>
<version>7.2.1.M2</version>
</project>

View File

@@ -0,0 +1,8 @@
launcher.prefix=TOS_MDM
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
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=tmdmce

View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
<product uid="org.talend.studio.tos.mdm.product" id="org.talend.rcp.branding.tombundle.product" useFeatures="true" includeLaunchers="false">
<configIni use="default">
<linux>config.ini</linux>
<macosx>config.ini</macosx>
<solaris>config.ini</solaris>
<win32>config.ini</win32>
</configIni>
<features>
<feature id="org.talend.rcp.branding.tombundle.feature"/>
<!--<feature id="org.talend.babel.all.tos.feature"/>-->
</features>
</product>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.4.1-SNAPSHOT</version>
<version>7.2.1-M2</version>
<relativePath />
</parent>
@@ -33,35 +33,11 @@
<url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>releases</id>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceRelease/</url>
</pluginRepository>
<pluginRepository>
<id>snapshots</id>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
<url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
</pluginRepository>
</pluginRepositories>
<properties>
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
<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>
<bom.out.dir>${project.build.directory}/products/${project.artifactId}-bom</bom.out.dir>
<bom.final.name.prefix>${storage.prefix}-${product.timestamp}-V${product.version}-${revision.filename}</bom.final.name.prefix>
<bom.final.name>${bom.final.name.prefix}-bom.xlsx</bom.final.name>
</properties>
<build>
@@ -134,7 +110,7 @@
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>eclipse-launcher-binaries</artifactId>
<version>7.4.1</version>
<version>4.4.1e</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${studio.dir}</outputDirectory>
@@ -142,7 +118,7 @@
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>eclipse-launcher-mac-${launcher.prefix}</artifactId>
<version>7.4.1</version>
<version>6.4.0</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${studio.dir}</outputDirectory>
@@ -158,7 +134,7 @@
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>eclipse-delta-pack</artifactId>
<version>4.10.0</version>
<version>4.4.1b</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${studio.dir}</outputDirectory>
@@ -187,26 +163,6 @@
</artifactItems>
</configuration>
</execution>
<execution>
<id>copy-studio-add-conf</id>
<phase>package</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>studio-add-conf</artifactId>
<version>7.3.1-SNAPSHOT</version>
<type>zip</type>
<classifier />
<overWrite>true</overWrite>
<outputDirectory>${studio.dir}/configuration</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
<execution>
<id>copy-notice-txt</id>
<phase>package</phase>
@@ -230,24 +186,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.talend.studio</groupId>
<artifactId>bomtool</artifactId>
<version>1.0.0-SNAPSHOT</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>genNotice</goal>
</goals>
</execution>
</executions>
<configuration>
<studioDirectory>${studio.dir}</studioDirectory>
<outputDirectory>${bom.out.dir}</outputDirectory>
<productVersion>${product.version}</productVersion>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
@@ -463,7 +401,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 -->
@@ -487,7 +425,7 @@
<version>${tycho.version}</version>
<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 -->
@@ -498,29 +436,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>
@@ -539,30 +477,13 @@
<mkdir dir="${product.dir}" />
<echo>Moving product ZIP ${project.build.directory}/products/${product.final.name}.zip to ${product.dir}</echo>
<move todir="${product.dir}" file="${project.build.directory}/products/${product.final.name}.zip" />
<!-- Copy bom -->
<property name="bom.build.path" value="${product.build.id}/BOMS" />
<property name="bom.dir" value="${storage}/${bom.build.path}" />
<mkdir dir="${bom.dir}" />
<echo>Copying ${bom.out.dir}/BOM.xlsx to ${bom.dir}/${bom.final.name}</echo>
<copy tofile="${bom.dir}/${bom.final.name}" file="${bom.out.dir}/BOM.xlsx" />
<echo>Copying ${bom.out.dir}/jarlist.json to ${bom.dir}/${bom.final.name.prefix}-jarlist.json</echo>
<copy tofile="${bom.dir}/${bom.final.name.prefix}-jarlist.json" file="${bom.out.dir}/jarlist.json" />
<echo>Copying ${bom.out.dir}/NOTICE.txt to ${bom.dir}/${bom.final.name.prefix}-NOTICE.txt</echo>
<copy tofile="${bom.dir}/${bom.final.name.prefix}-NOTICE.txt" file="${bom.out.dir}/NOTICE.txt" />
<echo>Copying ${bom.out.dir}/report.txt to ${bom.dir}/${bom.final.name.prefix}-report.txt</echo>
<copy tofile="${bom.dir}/${bom.final.name.prefix}-report.txt" file="${bom.out.dir}/report.txt" />
<if>
<and>
<equals arg1="${env.HUDSON_URL}" arg2="https://ci-newbuild.talend.com/" />
<equals arg1="${env.HUDSON_URL}" arg2="http://newbuild.talend.com:8180/" />
<equals arg1="${automaticnb}" arg2="1" />
</and>
<then>
<echo file="${storage}/lastnb.txt" append="true">http://newbuild.talend.com/builds/${product.build.path}/${product.final.name}.zip${line.separator}</echo>
<echo file="${storage}/lastnb.txt" append="true">http://newbuild.talend.com/builds/${bom.build.path}/${bom.final.name}${line.separator}</echo>
<echo file="${storage}/lastnb.txt" append="true">http://newbuild.talend.com/builds/${bom.build.path}/${bom.final.name.prefix}-jarlist.json${line.separator}</echo>
<echo file="${storage}/lastnb.txt" append="true">http://newbuild.talend.com/builds/${bom.build.path}/${bom.final.name.prefix}-NOTICE.txt${line.separator}</echo>
<echo file="${storage}/lastnb.txt" append="true">http://newbuild.talend.com/builds/${bom.build.path}/${bom.final.name.prefix}-report.txt${line.separator}</echo>
</then>
</if>
<exec executable="openssl" dir="${product.dir}" outputproperty="sha256">

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.4.1-SNAPSHOT</version>
<version>7.2.1-M2</version>
<relativePath />
</parent>

View File

@@ -1,49 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.4.1-SNAPSHOT</version>
<version>7.2.1-M2</version>
<packaging>pom</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<components.version>0.33.0-SNAPSHOT</components.version>
<daikon.version>0.31.11</daikon.version>
<daikon-ee.format.verison>3.2.0</daikon-ee.format.verison>
<daikon.audit.version>1.16.1</daikon.audit.version>
<org.talend.daikon.crypto-utils.version>0.31.11</org.talend.daikon.crypto-utils.version>
<studio-utils.version>1.0.2</studio-utils.version>
<tycho.version>1.7.0</tycho.version>
<tycho.version>0.22.0</tycho.version>
<tycho-extras.version>${tycho.version}</tycho-extras.version>
<base.version>7.4.1</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>
<doc.version>7.3.1-SNAPSHOT</doc.version>
<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>${opensourcerelease-unziprepo.url}/eclipse-p2-repo/4.10.0/eclipse-p2-repo-4.10.0.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>${opensourcerelease-unziprepo.url}/eclipse-babel-p2-repo/4.8.0/eclipse-babel-p2-repo-4.8.0.zip-unzip</babel-repo.url>
<babel-repo.url>${opensourcesnapshot-unziprepo.url}/talend-babel-p2-repo/4.4.1-SNAPSHOT/talend-babel-p2-repo-4.4.1-SNAPSHOT.zip-unzip</babel-repo.url>
<doc-repo.url>${opensourcesnapshot-unziprepo.url}/talend-doc-p2-repo/${doc.version}/talend-doc-p2-repo-${doc.version}.zip-unzip/</doc-repo.url>
<bonita-open-repo.url>${opensourcerelease-unziprepo.url}/bonita-community-p2-repo/7.9.0/bonita-community-p2-repo-7.9.0.zip-unzip/</bonita-open-repo.url>
<equinox.build>org.eclipse.equinox.launcher_1.5.200.v20180922-1751.jar</equinox.build>
<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>
<opensourcerelease-repo.url>${talend.nexus.url}/TalendOpenSourceRelease</opensourcerelease-repo.url>
<tos-p2-repo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSource${repo.type}/org/talend/studio/talend-tos-p2-repo/${osgi.compatible.version}/talend-tos-p2-repo-${osgi.compatible.version}.zip-unzip/</tos-p2-repo.url>
<tos-deps-p2-repo.url>${talend.nexus.p2unzip.url}/TalendP2UnzipOpenSource${repo.type}/org/talend/repo/dependencies.p2.tos/${maven.compatible.version}/dependencies.p2.tos-${maven.compatible.version}.zip-unzip/</tos-deps-p2-repo.url>
<eclipse-orbit-p2-repo.url>${opensourcerelease-unziprepo.url}/orbit/7.4.1/orbit-7.4.1.zip-unzip</eclipse-orbit-p2-repo.url>
<jgit.dirtyWorkingTree.official>error</jgit.dirtyWorkingTree.official>
<osgi.ws>win32</osgi.ws>
<osgi.os>win32</osgi.os>
<osgi.arch>x86_64</osgi.arch>
<strictVersions>true</strictVersions>
<osgi.arch>x86</osgi.arch>
<strictVersions>false</strictVersions>
</properties>
<distributionManagement>
@@ -62,17 +55,11 @@
</distributionManagement>
<repositories>
<repository>
<id>tos-deps</id>
<url>${tos-deps-p2-repo.url}</url>
<layout>p2</layout>
</repository>
<repository>
<id>eclipse_orbit</id>
<url>${eclipse-orbit-p2-repo.url}</url>
<layout>p2</layout>
</repository>
<repository>
<id>eclipse_repo</id>
<url>${eclipse-repo.url}</url>
@@ -118,7 +105,7 @@
</snapshots>
<url>${opensourcesnapshot-repo.url}</url>
</repository>
</repositories>
</repositories>
<build>
<pluginManagement>
@@ -147,12 +134,12 @@
<artifactId>tycho-maven-plugin</artifactId>
<version>${tycho.version}</version>
<extensions>true</extensions>
</plugin>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-versions-plugin</artifactId>
<version>${tycho.version}</version>
</plugin>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
@@ -168,38 +155,38 @@
</environments>
<filters>
<!-- restrict version of a bundle -->
<!--<filter>
<type>eclipse-plugin</type>
<id>org.eclipse.ui.views.properties.tabbed</id>
<restrictTo>
<version>3.6.100.v20140519-0906</version>
</restrictTo>
<!--<filter>
<type>eclipse-plugin</type>
<id>org.eclipse.ui.views.properties.tabbed</id>
<restrictTo>
<version>3.6.100.v20140519-0906</version>
</restrictTo>
</filter>-->
<filter>
<type>eclipse-plugin</type>
<id>org.eclipse.jdt.core</id>
<restrictTo>
<version>3.16.0.xx-201903290056-e1812-RELEASE</version>
<version>3.10.0.xx-201509250011-e44</version>
</restrictTo>
</filter>
<!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence
<filter>
<type>java-package</type>
<id>javax.persistence</id>
<restrictTo>
<type>eclipse-plugin</type>
<id>javax.persistence</id>
</restrictTo>
</filter>
-->
<!-- example 3: work around Equinox bug 348045
<filter>
<type>p2-installable-unit</type>
<id>org.eclipse.equinox.servletbridge.extensionbundle</id>
<removeAll />
</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>
-->
</filters>
</configuration>
</plugin>
@@ -208,79 +195,15 @@
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
<compilerArgs>
<arg>-err:+discouraged,forbidden</arg>
<arg>-warn:+discouraged,forbidden</arg>
</compilerArgs>
<compilerVersion>11</compilerVersion>
<source>11</source>
<target>11</target>
<compilerArgument>-warn:+discouraged,forbidden</compilerArgument>
<compilerVersion>1.8</compilerVersion>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</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>
@@ -331,6 +254,18 @@
<jgit.ignore>pom.xml</jgit.ignore>
<jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
<baselineRepositories>
<repository>
<url>http://localhost:8080/p2site/</url>
</repository>
</baselineRepositories>
</configuration>
</plugin>
</plugins>
</build>
@@ -453,7 +388,7 @@
</files>
</configuration>
</execution>
</executions>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
@@ -506,7 +441,7 @@
<sequential>
<echo>Signing @{jarFile}</echo>
<exec executable="${java.home}/../bin/jarsigner" dir="${project.basedir}/target/" failonerror="true">
<arg line="-verbose -digestalg SHA1 -sigalg SHA1withRSA -keystore ${keystore.path} -storepass ${keystore.pass} @{jarFile} talend" />
<arg line="-verbose -digestalg SHA1 -sigalg SHA1withRSA -keystore ${keystore.path} -storepass ${keystore.pass} @{jarFile} talend" />
</exec>
</sequential>
</ac:for>

View File

@@ -1,3 +1,3 @@
#!/bin/bash
cd ../../
mvn -Dtycho.mode=maven org.eclipse.tycho:tycho-versions-plugin:0.21.0:set-version -DnewVersion=6.0.0-SNAPSHOT -Dartifacts=parent-pom,tos-products-parent-pom,tos,org.talend.studio.tos.bigdata.product,org.talend.studio.tos.di.product,org.talend.studio.tos.dq.product,org.talend.studio.tos.esb.product,tbd-studio-se,tcommon-studio-se,tdi-studio-se,tdq-studio-se,tesb-studio-se,tmdm-common,tmdm-studio-se,toem-studio-se
mvn -Dtycho.mode=maven org.eclipse.tycho:tycho-versions-plugin:0.21.0:set-version -DnewVersion=6.0.0-SNAPSHOT -Dartifacts=parent-pom,tos-products-parent-pom,tos,org.talend.studio.tos.bigdata.product,org.talend.studio.tos.di.product,org.talend.studio.tos.dq.product,org.talend.studio.tos.esb.product,org.talend.studio.tos.mdm.product,tbd-studio-se,tcommon-studio-se,tdi-studio-se,tdq-studio-se,tesb-studio-se,tmdm-common,tmdm-studio-se,toem-studio-se