diff --git a/.env b/.env index 9c189ff3b..40fae83d9 100644 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ VERSION=3.1 -TOMCAT_DOCKER_VERSION=9.0-jre17-temurin +TOMCAT_DOCKER_VERSION=10.1-jre17-temurin DB_VERSION=10.6.11 MONGODB_VERSION=4.1.13 diff --git a/pom.xml b/pom.xml index 303618e4c..2fcf4f27d 100644 --- a/pom.xml +++ b/pom.xml @@ -68,11 +68,11 @@ jtidy r938 - + - com.sun.mail - javax.mail - 1.6.2 + org.eclipse.angus + angus-mail + 2.0.3 @@ -81,23 +81,26 @@ mongo-java-driver 3.12.14 + - javax - javaee-api - 8.0.1 + jakarta.servlet + jakarta.servlet-api + 6.0.0 provided + + - javax.servlet - javax.servlet-api - 4.0.1 - provided + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + 3.0.0 - - jstl - jstl - 1.2 + org.glassfish.web + jakarta.servlet.jsp.jstl + 3.0.1 @@ -147,7 +150,7 @@ org.springframework spring-test - 5.3.31 + 6.1.21 test @@ -155,30 +158,21 @@ org.springframework spring-core - 6.0.2 - test - - - - - org.springframework - spring-mock - 2.0.8 + 6.1.21 test - - com.github.fakemongo - fongo - 2.1.1 - test - + org.springframework spring-context - 5.3.31 + 6.1.21 diff --git a/src/it/java/servlets/LoginIT.java b/src/it/java/servlets/LoginIT.java index 3198098ae..c01e99e8d 100644 --- a/src/it/java/servlets/LoginIT.java +++ b/src/it/java/servlets/LoginIT.java @@ -7,7 +7,7 @@ import dbProcs.Setter; import java.io.IOException; import java.sql.SQLException; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeAll; diff --git a/src/it/java/servlets/LogoutIT.java b/src/it/java/servlets/LogoutIT.java index a8ccd57c5..1287fbb22 100644 --- a/src/it/java/servlets/LogoutIT.java +++ b/src/it/java/servlets/LogoutIT.java @@ -5,7 +5,7 @@ import dbProcs.GetterIT; import java.io.IOException; import java.sql.SQLException; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeAll; diff --git a/src/it/java/servlets/SetupIT.java b/src/it/java/servlets/SetupIT.java index 0b98dd32d..4a74f326b 100644 --- a/src/it/java/servlets/SetupIT.java +++ b/src/it/java/servlets/SetupIT.java @@ -12,7 +12,7 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import java.sql.SQLException; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import org.apache.commons.io.FileUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/it/java/servlets/admin/config/DisableCheatsIT.java b/src/it/java/servlets/admin/config/DisableCheatsIT.java index 951f6ba45..5455490df 100644 --- a/src/it/java/servlets/admin/config/DisableCheatsIT.java +++ b/src/it/java/servlets/admin/config/DisableCheatsIT.java @@ -6,7 +6,7 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.sql.SQLException; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeAll; diff --git a/src/it/java/servlets/admin/config/DisableFeedbackIT.java b/src/it/java/servlets/admin/config/DisableFeedbackIT.java index 5015f47cd..57ca58e1e 100644 --- a/src/it/java/servlets/admin/config/DisableFeedbackIT.java +++ b/src/it/java/servlets/admin/config/DisableFeedbackIT.java @@ -4,7 +4,7 @@ import java.io.IOException; import java.sql.SQLException; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeAll; diff --git a/src/it/java/servlets/admin/config/DisableScoreboardIT.java b/src/it/java/servlets/admin/config/DisableScoreboardIT.java index e9ecdbed7..d54b45b9c 100644 --- a/src/it/java/servlets/admin/config/DisableScoreboardIT.java +++ b/src/it/java/servlets/admin/config/DisableScoreboardIT.java @@ -4,7 +4,7 @@ import java.io.IOException; import java.sql.SQLException; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeAll; diff --git a/src/it/java/servlets/admin/config/EnableCheatsIT.java b/src/it/java/servlets/admin/config/EnableCheatsIT.java index 0b74ec4a7..1cbc5de1c 100644 --- a/src/it/java/servlets/admin/config/EnableCheatsIT.java +++ b/src/it/java/servlets/admin/config/EnableCheatsIT.java @@ -4,7 +4,7 @@ import java.io.IOException; import java.sql.SQLException; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeAll; diff --git a/src/it/java/servlets/admin/config/EnableFeedbackIT.java b/src/it/java/servlets/admin/config/EnableFeedbackIT.java index 9d3276d4c..aa109a611 100644 --- a/src/it/java/servlets/admin/config/EnableFeedbackIT.java +++ b/src/it/java/servlets/admin/config/EnableFeedbackIT.java @@ -4,7 +4,7 @@ import java.io.IOException; import java.sql.SQLException; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeAll; diff --git a/src/it/java/servlets/admin/config/SetCtfModeIT.java b/src/it/java/servlets/admin/config/SetCtfModeIT.java index ea7ba6b83..8129eb7e2 100644 --- a/src/it/java/servlets/admin/config/SetCtfModeIT.java +++ b/src/it/java/servlets/admin/config/SetCtfModeIT.java @@ -4,7 +4,7 @@ import java.io.IOException; import java.sql.SQLException; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeAll; diff --git a/src/it/java/servlets/admin/config/SetOpenFloorModeIT.java b/src/it/java/servlets/admin/config/SetOpenFloorModeIT.java index bf943868e..c9efa8ba0 100644 --- a/src/it/java/servlets/admin/config/SetOpenFloorModeIT.java +++ b/src/it/java/servlets/admin/config/SetOpenFloorModeIT.java @@ -4,7 +4,7 @@ import java.io.IOException; import java.sql.SQLException; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeAll; diff --git a/src/it/java/servlets/admin/config/SetTournamentModeIT.java b/src/it/java/servlets/admin/config/SetTournamentModeIT.java index cc48a5cb6..3a92e370a 100644 --- a/src/it/java/servlets/admin/config/SetTournamentModeIT.java +++ b/src/it/java/servlets/admin/config/SetTournamentModeIT.java @@ -4,7 +4,7 @@ import java.io.IOException; import java.sql.SQLException; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeAll; diff --git a/src/it/java/servlets/admin/config/ToggleRegistrationIT.java b/src/it/java/servlets/admin/config/ToggleRegistrationIT.java index 65246e3d3..42a486f64 100644 --- a/src/it/java/servlets/admin/config/ToggleRegistrationIT.java +++ b/src/it/java/servlets/admin/config/ToggleRegistrationIT.java @@ -4,7 +4,7 @@ import java.io.IOException; import java.sql.SQLException; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeAll; diff --git a/src/it/java/servlets/admin/moduleManagement/CloseAllModulesTestIT.java b/src/it/java/servlets/admin/moduleManagement/CloseAllModulesTestIT.java index 37ff10b1c..c0625fb8a 100644 --- a/src/it/java/servlets/admin/moduleManagement/CloseAllModulesTestIT.java +++ b/src/it/java/servlets/admin/moduleManagement/CloseAllModulesTestIT.java @@ -4,7 +4,7 @@ import java.io.IOException; import java.sql.SQLException; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeAll; diff --git a/src/it/java/servlets/admin/moduleManagement/EnableModuleBlockIT.java b/src/it/java/servlets/admin/moduleManagement/EnableModuleBlockIT.java index 6df6cf9a7..696263aea 100644 --- a/src/it/java/servlets/admin/moduleManagement/EnableModuleBlockIT.java +++ b/src/it/java/servlets/admin/moduleManagement/EnableModuleBlockIT.java @@ -4,7 +4,7 @@ import java.io.IOException; import java.sql.SQLException; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeAll; diff --git a/src/it/java/servlets/admin/moduleManagement/GetFeedbackIT.java b/src/it/java/servlets/admin/moduleManagement/GetFeedbackIT.java index 6f2a1c4cc..63250bf16 100644 --- a/src/it/java/servlets/admin/moduleManagement/GetFeedbackIT.java +++ b/src/it/java/servlets/admin/moduleManagement/GetFeedbackIT.java @@ -5,7 +5,7 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.sql.SQLException; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeAll; diff --git a/src/it/java/servlets/admin/moduleManagement/GetJsonProgressIT.java b/src/it/java/servlets/admin/moduleManagement/GetJsonProgressIT.java index c232bf8b9..041806576 100644 --- a/src/it/java/servlets/admin/moduleManagement/GetJsonProgressIT.java +++ b/src/it/java/servlets/admin/moduleManagement/GetJsonProgressIT.java @@ -4,7 +4,7 @@ import java.io.IOException; import java.sql.SQLException; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeAll; diff --git a/src/it/java/servlets/admin/moduleManagement/OpenAllModulesIT.java b/src/it/java/servlets/admin/moduleManagement/OpenAllModulesIT.java index 6ec680cbe..b8783e146 100644 --- a/src/it/java/servlets/admin/moduleManagement/OpenAllModulesIT.java +++ b/src/it/java/servlets/admin/moduleManagement/OpenAllModulesIT.java @@ -6,7 +6,7 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.sql.SQLException; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeAll; diff --git a/src/it/java/servlets/admin/moduleManagement/OpenOrCloseByCategoryIT.java b/src/it/java/servlets/admin/moduleManagement/OpenOrCloseByCategoryIT.java index 8b1d22cba..9a7867ce5 100644 --- a/src/it/java/servlets/admin/moduleManagement/OpenOrCloseByCategoryIT.java +++ b/src/it/java/servlets/admin/moduleManagement/OpenOrCloseByCategoryIT.java @@ -5,7 +5,7 @@ import dbProcs.Setter; import java.io.IOException; import java.sql.SQLException; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeAll; diff --git a/src/it/java/servlets/admin/userManagement/DeletePlayersIT.java b/src/it/java/servlets/admin/userManagement/DeletePlayersIT.java index 34366824d..5204dbcec 100644 --- a/src/it/java/servlets/admin/userManagement/DeletePlayersIT.java +++ b/src/it/java/servlets/admin/userManagement/DeletePlayersIT.java @@ -6,7 +6,7 @@ import dbProcs.Setter; import java.io.IOException; import java.sql.SQLException; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeAll; diff --git a/src/it/java/servlets/api/LevelsIT.java b/src/it/java/servlets/api/LevelsIT.java index 23bdddc37..da29dede7 100644 --- a/src/it/java/servlets/api/LevelsIT.java +++ b/src/it/java/servlets/api/LevelsIT.java @@ -5,7 +5,7 @@ import dbProcs.Setter; import java.io.IOException; import java.sql.SQLException; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.json.JSONArray; diff --git a/src/it/java/servlets/module/GetModuleIT.java b/src/it/java/servlets/module/GetModuleIT.java index cef551958..e52f0bf3f 100644 --- a/src/it/java/servlets/module/GetModuleIT.java +++ b/src/it/java/servlets/module/GetModuleIT.java @@ -6,7 +6,7 @@ import dbProcs.Setter; import java.io.IOException; import java.sql.SQLException; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeAll; diff --git a/src/it/java/servlets/module/challenge/BrokenCryptoHomeMadeIT.java b/src/it/java/servlets/module/challenge/BrokenCryptoHomeMadeIT.java index 4c2c871f5..fd096eb18 100644 --- a/src/it/java/servlets/module/challenge/BrokenCryptoHomeMadeIT.java +++ b/src/it/java/servlets/module/challenge/BrokenCryptoHomeMadeIT.java @@ -8,7 +8,7 @@ import java.sql.SQLException; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeAll; diff --git a/src/it/java/servlets/module/challenge/NoSqlInjection1IT.java b/src/it/java/servlets/module/challenge/NoSqlInjection1IT.java index 1cfddd769..01448540d 100644 --- a/src/it/java/servlets/module/challenge/NoSqlInjection1IT.java +++ b/src/it/java/servlets/module/challenge/NoSqlInjection1IT.java @@ -6,7 +6,7 @@ import dbProcs.Setter; import java.io.IOException; import java.sql.SQLException; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeAll; diff --git a/src/it/java/servlets/module/lesson/CsrfLessonIT.java b/src/it/java/servlets/module/lesson/CsrfLessonIT.java index f56f93655..0c1dd4d0f 100644 --- a/src/it/java/servlets/module/lesson/CsrfLessonIT.java +++ b/src/it/java/servlets/module/lesson/CsrfLessonIT.java @@ -6,7 +6,7 @@ import dbProcs.Setter; import java.io.IOException; import java.sql.SQLException; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeAll; diff --git a/src/it/java/servlets/module/lesson/SessionManagementLessonIT.java b/src/it/java/servlets/module/lesson/SessionManagementLessonIT.java index 577249667..45b2d7a68 100644 --- a/src/it/java/servlets/module/lesson/SessionManagementLessonIT.java +++ b/src/it/java/servlets/module/lesson/SessionManagementLessonIT.java @@ -6,7 +6,7 @@ import dbProcs.Setter; import java.io.IOException; import java.sql.SQLException; -import javax.servlet.http.Cookie; +import jakarta.servlet.http.Cookie; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeAll; diff --git a/src/main/java/listeners/DatabaseLifecycleListener.java b/src/main/java/listeners/DatabaseLifecycleListener.java index 3ba64ecd4..ef94963b9 100644 --- a/src/main/java/listeners/DatabaseLifecycleListener.java +++ b/src/main/java/listeners/DatabaseLifecycleListener.java @@ -2,9 +2,9 @@ import dbProcs.ConnectionPool; import dbProcs.MongoDatabase; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.annotation.WebListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.annotation.WebListener; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import servlets.Setup; diff --git a/src/main/java/servlets/ACS.java b/src/main/java/servlets/ACS.java index 3882c478b..ebbe06d9f 100644 --- a/src/main/java/servlets/ACS.java +++ b/src/main/java/servlets/ACS.java @@ -10,12 +10,12 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/servlets/ChangePassword.java b/src/main/java/servlets/ChangePassword.java index aede6289a..1713871c8 100644 --- a/src/main/java/servlets/ChangePassword.java +++ b/src/main/java/servlets/ChangePassword.java @@ -4,12 +4,12 @@ import dbProcs.Setter; import java.io.IOException; import java.math.BigInteger; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ShepherdLogManager; diff --git a/src/main/java/servlets/ChangeUsername.java b/src/main/java/servlets/ChangeUsername.java index 4e310ce3f..888cabfe4 100644 --- a/src/main/java/servlets/ChangeUsername.java +++ b/src/main/java/servlets/ChangeUsername.java @@ -2,12 +2,12 @@ import dbProcs.Setter; import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/GetJsonScore.java b/src/main/java/servlets/GetJsonScore.java index 158b763ae..f7b594417 100644 --- a/src/main/java/servlets/GetJsonScore.java +++ b/src/main/java/servlets/GetJsonScore.java @@ -3,12 +3,12 @@ import dbProcs.Getter; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import servlets.admin.moduleManagement.GetFeedback; diff --git a/src/main/java/servlets/Login.java b/src/main/java/servlets/Login.java index cfa533154..e651a913d 100644 --- a/src/main/java/servlets/Login.java +++ b/src/main/java/servlets/Login.java @@ -2,12 +2,12 @@ import dbProcs.Getter; import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.Hash; diff --git a/src/main/java/servlets/Logout.java b/src/main/java/servlets/Logout.java index 0da068f72..824463d6a 100644 --- a/src/main/java/servlets/Logout.java +++ b/src/main/java/servlets/Logout.java @@ -4,12 +4,12 @@ import com.onelogin.saml2.exception.Error; import com.onelogin.saml2.exception.SettingsException; import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.LoginMethod; diff --git a/src/main/java/servlets/MobileLogin.java b/src/main/java/servlets/MobileLogin.java index 9c8e794b6..ea4cedd43 100644 --- a/src/main/java/servlets/MobileLogin.java +++ b/src/main/java/servlets/MobileLogin.java @@ -3,12 +3,12 @@ import dbProcs.Getter; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.json.JSONObject; diff --git a/src/main/java/servlets/Register.java b/src/main/java/servlets/Register.java index 0cbbcf323..e7c66ed73 100644 --- a/src/main/java/servlets/Register.java +++ b/src/main/java/servlets/Register.java @@ -5,11 +5,11 @@ import java.io.IOException; import java.io.PrintWriter; import java.sql.SQLException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.OpenRegistration; diff --git a/src/main/java/servlets/SLS.java b/src/main/java/servlets/SLS.java index 996f52ed6..77b836dda 100644 --- a/src/main/java/servlets/SLS.java +++ b/src/main/java/servlets/SLS.java @@ -5,12 +5,12 @@ import com.onelogin.saml2.exception.SettingsException; import java.io.IOException; import java.util.List; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/servlets/SSOLogin.java b/src/main/java/servlets/SSOLogin.java index be2229ea1..074c25d9f 100644 --- a/src/main/java/servlets/SSOLogin.java +++ b/src/main/java/servlets/SSOLogin.java @@ -4,10 +4,10 @@ import com.onelogin.saml2.exception.Error; import com.onelogin.saml2.exception.SettingsException; 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; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ShepherdLogManager; diff --git a/src/main/java/servlets/SSOMetadata.java b/src/main/java/servlets/SSOMetadata.java index c8eb312c8..09c024752 100644 --- a/src/main/java/servlets/SSOMetadata.java +++ b/src/main/java/servlets/SSOMetadata.java @@ -5,10 +5,10 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.List; -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; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ShepherdLogManager; diff --git a/src/main/java/servlets/Setup.java b/src/main/java/servlets/Setup.java index bb08235f7..b84c75f31 100644 --- a/src/main/java/servlets/Setup.java +++ b/src/main/java/servlets/Setup.java @@ -26,10 +26,10 @@ import java.util.Properties; import java.util.ResourceBundle; import java.util.UUID; -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; import org.apache.commons.io.FileUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/servlets/SetupFilter.java b/src/main/java/servlets/SetupFilter.java index e30421005..5100d43e5 100644 --- a/src/main/java/servlets/SetupFilter.java +++ b/src/main/java/servlets/SetupFilter.java @@ -1,14 +1,14 @@ package servlets; import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.io.FilenameUtils; public class SetupFilter implements Filter { diff --git a/src/main/java/servlets/admin/config/ChangeCoreDatabase.java b/src/main/java/servlets/admin/config/ChangeCoreDatabase.java index 32ac6fae5..6bdce0e43 100644 --- a/src/main/java/servlets/admin/config/ChangeCoreDatabase.java +++ b/src/main/java/servlets/admin/config/ChangeCoreDatabase.java @@ -3,12 +3,12 @@ import dbProcs.Setter; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/admin/config/DisableCheats.java b/src/main/java/servlets/admin/config/DisableCheats.java index 5a9a709fc..4fda8cfd1 100644 --- a/src/main/java/servlets/admin/config/DisableCheats.java +++ b/src/main/java/servlets/admin/config/DisableCheats.java @@ -2,12 +2,12 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.CheatSheetStatus; diff --git a/src/main/java/servlets/admin/config/DisableFeedback.java b/src/main/java/servlets/admin/config/DisableFeedback.java index db8d26f1c..c851f520f 100644 --- a/src/main/java/servlets/admin/config/DisableFeedback.java +++ b/src/main/java/servlets/admin/config/DisableFeedback.java @@ -2,12 +2,12 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.FeedbackStatus; diff --git a/src/main/java/servlets/admin/config/DisableScoreboard.java b/src/main/java/servlets/admin/config/DisableScoreboard.java index 96d59cde1..e9adf349a 100644 --- a/src/main/java/servlets/admin/config/DisableScoreboard.java +++ b/src/main/java/servlets/admin/config/DisableScoreboard.java @@ -2,12 +2,12 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ScoreboardStatus; diff --git a/src/main/java/servlets/admin/config/EnableCheats.java b/src/main/java/servlets/admin/config/EnableCheats.java index 563101758..648b4362c 100644 --- a/src/main/java/servlets/admin/config/EnableCheats.java +++ b/src/main/java/servlets/admin/config/EnableCheats.java @@ -2,12 +2,12 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.CheatSheetStatus; diff --git a/src/main/java/servlets/admin/config/EnableFeedback.java b/src/main/java/servlets/admin/config/EnableFeedback.java index 6503a0124..f0768d02f 100644 --- a/src/main/java/servlets/admin/config/EnableFeedback.java +++ b/src/main/java/servlets/admin/config/EnableFeedback.java @@ -2,12 +2,12 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.FeedbackStatus; diff --git a/src/main/java/servlets/admin/config/EnableScoreboard.java b/src/main/java/servlets/admin/config/EnableScoreboard.java index c1f34db06..a408104eb 100644 --- a/src/main/java/servlets/admin/config/EnableScoreboard.java +++ b/src/main/java/servlets/admin/config/EnableScoreboard.java @@ -3,12 +3,12 @@ import dbProcs.Getter; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/admin/config/SetCountdown.java b/src/main/java/servlets/admin/config/SetCountdown.java index ea18228a0..284e3ef91 100644 --- a/src/main/java/servlets/admin/config/SetCountdown.java +++ b/src/main/java/servlets/admin/config/SetCountdown.java @@ -3,12 +3,12 @@ import java.io.IOException; import java.io.PrintWriter; import java.time.LocalDateTime; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.CountdownHandler; diff --git a/src/main/java/servlets/admin/config/SetCtfMode.java b/src/main/java/servlets/admin/config/SetCtfMode.java index 8d1652f38..9ab7ae753 100644 --- a/src/main/java/servlets/admin/config/SetCtfMode.java +++ b/src/main/java/servlets/admin/config/SetCtfMode.java @@ -2,12 +2,12 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ModulePlan; diff --git a/src/main/java/servlets/admin/config/SetOpenFloorMode.java b/src/main/java/servlets/admin/config/SetOpenFloorMode.java index ba988ef31..789a5fa87 100644 --- a/src/main/java/servlets/admin/config/SetOpenFloorMode.java +++ b/src/main/java/servlets/admin/config/SetOpenFloorMode.java @@ -2,12 +2,12 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ModulePlan; diff --git a/src/main/java/servlets/admin/config/SetTournamentMode.java b/src/main/java/servlets/admin/config/SetTournamentMode.java index 7dc613232..0a314eb52 100644 --- a/src/main/java/servlets/admin/config/SetTournamentMode.java +++ b/src/main/java/servlets/admin/config/SetTournamentMode.java @@ -2,12 +2,12 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ModulePlan; diff --git a/src/main/java/servlets/admin/config/ToggleRegistration.java b/src/main/java/servlets/admin/config/ToggleRegistration.java index b080e9e72..805bf77cb 100644 --- a/src/main/java/servlets/admin/config/ToggleRegistration.java +++ b/src/main/java/servlets/admin/config/ToggleRegistration.java @@ -2,12 +2,12 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.OpenRegistration; diff --git a/src/main/java/servlets/admin/moduleManagement/CloseAllModules.java b/src/main/java/servlets/admin/moduleManagement/CloseAllModules.java index 1bfd04b37..db0bd7e83 100644 --- a/src/main/java/servlets/admin/moduleManagement/CloseAllModules.java +++ b/src/main/java/servlets/admin/moduleManagement/CloseAllModules.java @@ -3,12 +3,12 @@ import dbProcs.Setter; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ShepherdLogManager; diff --git a/src/main/java/servlets/admin/moduleManagement/EnableModuleBlock.java b/src/main/java/servlets/admin/moduleManagement/EnableModuleBlock.java index 2cb6c30c4..28e8438ef 100644 --- a/src/main/java/servlets/admin/moduleManagement/EnableModuleBlock.java +++ b/src/main/java/servlets/admin/moduleManagement/EnableModuleBlock.java @@ -3,12 +3,12 @@ import dbProcs.Getter; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ModuleBlock; diff --git a/src/main/java/servlets/admin/moduleManagement/GetFeedback.java b/src/main/java/servlets/admin/moduleManagement/GetFeedback.java index f8a6981a1..66ac02035 100644 --- a/src/main/java/servlets/admin/moduleManagement/GetFeedback.java +++ b/src/main/java/servlets/admin/moduleManagement/GetFeedback.java @@ -3,12 +3,12 @@ import dbProcs.Getter; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ShepherdLogManager; diff --git a/src/main/java/servlets/admin/moduleManagement/GetJsonProgress.java b/src/main/java/servlets/admin/moduleManagement/GetJsonProgress.java index acaf82412..96dd01ee0 100644 --- a/src/main/java/servlets/admin/moduleManagement/GetJsonProgress.java +++ b/src/main/java/servlets/admin/moduleManagement/GetJsonProgress.java @@ -3,12 +3,12 @@ import dbProcs.Getter; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ShepherdLogManager; diff --git a/src/main/java/servlets/admin/moduleManagement/GetProgress.java b/src/main/java/servlets/admin/moduleManagement/GetProgress.java index b84793f28..d14fb3131 100644 --- a/src/main/java/servlets/admin/moduleManagement/GetProgress.java +++ b/src/main/java/servlets/admin/moduleManagement/GetProgress.java @@ -3,12 +3,12 @@ import dbProcs.Getter; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ShepherdLogManager; diff --git a/src/main/java/servlets/admin/moduleManagement/OpenAllModules.java b/src/main/java/servlets/admin/moduleManagement/OpenAllModules.java index b9457366e..ad8d8f95f 100644 --- a/src/main/java/servlets/admin/moduleManagement/OpenAllModules.java +++ b/src/main/java/servlets/admin/moduleManagement/OpenAllModules.java @@ -3,12 +3,12 @@ import dbProcs.Setter; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import servlets.module.challenge.XxeChallenge1; diff --git a/src/main/java/servlets/admin/moduleManagement/OpenMobileModules.java b/src/main/java/servlets/admin/moduleManagement/OpenMobileModules.java index cae111c23..d15b0c83a 100644 --- a/src/main/java/servlets/admin/moduleManagement/OpenMobileModules.java +++ b/src/main/java/servlets/admin/moduleManagement/OpenMobileModules.java @@ -3,12 +3,12 @@ import dbProcs.Setter; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ShepherdLogManager; diff --git a/src/main/java/servlets/admin/moduleManagement/OpenOrCloseByCategory.java b/src/main/java/servlets/admin/moduleManagement/OpenOrCloseByCategory.java index e905b00ed..1747686d0 100644 --- a/src/main/java/servlets/admin/moduleManagement/OpenOrCloseByCategory.java +++ b/src/main/java/servlets/admin/moduleManagement/OpenOrCloseByCategory.java @@ -3,12 +3,12 @@ import dbProcs.Setter; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/admin/moduleManagement/OpenWebModules.java b/src/main/java/servlets/admin/moduleManagement/OpenWebModules.java index 1c49400cd..0ddc2e3cc 100644 --- a/src/main/java/servlets/admin/moduleManagement/OpenWebModules.java +++ b/src/main/java/servlets/admin/moduleManagement/OpenWebModules.java @@ -3,12 +3,12 @@ import dbProcs.Setter; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import servlets.module.challenge.XxeChallenge1; diff --git a/src/main/java/servlets/admin/moduleManagement/RemoveModuleLock.java b/src/main/java/servlets/admin/moduleManagement/RemoveModuleLock.java index ce0353ea7..1a245d085 100644 --- a/src/main/java/servlets/admin/moduleManagement/RemoveModuleLock.java +++ b/src/main/java/servlets/admin/moduleManagement/RemoveModuleLock.java @@ -2,12 +2,12 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ModuleBlock; diff --git a/src/main/java/servlets/admin/moduleManagement/SetModuleStatus.java b/src/main/java/servlets/admin/moduleManagement/SetModuleStatus.java index ae9fd2eb9..a9baa293c 100644 --- a/src/main/java/servlets/admin/moduleManagement/SetModuleStatus.java +++ b/src/main/java/servlets/admin/moduleManagement/SetModuleStatus.java @@ -3,12 +3,12 @@ import dbProcs.Setter; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ShepherdLogManager; diff --git a/src/main/java/servlets/admin/userManagement/AddPlayer.java b/src/main/java/servlets/admin/userManagement/AddPlayer.java index 401c32e48..9f6773e5f 100644 --- a/src/main/java/servlets/admin/userManagement/AddPlayer.java +++ b/src/main/java/servlets/admin/userManagement/AddPlayer.java @@ -4,12 +4,12 @@ import dbProcs.Setter; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/admin/userManagement/AssignPlayers.java b/src/main/java/servlets/admin/userManagement/AssignPlayers.java index 88389e336..cbeb501b3 100644 --- a/src/main/java/servlets/admin/userManagement/AssignPlayers.java +++ b/src/main/java/servlets/admin/userManagement/AssignPlayers.java @@ -4,12 +4,12 @@ import dbProcs.Setter; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/admin/userManagement/ChangeUserPassword.java b/src/main/java/servlets/admin/userManagement/ChangeUserPassword.java index 18aaa6615..c65a9cd43 100644 --- a/src/main/java/servlets/admin/userManagement/ChangeUserPassword.java +++ b/src/main/java/servlets/admin/userManagement/ChangeUserPassword.java @@ -4,12 +4,12 @@ import dbProcs.Setter; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/admin/userManagement/CreateClass.java b/src/main/java/servlets/admin/userManagement/CreateClass.java index 44205f7ca..e1bcf24d8 100644 --- a/src/main/java/servlets/admin/userManagement/CreateClass.java +++ b/src/main/java/servlets/admin/userManagement/CreateClass.java @@ -3,12 +3,12 @@ import dbProcs.Setter; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/admin/userManagement/CreateNewAdmin.java b/src/main/java/servlets/admin/userManagement/CreateNewAdmin.java index 873b4b282..2c8993e5a 100644 --- a/src/main/java/servlets/admin/userManagement/CreateNewAdmin.java +++ b/src/main/java/servlets/admin/userManagement/CreateNewAdmin.java @@ -3,12 +3,12 @@ import dbProcs.Setter; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/admin/userManagement/DeletePlayers.java b/src/main/java/servlets/admin/userManagement/DeletePlayers.java index 20eb82dfc..5af14dc70 100644 --- a/src/main/java/servlets/admin/userManagement/DeletePlayers.java +++ b/src/main/java/servlets/admin/userManagement/DeletePlayers.java @@ -4,12 +4,12 @@ import dbProcs.Setter; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/admin/userManagement/DowngradeAdmin.java b/src/main/java/servlets/admin/userManagement/DowngradeAdmin.java index f3223b215..ce54e698b 100644 --- a/src/main/java/servlets/admin/userManagement/DowngradeAdmin.java +++ b/src/main/java/servlets/admin/userManagement/DowngradeAdmin.java @@ -4,12 +4,12 @@ import dbProcs.Setter; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/admin/userManagement/GetPlayersByClass.java b/src/main/java/servlets/admin/userManagement/GetPlayersByClass.java index 3e7ea2b8d..e925dbe9e 100644 --- a/src/main/java/servlets/admin/userManagement/GetPlayersByClass.java +++ b/src/main/java/servlets/admin/userManagement/GetPlayersByClass.java @@ -5,12 +5,12 @@ import java.io.PrintWriter; import java.sql.ResultSet; import java.sql.SQLException; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/admin/userManagement/GiveTakePoints.java b/src/main/java/servlets/admin/userManagement/GiveTakePoints.java index 7cf8056d9..cc5ef8a21 100644 --- a/src/main/java/servlets/admin/userManagement/GiveTakePoints.java +++ b/src/main/java/servlets/admin/userManagement/GiveTakePoints.java @@ -4,12 +4,12 @@ import dbProcs.Setter; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/admin/userManagement/SetDefaultClass.java b/src/main/java/servlets/admin/userManagement/SetDefaultClass.java index 03c709ec1..ba54928da 100644 --- a/src/main/java/servlets/admin/userManagement/SetDefaultClass.java +++ b/src/main/java/servlets/admin/userManagement/SetDefaultClass.java @@ -3,12 +3,12 @@ import dbProcs.Getter; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/admin/userManagement/SuspendUser.java b/src/main/java/servlets/admin/userManagement/SuspendUser.java index 927392858..1d9e516bc 100644 --- a/src/main/java/servlets/admin/userManagement/SuspendUser.java +++ b/src/main/java/servlets/admin/userManagement/SuspendUser.java @@ -4,12 +4,12 @@ import dbProcs.Setter; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/admin/userManagement/UnSuspendUser.java b/src/main/java/servlets/admin/userManagement/UnSuspendUser.java index f28df6edc..f0b60401e 100644 --- a/src/main/java/servlets/admin/userManagement/UnSuspendUser.java +++ b/src/main/java/servlets/admin/userManagement/UnSuspendUser.java @@ -4,12 +4,12 @@ import dbProcs.Setter; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/admin/userManagement/UpgradePlayer.java b/src/main/java/servlets/admin/userManagement/UpgradePlayer.java index 3c08b835d..ec05ca54a 100644 --- a/src/main/java/servlets/admin/userManagement/UpgradePlayer.java +++ b/src/main/java/servlets/admin/userManagement/UpgradePlayer.java @@ -4,12 +4,12 @@ import dbProcs.Setter; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/api/Cheats.java b/src/main/java/servlets/api/Cheats.java index 95be4c3d9..7b9de449c 100644 --- a/src/main/java/servlets/api/Cheats.java +++ b/src/main/java/servlets/api/Cheats.java @@ -2,12 +2,12 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import utils.CheatSheetStatus; @WebServlet("/api/cheats") diff --git a/src/main/java/servlets/api/Levels.java b/src/main/java/servlets/api/Levels.java index 3e7c4d951..08be7a69e 100644 --- a/src/main/java/servlets/api/Levels.java +++ b/src/main/java/servlets/api/Levels.java @@ -4,12 +4,12 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.Locale; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.json.JSONArray; diff --git a/src/main/java/servlets/api/Scoreboard.java b/src/main/java/servlets/api/Scoreboard.java index fbac01fc0..5a33c9117 100644 --- a/src/main/java/servlets/api/Scoreboard.java +++ b/src/main/java/servlets/api/Scoreboard.java @@ -2,12 +2,12 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import utils.ScoreboardStatus; @WebServlet("/api/scoreboard") diff --git a/src/main/java/servlets/module/FeedbackSubmit.java b/src/main/java/servlets/module/FeedbackSubmit.java index 60d563384..7e3b2af3b 100644 --- a/src/main/java/servlets/module/FeedbackSubmit.java +++ b/src/main/java/servlets/module/FeedbackSubmit.java @@ -4,12 +4,12 @@ import dbProcs.Setter; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jsoup.parser.Parser; diff --git a/src/main/java/servlets/module/GetCheat.java b/src/main/java/servlets/module/GetCheat.java index fa401e795..9ca40693e 100644 --- a/src/main/java/servlets/module/GetCheat.java +++ b/src/main/java/servlets/module/GetCheat.java @@ -4,12 +4,12 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.Locale; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/GetModule.java b/src/main/java/servlets/module/GetModule.java index af47fb6dc..0f5d6f9d6 100644 --- a/src/main/java/servlets/module/GetModule.java +++ b/src/main/java/servlets/module/GetModule.java @@ -3,12 +3,12 @@ import dbProcs.Getter; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/ModuleServletTemplate.java b/src/main/java/servlets/module/ModuleServletTemplate.java index d4242a323..0ecbab85d 100644 --- a/src/main/java/servlets/module/ModuleServletTemplate.java +++ b/src/main/java/servlets/module/ModuleServletTemplate.java @@ -9,11 +9,11 @@ import java.sql.Statement; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/RefreshMenu.java b/src/main/java/servlets/module/RefreshMenu.java index 67947d806..6d786c035 100644 --- a/src/main/java/servlets/module/RefreshMenu.java +++ b/src/main/java/servlets/module/RefreshMenu.java @@ -6,12 +6,12 @@ import java.sql.SQLException; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/SolutionSubmit.java b/src/main/java/servlets/module/SolutionSubmit.java index 8d8aa346e..edc0b0335 100644 --- a/src/main/java/servlets/module/SolutionSubmit.java +++ b/src/main/java/servlets/module/SolutionSubmit.java @@ -6,12 +6,12 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/challenge/BrokenCrypto3.java b/src/main/java/servlets/module/challenge/BrokenCrypto3.java index 0f8f50dcc..560c0fb8a 100644 --- a/src/main/java/servlets/module/challenge/BrokenCrypto3.java +++ b/src/main/java/servlets/module/challenge/BrokenCrypto3.java @@ -4,11 +4,11 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/challenge/BrokenCrypto4.java b/src/main/java/servlets/module/challenge/BrokenCrypto4.java index 017031089..aa97fb161 100644 --- a/src/main/java/servlets/module/challenge/BrokenCrypto4.java +++ b/src/main/java/servlets/module/challenge/BrokenCrypto4.java @@ -9,11 +9,11 @@ import java.sql.ResultSet; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.Hash; diff --git a/src/main/java/servlets/module/challenge/BrokenCryptoHomeMade.java b/src/main/java/servlets/module/challenge/BrokenCryptoHomeMade.java index b6afa0c96..e85123520 100644 --- a/src/main/java/servlets/module/challenge/BrokenCryptoHomeMade.java +++ b/src/main/java/servlets/module/challenge/BrokenCryptoHomeMade.java @@ -13,12 +13,12 @@ import javax.crypto.Cipher; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.codec.binary.Base64; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/servlets/module/challenge/CsrfChallengeFive.java b/src/main/java/servlets/module/challenge/CsrfChallengeFive.java index a37cc267d..73fa19608 100644 --- a/src/main/java/servlets/module/challenge/CsrfChallengeFive.java +++ b/src/main/java/servlets/module/challenge/CsrfChallengeFive.java @@ -6,12 +6,12 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ShepherdLogManager; diff --git a/src/main/java/servlets/module/challenge/CsrfChallengeFour.java b/src/main/java/servlets/module/challenge/CsrfChallengeFour.java index 87ca8a4e7..db0450bca 100644 --- a/src/main/java/servlets/module/challenge/CsrfChallengeFour.java +++ b/src/main/java/servlets/module/challenge/CsrfChallengeFour.java @@ -6,12 +6,12 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ShepherdLogManager; diff --git a/src/main/java/servlets/module/challenge/CsrfChallengeJSON.java b/src/main/java/servlets/module/challenge/CsrfChallengeJSON.java index 8cb659b8e..ea1d9ef8c 100644 --- a/src/main/java/servlets/module/challenge/CsrfChallengeJSON.java +++ b/src/main/java/servlets/module/challenge/CsrfChallengeJSON.java @@ -6,12 +6,12 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ShepherdLogManager; diff --git a/src/main/java/servlets/module/challenge/CsrfChallengeOne.java b/src/main/java/servlets/module/challenge/CsrfChallengeOne.java index 4173f6949..06f93f3cb 100644 --- a/src/main/java/servlets/module/challenge/CsrfChallengeOne.java +++ b/src/main/java/servlets/module/challenge/CsrfChallengeOne.java @@ -6,12 +6,12 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ShepherdLogManager; diff --git a/src/main/java/servlets/module/challenge/CsrfChallengeSeven.java b/src/main/java/servlets/module/challenge/CsrfChallengeSeven.java index 73450b083..726fb31bb 100644 --- a/src/main/java/servlets/module/challenge/CsrfChallengeSeven.java +++ b/src/main/java/servlets/module/challenge/CsrfChallengeSeven.java @@ -6,12 +6,12 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ShepherdLogManager; diff --git a/src/main/java/servlets/module/challenge/CsrfChallengeSevenGetToken.java b/src/main/java/servlets/module/challenge/CsrfChallengeSevenGetToken.java index 74c288a69..0c4c1429b 100644 --- a/src/main/java/servlets/module/challenge/CsrfChallengeSevenGetToken.java +++ b/src/main/java/servlets/module/challenge/CsrfChallengeSevenGetToken.java @@ -8,11 +8,11 @@ import java.sql.ResultSet; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/challenge/CsrfChallengeSix.java b/src/main/java/servlets/module/challenge/CsrfChallengeSix.java index 43bc936cd..81f207251 100644 --- a/src/main/java/servlets/module/challenge/CsrfChallengeSix.java +++ b/src/main/java/servlets/module/challenge/CsrfChallengeSix.java @@ -6,12 +6,12 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ShepherdLogManager; diff --git a/src/main/java/servlets/module/challenge/CsrfChallengeSixGetToken.java b/src/main/java/servlets/module/challenge/CsrfChallengeSixGetToken.java index cb61a3d85..6ca9e62b5 100644 --- a/src/main/java/servlets/module/challenge/CsrfChallengeSixGetToken.java +++ b/src/main/java/servlets/module/challenge/CsrfChallengeSixGetToken.java @@ -8,11 +8,11 @@ import java.sql.ResultSet; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/challenge/CsrfChallengeTargetFive.java b/src/main/java/servlets/module/challenge/CsrfChallengeTargetFive.java index 3a0627115..0895a7744 100644 --- a/src/main/java/servlets/module/challenge/CsrfChallengeTargetFive.java +++ b/src/main/java/servlets/module/challenge/CsrfChallengeTargetFive.java @@ -7,11 +7,11 @@ import java.util.Locale; import java.util.Random; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ShepherdLogManager; diff --git a/src/main/java/servlets/module/challenge/CsrfChallengeTargetFour.java b/src/main/java/servlets/module/challenge/CsrfChallengeTargetFour.java index c090403dd..438ca0380 100644 --- a/src/main/java/servlets/module/challenge/CsrfChallengeTargetFour.java +++ b/src/main/java/servlets/module/challenge/CsrfChallengeTargetFour.java @@ -11,11 +11,11 @@ import java.sql.SQLException; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.Hash; diff --git a/src/main/java/servlets/module/challenge/CsrfChallengeTargetJSON.java b/src/main/java/servlets/module/challenge/CsrfChallengeTargetJSON.java index d68a2817a..02438beeb 100644 --- a/src/main/java/servlets/module/challenge/CsrfChallengeTargetJSON.java +++ b/src/main/java/servlets/module/challenge/CsrfChallengeTargetJSON.java @@ -7,11 +7,11 @@ import java.util.Locale; import java.util.ResourceBundle; import java.util.Scanner; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.json.JSONObject; diff --git a/src/main/java/servlets/module/challenge/CsrfChallengeTargetOne.java b/src/main/java/servlets/module/challenge/CsrfChallengeTargetOne.java index b076906bb..a1e552a71 100644 --- a/src/main/java/servlets/module/challenge/CsrfChallengeTargetOne.java +++ b/src/main/java/servlets/module/challenge/CsrfChallengeTargetOne.java @@ -6,11 +6,11 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ShepherdLogManager; diff --git a/src/main/java/servlets/module/challenge/CsrfChallengeTargetSeven.java b/src/main/java/servlets/module/challenge/CsrfChallengeTargetSeven.java index 179abc11f..48ddbfc43 100644 --- a/src/main/java/servlets/module/challenge/CsrfChallengeTargetSeven.java +++ b/src/main/java/servlets/module/challenge/CsrfChallengeTargetSeven.java @@ -6,11 +6,11 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.Hash; diff --git a/src/main/java/servlets/module/challenge/CsrfChallengeTargetSix.java b/src/main/java/servlets/module/challenge/CsrfChallengeTargetSix.java index 684fd90b2..33441a52e 100644 --- a/src/main/java/servlets/module/challenge/CsrfChallengeTargetSix.java +++ b/src/main/java/servlets/module/challenge/CsrfChallengeTargetSix.java @@ -7,11 +7,11 @@ import java.util.Locale; import java.util.Random; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ShepherdLogManager; diff --git a/src/main/java/servlets/module/challenge/CsrfChallengeTargetThree.java b/src/main/java/servlets/module/challenge/CsrfChallengeTargetThree.java index 550c978c4..ec321367c 100644 --- a/src/main/java/servlets/module/challenge/CsrfChallengeTargetThree.java +++ b/src/main/java/servlets/module/challenge/CsrfChallengeTargetThree.java @@ -6,11 +6,11 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ShepherdLogManager; diff --git a/src/main/java/servlets/module/challenge/CsrfChallengeTargetTwo.java b/src/main/java/servlets/module/challenge/CsrfChallengeTargetTwo.java index bba136e80..724045eed 100644 --- a/src/main/java/servlets/module/challenge/CsrfChallengeTargetTwo.java +++ b/src/main/java/servlets/module/challenge/CsrfChallengeTargetTwo.java @@ -6,11 +6,11 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ShepherdLogManager; diff --git a/src/main/java/servlets/module/challenge/CsrfChallengeThree.java b/src/main/java/servlets/module/challenge/CsrfChallengeThree.java index 448f4c290..299657a34 100644 --- a/src/main/java/servlets/module/challenge/CsrfChallengeThree.java +++ b/src/main/java/servlets/module/challenge/CsrfChallengeThree.java @@ -6,12 +6,12 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ShepherdLogManager; diff --git a/src/main/java/servlets/module/challenge/CsrfChallengeTwo.java b/src/main/java/servlets/module/challenge/CsrfChallengeTwo.java index bebec19ba..dce4fe863 100644 --- a/src/main/java/servlets/module/challenge/CsrfChallengeTwo.java +++ b/src/main/java/servlets/module/challenge/CsrfChallengeTwo.java @@ -6,12 +6,12 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ShepherdLogManager; diff --git a/src/main/java/servlets/module/challenge/DirectObject1.java b/src/main/java/servlets/module/challenge/DirectObject1.java index 3f5381e58..d6071c089 100644 --- a/src/main/java/servlets/module/challenge/DirectObject1.java +++ b/src/main/java/servlets/module/challenge/DirectObject1.java @@ -8,11 +8,11 @@ import java.sql.ResultSet; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/challenge/DirectObject2.java b/src/main/java/servlets/module/challenge/DirectObject2.java index b404b738c..61d76bda8 100644 --- a/src/main/java/servlets/module/challenge/DirectObject2.java +++ b/src/main/java/servlets/module/challenge/DirectObject2.java @@ -8,11 +8,11 @@ import java.sql.ResultSet; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/challenge/DirectObjectBankCurrentBalance.java b/src/main/java/servlets/module/challenge/DirectObjectBankCurrentBalance.java index eb4438da4..0f7985a11 100644 --- a/src/main/java/servlets/module/challenge/DirectObjectBankCurrentBalance.java +++ b/src/main/java/servlets/module/challenge/DirectObjectBankCurrentBalance.java @@ -5,11 +5,11 @@ import java.sql.SQLException; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ShepherdLogManager; diff --git a/src/main/java/servlets/module/challenge/DirectObjectBankLogin.java b/src/main/java/servlets/module/challenge/DirectObjectBankLogin.java index 2757754a3..07791844d 100644 --- a/src/main/java/servlets/module/challenge/DirectObjectBankLogin.java +++ b/src/main/java/servlets/module/challenge/DirectObjectBankLogin.java @@ -9,11 +9,11 @@ import java.sql.SQLException; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/challenge/DirectObjectBankLogout.java b/src/main/java/servlets/module/challenge/DirectObjectBankLogout.java index 577f99ae4..b3f3cb2b4 100644 --- a/src/main/java/servlets/module/challenge/DirectObjectBankLogout.java +++ b/src/main/java/servlets/module/challenge/DirectObjectBankLogout.java @@ -4,11 +4,11 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ShepherdLogManager; diff --git a/src/main/java/servlets/module/challenge/DirectObjectBankRegistration.java b/src/main/java/servlets/module/challenge/DirectObjectBankRegistration.java index 9eb9d6c54..773836cc5 100644 --- a/src/main/java/servlets/module/challenge/DirectObjectBankRegistration.java +++ b/src/main/java/servlets/module/challenge/DirectObjectBankRegistration.java @@ -8,11 +8,11 @@ import java.sql.SQLException; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ShepherdLogManager; diff --git a/src/main/java/servlets/module/challenge/DirectObjectBankTransfer.java b/src/main/java/servlets/module/challenge/DirectObjectBankTransfer.java index 2ceaafaed..f019f800f 100644 --- a/src/main/java/servlets/module/challenge/DirectObjectBankTransfer.java +++ b/src/main/java/servlets/module/challenge/DirectObjectBankTransfer.java @@ -8,11 +8,11 @@ import java.sql.SQLException; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ShepherdLogManager; diff --git a/src/main/java/servlets/module/challenge/NoSqlInjection1.java b/src/main/java/servlets/module/challenge/NoSqlInjection1.java index ce1aa9b28..6c596fbd0 100644 --- a/src/main/java/servlets/module/challenge/NoSqlInjection1.java +++ b/src/main/java/servlets/module/challenge/NoSqlInjection1.java @@ -18,11 +18,11 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/challenge/PoorValidation1.java b/src/main/java/servlets/module/challenge/PoorValidation1.java index d222a0ca0..08e08d5c2 100644 --- a/src/main/java/servlets/module/challenge/PoorValidation1.java +++ b/src/main/java/servlets/module/challenge/PoorValidation1.java @@ -4,11 +4,11 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.Hash; diff --git a/src/main/java/servlets/module/challenge/PoorValidation2.java b/src/main/java/servlets/module/challenge/PoorValidation2.java index 818084430..e7596a14c 100644 --- a/src/main/java/servlets/module/challenge/PoorValidation2.java +++ b/src/main/java/servlets/module/challenge/PoorValidation2.java @@ -4,11 +4,11 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.Hash; diff --git a/src/main/java/servlets/module/challenge/SecurityMisconfigStealTokens.java b/src/main/java/servlets/module/challenge/SecurityMisconfigStealTokens.java index cb6e7a37b..d008d0d16 100644 --- a/src/main/java/servlets/module/challenge/SecurityMisconfigStealTokens.java +++ b/src/main/java/servlets/module/challenge/SecurityMisconfigStealTokens.java @@ -9,12 +9,12 @@ import java.sql.SQLException; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.Hash; diff --git a/src/main/java/servlets/module/challenge/SessionManagement1.java b/src/main/java/servlets/module/challenge/SessionManagement1.java index 104ee88c0..0681c9c76 100644 --- a/src/main/java/servlets/module/challenge/SessionManagement1.java +++ b/src/main/java/servlets/module/challenge/SessionManagement1.java @@ -4,12 +4,12 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.codec.binary.Base64; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/servlets/module/challenge/SessionManagement2.java b/src/main/java/servlets/module/challenge/SessionManagement2.java index a120f56d5..12d65064c 100644 --- a/src/main/java/servlets/module/challenge/SessionManagement2.java +++ b/src/main/java/servlets/module/challenge/SessionManagement2.java @@ -9,11 +9,11 @@ import java.sql.ResultSet; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/challenge/SessionManagement2ChangePassword.java b/src/main/java/servlets/module/challenge/SessionManagement2ChangePassword.java index fd47b6c45..f5de53b65 100644 --- a/src/main/java/servlets/module/challenge/SessionManagement2ChangePassword.java +++ b/src/main/java/servlets/module/challenge/SessionManagement2ChangePassword.java @@ -8,11 +8,11 @@ import java.sql.SQLException; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/challenge/SessionManagement3.java b/src/main/java/servlets/module/challenge/SessionManagement3.java index 9cc0f38be..3e2419f25 100644 --- a/src/main/java/servlets/module/challenge/SessionManagement3.java +++ b/src/main/java/servlets/module/challenge/SessionManagement3.java @@ -8,11 +8,11 @@ import java.sql.ResultSet; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/challenge/SessionManagement3ChangePassword.java b/src/main/java/servlets/module/challenge/SessionManagement3ChangePassword.java index 32fdb81e0..da8e85e2b 100644 --- a/src/main/java/servlets/module/challenge/SessionManagement3ChangePassword.java +++ b/src/main/java/servlets/module/challenge/SessionManagement3ChangePassword.java @@ -8,12 +8,12 @@ import java.sql.PreparedStatement; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.codec.binary.Base64; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/servlets/module/challenge/SessionManagement4.java b/src/main/java/servlets/module/challenge/SessionManagement4.java index 065d4b06b..aeef3883a 100644 --- a/src/main/java/servlets/module/challenge/SessionManagement4.java +++ b/src/main/java/servlets/module/challenge/SessionManagement4.java @@ -4,12 +4,12 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.codec.binary.Base64; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/servlets/module/challenge/SessionManagement5.java b/src/main/java/servlets/module/challenge/SessionManagement5.java index 0de15b90e..fe36d0a0e 100644 --- a/src/main/java/servlets/module/challenge/SessionManagement5.java +++ b/src/main/java/servlets/module/challenge/SessionManagement5.java @@ -8,11 +8,11 @@ import java.sql.ResultSet; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/challenge/SessionManagement5ChangePassword.java b/src/main/java/servlets/module/challenge/SessionManagement5ChangePassword.java index a48ddc69e..53260db9f 100644 --- a/src/main/java/servlets/module/challenge/SessionManagement5ChangePassword.java +++ b/src/main/java/servlets/module/challenge/SessionManagement5ChangePassword.java @@ -11,11 +11,11 @@ import java.util.Date; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.codec.binary.Base64; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/servlets/module/challenge/SessionManagement5SetToken.java b/src/main/java/servlets/module/challenge/SessionManagement5SetToken.java index 7080e18ca..9e5d8c582 100644 --- a/src/main/java/servlets/module/challenge/SessionManagement5SetToken.java +++ b/src/main/java/servlets/module/challenge/SessionManagement5SetToken.java @@ -8,11 +8,11 @@ import java.sql.ResultSet; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/challenge/SessionManagement6.java b/src/main/java/servlets/module/challenge/SessionManagement6.java index d351d8c3f..fef756d92 100644 --- a/src/main/java/servlets/module/challenge/SessionManagement6.java +++ b/src/main/java/servlets/module/challenge/SessionManagement6.java @@ -9,12 +9,12 @@ import java.sql.ResultSet; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.codec.binary.Base64; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/servlets/module/challenge/SessionManagement6SecretQuestion.java b/src/main/java/servlets/module/challenge/SessionManagement6SecretQuestion.java index 5bb2c5732..8429cf348 100644 --- a/src/main/java/servlets/module/challenge/SessionManagement6SecretQuestion.java +++ b/src/main/java/servlets/module/challenge/SessionManagement6SecretQuestion.java @@ -10,12 +10,12 @@ import java.sql.SQLException; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.codec.binary.Base64; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/servlets/module/challenge/SessionManagement7.java b/src/main/java/servlets/module/challenge/SessionManagement7.java index 190d859e2..2288a2e66 100644 --- a/src/main/java/servlets/module/challenge/SessionManagement7.java +++ b/src/main/java/servlets/module/challenge/SessionManagement7.java @@ -9,12 +9,12 @@ import java.sql.ResultSet; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.codec.binary.Base64; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/servlets/module/challenge/SessionManagement7SecretQuestion.java b/src/main/java/servlets/module/challenge/SessionManagement7SecretQuestion.java index 817b06335..23a59184e 100644 --- a/src/main/java/servlets/module/challenge/SessionManagement7SecretQuestion.java +++ b/src/main/java/servlets/module/challenge/SessionManagement7SecretQuestion.java @@ -10,12 +10,12 @@ import java.sql.SQLException; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.codec.binary.Base64; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/servlets/module/challenge/SessionManagement8.java b/src/main/java/servlets/module/challenge/SessionManagement8.java index a4266d025..d1f386bc6 100644 --- a/src/main/java/servlets/module/challenge/SessionManagement8.java +++ b/src/main/java/servlets/module/challenge/SessionManagement8.java @@ -5,12 +5,12 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.Hash; diff --git a/src/main/java/servlets/module/challenge/SqlInjection1.java b/src/main/java/servlets/module/challenge/SqlInjection1.java index dbae687fd..f5b72786d 100644 --- a/src/main/java/servlets/module/challenge/SqlInjection1.java +++ b/src/main/java/servlets/module/challenge/SqlInjection1.java @@ -9,11 +9,11 @@ import java.sql.Statement; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/challenge/SqlInjection3.java b/src/main/java/servlets/module/challenge/SqlInjection3.java index 7e7304c8d..9b1fc461c 100644 --- a/src/main/java/servlets/module/challenge/SqlInjection3.java +++ b/src/main/java/servlets/module/challenge/SqlInjection3.java @@ -9,11 +9,11 @@ import java.sql.Statement; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/challenge/SqlInjection4.java b/src/main/java/servlets/module/challenge/SqlInjection4.java index 23f43a228..8b59236b4 100644 --- a/src/main/java/servlets/module/challenge/SqlInjection4.java +++ b/src/main/java/servlets/module/challenge/SqlInjection4.java @@ -9,11 +9,11 @@ import java.sql.Statement; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/challenge/SqlInjection5.java b/src/main/java/servlets/module/challenge/SqlInjection5.java index f07e53cbc..ef64b6c92 100644 --- a/src/main/java/servlets/module/challenge/SqlInjection5.java +++ b/src/main/java/servlets/module/challenge/SqlInjection5.java @@ -8,11 +8,11 @@ import java.sql.ResultSet; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/challenge/SqlInjection5CouponCheck.java b/src/main/java/servlets/module/challenge/SqlInjection5CouponCheck.java index 1a8ae486a..91d277981 100644 --- a/src/main/java/servlets/module/challenge/SqlInjection5CouponCheck.java +++ b/src/main/java/servlets/module/challenge/SqlInjection5CouponCheck.java @@ -8,11 +8,11 @@ import java.sql.ResultSet; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/challenge/SqlInjection5VipCheck.java b/src/main/java/servlets/module/challenge/SqlInjection5VipCheck.java index 65a5a0672..fa060f383 100644 --- a/src/main/java/servlets/module/challenge/SqlInjection5VipCheck.java +++ b/src/main/java/servlets/module/challenge/SqlInjection5VipCheck.java @@ -8,11 +8,11 @@ import java.sql.ResultSet; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/challenge/SqlInjection6.java b/src/main/java/servlets/module/challenge/SqlInjection6.java index cfc7f8516..511f1742a 100644 --- a/src/main/java/servlets/module/challenge/SqlInjection6.java +++ b/src/main/java/servlets/module/challenge/SqlInjection6.java @@ -8,11 +8,11 @@ import java.sql.ResultSet; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/challenge/SqlInjection7.java b/src/main/java/servlets/module/challenge/SqlInjection7.java index 5842e8d4a..0bf7617cd 100644 --- a/src/main/java/servlets/module/challenge/SqlInjection7.java +++ b/src/main/java/servlets/module/challenge/SqlInjection7.java @@ -9,11 +9,11 @@ import java.sql.ResultSet; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/challenge/SqlInjectionEmail.java b/src/main/java/servlets/module/challenge/SqlInjectionEmail.java index 8c0108047..6f5b7e344 100644 --- a/src/main/java/servlets/module/challenge/SqlInjectionEmail.java +++ b/src/main/java/servlets/module/challenge/SqlInjectionEmail.java @@ -9,11 +9,11 @@ import java.sql.Statement; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/challenge/SqlInjectionEscaping.java b/src/main/java/servlets/module/challenge/SqlInjectionEscaping.java index 79f888fc0..e7b786fe4 100644 --- a/src/main/java/servlets/module/challenge/SqlInjectionEscaping.java +++ b/src/main/java/servlets/module/challenge/SqlInjectionEscaping.java @@ -9,11 +9,11 @@ import java.sql.Statement; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/challenge/SqlInjectionStoredProcedure.java b/src/main/java/servlets/module/challenge/SqlInjectionStoredProcedure.java index 9e7890770..9aa29e44d 100644 --- a/src/main/java/servlets/module/challenge/SqlInjectionStoredProcedure.java +++ b/src/main/java/servlets/module/challenge/SqlInjectionStoredProcedure.java @@ -9,11 +9,11 @@ import java.sql.Statement; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/challenge/UrlAccess1.java b/src/main/java/servlets/module/challenge/UrlAccess1.java index ac32f03ec..bb8bb8289 100644 --- a/src/main/java/servlets/module/challenge/UrlAccess1.java +++ b/src/main/java/servlets/module/challenge/UrlAccess1.java @@ -4,11 +4,11 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/challenge/UrlAccess1Admin.java b/src/main/java/servlets/module/challenge/UrlAccess1Admin.java index 7ef36b0d5..be8840575 100644 --- a/src/main/java/servlets/module/challenge/UrlAccess1Admin.java +++ b/src/main/java/servlets/module/challenge/UrlAccess1Admin.java @@ -4,11 +4,11 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/challenge/UrlAccess2.java b/src/main/java/servlets/module/challenge/UrlAccess2.java index 4ef27f57e..d3a0ba99b 100644 --- a/src/main/java/servlets/module/challenge/UrlAccess2.java +++ b/src/main/java/servlets/module/challenge/UrlAccess2.java @@ -4,11 +4,11 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ShepherdLogManager; diff --git a/src/main/java/servlets/module/challenge/UrlAccess2Admin.java b/src/main/java/servlets/module/challenge/UrlAccess2Admin.java index 0614491a5..e750ce002 100644 --- a/src/main/java/servlets/module/challenge/UrlAccess2Admin.java +++ b/src/main/java/servlets/module/challenge/UrlAccess2Admin.java @@ -4,11 +4,11 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/challenge/UrlAccess3.java b/src/main/java/servlets/module/challenge/UrlAccess3.java index 0c13de19d..4eb6933b9 100644 --- a/src/main/java/servlets/module/challenge/UrlAccess3.java +++ b/src/main/java/servlets/module/challenge/UrlAccess3.java @@ -5,12 +5,12 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.codec.binary.Base64; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/servlets/module/challenge/UrlAccess3UserList.java b/src/main/java/servlets/module/challenge/UrlAccess3UserList.java index 1a0e0fcee..9f8c8f8d5 100644 --- a/src/main/java/servlets/module/challenge/UrlAccess3UserList.java +++ b/src/main/java/servlets/module/challenge/UrlAccess3UserList.java @@ -8,12 +8,12 @@ import java.sql.ResultSet; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.codec.binary.Base64; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/servlets/module/challenge/XssChallengeFive.java b/src/main/java/servlets/module/challenge/XssChallengeFive.java index 6b3d89aaa..ba039f2d7 100644 --- a/src/main/java/servlets/module/challenge/XssChallengeFive.java +++ b/src/main/java/servlets/module/challenge/XssChallengeFive.java @@ -5,12 +5,12 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.FindXSS; diff --git a/src/main/java/servlets/module/challenge/XssChallengeFour.java b/src/main/java/servlets/module/challenge/XssChallengeFour.java index 11beb2531..4219e4ac0 100644 --- a/src/main/java/servlets/module/challenge/XssChallengeFour.java +++ b/src/main/java/servlets/module/challenge/XssChallengeFour.java @@ -5,12 +5,12 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.FindXSS; diff --git a/src/main/java/servlets/module/challenge/XssChallengeOne.java b/src/main/java/servlets/module/challenge/XssChallengeOne.java index f3930d562..da2ed05e2 100644 --- a/src/main/java/servlets/module/challenge/XssChallengeOne.java +++ b/src/main/java/servlets/module/challenge/XssChallengeOne.java @@ -5,12 +5,12 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.FindXSS; diff --git a/src/main/java/servlets/module/challenge/XssChallengeSix.java b/src/main/java/servlets/module/challenge/XssChallengeSix.java index 679a80fe0..5b9b25226 100644 --- a/src/main/java/servlets/module/challenge/XssChallengeSix.java +++ b/src/main/java/servlets/module/challenge/XssChallengeSix.java @@ -5,12 +5,12 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.FindXSS; diff --git a/src/main/java/servlets/module/challenge/XssChallengeThree.java b/src/main/java/servlets/module/challenge/XssChallengeThree.java index 7df78c920..f885ea4cd 100644 --- a/src/main/java/servlets/module/challenge/XssChallengeThree.java +++ b/src/main/java/servlets/module/challenge/XssChallengeThree.java @@ -5,12 +5,12 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.FindXSS; diff --git a/src/main/java/servlets/module/challenge/XssChallengeTwo.java b/src/main/java/servlets/module/challenge/XssChallengeTwo.java index 6ac70af59..e43020d07 100644 --- a/src/main/java/servlets/module/challenge/XssChallengeTwo.java +++ b/src/main/java/servlets/module/challenge/XssChallengeTwo.java @@ -5,12 +5,12 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.FindXSS; diff --git a/src/main/java/servlets/module/challenge/XxeChallenge1.java b/src/main/java/servlets/module/challenge/XxeChallenge1.java index 0f2b83b74..84a2b57a3 100644 --- a/src/main/java/servlets/module/challenge/XxeChallenge1.java +++ b/src/main/java/servlets/module/challenge/XxeChallenge1.java @@ -11,12 +11,12 @@ import java.nio.charset.StandardCharsets; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.commons.io.FileUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/servlets/module/challenge/XxeChallenge1OldWebService.java b/src/main/java/servlets/module/challenge/XxeChallenge1OldWebService.java index 868563583..866526e00 100644 --- a/src/main/java/servlets/module/challenge/XxeChallenge1OldWebService.java +++ b/src/main/java/servlets/module/challenge/XxeChallenge1OldWebService.java @@ -4,8 +4,12 @@ import java.io.*; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.*; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import javax.xml.parsers.DocumentBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/servlets/module/lesson/CsrfLesson.java b/src/main/java/servlets/module/lesson/CsrfLesson.java index 94fc8d004..b806afe13 100644 --- a/src/main/java/servlets/module/lesson/CsrfLesson.java +++ b/src/main/java/servlets/module/lesson/CsrfLesson.java @@ -5,12 +5,12 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/lesson/CsrfLessonTarget.java b/src/main/java/servlets/module/lesson/CsrfLessonTarget.java index 3bcdd31fd..8e5959953 100644 --- a/src/main/java/servlets/module/lesson/CsrfLessonTarget.java +++ b/src/main/java/servlets/module/lesson/CsrfLessonTarget.java @@ -4,11 +4,11 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ShepherdLogManager; diff --git a/src/main/java/servlets/module/lesson/DirectObjectLesson.java b/src/main/java/servlets/module/lesson/DirectObjectLesson.java index c63fd1a4b..2854ec441 100644 --- a/src/main/java/servlets/module/lesson/DirectObjectLesson.java +++ b/src/main/java/servlets/module/lesson/DirectObjectLesson.java @@ -4,11 +4,11 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/lesson/PoorValidationLesson.java b/src/main/java/servlets/module/lesson/PoorValidationLesson.java index 4406fe339..b55d22892 100644 --- a/src/main/java/servlets/module/lesson/PoorValidationLesson.java +++ b/src/main/java/servlets/module/lesson/PoorValidationLesson.java @@ -4,11 +4,11 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.Hash; diff --git a/src/main/java/servlets/module/lesson/Redirect.java b/src/main/java/servlets/module/lesson/Redirect.java index 18f5ada9f..3f7016c52 100644 --- a/src/main/java/servlets/module/lesson/Redirect.java +++ b/src/main/java/servlets/module/lesson/Redirect.java @@ -4,11 +4,11 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ShepherdLogManager; diff --git a/src/main/java/servlets/module/lesson/RedirectLessonTarget.java b/src/main/java/servlets/module/lesson/RedirectLessonTarget.java index 9c7e290d5..a1833197d 100644 --- a/src/main/java/servlets/module/lesson/RedirectLessonTarget.java +++ b/src/main/java/servlets/module/lesson/RedirectLessonTarget.java @@ -4,11 +4,11 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.ShepherdLogManager; diff --git a/src/main/java/servlets/module/lesson/SecurityMisconfigLesson.java b/src/main/java/servlets/module/lesson/SecurityMisconfigLesson.java index 4f400c93f..32c1fbdcd 100644 --- a/src/main/java/servlets/module/lesson/SecurityMisconfigLesson.java +++ b/src/main/java/servlets/module/lesson/SecurityMisconfigLesson.java @@ -4,11 +4,11 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/lesson/SessionManagementLesson.java b/src/main/java/servlets/module/lesson/SessionManagementLesson.java index d4c77e105..f1f531fec 100644 --- a/src/main/java/servlets/module/lesson/SessionManagementLesson.java +++ b/src/main/java/servlets/module/lesson/SessionManagementLesson.java @@ -4,12 +4,12 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.Hash; diff --git a/src/main/java/servlets/module/lesson/SqlInjectionLesson.java b/src/main/java/servlets/module/lesson/SqlInjectionLesson.java index 1849f65c9..40f41875d 100644 --- a/src/main/java/servlets/module/lesson/SqlInjectionLesson.java +++ b/src/main/java/servlets/module/lesson/SqlInjectionLesson.java @@ -9,11 +9,11 @@ import java.sql.Statement; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/lesson/UnvalidatedForwardsLesson.java b/src/main/java/servlets/module/lesson/UnvalidatedForwardsLesson.java index 27f0d0f46..64326e6ca 100644 --- a/src/main/java/servlets/module/lesson/UnvalidatedForwardsLesson.java +++ b/src/main/java/servlets/module/lesson/UnvalidatedForwardsLesson.java @@ -7,12 +7,12 @@ import java.net.URL; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.owasp.encoder.Encode; diff --git a/src/main/java/servlets/module/lesson/XssLesson.java b/src/main/java/servlets/module/lesson/XssLesson.java index 3ade358f8..dd4381c0d 100644 --- a/src/main/java/servlets/module/lesson/XssLesson.java +++ b/src/main/java/servlets/module/lesson/XssLesson.java @@ -5,12 +5,12 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import utils.FindXSS; diff --git a/src/main/java/servlets/module/lesson/XxeLesson.java b/src/main/java/servlets/module/lesson/XxeLesson.java index 72e6faa4b..afaf2c641 100644 --- a/src/main/java/servlets/module/lesson/XxeLesson.java +++ b/src/main/java/servlets/module/lesson/XxeLesson.java @@ -8,12 +8,12 @@ import java.io.PrintWriter; import java.util.Locale; import java.util.ResourceBundle; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import javax.xml.parsers.DocumentBuilder; import org.apache.commons.io.FileUtils; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/utils/Validate.java b/src/main/java/utils/Validate.java index 29450396b..81d819503 100644 --- a/src/main/java/utils/Validate.java +++ b/src/main/java/utils/Validate.java @@ -1,10 +1,10 @@ package utils; import java.math.BigInteger; -import javax.mail.internet.AddressException; -import javax.mail.internet.InternetAddress; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpSession; +import jakarta.mail.internet.AddressException; +import jakarta.mail.internet.InternetAddress; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/listeners/DatabaseLifecycleListenerTest.java b/src/test/java/listeners/DatabaseLifecycleListenerTest.java index dde5778d6..ae15fedf7 100644 --- a/src/test/java/listeners/DatabaseLifecycleListenerTest.java +++ b/src/test/java/listeners/DatabaseLifecycleListenerTest.java @@ -8,7 +8,7 @@ import dbProcs.MongoDatabase; import java.io.IOException; import java.sql.Connection; -import javax.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextEvent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeAll; diff --git a/src/test/java/testUtils/TestProperties.java b/src/test/java/testUtils/TestProperties.java index 81be0119f..e617f7c6b 100644 --- a/src/test/java/testUtils/TestProperties.java +++ b/src/test/java/testUtils/TestProperties.java @@ -22,7 +22,7 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.Properties; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import org.apache.commons.io.FileUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger;