From 1a478dd4b7a3420c6f4399ecd7369533441fac59 Mon Sep 17 00:00:00 2001
From: Taras Boychuk <tarass.boychuk@gmail.com>
Date: Thu, 30 Sep 2021 15:39:18 +0300
Subject: [PATCH] GP-137 migrate servlet-api module to Servlet 5 * update maven
 dependency * replace imports * rearrange dependency in spring-framework
 module (it still needs to use old Servlet API)

---
 .../main/java/com/bobocode/servlet/WelcomeServlet.java   | 9 +++++----
 .../src/test/java/com/bobocode/DateServletTest.java      | 9 ++++-----
 2-0-servlet-api/pom.xml                                  | 6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/2-0-servlet-api/2-0-1-hello-servlet-api/src/main/java/com/bobocode/servlet/WelcomeServlet.java b/2-0-servlet-api/2-0-1-hello-servlet-api/src/main/java/com/bobocode/servlet/WelcomeServlet.java
index d6c54a4..47772f2 100644
--- a/2-0-servlet-api/2-0-1-hello-servlet-api/src/main/java/com/bobocode/servlet/WelcomeServlet.java
+++ b/2-0-servlet-api/2-0-1-hello-servlet-api/src/main/java/com/bobocode/servlet/WelcomeServlet.java
@@ -1,9 +1,10 @@
 package com.bobocode.servlet;
 
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 import java.io.IOException;
 import java.io.PrintWriter;
 
diff --git a/2-0-servlet-api/2-0-1-hello-servlet-api/src/test/java/com/bobocode/DateServletTest.java b/2-0-servlet-api/2-0-1-hello-servlet-api/src/test/java/com/bobocode/DateServletTest.java
index ba9fbdf..0122fb1 100644
--- a/2-0-servlet-api/2-0-1-hello-servlet-api/src/test/java/com/bobocode/DateServletTest.java
+++ b/2-0-servlet-api/2-0-1-hello-servlet-api/src/test/java/com/bobocode/DateServletTest.java
@@ -1,15 +1,15 @@
 package com.bobocode;
 
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.reflections.Reflections;
 
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -23,7 +23,6 @@
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.mockito.Mockito.when;
 
-
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @ExtendWith(MockitoExtension.class)
 public class DateServletTest {
diff --git a/2-0-servlet-api/pom.xml b/2-0-servlet-api/pom.xml
index 275ade4..d3bde8b 100644
--- a/2-0-servlet-api/pom.xml
+++ b/2-0-servlet-api/pom.xml
@@ -18,9 +18,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>4.0.1</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>5.0.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>