| commit | f8afcb264a7c11224999c7e93492098a739fff9b | [log] [tgz] |
|---|---|---|
| author | Maxim Nesen <maxim.nesen@oracle.com> | Mon Sep 13 09:14:32 2021 +0200 |
| committer | Maxim Nesen <maxim.nesen@oracle.com> | Mon Sep 13 09:14:32 2021 +0200 |
| tree | 52144ec66669bf773939dbab4e5f1a8382865564 | |
| parent | 5fc527c6c59bf3c68588a2afa1e0437507cb1bdf [diff] | |
| parent | e97da048ab155b3ebf9e1bbacfc2c74af3a7b798 [diff] |
Merge remote-tracking branch 'origin/master' into 3.x Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/tests/integration/j-441/war1/pom.xml b/tests/integration/j-441/war1/pom.xml index 4f93886..7b165bc 100644 --- a/tests/integration/j-441/war1/pom.xml +++ b/tests/integration/j-441/war1/pom.xml
@@ -40,9 +40,9 @@ </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>${servlet3.version}</version> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> + <version>${servlet5.version}</version> <scope>provided</scope> </dependency> <dependency>
diff --git a/tests/integration/j-441/war1/src/main/java/org/glassfish/jersey/tests/integration/j441/one/CdiResource.java b/tests/integration/j-441/war1/src/main/java/org/glassfish/jersey/tests/integration/j441/one/CdiResource.java index ea0f0af..12e0ee9 100644 --- a/tests/integration/j-441/war1/src/main/java/org/glassfish/jersey/tests/integration/j441/one/CdiResource.java +++ b/tests/integration/j-441/war1/src/main/java/org/glassfish/jersey/tests/integration/j441/one/CdiResource.java
@@ -22,7 +22,7 @@ import jakarta.enterprise.context.RequestScoped; import jakarta.inject.Inject; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; /** * CDI backed JAX-RS resource.
diff --git a/tests/integration/j-441/war1/src/main/java/org/glassfish/jersey/tests/integration/j441/one/CustomExceptionMapper.java b/tests/integration/j-441/war1/src/main/java/org/glassfish/jersey/tests/integration/j441/one/CustomExceptionMapper.java index 7d7ae6c..1e7bf1b 100644 --- a/tests/integration/j-441/war1/src/main/java/org/glassfish/jersey/tests/integration/j441/one/CustomExceptionMapper.java +++ b/tests/integration/j-441/war1/src/main/java/org/glassfish/jersey/tests/integration/j441/one/CustomExceptionMapper.java
@@ -20,7 +20,7 @@ import jakarta.ws.rs.core.Response; import jakarta.ws.rs.ext.ExceptionMapper; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; /** * JAX-RS provider added just to make sure the application