Compare commits

..

1 Commits

Author SHA1 Message Date
Jenkins Continuous Build server
6eb143a4b6 Set version to 7.2.1 M6 2019-05-21 15:34:35 +02:00
27 changed files with 207 additions and 181 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.3.1-PATCH</version>
<version>7.2.1-M6</version>
</parent>
<artifactId>dependencies.p2.tos</artifactId>
@@ -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>
@@ -86,12 +96,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>
@@ -134,21 +138,6 @@
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.3</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>
</dependency>
<!-- end of daikon dependencies -->
<!-- ========================= -->
@@ -189,7 +178,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>
@@ -326,11 +315,6 @@
<artifactId>commons-logging</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.3</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>org-slf4j-api</artifactId>
@@ -344,42 +328,32 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
<version>${fasterxml.jackson.bonita.compatible.version}</version>
<version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>${fasterxml.jackson.bonita.compatible.version}</version>
<version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-csv</artifactId>
<version>${fasterxml.jackson.bonita.compatible.version}</version>
<version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-smile</artifactId>
<version>${fasterxml.jackson.bonita.compatible.version}</version>
<version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<version>${fasterxml.jackson.bonita.compatible.version}</version>
<version>${fasterxml.jackson.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>
<version>1.23</version>
</dependency>
</dependencies>

View File

@@ -1,21 +1,16 @@
<?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.3.1-PATCH</version>
<relativePath>../../talend.studio.parent.pom</relativePath>
</parent>
<groupId>org.talend.repo</groupId>
<artifactId>dependencies.p2</artifactId>
<version>7.2.1-M6</version>
<packaging>pom</packaging>
<properties>
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
<dataquality.lib.version>8.0.9</dataquality.lib.version>
<fasterxml.jackson.version>2.10.1</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.27.0-SNAPSHOT</components.version>
<dataquality.lib.version>6.4.1-SNAPSHOT</dataquality.lib.version>
<fasterxml.jackson.version>2.9.8</fasterxml.jackson.version>
<daikon.version>0.31.5-SNAPSHOT</daikon.version>
</properties>
<distributionManagement>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.3.1-PATCH</version>
<version>7.2.1-M6</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

@@ -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>
<groupId>org.talend.studio</groupId>
<artifactId>studio-bom</artifactId>
<version>7.2.1-M6</version>
<packaging>pom</packaging>
<name>studio bom</name>
<properties>
<daikon.version>0.31.5-SNAPSHOT</daikon.version>
</properties>
</project>

View File

@@ -4,13 +4,13 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.3.1-PATCH</version>
<version>7.2.1-M6</version>
<relativePath />
</parent>
<artifactId>talend-tos-p2-repo</artifactId>
<packaging>eclipse-repository</packaging>
<version>7.3.1.PATCH</version>
<version>7.2.1.M6</version>
<properties>
<product.final.name>${launcher.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>

View File

@@ -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"/>
@@ -63,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

@@ -14,5 +14,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.17.1,org.talend.components:cosmosDB:1.17.1

View File

@@ -4,11 +4,11 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>7.3.1-PATCH</version>
<version>7.2.1-M6</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>
<artifactId>org.talend.studio.tos.bigdata.product</artifactId>
<packaging>eclipse-repository</packaging>
<version>7.3.1.PATCH</version>
<version>7.2.1.M6</version>
</project>

View File

@@ -13,4 +13,4 @@ osgi.framework.extensions=org.talend.osgi.lib.loader,org.eclipse.osgi.compatibil
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,11 +4,11 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>7.3.1-PATCH</version>
<version>7.2.1-M6</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>
<artifactId>org.talend.studio.tos.di.product</artifactId>
<packaging>eclipse-repository</packaging>
<version>7.3.1.PATCH</version>
<version>7.2.1.M6</version>
</project>

View File

@@ -12,4 +12,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,11 +4,11 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>7.3.1-PATCH</version>
<version>7.2.1-M6</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>
<artifactId>org.talend.studio.tos.dq.product</artifactId>
<packaging>eclipse-repository</packaging>
<version>7.3.1.PATCH</version>
<version>7.2.1.M6</version>
</project>

View File

@@ -13,4 +13,4 @@ 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,11 +4,11 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>7.3.1-PATCH</version>
<version>7.2.1-M6</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>
<artifactId>org.talend.studio.tos.esb.product</artifactId>
<packaging>eclipse-repository</packaging>
<version>7.3.1.PATCH</version>
<version>7.2.1.M6</version>
</project>

View File

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

View File

@@ -0,0 +1,16 @@
#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.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.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,8 @@
-vmargs
-Xms256m
-Xmx768m
-Dfile.encoding=UTF-8
-Dosgi.requiredJavaVersion=1.8
-XX:+UseG1GC
-XX:+UseStringDeduplication
-XX:MaxMetaspaceSize=512m

View File

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

View File

@@ -0,0 +1,12 @@
-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
-XX:MaxMetaspaceSize=512m

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-M6</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.M6</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,29 @@
<?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>
<configurations>
<plugin id="org.apache.felix.scr" autoStart="true" 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,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.3.1-PATCH</version>
<version>7.2.1-M6</version>
<relativePath />
</parent>
@@ -118,7 +118,7 @@
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>eclipse-launcher-mac-${launcher.prefix}</artifactId>
<version>7.3.1</version>
<version>6.4.0</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${studio.dir}</outputDirectory>
@@ -174,7 +174,7 @@
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>studio-add-conf</artifactId>
<version>7.3.1-SNAPSHOT</version>
<version>7.2.1-SNAPSHOT</version>
<type>zip</type>
<classifier />
<overWrite>true</overWrite>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.3.1-PATCH</version>
<version>7.2.1-M6</version>
<relativePath />
</parent>

View File

@@ -3,25 +3,20 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.3.1-PATCH</version>
<version>7.2.1-M6</version>
<packaging>pom</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<components.version>0.28.16</components.version>
<daikon.version>0.31.10</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.10</org.talend.daikon.crypto-utils.version>
<tycho.version>0.22.0</tycho.version>
<tycho-extras.version>${tycho.version}</tycho-extras.version>
<base.version>7.3.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}</osgi.compatible.version>
<osgi.compatible.version>${base.version}.M6</osgi.compatible.version>
<!-- maven.compatible.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}-<suffix> (milestones), or ${base.version} (GA)-->
<maven.compatible.version>${base.version}</maven.compatible.version>
<maven.compatible.version>${base.version}-M6</maven.compatible.version>
<repo.type>Release</repo.type>
<doc.version>7.3.1-SNAPSHOT</doc.version>
<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>
@@ -35,8 +30,8 @@
<equinox.build>org.eclipse.equinox.launcher_1.5.200.v20180922-1751.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}.PATCH/talend-tos-p2-repo-${osgi.compatible.version}.PATCH.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}-PATCH/dependencies.p2.tos-${maven.compatible.version}-PATCH.zip-unzip/</tos-deps-p2-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>
<jgit.dirtyWorkingTree.official>error</jgit.dirtyWorkingTree.official>
<osgi.ws>win32</osgi.ws>
<osgi.os>win32</osgi.os>
@@ -160,37 +155,37 @@
</environments>
<filters>
<!-- restrict version of a bundle -->
<!--<filter>
<type>eclipse-plugin</type>
<id>org.eclipse.ui.views.properties.tabbed</id>
<restrictTo>
<version>3.6.100.v20140519-0906</version>
</restrictTo>
<!--<filter>
<type>eclipse-plugin</type>
<id>org.eclipse.ui.views.properties.tabbed</id>
<restrictTo>
<version>3.6.100.v20140519-0906</version>
</restrictTo>
</filter>-->
<filter>
<type>eclipse-plugin</type>
<id>org.eclipse.jdt.core</id>
<restrictTo>
<version>3.16.0.xx-201903290056-e1812-RELEASE</version>
<version>3.16.0.xx-201812291959-e2018-12-RELEASE</version>
</restrictTo>
</filter>
<!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence
<filter>
<type>java-package</type>
<id>javax.persistence</id>
<restrictTo>
<type>eclipse-plugin</type>
<id>javax.persistence</id>
</restrictTo>
</filter>
<!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence
<filter>
<type>java-package</type>
<id>javax.persistence</id>
<restrictTo>
<type>eclipse-plugin</type>
<id>javax.persistence</id>
</restrictTo>
</filter>
-->
<!-- example 3: work around Equinox bug 348045
<filter>
<type>p2-installable-unit</type>
<id>org.eclipse.equinox.servletbridge.extensionbundle</id>
<removeAll />
</filter>
<!-- example 3: work around Equinox bug 348045
<filter>
<type>p2-installable-unit</type>
<id>org.eclipse.equinox.servletbridge.extensionbundle</id>
<removeAll />
</filter>
-->
</filters>
</configuration>
@@ -209,75 +204,14 @@
</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>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<release.suffix>-PATCH</release.suffix>
<revision.filename>PATCH</revision.filename>
<release.suffix>-SNAPSHOT</release.suffix>
<revision.filename>SNAPSHOT</revision.filename>
<product.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</product.version>
</properties>
<build>

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