Merge pull request #21446 from cbridgha/UpgradeFileupload_1_4

Upgrade commons-fileupload to 1.4

Author: cbridgha

dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml

@@ -376,6 +376,11 @@
       <artifactId>commons-collections</artifactId>
       <version>3.2.2</version>
     </dependency>
+    <dependency>
+      <groupId>commons-fileupload</groupId>
+      <artifactId>commons-fileupload</artifactId>
+      <version>1.4</version>
+    </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
@@ -3456,11 +3461,6 @@
       <artifactId>commons-discovery</artifactId>
       <version>0.2</version>
     </dependency>
-    <dependency>
-      <groupId>commons-fileupload</groupId>
-      <artifactId>commons-fileupload</artifactId>
-      <version>1.3.3</version>
-    </dependency>
     <dependency>
       <groupId>commons-httpclient</groupId>
       <artifactId>commons-httpclient</artifactId>

dev/cnf/oss_dependencies.maven

@@ -71,6 +71,7 @@ com.unboundid:unboundid-ldapsdk:5.1.0
 commons-cli:commons-cli:1.4
 commons-codec:commons-codec:1.15
 commons-collections:commons-collections:3.2.2
+commons-fileupload:commons-fileupload:1.4
 commons-lang:commons-lang:2.4
 commons-logging:commons-logging:1.2
 commons-net:commons-net:3.6

dev/cnf/oss_source_dependencies.maven

@@ -19,7 +19,6 @@ com.sun.xml.ws:policy:2.4
 commons-beanutils:commons-beanutils:1.9.4
 commons-digester:commons-digester:1.8
 commons-discovery:commons-discovery:0.2
-commons-fileupload:commons-fileupload:1.3.3
 commons-httpclient:commons-httpclient:3.1
 commons-io:commons-io:2.6
 commons-io:commons-io:2.8.0

dev/com.ibm.ws.org.apache.commons.fileupload/bnd.bnd

@@ -8,7 +8,7 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 #*******************************************************************************
--include= jar:${fileuri;${repo;org.apache.commons.fileupload;1.3.3;EXACT}}!/META-INF/MANIFEST.MF,bnd.overrides
+-include= jar:${fileuri;${repo;org.apache.commons.commons-fileupload;1.4;EXACT}}!/META-INF/MANIFEST.MF,bnd.overrides
 
 -sub: *.bnd
 
@@ -17,5 +17,5 @@ instrument.disabled: true
 
 
 -buildpath: \
-	commons-fileupload:commons-fileupload;strategy=exact;version=1.3.3,\
+	commons-fileupload:commons-fileupload;strategy=exact;version=1.4,\
 	com.ibm.websphere.javaee.servlet.3.0;version=latest

dev/com.ibm.ws.org.apache.commons.fileupload/bnd.overrides

@@ -5,5 +5,5 @@ bVersion=1.0
 
 Private-Package: org.apache.commons.fileupload.portlet
 
-Include-Resource: @${repo;org.apache.commons.fileupload;1.3.3;EXACT}!/!META-INF/MANIFEST.MF|META-INF/maven/*
+Include-Resource: @${repo;org.apache.commons.commons-fileupload;1.4;EXACT}!/!META-INF/MANIFEST.MF|META-INF/maven/*
 

dev/com.ibm.ws.ui/bnd.bnd

@@ -79,4 +79,4 @@ Include-Resource: \
 	com.ibm.ws.org.osgi.annotation.versioning;version=latest,\
 	com.ibm.wsspi.org.osgi.service.component.annotations;version=latest,\
 	com.ibm.wsspi.org.osgi.service.event;version=latest,\
-	commons-fileupload:commons-fileupload;version=1.3.3
+	com.ibm.ws.org.apache.commons.fileupload;version=latest