Skip to content

Commit 5a52081

Browse files
authored
Merge pull request #21 from bobocode-projects/GP-137-upgrade-servlet-api-to-version-5
GP-137 migrate servlet-api module to Servlet 5
2 parents 2951054 + 1a478dd commit 5a52081

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

2-0-servlet-api/2-0-1-hello-servlet-api/src/main/java/com/bobocode/servlet/WelcomeServlet.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package com.bobocode.servlet;
22

3-
import javax.servlet.annotation.WebServlet;
4-
import javax.servlet.http.HttpServlet;
5-
import javax.servlet.http.HttpServletRequest;
6-
import javax.servlet.http.HttpServletResponse;
3+
import jakarta.servlet.annotation.WebServlet;
4+
import jakarta.servlet.http.HttpServlet;
5+
import jakarta.servlet.http.HttpServletRequest;
6+
import jakarta.servlet.http.HttpServletResponse;
7+
78
import java.io.IOException;
89
import java.io.PrintWriter;
910

2-0-servlet-api/2-0-1-hello-servlet-api/src/test/java/com/bobocode/DateServletTest.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package com.bobocode;
22

3+
import jakarta.servlet.annotation.WebServlet;
4+
import jakarta.servlet.http.HttpServlet;
5+
import jakarta.servlet.http.HttpServletRequest;
6+
import jakarta.servlet.http.HttpServletResponse;
37
import org.junit.jupiter.api.*;
48
import org.junit.jupiter.api.extension.ExtendWith;
59
import org.mockito.Mock;
610
import org.mockito.junit.jupiter.MockitoExtension;
711
import org.reflections.Reflections;
812

9-
import javax.servlet.annotation.WebServlet;
10-
import javax.servlet.http.HttpServlet;
11-
import javax.servlet.http.HttpServletRequest;
12-
import javax.servlet.http.HttpServletResponse;
1313
import java.io.IOException;
1414
import java.io.PrintWriter;
1515
import java.io.StringWriter;
@@ -23,7 +23,6 @@
2323
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
2424
import static org.mockito.Mockito.when;
2525

26-
2726
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
2827
@ExtendWith(MockitoExtension.class)
2928
public class DateServletTest {

2-0-servlet-api/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
<dependencies>
2020
<dependency>
21-
<groupId>javax.servlet</groupId>
22-
<artifactId>javax.servlet-api</artifactId>
23-
<version>4.0.1</version>
21+
<groupId>jakarta.servlet</groupId>
22+
<artifactId>jakarta.servlet-api</artifactId>
23+
<version>5.0.0</version>
2424
<scope>provided</scope>
2525
</dependency>
2626
</dependencies>

0 commit comments

Comments
 (0)