This is an automated email from the ASF dual-hosted git repository. gk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/turbine-fulcrum-testcontainer.git
commit 3aaf8a70612f607db0418750d27e099b241202b7 Author: Georg Kallidis <[email protected]> AuthorDate: Tue Jul 9 15:13:05 2024 +0200 Replace Javax. servlet-api 3.1.0 with Jakarta servlet-api 6.1.0 dependency. --- pom.xml | 6 +++--- src/java/org/apache/fulcrum/testcontainer/BaseUnit4Test.java | 6 +++--- src/java/org/apache/fulcrum/testcontainer/BaseUnit5Test.java | 9 +++------ 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index c2a476b..b7f9323 100644 --- a/pom.xml +++ b/pom.xml @@ -77,9 +77,9 @@ <optional>true</optional> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>3.1.0</version> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> + <version>6.1.0</version> <scope>provided</scope> </dependency> <dependency> diff --git a/src/java/org/apache/fulcrum/testcontainer/BaseUnit4Test.java b/src/java/org/apache/fulcrum/testcontainer/BaseUnit4Test.java index 7c3f565..06fe737 100644 --- a/src/java/org/apache/fulcrum/testcontainer/BaseUnit4Test.java +++ b/src/java/org/apache/fulcrum/testcontainer/BaseUnit4Test.java @@ -31,15 +31,15 @@ import java.util.Locale; import java.util.Map; import java.util.Vector; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - import org.apache.avalon.framework.component.ComponentException; import org.apache.avalon.framework.logger.ConsoleLogger; import org.junit.After; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; + /** * Alternative Base class to {@link BaseUnitTest} for component tests. * diff --git a/src/java/org/apache/fulcrum/testcontainer/BaseUnit5Test.java b/src/java/org/apache/fulcrum/testcontainer/BaseUnit5Test.java index 82af43c..c4fe87e 100644 --- a/src/java/org/apache/fulcrum/testcontainer/BaseUnit5Test.java +++ b/src/java/org/apache/fulcrum/testcontainer/BaseUnit5Test.java @@ -29,20 +29,17 @@ import static org.mockito.Mockito.when; import java.util.HashMap; import java.util.Locale; import java.util.Map; -import java.util.Objects; import java.util.Vector; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - import org.apache.avalon.framework.component.ComponentException; -import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.avalon.framework.logger.ConsoleLogger; -import org.apache.avalon.framework.logger.Logger; import org.junit.jupiter.api.AfterEach; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; + /** * Alternative Base class to {@link BaseUnit4Test} for component tests. *
