Compare commits

..

15 Commits

Author SHA1 Message Date
Oleksandr Zhelezniak
ba59819f49 chore(TDI-44671): bump tck components (#319)
* bump version of TCK components [1.12.0-SNAPSHOT] -> [1.14.0-SNAPSHOT]
2020-09-11 12:53:38 +03:00
bhe-talendbj
8dad0f7c70 fix(TUP-27438): restore org.apache.commons.codec (#315) 2020-09-08 15:26:27 +08:00
Oleksandr Zhelezniak
311822ac44 chore(TDI-44799): bump version of TCK components (#314)
* bump version of TCK components from [1.11.0-SNAPSHOT] to [1.12.0-SNAPSHOT]
2020-09-03 12:26:18 +03:00
jzhao
416d854b2b fix(TDI-44145):update common-codec for p2 (#311) 2020-09-01 11:56:18 +08:00
bhe-talendbj
7a4af470a4 feat(TUP-27438): Add studio-utils to dependencies.p2.tos (#310)
* feat(TUP-27438): Add studio-utils to dependencies.p2.tos

* feat(TUP-27438): update groupId
2020-08-31 09:47:23 +08:00
jiezhang-tlnd
b83a21f72b feat(TUP-28305)Update Talend logo for studio 7.4 launcher (#309) 2020-08-25 16:00:29 +08:00
build-talend-tdq
0d3e289820 chore(Jenkins): Update DQ libs to 8.3.1-SNAPSHOT (#304)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2020-07-20 14:19:57 +08:00
build-talend-tdq
d5a3675f25 chore(Jenkins): Update DQ libs to 8.1.1-SNAPSHOT (#303) 2020-07-19 09:22:51 +08:00
build-talend-tdq
81648c0cc8 chore(Jenkins): Update DQ libs to 8.3.1-SNAPSHOT (#302) 2020-07-17 16:05:40 +08:00
build-talend-tdq
056fc2d811 chore(Jenkins): Update DQ libs to 8.3.0 (#301) 2020-07-17 15:40:13 +08:00
hzhao-talendbj
429db0187b TUP-27154 - Update BeanUtils to 1.9.4 (#269) (#297)
Co-authored-by: Colm O hEigeartaigh <coheigea@users.noreply.github.com>
2020-07-14 12:14:40 +08:00
nrousseau
7474f094f2 Revert "TUP-27154 - Update BeanUtils to 1.9.4 (#269)" (#295)
This reverts commit d8c10ea4a3.
2020-07-13 18:11:27 +08:00
Colm O hEigeartaigh
d8c10ea4a3 TUP-27154 - Update BeanUtils to 1.9.4 (#269) 2020-07-03 12:26:12 +08:00
pyzhou
79db3f9919 fix(TDI-44402):update tacokit version studio (#287) 2020-06-19 11:50:07 +08:00
wang wei
9a81eaa34d fix(TDI-44306): adjust the audit event log integration in studio (#282) 2020-06-10 16:30:12 +08:00
5 changed files with 43 additions and 30 deletions

View File

@@ -137,7 +137,7 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.3</version>
<version>1.9.4</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -312,9 +312,9 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.10</version>
<version>1.14</version>
</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 -->
<dependency>
<groupId>biz.aQute.bnd</groupId>
@@ -329,7 +329,7 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.3</version>
<version>1.9.4</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -381,6 +381,12 @@
<artifactId>woodstox-core</artifactId>
<version>5.3.0</version>
</dependency>
<dependency>
<groupId>org.talend.studio</groupId>
<artifactId>studio-utils</artifactId>
<version>${studio-utils.version}</version>
<classifier>bundle</classifier>
</dependency>
</dependencies>
</project>

View File

@@ -12,7 +12,7 @@
<packaging>pom</packaging>
<properties>
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
<dataquality.lib.version>8.1.1-SNAPSHOT</dataquality.lib.version>
<dataquality.lib.version>8.3.1-SNAPSHOT</dataquality.lib.version>
<fasterxml.jackson.version>2.10.1</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>

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.10.0-SNAPSHOT,org.talend.components:cosmosDB:1.10.0-SNAPSHOT
component.java.coordinates = org.talend.components:couchbase:1.14.0-SNAPSHOT,org.talend.components:cosmosDB:1.14.0-SNAPSHOT

View File

@@ -134,7 +134,7 @@
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>eclipse-launcher-binaries</artifactId>
<version>4.4.1e</version>
<version>7.4.1</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${studio.dir}</outputDirectory>
@@ -142,7 +142,7 @@
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>eclipse-launcher-mac-${launcher.prefix}</artifactId>
<version>7.3.1</version>
<version>7.4.1</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${studio.dir}</outputDirectory>

View File

@@ -11,8 +11,9 @@
<components.version>0.29.0-SNAPSHOT</components.version>
<daikon.version>0.31.11</daikon.version>
<daikon-ee.format.verison>1.5.0</daikon-ee.format.verison>
<daikon.audit.version>1.8.0</daikon.audit.version>
<daikon.audit.version>1.16.0</daikon.audit.version>
<org.talend.daikon.crypto-utils.version>0.31.11</org.talend.daikon.crypto-utils.version>
<studio-utils.version>1.0.0-SNAPSHOT</studio-utils.version>
<tycho.version>0.22.0</tycho.version>
<tycho-extras.version>${tycho.version}</tycho-extras.version>
<base.version>7.4.1</base.version>
@@ -37,6 +38,7 @@
<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-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>
<eclipse-orbit-p2-repo.url>https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository/</eclipse-orbit-p2-repo.url>
<jgit.dirtyWorkingTree.official>error</jgit.dirtyWorkingTree.official>
<osgi.ws>win32</osgi.ws>
<osgi.os>win32</osgi.os>
@@ -60,6 +62,11 @@
</distributionManagement>
<repositories>
<repository>
<id>eclipse_orbit</id>
<url>${eclipse-orbit-p2-repo.url}</url>
<layout>p2</layout>
</repository>
<repository>
<id>tos-deps</id>
<url>${tos-deps-p2-repo.url}</url>
@@ -160,12 +167,12 @@
</environments>
<filters>
<!-- restrict version of a bundle -->
<!--<filter>
<type>eclipse-plugin</type>
<id>org.eclipse.ui.views.properties.tabbed</id>
<restrictTo>
<version>3.6.100.v20140519-0906</version>
</restrictTo>
<!--<filter>
<type>eclipse-plugin</type>
<id>org.eclipse.ui.views.properties.tabbed</id>
<restrictTo>
<version>3.6.100.v20140519-0906</version>
</restrictTo>
</filter>-->
<filter>
<type>eclipse-plugin</type>
@@ -175,22 +182,22 @@
</restrictTo>
</filter>
<!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence
<filter>
<type>java-package</type>
<id>javax.persistence</id>
<restrictTo>
<type>eclipse-plugin</type>
<id>javax.persistence</id>
</restrictTo>
</filter>
<!-- example 2: remove all providers of the package javax.persistence except the bundle javax.persistence
<filter>
<type>java-package</type>
<id>javax.persistence</id>
<restrictTo>
<type>eclipse-plugin</type>
<id>javax.persistence</id>
</restrictTo>
</filter>
-->
<!-- example 3: work around Equinox bug 348045
<filter>
<type>p2-installable-unit</type>
<id>org.eclipse.equinox.servletbridge.extensionbundle</id>
<removeAll />
</filter>
<!-- example 3: work around Equinox bug 348045
<filter>
<type>p2-installable-unit</type>
<id>org.eclipse.equinox.servletbridge.extensionbundle</id>
<removeAll />
</filter>
-->
</filters>
</configuration>