Compare commits

..

1 Commits

Author SHA1 Message Date
pyzhou
ce7a4bb632 fix(TDI-46260): bump tcompv0 connectors to 0.32.1 2021-06-08 21:20:48 +08:00
4 changed files with 26 additions and 38 deletions

View File

@@ -39,7 +39,7 @@
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
<version>2.6.13.1-Talend</version>
<version>2.6.1-Talend</version>
</dependency>
<dependency>
<groupId>org.talend.dataquality</groupId>
@@ -118,7 +118,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.10</version>
<version>3.8.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -128,7 +128,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${fasterxml.jackson.databind.version}</version>
<version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
@@ -143,12 +143,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
<version>2.8.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.10.0</version>
<version>2.0</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -163,12 +158,12 @@
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>1.9.16-TALEND</version>
<version>1.9.15-TALEND</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.9.16-TALEND</version>
<version>1.9.15-TALEND</version>
</dependency>
<!-- Avro with minimum depdencies -->
@@ -342,7 +337,11 @@
<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>
@@ -381,7 +380,7 @@
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
<version>6.4.0</version>
<version>5.3.0</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
@@ -405,16 +404,6 @@
<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>

View File

@@ -12,9 +12,8 @@
<packaging>pom</packaging>
<properties>
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
<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>
<dataquality.lib.version>8.0.12</dataquality.lib.version>
<fasterxml.jackson.version>2.11.4</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>

View File

@@ -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.27.24,org.talend.components:cosmosDB:1.27.24
component.java.coordinates = org.talend.components:couchbase:1.21.0,org.talend.components:cosmosDB:1.21.0

View File

@@ -8,11 +8,11 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<daikon.version>0.31.12</daikon.version>
<components.version>0.36.28</components.version>
<daikon.version>0.31.11</daikon.version>
<components.version>0.32.1</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>
<org.talend.daikon.crypto-utils.version>0.31.11</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>
@@ -110,7 +110,7 @@
</snapshots>
<url>${opensourcesnapshot-repo.url}</url>
</repository>
</repositories>
</repositories>
<build>
<pluginManagement>
@@ -139,12 +139,12 @@
<artifactId>tycho-maven-plugin</artifactId>
<version>${tycho.version}</version>
<extensions>true</extensions>
</plugin>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-versions-plugin</artifactId>
<version>${tycho.version}</version>
</plugin>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
@@ -175,7 +175,7 @@
</restrictTo>
</filter>
<!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence
<!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence
<filter>
<type>java-package</type>
<id>javax.persistence</id>
@@ -185,13 +185,13 @@
</restrictTo>
</filter>
-->
<!-- example 3: work around Equinox bug 348045
<!-- example 3: work around Equinox bug 348045
<filter>
<type>p2-installable-unit</type>
<id>org.eclipse.equinox.servletbridge.extensionbundle</id>
<removeAll />
</filter>
-->
-->
</filters>
</configuration>
</plugin>
@@ -442,7 +442,7 @@
</files>
</configuration>
</execution>
</executions>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
@@ -495,7 +495,7 @@
<sequential>
<echo>Signing @{jarFile}</echo>
<exec executable="${java.home}/../bin/jarsigner" dir="${project.basedir}/target/" failonerror="true">
<arg line="-verbose -digestalg SHA1 -sigalg SHA1withRSA -keystore ${keystore.path} -storepass ${keystore.pass} @{jarFile} talend" />
<arg line="-verbose -digestalg SHA1 -sigalg SHA1withRSA -keystore ${keystore.path} -storepass ${keystore.pass} @{jarFile} talend" />
</exec>
</sequential>
</ac:for>