From 75aa478d80aa0f249351ac0dec0731773059604a Mon Sep 17 00:00:00 2001
From: Krzysiek <krzysztofwoyke@gmail.com>
Date: Thu, 7 Jan 2021 20:26:18 +0100
Subject: [PATCH 1/2] JAVA-3585: Upgrade commons-io in the main pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 09cba54b87..e4a2632bf4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1375,7 +1375,7 @@
         <jmh-generator.version>1.19</jmh-generator.version>
         <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
         <maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version>
-        <commons-io.version>2.5</commons-io.version>
+        <commons-io.version>2.8.0</commons-io.version>
         <commons-lang.version>2.6</commons-lang.version>
         <commons-lang3.version>3.11</commons-lang3.version>
         <commons-cli.version>1.4</commons-cli.version>

From ba5343cab27965460f29ec889fa1a03a30d2cb78 Mon Sep 17 00:00:00 2001
From: Krzysiek <krzysztofwoyke@gmail.com>
Date: Thu, 7 Jan 2021 20:42:57 +0100
Subject: [PATCH 2/2] JAVA-3585: Use common commons-io.version property in all
 child modules

---
 aws-lambda/lambda/pom.xml                          | 1 -
 core-java-modules/core-java-9/pom.xml              | 2 +-
 jhipster/jhipster-microservice/car-app/pom.xml     | 1 -
 jhipster/jhipster-microservice/dealer-app/pom.xml  | 1 -
 jhipster/jhipster-microservice/gateway-app/pom.xml | 1 -
 jhipster/jhipster-monolithic/pom.xml               | 1 -
 libraries-6/pom.xml                                | 3 +--
 libraries-data/pom.xml                             | 3 +--
 parent-java/pom.xml                                | 3 +--
 persistence-modules/hibernate-mapping/pom.xml      | 1 -
 spring-boot-modules/pom.xml                        | 1 -
 spring-boot-modules/spring-boot-mvc-3/pom.xml      | 4 ----
 spring-core/pom.xml                                | 3 +--
 spring-di/pom.xml                                  | 3 +--
 spring-web-modules/spring-mvc-java/pom.xml         | 1 -
 xml/pom.xml                                        | 1 -
 16 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/aws-lambda/lambda/pom.xml b/aws-lambda/lambda/pom.xml
index 2d903aabc5..1f446e04c0 100644
--- a/aws-lambda/lambda/pom.xml
+++ b/aws-lambda/lambda/pom.xml
@@ -89,7 +89,6 @@
 
     <properties>
         <json-simple.version>1.1.1</json-simple.version>
-        <commons-io.version>2.5</commons-io.version>
         <aws-lambda-java-events.version>1.3.0</aws-lambda-java-events.version>
         <aws-lambda-java-core.version>1.2.0</aws-lambda-java-core.version>
         <gson.version>2.8.2</gson.version>
diff --git a/core-java-modules/core-java-9/pom.xml b/core-java-modules/core-java-9/pom.xml
index 05dc8ba5eb..001faf88cb 100644
--- a/core-java-modules/core-java-9/pom.xml
+++ b/core-java-modules/core-java-9/pom.xml
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.7</version>
+            <version>${commons-io.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/jhipster/jhipster-microservice/car-app/pom.xml b/jhipster/jhipster-microservice/car-app/pom.xml
index 603d53299c..477192438f 100644
--- a/jhipster/jhipster-microservice/car-app/pom.xml
+++ b/jhipster/jhipster-microservice/car-app/pom.xml
@@ -21,7 +21,6 @@
         <argLine>-Djava.security.egd=file:/dev/./urandom -Xmx256m</argLine>
         <assertj.version>3.6.2</assertj.version>
         <awaitility.version>2.0.0</awaitility.version>
-        <commons-io.version>2.5</commons-io.version>
         <docker-maven-plugin.version>0.4.13</docker-maven-plugin.version>
         <hazelcast-hibernate52.version>1.2</hazelcast-hibernate52.version>
         <hibernate.version>5.2.8.Final</hibernate.version>
diff --git a/jhipster/jhipster-microservice/dealer-app/pom.xml b/jhipster/jhipster-microservice/dealer-app/pom.xml
index 0e492d3d13..59df7d3b69 100644
--- a/jhipster/jhipster-microservice/dealer-app/pom.xml
+++ b/jhipster/jhipster-microservice/dealer-app/pom.xml
@@ -20,7 +20,6 @@
         <argLine>-Djava.security.egd=file:/dev/./urandom -Xmx256m</argLine>
         <assertj.version>3.6.2</assertj.version>
         <awaitility.version>2.0.0</awaitility.version>
-        <commons-io.version>2.5</commons-io.version>
         <docker-maven-plugin.version>0.4.13</docker-maven-plugin.version>
         <hazelcast-hibernate52.version>1.2</hazelcast-hibernate52.version>
         <hibernate.version>5.2.8.Final</hibernate.version>
diff --git a/jhipster/jhipster-microservice/gateway-app/pom.xml b/jhipster/jhipster-microservice/gateway-app/pom.xml
index c5e7364f57..a50c2bbdd1 100644
--- a/jhipster/jhipster-microservice/gateway-app/pom.xml
+++ b/jhipster/jhipster-microservice/gateway-app/pom.xml
@@ -22,7 +22,6 @@
         <awaitility.version>2.0.0</awaitility.version>
         <cassandra-driver.version>3.6.0</cassandra-driver.version>
         <commons-codec.version>1.10</commons-codec.version>
-        <commons-io.version>2.5</commons-io.version>
         <docker-maven-plugin.version>0.4.13</docker-maven-plugin.version>
         <frontend-maven-plugin.version>1.3</frontend-maven-plugin.version>
         <hazelcast-hibernate52.version>1.2</hazelcast-hibernate52.version>
diff --git a/jhipster/jhipster-monolithic/pom.xml b/jhipster/jhipster-monolithic/pom.xml
index 103f48424f..97f2b85b2f 100644
--- a/jhipster/jhipster-monolithic/pom.xml
+++ b/jhipster/jhipster-monolithic/pom.xml
@@ -887,7 +887,6 @@
         <argLine>-Djava.security.egd=file:/dev/./urandom -Xmx256m</argLine>
         <assertj.version>3.6.2</assertj.version>
         <awaitility.version>2.0.0</awaitility.version>
-        <commons-io.version>2.5</commons-io.version>
         <docker-maven-plugin.version>0.4.13</docker-maven-plugin.version>
         <frontend-maven-plugin.version>1.3</frontend-maven-plugin.version>
         <gatling-maven-plugin.version>2.2.1</gatling-maven-plugin.version>
diff --git a/libraries-6/pom.xml b/libraries-6/pom.xml
index 0f129c27c9..caaebbb922 100644
--- a/libraries-6/pom.xml
+++ b/libraries-6/pom.xml
@@ -94,7 +94,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>${commonsio.version}</version>
+            <version>${commons-io.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -157,7 +157,6 @@
         <protonpack.version>1.15</protonpack.version>
         <commons-net.version>3.6</commons-net.version>
         <assertj.version>3.6.2</assertj.version>
-        <commonsio.version>2.6</commonsio.version>
         <renjin.version>RELEASE</renjin.version>
         <rcaller.version>3.0</rcaller.version>
         <rserve.version>1.8.1</rserve.version>
diff --git a/libraries-data/pom.xml b/libraries-data/pom.xml
index 95d771ce4e..5adb490e96 100644
--- a/libraries-data/pom.xml
+++ b/libraries-data/pom.xml
@@ -80,7 +80,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>${commons.io.version}</version>
+            <version>${commons-io.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -165,7 +165,6 @@
     <properties>
         <assembly.plugin.version>2.3</assembly.plugin.version>
         <commons.cli.version>1.2</commons.cli.version>
-        <commons.io.version>2.1</commons.io.version>
         <httpclient.version>3.0.1</httpclient.version>
         <storm.version>1.2.2</storm.version>
         <kafka.version>1.0.0</kafka.version>
diff --git a/parent-java/pom.xml b/parent-java/pom.xml
index d251adcdd3..9170f45bbe 100644
--- a/parent-java/pom.xml
+++ b/parent-java/pom.xml
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>${commons.io.version}</version>
+            <version>${commons-io.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
@@ -43,7 +43,6 @@
 
     <properties>
         <guava.version>29.0-jre</guava.version>
-        <commons.io.version>2.6</commons.io.version>
         <jmh.version>1.19</jmh.version>
         <modelmapper.version>2.3.7</modelmapper.version>
         <hamcrest.version>2.2</hamcrest.version>
diff --git a/persistence-modules/hibernate-mapping/pom.xml b/persistence-modules/hibernate-mapping/pom.xml
index 155eefa526..ebc854a621 100644
--- a/persistence-modules/hibernate-mapping/pom.xml
+++ b/persistence-modules/hibernate-mapping/pom.xml
@@ -71,7 +71,6 @@
         <org.glassfish.javax.el.version>3.0.1-b11</org.glassfish.javax.el.version>        
         <money-api.version>1.0.3</money-api.version>
         <moneta.version>1.3</moneta.version>
-        <commons-io.version>2.6</commons-io.version>
     </properties>
 
 </project>
diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml
index c562d522e2..ee088c357a 100644
--- a/spring-boot-modules/pom.xml
+++ b/spring-boot-modules/pom.xml
@@ -116,6 +116,5 @@
 
     <properties>
         <junit-jupiter.version>5.6.2</junit-jupiter.version>
-        <commons-io.version>2.6</commons-io.version>
     </properties>
 </project>
diff --git a/spring-boot-modules/spring-boot-mvc-3/pom.xml b/spring-boot-modules/spring-boot-mvc-3/pom.xml
index 1290b0432f..5a5d4c3cd8 100644
--- a/spring-boot-modules/spring-boot-mvc-3/pom.xml
+++ b/spring-boot-modules/spring-boot-mvc-3/pom.xml
@@ -37,8 +37,4 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <commons-io.version>2.7</commons-io.version>
-    </properties>
-
 </project>
diff --git a/spring-core/pom.xml b/spring-core/pom.xml
index eb25bcd517..7d83fc198c 100644
--- a/spring-core/pom.xml
+++ b/spring-core/pom.xml
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>${commons.io.version}</version>
+            <version>${commons-io.version}</version>
         </dependency>
     </dependencies>
 
@@ -86,7 +86,6 @@
         <mockito.spring.boot.version>1.4.4.RELEASE</mockito.spring.boot.version>
         <javax.inject.version>1</javax.inject.version>
         <guava.version>20.0</guava.version>
-        <commons.io.version>2.5</commons.io.version>
         <spring-boot.version>1.5.2.RELEASE</spring-boot.version>
         <mockito.version>1.10.19</mockito.version>
         <assertj.version>3.12.2</assertj.version>
diff --git a/spring-di/pom.xml b/spring-di/pom.xml
index 48cdf60673..df0b685ae2 100644
--- a/spring-di/pom.xml
+++ b/spring-di/pom.xml
@@ -83,7 +83,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>${commons.io.version}</version>
+            <version>${commons-io.version}</version>
         </dependency>
         <dependency>
             <groupId>org.aspectj</groupId>
@@ -159,7 +159,6 @@
         <mockito.spring.boot.version>1.4.4.RELEASE</mockito.spring.boot.version>
         <javax.inject.version>1</javax.inject.version>
         <guava.version>20.0</guava.version>
-        <commons.io.version>2.5</commons.io.version>
         <spring-boot.version>1.5.2.RELEASE</spring-boot.version>
         <mockito.version>1.10.19</mockito.version>
         <assertj.version>3.12.2</assertj.version>
diff --git a/spring-web-modules/spring-mvc-java/pom.xml b/spring-web-modules/spring-mvc-java/pom.xml
index ec302eed57..474bbb2a06 100644
--- a/spring-web-modules/spring-mvc-java/pom.xml
+++ b/spring-web-modules/spring-mvc-java/pom.xml
@@ -235,7 +235,6 @@
         <!-- util -->
         <guava.version>19.0</guava.version>
         <commons-fileupload.version>1.3.2</commons-fileupload.version>
-        <commons-io.version>2.5</commons-io.version>
         <commons-fileupload.version>1.4</commons-fileupload.version>
         <jsonpath.version>2.2.0</jsonpath.version>
 
diff --git a/xml/pom.xml b/xml/pom.xml
index cbad5b37f0..837f918b46 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -364,7 +364,6 @@
         <jaxen.version>1.2.0</jaxen.version>
         <jdom2.version>2.0.6</jdom2.version>
         <joox.version>1.6.2</joox.version>
-        <commons-io.version>2.5</commons-io.version>
         <commons-collections4.version>4.1</commons-collections4.version>
         <jibx-version>1.2.4.5</jibx-version>
         <jaxb-api.version>2.3.1</jaxb-api.version>