You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by br...@apache.org on 2020/10/01 09:29:46 UTC

[lucene-solr] branch branch_8x updated: SOLR-14905: Upgrade commons-io version to 2.8.0.

This is an automated email from the ASF dual-hosted git repository.

broustant pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/branch_8x by this push:
     new db4bc94  SOLR-14905: Upgrade commons-io version to 2.8.0.
db4bc94 is described below

commit db4bc94480a4a122dae031619cffeef8b9b1aa8f
Author: Bruno Roustant <br...@salesforce.com>
AuthorDate: Thu Oct 1 10:30:47 2020 +0200

    SOLR-14905: Upgrade commons-io version to 2.8.0.
    
    Closes #1935
---
 lucene/ivy-versions.properties                        | 2 +-
 solr/CHANGES.txt                                      | 2 ++
 solr/core/src/test/org/apache/hadoop/fs/FileUtil.java | 7 +------
 solr/licenses/commons-io-2.6.jar.sha1                 | 1 -
 solr/licenses/commons-io-2.8.0.jar.sha1               | 1 +
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 183c762..7bca040 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -54,7 +54,7 @@ com.sun.jersey.version = 1.19
 /commons-cli/commons-cli = 1.4
 /commons-codec/commons-codec = 1.13
 /commons-collections/commons-collections = 3.2.2
-/commons-io/commons-io = 2.6
+/commons-io/commons-io = 2.8.0
 # necessary to run test or embedded Zookeeper as of 3.6.1
 commons.lang.version = 2.6
 /commons-lang/commons-lang = ${commons.lang.version}
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index a9a3bec..c7496a2 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -59,6 +59,8 @@ Improvements
 * SOLR-14859: DateRangeField now throws errors when invalid field/fieldType options specified; no longer silently accepts incompatible option values
   (Jason Gerlowski, Chris Hostetter, Munendra S N)
 
+* SOLR-14905: Update commons-io version to 2.8.0 due to security vulnerability. (Nazerke Seidan via Bruno Roustant)
+
 Optimizations
 ---------------------
 
diff --git a/solr/core/src/test/org/apache/hadoop/fs/FileUtil.java b/solr/core/src/test/org/apache/hadoop/fs/FileUtil.java
index e38b563..4b34356 100644
--- a/solr/core/src/test/org/apache/hadoop/fs/FileUtil.java
+++ b/solr/core/src/test/org/apache/hadoop/fs/FileUtil.java
@@ -597,12 +597,7 @@ public class FileUtil {
       File[] allFiles = dir.listFiles();
       if(allFiles != null) {
         for (int i = 0; i < allFiles.length; i++) {
-          boolean isSymLink;
-          try {
-            isSymLink = org.apache.commons.io.FileUtils.isSymlink(allFiles[i]);
-          } catch(IOException ioe) {
-            isSymLink = true;
-          }
+          boolean isSymLink = org.apache.commons.io.FileUtils.isSymlink(allFiles[i]);
           if(!isSymLink) {
             size += getDU(allFiles[i]);
           }
diff --git a/solr/licenses/commons-io-2.6.jar.sha1 b/solr/licenses/commons-io-2.6.jar.sha1
deleted file mode 100644
index 9fa55f5..0000000
--- a/solr/licenses/commons-io-2.6.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-815893df5f31da2ece4040fe0a12fd44b577afaf
diff --git a/solr/licenses/commons-io-2.8.0.jar.sha1 b/solr/licenses/commons-io-2.8.0.jar.sha1
new file mode 100644
index 0000000..3a5fc71
--- /dev/null
+++ b/solr/licenses/commons-io-2.8.0.jar.sha1
@@ -0,0 +1 @@
+92999e26e6534606b5678014e66948286298a35c