Compare commits
128 Commits
iwang-test
...
release/7.
| Author | SHA1 | Date | |
|---|---|---|---|
|
85b4b829de | ||
|
|
ec35638044 | ||
|
|
1c4c45ec93 | ||
|
|
ed1b8dacc4 | ||
|
|
0564871a8f | ||
|
|
6068bd1852 | ||
|
|
e3a9a1a383 | ||
|
|
c2820d369c | ||
|
|
5e03343be4 | ||
|
|
874449343f | ||
|
|
157620ee23 | ||
|
|
63da272b8d | ||
|
|
c5c82c8d8e | ||
|
|
f03c6f4a81 | ||
|
|
5bd9d0290e | ||
|
|
e359ff6671 | ||
|
|
8ec9afcc2f | ||
|
|
2658d871b8 | ||
|
|
8df6aaef98 | ||
|
|
179cdc7223 | ||
|
|
5edb59118e | ||
|
|
3b8944b8b2 | ||
|
|
37c2ffd4a0 | ||
|
|
4d60520020 | ||
|
|
e22b65ab12 | ||
|
|
448a58976d | ||
|
|
6091c0b7f5 | ||
|
|
3cacfad64a | ||
|
|
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,11 +5,12 @@
|
||||
<parent>
|
||||
<groupId>org.talend.repo</groupId>
|
||||
<artifactId>dependencies.p2</artifactId>
|
||||
<version>7.4.1-SNAPSHOT</version>
|
||||
<version>7.3.1-PATCH</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>dependencies.p2.tos</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
|
||||
<repositories>
|
||||
<repository>
|
||||
@@ -117,7 +118,7 @@
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-lang3</artifactId>
|
||||
<version>3.8.1</version>
|
||||
<version>3.10</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
@@ -127,7 +128,7 @@
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-databind</artifactId>
|
||||
<version>${fasterxml.jackson.version}</version>
|
||||
<version>${fasterxml.jackson.databind.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.xml.bind</groupId>
|
||||
@@ -137,12 +138,17 @@
|
||||
<dependency>
|
||||
<groupId>commons-beanutils</groupId>
|
||||
<artifactId>commons-beanutils</artifactId>
|
||||
<version>1.9.4</version>
|
||||
<version>1.9.4-talend</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-configuration2</artifactId>
|
||||
<version>2.0</version>
|
||||
<version>2.8.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-text</artifactId>
|
||||
<version>1.10.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.httpcomponents</groupId>
|
||||
@@ -157,12 +163,12 @@
|
||||
<dependency>
|
||||
<groupId>org.codehaus.jackson</groupId>
|
||||
<artifactId>jackson-core-asl</artifactId>
|
||||
<version>1.9.15-TALEND</version>
|
||||
<version>1.9.16-TALEND</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.codehaus.jackson</groupId>
|
||||
<artifactId>jackson-mapper-asl</artifactId>
|
||||
<version>1.9.15-TALEND</version>
|
||||
<version>1.9.16-TALEND</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Avro with minimum depdencies -->
|
||||
@@ -312,7 +318,7 @@
|
||||
<dependency>
|
||||
<groupId>commons-codec</groupId>
|
||||
<artifactId>commons-codec</artifactId>
|
||||
<version>1.14</version>
|
||||
<version>1.14-talend</version>
|
||||
</dependency>
|
||||
<!-- to avoid updatin the complete eclipse target platform we add these
|
||||
single dependencies -->
|
||||
@@ -329,18 +335,14 @@
|
||||
<dependency>
|
||||
<groupId>commons-beanutils</groupId>
|
||||
<artifactId>commons-beanutils</artifactId>
|
||||
<version>1.9.4</version>
|
||||
<version>1.9.4-talend</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>org-slf4j-api</artifactId>
|
||||
<version>1.7.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-configuration</groupId>
|
||||
<artifactId>commons-configuration</artifactId>
|
||||
<version>1.10</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.dataformat</groupId>
|
||||
<artifactId>jackson-dataformat-xml</artifactId>
|
||||
@@ -379,26 +381,40 @@
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.woodstox</groupId>
|
||||
<artifactId>woodstox-core</artifactId>
|
||||
<version>5.3.0</version>
|
||||
<version>6.4.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>studio-utils</artifactId>
|
||||
<version>${studio-utils.version}</version>
|
||||
<classifier>bundle</classifier>
|
||||
</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.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>
|
||||
<dependency>
|
||||
<groupId>org.apache.ant</groupId>
|
||||
<artifactId>ant</artifactId>
|
||||
<version>1.10.12-ORBIT</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
<?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>
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>7.4.1-SNAPSHOT</version>
|
||||
<version>7.3.1-PATCH</version>
|
||||
<relativePath>../../talend.studio.parent.pom</relativePath>
|
||||
</parent>
|
||||
<groupId>org.talend.repo</groupId>
|
||||
@@ -12,8 +12,9 @@
|
||||
<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>
|
||||
<dataquality.lib.version>8.0.26</dataquality.lib.version>
|
||||
<fasterxml.jackson.version>2.13.4</fasterxml.jackson.version>
|
||||
<fasterxml.jackson.databind.version>2.13.4.2</fasterxml.jackson.databind.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>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>7.4.1-SNAPSHOT</version>
|
||||
<version>7.3.1-PATCH</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -4,12 +4,13 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>7.4.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>
|
||||
|
||||
@@ -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>
|
||||
@@ -43,6 +43,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"/>
|
||||
|
||||
@@ -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.23.0-SNAPSHOT,org.talend.components:cosmosDB:1.23.0-SNAPSHOT
|
||||
component.java.coordinates = org.talend.components:couchbase:1.27.19,org.talend.components:cosmosDB:1.27.19
|
||||
|
||||
@@ -4,10 +4,11 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>7.4.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>
|
||||
|
||||
@@ -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>
|
||||
@@ -16,7 +16,7 @@
|
||||
</features>
|
||||
|
||||
<configurations>
|
||||
<plugin id="org.apache.felix.scr" autoStart="true" version="2.0.14.v20180822-1822" startLevel="2" />
|
||||
<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" />
|
||||
|
||||
@@ -4,10 +4,11 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>7.4.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>
|
||||
|
||||
@@ -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>
|
||||
@@ -18,7 +18,7 @@
|
||||
</features>
|
||||
|
||||
<configurations>
|
||||
<plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" version="2.0.14.v20180822-1822" />
|
||||
<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" />
|
||||
|
||||
@@ -4,10 +4,11 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>7.4.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>
|
||||
|
||||
@@ -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
|
||||
@@ -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>
|
||||
@@ -16,13 +16,14 @@
|
||||
</features>
|
||||
|
||||
<configurations>
|
||||
<plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" version="2.0.14.v20180822-1822" />
|
||||
<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.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.components.api.service.osgi" autoStart="true" startLevel="0" />
|
||||
<plugin id="org.talend.maven.resolver" autoStart="true" startLevel="0" />
|
||||
</configurations>
|
||||
|
||||
|
||||
@@ -4,10 +4,11 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tos-products-parent-pom</artifactId>
|
||||
<version>7.4.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>
|
||||
|
||||
@@ -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
|
||||
@@ -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>
|
||||
@@ -16,7 +16,7 @@
|
||||
</features>
|
||||
|
||||
<configurations>
|
||||
<plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" version="2.0.14.v20180822-1822" />
|
||||
<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" />
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>7.4.1-SNAPSHOT</version>
|
||||
<version>7.3.1-PATCH</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>7.3.1</version>
|
||||
<type>zip</type>
|
||||
<overWrite>true</overWrite>
|
||||
<outputDirectory>${studio.dir}</outputDirectory>
|
||||
@@ -230,24 +206,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>
|
||||
@@ -332,11 +290,13 @@
|
||||
<configuration>
|
||||
<target>
|
||||
<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>product.timestamp=${product.timestamp}</echo>
|
||||
<echo>version.full=${version.full}</echo>
|
||||
<fileset dir="${studio.dir}/plugins" includes="${product.branding.platform}_${product.version}*/about.mappings" id="aboutmappingspath_temp" />
|
||||
<fileset dir="${studio.dir}/plugins" includes="${product.branding.platform}_${unqualifiedVersion.short}*/about.mappings" id="aboutmappingspath_temp" />
|
||||
<pathconvert property="aboutmappingspath" refid="aboutmappingspath_temp" />
|
||||
<echo>aboutmappingspath=${aboutmappingspath}</echo>
|
||||
<loadfile property="about" srcFile="${aboutmappingspath}">
|
||||
@@ -463,7 +423,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 +447,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 -->
|
||||
@@ -539,30 +499,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">
|
||||
|
||||
2
pom.xml
2
pom.xml
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>parent-pom</artifactId>
|
||||
<version>7.4.1-SNAPSHOT</version>
|
||||
<version>7.3.1-PATCH</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user