From 664276b0f7b90387aad92f302386e0d041bddf01 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Thu, 28 Apr 2022 09:00:46 +0200
Subject: [PATCH] Add org.apache.felix:org.apache.felix.http.servlet-api:1.2.0

from Maven-Central and remove jakarta.servlet-api and jetty-servlet-api
in favor of that.

Prerequisite of https://github.com/eclipse-equinox/equinox/pull/403
and therefore part of
https://github.com/eclipse-equinox/equinox/issues/18
---
 .../platformOptions.txt                            |  2 +-
 .../bundles/org.eclipse.platform.doc.isv/pom.xml   |  2 +-
 .../eclipse-sdk-prereqs.target                     | 14 ++++----------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt
index 5c3a6cb09d3..7729638471a 100644
--- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt
+++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt
@@ -140,7 +140,7 @@
 ;${dependency.dir}/javax.el-api_*.jar
 ;${dependency.dir}/jakarta.inject-api_*.jar
 ;${dependency.dir}/javax.servlet.jsp-api_*.jar
-;${dependency.dir}/jakarta.servlet-api_*.jar
+;${dependency.dir}/org.apache.felix.http.servlet-api_*.jar
 ;${dependency.dir}/org.apache.ant_*/lib/ant.jar
 ;${dependency.dir}/org.apache.batik.css_*.jar
 ;${dependency.dir}/org.apache.commons.jxpath_*.jar
diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
index 43d4177866b..19e40df7f3d 100644
--- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
+++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
@@ -93,7 +93,7 @@
                   </requirement>
                   <requirement>
                     <type>eclipse-plugin</type>
-                    <id>jakarta.servlet-api</id>
+                    <id>org.apache.felix.http.servlet-api</id>
                     <versionRange>0.0.0</versionRange>
                   </requirement>
                   <requirement>
diff --git a/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target b/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
index 3611159ad11..a5851365ee4 100644
--- a/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
+++ b/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
@@ -216,10 +216,10 @@
 				  <type>jar</type>
 			  </dependency>
 			  <dependency>
-				  <groupId>jakarta.servlet</groupId>
-				  <artifactId>jakarta.servlet-api</artifactId>
-				  <version>4.0.4</version>
-				  <type>jar</type>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>org.apache.felix.http.servlet-api</artifactId>
+				<version>1.2.0</version>
+				<type>jar</type>
 			  </dependency>
 			  <dependency>
 				  <groupId>javax.servlet.jsp</groupId>
@@ -227,12 +227,6 @@
 				  <version>2.3.3</version>
 				  <type>jar</type>
 			  </dependency>
-			  <dependency>
-				  <groupId>org.eclipse.jetty.toolchain</groupId>
-				  <artifactId>jetty-servlet-api</artifactId>
-				  <version>4.0.6</version>
-				  <type>jar</type>
-			  </dependency>
 			  <dependency>
 				  <groupId>org.eclipse.jetty</groupId>
 				  <artifactId>jetty-http</artifactId>