This is an automated email from the ASF dual-hosted git repository. dsmiley pushed a commit to branch branch_10x in repository https://gitbox.apache.org/repos/asf/solr.git
commit 85ca2a3c0a90bf1f4886cc1938a0be8d260f73ff Author: Jan Høydahl <[email protected]> AuthorDate: Tue Jun 30 02:07:10 2026 +0200 Bulk dependency upgrade 2026-06-28 (#4566) Dependency upgrades (Renovate batch 2026-06-28) Bulk update of Gradle dependencies, with regenerated lockfiles and license checksums. - androidx-adaptive: 1.3.0-alpha07 -> 1.3.0-beta02 - androidx-navigation3: 1.1.0 -> 1.1.1 - apache-opennlp: 2.5.9 -> 2.5.10 - codehaus-woodstox (stax2-api): 4.2.2 -> 4.3.0 - commons-codec: 1.21.0 -> 1.22.0 - commons-io: 2.21.0 -> 2.22.0 - compose: 1.10.3 -> 1.11.1 - cuvs-java: 25.10.0 -> 26.06.0 - cuvs-lucene: 25.10.0 -> 25.12.0 - decompose: 3.4.0 -> 3.5.0 - dropwizard-metrics: 4.2.38 -> 4.2.39 - fasterxml-jackson: 2.21.2 -> 2.22.0 - fasterxml-woodstox: 7.0.0 -> 7.2.1 - google-autovalue: 1.11.0 -> 1.11.1 - google-cloud-bom: 0.261.0 -> 0.265.0 - google-gson: 2.13.1 -> 2.14.0 - google-protobuf: 4.34.1 -> 4.35.1 - grpc: 1.80.0 -> 1.82.0 - hk2: 3.1.1 -> 4.0.1 - ibm-icu (icu4j): 77.1 -> 78.3 - immutables-valueannotations: 2.12.1 -> 2.12.2 - jakarta-ws-rs-api: 3.1.0 -> 4.0.0 - jaxb: 2.3.9 -> 4.0.9 - jayway-jsonpath: 2.9.0 -> 3.0.0 - jctools: 4.0.5 -> 4.0.6 - jna: 5.18.1 -> 5.19.1 - joda-time: 2.14.0 -> 2.14.2 - kotlin: 2.3.20 -> 2.4.0 - kotlinx-atomicfu: 0.31.0 -> 0.33.0 - kotlinx-coroutines: 1.10.2 -> 1.11.0 - kotlinx-datetime: 0.7.1 -> 0.8.0-0.6.x-compat - ktor: 3.4.2 -> 3.5.0 - langchain4j-bom: 1.9.1 -> 1.16.3 - logchange: 1.19.13 -> 1.19.15 - mvikotlin: 4.3.0 -> 4.4.0 - netty-tcnative: 2.0.77.Final -> 2.0.79.Final - nimbusds-josejwt: 10.5 -> 10.9.1 - nlopez-compose: 0.5.7 -> 0.6.2 - openapi-generator: 7.20.0 -> 7.23.0 - oshai-kotlin-logging: 8.0.01 -> 8.0.4 - ow2-asm: 9.8 -> 9.10.1 - squareup-okhttp3: 4.12.0 -> 5.4.0 - squareup-okio: 3.16.0 -> 3.17.0 - swagger3: 2.2.22 -> 2.2.52 - testcontainers: 2.0.3 -> 2.0.5 - threeten-bp: 1.7.2 -> 1.7.3 (cherry picked from commit 62400f920fba012b049def77e6c7943261a0fc11) --- .../unreleased/PR#3218-update-io-ktor-ktor-bom.yml | 7 +++++ .../PR#3313-update-kotlinx-coroutines.yml | 9 ------- ...date-org-jetbrains-kotlinx-kotlinx-datetime.yml | 9 ------- changelog/unreleased/PR#3475-update-kotlin.yml | 7 +++++ ...#4096-update-org-jetbrains-kotlinx-atomicfu.yml | 7 +++++ .../PR#4343-update-admin-ui-libraries.yml | 7 +++++ .../PR#4346-update-com-squareup-okio-okio.yml | 7 +++++ ...#4389-update-io-nlopez-compose-rules-ktlint.yml | 7 +++++ ...0-update-org-jetbrains-androidx-navigation3.yml | 7 +++++ ...date-org-jetbrains-kotlinx-kotlinx-datetime.yml | 7 +++++ .../PR#4437-update-kotlinx-coroutines.yml | 7 +++++ .../PR#4559-update-squareup-okhttp3-okhttp.yml | 7 +++++ .../unreleased/PR4339-update-apache-log4j.yml | 8 ------ gradle/libs.versions.toml | 31 ++++++++++++---------- solr/cross-dc-manager/gradle.lockfile | 8 +++--- solr/licenses/angus-activation-2.0.3.jar.sha1 | 1 + .../licenses/jakarta.activation-api-2.1.4.jar.sha1 | 1 + solr/licenses/jakarta.xml.bind-api-4.0.5.jar.sha1 | 1 + solr/licenses/jaxb-core-4.0.9.jar.sha1 | 1 + solr/licenses/jaxb-runtime-4.0.9.jar.sha1 | 1 + solr/licenses/kotlin-stdlib-2.2.20.jar.sha1 | 1 - solr/licenses/kotlin-stdlib-jdk7-2.4.0.jar.sha1 | 1 + solr/licenses/kotlin-stdlib-jdk8-2.4.0.jar.sha1 | 1 + solr/licenses/okhttp-4.12.0.jar.sha1 | 1 - solr/licenses/okhttp-jvm-5.2.1.jar.sha1 | 1 - solr/licenses/okhttp-jvm-5.3.0.jar.sha1 | 1 - solr/licenses/okhttp-jvm-5.4.0.jar.sha1 | 1 + solr/licenses/okio-jvm-3.16.0.jar.sha1 | 1 - solr/licenses/okio-jvm-3.16.1.jar.sha1 | 1 - solr/licenses/okio-jvm-3.16.2.jar.sha1 | 1 - solr/licenses/okio-jvm-3.17.0.jar.sha1 | 1 + solr/licenses/txw2-4.0.9.jar.sha1 | 1 + solr/modules/opentelemetry/gradle.lockfile | 8 +++--- 33 files changed, 105 insertions(+), 55 deletions(-) diff --git a/changelog/unreleased/PR#3218-update-io-ktor-ktor-bom.yml b/changelog/unreleased/PR#3218-update-io-ktor-ktor-bom.yml new file mode 100644 index 00000000000..ffb0365e73f --- /dev/null +++ b/changelog/unreleased/PR#3218-update-io-ktor-ktor-bom.yml @@ -0,0 +1,7 @@ +title: Update io.ktor:ktor-bom to v3.5.0 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#3218 + url: https://github.com/apache/solr/pull/3218 diff --git a/changelog/unreleased/PR#3313-update-kotlinx-coroutines.yml b/changelog/unreleased/PR#3313-update-kotlinx-coroutines.yml deleted file mode 100644 index 93e5339db81..00000000000 --- a/changelog/unreleased/PR#3313-update-kotlinx-coroutines.yml +++ /dev/null @@ -1,9 +0,0 @@ -title: Update kotlinx.coroutines to v1.10.2 -type: dependency_update -authors: -- name: solrbot -links: -- name: PR#3313 - url: https://github.com/apache/solr/pull/3313 -- name: PR#4305 - url: https://github.com/apache/solr/pull/4305 diff --git a/changelog/unreleased/PR#3422-update-org-jetbrains-kotlinx-kotlinx-datetime.yml b/changelog/unreleased/PR#3422-update-org-jetbrains-kotlinx-kotlinx-datetime.yml deleted file mode 100644 index 8df877dd410..00000000000 --- a/changelog/unreleased/PR#3422-update-org-jetbrains-kotlinx-kotlinx-datetime.yml +++ /dev/null @@ -1,9 +0,0 @@ -title: Update org.jetbrains.kotlinx:kotlinx-datetime to v0.7.1-0.6.x-compat -type: dependency_update -authors: -- name: solrbot -links: -- name: PR#3422 - url: https://github.com/apache/solr/pull/3422 -- name: PR#4305 - url: https://github.com/apache/solr/pull/4305 diff --git a/changelog/unreleased/PR#3475-update-kotlin.yml b/changelog/unreleased/PR#3475-update-kotlin.yml new file mode 100644 index 00000000000..8ebfa07c725 --- /dev/null +++ b/changelog/unreleased/PR#3475-update-kotlin.yml @@ -0,0 +1,7 @@ +title: Update kotlin to v2.4.0 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#3475 + url: https://github.com/apache/solr/pull/3475 diff --git a/changelog/unreleased/PR#4096-update-org-jetbrains-kotlinx-atomicfu.yml b/changelog/unreleased/PR#4096-update-org-jetbrains-kotlinx-atomicfu.yml new file mode 100644 index 00000000000..694f86470be --- /dev/null +++ b/changelog/unreleased/PR#4096-update-org-jetbrains-kotlinx-atomicfu.yml @@ -0,0 +1,7 @@ +title: Update org.jetbrains.kotlinx:atomicfu to v0.33.0 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4096 + url: https://github.com/apache/solr/pull/4096 diff --git a/changelog/unreleased/PR#4343-update-admin-ui-libraries.yml b/changelog/unreleased/PR#4343-update-admin-ui-libraries.yml new file mode 100644 index 00000000000..90ed6de5379 --- /dev/null +++ b/changelog/unreleased/PR#4343-update-admin-ui-libraries.yml @@ -0,0 +1,7 @@ +title: Update Admin UI libraries +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4343 + url: https://github.com/apache/solr/pull/4343 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 00000000000..48a93eb63d8 --- /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 diff --git a/changelog/unreleased/PR#4389-update-io-nlopez-compose-rules-ktlint.yml b/changelog/unreleased/PR#4389-update-io-nlopez-compose-rules-ktlint.yml new file mode 100644 index 00000000000..e09c6ca27d4 --- /dev/null +++ b/changelog/unreleased/PR#4389-update-io-nlopez-compose-rules-ktlint.yml @@ -0,0 +1,7 @@ +title: Update io.nlopez.compose.rules:ktlint to v0.6.2 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4389 + url: https://github.com/apache/solr/pull/4389 diff --git a/changelog/unreleased/PR#4410-update-org-jetbrains-androidx-navigation3.yml b/changelog/unreleased/PR#4410-update-org-jetbrains-androidx-navigation3.yml new file mode 100644 index 00000000000..6edee3ee19c --- /dev/null +++ b/changelog/unreleased/PR#4410-update-org-jetbrains-androidx-navigation3.yml @@ -0,0 +1,7 @@ +title: Update org.jetbrains.androidx.navigation3:navigation3-ui to v1.1.1 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4410 + url: https://github.com/apache/solr/pull/4410 diff --git a/changelog/unreleased/PR#4436-update-org-jetbrains-kotlinx-kotlinx-datetime.yml b/changelog/unreleased/PR#4436-update-org-jetbrains-kotlinx-kotlinx-datetime.yml new file mode 100644 index 00000000000..c67204bc303 --- /dev/null +++ b/changelog/unreleased/PR#4436-update-org-jetbrains-kotlinx-kotlinx-datetime.yml @@ -0,0 +1,7 @@ +title: Update org.jetbrains.kotlinx:kotlinx-datetime to v0.8.0-0.6.x-compat +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4436 + url: https://github.com/apache/solr/pull/4436 diff --git a/changelog/unreleased/PR#4437-update-kotlinx-coroutines.yml b/changelog/unreleased/PR#4437-update-kotlinx-coroutines.yml new file mode 100644 index 00000000000..afaa89ed741 --- /dev/null +++ b/changelog/unreleased/PR#4437-update-kotlinx-coroutines.yml @@ -0,0 +1,7 @@ +title: Update kotlinx.coroutines to v1.11.0 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4437 + url: https://github.com/apache/solr/pull/4437 diff --git a/changelog/unreleased/PR#4559-update-squareup-okhttp3-okhttp.yml b/changelog/unreleased/PR#4559-update-squareup-okhttp3-okhttp.yml new file mode 100644 index 00000000000..ee9910f1d4f --- /dev/null +++ b/changelog/unreleased/PR#4559-update-squareup-okhttp3-okhttp.yml @@ -0,0 +1,7 @@ +title: Update squareup.okhttp3.okhttp to v5 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4559 + url: https://github.com/apache/solr/pull/4559 diff --git a/changelog/unreleased/PR4339-update-apache-log4j.yml b/changelog/unreleased/PR4339-update-apache-log4j.yml deleted file mode 100644 index 9202029b2bd..00000000000 --- a/changelog/unreleased/PR4339-update-apache-log4j.yml +++ /dev/null @@ -1,8 +0,0 @@ -# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc -title: Update apache.log4j to v2.25.4 -type: dependency_update -authors: -- name: solrbot -links: -- name: PR#4339 - url: https://github.com/apache/solr/pull/4339 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 271c41f4b25..a2246fc2fb5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,6 +15,9 @@ [versions] adobe-testing-s3mock = "4.12.4" amazon-awssdk = "2.42.37" +androidx-adaptive = "1.3.0-beta02" +androidx-lifecycle = "2.10.0" +androidx-navigation3 = "1.1.1" # @keep Antora version used in ref-guide antora = "3.1.12" # @keep Most recent commit as of 2025-08-03, this repo does not have tags @@ -71,10 +74,10 @@ codehaus-woodstox = "4.3.0" commons-cli = "1.11.0" commons-codec = "1.22.0" commons-io = "2.22.0" -compose = "1.8.2" +compose = "1.11.1" cuvs-java = "26.06.0" cuvs-lucene = "25.12.0" -decompose = "3.3.0" +decompose = "3.5.0" diffplug-spotless = "8.3.0" # @keep Use for dockerfile JRE version dockerfile-baseimage-java = "25" @@ -136,17 +139,17 @@ jna = "5.19.1" # @keep for version alignment joda-time = "2.14.2" junit = "4.13.2" -kotlin = "2.2.0" +kotlin = "2.4.0" # @keep for version alignment -kotlinx-atomicfu = "0.29.0" +kotlinx-atomicfu = "0.33.0" # @keep for version alignment -kotlinx-browser = "0.3" -kotlinx-coroutines = "1.10.2" -kotlinx-datetime = "0.7.1-0.6.x-compat" -kotlinx-serialization = "1.9.0" +kotlinx-browser = "0.5.0" +kotlinx-coroutines = "1.11.0" +kotlinx-datetime = "0.8.0-0.6.x-compat" +kotlinx-serialization = "1.11.0" # @keep used by spotless -ktlint = "1.7.1" -ktor = "3.2.2" +ktlint = "1.8.0" +ktor = "3.5.0" langchain4j-bom = "1.16.3" # @keep Link checker version used in ref-guide link-checker = "1.4.2" @@ -156,13 +159,13 @@ logchange = "1.19.15" ltgt-errorprone = "5.1.0" mockito = "5.23.0" morethan-jmhreport = "0.9.6" -mvikotlin = "4.3.0" +mvikotlin = "4.4.0" navsecurity = "5.0.1" netty = "4.2.15.Final" # @keep for version alignment netty-tcnative = "2.0.79.Final" nimbusds-josejwt = "10.9.1" -nlopez-compose = "0.4.27" +nlopez-compose = "0.6.2" nodegradle-node = "7.1.0" # @keep Node JS version used in node.gradle (LTS) nodejs = "22.18.0" @@ -184,8 +187,8 @@ semver4j = "6.0.0" slf4j = "2.0.17" spatial4j = "0.8" spotbugs = "4.9.8" -squareup-okhttp3-okhttp = "4.12.0" -squareup-okio = "3.16.0" +squareup-okhttp3-okhttp = "5.4.0" +squareup-okio = "3.17.0" stephenc-jcip = "1.0-1" swagger3 = "2.2.52" tdunning-tdigest = "3.3" diff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfile index 849e88cfccd..332646c7714 100644 --- a/solr/cross-dc-manager/gradle.lockfile +++ b/solr/cross-dc-manager/gradle.lockfile @@ -39,10 +39,10 @@ com.google.protobuf:protobuf-java:4.35.1=annotationProcessor,errorprone,jarValid com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:3.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath 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.okhttp3:okhttp-jvm:5.4.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +com.squareup.okhttp3:okhttp:5.4.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.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/angus-activation-2.0.3.jar.sha1 b/solr/licenses/angus-activation-2.0.3.jar.sha1 new file mode 100644 index 00000000000..0eff897a0f5 --- /dev/null +++ b/solr/licenses/angus-activation-2.0.3.jar.sha1 @@ -0,0 +1 @@ +7f80607ea5014fef0b1779e6c33d63a88a45a563 diff --git a/solr/licenses/jakarta.activation-api-2.1.4.jar.sha1 b/solr/licenses/jakarta.activation-api-2.1.4.jar.sha1 new file mode 100644 index 00000000000..041b05337ef --- /dev/null +++ b/solr/licenses/jakarta.activation-api-2.1.4.jar.sha1 @@ -0,0 +1 @@ +9e5c2a0d75dde71a0bedc4dbdbe47b78a5dc50f8 diff --git a/solr/licenses/jakarta.xml.bind-api-4.0.5.jar.sha1 b/solr/licenses/jakarta.xml.bind-api-4.0.5.jar.sha1 new file mode 100644 index 00000000000..25520554e95 --- /dev/null +++ b/solr/licenses/jakarta.xml.bind-api-4.0.5.jar.sha1 @@ -0,0 +1 @@ +161811f36cad3c65991502e80317f2f6703361df diff --git a/solr/licenses/jaxb-core-4.0.9.jar.sha1 b/solr/licenses/jaxb-core-4.0.9.jar.sha1 new file mode 100644 index 00000000000..2ad3b344fb8 --- /dev/null +++ b/solr/licenses/jaxb-core-4.0.9.jar.sha1 @@ -0,0 +1 @@ +3f32ec949d109d666fa30994223d1c25a47b105f diff --git a/solr/licenses/jaxb-runtime-4.0.9.jar.sha1 b/solr/licenses/jaxb-runtime-4.0.9.jar.sha1 new file mode 100644 index 00000000000..e8d57c23c8e --- /dev/null +++ b/solr/licenses/jaxb-runtime-4.0.9.jar.sha1 @@ -0,0 +1 @@ +500c199572538675d2819c938fbafe34935d8d6b diff --git a/solr/licenses/kotlin-stdlib-2.2.20.jar.sha1 b/solr/licenses/kotlin-stdlib-2.2.20.jar.sha1 deleted file mode 100644 index cd6eec602ce..00000000000 --- a/solr/licenses/kotlin-stdlib-2.2.20.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5380b19fa1924399b62ce3a1faffebb2b4f82272 diff --git a/solr/licenses/kotlin-stdlib-jdk7-2.4.0.jar.sha1 b/solr/licenses/kotlin-stdlib-jdk7-2.4.0.jar.sha1 new file mode 100644 index 00000000000..487bdaa7546 --- /dev/null +++ b/solr/licenses/kotlin-stdlib-jdk7-2.4.0.jar.sha1 @@ -0,0 +1 @@ +65464dd63e7ab1b7cb29f2b2554971088deb50f3 diff --git a/solr/licenses/kotlin-stdlib-jdk8-2.4.0.jar.sha1 b/solr/licenses/kotlin-stdlib-jdk8-2.4.0.jar.sha1 new file mode 100644 index 00000000000..7ef533a17e1 --- /dev/null +++ b/solr/licenses/kotlin-stdlib-jdk8-2.4.0.jar.sha1 @@ -0,0 +1 @@ +ff44d8831b07b547fc0263e33304e876788d6f0d diff --git a/solr/licenses/okhttp-4.12.0.jar.sha1 b/solr/licenses/okhttp-4.12.0.jar.sha1 deleted file mode 100644 index 7000de25fab..00000000000 --- a/solr/licenses/okhttp-4.12.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2f4525d4a200e97e1b87449c2cd9bd2e25b7e8cd diff --git a/solr/licenses/okhttp-jvm-5.2.1.jar.sha1 b/solr/licenses/okhttp-jvm-5.2.1.jar.sha1 deleted file mode 100644 index 38d3d52d5c5..00000000000 --- a/solr/licenses/okhttp-jvm-5.2.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -239374c8de427f72657c0145dda769fccb17a7b2 diff --git a/solr/licenses/okhttp-jvm-5.3.0.jar.sha1 b/solr/licenses/okhttp-jvm-5.3.0.jar.sha1 deleted file mode 100644 index bb70d2af553..00000000000 --- a/solr/licenses/okhttp-jvm-5.3.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6c64103d4b99cf95a4498872adc1075de580a30b diff --git a/solr/licenses/okhttp-jvm-5.4.0.jar.sha1 b/solr/licenses/okhttp-jvm-5.4.0.jar.sha1 new file mode 100644 index 00000000000..4b0e22d054d --- /dev/null +++ b/solr/licenses/okhttp-jvm-5.4.0.jar.sha1 @@ -0,0 +1 @@ +e1fae6fccaae70e60b31153c6a7680306a86ed31 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 38844b24131..00000000000 --- 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.1.jar.sha1 b/solr/licenses/okio-jvm-3.16.1.jar.sha1 deleted file mode 100644 index 46b92f0cc6d..00000000000 --- a/solr/licenses/okio-jvm-3.16.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2c8e9a56ce1a1b30ec920fb93a3a9980cf34b015 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 866cb0702dc..00000000000 --- 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 00000000000..bfc2de53471 --- /dev/null +++ b/solr/licenses/okio-jvm-3.17.0.jar.sha1 @@ -0,0 +1 @@ +a12d684ec0df9541b3869ae60a4a5257fd3613df diff --git a/solr/licenses/txw2-4.0.9.jar.sha1 b/solr/licenses/txw2-4.0.9.jar.sha1 new file mode 100644 index 00000000000..e106c036b81 --- /dev/null +++ b/solr/licenses/txw2-4.0.9.jar.sha1 @@ -0,0 +1 @@ +70325ebdebca3e7aae1dfa395fd41fc25d8a6f4e diff --git a/solr/modules/opentelemetry/gradle.lockfile b/solr/modules/opentelemetry/gradle.lockfile index f9293538637..9fef410f7fc 100644 --- a/solr/modules/opentelemetry/gradle.lockfile +++ b/solr/modules/opentelemetry/gradle.lockfile @@ -33,10 +33,10 @@ com.google.protobuf:protobuf-java:4.35.1=annotationProcessor,errorprone,jarValid com.j256.simplemagic:simplemagic:1.17=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:3.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath 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.okhttp3:okhttp-jvm:5.4.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath +com.squareup.okhttp3:okhttp:5.4.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.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.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
