From 6d0c0ab2d67425c50dfbc2e96232d65a00319b65 Mon Sep 17 00:00:00 2001
From: Martin Lippert <lippertm@vmware.com>
Date: Wed, 5 May 2021 10:20:16 +0200
Subject: [PATCH] update tycho version and do not restrict javax.servlet
 package resolution to a specific bundle anymore

---
 eclipse-distribution/pom.xml     | 12 +-----------
 eclipse-language-servers/pom.xml | 10 ----------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index c62e7ad5b..89117233d 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -96,7 +96,7 @@
 
 		<sts4-language-servers-p2-repo>https://dist.springsource.com/${dist.type}/TOOLS/sts4-language-server-integrations/${sts4-language-servers-version}</sts4-language-servers-p2-repo>
 		
-		<tycho-version>1.7.0</tycho-version>
+		<tycho-version>2.3.0</tycho-version>
 		<encoding>UTF-8</encoding>
 
 		<misc.p2.repo.version>3.9.4.202003091750</misc.p2.repo.version>
@@ -849,16 +849,6 @@
 								<arch>x86_64</arch>
 							</environment>
 						</environments>
-						<filters>
-							<filter>
-								<type>java-package</type>
-								<id>javax.servlet</id>
-								<restrictTo>
-									<type>eclipse-plugin</type>
-									<id>javax.servlet</id>
-								</restrictTo>
-							</filter>
-						</filters>
 					</configuration>
 				</plugin>
 				<plugin>
diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index 6d64b8a88..3d6173801 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -531,16 +531,6 @@
 								<arch>x86_64</arch>
 							</environment>
 						</environments>
-						<filters>
-							<filter>
-								<type>java-package</type>
-								<id>javax.servlet</id>
-								<restrictTo>
-									<type>eclipse-plugin</type>
-									<id>javax.servlet</id>
-								</restrictTo>
-							</filter>
-						</filters>
 					</configuration>
 				</plugin>
 				<plugin>