Compare commits
73 Commits
patch/7.2.
...
patch/7.3.
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
66239f13ae | ||
|
|
42cd952fb3 | ||
|
|
a2b93ac265 | ||
|
|
769a2d9b0f | ||
|
|
68080597b6 | ||
|
|
d0b073093b | ||
|
|
f0c6f2e1ec | ||
|
|
0ae0ada752 | ||
|
|
7d75662d10 | ||
|
|
c719a1d614 | ||
|
|
aededc597f | ||
|
|
4e2fba9165 | ||
|
|
2505066508 | ||
|
|
575596f5b8 | ||
|
|
fe4681c4e0 | ||
|
|
57719ae3ed | ||
|
|
d82bcc0756 | ||
|
|
f8e1658e8c | ||
|
|
cbce9b8c6b | ||
|
|
650a00c919 | ||
|
|
50ad6ec014 | ||
|
|
1a9cb4dc28 | ||
|
|
20061950b5 | ||
|
|
e17c5b760d | ||
|
|
455396a79d | ||
|
|
08a5fadc26 | ||
|
|
6d2df45139 | ||
|
|
47243627ee | ||
|
|
8be6746d1e | ||
|
|
d95215f5c7 | ||
|
|
f9e05fa54c | ||
|
|
8712de2933 | ||
|
|
02d9cca2ad | ||
|
|
d240f4a4a8 | ||
|
|
48c7fcab7f | ||
|
|
5ef43c83e6 | ||
|
|
65816f5ea7 | ||
|
|
733df4c762 | ||
|
|
078d0b5476 | ||
|
|
ec11efc3b6 | ||
|
|
481c4a55a5 | ||
|
|
44e4727bc4 | ||
|
|
0d4b025d62 | ||
|
|
8f9f871822 | ||
|
|
e8ef341670 | ||
|
|
4de7a06af0 | ||
|
|
b00f29c951 | ||
|
|
e23c04ab2a | ||
|
|
ad0c723115 | ||
|
|
ddebe7e96a | ||
|
|
25836f9d3e | ||
|
|
fc4e9b6159 | ||
|
|
32733397a5 | ||
|
|
405a0c1960 | ||
|
|
3157c8dbdf | ||
|
|
2d9e2e0dd8 | ||
|
|
9bdd384b29 | ||
|
|
61d9cec36c | ||
|
|
345a7c6491 | ||
|
|
5b15fbe489 | ||
|
|
ae30522551 | ||
|
|
1685507c3d | ||
|
|
a4ba9d6c22 | ||
|
|
3ba6621345 | ||
|
|
eb37dd885d | ||
|
|
8ee0358866 | ||
|
|
f5ae0c35db | ||
|
|
958ebc84e0 | ||
|
|
5f3de19d05 | ||
|
|
48a9dda162 | ||
|
|
cab7900f21 | ||
|
|
4143eb57a5 | ||
|
|
55950270f3 |
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.repo</groupId>
|
||||
<artifactId>dependencies.p2</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.3.1-PATCH</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>dependencies.p2.tos</artifactId>
|
||||
@@ -86,6 +86,12 @@
|
||||
<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>
|
||||
@@ -128,6 +134,21 @@
|
||||
<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 -->
|
||||
|
||||
<!-- ========================= -->
|
||||
@@ -168,7 +189,7 @@
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-compress</artifactId>
|
||||
<version>1.10</version>
|
||||
<version>1.19</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.github.livesense</groupId>
|
||||
@@ -293,7 +314,7 @@
|
||||
<artifactId>commons-codec</artifactId>
|
||||
<version>1.10</version>
|
||||
</dependency>
|
||||
<!-- to avoid updatin the complete eclipse target platform we add these
|
||||
<!-- to avoid updatin the complete eclipse target platform we add these
|
||||
single dependencies -->
|
||||
<dependency>
|
||||
<groupId>biz.aQute.bnd</groupId>
|
||||
@@ -323,32 +344,42 @@
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.dataformat</groupId>
|
||||
<artifactId>jackson-dataformat-xml</artifactId>
|
||||
<version>${fasterxml.jackson.version}</version>
|
||||
<version>${fasterxml.jackson.bonita.compatible.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.dataformat</groupId>
|
||||
<artifactId>jackson-dataformat-yaml</artifactId>
|
||||
<version>${fasterxml.jackson.version}</version>
|
||||
<version>${fasterxml.jackson.bonita.compatible.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.dataformat</groupId>
|
||||
<artifactId>jackson-dataformat-csv</artifactId>
|
||||
<version>${fasterxml.jackson.version}</version>
|
||||
<version>${fasterxml.jackson.bonita.compatible.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.dataformat</groupId>
|
||||
<artifactId>jackson-dataformat-smile</artifactId>
|
||||
<version>${fasterxml.jackson.version}</version>
|
||||
<version>${fasterxml.jackson.bonita.compatible.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.module</groupId>
|
||||
<artifactId>jackson-module-jaxb-annotations</artifactId>
|
||||
<version>${fasterxml.jackson.version}</version>
|
||||
<version>${fasterxml.jackson.bonita.compatible.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.yaml</groupId>
|
||||
<artifactId>snakeyaml</artifactId>
|
||||
<version>1.23</version>
|
||||
<version>1.25</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>
|
||||
</dependencies>
|
||||
|
||||
|
||||
@@ -1,16 +1,21 @@
|
||||
<?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-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<properties>
|
||||
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
|
||||
<components.version>0.27.3</components.version>
|
||||
<dataquality.lib.version>7.0.1</dataquality.lib.version>
|
||||
<fasterxml.jackson.version>2.9.9</fasterxml.jackson.version>
|
||||
<daikon.version>0.31.7</daikon.version>
|
||||
<dataquality.lib.version>8.0.6</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>
|
||||
</properties>
|
||||
|
||||
<distributionManagement>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.3.1-PATCH</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
<?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-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>studio bom</name>
|
||||
|
||||
<properties>
|
||||
<daikon.version>0.31.6</daikon.version>
|
||||
</properties>
|
||||
|
||||
</project>
|
||||
@@ -4,12 +4,13 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.3.1-PATCH</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
<artifactId>talend-tos-p2-repo</artifactId>
|
||||
<packaging>eclipse-repository</packaging>
|
||||
<version>7.3.1.PATCH</version>
|
||||
|
||||
<properties>
|
||||
<product.final.name>${launcher.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
<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"/>
|
||||
@@ -64,6 +63,9 @@
|
||||
<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>
|
||||
|
||||
|
||||
|
||||
@@ -15,4 +15,4 @@ 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.1.0
|
||||
component.java.coordinates = org.talend.components:couchbase:1.15.0,org.talend.components:cosmosDB:1.15.0
|
||||
|
||||
@@ -4,10 +4,11 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.3.1-PATCH</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>
|
||||
</project>
|
||||
|
||||
@@ -13,6 +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/
|
||||
|
||||
component.java.coordinates = org.talend.components:couchbase:1.1.0
|
||||
default.update.site.url=https://update.talend.com/Studio/tos/
|
||||
@@ -4,10 +4,11 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.3.1-PATCH</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>
|
||||
</project>
|
||||
|
||||
@@ -12,6 +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
|
||||
|
||||
component.java.coordinates = org.talend.components:couchbase:1.1.0
|
||||
eclipse.p2.profile=profile
|
||||
@@ -4,10 +4,11 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.3.1-PATCH</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>
|
||||
</project>
|
||||
|
||||
@@ -13,6 +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/
|
||||
|
||||
component.java.coordinates = org.talend.components:couchbase:1.1.0
|
||||
default.update.site.url=https://update.talend.com/Studio/tos/
|
||||
@@ -4,10 +4,11 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.3.1-PATCH</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>
|
||||
</project>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.3.1-PATCH</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
@@ -118,7 +118,7 @@
|
||||
<artifactItem>
|
||||
<groupId>${project.groupId}</groupId>
|
||||
<artifactId>eclipse-launcher-mac-${launcher.prefix}</artifactId>
|
||||
<version>6.4.0</version>
|
||||
<version>7.3.1</version>
|
||||
<type>zip</type>
|
||||
<overWrite>true</overWrite>
|
||||
<outputDirectory>${studio.dir}</outputDirectory>
|
||||
@@ -174,9 +174,9 @@
|
||||
<artifactItem>
|
||||
<groupId>${project.groupId}</groupId>
|
||||
<artifactId>studio-add-conf</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.3.1-SNAPSHOT</version>
|
||||
<type>zip</type>
|
||||
<classifier></classifier>
|
||||
<classifier />
|
||||
<overWrite>true</overWrite>
|
||||
<outputDirectory>${studio.dir}/configuration</outputDirectory>
|
||||
</artifactItem>
|
||||
@@ -456,29 +456,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>
|
||||
@@ -506,10 +506,10 @@
|
||||
<echo file="${storage}/lastnb.txt" append="true">http://newbuild.talend.com/builds/${product.build.path}/${product.final.name}.zip${line.separator}</echo>
|
||||
</then>
|
||||
</if>
|
||||
<exec executable="openssl" dir="${product.dir}" outputproperty="sha256" >
|
||||
<exec executable="openssl" dir="${product.dir}" outputproperty="sha256">
|
||||
<arg line="dgst" />
|
||||
<arg line="-sha256" />
|
||||
<arg line="${product.final.name}.zip"/>
|
||||
<arg line="${product.final.name}.zip" />
|
||||
</exec>
|
||||
<echo file="${product.dir}/${product.final.name}.zip.sha256" append="false">${sha256}</echo>
|
||||
</target>
|
||||
|
||||
2
pom.xml
2
pom.xml
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.3.1-PATCH</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -3,20 +3,25 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>7.2.1-SNAPSHOT</version>
|
||||
<version>7.3.1-PATCH</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<components.version>0.28.11</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.2.1</base.version>
|
||||
<base.version>7.3.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}</osgi.compatible.version>
|
||||
<!-- maven.compatible.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}-<suffix> (milestones), or ${base.version} (GA)-->
|
||||
<maven.compatible.version>${base.version}-SNAPSHOT</maven.compatible.version>
|
||||
<repo.type>Snapshot</repo.type>
|
||||
<doc.version>7.2.1-SNAPSHOT</doc.version>
|
||||
<maven.compatible.version>${base.version}</maven.compatible.version>
|
||||
<repo.type>Release</repo.type>
|
||||
<doc.version>7.3.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>
|
||||
@@ -30,13 +35,13 @@
|
||||
<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}/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>
|
||||
<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>
|
||||
<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>
|
||||
<strictVersions>false</strictVersions>
|
||||
</properties>
|
||||
|
||||
<distributionManagement>
|
||||
@@ -204,14 +209,75 @@
|
||||
</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>-SNAPSHOT</release.suffix>
|
||||
<revision.filename>SNAPSHOT</revision.filename>
|
||||
<release.suffix>-PATCH</release.suffix>
|
||||
<revision.filename>PATCH</revision.filename>
|
||||
<product.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</product.version>
|
||||
</properties>
|
||||
<build>
|
||||
|
||||
Reference in New Issue
Block a user