This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git
The following commit(s) were added to refs/heads/master by this push:
new 33a8b553 Refactor to support Jakarta Servlet 5 and 6
33a8b553 is described below
commit 33a8b5533d03c7a306e0ea82fca6881c8b551071
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Mon Jul 31 12:27:31 2023 -0400
Refactor to support Jakarta Servlet 5 and 6
---
commons-fileupload2-distribution/pom.xml | 42 ++++++++++++++---
.../pom.xml | 7 ++-
.../jakarta/servlet5}/JakartaFileCleaner.java | 2 +-
.../servlet5}/JakartaServletDiskFileUpload.java | 2 +-
.../servlet5}/JakartaServletFileUpload.java | 2 +-
.../servlet5}/JakartaServletRequestContext.java | 2 +-
.../jakarta/servlet5}/package-info.java | 2 +-
.../servlet5}/JakartaMockHttpServletRequest.java | 2 +-
.../servlet5}/JakartaMockServletHttpRequest.java | 2 +-
.../servlet5}/JakartaProgressListenerDiskTest.java | 4 +-
.../servlet5}/JakartaProgressListenerTest.java | 3 +-
.../JakartaServletFileUploadDiskTest.java | 5 +-
.../servlet5}/JakartaServletFileUploadTest.java | 4 +-
.../jakarta/servlet5}/JakartaSizesDiskTest.java | 3 +-
.../jakarta/servlet5}/JakartaSizesTest.java | 3 +-
.../servlet5}/JakartaStreamingDiskTest.java | 4 +-
.../jakarta/servlet5}/JakartaStreamingTest.java | 4 +-
.../pom.xml | 9 ++--
.../jakarta/servlet6}/JakartaFileCleaner.java | 2 +-
.../servlet6}/JakartaServletDiskFileUpload.java | 2 +-
.../servlet6}/JakartaServletFileUpload.java | 2 +-
.../servlet6}/JakartaServletRequestContext.java | 2 +-
.../jakarta/servlet6}/package-info.java | 2 +-
.../servlet6}/JakartaMockHttpServletRequest.java | 40 ++++++++--------
.../servlet6}/JakartaMockServletHttpRequest.java | 28 +++--------
.../servlet6}/JakartaProgressListenerDiskTest.java | 4 +-
.../servlet6}/JakartaProgressListenerTest.java | 3 +-
.../JakartaServletFileUploadDiskTest.java | 5 +-
.../servlet6}/JakartaServletFileUploadTest.java | 4 +-
.../jakarta/servlet6}/JakartaSizesDiskTest.java | 3 +-
.../jakarta/servlet6}/JakartaSizesTest.java | 3 +-
.../servlet6}/JakartaStreamingDiskTest.java | 4 +-
.../jakarta/servlet6}/JakartaStreamingTest.java | 4 +-
pom.xml | 3 +-
src/changes/changes.xml | 1 +
src/site/apt/migration.apt.vm | 54 ++++++++++++++--------
src/site/site.xml | 9 ++--
37 files changed, 168 insertions(+), 109 deletions(-)
diff --git a/commons-fileupload2-distribution/pom.xml
b/commons-fileupload2-distribution/pom.xml
index 260cf186..fdf66f1d 100644
--- a/commons-fileupload2-distribution/pom.xml
+++ b/commons-fileupload2-distribution/pom.xml
@@ -105,33 +105,63 @@ limitations under the License.
<version>${project.version}</version>
<classifier>test-sources</classifier>
</dependency>
- <!-- commons-fileupload2-jakarta -->
+ <!-- commons-fileupload2-jakarta-servlet5 -->
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-fileupload2-jakarta</artifactId>
+ <artifactId>commons-fileupload2-jakarta-servlet5</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-fileupload2-jakarta</artifactId>
+ <artifactId>commons-fileupload2-jakarta-servlet5</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-fileupload2-jakarta</artifactId>
+ <artifactId>commons-fileupload2-jakarta-servlet5</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-fileupload2-jakarta</artifactId>
+ <artifactId>commons-fileupload2-jakarta-servlet5</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-fileupload2-jakarta</artifactId>
+ <artifactId>commons-fileupload2-jakarta-servlet5</artifactId>
+ <version>${project.version}</version>
+ <classifier>test-sources</classifier>
+ </dependency>
+ <!-- commons-fileupload2-jakarta-servlet6 -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-jakarta-servlet6</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-jakarta-servlet6</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-jakarta-servlet6</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-jakarta-servlet6</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-jakarta-servlet6</artifactId>
<version>${project.version}</version>
<classifier>test-sources</classifier>
</dependency>
diff --git a/commons-fileupload2-jakarta/pom.xml
b/commons-fileupload2-jakarta-servlet5/pom.xml
similarity index 93%
copy from commons-fileupload2-jakarta/pom.xml
copy to commons-fileupload2-jakarta-servlet5/pom.xml
index cf9da470..6b63386a 100644
--- a/commons-fileupload2-jakarta/pom.xml
+++ b/commons-fileupload2-jakarta-servlet5/pom.xml
@@ -25,9 +25,9 @@
<relativePath>../</relativePath>
</parent>
- <artifactId>commons-fileupload2-jakarta</artifactId>
+ <artifactId>commons-fileupload2-jakarta-servlet5</artifactId>
- <name>Apache Commons FileUpload Jakarta</name>
+ <name>Apache Commons FileUpload Jakarta Servlet 5</name>
<description>
The Apache Commons FileUpload Jakarta component provides a simple yet
flexible means of adding support for multipart
file upload functionality to Jakarta servlets and web applications.
@@ -35,7 +35,7 @@
<properties>
<commons.parent.dir>${basedir}/..</commons.parent.dir>
-
<commons.module.name>org.apache.commons.fileupload2.jakarta</commons.module.name>
+
<commons.module.name>org.apache.commons.fileupload2.jakarta.servlet5</commons.module.name>
</properties>
<dependencies>
@@ -63,7 +63,6 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
- <!-- Version 6.0.0 requires Java 11 -->
<version>5.0.0</version>
<scope>provided</scope>
</dependency>
diff --git
a/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaFileCleaner.java
b/commons-fileupload2-jakarta-servlet5/src/main/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaFileCleaner.java
similarity index 98%
copy from
commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaFileCleaner.java
copy to
commons-fileupload2-jakarta-servlet5/src/main/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaFileCleaner.java
index 0af160df..649c4e3f 100644
---
a/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaFileCleaner.java
+++
b/commons-fileupload2-jakarta-servlet5/src/main/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaFileCleaner.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.jakarta;
+package org.apache.commons.fileupload2.jakarta.servlet5;
import org.apache.commons.io.FileCleaningTracker;
diff --git
a/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaServletDiskFileUpload.java
b/commons-fileupload2-jakarta-servlet5/src/main/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletDiskFileUpload.java
similarity index 95%
copy from
commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaServletDiskFileUpload.java
copy to
commons-fileupload2-jakarta-servlet5/src/main/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletDiskFileUpload.java
index 3130f966..d8c77c6c 100644
---
a/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaServletDiskFileUpload.java
+++
b/commons-fileupload2-jakarta-servlet5/src/main/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletDiskFileUpload.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.fileupload2.jakarta;
+package org.apache.commons.fileupload2.jakarta.servlet5;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
diff --git
a/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaServletFileUpload.java
b/commons-fileupload2-jakarta-servlet5/src/main/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletFileUpload.java
similarity index 98%
copy from
commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaServletFileUpload.java
copy to
commons-fileupload2-jakarta-servlet5/src/main/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletFileUpload.java
index 86219062..46592e3a 100644
---
a/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaServletFileUpload.java
+++
b/commons-fileupload2-jakarta-servlet5/src/main/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletFileUpload.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.jakarta;
+package org.apache.commons.fileupload2.jakarta.servlet5;
import java.io.IOException;
import java.util.List;
diff --git
a/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaServletRequestContext.java
b/commons-fileupload2-jakarta-servlet5/src/main/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletRequestContext.java
similarity index 97%
copy from
commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaServletRequestContext.java
copy to
commons-fileupload2-jakarta-servlet5/src/main/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletRequestContext.java
index e0106ab6..2a1de159 100644
---
a/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaServletRequestContext.java
+++
b/commons-fileupload2-jakarta-servlet5/src/main/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletRequestContext.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.jakarta;
+package org.apache.commons.fileupload2.jakarta.servlet5;
import java.io.IOException;
import java.io.InputStream;
diff --git
a/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/package-info.java
b/commons-fileupload2-jakarta-servlet5/src/main/java/org/apache/commons/fileupload2/jakarta/servlet5/package-info.java
similarity index 96%
copy from
commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/package-info.java
copy to
commons-fileupload2-jakarta-servlet5/src/main/java/org/apache/commons/fileupload2/jakarta/servlet5/package-info.java
index f69eeef0..83f86332 100644
---
a/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/package-info.java
+++
b/commons-fileupload2-jakarta-servlet5/src/main/java/org/apache/commons/fileupload2/jakarta/servlet5/package-info.java
@@ -36,4 +36,4 @@
* use this package.
* </p>
*/
-package org.apache.commons.fileupload2.jakarta;
+package org.apache.commons.fileupload2.jakarta.servlet5;
diff --git
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaMockHttpServletRequest.java
b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaMockHttpServletRequest.java
similarity index 99%
copy from
commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaMockHttpServletRequest.java
copy to
commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaMockHttpServletRequest.java
index 59d29e93..d7c43e4c 100644
---
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaMockHttpServletRequest.java
+++
b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaMockHttpServletRequest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.jakarta;
+package org.apache.commons.fileupload2.jakarta.servlet5;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
diff --git
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaMockServletHttpRequest.java
b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaMockServletHttpRequest.java
similarity index 99%
copy from
commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaMockServletHttpRequest.java
copy to
commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaMockServletHttpRequest.java
index 0123dd18..0a726550 100644
---
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaMockServletHttpRequest.java
+++
b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaMockServletHttpRequest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.jakarta;
+package org.apache.commons.fileupload2.jakarta.servlet5;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
diff --git
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaProgressListenerDiskTest.java
b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaProgressListenerDiskTest.java
similarity index 89%
copy from
commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaProgressListenerDiskTest.java
copy to
commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaProgressListenerDiskTest.java
index db084b94..ea57b4a7 100644
---
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaProgressListenerDiskTest.java
+++
b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaProgressListenerDiskTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.jakarta;
+package org.apache.commons.fileupload2.jakarta.servlet5;
import java.io.InputStream;
@@ -22,6 +22,8 @@ import
org.apache.commons.fileupload2.core.AbstractProgressListenerTest;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
import org.apache.commons.fileupload2.core.ProgressListener;
+import
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletDiskFileUpload;
+import
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletFileUpload;
import jakarta.servlet.http.HttpServletRequest;
diff --git
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaProgressListenerTest.java
b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaProgressListenerTest.java
similarity index 93%
copy from
commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaProgressListenerTest.java
copy to
commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaProgressListenerTest.java
index 2e975b65..bfeb9964 100644
---
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaProgressListenerTest.java
+++
b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaProgressListenerTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.jakarta;
+package org.apache.commons.fileupload2.jakarta.servlet5;
import java.io.InputStream;
@@ -22,6 +22,7 @@ import
org.apache.commons.fileupload2.core.AbstractProgressListenerTest;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
import org.apache.commons.fileupload2.core.ProgressListener;
+import
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletFileUpload;
import jakarta.servlet.http.HttpServletRequest;
diff --git
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaServletFileUploadDiskTest.java
b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletFileUploadDiskTest.java
similarity index 94%
copy from
commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaServletFileUploadDiskTest.java
copy to
commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletFileUploadDiskTest.java
index da2ec5e7..0d866abc 100644
---
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaServletFileUploadDiskTest.java
+++
b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletFileUploadDiskTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.jakarta;
+package org.apache.commons.fileupload2.jakarta.servlet5;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -27,6 +27,9 @@ import org.apache.commons.fileupload2.core.Constants;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
import org.apache.commons.fileupload2.core.FileUploadException;
+import
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletDiskFileUpload;
+import
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletFileUpload;
+import
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletRequestContext;
import org.junit.jupiter.api.Test;
import jakarta.servlet.http.HttpServletRequest;
diff --git
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaServletFileUploadTest.java
b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletFileUploadTest.java
similarity index 95%
copy from
commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaServletFileUploadTest.java
copy to
commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletFileUploadTest.java
index ff16b7d3..deba4d55 100644
---
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaServletFileUploadTest.java
+++
b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaServletFileUploadTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.jakarta;
+package org.apache.commons.fileupload2.jakarta.servlet5;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -27,6 +27,8 @@ import org.apache.commons.fileupload2.core.Constants;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
import org.apache.commons.fileupload2.core.FileUploadException;
+import
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletFileUpload;
+import
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletRequestContext;
import org.junit.jupiter.api.Test;
import jakarta.servlet.http.HttpServletRequest;
diff --git
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaSizesDiskTest.java
b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaSizesDiskTest.java
similarity index 92%
copy from
commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaSizesDiskTest.java
copy to
commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaSizesDiskTest.java
index 6276c750..8761605f 100644
---
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaSizesDiskTest.java
+++
b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaSizesDiskTest.java
@@ -14,13 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.jakarta;
+package org.apache.commons.fileupload2.jakarta.servlet5;
import java.io.InputStream;
import org.apache.commons.fileupload2.core.AbstractSizesTest;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
+import
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletDiskFileUpload;
import jakarta.servlet.http.HttpServletRequest;
diff --git
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaSizesTest.java
b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaSizesTest.java
similarity index 92%
copy from
commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaSizesTest.java
copy to
commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaSizesTest.java
index ad148bbc..3dc5c57a 100644
---
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaSizesTest.java
+++
b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaSizesTest.java
@@ -14,13 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.jakarta;
+package org.apache.commons.fileupload2.jakarta.servlet5;
import java.io.InputStream;
import org.apache.commons.fileupload2.core.AbstractSizesTest;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
+import
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletFileUpload;
import jakarta.servlet.http.HttpServletRequest;
diff --git
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaStreamingDiskTest.java
b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaStreamingDiskTest.java
similarity index 90%
copy from
commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaStreamingDiskTest.java
copy to
commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaStreamingDiskTest.java
index 1e6f10b6..6ba135e5 100644
---
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaStreamingDiskTest.java
+++
b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaStreamingDiskTest.java
@@ -14,13 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.jakarta;
+package org.apache.commons.fileupload2.jakarta.servlet5;
import java.io.InputStream;
import org.apache.commons.fileupload2.core.AbstractStreamingTest;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
+import
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletDiskFileUpload;
+import
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletRequestContext;
import jakarta.servlet.http.HttpServletRequest;
diff --git
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaStreamingTest.java
b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaStreamingTest.java
similarity index 90%
copy from
commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaStreamingTest.java
copy to
commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaStreamingTest.java
index f0b4cf68..9c7493df 100644
---
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaStreamingTest.java
+++
b/commons-fileupload2-jakarta-servlet5/src/test/java/org/apache/commons/fileupload2/jakarta/servlet5/JakartaStreamingTest.java
@@ -14,13 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.jakarta;
+package org.apache.commons.fileupload2.jakarta.servlet5;
import java.io.InputStream;
import org.apache.commons.fileupload2.core.AbstractStreamingTest;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
+import
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletFileUpload;
+import
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletRequestContext;
import jakarta.servlet.http.HttpServletRequest;
diff --git a/commons-fileupload2-jakarta/pom.xml
b/commons-fileupload2-jakarta-servlet6/pom.xml
similarity index 93%
rename from commons-fileupload2-jakarta/pom.xml
rename to commons-fileupload2-jakarta-servlet6/pom.xml
index cf9da470..e820b3d7 100644
--- a/commons-fileupload2-jakarta/pom.xml
+++ b/commons-fileupload2-jakarta-servlet6/pom.xml
@@ -25,9 +25,9 @@
<relativePath>../</relativePath>
</parent>
- <artifactId>commons-fileupload2-jakarta</artifactId>
+ <artifactId>commons-fileupload2-jakarta-servlet6</artifactId>
- <name>Apache Commons FileUpload Jakarta</name>
+ <name>Apache Commons FileUpload Jakarta Servlet 6</name>
<description>
The Apache Commons FileUpload Jakarta component provides a simple yet
flexible means of adding support for multipart
file upload functionality to Jakarta servlets and web applications.
@@ -35,7 +35,7 @@
<properties>
<commons.parent.dir>${basedir}/..</commons.parent.dir>
-
<commons.module.name>org.apache.commons.fileupload2.jakarta</commons.module.name>
+
<commons.module.name>org.apache.commons.fileupload2.jakarta.servlet6.servlet6.servlet6</commons.module.name>
</properties>
<dependencies>
@@ -63,8 +63,7 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
- <!-- Version 6.0.0 requires Java 11 -->
- <version>5.0.0</version>
+ <version>6.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git
a/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaFileCleaner.java
b/commons-fileupload2-jakarta-servlet6/src/main/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaFileCleaner.java
similarity index 98%
rename from
commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaFileCleaner.java
rename to
commons-fileupload2-jakarta-servlet6/src/main/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaFileCleaner.java
index 0af160df..65cffad3 100644
---
a/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaFileCleaner.java
+++
b/commons-fileupload2-jakarta-servlet6/src/main/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaFileCleaner.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.jakarta;
+package org.apache.commons.fileupload2.jakarta.servlet6;
import org.apache.commons.io.FileCleaningTracker;
diff --git
a/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaServletDiskFileUpload.java
b/commons-fileupload2-jakarta-servlet6/src/main/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletDiskFileUpload.java
similarity index 95%
rename from
commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaServletDiskFileUpload.java
rename to
commons-fileupload2-jakarta-servlet6/src/main/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletDiskFileUpload.java
index 3130f966..96ccd18b 100644
---
a/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaServletDiskFileUpload.java
+++
b/commons-fileupload2-jakarta-servlet6/src/main/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletDiskFileUpload.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.fileupload2.jakarta;
+package org.apache.commons.fileupload2.jakarta.servlet6;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
diff --git
a/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaServletFileUpload.java
b/commons-fileupload2-jakarta-servlet6/src/main/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletFileUpload.java
similarity index 98%
rename from
commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaServletFileUpload.java
rename to
commons-fileupload2-jakarta-servlet6/src/main/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletFileUpload.java
index 86219062..a2b3c60e 100644
---
a/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaServletFileUpload.java
+++
b/commons-fileupload2-jakarta-servlet6/src/main/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletFileUpload.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.jakarta;
+package org.apache.commons.fileupload2.jakarta.servlet6;
import java.io.IOException;
import java.util.List;
diff --git
a/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaServletRequestContext.java
b/commons-fileupload2-jakarta-servlet6/src/main/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletRequestContext.java
similarity index 97%
rename from
commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaServletRequestContext.java
rename to
commons-fileupload2-jakarta-servlet6/src/main/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletRequestContext.java
index e0106ab6..f764fd1e 100644
---
a/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaServletRequestContext.java
+++
b/commons-fileupload2-jakarta-servlet6/src/main/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletRequestContext.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.jakarta;
+package org.apache.commons.fileupload2.jakarta.servlet6;
import java.io.IOException;
import java.io.InputStream;
diff --git
a/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/package-info.java
b/commons-fileupload2-jakarta-servlet6/src/main/java/org/apache/commons/fileupload2/jakarta/servlet6/package-info.java
similarity index 96%
rename from
commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/package-info.java
rename to
commons-fileupload2-jakarta-servlet6/src/main/java/org/apache/commons/fileupload2/jakarta/servlet6/package-info.java
index f69eeef0..a7ef77e8 100644
---
a/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/package-info.java
+++
b/commons-fileupload2-jakarta-servlet6/src/main/java/org/apache/commons/fileupload2/jakarta/servlet6/package-info.java
@@ -36,4 +36,4 @@
* use this package.
* </p>
*/
-package org.apache.commons.fileupload2.jakarta;
+package org.apache.commons.fileupload2.jakarta.servlet6;
diff --git
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaMockHttpServletRequest.java
b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaMockHttpServletRequest.java
similarity index 97%
rename from
commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaMockHttpServletRequest.java
rename to
commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaMockHttpServletRequest.java
index 59d29e93..10e7229a 100644
---
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaMockHttpServletRequest.java
+++
b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaMockHttpServletRequest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.jakarta;
+package org.apache.commons.fileupload2.jakarta.servlet6;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
@@ -34,6 +34,7 @@ import jakarta.servlet.AsyncContext;
import jakarta.servlet.DispatcherType;
import jakarta.servlet.ReadListener;
import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletConnection;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletInputStream;
@@ -378,29 +379,24 @@ public class JakartaMockHttpServletRequest implements
HttpServletRequest {
return null;
}
- /**
- * @see HttpServletRequest#getQueryString()
- */
@Override
- public String getQueryString() {
+ public String getProtocolRequestId() {
return null;
}
/**
- * @see ServletRequest#getReader()
+ * @see HttpServletRequest#getQueryString()
*/
@Override
- public BufferedReader getReader() throws IOException {
+ public String getQueryString() {
return null;
}
/**
- * @see ServletRequest#getRealPath(String)
- * @deprecated
+ * @see ServletRequest#getReader()
*/
@Override
- @Deprecated
- public String getRealPath(final String arg0) {
+ public BufferedReader getReader() throws IOException {
return null;
}
@@ -453,6 +449,11 @@ public class JakartaMockHttpServletRequest implements
HttpServletRequest {
return null;
}
+ @Override
+ public String getRequestId() {
+ return null;
+ }
+
/**
* @see HttpServletRequest#getRequestURI()
*/
@@ -493,6 +494,11 @@ public class JakartaMockHttpServletRequest implements
HttpServletRequest {
return 0;
}
+ @Override
+ public ServletConnection getServletConnection() {
+ return null;
+ }
+
@Override
public ServletContext getServletContext() {
return null;
@@ -539,7 +545,7 @@ public class JakartaMockHttpServletRequest implements
HttpServletRequest {
public boolean isAsyncSupported() {
return false;
}
-
+
/**
* @see HttpServletRequest#isRequestedSessionIdFromCookie()
*/
@@ -548,16 +554,6 @@ public class JakartaMockHttpServletRequest implements
HttpServletRequest {
return false;
}
- /**
- * @see HttpServletRequest#isRequestedSessionIdFromUrl()
- * @deprecated
- */
- @Override
- @Deprecated
- public boolean isRequestedSessionIdFromUrl() {
- return false;
- }
-
/**
* @see HttpServletRequest#isRequestedSessionIdFromURL()
*/
diff --git
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaMockServletHttpRequest.java
b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaMockServletHttpRequest.java
similarity index 96%
rename from
commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaMockServletHttpRequest.java
rename to
commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaMockServletHttpRequest.java
index 0123dd18..d8029b10 100644
---
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaMockServletHttpRequest.java
+++
b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaMockServletHttpRequest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.jakarta;
+package org.apache.commons.fileupload2.jakarta.servlet6;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
@@ -33,6 +33,7 @@ import jakarta.servlet.AsyncContext;
import jakarta.servlet.DispatcherType;
import jakarta.servlet.ReadListener;
import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletConnection;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletInputStream;
@@ -393,11 +394,6 @@ public class JakartaMockServletHttpRequest implements
HttpServletRequest {
return null;
}
- @Override
- public String getRealPath(final String path) {
- return null;
- }
-
/**
* @see ServletRequest#getRemoteAddr()
*/
@@ -491,6 +487,11 @@ public class JakartaMockServletHttpRequest implements
HttpServletRequest {
return 0;
}
+ @Override
+ public ServletConnection getServletConnection() {
+ throw new IllegalStateException("Not implemented");
+ }
+
@Override
public ServletContext getServletContext() {
final var session = getSession();
@@ -550,16 +551,6 @@ public class JakartaMockServletHttpRequest implements
HttpServletRequest {
return false;
}
- /**
- * @see HttpServletRequest#isRequestedSessionIdFromUrl()
- * @deprecated
- */
- @Override
- @Deprecated
- public boolean isRequestedSessionIdFromUrl() {
- return false;
- }
-
/**
* @see HttpServletRequest#isRequestedSessionIdFromURL()
*/
@@ -653,9 +644,4 @@ public class JakartaMockServletHttpRequest implements
HttpServletRequest {
public <T extends HttpUpgradeHandler> T upgrade(final Class<T>
handlerClass) throws IOException, ServletException {
throw new IllegalStateException("Not implemented");
}
-
-// @Override
-// public ServletConnection getServletConnection() {
-// throw new IllegalStateException("Not implemented 6.0.0");
-// }
}
diff --git
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaProgressListenerDiskTest.java
b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaProgressListenerDiskTest.java
similarity index 89%
rename from
commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaProgressListenerDiskTest.java
rename to
commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaProgressListenerDiskTest.java
index db084b94..4a7d5088 100644
---
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaProgressListenerDiskTest.java
+++
b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaProgressListenerDiskTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.jakarta;
+package org.apache.commons.fileupload2.jakarta.servlet6;
import java.io.InputStream;
@@ -22,6 +22,8 @@ import
org.apache.commons.fileupload2.core.AbstractProgressListenerTest;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
import org.apache.commons.fileupload2.core.ProgressListener;
+import
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletDiskFileUpload;
+import
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload;
import jakarta.servlet.http.HttpServletRequest;
diff --git
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaProgressListenerTest.java
b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaProgressListenerTest.java
similarity index 93%
rename from
commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaProgressListenerTest.java
rename to
commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaProgressListenerTest.java
index 2e975b65..d3c1bf55 100644
---
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaProgressListenerTest.java
+++
b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaProgressListenerTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.jakarta;
+package org.apache.commons.fileupload2.jakarta.servlet6;
import java.io.InputStream;
@@ -22,6 +22,7 @@ import
org.apache.commons.fileupload2.core.AbstractProgressListenerTest;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
import org.apache.commons.fileupload2.core.ProgressListener;
+import
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload;
import jakarta.servlet.http.HttpServletRequest;
diff --git
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaServletFileUploadDiskTest.java
b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletFileUploadDiskTest.java
similarity index 94%
rename from
commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaServletFileUploadDiskTest.java
rename to
commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletFileUploadDiskTest.java
index da2ec5e7..b9c7de10 100644
---
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaServletFileUploadDiskTest.java
+++
b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletFileUploadDiskTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.jakarta;
+package org.apache.commons.fileupload2.jakarta.servlet6;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -27,6 +27,9 @@ import org.apache.commons.fileupload2.core.Constants;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
import org.apache.commons.fileupload2.core.FileUploadException;
+import
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletDiskFileUpload;
+import
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload;
+import
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletRequestContext;
import org.junit.jupiter.api.Test;
import jakarta.servlet.http.HttpServletRequest;
diff --git
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaServletFileUploadTest.java
b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletFileUploadTest.java
similarity index 95%
rename from
commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaServletFileUploadTest.java
rename to
commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletFileUploadTest.java
index ff16b7d3..6822ba87 100644
---
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaServletFileUploadTest.java
+++
b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaServletFileUploadTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.jakarta;
+package org.apache.commons.fileupload2.jakarta.servlet6;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -27,6 +27,8 @@ import org.apache.commons.fileupload2.core.Constants;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
import org.apache.commons.fileupload2.core.FileUploadException;
+import
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload;
+import
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletRequestContext;
import org.junit.jupiter.api.Test;
import jakarta.servlet.http.HttpServletRequest;
diff --git
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaSizesDiskTest.java
b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaSizesDiskTest.java
similarity index 92%
rename from
commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaSizesDiskTest.java
rename to
commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaSizesDiskTest.java
index 6276c750..f24694d0 100644
---
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaSizesDiskTest.java
+++
b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaSizesDiskTest.java
@@ -14,13 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.jakarta;
+package org.apache.commons.fileupload2.jakarta.servlet6;
import java.io.InputStream;
import org.apache.commons.fileupload2.core.AbstractSizesTest;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
+import
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletDiskFileUpload;
import jakarta.servlet.http.HttpServletRequest;
diff --git
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaSizesTest.java
b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaSizesTest.java
similarity index 92%
rename from
commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaSizesTest.java
rename to
commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaSizesTest.java
index ad148bbc..df18b303 100644
---
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaSizesTest.java
+++
b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaSizesTest.java
@@ -14,13 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.jakarta;
+package org.apache.commons.fileupload2.jakarta.servlet6;
import java.io.InputStream;
import org.apache.commons.fileupload2.core.AbstractSizesTest;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
+import
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload;
import jakarta.servlet.http.HttpServletRequest;
diff --git
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaStreamingDiskTest.java
b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaStreamingDiskTest.java
similarity index 90%
rename from
commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaStreamingDiskTest.java
rename to
commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaStreamingDiskTest.java
index 1e6f10b6..dcfd57c0 100644
---
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaStreamingDiskTest.java
+++
b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaStreamingDiskTest.java
@@ -14,13 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.jakarta;
+package org.apache.commons.fileupload2.jakarta.servlet6;
import java.io.InputStream;
import org.apache.commons.fileupload2.core.AbstractStreamingTest;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
+import
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletDiskFileUpload;
+import
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletRequestContext;
import jakarta.servlet.http.HttpServletRequest;
diff --git
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaStreamingTest.java
b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaStreamingTest.java
similarity index 90%
rename from
commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaStreamingTest.java
rename to
commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaStreamingTest.java
index f0b4cf68..74fde83a 100644
---
a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaStreamingTest.java
+++
b/commons-fileupload2-jakarta-servlet6/src/test/java/org/apache/commons/fileupload2/jakarta/servlet6/JakartaStreamingTest.java
@@ -14,13 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.jakarta;
+package org.apache.commons.fileupload2.jakarta.servlet6;
import java.io.InputStream;
import org.apache.commons.fileupload2.core.AbstractStreamingTest;
import org.apache.commons.fileupload2.core.DiskFileItem;
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
+import
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload;
+import
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletRequestContext;
import jakarta.servlet.http.HttpServletRequest;
diff --git a/pom.xml b/pom.xml
index aa5a1105..4cf5e964 100644
--- a/pom.xml
+++ b/pom.xml
@@ -448,7 +448,8 @@
</profiles>
<modules>
<module>commons-fileupload2-core</module>
- <module>commons-fileupload2-jakarta</module>
+ <module>commons-fileupload2-jakarta-servlet5</module>
+ <module>commons-fileupload2-jakarta-servlet6</module>
<module>commons-fileupload2-javax</module>
<module>commons-fileupload2-portlet</module>
<module>commons-fileupload2-distribution</module>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 0508c9be..867ae72a 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -46,6 +46,7 @@ The <action> type attribute can be add,update,fix,remove.
<release version="2.0.0-M2" date="2023-MM-DD" description="2.0.0-M2
Release">
<!-- FIX -->
<!-- ADD -->
+ <action dev="ggregory" type="update" due-to="Gary
Gregory">Refactor to support Jakarta Servlet 5 and 6.</action>
<!-- UDPATE -->
<action dev="ggregory" type="update"
due-to="Dependabot">Bump Java from 8 to 11.</action>
<action dev="ggregory" type="update" due-to="Gary
Gregory">Bump commons-parent from 58 to 59.</action>
diff --git a/src/site/apt/migration.apt.vm b/src/site/apt/migration.apt.vm
index 8bd57bde..316cfc23 100644
--- a/src/site/apt/migration.apt.vm
+++ b/src/site/apt/migration.apt.vm
@@ -33,13 +33,15 @@ Migrating
[[2]] Add one or more these dependencies with the <<<groupId>>>
<<org.apache.commons>>, and set the <<<artifactId>>> to:
- [[A]] <<commons-fileupload2-jakarta>> to use Jakarta servlets.
+ [[A]] <<commons-fileupload2-jakarta-serverl5>> to use Jakarta Servlets
5.
- [[B]] <<commons-fileupload2-javax>> to use Javax servlets.
+ [[B]] <<commons-fileupload2-jakarta-serverl6>> to use Jakarta Servlets
6.
+
+ [[C]] <<commons-fileupload2-javax>> to use Javax Servlets.
- [[C]] <<commons-fileupload2-portlet>> to use Javax portlets.
+ [[D]] <<commons-fileupload2-portlet>> to use Javax Portlets.
- [[D]] All of the above automatically depends on
<<commons-fileupload2-core>>.
+ [[E]] All of the above automatically depends on
<<commons-fileupload2-core>>.
[[3]] The dependency version is <<${project.version}>>
@@ -54,7 +56,13 @@ Migrating
to:
+-------------------------------------------
- import org.apache.commons.fileupload2.jakarta.JakartaServletFileUpload;
+ import
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletFileUpload;
++-------------------------------------------
+
+ or:
+
++-------------------------------------------
+ import
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload;
+-------------------------------------------
or:
@@ -95,18 +103,28 @@ Migrating
[[2]] Replace the classes from <<org.apache.commons.fileupload.servlet>> to
either
<<org.apache.commons.fileupload2.jakarta>> or
<<org.apache.commons.fileupload2.javax>>.
-*-------------------------------------------------------------
*---------------------------------------------------------------------*
-| <<Version 1 Name>> | <<Version 2
Jakarta Name>> |
-*-------------------------------------------------------------
*---------------------------------------------------------------------*
-| org.apache.commons.fileupload.servlet.ServletFileUpload |
org.apache.commons.fileupload2.jakarta.JakartaServletFileUpload |
-*-------------------------------------------------------------
*---------------------------------------------------------------------*
-| org.apache.commons.fileupload.servlet.ServletRequestContext |
org.apache.commons.fileupload2.jakarta.JakartaServletRequestContext |
-*--------------------------------------------------------------*---------------------------------------------------------------------*
-| org.apache.commons.fileupload2.servlet.FileCleanerCleanup |
org.apache.commons.fileupload2.jakarta.JakartaServletFileCleaner |
-*--------------------------------------------------------------*---------------------------------------------------------------------*
+*-------------------------------------------------------------
*------------------------------------------------------------------------------*
+| <<Version 1 Name>> | <<Version 2
Jakarta Servlet 5 Name>> |
+*-------------------------------------------------------------
*------------------------------------------------------------------------------*
+| org.apache.commons.fileupload.servlet.ServletFileUpload |
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletFileUpload |
+*-------------------------------------------------------------
*------------------------------------------------------------------------------*
+| org.apache.commons.fileupload.servlet.ServletRequestContext |
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletRequestContext |
+*--------------------------------------------------------------*------------------------------------------------------------------------------*
+| org.apache.commons.fileupload2.servlet.FileCleanerCleanup |
org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletFileCleaner |
+*--------------------------------------------------------------*------------------------------------------------------------------------------*
+
+*-------------------------------------------------------------
*------------------------------------------------------------------------------*
+| <<Version 1 Name>> | <<Version 2
Jakarta Servlet 6 Name>> |
+*-------------------------------------------------------------
*------------------------------------------------------------------------------*
+| org.apache.commons.fileupload.servlet.ServletFileUpload |
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload |
+*-------------------------------------------------------------
*------------------------------------------------------------------------------*
+| org.apache.commons.fileupload.servlet.ServletRequestContext |
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletRequestContext |
+*--------------------------------------------------------------*------------------------------------------------------------------------------*
+| org.apache.commons.fileupload2.servlet.FileCleanerCleanup |
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileCleaner |
+*--------------------------------------------------------------*------------------------------------------------------------------------------*
*-------------------------------------------------------------
*---------------------------------------------------------------------*
-| <<Version 1 Name>> | <<Version 2
Javax Name>> |
+| <<Version 1 Name>> | <<Version 2
Javax Name>> |
*-------------------------------------------------------------
*---------------------------------------------------------------------*
| org.apache.commons.fileupload.servlet.ServletFileUpload |
org.apache.commons.fileupload2.javax.JavaxServletFileUpload |
*-------------------------------------------------------------
*---------------------------------------------------------------------*
@@ -117,7 +135,7 @@ Migrating
* Example
- The following example demonstrates, how to use Commons FileUpload with the
Jakarta Servlet API, version 5:
+ The following example demonstrates, how to use Commons FileUpload with the
Jakarta Servlet API, version 6:
+-------------------------------------------
import java.io.IOException;
@@ -128,8 +146,8 @@ Migrating
import org.apache.commons.fileupload2.FileUpload;
import org.apache.commons.fileupload2.FileUploadException;
import org.apache.commons.fileupload2.DiskFileItemFactory;
- import org.apache.commons.fileupload2.jakarta.JakartaServletFileUpload;
- import org.apache.commons.fileupload2.jakarta.JakartaServletRequestContext;
+ import
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload;
+ import
org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletRequestContext;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServlet;
diff --git a/src/site/site.xml b/src/site/site.xml
index 91f60bc0..c005403e 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -39,10 +39,11 @@
<item name="Issue Tracking" href="./issue-tracking.html" />
</menu>
<menu name="Modules">
- <item name="FileUpload Core"
href="commons-fileupload2-core/index.html" />
- <item name="FileUpload Jakarta"
href="commons-fileupload2-jakarta/index.html" />
- <item name="FileUpload Javax"
href="commons-fileupload2-javax/index.html" />
- <item name="FileUpload Portlet"
href="commons-fileupload2-portlet/index.html" />
+ <item name="FileUpload Core"
href="commons-fileupload2-core/index.html" />
+ <item name="FileUpload Jakarta Servlet 5"
href="commons-fileupload2-jakarta-servlet5/index.html" />
+ <item name="FileUpload Jakarta Servlet 6"
href="commons-fileupload2-jakarta-servlet6/index.html" />
+ <item name="FileUpload Javax"
href="commons-fileupload2-javax/index.html" />
+ <item name="FileUpload Portlet"
href="commons-fileupload2-portlet/index.html" />
</menu>
</body>
