Bump commons-io to 2.11.0 (#11460)
* Bump commons-io to 2.11.0
* Address comments
* Remove try catch
* Fix checkstyle
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 9a4fbf3..717d6a0 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -9,5 +9,3 @@
# pin ZooKeeper dependencies to 3.5.x
- dependency-name: "org.apache.zookeeper"
versions: "[3.6,)"
- # Keep commons-io at 2.6 until https://issues.apache.org/jira/browse/IO-741 is resolved
- - dependency-name: "commons-io:commons-io"
diff --git a/extensions-core/protobuf-extensions/pom.xml b/extensions-core/protobuf-extensions/pom.xml
index c523ec2..5c2ac8f 100644
--- a/extensions-core/protobuf-extensions/pom.xml
+++ b/extensions-core/protobuf-extensions/pom.xml
@@ -35,7 +35,7 @@
<properties>
<confluent.version>6.0.1</confluent.version>
- <commons-io.version>2.6</commons-io.version>
+ <commons-io.version>2.11.0</commons-io.version>
</properties>
<repositories>
diff --git a/licenses.yaml b/licenses.yaml
index 7375f5b..acc6470 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -545,13 +545,13 @@
license_category: binary
module: java-core
license_name: Apache License version 2.0
-version: 2.6
+version: 2.11.0
libraries:
- commons-io: commons-io
notices:
- commons-io: |
Apache Commons IO
- Copyright 2002-2017 The Apache Software Foundation
+ Copyright 2002-2021 The Apache Software Foundation
---
diff --git a/pom.xml b/pom.xml
index 47d6e2e..eb066a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -224,7 +224,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.6</version>
+ <version>2.11.0</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
diff --git a/server/src/main/java/org/apache/druid/segment/realtime/firehose/InlineFirehose.java b/server/src/main/java/org/apache/druid/segment/realtime/firehose/InlineFirehose.java
index 924ee92..75897f4 100644
--- a/server/src/main/java/org/apache/druid/segment/realtime/firehose/InlineFirehose.java
+++ b/server/src/main/java/org/apache/druid/segment/realtime/firehose/InlineFirehose.java
@@ -41,7 +41,7 @@
private final StringInputRowParser parser;
private final LineIterator lineIterator;
- InlineFirehose(String data, StringInputRowParser parser) throws IOException
+ InlineFirehose(String data, StringInputRowParser parser)
{
this.parser = parser;
diff --git a/server/src/main/java/org/apache/druid/segment/realtime/firehose/InlineFirehoseFactory.java b/server/src/main/java/org/apache/druid/segment/realtime/firehose/InlineFirehoseFactory.java
index 7d0569f..f609cbe 100644
--- a/server/src/main/java/org/apache/druid/segment/realtime/firehose/InlineFirehoseFactory.java
+++ b/server/src/main/java/org/apache/druid/segment/realtime/firehose/InlineFirehoseFactory.java
@@ -31,7 +31,6 @@
import javax.annotation.Nullable;
import java.io.File;
-import java.io.IOException;
import java.util.Objects;
import java.util.stream.Stream;
@@ -56,7 +55,7 @@
}
@Override
- public Firehose connect(StringInputRowParser parser, @Nullable File temporaryDirectory) throws IOException
+ public Firehose connect(StringInputRowParser parser, @Nullable File temporaryDirectory)
{
return new InlineFirehose(data, parser);
}
diff --git a/server/src/test/java/org/apache/druid/segment/loading/LocalDataSegmentPusherTest.java b/server/src/test/java/org/apache/druid/segment/loading/LocalDataSegmentPusherTest.java
index b6a0d85..5ecca15 100644
--- a/server/src/test/java/org/apache/druid/segment/loading/LocalDataSegmentPusherTest.java
+++ b/server/src/test/java/org/apache/druid/segment/loading/LocalDataSegmentPusherTest.java
@@ -153,7 +153,7 @@
public void testPushCannotCreateDirectory() throws IOException
{
exception.expect(IOException.class);
- exception.expectMessage("Unable to create directory");
+ exception.expectMessage("Cannot create directory");
config.storageDirectory = new File(config.storageDirectory, "xxx");
Assert.assertTrue(config.storageDirectory.mkdir());
config.storageDirectory.setWritable(false);
diff --git a/server/src/test/java/org/apache/druid/segment/realtime/firehose/InlineFirehoseTest.java b/server/src/test/java/org/apache/druid/segment/realtime/firehose/InlineFirehoseTest.java
index 2a717c5..590e0e3 100644
--- a/server/src/test/java/org/apache/druid/segment/realtime/firehose/InlineFirehoseTest.java
+++ b/server/src/test/java/org/apache/druid/segment/realtime/firehose/InlineFirehoseTest.java
@@ -208,12 +208,7 @@
private static InlineFirehose create(String data)
{
- try {
- return new InlineFirehose(data, PARSER);
- }
- catch (IOException e) {
- throw new RuntimeException(e);
- }
+ return new InlineFirehose(data, PARSER);
}
private static void assertRowValue(String expected, InputRow row)
