Bug 572858 - CVE-2021-29425
Update to commons io 2.8.0 and remove 2.6.0 as it is not secure.
Change-Id: I141f2a81d1158512f8ca65d4d088fb4b090c9d3a
diff --git a/apache/org.apache.commons.io_2.6.0/.project b/apache/org.apache.commons.io_2.8.0/.project
similarity index 80%
rename from apache/org.apache.commons.io_2.6.0/.project
rename to apache/org.apache.commons.io_2.8.0/.project
index 318cd2b..c6bd785 100644
--- a/apache/org.apache.commons.io_2.6.0/.project
+++ b/apache/org.apache.commons.io_2.8.0/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.apache.commons.io_2.6.0</name>
+ <name>org.apache.commons.io_2.8.0</name>
<comment></comment>
<projects>
</projects>
diff --git a/apache/org.apache.commons.io_2.6.0/osgi.bnd b/apache/org.apache.commons.io_2.8.0/osgi.bnd
similarity index 100%
rename from apache/org.apache.commons.io_2.6.0/osgi.bnd
rename to apache/org.apache.commons.io_2.8.0/osgi.bnd
diff --git a/apache/org.apache.commons.io_2.6.0/pom.xml b/apache/org.apache.commons.io_2.8.0/pom.xml
similarity index 91%
rename from apache/org.apache.commons.io_2.6.0/pom.xml
rename to apache/org.apache.commons.io_2.8.0/pom.xml
index a25b0c9..bb8305b 100644
--- a/apache/org.apache.commons.io_2.6.0/pom.xml
+++ b/apache/org.apache.commons.io_2.8.0/pom.xml
@@ -8,14 +8,14 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.commons.io</artifactId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.8.0-SNAPSHOT</version>
<packaging>eclipse-bundle-recipe</packaging>
<name>Apache Commons IO</name>
<dependencies>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.6</version>
+ <version>2.8.0</version>
</dependency>
</dependencies>
</project>
diff --git a/apache/org.apache.commons.io_2.6.0/src/eclipse/ip_log.xml b/apache/org.apache.commons.io_2.8.0/src/eclipse/ip_log.xml
similarity index 73%
rename from apache/org.apache.commons.io_2.6.0/src/eclipse/ip_log.xml
rename to apache/org.apache.commons.io_2.8.0/src/eclipse/ip_log.xml
index 618a2f6..5cf82c1 100644
--- a/apache/org.apache.commons.io_2.6.0/src/eclipse/ip_log.xml
+++ b/apache/org.apache.commons.io_2.8.0/src/eclipse/ip_log.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ip_log version="1.0">
- <project id="org.apache.commons.io" version="2.6.0" status="done">
+ <project id="org.apache.commons.io" version="2.8.0" status="done">
<info>
<name>Apache Commons IO</name>
<repository>scm:git:git.eclipse.org:/gitroot/orbit/recipes.git</repository>
@@ -12,12 +12,12 @@
<company>Red Hat</company>
</contact>
<legal>
- <ipzilla bug_id="18796"/>
+ <clearlydefined url="https://clearlydefined.io/definitions/maven/mavencentral/commons-io/commons-io/2.8.0"/>
<license>
<name>Apache License, 2.0</name>
<reference>http://www.apache.org/licenses/LICENSE-2.0.txt</reference>
</license>
- <package>commons-io-2.6.jar</package>
+ <package>commons-io-2.8.0.jar</package>
</legal>
</project>
</ip_log>
diff --git a/apache/org.apache.commons.io_2.6.0/src/main/resources/OSGI-INF/l10n/bundle.properties b/apache/org.apache.commons.io_2.8.0/src/main/resources/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from apache/org.apache.commons.io_2.6.0/src/main/resources/OSGI-INF/l10n/bundle.properties
rename to apache/org.apache.commons.io_2.8.0/src/main/resources/OSGI-INF/l10n/bundle.properties
diff --git a/apache/org.apache.commons.io_2.6.0/src/main/resources/about.html b/apache/org.apache.commons.io_2.8.0/src/main/resources/about.html
similarity index 100%
rename from apache/org.apache.commons.io_2.6.0/src/main/resources/about.html
rename to apache/org.apache.commons.io_2.8.0/src/main/resources/about.html
diff --git a/apache/org.apache.commons.io_2.6.0/src/main/resources/about_files/APACHE_LICENSE__VERSION_2.0.txt b/apache/org.apache.commons.io_2.8.0/src/main/resources/about_files/APACHE_LICENSE__VERSION_2.0.txt
similarity index 100%
rename from apache/org.apache.commons.io_2.6.0/src/main/resources/about_files/APACHE_LICENSE__VERSION_2.0.txt
rename to apache/org.apache.commons.io_2.8.0/src/main/resources/about_files/APACHE_LICENSE__VERSION_2.0.txt
diff --git a/apache/pom.xml b/apache/pom.xml
index 903d55d..38df714 100644
--- a/apache/pom.xml
+++ b/apache/pom.xml
@@ -21,7 +21,7 @@
<module>org.apache.commons.compress_1.19.0</module>
<module>org.apache.commons.csv_1.8.0</module>
<module>org.apache.commons.fileupload_1.3.2</module>
- <module>org.apache.commons.io_2.6.0</module>
+ <module>org.apache.commons.io_2.8.0</module>
<module>org.apache.commons.logging_1.2.0</module>
<module>org.apache.commons.math3_3.6.1</module>
<module>org.apache.onami.configuration_6.3.0</module>
diff --git a/releng/aggregationfeature/feature.xml b/releng/aggregationfeature/feature.xml
index b46d155..519a7eb 100644
--- a/releng/aggregationfeature/feature.xml
+++ b/releng/aggregationfeature/feature.xml
@@ -213,7 +213,7 @@
<plugin id="org.apache.commons.logging" version="1.2.0.qualifier"/>
<plugin id="org.apache.commons.csv" version="1.8.0.qualifier"/>
<plugin id="org.apache.commons.fileupload" version="1.3.2.qualifier"/>
- <plugin id="org.apache.commons.io" version="2.6.0.qualifier"/>
+ <plugin id="org.apache.commons.io" version="2.8.0.qualifier"/>
<plugin id="org.apache.commons.math3" version="3.6.1.qualifier"/>
<plugin id="org.apache.jclouds.api.cloudwatch" version="1.8.0.qualifier"/>
