use mainline versions.aws via hardcode

Signed-off-by: Brian Flores <[email protected]>

Author: brianf-aws

build.gradle

@@ -82,6 +82,7 @@ subprojects {
         resolutionStrategy.force "com.google.guava:guava:32.1.3-jre"
         resolutionStrategy.force 'org.apache.commons:commons-compress:1.26.0'
         resolutionStrategy.force "org.apache.commons:commons-lang3:${versions.commonslang}"
+        resolutionStrategy.force 'software.amazon.awssdk:bom:2.32.29'
 
     }
 }

common/build.gradle

@@ -44,7 +44,7 @@ dependencies {
     compileOnly group: 'com.networknt' , name: 'json-schema-validator', version: '1.4.0'
     // Multi-tenant SDK Client
     compileOnly "org.opensearch:opensearch-remote-metadata-sdk:${opensearch_build}"
-    compileOnly (group: 'software.amazon.awssdk', name: 'netty-nio-client', version: "${versions.aws}") {
+    compileOnly (group: 'software.amazon.awssdk', name: 'netty-nio-client', version: "2.32.29") {
         exclude(group: 'org.reactivestreams', module: 'reactive-streams')
         exclude(group: 'org.slf4j', module: 'slf4j-api')
     }

ml-algorithms/build.gradle

@@ -72,24 +72,27 @@ dependencies {
         }
     }
 
-    implementation platform('software.amazon.awssdk:bom:2.30.18')
-    api 'software.amazon.awssdk:auth:2.30.18'
-    implementation 'software.amazon.awssdk:apache-client'
+    implementation platform(group: 'software.amazon.awssdk', name: 'bom', version:"2.32.29")
+    api "software.amazon.awssdk:auth:2.32.29"
+    implementation group: 'software.amazon.awssdk', name:'apache-client', version: "2.32.29"
+    implementation (group: 'software.amazon.awssdk', name: 'bedrockruntime', version: "2.32.29") {
+        exclude group: 'io.netty'
+    }
     implementation ('com.amazonaws:aws-encryption-sdk-java:2.4.1') {
         exclude group: 'org.bouncycastle', module: 'bcprov-ext-jdk18on'
     }
-    implementation 'org.bouncycastle:bcprov-jdk18on:1.78.1'
-
-    compileOnly group: 'software.amazon.awssdk', name: 'aws-core', version: "2.30.18"
-    compileOnly group: 'software.amazon.awssdk', name: 's3', version: "2.30.18"
-    compileOnly group: 'software.amazon.awssdk', name: 'regions', version: "2.30.18"
+    // needed by aws-encryption-sdk-java
+    implementation "org.bouncycastle:bc-fips:2.1.1"
+    compileOnly group: 'software.amazon.awssdk', name: 'aws-core', version: "2.32.29"
+    compileOnly group: 'software.amazon.awssdk', name: 's3', version: "2.32.29"
+    compileOnly group: 'software.amazon.awssdk', name: 'regions', version: "2.32.29"
 
     implementation ('com.jayway.jsonpath:json-path:2.9.0') {
         exclude group: 'net.minidev', module: 'json-smart'
     }
     implementation('net.minidev:json-smart:2.5.2')
     implementation group: 'org.json', name: 'json', version: '20231013'
-    implementation group: 'software.amazon.awssdk', name: 'netty-nio-client', version: "2.30.18"
+    implementation group: 'software.amazon.awssdk', name: 'netty-nio-client', version: "2.32.29"
     testImplementation("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}")
     testImplementation("com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}")
     testImplementation group: 'com.networknt' , name: 'json-schema-validator', version: '1.4.0'
@@ -102,7 +105,7 @@ lombok {
 configurations.all {
     resolutionStrategy.force 'com.google.protobuf:protobuf-java:3.25.5'
     resolutionStrategy.force 'org.apache.commons:commons-compress:1.26.0'
-    resolutionStrategy.force 'software.amazon.awssdk:bom:2.30.18'
+    resolutionStrategy.force group: 'software.amazon.awssdk', name:'bom', version:"2.32.29"
     resolutionStrategy.force 'commons-beanutils:commons-beanutils:1.11.0'
 }
 

plugin/build.gradle

@@ -54,15 +54,15 @@ dependencies {
     implementation project(':opensearch-ml-memory')
     compileOnly "com.google.guava:guava:32.1.3-jre"
 
-    implementation group: 'software.amazon.awssdk', name: 'aws-core', version: "${versions.aws}"
-    implementation group: 'software.amazon.awssdk', name: 's3', version: "${versions.aws}"
-    implementation group: 'software.amazon.awssdk', name: 'regions', version: "${versions.aws}"
+    implementation group: 'software.amazon.awssdk', name: 'aws-core', version: "2.32.29"
+    implementation group: 'software.amazon.awssdk', name: 's3', version: "2.32.29"
+    implementation group: 'software.amazon.awssdk', name: 'regions', version: "2.32.29"
 
-    implementation group: 'software.amazon.awssdk', name: 'aws-xml-protocol', version: "${versions.aws}"
+    implementation group: 'software.amazon.awssdk', name: 'aws-xml-protocol', version: "2.32.29"
 
-    implementation group: 'software.amazon.awssdk', name: 'aws-query-protocol', version: "${versions.aws}"
+    implementation group: 'software.amazon.awssdk', name: 'aws-query-protocol', version: "2.32.29"
 
-    implementation group: 'software.amazon.awssdk', name: 'protocol-core', version: "${versions.aws}"
+    implementation group: 'software.amazon.awssdk', name: 'protocol-core', version: "2.32.29"
 
     zipArchive group: 'org.opensearch.plugin', name:'opensearch-job-scheduler', version: "${opensearch_build}"
     compileOnly "org.opensearch:opensearch-job-scheduler-spi:${opensearch_build}"