diff --git a/build.gradle b/build.gradle
index c7be70f1f..9128f0778 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ import java.nio.file.Paths
 
 buildscript {
     ext {
-        opensearch_version = System.getProperty("opensearch.version", "3.4.0-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "3.5.0-SNAPSHOT")
         buildVersionQualifier = System.getProperty("build.version_qualifier", "")
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
         version_tokens = opensearch_version.tokenize('-')
@@ -225,7 +225,6 @@ dependencies {
     implementation("org.dafny:DafnyRuntime:${dafnyRuntimeVersion}")
     implementation("software.amazon.smithy.dafny:conversion:${smithyDafnyVersion}")
     implementation("org.bouncycastle:bc-fips:${versions.bouncycastle_jce}")
-    api("org.apache.httpcomponents.core5:httpcore5:${versions.httpcore5}")
     implementation("jakarta.json.bind:jakarta.json.bind-api:${jakartaJsonBindVersion}")
     implementation("org.glassfish:jakarta.json:${jakartaJsonVersion}")
     implementation("org.eclipse:yasson:${yassonVersion}")
@@ -251,7 +250,7 @@ dependencies {
     }
 
     // Jackson dependencies
-    implementation("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}")
+    implementation("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson_annotations}")
     implementation("com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}")
 
     testImplementation("org.junit.jupiter:junit-jupiter:${junitJupiterVersion}")
@@ -271,6 +270,9 @@ dependencies {
             // Some other plugin dependencies that don't use version catalog conflict here
             force("com.google.guava:guava:${versions.guava}")
             force("org.slf4j:slf4j-api:${versions.slf4j}")
+            force("com.google.errorprone:error_prone_annotations:${versions.error_prone_annotations}")
+            force("org.apache.httpcomponents.core5:httpcore5:${versions.httpcore5}")
+            force("org.apache.httpcomponents.core5:httpcore5-h2:${versions.httpcore5}")
 
             if (System.getenv('REMOTE_METADATA_SDK_IMPL') == 'ddb-client') {
                 // OpenSearch Java client brings in different versions of the below dependencies.
@@ -278,7 +280,7 @@ dependencies {
                 // Jackson dependencies
                 force("com.fasterxml.jackson.core:jackson-core:${versions.jackson}")
                 force("com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}")
-                force("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}")
+                force("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson_annotations}")
                 force("com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}")
                 force("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${versions.jackson_databind}")