diff --git a/CHANGELOG.md b/CHANGELOG.md index d15c4518c1729..af9ad503ad347 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ### Added ### Dependencies - Bump `netty` from 4.1.96.Final to 4.1.97.Final ([#9553](https://github.com/opensearch-project/OpenSearch/pull/9553)) +- Bump `org.xerial.snappy:snappy-java` from 1.1.8.2 to 1.1.10.3 ([#9252](https://github.com/opensearch-project/OpenSearch/pull/9252)) +- Bump `com.squareup.okhttp3:okhttp` from 4.9.3 to 4.11.0 ([#9252](https://github.com/opensearch-project/OpenSearch/pull/9252)) +- Bump `com.squareup.okio:okio` from 2.8.0 to 3.5.0 ([#9252](https://github.com/opensearch-project/OpenSearch/pull/9252)) ### Changed ### Deprecated diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 40cc8a5e2f4db..33b1e1cc21920 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -156,6 +156,12 @@ dependencies { } } +configurations.all { + resolutionStrategy { + force "com.google.guava:guava:${props.getProperty('guava')}" + } +} + /***************************************************************************** * Bootstrap repositories * *****************************************************************************/ diff --git a/test/fixtures/hdfs-fixture/build.gradle b/test/fixtures/hdfs-fixture/build.gradle index dc2d3c81a62cf..100796ef0268d 100644 --- a/test/fixtures/hdfs-fixture/build.gradle +++ b/test/fixtures/hdfs-fixture/build.gradle @@ -39,6 +39,9 @@ dependencies { exclude module: 'protobuf-java' exclude group: 'org.codehaus.jackson' exclude group: "org.bouncycastle" + exclude group: "com.squareup.okhttp3" + exclude group: "org.xerial.snappy" + exclude module: "json-io" } api "org.codehaus.jettison:jettison:${versions.jettison}" @@ -58,4 +61,9 @@ dependencies { api "org.eclipse.jetty:jetty-server:${versions.jetty}" api "org.eclipse.jetty.websocket:javax-websocket-server-impl:${versions.jetty}" runtimeOnly "com.google.guava:guava:${versions.guava}" + runtimeOnly("com.squareup.okhttp3:okhttp:4.11.0") { + exclude group: "com.squareup.okio" + } + runtimeOnly "com.squareup.okio:okio:3.5.0" + runtimeOnly "org.xerial.snappy:snappy-java:1.1.10.3" }