Compare commits
94 Commits
patchrelea
...
release/7.
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
76876d196f | ||
|
|
1bcaf8f08d | ||
|
|
0896551234 | ||
|
|
af2993df49 | ||
|
|
545c72144c | ||
|
|
35b3be2c72 | ||
|
|
5f4fd46747 | ||
|
|
4328599deb | ||
|
|
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 |
@@ -10,6 +10,7 @@
|
|||||||
|
|
||||||
<artifactId>dependencies.p2.tos</artifactId>
|
<artifactId>dependencies.p2.tos</artifactId>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
|
|
||||||
<repositories>
|
<repositories>
|
||||||
<repository>
|
<repository>
|
||||||
@@ -38,7 +39,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.ops4j.pax.url</groupId>
|
<groupId>org.ops4j.pax.url</groupId>
|
||||||
<artifactId>pax-url-aether</artifactId>
|
<artifactId>pax-url-aether</artifactId>
|
||||||
<version>2.6.1-Talend</version>
|
<version>2.6.13.1-Talend</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.talend.dataquality</groupId>
|
<groupId>org.talend.dataquality</groupId>
|
||||||
@@ -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,12 +138,17 @@
|
|||||||
<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>
|
||||||
<artifactId>commons-configuration2</artifactId>
|
<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>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.httpcomponents</groupId>
|
<groupId>org.apache.httpcomponents</groupId>
|
||||||
@@ -157,12 +163,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,9 +318,9 @@
|
|||||||
<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 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>biz.aQute.bnd</groupId>
|
<groupId>biz.aQute.bnd</groupId>
|
||||||
@@ -329,18 +335,14 @@
|
|||||||
<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>
|
||||||
<artifactId>org-slf4j-api</artifactId>
|
<artifactId>org-slf4j-api</artifactId>
|
||||||
<version>1.7.2</version>
|
<version>1.7.2</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>commons-configuration</groupId>
|
|
||||||
<artifactId>commons-configuration</artifactId>
|
|
||||||
<version>1.10</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.dataformat</groupId>
|
<groupId>com.fasterxml.jackson.dataformat</groupId>
|
||||||
<artifactId>jackson-dataformat-xml</artifactId>
|
<artifactId>jackson-dataformat-xml</artifactId>
|
||||||
@@ -379,7 +381,39 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.woodstox</groupId>
|
<groupId>com.fasterxml.woodstox</groupId>
|
||||||
<artifactId>woodstox-core</artifactId>
|
<artifactId>woodstox-core</artifactId>
|
||||||
<version>5.3.0</version>
|
<version>6.4.0</version>
|
||||||
|
</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>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.ant</groupId>
|
||||||
|
<artifactId>ant</artifactId>
|
||||||
|
<version>1.10.12-ORBIT</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
|
|||||||
@@ -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-PATCH</version>
|
<version>7.3.1-PATCH</version>
|
||||||
<relativePath>../../talend.studio.parent.pom</relativePath>
|
<relativePath>../../talend.studio.parent.pom</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.talend.repo</groupId>
|
<groupId>org.talend.repo</groupId>
|
||||||
@@ -12,8 +12,9 @@
|
|||||||
<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>
|
||||||
<dataquality.lib.version>8.0.9</dataquality.lib.version>
|
<dataquality.lib.version>8.0.26</dataquality.lib.version>
|
||||||
<fasterxml.jackson.version>2.10.1</fasterxml.jackson.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 -->
|
<!-- 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>
|
||||||
</properties>
|
</properties>
|
||||||
|
|||||||
@@ -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.17.1,org.talend.components:cosmosDB:1.17.1
|
component.java.coordinates = org.talend.components:couchbase:1.27.22,org.talend.components:cosmosDB:1.27.22
|
||||||
|
|||||||
@@ -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}">
|
||||||
@@ -456,29 +458,29 @@
|
|||||||
<timestampProvider>default</timestampProvider>
|
<timestampProvider>default</timestampProvider>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<!--
|
<!--
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
<artifactId>build-helper-maven-plugin</artifactId>
|
<artifactId>build-helper-maven-plugin</artifactId>
|
||||||
<version>1.7</version>
|
<version>1.7</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>-->
|
<execution>-->
|
||||||
<!-- Attach product ZIP to Maven artifact -->
|
<!-- Attach product ZIP to Maven artifact -->
|
||||||
<!-- <id>attach-artifacts</id>
|
<!-- <id>attach-artifacts</id>
|
||||||
<phase>package</phase>
|
<phase>package</phase>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>attach-artifact</goal>
|
<goal>attach-artifact</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<artifacts>
|
<artifacts>
|
||||||
<artifact>
|
<artifact>
|
||||||
<file>${project.build.directory}/products/${product.final.name}.zip</file>
|
<file>${project.build.directory}/products/${product.final.name}.zip</file>
|
||||||
<type>product</type>
|
<type>product</type>
|
||||||
</artifact>
|
</artifact>
|
||||||
</artifacts>
|
</artifacts>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>-->
|
</plugin>-->
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user