From bfd16d8a53060aeee0e766ff94676839a611abc1 Mon Sep 17 00:00:00 2001
From: Joshua Li <joshuali925@gmail.com>
Date: Wed, 1 Nov 2023 18:18:08 +0000
Subject: [PATCH] upgrade okhttp to 4.12.0

Signed-off-by: Joshua Li <joshuali925@gmail.com>
---
 common/build.gradle     | 5 ++---
 integ-test/build.gradle | 3 ++-
 plugin/build.gradle     | 4 ++--
 prometheus/build.gradle | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/build.gradle b/common/build.gradle
index 416c9ca20a..ed4b0304f6 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -37,7 +37,7 @@ dependencies {
     api group: 'com.google.guava', name: 'guava', version: '32.0.1-jre'
     api group: 'org.apache.logging.log4j', name: 'log4j-core', version:"${versions.log4j}"
     api group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
-    api group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.9.3'
+    api group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.12.0'
     implementation 'com.github.babbel:okhttp-aws-signer:1.0.2'
     api group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.12.545'
     api group: 'com.amazonaws', name: 'aws-java-sdk-sts', version: '1.12.545'
@@ -50,7 +50,7 @@ dependencies {
     testImplementation('org.junit.jupiter:junit-jupiter:5.6.2')
     testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.12.4'
     testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.12.4'
-    testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '4.9.3'
+    testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '4.12.0'
 }
 
 
@@ -60,7 +60,6 @@ configurations.all {
     resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${versions.jackson}"
     resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}"
     resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
-    resolutionStrategy.force "com.squareup.okhttp3:okhttp:4.9.3"
     resolutionStrategy.force "org.apache.httpcomponents:httpcore:4.4.13"
     resolutionStrategy.force "joda-time:joda-time:2.10.12"
     resolutionStrategy.force "org.slf4j:slf4j-api:1.7.36"
diff --git a/integ-test/build.gradle b/integ-test/build.gradle
index 85535da68c..49b6399c46 100644
--- a/integ-test/build.gradle
+++ b/integ-test/build.gradle
@@ -157,9 +157,10 @@ configurations.all {
     resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${versions.jackson}"
     resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}"
     resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
-    resolutionStrategy.force "com.squareup.okhttp3:okhttp:4.10.0"
+    resolutionStrategy.force "com.squareup.okhttp3:okhttp:4.12.0"
     resolutionStrategy.force "org.apache.httpcomponents:httpcore:4.4.13"
     resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31"
+    resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10"
     resolutionStrategy.force "joda-time:joda-time:2.10.12"
     resolutionStrategy.force "org.slf4j:slf4j-api:1.7.36"
     resolutionStrategy.force "com.amazonaws:aws-java-sdk-core:1.12.545"
diff --git a/plugin/build.gradle b/plugin/build.gradle
index 6b6706391a..671ddefa2d 100644
--- a/plugin/build.gradle
+++ b/plugin/build.gradle
@@ -103,13 +103,13 @@ configurations.all {
     resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${versions.jackson}"
     resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}"
     resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
-    resolutionStrategy.force "com.squareup.okhttp3:okhttp:4.10.0"
-    resolutionStrategy.force "com.squareup.okio:okio:3.4.0"
+    resolutionStrategy.force "com.squareup.okhttp3:okhttp:4.12.0"
     resolutionStrategy.force "joda-time:joda-time:2.10.12"
     resolutionStrategy.force "org.slf4j:slf4j-api:1.7.36"
     resolutionStrategy.force "org.apache.httpcomponents:httpcore:4.4.15"
     resolutionStrategy.force "org.apache.httpcomponents:httpclient:4.5.13"
     resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31"
+    resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10"
     resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0"
 }
 compileJava {
diff --git a/prometheus/build.gradle b/prometheus/build.gradle
index c2878ab1b4..d2f4ea9171 100644
--- a/prometheus/build.gradle
+++ b/prometheus/build.gradle
@@ -28,7 +28,7 @@ dependencies {
     testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
     testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.12.4'
     testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.12.4'
-    testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '4.9.3'
+    testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '4.12.0'
 }
 
 test {