From 51573246f4487105c5b3c532d12b0029bc18983e Mon Sep 17 00:00:00 2001 From: SolrBot Date: Wed, 2 Sep 2026 23:17:32 +0000 Subject: [PATCH 1/3] Update OkHttp & Okio --- gradle/libs.versions.toml | 4 ++-- solr/licenses/okhttp-jvm-5.4.0.jar.sha1 | 1 - solr/licenses/okhttp-jvm-5.5.0.jar.sha1 | 1 + solr/licenses/okio-jvm-3.17.0.jar.sha1 | 1 - solr/licenses/okio-jvm-3.18.1.jar.sha1 | 1 + solr/modules/jwt-auth/gradle.lockfile | 8 ++++---- solr/ui/gradle.lockfile | 6 +++--- 7 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 solr/licenses/okhttp-jvm-5.4.0.jar.sha1 create mode 100644 solr/licenses/okhttp-jvm-5.5.0.jar.sha1 delete mode 100644 solr/licenses/okio-jvm-3.17.0.jar.sha1 create mode 100644 solr/licenses/okio-jvm-3.18.1.jar.sha1 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 27f3856e3ff8..ded74e08d115 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -192,8 +192,8 @@ semver4j = "6.0.0" slf4j = "2.0.18" spatial4j = "0.8" spotbugs = "4.10.4" -squareup-okhttp3-okhttp = "5.4.0" -squareup-okio = "3.17.0" +squareup-okhttp3-okhttp = "5.5.0" +squareup-okio = "3.18.1" stephenc-jcip = "1.0-1" swagger3 = "2.2.54" tdunning-tdigest = "3.3" diff --git a/solr/licenses/okhttp-jvm-5.4.0.jar.sha1 b/solr/licenses/okhttp-jvm-5.4.0.jar.sha1 deleted file mode 100644 index 4b0e22d054de..000000000000 --- a/solr/licenses/okhttp-jvm-5.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e1fae6fccaae70e60b31153c6a7680306a86ed31 diff --git a/solr/licenses/okhttp-jvm-5.5.0.jar.sha1 b/solr/licenses/okhttp-jvm-5.5.0.jar.sha1 new file mode 100644 index 000000000000..9beb7e7afeb9 --- /dev/null +++ b/solr/licenses/okhttp-jvm-5.5.0.jar.sha1 @@ -0,0 +1 @@ +cefe1eb26408176d30511420b7e36b065e38bca0 diff --git a/solr/licenses/okio-jvm-3.17.0.jar.sha1 b/solr/licenses/okio-jvm-3.17.0.jar.sha1 deleted file mode 100644 index bfc2de534714..000000000000 --- a/solr/licenses/okio-jvm-3.17.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a12d684ec0df9541b3869ae60a4a5257fd3613df diff --git a/solr/licenses/okio-jvm-3.18.1.jar.sha1 b/solr/licenses/okio-jvm-3.18.1.jar.sha1 new file mode 100644 index 000000000000..970a3c8c5931 --- /dev/null +++ b/solr/licenses/okio-jvm-3.18.1.jar.sha1 @@ -0,0 +1 @@ +a3a8128bb3a0157d23ecc18c17e8330d9c0ac96c diff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfile index acdb4e22107e..0f426e012793 100644 --- a/solr/modules/jwt-auth/gradle.lockfile +++ b/solr/modules/jwt-auth/gradle.lockfile @@ -38,10 +38,10 @@ com.nimbusds:nimbus-jose-jwt:10.9.1=jarValidation,testCompileClasspath,testRunti com.nimbusds:oauth2-oidc-sdk:11.37.1=jarValidation,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:mockwebserver3:5.2.1=jarValidation,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:mockwebserver:5.2.1=jarValidation,testCompileClasspath,testRuntimeClasspath -com.squareup.okhttp3:okhttp-jvm:5.4.0=jarValidation,testCompileClasspath,testRuntimeClasspath -com.squareup.okhttp3:okhttp:5.4.0=jarValidation,testCompileClasspath,testRuntimeClasspath -com.squareup.okio:okio-jvm:3.17.0=jarValidation,testCompileClasspath,testRuntimeClasspath -com.squareup.okio:okio:3.17.0=jarValidation,testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp-jvm:5.5.0=jarValidation,testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:5.5.0=jarValidation,testCompileClasspath,testRuntimeClasspath +com.squareup.okio:okio-jvm:3.18.1=jarValidation,testCompileClasspath,testRuntimeClasspath +com.squareup.okio:okio:3.18.1=jarValidation,testCompileClasspath,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.11.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.22.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/ui/gradle.lockfile b/solr/ui/gradle.lockfile index 19e4c5be005b..003d7debe542 100644 --- a/solr/ui/gradle.lockfile +++ b/solr/ui/gradle.lockfile @@ -108,9 +108,9 @@ com.arkivanov.mvikotlin:mvikotlin-main-wasm-js:4.4.0=wasmJsCompileClasspath,wasm com.arkivanov.mvikotlin:mvikotlin-main:4.4.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevJvmDevRuntimeClasspath,composeHotReloadDevJvmRuntimeClasspath,composeHotReloadDevJvmTestRuntimeClasspath,jvmCompileClasspath,jvmDevCompileClasspath,jvmDevResolvableDependenciesMetadata,jvmDevRuntimeClasspath,jvmMainCompileClasspath,jvmMainResolvableDependenciesMetadata,jvmMainRuntimeClasspath,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestResolvableDependenciesMetadata,jvmTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata com.arkivanov.mvikotlin:mvikotlin-wasm-js:4.4.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath com.arkivanov.mvikotlin:mvikotlin:4.4.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevJvmDevRuntimeClasspath,composeHotReloadDevJvmRuntimeClasspath,composeHotReloadDevJvmTestRuntimeClasspath,jvmCompileClasspath,jvmDevCompileClasspath,jvmDevResolvableDependenciesMetadata,jvmDevRuntimeClasspath,jvmMainCompileClasspath,jvmMainResolvableDependenciesMetadata,jvmMainRuntimeClasspath,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestResolvableDependenciesMetadata,jvmTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata -com.squareup.okio:okio-jvm:3.17.0=composeHotReloadDevJvmDevRuntimeClasspath,composeHotReloadDevJvmRuntimeClasspath,composeHotReloadDevJvmTestRuntimeClasspath,jvmCompileClasspath,jvmDevCompileClasspath,jvmDevRuntimeClasspath,jvmMainCompileClasspath,jvmMainRuntimeClasspath,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestRuntimeClasspath -com.squareup.okio:okio-wasm-js:3.17.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath -com.squareup.okio:okio:3.17.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevJvmDevRuntimeClasspath,composeHotReloadDevJvmRuntimeClasspath,composeHotReloadDevJvmTestRuntimeClasspath,jvmCompileClasspath,jvmDevCompileClasspath,jvmDevResolvableDependenciesMetadata,jvmDevRuntimeClasspath,jvmMainCompileClasspath,jvmMainResolvableDependenciesMetadata,jvmMainRuntimeClasspath,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestResolvableDependenciesMetadata,jvmTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata +com.squareup.okio:okio-jvm:3.18.1=composeHotReloadDevJvmDevRuntimeClasspath,composeHotReloadDevJvmRuntimeClasspath,composeHotReloadDevJvmTestRuntimeClasspath,jvmCompileClasspath,jvmDevCompileClasspath,jvmDevRuntimeClasspath,jvmMainCompileClasspath,jvmMainRuntimeClasspath,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestRuntimeClasspath +com.squareup.okio:okio-wasm-js:3.18.1=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath +com.squareup.okio:okio:3.18.1=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevJvmDevRuntimeClasspath,composeHotReloadDevJvmRuntimeClasspath,composeHotReloadDevJvmTestRuntimeClasspath,jvmCompileClasspath,jvmDevCompileClasspath,jvmDevResolvableDependenciesMetadata,jvmDevRuntimeClasspath,jvmMainCompileClasspath,jvmMainResolvableDependenciesMetadata,jvmMainRuntimeClasspath,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestResolvableDependenciesMetadata,jvmTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata com.typesafe:config:1.4.9=composeHotReloadDevJvmDevRuntimeClasspath,composeHotReloadDevJvmRuntimeClasspath,composeHotReloadDevJvmTestRuntimeClasspath,jvmCompileClasspath,jvmDevCompileClasspath,jvmDevRuntimeClasspath,jvmMainCompileClasspath,jvmMainRuntimeClasspath,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestRuntimeClasspath io.github.oshai:kotlin-logging-jvm:8.0.4=composeHotReloadDevJvmDevRuntimeClasspath,composeHotReloadDevJvmRuntimeClasspath,composeHotReloadDevJvmTestRuntimeClasspath,jvmCompileClasspath,jvmDevCompileClasspath,jvmDevRuntimeClasspath,jvmMainCompileClasspath,jvmMainRuntimeClasspath,jvmRuntimeClasspath,jvmTestCompileClasspath,jvmTestRuntimeClasspath io.github.oshai:kotlin-logging-wasm-js:8.0.4=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath From 4c217b1071e5bf4f8fffeb2b49e5378f1c43927c Mon Sep 17 00:00:00 2001 From: SolrBot Date: Wed, 2 Sep 2026 23:18:14 +0000 Subject: [PATCH 2/3] Add changelog entry for PR#4850 --- changelog/unreleased/PR#4850-update-okhttp-okio.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changelog/unreleased/PR#4850-update-okhttp-okio.yml diff --git a/changelog/unreleased/PR#4850-update-okhttp-okio.yml b/changelog/unreleased/PR#4850-update-okhttp-okio.yml new file mode 100644 index 000000000000..f37e14a49518 --- /dev/null +++ b/changelog/unreleased/PR#4850-update-okhttp-okio.yml @@ -0,0 +1,7 @@ +title: Update OkHttp & Okio +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4850 + url: https://github.com/apache/solr/pull/4850 From 27c5d81f83d9115ed9eef3db0b0a1fed6cb193a0 Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Wed, 2 Sep 2026 22:24:40 -0400 Subject: [PATCH 3/3] align versions properly --- gradle/libs.versions.toml | 2 +- solr/modules/jwt-auth/gradle.lockfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ded74e08d115..f1a745492a71 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -517,7 +517,7 @@ slf4j-jcloverslf4j = { module = "org.slf4j:jcl-over-slf4j", version.ref = "slf4j slf4j-jultoslf4j = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" } slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4j" } spotbugs-annotations = { module = "com.github.spotbugs:spotbugs-annotations", version.ref = "spotbugs" } -squareup-okhttp3-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver" } +squareup-okhttp3-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "squareup-okhttp3-okhttp" } squareup-okhttp3-okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "squareup-okhttp3-okhttp" } squareup-okhttp3-okhttp-jvm = { module = "com.squareup.okhttp3:okhttp-jvm", version.ref = "squareup-okhttp3-okhttp" } squareup-okio = { module = "com.squareup.okio:okio", version.ref = "squareup-okio" } diff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfile index 0f426e012793..5a445e291afa 100644 --- a/solr/modules/jwt-auth/gradle.lockfile +++ b/solr/modules/jwt-auth/gradle.lockfile @@ -36,8 +36,8 @@ com.nimbusds:content-type:2.3=jarValidation,testCompileClasspath,testRuntimeClas com.nimbusds:lang-tag:1.7=jarValidation,testCompileClasspath,testRuntimeClasspath com.nimbusds:nimbus-jose-jwt:10.9.1=jarValidation,testCompileClasspath,testRuntimeClasspath com.nimbusds:oauth2-oidc-sdk:11.37.1=jarValidation,testCompileClasspath,testRuntimeClasspath -com.squareup.okhttp3:mockwebserver3:5.2.1=jarValidation,testCompileClasspath,testRuntimeClasspath -com.squareup.okhttp3:mockwebserver:5.2.1=jarValidation,testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:mockwebserver3:5.5.0=jarValidation,testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:mockwebserver:5.5.0=jarValidation,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp-jvm:5.5.0=jarValidation,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:5.5.0=jarValidation,testCompileClasspath,testRuntimeClasspath com.squareup.okio:okio-jvm:3.18.1=jarValidation,testCompileClasspath,testRuntimeClasspath