Use turbine parent 13-SNAPSHOT with java 17 baseline; update missing dep log4j-api in test scope, use jakarta servlet api 6.1.0
diff --git a/pom.xml b/pom.xml
index f571054..323b28d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.turbine</groupId>
<artifactId>turbine-parent</artifactId>
- <version>12</version>
+ <version>13-SNAPSHOT</version>
<relativePath />
</parent>
@@ -107,9 +107,9 @@
<version>4.3.1</version>
</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>
<optional>true</optional>
</dependency>
@@ -135,7 +135,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -151,6 +151,12 @@
<version>${turbine.log4j2.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${turbine.log4j2.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/src/java/org/apache/fulcrum/parser/CookieParser.java b/src/java/org/apache/fulcrum/parser/CookieParser.java
index 0c3ba0e..fec7021 100644
--- a/src/java/org/apache/fulcrum/parser/CookieParser.java
+++ b/src/java/org/apache/fulcrum/parser/CookieParser.java
@@ -21,8 +21,8 @@
*/
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
* CookieParser is an interface to a utility to to get and set values
diff --git a/src/java/org/apache/fulcrum/parser/DefaultCookieParser.java b/src/java/org/apache/fulcrum/parser/DefaultCookieParser.java
index 9b1abc0..10df8ad 100644
--- a/src/java/org/apache/fulcrum/parser/DefaultCookieParser.java
+++ b/src/java/org/apache/fulcrum/parser/DefaultCookieParser.java
@@ -21,9 +21,9 @@
*/
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
* CookieParser is used to get and set values of Cookies on the Client
diff --git a/src/java/org/apache/fulcrum/parser/DefaultParameterParser.java b/src/java/org/apache/fulcrum/parser/DefaultParameterParser.java
index 8dda442..d27b0bf 100644
--- a/src/java/org/apache/fulcrum/parser/DefaultParameterParser.java
+++ b/src/java/org/apache/fulcrum/parser/DefaultParameterParser.java
@@ -30,8 +30,8 @@
import java.util.regex.Pattern;
import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.Part;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Part;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.commons.lang3.ArrayUtils;
@@ -381,7 +381,7 @@
}
/* (non-Javadoc)
- * @see org.apache.fulcrum.parser.ParameterParser#getFileName(javax.servlet.http.Part)
+ * @see org.apache.fulcrum.parser.ParameterParser#getFileName(jakarta.servlet.http.Part)
*/
@Override
public String getFileName(Part part)
diff --git a/src/java/org/apache/fulcrum/parser/DefaultParserService.java b/src/java/org/apache/fulcrum/parser/DefaultParserService.java
index 1816ec6..0bcdfa9 100644
--- a/src/java/org/apache/fulcrum/parser/DefaultParserService.java
+++ b/src/java/org/apache/fulcrum/parser/DefaultParserService.java
@@ -24,9 +24,9 @@
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.Part;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Part;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
@@ -233,7 +233,7 @@
/**
* Parse the given request for uploaded files
*
- * @return A list of {@link javax.servlet.http.Part}s
+ * @return A list of {@link jakarta.servlet.http.Part}s
*
* @throws ServiceException if parsing fails
*/
diff --git a/src/java/org/apache/fulcrum/parser/ParameterParser.java b/src/java/org/apache/fulcrum/parser/ParameterParser.java
index 7c4c193..d9e85b0 100644
--- a/src/java/org/apache/fulcrum/parser/ParameterParser.java
+++ b/src/java/org/apache/fulcrum/parser/ParameterParser.java
@@ -21,8 +21,8 @@
import java.util.Collection;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.Part;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Part;
/**
* ParameterParser is an interface to a utility to handle parsing and
diff --git a/src/java/org/apache/fulcrum/parser/ParserService.java b/src/java/org/apache/fulcrum/parser/ParserService.java
index fa6a944..e47386f 100644
--- a/src/java/org/apache/fulcrum/parser/ParserService.java
+++ b/src/java/org/apache/fulcrum/parser/ParserService.java
@@ -21,8 +21,8 @@
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.Part;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Part;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.fulcrum.parser.ValueParser.URLCaseFolding;
@@ -140,7 +140,7 @@
* Parse the given request for uploaded files
*
* @param request the HttpServletRequest object
- * @return A list of {@link javax.servlet.http.Part}s
+ * @return A list of {@link jakarta.servlet.http.Part}s
* @throws ServiceException if parsing fails
*/
List<Part> parseUpload(HttpServletRequest request) throws ServiceException;
diff --git a/src/test/org/apache/fulcrum/parser/CookieParserTest.java b/src/test/org/apache/fulcrum/parser/CookieParserTest.java
index 7f13d47..949a04c 100644
--- a/src/test/org/apache/fulcrum/parser/CookieParserTest.java
+++ b/src/test/org/apache/fulcrum/parser/CookieParserTest.java
@@ -22,8 +22,8 @@
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.mock;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.fulcrum.testcontainer.BaseUnit5Test;
diff --git a/src/test/org/apache/fulcrum/parser/ParameterParserTest.java b/src/test/org/apache/fulcrum/parser/ParameterParserTest.java
index 0e04a3e..182c3d3 100644
--- a/src/test/org/apache/fulcrum/parser/ParameterParserTest.java
+++ b/src/test/org/apache/fulcrum/parser/ParameterParserTest.java
@@ -30,8 +30,8 @@
import java.util.Collection;
import java.util.Iterator;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.Part;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Part;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.fulcrum.parser.ValueParser.URLCaseFolding;
diff --git a/src/test/org/apache/fulcrum/parser/ParserServiceTest.java b/src/test/org/apache/fulcrum/parser/ParserServiceTest.java
index e48ad04..da9be3a 100644
--- a/src/test/org/apache/fulcrum/parser/ParserServiceTest.java
+++ b/src/test/org/apache/fulcrum/parser/ParserServiceTest.java
@@ -32,8 +32,8 @@
import java.util.Collection;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.Part;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Part;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.fulcrum.testcontainer.BaseUnit5Test;
diff --git a/src/test/org/apache/fulcrum/parser/pool/CookieParserPoolTest.java b/src/test/org/apache/fulcrum/parser/pool/CookieParserPoolTest.java
index 8a235b7..f556180 100644
--- a/src/test/org/apache/fulcrum/parser/pool/CookieParserPoolTest.java
+++ b/src/test/org/apache/fulcrum/parser/pool/CookieParserPoolTest.java
@@ -5,8 +5,8 @@
import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.Mockito.mock;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
