You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ag...@apache.org on 2022/03/28 20:22:15 UTC
[storm] branch master updated: commons-io 2.11.0 (#3446)
This is an automated email from the ASF dual-hosted git repository.
agresch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git
The following commit(s) were added to refs/heads/master by this push:
new b83df86 commons-io 2.11.0 (#3446)
b83df86 is described below
commit b83df866e5ae63481348b67d3613fc444c60d8c7
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Mon Mar 28 22:22:09 2022 +0200
commons-io 2.11.0 (#3446)
---
DEPENDENCY-LICENSES | 3 +--
LICENSE-binary | 2 +-
external/storm-solr/pom.xml | 2 +-
pom.xml | 2 +-
storm-server/src/main/java/org/apache/storm/utils/ServerUtils.java | 7 +------
storm-submit-tools/pom.xml | 2 +-
6 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/DEPENDENCY-LICENSES b/DEPENDENCY-LICENSES
index cc221fa..1ee234c 100644
--- a/DEPENDENCY-LICENSES
+++ b/DEPENDENCY-LICENSES
@@ -41,7 +41,7 @@ List of third-party dependencies grouped by their license type.
* Apache Commons CSV (org.apache.commons:commons-csv:1.4 - http://commons.apache.org/proper/commons-csv/)
* Apache Commons Exec (org.apache.commons:commons-exec:1.3 - http://commons.apache.org/proper/commons-exec/)
* Apache Commons FileUpload (commons-fileupload:commons-fileupload:1.3.3 - http://commons.apache.org/proper/commons-fileupload/)
- * Apache Commons IO (commons-io:commons-io:2.6 - http://commons.apache.org/proper/commons-io/)
+ * Apache Commons IO (commons-io:commons-io:2.11.0 - https://commons.apache.org/proper/commons-io/)
* Apache Commons Lang (org.apache.commons:commons-lang3:3.2 - http://commons.apache.org/proper/commons-lang/)
* Apache Commons Lang (org.apache.commons:commons-lang3:3.3 - http://commons.apache.org/proper/commons-lang/)
* Apache Commons Lang (org.apache.commons:commons-lang3:3.4 - http://commons.apache.org/proper/commons-lang/)
@@ -221,7 +221,6 @@ List of third-party dependencies grouped by their license type.
* Commons Configuration (commons-configuration:commons-configuration:1.6 - http://commons.apache.org/${pom.artifactId.substring(8)}/)
* Commons Daemon (commons-daemon:commons-daemon:1.0.13 - http://commons.apache.org/daemon/)
* Commons DBCP (commons-dbcp:commons-dbcp:1.4 - http://commons.apache.org/dbcp/)
- * Commons IO (commons-io:commons-io:1.4 - http://commons.apache.org/io/)
* Commons Lang (commons-lang:commons-lang:2.5 - http://commons.apache.org/lang/)
* Commons Lang (commons-lang:commons-lang:2.6 - http://commons.apache.org/lang/)
* Commons Logging (commons-logging:commons-logging:1.1.3 - http://commons.apache.org/proper/commons-logging/)
diff --git a/LICENSE-binary b/LICENSE-binary
index 7d20bc4..67bc7c4 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -692,7 +692,7 @@ The license texts of these dependencies can be found in the licenses directory.
* Apache Commons CSV (org.apache.commons:commons-csv:1.4 - http://commons.apache.org/proper/commons-csv/)
* Apache Commons Exec (org.apache.commons:commons-exec:1.3 - http://commons.apache.org/proper/commons-exec/)
* Apache Commons FileUpload (commons-fileupload:commons-fileupload:1.3.3 - http://commons.apache.org/proper/commons-fileupload/)
- * Apache Commons IO (commons-io:commons-io:2.6 - http://commons.apache.org/proper/commons-io/)
+ * Apache Commons IO (commons-io:commons-io:2.11.0 - http://commons.apache.org/proper/commons-io/)
* Apache Commons Lang (org.apache.commons:commons-lang3:3.2 - http://commons.apache.org/proper/commons-lang/)
* Apache Commons Lang (org.apache.commons:commons-lang3:3.6 - http://commons.apache.org/proper/commons-lang/)
* Apache Commons Lang (org.apache.commons:commons-lang3:3.8.1 - http://commons.apache.org/proper/commons-lang/)
diff --git a/external/storm-solr/pom.xml b/external/storm-solr/pom.xml
index 86e9996..81a532f 100644
--- a/external/storm-solr/pom.xml
+++ b/external/storm-solr/pom.xml
@@ -73,7 +73,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
+ <version>${commons-io.version}</version>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
diff --git a/pom.xml b/pom.xml
index 321e662..5ba75fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -289,7 +289,7 @@
<!-- dependency versions -->
<clojure.version>1.10.0</clojure.version>
<commons-compress.version>1.21</commons-compress.version>
- <commons-io.version>2.6</commons-io.version>
+ <commons-io.version>2.11.0</commons-io.version>
<commons-lang.version>2.6</commons-lang.version>
<commons-exec.version>1.3</commons-exec.version>
<commons-collections.version>3.2.2</commons-collections.version>
diff --git a/storm-server/src/main/java/org/apache/storm/utils/ServerUtils.java b/storm-server/src/main/java/org/apache/storm/utils/ServerUtils.java
index e9ea5d4..091043a 100644
--- a/storm-server/src/main/java/org/apache/storm/utils/ServerUtils.java
+++ b/storm-server/src/main/java/org/apache/storm/utils/ServerUtils.java
@@ -200,12 +200,7 @@ public class ServerUtils {
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 += getDiskUsage(allFiles[i]);
}
diff --git a/storm-submit-tools/pom.xml b/storm-submit-tools/pom.xml
index 51557c7..f84206d 100644
--- a/storm-submit-tools/pom.xml
+++ b/storm-submit-tools/pom.xml
@@ -103,7 +103,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.5</version>
+ <version>${commons-io.version}</version>
<scope>test</scope>
</dependency>
</dependencies>