From ff2a0e025e693730df8d64207563aa093b7c9c4d Mon Sep 17 00:00:00 2001 From: SolrBot Date: Mon, 4 May 2026 03:09:34 +0000 Subject: [PATCH 1/2] Update dependency com.squareup.okio:okio to v3.17.0 --- gradle/libs.versions.toml | 2 +- solr/cross-dc-manager/gradle.lockfile | 4 ++-- solr/licenses/okio-jvm-3.16.0.jar.sha1 | 1 - solr/licenses/okio-jvm-3.16.2.jar.sha1 | 1 - solr/licenses/okio-jvm-3.17.0.jar.sha1 | 1 + solr/modules/jwt-auth/gradle.lockfile | 4 ++-- solr/modules/language-models/gradle.lockfile | 4 ++-- solr/modules/opentelemetry/gradle.lockfile | 4 ++-- solr/ui/gradle.lockfile | 6 +++--- 9 files changed, 13 insertions(+), 14 deletions(-) delete mode 100644 solr/licenses/okio-jvm-3.16.0.jar.sha1 delete mode 100644 solr/licenses/okio-jvm-3.16.2.jar.sha1 create mode 100644 solr/licenses/okio-jvm-3.17.0.jar.sha1 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7018c17a31ec..bbc3f4d5e6d3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -196,7 +196,7 @@ spatial4j = "0.8" spotbugs = "4.9.8" squareup-okhttp3-mockwebserver = "4.12.0" squareup-okhttp3-okhttp = "4.12.0" -squareup-okio = "3.16.0" +squareup-okio = "3.17.0" stephenc-jcip = "1.0-1" swagger3 = "2.2.22" tdunning-tdigest = "3.3" diff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfile index a700b6be8058..ba24aae44b8c 100644 --- a/solr/cross-dc-manager/gradle.lockfile +++ b/solr/cross-dc-manager/gradle.lockfile @@ -41,8 +41,8 @@ com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,s com.lmax:disruptor:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.squareup.okhttp3:okhttp-jvm:5.3.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.squareup.okhttp3:okhttp:5.3.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -com.squareup.okio:okio-jvm:3.16.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -com.squareup.okio:okio:3.16.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +com.squareup.okio:okio-jvm:3.17.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +com.squareup.okio:okio:3.17.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.thoughtworks.paranamer:paranamer:2.8.3=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.typesafe.scala-logging:scala-logging_2.13:3.9.5=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath diff --git a/solr/licenses/okio-jvm-3.16.0.jar.sha1 b/solr/licenses/okio-jvm-3.16.0.jar.sha1 deleted file mode 100644 index 38844b241316..000000000000 --- a/solr/licenses/okio-jvm-3.16.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -60375cdf2fd0ed2a1dcd6db787095f732a31ff10 diff --git a/solr/licenses/okio-jvm-3.16.2.jar.sha1 b/solr/licenses/okio-jvm-3.16.2.jar.sha1 deleted file mode 100644 index 866cb0702dce..000000000000 --- a/solr/licenses/okio-jvm-3.16.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -243d8d1d6fce5571f38bda712b3caf8759b4af93 diff --git a/solr/licenses/okio-jvm-3.17.0.jar.sha1 b/solr/licenses/okio-jvm-3.17.0.jar.sha1 new file mode 100644 index 000000000000..bfc2de534714 --- /dev/null +++ b/solr/licenses/okio-jvm-3.17.0.jar.sha1 @@ -0,0 +1 @@ +a12d684ec0df9541b3869ae60a4a5257fd3613df diff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfile index de3055b0b4b2..3c3caea752ed 100644 --- a/solr/modules/jwt-auth/gradle.lockfile +++ b/solr/modules/jwt-auth/gradle.lockfile @@ -38,8 +38,8 @@ com.nimbusds:nimbus-jose-jwt:10.5=jarValidation,testCompileClasspath,testRuntime com.nimbusds:oauth2-oidc-sdk:10.10.1=jarValidation,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:mockwebserver:4.12.0=jarValidation,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:4.12.0=jarValidation,testCompileClasspath,testRuntimeClasspath -com.squareup.okio:okio-jvm:3.16.0=jarValidation,testCompileClasspath,testRuntimeClasspath -com.squareup.okio:okio:3.16.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.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.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/language-models/gradle.lockfile b/solr/modules/language-models/gradle.lockfile index d2cdfd08dd84..77f548097ca5 100644 --- a/solr/modules/language-models/gradle.lockfile +++ b/solr/modules/language-models/gradle.lockfile @@ -33,8 +33,8 @@ com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,s com.knuddels:jtokkit:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.lmax:disruptor:4.0.0=solrPlatformLibs com.squareup.okhttp3:okhttp:4.12.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -com.squareup.okio:okio-jvm:3.16.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -com.squareup.okio:okio:3.16.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +com.squareup.okio:okio-jvm:3.17.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +com.squareup.okio:okio:3.17.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.squareup.retrofit2:converter-jackson:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.squareup.retrofit2:retrofit:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/opentelemetry/gradle.lockfile b/solr/modules/opentelemetry/gradle.lockfile index dab8526fa6fa..3ac1af6ab72a 100644 --- a/solr/modules/opentelemetry/gradle.lockfile +++ b/solr/modules/opentelemetry/gradle.lockfile @@ -35,8 +35,8 @@ com.jayway.jsonpath:json-path:2.9.0=jarValidation,runtimeClasspath,runtimeLibs,s com.lmax:disruptor:4.0.0=solrPlatformLibs com.squareup.okhttp3:okhttp-jvm:5.3.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath com.squareup.okhttp3:okhttp:5.3.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -com.squareup.okio:okio-jvm:3.16.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -com.squareup.okio:okio:3.16.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +com.squareup.okio:okio-jvm:3.17.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +com.squareup.okio:okio:3.17.0=jarValidation,runtimeClasspath,runtimeLibs,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.21.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/ui/gradle.lockfile b/solr/ui/gradle.lockfile index 521d5efe58d0..879797f0c061 100644 --- a/solr/ui/gradle.lockfile +++ b/solr/ui/gradle.lockfile @@ -108,9 +108,9 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=comp com.google.j2objc:j2objc-annotations:3.1=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestRuntimeClasspath com.google.truth:truth:1.0.1=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestRuntimeClasspath com.googlecode.java-diff-utils:diffutils:1.3.0=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestRuntimeClasspath -com.squareup.okio:okio-jvm:3.16.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath -com.squareup.okio:okio-wasm-js:3.16.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath -com.squareup.okio:okio:3.16.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata +com.squareup.okio:okio-jvm:3.17.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath +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,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata com.typesafe:config:1.4.5=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=kotlinInternalAbiValidation io.github.oshai:kotlin-logging-jvm:8.0.01=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath From 85b46d85d7ca69f3ca57ac54e13b80f167909504 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Mon, 4 May 2026 03:09:52 +0000 Subject: [PATCH 2/2] Update changelog entry --- .../unreleased/PR#4346-update-com-squareup-okio-okio.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changelog/unreleased/PR#4346-update-com-squareup-okio-okio.yml diff --git a/changelog/unreleased/PR#4346-update-com-squareup-okio-okio.yml b/changelog/unreleased/PR#4346-update-com-squareup-okio-okio.yml new file mode 100644 index 000000000000..48a93eb63d85 --- /dev/null +++ b/changelog/unreleased/PR#4346-update-com-squareup-okio-okio.yml @@ -0,0 +1,7 @@ +title: Update com.squareup.okio:okio to v3.17.0 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4346 + url: https://github.com/apache/solr/pull/4346