From 64fd359bc3ffa2661e682846826265bbf7384e61 Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Fri, 28 Jan 2022 12:56:30 +0100
Subject: [PATCH] Fixes after merge.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
---
 .../handler/SecuredRedirectHandlerCodeTest.java      |  3 +--
 pom.xml                                              | 12 ++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/SecuredRedirectHandlerCodeTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/SecuredRedirectHandlerCodeTest.java
index 615f0aa5e1f..abd00b71020 100644
--- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/SecuredRedirectHandlerCodeTest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/SecuredRedirectHandlerCodeTest.java
@@ -20,8 +20,7 @@ import java.net.URL;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLSocketFactory;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.HttpConfiguration;
diff --git a/pom.xml b/pom.xml
index 4acd639277c..ea2432d58ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
     <jakarta.activation.api.version>2.0.1</jakarta.activation.api.version>
     <jakarta.annotation.api.version>2.0.0</jakarta.annotation.api.version>
     <jakarta.authentication.api.version>2.0.0</jakarta.authentication.api.version>
-    <jakarta.el-api.version>4.0.0</jakarta.el-api.version>
+    <jakarta.el.api.version>4.0.0</jakarta.el.api.version>
     <jakarta.enterprise.cdi.api.version>3.0.0</jakarta.enterprise.cdi.api.version>
     <jakarta.inject.api.version>2.0.0</jakarta.inject.api.version>
     <jakarta.interceptor.api.version>2.0.0</jakarta.interceptor.api.version>
@@ -66,7 +66,7 @@
     <jakarta.servlet.api.version>5.0.0</jakarta.servlet.api.version>
     <jakarta.servlet.jsp.api.version>3.0.0</jakarta.servlet.jsp.api.version>
     <jakarta.servlet.jsp.jstl.api.version>2.0.0</jakarta.servlet.jsp.jstl.api.version>
-    <jakarta.servlet.jsp.jstl.impl.version>2.0.0</jakarta.servlet.jsp.jstl.impl.version>
+    <jakarta.servlet.jsp.jstl.impl.version>2.0.0</jakarta.servlet.jsp.jstl.impl.version> <!-- TODO: remove? -->
     <jakarta.transaction-api.version>2.0.0</jakarta.transaction-api.version>
     <jakarta.websocket.api.version>2.0.0</jakarta.websocket.api.version>
     <jakarta.ws.rs.api.version>3.0.0</jakarta.ws.rs.api.version>
@@ -75,10 +75,10 @@
     <jakarta.xml.jaxws.impl.version>3.0.2</jakarta.xml.jaxws.impl.version>
     <jakarta.xml.ws.api.version>3.0.1</jakarta.xml.ws.api.version>
     <jamon.version>2.82</jamon.version>
-    <javax.activation.impl.version>1.1.0.v201105071233</javax.activation.impl.version>
-    <javax.cdi.api.version>2.0</javax.cdi.api.version>
-    <javax.mail.glassfish.version>1.4.1.v201005082020</javax.mail.glassfish.version>
-    <javax.security.auth.message.version>1.0.0.v201108011116</javax.security.auth.message.version>
+    <javax.activation.impl.version>1.1.0.v201105071233</javax.activation.impl.version> <!-- TODO: remove? -->
+    <javax.cdi.api.version>2.0</javax.cdi.api.version> <!-- TODO: remove? -->
+    <javax.mail.glassfish.version>1.4.1.v201005082020</javax.mail.glassfish.version> <!-- TODO: remove? -->
+    <javax.security.auth.message.version>1.0.0.v201108011116</javax.security.auth.message.version> <!-- TODO: remove? -->
     <jboss.logging.annotations.version>2.2.1.Final</jboss.logging.annotations.version>
     <jboss.logging.processor.version>2.2.1.Final</jboss.logging.processor.version>
     <jboss.logging.version>3.4.3.Final</jboss.logging.version>