diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 9a4fbf33391..717d6a07d56 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,5 +9,3 @@ updates: # 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 c523ec20926..5c2ac8f7f9d 100644 --- a/extensions-core/protobuf-extensions/pom.xml +++ b/extensions-core/protobuf-extensions/pom.xml @@ -35,7 +35,7 @@ 6.0.1 - 2.6 + 2.11.0 diff --git a/licenses.yaml b/licenses.yaml index 7375f5b78e5..acc6470b47d 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -545,13 +545,13 @@ name: Apache Commons IO 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 47d6e2ee563..eb066a43050 100644 --- a/pom.xml +++ b/pom.xml @@ -224,7 +224,7 @@ commons-io commons-io - 2.6 + 2.11.0 commons-logging 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 924ee92b4cb..75897f4d8a5 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 @@ public class InlineFirehose implements Firehose 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 7d0569fe594..f609cbe87f3 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 org.apache.druid.data.input.impl.StringInputRowParser; 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 @@ public class InlineFirehoseFactory implements FiniteFirehoseFactory