Compare commits

..

36 Commits

Author SHA1 Message Date
Jenkins Continuous Build server
3c2b229977 Set version to 7.4.1 M5 2020-12-08 20:23:14 +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
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
bhe-talendbj
c7bfcae92b bugfix(TUP-27224): Upgrade crypto-utils and daikon to 0.31.11 (#279)
* fix(TUP-27224): Upgrade crypto-utils to 2.1.0

* fix(TUP-27224): Upgrade daikon version to 2.1.0

* fix(TUP-27224): Upgrade daikon version to 0.31.11
2020-05-26 19:56:32 +08:00
pyzhou
06e0945fa3 fix(TDI-44203):upgrade tacokit version to 1.10.0-SNAPSHOT for studio (#271) 2020-05-15 09:38:04 +08:00
Roman
8637c51f88 fix(TDI-44125): Bump daikon-ee.format version (#270) 2020-05-13 13:17:17 +03:00
bhe-talendbj
99dcdfb0db feat(TUP-26303): Copy jarlist and notice,report to bom folder (#267) 2020-04-14 10:58:44 +08:00
pyzhou
00780637ba feat(TDI-43717):integrate cosmosDB into studio (#266) 2020-04-14 10:04:01 +08:00
bhe-talendbj
d69a3c8a88 feat(TUP-26303): Integrate bom tool plugin (#261)
* feat(TUP-26303): Integrate cve tool plugin

* feat(TUP-26303): Add bom outputs

* feat(TUP-26303): Correct artifact id

* feat(TUP-26303): Copy bom only

* feat(TUP-26303): Fix unintentional changes

* feat(TUP-26303): Update directory of bom

* feat(TUP-26303): Add pluginRepository for bomtool

* feat(TUP-26303): Update echo message
2020-04-08 18:06:58 +08:00
Zhiwei Xue
d8f17f42f8 feat(TUP-26304):Have a root studio bom for SE/EE product (#251) 2020-04-01 15:06:52 +08:00
build-talend-tdq
05c09ee985 chore(Jenkins): Update DQ libs to 8.1.1-SNAPSHOT (#254)
Co-authored-by: jenkins-git <jenkins-git@talend.com>
2020-03-14 22:17:06 +01:00
Roman
51b442c2b4 chore: bump tacokit version for studio (#253) 2020-03-11 23:26:23 +08:00
mbasiuk-talend
9f9394fa0f chore: bump components-version to 0.29.0-SNAPSHOT (#250)
* chore: bump components-version to 0.29.0-SNAPSHOT
2020-03-04 18:22:49 +08:00
build-talend-tdq
cad210df20 chore(Jenkins): Update DQ libs to 8.0.1-SNAPSHOT (#248) 2020-02-25 15:17:06 +01:00
Jenkins Continuous Build server
69dfab2bf6 Set version to 7.4.1 SNAPSHOT 2020-02-21 15:34:46 +01:00
Roman
878d4211db chore: bump Components version to 0.28.2 (#245) 2020-02-14 22:02:43 +08:00
14 changed files with 132 additions and 60 deletions

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.talend.repo</groupId>
<artifactId>dependencies.p2</artifactId>
<version>7.3.1-PATCH</version>
<version>7.4.1-M5</version>
</parent>
<artifactId>dependencies.p2.tos</artifactId>
@@ -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,7 +312,7 @@
<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
single dependencies -->
@@ -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

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.3.1-PATCH</version>
<version>7.4.1-M5</version>
<relativePath>../../talend.studio.parent.pom</relativePath>
</parent>
<groupId>org.talend.repo</groupId>
@@ -12,7 +12,7 @@
<packaging>pom</packaging>
<properties>
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
<dataquality.lib.version>8.0.9</dataquality.lib.version>
<dataquality.lib.version>8.3.2-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

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.3.1-PATCH</version>
<version>7.4.1-M5</version>
<relativePath />
</parent>

View File

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

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.17.1,org.talend.components:cosmosDB:1.17.1
component.java.coordinates = org.talend.components:couchbase:1.16.0-SNAPSHOT,org.talend.components:cosmosDB:1.16.0-SNAPSHOT

View File

@@ -4,11 +4,11 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>7.3.1-PATCH</version>
<version>7.4.1-M5</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>
<artifactId>org.talend.studio.tos.bigdata.product</artifactId>
<packaging>eclipse-repository</packaging>
<version>7.3.1.PATCH</version>
<version>7.4.1.M5</version>
</project>

View File

@@ -4,11 +4,11 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>7.3.1-PATCH</version>
<version>7.4.1-M5</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>
<artifactId>org.talend.studio.tos.di.product</artifactId>
<packaging>eclipse-repository</packaging>
<version>7.3.1.PATCH</version>
<version>7.4.1.M5</version>
</project>

View File

@@ -4,11 +4,11 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>7.3.1-PATCH</version>
<version>7.4.1-M5</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>
<artifactId>org.talend.studio.tos.dq.product</artifactId>
<packaging>eclipse-repository</packaging>
<version>7.3.1.PATCH</version>
<version>7.4.1.M5</version>
</project>

View File

@@ -1,8 +1,8 @@
launcher.prefix=TOS_DQ
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.id=${product.branding.platform}.product
mac.launcher.info=${product.name} for Mac OS X, Copyright Talend. 2006-2015. All rights reserved.
product.website=http://www.talend.com\n
storage.dir=top
storage.dir=top

View File

@@ -4,11 +4,11 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tos-products-parent-pom</artifactId>
<version>7.3.1-PATCH</version>
<version>7.4.1-M5</version>
<relativePath>../talend.studio.tos.product.parent.pom</relativePath>
</parent>
<artifactId>org.talend.studio.tos.esb.product</artifactId>
<packaging>eclipse-repository</packaging>
<version>7.3.1.PATCH</version>
<version>7.4.1.M5</version>
</project>

View File

@@ -1,8 +1,8 @@
launcher.prefix=TOS_ESB
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.id=${product.branding.platform}.product
mac.launcher.info=${product.name} for Mac OS X, Copyright Talend. 2006-2015. All rights reserved.
product.website=http://www.talend.com\n
storage.dir=esb
storage.dir=esb

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.3.1-PATCH</version>
<version>7.4.1-M5</version>
<relativePath />
</parent>
@@ -33,11 +33,35 @@
<url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>releases</id>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceRelease/</url>
</pluginRepository>
<pluginRepository>
<id>snapshots</id>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
<url>${talend.nexus.host}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
</pluginRepository>
</pluginRepositories>
<properties>
<talend.nexus.host>https://artifacts-oss.talend.com</talend.nexus.host>
<product.final.name>${storage.prefix}-${product.timestamp}-V${product.version}${revision.filename}</product.final.name>
<studio.dir>${project.build.directory}/products/${project.artifactId}/${osgi.os}/${osgi.ws}/${osgi.arch}</studio.dir>
<bom.out.dir>${project.build.directory}/products/${project.artifactId}-bom</bom.out.dir>
<bom.final.name.prefix>${storage.prefix}-${product.timestamp}-V${product.version}-${revision.filename}</bom.final.name.prefix>
<bom.final.name>${bom.final.name.prefix}-bom.xlsx</bom.final.name>
</properties>
<build>
@@ -110,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>
@@ -118,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>
@@ -206,6 +230,24 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.talend.studio</groupId>
<artifactId>bomtool</artifactId>
<version>1.0.0-SNAPSHOT</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>genNotice</goal>
</goals>
</execution>
</executions>
<configuration>
<studioDirectory>${studio.dir}</studioDirectory>
<outputDirectory>${bom.out.dir}</outputDirectory>
<productVersion>${product.version}</productVersion>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
@@ -497,6 +539,19 @@
<mkdir dir="${product.dir}" />
<echo>Moving product ZIP ${project.build.directory}/products/${product.final.name}.zip to ${product.dir}</echo>
<move todir="${product.dir}" file="${project.build.directory}/products/${product.final.name}.zip" />
<!-- Copy bom -->
<property name="bom.build.path" value="${product.build.id}/BOMS" />
<property name="bom.dir" value="${storage}/${bom.build.path}" />
<mkdir dir="${bom.dir}" />
<echo>Copying ${bom.out.dir}/BOM.xlsx to ${bom.dir}/${bom.final.name}</echo>
<copy tofile="${bom.dir}/${bom.final.name}" file="${bom.out.dir}/BOM.xlsx" />
<echo>Copying ${bom.out.dir}/jarlist.json to ${bom.dir}/${bom.final.name.prefix}-jarlist.json</echo>
<copy tofile="${bom.dir}/${bom.final.name.prefix}-jarlist.json" file="${bom.out.dir}/jarlist.json" />
<echo>Copying ${bom.out.dir}/NOTICE.txt to ${bom.dir}/${bom.final.name.prefix}-NOTICE.txt</echo>
<copy tofile="${bom.dir}/${bom.final.name.prefix}-NOTICE.txt" file="${bom.out.dir}/NOTICE.txt" />
<echo>Copying ${bom.out.dir}/report.txt to ${bom.dir}/${bom.final.name.prefix}-report.txt</echo>
<copy tofile="${bom.dir}/${bom.final.name.prefix}-report.txt" file="${bom.out.dir}/report.txt" />
<if>
<and>
<equals arg1="${env.HUDSON_URL}" arg2="http://newbuild.talend.com:8180/" />
@@ -504,6 +559,10 @@
</and>
<then>
<echo file="${storage}/lastnb.txt" append="true">http://newbuild.talend.com/builds/${product.build.path}/${product.final.name}.zip${line.separator}</echo>
<echo file="${storage}/lastnb.txt" append="true">http://newbuild.talend.com/builds/${bom.build.path}/${bom.final.name}${line.separator}</echo>
<echo file="${storage}/lastnb.txt" append="true">http://newbuild.talend.com/builds/${bom.build.path}/${bom.final.name.prefix}-jarlist.json${line.separator}</echo>
<echo file="${storage}/lastnb.txt" append="true">http://newbuild.talend.com/builds/${bom.build.path}/${bom.final.name.prefix}-NOTICE.txt${line.separator}</echo>
<echo file="${storage}/lastnb.txt" append="true">http://newbuild.talend.com/builds/${bom.build.path}/${bom.final.name.prefix}-report.txt${line.separator}</echo>
</then>
</if>
<exec executable="openssl" dir="${product.dir}" outputproperty="sha256">

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.3.1-PATCH</version>
<version>7.4.1-M5</version>
<relativePath />
</parent>

View File

@@ -3,23 +3,24 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.talend.studio</groupId>
<artifactId>parent-pom</artifactId>
<version>7.3.1-PATCH</version>
<version>7.4.1-M5</version>
<packaging>pom</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<components.version>0.28.16</components.version>
<daikon.version>0.31.10</daikon.version>
<components.version>0.29.0-SNAPSHOT</components.version>
<daikon.version>0.31.11</daikon.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.10</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.0-SNAPSHOT</studio-utils.version>
<tycho.version>0.22.0</tycho.version>
<tycho-extras.version>${tycho.version}</tycho-extras.version>
<base.version>7.3.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>${base.version}</osgi.compatible.version>
<osgi.compatible.version>${base.version}.M5</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}</maven.compatible.version>
<maven.compatible.version>${base.version}-M5</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>
@@ -35,8 +36,9 @@
<equinox.build>org.eclipse.equinox.launcher_1.5.200.v20180922-1751.jar</equinox.build>
<opensourcesnapshot-repo.url>${talend.nexus.url}/TalendOpenSourceSnapshot</opensourcesnapshot-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}.PATCH/talend-tos-p2-repo-${osgi.compatible.version}.PATCH.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}-PATCH/dependencies.p2.tos-${maven.compatible.version}-PATCH.zip-unzip/</tos-deps-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>
<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>
@@ -276,8 +283,8 @@
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<release.suffix>-PATCH</release.suffix>
<revision.filename>PATCH</revision.filename>
<release.suffix>-SNAPSHOT</release.suffix>
<revision.filename>SNAPSHOT</revision.filename>
<product.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</product.version>
</properties>
<build>