From 8b501aa212f54a83c2f156e5a292dc00425f3834 Mon Sep 17 00:00:00 2001
From: jdyer1 <jdyer@apache.org>
Date: Wed, 18 Oct 2023 13:06:44 -0500
Subject: [PATCH] WN-5141

- initial attempt to update references javax>jakarta and get things to compile
---
 apps/showcase/pom.xml                                           | 2 +-
 .../apache/struts2/interceptor/FileUploadInterceptorTest.java   | 1 -
 .../test/java/org/apache/struts2/views/jsp/IncludeTagTest.java  | 1 -
 core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java | 1 +
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index b9e123165..d39ba1164 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -95,7 +95,7 @@
 
         <dependency>
             <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId> 
+            <artifactId>jakarta.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
diff --git a/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
index 7bf286030..d3d24ac78 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
@@ -38,7 +38,6 @@ import org.apache.struts2.dispatcher.multipart.JakartaMultiPartRequest;
 import org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper;
 import org.apache.struts2.dispatcher.multipart.StrutsUploadedFile;
 import org.apache.struts2.dispatcher.multipart.UploadedFile;
-import org.junit.Ignore;
 import org.springframework.mock.web.MockHttpServletRequest;
 
 import com.opensymphony.xwork2.ActionContext;
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java
index 4ff0533cf..7ca1daf12 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java
@@ -26,7 +26,6 @@ import static org.easymock.EasyMock.verify;
 
 import org.apache.struts2.StrutsException;
 import org.apache.struts2.components.Include;
-import org.springframework.mock.web.MockRequestDispatcher;
 
 import jakarta.servlet.RequestDispatcher;
 import jakarta.servlet.ServletRequest;
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
index f90999183..633598837 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
@@ -47,6 +47,7 @@ import com.opensymphony.xwork2.inject.Container;
 import jakarta.servlet.http.HttpSession;
 import jakarta.servlet.jsp.JspWriter;
 
+
 /**
  * Unit test for {@link URLTag}.
  */