Compare commits
100 Commits
release/8.
...
release/7.
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b95ac98de7 | ||
|
|
b46733e5db | ||
|
|
76d5a4ee43 | ||
|
|
97f75d933a | ||
|
|
c3aef7505b | ||
|
|
9fcfddf6ee | ||
|
|
d5e4b03c38 | ||
|
|
1bc9fe5469 | ||
|
|
abdbdf2102 | ||
|
|
b95b65b43b | ||
|
|
2753570d48 | ||
|
|
14cf877362 | ||
|
|
099b42b62d | ||
|
|
d49a0a5e8f | ||
|
|
a340385238 | ||
|
|
b5f03c02d6 | ||
|
|
e663fd9939 | ||
|
|
7b85ce307e | ||
|
|
513644e06f | ||
|
|
95a3158b5b | ||
|
|
1bff678e23 | ||
|
|
d36481b7cf | ||
|
|
f9be93c1c2 | ||
|
|
a6e0d474fc | ||
|
|
3e463ad9d6 | ||
|
|
8227fa30ad | ||
|
|
d83af2f66b | ||
|
|
6cf4f6a3fe | ||
|
|
593c7b38d4 | ||
|
|
d4b582b5fd | ||
|
|
e11d543555 | ||
|
|
71d2b60c12 | ||
|
|
682b529fd4 | ||
|
|
8211db3e00 | ||
|
|
14ffc7709d | ||
|
|
2305da028b | ||
|
|
2e28c62c6d | ||
|
|
28feadd37c | ||
|
|
5c4a678284 | ||
|
|
e00b580862 | ||
|
|
14bad8f528 | ||
|
|
0189c9b290 | ||
|
|
d8f4ca3e61 | ||
|
|
71b4fb154b | ||
|
|
db2b45ce90 | ||
|
|
98139e7cab | ||
|
|
93efd732dc | ||
|
|
74fc1892b9 | ||
|
|
55962cbf90 | ||
|
|
03d118eb0e | ||
|
|
f31347c758 | ||
|
|
4dee335b4f | ||
|
|
3a1cb67f59 | ||
|
|
ed72ab400e | ||
|
|
7c048b4cdb | ||
|
|
9cbf5294ed | ||
|
|
c02c790c92 | ||
|
|
5c21c43bb8 | ||
|
|
0d2400a921 | ||
|
|
40c4265944 | ||
|
|
8942dd7faa | ||
|
|
053b43d4a2 | ||
|
|
a9ce7e33ee | ||
|
|
0b6a63d1aa | ||
|
|
f85d9fe28b | ||
|
|
008a6264b8 | ||
|
|
61ec1150cf | ||
|
|
79cf9b5364 | ||
|
|
3193ec1bfd | ||
|
|
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 |
@@ -5,12 +5,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.repo</groupId>
|
<groupId>org.talend.repo</groupId>
|
||||||
<artifactId>dependencies.p2</artifactId>
|
<artifactId>dependencies.p2</artifactId>
|
||||||
<version>7.3.1-SNAPSHOT</version>
|
<version>7.3.1-PATCH</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>dependencies.p2.tos</artifactId>
|
<artifactId>dependencies.p2.tos</artifactId>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
|
|
||||||
<repositories>
|
<repositories>
|
||||||
<repository>
|
<repository>
|
||||||
<id>sonatype_releases</id>
|
<id>sonatype_releases</id>
|
||||||
@@ -117,7 +118,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.commons</groupId>
|
<groupId>org.apache.commons</groupId>
|
||||||
<artifactId>commons-lang3</artifactId>
|
<artifactId>commons-lang3</artifactId>
|
||||||
<version>3.8.1</version>
|
<version>3.10</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
@@ -127,7 +128,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
<artifactId>jackson-databind</artifactId>
|
<artifactId>jackson-databind</artifactId>
|
||||||
<version>${fasterxml.jackson.version}</version>
|
<version>${fasterxml.jackson.databind.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>javax.xml.bind</groupId>
|
<groupId>javax.xml.bind</groupId>
|
||||||
@@ -137,7 +138,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>commons-beanutils</groupId>
|
<groupId>commons-beanutils</groupId>
|
||||||
<artifactId>commons-beanutils</artifactId>
|
<artifactId>commons-beanutils</artifactId>
|
||||||
<version>1.9.3</version>
|
<version>1.9.4-talend</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.commons</groupId>
|
<groupId>org.apache.commons</groupId>
|
||||||
@@ -157,12 +158,12 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.codehaus.jackson</groupId>
|
<groupId>org.codehaus.jackson</groupId>
|
||||||
<artifactId>jackson-core-asl</artifactId>
|
<artifactId>jackson-core-asl</artifactId>
|
||||||
<version>1.9.14-TALEND</version>
|
<version>1.9.16-TALEND</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.codehaus.jackson</groupId>
|
<groupId>org.codehaus.jackson</groupId>
|
||||||
<artifactId>jackson-mapper-asl</artifactId>
|
<artifactId>jackson-mapper-asl</artifactId>
|
||||||
<version>1.9.14-TALEND</version>
|
<version>1.9.16-TALEND</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Avro with minimum depdencies -->
|
<!-- Avro with minimum depdencies -->
|
||||||
@@ -312,7 +313,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>commons-codec</groupId>
|
<groupId>commons-codec</groupId>
|
||||||
<artifactId>commons-codec</artifactId>
|
<artifactId>commons-codec</artifactId>
|
||||||
<version>1.10</version>
|
<version>1.14-talend</version>
|
||||||
</dependency>
|
</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 -->
|
single dependencies -->
|
||||||
@@ -329,7 +330,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>commons-beanutils</groupId>
|
<groupId>commons-beanutils</groupId>
|
||||||
<artifactId>commons-beanutils</artifactId>
|
<artifactId>commons-beanutils</artifactId>
|
||||||
<version>1.9.3</version>
|
<version>1.9.4-talend</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.slf4j</groupId>
|
<groupId>org.slf4j</groupId>
|
||||||
@@ -369,7 +370,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.yaml</groupId>
|
<groupId>org.yaml</groupId>
|
||||||
<artifactId>snakeyaml</artifactId>
|
<artifactId>snakeyaml</artifactId>
|
||||||
<version>1.25</version>
|
<version>1.26</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.codehaus.woodstox</groupId>
|
<groupId>org.codehaus.woodstox</groupId>
|
||||||
@@ -381,6 +382,33 @@
|
|||||||
<artifactId>woodstox-core</artifactId>
|
<artifactId>woodstox-core</artifactId>
|
||||||
<version>5.3.0</version>
|
<version>5.3.0</version>
|
||||||
</dependency>
|
</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>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.httpcomponents</groupId>
|
||||||
|
<artifactId>httpclient</artifactId>
|
||||||
|
<version>4.5.13-talend</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.httpcomponents</groupId>
|
||||||
|
<artifactId>httpcore</artifactId>
|
||||||
|
<version>4.4.14-talend</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>ch.qos.reload4j</groupId>
|
||||||
|
<artifactId>reload4j</artifactId>
|
||||||
|
<version>1.2.19-TALEND</version>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -1,18 +1,22 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?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">
|
<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>
|
||||||
|
<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>
|
<groupId>org.talend.repo</groupId>
|
||||||
<artifactId>dependencies.p2</artifactId>
|
<artifactId>dependencies.p2</artifactId>
|
||||||
<version>7.3.1-SNAPSHOT</version>
|
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<properties>
|
<properties>
|
||||||
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
|
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
|
||||||
<components.version>0.28.1</components.version>
|
<dataquality.lib.version>8.0.21</dataquality.lib.version>
|
||||||
<dataquality.lib.version>8.0.0</dataquality.lib.version>
|
<fasterxml.jackson.version>2.13.2</fasterxml.jackson.version>
|
||||||
<fasterxml.jackson.version>2.10.1</fasterxml.jackson.version>
|
<fasterxml.jackson.databind.version>2.13.2.2</fasterxml.jackson.databind.version>
|
||||||
<!-- jackson dataformat and jaxb should use version 2.9.10 to make studio compatible with bonita -->
|
<!-- 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>
|
<fasterxml.jackson.bonita.compatible.version>2.9.10</fasterxml.jackson.bonita.compatible.version>
|
||||||
<daikon.version>0.31.10</daikon.version>
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<distributionManagement>
|
<distributionManagement>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>parent-pom</artifactId>
|
<artifactId>parent-pom</artifactId>
|
||||||
<version>7.3.1-SNAPSHOT</version>
|
<version>7.3.1-PATCH</version>
|
||||||
<relativePath />
|
<relativePath />
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -1,14 +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.3.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>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>parent-pom</artifactId>
|
<artifactId>parent-pom</artifactId>
|
||||||
<version>7.3.1-SNAPSHOT</version>
|
<version>7.3.1-PATCH</version>
|
||||||
<relativePath />
|
<relativePath />
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>talend-tos-p2-repo</artifactId>
|
<artifactId>talend-tos-p2-repo</artifactId>
|
||||||
<packaging>eclipse-repository</packaging>
|
<packaging>eclipse-repository</packaging>
|
||||||
|
<version>7.3.1.PATCH</version>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<product.final.name>${launcher.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
|
<product.final.name>${launcher.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
|
||||||
|
|||||||
@@ -15,4 +15,4 @@ eclipse.p2.data.area=@config.dir/../p2/
|
|||||||
eclipse.p2.profile=profile
|
eclipse.p2.profile=profile
|
||||||
default.update.site.url=https://update.talend.com/Studio/tos/
|
default.update.site.url=https://update.talend.com/Studio/tos/
|
||||||
|
|
||||||
component.java.coordinates = org.talend.components:couchbase:1.6.0
|
component.java.coordinates = org.talend.components:couchbase:1.27.10,org.talend.components:cosmosDB:1.27.10
|
||||||
|
|||||||
@@ -4,10 +4,11 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tos-products-parent-pom</artifactId>
|
<artifactId>tos-products-parent-pom</artifactId>
|
||||||
<version>7.3.1-SNAPSHOT</version>
|
<version>7.3.1-PATCH</version>
|
||||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>org.talend.studio.tos.bigdata.product</artifactId>
|
<artifactId>org.talend.studio.tos.bigdata.product</artifactId>
|
||||||
<packaging>eclipse-repository</packaging>
|
<packaging>eclipse-repository</packaging>
|
||||||
|
<version>7.3.1.PATCH</version>
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -4,10 +4,11 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tos-products-parent-pom</artifactId>
|
<artifactId>tos-products-parent-pom</artifactId>
|
||||||
<version>7.3.1-SNAPSHOT</version>
|
<version>7.3.1-PATCH</version>
|
||||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>org.talend.studio.tos.di.product</artifactId>
|
<artifactId>org.talend.studio.tos.di.product</artifactId>
|
||||||
<packaging>eclipse-repository</packaging>
|
<packaging>eclipse-repository</packaging>
|
||||||
|
<version>7.3.1.PATCH</version>
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -4,10 +4,11 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tos-products-parent-pom</artifactId>
|
<artifactId>tos-products-parent-pom</artifactId>
|
||||||
<version>7.3.1-SNAPSHOT</version>
|
<version>7.3.1-PATCH</version>
|
||||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>org.talend.studio.tos.dq.product</artifactId>
|
<artifactId>org.talend.studio.tos.dq.product</artifactId>
|
||||||
<packaging>eclipse-repository</packaging>
|
<packaging>eclipse-repository</packaging>
|
||||||
|
<version>7.3.1.PATCH</version>
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -4,10 +4,11 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>tos-products-parent-pom</artifactId>
|
<artifactId>tos-products-parent-pom</artifactId>
|
||||||
<version>7.3.1-SNAPSHOT</version>
|
<version>7.3.1-PATCH</version>
|
||||||
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>org.talend.studio.tos.esb.product</artifactId>
|
<artifactId>org.talend.studio.tos.esb.product</artifactId>
|
||||||
<packaging>eclipse-repository</packaging>
|
<packaging>eclipse-repository</packaging>
|
||||||
|
<version>7.3.1.PATCH</version>
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>parent-pom</artifactId>
|
<artifactId>parent-pom</artifactId>
|
||||||
<version>7.3.1-SNAPSHOT</version>
|
<version>7.3.1-PATCH</version>
|
||||||
<relativePath />
|
<relativePath />
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
@@ -290,11 +290,13 @@
|
|||||||
<configuration>
|
<configuration>
|
||||||
<target>
|
<target>
|
||||||
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
|
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
|
||||||
<echo>Looking for ${studio.dir}/plugins/${product.branding.platform}_${product.version}*</echo>
|
<propertyregex property="unqualifiedVersion.short" input="${product.version}" regexp="^([0-9])\.([0-9])\.([0-9])" select="\1.\2" casesensitive="false" />
|
||||||
|
<echo>unqualifiedVersion.short: ${unqualifiedVersion.short}</echo>
|
||||||
|
<echo>Looking for ${studio.dir}/plugins/${product.branding.platform}_${unqualifiedVersion.short}*</echo>
|
||||||
<echo>buildQualifier=${buildQualifier}</echo>
|
<echo>buildQualifier=${buildQualifier}</echo>
|
||||||
<echo>product.timestamp=${product.timestamp}</echo>
|
<echo>product.timestamp=${product.timestamp}</echo>
|
||||||
<echo>version.full=${version.full}</echo>
|
<echo>version.full=${version.full}</echo>
|
||||||
<fileset dir="${studio.dir}/plugins" includes="${product.branding.platform}_${product.version}*/about.mappings" id="aboutmappingspath_temp" />
|
<fileset dir="${studio.dir}/plugins" includes="${product.branding.platform}_${unqualifiedVersion.short}*/about.mappings" id="aboutmappingspath_temp" />
|
||||||
<pathconvert property="aboutmappingspath" refid="aboutmappingspath_temp" />
|
<pathconvert property="aboutmappingspath" refid="aboutmappingspath_temp" />
|
||||||
<echo>aboutmappingspath=${aboutmappingspath}</echo>
|
<echo>aboutmappingspath=${aboutmappingspath}</echo>
|
||||||
<loadfile property="about" srcFile="${aboutmappingspath}">
|
<loadfile property="about" srcFile="${aboutmappingspath}">
|
||||||
|
|||||||
2
pom.xml
2
pom.xml
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>parent-pom</artifactId>
|
<artifactId>parent-pom</artifactId>
|
||||||
<version>7.3.1-SNAPSHOT</version>
|
<version>7.3.1-PATCH</version>
|
||||||
<relativePath />
|
<relativePath />
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -3,19 +3,24 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>org.talend.studio</groupId>
|
<groupId>org.talend.studio</groupId>
|
||||||
<artifactId>parent-pom</artifactId>
|
<artifactId>parent-pom</artifactId>
|
||||||
<version>7.3.1-SNAPSHOT</version>
|
<version>7.3.1-PATCH</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
|
<daikon.version>0.31.12</daikon.version>
|
||||||
|
<components.version>0.36.9</components.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.12</org.talend.daikon.crypto-utils.version>
|
||||||
<tycho.version>0.22.0</tycho.version>
|
<tycho.version>0.22.0</tycho.version>
|
||||||
<tycho-extras.version>${tycho.version}</tycho-extras.version>
|
<tycho-extras.version>${tycho.version}</tycho-extras.version>
|
||||||
<base.version>7.3.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 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 is either ${base.version}-SNAPSHOT (snapshots), ${base.version}-<suffix> (milestones), or ${base.version} (GA)-->
|
||||||
<maven.compatible.version>${base.version}-SNAPSHOT</maven.compatible.version>
|
<maven.compatible.version>${base.version}</maven.compatible.version>
|
||||||
<repo.type>Snapshot</repo.type>
|
<repo.type>Release</repo.type>
|
||||||
<doc.version>7.3.1-SNAPSHOT</doc.version>
|
<doc.version>7.3.1-SNAPSHOT</doc.version>
|
||||||
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
|
<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.url>${talend.nexus.host}/nexus/content/repositories</talend.nexus.url>
|
||||||
@@ -30,13 +35,13 @@
|
|||||||
<equinox.build>org.eclipse.equinox.launcher_1.5.200.v20180922-1751.jar</equinox.build>
|
<equinox.build>org.eclipse.equinox.launcher_1.5.200.v20180922-1751.jar</equinox.build>
|
||||||
<opensourcesnapshot-repo.url>${talend.nexus.url}/TalendOpenSourceSnapshot</opensourcesnapshot-repo.url>
|
<opensourcesnapshot-repo.url>${talend.nexus.url}/TalendOpenSourceSnapshot</opensourcesnapshot-repo.url>
|
||||||
<opensourcerelease-repo.url>${talend.nexus.url}/TalendOpenSourceRelease</opensourcerelease-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-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}/dependencies.p2.tos-${maven.compatible.version}.zip-unzip/</tos-deps-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>
|
<jgit.dirtyWorkingTree.official>error</jgit.dirtyWorkingTree.official>
|
||||||
<osgi.ws>win32</osgi.ws>
|
<osgi.ws>win32</osgi.ws>
|
||||||
<osgi.os>win32</osgi.os>
|
<osgi.os>win32</osgi.os>
|
||||||
<osgi.arch>x86_64</osgi.arch>
|
<osgi.arch>x86_64</osgi.arch>
|
||||||
<strictVersions>true</strictVersions>
|
<strictVersions>false</strictVersions>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<distributionManagement>
|
<distributionManagement>
|
||||||
@@ -271,8 +276,8 @@
|
|||||||
<activeByDefault>true</activeByDefault>
|
<activeByDefault>true</activeByDefault>
|
||||||
</activation>
|
</activation>
|
||||||
<properties>
|
<properties>
|
||||||
<release.suffix>-SNAPSHOT</release.suffix>
|
<release.suffix>-PATCH</release.suffix>
|
||||||
<revision.filename>SNAPSHOT</revision.filename>
|
<revision.filename>PATCH</revision.filename>
|
||||||
<product.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</product.version>
|
<product.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</product.version>
|
||||||
</properties>
|
</properties>
|
||||||
<build>
|
<build>
|
||||||
|
|||||||
Reference in New Issue
Block a user