Compare commits

...

39 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
jiezhang-tlnd
fb547ac3f8 chore(TUP-30992)CVE: junit-4.11,4.13 (#392)
* chore(TUP-30992)CVE: junit-4.11,4.13

* remove classifier bundle

* Update pom.xml

* switch the place of eclipse_orbit
2021-04-15 16:15:22 +08:00
mbasiuk-talend
87e2aebfd2 chore(TDI-45894): prepare the next connectors iteration (#394) 2021-04-13 13:35:02 +03:00
wang wei
ea24fc1bc5 fix(TDI-45896): upgrade tcompv0 connectors for studio (#396) 2021-04-12 10:10:43 +08:00
Chao MENG
dfb55aa4fe feat(TUP-30475): Test of lite studio (#391) 2021-04-08 14:24:58 +08:00
bhe-talendbj
f282b61182 bugfix(TUP-26813): upgrade org.bouncycastle.bcprov to 1.68 (#387)
* fix(TUP-26813): upgrade org.bouncycastle.bcprov-jdk15on to 1.68

* fix(TUP-26813): upgrade org.bouncycastle.bcprov-jdk15on to 1.68

* fix(TUP-26813): upgrade org.bouncycastle.bcprov-jdk15on to 1.68

* fix(TUP-26813): deploy org.bouncycastle 1.68

* fix(TUP-26813): deploy org.bouncycastle 1.68

* fix(TUP-26813): update studio-utils
2021-04-02 18:19:22 +08:00
wang wei
0f1379f4ff fix(TDI-45748): use 0.30.1snapshot tcompv0 for studio master branch (#384) 2021-03-24 18:00:14 +08:00
Dmytro Sylaiev
b9f723571b feat(TDI-45721): Bump TCK for master (#381) 2021-03-05 14:03:23 +02:00
bhe-talendbj
460242307e chore(TUP-29719): upgrade jackson to 2.11.4 (#367)
* fix(TUP-29719): upgrade jackson to 2.11.0

* chore(TUP-29719): upgrade to 2.11.4

Co-authored-by: hzhao-talendbj <hzhao@talend.com>
2021-03-03 18:24:10 +08:00
pyzhou
0eb0a011ca fix(TDI-45607) Upgrade tck in studio (#370) 2021-02-07 10:25:08 +08:00
hzhao-talendbj
b80820929b chore(TUP-29869): upgrade bcprov-jdk15on to 1.68 (#364) 2021-02-03 16:11:22 +08:00
hzhao-talendbj
4daf03253e Revert "fix(TUP-29719): upgrade jackson to 2.11.0 (#351)" (#366)
This reverts commit 2ff6394bc9.
2021-01-27 11:55:16 +08:00
hzhao-talendbj
2ff6394bc9 fix(TUP-29719): upgrade jackson to 2.11.0 (#351) 2021-01-26 18:02:00 +08:00
wang wei
433a183c2f bump tcompv0 to 0.30.0snapshot for master (#362) 2021-01-19 11:29:15 +08:00
Dmytro Sylaiev
c4306a2dd9 fix(TDI-45470): Bump TCK version in config.ini (#358) 2021-01-14 14:53:09 +02:00
nrousseau
ef8d349dcf Update orbit following change of eclipse (#343) 2020-12-17 10:36:03 +08:00
bhe-talendbj
84442eac3c chore(TUP-21116): update osgi qualifier format (#342) 2020-12-16 19:02:01 +08:00
nrousseau
3836961cd3 chore(TUP-21116) upgrade tycho version to 1.7.0 (#298)
* chore(TUP-21116) upgrade tycho version to 1.7.0

* chore(TUP-21116) upgrade tycho version to 1.7.0

* chore(TUP-21116) upgrade tycho version to 1.7.0

* update pom

* update pom

* chore(TUP-21116): upgrade tycho

* chore(TUP-21116): upgrade tycho

* chore(TUP-21116): add version to talend.product

* chore(TUP-21116): reset qualifer format for snapshot build

* chore(TUP-21116): add compilation flag

Co-authored-by: bhe-talendbj <bhe@talend.com>
2020-12-15 15:31:47 +08:00
pyzhou
0f049a8c92 chore(TDI-45339): Bump TCK comp version (#341) 2020-12-14 16:02:59 +08:00
iwangtalend
02bb1ecc7c Update newbuild URL (#337) 2020-12-10 10:02:19 +01:00
build-talend-tdq
952acaf430 chore(Jenkins): Update DQ libs to 8.3.2-SNAPSHOT (#333)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2020-11-24 20:26:29 +08:00
mbasiuk-talend
0410f8032d chore(TDI-44770): update snakeyaml for master (#332) 2020-11-23 11:34:07 +02:00
iwangtalend
517669f07c Fix TOS DQ product name 2020-11-18 17:19:18 +01:00
iwangtalend
f29267c23e Fix TOS ESB name 2020-11-18 17:17:30 +01:00
chmyga
57567c15ed chore(TDI-45157): bump TCK components version (#329)
Co-authored-by: Dmytro Chmyga <dmytro.chmyga@synapse.com>
2020-11-10 14:40:26 +02:00
Oleksandr Zhelezniak
294f6b5836 chore(TDI-44523): resolve cve issue (#326)
* update daikon-ee [1.5.0] -> [3.2.0] for tSetDynamicSchema
2020-11-09 11:00:12 +02:00
wang wei
ffce1d5c4e fix(TDI-44824): Observability: Update daikon-audit library version (#322) 2020-09-18 15:07:38 +08:00
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
12 changed files with 110 additions and 83 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 -->
@@ -312,7 +312,7 @@
<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</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 -->
@@ -369,7 +369,7 @@
<dependency> <dependency>
<groupId>org.yaml</groupId> <groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId> <artifactId>snakeyaml</artifactId>
<version>1.25</version> <version>1.26</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.woodstox</groupId> <groupId>org.codehaus.woodstox</groupId>
@@ -381,6 +381,24 @@
<artifactId>woodstox-core</artifactId> <artifactId>woodstox-core</artifactId>
<version>5.3.0</version> <version>5.3.0</version>
</dependency> </dependency>
<dependency>
<groupId>org.talend.studio</groupId>
<artifactId>studio-utils</artifactId>
<version>${studio-utils.version}</version>
<classifier>bundle</classifier>
</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>
</dependencies> </dependencies>
</project> </project>

View File

@@ -12,8 +12,8 @@
<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.3.1-SNAPSHOT</dataquality.lib.version> <dataquality.lib.version>8.3.2-SNAPSHOT</dataquality.lib.version>
<fasterxml.jackson.version>2.10.1</fasterxml.jackson.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 --> <!-- 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>

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?> <?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" 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" useFeatures="true" includeLaunchers="false" version="7.4.1.qualifier">
<configIni use="default"> <configIni use="default">
<linux>config.ini</linux> <linux>config.ini</linux>
@@ -43,7 +43,6 @@
<feature id="org.talend.jdt.feature"/> <feature id="org.talend.jdt.feature"/>
<feature id="org.talend.libraries.jdbc.feature"/> <feature id="org.talend.libraries.jdbc.feature"/>
<feature id="org.talend.m2e.feature"/> <feature id="org.talend.m2e.feature"/>
<feature id="org.talend.model.migration.feature"/>
<feature id="org.talend.platform.feature"/> <feature id="org.talend.platform.feature"/>
<feature id="org.talend.rcp.feature"/> <feature id="org.talend.rcp.feature"/>
<feature id="org.talend.repository.feature"/> <feature id="org.talend.repository.feature"/>

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

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?> <?pde version="3.5"?>
<product uid="org.talend.studio.tos.bigdata.product" id="org.talend.rcp.branding.tos.bigdata.product" useFeatures="true" includeLaunchers="false"> <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">
<configIni use="default"> <configIni use="default">
<linux>config.ini</linux> <linux>config.ini</linux>
@@ -16,7 +16,7 @@
</features> </features>
<configurations> <configurations>
<plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" /> <plugin id="org.apache.felix.scr" autoStart="true" version="2.0.14.v20180822-1822" startLevel="2" />
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" /> <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" /> <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?> <?pde version="3.5"?>
<product uid="org.talend.studio.tos.di.product" id="org.talend.rcp.branding.tos.product" useFeatures="true" includeLaunchers="false"> <product uid="org.talend.studio.tos.di.product" id="org.talend.rcp.branding.tos.product" useFeatures="true" includeLaunchers="false" version="7.4.1.qualifier">
<configIni use="default"> <configIni use="default">
<linux>config.ini</linux> <linux>config.ini</linux>
@@ -18,7 +18,7 @@
</features> </features>
<configurations> <configurations>
<plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" /> <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" version="2.0.14.v20180822-1822" />
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" /> <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" /> <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />

View File

@@ -1,6 +1,6 @@
launcher.prefix=TOS_DQ launcher.prefix=TOS_DQ
storage.prefix=${launcher.prefix} storage.prefix=${launcher.prefix}
product.name=Talend Open Profiler product.name=Talend Open Studio for Data Quality
product.branding.platform=org.talend.rcp.branding.top product.branding.platform=org.talend.rcp.branding.top
product.branding.id=${product.branding.platform}.product product.branding.id=${product.branding.platform}.product
mac.launcher.info=${product.name} for Mac OS X, Copyright Talend. 2006-2015. All rights reserved. mac.launcher.info=${product.name} for Mac OS X, Copyright Talend. 2006-2015. All rights reserved.

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?> <?pde version="3.5"?>
<product uid="org.talend.studio.tos.dq.product" id="org.talend.rcp.branding.top.product" useFeatures="true" includeLaunchers="false"> <product uid="org.talend.studio.tos.dq.product" id="org.talend.rcp.branding.top.product" useFeatures="true" includeLaunchers="false" version="7.4.1.qualifier">
<configIni use="default"> <configIni use="default">
<linux>config.ini</linux> <linux>config.ini</linux>
@@ -16,14 +16,13 @@
</features> </features>
<configurations> <configurations>
<plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" /> <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" version="2.0.14.v20180822-1822" />
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" /> <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" /> <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" /> <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
<plugin id="org.ops4j.pax.url.mvn" autoStart="true" startLevel="0" /> <plugin id="org.ops4j.pax.url.mvn" autoStart="true" startLevel="0" />
<plugin id="org.talend.components.api.service.osgi" autoStart="true" startLevel="0" />
<plugin id="org.talend.maven.resolver" autoStart="true" startLevel="0" /> <plugin id="org.talend.maven.resolver" autoStart="true" startLevel="0" />
</configurations> </configurations>

View File

@@ -1,6 +1,6 @@
launcher.prefix=TOS_ESB launcher.prefix=TOS_ESB
storage.prefix=TOS_ESB-Studio storage.prefix=TOS_ESB-Studio
product.name=Talend Open Studio product.name=Talend Open Studio for ESB
product.branding.platform=org.talend.rcp.branding.esbstandard product.branding.platform=org.talend.rcp.branding.esbstandard
product.branding.id=${product.branding.platform}.product product.branding.id=${product.branding.platform}.product
mac.launcher.info=${product.name} for Mac OS X, Copyright Talend. 2006-2015. All rights reserved. mac.launcher.info=${product.name} for Mac OS X, Copyright Talend. 2006-2015. All rights reserved.

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?> <?pde version="3.5"?>
<product uid="org.talend.studio.tos.esb.product" id="org.talend.rcp.branding.esbstandard.product" useFeatures="true" includeLaunchers="false"> <product uid="org.talend.studio.tos.esb.product" id="org.talend.rcp.branding.esbstandard.product" useFeatures="true" includeLaunchers="false" version="7.4.1.qualifier">
<configIni use="default"> <configIni use="default">
<linux>config.ini</linux> <linux>config.ini</linux>
@@ -16,7 +16,7 @@
</features> </features>
<configurations> <configurations>
<plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" /> <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" version="2.0.14.v20180822-1822" />
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" /> <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" /> <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />

View File

@@ -134,7 +134,7 @@
<artifactItem> <artifactItem>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>eclipse-launcher-binaries</artifactId> <artifactId>eclipse-launcher-binaries</artifactId>
<version>4.4.1e</version> <version>7.4.1</version>
<type>zip</type> <type>zip</type>
<overWrite>true</overWrite> <overWrite>true</overWrite>
<outputDirectory>${studio.dir}</outputDirectory> <outputDirectory>${studio.dir}</outputDirectory>
@@ -142,7 +142,7 @@
<artifactItem> <artifactItem>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>eclipse-launcher-mac-${launcher.prefix}</artifactId> <artifactId>eclipse-launcher-mac-${launcher.prefix}</artifactId>
<version>7.3.1</version> <version>7.4.1</version>
<type>zip</type> <type>zip</type>
<overWrite>true</overWrite> <overWrite>true</overWrite>
<outputDirectory>${studio.dir}</outputDirectory> <outputDirectory>${studio.dir}</outputDirectory>
@@ -463,7 +463,7 @@
<version>${tycho.version}</version> <version>${tycho.version}</version>
<configuration> <configuration>
<strictBinIncludes>false</strictBinIncludes> <strictBinIncludes>false</strictBinIncludes>
<format>yyyyMMdd'_'HHmm'${release.suffix}'</format> <format>yyyyMMdd'_'HHmm</format>
<archive> <archive>
<addMavenDescriptor>false</addMavenDescriptor> <addMavenDescriptor>false</addMavenDescriptor>
<!-- By default, name of the current user is inserted into generated MANIFEST.MF files --> <!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
@@ -487,7 +487,7 @@
<version>${tycho.version}</version> <version>${tycho.version}</version>
<configuration> <configuration>
<strictBinIncludes>false</strictBinIncludes> <strictBinIncludes>false</strictBinIncludes>
<format>'${product.timestamp}${release.suffix}'</format> <format>yyyyMMdd'_'HHmm</format>
<archive> <archive>
<addMavenDescriptor>false</addMavenDescriptor> <addMavenDescriptor>false</addMavenDescriptor>
<!-- By default, name of the current user is inserted into generated MANIFEST.MF files --> <!-- By default, name of the current user is inserted into generated MANIFEST.MF files -->
@@ -554,7 +554,7 @@
<copy tofile="${bom.dir}/${bom.final.name.prefix}-report.txt" file="${bom.out.dir}/report.txt" /> <copy tofile="${bom.dir}/${bom.final.name.prefix}-report.txt" file="${bom.out.dir}/report.txt" />
<if> <if>
<and> <and>
<equals arg1="${env.HUDSON_URL}" arg2="http://newbuild.talend.com:8180/" /> <equals arg1="${env.HUDSON_URL}" arg2="https://ci-newbuild.talend.com/" />
<equals arg1="${automaticnb}" arg2="1" /> <equals arg1="${automaticnb}" arg2="1" />
</and> </and>
<then> <then>

View File

@@ -8,12 +8,13 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<components.version>0.29.0-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>1.5.0</daikon-ee.format.verison> <daikon-ee.format.verison>3.2.0</daikon-ee.format.verison>
<daikon.audit.version>1.16.0</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>
<tycho.version>0.22.0</tycho.version> <studio-utils.version>1.0.2</studio-utils.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>
<!-- osgi.compatible.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}.<suffix> (milestones), or ${base.version} (GA)--> <!-- osgi.compatible.version is either ${base.version}-SNAPSHOT (snapshots), ${base.version}.<suffix> (milestones), or ${base.version} (GA)-->
@@ -37,6 +38,7 @@
<opensourcerelease-repo.url>${talend.nexus.url}/TalendOpenSourceRelease</opensourcerelease-repo.url> <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-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> <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>${opensourcerelease-unziprepo.url}/orbit/7.4.1/orbit-7.4.1.zip-unzip</eclipse-orbit-p2-repo.url>
<jgit.dirtyWorkingTree.official>error</jgit.dirtyWorkingTree.official> <jgit.dirtyWorkingTree.official>error</jgit.dirtyWorkingTree.official>
<osgi.ws>win32</osgi.ws> <osgi.ws>win32</osgi.ws>
<osgi.os>win32</osgi.os> <osgi.os>win32</osgi.os>
@@ -60,11 +62,17 @@
</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>
<layout>p2</layout> <layout>p2</layout>
</repository> </repository>
<repository>
<id>eclipse_orbit</id>
<url>${eclipse-orbit-p2-repo.url}</url>
<layout>p2</layout>
</repository>
<repository> <repository>
<id>eclipse_repo</id> <id>eclipse_repo</id>
<url>${eclipse-repo.url}</url> <url>${eclipse-repo.url}</url>
@@ -200,10 +208,13 @@
<artifactId>tycho-compiler-plugin</artifactId> <artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho.version}</version> <version>${tycho.version}</version>
<configuration> <configuration>
<compilerArgument>-warn:+discouraged,forbidden</compilerArgument> <compilerArgs>
<compilerVersion>1.8</compilerVersion> <arg>-err:+discouraged,forbidden</arg>
<source>1.8</source> <arg>-warn:+discouraged,forbidden</arg>
<target>1.8</target> </compilerArgs>
<compilerVersion>11</compilerVersion>
<source>11</source>
<target>11</target>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>