diff --git a/core/pom.xml b/core/pom.xml
index abffdbe49..ac103579c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -214,8 +214,8 @@
 
         <!-- File upload -->
         <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-fileupload2-jakarta</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
diff --git a/pom.xml b/pom.xml
index 7b708d665..3826c125b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -833,9 +833,9 @@
                 <version>4.4</version>
             </dependency>
             <dependency>
-                <groupId>commons-fileupload</groupId>
-                <artifactId>commons-fileupload</artifactId>
-                <version>1.5</version>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-fileupload2-jakarta</artifactId>
+                <version>2.0.0-M1</version>
             </dependency>
             <dependency>
                 <groupId>commons-io</groupId>