diff --git a/pom.xml b/pom.xml index a4dae1d..5b67f29 100644 --- a/pom.xml +++ b/pom.xml @@ -70,12 +70,12 @@ commons-beanutils commons-beanutils - 1.9.4 + 1.11.0 org.apache.commons - commons-fileupload2-jakarta - 2.0.0-M1 + commons-fileupload2-jakarta-servlet6 + 2.0.0-M4 commons-io @@ -121,7 +121,7 @@ - 6.2.0 + 6.2.8 17 ${java.version} ${java.version} diff --git a/spring-webscripts/spring-webscripts/pom.xml b/spring-webscripts/spring-webscripts/pom.xml index 89f9c76..792166a 100644 --- a/spring-webscripts/spring-webscripts/pom.xml +++ b/spring-webscripts/spring-webscripts/pom.xml @@ -32,7 +32,7 @@ org.apache.commons - commons-fileupload2-jakarta + commons-fileupload2-jakarta-servlet6 diff --git a/spring-webscripts/spring-webscripts/src/main/java/org/springframework/extensions/webscripts/servlet/FormData.java b/spring-webscripts/spring-webscripts/src/main/java/org/springframework/extensions/webscripts/servlet/FormData.java index 786d9ee..79abb1f 100644 --- a/spring-webscripts/spring-webscripts/src/main/java/org/springframework/extensions/webscripts/servlet/FormData.java +++ b/spring-webscripts/spring-webscripts/src/main/java/org/springframework/extensions/webscripts/servlet/FormData.java @@ -31,8 +31,8 @@ import org.apache.commons.fileupload2.core.FileItem; import org.apache.commons.fileupload2.core.FileItemFactory; import org.apache.commons.fileupload2.core.FileUploadException; -import org.apache.commons.fileupload2.jakarta.JakartaFileCleaner; -import org.apache.commons.fileupload2.jakarta.JakartaServletFileUpload; +import org.apache.commons.fileupload2.jakarta.servlet6.JakartaFileCleaner; +import org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload; import org.apache.commons.io.FileCleaningTracker; import org.apache.commons.io.FilenameUtils; import org.apache.commons.logging.Log;