From fd6e5d02159f74edab8713adf908731c75a05e3e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jan 2024 16:24:50 +0000
Subject: [PATCH 1/2] build(deps): bump com.squareup.okhttp3:okhttp from 4.11.0
to 4.12.0
Bumps [com.squareup.okhttp3:okhttp](https://github.com/square/okhttp) from 4.11.0 to 4.12.0.
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.11.0...parent-4.12.0)
---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index f1e638ff73..d5df0ae691 100644
--- a/build.gradle
+++ b/build.gradle
@@ -78,7 +78,7 @@ subprojects {
ext {
libraries = [
guava: "com.google.guava:guava:31.1-jre",
- okhttp: 'com.squareup.okhttp3:okhttp:4.11.0',
+ okhttp: 'com.squareup.okhttp3:okhttp:4.12.0',
jupiterApi: 'org.junit.jupiter:junit-jupiter-api:5.+',
jupiterParams: 'org.junit.jupiter:junit-jupiter-params:5.+',
jupiterEngine: 'org.junit.jupiter:junit-jupiter-engine:5.+',
From c2742ba47a8d6069ceb898f9cb7a390a56f48eff Mon Sep 17 00:00:00 2001
From: "Sean C. Sullivan" <github@seansullivan.com>
Date: Fri, 26 Jan 2024 17:16:20 -0800
Subject: [PATCH 2/2] regenerate lock files
---
zuul-integration-test/dependencies.lock | 45 ++++++++++++-------------
1 file changed, 21 insertions(+), 24 deletions(-)
diff --git a/zuul-integration-test/dependencies.lock b/zuul-integration-test/dependencies.lock
index c88a77050c..f5b48e069d 100644
--- a/zuul-integration-test/dependencies.lock
+++ b/zuul-integration-test/dependencies.lock
@@ -1773,16 +1773,16 @@
]
},
"com.squareup.okhttp3:okhttp": {
- "locked": "4.11.0"
+ "locked": "4.12.0"
},
"com.squareup.okio:okio": {
- "locked": "3.2.0",
+ "locked": "3.6.0",
"transitive": [
"com.squareup.okhttp3:okhttp"
]
},
"com.squareup.okio:okio-jvm": {
- "locked": "3.2.0",
+ "locked": "3.6.0",
"transitive": [
"com.squareup.okio:okio"
]
@@ -2418,28 +2418,27 @@
]
},
"org.jetbrains.kotlin:kotlin-stdlib": {
- "locked": "1.6.20",
+ "locked": "1.9.10",
"transitive": [
- "com.squareup.okhttp3:okhttp",
"org.jetbrains.kotlin:kotlin-stdlib-jdk7",
"org.jetbrains.kotlin:kotlin-stdlib-jdk8"
]
},
"org.jetbrains.kotlin:kotlin-stdlib-common": {
- "locked": "1.6.20",
+ "locked": "1.9.10",
"transitive": [
"com.squareup.okio:okio-jvm",
"org.jetbrains.kotlin:kotlin-stdlib"
]
},
"org.jetbrains.kotlin:kotlin-stdlib-jdk7": {
- "locked": "1.6.20",
+ "locked": "1.9.10",
"transitive": [
"org.jetbrains.kotlin:kotlin-stdlib-jdk8"
]
},
"org.jetbrains.kotlin:kotlin-stdlib-jdk8": {
- "locked": "1.6.20",
+ "locked": "1.9.10",
"transitive": [
"com.squareup.okhttp3:okhttp",
"com.squareup.okio:okio-jvm"
@@ -3489,16 +3488,16 @@
]
},
"com.squareup.okhttp3:okhttp": {
- "locked": "4.11.0"
+ "locked": "4.12.0"
},
"com.squareup.okio:okio": {
- "locked": "3.2.0",
+ "locked": "3.6.0",
"transitive": [
"com.squareup.okhttp3:okhttp"
]
},
"com.squareup.okio:okio-jvm": {
- "locked": "3.2.0",
+ "locked": "3.6.0",
"transitive": [
"com.squareup.okio:okio"
]
@@ -3971,28 +3970,27 @@
]
},
"org.jetbrains.kotlin:kotlin-stdlib": {
- "locked": "1.6.20",
+ "locked": "1.9.10",
"transitive": [
- "com.squareup.okhttp3:okhttp",
"org.jetbrains.kotlin:kotlin-stdlib-jdk7",
"org.jetbrains.kotlin:kotlin-stdlib-jdk8"
]
},
"org.jetbrains.kotlin:kotlin-stdlib-common": {
- "locked": "1.6.20",
+ "locked": "1.9.10",
"transitive": [
"com.squareup.okio:okio-jvm",
"org.jetbrains.kotlin:kotlin-stdlib"
]
},
"org.jetbrains.kotlin:kotlin-stdlib-jdk7": {
- "locked": "1.6.20",
+ "locked": "1.9.10",
"transitive": [
"org.jetbrains.kotlin:kotlin-stdlib-jdk8"
]
},
"org.jetbrains.kotlin:kotlin-stdlib-jdk8": {
- "locked": "1.6.20",
+ "locked": "1.9.10",
"transitive": [
"com.squareup.okhttp3:okhttp",
"com.squareup.okio:okio-jvm"
@@ -4461,16 +4459,16 @@
]
},
"com.squareup.okhttp3:okhttp": {
- "locked": "4.11.0"
+ "locked": "4.12.0"
},
"com.squareup.okio:okio": {
- "locked": "3.2.0",
+ "locked": "3.6.0",
"transitive": [
"com.squareup.okhttp3:okhttp"
]
},
"com.squareup.okio:okio-jvm": {
- "locked": "3.2.0",
+ "locked": "3.6.0",
"transitive": [
"com.squareup.okio:okio"
]
@@ -5099,28 +5097,27 @@
]
},
"org.jetbrains.kotlin:kotlin-stdlib": {
- "locked": "1.6.20",
+ "locked": "1.9.10",
"transitive": [
- "com.squareup.okhttp3:okhttp",
"org.jetbrains.kotlin:kotlin-stdlib-jdk7",
"org.jetbrains.kotlin:kotlin-stdlib-jdk8"
]
},
"org.jetbrains.kotlin:kotlin-stdlib-common": {
- "locked": "1.6.20",
+ "locked": "1.9.10",
"transitive": [
"com.squareup.okio:okio-jvm",
"org.jetbrains.kotlin:kotlin-stdlib"
]
},
"org.jetbrains.kotlin:kotlin-stdlib-jdk7": {
- "locked": "1.6.20",
+ "locked": "1.9.10",
"transitive": [
"org.jetbrains.kotlin:kotlin-stdlib-jdk8"
]
},
"org.jetbrains.kotlin:kotlin-stdlib-jdk8": {
- "locked": "1.6.20",
+ "locked": "1.9.10",
"transitive": [
"com.squareup.okhttp3:okhttp",
"com.squareup.okio:okio-jvm"