[JENKINS-73170] Upgrade Commons FileUpload from 1.5 to 2.0.0-M2 (#542)

jenkinsci · May 16, 2024 · d250086 · d250086
1 parent fc1ca4b
commit d250086
Show file tree

Hide file tree

Showing 8 changed files with 698 additions and 29 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -10,6 +10,11 @@
   <artifactId>stapler</artifactId>
   <name>Stapler</name>
   <description>Stapler HTTP request handling engine</description>
+
+  <properties>
+    <commons-fileupload2.version>2.0.0-M2</commons-fileupload2.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>com.jcraft</groupId>
@@ -38,12 +43,6 @@
       <artifactId>commons-discovery</artifactId>
       <version>0.5</version>
     </dependency>
-    <dependency>
-      <!-- perhaps mark this dependency optional? -->
-      <groupId>commons-fileupload</groupId>
-      <artifactId>commons-fileupload</artifactId>
-      <version>1.5</version>
-    </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
@@ -63,6 +62,17 @@
       <artifactId>javax.annotation-api</artifactId>
       <version>1.3.2</version>
     </dependency>
+    <!-- perhaps mark these dependencies optional? -->
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-fileupload2-core</artifactId>
+      <version>${commons-fileupload2.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-fileupload2-javax</artifactId>
+      <version>${commons-fileupload2.version}</version>
+    </dependency>
     <dependency>
       <!--
         To allow stapler to be used from Groovy, code, we have a bit of tooling