From 887296fcd0ce04c1f6341d31b90522ee509dd6db Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Mon, 1 Feb 2021 00:20:19 -0800
Subject: [PATCH] JENKINS-64650: Upgrade Commons FileUpload from
 1.3.1-jenkins-2 to 1.4 (#5174)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 bom/pom.xml                                  | 2 +-
 core/src/main/java/hudson/PluginManager.java | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index b7245917021a..0ad347d11fb4 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -262,7 +262,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>commons-fileupload</groupId>
         <artifactId>commons-fileupload</artifactId>
-        <version>1.3.1-jenkins-2</version>
+        <version>1.4</version>
       </dependency>
       <dependency>
         <groupId>com.sun.xml.txw2</groupId>
diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java
index 3ce68f348794..68c3e149d37c 100644
--- a/core/src/main/java/hudson/PluginManager.java
+++ b/core/src/main/java/hudson/PluginManager.java
@@ -1771,6 +1771,9 @@ public HttpResponse doUploadPlugin(StaplerRequest req) throws IOException, Servl
             File t = File.createTempFile("uploaded", ".jpi");
             t.deleteOnExit();
             try {
+                // TODO Remove this workaround after FILEUPLOAD-293 is resolved.
+                t.delete();
+
                 fileItem.write(t);
             } catch (Exception e) {
                 // Exception thrown is too generic so at least limit the scope where it can occur