From d450e4a2f81748ada5b89fd8cc5a8a976d35d095 Mon Sep 17 00:00:00 2001
From: Krzysiek <krzysztofwoyke@gmail.com>
Date: Fri, 8 Jan 2021 20:01:27 +0100
Subject: [PATCH] JAVA-3588: Use common commons-fileupload.version property in
 all child modules

---
 javax-servlets/pom.xml                                   | 1 -
 spring-security-modules/spring-security-web-rest/pom.xml | 2 --
 spring-web-modules/spring-mvc-basics-2/pom.xml           | 1 -
 spring-web-modules/spring-mvc-forms-jsp/pom.xml          | 3 +--
 spring-web-modules/spring-mvc-java/pom.xml               | 2 --
 spring-web-modules/spring-rest-simple/pom.xml            | 1 -
 6 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/javax-servlets/pom.xml b/javax-servlets/pom.xml
index 5fc9fef24a..700b823a6e 100644
--- a/javax-servlets/pom.xml
+++ b/javax-servlets/pom.xml
@@ -59,7 +59,6 @@
         <org.apache.httpcomponents.version>4.5.3</org.apache.httpcomponents.version>
         <gson.version>2.8.2</gson.version>
         <assertj.version>3.9.1</assertj.version>
-        <commons-fileupload.version>1.3.3</commons-fileupload.version>
         <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
     </properties>
 
diff --git a/spring-security-modules/spring-security-web-rest/pom.xml b/spring-security-modules/spring-security-web-rest/pom.xml
index d2468152da..2330243aa6 100644
--- a/spring-security-modules/spring-security-web-rest/pom.xml
+++ b/spring-security-modules/spring-security-web-rest/pom.xml
@@ -168,7 +168,6 @@
             <version>${springfox-swagger.version}</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/commons-fileupload/commons-fileupload -->
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
@@ -271,7 +270,6 @@
 
         <!-- util -->
         <guava.version>26.0-jre</guava.version>
-        <commons-fileupload.version>1.3.2</commons-fileupload.version>
 
         <!-- testing -->
         <rest-assured.version>2.9.0</rest-assured.version>
diff --git a/spring-web-modules/spring-mvc-basics-2/pom.xml b/spring-web-modules/spring-mvc-basics-2/pom.xml
index e16b54b2c8..0b4515994b 100644
--- a/spring-web-modules/spring-mvc-basics-2/pom.xml
+++ b/spring-web-modules/spring-mvc-basics-2/pom.xml
@@ -168,7 +168,6 @@
         <javax.servlet-api.version>4.0.0</javax.servlet-api.version>
         <hibernate-validator.version>6.0.10.Final</hibernate-validator.version>
         <deploy-path>enter-location-of-server</deploy-path>
-        <commons-fileupload.version>1.3.2</commons-fileupload.version>
         <org.thymeleaf-version>3.0.11.RELEASE</org.thymeleaf-version>
         <groovy.version>2.4.12</groovy.version>
         <freemarker.version>2.3.27-incubating</freemarker.version>
diff --git a/spring-web-modules/spring-mvc-forms-jsp/pom.xml b/spring-web-modules/spring-mvc-forms-jsp/pom.xml
index aba16236da..0ca23bd6cb 100644
--- a/spring-web-modules/spring-mvc-forms-jsp/pom.xml
+++ b/spring-web-modules/spring-mvc-forms-jsp/pom.xml
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
-            <version>${fileupload.version}</version>
+            <version>${commons-fileupload.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -98,7 +98,6 @@
 
     <properties>
         <hibernate-validator.version>6.0.10.Final</hibernate-validator.version>
-        <fileupload.version>1.3.3</fileupload.version>
         <hibernate.version>5.2.5.Final</hibernate.version>
         <mysql-connector-java.version>6.0.6</mysql-connector-java.version>
     </properties>
diff --git a/spring-web-modules/spring-mvc-java/pom.xml b/spring-web-modules/spring-mvc-java/pom.xml
index 474bbb2a06..1324511215 100644
--- a/spring-web-modules/spring-mvc-java/pom.xml
+++ b/spring-web-modules/spring-mvc-java/pom.xml
@@ -234,8 +234,6 @@
 
         <!-- util -->
         <guava.version>19.0</guava.version>
-        <commons-fileupload.version>1.3.2</commons-fileupload.version>
-        <commons-fileupload.version>1.4</commons-fileupload.version>
         <jsonpath.version>2.2.0</jsonpath.version>
 
         <!-- testing -->
diff --git a/spring-web-modules/spring-rest-simple/pom.xml b/spring-web-modules/spring-rest-simple/pom.xml
index 37a0b99de2..b9d5100fbf 100644
--- a/spring-web-modules/spring-rest-simple/pom.xml
+++ b/spring-web-modules/spring-rest-simple/pom.xml
@@ -314,7 +314,6 @@
     </profiles>
 
     <properties>
-        <commons-fileupload.version>1.3.3</commons-fileupload.version>
         <kryo.version>4.0.0</kryo.version>
         <protobuf-java-format.version>1.4</protobuf-java-format.version>
         <protobuf-java.version>3.1.0</protobuf-java.version>