Compare commits

..

5 Commits

Author SHA1 Message Date
Chao MENG
38b8f21abd chore: support code generator server 2022-09-05 11:05:51 +08:00
Jenkins Continuous Build server
ca6eefb80c Set version to 8.0.1 2021-11-03 17:02:09 +01:00
Irene Wang
ec9f75fc13 Update version to 8.0.1 2021-10-28 13:08:24 +02:00
jiezhang-tlnd
486ac12331 fix(TUP-33312)CWE-327: upgrade bcprov-jdk15on to 1.69 (#488) (#496)
* fix(TUP-33312)CWE-327: upgrade bcprov-jdk15on to 1.69

* fix(TUP-33312)CWE-327: upgrade bcprov-jdk15on to 1.69

Conflicts:
	talend.studio.parent.pom/pom.xml
2021-10-28 11:52:05 +08:00
wang wei
5ef4ec9663 fix(TDI-46286): upgrade org.slf4j version to 1.7.29 from 1.7.25 (#485)
Conflicts:
	talend.studio.parent.pom/pom.xml
2021-10-27 15:42:21 +08:00
16 changed files with 29 additions and 24 deletions

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.talend.repo</groupId>
<artifactId>dependencies.p2</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.0.1</version>
</parent>
<artifactId>dependencies.p2.tos</artifactId>
@@ -351,7 +351,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov</artifactId>
<version>1.68.0</version>
<version>1.69.0</version>
<classifier>bundle</classifier>
</dependency>
<dependency>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.0.1</version>
<relativePath>../../talend.studio.parent.pom</relativePath>
</parent>
<groupId>org.talend.repo</groupId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.0.1</version>
<relativePath />
</parent>

View File

@@ -4,12 +4,13 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.0.1</version>
<relativePath />
</parent>
<artifactId>talend-tos-p2-repo</artifactId>
<packaging>eclipse-repository</packaging>
<properties>
<product.final.name>${launcher.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>

View File

@@ -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" version="7.4.1.qualifier" useFeatures="true" includeLaunchers="false">
<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" version="8.0.1.qualifier" useFeatures="true" includeLaunchers="false">
<configIni use="default">
<linux>config.ini</linux>

View File

@@ -4,10 +4,11 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.0.1</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>
<artifactId>org.talend.studio.tos.bigdata.product</artifactId>
<packaging>eclipse-repository</packaging>
</project>

View File

@@ -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" version="8.0.1.qualifier">
<configIni use="default">
<linux>config.ini</linux>

View File

@@ -4,10 +4,11 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.0.1</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>
<artifactId>org.talend.studio.tos.di.product</artifactId>
<packaging>eclipse-repository</packaging>
</project>

View File

@@ -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" version="8.0.1.qualifier">
<configIni use="default">
<linux>config.ini</linux>

View File

@@ -4,10 +4,11 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.0.1</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>
<artifactId>org.talend.studio.tos.dq.product</artifactId>
<packaging>eclipse-repository</packaging>
</project>

View File

@@ -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" version="8.0.1.qualifier">
<configIni use="default">
<linux>config.ini</linux>

View File

@@ -4,10 +4,11 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.0.1</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>
<artifactId>org.talend.studio.tos.esb.product</artifactId>
<packaging>eclipse-repository</packaging>
</project>

View File

@@ -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" version="8.0.1.qualifier">
<configIni use="default">
<linux>config.ini</linux>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.0.1</version>
<relativePath />
</parent>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.0.1-SNAPSHOT</version>
<relativePath />
</parent>

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
@@ -14,20 +14,20 @@
<m2.fasterxml.jackson.version>2.11.4</m2.fasterxml.jackson.version>
<jackson-codehaus.version>1.9.15-TALEND</jackson-codehaus.version>
<daikon.version>0.31.12</daikon.version>
<slf4j-api.version>1.7.25</slf4j-api.version>
<slf4j-api.version>1.7.29</slf4j-api.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>
<studio-utils.version>1.0.5</studio-utils.version>
<studio-utils.version>1.0.6</studio-utils.version>
<compcache.creator.version>1.0.0</compcache.creator.version>
<tycho.version>1.7.0</tycho.version>
<tycho-extras.version>${tycho.version}</tycho-extras.version>
<base.version>8.0.2</base.version>
<base.version>8.0.1</base.version>
<!-- osgi.compatible.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}.<suffix> (milestones), or ${base.version} (GA)-->
<osgi.compatible.version>${base.version}-SNAPSHOT</osgi.compatible.version>
<osgi.compatible.version>${base.version}</osgi.compatible.version>
<!-- maven.compatible.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}-<suffix> (milestones), or ${base.version} (GA)-->
<maven.compatible.version>${base.version}-SNAPSHOT</maven.compatible.version>
<repo.type>Snapshot</repo.type>
<maven.compatible.version>${base.version}</maven.compatible.version>
<repo.type>Release</repo.type>
<doc.version>7.3.1-SNAPSHOT</doc.version>
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
<talend.nexus.url>${talend.nexus.host}/nexus/content/repositories</talend.nexus.url>
@@ -44,7 +44,7 @@
<osgi.ws>win32</osgi.ws>
<osgi.os>win32</osgi.os>
<osgi.arch>x86_64</osgi.arch>
<strictVersions>true</strictVersions>
<strictVersions>false</strictVersions>
</properties>
<distributionManagement>