From 9d081f468efd308b6115a2229f53457b2d9c7d84 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 12 Oct 2023 17:08:45 +0000 Subject: [PATCH 1/5] Bump org.apache.zookeeper:zookeeper to 3.9.1 and io.netty:netty-tcnative-boringssl-static to 2.0.61.Final (#3532) Signed-off-by: Craig Perkins (cherry picked from commit 23359f66a7d9e4370ca7466ffef11bb045e3dfa4) Signed-off-by: github-actions[bot] --- build.gradle | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 742a694961..048a9c27e5 100644 --- a/build.gradle +++ b/build.gradle @@ -620,8 +620,8 @@ dependencies { testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.0' // Only osx-x86_64, osx-aarch_64, linux-x86_64, linux-aarch_64, windows-x86_64 are available if (osdetector.classifier in ["osx-x86_64", "osx-aarch_64", "linux-x86_64", "linux-aarch_64", "windows-x86_64"]) { - testImplementation "io.netty:netty-tcnative-classes:2.0.54.Final" - testImplementation "io.netty:netty-tcnative-boringssl-static:2.0.54.Final:${osdetector.classifier}" + testImplementation "io.netty:netty-tcnative-classes:2.0.61.Final" + testImplementation "io.netty:netty-tcnative-boringssl-static:2.0.61.Final:${osdetector.classifier}" } // JUnit build requirement testCompileOnly 'org.apiguardian:apiguardian-api:1.1.2' @@ -633,7 +633,9 @@ dependencies { testRuntimeOnly 'org.scala-lang:scala-library:2.13.11' testRuntimeOnly 'com.yammer.metrics:metrics-core:2.2.0' testRuntimeOnly 'com.typesafe.scala-logging:scala-logging_3:3.9.5' - testRuntimeOnly 'org.apache.zookeeper:zookeeper:3.7.1' + testRuntimeOnly('org.apache.zookeeper:zookeeper:3.9.1') { + exclude(group:'ch.qos.logback', module: 'logback-classic' ) + } testRuntimeOnly "org.apache.kafka:kafka-metadata:${kafka_version}" testRuntimeOnly "org.apache.kafka:kafka-storage:${kafka_version}" From 28bab89118adc75585e08dde1190ea77414d9a3d Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Thu, 12 Oct 2023 13:35:37 -0400 Subject: [PATCH 2/5] Remove implementation dependency on commons-io Signed-off-by: Craig Perkins --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index 048a9c27e5..d0bab1fdf9 100644 --- a/build.gradle +++ b/build.gradle @@ -574,7 +574,6 @@ dependencies { runtimeOnly 'com.google.guava:failureaccess:1.0.1' runtimeOnly 'org.apache.commons:commons-text:1.10.0' - implementation 'commons-io:commons-io:2.13.0' runtimeOnly "org.glassfish.jaxb:jaxb-runtime:${jaxb_version}" runtimeOnly 'com.google.j2objc:j2objc-annotations:2.8' runtimeOnly 'com.google.code.findbugs:jsr305:3.0.2' From 9ceeb8185e9d20ff3420e46a286344d5ffbafd5d Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Thu, 12 Oct 2023 13:46:40 -0400 Subject: [PATCH 3/5] Use guava to read InputStream Signed-off-by: Craig Perkins --- .../opensearch/security/test/helper/rest/RestHelper.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/opensearch/security/test/helper/rest/RestHelper.java b/src/test/java/org/opensearch/security/test/helper/rest/RestHelper.java index 5fad23ed17..4260af23fc 100644 --- a/src/test/java/org/opensearch/security/test/helper/rest/RestHelper.java +++ b/src/test/java/org/opensearch/security/test/helper/rest/RestHelper.java @@ -28,6 +28,7 @@ import java.io.FileInputStream; import java.io.IOException; +import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import java.security.KeyStore; @@ -45,7 +46,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; -import org.apache.commons.io.IOUtils; +import com.google.common.base.Charsets; +import com.google.common.io.CharStreams; import org.apache.http.Header; import org.apache.http.HttpEntity; import org.apache.http.HttpHeaders; @@ -117,7 +119,7 @@ public String executeSimpleRequest(final String request) throws Exception { throw new Exception("Statuscode " + response.getStatusLine().getStatusCode()); } - return IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8); + return CharStreams.toString(new InputStreamReader(response.getEntity().getContent(), Charsets.UTF_8)); } finally { if (response != null) { From 28150d3593098e30898523e68b9445c3f60747e0 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Thu, 12 Oct 2023 13:51:10 -0400 Subject: [PATCH 4/5] Remove all references to IOUtils outside of integrationTest Signed-off-by: Craig Perkins --- .../org/opensearch/security/test/helper/rest/RestHelper.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/java/org/opensearch/security/test/helper/rest/RestHelper.java b/src/test/java/org/opensearch/security/test/helper/rest/RestHelper.java index 4260af23fc..b80741bfd5 100644 --- a/src/test/java/org/opensearch/security/test/helper/rest/RestHelper.java +++ b/src/test/java/org/opensearch/security/test/helper/rest/RestHelper.java @@ -30,7 +30,6 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; -import java.nio.charset.StandardCharsets; import java.security.KeyStore; import java.util.Arrays; import java.util.Collections; @@ -323,7 +322,7 @@ public HttpResponse(CloseableHttpResponse inner) throws IllegalStateException, I if (entity == null) { // head request does not have a entity this.body = ""; } else { - this.body = IOUtils.toString(entity.getContent(), StandardCharsets.UTF_8); + this.body = CharStreams.toString(new InputStreamReader(entity.getContent(), Charsets.UTF_8)); } this.header = inner.getAllHeaders(); this.statusCode = inner.getStatusLine().getStatusCode(); From 1e4f338f1f0a8f61742118337b53931eba298b04 Mon Sep 17 00:00:00 2001 From: Darshit Chanpura Date: Fri, 13 Oct 2023 11:56:17 -0400 Subject: [PATCH 5/5] Bump commons-io to 2.14.0 Signed-off-by: Darshit Chanpura --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d0bab1fdf9..e2d32c959b 100644 --- a/build.gradle +++ b/build.gradle @@ -650,7 +650,7 @@ dependencies { integrationTestImplementation 'junit:junit:4.13.2' integrationTestImplementation "org.opensearch.plugin:reindex-client:${opensearch_version}" integrationTestImplementation "org.opensearch.plugin:percolator-client:${opensearch_version}" - integrationTestImplementation 'commons-io:commons-io:2.13.0' + integrationTestImplementation 'commons-io:commons-io:2.14.0' integrationTestImplementation "org.apache.logging.log4j:log4j-core:${versions.log4j}" integrationTestImplementation "org.apache.logging.log4j:log4j-jul:${versions.log4j}" integrationTestImplementation 'org.hamcrest:hamcrest:2.2'