Compare commits

...

7 Commits

Author SHA1 Message Date
Irene Wang
34a2d1725e Test Java 11 2021-06-15 17:28:11 +02:00
chmyga
848c8c958d chore(TDI-46267): bump connectors to 1.23.0-SNAPSHOT (#420)
Co-authored-by: Dmytro Chmyga <dmytro.chmyga@globallogic.com>
2021-06-09 14:13:55 +03:00
pyzhou
17f5d98efa fix(TDI-46260): bump tcompv0 connectors to 0.33.0-SNAPSHOT (#418) 2021-06-09 11:13:01 +08:00
hzhao-talendbj
53ee776d01 chore(TUP-30255): upgrade studio-util version (#404) 2021-05-10 18:14:07 +08:00
mbasiuk-talend
40762313c2 chore(TDI-46032): bump connectors version to 1.22.0-SNAPSHOT (#407) 2021-05-08 17:09:37 +08:00
jzhao
eba2b2d52b fix(TDI-46033): bump tcompv0 connectors to 0.32.0-SNAPSHOT (#410) 2021-05-08 17:03:14 +08:00
jiezhang-tlnd
5e4c564fa6 fix(TUP-30960)CVE: jackson-mapper-1.9.14.TALEND (#402)
* fix(TUP-30960)CVE: jackson-mapper-1.9.14.TALEND

* plan deploy p2

* test p2

* test p2

* test p2

* test p2

* test p2

* test p2

* test p2

* change back temp p2
2021-05-06 11:47:29 +08:00
3 changed files with 17 additions and 17 deletions

View File

@@ -157,12 +157,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.15-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.15-TALEND</version>
</dependency> </dependency>
<!-- Avro with minimum depdencies --> <!-- Avro with minimum depdencies -->

View File

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

View File

@@ -8,12 +8,12 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<components.version>0.30.2-SNAPSHOT</components.version> <components.version>0.33.0-SNAPSHOT</components.version>
<daikon.version>0.31.11</daikon.version> <daikon.version>0.31.11</daikon.version>
<daikon-ee.format.verison>3.2.0</daikon-ee.format.verison> <daikon-ee.format.verison>3.2.0</daikon-ee.format.verison>
<daikon.audit.version>1.16.1</daikon.audit.version> <daikon.audit.version>1.16.1</daikon.audit.version>
<org.talend.daikon.crypto-utils.version>0.31.11</org.talend.daikon.crypto-utils.version> <org.talend.daikon.crypto-utils.version>0.31.11</org.talend.daikon.crypto-utils.version>
<studio-utils.version>1.0.1</studio-utils.version> <studio-utils.version>1.0.2</studio-utils.version>
<tycho.version>1.7.0</tycho.version> <tycho.version>1.7.0</tycho.version>
<tycho-extras.version>${tycho.version}</tycho-extras.version> <tycho-extras.version>${tycho.version}</tycho-extras.version>
<base.version>7.4.1</base.version> <base.version>7.4.1</base.version>
@@ -62,7 +62,7 @@
</distributionManagement> </distributionManagement>
<repositories> <repositories>
<repository> <repository>
<id>tos-deps</id> <id>tos-deps</id>
<url>${tos-deps-p2-repo.url}</url> <url>${tos-deps-p2-repo.url}</url>
@@ -118,7 +118,7 @@
</snapshots> </snapshots>
<url>${opensourcesnapshot-repo.url}</url> <url>${opensourcesnapshot-repo.url}</url>
</repository> </repository>
</repositories> </repositories>
<build> <build>
<pluginManagement> <pluginManagement>
@@ -147,12 +147,12 @@
<artifactId>tycho-maven-plugin</artifactId> <artifactId>tycho-maven-plugin</artifactId>
<version>${tycho.version}</version> <version>${tycho.version}</version>
<extensions>true</extensions> <extensions>true</extensions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.eclipse.tycho</groupId> <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-versions-plugin</artifactId> <artifactId>tycho-versions-plugin</artifactId>
<version>${tycho.version}</version> <version>${tycho.version}</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.eclipse.tycho</groupId> <groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId> <artifactId>target-platform-configuration</artifactId>
@@ -183,7 +183,7 @@
</restrictTo> </restrictTo>
</filter> </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> <filter>
<type>java-package</type> <type>java-package</type>
<id>javax.persistence</id> <id>javax.persistence</id>
@@ -193,13 +193,13 @@
</restrictTo> </restrictTo>
</filter> </filter>
--> -->
<!-- example 3: work around Equinox bug 348045 <!-- example 3: work around Equinox bug 348045
<filter> <filter>
<type>p2-installable-unit</type> <type>p2-installable-unit</type>
<id>org.eclipse.equinox.servletbridge.extensionbundle</id> <id>org.eclipse.equinox.servletbridge.extensionbundle</id>
<removeAll /> <removeAll />
</filter> </filter>
--> -->
</filters> </filters>
</configuration> </configuration>
</plugin> </plugin>
@@ -212,9 +212,9 @@
<arg>-err:+discouraged,forbidden</arg> <arg>-err:+discouraged,forbidden</arg>
<arg>-warn:+discouraged,forbidden</arg> <arg>-warn:+discouraged,forbidden</arg>
</compilerArgs> </compilerArgs>
<compilerVersion>1.8</compilerVersion> <compilerVersion>11</compilerVersion>
<source>1.8</source> <source>11</source>
<target>1.8</target> <target>11</target>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
@@ -453,7 +453,7 @@
</files> </files>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.eclipse.tycho</groupId> <groupId>org.eclipse.tycho</groupId>
@@ -506,7 +506,7 @@
<sequential> <sequential>
<echo>Signing @{jarFile}</echo> <echo>Signing @{jarFile}</echo>
<exec executable="${java.home}/../bin/jarsigner" dir="${project.basedir}/target/" failonerror="true"> <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> </exec>
</sequential> </sequential>
</ac:for> </ac:for>