From 9b42fb1c656efca58cafd1d07388e8a71e80554d Mon Sep 17 00:00:00 2001 From: Karan Kumar Date: Wed, 9 Oct 2024 18:19:37 +0530 Subject: [PATCH] Upgrade commons-io to 2.17.0 (#17227) (#17302) (cherry picked from commit 93b5a8326bfcde747b43b481064096e01b7a407f) Co-authored-by: Shivam Garg --- .../DruidPeonClientIntegrationTest.java | 4 ++-- extensions-core/protobuf-extensions/pom.xml | 2 +- licenses.yaml | 18 ++---------------- pom.xml | 2 +- 4 files changed, 6 insertions(+), 20 deletions(-) diff --git a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/DruidPeonClientIntegrationTest.java b/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/DruidPeonClientIntegrationTest.java index e2d97accc97f..44570fac2d2d 100644 --- a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/DruidPeonClientIntegrationTest.java +++ b/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/taskadapter/DruidPeonClientIntegrationTest.java @@ -50,8 +50,8 @@ import org.junit.jupiter.api.io.TempDir; import java.io.File; -import java.io.IOException; import java.io.InputStream; +import java.io.UncheckedIOException; import java.nio.charset.StandardCharsets; import java.nio.file.Path; import java.nio.file.Paths; @@ -147,7 +147,7 @@ public void testDeployingSomethingToKind(@TempDir Path tempDir) throws Exception .map(Integer::parseInt) .collect(Collectors.toList())); } - catch (IOException e) { + catch (UncheckedIOException e) { throw new RuntimeException(e); } }); diff --git a/extensions-core/protobuf-extensions/pom.xml b/extensions-core/protobuf-extensions/pom.xml index aaf525070bec..10d7030e65dc 100644 --- a/extensions-core/protobuf-extensions/pom.xml +++ b/extensions-core/protobuf-extensions/pom.xml @@ -35,7 +35,7 @@ - 2.11.0 + 2.17.0 3.6.0 diff --git a/licenses.yaml b/licenses.yaml index 12c2d031c370..0c1e58dba46b 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -546,13 +546,13 @@ name: Apache Commons IO license_category: binary module: java-core license_name: Apache License version 2.0 -version: 2.11.0 +version: 2.17.0 libraries: - commons-io: commons-io notices: - commons-io: | Apache Commons IO - Copyright 2002-2021 The Apache Software Foundation + Copyright 2002-2024 The Apache Software Foundation --- @@ -2455,20 +2455,6 @@ notices: --- -name: Apache Commons IO -license_category: binary -module: hadoop-client -license_name: Apache License version 2.0 -version: 2.4 -libraries: - - commons-io: commons-io -notices: - - commons-io: | - Apache Commons IO - Copyright 2002-2012 The Apache Software Foundation - ---- - name: Apache Commons Logging license_category: binary module: hadoop-client diff --git a/pom.xml b/pom.xml index 3568d1a045b0..e4046cbe27eb 100644 --- a/pom.xml +++ b/pom.xml @@ -294,7 +294,7 @@ commons-io commons-io - 2.11.0 + 2.17.0 commons-logging