From cba5e41f36a8658a58f57ec370b7e183d533996e Mon Sep 17 00:00:00 2001
From: rmartinc <rmartinc@redhat.com>
Date: Mon, 11 Jul 2022 15:50:33 +0200
Subject: [PATCH] [UNDERTOW-2122] Javax imports in servlet tests

---
 core/pom.xml                                              | 1 +
 servlet/pom.xml                                           | 1 +
 .../servlet/test/redirect/RelativeRedirectServlet.java    | 8 ++++----
 .../test/redirect/RelativeRedirectServletTestCase.java    | 2 +-
 websockets-jsr/pom.xml                                    | 1 +
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 90ffb1bb70..2c3e59dba7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -239,6 +239,7 @@
                 <configuration>
                     <enableAssertions>true</enableAssertions>
                     <runOrder>reversealphabetical</runOrder>
+                    <failIfNoTests>true</failIfNoTests>
                     <systemPropertyVariables>
                         <test.ajp>${ajp}</test.ajp>
                         <test.proxy>${proxy}</test.proxy>
diff --git a/servlet/pom.xml b/servlet/pom.xml
index c015b40038..291c4d9f9c 100644
--- a/servlet/pom.xml
+++ b/servlet/pom.xml
@@ -197,6 +197,7 @@
                 <configuration>
                     <enableAssertions>true</enableAssertions>
                     <runOrder>reversealphabetical</runOrder>
+                    <failIfNoTests>true</failIfNoTests>
                     <systemPropertyVariables>
                         <test.ajp>${ajp}</test.ajp>
                         <test.proxy>${proxy}</test.proxy>
diff --git a/servlet/src/test/java/io/undertow/servlet/test/redirect/RelativeRedirectServlet.java b/servlet/src/test/java/io/undertow/servlet/test/redirect/RelativeRedirectServlet.java
index 8a9e5fc452..5cffc0215a 100644
--- a/servlet/src/test/java/io/undertow/servlet/test/redirect/RelativeRedirectServlet.java
+++ b/servlet/src/test/java/io/undertow/servlet/test/redirect/RelativeRedirectServlet.java
@@ -19,10 +19,10 @@
 
 import java.io.IOException;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  *
diff --git a/servlet/src/test/java/io/undertow/servlet/test/redirect/RelativeRedirectServletTestCase.java b/servlet/src/test/java/io/undertow/servlet/test/redirect/RelativeRedirectServletTestCase.java
index db50af5dc6..3ccf0ebfa3 100644
--- a/servlet/src/test/java/io/undertow/servlet/test/redirect/RelativeRedirectServletTestCase.java
+++ b/servlet/src/test/java/io/undertow/servlet/test/redirect/RelativeRedirectServletTestCase.java
@@ -19,7 +19,7 @@
 
 import static io.undertow.servlet.Servlets.servlet;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpGet;
diff --git a/websockets-jsr/pom.xml b/websockets-jsr/pom.xml
index db1b99e1c5..a48e6ad486 100644
--- a/websockets-jsr/pom.xml
+++ b/websockets-jsr/pom.xml
@@ -171,6 +171,7 @@
                     <runOrder>reversealphabetical</runOrder>
                     <skip>${skipWebSocketTests}</skip>
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                    <failIfNoTests>true</failIfNoTests>
                     <systemPropertyVariables>
                         <proxy>${proxy}</proxy>
                         <default.server.address>localhost</default.server.address>