From 979dbaaf94ab5782c945e0014ec2c6645941e91a Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Fri, 1 Sep 2023 16:19:09 +0000 Subject: [PATCH 1/2] bump okhttp to 4.10.0 Signed-off-by: Joshua Li --- integ-test/build.gradle | 2 +- plugin/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/integ-test/build.gradle b/integ-test/build.gradle index eedf2f4a03..c7cf1dd158 100644 --- a/integ-test/build.gradle +++ b/integ-test/build.gradle @@ -157,7 +157,7 @@ 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 "com.squareup.okhttp3:okhttp:4.10.0" 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/plugin/build.gradle b/plugin/build.gradle index 7291f78ba4..d01c318582 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -103,7 +103,7 @@ 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 "com.squareup.okhttp3:okhttp:4.10.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" From 20ba0d5911cd48a0fa7a834240dc86ed15ebcbd5 Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Fri, 1 Sep 2023 16:32:01 +0000 Subject: [PATCH 2/2] force resolve org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31 Signed-off-by: Joshua Li --- integ-test/build.gradle | 1 + plugin/build.gradle | 1 + 2 files changed, 2 insertions(+) diff --git a/integ-test/build.gradle b/integ-test/build.gradle index c7cf1dd158..a06a580c6a 100644 --- a/integ-test/build.gradle +++ b/integ-test/build.gradle @@ -159,6 +159,7 @@ configurations.all { resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}" resolutionStrategy.force "com.squareup.okhttp3:okhttp:4.10.0" resolutionStrategy.force "org.apache.httpcomponents:httpcore:4.4.13" + resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31" resolutionStrategy.force "joda-time:joda-time:2.10.12" resolutionStrategy.force "org.slf4j:slf4j-api:1.7.36" } diff --git a/plugin/build.gradle b/plugin/build.gradle index d01c318582..1184c17960 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -108,6 +108,7 @@ configurations.all { 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" } compileJava { options.compilerArgs.addAll(["-processor", 'lombok.launch.AnnotationProcessorHider$AnnotationProcessor'])