From abede2a4b4fa87b38f33fa1f95be8e955eab654a Mon Sep 17 00:00:00 2001
From: Domenico Sibilio <domenicosibilio@gmail.com>
Date: Fri, 29 Mar 2024 11:00:20 +0100
Subject: [PATCH] ACS-7036 Bump commons-fileupload to 1.5 (#1984)

---
 pom.xml                                                     | 6 ++++++
 search-services/packaging/pom.xml                           | 1 +
 .../packaging/src/main/resources/licenses/notice.txt        | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1e4c95ccd..2d6c20807 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,9 +86,15 @@
       <dependency.protobuf.version>3.23.4</dependency.protobuf.version>
       <dependency.jayway.jsonpath.version>2.8.0</dependency.jayway.jsonpath.version>
       <dependency.janino.version>3.1.10</dependency.janino.version>
+      <dependency.commons-fileupload.version>1.5</dependency.commons-fileupload.version>
    </properties>
    <dependencyManagement>
       <dependencies>
+         <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>${dependency.commons-fileupload.version}</version>
+         </dependency>
          <dependency>
             <groupId>org.codehaus.janino</groupId>
             <artifactId>commons-compiler</artifactId>
diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml
index 48afdd989..9424081db 100644
--- a/search-services/packaging/pom.xml
+++ b/search-services/packaging/pom.xml
@@ -184,6 +184,7 @@
                                 <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/httpclient-4.4.1.jar" />
                                 <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/guava-31.1-jre.jar" />
                                 <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/protobuf-java-3.6.1.jar" />
+                                <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/commons-fileupload-1.3.3.jar" />
                                 <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/libs/jquery-2.1.3.min.js" />
                                 <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/js/lib/jquery-1.7.2.min.js" />
                             </target>
diff --git a/search-services/packaging/src/main/resources/licenses/notice.txt b/search-services/packaging/src/main/resources/licenses/notice.txt
index 6fb620556..3d74858e9 100644
--- a/search-services/packaging/src/main/resources/licenses/notice.txt
+++ b/search-services/packaging/src/main/resources/licenses/notice.txt
@@ -149,7 +149,7 @@ commons-collections-3.2.2.jar
 commons-collections4-4.1.jar
 commons-configuration-1.6.jar
 commons-exec-1.3.jar
-commons-fileupload-1.3.3.jar
+commons-fileupload-1.5.jar
 commons-io-2.5.jar
 calcite-core-1.32.0.jar
 calcite-linq4j-1.32.0.jar