From a8600a6d24500851f9c596aa7b123dbc932ca8e2 Mon Sep 17 00:00:00 2001
From: Alexander Fedorov <alexander.fedorov@arsysop.ru>
Date: Mon, 21 Nov 2022 10:20:25 +0300
Subject: [PATCH] Switch from javax.servlet to jakarta.servlet #1151

Switch setup and target to jakarta.servlet
Remove Orbit 2022-03

Signed-off-by: Alexander Fedorov <alexander.fedorov@arsysop.ru>
---
 releng/org.eclipse.passage.releng/passage.setup           | 8 ++------
 .../org.eclipse.passage.target.target                     | 5 +----
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/releng/org.eclipse.passage.releng/passage.setup b/releng/org.eclipse.passage.releng/passage.setup
index 4a2ef6c3e..5c48bc0c2 100644
--- a/releng/org.eclipse.passage.releng/passage.setup
+++ b/releng/org.eclipse.passage.releng/passage.setup
@@ -260,11 +260,9 @@
         <requirement
             name="com.sun.jna.platform"/>
         <requirement
-            name="javax.activation"/>
-        <requirement
-            name="javax.mail"/>
+            name="jakarta.servlet"/>
         <requirement
-            name="javax.servlet"/>
+            name="javax.activation"/>
         <requirement
             name="org.apache.commons.csv"
             versionRange="[1.4.0,2.0.0)"/>
@@ -351,8 +349,6 @@
               url="https://download.eclipse.org/tools/gef/classic/releases/3.14.0/"/>
           <repository
               url="https://download.eclipse.org/tools/orbit/downloads/2022-12"/>
-          <repository
-              url="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
         </repositoryList>
       </targlet>
     </setupTask>
diff --git a/releng/org.eclipse.passage.target/org.eclipse.passage.target.target b/releng/org.eclipse.passage.target/org.eclipse.passage.target.target
index fbc57953f..55f4ef559 100644
--- a/releng/org.eclipse.passage.target/org.eclipse.passage.target.target
+++ b/releng/org.eclipse.passage.target/org.eclipse.passage.target.target
@@ -78,6 +78,7 @@
 			<unit id="com.github.oshi.oshi-core" version="0.0.0"/>
 			<unit id="com.sun.jna" version="4.5.1.v20210503-0343"/>
 			<unit id="com.sun.jna.platform" version="4.5.1.v20221112-0806"/>
+			<unit id="jakarta.servlet" version="0.0.0"/>
 			<unit id="javax.activation" version="0.0.0"/>
 			<unit id="org.apache.commons.csv" version="0.0.0"/>
 			<unit id="org.apache.logging.log4j" version="0.0.0"/>
@@ -89,9 +90,5 @@
 			<unit id="org.slf4j.api" version="0.0.0"/>
 			<unit id="org.slf4j.apis.log4j" version="0.0.0"/>
 		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
-			<unit id="javax.servlet" version="0.0.0"/>
-		</location>
 	</locations>
 </target>