Merge pull request #189 from jglick/commons-fileupload

Update commons-fileupload to match that used in Jenkins
jenkinsci · Jun 15, 2020 · 6bb6358 · 6bb6358
2 parents b7f1b76 + 4949d30
commit 6bb6358
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/core/pom.xml b/core/pom.xml
@@ -107,7 +107,7 @@
       <!-- perhaps mark this dependency optional? -->
       <groupId>commons-fileupload</groupId>
       <artifactId>commons-fileupload</artifactId>
-      <version>1.2.1</version>
+      <version>1.3.1-jenkins-2</version>
     </dependency>    
     <!-- optional REST support -->
     <dependency>

diff --git a/core/src/test/java/org/kohsuke/stapler/RequestImplTest.java b/core/src/test/java/org/kohsuke/stapler/RequestImplTest.java
@@ -60,6 +60,11 @@ public String getCharacterEncoding() {
                 return "UTF-8";
             }
             @Override
+            public String getHeader(String name) {
+                // FILEUPLOAD-195/FILEUPLOAD-228: ignore FileUploadBase.CONTENT_LENGTH
+                return null;
+            }
+            @Override
             public int getContentLength() {
                 return buf.length;
             }