Favor using OpenSearch's versions for httpclient and httpcore (#477)

Signed-off-by: Mohammad Qureshi <[email protected]>
opensearch-project · Jul 14, 2022 · d5ae629 · d5ae629
1 parent d34bf56
commit d5ae629
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/notifications/core-spi/build.gradle b/notifications/core-spi/build.gradle
@@ -48,8 +48,8 @@ dependencies {
     compileOnly "org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin_version}"
     implementation "com.amazonaws:aws-java-sdk-core:${aws_version}"
     implementation "com.amazonaws:aws-java-sdk-ses:${aws_version}"
-    implementation "org.apache.httpcomponents:httpcore:4.4.13"
-    implementation "org.apache.httpcomponents:httpclient:4.5.10"
+    implementation "org.apache.httpcomponents:httpcore:${versions.httpcore}"
+    implementation "org.apache.httpcomponents:httpclient:${versions.httpclient}"
     implementation "com.github.seancfoley:ipaddress:5.3.3"
 
     testImplementation(
@@ -69,8 +69,8 @@ configurations.all {
         force "org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin_version}"
         force "commons-logging:commons-logging:${versions.commonslogging}" // resolve for amazonaws
         force "commons-codec:commons-codec:1.13" // resolve for amazonaws
-        force "org.apache.httpcomponents:httpclient:4.5.10" // resolve for amazonaws
-        force "org.apache.httpcomponents:httpcore:4.4.13" // resolve for amazonaws
+        force "org.apache.httpcomponents:httpclient:${versions.httpclient}" // resolve for amazonaws
+        force "org.apache.httpcomponents:httpcore:${versions.httpcore}" // resolve for amazonaws
         force "joda-time:joda-time:2.8.1" // Resolve for amazonaws
         force "com.fasterxml.jackson.core:jackson-core:2.11.4" // resolve for amazonaws
         force "com.fasterxml.jackson.core:jackson-annotations:2.11.4" // resolve for amazonaws

diff --git a/notifications/core/build.gradle b/notifications/core/build.gradle
@@ -79,8 +79,8 @@ configurations.all {
         force "org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin_version}"
         force "commons-logging:commons-logging:${versions.commonslogging}" // resolve for amazonaws
         force "commons-codec:commons-codec:1.13" // resolve for amazonaws
-        force "org.apache.httpcomponents:httpclient:4.5.10" // resolve for amazonaws
-        force "org.apache.httpcomponents:httpcore:4.4.13" // resolve for amazonaws
+        force "org.apache.httpcomponents:httpclient:${versions.httpclient}" // resolve for amazonaws
+        force "org.apache.httpcomponents:httpcore:${versions.httpcore}" // resolve for amazonaws
         force "joda-time:joda-time:2.8.1" // Resolve for amazonaws
         force "com.fasterxml.jackson.core:jackson-core:${versions.jackson}" // resolve for amazonaws
         force "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}" // resolve for amazonaws
@@ -99,8 +99,8 @@ dependencies {
     implementation "commons-logging:commons-logging:${versions.commonslogging}"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin_version}"
-    implementation "org.apache.httpcomponents:httpcore:4.4.5"
-    implementation "org.apache.httpcomponents:httpclient:4.5.10"
+    implementation "org.apache.httpcomponents:httpcore:${versions.httpcore}"
+    implementation "org.apache.httpcomponents:httpclient:${versions.httpclient}"
     implementation "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
     implementation "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
     implementation "com.amazonaws:aws-java-sdk-core:${aws_version}"