From 4904b5ea75151d03e45a5429d99bbb3b9d7f7b70 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Sat, 25 Apr 2026 01:52:37 +0000 Subject: [PATCH 01/45] Update dependency commons-codec:commons-codec to v1.22.0 (branch_9x) --- solr/licenses/commons-codec-1.21.0.jar.sha1 | 1 - solr/licenses/commons-codec-1.22.0.jar.sha1 | 1 + versions.lock | 2 +- versions.props | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 solr/licenses/commons-codec-1.21.0.jar.sha1 create mode 100644 solr/licenses/commons-codec-1.22.0.jar.sha1 diff --git a/solr/licenses/commons-codec-1.21.0.jar.sha1 b/solr/licenses/commons-codec-1.21.0.jar.sha1 deleted file mode 100644 index e33f241bcbfc..000000000000 --- a/solr/licenses/commons-codec-1.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d95f998db5f89900fe895daf6cd2cddcb2f1d64b diff --git a/solr/licenses/commons-codec-1.22.0.jar.sha1 b/solr/licenses/commons-codec-1.22.0.jar.sha1 new file mode 100644 index 000000000000..5a86d1e4451a --- /dev/null +++ b/solr/licenses/commons-codec-1.22.0.jar.sha1 @@ -0,0 +1 @@ +6b3eb4beb7058c2a638f5f17bcb388649fd339dd diff --git a/versions.lock b/versions.lock index 659611f7d411..c01782c79e3d 100644 --- a/versions.lock +++ b/versions.lock @@ -76,7 +76,7 @@ com.yammer.metrics:metrics-core:2.2.0 (7 constraints: 8760e867) com.zaxxer:SparseBitSet:1.3 (1 constraints: 0e081f75) commons-beanutils:commons-beanutils:1.11.0 (1 constraints: e30fce93) commons-cli:commons-cli:1.11.0 (2 constraints: d20f5dbe) -commons-codec:commons-codec:1.21.0 (9 constraints: 587d8a8a) +commons-codec:commons-codec:1.22.0 (9 constraints: 597deb8b) commons-collections:commons-collections:3.2.2 (3 constraints: 77242dac) commons-digester:commons-digester:2.1 (1 constraints: 550fb664) commons-io:commons-io:2.21.0 (10 constraints: ab74caac) diff --git a/versions.props b/versions.props index 9696656c75ea..7bb4fd6bafad 100644 --- a/versions.props +++ b/versions.props @@ -20,7 +20,7 @@ com.jayway.jsonpath:json-path=2.9.0 com.lmax:disruptor=3.4.4 com.tdunning:t-digest=3.3 commons-cli:commons-cli=1.11.0 -commons-codec:commons-codec=1.21.0 +commons-codec:commons-codec=1.22.0 commons-collections:commons-collections=3.2.2 commons-io:commons-io=2.21.0 dev.langchain4j:langchain4j-*=0.35.0 From 624c55c4bab89b119e888eca81439deb6238546a Mon Sep 17 00:00:00 2001 From: SolrBot Date: Sat, 25 Apr 2026 01:52:56 +0000 Subject: [PATCH 02/45] Update changelog entry --- .../PR#4332-update-commons-codec-commons-codec.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changelog/unreleased/PR#4332-update-commons-codec-commons-codec.yml diff --git a/changelog/unreleased/PR#4332-update-commons-codec-commons-codec.yml b/changelog/unreleased/PR#4332-update-commons-codec-commons-codec.yml new file mode 100644 index 000000000000..ec142f84bfde --- /dev/null +++ b/changelog/unreleased/PR#4332-update-commons-codec-commons-codec.yml @@ -0,0 +1,7 @@ +title: Update commons-codec:commons-codec to v1.22.0 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4332 + url: https://github.com/apache/solr/pull/4332 From 97344b621b87ff02ebb823834e7b58edcaa0a13b Mon Sep 17 00:00:00 2001 From: SolrBot Date: Fri, 1 May 2026 02:29:20 +0000 Subject: [PATCH 03/45] Update dependency org.testcontainers:testcontainers to v2 (branch_9x) --- solr/licenses/docker-java-api-3.4.0.jar.sha1 | 1 - solr/licenses/docker-java-api-3.7.1.jar.sha1 | 1 + .../docker-java-transport-3.4.0.jar.sha1 | 1 - .../docker-java-transport-3.7.1.jar.sha1 | 1 + ...cker-java-transport-zerodep-3.4.0.jar.sha1 | 1 - ...cker-java-transport-zerodep-3.7.1.jar.sha1 | 1 + .../jackson-annotations-2.18.0.jar.sha1 | 1 - .../jackson-annotations-2.20.jar.sha1 | 1 + solr/licenses/testcontainers-1.20.4.jar.sha1 | 1 - solr/licenses/testcontainers-2.0.5.jar.sha1 | 1 + versions.lock | 20 +++++++++---------- versions.props | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 solr/licenses/docker-java-api-3.4.0.jar.sha1 create mode 100644 solr/licenses/docker-java-api-3.7.1.jar.sha1 delete mode 100644 solr/licenses/docker-java-transport-3.4.0.jar.sha1 create mode 100644 solr/licenses/docker-java-transport-3.7.1.jar.sha1 delete mode 100644 solr/licenses/docker-java-transport-zerodep-3.4.0.jar.sha1 create mode 100644 solr/licenses/docker-java-transport-zerodep-3.7.1.jar.sha1 delete mode 100644 solr/licenses/jackson-annotations-2.18.0.jar.sha1 create mode 100644 solr/licenses/jackson-annotations-2.20.jar.sha1 delete mode 100644 solr/licenses/testcontainers-1.20.4.jar.sha1 create mode 100644 solr/licenses/testcontainers-2.0.5.jar.sha1 diff --git a/solr/licenses/docker-java-api-3.4.0.jar.sha1 b/solr/licenses/docker-java-api-3.4.0.jar.sha1 deleted file mode 100644 index bf5ca0d6db4c..000000000000 --- a/solr/licenses/docker-java-api-3.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9ef23dcc93693f15e69b64632be096c38e31bc44 diff --git a/solr/licenses/docker-java-api-3.7.1.jar.sha1 b/solr/licenses/docker-java-api-3.7.1.jar.sha1 new file mode 100644 index 000000000000..f233e26829a3 --- /dev/null +++ b/solr/licenses/docker-java-api-3.7.1.jar.sha1 @@ -0,0 +1 @@ +2df91233a782749e85139991cc94d4ef40b59038 diff --git a/solr/licenses/docker-java-transport-3.4.0.jar.sha1 b/solr/licenses/docker-java-transport-3.4.0.jar.sha1 deleted file mode 100644 index c1232d24a6be..000000000000 --- a/solr/licenses/docker-java-transport-3.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c058705684d782effc4b2edfdef1a87544ba4af8 diff --git a/solr/licenses/docker-java-transport-3.7.1.jar.sha1 b/solr/licenses/docker-java-transport-3.7.1.jar.sha1 new file mode 100644 index 000000000000..42b06b963c50 --- /dev/null +++ b/solr/licenses/docker-java-transport-3.7.1.jar.sha1 @@ -0,0 +1 @@ +7b8f1b7486e83f2871d9f98a7e12c529dfddc9c2 diff --git a/solr/licenses/docker-java-transport-zerodep-3.4.0.jar.sha1 b/solr/licenses/docker-java-transport-zerodep-3.4.0.jar.sha1 deleted file mode 100644 index b658f8f0810d..000000000000 --- a/solr/licenses/docker-java-transport-zerodep-3.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c4ce6d8695cfdb0027872f99cc20f8f679f8a969 diff --git a/solr/licenses/docker-java-transport-zerodep-3.7.1.jar.sha1 b/solr/licenses/docker-java-transport-zerodep-3.7.1.jar.sha1 new file mode 100644 index 000000000000..b5652c098114 --- /dev/null +++ b/solr/licenses/docker-java-transport-zerodep-3.7.1.jar.sha1 @@ -0,0 +1 @@ +6b1af9996b2004703a41e0fbbf1031cabbbe4e6b diff --git a/solr/licenses/jackson-annotations-2.18.0.jar.sha1 b/solr/licenses/jackson-annotations-2.18.0.jar.sha1 deleted file mode 100644 index 2303a2b31609..000000000000 --- a/solr/licenses/jackson-annotations-2.18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9bddcc56af9d90f902ef5dba7348102cd12b04e2 diff --git a/solr/licenses/jackson-annotations-2.20.jar.sha1 b/solr/licenses/jackson-annotations-2.20.jar.sha1 new file mode 100644 index 000000000000..e1372cb64fd4 --- /dev/null +++ b/solr/licenses/jackson-annotations-2.20.jar.sha1 @@ -0,0 +1 @@ +6a5e7291ea3f2b590a7ce400adb7b3aea4d7e12c diff --git a/solr/licenses/testcontainers-1.20.4.jar.sha1 b/solr/licenses/testcontainers-1.20.4.jar.sha1 deleted file mode 100644 index 29746a98e881..000000000000 --- a/solr/licenses/testcontainers-1.20.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ee2fe3afc9fa6cb2e6a43233998f3633f761692f diff --git a/solr/licenses/testcontainers-2.0.5.jar.sha1 b/solr/licenses/testcontainers-2.0.5.jar.sha1 new file mode 100644 index 000000000000..a0f25a928a7c --- /dev/null +++ b/solr/licenses/testcontainers-2.0.5.jar.sha1 @@ -0,0 +1 @@ +7e5013c78fd678ba8958db23c6883274019f2f2f diff --git a/versions.lock b/versions.lock index 659611f7d411..01353e650985 100644 --- a/versions.lock +++ b/versions.lock @@ -4,8 +4,8 @@ biz.aQute.bnd:biz.aQute.bnd.annotation:6.4.1 (1 constraints: 0d051636) com.carrotsearch:hppc:0.10.0 (2 constraints: d40fecb0) com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.4 (2 constraints: d21594e2) com.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e) -com.fasterxml.jackson:jackson-bom:2.18.0 (13 constraints: 2614e9f5) -com.fasterxml.jackson.core:jackson-annotations:2.18.0 (13 constraints: 4301624c) +com.fasterxml.jackson:jackson-bom:2.18.0 (12 constraints: 2500f8a0) +com.fasterxml.jackson.core:jackson-annotations:2.20 (13 constraints: e300bf84) com.fasterxml.jackson.core:jackson-core:2.18.0 (15 constraints: e436f89c) com.fasterxml.jackson.core:jackson-databind:2.18.0 (34 constraints: ec643f77) com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.0 (2 constraints: 641ca1f1) @@ -167,7 +167,7 @@ jakarta.annotation:jakarta.annotation-api:2.1.1 (4 constraints: c94095a4) jakarta.inject:jakarta.inject-api:2.0.1 (5 constraints: 1d49b79e) jakarta.validation:jakarta.validation-api:3.0.2 (1 constraints: fe10bbc3) jakarta.ws.rs:jakarta.ws.rs-api:3.1.0 (6 constraints: 7365f954) -junit:junit:4.13.2 (8 constraints: 807c2182) +junit:junit:4.13.2 (7 constraints: 136d2cb8) net.arnx:jsonic:1.2.7 (1 constraints: d00b47eb) net.sf.jopt-simple:jopt-simple:5.0.4 (3 constraints: 132590bf) net.sourceforge.argparse4j:argparse4j:0.7.0 (1 constraints: fe0a06e8) @@ -178,7 +178,7 @@ org.apache.calcite:calcite-linq4j:1.37.0 (2 constraints: cf12444c) org.apache.calcite.avatica:avatica-core:1.25.0 (3 constraints: 0121ddcc) org.apache.calcite.avatica:avatica-metrics:1.25.0 (1 constraints: 9b104fc4) org.apache.commons:commons-collections4:4.5.0 (3 constraints: 471880cc) -org.apache.commons:commons-compress:1.28.0 (3 constraints: a51f96f4) +org.apache.commons:commons-compress:1.28.0 (3 constraints: a91fa2f4) org.apache.commons:commons-configuration2:2.14.0 (1 constraints: 39053b3b) org.apache.commons:commons-exec:1.6.0 (1 constraints: 09050236) org.apache.commons:commons-lang3:3.20.0 (5 constraints: 3a422d95) @@ -342,7 +342,7 @@ org.scala-lang.modules:scala-java8-compat_2.13:1.0.2 (1 constraints: fa0af8e7) org.semver4j:semver4j:5.8.0 (1 constraints: 0f051c36) org.slf4j:jcl-over-slf4j:2.0.17 (1 constraints: 3c05323b) org.slf4j:jul-to-slf4j:2.0.17 (2 constraints: c11bd27e) -org.slf4j:slf4j-api:2.0.17 (68 constraints: 6cd32dae) +org.slf4j:slf4j-api:2.0.17 (68 constraints: 6ed3c2c3) org.threeten:threetenbp:1.6.9 (4 constraints: 2833ea68) org.xerial.snappy:snappy-java:1.1.10.8 (5 constraints: c146fa38) software.amazon.awssdk:annotations:2.42.37 (30 constraints: 48cb1be0) @@ -391,9 +391,9 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.18.0 (2 constraints: a com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.0 (4 constraints: 6e48dd35) com.fasterxml.jackson.module:jackson-module-kotlin:2.18.0 (2 constraints: aa1d6d60) com.fasterxml.jackson.module:jackson-module-parameter-names:2.18.0 (2 constraints: 0d248182) -com.github.docker-java:docker-java-api:3.4.0 (1 constraints: 3b0f6067) -com.github.docker-java:docker-java-transport:3.4.0 (1 constraints: c51513cb) -com.github.docker-java:docker-java-transport-zerodep:3.4.0 (1 constraints: 3b0f6067) +com.github.docker-java:docker-java-api:3.7.1 (1 constraints: 3f0f6a67) +com.github.docker-java:docker-java-transport:3.7.1 (1 constraints: c9151dcb) +com.github.docker-java:docker-java-transport-zerodep:3.7.1 (1 constraints: 3f0f6a67) com.google.cloud:google-cloud-nio:0.127.20 (1 constraints: c90e267b) com.nimbusds:content-type:2.2 (1 constraints: d80b68eb) com.nimbusds:lang-tag:1.7 (1 constraints: dc0b6aeb) @@ -413,7 +413,7 @@ javax.inject:javax.inject:1 (1 constraints: 7a0df617) joda-time:joda-time:2.8.1 (1 constraints: 7a0dd431) net.bytebuddy:byte-buddy:1.17.7 (2 constraints: 8b1044cc) net.bytebuddy:byte-buddy-agent:1.17.7 (1 constraints: 4205453b) -net.java.dev.jna:jna:5.18.1 (2 constraints: 371b0b62) +net.java.dev.jna:jna:5.18.1 (2 constraints: 3d1b1b62) net.minidev:accessors-smart:2.4.9 (1 constraints: 500a92b8) net.minidev:json-smart:2.4.10 (1 constraints: 400e9a7c) no.nav.security:mock-oauth2-server:0.5.10 (1 constraints: 3805333b) @@ -463,7 +463,7 @@ org.springframework.boot:spring-boot-starter-jetty:2.7.13 (1 constraints: f30a39 org.springframework.boot:spring-boot-starter-json:2.7.13 (1 constraints: d914679e) org.springframework.boot:spring-boot-starter-logging:2.7.13 (1 constraints: 6e138c46) org.springframework.boot:spring-boot-starter-web:2.7.13 (1 constraints: f30a39d6) -org.testcontainers:testcontainers:1.20.4 (1 constraints: 3905313b) +org.testcontainers:testcontainers:2.0.5 (1 constraints: 0905fa35) org.yaml:snakeyaml:1.30 (1 constraints: 0713d91f) software.amazon.awssdk:url-connection-client:2.42.37 (2 constraints: 461f04f7) software.amazon.ion:ion-java:1.0.2 (1 constraints: 720db831) diff --git a/versions.props b/versions.props index 9696656c75ea..320f289a69b2 100644 --- a/versions.props +++ b/versions.props @@ -83,6 +83,6 @@ org.osgi:osgi.annotation=8.1.0 org.quicktheories:quicktheories=0.26 org.semver4j:semver4j=5.8.0 org.slf4j:*=2.0.17 -org.testcontainers:testcontainers*=1.20.4 +org.testcontainers:testcontainers*=2.0.5 org.xerial.snappy:snappy-java=1.1.10.8 software.amazon.awssdk:*=2.42.37 From c6e3a439cd2d747a01349c83744a260137a123c7 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Fri, 1 May 2026 02:29:45 +0000 Subject: [PATCH 04/45] Update changelog entry --- .../PR#4386-update-org-testcontainers-testcontainers.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changelog/unreleased/PR#4386-update-org-testcontainers-testcontainers.yml diff --git a/changelog/unreleased/PR#4386-update-org-testcontainers-testcontainers.yml b/changelog/unreleased/PR#4386-update-org-testcontainers-testcontainers.yml new file mode 100644 index 000000000000..8b0917c6b743 --- /dev/null +++ b/changelog/unreleased/PR#4386-update-org-testcontainers-testcontainers.yml @@ -0,0 +1,7 @@ +title: Update org.testcontainers:testcontainers to v2 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4386 + url: https://github.com/apache/solr/pull/4386 From 19cae9dcd1703dfe87b55c77367c6ec855f04dec Mon Sep 17 00:00:00 2001 From: SolrBot Date: Sun, 3 May 2026 02:10:34 +0000 Subject: [PATCH 05/45] Update dependency com.github.ben-manes.caffeine:caffeine to v3.2.4 (branch_9x) --- solr/licenses/caffeine-3.2.3.jar.sha1 | 1 - solr/licenses/caffeine-3.2.4.jar.sha1 | 1 + versions.lock | 4 ++-- versions.props | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 solr/licenses/caffeine-3.2.3.jar.sha1 create mode 100644 solr/licenses/caffeine-3.2.4.jar.sha1 diff --git a/solr/licenses/caffeine-3.2.3.jar.sha1 b/solr/licenses/caffeine-3.2.3.jar.sha1 deleted file mode 100644 index 29f1c69cf626..000000000000 --- a/solr/licenses/caffeine-3.2.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c097f0f6d21a0e6db88ea55836e26419b30dfe19 diff --git a/solr/licenses/caffeine-3.2.4.jar.sha1 b/solr/licenses/caffeine-3.2.4.jar.sha1 new file mode 100644 index 000000000000..d35655611e70 --- /dev/null +++ b/solr/licenses/caffeine-3.2.4.jar.sha1 @@ -0,0 +1 @@ +c63b303adf59c733d2a96125ad6670e938a2c15d diff --git a/versions.lock b/versions.lock index 659611f7d411..d9d0921e4d3f 100644 --- a/versions.lock +++ b/versions.lock @@ -15,7 +15,7 @@ com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.0 (6 constraints: e358 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.18.0 (2 constraints: ab241ae1) com.fasterxml.jackson.module:jackson-module-scala_2.13:2.18.0 (2 constraints: ec19ff7a) com.fasterxml.woodstox:woodstox-core:7.0.0 (1 constraints: 3b174526) -com.github.ben-manes.caffeine:caffeine:3.2.3 (2 constraints: 0d121317) +com.github.ben-manes.caffeine:caffeine:3.2.4 (2 constraints: 0e123b17) com.github.luben:zstd-jni:1.5.6-4 (1 constraints: 600d6236) com.github.spotbugs:spotbugs-annotations:4.8.6 (1 constraints: 14051d36) com.github.stephenc.jcip:jcip-annotations:1.0-1 (3 constraints: c71d2c87) @@ -41,7 +41,7 @@ com.google.cloud:google-cloud-core-grpc:2.40.0 (1 constraints: 1a1001a6) com.google.cloud:google-cloud-core-http:2.40.0 (1 constraints: 1a1001a6) com.google.cloud:google-cloud-storage:2.40.1 (2 constraints: cf1cc626) com.google.code.gson:gson:2.12.1 (7 constraints: f6622515) -com.google.errorprone:error_prone_annotations:2.31.0 (16 constraints: 87cf47ce) +com.google.errorprone:error_prone_annotations:2.31.0 (16 constraints: 8dcf2bdb) com.google.guava:failureaccess:1.0.3 (2 constraints: fc19c037) com.google.guava:guava:33.6.0-jre (24 constraints: 4d653d82) com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 4b35b0a0) diff --git a/versions.props b/versions.props index 9696656c75ea..b09ffb6ee7eb 100644 --- a/versions.props +++ b/versions.props @@ -7,7 +7,7 @@ com.carrotsearch.randomizedtesting:*=2.8.4 com.carrotsearch:hppc=0.10.0 com.cybozu.labs:langdetect=1.1-20120112 com.fasterxml.jackson:jackson-bom=2.18.0 -com.github.ben-manes.caffeine:caffeine=3.2.3 +com.github.ben-manes.caffeine:caffeine=3.2.4 com.github.spotbugs:*=4.8.6 com.github.stephenc.jcip:jcip-annotations=1.0-1 com.google.cloud:google-cloud-bom=0.224.0 From eeffaf3165eaa5d86c67da193600c7979c7735f8 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Sun, 3 May 2026 02:10:55 +0000 Subject: [PATCH 06/45] Update changelog entry --- ...#4390-update-com-github-ben-manes-caffeine-caffeine.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changelog/unreleased/PR#4390-update-com-github-ben-manes-caffeine-caffeine.yml diff --git a/changelog/unreleased/PR#4390-update-com-github-ben-manes-caffeine-caffeine.yml b/changelog/unreleased/PR#4390-update-com-github-ben-manes-caffeine-caffeine.yml new file mode 100644 index 000000000000..0e1fba21a681 --- /dev/null +++ b/changelog/unreleased/PR#4390-update-com-github-ben-manes-caffeine-caffeine.yml @@ -0,0 +1,7 @@ +title: Update com.github.ben-manes.caffeine:caffeine to v3.2.4 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4390 + url: https://github.com/apache/solr/pull/4390 From 5e977ac8e09679910d4506207eaf8af37f9e949a Mon Sep 17 00:00:00 2001 From: SolrBot Date: Sun, 17 May 2026 18:57:48 +0000 Subject: [PATCH 07/45] Update org.slf4j:* to v2.0.18 (branch_9x) --- solr/licenses/jcl-over-slf4j-2.0.17.jar.sha1 | 1 - solr/licenses/jcl-over-slf4j-2.0.18.jar.sha1 | 1 + solr/licenses/jul-to-slf4j-2.0.17.jar.sha1 | 1 - solr/licenses/jul-to-slf4j-2.0.18.jar.sha1 | 1 + solr/licenses/slf4j-api-2.0.17.jar.sha1 | 1 - solr/licenses/slf4j-api-2.0.18.jar.sha1 | 1 + versions.lock | 6 +++--- versions.props | 2 +- 8 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 solr/licenses/jcl-over-slf4j-2.0.17.jar.sha1 create mode 100644 solr/licenses/jcl-over-slf4j-2.0.18.jar.sha1 delete mode 100644 solr/licenses/jul-to-slf4j-2.0.17.jar.sha1 create mode 100644 solr/licenses/jul-to-slf4j-2.0.18.jar.sha1 delete mode 100644 solr/licenses/slf4j-api-2.0.17.jar.sha1 create mode 100644 solr/licenses/slf4j-api-2.0.18.jar.sha1 diff --git a/solr/licenses/jcl-over-slf4j-2.0.17.jar.sha1 b/solr/licenses/jcl-over-slf4j-2.0.17.jar.sha1 deleted file mode 100644 index b1b26abe52c8..000000000000 --- a/solr/licenses/jcl-over-slf4j-2.0.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -76ea503eb688f06556a9ba69995d7eab63e34531 diff --git a/solr/licenses/jcl-over-slf4j-2.0.18.jar.sha1 b/solr/licenses/jcl-over-slf4j-2.0.18.jar.sha1 new file mode 100644 index 000000000000..8479b885c85f --- /dev/null +++ b/solr/licenses/jcl-over-slf4j-2.0.18.jar.sha1 @@ -0,0 +1 @@ +fb36c10c70e27bb427bb3cec86ac30bb83f667c7 diff --git a/solr/licenses/jul-to-slf4j-2.0.17.jar.sha1 b/solr/licenses/jul-to-slf4j-2.0.17.jar.sha1 deleted file mode 100644 index ae39b76a9f11..000000000000 --- a/solr/licenses/jul-to-slf4j-2.0.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -524cb6ccc2b68a57604750e1ab8b13b5a786a6aa diff --git a/solr/licenses/jul-to-slf4j-2.0.18.jar.sha1 b/solr/licenses/jul-to-slf4j-2.0.18.jar.sha1 new file mode 100644 index 000000000000..8d566d495679 --- /dev/null +++ b/solr/licenses/jul-to-slf4j-2.0.18.jar.sha1 @@ -0,0 +1 @@ +79739c98001d5c9d078d087d5a348ec9e474ec8f diff --git a/solr/licenses/slf4j-api-2.0.17.jar.sha1 b/solr/licenses/slf4j-api-2.0.17.jar.sha1 deleted file mode 100644 index ea5df72c49f0..000000000000 --- a/solr/licenses/slf4j-api-2.0.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d9e58ac9c7779ba3bf8142aff6c830617a7fe60f diff --git a/solr/licenses/slf4j-api-2.0.18.jar.sha1 b/solr/licenses/slf4j-api-2.0.18.jar.sha1 new file mode 100644 index 000000000000..eff93970d557 --- /dev/null +++ b/solr/licenses/slf4j-api-2.0.18.jar.sha1 @@ -0,0 +1 @@ +78a9e7a37cd6360e0b818e86341b24123d28d4df diff --git a/versions.lock b/versions.lock index 659611f7d411..08de42cd6f48 100644 --- a/versions.lock +++ b/versions.lock @@ -340,9 +340,9 @@ org.scala-lang:scala-reflect:2.13.15 (2 constraints: c11d80f4) org.scala-lang.modules:scala-collection-compat_2.13:2.10.0 (1 constraints: 2a0b2af3) org.scala-lang.modules:scala-java8-compat_2.13:1.0.2 (1 constraints: fa0af8e7) org.semver4j:semver4j:5.8.0 (1 constraints: 0f051c36) -org.slf4j:jcl-over-slf4j:2.0.17 (1 constraints: 3c05323b) -org.slf4j:jul-to-slf4j:2.0.17 (2 constraints: c11bd27e) -org.slf4j:slf4j-api:2.0.17 (68 constraints: 6cd32dae) +org.slf4j:jcl-over-slf4j:2.0.18 (1 constraints: 3d05333b) +org.slf4j:jul-to-slf4j:2.0.18 (2 constraints: c21b117f) +org.slf4j:slf4j-api:2.0.18 (68 constraints: 6fd3cbba) org.threeten:threetenbp:1.6.9 (4 constraints: 2833ea68) org.xerial.snappy:snappy-java:1.1.10.8 (5 constraints: c146fa38) software.amazon.awssdk:annotations:2.42.37 (30 constraints: 48cb1be0) diff --git a/versions.props b/versions.props index 9696656c75ea..a2eebb2c619b 100644 --- a/versions.props +++ b/versions.props @@ -82,7 +82,7 @@ org.openjdk.jmh:*=1.37 org.osgi:osgi.annotation=8.1.0 org.quicktheories:quicktheories=0.26 org.semver4j:semver4j=5.8.0 -org.slf4j:*=2.0.17 +org.slf4j:*=2.0.18 org.testcontainers:testcontainers*=1.20.4 org.xerial.snappy:snappy-java=1.1.10.8 software.amazon.awssdk:*=2.42.37 From bacc05feb06d965b15cb9596671d8078884ea81a Mon Sep 17 00:00:00 2001 From: SolrBot Date: Sun, 17 May 2026 18:58:22 +0000 Subject: [PATCH 08/45] Update changelog entry --- .../PR#4438-update-org-slf4j-to-v2-0-18-branch-9x.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changelog/unreleased/PR#4438-update-org-slf4j-to-v2-0-18-branch-9x.yml diff --git a/changelog/unreleased/PR#4438-update-org-slf4j-to-v2-0-18-branch-9x.yml b/changelog/unreleased/PR#4438-update-org-slf4j-to-v2-0-18-branch-9x.yml new file mode 100644 index 000000000000..37677b997270 --- /dev/null +++ b/changelog/unreleased/PR#4438-update-org-slf4j-to-v2-0-18-branch-9x.yml @@ -0,0 +1,7 @@ +title: Update org.slf4j:* to v2.0.18 (branch_9x) +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4438 + url: https://github.com/apache/solr/pull/4438 From db4aa763354f101071d32d9dbd3b64f6dce21961 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Fri, 22 May 2026 19:28:15 +0000 Subject: [PATCH 09/45] Update dependency org.immutables:value-annotations to v2.12.2 (branch_9x) --- solr/licenses/value-annotations-2.12.1.jar.sha1 | 1 - solr/licenses/value-annotations-2.12.2.jar.sha1 | 1 + versions.lock | 2 +- versions.props | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 solr/licenses/value-annotations-2.12.1.jar.sha1 create mode 100644 solr/licenses/value-annotations-2.12.2.jar.sha1 diff --git a/solr/licenses/value-annotations-2.12.1.jar.sha1 b/solr/licenses/value-annotations-2.12.1.jar.sha1 deleted file mode 100644 index b4acd2385313..000000000000 --- a/solr/licenses/value-annotations-2.12.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d7c9a036710819e4825735ee2d4901ca567109ab diff --git a/solr/licenses/value-annotations-2.12.2.jar.sha1 b/solr/licenses/value-annotations-2.12.2.jar.sha1 new file mode 100644 index 000000000000..62eb279d0745 --- /dev/null +++ b/solr/licenses/value-annotations-2.12.2.jar.sha1 @@ -0,0 +1 @@ +9353d76b130944ca2879b36f81ae3a46ebf0a488 diff --git a/versions.lock b/versions.lock index 659611f7d411..febf864acd3f 100644 --- a/versions.lock +++ b/versions.lock @@ -311,7 +311,7 @@ org.glassfish.jersey.inject:jersey-hk2:3.1.11 (1 constraints: 3805363b) org.glassfish.jersey.media:jersey-media-json-jackson:3.1.11 (1 constraints: 3805363b) org.hamcrest:hamcrest:3.0 (3 constraints: 74208125) org.hamcrest:hamcrest-core:3.0 (1 constraints: cc05fe3f) -org.immutables:value-annotations:2.12.1 (1 constraints: 3805363b) +org.immutables:value-annotations:2.12.2 (1 constraints: 3905373b) org.javassist:javassist:3.30.2-GA (1 constraints: 2811fff0) org.jctools:jctools-core:4.0.6 (1 constraints: 0c050536) org.jetbrains:annotations:17.0.0 (2 constraints: 371c92e0) diff --git a/versions.props b/versions.props index 9696656c75ea..883c9cb8a4b6 100644 --- a/versions.props +++ b/versions.props @@ -75,7 +75,7 @@ org.glassfish.jersey*:*=3.1.11 org.glassfish.jersey.containers:jersey-container-jetty-http=2.39.1 org.hamcrest:*=3.0 org.hsqldb:hsqldb=2.7.4 -org.immutables:value-annotations=2.12.1 +org.immutables:value-annotations=2.12.2 org.jctools:jctools-core=4.0.6 org.mockito:mockito*=5.23.0 org.openjdk.jmh:*=1.37 From fe86f92c7d4790c677df5a9a3806789c1296ba6b Mon Sep 17 00:00:00 2001 From: SolrBot Date: Fri, 22 May 2026 19:28:53 +0000 Subject: [PATCH 10/45] Update changelog entry --- .../PR#4456-update-org-immutables-value-annotations.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changelog/unreleased/PR#4456-update-org-immutables-value-annotations.yml diff --git a/changelog/unreleased/PR#4456-update-org-immutables-value-annotations.yml b/changelog/unreleased/PR#4456-update-org-immutables-value-annotations.yml new file mode 100644 index 000000000000..d90a1e3c4232 --- /dev/null +++ b/changelog/unreleased/PR#4456-update-org-immutables-value-annotations.yml @@ -0,0 +1,7 @@ +title: Update org.immutables:value-annotations to v2.12.2 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4456 + url: https://github.com/apache/solr/pull/4456 From b5b95e4bd03b6293d3ee9cdeeea1662e8e4abd50 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Tue, 26 May 2026 14:43:26 +0000 Subject: [PATCH 11/45] Update org.apache.tika:* to v3.3.1 (branch_9x) --- solr/licenses/commons-io-2.21.0.jar.sha1 | 1 - solr/licenses/commons-io-2.22.0.jar.sha1 | 1 + solr/licenses/jcl-over-slf4j-2.0.17.jar.sha1 | 1 - solr/licenses/jcl-over-slf4j-2.0.18.jar.sha1 | 1 + solr/licenses/jul-to-slf4j-2.0.17.jar.sha1 | 1 - solr/licenses/jul-to-slf4j-2.0.18.jar.sha1 | 1 + solr/licenses/slf4j-api-2.0.17.jar.sha1 | 1 - solr/licenses/slf4j-api-2.0.18.jar.sha1 | 1 + solr/licenses/tika-core-3.3.0.jar.sha1 | 1 - solr/licenses/tika-core-3.3.1.jar.sha1 | 1 + solr/licenses/tika-langdetect-tika-3.3.0.jar.sha1 | 1 - solr/licenses/tika-langdetect-tika-3.3.1.jar.sha1 | 1 + versions.lock | 12 ++++++------ versions.props | 2 +- 14 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 solr/licenses/commons-io-2.21.0.jar.sha1 create mode 100644 solr/licenses/commons-io-2.22.0.jar.sha1 delete mode 100644 solr/licenses/jcl-over-slf4j-2.0.17.jar.sha1 create mode 100644 solr/licenses/jcl-over-slf4j-2.0.18.jar.sha1 delete mode 100644 solr/licenses/jul-to-slf4j-2.0.17.jar.sha1 create mode 100644 solr/licenses/jul-to-slf4j-2.0.18.jar.sha1 delete mode 100644 solr/licenses/slf4j-api-2.0.17.jar.sha1 create mode 100644 solr/licenses/slf4j-api-2.0.18.jar.sha1 delete mode 100644 solr/licenses/tika-core-3.3.0.jar.sha1 create mode 100644 solr/licenses/tika-core-3.3.1.jar.sha1 delete mode 100644 solr/licenses/tika-langdetect-tika-3.3.0.jar.sha1 create mode 100644 solr/licenses/tika-langdetect-tika-3.3.1.jar.sha1 diff --git a/solr/licenses/commons-io-2.21.0.jar.sha1 b/solr/licenses/commons-io-2.21.0.jar.sha1 deleted file mode 100644 index 00879ab2ee80..000000000000 --- a/solr/licenses/commons-io-2.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -52a6f68fe5afe335cde95461dd5c3412f04996f7 diff --git a/solr/licenses/commons-io-2.22.0.jar.sha1 b/solr/licenses/commons-io-2.22.0.jar.sha1 new file mode 100644 index 000000000000..2f8655c58bda --- /dev/null +++ b/solr/licenses/commons-io-2.22.0.jar.sha1 @@ -0,0 +1 @@ +5b1e18bc0ad651ed878029d83f88d9c8189fd51e diff --git a/solr/licenses/jcl-over-slf4j-2.0.17.jar.sha1 b/solr/licenses/jcl-over-slf4j-2.0.17.jar.sha1 deleted file mode 100644 index b1b26abe52c8..000000000000 --- a/solr/licenses/jcl-over-slf4j-2.0.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -76ea503eb688f06556a9ba69995d7eab63e34531 diff --git a/solr/licenses/jcl-over-slf4j-2.0.18.jar.sha1 b/solr/licenses/jcl-over-slf4j-2.0.18.jar.sha1 new file mode 100644 index 000000000000..8479b885c85f --- /dev/null +++ b/solr/licenses/jcl-over-slf4j-2.0.18.jar.sha1 @@ -0,0 +1 @@ +fb36c10c70e27bb427bb3cec86ac30bb83f667c7 diff --git a/solr/licenses/jul-to-slf4j-2.0.17.jar.sha1 b/solr/licenses/jul-to-slf4j-2.0.17.jar.sha1 deleted file mode 100644 index ae39b76a9f11..000000000000 --- a/solr/licenses/jul-to-slf4j-2.0.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -524cb6ccc2b68a57604750e1ab8b13b5a786a6aa diff --git a/solr/licenses/jul-to-slf4j-2.0.18.jar.sha1 b/solr/licenses/jul-to-slf4j-2.0.18.jar.sha1 new file mode 100644 index 000000000000..8d566d495679 --- /dev/null +++ b/solr/licenses/jul-to-slf4j-2.0.18.jar.sha1 @@ -0,0 +1 @@ +79739c98001d5c9d078d087d5a348ec9e474ec8f diff --git a/solr/licenses/slf4j-api-2.0.17.jar.sha1 b/solr/licenses/slf4j-api-2.0.17.jar.sha1 deleted file mode 100644 index ea5df72c49f0..000000000000 --- a/solr/licenses/slf4j-api-2.0.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d9e58ac9c7779ba3bf8142aff6c830617a7fe60f diff --git a/solr/licenses/slf4j-api-2.0.18.jar.sha1 b/solr/licenses/slf4j-api-2.0.18.jar.sha1 new file mode 100644 index 000000000000..eff93970d557 --- /dev/null +++ b/solr/licenses/slf4j-api-2.0.18.jar.sha1 @@ -0,0 +1 @@ +78a9e7a37cd6360e0b818e86341b24123d28d4df diff --git a/solr/licenses/tika-core-3.3.0.jar.sha1 b/solr/licenses/tika-core-3.3.0.jar.sha1 deleted file mode 100644 index be03fe63c64c..000000000000 --- a/solr/licenses/tika-core-3.3.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1b733d4c478e583cb4c5e75aca9e5485d04ea830 diff --git a/solr/licenses/tika-core-3.3.1.jar.sha1 b/solr/licenses/tika-core-3.3.1.jar.sha1 new file mode 100644 index 000000000000..04665fed0998 --- /dev/null +++ b/solr/licenses/tika-core-3.3.1.jar.sha1 @@ -0,0 +1 @@ +075c89f5a662324e7186da5e315ea9966acb7e8a diff --git a/solr/licenses/tika-langdetect-tika-3.3.0.jar.sha1 b/solr/licenses/tika-langdetect-tika-3.3.0.jar.sha1 deleted file mode 100644 index c829bd206e6d..000000000000 --- a/solr/licenses/tika-langdetect-tika-3.3.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fde13abacdaf638e03cdae248ed2a9f563c6ac32 diff --git a/solr/licenses/tika-langdetect-tika-3.3.1.jar.sha1 b/solr/licenses/tika-langdetect-tika-3.3.1.jar.sha1 new file mode 100644 index 000000000000..702c54e04283 --- /dev/null +++ b/solr/licenses/tika-langdetect-tika-3.3.1.jar.sha1 @@ -0,0 +1 @@ +fd3b3449892accb40920e9d0683f602f9d1cd370 diff --git a/versions.lock b/versions.lock index 659611f7d411..f6168a67a67e 100644 --- a/versions.lock +++ b/versions.lock @@ -79,7 +79,7 @@ commons-cli:commons-cli:1.11.0 (2 constraints: d20f5dbe) commons-codec:commons-codec:1.21.0 (9 constraints: 587d8a8a) commons-collections:commons-collections:3.2.2 (3 constraints: 77242dac) commons-digester:commons-digester:2.1 (1 constraints: 550fb664) -commons-io:commons-io:2.21.0 (10 constraints: ab74caac) +commons-io:commons-io:2.22.0 (10 constraints: ac74f5ac) commons-validator:commons-validator:1.10.1 (1 constraints: 2a0b25f3) dev.ai4j:openai4j:0.22.0 (1 constraints: cf0ee778) dev.langchain4j:langchain4j-cohere:0.35.0 (1 constraints: 3a053a3b) @@ -257,8 +257,8 @@ org.apache.poi:poi:5.5.1 (2 constraints: db0f56a8) org.apache.poi:poi-ooxml:5.5.1 (1 constraints: 0d051436) org.apache.poi:poi-ooxml-lite:5.5.1 (1 constraints: cf0aa7cb) org.apache.thrift:libthrift:0.15.0 (1 constraints: 900d0334) -org.apache.tika:tika-core:3.3.0 (1 constraints: 08050336) -org.apache.tika:tika-langdetect-tika:3.3.0 (1 constraints: 08050336) +org.apache.tika:tika-core:3.3.1 (1 constraints: 09050436) +org.apache.tika:tika-langdetect-tika:3.3.1 (1 constraints: 09050436) org.apache.tomcat:annotations-api:6.0.53 (1 constraints: 40054e3b) org.apache.xmlbeans:xmlbeans:5.3.0 (2 constraints: 72173c75) org.apache.zookeeper:zookeeper:3.9.5 (3 constraints: aa1e950b) @@ -340,9 +340,9 @@ org.scala-lang:scala-reflect:2.13.15 (2 constraints: c11d80f4) org.scala-lang.modules:scala-collection-compat_2.13:2.10.0 (1 constraints: 2a0b2af3) org.scala-lang.modules:scala-java8-compat_2.13:1.0.2 (1 constraints: fa0af8e7) org.semver4j:semver4j:5.8.0 (1 constraints: 0f051c36) -org.slf4j:jcl-over-slf4j:2.0.17 (1 constraints: 3c05323b) -org.slf4j:jul-to-slf4j:2.0.17 (2 constraints: c11bd27e) -org.slf4j:slf4j-api:2.0.17 (68 constraints: 6cd32dae) +org.slf4j:jcl-over-slf4j:2.0.18 (1 constraints: 3c05323b) +org.slf4j:jul-to-slf4j:2.0.18 (2 constraints: c11bd27e) +org.slf4j:slf4j-api:2.0.18 (68 constraints: 6fd374b4) org.threeten:threetenbp:1.6.9 (4 constraints: 2833ea68) org.xerial.snappy:snappy-java:1.1.10.8 (5 constraints: c146fa38) software.amazon.awssdk:annotations:2.42.37 (30 constraints: 48cb1be0) diff --git a/versions.props b/versions.props index 9696656c75ea..ad64a0d536bc 100644 --- a/versions.props +++ b/versions.props @@ -59,7 +59,7 @@ org.apache.kerby:*=2.1.0 org.apache.logging.log4j:*=2.25.4 org.apache.lucene:*=9.12.3 org.apache.poi:*=5.5.1 -org.apache.tika:*=3.3.0 +org.apache.tika:*=3.3.1 org.apache.tomcat:annotations-api=6.0.53 org.apache.zookeeper:*=3.9.5 org.bitbucket.b_c:jose4j=0.9.6 From 47dc85ffd76612ce0f9200d8f701d67ac8a159bb Mon Sep 17 00:00:00 2001 From: SolrBot Date: Tue, 26 May 2026 14:44:12 +0000 Subject: [PATCH 12/45] Update changelog entry --- .../PR#4470-update-org-apache-tika-to-v3-3-1-branch-9x.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changelog/unreleased/PR#4470-update-org-apache-tika-to-v3-3-1-branch-9x.yml diff --git a/changelog/unreleased/PR#4470-update-org-apache-tika-to-v3-3-1-branch-9x.yml b/changelog/unreleased/PR#4470-update-org-apache-tika-to-v3-3-1-branch-9x.yml new file mode 100644 index 000000000000..c25964632349 --- /dev/null +++ b/changelog/unreleased/PR#4470-update-org-apache-tika-to-v3-3-1-branch-9x.yml @@ -0,0 +1,7 @@ +title: Update org.apache.tika:* to v3.3.1 (branch_9x) +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4470 + url: https://github.com/apache/solr/pull/4470 From 13c448ae7bee4c90750ec1a839be31bb68e2ff25 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Sun, 31 May 2026 02:17:47 +0000 Subject: [PATCH 13/45] Update io.dropwizard.metrics:* to v4.2.39 (branch_9x) --- solr/licenses/jcl-over-slf4j-2.0.17.jar.sha1 | 1 - solr/licenses/jcl-over-slf4j-2.0.18.jar.sha1 | 1 + solr/licenses/jul-to-slf4j-2.0.17.jar.sha1 | 1 - solr/licenses/jul-to-slf4j-2.0.18.jar.sha1 | 1 + .../metrics-annotation-4.2.38.jar.sha1 | 1 - .../metrics-annotation-4.2.39.jar.sha1 | 1 + solr/licenses/metrics-core-4.2.38.jar.sha1 | 1 - solr/licenses/metrics-core-4.2.39.jar.sha1 | 1 + .../licenses/metrics-graphite-4.2.38.jar.sha1 | 1 - .../licenses/metrics-graphite-4.2.39.jar.sha1 | 1 + .../metrics-healthchecks-4.2.38.jar.sha1 | 1 - .../metrics-healthchecks-4.2.39.jar.sha1 | 1 + solr/licenses/metrics-jetty10-4.2.38.jar.sha1 | 1 - solr/licenses/metrics-jetty10-4.2.39.jar.sha1 | 1 + solr/licenses/metrics-jmx-4.2.38.jar.sha1 | 1 - solr/licenses/metrics-jmx-4.2.39.jar.sha1 | 1 + solr/licenses/metrics-json-4.2.38.jar.sha1 | 1 - solr/licenses/metrics-json-4.2.39.jar.sha1 | 1 + solr/licenses/metrics-jvm-4.2.38.jar.sha1 | 1 - solr/licenses/metrics-jvm-4.2.39.jar.sha1 | 1 + .../licenses/metrics-servlets-4.2.38.jar.sha1 | 1 - .../licenses/metrics-servlets-4.2.39.jar.sha1 | 1 + solr/licenses/slf4j-api-2.0.17.jar.sha1 | 1 - solr/licenses/slf4j-api-2.0.18.jar.sha1 | 1 + versions.lock | 24 +++++++++---------- versions.props | 2 +- 26 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 solr/licenses/jcl-over-slf4j-2.0.17.jar.sha1 create mode 100644 solr/licenses/jcl-over-slf4j-2.0.18.jar.sha1 delete mode 100644 solr/licenses/jul-to-slf4j-2.0.17.jar.sha1 create mode 100644 solr/licenses/jul-to-slf4j-2.0.18.jar.sha1 delete mode 100644 solr/licenses/metrics-annotation-4.2.38.jar.sha1 create mode 100644 solr/licenses/metrics-annotation-4.2.39.jar.sha1 delete mode 100644 solr/licenses/metrics-core-4.2.38.jar.sha1 create mode 100644 solr/licenses/metrics-core-4.2.39.jar.sha1 delete mode 100644 solr/licenses/metrics-graphite-4.2.38.jar.sha1 create mode 100644 solr/licenses/metrics-graphite-4.2.39.jar.sha1 delete mode 100644 solr/licenses/metrics-healthchecks-4.2.38.jar.sha1 create mode 100644 solr/licenses/metrics-healthchecks-4.2.39.jar.sha1 delete mode 100644 solr/licenses/metrics-jetty10-4.2.38.jar.sha1 create mode 100644 solr/licenses/metrics-jetty10-4.2.39.jar.sha1 delete mode 100644 solr/licenses/metrics-jmx-4.2.38.jar.sha1 create mode 100644 solr/licenses/metrics-jmx-4.2.39.jar.sha1 delete mode 100644 solr/licenses/metrics-json-4.2.38.jar.sha1 create mode 100644 solr/licenses/metrics-json-4.2.39.jar.sha1 delete mode 100644 solr/licenses/metrics-jvm-4.2.38.jar.sha1 create mode 100644 solr/licenses/metrics-jvm-4.2.39.jar.sha1 delete mode 100644 solr/licenses/metrics-servlets-4.2.38.jar.sha1 create mode 100644 solr/licenses/metrics-servlets-4.2.39.jar.sha1 delete mode 100644 solr/licenses/slf4j-api-2.0.17.jar.sha1 create mode 100644 solr/licenses/slf4j-api-2.0.18.jar.sha1 diff --git a/solr/licenses/jcl-over-slf4j-2.0.17.jar.sha1 b/solr/licenses/jcl-over-slf4j-2.0.17.jar.sha1 deleted file mode 100644 index b1b26abe52c8..000000000000 --- a/solr/licenses/jcl-over-slf4j-2.0.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -76ea503eb688f06556a9ba69995d7eab63e34531 diff --git a/solr/licenses/jcl-over-slf4j-2.0.18.jar.sha1 b/solr/licenses/jcl-over-slf4j-2.0.18.jar.sha1 new file mode 100644 index 000000000000..8479b885c85f --- /dev/null +++ b/solr/licenses/jcl-over-slf4j-2.0.18.jar.sha1 @@ -0,0 +1 @@ +fb36c10c70e27bb427bb3cec86ac30bb83f667c7 diff --git a/solr/licenses/jul-to-slf4j-2.0.17.jar.sha1 b/solr/licenses/jul-to-slf4j-2.0.17.jar.sha1 deleted file mode 100644 index ae39b76a9f11..000000000000 --- a/solr/licenses/jul-to-slf4j-2.0.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -524cb6ccc2b68a57604750e1ab8b13b5a786a6aa diff --git a/solr/licenses/jul-to-slf4j-2.0.18.jar.sha1 b/solr/licenses/jul-to-slf4j-2.0.18.jar.sha1 new file mode 100644 index 000000000000..8d566d495679 --- /dev/null +++ b/solr/licenses/jul-to-slf4j-2.0.18.jar.sha1 @@ -0,0 +1 @@ +79739c98001d5c9d078d087d5a348ec9e474ec8f diff --git a/solr/licenses/metrics-annotation-4.2.38.jar.sha1 b/solr/licenses/metrics-annotation-4.2.38.jar.sha1 deleted file mode 100644 index a909c584d5bf..000000000000 --- a/solr/licenses/metrics-annotation-4.2.38.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d20d42d846dfadffb1e0695a6f2559f5290cd4ce diff --git a/solr/licenses/metrics-annotation-4.2.39.jar.sha1 b/solr/licenses/metrics-annotation-4.2.39.jar.sha1 new file mode 100644 index 000000000000..d05d4b485267 --- /dev/null +++ b/solr/licenses/metrics-annotation-4.2.39.jar.sha1 @@ -0,0 +1 @@ +f6fcf72f2f5797608a098fa49c04e5d5189227ee diff --git a/solr/licenses/metrics-core-4.2.38.jar.sha1 b/solr/licenses/metrics-core-4.2.38.jar.sha1 deleted file mode 100644 index c3ef8e0a5ad1..000000000000 --- a/solr/licenses/metrics-core-4.2.38.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4b69739b1e6a3c988695d600a908d82c64283605 diff --git a/solr/licenses/metrics-core-4.2.39.jar.sha1 b/solr/licenses/metrics-core-4.2.39.jar.sha1 new file mode 100644 index 000000000000..b8bd3af3f4f3 --- /dev/null +++ b/solr/licenses/metrics-core-4.2.39.jar.sha1 @@ -0,0 +1 @@ +e14f636f65b1d80053e5cd16066b0e33a0384f0e diff --git a/solr/licenses/metrics-graphite-4.2.38.jar.sha1 b/solr/licenses/metrics-graphite-4.2.38.jar.sha1 deleted file mode 100644 index 3677574e2673..000000000000 --- a/solr/licenses/metrics-graphite-4.2.38.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -498486636fd438dab608b43061181b262799bdc0 diff --git a/solr/licenses/metrics-graphite-4.2.39.jar.sha1 b/solr/licenses/metrics-graphite-4.2.39.jar.sha1 new file mode 100644 index 000000000000..beeb2383dbb4 --- /dev/null +++ b/solr/licenses/metrics-graphite-4.2.39.jar.sha1 @@ -0,0 +1 @@ +123f59805612932383d7a860ccbd8241fea8230e diff --git a/solr/licenses/metrics-healthchecks-4.2.38.jar.sha1 b/solr/licenses/metrics-healthchecks-4.2.38.jar.sha1 deleted file mode 100644 index 13864ecec792..000000000000 --- a/solr/licenses/metrics-healthchecks-4.2.38.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -002379bb2ec8c382b9ae06da913e0424667e8226 diff --git a/solr/licenses/metrics-healthchecks-4.2.39.jar.sha1 b/solr/licenses/metrics-healthchecks-4.2.39.jar.sha1 new file mode 100644 index 000000000000..86d6091ead97 --- /dev/null +++ b/solr/licenses/metrics-healthchecks-4.2.39.jar.sha1 @@ -0,0 +1 @@ +7d3e8469ef9e7cf530e8f85f250968927dedaf2d diff --git a/solr/licenses/metrics-jetty10-4.2.38.jar.sha1 b/solr/licenses/metrics-jetty10-4.2.38.jar.sha1 deleted file mode 100644 index e73ed91d0be8..000000000000 --- a/solr/licenses/metrics-jetty10-4.2.38.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -215f98a7d645a9e95e3310d59bb32c98c928c29d diff --git a/solr/licenses/metrics-jetty10-4.2.39.jar.sha1 b/solr/licenses/metrics-jetty10-4.2.39.jar.sha1 new file mode 100644 index 000000000000..2bef6323a15d --- /dev/null +++ b/solr/licenses/metrics-jetty10-4.2.39.jar.sha1 @@ -0,0 +1 @@ +867972c78b8aef8175c8ee8c40c5e7ef6966b17e diff --git a/solr/licenses/metrics-jmx-4.2.38.jar.sha1 b/solr/licenses/metrics-jmx-4.2.38.jar.sha1 deleted file mode 100644 index 012ac6521247..000000000000 --- a/solr/licenses/metrics-jmx-4.2.38.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -875184ccca0b5acfc896a5bb4e08847cd230d57d diff --git a/solr/licenses/metrics-jmx-4.2.39.jar.sha1 b/solr/licenses/metrics-jmx-4.2.39.jar.sha1 new file mode 100644 index 000000000000..cd1f372baa87 --- /dev/null +++ b/solr/licenses/metrics-jmx-4.2.39.jar.sha1 @@ -0,0 +1 @@ +98366efa0d25a6d8bbcbd5d43ea405a0839eaa59 diff --git a/solr/licenses/metrics-json-4.2.38.jar.sha1 b/solr/licenses/metrics-json-4.2.38.jar.sha1 deleted file mode 100644 index 0737171e1e56..000000000000 --- a/solr/licenses/metrics-json-4.2.38.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -14b4b49cf201fc528076efc50cfdc6629ed6405b diff --git a/solr/licenses/metrics-json-4.2.39.jar.sha1 b/solr/licenses/metrics-json-4.2.39.jar.sha1 new file mode 100644 index 000000000000..aff8ae2e9828 --- /dev/null +++ b/solr/licenses/metrics-json-4.2.39.jar.sha1 @@ -0,0 +1 @@ +b58ad6bce2b032e368656b7c4b1c30846b65f1c3 diff --git a/solr/licenses/metrics-jvm-4.2.38.jar.sha1 b/solr/licenses/metrics-jvm-4.2.38.jar.sha1 deleted file mode 100644 index 1c25831c68de..000000000000 --- a/solr/licenses/metrics-jvm-4.2.38.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fb22c349d1b7e525ae875599516685eb072662e4 diff --git a/solr/licenses/metrics-jvm-4.2.39.jar.sha1 b/solr/licenses/metrics-jvm-4.2.39.jar.sha1 new file mode 100644 index 000000000000..9c634f31d1fa --- /dev/null +++ b/solr/licenses/metrics-jvm-4.2.39.jar.sha1 @@ -0,0 +1 @@ +16e6b4c24b13dda6000beb0781e84f6b252b1139 diff --git a/solr/licenses/metrics-servlets-4.2.38.jar.sha1 b/solr/licenses/metrics-servlets-4.2.38.jar.sha1 deleted file mode 100644 index 6bd5fff76bba..000000000000 --- a/solr/licenses/metrics-servlets-4.2.38.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -36a0aae9aa6084077ffd65a1235e6211a3f1cf41 diff --git a/solr/licenses/metrics-servlets-4.2.39.jar.sha1 b/solr/licenses/metrics-servlets-4.2.39.jar.sha1 new file mode 100644 index 000000000000..e073ed1a2840 --- /dev/null +++ b/solr/licenses/metrics-servlets-4.2.39.jar.sha1 @@ -0,0 +1 @@ +080143015a05c3c4ffc09b9edf6dcf3c0e330a29 diff --git a/solr/licenses/slf4j-api-2.0.17.jar.sha1 b/solr/licenses/slf4j-api-2.0.17.jar.sha1 deleted file mode 100644 index ea5df72c49f0..000000000000 --- a/solr/licenses/slf4j-api-2.0.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d9e58ac9c7779ba3bf8142aff6c830617a7fe60f diff --git a/solr/licenses/slf4j-api-2.0.18.jar.sha1 b/solr/licenses/slf4j-api-2.0.18.jar.sha1 new file mode 100644 index 000000000000..eff93970d557 --- /dev/null +++ b/solr/licenses/slf4j-api-2.0.18.jar.sha1 @@ -0,0 +1 @@ +78a9e7a37cd6360e0b818e86341b24123d28d4df diff --git a/versions.lock b/versions.lock index 659611f7d411..08f78876c396 100644 --- a/versions.lock +++ b/versions.lock @@ -87,15 +87,15 @@ dev.langchain4j:langchain4j-core:0.35.0 (5 constraints: 9543f68f) dev.langchain4j:langchain4j-hugging-face:0.35.0 (1 constraints: 3a053a3b) dev.langchain4j:langchain4j-mistral-ai:0.35.0 (1 constraints: 3a053a3b) dev.langchain4j:langchain4j-open-ai:0.35.0 (1 constraints: 3a053a3b) -io.dropwizard.metrics:metrics-annotation:4.2.38 (1 constraints: 391077b0) -io.dropwizard.metrics:metrics-core:4.2.38 (9 constraints: fb827ef5) -io.dropwizard.metrics:metrics-graphite:4.2.38 (1 constraints: 43054b3b) -io.dropwizard.metrics:metrics-healthchecks:4.2.38 (1 constraints: 201187c9) -io.dropwizard.metrics:metrics-jetty10:4.2.38 (1 constraints: 43054b3b) -io.dropwizard.metrics:metrics-jmx:4.2.38 (1 constraints: 43054b3b) -io.dropwizard.metrics:metrics-json:4.2.38 (1 constraints: 201187c9) -io.dropwizard.metrics:metrics-jvm:4.2.38 (2 constraints: 62165001) -io.dropwizard.metrics:metrics-servlets:4.2.38 (1 constraints: 43054b3b) +io.dropwizard.metrics:metrics-annotation:4.2.39 (1 constraints: 3a1078b0) +io.dropwizard.metrics:metrics-core:4.2.39 (9 constraints: 0383bdfb) +io.dropwizard.metrics:metrics-graphite:4.2.39 (1 constraints: 44054c3b) +io.dropwizard.metrics:metrics-healthchecks:4.2.39 (1 constraints: 211188c9) +io.dropwizard.metrics:metrics-jetty10:4.2.39 (1 constraints: 44054c3b) +io.dropwizard.metrics:metrics-jmx:4.2.39 (1 constraints: 44054c3b) +io.dropwizard.metrics:metrics-json:4.2.39 (1 constraints: 211188c9) +io.dropwizard.metrics:metrics-jvm:4.2.39 (2 constraints: 64168201) +io.dropwizard.metrics:metrics-servlets:4.2.39 (1 constraints: 44054c3b) io.grpc:grpc-alts:1.80.0 (1 constraints: 1f100ba6) io.grpc:grpc-api:1.80.0 (8 constraints: 4d510a82) io.grpc:grpc-auth:1.80.0 (1 constraints: 1f100ba6) @@ -340,9 +340,9 @@ org.scala-lang:scala-reflect:2.13.15 (2 constraints: c11d80f4) org.scala-lang.modules:scala-collection-compat_2.13:2.10.0 (1 constraints: 2a0b2af3) org.scala-lang.modules:scala-java8-compat_2.13:1.0.2 (1 constraints: fa0af8e7) org.semver4j:semver4j:5.8.0 (1 constraints: 0f051c36) -org.slf4j:jcl-over-slf4j:2.0.17 (1 constraints: 3c05323b) -org.slf4j:jul-to-slf4j:2.0.17 (2 constraints: c11bd27e) -org.slf4j:slf4j-api:2.0.17 (68 constraints: 6cd32dae) +org.slf4j:jcl-over-slf4j:2.0.18 (1 constraints: 3c05323b) +org.slf4j:jul-to-slf4j:2.0.18 (2 constraints: c11bd27e) +org.slf4j:slf4j-api:2.0.18 (68 constraints: 6fd3a6b8) org.threeten:threetenbp:1.6.9 (4 constraints: 2833ea68) org.xerial.snappy:snappy-java:1.1.10.8 (5 constraints: c146fa38) software.amazon.awssdk:annotations:2.42.37 (30 constraints: 48cb1be0) diff --git a/versions.props b/versions.props index 9696656c75ea..cc58e9776185 100644 --- a/versions.props +++ b/versions.props @@ -24,7 +24,7 @@ commons-codec:commons-codec=1.21.0 commons-collections:commons-collections=3.2.2 commons-io:commons-io=2.21.0 dev.langchain4j:langchain4j-*=0.35.0 -io.dropwizard.metrics:*=4.2.38 +io.dropwizard.metrics:*=4.2.39 io.grpc:grpc-*=1.80.0 io.jaegertracing:*=1.8.1 io.netty:netty*=4.2.12.Final From 7b4ecc13b7ebe2adc8ceb62b316e8410fe3bd659 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Wed, 3 Jun 2026 16:21:38 +0000 Subject: [PATCH 14/45] Update dependency com.carrotsearch.randomizedtesting:randomizedtesting-runner to v2.9.1 (branch_9x) --- solr/licenses/randomizedtesting-runner-2.8.4.jar.sha1 | 1 - solr/licenses/randomizedtesting-runner-2.9.1.jar.sha1 | 1 + versions.lock | 2 +- versions.props | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 solr/licenses/randomizedtesting-runner-2.8.4.jar.sha1 create mode 100644 solr/licenses/randomizedtesting-runner-2.9.1.jar.sha1 diff --git a/solr/licenses/randomizedtesting-runner-2.8.4.jar.sha1 b/solr/licenses/randomizedtesting-runner-2.8.4.jar.sha1 deleted file mode 100644 index 18dc18189798..000000000000 --- a/solr/licenses/randomizedtesting-runner-2.8.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8a8e4edac434f169adbed4c5078e9619afc9b5fb diff --git a/solr/licenses/randomizedtesting-runner-2.9.1.jar.sha1 b/solr/licenses/randomizedtesting-runner-2.9.1.jar.sha1 new file mode 100644 index 000000000000..de6a1e95a315 --- /dev/null +++ b/solr/licenses/randomizedtesting-runner-2.9.1.jar.sha1 @@ -0,0 +1 @@ +3a7cb4e4075401e11754e31fc6dabe1737b0a5bb diff --git a/versions.lock b/versions.lock index 659611f7d411..7d93e8da8c74 100644 --- a/versions.lock +++ b/versions.lock @@ -2,7 +2,7 @@ at.yawk.lz4:lz4-java:1.10.1 (1 constraints: 260dec28) biz.aQute.bnd:biz.aQute.bnd.annotation:6.4.1 (1 constraints: 0d051636) com.carrotsearch:hppc:0.10.0 (2 constraints: d40fecb0) -com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.4 (2 constraints: d21594e2) +com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.9.1 (2 constraints: d01534e2) com.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e) com.fasterxml.jackson:jackson-bom:2.18.0 (13 constraints: 2614e9f5) com.fasterxml.jackson.core:jackson-annotations:2.18.0 (13 constraints: 4301624c) diff --git a/versions.props b/versions.props index 9696656c75ea..16da212d93a5 100644 --- a/versions.props +++ b/versions.props @@ -3,7 +3,7 @@ # The lines in this file needs to be lexicographically sorted. biz.aQute.bnd:biz.aQute.bnd.annotation=6.4.1 com.adobe.testing:s3mock-junit4=2.17.0 -com.carrotsearch.randomizedtesting:*=2.8.4 +com.carrotsearch.randomizedtesting:*=2.9.1 com.carrotsearch:hppc=0.10.0 com.cybozu.labs:langdetect=1.1-20120112 com.fasterxml.jackson:jackson-bom=2.18.0 From cd894b1276d4434bd4a585bb779e204c79a1b093 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Sat, 6 Jun 2026 02:06:38 +0000 Subject: [PATCH 15/45] Update dependency com.fasterxml.jackson:jackson-bom to v2.22.0 (branch_9x) --- .../jackson-annotations-2.18.0.jar.sha1 | 1 - .../jackson-annotations-2.22.jar.sha1 | 1 + solr/licenses/jackson-core-2.18.0.jar.sha1 | 1 - solr/licenses/jackson-core-2.22.0.jar.sha1 | 1 + .../licenses/jackson-databind-2.18.0.jar.sha1 | 1 - .../licenses/jackson-databind-2.22.0.jar.sha1 | 1 + .../jackson-dataformat-cbor-2.18.0.jar.sha1 | 1 - .../jackson-dataformat-cbor-2.22.0.jar.sha1 | 1 + .../jackson-dataformat-csv-2.18.0.jar.sha1 | 1 - .../jackson-dataformat-csv-2.22.0.jar.sha1 | 1 + .../jackson-dataformat-smile-2.18.0.jar.sha1 | 1 - .../jackson-dataformat-smile-2.22.0.jar.sha1 | 1 + .../jackson-dataformat-xml-2.18.0.jar.sha1 | 1 - .../jackson-dataformat-xml-2.22.0.jar.sha1 | 1 + .../jackson-datatype-jdk8-2.18.0.jar.sha1 | 1 - .../jackson-datatype-jdk8-2.22.0.jar.sha1 | 1 + .../jackson-datatype-jsr310-2.18.0.jar.sha1 | 1 - .../jackson-datatype-jsr310-2.22.0.jar.sha1 | 1 + ...akarta-xmlbind-annotations-2.18.0.jar.sha1 | 1 - ...akarta-xmlbind-annotations-2.22.0.jar.sha1 | 1 + .../jackson-module-kotlin-2.18.0.jar.sha1 | 1 - .../jackson-module-kotlin-2.22.0.jar.sha1 | 1 + ...son-module-parameter-names-2.18.0.jar.sha1 | 1 - ...son-module-parameter-names-2.22.0.jar.sha1 | 1 + .../jackson-module-scala_2.13-2.18.0.jar.sha1 | 1 - .../jackson-module-scala_2.13-2.22.0.jar.sha1 | 1 + solr/licenses/kotlin-reflect-1.8.22.jar.sha1 | 1 - solr/licenses/kotlin-reflect-2.1.21.jar.sha1 | 1 + solr/licenses/paranamer-2.8.3.jar.sha1 | 1 + solr/licenses/paranamer-2.8.jar.sha1 | 1 - solr/licenses/scala-library-2.13.15.jar.sha1 | 1 - solr/licenses/scala-library-2.13.18.jar.sha1 | 1 + solr/licenses/woodstox-core-7.0.0.jar.sha1 | 1 - solr/licenses/woodstox-core-7.2.0.jar.sha1 | 1 + versions.lock | 40 +++++++++---------- versions.props | 2 +- 36 files changed, 38 insertions(+), 38 deletions(-) delete mode 100644 solr/licenses/jackson-annotations-2.18.0.jar.sha1 create mode 100644 solr/licenses/jackson-annotations-2.22.jar.sha1 delete mode 100644 solr/licenses/jackson-core-2.18.0.jar.sha1 create mode 100644 solr/licenses/jackson-core-2.22.0.jar.sha1 delete mode 100644 solr/licenses/jackson-databind-2.18.0.jar.sha1 create mode 100644 solr/licenses/jackson-databind-2.22.0.jar.sha1 delete mode 100644 solr/licenses/jackson-dataformat-cbor-2.18.0.jar.sha1 create mode 100644 solr/licenses/jackson-dataformat-cbor-2.22.0.jar.sha1 delete mode 100644 solr/licenses/jackson-dataformat-csv-2.18.0.jar.sha1 create mode 100644 solr/licenses/jackson-dataformat-csv-2.22.0.jar.sha1 delete mode 100644 solr/licenses/jackson-dataformat-smile-2.18.0.jar.sha1 create mode 100644 solr/licenses/jackson-dataformat-smile-2.22.0.jar.sha1 delete mode 100644 solr/licenses/jackson-dataformat-xml-2.18.0.jar.sha1 create mode 100644 solr/licenses/jackson-dataformat-xml-2.22.0.jar.sha1 delete mode 100644 solr/licenses/jackson-datatype-jdk8-2.18.0.jar.sha1 create mode 100644 solr/licenses/jackson-datatype-jdk8-2.22.0.jar.sha1 delete mode 100644 solr/licenses/jackson-datatype-jsr310-2.18.0.jar.sha1 create mode 100644 solr/licenses/jackson-datatype-jsr310-2.22.0.jar.sha1 delete mode 100644 solr/licenses/jackson-module-jakarta-xmlbind-annotations-2.18.0.jar.sha1 create mode 100644 solr/licenses/jackson-module-jakarta-xmlbind-annotations-2.22.0.jar.sha1 delete mode 100644 solr/licenses/jackson-module-kotlin-2.18.0.jar.sha1 create mode 100644 solr/licenses/jackson-module-kotlin-2.22.0.jar.sha1 delete mode 100644 solr/licenses/jackson-module-parameter-names-2.18.0.jar.sha1 create mode 100644 solr/licenses/jackson-module-parameter-names-2.22.0.jar.sha1 delete mode 100644 solr/licenses/jackson-module-scala_2.13-2.18.0.jar.sha1 create mode 100644 solr/licenses/jackson-module-scala_2.13-2.22.0.jar.sha1 delete mode 100644 solr/licenses/kotlin-reflect-1.8.22.jar.sha1 create mode 100644 solr/licenses/kotlin-reflect-2.1.21.jar.sha1 create mode 100644 solr/licenses/paranamer-2.8.3.jar.sha1 delete mode 100644 solr/licenses/paranamer-2.8.jar.sha1 delete mode 100644 solr/licenses/scala-library-2.13.15.jar.sha1 create mode 100644 solr/licenses/scala-library-2.13.18.jar.sha1 delete mode 100644 solr/licenses/woodstox-core-7.0.0.jar.sha1 create mode 100644 solr/licenses/woodstox-core-7.2.0.jar.sha1 diff --git a/solr/licenses/jackson-annotations-2.18.0.jar.sha1 b/solr/licenses/jackson-annotations-2.18.0.jar.sha1 deleted file mode 100644 index 2303a2b31609..000000000000 --- a/solr/licenses/jackson-annotations-2.18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9bddcc56af9d90f902ef5dba7348102cd12b04e2 diff --git a/solr/licenses/jackson-annotations-2.22.jar.sha1 b/solr/licenses/jackson-annotations-2.22.jar.sha1 new file mode 100644 index 000000000000..f7cd2c0f37fc --- /dev/null +++ b/solr/licenses/jackson-annotations-2.22.jar.sha1 @@ -0,0 +1 @@ +15c67f9498d6934cff9510fc70c5a12e52290457 diff --git a/solr/licenses/jackson-core-2.18.0.jar.sha1 b/solr/licenses/jackson-core-2.18.0.jar.sha1 deleted file mode 100644 index 6bfee538bd71..000000000000 --- a/solr/licenses/jackson-core-2.18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -65e8ead7de5d8f7a53e296c363bea3182f21f925 diff --git a/solr/licenses/jackson-core-2.22.0.jar.sha1 b/solr/licenses/jackson-core-2.22.0.jar.sha1 new file mode 100644 index 000000000000..22c25019d62e --- /dev/null +++ b/solr/licenses/jackson-core-2.22.0.jar.sha1 @@ -0,0 +1 @@ +f25b20bdff54546bcaf9d1ac4701447f2d3968f7 diff --git a/solr/licenses/jackson-databind-2.18.0.jar.sha1 b/solr/licenses/jackson-databind-2.18.0.jar.sha1 deleted file mode 100644 index d04d844d43fe..000000000000 --- a/solr/licenses/jackson-databind-2.18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8dba1f789a75fc30b59303574fe2b269afa4d3bc diff --git a/solr/licenses/jackson-databind-2.22.0.jar.sha1 b/solr/licenses/jackson-databind-2.22.0.jar.sha1 new file mode 100644 index 000000000000..a49d221864d1 --- /dev/null +++ b/solr/licenses/jackson-databind-2.22.0.jar.sha1 @@ -0,0 +1 @@ +7aa54fc3755a9285eec2e73053bde1b9b845a9b2 diff --git a/solr/licenses/jackson-dataformat-cbor-2.18.0.jar.sha1 b/solr/licenses/jackson-dataformat-cbor-2.18.0.jar.sha1 deleted file mode 100644 index 23956a91bb74..000000000000 --- a/solr/licenses/jackson-dataformat-cbor-2.18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -90ec8bb9c6f7d1535e49272d344907ba57b014d6 diff --git a/solr/licenses/jackson-dataformat-cbor-2.22.0.jar.sha1 b/solr/licenses/jackson-dataformat-cbor-2.22.0.jar.sha1 new file mode 100644 index 000000000000..00e2e9037c27 --- /dev/null +++ b/solr/licenses/jackson-dataformat-cbor-2.22.0.jar.sha1 @@ -0,0 +1 @@ +6ea8272ab03f72d79abb5b939aa9f457e6df104f diff --git a/solr/licenses/jackson-dataformat-csv-2.18.0.jar.sha1 b/solr/licenses/jackson-dataformat-csv-2.18.0.jar.sha1 deleted file mode 100644 index ac8ed0a127d1..000000000000 --- a/solr/licenses/jackson-dataformat-csv-2.18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -13659d6c9e8e0798ddbf19c612951c976f10aa6d diff --git a/solr/licenses/jackson-dataformat-csv-2.22.0.jar.sha1 b/solr/licenses/jackson-dataformat-csv-2.22.0.jar.sha1 new file mode 100644 index 000000000000..14ad17bebbac --- /dev/null +++ b/solr/licenses/jackson-dataformat-csv-2.22.0.jar.sha1 @@ -0,0 +1 @@ +cb79c48fff4f42e970d16e26754ab8b33b569410 diff --git a/solr/licenses/jackson-dataformat-smile-2.18.0.jar.sha1 b/solr/licenses/jackson-dataformat-smile-2.18.0.jar.sha1 deleted file mode 100644 index 67cd3a36fcc0..000000000000 --- a/solr/licenses/jackson-dataformat-smile-2.18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -aeba95810bd35d672ca50c4a627a72543473e8b8 diff --git a/solr/licenses/jackson-dataformat-smile-2.22.0.jar.sha1 b/solr/licenses/jackson-dataformat-smile-2.22.0.jar.sha1 new file mode 100644 index 000000000000..7356c057db46 --- /dev/null +++ b/solr/licenses/jackson-dataformat-smile-2.22.0.jar.sha1 @@ -0,0 +1 @@ +07353fa704fbdc119ccd594e099c4e60cfbaef47 diff --git a/solr/licenses/jackson-dataformat-xml-2.18.0.jar.sha1 b/solr/licenses/jackson-dataformat-xml-2.18.0.jar.sha1 deleted file mode 100644 index e084b28dd793..000000000000 --- a/solr/licenses/jackson-dataformat-xml-2.18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -abc59039b723b1c2d30d4c0e4a94dd56825f664a diff --git a/solr/licenses/jackson-dataformat-xml-2.22.0.jar.sha1 b/solr/licenses/jackson-dataformat-xml-2.22.0.jar.sha1 new file mode 100644 index 000000000000..861c2cbe5cea --- /dev/null +++ b/solr/licenses/jackson-dataformat-xml-2.22.0.jar.sha1 @@ -0,0 +1 @@ +165dbf511d2148fd8448e0c62e532a83c949eef9 diff --git a/solr/licenses/jackson-datatype-jdk8-2.18.0.jar.sha1 b/solr/licenses/jackson-datatype-jdk8-2.18.0.jar.sha1 deleted file mode 100644 index 7e08a14678a2..000000000000 --- a/solr/licenses/jackson-datatype-jdk8-2.18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2046c6ad99a59b5bccf840021f5b3dcf2890acc2 diff --git a/solr/licenses/jackson-datatype-jdk8-2.22.0.jar.sha1 b/solr/licenses/jackson-datatype-jdk8-2.22.0.jar.sha1 new file mode 100644 index 000000000000..8262c0b49f41 --- /dev/null +++ b/solr/licenses/jackson-datatype-jdk8-2.22.0.jar.sha1 @@ -0,0 +1 @@ +5eaa676681bbb4a4036c097d13cb50835f513212 diff --git a/solr/licenses/jackson-datatype-jsr310-2.18.0.jar.sha1 b/solr/licenses/jackson-datatype-jsr310-2.18.0.jar.sha1 deleted file mode 100644 index 202debec5442..000000000000 --- a/solr/licenses/jackson-datatype-jsr310-2.18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ed3e9d73b532bb4eba3ac31ca44d4debe0c418de diff --git a/solr/licenses/jackson-datatype-jsr310-2.22.0.jar.sha1 b/solr/licenses/jackson-datatype-jsr310-2.22.0.jar.sha1 new file mode 100644 index 000000000000..09da1fc29f56 --- /dev/null +++ b/solr/licenses/jackson-datatype-jsr310-2.22.0.jar.sha1 @@ -0,0 +1 @@ +6aa58b1174d2888ad7f3941e8d9e2fd62775edc3 diff --git a/solr/licenses/jackson-module-jakarta-xmlbind-annotations-2.18.0.jar.sha1 b/solr/licenses/jackson-module-jakarta-xmlbind-annotations-2.18.0.jar.sha1 deleted file mode 100644 index 834aee7755cb..000000000000 --- a/solr/licenses/jackson-module-jakarta-xmlbind-annotations-2.18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -697ef6ec2884f4ae6e5e79377ae368f178cd0c61 diff --git a/solr/licenses/jackson-module-jakarta-xmlbind-annotations-2.22.0.jar.sha1 b/solr/licenses/jackson-module-jakarta-xmlbind-annotations-2.22.0.jar.sha1 new file mode 100644 index 000000000000..be486d9a8140 --- /dev/null +++ b/solr/licenses/jackson-module-jakarta-xmlbind-annotations-2.22.0.jar.sha1 @@ -0,0 +1 @@ +e5e562a476060f4636b1c665487e0be60fccd5ff diff --git a/solr/licenses/jackson-module-kotlin-2.18.0.jar.sha1 b/solr/licenses/jackson-module-kotlin-2.18.0.jar.sha1 deleted file mode 100644 index d8209104bd74..000000000000 --- a/solr/licenses/jackson-module-kotlin-2.18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ef6ff9000dd9b28246e9346151127638d91398fa diff --git a/solr/licenses/jackson-module-kotlin-2.22.0.jar.sha1 b/solr/licenses/jackson-module-kotlin-2.22.0.jar.sha1 new file mode 100644 index 000000000000..af1acf1ca6c0 --- /dev/null +++ b/solr/licenses/jackson-module-kotlin-2.22.0.jar.sha1 @@ -0,0 +1 @@ +6611d4fa8346dbdc18ef851f8849fdbea3e73fa1 diff --git a/solr/licenses/jackson-module-parameter-names-2.18.0.jar.sha1 b/solr/licenses/jackson-module-parameter-names-2.18.0.jar.sha1 deleted file mode 100644 index 9d8bdcffab06..000000000000 --- a/solr/licenses/jackson-module-parameter-names-2.18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -479b85d02896fef7f78420902f587e909a72de11 diff --git a/solr/licenses/jackson-module-parameter-names-2.22.0.jar.sha1 b/solr/licenses/jackson-module-parameter-names-2.22.0.jar.sha1 new file mode 100644 index 000000000000..dd896bd834a7 --- /dev/null +++ b/solr/licenses/jackson-module-parameter-names-2.22.0.jar.sha1 @@ -0,0 +1 @@ +8bf5fd8adffde5ee34638be4f3fc69153cf74958 diff --git a/solr/licenses/jackson-module-scala_2.13-2.18.0.jar.sha1 b/solr/licenses/jackson-module-scala_2.13-2.18.0.jar.sha1 deleted file mode 100644 index 3ed8ffaed218..000000000000 --- a/solr/licenses/jackson-module-scala_2.13-2.18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -44ec5bc8f41c3c93586b4bef9225fd5465b71662 diff --git a/solr/licenses/jackson-module-scala_2.13-2.22.0.jar.sha1 b/solr/licenses/jackson-module-scala_2.13-2.22.0.jar.sha1 new file mode 100644 index 000000000000..06254cea8508 --- /dev/null +++ b/solr/licenses/jackson-module-scala_2.13-2.22.0.jar.sha1 @@ -0,0 +1 @@ +ee9cda18f877b8b650005575915a379d344a0ddb diff --git a/solr/licenses/kotlin-reflect-1.8.22.jar.sha1 b/solr/licenses/kotlin-reflect-1.8.22.jar.sha1 deleted file mode 100644 index 02571f1cce13..000000000000 --- a/solr/licenses/kotlin-reflect-1.8.22.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b52be44bc57cb6fd2169a29aefa4507c4e49c858 diff --git a/solr/licenses/kotlin-reflect-2.1.21.jar.sha1 b/solr/licenses/kotlin-reflect-2.1.21.jar.sha1 new file mode 100644 index 000000000000..3ccfc58edbd4 --- /dev/null +++ b/solr/licenses/kotlin-reflect-2.1.21.jar.sha1 @@ -0,0 +1 @@ +4929da533b3f04a101e4bb9ae0ee51a1d8107614 diff --git a/solr/licenses/paranamer-2.8.3.jar.sha1 b/solr/licenses/paranamer-2.8.3.jar.sha1 new file mode 100644 index 000000000000..a004717c78a1 --- /dev/null +++ b/solr/licenses/paranamer-2.8.3.jar.sha1 @@ -0,0 +1 @@ +75ae4eb129574b7fc0df5fa8808d7ed625be815d diff --git a/solr/licenses/paranamer-2.8.jar.sha1 b/solr/licenses/paranamer-2.8.jar.sha1 deleted file mode 100644 index cb85c7c1459a..000000000000 --- a/solr/licenses/paranamer-2.8.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -619eba74c19ccf1da8ebec97a2d7f8ba05773dd6 diff --git a/solr/licenses/scala-library-2.13.15.jar.sha1 b/solr/licenses/scala-library-2.13.15.jar.sha1 deleted file mode 100644 index 36f9c041512b..000000000000 --- a/solr/licenses/scala-library-2.13.15.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ed6f1d58968b16c5f9067d5cac032d952552de58 diff --git a/solr/licenses/scala-library-2.13.18.jar.sha1 b/solr/licenses/scala-library-2.13.18.jar.sha1 new file mode 100644 index 000000000000..41da4274c9e4 --- /dev/null +++ b/solr/licenses/scala-library-2.13.18.jar.sha1 @@ -0,0 +1 @@ +eb2086988c25b08705472cc750654570900362e5 diff --git a/solr/licenses/woodstox-core-7.0.0.jar.sha1 b/solr/licenses/woodstox-core-7.0.0.jar.sha1 deleted file mode 100644 index 7be308864653..000000000000 --- a/solr/licenses/woodstox-core-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -beb19c02e7e28a8a4acf4a9cc8c3280ec3b94722 diff --git a/solr/licenses/woodstox-core-7.2.0.jar.sha1 b/solr/licenses/woodstox-core-7.2.0.jar.sha1 new file mode 100644 index 000000000000..f268bc7cb4d3 --- /dev/null +++ b/solr/licenses/woodstox-core-7.2.0.jar.sha1 @@ -0,0 +1 @@ +ec9c97f566f812e249a7aba6c76815369ac00864 diff --git a/versions.lock b/versions.lock index 659611f7d411..16aea1dad75e 100644 --- a/versions.lock +++ b/versions.lock @@ -4,17 +4,17 @@ biz.aQute.bnd:biz.aQute.bnd.annotation:6.4.1 (1 constraints: 0d051636) com.carrotsearch:hppc:0.10.0 (2 constraints: d40fecb0) com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.4 (2 constraints: d21594e2) com.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e) -com.fasterxml.jackson:jackson-bom:2.18.0 (13 constraints: 2614e9f5) -com.fasterxml.jackson.core:jackson-annotations:2.18.0 (13 constraints: 4301624c) -com.fasterxml.jackson.core:jackson-core:2.18.0 (15 constraints: e436f89c) -com.fasterxml.jackson.core:jackson-databind:2.18.0 (34 constraints: ec643f77) -com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.0 (2 constraints: 641ca1f1) -com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.18.0 (2 constraints: ec19ff7a) -com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.18.0 (1 constraints: bb0eb266) -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.0 (6 constraints: e3582669) -com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.18.0 (2 constraints: ab241ae1) -com.fasterxml.jackson.module:jackson-module-scala_2.13:2.18.0 (2 constraints: ec19ff7a) -com.fasterxml.woodstox:woodstox-core:7.0.0 (1 constraints: 3b174526) +com.fasterxml.jackson:jackson-bom:2.22.0 (12 constraints: daffec4a) +com.fasterxml.jackson.core:jackson-annotations:2.22 (13 constraints: 1cfebfd7) +com.fasterxml.jackson.core:jackson-core:2.22.0 (15 constraints: ad362d2d) +com.fasterxml.jackson.core:jackson-databind:2.22.0 (34 constraints: b5645c5c) +com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.22.0 (2 constraints: 5f1c93f1) +com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.22.0 (2 constraints: e719387a) +com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.22.0 (1 constraints: b60ea466) +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.22.0 (6 constraints: de587165) +com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.22.0 (2 constraints: a624d6df) +com.fasterxml.jackson.module:jackson-module-scala_2.13:2.22.0 (2 constraints: e719387a) +com.fasterxml.woodstox:woodstox-core:7.2.0 (1 constraints: 3d174b26) com.github.ben-manes.caffeine:caffeine:3.2.3 (2 constraints: 0d121317) com.github.luben:zstd-jni:1.5.6-4 (1 constraints: 600d6236) com.github.spotbugs:spotbugs-annotations:4.8.6 (1 constraints: 14051d36) @@ -70,7 +70,7 @@ com.squareup.okio:okio-jvm:3.15.0 (1 constraints: 800a50c4) com.squareup.retrofit2:converter-jackson:2.9.0 (4 constraints: ce36e7ea) com.squareup.retrofit2:retrofit:2.9.0 (5 constraints: 4a48510b) com.tdunning:t-digest:3.3 (1 constraints: aa04232c) -com.thoughtworks.paranamer:paranamer:2.8 (1 constraints: 7c15bdd4) +com.thoughtworks.paranamer:paranamer:2.8.3 (1 constraints: dd155300) com.typesafe.scala-logging:scala-logging_2.13:3.9.5 (1 constraints: 080b20e8) com.yammer.metrics:metrics-core:2.2.0 (7 constraints: 8760e867) com.zaxxer:SparseBitSet:1.3 (1 constraints: 0e081f75) @@ -272,7 +272,7 @@ org.carrot2:morfologik-stemming:2.1.9 (2 constraints: d81fb300) org.checkerframework:checker-qual:3.44.0 (3 constraints: f02b17cc) org.codehaus.janino:commons-compiler:3.1.11 (2 constraints: 83195319) org.codehaus.janino:janino:3.1.11 (1 constraints: 8e0d433a) -org.codehaus.woodstox:stax2-api:4.3.0 (2 constraints: 371531af) +org.codehaus.woodstox:stax2-api:4.3.0 (2 constraints: 361532af) org.conscrypt:conscrypt-openjdk-uber:2.5.2 (1 constraints: ed0fea95) org.eclipse.jetty:jetty-alpn-client:10.0.26 (3 constraints: f72e3161) org.eclipse.jetty:jetty-alpn-java-client:10.0.26 (2 constraints: 231b156f) @@ -315,7 +315,7 @@ org.immutables:value-annotations:2.12.1 (1 constraints: 3805363b) org.javassist:javassist:3.30.2-GA (1 constraints: 2811fff0) org.jctools:jctools-core:4.0.6 (1 constraints: 0c050536) org.jetbrains:annotations:17.0.0 (2 constraints: 371c92e0) -org.jetbrains.kotlin:kotlin-stdlib:2.2.0 (7 constraints: db6ba2e1) +org.jetbrains.kotlin:kotlin-stdlib:2.2.0 (7 constraints: d46b7fdd) org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 (2 constraints: f31f0a21) org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 (8 constraints: 5f7a37d5) org.jspecify:jspecify:1.0.0 (3 constraints: b1233dfa) @@ -335,7 +335,7 @@ org.pcollections:pcollections:4.0.1 (1 constraints: 530f2e7d) org.quicktheories:quicktheories:0.26 (1 constraints: dc04f530) org.reactivestreams:reactive-streams:1.0.4 (4 constraints: 073bf033) org.rocksdb:rocksdbjni:7.9.2 (1 constraints: 120d091d) -org.scala-lang:scala-library:2.13.15 (6 constraints: cd67c5a6) +org.scala-lang:scala-library:2.13.18 (6 constraints: d067b6a9) org.scala-lang:scala-reflect:2.13.15 (2 constraints: c11d80f4) org.scala-lang.modules:scala-collection-compat_2.13:2.10.0 (1 constraints: 2a0b2af3) org.scala-lang.modules:scala-java8-compat_2.13:1.0.2 (1 constraints: fa0af8e7) @@ -387,10 +387,10 @@ com.amazonaws:aws-java-sdk-core:1.12.501 (2 constraints: b01a32b3) com.amazonaws:aws-java-sdk-kms:1.12.501 (1 constraints: 060dbd37) com.amazonaws:aws-java-sdk-s3:1.12.501 (1 constraints: 10136f43) com.amazonaws:jmespath-java:1.12.501 (2 constraints: b01a32b3) -com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.18.0 (2 constraints: ab195b13) -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.0 (4 constraints: 6e48dd35) -com.fasterxml.jackson.module:jackson-module-kotlin:2.18.0 (2 constraints: aa1d6d60) -com.fasterxml.jackson.module:jackson-module-parameter-names:2.18.0 (2 constraints: 0d248182) +com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.22.0 (2 constraints: a6194d13) +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.22.0 (4 constraints: 69484f33) +com.fasterxml.jackson.module:jackson-module-kotlin:2.22.0 (2 constraints: a51d835f) +com.fasterxml.jackson.module:jackson-module-parameter-names:2.22.0 (2 constraints: 08244c81) com.github.docker-java:docker-java-api:3.4.0 (1 constraints: 3b0f6067) com.github.docker-java:docker-java-transport:3.4.0 (1 constraints: c51513cb) com.github.docker-java:docker-java-transport-zerodep:3.4.0 (1 constraints: 3b0f6067) @@ -438,7 +438,7 @@ org.glassfish.jaxb:jaxb-runtime:2.3.8 (1 constraints: c30a41cb) org.glassfish.jaxb:txw2:2.3.8 (1 constraints: c20dba35) org.hdrhistogram:HdrHistogram:2.1.12 (1 constraints: 520d2029) org.hsqldb:hsqldb:2.7.4 (1 constraints: 0f050e36) -org.jetbrains.kotlin:kotlin-reflect:1.8.22 (2 constraints: 6624c6e2) +org.jetbrains.kotlin:kotlin-reflect:2.1.21 (2 constraints: 622403e2) org.jetbrains.kotlin:kotlin-stdlib-common:2.2.0 (2 constraints: 0820970a) org.latencyutils:LatencyUtils:2.0.3 (1 constraints: 210dcd1b) org.mockito:mockito-core:5.23.0 (2 constraints: 3612e31b) diff --git a/versions.props b/versions.props index 9696656c75ea..e97ad23df135 100644 --- a/versions.props +++ b/versions.props @@ -6,7 +6,7 @@ com.adobe.testing:s3mock-junit4=2.17.0 com.carrotsearch.randomizedtesting:*=2.8.4 com.carrotsearch:hppc=0.10.0 com.cybozu.labs:langdetect=1.1-20120112 -com.fasterxml.jackson:jackson-bom=2.18.0 +com.fasterxml.jackson:jackson-bom=2.22.0 com.github.ben-manes.caffeine:caffeine=3.2.3 com.github.spotbugs:*=4.8.6 com.github.stephenc.jcip:jcip-annotations=1.0-1 From c35292920ff598b32d6a701e80c22d2ec771b630 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Sun, 7 Jun 2026 08:49:47 +0000 Subject: [PATCH 16/45] Update io.netty:netty* to v4.2.15.Final (branch_9x) --- .../netty-buffer-4.2.12.Final.jar.sha1 | 1 - .../netty-buffer-4.2.15.Final.jar.sha1 | 1 + .../netty-codec-base-4.2.12.Final.jar.sha1 | 1 - .../netty-codec-base-4.2.15.Final.jar.sha1 | 1 + ...ty-codec-compression-4.2.12.Final.jar.sha1 | 1 - ...ty-codec-compression-4.2.15.Final.jar.sha1 | 1 + .../netty-codec-http-4.2.12.Final.jar.sha1 | 1 - .../netty-codec-http-4.2.15.Final.jar.sha1 | 1 + .../netty-codec-http2-4.2.12.Final.jar.sha1 | 1 - .../netty-codec-http2-4.2.15.Final.jar.sha1 | 1 + .../netty-codec-socks-4.2.12.Final.jar.sha1 | 1 - .../netty-codec-socks-4.2.15.Final.jar.sha1 | 1 + .../netty-common-4.2.12.Final.jar.sha1 | 1 - .../netty-common-4.2.15.Final.jar.sha1 | 1 + .../netty-handler-4.2.12.Final.jar.sha1 | 1 - .../netty-handler-4.2.15.Final.jar.sha1 | 1 + .../netty-handler-proxy-4.2.12.Final.jar.sha1 | 1 - .../netty-handler-proxy-4.2.15.Final.jar.sha1 | 1 + .../netty-resolver-4.2.12.Final.jar.sha1 | 1 - .../netty-resolver-4.2.15.Final.jar.sha1 | 1 + ...ive-boringssl-static-2.0.75.Final.jar.sha1 | 1 - ...ive-boringssl-static-2.0.77.Final.jar.sha1 | 1 + ...tty-tcnative-classes-2.0.75.Final.jar.sha1 | 1 - ...tty-tcnative-classes-2.0.77.Final.jar.sha1 | 1 + .../netty-transport-4.2.12.Final.jar.sha1 | 1 - .../netty-transport-4.2.15.Final.jar.sha1 | 1 + ...nsport-classes-epoll-4.2.12.Final.jar.sha1 | 1 - ...nsport-classes-epoll-4.2.15.Final.jar.sha1 | 1 + ...e-epoll-4.2.12.Final-linux-x86_64.jar.sha1 | 1 - ...e-epoll-4.2.15.Final-linux-x86_64.jar.sha1 | 1 + ...t-native-unix-common-4.2.12.Final.jar.sha1 | 1 - ...t-native-unix-common-4.2.15.Final.jar.sha1 | 1 + versions.lock | 34 +++++++++---------- versions.props | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) delete mode 100644 solr/licenses/netty-buffer-4.2.12.Final.jar.sha1 create mode 100644 solr/licenses/netty-buffer-4.2.15.Final.jar.sha1 delete mode 100644 solr/licenses/netty-codec-base-4.2.12.Final.jar.sha1 create mode 100644 solr/licenses/netty-codec-base-4.2.15.Final.jar.sha1 delete mode 100644 solr/licenses/netty-codec-compression-4.2.12.Final.jar.sha1 create mode 100644 solr/licenses/netty-codec-compression-4.2.15.Final.jar.sha1 delete mode 100644 solr/licenses/netty-codec-http-4.2.12.Final.jar.sha1 create mode 100644 solr/licenses/netty-codec-http-4.2.15.Final.jar.sha1 delete mode 100644 solr/licenses/netty-codec-http2-4.2.12.Final.jar.sha1 create mode 100644 solr/licenses/netty-codec-http2-4.2.15.Final.jar.sha1 delete mode 100644 solr/licenses/netty-codec-socks-4.2.12.Final.jar.sha1 create mode 100644 solr/licenses/netty-codec-socks-4.2.15.Final.jar.sha1 delete mode 100644 solr/licenses/netty-common-4.2.12.Final.jar.sha1 create mode 100644 solr/licenses/netty-common-4.2.15.Final.jar.sha1 delete mode 100644 solr/licenses/netty-handler-4.2.12.Final.jar.sha1 create mode 100644 solr/licenses/netty-handler-4.2.15.Final.jar.sha1 delete mode 100644 solr/licenses/netty-handler-proxy-4.2.12.Final.jar.sha1 create mode 100644 solr/licenses/netty-handler-proxy-4.2.15.Final.jar.sha1 delete mode 100644 solr/licenses/netty-resolver-4.2.12.Final.jar.sha1 create mode 100644 solr/licenses/netty-resolver-4.2.15.Final.jar.sha1 delete mode 100644 solr/licenses/netty-tcnative-boringssl-static-2.0.75.Final.jar.sha1 create mode 100644 solr/licenses/netty-tcnative-boringssl-static-2.0.77.Final.jar.sha1 delete mode 100644 solr/licenses/netty-tcnative-classes-2.0.75.Final.jar.sha1 create mode 100644 solr/licenses/netty-tcnative-classes-2.0.77.Final.jar.sha1 delete mode 100644 solr/licenses/netty-transport-4.2.12.Final.jar.sha1 create mode 100644 solr/licenses/netty-transport-4.2.15.Final.jar.sha1 delete mode 100644 solr/licenses/netty-transport-classes-epoll-4.2.12.Final.jar.sha1 create mode 100644 solr/licenses/netty-transport-classes-epoll-4.2.15.Final.jar.sha1 delete mode 100644 solr/licenses/netty-transport-native-epoll-4.2.12.Final-linux-x86_64.jar.sha1 create mode 100644 solr/licenses/netty-transport-native-epoll-4.2.15.Final-linux-x86_64.jar.sha1 delete mode 100644 solr/licenses/netty-transport-native-unix-common-4.2.12.Final.jar.sha1 create mode 100644 solr/licenses/netty-transport-native-unix-common-4.2.15.Final.jar.sha1 diff --git a/solr/licenses/netty-buffer-4.2.12.Final.jar.sha1 b/solr/licenses/netty-buffer-4.2.12.Final.jar.sha1 deleted file mode 100644 index ef87c4ab9c87..000000000000 --- a/solr/licenses/netty-buffer-4.2.12.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a1b3a6a4ebaf546860eb119d4e462cd300976ae3 diff --git a/solr/licenses/netty-buffer-4.2.15.Final.jar.sha1 b/solr/licenses/netty-buffer-4.2.15.Final.jar.sha1 new file mode 100644 index 000000000000..eb7e95c7d7fe --- /dev/null +++ b/solr/licenses/netty-buffer-4.2.15.Final.jar.sha1 @@ -0,0 +1 @@ +2beb620803bf871cda2dd5d46b8f831e8015dd34 diff --git a/solr/licenses/netty-codec-base-4.2.12.Final.jar.sha1 b/solr/licenses/netty-codec-base-4.2.12.Final.jar.sha1 deleted file mode 100644 index f87dbf6eb23e..000000000000 --- a/solr/licenses/netty-codec-base-4.2.12.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -381b47a0cdd126010a7df1c25d25d7bf55c4fddb diff --git a/solr/licenses/netty-codec-base-4.2.15.Final.jar.sha1 b/solr/licenses/netty-codec-base-4.2.15.Final.jar.sha1 new file mode 100644 index 000000000000..572127e87bce --- /dev/null +++ b/solr/licenses/netty-codec-base-4.2.15.Final.jar.sha1 @@ -0,0 +1 @@ +e97149fdd5fb04858efa90e314651c8d700dc68b diff --git a/solr/licenses/netty-codec-compression-4.2.12.Final.jar.sha1 b/solr/licenses/netty-codec-compression-4.2.12.Final.jar.sha1 deleted file mode 100644 index d72da2d578b2..000000000000 --- a/solr/licenses/netty-codec-compression-4.2.12.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -aa0849118167bc727a8dbdaeccc45d56c1f1e8fb diff --git a/solr/licenses/netty-codec-compression-4.2.15.Final.jar.sha1 b/solr/licenses/netty-codec-compression-4.2.15.Final.jar.sha1 new file mode 100644 index 000000000000..0e00e83ad7d1 --- /dev/null +++ b/solr/licenses/netty-codec-compression-4.2.15.Final.jar.sha1 @@ -0,0 +1 @@ +89fc4a20b7ae6af974304b1695405e62c4f9b16d diff --git a/solr/licenses/netty-codec-http-4.2.12.Final.jar.sha1 b/solr/licenses/netty-codec-http-4.2.12.Final.jar.sha1 deleted file mode 100644 index 92e03977dd78..000000000000 --- a/solr/licenses/netty-codec-http-4.2.12.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8dbaa045acc60abf333d428dca4339ce36423bd0 diff --git a/solr/licenses/netty-codec-http-4.2.15.Final.jar.sha1 b/solr/licenses/netty-codec-http-4.2.15.Final.jar.sha1 new file mode 100644 index 000000000000..477df1d69d29 --- /dev/null +++ b/solr/licenses/netty-codec-http-4.2.15.Final.jar.sha1 @@ -0,0 +1 @@ +e611826aa054371bb9a17f27bdb05755a4cac5f0 diff --git a/solr/licenses/netty-codec-http2-4.2.12.Final.jar.sha1 b/solr/licenses/netty-codec-http2-4.2.12.Final.jar.sha1 deleted file mode 100644 index 77664d23aa8e..000000000000 --- a/solr/licenses/netty-codec-http2-4.2.12.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -383b786cfc2549978390a2881ff3c146cc22bb54 diff --git a/solr/licenses/netty-codec-http2-4.2.15.Final.jar.sha1 b/solr/licenses/netty-codec-http2-4.2.15.Final.jar.sha1 new file mode 100644 index 000000000000..68fe44b7d9b2 --- /dev/null +++ b/solr/licenses/netty-codec-http2-4.2.15.Final.jar.sha1 @@ -0,0 +1 @@ +c70540243427c8c952473f55813c6d459817de42 diff --git a/solr/licenses/netty-codec-socks-4.2.12.Final.jar.sha1 b/solr/licenses/netty-codec-socks-4.2.12.Final.jar.sha1 deleted file mode 100644 index ed93c773e5dd..000000000000 --- a/solr/licenses/netty-codec-socks-4.2.12.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e7114ff84cea11086b33367468f5cae16aa727a8 diff --git a/solr/licenses/netty-codec-socks-4.2.15.Final.jar.sha1 b/solr/licenses/netty-codec-socks-4.2.15.Final.jar.sha1 new file mode 100644 index 000000000000..6adae6986809 --- /dev/null +++ b/solr/licenses/netty-codec-socks-4.2.15.Final.jar.sha1 @@ -0,0 +1 @@ +5d6dc38231104f28b6ba48b77d2f90b93cdb6fe7 diff --git a/solr/licenses/netty-common-4.2.12.Final.jar.sha1 b/solr/licenses/netty-common-4.2.12.Final.jar.sha1 deleted file mode 100644 index fe44addf3bf6..000000000000 --- a/solr/licenses/netty-common-4.2.12.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d35ffb9bf5cc0e05ae7408cf6a682b62dceceafc diff --git a/solr/licenses/netty-common-4.2.15.Final.jar.sha1 b/solr/licenses/netty-common-4.2.15.Final.jar.sha1 new file mode 100644 index 000000000000..07470222cb8a --- /dev/null +++ b/solr/licenses/netty-common-4.2.15.Final.jar.sha1 @@ -0,0 +1 @@ +7222492c1af9c2d4d78d521eea340a619e242fda diff --git a/solr/licenses/netty-handler-4.2.12.Final.jar.sha1 b/solr/licenses/netty-handler-4.2.12.Final.jar.sha1 deleted file mode 100644 index 72b68881f5f5..000000000000 --- a/solr/licenses/netty-handler-4.2.12.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1ccb2b1eed54ce049b3ff39fde225014526ab6a0 diff --git a/solr/licenses/netty-handler-4.2.15.Final.jar.sha1 b/solr/licenses/netty-handler-4.2.15.Final.jar.sha1 new file mode 100644 index 000000000000..c82bde6ffce8 --- /dev/null +++ b/solr/licenses/netty-handler-4.2.15.Final.jar.sha1 @@ -0,0 +1 @@ +d5344afd1148e3b9927a74be019605ebb0937a93 diff --git a/solr/licenses/netty-handler-proxy-4.2.12.Final.jar.sha1 b/solr/licenses/netty-handler-proxy-4.2.12.Final.jar.sha1 deleted file mode 100644 index c7c7f07c7aab..000000000000 --- a/solr/licenses/netty-handler-proxy-4.2.12.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2304d930dcd2c2ba3537318395361944938e3d42 diff --git a/solr/licenses/netty-handler-proxy-4.2.15.Final.jar.sha1 b/solr/licenses/netty-handler-proxy-4.2.15.Final.jar.sha1 new file mode 100644 index 000000000000..cdf1b264bb2e --- /dev/null +++ b/solr/licenses/netty-handler-proxy-4.2.15.Final.jar.sha1 @@ -0,0 +1 @@ +31e63e04af11da75793ecbfc126d7691b8771d01 diff --git a/solr/licenses/netty-resolver-4.2.12.Final.jar.sha1 b/solr/licenses/netty-resolver-4.2.12.Final.jar.sha1 deleted file mode 100644 index 1a511122b02e..000000000000 --- a/solr/licenses/netty-resolver-4.2.12.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c59aa586a12e62d80207a00f9cf18eedf69d1012 diff --git a/solr/licenses/netty-resolver-4.2.15.Final.jar.sha1 b/solr/licenses/netty-resolver-4.2.15.Final.jar.sha1 new file mode 100644 index 000000000000..e2a924551bd5 --- /dev/null +++ b/solr/licenses/netty-resolver-4.2.15.Final.jar.sha1 @@ -0,0 +1 @@ +b961a16d379b508b473e064ba06842bba280f4e3 diff --git a/solr/licenses/netty-tcnative-boringssl-static-2.0.75.Final.jar.sha1 b/solr/licenses/netty-tcnative-boringssl-static-2.0.75.Final.jar.sha1 deleted file mode 100644 index c11d65c12632..000000000000 --- a/solr/licenses/netty-tcnative-boringssl-static-2.0.75.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c2718a8b99999019d437a703d9bf429f99c465ac diff --git a/solr/licenses/netty-tcnative-boringssl-static-2.0.77.Final.jar.sha1 b/solr/licenses/netty-tcnative-boringssl-static-2.0.77.Final.jar.sha1 new file mode 100644 index 000000000000..328aba575968 --- /dev/null +++ b/solr/licenses/netty-tcnative-boringssl-static-2.0.77.Final.jar.sha1 @@ -0,0 +1 @@ +d362cc5969c00d1c4cf9dc177283e241fb8d429c diff --git a/solr/licenses/netty-tcnative-classes-2.0.75.Final.jar.sha1 b/solr/licenses/netty-tcnative-classes-2.0.75.Final.jar.sha1 deleted file mode 100644 index 710047bf4344..000000000000 --- a/solr/licenses/netty-tcnative-classes-2.0.75.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b446e6fab7af1bab12bf01a4213627f8d0a2e6ba diff --git a/solr/licenses/netty-tcnative-classes-2.0.77.Final.jar.sha1 b/solr/licenses/netty-tcnative-classes-2.0.77.Final.jar.sha1 new file mode 100644 index 000000000000..cf12c09dcdc6 --- /dev/null +++ b/solr/licenses/netty-tcnative-classes-2.0.77.Final.jar.sha1 @@ -0,0 +1 @@ +f58362f70036d0738e995347987b6462f3408204 diff --git a/solr/licenses/netty-transport-4.2.12.Final.jar.sha1 b/solr/licenses/netty-transport-4.2.12.Final.jar.sha1 deleted file mode 100644 index 7d4296d7d55e..000000000000 --- a/solr/licenses/netty-transport-4.2.12.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e9d42074c3d96cf31ce57cc58f6de6f31959b7a8 diff --git a/solr/licenses/netty-transport-4.2.15.Final.jar.sha1 b/solr/licenses/netty-transport-4.2.15.Final.jar.sha1 new file mode 100644 index 000000000000..cdc951007377 --- /dev/null +++ b/solr/licenses/netty-transport-4.2.15.Final.jar.sha1 @@ -0,0 +1 @@ +a000c3a6196ee40207b73ac619dcb339409dd62f diff --git a/solr/licenses/netty-transport-classes-epoll-4.2.12.Final.jar.sha1 b/solr/licenses/netty-transport-classes-epoll-4.2.12.Final.jar.sha1 deleted file mode 100644 index 909166dac87b..000000000000 --- a/solr/licenses/netty-transport-classes-epoll-4.2.12.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -208f99e5eb334344c51eb921563cd04a3458df66 diff --git a/solr/licenses/netty-transport-classes-epoll-4.2.15.Final.jar.sha1 b/solr/licenses/netty-transport-classes-epoll-4.2.15.Final.jar.sha1 new file mode 100644 index 000000000000..19ff1ea79d17 --- /dev/null +++ b/solr/licenses/netty-transport-classes-epoll-4.2.15.Final.jar.sha1 @@ -0,0 +1 @@ +44bafba9c9993800e955b365bba4981326f3f3b1 diff --git a/solr/licenses/netty-transport-native-epoll-4.2.12.Final-linux-x86_64.jar.sha1 b/solr/licenses/netty-transport-native-epoll-4.2.12.Final-linux-x86_64.jar.sha1 deleted file mode 100644 index 759789483114..000000000000 --- a/solr/licenses/netty-transport-native-epoll-4.2.12.Final-linux-x86_64.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d5e896a5de7e630a79cb3e02fc4de8a6e69ad4cd diff --git a/solr/licenses/netty-transport-native-epoll-4.2.15.Final-linux-x86_64.jar.sha1 b/solr/licenses/netty-transport-native-epoll-4.2.15.Final-linux-x86_64.jar.sha1 new file mode 100644 index 000000000000..023d2f53c1cc --- /dev/null +++ b/solr/licenses/netty-transport-native-epoll-4.2.15.Final-linux-x86_64.jar.sha1 @@ -0,0 +1 @@ +ce256127f8ed3f076756f1f4dcb5877d65d1f1c2 diff --git a/solr/licenses/netty-transport-native-unix-common-4.2.12.Final.jar.sha1 b/solr/licenses/netty-transport-native-unix-common-4.2.12.Final.jar.sha1 deleted file mode 100644 index ec36d507a37c..000000000000 --- a/solr/licenses/netty-transport-native-unix-common-4.2.12.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8f8e5e39fcf6bebc8ec4c1d855f4f1335756c50e diff --git a/solr/licenses/netty-transport-native-unix-common-4.2.15.Final.jar.sha1 b/solr/licenses/netty-transport-native-unix-common-4.2.15.Final.jar.sha1 new file mode 100644 index 000000000000..f2dc7be30fe0 --- /dev/null +++ b/solr/licenses/netty-transport-native-unix-common-4.2.15.Final.jar.sha1 @@ -0,0 +1 @@ +efb6943b4de9e0226a5ac35330f232605424af02 diff --git a/versions.lock b/versions.lock index 659611f7d411..00281796601e 100644 --- a/versions.lock +++ b/versions.lock @@ -115,23 +115,23 @@ io.grpc:grpc-util:1.80.0 (3 constraints: f7218364) io.grpc:grpc-xds:1.80.0 (1 constraints: 1f100ba6) io.jaegertracing:jaeger-core:1.8.1 (2 constraints: 6f124721) io.jaegertracing:jaeger-thrift:1.8.1 (1 constraints: 0c050936) -io.netty:netty-bom:4.2.12.Final (1 constraints: 53073161) -io.netty:netty-buffer:4.2.12.Final (12 constraints: afb6c528) -io.netty:netty-codec-base:4.2.12.Final (7 constraints: c8602952) -io.netty:netty-codec-compression:4.2.12.Final (2 constraints: a4183ac7) -io.netty:netty-codec-http:4.2.12.Final (4 constraints: 322f7360) -io.netty:netty-codec-http2:4.2.12.Final (2 constraints: 0d16021d) -io.netty:netty-codec-socks:4.2.12.Final (2 constraints: 061af11e) -io.netty:netty-common:4.2.12.Final (14 constraints: 15d00f13) -io.netty:netty-handler:4.2.12.Final (5 constraints: 88458591) -io.netty:netty-handler-proxy:4.2.12.Final (2 constraints: 0d16021d) -io.netty:netty-resolver:4.2.12.Final (3 constraints: 41251658) -io.netty:netty-tcnative-boringssl-static:2.0.75.Final (2 constraints: d51a5f58) -io.netty:netty-tcnative-classes:2.0.75.Final (2 constraints: d61e8d95) -io.netty:netty-transport:4.2.12.Final (11 constraints: 05a916e1) -io.netty:netty-transport-classes-epoll:4.2.12.Final (2 constraints: a31d1134) -io.netty:netty-transport-native-epoll:4.2.12.Final (2 constraints: fc1a4f71) -io.netty:netty-transport-native-unix-common:4.2.12.Final (5 constraints: 5d482b2e) +io.netty:netty-bom:4.2.15.Final (1 constraints: 56074661) +io.netty:netty-buffer:4.2.15.Final (12 constraints: d3b6c64e) +io.netty:netty-codec-base:4.2.15.Final (7 constraints: dd60065d) +io.netty:netty-codec-compression:4.2.15.Final (2 constraints: aa18dfc7) +io.netty:netty-codec-http:4.2.15.Final (4 constraints: 3e2fb563) +io.netty:netty-codec-http2:4.2.15.Final (2 constraints: 1016171d) +io.netty:netty-codec-socks:4.2.15.Final (2 constraints: 0c1a9f1f) +io.netty:netty-common:4.2.15.Final (14 constraints: 3fd01246) +io.netty:netty-handler:4.2.15.Final (5 constraints: 94451097) +io.netty:netty-handler-proxy:4.2.15.Final (2 constraints: 1016171d) +io.netty:netty-resolver:4.2.15.Final (3 constraints: 4a25b759) +io.netty:netty-tcnative-boringssl-static:2.0.77.Final (2 constraints: d71ac958) +io.netty:netty-tcnative-classes:2.0.77.Final (2 constraints: da1e1996) +io.netty:netty-transport:4.2.15.Final (11 constraints: 26a95f01) +io.netty:netty-transport-classes-epoll:4.2.15.Final (2 constraints: a91dda34) +io.netty:netty-transport-native-epoll:4.2.15.Final (2 constraints: ff1af171) +io.netty:netty-transport-native-unix-common:4.2.15.Final (5 constraints: 69481232) io.opencensus:opencensus-api:0.31.1 (5 constraints: 924d4692) io.opencensus:opencensus-contrib-http-util:0.31.1 (3 constraints: 7232a9fc) io.opencensus:opencensus-proto:0.2.0 (1 constraints: e60fd595) diff --git a/versions.props b/versions.props index 9696656c75ea..80d7692b61f0 100644 --- a/versions.props +++ b/versions.props @@ -27,7 +27,7 @@ dev.langchain4j:langchain4j-*=0.35.0 io.dropwizard.metrics:*=4.2.38 io.grpc:grpc-*=1.80.0 io.jaegertracing:*=1.8.1 -io.netty:netty*=4.2.12.Final +io.netty:netty*=4.2.15.Final io.netty:netty-tcnative*=2.0.75.Final io.opentelemetry:opentelemetry-bom=1.53.0 io.opentracing:opentracing*=0.33.0 From e721a3ac7c4a0fe980c081e941ff4ffa219415be Mon Sep 17 00:00:00 2001 From: SolrBot Date: Sun, 7 Jun 2026 19:14:32 +0000 Subject: [PATCH 17/45] Update dependency biz.aQute.bnd:biz.aQute.bnd.annotation to v7 (branch_9x) --- solr/licenses/biz.aQute.bnd.annotation-6.4.1.jar.sha1 | 1 - solr/licenses/biz.aQute.bnd.annotation-7.3.0.jar.sha1 | 1 + versions.lock | 2 +- versions.props | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 solr/licenses/biz.aQute.bnd.annotation-6.4.1.jar.sha1 create mode 100644 solr/licenses/biz.aQute.bnd.annotation-7.3.0.jar.sha1 diff --git a/solr/licenses/biz.aQute.bnd.annotation-6.4.1.jar.sha1 b/solr/licenses/biz.aQute.bnd.annotation-6.4.1.jar.sha1 deleted file mode 100644 index 3046cf2dbf20..000000000000 --- a/solr/licenses/biz.aQute.bnd.annotation-6.4.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -381d53a2e2f48c2623e04990f4a2b06b6885cab1 diff --git a/solr/licenses/biz.aQute.bnd.annotation-7.3.0.jar.sha1 b/solr/licenses/biz.aQute.bnd.annotation-7.3.0.jar.sha1 new file mode 100644 index 000000000000..5e9d6967b94e --- /dev/null +++ b/solr/licenses/biz.aQute.bnd.annotation-7.3.0.jar.sha1 @@ -0,0 +1 @@ +79fa7d75617d803ad8fafe1d45a902ee36b40bb8 diff --git a/versions.lock b/versions.lock index 659611f7d411..1be155beb2e8 100644 --- a/versions.lock +++ b/versions.lock @@ -1,6 +1,6 @@ # Run ./gradlew writeVersionsLocks to regenerate this file at.yawk.lz4:lz4-java:1.10.1 (1 constraints: 260dec28) -biz.aQute.bnd:biz.aQute.bnd.annotation:6.4.1 (1 constraints: 0d051636) +biz.aQute.bnd:biz.aQute.bnd.annotation:7.3.0 (1 constraints: 0c051736) com.carrotsearch:hppc:0.10.0 (2 constraints: d40fecb0) com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.4 (2 constraints: d21594e2) com.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e) diff --git a/versions.props b/versions.props index 9696656c75ea..622e2602e396 100644 --- a/versions.props +++ b/versions.props @@ -1,7 +1,7 @@ # Errorprone must stay on 2.31.0 on 9.x to play nice with JDK11 # Please only add direct dependencies. Overrides of transitive versions should be called out in a comment. # The lines in this file needs to be lexicographically sorted. -biz.aQute.bnd:biz.aQute.bnd.annotation=6.4.1 +biz.aQute.bnd:biz.aQute.bnd.annotation=7.3.0 com.adobe.testing:s3mock-junit4=2.17.0 com.carrotsearch.randomizedtesting:*=2.8.4 com.carrotsearch:hppc=0.10.0 From bf3bb2cad69308e7dc23d38764e105d73fbc279c Mon Sep 17 00:00:00 2001 From: SolrBot Date: Mon, 8 Jun 2026 15:33:36 +0000 Subject: [PATCH 18/45] Update net.bytebuddy:* to v1.18.10-jdk5 (branch_9x) --- solr/licenses/byte-buddy-1.17.7.jar.sha1 | 1 - solr/licenses/byte-buddy-1.18.10-jdk5.jar.sha1 | 1 + solr/licenses/byte-buddy-agent-1.17.7.jar.sha1 | 1 - solr/licenses/byte-buddy-agent-1.18.10-jdk5.jar.sha1 | 1 + versions.lock | 4 ++-- versions.props | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 solr/licenses/byte-buddy-1.17.7.jar.sha1 create mode 100644 solr/licenses/byte-buddy-1.18.10-jdk5.jar.sha1 delete mode 100644 solr/licenses/byte-buddy-agent-1.17.7.jar.sha1 create mode 100644 solr/licenses/byte-buddy-agent-1.18.10-jdk5.jar.sha1 diff --git a/solr/licenses/byte-buddy-1.17.7.jar.sha1 b/solr/licenses/byte-buddy-1.17.7.jar.sha1 deleted file mode 100644 index 1104b3c9420d..000000000000 --- a/solr/licenses/byte-buddy-1.17.7.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3856bfab61beb23e099a0d6629f2ba8de4b98ace diff --git a/solr/licenses/byte-buddy-1.18.10-jdk5.jar.sha1 b/solr/licenses/byte-buddy-1.18.10-jdk5.jar.sha1 new file mode 100644 index 000000000000..d18172c7ee47 --- /dev/null +++ b/solr/licenses/byte-buddy-1.18.10-jdk5.jar.sha1 @@ -0,0 +1 @@ +7f49079987149888863a48740fb905cf37d29157 diff --git a/solr/licenses/byte-buddy-agent-1.17.7.jar.sha1 b/solr/licenses/byte-buddy-agent-1.17.7.jar.sha1 deleted file mode 100644 index 1074f60f1bf8..000000000000 --- a/solr/licenses/byte-buddy-agent-1.17.7.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fbf3d6d649ed37fc9e9c59480a05be0a26e3c2da diff --git a/solr/licenses/byte-buddy-agent-1.18.10-jdk5.jar.sha1 b/solr/licenses/byte-buddy-agent-1.18.10-jdk5.jar.sha1 new file mode 100644 index 000000000000..a35cd1f9f373 --- /dev/null +++ b/solr/licenses/byte-buddy-agent-1.18.10-jdk5.jar.sha1 @@ -0,0 +1 @@ +8fe4b6c25352b52b9558710f094debe2bba827c9 diff --git a/versions.lock b/versions.lock index 659611f7d411..f60341d659d1 100644 --- a/versions.lock +++ b/versions.lock @@ -411,8 +411,8 @@ jakarta.websocket:jakarta.websocket-api:1.1.2 (1 constraints: 92155ab9) jakarta.xml.bind:jakarta.xml.bind-api:2.3.3 (1 constraints: bd0db535) javax.inject:javax.inject:1 (1 constraints: 7a0df617) joda-time:joda-time:2.8.1 (1 constraints: 7a0dd431) -net.bytebuddy:byte-buddy:1.17.7 (2 constraints: 8b1044cc) -net.bytebuddy:byte-buddy-agent:1.17.7 (1 constraints: 4205453b) +net.bytebuddy:byte-buddy:1.18.10-jdk5 (2 constraints: 5112ea2d) +net.bytebuddy:byte-buddy-agent:1.18.10-jdk5 (1 constraints: 08079060) net.java.dev.jna:jna:5.18.1 (2 constraints: 371b0b62) net.minidev:accessors-smart:2.4.9 (1 constraints: 500a92b8) net.minidev:json-smart:2.4.10 (1 constraints: 400e9a7c) diff --git a/versions.props b/versions.props index 9696656c75ea..64a98bea4587 100644 --- a/versions.props +++ b/versions.props @@ -36,7 +36,7 @@ io.prometheus:simpleclient*=0.16.0 io.swagger.core.v3:*=2.2.22 jakarta.ws.rs:jakarta.ws.rs-api=3.1.0 junit:junit=4.13.2 -net.bytebuddy:*=1.17.7 +net.bytebuddy:*=1.18.10-jdk5 net.java.dev.jna:jna=5.18.1 net.thisptr:jackson-jq=0.0.13 no.nav.security:mock-oauth2-server=0.5.10 From 5e0e84ebdbfec80618d7b3f2e2420efe02110307 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Wed, 10 Jun 2026 14:57:01 +0000 Subject: [PATCH 19/45] Update dependency io.opentelemetry:opentelemetry-bom to v1.63.0 (branch_9x) --- solr/licenses/kotlin-stdlib-2.2.0.jar.sha1 | 1 - solr/licenses/kotlin-stdlib-2.2.21.jar.sha1 | 1 + solr/licenses/okhttp-4.12.0.jar.sha1 | 1 - solr/licenses/okhttp-jvm-5.1.0.jar.sha1 | 1 - solr/licenses/okhttp-jvm-5.3.2.jar.sha1 | 1 + solr/licenses/okio-jvm-3.15.0.jar.sha1 | 1 - solr/licenses/okio-jvm-3.16.4.jar.sha1 | 1 + .../opentelemetry-api-1.53.0.jar.sha1 | 1 - .../opentelemetry-api-1.63.0.jar.sha1 | 1 + .../opentelemetry-common-1.53.0.jar.sha1 | 1 - .../opentelemetry-common-1.63.0.jar.sha1 | 1 + .../opentelemetry-context-1.53.0.jar.sha1 | 1 - .../opentelemetry-context-1.63.0.jar.sha1 | 1 + ...ntelemetry-exporter-common-1.53.0.jar.sha1 | 1 - ...ntelemetry-exporter-common-1.63.0.jar.sha1 | 1 + ...pentelemetry-exporter-otlp-1.53.0.jar.sha1 | 1 - ...pentelemetry-exporter-otlp-1.63.0.jar.sha1 | 1 + ...metry-exporter-otlp-common-1.53.0.jar.sha1 | 1 - ...metry-exporter-otlp-common-1.63.0.jar.sha1 | 1 + ...try-exporter-sender-okhttp-1.53.0.jar.sha1 | 1 - ...try-exporter-sender-okhttp-1.63.0.jar.sha1 | 1 + ...telemetry-opentracing-shim-1.53.0.jar.sha1 | 1 - ...telemetry-opentracing-shim-1.63.0.jar.sha1 | 1 + .../opentelemetry-sdk-1.53.0.jar.sha1 | 1 - .../opentelemetry-sdk-1.63.0.jar.sha1 | 1 + .../opentelemetry-sdk-common-1.53.0.jar.sha1 | 1 - .../opentelemetry-sdk-common-1.63.0.jar.sha1 | 1 + ...dk-extension-autoconfigure-1.53.0.jar.sha1 | 1 - ...dk-extension-autoconfigure-1.63.0.jar.sha1 | 1 + ...xtension-autoconfigure-spi-1.53.0.jar.sha1 | 1 - ...xtension-autoconfigure-spi-1.63.0.jar.sha1 | 1 + .../opentelemetry-sdk-logs-1.53.0.jar.sha1 | 1 - .../opentelemetry-sdk-logs-1.63.0.jar.sha1 | 1 + .../opentelemetry-sdk-metrics-1.53.0.jar.sha1 | 1 - .../opentelemetry-sdk-metrics-1.63.0.jar.sha1 | 1 + .../opentelemetry-sdk-trace-1.53.0.jar.sha1 | 1 - .../opentelemetry-sdk-trace-1.63.0.jar.sha1 | 1 + versions.lock | 46 +++++++++---------- versions.props | 2 +- 39 files changed, 42 insertions(+), 43 deletions(-) delete mode 100644 solr/licenses/kotlin-stdlib-2.2.0.jar.sha1 create mode 100644 solr/licenses/kotlin-stdlib-2.2.21.jar.sha1 delete mode 100644 solr/licenses/okhttp-4.12.0.jar.sha1 delete mode 100644 solr/licenses/okhttp-jvm-5.1.0.jar.sha1 create mode 100644 solr/licenses/okhttp-jvm-5.3.2.jar.sha1 delete mode 100644 solr/licenses/okio-jvm-3.15.0.jar.sha1 create mode 100644 solr/licenses/okio-jvm-3.16.4.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-api-1.53.0.jar.sha1 create mode 100644 solr/licenses/opentelemetry-api-1.63.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-common-1.53.0.jar.sha1 create mode 100644 solr/licenses/opentelemetry-common-1.63.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-context-1.53.0.jar.sha1 create mode 100644 solr/licenses/opentelemetry-context-1.63.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-exporter-common-1.53.0.jar.sha1 create mode 100644 solr/licenses/opentelemetry-exporter-common-1.63.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-exporter-otlp-1.53.0.jar.sha1 create mode 100644 solr/licenses/opentelemetry-exporter-otlp-1.63.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-exporter-otlp-common-1.53.0.jar.sha1 create mode 100644 solr/licenses/opentelemetry-exporter-otlp-common-1.63.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-exporter-sender-okhttp-1.53.0.jar.sha1 create mode 100644 solr/licenses/opentelemetry-exporter-sender-okhttp-1.63.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-opentracing-shim-1.53.0.jar.sha1 create mode 100644 solr/licenses/opentelemetry-opentracing-shim-1.63.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-sdk-1.53.0.jar.sha1 create mode 100644 solr/licenses/opentelemetry-sdk-1.63.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-sdk-common-1.53.0.jar.sha1 create mode 100644 solr/licenses/opentelemetry-sdk-common-1.63.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.53.0.jar.sha1 create mode 100644 solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.63.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.53.0.jar.sha1 create mode 100644 solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.63.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-sdk-logs-1.53.0.jar.sha1 create mode 100644 solr/licenses/opentelemetry-sdk-logs-1.63.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-sdk-metrics-1.53.0.jar.sha1 create mode 100644 solr/licenses/opentelemetry-sdk-metrics-1.63.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-sdk-trace-1.53.0.jar.sha1 create mode 100644 solr/licenses/opentelemetry-sdk-trace-1.63.0.jar.sha1 diff --git a/solr/licenses/kotlin-stdlib-2.2.0.jar.sha1 b/solr/licenses/kotlin-stdlib-2.2.0.jar.sha1 deleted file mode 100644 index 509f04545dec..000000000000 --- a/solr/licenses/kotlin-stdlib-2.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fdfc65fbc42fda253a26f61dac3c0aca335fae96 diff --git a/solr/licenses/kotlin-stdlib-2.2.21.jar.sha1 b/solr/licenses/kotlin-stdlib-2.2.21.jar.sha1 new file mode 100644 index 000000000000..b3aaadc50d78 --- /dev/null +++ b/solr/licenses/kotlin-stdlib-2.2.21.jar.sha1 @@ -0,0 +1 @@ +fa374a986e128314c3db00a20aae55f72a258511 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 7000de25fabc..000000000000 --- a/solr/licenses/okhttp-4.12.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2f4525d4a200e97e1b87449c2cd9bd2e25b7e8cd diff --git a/solr/licenses/okhttp-jvm-5.1.0.jar.sha1 b/solr/licenses/okhttp-jvm-5.1.0.jar.sha1 deleted file mode 100644 index 4f6b39d8286a..000000000000 --- a/solr/licenses/okhttp-jvm-5.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c17340f19b33c1d28a47b8dc4ae15018aff6dc10 diff --git a/solr/licenses/okhttp-jvm-5.3.2.jar.sha1 b/solr/licenses/okhttp-jvm-5.3.2.jar.sha1 new file mode 100644 index 000000000000..2edd40fd7e5f --- /dev/null +++ b/solr/licenses/okhttp-jvm-5.3.2.jar.sha1 @@ -0,0 +1 @@ +f31e8de27feebe1e56d6c9d354a0986b65be0e1d diff --git a/solr/licenses/okio-jvm-3.15.0.jar.sha1 b/solr/licenses/okio-jvm-3.15.0.jar.sha1 deleted file mode 100644 index 47b83b79d436..000000000000 --- a/solr/licenses/okio-jvm-3.15.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -cb3c285187640f543150fcac1ae012bdd778c0e1 diff --git a/solr/licenses/okio-jvm-3.16.4.jar.sha1 b/solr/licenses/okio-jvm-3.16.4.jar.sha1 new file mode 100644 index 000000000000..97f8e4eb6242 --- /dev/null +++ b/solr/licenses/okio-jvm-3.16.4.jar.sha1 @@ -0,0 +1 @@ +ceb794cf0bbf8d0d20f49aa91ce20db7fd77675d diff --git a/solr/licenses/opentelemetry-api-1.53.0.jar.sha1 b/solr/licenses/opentelemetry-api-1.53.0.jar.sha1 deleted file mode 100644 index 2c89b0239f91..000000000000 --- a/solr/licenses/opentelemetry-api-1.53.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fc6d4f6a0f5c5a97cbafbd198f5008ba8a023c3f diff --git a/solr/licenses/opentelemetry-api-1.63.0.jar.sha1 b/solr/licenses/opentelemetry-api-1.63.0.jar.sha1 new file mode 100644 index 000000000000..4d520c3f678f --- /dev/null +++ b/solr/licenses/opentelemetry-api-1.63.0.jar.sha1 @@ -0,0 +1 @@ +39c923c0f236417ec8c4e2091f9e3032b4b6fb91 diff --git a/solr/licenses/opentelemetry-common-1.53.0.jar.sha1 b/solr/licenses/opentelemetry-common-1.53.0.jar.sha1 deleted file mode 100644 index 466f1044f444..000000000000 --- a/solr/licenses/opentelemetry-common-1.53.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e9ee5d5738ee7a8e00a12922920af3f05daa9c42 diff --git a/solr/licenses/opentelemetry-common-1.63.0.jar.sha1 b/solr/licenses/opentelemetry-common-1.63.0.jar.sha1 new file mode 100644 index 000000000000..92b1d5a7619b --- /dev/null +++ b/solr/licenses/opentelemetry-common-1.63.0.jar.sha1 @@ -0,0 +1 @@ +450f8d552f33d51b19457d1336d8f7bdaec35e01 diff --git a/solr/licenses/opentelemetry-context-1.53.0.jar.sha1 b/solr/licenses/opentelemetry-context-1.53.0.jar.sha1 deleted file mode 100644 index ca8ef1d1fe1b..000000000000 --- a/solr/licenses/opentelemetry-context-1.53.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9733ca6c3741f0f40de6c99f9874fc239ed066cf diff --git a/solr/licenses/opentelemetry-context-1.63.0.jar.sha1 b/solr/licenses/opentelemetry-context-1.63.0.jar.sha1 new file mode 100644 index 000000000000..fe9535c75a06 --- /dev/null +++ b/solr/licenses/opentelemetry-context-1.63.0.jar.sha1 @@ -0,0 +1 @@ +4af6d513cedbf78dafe104f82f8dce7c7a205f07 diff --git a/solr/licenses/opentelemetry-exporter-common-1.53.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-common-1.53.0.jar.sha1 deleted file mode 100644 index c54609d0410b..000000000000 --- a/solr/licenses/opentelemetry-exporter-common-1.53.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a42984afaa0216de2667d56f5996926055b5f8d8 diff --git a/solr/licenses/opentelemetry-exporter-common-1.63.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-common-1.63.0.jar.sha1 new file mode 100644 index 000000000000..3e1869a902a3 --- /dev/null +++ b/solr/licenses/opentelemetry-exporter-common-1.63.0.jar.sha1 @@ -0,0 +1 @@ +75e2658228eb885770b894f71e8d145d46095fdf diff --git a/solr/licenses/opentelemetry-exporter-otlp-1.53.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-otlp-1.53.0.jar.sha1 deleted file mode 100644 index 6dbd74485bde..000000000000 --- a/solr/licenses/opentelemetry-exporter-otlp-1.53.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -092aa3e070ab3f70f9edaa457a777a4bcdc0570b diff --git a/solr/licenses/opentelemetry-exporter-otlp-1.63.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-otlp-1.63.0.jar.sha1 new file mode 100644 index 000000000000..0d6393d6194c --- /dev/null +++ b/solr/licenses/opentelemetry-exporter-otlp-1.63.0.jar.sha1 @@ -0,0 +1 @@ +7f02be0f4f2c44476e957bce9d7f7d3e0a1a7ae4 diff --git a/solr/licenses/opentelemetry-exporter-otlp-common-1.53.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-otlp-common-1.53.0.jar.sha1 deleted file mode 100644 index 4edbd1a40400..000000000000 --- a/solr/licenses/opentelemetry-exporter-otlp-common-1.53.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fb3f8b04344b47ffe4b78db487ba9997e0fbb36d diff --git a/solr/licenses/opentelemetry-exporter-otlp-common-1.63.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-otlp-common-1.63.0.jar.sha1 new file mode 100644 index 000000000000..fafd1c7f84fb --- /dev/null +++ b/solr/licenses/opentelemetry-exporter-otlp-common-1.63.0.jar.sha1 @@ -0,0 +1 @@ +d6a9a75d3e4b9f69a67c3a333162a3b0783178c0 diff --git a/solr/licenses/opentelemetry-exporter-sender-okhttp-1.53.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-sender-okhttp-1.53.0.jar.sha1 deleted file mode 100644 index a3bcba0ace54..000000000000 --- a/solr/licenses/opentelemetry-exporter-sender-okhttp-1.53.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -27f729e20bd15d32b3e971d62332064cee503d5a diff --git a/solr/licenses/opentelemetry-exporter-sender-okhttp-1.63.0.jar.sha1 b/solr/licenses/opentelemetry-exporter-sender-okhttp-1.63.0.jar.sha1 new file mode 100644 index 000000000000..dcfbbd0e210a --- /dev/null +++ b/solr/licenses/opentelemetry-exporter-sender-okhttp-1.63.0.jar.sha1 @@ -0,0 +1 @@ +2045d90ed21954e0f61e900d168034e17711c7e9 diff --git a/solr/licenses/opentelemetry-opentracing-shim-1.53.0.jar.sha1 b/solr/licenses/opentelemetry-opentracing-shim-1.53.0.jar.sha1 deleted file mode 100644 index 8e5e493382aa..000000000000 --- a/solr/licenses/opentelemetry-opentracing-shim-1.53.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bf1f25a18e8273b737f04aa6e82501026e15c105 diff --git a/solr/licenses/opentelemetry-opentracing-shim-1.63.0.jar.sha1 b/solr/licenses/opentelemetry-opentracing-shim-1.63.0.jar.sha1 new file mode 100644 index 000000000000..3711a8bd988e --- /dev/null +++ b/solr/licenses/opentelemetry-opentracing-shim-1.63.0.jar.sha1 @@ -0,0 +1 @@ +4b10ad39102495c76a8d9883f073af6d4e8431cd diff --git a/solr/licenses/opentelemetry-sdk-1.53.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-1.53.0.jar.sha1 deleted file mode 100644 index 946da446cd42..000000000000 --- a/solr/licenses/opentelemetry-sdk-1.53.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c49f224a0d8a4cb5392aa8fbc4742248d6c71a85 diff --git a/solr/licenses/opentelemetry-sdk-1.63.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-1.63.0.jar.sha1 new file mode 100644 index 000000000000..dfa41e2f681e --- /dev/null +++ b/solr/licenses/opentelemetry-sdk-1.63.0.jar.sha1 @@ -0,0 +1 @@ +1d522dcf3fb4903c7f95835c3f6f631cf1c3824b diff --git a/solr/licenses/opentelemetry-sdk-common-1.53.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-common-1.53.0.jar.sha1 deleted file mode 100644 index 4e6a52028da7..000000000000 --- a/solr/licenses/opentelemetry-sdk-common-1.53.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2180d1e384d1de5dddd00b7ca66513846aff70d8 diff --git a/solr/licenses/opentelemetry-sdk-common-1.63.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-common-1.63.0.jar.sha1 new file mode 100644 index 000000000000..0883fa8952e0 --- /dev/null +++ b/solr/licenses/opentelemetry-sdk-common-1.63.0.jar.sha1 @@ -0,0 +1 @@ +db2ec1f09c307adcf015bb8a87dd687eefa32e77 diff --git a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.53.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.53.0.jar.sha1 deleted file mode 100644 index d106d839d1fb..000000000000 --- a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.53.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c708fa8294ffa0a1452ef29c442d804246ca6e35 diff --git a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.63.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.63.0.jar.sha1 new file mode 100644 index 000000000000..0a85030199e3 --- /dev/null +++ b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-1.63.0.jar.sha1 @@ -0,0 +1 @@ +18fca38c89e76af8992cfc0423536434148a7d3e diff --git a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.53.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.53.0.jar.sha1 deleted file mode 100644 index 9d6291e1b3a3..000000000000 --- a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.53.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c2fff90b3070662d292071487db0ae180dbfded3 diff --git a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.63.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.63.0.jar.sha1 new file mode 100644 index 000000000000..855056948819 --- /dev/null +++ b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.63.0.jar.sha1 @@ -0,0 +1 @@ +cbe3039cd5b86e983bc6153b70132e8d5d74ca4b diff --git a/solr/licenses/opentelemetry-sdk-logs-1.53.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-logs-1.53.0.jar.sha1 deleted file mode 100644 index 1237acf55bbd..000000000000 --- a/solr/licenses/opentelemetry-sdk-logs-1.53.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -26f1c04034202b0645cfe6f320c8d65ec6753275 diff --git a/solr/licenses/opentelemetry-sdk-logs-1.63.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-logs-1.63.0.jar.sha1 new file mode 100644 index 000000000000..d65ac4087263 --- /dev/null +++ b/solr/licenses/opentelemetry-sdk-logs-1.63.0.jar.sha1 @@ -0,0 +1 @@ +ef1e93dc6e05d2b9191d7fb9449fea8965086acb diff --git a/solr/licenses/opentelemetry-sdk-metrics-1.53.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-metrics-1.53.0.jar.sha1 deleted file mode 100644 index a22950457db5..000000000000 --- a/solr/licenses/opentelemetry-sdk-metrics-1.53.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b264c6929feffe6632b99a0b9812278ff1779135 diff --git a/solr/licenses/opentelemetry-sdk-metrics-1.63.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-metrics-1.63.0.jar.sha1 new file mode 100644 index 000000000000..256c4b17e433 --- /dev/null +++ b/solr/licenses/opentelemetry-sdk-metrics-1.63.0.jar.sha1 @@ -0,0 +1 @@ +decbaf0de6dbe8156aa426ddc85b5b38354a236b diff --git a/solr/licenses/opentelemetry-sdk-trace-1.53.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-trace-1.53.0.jar.sha1 deleted file mode 100644 index 873e56283797..000000000000 --- a/solr/licenses/opentelemetry-sdk-trace-1.53.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d5f3c5243bfe5452db3941ce048f621415aac3a1 diff --git a/solr/licenses/opentelemetry-sdk-trace-1.63.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-trace-1.63.0.jar.sha1 new file mode 100644 index 000000000000..87f503089f9c --- /dev/null +++ b/solr/licenses/opentelemetry-sdk-trace-1.63.0.jar.sha1 @@ -0,0 +1 @@ +5c948707623a0dbd79105eb29461f42bfe0db11b diff --git a/versions.lock b/versions.lock index 659611f7d411..b6f05c601c3e 100644 --- a/versions.lock +++ b/versions.lock @@ -62,11 +62,11 @@ com.j256.simplemagic:simplemagic:1.17 (1 constraints: dd04f830) com.jayway.jsonpath:json-path:2.9.0 (2 constraints: 6f12c62c) com.knuddels:jtokkit:1.1.0 (1 constraints: 9d0e146a) com.lmax:disruptor:3.4.4 (1 constraints: 0d050a36) -com.squareup.okhttp3:okhttp:4.12.0 (8 constraints: 76707ed2) -com.squareup.okhttp3:okhttp-jvm:5.1.0 (1 constraints: 1317930c) +com.squareup.okhttp3:okhttp:5.3.2 (9 constraints: 8c87131d) +com.squareup.okhttp3:okhttp-jvm:5.3.2 (1 constraints: 540c3bfd) com.squareup.okhttp3:okhttp-sse:4.12.0 (2 constraints: 13189cad) -com.squareup.okio:okio:3.15.0 (2 constraints: 4f1a293d) -com.squareup.okio:okio-jvm:3.15.0 (1 constraints: 800a50c4) +com.squareup.okio:okio:3.16.4 (1 constraints: 020ea946) +com.squareup.okio:okio-jvm:3.16.4 (1 constraints: 850a57c4) com.squareup.retrofit2:converter-jackson:2.9.0 (4 constraints: ce36e7ea) com.squareup.retrofit2:retrofit:2.9.0 (5 constraints: 4a48510b) com.tdunning:t-digest:3.3 (1 constraints: aa04232c) @@ -135,22 +135,22 @@ io.netty:netty-transport-native-unix-common:4.2.12.Final (5 constraints: 5d482b2 io.opencensus:opencensus-api:0.31.1 (5 constraints: 924d4692) io.opencensus:opencensus-contrib-http-util:0.31.1 (3 constraints: 7232a9fc) io.opencensus:opencensus-proto:0.2.0 (1 constraints: e60fd595) -io.opentelemetry:opentelemetry-api:1.53.0 (8 constraints: e090e9f7) -io.opentelemetry:opentelemetry-bom:1.53.0 (1 constraints: 3b05423b) -io.opentelemetry:opentelemetry-common:1.53.0 (2 constraints: f2205f41) -io.opentelemetry:opentelemetry-context:1.53.0 (2 constraints: 271fd2b4) -io.opentelemetry:opentelemetry-exporter-common:1.53.0 (3 constraints: 4d3d0eac) -io.opentelemetry:opentelemetry-exporter-otlp:1.53.0 (1 constraints: 960ff383) -io.opentelemetry:opentelemetry-exporter-otlp-common:1.53.0 (2 constraints: 52233d1c) -io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.53.0 (2 constraints: 52233d1c) -io.opentelemetry:opentelemetry-opentracing-shim:1.53.0 (1 constraints: 960ff383) -io.opentelemetry:opentelemetry-sdk:1.53.0 (3 constraints: a543e8e4) -io.opentelemetry:opentelemetry-sdk-common:1.53.0 (6 constraints: 816c3965) -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.53.0 (1 constraints: 960ff383) -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.53.0 (4 constraints: 235183d1) -io.opentelemetry:opentelemetry-sdk-logs:1.53.0 (3 constraints: eb32b9b2) -io.opentelemetry:opentelemetry-sdk-metrics:1.53.0 (3 constraints: eb32b9b2) -io.opentelemetry:opentelemetry-sdk-trace:1.53.0 (3 constraints: eb32b9b2) +io.opentelemetry:opentelemetry-api:1.63.0 (8 constraints: e8908efd) +io.opentelemetry:opentelemetry-bom:1.63.0 (1 constraints: 3c05463b) +io.opentelemetry:opentelemetry-common:1.63.0 (2 constraints: f4209741) +io.opentelemetry:opentelemetry-context:1.63.0 (2 constraints: 291f06b5) +io.opentelemetry:opentelemetry-exporter-common:1.63.0 (3 constraints: 503dd5ac) +io.opentelemetry:opentelemetry-exporter-otlp:1.63.0 (1 constraints: 970ff783) +io.opentelemetry:opentelemetry-exporter-otlp-common:1.63.0 (2 constraints: 54237b1c) +io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.63.0 (2 constraints: 54237b1c) +io.opentelemetry:opentelemetry-opentracing-shim:1.63.0 (1 constraints: 970ff783) +io.opentelemetry:opentelemetry-sdk:1.63.0 (3 constraints: a843c8e5) +io.opentelemetry:opentelemetry-sdk-common:1.63.0 (6 constraints: 876c4568) +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.63.0 (1 constraints: 970ff783) +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.63.0 (2 constraints: e328cf4e) +io.opentelemetry:opentelemetry-sdk-logs:1.63.0 (3 constraints: ee3253b3) +io.opentelemetry:opentelemetry-sdk-metrics:1.63.0 (3 constraints: ee3253b3) +io.opentelemetry:opentelemetry-sdk-trace:1.63.0 (3 constraints: ee3253b3) io.opentracing:opentracing-api:0.33.0 (6 constraints: 195100dd) io.opentracing:opentracing-noop:0.33.0 (4 constraints: 48361e21) io.opentracing:opentracing-util:0.33.0 (3 constraints: f71f843b) @@ -315,9 +315,9 @@ org.immutables:value-annotations:2.12.1 (1 constraints: 3805363b) org.javassist:javassist:3.30.2-GA (1 constraints: 2811fff0) org.jctools:jctools-core:4.0.6 (1 constraints: 0c050536) org.jetbrains:annotations:17.0.0 (2 constraints: 371c92e0) -org.jetbrains.kotlin:kotlin-stdlib:2.2.0 (7 constraints: db6ba2e1) +org.jetbrains.kotlin:kotlin-stdlib:2.2.21 (7 constraints: 416c1c84) org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 (2 constraints: f31f0a21) -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 (8 constraints: 5f7a37d5) +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 (7 constraints: da6d50f8) org.jspecify:jspecify:1.0.0 (3 constraints: b1233dfa) org.locationtech.jts:jts-core:1.19.0 (2 constraints: a31de760) org.locationtech.jts.io:jts-io-common:1.19.0 (1 constraints: 930d513a) @@ -439,7 +439,7 @@ org.glassfish.jaxb:txw2:2.3.8 (1 constraints: c20dba35) org.hdrhistogram:HdrHistogram:2.1.12 (1 constraints: 520d2029) org.hsqldb:hsqldb:2.7.4 (1 constraints: 0f050e36) org.jetbrains.kotlin:kotlin-reflect:1.8.22 (2 constraints: 6624c6e2) -org.jetbrains.kotlin:kotlin-stdlib-common:2.2.0 (2 constraints: 0820970a) +org.jetbrains.kotlin:kotlin-stdlib-common:2.2.21 (2 constraints: 3b20d42a) org.latencyutils:LatencyUtils:2.0.3 (1 constraints: 210dcd1b) org.mockito:mockito-core:5.23.0 (2 constraints: 3612e31b) org.mockito:mockito-subclass:5.23.0 (1 constraints: 3c054e3b) diff --git a/versions.props b/versions.props index 9696656c75ea..f2da200fa944 100644 --- a/versions.props +++ b/versions.props @@ -29,7 +29,7 @@ io.grpc:grpc-*=1.80.0 io.jaegertracing:*=1.8.1 io.netty:netty*=4.2.12.Final io.netty:netty-tcnative*=2.0.75.Final -io.opentelemetry:opentelemetry-bom=1.53.0 +io.opentelemetry:opentelemetry-bom=1.63.0 io.opentracing:opentracing*=0.33.0 io.prometheus:prometheus*=1.5.1 io.prometheus:simpleclient*=0.16.0 From ff450a5dd0f8ac3a94f15283d8f66d3ababe5b78 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Tue, 16 Jun 2026 16:28:55 +0000 Subject: [PATCH 20/45] Update io.prometheus:prometheus* to v1.8.0 (branch_9x) --- solr/licenses/prometheus-metrics-config-1.5.1.jar.sha1 | 1 - solr/licenses/prometheus-metrics-config-1.8.0.jar.sha1 | 1 + ...prometheus-metrics-exposition-textformats-1.5.1.jar.sha1 | 1 - ...prometheus-metrics-exposition-textformats-1.8.0.jar.sha1 | 1 + solr/licenses/prometheus-metrics-model-1.5.1.jar.sha1 | 1 - solr/licenses/prometheus-metrics-model-1.8.0.jar.sha1 | 1 + versions.lock | 6 +++--- versions.props | 2 +- 8 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 solr/licenses/prometheus-metrics-config-1.5.1.jar.sha1 create mode 100644 solr/licenses/prometheus-metrics-config-1.8.0.jar.sha1 delete mode 100644 solr/licenses/prometheus-metrics-exposition-textformats-1.5.1.jar.sha1 create mode 100644 solr/licenses/prometheus-metrics-exposition-textformats-1.8.0.jar.sha1 delete mode 100644 solr/licenses/prometheus-metrics-model-1.5.1.jar.sha1 create mode 100644 solr/licenses/prometheus-metrics-model-1.8.0.jar.sha1 diff --git a/solr/licenses/prometheus-metrics-config-1.5.1.jar.sha1 b/solr/licenses/prometheus-metrics-config-1.5.1.jar.sha1 deleted file mode 100644 index 2212deb0d190..000000000000 --- a/solr/licenses/prometheus-metrics-config-1.5.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ad86683e4e0047f0c85906378bc3b6214155e4f6 diff --git a/solr/licenses/prometheus-metrics-config-1.8.0.jar.sha1 b/solr/licenses/prometheus-metrics-config-1.8.0.jar.sha1 new file mode 100644 index 000000000000..d05c311f3c4d --- /dev/null +++ b/solr/licenses/prometheus-metrics-config-1.8.0.jar.sha1 @@ -0,0 +1 @@ +42e6da5241a6e66ccb788da6fc62a6e6c588658d diff --git a/solr/licenses/prometheus-metrics-exposition-textformats-1.5.1.jar.sha1 b/solr/licenses/prometheus-metrics-exposition-textformats-1.5.1.jar.sha1 deleted file mode 100644 index cc15cff4ddaa..000000000000 --- a/solr/licenses/prometheus-metrics-exposition-textformats-1.5.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a19fc890e26391515134c2a3f4ae960b7d393206 diff --git a/solr/licenses/prometheus-metrics-exposition-textformats-1.8.0.jar.sha1 b/solr/licenses/prometheus-metrics-exposition-textformats-1.8.0.jar.sha1 new file mode 100644 index 000000000000..92739ce67577 --- /dev/null +++ b/solr/licenses/prometheus-metrics-exposition-textformats-1.8.0.jar.sha1 @@ -0,0 +1 @@ +6fa37bb0e23926b4fd90f5a05063522ba426a6f0 diff --git a/solr/licenses/prometheus-metrics-model-1.5.1.jar.sha1 b/solr/licenses/prometheus-metrics-model-1.5.1.jar.sha1 deleted file mode 100644 index 537c9850f840..000000000000 --- a/solr/licenses/prometheus-metrics-model-1.5.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4fc0389959f2d4b7812fac6af1e925c4c1991fbb diff --git a/solr/licenses/prometheus-metrics-model-1.8.0.jar.sha1 b/solr/licenses/prometheus-metrics-model-1.8.0.jar.sha1 new file mode 100644 index 000000000000..5ed4770e35e8 --- /dev/null +++ b/solr/licenses/prometheus-metrics-model-1.8.0.jar.sha1 @@ -0,0 +1 @@ +cd79bf59ba6d5c014e2b7380f83c9359d68445ef diff --git a/versions.lock b/versions.lock index 659611f7d411..e2a86feecf43 100644 --- a/versions.lock +++ b/versions.lock @@ -155,9 +155,9 @@ io.opentracing:opentracing-api:0.33.0 (6 constraints: 195100dd) io.opentracing:opentracing-noop:0.33.0 (4 constraints: 48361e21) io.opentracing:opentracing-util:0.33.0 (3 constraints: f71f843b) io.perfmark:perfmark-api:0.27.0 (3 constraints: 24218716) -io.prometheus:prometheus-metrics-config:1.5.1 (1 constraints: d9101ebb) -io.prometheus:prometheus-metrics-exposition-textformats:1.5.1 (1 constraints: 09050036) -io.prometheus:prometheus-metrics-model:1.5.1 (2 constraints: 101dd0b7) +io.prometheus:prometheus-metrics-config:1.8.0 (1 constraints: db1026bb) +io.prometheus:prometheus-metrics-exposition-textformats:1.8.0 (1 constraints: 0b050836) +io.prometheus:prometheus-metrics-model:1.8.0 (2 constraints: 141d60b8) io.prometheus:simpleclient:0.16.0 (3 constraints: 9d257513) io.prometheus:simpleclient_common:0.16.0 (1 constraints: 1a1139c0) io.prometheus:simpleclient_httpserver:0.16.0 (1 constraints: 3905353b) diff --git a/versions.props b/versions.props index 9696656c75ea..fe62c46d4a07 100644 --- a/versions.props +++ b/versions.props @@ -31,7 +31,7 @@ io.netty:netty*=4.2.12.Final io.netty:netty-tcnative*=2.0.75.Final io.opentelemetry:opentelemetry-bom=1.53.0 io.opentracing:opentracing*=0.33.0 -io.prometheus:prometheus*=1.5.1 +io.prometheus:prometheus*=1.8.0 io.prometheus:simpleclient*=0.16.0 io.swagger.core.v3:*=2.2.22 jakarta.ws.rs:jakarta.ws.rs-api=3.1.0 From e35d6365ade8499bda2d65dc3fcb20641e11cd51 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Wed, 17 Jun 2026 02:43:38 +0000 Subject: [PATCH 21/45] Update com.google.protobuf:* to v4.35.1 (branch_9x) --- solr/licenses/protobuf-java-4.34.1.jar.sha1 | 1 - solr/licenses/protobuf-java-4.35.1.jar.sha1 | 1 + solr/licenses/protobuf-java-util-4.34.1.jar.sha1 | 1 - solr/licenses/protobuf-java-util-4.35.1.jar.sha1 | 1 + versions.lock | 4 ++-- versions.props | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 solr/licenses/protobuf-java-4.34.1.jar.sha1 create mode 100644 solr/licenses/protobuf-java-4.35.1.jar.sha1 delete mode 100644 solr/licenses/protobuf-java-util-4.34.1.jar.sha1 create mode 100644 solr/licenses/protobuf-java-util-4.35.1.jar.sha1 diff --git a/solr/licenses/protobuf-java-4.34.1.jar.sha1 b/solr/licenses/protobuf-java-4.34.1.jar.sha1 deleted file mode 100644 index 97404fe07808..000000000000 --- a/solr/licenses/protobuf-java-4.34.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e3b07cd3be66ec918b9fa4db9863c86d5eeea891 diff --git a/solr/licenses/protobuf-java-4.35.1.jar.sha1 b/solr/licenses/protobuf-java-4.35.1.jar.sha1 new file mode 100644 index 000000000000..189f88252792 --- /dev/null +++ b/solr/licenses/protobuf-java-4.35.1.jar.sha1 @@ -0,0 +1 @@ +b933d3f9fc35b0356f28980c2ffc5892d297eebf diff --git a/solr/licenses/protobuf-java-util-4.34.1.jar.sha1 b/solr/licenses/protobuf-java-util-4.34.1.jar.sha1 deleted file mode 100644 index e3e01d23cde0..000000000000 --- a/solr/licenses/protobuf-java-util-4.34.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -229b622286699e974977b347e188138519241a37 diff --git a/solr/licenses/protobuf-java-util-4.35.1.jar.sha1 b/solr/licenses/protobuf-java-util-4.35.1.jar.sha1 new file mode 100644 index 000000000000..d32b8c1ad2f5 --- /dev/null +++ b/solr/licenses/protobuf-java-util-4.35.1.jar.sha1 @@ -0,0 +1 @@ +3ea4772e5b79ba8ff3050bc85252a1dca36711f8 diff --git a/versions.lock b/versions.lock index 659611f7d411..e725bffdbcb8 100644 --- a/versions.lock +++ b/versions.lock @@ -52,8 +52,8 @@ com.google.http-client:google-http-client-gson:1.44.2 (7 constraints: 68702d4e) com.google.http-client:google-http-client-jackson2:1.44.2 (1 constraints: 1f1009a6) com.google.j2objc:j2objc-annotations:3.1 (4 constraints: cb35bfba) com.google.oauth-client:google-oauth-client:1.36.0 (2 constraints: b720ee75) -com.google.protobuf:protobuf-java:4.34.1 (9 constraints: 4483fb93) -com.google.protobuf:protobuf-java-util:4.34.1 (4 constraints: 79302007) +com.google.protobuf:protobuf-java:4.35.1 (9 constraints: 45834e94) +com.google.protobuf:protobuf-java-util:4.35.1 (4 constraints: 7a30a307) com.google.re2j:re2j:1.8 (2 constraints: 3a140270) com.googlecode.json-simple:json-simple:1.1.1 (1 constraints: d90f7798) com.helger:profiler:1.1.1 (1 constraints: e21053b8) diff --git a/versions.props b/versions.props index 9696656c75ea..de3ec88a61fd 100644 --- a/versions.props +++ b/versions.props @@ -13,7 +13,7 @@ com.github.stephenc.jcip:jcip-annotations=1.0-1 com.google.cloud:google-cloud-bom=0.224.0 com.google.errorprone:*=2.31.0 com.google.guava:guava=33.6.0-jre -com.google.protobuf:*=4.34.1 +com.google.protobuf:*=4.35.1 com.google.re2j:re2j=1.8 com.j256.simplemagic:simplemagic=1.17 com.jayway.jsonpath:json-path=2.9.0 From 6e3f6ffbf562ea64af9695d0c3b79e79b7472fba Mon Sep 17 00:00:00 2001 From: SolrBot Date: Thu, 18 Jun 2026 02:41:25 +0000 Subject: [PATCH 22/45] Update dependency com.google.cloud:google-cloud-bom to v0.265.0 (branch_9x) --- solr/licenses/api-common-2.33.0.jar.sha1 | 1 - solr/licenses/api-common-2.64.0.jar.sha1 | 1 + .../auto-value-annotations-1.10.4.jar.sha1 | 1 - .../auto-value-annotations-1.11.0.jar.sha1 | 1 + solr/licenses/checker-qual-3.44.0.jar.sha1 | 1 - solr/licenses/checker-qual-3.49.0.jar.sha1 | 1 + ...detector-resources-support-0.33.0.jar.sha1 | 1 + .../licenses/exporter-metrics-0.33.0.jar.sha1 | 1 + ...gle-cloud-storage-v2-2.40.1-alpha.jar.sha1 | 1 - ...ic-google-cloud-storage-v2-2.69.0.jar.sha1 | 1 + solr/licenses/gax-2.50.0.jar.sha1 | 1 - solr/licenses/gax-2.81.0.jar.sha1 | 1 + solr/licenses/gax-grpc-2.50.0.jar.sha1 | 1 - solr/licenses/gax-grpc-2.81.0.jar.sha1 | 1 + solr/licenses/gax-httpjson-2.50.0.jar.sha1 | 1 - solr/licenses/gax-httpjson-2.81.0.jar.sha1 | 1 + .../licenses/google-api-client-2.6.0.jar.sha1 | 1 - .../licenses/google-api-client-2.7.2.jar.sha1 | 1 + ...ices-storage-v1-rev20240621-2.0.0.jar.sha1 | 1 - ...ices-storage-v1-rev20260204-2.0.0.jar.sha1 | 1 + ...e-auth-library-credentials-1.23.0.jar.sha1 | 1 - ...e-auth-library-credentials-1.48.0.jar.sha1 | 1 + ...e-auth-library-oauth2-http-1.23.0.jar.sha1 | 1 - ...e-auth-library-oauth2-http-1.48.0.jar.sha1 | 1 + .../google-cloud-core-2.40.0.jar.sha1 | 1 - .../google-cloud-core-2.71.0.jar.sha1 | 1 + .../google-cloud-core-grpc-2.40.0.jar.sha1 | 1 - .../google-cloud-core-grpc-2.71.0.jar.sha1 | 1 + .../google-cloud-core-http-2.40.0.jar.sha1 | 1 - .../google-cloud-core-http-2.71.0.jar.sha1 | 1 + .../google-cloud-monitoring-3.94.0.jar.sha1 | 1 + .../google-cloud-nio-0.127.20.jar.sha1 | 1 - .../google-cloud-nio-0.133.0.jar.sha1 | 1 + .../google-cloud-storage-2.40.1.jar.sha1 | 1 - .../google-cloud-storage-2.69.0.jar.sha1 | 1 + .../google-http-client-1.44.2.jar.sha1 | 1 - .../google-http-client-2.1.0.jar.sha1 | 1 + ...ogle-http-client-apache-v2-1.44.2.jar.sha1 | 1 - ...oogle-http-client-apache-v2-2.1.0.jar.sha1 | 1 + ...ogle-http-client-appengine-1.44.2.jar.sha1 | 1 - ...oogle-http-client-appengine-2.1.0.jar.sha1 | 1 + .../google-http-client-gson-1.44.2.jar.sha1 | 1 - .../google-http-client-gson-2.1.0.jar.sha1 | 1 + ...oogle-http-client-jackson2-1.44.2.jar.sha1 | 1 - ...google-http-client-jackson2-2.1.0.jar.sha1 | 1 + .../google-oauth-client-1.36.0.jar.sha1 | 1 - .../google-oauth-client-1.39.0.jar.sha1 | 1 + solr/licenses/grpc-alts-1.80.0.jar.sha1 | 1 - solr/licenses/grpc-alts-1.81.0.jar.sha1 | 1 + solr/licenses/grpc-api-1.80.0.jar.sha1 | 1 - solr/licenses/grpc-api-1.81.0.jar.sha1 | 1 + solr/licenses/grpc-auth-1.80.0.jar.sha1 | 1 - solr/licenses/grpc-auth-1.81.0.jar.sha1 | 1 + solr/licenses/grpc-context-1.80.0.jar.sha1 | 1 - solr/licenses/grpc-context-1.81.0.jar.sha1 | 1 + solr/licenses/grpc-core-1.80.0.jar.sha1 | 1 - solr/licenses/grpc-core-1.81.0.jar.sha1 | 1 + ...gle-cloud-storage-v2-2.40.1-alpha.jar.sha1 | 1 - ...pc-google-cloud-storage-v2-2.69.0.jar.sha1 | 1 + solr/licenses/grpc-googleapis-1.80.0.jar.sha1 | 1 - solr/licenses/grpc-googleapis-1.81.0.jar.sha1 | 1 + solr/licenses/grpc-grpclb-1.80.0.jar.sha1 | 1 - solr/licenses/grpc-grpclb-1.81.0.jar.sha1 | 1 + solr/licenses/grpc-inprocess-1.80.0.jar.sha1 | 1 - solr/licenses/grpc-inprocess-1.81.0.jar.sha1 | 1 + solr/licenses/grpc-netty-1.80.0.jar.sha1 | 1 - solr/licenses/grpc-netty-1.81.0.jar.sha1 | 1 + .../grpc-netty-shaded-1.80.0.jar.sha1 | 1 - .../grpc-netty-shaded-1.81.0.jar.sha1 | 1 + .../grpc-opentelemetry-1.81.0.jar.sha1 | 1 + solr/licenses/grpc-protobuf-1.80.0.jar.sha1 | 1 - solr/licenses/grpc-protobuf-1.81.0.jar.sha1 | 1 + .../grpc-protobuf-lite-1.80.0.jar.sha1 | 1 - .../grpc-protobuf-lite-1.81.0.jar.sha1 | 1 + solr/licenses/grpc-rls-1.80.0.jar.sha1 | 1 - solr/licenses/grpc-rls-1.81.0.jar.sha1 | 1 + solr/licenses/grpc-services-1.80.0.jar.sha1 | 1 - solr/licenses/grpc-services-1.81.0.jar.sha1 | 1 + solr/licenses/grpc-stub-1.80.0.jar.sha1 | 1 - solr/licenses/grpc-stub-1.81.0.jar.sha1 | 1 + solr/licenses/grpc-util-1.80.0.jar.sha1 | 1 - solr/licenses/grpc-util-1.81.0.jar.sha1 | 1 + solr/licenses/grpc-xds-1.80.0.jar.sha1 | 1 - solr/licenses/grpc-xds-1.81.0.jar.sha1 | 1 + solr/licenses/gson-2.12.1.jar.sha1 | 1 - solr/licenses/gson-2.13.2.jar.sha1 | 1 + .../jackson-annotations-2.18.0.jar.sha1 | 1 - .../jackson-annotations-2.18.3.jar.sha1 | 1 + solr/licenses/jackson-core-2.18.0.jar.sha1 | 1 - solr/licenses/jackson-core-2.18.3.jar.sha1 | 1 + .../licenses/jackson-databind-2.18.0.jar.sha1 | 1 - .../licenses/jackson-databind-2.18.3.jar.sha1 | 1 + .../jackson-dataformat-cbor-2.18.0.jar.sha1 | 1 - .../jackson-dataformat-cbor-2.18.3.jar.sha1 | 1 + .../jackson-dataformat-csv-2.18.0.jar.sha1 | 1 - .../jackson-dataformat-csv-2.18.3.jar.sha1 | 1 + .../jackson-dataformat-smile-2.18.0.jar.sha1 | 1 - .../jackson-dataformat-smile-2.18.3.jar.sha1 | 1 + .../jackson-dataformat-xml-2.18.0.jar.sha1 | 1 - .../jackson-dataformat-xml-2.18.3.jar.sha1 | 1 + .../jackson-datatype-jdk8-2.18.0.jar.sha1 | 1 - .../jackson-datatype-jdk8-2.18.3.jar.sha1 | 1 + .../jackson-datatype-jsr310-2.18.0.jar.sha1 | 1 - .../jackson-datatype-jsr310-2.18.3.jar.sha1 | 1 + ...akarta-xmlbind-annotations-2.18.0.jar.sha1 | 1 - ...akarta-xmlbind-annotations-2.18.3.jar.sha1 | 1 + .../jackson-module-kotlin-2.18.0.jar.sha1 | 1 - .../jackson-module-kotlin-2.18.3.jar.sha1 | 1 + ...son-module-parameter-names-2.18.0.jar.sha1 | 1 - ...son-module-parameter-names-2.18.3.jar.sha1 | 1 + .../jackson-module-scala_2.13-2.18.0.jar.sha1 | 1 - .../jackson-module-scala_2.13-2.18.3.jar.sha1 | 1 + solr/licenses/opencensus-proto-0.2.0.jar.sha1 | 1 - .../opentelemetry-api-1.53.0.jar.sha1 | 1 - .../opentelemetry-api-1.62.0.jar.sha1 | 1 + .../opentelemetry-common-1.53.0.jar.sha1 | 1 - .../opentelemetry-common-1.62.0.jar.sha1 | 1 + .../opentelemetry-context-1.53.0.jar.sha1 | 1 - .../opentelemetry-context-1.62.0.jar.sha1 | 1 + ...emetry-gcp-resources-1.45.0-alpha.jar.sha1 | 1 + .../opentelemetry-sdk-1.53.0.jar.sha1 | 1 - .../opentelemetry-sdk-1.62.0.jar.sha1 | 1 + .../opentelemetry-sdk-common-1.53.0.jar.sha1 | 1 - .../opentelemetry-sdk-common-1.62.0.jar.sha1 | 1 + ...xtension-autoconfigure-spi-1.53.0.jar.sha1 | 1 - ...xtension-autoconfigure-spi-1.62.0.jar.sha1 | 1 + .../opentelemetry-sdk-logs-1.53.0.jar.sha1 | 1 - .../opentelemetry-sdk-logs-1.62.0.jar.sha1 | 1 + .../opentelemetry-sdk-metrics-1.53.0.jar.sha1 | 1 - .../opentelemetry-sdk-metrics-1.62.0.jar.sha1 | 1 + .../opentelemetry-sdk-trace-1.53.0.jar.sha1 | 1 - .../opentelemetry-sdk-trace-1.62.0.jar.sha1 | 1 + ...pentelemetry-semconv-1.29.0-alpha.jar.sha1 | 1 + ...google-cloud-monitoring-v3-3.94.0.jar.sha1 | 1 + ...gle-cloud-storage-v2-2.40.1-alpha.jar.sha1 | 1 - ...to-google-cloud-storage-v2-2.69.0.jar.sha1 | 1 + ...proto-google-common-protos-2.63.2.jar.sha1 | 1 - ...proto-google-common-protos-2.72.0.jar.sha1 | 1 + .../proto-google-iam-v1-1.36.0.jar.sha1 | 1 - .../proto-google-iam-v1-1.67.0.jar.sha1 | 1 + .../shared-resourcemapping-0.33.0.jar.sha1 | 1 + solr/licenses/threetenbp-1.6.9.jar.sha1 | 1 - solr/licenses/threetenbp-1.7.0.jar.sha1 | 1 + versions.lock | 196 +++++++++--------- versions.props | 2 +- 145 files changed, 178 insertions(+), 163 deletions(-) delete mode 100644 solr/licenses/api-common-2.33.0.jar.sha1 create mode 100644 solr/licenses/api-common-2.64.0.jar.sha1 delete mode 100644 solr/licenses/auto-value-annotations-1.10.4.jar.sha1 create mode 100644 solr/licenses/auto-value-annotations-1.11.0.jar.sha1 delete mode 100644 solr/licenses/checker-qual-3.44.0.jar.sha1 create mode 100644 solr/licenses/checker-qual-3.49.0.jar.sha1 create mode 100644 solr/licenses/detector-resources-support-0.33.0.jar.sha1 create mode 100644 solr/licenses/exporter-metrics-0.33.0.jar.sha1 delete mode 100644 solr/licenses/gapic-google-cloud-storage-v2-2.40.1-alpha.jar.sha1 create mode 100644 solr/licenses/gapic-google-cloud-storage-v2-2.69.0.jar.sha1 delete mode 100644 solr/licenses/gax-2.50.0.jar.sha1 create mode 100644 solr/licenses/gax-2.81.0.jar.sha1 delete mode 100644 solr/licenses/gax-grpc-2.50.0.jar.sha1 create mode 100644 solr/licenses/gax-grpc-2.81.0.jar.sha1 delete mode 100644 solr/licenses/gax-httpjson-2.50.0.jar.sha1 create mode 100644 solr/licenses/gax-httpjson-2.81.0.jar.sha1 delete mode 100644 solr/licenses/google-api-client-2.6.0.jar.sha1 create mode 100644 solr/licenses/google-api-client-2.7.2.jar.sha1 delete mode 100644 solr/licenses/google-api-services-storage-v1-rev20240621-2.0.0.jar.sha1 create mode 100644 solr/licenses/google-api-services-storage-v1-rev20260204-2.0.0.jar.sha1 delete mode 100644 solr/licenses/google-auth-library-credentials-1.23.0.jar.sha1 create mode 100644 solr/licenses/google-auth-library-credentials-1.48.0.jar.sha1 delete mode 100644 solr/licenses/google-auth-library-oauth2-http-1.23.0.jar.sha1 create mode 100644 solr/licenses/google-auth-library-oauth2-http-1.48.0.jar.sha1 delete mode 100644 solr/licenses/google-cloud-core-2.40.0.jar.sha1 create mode 100644 solr/licenses/google-cloud-core-2.71.0.jar.sha1 delete mode 100644 solr/licenses/google-cloud-core-grpc-2.40.0.jar.sha1 create mode 100644 solr/licenses/google-cloud-core-grpc-2.71.0.jar.sha1 delete mode 100644 solr/licenses/google-cloud-core-http-2.40.0.jar.sha1 create mode 100644 solr/licenses/google-cloud-core-http-2.71.0.jar.sha1 create mode 100644 solr/licenses/google-cloud-monitoring-3.94.0.jar.sha1 delete mode 100644 solr/licenses/google-cloud-nio-0.127.20.jar.sha1 create mode 100644 solr/licenses/google-cloud-nio-0.133.0.jar.sha1 delete mode 100644 solr/licenses/google-cloud-storage-2.40.1.jar.sha1 create mode 100644 solr/licenses/google-cloud-storage-2.69.0.jar.sha1 delete mode 100644 solr/licenses/google-http-client-1.44.2.jar.sha1 create mode 100644 solr/licenses/google-http-client-2.1.0.jar.sha1 delete mode 100644 solr/licenses/google-http-client-apache-v2-1.44.2.jar.sha1 create mode 100644 solr/licenses/google-http-client-apache-v2-2.1.0.jar.sha1 delete mode 100644 solr/licenses/google-http-client-appengine-1.44.2.jar.sha1 create mode 100644 solr/licenses/google-http-client-appengine-2.1.0.jar.sha1 delete mode 100644 solr/licenses/google-http-client-gson-1.44.2.jar.sha1 create mode 100644 solr/licenses/google-http-client-gson-2.1.0.jar.sha1 delete mode 100644 solr/licenses/google-http-client-jackson2-1.44.2.jar.sha1 create mode 100644 solr/licenses/google-http-client-jackson2-2.1.0.jar.sha1 delete mode 100644 solr/licenses/google-oauth-client-1.36.0.jar.sha1 create mode 100644 solr/licenses/google-oauth-client-1.39.0.jar.sha1 delete mode 100644 solr/licenses/grpc-alts-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-alts-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-api-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-api-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-auth-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-auth-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-context-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-context-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-core-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-core-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-google-cloud-storage-v2-2.40.1-alpha.jar.sha1 create mode 100644 solr/licenses/grpc-google-cloud-storage-v2-2.69.0.jar.sha1 delete mode 100644 solr/licenses/grpc-googleapis-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-googleapis-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-grpclb-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-grpclb-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-inprocess-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-inprocess-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-netty-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-netty-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-netty-shaded-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-netty-shaded-1.81.0.jar.sha1 create mode 100644 solr/licenses/grpc-opentelemetry-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-protobuf-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-protobuf-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-protobuf-lite-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-protobuf-lite-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-rls-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-rls-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-services-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-services-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-stub-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-stub-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-util-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-util-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-xds-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-xds-1.81.0.jar.sha1 delete mode 100644 solr/licenses/gson-2.12.1.jar.sha1 create mode 100644 solr/licenses/gson-2.13.2.jar.sha1 delete mode 100644 solr/licenses/jackson-annotations-2.18.0.jar.sha1 create mode 100644 solr/licenses/jackson-annotations-2.18.3.jar.sha1 delete mode 100644 solr/licenses/jackson-core-2.18.0.jar.sha1 create mode 100644 solr/licenses/jackson-core-2.18.3.jar.sha1 delete mode 100644 solr/licenses/jackson-databind-2.18.0.jar.sha1 create mode 100644 solr/licenses/jackson-databind-2.18.3.jar.sha1 delete mode 100644 solr/licenses/jackson-dataformat-cbor-2.18.0.jar.sha1 create mode 100644 solr/licenses/jackson-dataformat-cbor-2.18.3.jar.sha1 delete mode 100644 solr/licenses/jackson-dataformat-csv-2.18.0.jar.sha1 create mode 100644 solr/licenses/jackson-dataformat-csv-2.18.3.jar.sha1 delete mode 100644 solr/licenses/jackson-dataformat-smile-2.18.0.jar.sha1 create mode 100644 solr/licenses/jackson-dataformat-smile-2.18.3.jar.sha1 delete mode 100644 solr/licenses/jackson-dataformat-xml-2.18.0.jar.sha1 create mode 100644 solr/licenses/jackson-dataformat-xml-2.18.3.jar.sha1 delete mode 100644 solr/licenses/jackson-datatype-jdk8-2.18.0.jar.sha1 create mode 100644 solr/licenses/jackson-datatype-jdk8-2.18.3.jar.sha1 delete mode 100644 solr/licenses/jackson-datatype-jsr310-2.18.0.jar.sha1 create mode 100644 solr/licenses/jackson-datatype-jsr310-2.18.3.jar.sha1 delete mode 100644 solr/licenses/jackson-module-jakarta-xmlbind-annotations-2.18.0.jar.sha1 create mode 100644 solr/licenses/jackson-module-jakarta-xmlbind-annotations-2.18.3.jar.sha1 delete mode 100644 solr/licenses/jackson-module-kotlin-2.18.0.jar.sha1 create mode 100644 solr/licenses/jackson-module-kotlin-2.18.3.jar.sha1 delete mode 100644 solr/licenses/jackson-module-parameter-names-2.18.0.jar.sha1 create mode 100644 solr/licenses/jackson-module-parameter-names-2.18.3.jar.sha1 delete mode 100644 solr/licenses/jackson-module-scala_2.13-2.18.0.jar.sha1 create mode 100644 solr/licenses/jackson-module-scala_2.13-2.18.3.jar.sha1 delete mode 100644 solr/licenses/opencensus-proto-0.2.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-api-1.53.0.jar.sha1 create mode 100644 solr/licenses/opentelemetry-api-1.62.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-common-1.53.0.jar.sha1 create mode 100644 solr/licenses/opentelemetry-common-1.62.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-context-1.53.0.jar.sha1 create mode 100644 solr/licenses/opentelemetry-context-1.62.0.jar.sha1 create mode 100644 solr/licenses/opentelemetry-gcp-resources-1.45.0-alpha.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-sdk-1.53.0.jar.sha1 create mode 100644 solr/licenses/opentelemetry-sdk-1.62.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-sdk-common-1.53.0.jar.sha1 create mode 100644 solr/licenses/opentelemetry-sdk-common-1.62.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.53.0.jar.sha1 create mode 100644 solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.62.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-sdk-logs-1.53.0.jar.sha1 create mode 100644 solr/licenses/opentelemetry-sdk-logs-1.62.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-sdk-metrics-1.53.0.jar.sha1 create mode 100644 solr/licenses/opentelemetry-sdk-metrics-1.62.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-sdk-trace-1.53.0.jar.sha1 create mode 100644 solr/licenses/opentelemetry-sdk-trace-1.62.0.jar.sha1 create mode 100644 solr/licenses/opentelemetry-semconv-1.29.0-alpha.jar.sha1 create mode 100644 solr/licenses/proto-google-cloud-monitoring-v3-3.94.0.jar.sha1 delete mode 100644 solr/licenses/proto-google-cloud-storage-v2-2.40.1-alpha.jar.sha1 create mode 100644 solr/licenses/proto-google-cloud-storage-v2-2.69.0.jar.sha1 delete mode 100644 solr/licenses/proto-google-common-protos-2.63.2.jar.sha1 create mode 100644 solr/licenses/proto-google-common-protos-2.72.0.jar.sha1 delete mode 100644 solr/licenses/proto-google-iam-v1-1.36.0.jar.sha1 create mode 100644 solr/licenses/proto-google-iam-v1-1.67.0.jar.sha1 create mode 100644 solr/licenses/shared-resourcemapping-0.33.0.jar.sha1 delete mode 100644 solr/licenses/threetenbp-1.6.9.jar.sha1 create mode 100644 solr/licenses/threetenbp-1.7.0.jar.sha1 diff --git a/solr/licenses/api-common-2.33.0.jar.sha1 b/solr/licenses/api-common-2.33.0.jar.sha1 deleted file mode 100644 index f7216504ed26..000000000000 --- a/solr/licenses/api-common-2.33.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -346c93a59fd450ae2239de57b40cd13c4086854e diff --git a/solr/licenses/api-common-2.64.0.jar.sha1 b/solr/licenses/api-common-2.64.0.jar.sha1 new file mode 100644 index 000000000000..33a20a1b4069 --- /dev/null +++ b/solr/licenses/api-common-2.64.0.jar.sha1 @@ -0,0 +1 @@ +cf7d93aa7a4d348be7bf41d8afe3b104e16382be diff --git a/solr/licenses/auto-value-annotations-1.10.4.jar.sha1 b/solr/licenses/auto-value-annotations-1.10.4.jar.sha1 deleted file mode 100644 index 16fabd65b72c..000000000000 --- a/solr/licenses/auto-value-annotations-1.10.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9679de8286eb0a151db6538ba297a8951c4a1224 diff --git a/solr/licenses/auto-value-annotations-1.11.0.jar.sha1 b/solr/licenses/auto-value-annotations-1.11.0.jar.sha1 new file mode 100644 index 000000000000..853f4ef5d823 --- /dev/null +++ b/solr/licenses/auto-value-annotations-1.11.0.jar.sha1 @@ -0,0 +1 @@ +f0d047931d07cfbc6fa4079854f181ff62891d6f diff --git a/solr/licenses/checker-qual-3.44.0.jar.sha1 b/solr/licenses/checker-qual-3.44.0.jar.sha1 deleted file mode 100644 index 99df088cdc93..000000000000 --- a/solr/licenses/checker-qual-3.44.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e026b198319ea9dd3f221fab367d2099215079e5 diff --git a/solr/licenses/checker-qual-3.49.0.jar.sha1 b/solr/licenses/checker-qual-3.49.0.jar.sha1 new file mode 100644 index 000000000000..871945c3f736 --- /dev/null +++ b/solr/licenses/checker-qual-3.49.0.jar.sha1 @@ -0,0 +1 @@ +54be36cb42c9b991c109e467e2bfa82af4cda44e diff --git a/solr/licenses/detector-resources-support-0.33.0.jar.sha1 b/solr/licenses/detector-resources-support-0.33.0.jar.sha1 new file mode 100644 index 000000000000..2f159b8e0c61 --- /dev/null +++ b/solr/licenses/detector-resources-support-0.33.0.jar.sha1 @@ -0,0 +1 @@ +a6ba22e47f6234179803b5bab5030ebede575b6e diff --git a/solr/licenses/exporter-metrics-0.33.0.jar.sha1 b/solr/licenses/exporter-metrics-0.33.0.jar.sha1 new file mode 100644 index 000000000000..f1656a89dbb8 --- /dev/null +++ b/solr/licenses/exporter-metrics-0.33.0.jar.sha1 @@ -0,0 +1 @@ +6f0cd9f1481cf92e566478140aa4d26e159b5ad8 diff --git a/solr/licenses/gapic-google-cloud-storage-v2-2.40.1-alpha.jar.sha1 b/solr/licenses/gapic-google-cloud-storage-v2-2.40.1-alpha.jar.sha1 deleted file mode 100644 index b0a6424ad7b8..000000000000 --- a/solr/licenses/gapic-google-cloud-storage-v2-2.40.1-alpha.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c0cde24ebb3db3fd6a062717a1818981d34a8591 diff --git a/solr/licenses/gapic-google-cloud-storage-v2-2.69.0.jar.sha1 b/solr/licenses/gapic-google-cloud-storage-v2-2.69.0.jar.sha1 new file mode 100644 index 000000000000..c83347df7823 --- /dev/null +++ b/solr/licenses/gapic-google-cloud-storage-v2-2.69.0.jar.sha1 @@ -0,0 +1 @@ +41a82cd10663adaab996e4ff134e0c888a8c7a70 diff --git a/solr/licenses/gax-2.50.0.jar.sha1 b/solr/licenses/gax-2.50.0.jar.sha1 deleted file mode 100644 index 94001ae33dfd..000000000000 --- a/solr/licenses/gax-2.50.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -dd83734255063fc7bc3f7137db999ca2e23ad525 diff --git a/solr/licenses/gax-2.81.0.jar.sha1 b/solr/licenses/gax-2.81.0.jar.sha1 new file mode 100644 index 000000000000..9c66e03e0582 --- /dev/null +++ b/solr/licenses/gax-2.81.0.jar.sha1 @@ -0,0 +1 @@ +69daeb0f12d235adc42f122963131c66d103c4ca diff --git a/solr/licenses/gax-grpc-2.50.0.jar.sha1 b/solr/licenses/gax-grpc-2.50.0.jar.sha1 deleted file mode 100644 index 38f5ec5f1086..000000000000 --- a/solr/licenses/gax-grpc-2.50.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -526b493917d951b82ebb34d0a7cc79ff07264b0e diff --git a/solr/licenses/gax-grpc-2.81.0.jar.sha1 b/solr/licenses/gax-grpc-2.81.0.jar.sha1 new file mode 100644 index 000000000000..5b8f25748f57 --- /dev/null +++ b/solr/licenses/gax-grpc-2.81.0.jar.sha1 @@ -0,0 +1 @@ +7c6343df5c9d51660450759f3704599f9a3dc042 diff --git a/solr/licenses/gax-httpjson-2.50.0.jar.sha1 b/solr/licenses/gax-httpjson-2.50.0.jar.sha1 deleted file mode 100644 index 2126fbd80e26..000000000000 --- a/solr/licenses/gax-httpjson-2.50.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8c0a42ce6b3363b2a569b0cadd9a9d5859841f3d diff --git a/solr/licenses/gax-httpjson-2.81.0.jar.sha1 b/solr/licenses/gax-httpjson-2.81.0.jar.sha1 new file mode 100644 index 000000000000..5ea06efc0ab3 --- /dev/null +++ b/solr/licenses/gax-httpjson-2.81.0.jar.sha1 @@ -0,0 +1 @@ +bc029c04b8da81dd80b5975bd346a9d3c5980693 diff --git a/solr/licenses/google-api-client-2.6.0.jar.sha1 b/solr/licenses/google-api-client-2.6.0.jar.sha1 deleted file mode 100644 index d2a9431dc751..000000000000 --- a/solr/licenses/google-api-client-2.6.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b602d71e2491bbb66cfcd27a21db6ffea3764cdd diff --git a/solr/licenses/google-api-client-2.7.2.jar.sha1 b/solr/licenses/google-api-client-2.7.2.jar.sha1 new file mode 100644 index 000000000000..0c7ef7d5f40a --- /dev/null +++ b/solr/licenses/google-api-client-2.7.2.jar.sha1 @@ -0,0 +1 @@ +495d58d6e31c2c5e24a707a50d6355ba92dd3d0c diff --git a/solr/licenses/google-api-services-storage-v1-rev20240621-2.0.0.jar.sha1 b/solr/licenses/google-api-services-storage-v1-rev20240621-2.0.0.jar.sha1 deleted file mode 100644 index f99f2036b3c3..000000000000 --- a/solr/licenses/google-api-services-storage-v1-rev20240621-2.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -260d4c88612b1fe65e7332550a023dced06943f4 diff --git a/solr/licenses/google-api-services-storage-v1-rev20260204-2.0.0.jar.sha1 b/solr/licenses/google-api-services-storage-v1-rev20260204-2.0.0.jar.sha1 new file mode 100644 index 000000000000..50a079159df7 --- /dev/null +++ b/solr/licenses/google-api-services-storage-v1-rev20260204-2.0.0.jar.sha1 @@ -0,0 +1 @@ +44f5c332e039669200fabd453eb6b95f43da4877 diff --git a/solr/licenses/google-auth-library-credentials-1.23.0.jar.sha1 b/solr/licenses/google-auth-library-credentials-1.23.0.jar.sha1 deleted file mode 100644 index 9fe73f862136..000000000000 --- a/solr/licenses/google-auth-library-credentials-1.23.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a50ee3611922a0eea9d421c6ddb1db031972a7dc diff --git a/solr/licenses/google-auth-library-credentials-1.48.0.jar.sha1 b/solr/licenses/google-auth-library-credentials-1.48.0.jar.sha1 new file mode 100644 index 000000000000..f0d7bf49c378 --- /dev/null +++ b/solr/licenses/google-auth-library-credentials-1.48.0.jar.sha1 @@ -0,0 +1 @@ +ed2bbb1e309727bff5fb80c93cdd49cb814ed88e diff --git a/solr/licenses/google-auth-library-oauth2-http-1.23.0.jar.sha1 b/solr/licenses/google-auth-library-oauth2-http-1.23.0.jar.sha1 deleted file mode 100644 index 86babb809871..000000000000 --- a/solr/licenses/google-auth-library-oauth2-http-1.23.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f9ebd75a55b8e2cfa62e1f66d04a62b46a2f3b70 diff --git a/solr/licenses/google-auth-library-oauth2-http-1.48.0.jar.sha1 b/solr/licenses/google-auth-library-oauth2-http-1.48.0.jar.sha1 new file mode 100644 index 000000000000..be9b848fcfa1 --- /dev/null +++ b/solr/licenses/google-auth-library-oauth2-http-1.48.0.jar.sha1 @@ -0,0 +1 @@ +6f60491221a120e373d43fa366e0ce2f5b60a8d3 diff --git a/solr/licenses/google-cloud-core-2.40.0.jar.sha1 b/solr/licenses/google-cloud-core-2.40.0.jar.sha1 deleted file mode 100644 index c642ef365721..000000000000 --- a/solr/licenses/google-cloud-core-2.40.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -035214007270128474de01a84c6795df0083b4bc diff --git a/solr/licenses/google-cloud-core-2.71.0.jar.sha1 b/solr/licenses/google-cloud-core-2.71.0.jar.sha1 new file mode 100644 index 000000000000..4b4c645bc756 --- /dev/null +++ b/solr/licenses/google-cloud-core-2.71.0.jar.sha1 @@ -0,0 +1 @@ +f85fc6fa817f3109e1b0156640fa27bb14f8b0ba diff --git a/solr/licenses/google-cloud-core-grpc-2.40.0.jar.sha1 b/solr/licenses/google-cloud-core-grpc-2.40.0.jar.sha1 deleted file mode 100644 index e30de3978799..000000000000 --- a/solr/licenses/google-cloud-core-grpc-2.40.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -29cf12a64d738cc67d729342246a72e40c27a137 diff --git a/solr/licenses/google-cloud-core-grpc-2.71.0.jar.sha1 b/solr/licenses/google-cloud-core-grpc-2.71.0.jar.sha1 new file mode 100644 index 000000000000..7f4cc4e7384f --- /dev/null +++ b/solr/licenses/google-cloud-core-grpc-2.71.0.jar.sha1 @@ -0,0 +1 @@ +4f1c7e76f16a327aa233fd9809b1c274fe945600 diff --git a/solr/licenses/google-cloud-core-http-2.40.0.jar.sha1 b/solr/licenses/google-cloud-core-http-2.40.0.jar.sha1 deleted file mode 100644 index 7fa9d3ee815a..000000000000 --- a/solr/licenses/google-cloud-core-http-2.40.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a7d82b9e9499c6d8d7cee9583f44f3d540a69f31 diff --git a/solr/licenses/google-cloud-core-http-2.71.0.jar.sha1 b/solr/licenses/google-cloud-core-http-2.71.0.jar.sha1 new file mode 100644 index 000000000000..7394a38f5bb2 --- /dev/null +++ b/solr/licenses/google-cloud-core-http-2.71.0.jar.sha1 @@ -0,0 +1 @@ +2fabf20a332f0e13d5e09c4f303ce5ca61ff833b diff --git a/solr/licenses/google-cloud-monitoring-3.94.0.jar.sha1 b/solr/licenses/google-cloud-monitoring-3.94.0.jar.sha1 new file mode 100644 index 000000000000..fbcfcb08f1de --- /dev/null +++ b/solr/licenses/google-cloud-monitoring-3.94.0.jar.sha1 @@ -0,0 +1 @@ +f734ff5bc4797a105b72afc2afba4af573c73335 diff --git a/solr/licenses/google-cloud-nio-0.127.20.jar.sha1 b/solr/licenses/google-cloud-nio-0.127.20.jar.sha1 deleted file mode 100644 index edae0365265a..000000000000 --- a/solr/licenses/google-cloud-nio-0.127.20.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -997a712f567451a548951bd887953d26aa90a1fe diff --git a/solr/licenses/google-cloud-nio-0.133.0.jar.sha1 b/solr/licenses/google-cloud-nio-0.133.0.jar.sha1 new file mode 100644 index 000000000000..62f040cc6c48 --- /dev/null +++ b/solr/licenses/google-cloud-nio-0.133.0.jar.sha1 @@ -0,0 +1 @@ +de74362396d557315ea395413283ef0f3b79bc6b diff --git a/solr/licenses/google-cloud-storage-2.40.1.jar.sha1 b/solr/licenses/google-cloud-storage-2.40.1.jar.sha1 deleted file mode 100644 index 62f240f4b9ef..000000000000 --- a/solr/licenses/google-cloud-storage-2.40.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -33e67ce2dc4e91edb85a8bdd9ea154735aa4a88f diff --git a/solr/licenses/google-cloud-storage-2.69.0.jar.sha1 b/solr/licenses/google-cloud-storage-2.69.0.jar.sha1 new file mode 100644 index 000000000000..cdfb9e15d5aa --- /dev/null +++ b/solr/licenses/google-cloud-storage-2.69.0.jar.sha1 @@ -0,0 +1 @@ +23bfeb53c12bc24d40e14061636c32ac2bc8924e diff --git a/solr/licenses/google-http-client-1.44.2.jar.sha1 b/solr/licenses/google-http-client-1.44.2.jar.sha1 deleted file mode 100644 index d41c555b7f8a..000000000000 --- a/solr/licenses/google-http-client-1.44.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -12f55ba06332c2b6f5456091b0786e1d7b8987e9 diff --git a/solr/licenses/google-http-client-2.1.0.jar.sha1 b/solr/licenses/google-http-client-2.1.0.jar.sha1 new file mode 100644 index 000000000000..a58c9a8c44ff --- /dev/null +++ b/solr/licenses/google-http-client-2.1.0.jar.sha1 @@ -0,0 +1 @@ +f4c08fa160a5199af19f81080fbaa921ae2193c7 diff --git a/solr/licenses/google-http-client-apache-v2-1.44.2.jar.sha1 b/solr/licenses/google-http-client-apache-v2-1.44.2.jar.sha1 deleted file mode 100644 index aefcf791c962..000000000000 --- a/solr/licenses/google-http-client-apache-v2-1.44.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ed3a506172c1cbf7ee514fc103f539979891f7b0 diff --git a/solr/licenses/google-http-client-apache-v2-2.1.0.jar.sha1 b/solr/licenses/google-http-client-apache-v2-2.1.0.jar.sha1 new file mode 100644 index 000000000000..9a32ad6f6ef6 --- /dev/null +++ b/solr/licenses/google-http-client-apache-v2-2.1.0.jar.sha1 @@ -0,0 +1 @@ +0e1af7948c8505b26f17cad54a61a43d6fa45686 diff --git a/solr/licenses/google-http-client-appengine-1.44.2.jar.sha1 b/solr/licenses/google-http-client-appengine-1.44.2.jar.sha1 deleted file mode 100644 index 144d5ab8b2e0..000000000000 --- a/solr/licenses/google-http-client-appengine-1.44.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -890b842ea0de630308c459bbe1185532cf486d62 diff --git a/solr/licenses/google-http-client-appengine-2.1.0.jar.sha1 b/solr/licenses/google-http-client-appengine-2.1.0.jar.sha1 new file mode 100644 index 000000000000..e7d5968d605c --- /dev/null +++ b/solr/licenses/google-http-client-appengine-2.1.0.jar.sha1 @@ -0,0 +1 @@ +9df9de27b31fca53b0126ed635f3e71018cdc3d1 diff --git a/solr/licenses/google-http-client-gson-1.44.2.jar.sha1 b/solr/licenses/google-http-client-gson-1.44.2.jar.sha1 deleted file mode 100644 index 029a18042906..000000000000 --- a/solr/licenses/google-http-client-gson-1.44.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6851401b3eda8b74658a159e10165f39fb9678fa diff --git a/solr/licenses/google-http-client-gson-2.1.0.jar.sha1 b/solr/licenses/google-http-client-gson-2.1.0.jar.sha1 new file mode 100644 index 000000000000..93b97013bdb0 --- /dev/null +++ b/solr/licenses/google-http-client-gson-2.1.0.jar.sha1 @@ -0,0 +1 @@ +e65ea98fe4e8d3a512559698a0d8664908fd36f3 diff --git a/solr/licenses/google-http-client-jackson2-1.44.2.jar.sha1 b/solr/licenses/google-http-client-jackson2-1.44.2.jar.sha1 deleted file mode 100644 index 0376b4fd0f92..000000000000 --- a/solr/licenses/google-http-client-jackson2-1.44.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3046eb6db11805ba7f90ad5bb6be31877468a7cf diff --git a/solr/licenses/google-http-client-jackson2-2.1.0.jar.sha1 b/solr/licenses/google-http-client-jackson2-2.1.0.jar.sha1 new file mode 100644 index 000000000000..0a51317387cf --- /dev/null +++ b/solr/licenses/google-http-client-jackson2-2.1.0.jar.sha1 @@ -0,0 +1 @@ +b4c10b1a877369a60e81d325c2aed72a459c2c29 diff --git a/solr/licenses/google-oauth-client-1.36.0.jar.sha1 b/solr/licenses/google-oauth-client-1.36.0.jar.sha1 deleted file mode 100644 index 8e0675ca449e..000000000000 --- a/solr/licenses/google-oauth-client-1.36.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -dc3f07bc8f49dd52fe8fcc15958f3cfeb003e20f diff --git a/solr/licenses/google-oauth-client-1.39.0.jar.sha1 b/solr/licenses/google-oauth-client-1.39.0.jar.sha1 new file mode 100644 index 000000000000..25e2d6124d21 --- /dev/null +++ b/solr/licenses/google-oauth-client-1.39.0.jar.sha1 @@ -0,0 +1 @@ +99f02f3c46c68c01dfc95878456b009a13229c88 diff --git a/solr/licenses/grpc-alts-1.80.0.jar.sha1 b/solr/licenses/grpc-alts-1.80.0.jar.sha1 deleted file mode 100644 index 050cecc30057..000000000000 --- a/solr/licenses/grpc-alts-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -73f4f60f2f22305c03784ea90f46e8d9af97b20e diff --git a/solr/licenses/grpc-alts-1.81.0.jar.sha1 b/solr/licenses/grpc-alts-1.81.0.jar.sha1 new file mode 100644 index 000000000000..0ded51c551c3 --- /dev/null +++ b/solr/licenses/grpc-alts-1.81.0.jar.sha1 @@ -0,0 +1 @@ +def9f992e861fe4b7d913500a4d8b7505637b36c diff --git a/solr/licenses/grpc-api-1.80.0.jar.sha1 b/solr/licenses/grpc-api-1.80.0.jar.sha1 deleted file mode 100644 index 80da4173064b..000000000000 --- a/solr/licenses/grpc-api-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -55f7b74a476f7f1815cb823b1a56b7ffd68e5043 diff --git a/solr/licenses/grpc-api-1.81.0.jar.sha1 b/solr/licenses/grpc-api-1.81.0.jar.sha1 new file mode 100644 index 000000000000..e8d3667c491b --- /dev/null +++ b/solr/licenses/grpc-api-1.81.0.jar.sha1 @@ -0,0 +1 @@ +7a5827c8180858b12ba3d308c7ce31e95002b6ed diff --git a/solr/licenses/grpc-auth-1.80.0.jar.sha1 b/solr/licenses/grpc-auth-1.80.0.jar.sha1 deleted file mode 100644 index e9c7841ad833..000000000000 --- a/solr/licenses/grpc-auth-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e81fba2c16ffcc812a2b5541aaea47ce3bb50392 diff --git a/solr/licenses/grpc-auth-1.81.0.jar.sha1 b/solr/licenses/grpc-auth-1.81.0.jar.sha1 new file mode 100644 index 000000000000..ff1dcfba1234 --- /dev/null +++ b/solr/licenses/grpc-auth-1.81.0.jar.sha1 @@ -0,0 +1 @@ +1cb1c669861caa4929ee1a9fb78c0d74672702f4 diff --git a/solr/licenses/grpc-context-1.80.0.jar.sha1 b/solr/licenses/grpc-context-1.80.0.jar.sha1 deleted file mode 100644 index 1b86b000cd3a..000000000000 --- a/solr/licenses/grpc-context-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b3fd476c0303c84ee5abe9a639f13020660f13b0 diff --git a/solr/licenses/grpc-context-1.81.0.jar.sha1 b/solr/licenses/grpc-context-1.81.0.jar.sha1 new file mode 100644 index 000000000000..043d3fcbe29e --- /dev/null +++ b/solr/licenses/grpc-context-1.81.0.jar.sha1 @@ -0,0 +1 @@ +132e07350016d36a5c3d94afd89fe699f5eecec6 diff --git a/solr/licenses/grpc-core-1.80.0.jar.sha1 b/solr/licenses/grpc-core-1.80.0.jar.sha1 deleted file mode 100644 index c6785dce15ef..000000000000 --- a/solr/licenses/grpc-core-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -aae1d22e5a816650e1e7408f2f766bf769de76f1 diff --git a/solr/licenses/grpc-core-1.81.0.jar.sha1 b/solr/licenses/grpc-core-1.81.0.jar.sha1 new file mode 100644 index 000000000000..c9a2d10978a3 --- /dev/null +++ b/solr/licenses/grpc-core-1.81.0.jar.sha1 @@ -0,0 +1 @@ +095e55b49d51ded7cee191f1db6f32d2c2e934e3 diff --git a/solr/licenses/grpc-google-cloud-storage-v2-2.40.1-alpha.jar.sha1 b/solr/licenses/grpc-google-cloud-storage-v2-2.40.1-alpha.jar.sha1 deleted file mode 100644 index c9dabe2641b1..000000000000 --- a/solr/licenses/grpc-google-cloud-storage-v2-2.40.1-alpha.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7f281914b3ec9e0039531eb1f193f1099d74b45c diff --git a/solr/licenses/grpc-google-cloud-storage-v2-2.69.0.jar.sha1 b/solr/licenses/grpc-google-cloud-storage-v2-2.69.0.jar.sha1 new file mode 100644 index 000000000000..50ef8dda9675 --- /dev/null +++ b/solr/licenses/grpc-google-cloud-storage-v2-2.69.0.jar.sha1 @@ -0,0 +1 @@ +bb9dd464b63a01676dacd965ee13aa702d6f99d0 diff --git a/solr/licenses/grpc-googleapis-1.80.0.jar.sha1 b/solr/licenses/grpc-googleapis-1.80.0.jar.sha1 deleted file mode 100644 index 60fa3efd9bb9..000000000000 --- a/solr/licenses/grpc-googleapis-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9b223e2dc54591311ca171eb429841c9f0654b66 diff --git a/solr/licenses/grpc-googleapis-1.81.0.jar.sha1 b/solr/licenses/grpc-googleapis-1.81.0.jar.sha1 new file mode 100644 index 000000000000..14e33898a475 --- /dev/null +++ b/solr/licenses/grpc-googleapis-1.81.0.jar.sha1 @@ -0,0 +1 @@ +83e0e656298700f843883022c7a06c58af4eaee9 diff --git a/solr/licenses/grpc-grpclb-1.80.0.jar.sha1 b/solr/licenses/grpc-grpclb-1.80.0.jar.sha1 deleted file mode 100644 index 02320e2cd176..000000000000 --- a/solr/licenses/grpc-grpclb-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -28c9e8f262834c8a61faeba9e5c27261f88a40eb diff --git a/solr/licenses/grpc-grpclb-1.81.0.jar.sha1 b/solr/licenses/grpc-grpclb-1.81.0.jar.sha1 new file mode 100644 index 000000000000..4682090f6b10 --- /dev/null +++ b/solr/licenses/grpc-grpclb-1.81.0.jar.sha1 @@ -0,0 +1 @@ +065f8ba3ff4a65e4f865073851f913122b858536 diff --git a/solr/licenses/grpc-inprocess-1.80.0.jar.sha1 b/solr/licenses/grpc-inprocess-1.80.0.jar.sha1 deleted file mode 100644 index 6f3dbbbdc864..000000000000 --- a/solr/licenses/grpc-inprocess-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -51b7c00db7070fcbc7b468533fb591d54385e327 diff --git a/solr/licenses/grpc-inprocess-1.81.0.jar.sha1 b/solr/licenses/grpc-inprocess-1.81.0.jar.sha1 new file mode 100644 index 000000000000..163d6ba2050d --- /dev/null +++ b/solr/licenses/grpc-inprocess-1.81.0.jar.sha1 @@ -0,0 +1 @@ +14dbd91b6ffbceb932f3c3f46d236ffb31d66bad diff --git a/solr/licenses/grpc-netty-1.80.0.jar.sha1 b/solr/licenses/grpc-netty-1.80.0.jar.sha1 deleted file mode 100644 index ab935ba89852..000000000000 --- a/solr/licenses/grpc-netty-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b3c8b1ed43f626498adc2dae078e3f240db5b154 diff --git a/solr/licenses/grpc-netty-1.81.0.jar.sha1 b/solr/licenses/grpc-netty-1.81.0.jar.sha1 new file mode 100644 index 000000000000..9e6ef63bed1d --- /dev/null +++ b/solr/licenses/grpc-netty-1.81.0.jar.sha1 @@ -0,0 +1 @@ +bca99ad5b88c0ea0752b7d1d548a536dc7c67dcb diff --git a/solr/licenses/grpc-netty-shaded-1.80.0.jar.sha1 b/solr/licenses/grpc-netty-shaded-1.80.0.jar.sha1 deleted file mode 100644 index 9f325bc5a3f8..000000000000 --- a/solr/licenses/grpc-netty-shaded-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -90211b872a6fd7eefca494295549ed31cf5386c7 diff --git a/solr/licenses/grpc-netty-shaded-1.81.0.jar.sha1 b/solr/licenses/grpc-netty-shaded-1.81.0.jar.sha1 new file mode 100644 index 000000000000..2f0559d4c300 --- /dev/null +++ b/solr/licenses/grpc-netty-shaded-1.81.0.jar.sha1 @@ -0,0 +1 @@ +134b4014a4140c3ca54fe9d758b160a76210bfb0 diff --git a/solr/licenses/grpc-opentelemetry-1.81.0.jar.sha1 b/solr/licenses/grpc-opentelemetry-1.81.0.jar.sha1 new file mode 100644 index 000000000000..49a68e4b15f7 --- /dev/null +++ b/solr/licenses/grpc-opentelemetry-1.81.0.jar.sha1 @@ -0,0 +1 @@ +6c6725f2e0c674a1502432204bb9a572e23db3b3 diff --git a/solr/licenses/grpc-protobuf-1.80.0.jar.sha1 b/solr/licenses/grpc-protobuf-1.80.0.jar.sha1 deleted file mode 100644 index 0536ce7131d5..000000000000 --- a/solr/licenses/grpc-protobuf-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0fdcc7d6170bc4742ffb4581ebe5aaa25ada494f diff --git a/solr/licenses/grpc-protobuf-1.81.0.jar.sha1 b/solr/licenses/grpc-protobuf-1.81.0.jar.sha1 new file mode 100644 index 000000000000..0e3f029f9f0c --- /dev/null +++ b/solr/licenses/grpc-protobuf-1.81.0.jar.sha1 @@ -0,0 +1 @@ +1d51b99a7b9e3f6d52ee4ffb7a689dcb299b0d26 diff --git a/solr/licenses/grpc-protobuf-lite-1.80.0.jar.sha1 b/solr/licenses/grpc-protobuf-lite-1.80.0.jar.sha1 deleted file mode 100644 index 70ea0f1373b8..000000000000 --- a/solr/licenses/grpc-protobuf-lite-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4fb2ba34b3b3f59bd65af3bf080b5fd55179215a diff --git a/solr/licenses/grpc-protobuf-lite-1.81.0.jar.sha1 b/solr/licenses/grpc-protobuf-lite-1.81.0.jar.sha1 new file mode 100644 index 000000000000..35158336fd65 --- /dev/null +++ b/solr/licenses/grpc-protobuf-lite-1.81.0.jar.sha1 @@ -0,0 +1 @@ +525ab86456ede321770d3e799665517ee01645b6 diff --git a/solr/licenses/grpc-rls-1.80.0.jar.sha1 b/solr/licenses/grpc-rls-1.80.0.jar.sha1 deleted file mode 100644 index 23ff4a3e39d3..000000000000 --- a/solr/licenses/grpc-rls-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6f42e364ba054d6f39e9342c3db67fd59a352f92 diff --git a/solr/licenses/grpc-rls-1.81.0.jar.sha1 b/solr/licenses/grpc-rls-1.81.0.jar.sha1 new file mode 100644 index 000000000000..dce5b68bbae4 --- /dev/null +++ b/solr/licenses/grpc-rls-1.81.0.jar.sha1 @@ -0,0 +1 @@ +d76dd4ed4cedf057582072f85c130f24048b01c0 diff --git a/solr/licenses/grpc-services-1.80.0.jar.sha1 b/solr/licenses/grpc-services-1.80.0.jar.sha1 deleted file mode 100644 index 6ceaaedec1d9..000000000000 --- a/solr/licenses/grpc-services-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f50a01610e071cd37390beedc6ac39f8990ff30c diff --git a/solr/licenses/grpc-services-1.81.0.jar.sha1 b/solr/licenses/grpc-services-1.81.0.jar.sha1 new file mode 100644 index 000000000000..621144be697b --- /dev/null +++ b/solr/licenses/grpc-services-1.81.0.jar.sha1 @@ -0,0 +1 @@ +106706f0e1ffa0ccde965e86f6ae588898bdde38 diff --git a/solr/licenses/grpc-stub-1.80.0.jar.sha1 b/solr/licenses/grpc-stub-1.80.0.jar.sha1 deleted file mode 100644 index 41183fef9c5b..000000000000 --- a/solr/licenses/grpc-stub-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ec14c383fd33981790afd29b4c3da231035087b0 diff --git a/solr/licenses/grpc-stub-1.81.0.jar.sha1 b/solr/licenses/grpc-stub-1.81.0.jar.sha1 new file mode 100644 index 000000000000..2f16d93d86c3 --- /dev/null +++ b/solr/licenses/grpc-stub-1.81.0.jar.sha1 @@ -0,0 +1 @@ +3d5eac7173895a2fa774ac55f1d654ee91ade2b8 diff --git a/solr/licenses/grpc-util-1.80.0.jar.sha1 b/solr/licenses/grpc-util-1.80.0.jar.sha1 deleted file mode 100644 index c86e75559783..000000000000 --- a/solr/licenses/grpc-util-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -732e362b854ae44c0c102281d9192ce906d0d884 diff --git a/solr/licenses/grpc-util-1.81.0.jar.sha1 b/solr/licenses/grpc-util-1.81.0.jar.sha1 new file mode 100644 index 000000000000..639ea8cce5cb --- /dev/null +++ b/solr/licenses/grpc-util-1.81.0.jar.sha1 @@ -0,0 +1 @@ +0c0fff52d9691cc4a9b500509b078a25cf026a29 diff --git a/solr/licenses/grpc-xds-1.80.0.jar.sha1 b/solr/licenses/grpc-xds-1.80.0.jar.sha1 deleted file mode 100644 index b7f40c589ec9..000000000000 --- a/solr/licenses/grpc-xds-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -090e6d2faf6f8a4871167f83c977be1309445337 diff --git a/solr/licenses/grpc-xds-1.81.0.jar.sha1 b/solr/licenses/grpc-xds-1.81.0.jar.sha1 new file mode 100644 index 000000000000..6206099b5e6a --- /dev/null +++ b/solr/licenses/grpc-xds-1.81.0.jar.sha1 @@ -0,0 +1 @@ +2253157ac1c6ba69a3aa47388bdaabdda1973b4a diff --git a/solr/licenses/gson-2.12.1.jar.sha1 b/solr/licenses/gson-2.12.1.jar.sha1 deleted file mode 100644 index a7845e200a15..000000000000 --- a/solr/licenses/gson-2.12.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4e773a317740b83b43cfc3d652962856041697cb diff --git a/solr/licenses/gson-2.13.2.jar.sha1 b/solr/licenses/gson-2.13.2.jar.sha1 new file mode 100644 index 000000000000..d68492a9bcee --- /dev/null +++ b/solr/licenses/gson-2.13.2.jar.sha1 @@ -0,0 +1 @@ +48b8230771e573b54ce6e867a9001e75977fe78e diff --git a/solr/licenses/jackson-annotations-2.18.0.jar.sha1 b/solr/licenses/jackson-annotations-2.18.0.jar.sha1 deleted file mode 100644 index 2303a2b31609..000000000000 --- a/solr/licenses/jackson-annotations-2.18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9bddcc56af9d90f902ef5dba7348102cd12b04e2 diff --git a/solr/licenses/jackson-annotations-2.18.3.jar.sha1 b/solr/licenses/jackson-annotations-2.18.3.jar.sha1 new file mode 100644 index 000000000000..aeb54ab81576 --- /dev/null +++ b/solr/licenses/jackson-annotations-2.18.3.jar.sha1 @@ -0,0 +1 @@ +7fa21cf7da4598f8240e4ebd9779249622af1acd diff --git a/solr/licenses/jackson-core-2.18.0.jar.sha1 b/solr/licenses/jackson-core-2.18.0.jar.sha1 deleted file mode 100644 index 6bfee538bd71..000000000000 --- a/solr/licenses/jackson-core-2.18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -65e8ead7de5d8f7a53e296c363bea3182f21f925 diff --git a/solr/licenses/jackson-core-2.18.3.jar.sha1 b/solr/licenses/jackson-core-2.18.3.jar.sha1 new file mode 100644 index 000000000000..2e73faa33c05 --- /dev/null +++ b/solr/licenses/jackson-core-2.18.3.jar.sha1 @@ -0,0 +1 @@ +78f80c259268200e588aa204dd97ecf09b76916e diff --git a/solr/licenses/jackson-databind-2.18.0.jar.sha1 b/solr/licenses/jackson-databind-2.18.0.jar.sha1 deleted file mode 100644 index d04d844d43fe..000000000000 --- a/solr/licenses/jackson-databind-2.18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8dba1f789a75fc30b59303574fe2b269afa4d3bc diff --git a/solr/licenses/jackson-databind-2.18.3.jar.sha1 b/solr/licenses/jackson-databind-2.18.3.jar.sha1 new file mode 100644 index 000000000000..baff91e6caa9 --- /dev/null +++ b/solr/licenses/jackson-databind-2.18.3.jar.sha1 @@ -0,0 +1 @@ +537e3886263e3b3464385040453e92567fd509e2 diff --git a/solr/licenses/jackson-dataformat-cbor-2.18.0.jar.sha1 b/solr/licenses/jackson-dataformat-cbor-2.18.0.jar.sha1 deleted file mode 100644 index 23956a91bb74..000000000000 --- a/solr/licenses/jackson-dataformat-cbor-2.18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -90ec8bb9c6f7d1535e49272d344907ba57b014d6 diff --git a/solr/licenses/jackson-dataformat-cbor-2.18.3.jar.sha1 b/solr/licenses/jackson-dataformat-cbor-2.18.3.jar.sha1 new file mode 100644 index 000000000000..e08a01c43e58 --- /dev/null +++ b/solr/licenses/jackson-dataformat-cbor-2.18.3.jar.sha1 @@ -0,0 +1 @@ +af8064ba5b2afaf0920943fbfeb6b57f56aad6d8 diff --git a/solr/licenses/jackson-dataformat-csv-2.18.0.jar.sha1 b/solr/licenses/jackson-dataformat-csv-2.18.0.jar.sha1 deleted file mode 100644 index ac8ed0a127d1..000000000000 --- a/solr/licenses/jackson-dataformat-csv-2.18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -13659d6c9e8e0798ddbf19c612951c976f10aa6d diff --git a/solr/licenses/jackson-dataformat-csv-2.18.3.jar.sha1 b/solr/licenses/jackson-dataformat-csv-2.18.3.jar.sha1 new file mode 100644 index 000000000000..3d68dca4b0a2 --- /dev/null +++ b/solr/licenses/jackson-dataformat-csv-2.18.3.jar.sha1 @@ -0,0 +1 @@ +f560c1fca2340a9bdb0d6d5ebd903f9932962613 diff --git a/solr/licenses/jackson-dataformat-smile-2.18.0.jar.sha1 b/solr/licenses/jackson-dataformat-smile-2.18.0.jar.sha1 deleted file mode 100644 index 67cd3a36fcc0..000000000000 --- a/solr/licenses/jackson-dataformat-smile-2.18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -aeba95810bd35d672ca50c4a627a72543473e8b8 diff --git a/solr/licenses/jackson-dataformat-smile-2.18.3.jar.sha1 b/solr/licenses/jackson-dataformat-smile-2.18.3.jar.sha1 new file mode 100644 index 000000000000..da05ca5563e3 --- /dev/null +++ b/solr/licenses/jackson-dataformat-smile-2.18.3.jar.sha1 @@ -0,0 +1 @@ +082239b024b0f030babd2164ea5f830430d09058 diff --git a/solr/licenses/jackson-dataformat-xml-2.18.0.jar.sha1 b/solr/licenses/jackson-dataformat-xml-2.18.0.jar.sha1 deleted file mode 100644 index e084b28dd793..000000000000 --- a/solr/licenses/jackson-dataformat-xml-2.18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -abc59039b723b1c2d30d4c0e4a94dd56825f664a diff --git a/solr/licenses/jackson-dataformat-xml-2.18.3.jar.sha1 b/solr/licenses/jackson-dataformat-xml-2.18.3.jar.sha1 new file mode 100644 index 000000000000..546e55c9e415 --- /dev/null +++ b/solr/licenses/jackson-dataformat-xml-2.18.3.jar.sha1 @@ -0,0 +1 @@ +665a683773f8a92ea270d87127e198531e39cafa diff --git a/solr/licenses/jackson-datatype-jdk8-2.18.0.jar.sha1 b/solr/licenses/jackson-datatype-jdk8-2.18.0.jar.sha1 deleted file mode 100644 index 7e08a14678a2..000000000000 --- a/solr/licenses/jackson-datatype-jdk8-2.18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2046c6ad99a59b5bccf840021f5b3dcf2890acc2 diff --git a/solr/licenses/jackson-datatype-jdk8-2.18.3.jar.sha1 b/solr/licenses/jackson-datatype-jdk8-2.18.3.jar.sha1 new file mode 100644 index 000000000000..d95cc2fc5874 --- /dev/null +++ b/solr/licenses/jackson-datatype-jdk8-2.18.3.jar.sha1 @@ -0,0 +1 @@ +621558295660935134b171ce2b0d9ad6842ec2ff diff --git a/solr/licenses/jackson-datatype-jsr310-2.18.0.jar.sha1 b/solr/licenses/jackson-datatype-jsr310-2.18.0.jar.sha1 deleted file mode 100644 index 202debec5442..000000000000 --- a/solr/licenses/jackson-datatype-jsr310-2.18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ed3e9d73b532bb4eba3ac31ca44d4debe0c418de diff --git a/solr/licenses/jackson-datatype-jsr310-2.18.3.jar.sha1 b/solr/licenses/jackson-datatype-jsr310-2.18.3.jar.sha1 new file mode 100644 index 000000000000..15cc13b8f766 --- /dev/null +++ b/solr/licenses/jackson-datatype-jsr310-2.18.3.jar.sha1 @@ -0,0 +1 @@ +cc57924cccf42fc852081c36215272f84ffcd991 diff --git a/solr/licenses/jackson-module-jakarta-xmlbind-annotations-2.18.0.jar.sha1 b/solr/licenses/jackson-module-jakarta-xmlbind-annotations-2.18.0.jar.sha1 deleted file mode 100644 index 834aee7755cb..000000000000 --- a/solr/licenses/jackson-module-jakarta-xmlbind-annotations-2.18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -697ef6ec2884f4ae6e5e79377ae368f178cd0c61 diff --git a/solr/licenses/jackson-module-jakarta-xmlbind-annotations-2.18.3.jar.sha1 b/solr/licenses/jackson-module-jakarta-xmlbind-annotations-2.18.3.jar.sha1 new file mode 100644 index 000000000000..5ea974805c0f --- /dev/null +++ b/solr/licenses/jackson-module-jakarta-xmlbind-annotations-2.18.3.jar.sha1 @@ -0,0 +1 @@ +aa8ebfd31dcfa3c5be0ee55962effe2eabb63ead diff --git a/solr/licenses/jackson-module-kotlin-2.18.0.jar.sha1 b/solr/licenses/jackson-module-kotlin-2.18.0.jar.sha1 deleted file mode 100644 index d8209104bd74..000000000000 --- a/solr/licenses/jackson-module-kotlin-2.18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ef6ff9000dd9b28246e9346151127638d91398fa diff --git a/solr/licenses/jackson-module-kotlin-2.18.3.jar.sha1 b/solr/licenses/jackson-module-kotlin-2.18.3.jar.sha1 new file mode 100644 index 000000000000..f2438dd58f76 --- /dev/null +++ b/solr/licenses/jackson-module-kotlin-2.18.3.jar.sha1 @@ -0,0 +1 @@ +d79c117605fc157ec32ec9774690bb3e493938ce diff --git a/solr/licenses/jackson-module-parameter-names-2.18.0.jar.sha1 b/solr/licenses/jackson-module-parameter-names-2.18.0.jar.sha1 deleted file mode 100644 index 9d8bdcffab06..000000000000 --- a/solr/licenses/jackson-module-parameter-names-2.18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -479b85d02896fef7f78420902f587e909a72de11 diff --git a/solr/licenses/jackson-module-parameter-names-2.18.3.jar.sha1 b/solr/licenses/jackson-module-parameter-names-2.18.3.jar.sha1 new file mode 100644 index 000000000000..70cc1819e161 --- /dev/null +++ b/solr/licenses/jackson-module-parameter-names-2.18.3.jar.sha1 @@ -0,0 +1 @@ +fa63ae5eb3956b1a6d7a7ead2b513af89dea22e7 diff --git a/solr/licenses/jackson-module-scala_2.13-2.18.0.jar.sha1 b/solr/licenses/jackson-module-scala_2.13-2.18.0.jar.sha1 deleted file mode 100644 index 3ed8ffaed218..000000000000 --- a/solr/licenses/jackson-module-scala_2.13-2.18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -44ec5bc8f41c3c93586b4bef9225fd5465b71662 diff --git a/solr/licenses/jackson-module-scala_2.13-2.18.3.jar.sha1 b/solr/licenses/jackson-module-scala_2.13-2.18.3.jar.sha1 new file mode 100644 index 000000000000..d30f5b37b0f8 --- /dev/null +++ b/solr/licenses/jackson-module-scala_2.13-2.18.3.jar.sha1 @@ -0,0 +1 @@ +654e30ed3c2774c41fb285ded3076b9ff139e6fa diff --git a/solr/licenses/opencensus-proto-0.2.0.jar.sha1 b/solr/licenses/opencensus-proto-0.2.0.jar.sha1 deleted file mode 100644 index 831b07ea11f4..000000000000 --- a/solr/licenses/opencensus-proto-0.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c05b6b32b69d5d9144087ea0ebc6fab183fb9151 diff --git a/solr/licenses/opentelemetry-api-1.53.0.jar.sha1 b/solr/licenses/opentelemetry-api-1.53.0.jar.sha1 deleted file mode 100644 index 2c89b0239f91..000000000000 --- a/solr/licenses/opentelemetry-api-1.53.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fc6d4f6a0f5c5a97cbafbd198f5008ba8a023c3f diff --git a/solr/licenses/opentelemetry-api-1.62.0.jar.sha1 b/solr/licenses/opentelemetry-api-1.62.0.jar.sha1 new file mode 100644 index 000000000000..8afee6408e60 --- /dev/null +++ b/solr/licenses/opentelemetry-api-1.62.0.jar.sha1 @@ -0,0 +1 @@ +c4ee83d77005567852a72e08b945ebb023be1daa diff --git a/solr/licenses/opentelemetry-common-1.53.0.jar.sha1 b/solr/licenses/opentelemetry-common-1.53.0.jar.sha1 deleted file mode 100644 index 466f1044f444..000000000000 --- a/solr/licenses/opentelemetry-common-1.53.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e9ee5d5738ee7a8e00a12922920af3f05daa9c42 diff --git a/solr/licenses/opentelemetry-common-1.62.0.jar.sha1 b/solr/licenses/opentelemetry-common-1.62.0.jar.sha1 new file mode 100644 index 000000000000..a0fd2170a43a --- /dev/null +++ b/solr/licenses/opentelemetry-common-1.62.0.jar.sha1 @@ -0,0 +1 @@ +e6468bd64a94429b68761f7c13e143c3fdfaafc7 diff --git a/solr/licenses/opentelemetry-context-1.53.0.jar.sha1 b/solr/licenses/opentelemetry-context-1.53.0.jar.sha1 deleted file mode 100644 index ca8ef1d1fe1b..000000000000 --- a/solr/licenses/opentelemetry-context-1.53.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9733ca6c3741f0f40de6c99f9874fc239ed066cf diff --git a/solr/licenses/opentelemetry-context-1.62.0.jar.sha1 b/solr/licenses/opentelemetry-context-1.62.0.jar.sha1 new file mode 100644 index 000000000000..1672a417585c --- /dev/null +++ b/solr/licenses/opentelemetry-context-1.62.0.jar.sha1 @@ -0,0 +1 @@ +365cee4d1f365e4d4a05654742b50aa436c2dd8e diff --git a/solr/licenses/opentelemetry-gcp-resources-1.45.0-alpha.jar.sha1 b/solr/licenses/opentelemetry-gcp-resources-1.45.0-alpha.jar.sha1 new file mode 100644 index 000000000000..8d30fe778505 --- /dev/null +++ b/solr/licenses/opentelemetry-gcp-resources-1.45.0-alpha.jar.sha1 @@ -0,0 +1 @@ +2925048a53d183dcf6ec137ec5e798f38f08b2ef diff --git a/solr/licenses/opentelemetry-sdk-1.53.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-1.53.0.jar.sha1 deleted file mode 100644 index 946da446cd42..000000000000 --- a/solr/licenses/opentelemetry-sdk-1.53.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c49f224a0d8a4cb5392aa8fbc4742248d6c71a85 diff --git a/solr/licenses/opentelemetry-sdk-1.62.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-1.62.0.jar.sha1 new file mode 100644 index 000000000000..80ceb4bed094 --- /dev/null +++ b/solr/licenses/opentelemetry-sdk-1.62.0.jar.sha1 @@ -0,0 +1 @@ +06fa52c4641322b14b8bd515eb048bb9b1365d0c diff --git a/solr/licenses/opentelemetry-sdk-common-1.53.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-common-1.53.0.jar.sha1 deleted file mode 100644 index 4e6a52028da7..000000000000 --- a/solr/licenses/opentelemetry-sdk-common-1.53.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2180d1e384d1de5dddd00b7ca66513846aff70d8 diff --git a/solr/licenses/opentelemetry-sdk-common-1.62.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-common-1.62.0.jar.sha1 new file mode 100644 index 000000000000..d41eff52c06f --- /dev/null +++ b/solr/licenses/opentelemetry-sdk-common-1.62.0.jar.sha1 @@ -0,0 +1 @@ +b6742282daab8e13598b78a83ddfa54f10b5752b diff --git a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.53.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.53.0.jar.sha1 deleted file mode 100644 index 9d6291e1b3a3..000000000000 --- a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.53.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c2fff90b3070662d292071487db0ae180dbfded3 diff --git a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.62.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.62.0.jar.sha1 new file mode 100644 index 000000000000..459a26137935 --- /dev/null +++ b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.62.0.jar.sha1 @@ -0,0 +1 @@ +99bbc1bf4cae62c793e6eaa3f41436e29710b876 diff --git a/solr/licenses/opentelemetry-sdk-logs-1.53.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-logs-1.53.0.jar.sha1 deleted file mode 100644 index 1237acf55bbd..000000000000 --- a/solr/licenses/opentelemetry-sdk-logs-1.53.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -26f1c04034202b0645cfe6f320c8d65ec6753275 diff --git a/solr/licenses/opentelemetry-sdk-logs-1.62.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-logs-1.62.0.jar.sha1 new file mode 100644 index 000000000000..a4ca902edc18 --- /dev/null +++ b/solr/licenses/opentelemetry-sdk-logs-1.62.0.jar.sha1 @@ -0,0 +1 @@ +f242422084100da0bd3a5f6f2bcf364aaf4d2c53 diff --git a/solr/licenses/opentelemetry-sdk-metrics-1.53.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-metrics-1.53.0.jar.sha1 deleted file mode 100644 index a22950457db5..000000000000 --- a/solr/licenses/opentelemetry-sdk-metrics-1.53.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b264c6929feffe6632b99a0b9812278ff1779135 diff --git a/solr/licenses/opentelemetry-sdk-metrics-1.62.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-metrics-1.62.0.jar.sha1 new file mode 100644 index 000000000000..28b973b5497a --- /dev/null +++ b/solr/licenses/opentelemetry-sdk-metrics-1.62.0.jar.sha1 @@ -0,0 +1 @@ +5838371075930a4a15f7f61240b4b64cb3e924d8 diff --git a/solr/licenses/opentelemetry-sdk-trace-1.53.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-trace-1.53.0.jar.sha1 deleted file mode 100644 index 873e56283797..000000000000 --- a/solr/licenses/opentelemetry-sdk-trace-1.53.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d5f3c5243bfe5452db3941ce048f621415aac3a1 diff --git a/solr/licenses/opentelemetry-sdk-trace-1.62.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-trace-1.62.0.jar.sha1 new file mode 100644 index 000000000000..df78423607fc --- /dev/null +++ b/solr/licenses/opentelemetry-sdk-trace-1.62.0.jar.sha1 @@ -0,0 +1 @@ +7a337d2f887b151d27e734d1c221eb51b1c5b734 diff --git a/solr/licenses/opentelemetry-semconv-1.29.0-alpha.jar.sha1 b/solr/licenses/opentelemetry-semconv-1.29.0-alpha.jar.sha1 new file mode 100644 index 000000000000..75a66f7a522f --- /dev/null +++ b/solr/licenses/opentelemetry-semconv-1.29.0-alpha.jar.sha1 @@ -0,0 +1 @@ +613d7f7743eb2b974680ad1af1685802e6a7cb58 diff --git a/solr/licenses/proto-google-cloud-monitoring-v3-3.94.0.jar.sha1 b/solr/licenses/proto-google-cloud-monitoring-v3-3.94.0.jar.sha1 new file mode 100644 index 000000000000..ccb80b83f3a0 --- /dev/null +++ b/solr/licenses/proto-google-cloud-monitoring-v3-3.94.0.jar.sha1 @@ -0,0 +1 @@ +6c6ad7eabc05c54cc02a39d7e3949c00163263b5 diff --git a/solr/licenses/proto-google-cloud-storage-v2-2.40.1-alpha.jar.sha1 b/solr/licenses/proto-google-cloud-storage-v2-2.40.1-alpha.jar.sha1 deleted file mode 100644 index d78d89260518..000000000000 --- a/solr/licenses/proto-google-cloud-storage-v2-2.40.1-alpha.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0b99831c99943417c29ba27b72ddb99d215c880c diff --git a/solr/licenses/proto-google-cloud-storage-v2-2.69.0.jar.sha1 b/solr/licenses/proto-google-cloud-storage-v2-2.69.0.jar.sha1 new file mode 100644 index 000000000000..42df81f9ea43 --- /dev/null +++ b/solr/licenses/proto-google-cloud-storage-v2-2.69.0.jar.sha1 @@ -0,0 +1 @@ +763a4ac98c0fcfcbac2c8aeb5b07bde2f48dd1d1 diff --git a/solr/licenses/proto-google-common-protos-2.63.2.jar.sha1 b/solr/licenses/proto-google-common-protos-2.63.2.jar.sha1 deleted file mode 100644 index dd6686d4aa0e..000000000000 --- a/solr/licenses/proto-google-common-protos-2.63.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -da5f87b9b7ade71856fe569f89c6af036d429888 diff --git a/solr/licenses/proto-google-common-protos-2.72.0.jar.sha1 b/solr/licenses/proto-google-common-protos-2.72.0.jar.sha1 new file mode 100644 index 000000000000..4833744c787a --- /dev/null +++ b/solr/licenses/proto-google-common-protos-2.72.0.jar.sha1 @@ -0,0 +1 @@ +45cff0a9fde6e270021c417737ad172f4081492d diff --git a/solr/licenses/proto-google-iam-v1-1.36.0.jar.sha1 b/solr/licenses/proto-google-iam-v1-1.36.0.jar.sha1 deleted file mode 100644 index d2b1f509a287..000000000000 --- a/solr/licenses/proto-google-iam-v1-1.36.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -af2c8bdad5a6ea0c1ba9aebff08d675fdee26476 diff --git a/solr/licenses/proto-google-iam-v1-1.67.0.jar.sha1 b/solr/licenses/proto-google-iam-v1-1.67.0.jar.sha1 new file mode 100644 index 000000000000..2503225c1e2c --- /dev/null +++ b/solr/licenses/proto-google-iam-v1-1.67.0.jar.sha1 @@ -0,0 +1 @@ +d126a812934b9b180ed23c68a6de2844eecfc5ac diff --git a/solr/licenses/shared-resourcemapping-0.33.0.jar.sha1 b/solr/licenses/shared-resourcemapping-0.33.0.jar.sha1 new file mode 100644 index 000000000000..6906fbb9b428 --- /dev/null +++ b/solr/licenses/shared-resourcemapping-0.33.0.jar.sha1 @@ -0,0 +1 @@ +9c4f5ed770ccf34c3e78adadd979227fb9105de3 diff --git a/solr/licenses/threetenbp-1.6.9.jar.sha1 b/solr/licenses/threetenbp-1.6.9.jar.sha1 deleted file mode 100644 index 6b538b47cb23..000000000000 --- a/solr/licenses/threetenbp-1.6.9.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -39c822e33f202e7c25b54172d8235d484b4966fc diff --git a/solr/licenses/threetenbp-1.7.0.jar.sha1 b/solr/licenses/threetenbp-1.7.0.jar.sha1 new file mode 100644 index 000000000000..86270d2a5a0c --- /dev/null +++ b/solr/licenses/threetenbp-1.7.0.jar.sha1 @@ -0,0 +1 @@ +8703e893440e550295aa358281db468625bc9a05 diff --git a/versions.lock b/versions.lock index 659611f7d411..df8ceabbd52c 100644 --- a/versions.lock +++ b/versions.lock @@ -4,57 +4,65 @@ biz.aQute.bnd:biz.aQute.bnd.annotation:6.4.1 (1 constraints: 0d051636) com.carrotsearch:hppc:0.10.0 (2 constraints: d40fecb0) com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.4 (2 constraints: d21594e2) com.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e) -com.fasterxml.jackson:jackson-bom:2.18.0 (13 constraints: 2614e9f5) -com.fasterxml.jackson.core:jackson-annotations:2.18.0 (13 constraints: 4301624c) -com.fasterxml.jackson.core:jackson-core:2.18.0 (15 constraints: e436f89c) -com.fasterxml.jackson.core:jackson-databind:2.18.0 (34 constraints: ec643f77) -com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.0 (2 constraints: 641ca1f1) -com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.18.0 (2 constraints: ec19ff7a) -com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.18.0 (1 constraints: bb0eb266) -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.0 (6 constraints: e3582669) -com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.18.0 (2 constraints: ab241ae1) -com.fasterxml.jackson.module:jackson-module-scala_2.13:2.18.0 (2 constraints: ec19ff7a) -com.fasterxml.woodstox:woodstox-core:7.0.0 (1 constraints: 3b174526) +com.fasterxml.jackson:jackson-bom:2.18.3 (13 constraints: 4a145829) +com.fasterxml.jackson.core:jackson-annotations:2.18.3 (15 constraints: ee1f6693) +com.fasterxml.jackson.core:jackson-core:2.18.3 (16 constraints: 7a457559) +com.fasterxml.jackson.core:jackson-databind:2.18.3 (36 constraints: a083e21f) +com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.3 (2 constraints: 671ca4f1) +com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.18.3 (2 constraints: ef19717b) +com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.18.3 (1 constraints: be0eb566) +com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.18.3 (4 constraints: 413821c6) +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.3 (6 constraints: e6585a6b) +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.3 (6 constraints: 04679334) +com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.18.3 (2 constraints: ae24d7e1) +com.fasterxml.jackson.module:jackson-module-scala_2.13:2.18.3 (2 constraints: ef19717b) +com.fasterxml.woodstox:woodstox-core:7.0.0 (3 constraints: 60353697) com.github.ben-manes.caffeine:caffeine:3.2.3 (2 constraints: 0d121317) com.github.luben:zstd-jni:1.5.6-4 (1 constraints: 600d6236) com.github.spotbugs:spotbugs-annotations:4.8.6 (1 constraints: 14051d36) com.github.stephenc.jcip:jcip-annotations:1.0-1 (3 constraints: c71d2c87) com.github.virtuald:curvesapi:1.08 (1 constraints: 9f0ac8c0) -com.google.android:annotations:4.1.1.4 (2 constraints: b918820a) -com.google.api:api-common:2.33.0 (5 constraints: 8444f8b5) -com.google.api:gax:2.50.0 (5 constraints: 504a5892) -com.google.api:gax-grpc:2.50.0 (1 constraints: 1b1005a6) -com.google.api:gax-httpjson:2.50.0 (2 constraints: d6201381) -com.google.api-client:google-api-client:2.6.0 (3 constraints: ad32fffc) -com.google.api.grpc:gapic-google-cloud-storage-v2:2.40.1-alpha (2 constraints: e4226438) -com.google.api.grpc:grpc-google-cloud-storage-v2:2.40.1-alpha (2 constraints: e4226438) -com.google.api.grpc:proto-google-cloud-storage-v2:2.40.1-alpha (2 constraints: e4226438) -com.google.api.grpc:proto-google-common-protos:2.63.2 (6 constraints: 184eab81) -com.google.api.grpc:proto-google-iam-v1:1.36.0 (2 constraints: ef1e9acd) -com.google.apis:google-api-services-storage:v1-rev20240621-2.0.0 (2 constraints: da256149) -com.google.auth:google-auth-library-credentials:1.23.0 (7 constraints: cb686112) -com.google.auth:google-auth-library-oauth2-http:1.23.0 (6 constraints: 0f558a85) -com.google.auto.value:auto-value-annotations:1.10.4 (6 constraints: b85aa377) -com.google.cloud:google-cloud-bom:0.224.0 (1 constraints: 6a05a140) -com.google.cloud:google-cloud-core:2.40.0 (3 constraints: 3e2f1a54) -com.google.cloud:google-cloud-core-grpc:2.40.0 (1 constraints: 1a1001a6) -com.google.cloud:google-cloud-core-http:2.40.0 (1 constraints: 1a1001a6) -com.google.cloud:google-cloud-storage:2.40.1 (2 constraints: cf1cc626) -com.google.code.gson:gson:2.12.1 (7 constraints: f6622515) -com.google.errorprone:error_prone_annotations:2.31.0 (16 constraints: 87cf47ce) -com.google.guava:failureaccess:1.0.3 (2 constraints: fc19c037) -com.google.guava:guava:33.6.0-jre (24 constraints: 4d653d82) -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 4b35b0a0) -com.google.http-client:google-http-client:1.44.2 (11 constraints: 45bf29b8) -com.google.http-client:google-http-client-apache-v2:1.44.2 (2 constraints: b9201d76) -com.google.http-client:google-http-client-appengine:1.44.2 (2 constraints: de20d781) -com.google.http-client:google-http-client-gson:1.44.2 (7 constraints: 68702d4e) -com.google.http-client:google-http-client-jackson2:1.44.2 (1 constraints: 1f1009a6) -com.google.j2objc:j2objc-annotations:3.1 (4 constraints: cb35bfba) -com.google.oauth-client:google-oauth-client:1.36.0 (2 constraints: b720ee75) -com.google.protobuf:protobuf-java:4.34.1 (9 constraints: 4483fb93) -com.google.protobuf:protobuf-java-util:4.34.1 (4 constraints: 79302007) -com.google.re2j:re2j:1.8 (2 constraints: 3a140270) +com.google.android:annotations:4.1.1.4 (4 constraints: a33b86f4) +com.google.api:api-common:2.64.0 (9 constraints: f9877ce1) +com.google.api:gax:2.81.0 (6 constraints: c857f669) +com.google.api:gax-grpc:2.81.0 (3 constraints: f22b33a1) +com.google.api:gax-httpjson:2.81.0 (4 constraints: b13c44eb) +com.google.api-client:google-api-client:2.7.2 (4 constraints: ee3b3420) +com.google.api.grpc:gapic-google-cloud-storage-v2:2.69.0 (4 constraints: 323cfe7e) +com.google.api.grpc:grpc-google-cloud-storage-v2:2.69.0 (4 constraints: 323cfe7e) +com.google.api.grpc:proto-google-cloud-monitoring-v3:3.94.0 (4 constraints: 5a3ae951) +com.google.api.grpc:proto-google-cloud-storage-v2:2.69.0 (4 constraints: 323cfe7e) +com.google.api.grpc:proto-google-common-protos:2.72.0 (9 constraints: c87d009a) +com.google.api.grpc:proto-google-iam-v1:1.67.0 (4 constraints: c73a589a) +com.google.apis:google-api-services-storage:v1-rev20260204-2.0.0 (2 constraints: d8251249) +com.google.auth:google-auth-library-credentials:1.48.0 (10 constraints: e998ee29) +com.google.auth:google-auth-library-oauth2-http:1.48.0 (9 constraints: 2685d7b1) +com.google.auto.value:auto-value-annotations:1.11.0 (10 constraints: 5f9fd30d) +com.google.cloud:google-cloud-bom:0.265.0 (1 constraints: 6f05b440) +com.google.cloud:google-cloud-core:2.71.0 (3 constraints: 4a2f6b56) +com.google.cloud:google-cloud-core-grpc:2.71.0 (3 constraints: ef2ba8a0) +com.google.cloud:google-cloud-core-http:2.71.0 (3 constraints: ef2ba8a0) +com.google.cloud:google-cloud-monitoring:3.94.0 (3 constraints: f82cee1a) +com.google.cloud:google-cloud-storage:2.69.0 (3 constraints: 452a38dc) +com.google.cloud:libraries-bom:26.48.0 (1 constraints: cd141b95) +com.google.cloud.opentelemetry:detector-resources-support:0.33.0 (2 constraints: 841ec6a9) +com.google.cloud.opentelemetry:exporter-metrics:0.33.0 (2 constraints: 841ec6a9) +com.google.cloud.opentelemetry:shared-resourcemapping:0.33.0 (2 constraints: 841ec6a9) +com.google.code.gson:gson:2.13.2 (12 constraints: 3fafeba5) +com.google.errorprone:error_prone_annotations:2.31.0 (22 constraints: 4c2fb449) +com.google.guava:failureaccess:1.0.3 (6 constraints: cb636b42) +com.google.guava:guava:33.6.0-jre (24 constraints: b767ae06) +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (6 constraints: b5b5e9b2) +com.google.http-client:google-http-client:2.1.0 (14 constraints: ffe60549) +com.google.http-client:google-http-client-apache-v2:2.1.0 (4 constraints: 1b3c076a) +com.google.http-client:google-http-client-appengine:2.1.0 (4 constraints: 073c2554) +com.google.http-client:google-http-client-gson:2.1.0 (10 constraints: 02993520) +com.google.http-client:google-http-client-jackson2:2.1.0 (3 constraints: 802b6b58) +com.google.j2objc:j2objc-annotations:3.1 (7 constraints: 05738e58) +com.google.oauth-client:google-oauth-client:1.39.0 (4 constraints: 8d3cefd3) +com.google.protobuf:protobuf-java:4.34.1 (11 constraints: 109fcbad) +com.google.protobuf:protobuf-java-util:4.34.1 (8 constraints: 0e69b9fe) +com.google.re2j:re2j:1.8 (4 constraints: ab350084) com.googlecode.json-simple:json-simple:1.1.1 (1 constraints: d90f7798) com.helger:profiler:1.1.1 (1 constraints: e21053b8) com.ibm.icu:icu4j:74.2 (1 constraints: ae0f2484) @@ -76,7 +84,7 @@ com.yammer.metrics:metrics-core:2.2.0 (7 constraints: 8760e867) com.zaxxer:SparseBitSet:1.3 (1 constraints: 0e081f75) commons-beanutils:commons-beanutils:1.11.0 (1 constraints: e30fce93) commons-cli:commons-cli:1.11.0 (2 constraints: d20f5dbe) -commons-codec:commons-codec:1.21.0 (9 constraints: 587d8a8a) +commons-codec:commons-codec:1.21.0 (11 constraints: e89fc32d) commons-collections:commons-collections:3.2.2 (3 constraints: 77242dac) commons-digester:commons-digester:2.1 (1 constraints: 550fb664) commons-io:commons-io:2.21.0 (10 constraints: ab74caac) @@ -96,23 +104,24 @@ io.dropwizard.metrics:metrics-jmx:4.2.38 (1 constraints: 43054b3b) io.dropwizard.metrics:metrics-json:4.2.38 (1 constraints: 201187c9) io.dropwizard.metrics:metrics-jvm:4.2.38 (2 constraints: 62165001) io.dropwizard.metrics:metrics-servlets:4.2.38 (1 constraints: 43054b3b) -io.grpc:grpc-alts:1.80.0 (1 constraints: 1f100ba6) -io.grpc:grpc-api:1.80.0 (8 constraints: 4d510a82) -io.grpc:grpc-auth:1.80.0 (1 constraints: 1f100ba6) -io.grpc:grpc-context:1.80.0 (6 constraints: 8344a583) -io.grpc:grpc-core:1.80.0 (3 constraints: 3b21991e) -io.grpc:grpc-googleapis:1.80.0 (1 constraints: 1f100ba6) -io.grpc:grpc-grpclb:1.80.0 (1 constraints: 1f100ba6) -io.grpc:grpc-inprocess:1.80.0 (1 constraints: 1f100ba6) -io.grpc:grpc-netty:1.80.0 (1 constraints: 3b05453b) -io.grpc:grpc-netty-shaded:1.80.0 (1 constraints: 1f100ba6) -io.grpc:grpc-protobuf:1.80.0 (2 constraints: 591505d7) -io.grpc:grpc-protobuf-lite:1.80.0 (2 constraints: 251ac24d) -io.grpc:grpc-rls:1.80.0 (1 constraints: 1f100ba6) -io.grpc:grpc-services:1.80.0 (1 constraints: 1f100ba6) -io.grpc:grpc-stub:1.80.0 (2 constraints: 591505d7) -io.grpc:grpc-util:1.80.0 (3 constraints: f7218364) -io.grpc:grpc-xds:1.80.0 (1 constraints: 1f100ba6) +io.grpc:grpc-alts:1.81.0 (4 constraints: 1340dd66) +io.grpc:grpc-api:1.81.0 (11 constraints: c57535c2) +io.grpc:grpc-auth:1.81.0 (4 constraints: 1340dd66) +io.grpc:grpc-context:1.81.0 (8 constraints: 2f6c882b) +io.grpc:grpc-core:1.81.0 (6 constraints: 31518e2d) +io.grpc:grpc-googleapis:1.81.0 (4 constraints: 1340dd66) +io.grpc:grpc-grpclb:1.81.0 (3 constraints: f32bb1a0) +io.grpc:grpc-inprocess:1.81.0 (4 constraints: 1340dd66) +io.grpc:grpc-netty:1.81.0 (2 constraints: a212683c) +io.grpc:grpc-netty-shaded:1.81.0 (4 constraints: 1340dd66) +io.grpc:grpc-opentelemetry:1.81.0 (3 constraints: f32bb1a0) +io.grpc:grpc-protobuf:1.81.0 (4 constraints: 2d319783) +io.grpc:grpc-protobuf-lite:1.81.0 (6 constraints: e25ddd56) +io.grpc:grpc-rls:1.81.0 (3 constraints: f32bb1a0) +io.grpc:grpc-services:1.81.0 (4 constraints: 1340dd66) +io.grpc:grpc-stub:1.81.0 (4 constraints: 2d319783) +io.grpc:grpc-util:1.81.0 (5 constraints: dd483ef9) +io.grpc:grpc-xds:1.81.0 (4 constraints: 1340dd66) io.jaegertracing:jaeger-core:1.8.1 (2 constraints: 6f124721) io.jaegertracing:jaeger-thrift:1.8.1 (1 constraints: 0c050936) io.netty:netty-bom:4.2.12.Final (1 constraints: 53073161) @@ -120,41 +129,42 @@ io.netty:netty-buffer:4.2.12.Final (12 constraints: afb6c528) io.netty:netty-codec-base:4.2.12.Final (7 constraints: c8602952) io.netty:netty-codec-compression:4.2.12.Final (2 constraints: a4183ac7) io.netty:netty-codec-http:4.2.12.Final (4 constraints: 322f7360) -io.netty:netty-codec-http2:4.2.12.Final (2 constraints: 0d16021d) +io.netty:netty-codec-http2:4.2.12.Final (2 constraints: 0f16541d) io.netty:netty-codec-socks:4.2.12.Final (2 constraints: 061af11e) io.netty:netty-common:4.2.12.Final (14 constraints: 15d00f13) io.netty:netty-handler:4.2.12.Final (5 constraints: 88458591) -io.netty:netty-handler-proxy:4.2.12.Final (2 constraints: 0d16021d) +io.netty:netty-handler-proxy:4.2.12.Final (2 constraints: 0f16541d) io.netty:netty-resolver:4.2.12.Final (3 constraints: 41251658) io.netty:netty-tcnative-boringssl-static:2.0.75.Final (2 constraints: d51a5f58) io.netty:netty-tcnative-classes:2.0.75.Final (2 constraints: d61e8d95) io.netty:netty-transport:4.2.12.Final (11 constraints: 05a916e1) io.netty:netty-transport-classes-epoll:4.2.12.Final (2 constraints: a31d1134) io.netty:netty-transport-native-epoll:4.2.12.Final (2 constraints: fc1a4f71) -io.netty:netty-transport-native-unix-common:4.2.12.Final (5 constraints: 5d482b2e) -io.opencensus:opencensus-api:0.31.1 (5 constraints: 924d4692) -io.opencensus:opencensus-contrib-http-util:0.31.1 (3 constraints: 7232a9fc) -io.opencensus:opencensus-proto:0.2.0 (1 constraints: e60fd595) -io.opentelemetry:opentelemetry-api:1.53.0 (8 constraints: e090e9f7) -io.opentelemetry:opentelemetry-bom:1.53.0 (1 constraints: 3b05423b) -io.opentelemetry:opentelemetry-common:1.53.0 (2 constraints: f2205f41) -io.opentelemetry:opentelemetry-context:1.53.0 (2 constraints: 271fd2b4) +io.netty:netty-transport-native-unix-common:4.2.12.Final (5 constraints: 5f489f2f) +io.opencensus:opencensus-api:0.31.1 (7 constraints: 1670542e) +io.opencensus:opencensus-contrib-http-util:0.31.1 (5 constraints: f654c128) +io.opentelemetry:opentelemetry-api:1.62.0 (10 constraints: 69afe9b6) +io.opentelemetry:opentelemetry-bom:1.53.0 (2 constraints: cb195ce5) +io.opentelemetry:opentelemetry-common:1.62.0 (4 constraints: 7b3fb2e5) +io.opentelemetry:opentelemetry-context:1.62.0 (4 constraints: b03d01df) io.opentelemetry:opentelemetry-exporter-common:1.53.0 (3 constraints: 4d3d0eac) io.opentelemetry:opentelemetry-exporter-otlp:1.53.0 (1 constraints: 960ff383) io.opentelemetry:opentelemetry-exporter-otlp-common:1.53.0 (2 constraints: 52233d1c) io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.53.0 (2 constraints: 52233d1c) io.opentelemetry:opentelemetry-opentracing-shim:1.53.0 (1 constraints: 960ff383) -io.opentelemetry:opentelemetry-sdk:1.53.0 (3 constraints: a543e8e4) -io.opentelemetry:opentelemetry-sdk-common:1.53.0 (6 constraints: 816c3965) +io.opentelemetry:opentelemetry-sdk:1.62.0 (5 constraints: 2e622b83) +io.opentelemetry:opentelemetry-sdk-common:1.62.0 (8 constraints: 0a8b7717) io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.53.0 (1 constraints: 960ff383) -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.53.0 (4 constraints: 235183d1) -io.opentelemetry:opentelemetry-sdk-logs:1.53.0 (3 constraints: eb32b9b2) -io.opentelemetry:opentelemetry-sdk-metrics:1.53.0 (3 constraints: eb32b9b2) -io.opentelemetry:opentelemetry-sdk-trace:1.53.0 (3 constraints: eb32b9b2) +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.62.0 (6 constraints: ac6f57f8) +io.opentelemetry:opentelemetry-sdk-logs:1.62.0 (5 constraints: 7451374e) +io.opentelemetry:opentelemetry-sdk-metrics:1.62.0 (5 constraints: 7451374e) +io.opentelemetry:opentelemetry-sdk-trace:1.62.0 (5 constraints: 7451374e) +io.opentelemetry.contrib:opentelemetry-gcp-resources:1.45.0-alpha (2 constraints: f322813b) +io.opentelemetry.semconv:opentelemetry-semconv:1.29.0-alpha (1 constraints: 5312010e) io.opentracing:opentracing-api:0.33.0 (6 constraints: 195100dd) io.opentracing:opentracing-noop:0.33.0 (4 constraints: 48361e21) io.opentracing:opentracing-util:0.33.0 (3 constraints: f71f843b) -io.perfmark:perfmark-api:0.27.0 (3 constraints: 24218716) +io.perfmark:perfmark-api:0.27.0 (5 constraints: b043fe27) io.prometheus:prometheus-metrics-config:1.5.1 (1 constraints: d9101ebb) io.prometheus:prometheus-metrics-exposition-textformats:1.5.1 (1 constraints: 09050036) io.prometheus:prometheus-metrics-model:1.5.1 (2 constraints: 101dd0b7) @@ -193,8 +203,8 @@ org.apache.hadoop:hadoop-client-api:3.4.1 (3 constraints: 1928b25e) org.apache.hadoop:hadoop-client-runtime:3.4.1 (2 constraints: 67170843) org.apache.hadoop:hadoop-common:3.4.1 (1 constraints: 0a050736) org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.5.0 (1 constraints: 0805ff35) -org.apache.httpcomponents:httpclient:4.5.14 (7 constraints: b7695b2f) -org.apache.httpcomponents:httpcore:4.4.16 (6 constraints: ea5cc678) +org.apache.httpcomponents:httpclient:4.5.14 (10 constraints: 6e9cc932) +org.apache.httpcomponents:httpcore:4.4.16 (9 constraints: a48fb4f0) org.apache.httpcomponents:httpmime:4.5.14 (1 constraints: 40054f3b) org.apache.httpcomponents.client5:httpclient5:5.2.1 (1 constraints: 6b10bdb3) org.apache.httpcomponents.core5:httpcore5:5.2.3 (3 constraints: 40351d23) @@ -269,11 +279,11 @@ org.carrot2:carrot2-core:4.5.1 (1 constraints: 0c050f36) org.carrot2:morfologik-fsa:2.1.9 (1 constraints: db0d9c36) org.carrot2:morfologik-polish:2.1.9 (1 constraints: d312541e) org.carrot2:morfologik-stemming:2.1.9 (2 constraints: d81fb300) -org.checkerframework:checker-qual:3.44.0 (3 constraints: f02b17cc) +org.checkerframework:checker-qual:3.49.0 (4 constraints: 693aef91) org.codehaus.janino:commons-compiler:3.1.11 (2 constraints: 83195319) org.codehaus.janino:janino:3.1.11 (1 constraints: 8e0d433a) -org.codehaus.woodstox:stax2-api:4.3.0 (2 constraints: 371531af) -org.conscrypt:conscrypt-openjdk-uber:2.5.2 (1 constraints: ed0fea95) +org.codehaus.woodstox:stax2-api:4.3.0 (4 constraints: 5e33e26e) +org.conscrypt:conscrypt-openjdk-uber:2.5.2 (3 constraints: 193286c8) org.eclipse.jetty:jetty-alpn-client:10.0.26 (3 constraints: f72e3161) org.eclipse.jetty:jetty-alpn-java-client:10.0.26 (2 constraints: 231b156f) org.eclipse.jetty:jetty-alpn-java-server:10.0.26 (1 constraints: 6b059440) @@ -318,7 +328,7 @@ org.jetbrains:annotations:17.0.0 (2 constraints: 371c92e0) org.jetbrains.kotlin:kotlin-stdlib:2.2.0 (7 constraints: db6ba2e1) org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 (2 constraints: f31f0a21) org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 (8 constraints: 5f7a37d5) -org.jspecify:jspecify:1.0.0 (3 constraints: b1233dfa) +org.jspecify:jspecify:1.0.0 (10 constraints: f5a3acf8) org.locationtech.jts:jts-core:1.19.0 (2 constraints: a31de760) org.locationtech.jts.io:jts-io-common:1.19.0 (1 constraints: 930d513a) org.locationtech.proj4j:proj4j:1.2.2 (1 constraints: 5d0daf2c) @@ -342,8 +352,8 @@ org.scala-lang.modules:scala-java8-compat_2.13:1.0.2 (1 constraints: fa0af8e7) org.semver4j:semver4j:5.8.0 (1 constraints: 0f051c36) org.slf4j:jcl-over-slf4j:2.0.17 (1 constraints: 3c05323b) org.slf4j:jul-to-slf4j:2.0.17 (2 constraints: c11bd27e) -org.slf4j:slf4j-api:2.0.17 (68 constraints: 6cd32dae) -org.threeten:threetenbp:1.6.9 (4 constraints: 2833ea68) +org.slf4j:slf4j-api:2.0.17 (70 constraints: f5f17efc) +org.threeten:threetenbp:1.7.0 (6 constraints: 32557c53) org.xerial.snappy:snappy-java:1.1.10.8 (5 constraints: c146fa38) software.amazon.awssdk:annotations:2.42.37 (30 constraints: 48cb1be0) software.amazon.awssdk:apache-client:2.42.37 (4 constraints: 092a12e2) @@ -387,14 +397,12 @@ com.amazonaws:aws-java-sdk-core:1.12.501 (2 constraints: b01a32b3) com.amazonaws:aws-java-sdk-kms:1.12.501 (1 constraints: 060dbd37) com.amazonaws:aws-java-sdk-s3:1.12.501 (1 constraints: 10136f43) com.amazonaws:jmespath-java:1.12.501 (2 constraints: b01a32b3) -com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.18.0 (2 constraints: ab195b13) -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.0 (4 constraints: 6e48dd35) -com.fasterxml.jackson.module:jackson-module-kotlin:2.18.0 (2 constraints: aa1d6d60) -com.fasterxml.jackson.module:jackson-module-parameter-names:2.18.0 (2 constraints: 0d248182) +com.fasterxml.jackson.module:jackson-module-kotlin:2.18.3 (2 constraints: ad1df460) +com.fasterxml.jackson.module:jackson-module-parameter-names:2.18.3 (2 constraints: 10243583) com.github.docker-java:docker-java-api:3.4.0 (1 constraints: 3b0f6067) com.github.docker-java:docker-java-transport:3.4.0 (1 constraints: c51513cb) com.github.docker-java:docker-java-transport-zerodep:3.4.0 (1 constraints: 3b0f6067) -com.google.cloud:google-cloud-nio:0.127.20 (1 constraints: c90e267b) +com.google.cloud:google-cloud-nio:0.133.0 (2 constraints: 5c1ce41b) com.nimbusds:content-type:2.2 (1 constraints: d80b68eb) com.nimbusds:lang-tag:1.7 (1 constraints: dc0b6aeb) com.nimbusds:nimbus-jose-jwt:9.30.2 (1 constraints: 700c4b10) diff --git a/versions.props b/versions.props index 9696656c75ea..b1223f35fb0d 100644 --- a/versions.props +++ b/versions.props @@ -10,7 +10,7 @@ com.fasterxml.jackson:jackson-bom=2.18.0 com.github.ben-manes.caffeine:caffeine=3.2.3 com.github.spotbugs:*=4.8.6 com.github.stephenc.jcip:jcip-annotations=1.0-1 -com.google.cloud:google-cloud-bom=0.224.0 +com.google.cloud:google-cloud-bom=0.265.0 com.google.errorprone:*=2.31.0 com.google.guava:guava=33.6.0-jre com.google.protobuf:*=4.34.1 From bf07f445fce6e98620f5a57124f03d184ce7b2d4 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Thu, 25 Jun 2026 19:50:44 +0000 Subject: [PATCH 23/45] Update org.apache.kerby:* to v2.1.2 (branch_9x) --- solr/licenses/commons-io-2.21.0.jar.sha1 | 1 - solr/licenses/commons-io-2.22.0.jar.sha1 | 1 + solr/licenses/kerb-admin-2.1.0.jar.sha1 | 1 - solr/licenses/kerb-admin-2.1.2.jar.sha1 | 1 + solr/licenses/kerb-client-2.1.0.jar.sha1 | 1 - solr/licenses/kerb-client-2.1.2.jar.sha1 | 1 + solr/licenses/kerb-common-2.1.0.jar.sha1 | 1 - solr/licenses/kerb-common-2.1.2.jar.sha1 | 1 + solr/licenses/kerb-core-2.1.0.jar.sha1 | 1 - solr/licenses/kerb-core-2.1.2.jar.sha1 | 1 + solr/licenses/kerb-crypto-2.1.0.jar.sha1 | 1 - solr/licenses/kerb-crypto-2.1.2.jar.sha1 | 1 + solr/licenses/kerb-identity-2.1.0.jar.sha1 | 1 - solr/licenses/kerb-identity-2.1.2.jar.sha1 | 1 + solr/licenses/kerb-server-2.1.0.jar.sha1 | 1 - solr/licenses/kerb-server-2.1.2.jar.sha1 | 1 + solr/licenses/kerb-simplekdc-2.1.0.jar.sha1 | 1 - solr/licenses/kerb-simplekdc-2.1.2.jar.sha1 | 1 + solr/licenses/kerb-util-2.1.0.jar.sha1 | 1 - solr/licenses/kerb-util-2.1.2.jar.sha1 | 1 + solr/licenses/kerby-asn1-2.1.0.jar.sha1 | 1 - solr/licenses/kerby-asn1-2.1.2.jar.sha1 | 1 + solr/licenses/kerby-config-2.1.0.jar.sha1 | 1 - solr/licenses/kerby-config-2.1.2.jar.sha1 | 1 + solr/licenses/kerby-pkix-2.1.0.jar.sha1 | 1 - solr/licenses/kerby-pkix-2.1.2.jar.sha1 | 1 + solr/licenses/kerby-util-2.1.0.jar.sha1 | 1 - solr/licenses/kerby-util-2.1.2.jar.sha1 | 1 + versions.lock | 28 ++++++++++----------- versions.props | 2 +- 30 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 solr/licenses/commons-io-2.21.0.jar.sha1 create mode 100644 solr/licenses/commons-io-2.22.0.jar.sha1 delete mode 100644 solr/licenses/kerb-admin-2.1.0.jar.sha1 create mode 100644 solr/licenses/kerb-admin-2.1.2.jar.sha1 delete mode 100644 solr/licenses/kerb-client-2.1.0.jar.sha1 create mode 100644 solr/licenses/kerb-client-2.1.2.jar.sha1 delete mode 100644 solr/licenses/kerb-common-2.1.0.jar.sha1 create mode 100644 solr/licenses/kerb-common-2.1.2.jar.sha1 delete mode 100644 solr/licenses/kerb-core-2.1.0.jar.sha1 create mode 100644 solr/licenses/kerb-core-2.1.2.jar.sha1 delete mode 100644 solr/licenses/kerb-crypto-2.1.0.jar.sha1 create mode 100644 solr/licenses/kerb-crypto-2.1.2.jar.sha1 delete mode 100644 solr/licenses/kerb-identity-2.1.0.jar.sha1 create mode 100644 solr/licenses/kerb-identity-2.1.2.jar.sha1 delete mode 100644 solr/licenses/kerb-server-2.1.0.jar.sha1 create mode 100644 solr/licenses/kerb-server-2.1.2.jar.sha1 delete mode 100644 solr/licenses/kerb-simplekdc-2.1.0.jar.sha1 create mode 100644 solr/licenses/kerb-simplekdc-2.1.2.jar.sha1 delete mode 100644 solr/licenses/kerb-util-2.1.0.jar.sha1 create mode 100644 solr/licenses/kerb-util-2.1.2.jar.sha1 delete mode 100644 solr/licenses/kerby-asn1-2.1.0.jar.sha1 create mode 100644 solr/licenses/kerby-asn1-2.1.2.jar.sha1 delete mode 100644 solr/licenses/kerby-config-2.1.0.jar.sha1 create mode 100644 solr/licenses/kerby-config-2.1.2.jar.sha1 delete mode 100644 solr/licenses/kerby-pkix-2.1.0.jar.sha1 create mode 100644 solr/licenses/kerby-pkix-2.1.2.jar.sha1 delete mode 100644 solr/licenses/kerby-util-2.1.0.jar.sha1 create mode 100644 solr/licenses/kerby-util-2.1.2.jar.sha1 diff --git a/solr/licenses/commons-io-2.21.0.jar.sha1 b/solr/licenses/commons-io-2.21.0.jar.sha1 deleted file mode 100644 index 00879ab2ee80..000000000000 --- a/solr/licenses/commons-io-2.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -52a6f68fe5afe335cde95461dd5c3412f04996f7 diff --git a/solr/licenses/commons-io-2.22.0.jar.sha1 b/solr/licenses/commons-io-2.22.0.jar.sha1 new file mode 100644 index 000000000000..2f8655c58bda --- /dev/null +++ b/solr/licenses/commons-io-2.22.0.jar.sha1 @@ -0,0 +1 @@ +5b1e18bc0ad651ed878029d83f88d9c8189fd51e diff --git a/solr/licenses/kerb-admin-2.1.0.jar.sha1 b/solr/licenses/kerb-admin-2.1.0.jar.sha1 deleted file mode 100644 index a5f052b46a1e..000000000000 --- a/solr/licenses/kerb-admin-2.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -597e5f5efabf391095d4f67a599ad60d86f40a86 diff --git a/solr/licenses/kerb-admin-2.1.2.jar.sha1 b/solr/licenses/kerb-admin-2.1.2.jar.sha1 new file mode 100644 index 000000000000..314b16a6e50f --- /dev/null +++ b/solr/licenses/kerb-admin-2.1.2.jar.sha1 @@ -0,0 +1 @@ +dc72dbe82b26b5bea78f1ac3c78f286f837d86d4 diff --git a/solr/licenses/kerb-client-2.1.0.jar.sha1 b/solr/licenses/kerb-client-2.1.0.jar.sha1 deleted file mode 100644 index a1bd05d40a44..000000000000 --- a/solr/licenses/kerb-client-2.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2b46013b5aa625d76808384341aed114559aa120 diff --git a/solr/licenses/kerb-client-2.1.2.jar.sha1 b/solr/licenses/kerb-client-2.1.2.jar.sha1 new file mode 100644 index 000000000000..5aa852158e98 --- /dev/null +++ b/solr/licenses/kerb-client-2.1.2.jar.sha1 @@ -0,0 +1 @@ +08303e87229c418609447cde6afc85cf428fd8a1 diff --git a/solr/licenses/kerb-common-2.1.0.jar.sha1 b/solr/licenses/kerb-common-2.1.0.jar.sha1 deleted file mode 100644 index e37f8392ee3f..000000000000 --- a/solr/licenses/kerb-common-2.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ff54986489e5ba24e633130323112d87ba6f629c diff --git a/solr/licenses/kerb-common-2.1.2.jar.sha1 b/solr/licenses/kerb-common-2.1.2.jar.sha1 new file mode 100644 index 000000000000..c48e16117ee1 --- /dev/null +++ b/solr/licenses/kerb-common-2.1.2.jar.sha1 @@ -0,0 +1 @@ +b27ce6add4b8d3e1168ffa5eceb4542b67f7ceb5 diff --git a/solr/licenses/kerb-core-2.1.0.jar.sha1 b/solr/licenses/kerb-core-2.1.0.jar.sha1 deleted file mode 100644 index f0da37cbb3f6..000000000000 --- a/solr/licenses/kerb-core-2.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -aa3993994c4f3127b44ca485b9a5ae656d38c68b diff --git a/solr/licenses/kerb-core-2.1.2.jar.sha1 b/solr/licenses/kerb-core-2.1.2.jar.sha1 new file mode 100644 index 000000000000..ebd34c93befc --- /dev/null +++ b/solr/licenses/kerb-core-2.1.2.jar.sha1 @@ -0,0 +1 @@ +37b111fc27418aa9fd026c56a237db0513d92b1d diff --git a/solr/licenses/kerb-crypto-2.1.0.jar.sha1 b/solr/licenses/kerb-crypto-2.1.0.jar.sha1 deleted file mode 100644 index fa8f6b51d9df..000000000000 --- a/solr/licenses/kerb-crypto-2.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fcb591be6d2ca2caa169efc0117a71068d41a964 diff --git a/solr/licenses/kerb-crypto-2.1.2.jar.sha1 b/solr/licenses/kerb-crypto-2.1.2.jar.sha1 new file mode 100644 index 000000000000..3c3912daad36 --- /dev/null +++ b/solr/licenses/kerb-crypto-2.1.2.jar.sha1 @@ -0,0 +1 @@ +6b3684693d68905afe1cefd8007f894ad4be424d diff --git a/solr/licenses/kerb-identity-2.1.0.jar.sha1 b/solr/licenses/kerb-identity-2.1.0.jar.sha1 deleted file mode 100644 index d61aabcd135b..000000000000 --- a/solr/licenses/kerb-identity-2.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f9df482c85a446291d60bd7cbbf3a2cfc409d135 diff --git a/solr/licenses/kerb-identity-2.1.2.jar.sha1 b/solr/licenses/kerb-identity-2.1.2.jar.sha1 new file mode 100644 index 000000000000..8bd194acb284 --- /dev/null +++ b/solr/licenses/kerb-identity-2.1.2.jar.sha1 @@ -0,0 +1 @@ +712fd5689a95a1ae8b4f0c0c317b208e1a5e9c02 diff --git a/solr/licenses/kerb-server-2.1.0.jar.sha1 b/solr/licenses/kerb-server-2.1.0.jar.sha1 deleted file mode 100644 index b9292ff423a5..000000000000 --- a/solr/licenses/kerb-server-2.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -424e27bd14a44dac9361b4286844f85491b594ef diff --git a/solr/licenses/kerb-server-2.1.2.jar.sha1 b/solr/licenses/kerb-server-2.1.2.jar.sha1 new file mode 100644 index 000000000000..090c9291567c --- /dev/null +++ b/solr/licenses/kerb-server-2.1.2.jar.sha1 @@ -0,0 +1 @@ +23a65378b53c53384c446da5f7e62b86e05cfac0 diff --git a/solr/licenses/kerb-simplekdc-2.1.0.jar.sha1 b/solr/licenses/kerb-simplekdc-2.1.0.jar.sha1 deleted file mode 100644 index 498c8e5a3228..000000000000 --- a/solr/licenses/kerb-simplekdc-2.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b85b2217c42af8b4e4738d76fd534f4880eedf33 diff --git a/solr/licenses/kerb-simplekdc-2.1.2.jar.sha1 b/solr/licenses/kerb-simplekdc-2.1.2.jar.sha1 new file mode 100644 index 000000000000..b06a02d4501d --- /dev/null +++ b/solr/licenses/kerb-simplekdc-2.1.2.jar.sha1 @@ -0,0 +1 @@ +223359859e861442d51a6324726b1774cce705e9 diff --git a/solr/licenses/kerb-util-2.1.0.jar.sha1 b/solr/licenses/kerb-util-2.1.0.jar.sha1 deleted file mode 100644 index 22ff76cae450..000000000000 --- a/solr/licenses/kerb-util-2.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -50ed9e4aa5783ce7da8a3e37ef9fdb13acc00a77 diff --git a/solr/licenses/kerb-util-2.1.2.jar.sha1 b/solr/licenses/kerb-util-2.1.2.jar.sha1 new file mode 100644 index 000000000000..ef671e0276df --- /dev/null +++ b/solr/licenses/kerb-util-2.1.2.jar.sha1 @@ -0,0 +1 @@ +5d1537588f0009fc3cf6782ea36980106c2d1506 diff --git a/solr/licenses/kerby-asn1-2.1.0.jar.sha1 b/solr/licenses/kerby-asn1-2.1.0.jar.sha1 deleted file mode 100644 index 4e1d8ce545b7..000000000000 --- a/solr/licenses/kerby-asn1-2.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f29bfaf9033b689b340fca2af24f69ba0332a831 diff --git a/solr/licenses/kerby-asn1-2.1.2.jar.sha1 b/solr/licenses/kerby-asn1-2.1.2.jar.sha1 new file mode 100644 index 000000000000..a35ab4542c97 --- /dev/null +++ b/solr/licenses/kerby-asn1-2.1.2.jar.sha1 @@ -0,0 +1 @@ +dcce4603eb18575a156938e40d636f18f58eb286 diff --git a/solr/licenses/kerby-config-2.1.0.jar.sha1 b/solr/licenses/kerby-config-2.1.0.jar.sha1 deleted file mode 100644 index 514f0f8b0521..000000000000 --- a/solr/licenses/kerby-config-2.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6d22940560623c31b981371832555256becd5323 diff --git a/solr/licenses/kerby-config-2.1.2.jar.sha1 b/solr/licenses/kerby-config-2.1.2.jar.sha1 new file mode 100644 index 000000000000..48b7a3ebd11e --- /dev/null +++ b/solr/licenses/kerby-config-2.1.2.jar.sha1 @@ -0,0 +1 @@ +b125f8041feec586d55bd3e50137b4fcaf71d9a0 diff --git a/solr/licenses/kerby-pkix-2.1.0.jar.sha1 b/solr/licenses/kerby-pkix-2.1.0.jar.sha1 deleted file mode 100644 index 2d171bf4446f..000000000000 --- a/solr/licenses/kerby-pkix-2.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a404c5c60331ef647608b626c4202bbbbe9c1e3c diff --git a/solr/licenses/kerby-pkix-2.1.2.jar.sha1 b/solr/licenses/kerby-pkix-2.1.2.jar.sha1 new file mode 100644 index 000000000000..a982362a0949 --- /dev/null +++ b/solr/licenses/kerby-pkix-2.1.2.jar.sha1 @@ -0,0 +1 @@ +22cbc3a84aad58dd9e357c013d9ba0a4dff3075c diff --git a/solr/licenses/kerby-util-2.1.0.jar.sha1 b/solr/licenses/kerby-util-2.1.0.jar.sha1 deleted file mode 100644 index 177b15a3c24f..000000000000 --- a/solr/licenses/kerby-util-2.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7296dbedf430fd56bbd8e1cbe008f9c80ee213d5 diff --git a/solr/licenses/kerby-util-2.1.2.jar.sha1 b/solr/licenses/kerby-util-2.1.2.jar.sha1 new file mode 100644 index 000000000000..d0b24a9d931e --- /dev/null +++ b/solr/licenses/kerby-util-2.1.2.jar.sha1 @@ -0,0 +1 @@ +e7e39eaa8f027f3e5de19c3a698c8a447901978c diff --git a/versions.lock b/versions.lock index 1b2d685a5bae..080c04c32c86 100644 --- a/versions.lock +++ b/versions.lock @@ -79,7 +79,7 @@ commons-cli:commons-cli:1.11.0 (2 constraints: d20f5dbe) commons-codec:commons-codec:1.21.0 (9 constraints: 587d8a8a) commons-collections:commons-collections:3.2.2 (3 constraints: 77242dac) commons-digester:commons-digester:2.1 (1 constraints: 550fb664) -commons-io:commons-io:2.21.0 (10 constraints: ab74caac) +commons-io:commons-io:2.22.0 (10 constraints: a7749daa) commons-validator:commons-validator:1.10.1 (1 constraints: 2a0b25f3) dev.ai4j:openai4j:0.22.0 (1 constraints: cf0ee778) dev.langchain4j:langchain4j-cohere:0.35.0 (1 constraints: 3a053a3b) @@ -212,13 +212,13 @@ org.apache.kafka:kafka-streams:3.9.2 (1 constraints: 4b07ef6f) org.apache.kafka:kafka-tools-api:3.9.2 (1 constraints: 050b1de8) org.apache.kafka:kafka-transaction-coordinator:3.9.2 (3 constraints: ad24b99b) org.apache.kafka:kafka_2.13:3.9.2 (1 constraints: 4b07ef6f) -org.apache.kerby:kerb-core:2.1.0 (5 constraints: 6d360adf) -org.apache.kerby:kerb-crypto:2.1.0 (2 constraints: d8172f97) -org.apache.kerby:kerb-util:2.1.0 (3 constraints: 1d1d5e4d) -org.apache.kerby:kerby-asn1:2.1.0 (1 constraints: fe0bf0f4) -org.apache.kerby:kerby-config:2.1.0 (4 constraints: 51317aba) -org.apache.kerby:kerby-pkix:2.1.0 (1 constraints: 720b03e5) -org.apache.kerby:kerby-util:2.1.0 (2 constraints: 6718efb6) +org.apache.kerby:kerb-core:2.1.2 (5 constraints: 7736f4e1) +org.apache.kerby:kerb-crypto:2.1.2 (2 constraints: dc177997) +org.apache.kerby:kerb-util:2.1.2 (3 constraints: 231d404e) +org.apache.kerby:kerby-asn1:2.1.2 (1 constraints: 000cf2f4) +org.apache.kerby:kerby-config:2.1.2 (4 constraints: 59313abc) +org.apache.kerby:kerby-pkix:2.1.2 (1 constraints: 740b05e5) +org.apache.kerby:kerby-util:2.1.2 (2 constraints: 6b183bb7) org.apache.logging.log4j:log4j-1.2-api:2.26.0 (1 constraints: 3c05453b) org.apache.logging.log4j:log4j-api:2.26.0 (7 constraints: fb555ddb) org.apache.logging.log4j:log4j-core:2.26.0 (5 constraints: 73515398) @@ -420,12 +420,12 @@ no.nav.security:mock-oauth2-server:0.5.10 (1 constraints: 3805333b) org.apache.hadoop:hadoop-client-minicluster:3.4.1 (1 constraints: 0a050736) org.apache.hadoop:hadoop-hdfs:3.4.1 (1 constraints: 0a050736) org.apache.hadoop:hadoop-minikdc:3.4.1 (1 constraints: 0a050736) -org.apache.kerby:kerb-admin:2.1.0 (1 constraints: 850d902f) -org.apache.kerby:kerb-client:2.1.0 (1 constraints: 850d902f) -org.apache.kerby:kerb-common:2.1.0 (3 constraints: d92524b2) -org.apache.kerby:kerb-identity:2.1.0 (1 constraints: 600cbd02) -org.apache.kerby:kerb-server:2.1.0 (1 constraints: d20b6cf2) -org.apache.kerby:kerb-simplekdc:2.1.0 (1 constraints: df0d853e) +org.apache.kerby:kerb-admin:2.1.2 (1 constraints: 870d922f) +org.apache.kerby:kerb-client:2.1.2 (1 constraints: 870d922f) +org.apache.kerby:kerb-common:2.1.2 (3 constraints: df250cb3) +org.apache.kerby:kerb-identity:2.1.2 (1 constraints: 620cbf02) +org.apache.kerby:kerb-server:2.1.2 (1 constraints: d40b6ef2) +org.apache.kerby:kerb-simplekdc:2.1.2 (1 constraints: df0d853e) org.apache.tomcat.embed:tomcat-embed-el:9.0.76 (1 constraints: d41558cf) org.bouncycastle:bcpkix-jdk15on:1.70 (1 constraints: 900eeb53) org.bouncycastle:bcpkix-jdk18on:1.82 (1 constraints: df040131) diff --git a/versions.props b/versions.props index db559662c37a..b12b7bea5a85 100644 --- a/versions.props +++ b/versions.props @@ -55,7 +55,7 @@ org.apache.httpcomponents:httpclient=4.5.14 org.apache.httpcomponents:httpcore=4.4.16 org.apache.httpcomponents:httpmime=4.5.14 org.apache.kafka:*=3.9.2 -org.apache.kerby:*=2.1.0 +org.apache.kerby:*=2.1.2 org.apache.logging.log4j:*=2.26.0 org.apache.lucene:*=9.12.3 org.apache.poi:*=5.5.1 From 63383535c7c6faab56ce02dce5bde2cdc3b00a5e Mon Sep 17 00:00:00 2001 From: SolrBot Date: Sun, 28 Jun 2026 08:46:24 +0000 Subject: [PATCH 24/45] Update AWS SDK to v2.46.17 (branch_9x) --- solr/licenses/annotations-2.42.37.jar.sha1 | 1 - solr/licenses/annotations-2.46.17.jar.sha1 | 1 + solr/licenses/apache-client-2.42.37.jar.sha1 | 1 - solr/licenses/apache-client-2.46.17.jar.sha1 | 1 + solr/licenses/apache5-client-2.46.17.jar.sha1 | 1 + solr/licenses/arns-2.42.37.jar.sha1 | 1 - solr/licenses/arns-2.46.17.jar.sha1 | 1 + solr/licenses/auth-2.42.37.jar.sha1 | 1 - solr/licenses/auth-2.46.17.jar.sha1 | 1 + solr/licenses/aws-core-2.42.37.jar.sha1 | 1 - solr/licenses/aws-core-2.46.17.jar.sha1 | 1 + .../aws-query-protocol-2.42.37.jar.sha1 | 1 - .../aws-query-protocol-2.46.17.jar.sha1 | 1 + .../aws-xml-protocol-2.42.37.jar.sha1 | 1 - .../aws-xml-protocol-2.46.17.jar.sha1 | 1 + solr/licenses/checksums-2.42.37.jar.sha1 | 1 - solr/licenses/checksums-2.46.17.jar.sha1 | 1 + solr/licenses/checksums-spi-2.42.37.jar.sha1 | 1 - solr/licenses/checksums-spi-2.46.17.jar.sha1 | 1 + solr/licenses/crt-core-2.42.37.jar.sha1 | 1 - solr/licenses/crt-core-2.46.17.jar.sha1 | 1 + solr/licenses/endpoints-spi-2.42.37.jar.sha1 | 1 - solr/licenses/endpoints-spi-2.46.17.jar.sha1 | 1 + solr/licenses/http-auth-2.42.37.jar.sha1 | 1 - solr/licenses/http-auth-2.46.17.jar.sha1 | 1 + solr/licenses/http-auth-aws-2.42.37.jar.sha1 | 1 - solr/licenses/http-auth-aws-2.46.17.jar.sha1 | 1 + ...http-auth-aws-eventstream-2.42.37.jar.sha1 | 1 - ...http-auth-aws-eventstream-2.46.17.jar.sha1 | 1 + solr/licenses/http-auth-spi-2.42.37.jar.sha1 | 1 - solr/licenses/http-auth-spi-2.46.17.jar.sha1 | 1 + .../licenses/http-client-spi-2.42.37.jar.sha1 | 1 - .../licenses/http-client-spi-2.46.17.jar.sha1 | 1 + solr/licenses/httpclient5-5.2.1.jar.sha1 | 1 - solr/licenses/httpclient5-5.6.1.jar.sha1 | 1 + solr/licenses/httpcore5-5.2.3.jar.sha1 | 1 - solr/licenses/httpcore5-5.4.2.jar.sha1 | 1 + solr/licenses/httpcore5-h2-5.2.jar.sha1 | 1 - solr/licenses/httpcore5-h2-5.4.jar.sha1 | 1 + solr/licenses/identity-spi-2.42.37.jar.sha1 | 1 - solr/licenses/identity-spi-2.46.17.jar.sha1 | 1 + solr/licenses/json-utils-2.42.37.jar.sha1 | 1 - solr/licenses/json-utils-2.46.17.jar.sha1 | 1 + solr/licenses/metrics-spi-2.42.37.jar.sha1 | 1 - solr/licenses/metrics-spi-2.46.17.jar.sha1 | 1 + solr/licenses/profiles-2.42.37.jar.sha1 | 1 - solr/licenses/profiles-2.46.17.jar.sha1 | 1 + solr/licenses/protocol-core-2.42.37.jar.sha1 | 1 - solr/licenses/protocol-core-2.46.17.jar.sha1 | 1 + solr/licenses/regions-2.42.37.jar.sha1 | 1 - solr/licenses/regions-2.46.17.jar.sha1 | 1 + solr/licenses/retries-2.42.37.jar.sha1 | 1 - solr/licenses/retries-2.46.17.jar.sha1 | 1 + solr/licenses/retries-spi-2.42.37.jar.sha1 | 1 - solr/licenses/retries-spi-2.46.17.jar.sha1 | 1 + solr/licenses/s3-2.42.37.jar.sha1 | 1 - solr/licenses/s3-2.46.17.jar.sha1 | 1 + solr/licenses/sdk-core-2.42.37.jar.sha1 | 1 - solr/licenses/sdk-core-2.46.17.jar.sha1 | 1 + solr/licenses/sts-2.42.37.jar.sha1 | 1 - solr/licenses/sts-2.46.17.jar.sha1 | 1 + .../third-party-jackson-core-2.42.37.jar.sha1 | 1 - .../third-party-jackson-core-2.46.17.jar.sha1 | 1 + .../url-connection-client-2.42.37.jar.sha1 | 1 - .../url-connection-client-2.46.17.jar.sha1 | 1 + solr/licenses/utils-2.42.37.jar.sha1 | 1 - solr/licenses/utils-2.46.17.jar.sha1 | 1 + solr/licenses/utils-lite-2.42.37.jar.sha1 | 1 - solr/licenses/utils-lite-2.46.17.jar.sha1 | 1 + versions.lock | 71 ++++++++++--------- versions.props | 2 +- 71 files changed, 72 insertions(+), 70 deletions(-) delete mode 100644 solr/licenses/annotations-2.42.37.jar.sha1 create mode 100644 solr/licenses/annotations-2.46.17.jar.sha1 delete mode 100644 solr/licenses/apache-client-2.42.37.jar.sha1 create mode 100644 solr/licenses/apache-client-2.46.17.jar.sha1 create mode 100644 solr/licenses/apache5-client-2.46.17.jar.sha1 delete mode 100644 solr/licenses/arns-2.42.37.jar.sha1 create mode 100644 solr/licenses/arns-2.46.17.jar.sha1 delete mode 100644 solr/licenses/auth-2.42.37.jar.sha1 create mode 100644 solr/licenses/auth-2.46.17.jar.sha1 delete mode 100644 solr/licenses/aws-core-2.42.37.jar.sha1 create mode 100644 solr/licenses/aws-core-2.46.17.jar.sha1 delete mode 100644 solr/licenses/aws-query-protocol-2.42.37.jar.sha1 create mode 100644 solr/licenses/aws-query-protocol-2.46.17.jar.sha1 delete mode 100644 solr/licenses/aws-xml-protocol-2.42.37.jar.sha1 create mode 100644 solr/licenses/aws-xml-protocol-2.46.17.jar.sha1 delete mode 100644 solr/licenses/checksums-2.42.37.jar.sha1 create mode 100644 solr/licenses/checksums-2.46.17.jar.sha1 delete mode 100644 solr/licenses/checksums-spi-2.42.37.jar.sha1 create mode 100644 solr/licenses/checksums-spi-2.46.17.jar.sha1 delete mode 100644 solr/licenses/crt-core-2.42.37.jar.sha1 create mode 100644 solr/licenses/crt-core-2.46.17.jar.sha1 delete mode 100644 solr/licenses/endpoints-spi-2.42.37.jar.sha1 create mode 100644 solr/licenses/endpoints-spi-2.46.17.jar.sha1 delete mode 100644 solr/licenses/http-auth-2.42.37.jar.sha1 create mode 100644 solr/licenses/http-auth-2.46.17.jar.sha1 delete mode 100644 solr/licenses/http-auth-aws-2.42.37.jar.sha1 create mode 100644 solr/licenses/http-auth-aws-2.46.17.jar.sha1 delete mode 100644 solr/licenses/http-auth-aws-eventstream-2.42.37.jar.sha1 create mode 100644 solr/licenses/http-auth-aws-eventstream-2.46.17.jar.sha1 delete mode 100644 solr/licenses/http-auth-spi-2.42.37.jar.sha1 create mode 100644 solr/licenses/http-auth-spi-2.46.17.jar.sha1 delete mode 100644 solr/licenses/http-client-spi-2.42.37.jar.sha1 create mode 100644 solr/licenses/http-client-spi-2.46.17.jar.sha1 delete mode 100644 solr/licenses/httpclient5-5.2.1.jar.sha1 create mode 100644 solr/licenses/httpclient5-5.6.1.jar.sha1 delete mode 100644 solr/licenses/httpcore5-5.2.3.jar.sha1 create mode 100644 solr/licenses/httpcore5-5.4.2.jar.sha1 delete mode 100644 solr/licenses/httpcore5-h2-5.2.jar.sha1 create mode 100644 solr/licenses/httpcore5-h2-5.4.jar.sha1 delete mode 100644 solr/licenses/identity-spi-2.42.37.jar.sha1 create mode 100644 solr/licenses/identity-spi-2.46.17.jar.sha1 delete mode 100644 solr/licenses/json-utils-2.42.37.jar.sha1 create mode 100644 solr/licenses/json-utils-2.46.17.jar.sha1 delete mode 100644 solr/licenses/metrics-spi-2.42.37.jar.sha1 create mode 100644 solr/licenses/metrics-spi-2.46.17.jar.sha1 delete mode 100644 solr/licenses/profiles-2.42.37.jar.sha1 create mode 100644 solr/licenses/profiles-2.46.17.jar.sha1 delete mode 100644 solr/licenses/protocol-core-2.42.37.jar.sha1 create mode 100644 solr/licenses/protocol-core-2.46.17.jar.sha1 delete mode 100644 solr/licenses/regions-2.42.37.jar.sha1 create mode 100644 solr/licenses/regions-2.46.17.jar.sha1 delete mode 100644 solr/licenses/retries-2.42.37.jar.sha1 create mode 100644 solr/licenses/retries-2.46.17.jar.sha1 delete mode 100644 solr/licenses/retries-spi-2.42.37.jar.sha1 create mode 100644 solr/licenses/retries-spi-2.46.17.jar.sha1 delete mode 100644 solr/licenses/s3-2.42.37.jar.sha1 create mode 100644 solr/licenses/s3-2.46.17.jar.sha1 delete mode 100644 solr/licenses/sdk-core-2.42.37.jar.sha1 create mode 100644 solr/licenses/sdk-core-2.46.17.jar.sha1 delete mode 100644 solr/licenses/sts-2.42.37.jar.sha1 create mode 100644 solr/licenses/sts-2.46.17.jar.sha1 delete mode 100644 solr/licenses/third-party-jackson-core-2.42.37.jar.sha1 create mode 100644 solr/licenses/third-party-jackson-core-2.46.17.jar.sha1 delete mode 100644 solr/licenses/url-connection-client-2.42.37.jar.sha1 create mode 100644 solr/licenses/url-connection-client-2.46.17.jar.sha1 delete mode 100644 solr/licenses/utils-2.42.37.jar.sha1 create mode 100644 solr/licenses/utils-2.46.17.jar.sha1 delete mode 100644 solr/licenses/utils-lite-2.42.37.jar.sha1 create mode 100644 solr/licenses/utils-lite-2.46.17.jar.sha1 diff --git a/solr/licenses/annotations-2.42.37.jar.sha1 b/solr/licenses/annotations-2.42.37.jar.sha1 deleted file mode 100644 index dbcf3de7171c..000000000000 --- a/solr/licenses/annotations-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b1a13a1f1d3b5445e2f60dcc01c0e1c66662ce32 diff --git a/solr/licenses/annotations-2.46.17.jar.sha1 b/solr/licenses/annotations-2.46.17.jar.sha1 new file mode 100644 index 000000000000..3cf3b15c1481 --- /dev/null +++ b/solr/licenses/annotations-2.46.17.jar.sha1 @@ -0,0 +1 @@ +421c380b853f3222bbb0c499191b1efc2b36ba7d diff --git a/solr/licenses/apache-client-2.42.37.jar.sha1 b/solr/licenses/apache-client-2.42.37.jar.sha1 deleted file mode 100644 index 06b09d5efbe4..000000000000 --- a/solr/licenses/apache-client-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -34a1dcf7f2d504954b00b5d2df485b445ff0fe4a diff --git a/solr/licenses/apache-client-2.46.17.jar.sha1 b/solr/licenses/apache-client-2.46.17.jar.sha1 new file mode 100644 index 000000000000..503cb79a1615 --- /dev/null +++ b/solr/licenses/apache-client-2.46.17.jar.sha1 @@ -0,0 +1 @@ +79e3af1775fed1926f934782d6ac83cfdf7ad154 diff --git a/solr/licenses/apache5-client-2.46.17.jar.sha1 b/solr/licenses/apache5-client-2.46.17.jar.sha1 new file mode 100644 index 000000000000..1621bb74e4ff --- /dev/null +++ b/solr/licenses/apache5-client-2.46.17.jar.sha1 @@ -0,0 +1 @@ +6a8582139ffba62f07ee7fdad975f8f0253840f1 diff --git a/solr/licenses/arns-2.42.37.jar.sha1 b/solr/licenses/arns-2.42.37.jar.sha1 deleted file mode 100644 index bd3ecaf3c21a..000000000000 --- a/solr/licenses/arns-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -dfa5f78ee3ef1ae7751d77cbfea79ab9462a4eda diff --git a/solr/licenses/arns-2.46.17.jar.sha1 b/solr/licenses/arns-2.46.17.jar.sha1 new file mode 100644 index 000000000000..2e87ec6d7fa1 --- /dev/null +++ b/solr/licenses/arns-2.46.17.jar.sha1 @@ -0,0 +1 @@ +b39f0fbce96135c9b168cf3d24473a76f38cdbd1 diff --git a/solr/licenses/auth-2.42.37.jar.sha1 b/solr/licenses/auth-2.42.37.jar.sha1 deleted file mode 100644 index 82f6bede40be..000000000000 --- a/solr/licenses/auth-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1367486a9ad11dc1d86db7b91f1ae6763c80caa9 diff --git a/solr/licenses/auth-2.46.17.jar.sha1 b/solr/licenses/auth-2.46.17.jar.sha1 new file mode 100644 index 000000000000..501d7affea45 --- /dev/null +++ b/solr/licenses/auth-2.46.17.jar.sha1 @@ -0,0 +1 @@ +0e7b3fe1baf2a4dbf1858ddea045d60950ccb04a diff --git a/solr/licenses/aws-core-2.42.37.jar.sha1 b/solr/licenses/aws-core-2.42.37.jar.sha1 deleted file mode 100644 index 81229d11a2ab..000000000000 --- a/solr/licenses/aws-core-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -81da5401148dc666e61137c2ec4cb6d16a1d93e9 diff --git a/solr/licenses/aws-core-2.46.17.jar.sha1 b/solr/licenses/aws-core-2.46.17.jar.sha1 new file mode 100644 index 000000000000..c27f859d5fc0 --- /dev/null +++ b/solr/licenses/aws-core-2.46.17.jar.sha1 @@ -0,0 +1 @@ +9dd4ab62a8ec46d8afc23b80a2e6e2472943b5a2 diff --git a/solr/licenses/aws-query-protocol-2.42.37.jar.sha1 b/solr/licenses/aws-query-protocol-2.42.37.jar.sha1 deleted file mode 100644 index 63439cfd09ef..000000000000 --- a/solr/licenses/aws-query-protocol-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e9e2849ad9acc8ac3589d9fb77c6ba9e5e7e327c diff --git a/solr/licenses/aws-query-protocol-2.46.17.jar.sha1 b/solr/licenses/aws-query-protocol-2.46.17.jar.sha1 new file mode 100644 index 000000000000..a152d88a0a39 --- /dev/null +++ b/solr/licenses/aws-query-protocol-2.46.17.jar.sha1 @@ -0,0 +1 @@ +b9661443d20f3d5e2a56c03f7952b93cb54c8e57 diff --git a/solr/licenses/aws-xml-protocol-2.42.37.jar.sha1 b/solr/licenses/aws-xml-protocol-2.42.37.jar.sha1 deleted file mode 100644 index c7d66dbc614a..000000000000 --- a/solr/licenses/aws-xml-protocol-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -495e1f5428bea389bd9bf4d431bc16445d9d6ce9 diff --git a/solr/licenses/aws-xml-protocol-2.46.17.jar.sha1 b/solr/licenses/aws-xml-protocol-2.46.17.jar.sha1 new file mode 100644 index 000000000000..90b4e2ba58a5 --- /dev/null +++ b/solr/licenses/aws-xml-protocol-2.46.17.jar.sha1 @@ -0,0 +1 @@ +1375388137e71d4771a530b17c0776e3ffcb65f0 diff --git a/solr/licenses/checksums-2.42.37.jar.sha1 b/solr/licenses/checksums-2.42.37.jar.sha1 deleted file mode 100644 index 74684e7cf131..000000000000 --- a/solr/licenses/checksums-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b74d0ae9d5f24686f687687cf9f0fbf075eeaa63 diff --git a/solr/licenses/checksums-2.46.17.jar.sha1 b/solr/licenses/checksums-2.46.17.jar.sha1 new file mode 100644 index 000000000000..87c084ddde2e --- /dev/null +++ b/solr/licenses/checksums-2.46.17.jar.sha1 @@ -0,0 +1 @@ +003c13820784f5b2e9806e7ba2cd003bd1c30e91 diff --git a/solr/licenses/checksums-spi-2.42.37.jar.sha1 b/solr/licenses/checksums-spi-2.42.37.jar.sha1 deleted file mode 100644 index 29316fa67d0e..000000000000 --- a/solr/licenses/checksums-spi-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9efc58b403257390065e1dac7137a79e261df2a9 diff --git a/solr/licenses/checksums-spi-2.46.17.jar.sha1 b/solr/licenses/checksums-spi-2.46.17.jar.sha1 new file mode 100644 index 000000000000..55b16ac59ffd --- /dev/null +++ b/solr/licenses/checksums-spi-2.46.17.jar.sha1 @@ -0,0 +1 @@ +65d2b93a2e968bad046d930ad8a704d12d5742c1 diff --git a/solr/licenses/crt-core-2.42.37.jar.sha1 b/solr/licenses/crt-core-2.42.37.jar.sha1 deleted file mode 100644 index 6863d6be63fe..000000000000 --- a/solr/licenses/crt-core-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4e3d8cfb9b52b94f60a91849bbfa09c0bc0f1ab9 diff --git a/solr/licenses/crt-core-2.46.17.jar.sha1 b/solr/licenses/crt-core-2.46.17.jar.sha1 new file mode 100644 index 000000000000..ca4f76da8705 --- /dev/null +++ b/solr/licenses/crt-core-2.46.17.jar.sha1 @@ -0,0 +1 @@ +a2b266e984177c7be2975757f50429e44854484a diff --git a/solr/licenses/endpoints-spi-2.42.37.jar.sha1 b/solr/licenses/endpoints-spi-2.42.37.jar.sha1 deleted file mode 100644 index cb6f35d8a95a..000000000000 --- a/solr/licenses/endpoints-spi-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5cf2c9e67fdf32b57417f1975cdff243268e383a diff --git a/solr/licenses/endpoints-spi-2.46.17.jar.sha1 b/solr/licenses/endpoints-spi-2.46.17.jar.sha1 new file mode 100644 index 000000000000..576fab8fdcde --- /dev/null +++ b/solr/licenses/endpoints-spi-2.46.17.jar.sha1 @@ -0,0 +1 @@ +6e85196754b8c948742d1716681e482f2b9dd492 diff --git a/solr/licenses/http-auth-2.42.37.jar.sha1 b/solr/licenses/http-auth-2.42.37.jar.sha1 deleted file mode 100644 index 7c240cb4aa5d..000000000000 --- a/solr/licenses/http-auth-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ad2b97b222ba564bc4e1f5d89a4edfe50e9bcdf8 diff --git a/solr/licenses/http-auth-2.46.17.jar.sha1 b/solr/licenses/http-auth-2.46.17.jar.sha1 new file mode 100644 index 000000000000..b4cf41acb7f3 --- /dev/null +++ b/solr/licenses/http-auth-2.46.17.jar.sha1 @@ -0,0 +1 @@ +6f48708e7f978969ade0115ebb27c9e0d2db7e05 diff --git a/solr/licenses/http-auth-aws-2.42.37.jar.sha1 b/solr/licenses/http-auth-aws-2.42.37.jar.sha1 deleted file mode 100644 index db90fbda51f5..000000000000 --- a/solr/licenses/http-auth-aws-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -98fa9005878817a77ca4ac8bd36173e5fd7762e8 diff --git a/solr/licenses/http-auth-aws-2.46.17.jar.sha1 b/solr/licenses/http-auth-aws-2.46.17.jar.sha1 new file mode 100644 index 000000000000..066fe1c23eea --- /dev/null +++ b/solr/licenses/http-auth-aws-2.46.17.jar.sha1 @@ -0,0 +1 @@ +03cdf15a6cf03428c77247c8564c875a606b2690 diff --git a/solr/licenses/http-auth-aws-eventstream-2.42.37.jar.sha1 b/solr/licenses/http-auth-aws-eventstream-2.42.37.jar.sha1 deleted file mode 100644 index 92d481ec2554..000000000000 --- a/solr/licenses/http-auth-aws-eventstream-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -443b35c30db91baad70a365c68243f0e08caf70c diff --git a/solr/licenses/http-auth-aws-eventstream-2.46.17.jar.sha1 b/solr/licenses/http-auth-aws-eventstream-2.46.17.jar.sha1 new file mode 100644 index 000000000000..8c033da9a752 --- /dev/null +++ b/solr/licenses/http-auth-aws-eventstream-2.46.17.jar.sha1 @@ -0,0 +1 @@ +37b17870c6b9d4ab05eeba668c895717b7b82cd8 diff --git a/solr/licenses/http-auth-spi-2.42.37.jar.sha1 b/solr/licenses/http-auth-spi-2.42.37.jar.sha1 deleted file mode 100644 index c45d3c53f511..000000000000 --- a/solr/licenses/http-auth-spi-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e72436b6c5e7601f2d6172b09fe44ab5c97c33e7 diff --git a/solr/licenses/http-auth-spi-2.46.17.jar.sha1 b/solr/licenses/http-auth-spi-2.46.17.jar.sha1 new file mode 100644 index 000000000000..5a77da086039 --- /dev/null +++ b/solr/licenses/http-auth-spi-2.46.17.jar.sha1 @@ -0,0 +1 @@ +7d9f5207119ac239e43d9e413eb3d45a689f83b1 diff --git a/solr/licenses/http-client-spi-2.42.37.jar.sha1 b/solr/licenses/http-client-spi-2.42.37.jar.sha1 deleted file mode 100644 index 85a0700bd9b0..000000000000 --- a/solr/licenses/http-client-spi-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a6a7d757cc5c0606c725228a25c5800ef2380d5d diff --git a/solr/licenses/http-client-spi-2.46.17.jar.sha1 b/solr/licenses/http-client-spi-2.46.17.jar.sha1 new file mode 100644 index 000000000000..eecacdca41ae --- /dev/null +++ b/solr/licenses/http-client-spi-2.46.17.jar.sha1 @@ -0,0 +1 @@ +2ab1a2fce74d4594ac03067da6bac0b3fea23b17 diff --git a/solr/licenses/httpclient5-5.2.1.jar.sha1 b/solr/licenses/httpclient5-5.2.1.jar.sha1 deleted file mode 100644 index 5008d9aae803..000000000000 --- a/solr/licenses/httpclient5-5.2.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0c900514d3446d9ce5d9dbd90c21192048125440 diff --git a/solr/licenses/httpclient5-5.6.1.jar.sha1 b/solr/licenses/httpclient5-5.6.1.jar.sha1 new file mode 100644 index 000000000000..69efb3603e85 --- /dev/null +++ b/solr/licenses/httpclient5-5.6.1.jar.sha1 @@ -0,0 +1 @@ +b418ba210ace28adf920f1decf64d673953d07cf diff --git a/solr/licenses/httpcore5-5.2.3.jar.sha1 b/solr/licenses/httpcore5-5.2.3.jar.sha1 deleted file mode 100644 index 9a0b58fcbfdc..000000000000 --- a/solr/licenses/httpcore5-5.2.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -687cede1a44f70c7741abfab6ee2aa53dd2bfb54 diff --git a/solr/licenses/httpcore5-5.4.2.jar.sha1 b/solr/licenses/httpcore5-5.4.2.jar.sha1 new file mode 100644 index 000000000000..c9048d8d404d --- /dev/null +++ b/solr/licenses/httpcore5-5.4.2.jar.sha1 @@ -0,0 +1 @@ +346d5f65ff819510666541ba94b3abf747454916 diff --git a/solr/licenses/httpcore5-h2-5.2.jar.sha1 b/solr/licenses/httpcore5-h2-5.2.jar.sha1 deleted file mode 100644 index ff13228a443e..000000000000 --- a/solr/licenses/httpcore5-h2-5.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -698bd8c759ccc7fd7398f3179ff45d0e5a7ccc16 diff --git a/solr/licenses/httpcore5-h2-5.4.jar.sha1 b/solr/licenses/httpcore5-h2-5.4.jar.sha1 new file mode 100644 index 000000000000..f8e386f67ab1 --- /dev/null +++ b/solr/licenses/httpcore5-h2-5.4.jar.sha1 @@ -0,0 +1 @@ +83cdd62ef3140664f46be59c2c2727141d1c5a32 diff --git a/solr/licenses/identity-spi-2.42.37.jar.sha1 b/solr/licenses/identity-spi-2.42.37.jar.sha1 deleted file mode 100644 index 0319e9963c18..000000000000 --- a/solr/licenses/identity-spi-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c0bcbea7717e6220421af3c320f59272e1964a25 diff --git a/solr/licenses/identity-spi-2.46.17.jar.sha1 b/solr/licenses/identity-spi-2.46.17.jar.sha1 new file mode 100644 index 000000000000..ca08123ca054 --- /dev/null +++ b/solr/licenses/identity-spi-2.46.17.jar.sha1 @@ -0,0 +1 @@ +063c6435d7633e01c714ff1e28b7fe13c846a45d diff --git a/solr/licenses/json-utils-2.42.37.jar.sha1 b/solr/licenses/json-utils-2.42.37.jar.sha1 deleted file mode 100644 index 0dd0e260574b..000000000000 --- a/solr/licenses/json-utils-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bed7e7e88026ff273838cbd40de3b9eded21e306 diff --git a/solr/licenses/json-utils-2.46.17.jar.sha1 b/solr/licenses/json-utils-2.46.17.jar.sha1 new file mode 100644 index 000000000000..d7014fee416b --- /dev/null +++ b/solr/licenses/json-utils-2.46.17.jar.sha1 @@ -0,0 +1 @@ +24ec06a3d5b9d430e6de1d88cf041be36a7fd560 diff --git a/solr/licenses/metrics-spi-2.42.37.jar.sha1 b/solr/licenses/metrics-spi-2.42.37.jar.sha1 deleted file mode 100644 index e892e21ff55c..000000000000 --- a/solr/licenses/metrics-spi-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -87e9e8c04f82394aa7cb916616e1cbcfc7a954f8 diff --git a/solr/licenses/metrics-spi-2.46.17.jar.sha1 b/solr/licenses/metrics-spi-2.46.17.jar.sha1 new file mode 100644 index 000000000000..8a367fab7bd8 --- /dev/null +++ b/solr/licenses/metrics-spi-2.46.17.jar.sha1 @@ -0,0 +1 @@ +532e07e3a4236bae07bd63c90d7914f52dd23d5f diff --git a/solr/licenses/profiles-2.42.37.jar.sha1 b/solr/licenses/profiles-2.42.37.jar.sha1 deleted file mode 100644 index 7a9c3b0f0e29..000000000000 --- a/solr/licenses/profiles-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b2e57056153651f93a826a6e0cfc2d935d876ee3 diff --git a/solr/licenses/profiles-2.46.17.jar.sha1 b/solr/licenses/profiles-2.46.17.jar.sha1 new file mode 100644 index 000000000000..4d913b17675b --- /dev/null +++ b/solr/licenses/profiles-2.46.17.jar.sha1 @@ -0,0 +1 @@ +4d7a10d2e471740e1055a1513ed996a762850ccf diff --git a/solr/licenses/protocol-core-2.42.37.jar.sha1 b/solr/licenses/protocol-core-2.42.37.jar.sha1 deleted file mode 100644 index 0e838547cc83..000000000000 --- a/solr/licenses/protocol-core-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -49bcc7cdf41b39b84f83f22201f888ac6d60b3e8 diff --git a/solr/licenses/protocol-core-2.46.17.jar.sha1 b/solr/licenses/protocol-core-2.46.17.jar.sha1 new file mode 100644 index 000000000000..e21f46dcdab6 --- /dev/null +++ b/solr/licenses/protocol-core-2.46.17.jar.sha1 @@ -0,0 +1 @@ +63c63ddd7dbaab91f9406625578fd1969b34108d diff --git a/solr/licenses/regions-2.42.37.jar.sha1 b/solr/licenses/regions-2.42.37.jar.sha1 deleted file mode 100644 index 42d0cc1ff7da..000000000000 --- a/solr/licenses/regions-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9f2f7e54e093b5d77638b97f5fa087bbc38f7638 diff --git a/solr/licenses/regions-2.46.17.jar.sha1 b/solr/licenses/regions-2.46.17.jar.sha1 new file mode 100644 index 000000000000..5ad50fc4fb10 --- /dev/null +++ b/solr/licenses/regions-2.46.17.jar.sha1 @@ -0,0 +1 @@ +ec6c415cf5ebbb9ddd72fdadf14aedaf828a3b6b diff --git a/solr/licenses/retries-2.42.37.jar.sha1 b/solr/licenses/retries-2.42.37.jar.sha1 deleted file mode 100644 index 9a9273794346..000000000000 --- a/solr/licenses/retries-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -360553c72c0e1b1949b8109bf4f202096bf3eac7 diff --git a/solr/licenses/retries-2.46.17.jar.sha1 b/solr/licenses/retries-2.46.17.jar.sha1 new file mode 100644 index 000000000000..468ea2d84a63 --- /dev/null +++ b/solr/licenses/retries-2.46.17.jar.sha1 @@ -0,0 +1 @@ +33b5700ff1bb58a76e9b67867540aa3a961f03c5 diff --git a/solr/licenses/retries-spi-2.42.37.jar.sha1 b/solr/licenses/retries-spi-2.42.37.jar.sha1 deleted file mode 100644 index 66207ff36536..000000000000 --- a/solr/licenses/retries-spi-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -de34d04f9fc382bea4b91c6e398739512db0b96e diff --git a/solr/licenses/retries-spi-2.46.17.jar.sha1 b/solr/licenses/retries-spi-2.46.17.jar.sha1 new file mode 100644 index 000000000000..6129b120878c --- /dev/null +++ b/solr/licenses/retries-spi-2.46.17.jar.sha1 @@ -0,0 +1 @@ +ffb9e4fc620e9779b53b959125a86921b945cf70 diff --git a/solr/licenses/s3-2.42.37.jar.sha1 b/solr/licenses/s3-2.42.37.jar.sha1 deleted file mode 100644 index 4f9e990c363e..000000000000 --- a/solr/licenses/s3-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1f84320b40a915b39b002bcd08247c6c4186be47 diff --git a/solr/licenses/s3-2.46.17.jar.sha1 b/solr/licenses/s3-2.46.17.jar.sha1 new file mode 100644 index 000000000000..f2dc072d7380 --- /dev/null +++ b/solr/licenses/s3-2.46.17.jar.sha1 @@ -0,0 +1 @@ +3f3a90c40030235f3f2d754fc5d85703b5b37223 diff --git a/solr/licenses/sdk-core-2.42.37.jar.sha1 b/solr/licenses/sdk-core-2.42.37.jar.sha1 deleted file mode 100644 index 71dc4bad1a23..000000000000 --- a/solr/licenses/sdk-core-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -07de694e0e72862f093c5c837f27fb384a6b9610 diff --git a/solr/licenses/sdk-core-2.46.17.jar.sha1 b/solr/licenses/sdk-core-2.46.17.jar.sha1 new file mode 100644 index 000000000000..97965e1afa23 --- /dev/null +++ b/solr/licenses/sdk-core-2.46.17.jar.sha1 @@ -0,0 +1 @@ +a5ce78d4f92624100ab39e721929534f93f08df7 diff --git a/solr/licenses/sts-2.42.37.jar.sha1 b/solr/licenses/sts-2.42.37.jar.sha1 deleted file mode 100644 index 1090f07d7282..000000000000 --- a/solr/licenses/sts-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e1ce18a7bb2209d6203073357e77d470c4573f06 diff --git a/solr/licenses/sts-2.46.17.jar.sha1 b/solr/licenses/sts-2.46.17.jar.sha1 new file mode 100644 index 000000000000..2d61277af183 --- /dev/null +++ b/solr/licenses/sts-2.46.17.jar.sha1 @@ -0,0 +1 @@ +022d998b64f71e57057bef3580cec6f60a701c82 diff --git a/solr/licenses/third-party-jackson-core-2.42.37.jar.sha1 b/solr/licenses/third-party-jackson-core-2.42.37.jar.sha1 deleted file mode 100644 index 6fb5a7ac5af8..000000000000 --- a/solr/licenses/third-party-jackson-core-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -09ad8d94e91bfa5c6e2ceb0aa9b9f3201ebf9ab9 diff --git a/solr/licenses/third-party-jackson-core-2.46.17.jar.sha1 b/solr/licenses/third-party-jackson-core-2.46.17.jar.sha1 new file mode 100644 index 000000000000..8ebf5401c59c --- /dev/null +++ b/solr/licenses/third-party-jackson-core-2.46.17.jar.sha1 @@ -0,0 +1 @@ +1d6ca0541e795b6386885c7ec88d0139e0a00bed diff --git a/solr/licenses/url-connection-client-2.42.37.jar.sha1 b/solr/licenses/url-connection-client-2.42.37.jar.sha1 deleted file mode 100644 index 6ac8dc316dfe..000000000000 --- a/solr/licenses/url-connection-client-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0d6dc3d6fdf3404e29321698c0c7ea4b0de2c90d diff --git a/solr/licenses/url-connection-client-2.46.17.jar.sha1 b/solr/licenses/url-connection-client-2.46.17.jar.sha1 new file mode 100644 index 000000000000..88eaafae6eb5 --- /dev/null +++ b/solr/licenses/url-connection-client-2.46.17.jar.sha1 @@ -0,0 +1 @@ +33203e981c224fa4356cf7b8c025c075b327fb21 diff --git a/solr/licenses/utils-2.42.37.jar.sha1 b/solr/licenses/utils-2.42.37.jar.sha1 deleted file mode 100644 index cdea5b4a6636..000000000000 --- a/solr/licenses/utils-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9b862317e697a236013adbd9299174595ed279bb diff --git a/solr/licenses/utils-2.46.17.jar.sha1 b/solr/licenses/utils-2.46.17.jar.sha1 new file mode 100644 index 000000000000..8279faa5d3e5 --- /dev/null +++ b/solr/licenses/utils-2.46.17.jar.sha1 @@ -0,0 +1 @@ +1e40b6fd0e0eaf72e6339f05ce0209da60713d91 diff --git a/solr/licenses/utils-lite-2.42.37.jar.sha1 b/solr/licenses/utils-lite-2.42.37.jar.sha1 deleted file mode 100644 index 28a9b84e9b95..000000000000 --- a/solr/licenses/utils-lite-2.42.37.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7fbe573b0b7764ae29d2b36e63543a372c4cbbfb diff --git a/solr/licenses/utils-lite-2.46.17.jar.sha1 b/solr/licenses/utils-lite-2.46.17.jar.sha1 new file mode 100644 index 000000000000..b35707755efe --- /dev/null +++ b/solr/licenses/utils-lite-2.46.17.jar.sha1 @@ -0,0 +1 @@ +9d7f08d137796e1877694313c59dff8e469a7dfd diff --git a/versions.lock b/versions.lock index 1b2d685a5bae..da93de04ee96 100644 --- a/versions.lock +++ b/versions.lock @@ -196,9 +196,9 @@ org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.5.0 (1 constraints: 0805ff35) org.apache.httpcomponents:httpclient:4.5.14 (7 constraints: b7695b2f) org.apache.httpcomponents:httpcore:4.4.16 (6 constraints: ea5cc678) org.apache.httpcomponents:httpmime:4.5.14 (1 constraints: 40054f3b) -org.apache.httpcomponents.client5:httpclient5:5.2.1 (1 constraints: 6b10bdb3) -org.apache.httpcomponents.core5:httpcore5:5.2.3 (3 constraints: 40351d23) -org.apache.httpcomponents.core5:httpcore5-h2:5.2 (1 constraints: dd12c315) +org.apache.httpcomponents.client5:httpclient5:5.6.1 (2 constraints: 6520b445) +org.apache.httpcomponents.core5:httpcore5:5.4.2 (4 constraints: 3d45d154) +org.apache.httpcomponents.core5:httpcore5-h2:5.4 (1 constraints: df12c515) org.apache.kafka:kafka-clients:3.9.2 (13 constraints: 7db456b4) org.apache.kafka:kafka-group-coordinator:3.9.2 (2 constraints: aa1748bd) org.apache.kafka:kafka-group-coordinator-api:3.9.2 (2 constraints: 111c3e15) @@ -345,37 +345,38 @@ org.slf4j:jul-to-slf4j:2.0.17 (2 constraints: c11bd27e) org.slf4j:slf4j-api:2.0.17 (68 constraints: 6cd32dae) org.threeten:threetenbp:1.6.9 (4 constraints: 2833ea68) org.xerial.snappy:snappy-java:1.1.10.8 (5 constraints: c146fa38) -software.amazon.awssdk:annotations:2.42.37 (30 constraints: 48cb1be0) -software.amazon.awssdk:apache-client:2.42.37 (4 constraints: 092a12e2) -software.amazon.awssdk:arns:2.42.37 (2 constraints: 1f1828c1) -software.amazon.awssdk:auth:2.42.37 (5 constraints: 4738643e) -software.amazon.awssdk:aws-core:2.42.37 (6 constraints: f84d7b1c) -software.amazon.awssdk:aws-query-protocol:2.42.37 (3 constraints: 582a2ddd) -software.amazon.awssdk:aws-xml-protocol:2.42.37 (2 constraints: 1f1828c1) -software.amazon.awssdk:bom:2.42.37 (1 constraints: 7405b840) -software.amazon.awssdk:checksums:2.42.37 (4 constraints: 883656f4) -software.amazon.awssdk:checksums-spi:2.42.37 (7 constraints: 6f622c0d) -software.amazon.awssdk:crt-core:2.42.37 (1 constraints: c40b9df9) -software.amazon.awssdk:endpoints-spi:2.42.37 (5 constraints: 09414072) -software.amazon.awssdk:http-auth:2.42.37 (5 constraints: a33ffc76) -software.amazon.awssdk:http-auth-aws:2.42.37 (5 constraints: 9a3f655a) -software.amazon.awssdk:http-auth-aws-eventstream:2.42.37 (2 constraints: 2b190fff) -software.amazon.awssdk:http-auth-spi:2.42.37 (8 constraints: c86c0fd5) -software.amazon.awssdk:http-client-spi:2.42.37 (15 constraints: 68da0709) -software.amazon.awssdk:identity-spi:2.42.37 (9 constraints: fd7c9bb9) -software.amazon.awssdk:json-utils:2.42.37 (5 constraints: 793fae3c) -software.amazon.awssdk:metrics-spi:2.42.37 (7 constraints: 3662850f) -software.amazon.awssdk:profiles:2.42.37 (8 constraints: 5f617a41) -software.amazon.awssdk:protocol-core:2.42.37 (5 constraints: 85483c58) -software.amazon.awssdk:regions:2.42.37 (7 constraints: 40501bad) -software.amazon.awssdk:retries:2.42.37 (3 constraints: cf284227) -software.amazon.awssdk:retries-spi:2.42.37 (7 constraints: 9754df98) -software.amazon.awssdk:s3:2.42.37 (4 constraints: e32f12c0) -software.amazon.awssdk:sdk-core:2.42.37 (10 constraints: 7e877bde) -software.amazon.awssdk:sts:2.42.37 (2 constraints: cf110715) -software.amazon.awssdk:third-party-jackson-core:2.42.37 (2 constraints: 911bdaa7) -software.amazon.awssdk:utils:2.42.37 (26 constraints: 2684ebff) -software.amazon.awssdk:utils-lite:2.42.37 (2 constraints: 9a1a0d72) +software.amazon.awssdk:annotations:2.46.17 (31 constraints: e6db2e80) +software.amazon.awssdk:apache-client:2.46.17 (2 constraints: d3116915) +software.amazon.awssdk:apache5-client:2.46.17 (3 constraints: 9c24d24a) +software.amazon.awssdk:arns:2.46.17 (2 constraints: 231888c1) +software.amazon.awssdk:auth:2.46.17 (5 constraints: 51388841) +software.amazon.awssdk:aws-core:2.46.17 (6 constraints: 044e6321) +software.amazon.awssdk:aws-query-protocol:2.46.17 (3 constraints: 5e2a2fde) +software.amazon.awssdk:aws-xml-protocol:2.46.17 (2 constraints: 231888c1) +software.amazon.awssdk:bom:2.46.17 (1 constraints: 7605c440) +software.amazon.awssdk:checksums:2.46.17 (4 constraints: 903670f6) +software.amazon.awssdk:checksums-spi:2.46.17 (7 constraints: 7d626814) +software.amazon.awssdk:crt-core:2.46.17 (1 constraints: c60ba9f9) +software.amazon.awssdk:endpoints-spi:2.46.17 (5 constraints: 13417a75) +software.amazon.awssdk:http-auth:2.46.17 (5 constraints: ad3f207a) +software.amazon.awssdk:http-auth-aws:2.46.17 (5 constraints: a43f9f5d) +software.amazon.awssdk:http-auth-aws-eventstream:2.46.17 (2 constraints: 2f1971ff) +software.amazon.awssdk:http-auth-spi:2.46.17 (8 constraints: d86c37de) +software.amazon.awssdk:http-client-spi:2.46.17 (16 constraints: e8ea66a9) +software.amazon.awssdk:identity-spi:2.46.17 (9 constraints: 0f7d8bc5) +software.amazon.awssdk:json-utils:2.46.17 (5 constraints: 833fd83f) +software.amazon.awssdk:metrics-spi:2.46.17 (8 constraints: a672306c) +software.amazon.awssdk:profiles:2.46.17 (8 constraints: 6f615a4a) +software.amazon.awssdk:protocol-core:2.46.17 (5 constraints: 8f48705b) +software.amazon.awssdk:regions:2.46.17 (7 constraints: 4c500db2) +software.amazon.awssdk:retries:2.46.17 (3 constraints: d5285828) +software.amazon.awssdk:retries-spi:2.46.17 (7 constraints: a554919f) +software.amazon.awssdk:s3:2.46.17 (4 constraints: e72f26c1) +software.amazon.awssdk:sdk-core:2.46.17 (10 constraints: 92876ded) +software.amazon.awssdk:sts:2.46.17 (2 constraints: d3116915) +software.amazon.awssdk:third-party-jackson-core:2.46.17 (2 constraints: 951b4aa8) +software.amazon.awssdk:utils:2.46.17 (27 constraints: ba943b6d) +software.amazon.awssdk:utils-lite:2.46.17 (2 constraints: 9e1a6f72) software.amazon.eventstream:eventstream:1.0.1 (3 constraints: cd2e5385) ua.net.nlp:morfologik-ukrainian-search:4.9.1 (1 constraints: d5126e1e) @@ -465,5 +466,5 @@ org.springframework.boot:spring-boot-starter-logging:2.7.13 (1 constraints: 6e13 org.springframework.boot:spring-boot-starter-web:2.7.13 (1 constraints: f30a39d6) org.testcontainers:testcontainers:1.20.4 (1 constraints: 3905313b) org.yaml:snakeyaml:1.30 (1 constraints: 0713d91f) -software.amazon.awssdk:url-connection-client:2.42.37 (2 constraints: 461f04f7) +software.amazon.awssdk:url-connection-client:2.46.17 (2 constraints: 481f10f7) software.amazon.ion:ion-java:1.0.2 (1 constraints: 720db831) diff --git a/versions.props b/versions.props index db559662c37a..ae0f03064f6f 100644 --- a/versions.props +++ b/versions.props @@ -85,4 +85,4 @@ org.semver4j:semver4j=5.8.0 org.slf4j:*=2.0.17 org.testcontainers:testcontainers*=1.20.4 org.xerial.snappy:snappy-java=1.1.10.8 -software.amazon.awssdk:*=2.42.37 +software.amazon.awssdk:*=2.46.17 From f1cdc16dd58c529b9ad2976000d77c65aca140b8 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Sun, 28 Jun 2026 19:08:58 +0000 Subject: [PATCH 25/45] Update io.grpc:grpc-* to v1.82.1 (branch_9x) --- solr/licenses/grpc-alts-1.80.0.jar.sha1 | 1 - solr/licenses/grpc-alts-1.82.1.jar.sha1 | 1 + solr/licenses/grpc-api-1.80.0.jar.sha1 | 1 - solr/licenses/grpc-api-1.82.1.jar.sha1 | 1 + solr/licenses/grpc-auth-1.80.0.jar.sha1 | 1 - solr/licenses/grpc-auth-1.82.1.jar.sha1 | 1 + solr/licenses/grpc-context-1.80.0.jar.sha1 | 1 - solr/licenses/grpc-context-1.82.1.jar.sha1 | 1 + solr/licenses/grpc-core-1.80.0.jar.sha1 | 1 - solr/licenses/grpc-core-1.82.1.jar.sha1 | 1 + solr/licenses/grpc-googleapis-1.80.0.jar.sha1 | 1 - solr/licenses/grpc-googleapis-1.82.1.jar.sha1 | 1 + solr/licenses/grpc-grpclb-1.80.0.jar.sha1 | 1 - solr/licenses/grpc-grpclb-1.82.1.jar.sha1 | 1 + solr/licenses/grpc-inprocess-1.80.0.jar.sha1 | 1 - solr/licenses/grpc-inprocess-1.82.1.jar.sha1 | 1 + solr/licenses/grpc-netty-1.80.0.jar.sha1 | 1 - solr/licenses/grpc-netty-1.82.1.jar.sha1 | 1 + .../grpc-netty-shaded-1.80.0.jar.sha1 | 1 - .../grpc-netty-shaded-1.82.1.jar.sha1 | 1 + solr/licenses/grpc-protobuf-1.80.0.jar.sha1 | 1 - solr/licenses/grpc-protobuf-1.82.1.jar.sha1 | 1 + .../grpc-protobuf-lite-1.80.0.jar.sha1 | 1 - .../grpc-protobuf-lite-1.82.1.jar.sha1 | 1 + solr/licenses/grpc-rls-1.80.0.jar.sha1 | 1 - solr/licenses/grpc-rls-1.82.1.jar.sha1 | 1 + solr/licenses/grpc-services-1.80.0.jar.sha1 | 1 - solr/licenses/grpc-services-1.82.1.jar.sha1 | 1 + solr/licenses/grpc-stub-1.80.0.jar.sha1 | 1 - solr/licenses/grpc-stub-1.82.1.jar.sha1 | 1 + solr/licenses/grpc-util-1.80.0.jar.sha1 | 1 - solr/licenses/grpc-util-1.82.1.jar.sha1 | 1 + solr/licenses/grpc-xds-1.80.0.jar.sha1 | 1 - solr/licenses/grpc-xds-1.82.1.jar.sha1 | 1 + solr/licenses/gson-2.12.1.jar.sha1 | 1 - solr/licenses/gson-2.13.2.jar.sha1 | 1 + ...proto-google-common-protos-2.63.2.jar.sha1 | 1 - ...proto-google-common-protos-2.64.1.jar.sha1 | 1 + versions.lock | 46 +++++++++---------- versions.props | 2 +- 40 files changed, 43 insertions(+), 43 deletions(-) delete mode 100644 solr/licenses/grpc-alts-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-alts-1.82.1.jar.sha1 delete mode 100644 solr/licenses/grpc-api-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-api-1.82.1.jar.sha1 delete mode 100644 solr/licenses/grpc-auth-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-auth-1.82.1.jar.sha1 delete mode 100644 solr/licenses/grpc-context-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-context-1.82.1.jar.sha1 delete mode 100644 solr/licenses/grpc-core-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-core-1.82.1.jar.sha1 delete mode 100644 solr/licenses/grpc-googleapis-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-googleapis-1.82.1.jar.sha1 delete mode 100644 solr/licenses/grpc-grpclb-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-grpclb-1.82.1.jar.sha1 delete mode 100644 solr/licenses/grpc-inprocess-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-inprocess-1.82.1.jar.sha1 delete mode 100644 solr/licenses/grpc-netty-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-netty-1.82.1.jar.sha1 delete mode 100644 solr/licenses/grpc-netty-shaded-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-netty-shaded-1.82.1.jar.sha1 delete mode 100644 solr/licenses/grpc-protobuf-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-protobuf-1.82.1.jar.sha1 delete mode 100644 solr/licenses/grpc-protobuf-lite-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-protobuf-lite-1.82.1.jar.sha1 delete mode 100644 solr/licenses/grpc-rls-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-rls-1.82.1.jar.sha1 delete mode 100644 solr/licenses/grpc-services-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-services-1.82.1.jar.sha1 delete mode 100644 solr/licenses/grpc-stub-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-stub-1.82.1.jar.sha1 delete mode 100644 solr/licenses/grpc-util-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-util-1.82.1.jar.sha1 delete mode 100644 solr/licenses/grpc-xds-1.80.0.jar.sha1 create mode 100644 solr/licenses/grpc-xds-1.82.1.jar.sha1 delete mode 100644 solr/licenses/gson-2.12.1.jar.sha1 create mode 100644 solr/licenses/gson-2.13.2.jar.sha1 delete mode 100644 solr/licenses/proto-google-common-protos-2.63.2.jar.sha1 create mode 100644 solr/licenses/proto-google-common-protos-2.64.1.jar.sha1 diff --git a/solr/licenses/grpc-alts-1.80.0.jar.sha1 b/solr/licenses/grpc-alts-1.80.0.jar.sha1 deleted file mode 100644 index 050cecc30057..000000000000 --- a/solr/licenses/grpc-alts-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -73f4f60f2f22305c03784ea90f46e8d9af97b20e diff --git a/solr/licenses/grpc-alts-1.82.1.jar.sha1 b/solr/licenses/grpc-alts-1.82.1.jar.sha1 new file mode 100644 index 000000000000..5d3148e25db1 --- /dev/null +++ b/solr/licenses/grpc-alts-1.82.1.jar.sha1 @@ -0,0 +1 @@ +ac7fde701d8d715dc634f6085677faf3adc981e9 diff --git a/solr/licenses/grpc-api-1.80.0.jar.sha1 b/solr/licenses/grpc-api-1.80.0.jar.sha1 deleted file mode 100644 index 80da4173064b..000000000000 --- a/solr/licenses/grpc-api-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -55f7b74a476f7f1815cb823b1a56b7ffd68e5043 diff --git a/solr/licenses/grpc-api-1.82.1.jar.sha1 b/solr/licenses/grpc-api-1.82.1.jar.sha1 new file mode 100644 index 000000000000..9605e6a6da01 --- /dev/null +++ b/solr/licenses/grpc-api-1.82.1.jar.sha1 @@ -0,0 +1 @@ +2924727e8438944e24f573506ae8fd675ffcaef9 diff --git a/solr/licenses/grpc-auth-1.80.0.jar.sha1 b/solr/licenses/grpc-auth-1.80.0.jar.sha1 deleted file mode 100644 index e9c7841ad833..000000000000 --- a/solr/licenses/grpc-auth-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e81fba2c16ffcc812a2b5541aaea47ce3bb50392 diff --git a/solr/licenses/grpc-auth-1.82.1.jar.sha1 b/solr/licenses/grpc-auth-1.82.1.jar.sha1 new file mode 100644 index 000000000000..ed24c5e41803 --- /dev/null +++ b/solr/licenses/grpc-auth-1.82.1.jar.sha1 @@ -0,0 +1 @@ +4dcc11ac2265d997a3a6cf4d34faeb3ebbdad590 diff --git a/solr/licenses/grpc-context-1.80.0.jar.sha1 b/solr/licenses/grpc-context-1.80.0.jar.sha1 deleted file mode 100644 index 1b86b000cd3a..000000000000 --- a/solr/licenses/grpc-context-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b3fd476c0303c84ee5abe9a639f13020660f13b0 diff --git a/solr/licenses/grpc-context-1.82.1.jar.sha1 b/solr/licenses/grpc-context-1.82.1.jar.sha1 new file mode 100644 index 000000000000..7d3b3fa08f8a --- /dev/null +++ b/solr/licenses/grpc-context-1.82.1.jar.sha1 @@ -0,0 +1 @@ +c53d85fe88126fc2bc3a99e1851d52c989ee167e diff --git a/solr/licenses/grpc-core-1.80.0.jar.sha1 b/solr/licenses/grpc-core-1.80.0.jar.sha1 deleted file mode 100644 index c6785dce15ef..000000000000 --- a/solr/licenses/grpc-core-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -aae1d22e5a816650e1e7408f2f766bf769de76f1 diff --git a/solr/licenses/grpc-core-1.82.1.jar.sha1 b/solr/licenses/grpc-core-1.82.1.jar.sha1 new file mode 100644 index 000000000000..74f1b175f329 --- /dev/null +++ b/solr/licenses/grpc-core-1.82.1.jar.sha1 @@ -0,0 +1 @@ +823f78a87ecf2ba34ffcee5d706563de54f1d6af diff --git a/solr/licenses/grpc-googleapis-1.80.0.jar.sha1 b/solr/licenses/grpc-googleapis-1.80.0.jar.sha1 deleted file mode 100644 index 60fa3efd9bb9..000000000000 --- a/solr/licenses/grpc-googleapis-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9b223e2dc54591311ca171eb429841c9f0654b66 diff --git a/solr/licenses/grpc-googleapis-1.82.1.jar.sha1 b/solr/licenses/grpc-googleapis-1.82.1.jar.sha1 new file mode 100644 index 000000000000..448fe85e2005 --- /dev/null +++ b/solr/licenses/grpc-googleapis-1.82.1.jar.sha1 @@ -0,0 +1 @@ +d360de6887f8ee4285e177593863862dc192a6f6 diff --git a/solr/licenses/grpc-grpclb-1.80.0.jar.sha1 b/solr/licenses/grpc-grpclb-1.80.0.jar.sha1 deleted file mode 100644 index 02320e2cd176..000000000000 --- a/solr/licenses/grpc-grpclb-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -28c9e8f262834c8a61faeba9e5c27261f88a40eb diff --git a/solr/licenses/grpc-grpclb-1.82.1.jar.sha1 b/solr/licenses/grpc-grpclb-1.82.1.jar.sha1 new file mode 100644 index 000000000000..1485ef27f558 --- /dev/null +++ b/solr/licenses/grpc-grpclb-1.82.1.jar.sha1 @@ -0,0 +1 @@ +2c24aebc42583fa7ac9e61ffacd70f9dec84a4e4 diff --git a/solr/licenses/grpc-inprocess-1.80.0.jar.sha1 b/solr/licenses/grpc-inprocess-1.80.0.jar.sha1 deleted file mode 100644 index 6f3dbbbdc864..000000000000 --- a/solr/licenses/grpc-inprocess-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -51b7c00db7070fcbc7b468533fb591d54385e327 diff --git a/solr/licenses/grpc-inprocess-1.82.1.jar.sha1 b/solr/licenses/grpc-inprocess-1.82.1.jar.sha1 new file mode 100644 index 000000000000..f84cc0e532ed --- /dev/null +++ b/solr/licenses/grpc-inprocess-1.82.1.jar.sha1 @@ -0,0 +1 @@ +2bf9884f4f378b45664387fe4132d98ddbfc89af diff --git a/solr/licenses/grpc-netty-1.80.0.jar.sha1 b/solr/licenses/grpc-netty-1.80.0.jar.sha1 deleted file mode 100644 index ab935ba89852..000000000000 --- a/solr/licenses/grpc-netty-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b3c8b1ed43f626498adc2dae078e3f240db5b154 diff --git a/solr/licenses/grpc-netty-1.82.1.jar.sha1 b/solr/licenses/grpc-netty-1.82.1.jar.sha1 new file mode 100644 index 000000000000..7d45ebf305be --- /dev/null +++ b/solr/licenses/grpc-netty-1.82.1.jar.sha1 @@ -0,0 +1 @@ +05905efb04672109253137583353e458dee844e1 diff --git a/solr/licenses/grpc-netty-shaded-1.80.0.jar.sha1 b/solr/licenses/grpc-netty-shaded-1.80.0.jar.sha1 deleted file mode 100644 index 9f325bc5a3f8..000000000000 --- a/solr/licenses/grpc-netty-shaded-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -90211b872a6fd7eefca494295549ed31cf5386c7 diff --git a/solr/licenses/grpc-netty-shaded-1.82.1.jar.sha1 b/solr/licenses/grpc-netty-shaded-1.82.1.jar.sha1 new file mode 100644 index 000000000000..96d36d5a155c --- /dev/null +++ b/solr/licenses/grpc-netty-shaded-1.82.1.jar.sha1 @@ -0,0 +1 @@ +fa697223034dd52f7f854942c573f7e1706a096f diff --git a/solr/licenses/grpc-protobuf-1.80.0.jar.sha1 b/solr/licenses/grpc-protobuf-1.80.0.jar.sha1 deleted file mode 100644 index 0536ce7131d5..000000000000 --- a/solr/licenses/grpc-protobuf-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0fdcc7d6170bc4742ffb4581ebe5aaa25ada494f diff --git a/solr/licenses/grpc-protobuf-1.82.1.jar.sha1 b/solr/licenses/grpc-protobuf-1.82.1.jar.sha1 new file mode 100644 index 000000000000..5ae65c9f6550 --- /dev/null +++ b/solr/licenses/grpc-protobuf-1.82.1.jar.sha1 @@ -0,0 +1 @@ +48b602fc9b1a011cff929a6be5b6f8d54d43f65b diff --git a/solr/licenses/grpc-protobuf-lite-1.80.0.jar.sha1 b/solr/licenses/grpc-protobuf-lite-1.80.0.jar.sha1 deleted file mode 100644 index 70ea0f1373b8..000000000000 --- a/solr/licenses/grpc-protobuf-lite-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4fb2ba34b3b3f59bd65af3bf080b5fd55179215a diff --git a/solr/licenses/grpc-protobuf-lite-1.82.1.jar.sha1 b/solr/licenses/grpc-protobuf-lite-1.82.1.jar.sha1 new file mode 100644 index 000000000000..9bc028b7281e --- /dev/null +++ b/solr/licenses/grpc-protobuf-lite-1.82.1.jar.sha1 @@ -0,0 +1 @@ +9e90d2d011b0ff4aa2089c98e5060855490d1d07 diff --git a/solr/licenses/grpc-rls-1.80.0.jar.sha1 b/solr/licenses/grpc-rls-1.80.0.jar.sha1 deleted file mode 100644 index 23ff4a3e39d3..000000000000 --- a/solr/licenses/grpc-rls-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6f42e364ba054d6f39e9342c3db67fd59a352f92 diff --git a/solr/licenses/grpc-rls-1.82.1.jar.sha1 b/solr/licenses/grpc-rls-1.82.1.jar.sha1 new file mode 100644 index 000000000000..9d402883e926 --- /dev/null +++ b/solr/licenses/grpc-rls-1.82.1.jar.sha1 @@ -0,0 +1 @@ +0e12f64abf854b160318c2da3dcb4cbeb6b83ed8 diff --git a/solr/licenses/grpc-services-1.80.0.jar.sha1 b/solr/licenses/grpc-services-1.80.0.jar.sha1 deleted file mode 100644 index 6ceaaedec1d9..000000000000 --- a/solr/licenses/grpc-services-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f50a01610e071cd37390beedc6ac39f8990ff30c diff --git a/solr/licenses/grpc-services-1.82.1.jar.sha1 b/solr/licenses/grpc-services-1.82.1.jar.sha1 new file mode 100644 index 000000000000..b1ac3f9a64fb --- /dev/null +++ b/solr/licenses/grpc-services-1.82.1.jar.sha1 @@ -0,0 +1 @@ +c62ddf7c9ad7201aabb10b166017c2dcecf68679 diff --git a/solr/licenses/grpc-stub-1.80.0.jar.sha1 b/solr/licenses/grpc-stub-1.80.0.jar.sha1 deleted file mode 100644 index 41183fef9c5b..000000000000 --- a/solr/licenses/grpc-stub-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ec14c383fd33981790afd29b4c3da231035087b0 diff --git a/solr/licenses/grpc-stub-1.82.1.jar.sha1 b/solr/licenses/grpc-stub-1.82.1.jar.sha1 new file mode 100644 index 000000000000..2f1dab5a58ef --- /dev/null +++ b/solr/licenses/grpc-stub-1.82.1.jar.sha1 @@ -0,0 +1 @@ +f5fee5ee46fad18d5580e832f4975597d71f6236 diff --git a/solr/licenses/grpc-util-1.80.0.jar.sha1 b/solr/licenses/grpc-util-1.80.0.jar.sha1 deleted file mode 100644 index c86e75559783..000000000000 --- a/solr/licenses/grpc-util-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -732e362b854ae44c0c102281d9192ce906d0d884 diff --git a/solr/licenses/grpc-util-1.82.1.jar.sha1 b/solr/licenses/grpc-util-1.82.1.jar.sha1 new file mode 100644 index 000000000000..84cead9c21d7 --- /dev/null +++ b/solr/licenses/grpc-util-1.82.1.jar.sha1 @@ -0,0 +1 @@ +6727e2863675bc307703dd23d39922032a7b1232 diff --git a/solr/licenses/grpc-xds-1.80.0.jar.sha1 b/solr/licenses/grpc-xds-1.80.0.jar.sha1 deleted file mode 100644 index b7f40c589ec9..000000000000 --- a/solr/licenses/grpc-xds-1.80.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -090e6d2faf6f8a4871167f83c977be1309445337 diff --git a/solr/licenses/grpc-xds-1.82.1.jar.sha1 b/solr/licenses/grpc-xds-1.82.1.jar.sha1 new file mode 100644 index 000000000000..872a9590dfd2 --- /dev/null +++ b/solr/licenses/grpc-xds-1.82.1.jar.sha1 @@ -0,0 +1 @@ +67bbd6aef2c22e9b512a4793ee920c40aea89b99 diff --git a/solr/licenses/gson-2.12.1.jar.sha1 b/solr/licenses/gson-2.12.1.jar.sha1 deleted file mode 100644 index a7845e200a15..000000000000 --- a/solr/licenses/gson-2.12.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4e773a317740b83b43cfc3d652962856041697cb diff --git a/solr/licenses/gson-2.13.2.jar.sha1 b/solr/licenses/gson-2.13.2.jar.sha1 new file mode 100644 index 000000000000..d68492a9bcee --- /dev/null +++ b/solr/licenses/gson-2.13.2.jar.sha1 @@ -0,0 +1 @@ +48b8230771e573b54ce6e867a9001e75977fe78e diff --git a/solr/licenses/proto-google-common-protos-2.63.2.jar.sha1 b/solr/licenses/proto-google-common-protos-2.63.2.jar.sha1 deleted file mode 100644 index dd6686d4aa0e..000000000000 --- a/solr/licenses/proto-google-common-protos-2.63.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -da5f87b9b7ade71856fe569f89c6af036d429888 diff --git a/solr/licenses/proto-google-common-protos-2.64.1.jar.sha1 b/solr/licenses/proto-google-common-protos-2.64.1.jar.sha1 new file mode 100644 index 000000000000..371f2bdcaaa5 --- /dev/null +++ b/solr/licenses/proto-google-common-protos-2.64.1.jar.sha1 @@ -0,0 +1 @@ +a71d9a9867ed792e54e893b8c7864a0ba1b022cf diff --git a/versions.lock b/versions.lock index 1b2d685a5bae..7e7942b46633 100644 --- a/versions.lock +++ b/versions.lock @@ -29,7 +29,7 @@ com.google.api-client:google-api-client:2.6.0 (3 constraints: ad32fffc) com.google.api.grpc:gapic-google-cloud-storage-v2:2.40.1-alpha (2 constraints: e4226438) com.google.api.grpc:grpc-google-cloud-storage-v2:2.40.1-alpha (2 constraints: e4226438) com.google.api.grpc:proto-google-cloud-storage-v2:2.40.1-alpha (2 constraints: e4226438) -com.google.api.grpc:proto-google-common-protos:2.63.2 (6 constraints: 184eab81) +com.google.api.grpc:proto-google-common-protos:2.64.1 (6 constraints: 184ead81) com.google.api.grpc:proto-google-iam-v1:1.36.0 (2 constraints: ef1e9acd) com.google.apis:google-api-services-storage:v1-rev20240621-2.0.0 (2 constraints: da256149) com.google.auth:google-auth-library-credentials:1.23.0 (7 constraints: cb686112) @@ -40,8 +40,8 @@ com.google.cloud:google-cloud-core:2.40.0 (3 constraints: 3e2f1a54) com.google.cloud:google-cloud-core-grpc:2.40.0 (1 constraints: 1a1001a6) com.google.cloud:google-cloud-core-http:2.40.0 (1 constraints: 1a1001a6) com.google.cloud:google-cloud-storage:2.40.1 (2 constraints: cf1cc626) -com.google.code.gson:gson:2.12.1 (7 constraints: f6622515) -com.google.errorprone:error_prone_annotations:2.31.0 (16 constraints: 87cf47ce) +com.google.code.gson:gson:2.13.2 (7 constraints: f8627315) +com.google.errorprone:error_prone_annotations:2.31.0 (16 constraints: 8fcfd8cd) com.google.guava:failureaccess:1.0.3 (2 constraints: fc19c037) com.google.guava:guava:33.6.0-jre (24 constraints: 4d653d82) com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 4b35b0a0) @@ -96,23 +96,23 @@ io.dropwizard.metrics:metrics-jmx:4.2.38 (1 constraints: 43054b3b) io.dropwizard.metrics:metrics-json:4.2.38 (1 constraints: 201187c9) io.dropwizard.metrics:metrics-jvm:4.2.38 (2 constraints: 62165001) io.dropwizard.metrics:metrics-servlets:4.2.38 (1 constraints: 43054b3b) -io.grpc:grpc-alts:1.80.0 (1 constraints: 1f100ba6) -io.grpc:grpc-api:1.80.0 (8 constraints: 4d510a82) -io.grpc:grpc-auth:1.80.0 (1 constraints: 1f100ba6) -io.grpc:grpc-context:1.80.0 (6 constraints: 8344a583) -io.grpc:grpc-core:1.80.0 (3 constraints: 3b21991e) -io.grpc:grpc-googleapis:1.80.0 (1 constraints: 1f100ba6) -io.grpc:grpc-grpclb:1.80.0 (1 constraints: 1f100ba6) -io.grpc:grpc-inprocess:1.80.0 (1 constraints: 1f100ba6) -io.grpc:grpc-netty:1.80.0 (1 constraints: 3b05453b) -io.grpc:grpc-netty-shaded:1.80.0 (1 constraints: 1f100ba6) -io.grpc:grpc-protobuf:1.80.0 (2 constraints: 591505d7) -io.grpc:grpc-protobuf-lite:1.80.0 (2 constraints: 251ac24d) -io.grpc:grpc-rls:1.80.0 (1 constraints: 1f100ba6) -io.grpc:grpc-services:1.80.0 (1 constraints: 1f100ba6) -io.grpc:grpc-stub:1.80.0 (2 constraints: 591505d7) -io.grpc:grpc-util:1.80.0 (3 constraints: f7218364) -io.grpc:grpc-xds:1.80.0 (1 constraints: 1f100ba6) +io.grpc:grpc-alts:1.82.1 (1 constraints: 1f100ba6) +io.grpc:grpc-api:1.82.1 (8 constraints: 62517689) +io.grpc:grpc-auth:1.82.1 (1 constraints: 1f100ba6) +io.grpc:grpc-context:1.82.1 (6 constraints: 8c442987) +io.grpc:grpc-core:1.82.1 (3 constraints: 4121f81e) +io.grpc:grpc-googleapis:1.82.1 (1 constraints: 1f100ba6) +io.grpc:grpc-grpclb:1.82.1 (1 constraints: 1f100ba6) +io.grpc:grpc-inprocess:1.82.1 (1 constraints: 1f100ba6) +io.grpc:grpc-netty:1.82.1 (1 constraints: 3e054c3b) +io.grpc:grpc-netty-shaded:1.82.1 (1 constraints: 1f100ba6) +io.grpc:grpc-protobuf:1.82.1 (2 constraints: 5c1599d7) +io.grpc:grpc-protobuf-lite:1.82.1 (2 constraints: 281ac94d) +io.grpc:grpc-rls:1.82.1 (1 constraints: 1f100ba6) +io.grpc:grpc-services:1.82.1 (1 constraints: 1f100ba6) +io.grpc:grpc-stub:1.82.1 (2 constraints: 5c1599d7) +io.grpc:grpc-util:1.82.1 (3 constraints: fd21e564) +io.grpc:grpc-xds:1.82.1 (1 constraints: 1f100ba6) io.jaegertracing:jaeger-core:1.8.1 (2 constraints: 6f124721) io.jaegertracing:jaeger-thrift:1.8.1 (1 constraints: 0c050936) io.netty:netty-bom:4.2.12.Final (1 constraints: 53073161) @@ -120,18 +120,18 @@ io.netty:netty-buffer:4.2.12.Final (12 constraints: afb6c528) io.netty:netty-codec-base:4.2.12.Final (7 constraints: c8602952) io.netty:netty-codec-compression:4.2.12.Final (2 constraints: a4183ac7) io.netty:netty-codec-http:4.2.12.Final (4 constraints: 322f7360) -io.netty:netty-codec-http2:4.2.12.Final (2 constraints: 0d16021d) +io.netty:netty-codec-http2:4.2.12.Final (2 constraints: 10167d1d) io.netty:netty-codec-socks:4.2.12.Final (2 constraints: 061af11e) io.netty:netty-common:4.2.12.Final (14 constraints: 15d00f13) io.netty:netty-handler:4.2.12.Final (5 constraints: 88458591) -io.netty:netty-handler-proxy:4.2.12.Final (2 constraints: 0d16021d) +io.netty:netty-handler-proxy:4.2.12.Final (2 constraints: 10167d1d) io.netty:netty-resolver:4.2.12.Final (3 constraints: 41251658) io.netty:netty-tcnative-boringssl-static:2.0.75.Final (2 constraints: d51a5f58) io.netty:netty-tcnative-classes:2.0.75.Final (2 constraints: d61e8d95) io.netty:netty-transport:4.2.12.Final (11 constraints: 05a916e1) io.netty:netty-transport-classes-epoll:4.2.12.Final (2 constraints: a31d1134) io.netty:netty-transport-native-epoll:4.2.12.Final (2 constraints: fc1a4f71) -io.netty:netty-transport-native-unix-common:4.2.12.Final (5 constraints: 5d482b2e) +io.netty:netty-transport-native-unix-common:4.2.12.Final (5 constraints: 60485930) io.opencensus:opencensus-api:0.31.1 (5 constraints: 924d4692) io.opencensus:opencensus-contrib-http-util:0.31.1 (3 constraints: 7232a9fc) io.opencensus:opencensus-proto:0.2.0 (1 constraints: e60fd595) diff --git a/versions.props b/versions.props index db559662c37a..204763d34b36 100644 --- a/versions.props +++ b/versions.props @@ -25,7 +25,7 @@ commons-collections:commons-collections=3.2.2 commons-io:commons-io=2.21.0 dev.langchain4j:langchain4j-*=0.35.0 io.dropwizard.metrics:*=4.2.38 -io.grpc:grpc-*=1.80.0 +io.grpc:grpc-*=1.82.1 io.jaegertracing:*=1.8.1 io.netty:netty*=4.2.12.Final io.netty:netty-tcnative*=2.0.75.Final From 6150e01afcaefae71095399dbcc935d92a5548c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Mon, 29 Jun 2026 01:02:37 +0200 Subject: [PATCH 26/45] Add LICENSE and NOTICE for new apache5-client AWS SDK module --- solr/licenses/apache5-client-LICENSE-ASL.txt | 206 +++++++++++++++++++ solr/licenses/apache5-client-NOTICE.txt | 25 +++ 2 files changed, 231 insertions(+) create mode 100644 solr/licenses/apache5-client-LICENSE-ASL.txt create mode 100644 solr/licenses/apache5-client-NOTICE.txt diff --git a/solr/licenses/apache5-client-LICENSE-ASL.txt b/solr/licenses/apache5-client-LICENSE-ASL.txt new file mode 100644 index 000000000000..1eef70a9b9f4 --- /dev/null +++ b/solr/licenses/apache5-client-LICENSE-ASL.txt @@ -0,0 +1,206 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + Note: Other license terms may apply to certain, identified software files contained within or distributed + with the accompanying software if such terms are included in the directory containing the accompanying software. + Such other license terms will then apply in lieu of the terms of the software license above. diff --git a/solr/licenses/apache5-client-NOTICE.txt b/solr/licenses/apache5-client-NOTICE.txt new file mode 100644 index 000000000000..7b5a06890325 --- /dev/null +++ b/solr/licenses/apache5-client-NOTICE.txt @@ -0,0 +1,25 @@ +AWS SDK for Java 2.0 +Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + +This product includes software developed by +Amazon Technologies, Inc (http://www.amazon.com/). + +********************** +THIRD PARTY COMPONENTS +********************** +This software includes third party software subject to the following copyrights: +- XML parsing and utility functions from JetS3t - Copyright 2006-2009 James Murty. +- PKCS#1 PEM encoded private key parsing and utility functions from oauth.googlecode.com - Copyright 1998-2010 AOL Inc. +- Apache Commons Lang - https://github.com/apache/commons-lang +- Netty Reactive Streams - https://github.com/playframework/netty-reactive-streams +- Jackson-core - https://github.com/FasterXML/jackson-core +- Jackson-dataformat-cbor - https://github.com/FasterXML/jackson-dataformats-binary + +The licenses for these third party components are included in LICENSE.txt + +- For Apache Commons Lang see also this required NOTICE: + Apache Commons Lang + Copyright 2001-2020 The Apache Software Foundation + + This product includes software developed at + The Apache Software Foundation (https://www.apache.org/). From 67981bf5ce0cd72d5b387e5b53f51ea46f7e59c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Mon, 29 Jun 2026 01:12:25 +0200 Subject: [PATCH 27/45] Exclude unused Cloud Monitoring / OpenTelemetry metrics deps from gcs-repository Solr's GCS backup uses the HTTP transport, which never loads the gRPC-only metrics/monitoring stack. Exclude those transitive libs (and prune their license/checksum files) and implement the new Storage.moveBlob test override. --- ...detector-resources-support-0.33.0.jar.sha1 | 1 - .../licenses/exporter-metrics-0.33.0.jar.sha1 | 1 - .../google-cloud-monitoring-3.94.0.jar.sha1 | 1 - ...emetry-gcp-resources-1.45.0-alpha.jar.sha1 | 1 - ...google-cloud-monitoring-v3-3.94.0.jar.sha1 | 1 - .../shared-resourcemapping-0.33.0.jar.sha1 | 1 - solr/modules/gcs-repository/build.gradle | 11 +++ .../solr/gcs/ConcurrentDelegatingStorage.java | 5 + versions.lock | 99 +++++++++---------- 9 files changed, 62 insertions(+), 59 deletions(-) delete mode 100644 solr/licenses/detector-resources-support-0.33.0.jar.sha1 delete mode 100644 solr/licenses/exporter-metrics-0.33.0.jar.sha1 delete mode 100644 solr/licenses/google-cloud-monitoring-3.94.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-gcp-resources-1.45.0-alpha.jar.sha1 delete mode 100644 solr/licenses/proto-google-cloud-monitoring-v3-3.94.0.jar.sha1 delete mode 100644 solr/licenses/shared-resourcemapping-0.33.0.jar.sha1 diff --git a/solr/licenses/detector-resources-support-0.33.0.jar.sha1 b/solr/licenses/detector-resources-support-0.33.0.jar.sha1 deleted file mode 100644 index 2f159b8e0c61..000000000000 --- a/solr/licenses/detector-resources-support-0.33.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a6ba22e47f6234179803b5bab5030ebede575b6e diff --git a/solr/licenses/exporter-metrics-0.33.0.jar.sha1 b/solr/licenses/exporter-metrics-0.33.0.jar.sha1 deleted file mode 100644 index f1656a89dbb8..000000000000 --- a/solr/licenses/exporter-metrics-0.33.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6f0cd9f1481cf92e566478140aa4d26e159b5ad8 diff --git a/solr/licenses/google-cloud-monitoring-3.94.0.jar.sha1 b/solr/licenses/google-cloud-monitoring-3.94.0.jar.sha1 deleted file mode 100644 index fbcfcb08f1de..000000000000 --- a/solr/licenses/google-cloud-monitoring-3.94.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f734ff5bc4797a105b72afc2afba4af573c73335 diff --git a/solr/licenses/opentelemetry-gcp-resources-1.45.0-alpha.jar.sha1 b/solr/licenses/opentelemetry-gcp-resources-1.45.0-alpha.jar.sha1 deleted file mode 100644 index 8d30fe778505..000000000000 --- a/solr/licenses/opentelemetry-gcp-resources-1.45.0-alpha.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2925048a53d183dcf6ec137ec5e798f38f08b2ef diff --git a/solr/licenses/proto-google-cloud-monitoring-v3-3.94.0.jar.sha1 b/solr/licenses/proto-google-cloud-monitoring-v3-3.94.0.jar.sha1 deleted file mode 100644 index ccb80b83f3a0..000000000000 --- a/solr/licenses/proto-google-cloud-monitoring-v3-3.94.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6c6ad7eabc05c54cc02a39d7e3949c00163263b5 diff --git a/solr/licenses/shared-resourcemapping-0.33.0.jar.sha1 b/solr/licenses/shared-resourcemapping-0.33.0.jar.sha1 deleted file mode 100644 index 6906fbb9b428..000000000000 --- a/solr/licenses/shared-resourcemapping-0.33.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9c4f5ed770ccf34c3e78adadd979227fb9105de3 diff --git a/solr/modules/gcs-repository/build.gradle b/solr/modules/gcs-repository/build.gradle index 5eec865fc9da..84b68ab579e9 100644 --- a/solr/modules/gcs-repository/build.gradle +++ b/solr/modules/gcs-repository/build.gradle @@ -19,6 +19,17 @@ apply plugin: 'java-library' description = 'GCS Backup Repository' +configurations.all { + // Cloud Monitoring / OpenTelemetry metrics export is only wired up for the gRPC + // transport. Solr uses the HTTP transport (see GCSConfigParser), so these libs are + // never loaded. Exclude them everywhere (incl. test, via google-cloud-nio) to avoid + // shipping unused dependencies. + exclude group: 'com.google.cloud', module: 'google-cloud-monitoring' + exclude group: 'com.google.api.grpc', module: 'proto-google-cloud-monitoring-v3' + exclude group: 'com.google.cloud.opentelemetry' + exclude group: 'io.opentelemetry.contrib', module: 'opentelemetry-gcp-resources' +} + dependencies { api project(':solr:core') implementation project(':solr:solrj') diff --git a/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/ConcurrentDelegatingStorage.java b/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/ConcurrentDelegatingStorage.java index 807f34e5bc90..9bf685081e4e 100644 --- a/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/ConcurrentDelegatingStorage.java +++ b/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/ConcurrentDelegatingStorage.java @@ -202,6 +202,11 @@ public synchronized CopyWriter copy(CopyRequest copyRequest) { return delegate.copy(copyRequest); } + @Override + public synchronized Blob moveBlob(MoveBlobRequest request) { + return delegate.moveBlob(request); + } + @Override public synchronized byte[] readAllBytes(String bucket, String blob, BlobSourceOption... options) { return delegate.readAllBytes(bucket, blob, options); diff --git a/versions.lock b/versions.lock index df8ceabbd52c..2ac292981bb1 100644 --- a/versions.lock +++ b/versions.lock @@ -23,45 +23,39 @@ com.github.spotbugs:spotbugs-annotations:4.8.6 (1 constraints: 14051d36) com.github.stephenc.jcip:jcip-annotations:1.0-1 (3 constraints: c71d2c87) com.github.virtuald:curvesapi:1.08 (1 constraints: 9f0ac8c0) com.google.android:annotations:4.1.1.4 (4 constraints: a33b86f4) -com.google.api:api-common:2.64.0 (9 constraints: f9877ce1) -com.google.api:gax:2.81.0 (6 constraints: c857f669) -com.google.api:gax-grpc:2.81.0 (3 constraints: f22b33a1) -com.google.api:gax-httpjson:2.81.0 (4 constraints: b13c44eb) -com.google.api-client:google-api-client:2.7.2 (4 constraints: ee3b3420) -com.google.api.grpc:gapic-google-cloud-storage-v2:2.69.0 (4 constraints: 323cfe7e) -com.google.api.grpc:grpc-google-cloud-storage-v2:2.69.0 (4 constraints: 323cfe7e) -com.google.api.grpc:proto-google-cloud-monitoring-v3:3.94.0 (4 constraints: 5a3ae951) -com.google.api.grpc:proto-google-cloud-storage-v2:2.69.0 (4 constraints: 323cfe7e) -com.google.api.grpc:proto-google-common-protos:2.72.0 (9 constraints: c87d009a) -com.google.api.grpc:proto-google-iam-v1:1.67.0 (4 constraints: c73a589a) +com.google.api:api-common:2.64.0 (8 constraints: 947a6b89) +com.google.api:gax:2.81.0 (5 constraints: 644acf99) +com.google.api:gax-grpc:2.81.0 (2 constraints: 8e1ee5aa) +com.google.api:gax-httpjson:2.81.0 (3 constraints: 4d2f0057) +com.google.api-client:google-api-client:2.7.2 (3 constraints: bd2e86de) +com.google.api.grpc:gapic-google-cloud-storage-v2:2.69.0 (3 constraints: 072db41c) +com.google.api.grpc:grpc-google-cloud-storage-v2:2.69.0 (3 constraints: 072db41c) +com.google.api.grpc:proto-google-cloud-storage-v2:2.69.0 (3 constraints: 072db41c) +com.google.api.grpc:proto-google-common-protos:2.72.0 (8 constraints: 6470f4cb) +com.google.api.grpc:proto-google-iam-v1:1.67.0 (3 constraints: 692dca51) com.google.apis:google-api-services-storage:v1-rev20260204-2.0.0 (2 constraints: d8251249) -com.google.auth:google-auth-library-credentials:1.48.0 (10 constraints: e998ee29) -com.google.auth:google-auth-library-oauth2-http:1.48.0 (9 constraints: 2685d7b1) +com.google.auth:google-auth-library-credentials:1.48.0 (9 constraints: 878bc32b) +com.google.auth:google-auth-library-oauth2-http:1.48.0 (8 constraints: c47751ca) com.google.auto.value:auto-value-annotations:1.11.0 (10 constraints: 5f9fd30d) com.google.cloud:google-cloud-bom:0.265.0 (1 constraints: 6f05b440) com.google.cloud:google-cloud-core:2.71.0 (3 constraints: 4a2f6b56) -com.google.cloud:google-cloud-core-grpc:2.71.0 (3 constraints: ef2ba8a0) -com.google.cloud:google-cloud-core-http:2.71.0 (3 constraints: ef2ba8a0) -com.google.cloud:google-cloud-monitoring:3.94.0 (3 constraints: f82cee1a) -com.google.cloud:google-cloud-storage:2.69.0 (3 constraints: 452a38dc) -com.google.cloud:libraries-bom:26.48.0 (1 constraints: cd141b95) -com.google.cloud.opentelemetry:detector-resources-support:0.33.0 (2 constraints: 841ec6a9) -com.google.cloud.opentelemetry:exporter-metrics:0.33.0 (2 constraints: 841ec6a9) -com.google.cloud.opentelemetry:shared-resourcemapping:0.33.0 (2 constraints: 841ec6a9) -com.google.code.gson:gson:2.13.2 (12 constraints: 3fafeba5) +com.google.cloud:google-cloud-core-grpc:2.71.0 (2 constraints: 8c1eaeaa) +com.google.cloud:google-cloud-core-http:2.71.0 (2 constraints: 8c1eaeaa) +com.google.cloud:google-cloud-storage:2.69.0 (2 constraints: e31cb828) +com.google.code.gson:gson:2.13.2 (11 constraints: e3a1774a) com.google.errorprone:error_prone_annotations:2.31.0 (22 constraints: 4c2fb449) com.google.guava:failureaccess:1.0.3 (6 constraints: cb636b42) -com.google.guava:guava:33.6.0-jre (24 constraints: b767ae06) +com.google.guava:guava:33.6.0-jre (23 constraints: e85806a5) com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (6 constraints: b5b5e9b2) -com.google.http-client:google-http-client:2.1.0 (14 constraints: ffe60549) -com.google.http-client:google-http-client-apache-v2:2.1.0 (4 constraints: 1b3c076a) -com.google.http-client:google-http-client-appengine:2.1.0 (4 constraints: 073c2554) -com.google.http-client:google-http-client-gson:2.1.0 (10 constraints: 02993520) -com.google.http-client:google-http-client-jackson2:2.1.0 (3 constraints: 802b6b58) +com.google.http-client:google-http-client:2.1.0 (13 constraints: 9dd91ca6) +com.google.http-client:google-http-client-apache-v2:2.1.0 (3 constraints: b92edcec) +com.google.http-client:google-http-client-appengine:2.1.0 (3 constraints: a52e1ada) +com.google.http-client:google-http-client-gson:2.1.0 (9 constraints: a08b1639) +com.google.http-client:google-http-client-jackson2:2.1.0 (2 constraints: 1e1ea573) com.google.j2objc:j2objc-annotations:3.1 (7 constraints: 05738e58) -com.google.oauth-client:google-oauth-client:1.39.0 (4 constraints: 8d3cefd3) -com.google.protobuf:protobuf-java:4.34.1 (11 constraints: 109fcbad) -com.google.protobuf:protobuf-java-util:4.34.1 (8 constraints: 0e69b9fe) +com.google.oauth-client:google-oauth-client:1.39.0 (3 constraints: 2b2f0445) +com.google.protobuf:protobuf-java:4.34.1 (10 constraints: a9915ed0) +com.google.protobuf:protobuf-java-util:4.34.1 (7 constraints: a75bfb7b) com.google.re2j:re2j:1.8 (4 constraints: ab350084) com.googlecode.json-simple:json-simple:1.1.1 (1 constraints: d90f7798) com.helger:profiler:1.1.1 (1 constraints: e21053b8) @@ -104,24 +98,24 @@ io.dropwizard.metrics:metrics-jmx:4.2.38 (1 constraints: 43054b3b) io.dropwizard.metrics:metrics-json:4.2.38 (1 constraints: 201187c9) io.dropwizard.metrics:metrics-jvm:4.2.38 (2 constraints: 62165001) io.dropwizard.metrics:metrics-servlets:4.2.38 (1 constraints: 43054b3b) -io.grpc:grpc-alts:1.81.0 (4 constraints: 1340dd66) -io.grpc:grpc-api:1.81.0 (11 constraints: c57535c2) -io.grpc:grpc-auth:1.81.0 (4 constraints: 1340dd66) -io.grpc:grpc-context:1.81.0 (8 constraints: 2f6c882b) -io.grpc:grpc-core:1.81.0 (6 constraints: 31518e2d) -io.grpc:grpc-googleapis:1.81.0 (4 constraints: 1340dd66) -io.grpc:grpc-grpclb:1.81.0 (3 constraints: f32bb1a0) -io.grpc:grpc-inprocess:1.81.0 (4 constraints: 1340dd66) -io.grpc:grpc-netty:1.81.0 (2 constraints: a212683c) -io.grpc:grpc-netty-shaded:1.81.0 (4 constraints: 1340dd66) -io.grpc:grpc-opentelemetry:1.81.0 (3 constraints: f32bb1a0) -io.grpc:grpc-protobuf:1.81.0 (4 constraints: 2d319783) -io.grpc:grpc-protobuf-lite:1.81.0 (6 constraints: e25ddd56) -io.grpc:grpc-rls:1.81.0 (3 constraints: f32bb1a0) -io.grpc:grpc-services:1.81.0 (4 constraints: 1340dd66) -io.grpc:grpc-stub:1.81.0 (4 constraints: 2d319783) -io.grpc:grpc-util:1.81.0 (5 constraints: dd483ef9) -io.grpc:grpc-xds:1.81.0 (4 constraints: 1340dd66) +io.grpc:grpc-alts:1.81.0 (3 constraints: ac32a94b) +io.grpc:grpc-api:1.81.0 (10 constraints: 5e6810aa) +io.grpc:grpc-auth:1.81.0 (3 constraints: ac32a94b) +io.grpc:grpc-context:1.81.0 (7 constraints: c85e2f2c) +io.grpc:grpc-core:1.81.0 (5 constraints: ca430c31) +io.grpc:grpc-googleapis:1.81.0 (3 constraints: ac32a94b) +io.grpc:grpc-grpclb:1.81.0 (2 constraints: 8c1eaaaa) +io.grpc:grpc-inprocess:1.81.0 (3 constraints: ac32a94b) +io.grpc:grpc-netty:1.81.0 (1 constraints: 3b05453b) +io.grpc:grpc-netty-shaded:1.81.0 (3 constraints: ac32a94b) +io.grpc:grpc-opentelemetry:1.81.0 (2 constraints: 8c1eaaaa) +io.grpc:grpc-protobuf:1.81.0 (3 constraints: c62371bc) +io.grpc:grpc-protobuf-lite:1.81.0 (5 constraints: 7b50a584) +io.grpc:grpc-rls:1.81.0 (2 constraints: 8c1eaaaa) +io.grpc:grpc-services:1.81.0 (3 constraints: ac32a94b) +io.grpc:grpc-stub:1.81.0 (3 constraints: c62371bc) +io.grpc:grpc-util:1.81.0 (4 constraints: 763bb766) +io.grpc:grpc-xds:1.81.0 (3 constraints: ac32a94b) io.jaegertracing:jaeger-core:1.8.1 (2 constraints: 6f124721) io.jaegertracing:jaeger-thrift:1.8.1 (1 constraints: 0c050936) io.netty:netty-bom:4.2.12.Final (1 constraints: 53073161) @@ -144,7 +138,7 @@ io.netty:netty-transport-native-unix-common:4.2.12.Final (5 constraints: 5f489f2 io.opencensus:opencensus-api:0.31.1 (7 constraints: 1670542e) io.opencensus:opencensus-contrib-http-util:0.31.1 (5 constraints: f654c128) io.opentelemetry:opentelemetry-api:1.62.0 (10 constraints: 69afe9b6) -io.opentelemetry:opentelemetry-bom:1.53.0 (2 constraints: cb195ce5) +io.opentelemetry:opentelemetry-bom:1.53.0 (1 constraints: 3b05423b) io.opentelemetry:opentelemetry-common:1.62.0 (4 constraints: 7b3fb2e5) io.opentelemetry:opentelemetry-context:1.62.0 (4 constraints: b03d01df) io.opentelemetry:opentelemetry-exporter-common:1.53.0 (3 constraints: 4d3d0eac) @@ -159,7 +153,6 @@ io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.62.0 (6 constra io.opentelemetry:opentelemetry-sdk-logs:1.62.0 (5 constraints: 7451374e) io.opentelemetry:opentelemetry-sdk-metrics:1.62.0 (5 constraints: 7451374e) io.opentelemetry:opentelemetry-sdk-trace:1.62.0 (5 constraints: 7451374e) -io.opentelemetry.contrib:opentelemetry-gcp-resources:1.45.0-alpha (2 constraints: f322813b) io.opentelemetry.semconv:opentelemetry-semconv:1.29.0-alpha (1 constraints: 5312010e) io.opentracing:opentracing-api:0.33.0 (6 constraints: 195100dd) io.opentracing:opentracing-noop:0.33.0 (4 constraints: 48361e21) @@ -328,7 +321,7 @@ org.jetbrains:annotations:17.0.0 (2 constraints: 371c92e0) org.jetbrains.kotlin:kotlin-stdlib:2.2.0 (7 constraints: db6ba2e1) org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 (2 constraints: f31f0a21) org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 (8 constraints: 5f7a37d5) -org.jspecify:jspecify:1.0.0 (10 constraints: f5a3acf8) +org.jspecify:jspecify:1.0.0 (8 constraints: 577d1349) org.locationtech.jts:jts-core:1.19.0 (2 constraints: a31de760) org.locationtech.jts.io:jts-io-common:1.19.0 (1 constraints: 930d513a) org.locationtech.proj4j:proj4j:1.2.2 (1 constraints: 5d0daf2c) @@ -402,7 +395,7 @@ com.fasterxml.jackson.module:jackson-module-parameter-names:2.18.3 (2 constraint com.github.docker-java:docker-java-api:3.4.0 (1 constraints: 3b0f6067) com.github.docker-java:docker-java-transport:3.4.0 (1 constraints: c51513cb) com.github.docker-java:docker-java-transport-zerodep:3.4.0 (1 constraints: 3b0f6067) -com.google.cloud:google-cloud-nio:0.133.0 (2 constraints: 5c1ce41b) +com.google.cloud:google-cloud-nio:0.133.0 (1 constraints: 940e536c) com.nimbusds:content-type:2.2 (1 constraints: d80b68eb) com.nimbusds:lang-tag:1.7 (1 constraints: dc0b6aeb) com.nimbusds:nimbus-jose-jwt:9.30.2 (1 constraints: 700c4b10) From 925c8053a4d66249a042e0439fdd066e2f1660f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Mon, 29 Jun 2026 01:30:47 +0200 Subject: [PATCH 28/45] Align okhttp family to 5.x for opentelemetry-bom 1.63.0 bump opentelemetry-exporter-sender-okhttp:1.63.0 requires okhttp 5.x, which consistent-versions enforces project-wide. Pin the whole com.squareup.okhttp3 family to 5.3.2 so mockwebserver (jwt-auth tests) and okhttp-sse (llm/langchain4j streaming) don't lag at 4.x and break against okhttp 5. okhttp 5.x splits its classes into okhttp-jvm, so declare it in jwt-auth and add mockwebserver3 license/checksum files. --- solr/licenses/mockwebserver-4.11.0.jar.sha1 | 1 - solr/licenses/mockwebserver-5.3.2.jar.sha1 | 1 + solr/licenses/mockwebserver3-5.3.2.jar.sha1 | 1 + solr/licenses/mockwebserver3-LICENSE-ASL.txt | 202 +++++++++++++++++++ solr/licenses/mockwebserver3-NOTICE.txt | 13 ++ solr/licenses/okhttp-sse-4.12.0.jar.sha1 | 1 - solr/licenses/okhttp-sse-5.3.2.jar.sha1 | 1 + solr/modules/jwt-auth/build.gradle | 2 + versions.lock | 15 +- versions.props | 1 + 10 files changed, 229 insertions(+), 9 deletions(-) delete mode 100644 solr/licenses/mockwebserver-4.11.0.jar.sha1 create mode 100644 solr/licenses/mockwebserver-5.3.2.jar.sha1 create mode 100644 solr/licenses/mockwebserver3-5.3.2.jar.sha1 create mode 100644 solr/licenses/mockwebserver3-LICENSE-ASL.txt create mode 100644 solr/licenses/mockwebserver3-NOTICE.txt delete mode 100644 solr/licenses/okhttp-sse-4.12.0.jar.sha1 create mode 100644 solr/licenses/okhttp-sse-5.3.2.jar.sha1 diff --git a/solr/licenses/mockwebserver-4.11.0.jar.sha1 b/solr/licenses/mockwebserver-4.11.0.jar.sha1 deleted file mode 100644 index 443999ff4889..000000000000 --- a/solr/licenses/mockwebserver-4.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1dc21cc47456f1e564a698102e6505eff931780f diff --git a/solr/licenses/mockwebserver-5.3.2.jar.sha1 b/solr/licenses/mockwebserver-5.3.2.jar.sha1 new file mode 100644 index 000000000000..c584e1609098 --- /dev/null +++ b/solr/licenses/mockwebserver-5.3.2.jar.sha1 @@ -0,0 +1 @@ +58f89e39ed9f68a9cb12e4da6de64848b177e727 diff --git a/solr/licenses/mockwebserver3-5.3.2.jar.sha1 b/solr/licenses/mockwebserver3-5.3.2.jar.sha1 new file mode 100644 index 000000000000..fdd80de865f7 --- /dev/null +++ b/solr/licenses/mockwebserver3-5.3.2.jar.sha1 @@ -0,0 +1 @@ +b759ca96141cdd58291dea97211864f621e4c7bd diff --git a/solr/licenses/mockwebserver3-LICENSE-ASL.txt b/solr/licenses/mockwebserver3-LICENSE-ASL.txt new file mode 100644 index 000000000000..d64569567334 --- /dev/null +++ b/solr/licenses/mockwebserver3-LICENSE-ASL.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/solr/licenses/mockwebserver3-NOTICE.txt b/solr/licenses/mockwebserver3-NOTICE.txt new file mode 100644 index 000000000000..d8bff2eefb0e --- /dev/null +++ b/solr/licenses/mockwebserver3-NOTICE.txt @@ -0,0 +1,13 @@ +Copyright 2019 Square, Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. \ No newline at end of file diff --git a/solr/licenses/okhttp-sse-4.12.0.jar.sha1 b/solr/licenses/okhttp-sse-4.12.0.jar.sha1 deleted file mode 100644 index 60d422fb2c6f..000000000000 --- a/solr/licenses/okhttp-sse-4.12.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -eca9c68c54ae7fd18d465beba65d80a44e9667e4 diff --git a/solr/licenses/okhttp-sse-5.3.2.jar.sha1 b/solr/licenses/okhttp-sse-5.3.2.jar.sha1 new file mode 100644 index 000000000000..def7c32b7a8a --- /dev/null +++ b/solr/licenses/okhttp-sse-5.3.2.jar.sha1 @@ -0,0 +1 @@ +5e21d25808bc853079b9aabeaca9f998a24cbf6c diff --git a/solr/modules/jwt-auth/build.gradle b/solr/modules/jwt-auth/build.gradle index c2a4990b5b38..c957b9df89a0 100644 --- a/solr/modules/jwt-auth/build.gradle +++ b/solr/modules/jwt-auth/build.gradle @@ -66,5 +66,7 @@ dependencies { testImplementation 'com.nimbusds:nimbus-jose-jwt' testImplementation 'com.squareup.okhttp3:mockwebserver' testImplementation 'com.squareup.okhttp3:okhttp' + // okhttp 5.x ships its implementation classes in the platform-specific okhttp-jvm artifact + testImplementation 'com.squareup.okhttp3:okhttp-jvm' testRuntimeOnly 'io.netty:netty-codec-http' } diff --git a/versions.lock b/versions.lock index b6f05c601c3e..b95e2d2fa5fa 100644 --- a/versions.lock +++ b/versions.lock @@ -62,9 +62,9 @@ com.j256.simplemagic:simplemagic:1.17 (1 constraints: dd04f830) com.jayway.jsonpath:json-path:2.9.0 (2 constraints: 6f12c62c) com.knuddels:jtokkit:1.1.0 (1 constraints: 9d0e146a) com.lmax:disruptor:3.4.4 (1 constraints: 0d050a36) -com.squareup.okhttp3:okhttp:5.3.2 (9 constraints: 8c87131d) -com.squareup.okhttp3:okhttp-jvm:5.3.2 (1 constraints: 540c3bfd) -com.squareup.okhttp3:okhttp-sse:4.12.0 (2 constraints: 13189cad) +com.squareup.okhttp3:okhttp:5.3.2 (11 constraints: a99b5194) +com.squareup.okhttp3:okhttp-jvm:5.3.2 (2 constraints: 5f11e5e8) +com.squareup.okhttp3:okhttp-sse:5.3.2 (2 constraints: 13189cad) com.squareup.okio:okio:3.16.4 (1 constraints: 020ea946) com.squareup.okio:okio-jvm:3.16.4 (1 constraints: 850a57c4) com.squareup.retrofit2:converter-jackson:2.9.0 (4 constraints: ce36e7ea) @@ -167,7 +167,7 @@ jakarta.annotation:jakarta.annotation-api:2.1.1 (4 constraints: c94095a4) jakarta.inject:jakarta.inject-api:2.0.1 (5 constraints: 1d49b79e) jakarta.validation:jakarta.validation-api:3.0.2 (1 constraints: fe10bbc3) jakarta.ws.rs:jakarta.ws.rs-api:3.1.0 (6 constraints: 7365f954) -junit:junit:4.13.2 (8 constraints: 807c2182) +junit:junit:4.13.2 (8 constraints: e07ce03f) net.arnx:jsonic:1.2.7 (1 constraints: d00b47eb) net.sf.jopt-simple:jopt-simple:5.0.4 (3 constraints: 132590bf) net.sourceforge.argparse4j:argparse4j:0.7.0 (1 constraints: fe0a06e8) @@ -315,9 +315,9 @@ org.immutables:value-annotations:2.12.1 (1 constraints: 3805363b) org.javassist:javassist:3.30.2-GA (1 constraints: 2811fff0) org.jctools:jctools-core:4.0.6 (1 constraints: 0c050536) org.jetbrains:annotations:17.0.0 (2 constraints: 371c92e0) -org.jetbrains.kotlin:kotlin-stdlib:2.2.21 (7 constraints: 416c1c84) +org.jetbrains.kotlin:kotlin-stdlib:2.2.21 (10 constraints: 36996fd4) org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 (2 constraints: f31f0a21) -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 (7 constraints: da6d50f8) +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 (6 constraints: 745eefc1) org.jspecify:jspecify:1.0.0 (3 constraints: b1233dfa) org.locationtech.jts:jts-core:1.19.0 (2 constraints: a31de760) org.locationtech.jts.io:jts-io-common:1.19.0 (1 constraints: 930d513a) @@ -399,7 +399,8 @@ com.nimbusds:content-type:2.2 (1 constraints: d80b68eb) com.nimbusds:lang-tag:1.7 (1 constraints: dc0b6aeb) com.nimbusds:nimbus-jose-jwt:9.30.2 (1 constraints: 700c4b10) com.nimbusds:oauth2-oidc-sdk:10.10.1 (1 constraints: 190f9b80) -com.squareup.okhttp3:mockwebserver:4.11.0 (1 constraints: ec0e9471) +com.squareup.okhttp3:mockwebserver:5.3.2 (2 constraints: f7139685) +com.squareup.okhttp3:mockwebserver3:5.3.2 (1 constraints: 390f436d) com.sun.activation:jakarta.activation:1.2.2 (1 constraints: ba0dac35) com.sun.istack:istack-commons-runtime:3.0.12 (1 constraints: eb0d9a43) io.github.microutils:kotlin-logging:3.0.5 (1 constraints: be0ea162) diff --git a/versions.props b/versions.props index f2da200fa944..290cf8e8f63b 100644 --- a/versions.props +++ b/versions.props @@ -18,6 +18,7 @@ com.google.re2j:re2j=1.8 com.j256.simplemagic:simplemagic=1.17 com.jayway.jsonpath:json-path=2.9.0 com.lmax:disruptor=3.4.4 +com.squareup.okhttp3:*=5.3.2 com.tdunning:t-digest=3.3 commons-cli:commons-cli=1.11.0 commons-codec:commons-codec=1.21.0 From 289226f58f73de7fa7246cf20dffd4bfb47b1779 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Mon, 29 Jun 2026 01:35:43 +0200 Subject: [PATCH 29/45] Bump jackson-bom to 2.18.3 to match google-cloud-bom 0.265.0 google-cloud-bom 0.265.0 requires jackson 2.18.3, which consistent-versions forces onto classpaths. Aligning the jackson-bom pin (was 2.18.0) keeps the bom-managed configs consistent with the resolved version, fixing the jwt-auth analyzeTestClassesDependencies permitTestUnusedDeclared mismatch. --- versions.lock | 2 +- versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions.lock b/versions.lock index 2ac292981bb1..397c3e481579 100644 --- a/versions.lock +++ b/versions.lock @@ -4,7 +4,7 @@ biz.aQute.bnd:biz.aQute.bnd.annotation:6.4.1 (1 constraints: 0d051636) com.carrotsearch:hppc:0.10.0 (2 constraints: d40fecb0) com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.4 (2 constraints: d21594e2) com.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e) -com.fasterxml.jackson:jackson-bom:2.18.3 (13 constraints: 4a145829) +com.fasterxml.jackson:jackson-bom:2.18.3 (13 constraints: 4d143a32) com.fasterxml.jackson.core:jackson-annotations:2.18.3 (15 constraints: ee1f6693) com.fasterxml.jackson.core:jackson-core:2.18.3 (16 constraints: 7a457559) com.fasterxml.jackson.core:jackson-databind:2.18.3 (36 constraints: a083e21f) diff --git a/versions.props b/versions.props index b1223f35fb0d..51e1c4cbc36e 100644 --- a/versions.props +++ b/versions.props @@ -6,7 +6,7 @@ com.adobe.testing:s3mock-junit4=2.17.0 com.carrotsearch.randomizedtesting:*=2.8.4 com.carrotsearch:hppc=0.10.0 com.cybozu.labs:langdetect=1.1-20120112 -com.fasterxml.jackson:jackson-bom=2.18.0 +com.fasterxml.jackson:jackson-bom=2.18.3 com.github.ben-manes.caffeine:caffeine=3.2.3 com.github.spotbugs:*=4.8.6 com.github.stephenc.jcip:jcip-annotations=1.0-1 From e221ff9906230f07fb81b75951d77076c083e94e Mon Sep 17 00:00:00 2001 From: SolrBot Date: Mon, 29 Jun 2026 00:50:26 +0000 Subject: [PATCH 30/45] Update plugin dev.logchange to v1.19.15 (branch_9x) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7f87b494b8eb..efd4214c878b 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ plugins { id 'net.ltgt.errorprone' version '5.1.0' apply false id 'com.diffplug.spotless' version '7.2.1' apply false id 'com.github.node-gradle.node' version '7.1.0' apply false - id 'dev.logchange' version '1.19.10' + id 'dev.logchange' version '1.19.15' } apply from: file('gradle/globals.gradle') From 111476facfe10d3084f2815013219d5081983679 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Mon, 29 Jun 2026 00:52:20 +0000 Subject: [PATCH 31/45] Update dependency com.jayway.jsonpath:json-path to v2.10.0 (branch_9x) --- solr/licenses/json-path-2.10.0.jar.sha1 | 1 + solr/licenses/json-path-2.9.0.jar.sha1 | 1 - versions.lock | 4 ++-- versions.props | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 solr/licenses/json-path-2.10.0.jar.sha1 delete mode 100644 solr/licenses/json-path-2.9.0.jar.sha1 diff --git a/solr/licenses/json-path-2.10.0.jar.sha1 b/solr/licenses/json-path-2.10.0.jar.sha1 new file mode 100644 index 000000000000..7526693e2999 --- /dev/null +++ b/solr/licenses/json-path-2.10.0.jar.sha1 @@ -0,0 +1 @@ +e1a0b2e6db75401181c9c1c64c6d155ca5c6d608 diff --git a/solr/licenses/json-path-2.9.0.jar.sha1 b/solr/licenses/json-path-2.9.0.jar.sha1 deleted file mode 100644 index a1bb2e6a2a57..000000000000 --- a/solr/licenses/json-path-2.9.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -37fe2217f577b0b68b18e62c4d17a8858ecf9b69 diff --git a/versions.lock b/versions.lock index 1b2d685a5bae..43f37f55eb2f 100644 --- a/versions.lock +++ b/versions.lock @@ -59,7 +59,7 @@ com.googlecode.json-simple:json-simple:1.1.1 (1 constraints: d90f7798) com.helger:profiler:1.1.1 (1 constraints: e21053b8) com.ibm.icu:icu4j:74.2 (1 constraints: ae0f2484) com.j256.simplemagic:simplemagic:1.17 (1 constraints: dd04f830) -com.jayway.jsonpath:json-path:2.9.0 (2 constraints: 6f12c62c) +com.jayway.jsonpath:json-path:2.10.0 (2 constraints: 97122538) com.knuddels:jtokkit:1.1.0 (1 constraints: 9d0e146a) com.lmax:disruptor:3.4.4 (1 constraints: 0d050a36) com.squareup.okhttp3:okhttp:4.12.0 (8 constraints: 76707ed2) @@ -342,7 +342,7 @@ org.scala-lang.modules:scala-java8-compat_2.13:1.0.2 (1 constraints: fa0af8e7) org.semver4j:semver4j:5.8.0 (1 constraints: 0f051c36) org.slf4j:jcl-over-slf4j:2.0.17 (1 constraints: 3c05323b) org.slf4j:jul-to-slf4j:2.0.17 (2 constraints: c11bd27e) -org.slf4j:slf4j-api:2.0.17 (68 constraints: 6cd32dae) +org.slf4j:slf4j-api:2.0.17 (68 constraints: 72d3ffed) org.threeten:threetenbp:1.6.9 (4 constraints: 2833ea68) org.xerial.snappy:snappy-java:1.1.10.8 (5 constraints: c146fa38) software.amazon.awssdk:annotations:2.42.37 (30 constraints: 48cb1be0) diff --git a/versions.props b/versions.props index db559662c37a..bc55fe55b0d2 100644 --- a/versions.props +++ b/versions.props @@ -16,7 +16,7 @@ com.google.guava:guava=33.6.0-jre com.google.protobuf:*=4.34.1 com.google.re2j:re2j=1.8 com.j256.simplemagic:simplemagic=1.17 -com.jayway.jsonpath:json-path=2.9.0 +com.jayway.jsonpath:json-path=2.10.0 com.lmax:disruptor=3.4.4 com.tdunning:t-digest=3.3 commons-cli:commons-cli=1.11.0 From 856a39766aa575dac2de182534649614678d6fd3 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Mon, 29 Jun 2026 00:54:09 +0000 Subject: [PATCH 32/45] Update dependency commons-io:commons-io to v2.22.0 (branch_9x) --- solr/licenses/commons-io-2.21.0.jar.sha1 | 1 - solr/licenses/commons-io-2.22.0.jar.sha1 | 1 + versions.lock | 2 +- versions.props | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 solr/licenses/commons-io-2.21.0.jar.sha1 create mode 100644 solr/licenses/commons-io-2.22.0.jar.sha1 diff --git a/solr/licenses/commons-io-2.21.0.jar.sha1 b/solr/licenses/commons-io-2.21.0.jar.sha1 deleted file mode 100644 index 00879ab2ee80..000000000000 --- a/solr/licenses/commons-io-2.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -52a6f68fe5afe335cde95461dd5c3412f04996f7 diff --git a/solr/licenses/commons-io-2.22.0.jar.sha1 b/solr/licenses/commons-io-2.22.0.jar.sha1 new file mode 100644 index 000000000000..2f8655c58bda --- /dev/null +++ b/solr/licenses/commons-io-2.22.0.jar.sha1 @@ -0,0 +1 @@ +5b1e18bc0ad651ed878029d83f88d9c8189fd51e diff --git a/versions.lock b/versions.lock index 1b2d685a5bae..7f7554727066 100644 --- a/versions.lock +++ b/versions.lock @@ -79,7 +79,7 @@ commons-cli:commons-cli:1.11.0 (2 constraints: d20f5dbe) commons-codec:commons-codec:1.21.0 (9 constraints: 587d8a8a) commons-collections:commons-collections:3.2.2 (3 constraints: 77242dac) commons-digester:commons-digester:2.1 (1 constraints: 550fb664) -commons-io:commons-io:2.21.0 (10 constraints: ab74caac) +commons-io:commons-io:2.22.0 (10 constraints: ac7421ae) commons-validator:commons-validator:1.10.1 (1 constraints: 2a0b25f3) dev.ai4j:openai4j:0.22.0 (1 constraints: cf0ee778) dev.langchain4j:langchain4j-cohere:0.35.0 (1 constraints: 3a053a3b) diff --git a/versions.props b/versions.props index db559662c37a..6964ab159557 100644 --- a/versions.props +++ b/versions.props @@ -22,7 +22,7 @@ com.tdunning:t-digest=3.3 commons-cli:commons-cli=1.11.0 commons-codec:commons-codec=1.21.0 commons-collections:commons-collections=3.2.2 -commons-io:commons-io=2.21.0 +commons-io:commons-io=2.22.0 dev.langchain4j:langchain4j-*=0.35.0 io.dropwizard.metrics:*=4.2.38 io.grpc:grpc-*=1.80.0 From 43c488b29adb75a8078ee972753526c204f3ee9e Mon Sep 17 00:00:00 2001 From: SolrBot Date: Mon, 29 Jun 2026 00:55:39 +0000 Subject: [PATCH 33/45] Update dependency org.apache.commons:commons-configuration2 to v2.15.1 (branch_9x) --- solr/licenses/commons-configuration2-2.14.0.jar.sha1 | 1 - solr/licenses/commons-configuration2-2.15.1.jar.sha1 | 1 + solr/licenses/commons-io-2.21.0.jar.sha1 | 1 - solr/licenses/commons-io-2.22.0.jar.sha1 | 1 + versions.lock | 4 ++-- versions.props | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 solr/licenses/commons-configuration2-2.14.0.jar.sha1 create mode 100644 solr/licenses/commons-configuration2-2.15.1.jar.sha1 delete mode 100644 solr/licenses/commons-io-2.21.0.jar.sha1 create mode 100644 solr/licenses/commons-io-2.22.0.jar.sha1 diff --git a/solr/licenses/commons-configuration2-2.14.0.jar.sha1 b/solr/licenses/commons-configuration2-2.14.0.jar.sha1 deleted file mode 100644 index d188ee0e0f69..000000000000 --- a/solr/licenses/commons-configuration2-2.14.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -dcbaad997c64f3df16d8c75c730ad7aaf0d2d2a3 diff --git a/solr/licenses/commons-configuration2-2.15.1.jar.sha1 b/solr/licenses/commons-configuration2-2.15.1.jar.sha1 new file mode 100644 index 000000000000..c324e7b4e94f --- /dev/null +++ b/solr/licenses/commons-configuration2-2.15.1.jar.sha1 @@ -0,0 +1 @@ +4a9d0b7656fee32af48f81ca18cda0158191fe10 diff --git a/solr/licenses/commons-io-2.21.0.jar.sha1 b/solr/licenses/commons-io-2.21.0.jar.sha1 deleted file mode 100644 index 00879ab2ee80..000000000000 --- a/solr/licenses/commons-io-2.21.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -52a6f68fe5afe335cde95461dd5c3412f04996f7 diff --git a/solr/licenses/commons-io-2.22.0.jar.sha1 b/solr/licenses/commons-io-2.22.0.jar.sha1 new file mode 100644 index 000000000000..2f8655c58bda --- /dev/null +++ b/solr/licenses/commons-io-2.22.0.jar.sha1 @@ -0,0 +1 @@ +5b1e18bc0ad651ed878029d83f88d9c8189fd51e diff --git a/versions.lock b/versions.lock index 1b2d685a5bae..60bff7f49eec 100644 --- a/versions.lock +++ b/versions.lock @@ -79,7 +79,7 @@ commons-cli:commons-cli:1.11.0 (2 constraints: d20f5dbe) commons-codec:commons-codec:1.21.0 (9 constraints: 587d8a8a) commons-collections:commons-collections:3.2.2 (3 constraints: 77242dac) commons-digester:commons-digester:2.1 (1 constraints: 550fb664) -commons-io:commons-io:2.21.0 (10 constraints: ab74caac) +commons-io:commons-io:2.22.0 (11 constraints: 8786a838) commons-validator:commons-validator:1.10.1 (1 constraints: 2a0b25f3) dev.ai4j:openai4j:0.22.0 (1 constraints: cf0ee778) dev.langchain4j:langchain4j-cohere:0.35.0 (1 constraints: 3a053a3b) @@ -179,7 +179,7 @@ org.apache.calcite.avatica:avatica-core:1.25.0 (3 constraints: 0121ddcc) org.apache.calcite.avatica:avatica-metrics:1.25.0 (1 constraints: 9b104fc4) org.apache.commons:commons-collections4:4.5.0 (3 constraints: 471880cc) org.apache.commons:commons-compress:1.28.0 (3 constraints: a51f96f4) -org.apache.commons:commons-configuration2:2.14.0 (1 constraints: 39053b3b) +org.apache.commons:commons-configuration2:2.15.1 (1 constraints: 3b053f3b) org.apache.commons:commons-exec:1.6.0 (1 constraints: 09050236) org.apache.commons:commons-lang3:3.20.0 (5 constraints: 3a422d95) org.apache.commons:commons-math3:3.6.1 (4 constraints: 9c2589e7) diff --git a/versions.props b/versions.props index db559662c37a..776871c1fd1e 100644 --- a/versions.props +++ b/versions.props @@ -44,7 +44,7 @@ org.apache.calcite.avatica:avatica-core=1.25.0 org.apache.calcite:*=1.37.0 org.apache.commons:commons-collections4=4.5.0 org.apache.commons:commons-compress=1.28.0 -org.apache.commons:commons-configuration2=2.14.0 +org.apache.commons:commons-configuration2=2.15.1 org.apache.commons:commons-exec=1.6.0 org.apache.commons:commons-lang3=3.20.0 org.apache.commons:commons-math3=3.6.1 From bb7970dada947836ee306729044778daca2daff9 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Mon, 29 Jun 2026 00:57:24 +0000 Subject: [PATCH 34/45] Update dependency org.bouncycastle:bcpkix-jdk18on to v1.84 (branch_9x) --- solr/licenses/bcpkix-jdk18on-1.82.jar.sha1 | 1 - solr/licenses/bcpkix-jdk18on-1.84.jar.sha1 | 1 + solr/licenses/bcprov-jdk18on-1.82.jar.sha1 | 1 - solr/licenses/bcprov-jdk18on-1.84.jar.sha1 | 1 + solr/licenses/bcutil-jdk18on-1.82.jar.sha1 | 1 - solr/licenses/bcutil-jdk18on-1.84.jar.sha1 | 1 + versions.lock | 6 +++--- versions.props | 2 +- 8 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 solr/licenses/bcpkix-jdk18on-1.82.jar.sha1 create mode 100644 solr/licenses/bcpkix-jdk18on-1.84.jar.sha1 delete mode 100644 solr/licenses/bcprov-jdk18on-1.82.jar.sha1 create mode 100644 solr/licenses/bcprov-jdk18on-1.84.jar.sha1 delete mode 100644 solr/licenses/bcutil-jdk18on-1.82.jar.sha1 create mode 100644 solr/licenses/bcutil-jdk18on-1.84.jar.sha1 diff --git a/solr/licenses/bcpkix-jdk18on-1.82.jar.sha1 b/solr/licenses/bcpkix-jdk18on-1.82.jar.sha1 deleted file mode 100644 index a74dc9fef083..000000000000 --- a/solr/licenses/bcpkix-jdk18on-1.82.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ad7b7155abac3e4e4f73579d5176c11f7659c560 diff --git a/solr/licenses/bcpkix-jdk18on-1.84.jar.sha1 b/solr/licenses/bcpkix-jdk18on-1.84.jar.sha1 new file mode 100644 index 000000000000..36a6a0749c59 --- /dev/null +++ b/solr/licenses/bcpkix-jdk18on-1.84.jar.sha1 @@ -0,0 +1 @@ +dab889a3259e27caec6e6c2f3bde94af036b2fcc diff --git a/solr/licenses/bcprov-jdk18on-1.82.jar.sha1 b/solr/licenses/bcprov-jdk18on-1.82.jar.sha1 deleted file mode 100644 index cde7b3bd11bd..000000000000 --- a/solr/licenses/bcprov-jdk18on-1.82.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e1118397395d21909a1b7b15120d0c2a68d7fd0c diff --git a/solr/licenses/bcprov-jdk18on-1.84.jar.sha1 b/solr/licenses/bcprov-jdk18on-1.84.jar.sha1 new file mode 100644 index 000000000000..2560bf05b42f --- /dev/null +++ b/solr/licenses/bcprov-jdk18on-1.84.jar.sha1 @@ -0,0 +1 @@ +2d5651789941d2f8ae9b8771f23356de6b61e96b diff --git a/solr/licenses/bcutil-jdk18on-1.82.jar.sha1 b/solr/licenses/bcutil-jdk18on-1.82.jar.sha1 deleted file mode 100644 index a919ba56f780..000000000000 --- a/solr/licenses/bcutil-jdk18on-1.82.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1850911d674c91ce6444783ff10478e2c6e9bbf9 diff --git a/solr/licenses/bcutil-jdk18on-1.84.jar.sha1 b/solr/licenses/bcutil-jdk18on-1.84.jar.sha1 new file mode 100644 index 000000000000..5bff4aac1fe5 --- /dev/null +++ b/solr/licenses/bcutil-jdk18on-1.84.jar.sha1 @@ -0,0 +1 @@ +79bfd1f9c6bd7431ff22e29935ec20f12f0af0d3 diff --git a/versions.lock b/versions.lock index 1b2d685a5bae..9a1d8d23b3f5 100644 --- a/versions.lock +++ b/versions.lock @@ -428,11 +428,11 @@ org.apache.kerby:kerb-server:2.1.0 (1 constraints: d20b6cf2) org.apache.kerby:kerb-simplekdc:2.1.0 (1 constraints: df0d853e) org.apache.tomcat.embed:tomcat-embed-el:9.0.76 (1 constraints: d41558cf) org.bouncycastle:bcpkix-jdk15on:1.70 (1 constraints: 900eeb53) -org.bouncycastle:bcpkix-jdk18on:1.82 (1 constraints: df040131) +org.bouncycastle:bcpkix-jdk18on:1.84 (1 constraints: e1040331) org.bouncycastle:bcprov-jdk15on:1.70 (2 constraints: b11aac5a) -org.bouncycastle:bcprov-jdk18on:1.82 (1 constraints: 600d6d29) +org.bouncycastle:bcprov-jdk18on:1.84 (1 constraints: 620d6f29) org.bouncycastle:bcutil-jdk15on:1.70 (1 constraints: 580d0529) -org.bouncycastle:bcutil-jdk18on:1.82 (1 constraints: 5e0d2a29) +org.bouncycastle:bcutil-jdk18on:1.84 (1 constraints: 600d2c29) org.freemarker:freemarker:2.3.32 (1 constraints: f00e9371) org.glassfish.jaxb:jaxb-runtime:2.3.8 (1 constraints: c30a41cb) org.glassfish.jaxb:txw2:2.3.8 (1 constraints: c20dba35) diff --git a/versions.props b/versions.props index db559662c37a..0fa6c0b4654c 100644 --- a/versions.props +++ b/versions.props @@ -63,7 +63,7 @@ org.apache.tika:*=3.3.0 org.apache.tomcat:annotations-api=6.0.53 org.apache.zookeeper:*=3.9.5 org.bitbucket.b_c:jose4j=0.9.6 -org.bouncycastle:bcpkix-jdk18on=1.82 +org.bouncycastle:bcpkix-jdk18on=1.84 org.carrot2:carrot2-core=4.5.1 org.codehaus.woodstox:stax2-api=4.3.0 org.eclipse.jetty*:*=10.0.26 From 1f8ecbbcd925079d0525f1fc7d345ab97e789bf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Mon, 29 Jun 2026 10:02:05 +0200 Subject: [PATCH 35/45] Regenerate lockfile after merging dependency updates --- versions.lock | 104 +++++++++++++++++++++++++------------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/versions.lock b/versions.lock index 84ffe3b03dfc..ad1cdb28579c 100644 --- a/versions.lock +++ b/versions.lock @@ -4,8 +4,8 @@ biz.aQute.bnd:biz.aQute.bnd.annotation:7.3.0 (1 constraints: 0c051736) com.carrotsearch:hppc:0.10.0 (2 constraints: d40fecb0) com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.4 (2 constraints: d21594e2) com.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e) -com.fasterxml.jackson:jackson-bom:2.18.0 (13 constraints: 2614e9f5) -com.fasterxml.jackson.core:jackson-annotations:2.18.0 (13 constraints: 4301624c) +com.fasterxml.jackson:jackson-bom:2.18.0 (12 constraints: 2500f8a0) +com.fasterxml.jackson.core:jackson-annotations:2.20 (13 constraints: e300bf84) com.fasterxml.jackson.core:jackson-core:2.18.0 (15 constraints: e436f89c) com.fasterxml.jackson.core:jackson-databind:2.18.0 (34 constraints: ec643f77) com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.0 (2 constraints: 641ca1f1) @@ -29,7 +29,7 @@ com.google.api-client:google-api-client:2.6.0 (3 constraints: ad32fffc) com.google.api.grpc:gapic-google-cloud-storage-v2:2.40.1-alpha (2 constraints: e4226438) com.google.api.grpc:grpc-google-cloud-storage-v2:2.40.1-alpha (2 constraints: e4226438) com.google.api.grpc:proto-google-cloud-storage-v2:2.40.1-alpha (2 constraints: e4226438) -com.google.api.grpc:proto-google-common-protos:2.63.2 (6 constraints: 184eab81) +com.google.api.grpc:proto-google-common-protos:2.64.1 (6 constraints: 184ead81) com.google.api.grpc:proto-google-iam-v1:1.36.0 (2 constraints: ef1e9acd) com.google.apis:google-api-services-storage:v1-rev20240621-2.0.0 (2 constraints: da256149) com.google.auth:google-auth-library-credentials:1.23.0 (7 constraints: cb686112) @@ -40,8 +40,8 @@ com.google.cloud:google-cloud-core:2.40.0 (3 constraints: 3e2f1a54) com.google.cloud:google-cloud-core-grpc:2.40.0 (1 constraints: 1a1001a6) com.google.cloud:google-cloud-core-http:2.40.0 (1 constraints: 1a1001a6) com.google.cloud:google-cloud-storage:2.40.1 (2 constraints: cf1cc626) -com.google.code.gson:gson:2.12.1 (7 constraints: f6622515) -com.google.errorprone:error_prone_annotations:2.31.0 (16 constraints: 8dcf2bdb) +com.google.code.gson:gson:2.13.2 (7 constraints: f8627315) +com.google.errorprone:error_prone_annotations:2.31.0 (16 constraints: 95cfbcda) com.google.guava:failureaccess:1.0.3 (2 constraints: fc19c037) com.google.guava:guava:33.6.0-jre (24 constraints: 4d653d82) com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 4b35b0a0) @@ -59,7 +59,7 @@ com.googlecode.json-simple:json-simple:1.1.1 (1 constraints: d90f7798) com.helger:profiler:1.1.1 (1 constraints: e21053b8) com.ibm.icu:icu4j:74.2 (1 constraints: ae0f2484) com.j256.simplemagic:simplemagic:1.17 (1 constraints: dd04f830) -com.jayway.jsonpath:json-path:2.9.0 (2 constraints: 6f12c62c) +com.jayway.jsonpath:json-path:2.10.0 (2 constraints: 97122538) com.knuddels:jtokkit:1.1.0 (1 constraints: 9d0e146a) com.lmax:disruptor:3.4.4 (1 constraints: 0d050a36) com.squareup.okhttp3:okhttp:5.3.2 (11 constraints: a99b5194) @@ -79,7 +79,7 @@ commons-cli:commons-cli:1.11.0 (2 constraints: d20f5dbe) commons-codec:commons-codec:1.22.0 (9 constraints: 597deb8b) commons-collections:commons-collections:3.2.2 (3 constraints: 77242dac) commons-digester:commons-digester:2.1 (1 constraints: 550fb664) -commons-io:commons-io:2.22.0 (11 constraints: 8786a838) +commons-io:commons-io:2.22.0 (11 constraints: 85863038) commons-validator:commons-validator:1.10.1 (1 constraints: 2a0b25f3) dev.ai4j:openai4j:0.22.0 (1 constraints: cf0ee778) dev.langchain4j:langchain4j-cohere:0.35.0 (1 constraints: 3a053a3b) @@ -96,23 +96,23 @@ io.dropwizard.metrics:metrics-jmx:4.2.39 (1 constraints: 44054c3b) io.dropwizard.metrics:metrics-json:4.2.39 (1 constraints: 211188c9) io.dropwizard.metrics:metrics-jvm:4.2.39 (2 constraints: 64168201) io.dropwizard.metrics:metrics-servlets:4.2.39 (1 constraints: 44054c3b) -io.grpc:grpc-alts:1.80.0 (1 constraints: 1f100ba6) -io.grpc:grpc-api:1.80.0 (8 constraints: 4d510a82) -io.grpc:grpc-auth:1.80.0 (1 constraints: 1f100ba6) -io.grpc:grpc-context:1.80.0 (6 constraints: 8344a583) -io.grpc:grpc-core:1.80.0 (3 constraints: 3b21991e) -io.grpc:grpc-googleapis:1.80.0 (1 constraints: 1f100ba6) -io.grpc:grpc-grpclb:1.80.0 (1 constraints: 1f100ba6) -io.grpc:grpc-inprocess:1.80.0 (1 constraints: 1f100ba6) -io.grpc:grpc-netty:1.80.0 (1 constraints: 3b05453b) -io.grpc:grpc-netty-shaded:1.80.0 (1 constraints: 1f100ba6) -io.grpc:grpc-protobuf:1.80.0 (2 constraints: 591505d7) -io.grpc:grpc-protobuf-lite:1.80.0 (2 constraints: 251ac24d) -io.grpc:grpc-rls:1.80.0 (1 constraints: 1f100ba6) -io.grpc:grpc-services:1.80.0 (1 constraints: 1f100ba6) -io.grpc:grpc-stub:1.80.0 (2 constraints: 591505d7) -io.grpc:grpc-util:1.80.0 (3 constraints: f7218364) -io.grpc:grpc-xds:1.80.0 (1 constraints: 1f100ba6) +io.grpc:grpc-alts:1.82.1 (1 constraints: 1f100ba6) +io.grpc:grpc-api:1.82.1 (8 constraints: 62517689) +io.grpc:grpc-auth:1.82.1 (1 constraints: 1f100ba6) +io.grpc:grpc-context:1.82.1 (6 constraints: 8c442987) +io.grpc:grpc-core:1.82.1 (3 constraints: 4121f81e) +io.grpc:grpc-googleapis:1.82.1 (1 constraints: 1f100ba6) +io.grpc:grpc-grpclb:1.82.1 (1 constraints: 1f100ba6) +io.grpc:grpc-inprocess:1.82.1 (1 constraints: 1f100ba6) +io.grpc:grpc-netty:1.82.1 (1 constraints: 3e054c3b) +io.grpc:grpc-netty-shaded:1.82.1 (1 constraints: 1f100ba6) +io.grpc:grpc-protobuf:1.82.1 (2 constraints: 5c1599d7) +io.grpc:grpc-protobuf-lite:1.82.1 (2 constraints: 281ac94d) +io.grpc:grpc-rls:1.82.1 (1 constraints: 1f100ba6) +io.grpc:grpc-services:1.82.1 (1 constraints: 1f100ba6) +io.grpc:grpc-stub:1.82.1 (2 constraints: 5c1599d7) +io.grpc:grpc-util:1.82.1 (3 constraints: fd21e564) +io.grpc:grpc-xds:1.82.1 (1 constraints: 1f100ba6) io.jaegertracing:jaeger-core:1.8.1 (2 constraints: 6f124721) io.jaegertracing:jaeger-thrift:1.8.1 (1 constraints: 0c050936) io.netty:netty-bom:4.2.15.Final (1 constraints: 56074661) @@ -120,18 +120,18 @@ io.netty:netty-buffer:4.2.15.Final (12 constraints: d3b6c64e) io.netty:netty-codec-base:4.2.15.Final (7 constraints: dd60065d) io.netty:netty-codec-compression:4.2.15.Final (2 constraints: aa18dfc7) io.netty:netty-codec-http:4.2.15.Final (4 constraints: 3e2fb563) -io.netty:netty-codec-http2:4.2.15.Final (2 constraints: 1016171d) +io.netty:netty-codec-http2:4.2.15.Final (2 constraints: 1316921d) io.netty:netty-codec-socks:4.2.15.Final (2 constraints: 0c1a9f1f) io.netty:netty-common:4.2.15.Final (14 constraints: 3fd01246) io.netty:netty-handler:4.2.15.Final (5 constraints: 94451097) -io.netty:netty-handler-proxy:4.2.15.Final (2 constraints: 1016171d) +io.netty:netty-handler-proxy:4.2.15.Final (2 constraints: 1316921d) io.netty:netty-resolver:4.2.15.Final (3 constraints: 4a25b759) io.netty:netty-tcnative-boringssl-static:2.0.77.Final (2 constraints: d71ac958) io.netty:netty-tcnative-classes:2.0.77.Final (2 constraints: da1e1996) io.netty:netty-transport:4.2.15.Final (11 constraints: 26a95f01) io.netty:netty-transport-classes-epoll:4.2.15.Final (2 constraints: a91dda34) io.netty:netty-transport-native-epoll:4.2.15.Final (2 constraints: ff1af171) -io.netty:netty-transport-native-unix-common:4.2.15.Final (5 constraints: 69481232) +io.netty:netty-transport-native-unix-common:4.2.15.Final (5 constraints: 6c484034) io.opencensus:opencensus-api:0.31.1 (5 constraints: 924d4692) io.opencensus:opencensus-contrib-http-util:0.31.1 (3 constraints: 7232a9fc) io.opencensus:opencensus-proto:0.2.0 (1 constraints: e60fd595) @@ -167,7 +167,7 @@ jakarta.annotation:jakarta.annotation-api:2.1.1 (4 constraints: c94095a4) jakarta.inject:jakarta.inject-api:2.0.1 (5 constraints: 1d49b79e) jakarta.validation:jakarta.validation-api:3.0.2 (1 constraints: fe10bbc3) jakarta.ws.rs:jakarta.ws.rs-api:3.1.0 (6 constraints: 7365f954) -junit:junit:4.13.2 (8 constraints: e07ce03f) +junit:junit:4.13.2 (7 constraints: 736dcb65) net.arnx:jsonic:1.2.7 (1 constraints: d00b47eb) net.sf.jopt-simple:jopt-simple:5.0.4 (3 constraints: 132590bf) net.sourceforge.argparse4j:argparse4j:0.7.0 (1 constraints: fe0a06e8) @@ -178,7 +178,7 @@ org.apache.calcite:calcite-linq4j:1.37.0 (2 constraints: cf12444c) org.apache.calcite.avatica:avatica-core:1.25.0 (3 constraints: 0121ddcc) org.apache.calcite.avatica:avatica-metrics:1.25.0 (1 constraints: 9b104fc4) org.apache.commons:commons-collections4:4.5.0 (3 constraints: 471880cc) -org.apache.commons:commons-compress:1.28.0 (3 constraints: a51f96f4) +org.apache.commons:commons-compress:1.28.0 (3 constraints: a91fa2f4) org.apache.commons:commons-configuration2:2.15.1 (1 constraints: 3b053f3b) org.apache.commons:commons-exec:1.6.0 (1 constraints: 09050236) org.apache.commons:commons-lang3:3.20.0 (5 constraints: 3a422d95) @@ -212,13 +212,13 @@ org.apache.kafka:kafka-streams:3.9.2 (1 constraints: 4b07ef6f) org.apache.kafka:kafka-tools-api:3.9.2 (1 constraints: 050b1de8) org.apache.kafka:kafka-transaction-coordinator:3.9.2 (3 constraints: ad24b99b) org.apache.kafka:kafka_2.13:3.9.2 (1 constraints: 4b07ef6f) -org.apache.kerby:kerb-core:2.1.0 (5 constraints: 6d360adf) -org.apache.kerby:kerb-crypto:2.1.0 (2 constraints: d8172f97) -org.apache.kerby:kerb-util:2.1.0 (3 constraints: 1d1d5e4d) -org.apache.kerby:kerby-asn1:2.1.0 (1 constraints: fe0bf0f4) -org.apache.kerby:kerby-config:2.1.0 (4 constraints: 51317aba) -org.apache.kerby:kerby-pkix:2.1.0 (1 constraints: 720b03e5) -org.apache.kerby:kerby-util:2.1.0 (2 constraints: 6718efb6) +org.apache.kerby:kerb-core:2.1.2 (5 constraints: 7736f4e1) +org.apache.kerby:kerb-crypto:2.1.2 (2 constraints: dc177997) +org.apache.kerby:kerb-util:2.1.2 (3 constraints: 231d404e) +org.apache.kerby:kerby-asn1:2.1.2 (1 constraints: 000cf2f4) +org.apache.kerby:kerby-config:2.1.2 (4 constraints: 59313abc) +org.apache.kerby:kerby-pkix:2.1.2 (1 constraints: 740b05e5) +org.apache.kerby:kerby-util:2.1.2 (2 constraints: 6b183bb7) org.apache.logging.log4j:log4j-1.2-api:2.26.0 (1 constraints: 3c05453b) org.apache.logging.log4j:log4j-api:2.26.0 (7 constraints: fb555ddb) org.apache.logging.log4j:log4j-core:2.26.0 (5 constraints: 73515398) @@ -257,8 +257,8 @@ org.apache.poi:poi:5.5.1 (2 constraints: db0f56a8) org.apache.poi:poi-ooxml:5.5.1 (1 constraints: 0d051436) org.apache.poi:poi-ooxml-lite:5.5.1 (1 constraints: cf0aa7cb) org.apache.thrift:libthrift:0.15.0 (1 constraints: 900d0334) -org.apache.tika:tika-core:3.3.0 (1 constraints: 08050336) -org.apache.tika:tika-langdetect-tika:3.3.0 (1 constraints: 08050336) +org.apache.tika:tika-core:3.3.1 (1 constraints: 09050436) +org.apache.tika:tika-langdetect-tika:3.3.1 (1 constraints: 09050436) org.apache.tomcat:annotations-api:6.0.53 (1 constraints: 40054e3b) org.apache.xmlbeans:xmlbeans:5.3.0 (2 constraints: 72173c75) org.apache.zookeeper:zookeeper:3.9.5 (3 constraints: aa1e950b) @@ -340,9 +340,9 @@ org.scala-lang:scala-reflect:2.13.15 (2 constraints: c11d80f4) org.scala-lang.modules:scala-collection-compat_2.13:2.10.0 (1 constraints: 2a0b2af3) org.scala-lang.modules:scala-java8-compat_2.13:1.0.2 (1 constraints: fa0af8e7) org.semver4j:semver4j:5.8.0 (1 constraints: 0f051c36) -org.slf4j:jcl-over-slf4j:2.0.18 (1 constraints: 3c05323b) -org.slf4j:jul-to-slf4j:2.0.18 (2 constraints: c11bd27e) -org.slf4j:slf4j-api:2.0.18 (68 constraints: 6fd3a6b8) +org.slf4j:jcl-over-slf4j:2.0.18 (1 constraints: 3d05333b) +org.slf4j:jul-to-slf4j:2.0.18 (2 constraints: c21b117f) +org.slf4j:slf4j-api:2.0.18 (68 constraints: 79d3351e) org.threeten:threetenbp:1.6.9 (4 constraints: 2833ea68) org.xerial.snappy:snappy-java:1.1.10.8 (5 constraints: c146fa38) software.amazon.awssdk:annotations:2.46.17 (31 constraints: e6db2e80) @@ -392,9 +392,9 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.18.0 (2 constraints: a com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.0 (4 constraints: 6e48dd35) com.fasterxml.jackson.module:jackson-module-kotlin:2.18.0 (2 constraints: aa1d6d60) com.fasterxml.jackson.module:jackson-module-parameter-names:2.18.0 (2 constraints: 0d248182) -com.github.docker-java:docker-java-api:3.4.0 (1 constraints: 3b0f6067) -com.github.docker-java:docker-java-transport:3.4.0 (1 constraints: c51513cb) -com.github.docker-java:docker-java-transport-zerodep:3.4.0 (1 constraints: 3b0f6067) +com.github.docker-java:docker-java-api:3.7.1 (1 constraints: 3f0f6a67) +com.github.docker-java:docker-java-transport:3.7.1 (1 constraints: c9151dcb) +com.github.docker-java:docker-java-transport-zerodep:3.7.1 (1 constraints: 3f0f6a67) com.google.cloud:google-cloud-nio:0.127.20 (1 constraints: c90e267b) com.nimbusds:content-type:2.2 (1 constraints: d80b68eb) com.nimbusds:lang-tag:1.7 (1 constraints: dc0b6aeb) @@ -415,19 +415,19 @@ javax.inject:javax.inject:1 (1 constraints: 7a0df617) joda-time:joda-time:2.8.1 (1 constraints: 7a0dd431) net.bytebuddy:byte-buddy:1.18.10-jdk5 (2 constraints: 5112ea2d) net.bytebuddy:byte-buddy-agent:1.18.10-jdk5 (1 constraints: 08079060) -net.java.dev.jna:jna:5.18.1 (2 constraints: 371b0b62) +net.java.dev.jna:jna:5.18.1 (2 constraints: 3d1b1b62) net.minidev:accessors-smart:2.4.9 (1 constraints: 500a92b8) net.minidev:json-smart:2.4.10 (1 constraints: 400e9a7c) no.nav.security:mock-oauth2-server:0.5.10 (1 constraints: 3805333b) org.apache.hadoop:hadoop-client-minicluster:3.4.1 (1 constraints: 0a050736) org.apache.hadoop:hadoop-hdfs:3.4.1 (1 constraints: 0a050736) org.apache.hadoop:hadoop-minikdc:3.4.1 (1 constraints: 0a050736) -org.apache.kerby:kerb-admin:2.1.0 (1 constraints: 850d902f) -org.apache.kerby:kerb-client:2.1.0 (1 constraints: 850d902f) -org.apache.kerby:kerb-common:2.1.0 (3 constraints: d92524b2) -org.apache.kerby:kerb-identity:2.1.0 (1 constraints: 600cbd02) -org.apache.kerby:kerb-server:2.1.0 (1 constraints: d20b6cf2) -org.apache.kerby:kerb-simplekdc:2.1.0 (1 constraints: df0d853e) +org.apache.kerby:kerb-admin:2.1.2 (1 constraints: 870d922f) +org.apache.kerby:kerb-client:2.1.2 (1 constraints: 870d922f) +org.apache.kerby:kerb-common:2.1.2 (3 constraints: df250cb3) +org.apache.kerby:kerb-identity:2.1.2 (1 constraints: 620cbf02) +org.apache.kerby:kerb-server:2.1.2 (1 constraints: d40b6ef2) +org.apache.kerby:kerb-simplekdc:2.1.2 (1 constraints: df0d853e) org.apache.tomcat.embed:tomcat-embed-el:9.0.76 (1 constraints: d41558cf) org.bouncycastle:bcpkix-jdk15on:1.70 (1 constraints: 900eeb53) org.bouncycastle:bcpkix-jdk18on:1.84 (1 constraints: e1040331) @@ -465,7 +465,7 @@ org.springframework.boot:spring-boot-starter-jetty:2.7.13 (1 constraints: f30a39 org.springframework.boot:spring-boot-starter-json:2.7.13 (1 constraints: d914679e) org.springframework.boot:spring-boot-starter-logging:2.7.13 (1 constraints: 6e138c46) org.springframework.boot:spring-boot-starter-web:2.7.13 (1 constraints: f30a39d6) -org.testcontainers:testcontainers:1.20.4 (1 constraints: 3905313b) +org.testcontainers:testcontainers:2.0.5 (1 constraints: 0905fa35) org.yaml:snakeyaml:1.30 (1 constraints: 0713d91f) software.amazon.awssdk:url-connection-client:2.46.17 (2 constraints: 481f10f7) software.amazon.ion:ion-java:1.0.2 (1 constraints: 720db831) From 57ddb0df18ddc54c0188455449eccfde88939b13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Mon, 29 Jun 2026 10:27:00 +0200 Subject: [PATCH 36/45] Add BouncyCastle security properties required by bcpkix 1.84 (jwt-auth tests) bcpkix-jdk18on 1.84 reads two additional org.bouncycastle.* security properties during EC/ASN.1 initialization; grant getProperty access in both the test policy and the server security policy. --- gradle/testing/randomization/policies/solr-tests.policy | 2 ++ solr/server/etc/security.policy | 2 ++ 2 files changed, 4 insertions(+) diff --git a/gradle/testing/randomization/policies/solr-tests.policy b/gradle/testing/randomization/policies/solr-tests.policy index 7024b0579cbe..5fece2320a54 100644 --- a/gradle/testing/randomization/policies/solr-tests.policy +++ b/gradle/testing/randomization/policies/solr-tests.policy @@ -180,6 +180,8 @@ grant { permission java.security.SecurityPermission "putProviderProperty.BC"; permission java.security.SecurityPermission "removeProviderProperty.BC"; permission java.security.SecurityPermission "getProperty.org.bouncycastle.x509.allow_non-der_tbscert"; + permission java.security.SecurityPermission "getProperty.org.bouncycastle.ec.max_f2m_field_size"; + permission java.security.SecurityPermission "getProperty.org.bouncycastle.asn1.max_cons_depth"; // may only be necessary with Java 7? permission javax.security.auth.PrivateCredentialPermission "javax.security.auth.kerberos.KeyTab * \"*\"", "read"; diff --git a/solr/server/etc/security.policy b/solr/server/etc/security.policy index 1536424cd58c..0e95c1edabbd 100644 --- a/solr/server/etc/security.policy +++ b/solr/server/etc/security.policy @@ -156,6 +156,8 @@ grant { // Needed by JWT integration tests & S3 clients permission java.lang.RuntimePermission "setFactory"; permission java.security.SecurityPermission "getProperty.org.bouncycastle.pkcs12.default"; + permission java.security.SecurityPermission "getProperty.org.bouncycastle.ec.max_f2m_field_size"; + permission java.security.SecurityPermission "getProperty.org.bouncycastle.asn1.max_cons_depth"; permission javax.xml.bind.JAXBPermission "setDatatypeConverter"; From 5baabbd4ae33f46fb7a5d81a9389fe0e3ee4764e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Mon, 29 Jun 2026 10:29:34 +0200 Subject: [PATCH 37/45] Deduplicate changelog entries: keep only final version per dependency For each upgraded dependency, ensure a single changelog/unreleased entry reflecting the final merged version: removed intermediate-version duplicates, updated/renamed stale entries to the final version, and added entries for upgrades whose solrbot branch did not carry a changelog file. --- ...9-update-io-dropwizard-metrics-to-v4-2-38-branch-9x.yml | 7 ------- .../PR#3560-update-io-grpc-grpc-to-v1-80-0-branch-9x.yml | 7 ------- ...72-update-com-google-protobuf-to-v4-branch-9x-major.yml | 7 ------- ...593-update-software-amazon-awssdk-to-v2-41-0-branch.yml | 6 ------ .../PR#3694-update-org-immutables-value-annotations.yml | 7 ------- .../PR#4013-update-commons-codec-commons-codec.yml | 7 ------- .../unreleased/PR#4014-update-commons-io-commons-io.yml | 7 ------- ...19-update-org-apache-commons-commons-configuration2.yml | 7 ------- ...26-update-io-netty-netty-to-v4-2-12-final-branch-9x.yml | 7 ------- ...28-update-io-prometheus-prometheus-to-v1-5-1-branch.yml | 7 ------- .../PR#4302-update-org-apache-tika-to-v3-3-0-branch-9x.yml | 7 ------- ...#4313-update-com-github-ben-manes-caffeine-caffeine.yml | 7 ------- changelog/unreleased/update-awssdk-2.46.17.yml | 7 +++++++ changelog/unreleased/update-bnd-annotation-7.3.0.yml | 7 +++++++ changelog/unreleased/update-bouncycastle-bcpkix-1.84.yml | 7 +++++++ changelog/unreleased/update-bytebuddy-1.18.10.yml | 7 +++++++ .../unreleased/update-commons-configuration2-2.15.1.yml | 7 +++++++ changelog/unreleased/update-commons-io-2.22.0.yml | 7 +++++++ changelog/unreleased/update-dropwizard-metrics-4.2.39.yml | 7 +++++++ changelog/unreleased/update-grpc-1.82.1.yml | 7 +++++++ changelog/unreleased/update-json-path-2.10.0.yml | 7 +++++++ changelog/unreleased/update-kerby-2.1.2.yml | 7 +++++++ changelog/unreleased/update-logchange-plugin-1.19.15.yml | 7 +++++++ changelog/unreleased/update-netty-4.2.15.yml | 7 +++++++ changelog/unreleased/update-opentelemetry-bom-1.63.0.yml | 7 +++++++ changelog/unreleased/update-prometheus-1.8.0.yml | 7 +++++++ changelog/unreleased/update-protobuf-4.35.1.yml | 7 +++++++ ...-testcontainers.yml => update-testcontainers-2.0.5.yml} | 2 +- 28 files changed, 106 insertions(+), 84 deletions(-) delete mode 100644 changelog/unreleased/PR#3529-update-io-dropwizard-metrics-to-v4-2-38-branch-9x.yml delete mode 100644 changelog/unreleased/PR#3560-update-io-grpc-grpc-to-v1-80-0-branch-9x.yml delete mode 100644 changelog/unreleased/PR#3572-update-com-google-protobuf-to-v4-branch-9x-major.yml delete mode 100644 changelog/unreleased/PR#3593-update-software-amazon-awssdk-to-v2-41-0-branch.yml delete mode 100644 changelog/unreleased/PR#3694-update-org-immutables-value-annotations.yml delete mode 100644 changelog/unreleased/PR#4013-update-commons-codec-commons-codec.yml delete mode 100644 changelog/unreleased/PR#4014-update-commons-io-commons-io.yml delete mode 100644 changelog/unreleased/PR#4019-update-org-apache-commons-commons-configuration2.yml delete mode 100644 changelog/unreleased/PR#4026-update-io-netty-netty-to-v4-2-12-final-branch-9x.yml delete mode 100644 changelog/unreleased/PR#4028-update-io-prometheus-prometheus-to-v1-5-1-branch.yml delete mode 100644 changelog/unreleased/PR#4302-update-org-apache-tika-to-v3-3-0-branch-9x.yml delete mode 100644 changelog/unreleased/PR#4313-update-com-github-ben-manes-caffeine-caffeine.yml create mode 100644 changelog/unreleased/update-awssdk-2.46.17.yml create mode 100644 changelog/unreleased/update-bnd-annotation-7.3.0.yml create mode 100644 changelog/unreleased/update-bouncycastle-bcpkix-1.84.yml create mode 100644 changelog/unreleased/update-bytebuddy-1.18.10.yml create mode 100644 changelog/unreleased/update-commons-configuration2-2.15.1.yml create mode 100644 changelog/unreleased/update-commons-io-2.22.0.yml create mode 100644 changelog/unreleased/update-dropwizard-metrics-4.2.39.yml create mode 100644 changelog/unreleased/update-grpc-1.82.1.yml create mode 100644 changelog/unreleased/update-json-path-2.10.0.yml create mode 100644 changelog/unreleased/update-kerby-2.1.2.yml create mode 100644 changelog/unreleased/update-logchange-plugin-1.19.15.yml create mode 100644 changelog/unreleased/update-netty-4.2.15.yml create mode 100644 changelog/unreleased/update-opentelemetry-bom-1.63.0.yml create mode 100644 changelog/unreleased/update-prometheus-1.8.0.yml create mode 100644 changelog/unreleased/update-protobuf-4.35.1.yml rename changelog/unreleased/{PR#4386-update-org-testcontainers-testcontainers.yml => update-testcontainers-2.0.5.yml} (62%) diff --git a/changelog/unreleased/PR#3529-update-io-dropwizard-metrics-to-v4-2-38-branch-9x.yml b/changelog/unreleased/PR#3529-update-io-dropwizard-metrics-to-v4-2-38-branch-9x.yml deleted file mode 100644 index 2124f20c703e..000000000000 --- a/changelog/unreleased/PR#3529-update-io-dropwizard-metrics-to-v4-2-38-branch-9x.yml +++ /dev/null @@ -1,7 +0,0 @@ -title: Update io.dropwizard.metrics:* to v4.2.38 (branch_9x) -type: dependency_update -authors: -- name: solrbot -links: -- name: PR#3529 - url: https://github.com/apache/solr/pull/3529 diff --git a/changelog/unreleased/PR#3560-update-io-grpc-grpc-to-v1-80-0-branch-9x.yml b/changelog/unreleased/PR#3560-update-io-grpc-grpc-to-v1-80-0-branch-9x.yml deleted file mode 100644 index d74dc514acf5..000000000000 --- a/changelog/unreleased/PR#3560-update-io-grpc-grpc-to-v1-80-0-branch-9x.yml +++ /dev/null @@ -1,7 +0,0 @@ -title: Update io.grpc:grpc-* to v1.80.0 (branch_9x) -type: dependency_update -authors: -- name: solrbot -links: -- name: PR#3560 - url: https://github.com/apache/solr/pull/3560 diff --git a/changelog/unreleased/PR#3572-update-com-google-protobuf-to-v4-branch-9x-major.yml b/changelog/unreleased/PR#3572-update-com-google-protobuf-to-v4-branch-9x-major.yml deleted file mode 100644 index 896c1df71ffa..000000000000 --- a/changelog/unreleased/PR#3572-update-com-google-protobuf-to-v4-branch-9x-major.yml +++ /dev/null @@ -1,7 +0,0 @@ -title: Update com.google.protobuf:* to v4 (branch_9x) (major) -type: dependency_update -authors: -- name: solrbot -links: -- name: PR#3572 - url: https://github.com/apache/solr/pull/3572 diff --git a/changelog/unreleased/PR#3593-update-software-amazon-awssdk-to-v2-41-0-branch.yml b/changelog/unreleased/PR#3593-update-software-amazon-awssdk-to-v2-41-0-branch.yml deleted file mode 100644 index dc73ed44949b..000000000000 --- a/changelog/unreleased/PR#3593-update-software-amazon-awssdk-to-v2-41-0-branch.yml +++ /dev/null @@ -1,6 +0,0 @@ -title: Update software.amazon.awssdk:* to v2.42.37 (branch_9x) -authors: -- name: solrbot -links: -- name: PR#3593 - url: https://github.com/apache/solr/pull/3593 diff --git a/changelog/unreleased/PR#3694-update-org-immutables-value-annotations.yml b/changelog/unreleased/PR#3694-update-org-immutables-value-annotations.yml deleted file mode 100644 index f457c815ed33..000000000000 --- a/changelog/unreleased/PR#3694-update-org-immutables-value-annotations.yml +++ /dev/null @@ -1,7 +0,0 @@ -title: Update org.immutables:value-annotations to v2.12.1 -type: dependency_update -authors: -- name: solrbot -links: -- name: PR#3694 - url: https://github.com/apache/solr/pull/3694 diff --git a/changelog/unreleased/PR#4013-update-commons-codec-commons-codec.yml b/changelog/unreleased/PR#4013-update-commons-codec-commons-codec.yml deleted file mode 100644 index 900994c455c1..000000000000 --- a/changelog/unreleased/PR#4013-update-commons-codec-commons-codec.yml +++ /dev/null @@ -1,7 +0,0 @@ -title: Update commons-codec:commons-codec to v1.21.0 -type: dependency_update -authors: -- name: solrbot -links: -- name: PR#4013 - url: https://github.com/apache/solr/pull/4013 diff --git a/changelog/unreleased/PR#4014-update-commons-io-commons-io.yml b/changelog/unreleased/PR#4014-update-commons-io-commons-io.yml deleted file mode 100644 index 371b02711e6e..000000000000 --- a/changelog/unreleased/PR#4014-update-commons-io-commons-io.yml +++ /dev/null @@ -1,7 +0,0 @@ -title: Update commons-io:commons-io to v2.21.0 -type: dependency_update -authors: -- name: solrbot -links: -- name: PR#4014 - url: https://github.com/apache/solr/pull/4014 diff --git a/changelog/unreleased/PR#4019-update-org-apache-commons-commons-configuration2.yml b/changelog/unreleased/PR#4019-update-org-apache-commons-commons-configuration2.yml deleted file mode 100644 index 28f0e0c163b0..000000000000 --- a/changelog/unreleased/PR#4019-update-org-apache-commons-commons-configuration2.yml +++ /dev/null @@ -1,7 +0,0 @@ -title: Update org.apache.commons:commons-configuration2 to v2.14.0 -type: dependency_update -authors: -- name: solrbot -links: -- name: PR#4019 - url: https://github.com/apache/solr/pull/4019 diff --git a/changelog/unreleased/PR#4026-update-io-netty-netty-to-v4-2-12-final-branch-9x.yml b/changelog/unreleased/PR#4026-update-io-netty-netty-to-v4-2-12-final-branch-9x.yml deleted file mode 100644 index a38f9a45f52b..000000000000 --- a/changelog/unreleased/PR#4026-update-io-netty-netty-to-v4-2-12-final-branch-9x.yml +++ /dev/null @@ -1,7 +0,0 @@ -title: Update io.netty:netty* to v4.2.12.Final (branch_9x) -type: dependency_update -authors: -- name: solrbot -links: -- name: PR#4026 - url: https://github.com/apache/solr/pull/4026 diff --git a/changelog/unreleased/PR#4028-update-io-prometheus-prometheus-to-v1-5-1-branch.yml b/changelog/unreleased/PR#4028-update-io-prometheus-prometheus-to-v1-5-1-branch.yml deleted file mode 100644 index 2616b901ed83..000000000000 --- a/changelog/unreleased/PR#4028-update-io-prometheus-prometheus-to-v1-5-1-branch.yml +++ /dev/null @@ -1,7 +0,0 @@ -title: Update io.prometheus:prometheus* to v1.5.1 (branch_9x) -type: dependency_update -authors: -- name: solrbot -links: -- name: PR#4028 - url: https://github.com/apache/solr/pull/4028 diff --git a/changelog/unreleased/PR#4302-update-org-apache-tika-to-v3-3-0-branch-9x.yml b/changelog/unreleased/PR#4302-update-org-apache-tika-to-v3-3-0-branch-9x.yml deleted file mode 100644 index 4e85bc4a6f4d..000000000000 --- a/changelog/unreleased/PR#4302-update-org-apache-tika-to-v3-3-0-branch-9x.yml +++ /dev/null @@ -1,7 +0,0 @@ -title: Update org.apache.tika:* to v3.3.0 (branch_9x) -type: dependency_update -authors: -- name: solrbot -links: -- name: PR#4302 - url: https://github.com/apache/solr/pull/4302 diff --git a/changelog/unreleased/PR#4313-update-com-github-ben-manes-caffeine-caffeine.yml b/changelog/unreleased/PR#4313-update-com-github-ben-manes-caffeine-caffeine.yml deleted file mode 100644 index ecf824ce90bb..000000000000 --- a/changelog/unreleased/PR#4313-update-com-github-ben-manes-caffeine-caffeine.yml +++ /dev/null @@ -1,7 +0,0 @@ -title: Update com.github.ben-manes.caffeine:caffeine to v3.2.3 -type: dependency_update -authors: -- name: solrbot -links: -- name: PR#4313 - url: https://github.com/apache/solr/pull/4313 diff --git a/changelog/unreleased/update-awssdk-2.46.17.yml b/changelog/unreleased/update-awssdk-2.46.17.yml new file mode 100644 index 000000000000..85514229e4db --- /dev/null +++ b/changelog/unreleased/update-awssdk-2.46.17.yml @@ -0,0 +1,7 @@ +title: Update software.amazon.awssdk:* to v2.46.17 (branch_9x) +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4379 + url: https://github.com/apache/solr/pull/4379 diff --git a/changelog/unreleased/update-bnd-annotation-7.3.0.yml b/changelog/unreleased/update-bnd-annotation-7.3.0.yml new file mode 100644 index 000000000000..6f1f98f28019 --- /dev/null +++ b/changelog/unreleased/update-bnd-annotation-7.3.0.yml @@ -0,0 +1,7 @@ +title: Update biz.aQute.bnd:biz.aQute.bnd.annotation to v7.3.0 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4360 + url: https://github.com/apache/solr/pull/4360 diff --git a/changelog/unreleased/update-bouncycastle-bcpkix-1.84.yml b/changelog/unreleased/update-bouncycastle-bcpkix-1.84.yml new file mode 100644 index 000000000000..830120aba352 --- /dev/null +++ b/changelog/unreleased/update-bouncycastle-bcpkix-1.84.yml @@ -0,0 +1,7 @@ +title: Update org.bouncycastle:bcpkix-jdk18on to v1.84 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4382 + url: https://github.com/apache/solr/pull/4382 diff --git a/changelog/unreleased/update-bytebuddy-1.18.10.yml b/changelog/unreleased/update-bytebuddy-1.18.10.yml new file mode 100644 index 000000000000..60017917c5ff --- /dev/null +++ b/changelog/unreleased/update-bytebuddy-1.18.10.yml @@ -0,0 +1,7 @@ +title: Update net.bytebuddy:* to v1.18.10-jdk5 (branch_9x) +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4384 + url: https://github.com/apache/solr/pull/4384 diff --git a/changelog/unreleased/update-commons-configuration2-2.15.1.yml b/changelog/unreleased/update-commons-configuration2-2.15.1.yml new file mode 100644 index 000000000000..9a445f1294dc --- /dev/null +++ b/changelog/unreleased/update-commons-configuration2-2.15.1.yml @@ -0,0 +1,7 @@ +title: Update org.apache.commons:commons-configuration2 to v2.15.1 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4439 + url: https://github.com/apache/solr/pull/4439 diff --git a/changelog/unreleased/update-commons-io-2.22.0.yml b/changelog/unreleased/update-commons-io-2.22.0.yml new file mode 100644 index 000000000000..90a39dcd0a7c --- /dev/null +++ b/changelog/unreleased/update-commons-io-2.22.0.yml @@ -0,0 +1,7 @@ +title: Update commons-io:commons-io to v2.22.0 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4327 + url: https://github.com/apache/solr/pull/4327 diff --git a/changelog/unreleased/update-dropwizard-metrics-4.2.39.yml b/changelog/unreleased/update-dropwizard-metrics-4.2.39.yml new file mode 100644 index 000000000000..7122b9e5f39f --- /dev/null +++ b/changelog/unreleased/update-dropwizard-metrics-4.2.39.yml @@ -0,0 +1,7 @@ +title: Update io.dropwizard.metrics:* to v4.2.39 (branch_9x) +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4480 + url: https://github.com/apache/solr/pull/4480 diff --git a/changelog/unreleased/update-grpc-1.82.1.yml b/changelog/unreleased/update-grpc-1.82.1.yml new file mode 100644 index 000000000000..3afc83523cec --- /dev/null +++ b/changelog/unreleased/update-grpc-1.82.1.yml @@ -0,0 +1,7 @@ +title: Update io.grpc:grpc-* to v1.82.1 (branch_9x) +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4378 + url: https://github.com/apache/solr/pull/4378 diff --git a/changelog/unreleased/update-json-path-2.10.0.yml b/changelog/unreleased/update-json-path-2.10.0.yml new file mode 100644 index 000000000000..5c08db3d6ddf --- /dev/null +++ b/changelog/unreleased/update-json-path-2.10.0.yml @@ -0,0 +1,7 @@ +title: Update com.jayway.jsonpath:json-path to v2.10.0 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4017 + url: https://github.com/apache/solr/pull/4017 diff --git a/changelog/unreleased/update-kerby-2.1.2.yml b/changelog/unreleased/update-kerby-2.1.2.yml new file mode 100644 index 000000000000..afc4bffb7529 --- /dev/null +++ b/changelog/unreleased/update-kerby-2.1.2.yml @@ -0,0 +1,7 @@ +title: Update org.apache.kerby:* to v2.1.2 (branch_9x) +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4380 + url: https://github.com/apache/solr/pull/4380 diff --git a/changelog/unreleased/update-logchange-plugin-1.19.15.yml b/changelog/unreleased/update-logchange-plugin-1.19.15.yml new file mode 100644 index 000000000000..b358a5255728 --- /dev/null +++ b/changelog/unreleased/update-logchange-plugin-1.19.15.yml @@ -0,0 +1,7 @@ +title: Update plugin dev.logchange to v1.19.15 (branch_9x) +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4015 + url: https://github.com/apache/solr/pull/4015 diff --git a/changelog/unreleased/update-netty-4.2.15.yml b/changelog/unreleased/update-netty-4.2.15.yml new file mode 100644 index 000000000000..c423a1c42408 --- /dev/null +++ b/changelog/unreleased/update-netty-4.2.15.yml @@ -0,0 +1,7 @@ +title: Update io.netty:netty* to v4.2.15.Final (branch_9x) +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4398 + url: https://github.com/apache/solr/pull/4398 diff --git a/changelog/unreleased/update-opentelemetry-bom-1.63.0.yml b/changelog/unreleased/update-opentelemetry-bom-1.63.0.yml new file mode 100644 index 000000000000..8aec744f08a7 --- /dev/null +++ b/changelog/unreleased/update-opentelemetry-bom-1.63.0.yml @@ -0,0 +1,7 @@ +title: Update io.opentelemetry:opentelemetry-bom to v1.63.0 (and okhttp to v5.3.2) (branch_9x) +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#3646 + url: https://github.com/apache/solr/pull/3646 diff --git a/changelog/unreleased/update-prometheus-1.8.0.yml b/changelog/unreleased/update-prometheus-1.8.0.yml new file mode 100644 index 000000000000..e5afaa17fe44 --- /dev/null +++ b/changelog/unreleased/update-prometheus-1.8.0.yml @@ -0,0 +1,7 @@ +title: Update io.prometheus:prometheus* to v1.8.0 (branch_9x) +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4371 + url: https://github.com/apache/solr/pull/4371 diff --git a/changelog/unreleased/update-protobuf-4.35.1.yml b/changelog/unreleased/update-protobuf-4.35.1.yml new file mode 100644 index 000000000000..f8e9026e4611 --- /dev/null +++ b/changelog/unreleased/update-protobuf-4.35.1.yml @@ -0,0 +1,7 @@ +title: Update com.google.protobuf:* to v4.35.1 (branch_9x) +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4460 + url: https://github.com/apache/solr/pull/4460 diff --git a/changelog/unreleased/PR#4386-update-org-testcontainers-testcontainers.yml b/changelog/unreleased/update-testcontainers-2.0.5.yml similarity index 62% rename from changelog/unreleased/PR#4386-update-org-testcontainers-testcontainers.yml rename to changelog/unreleased/update-testcontainers-2.0.5.yml index 8b0917c6b743..ac48394f0356 100644 --- a/changelog/unreleased/PR#4386-update-org-testcontainers-testcontainers.yml +++ b/changelog/unreleased/update-testcontainers-2.0.5.yml @@ -1,4 +1,4 @@ -title: Update org.testcontainers:testcontainers to v2 +title: Update org.testcontainers:testcontainers* to v2.0.5 (branch_9x) type: dependency_update authors: - name: solrbot From 6b2e853fc19d8b111b3ce98e0014a4bff3cd51ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Tue, 30 Jun 2026 01:46:22 +0200 Subject: [PATCH 38/45] Further bump com.squareup.okhttp3:*=5.4.0 and software.amazon.awssdk:*=2.46.18 --- ...-2.46.17.yml => update-awssdk-2.46.18.yml} | 2 +- .../update-opentelemetry-bom-1.63.0.yml | 2 +- solr/licenses/annotations-2.46.17.jar.sha1 | 1 - solr/licenses/annotations-2.46.18.jar.sha1 | 1 + solr/licenses/apache-client-2.46.17.jar.sha1 | 1 - solr/licenses/apache-client-2.46.18.jar.sha1 | 1 + solr/licenses/apache5-client-2.46.17.jar.sha1 | 1 - solr/licenses/apache5-client-2.46.18.jar.sha1 | 1 + solr/licenses/arns-2.46.17.jar.sha1 | 1 - solr/licenses/arns-2.46.18.jar.sha1 | 1 + solr/licenses/auth-2.46.17.jar.sha1 | 1 - solr/licenses/auth-2.46.18.jar.sha1 | 1 + solr/licenses/aws-core-2.46.17.jar.sha1 | 1 - solr/licenses/aws-core-2.46.18.jar.sha1 | 1 + .../aws-query-protocol-2.46.17.jar.sha1 | 1 - .../aws-query-protocol-2.46.18.jar.sha1 | 1 + .../aws-xml-protocol-2.46.17.jar.sha1 | 1 - .../aws-xml-protocol-2.46.18.jar.sha1 | 1 + solr/licenses/checksums-2.46.17.jar.sha1 | 1 - solr/licenses/checksums-2.46.18.jar.sha1 | 1 + solr/licenses/checksums-spi-2.46.17.jar.sha1 | 1 - solr/licenses/checksums-spi-2.46.18.jar.sha1 | 1 + solr/licenses/crt-core-2.46.17.jar.sha1 | 1 - solr/licenses/crt-core-2.46.18.jar.sha1 | 1 + solr/licenses/endpoints-spi-2.46.17.jar.sha1 | 1 - solr/licenses/endpoints-spi-2.46.18.jar.sha1 | 1 + solr/licenses/http-auth-2.46.17.jar.sha1 | 1 - solr/licenses/http-auth-2.46.18.jar.sha1 | 1 + solr/licenses/http-auth-aws-2.46.17.jar.sha1 | 1 - solr/licenses/http-auth-aws-2.46.18.jar.sha1 | 1 + ...http-auth-aws-eventstream-2.46.17.jar.sha1 | 1 - ...http-auth-aws-eventstream-2.46.18.jar.sha1 | 1 + solr/licenses/http-auth-spi-2.46.17.jar.sha1 | 1 - solr/licenses/http-auth-spi-2.46.18.jar.sha1 | 1 + .../licenses/http-client-spi-2.46.17.jar.sha1 | 1 - .../licenses/http-client-spi-2.46.18.jar.sha1 | 1 + solr/licenses/httpcore5-5.4.2.jar.sha1 | 1 - solr/licenses/httpcore5-5.4.3.jar.sha1 | 1 + solr/licenses/identity-spi-2.46.17.jar.sha1 | 1 - solr/licenses/identity-spi-2.46.18.jar.sha1 | 1 + solr/licenses/json-utils-2.46.17.jar.sha1 | 1 - solr/licenses/json-utils-2.46.18.jar.sha1 | 1 + solr/licenses/metrics-spi-2.46.17.jar.sha1 | 1 - solr/licenses/metrics-spi-2.46.18.jar.sha1 | 1 + solr/licenses/mockwebserver-5.3.2.jar.sha1 | 1 - solr/licenses/mockwebserver-5.4.0.jar.sha1 | 1 + solr/licenses/mockwebserver3-5.3.2.jar.sha1 | 1 - solr/licenses/mockwebserver3-5.4.0.jar.sha1 | 1 + solr/licenses/okhttp-jvm-5.3.2.jar.sha1 | 1 - solr/licenses/okhttp-jvm-5.4.0.jar.sha1 | 1 + solr/licenses/okhttp-sse-5.3.2.jar.sha1 | 1 - solr/licenses/okhttp-sse-5.4.0.jar.sha1 | 1 + solr/licenses/okio-jvm-3.16.4.jar.sha1 | 1 - solr/licenses/okio-jvm-3.17.0.jar.sha1 | 1 + solr/licenses/profiles-2.46.17.jar.sha1 | 1 - solr/licenses/profiles-2.46.18.jar.sha1 | 1 + solr/licenses/protocol-core-2.46.17.jar.sha1 | 1 - solr/licenses/protocol-core-2.46.18.jar.sha1 | 1 + solr/licenses/regions-2.46.17.jar.sha1 | 1 - solr/licenses/regions-2.46.18.jar.sha1 | 1 + solr/licenses/retries-2.46.17.jar.sha1 | 1 - solr/licenses/retries-2.46.18.jar.sha1 | 1 + solr/licenses/retries-spi-2.46.17.jar.sha1 | 1 - solr/licenses/retries-spi-2.46.18.jar.sha1 | 1 + solr/licenses/s3-2.46.17.jar.sha1 | 1 - solr/licenses/s3-2.46.18.jar.sha1 | 1 + solr/licenses/sdk-core-2.46.17.jar.sha1 | 1 - solr/licenses/sdk-core-2.46.18.jar.sha1 | 1 + solr/licenses/sts-2.46.17.jar.sha1 | 1 - solr/licenses/sts-2.46.18.jar.sha1 | 1 + .../third-party-jackson-core-2.46.17.jar.sha1 | 1 - .../third-party-jackson-core-2.46.18.jar.sha1 | 1 + .../url-connection-client-2.46.17.jar.sha1 | 1 - .../url-connection-client-2.46.18.jar.sha1 | 1 + solr/licenses/utils-2.46.17.jar.sha1 | 1 - solr/licenses/utils-2.46.18.jar.sha1 | 1 + solr/licenses/utils-lite-2.46.17.jar.sha1 | 1 - solr/licenses/utils-lite-2.46.18.jar.sha1 | 1 + versions.lock | 84 +++++++++---------- versions.props | 4 +- 80 files changed, 84 insertions(+), 84 deletions(-) rename changelog/unreleased/{update-awssdk-2.46.17.yml => update-awssdk-2.46.18.yml} (65%) delete mode 100644 solr/licenses/annotations-2.46.17.jar.sha1 create mode 100644 solr/licenses/annotations-2.46.18.jar.sha1 delete mode 100644 solr/licenses/apache-client-2.46.17.jar.sha1 create mode 100644 solr/licenses/apache-client-2.46.18.jar.sha1 delete mode 100644 solr/licenses/apache5-client-2.46.17.jar.sha1 create mode 100644 solr/licenses/apache5-client-2.46.18.jar.sha1 delete mode 100644 solr/licenses/arns-2.46.17.jar.sha1 create mode 100644 solr/licenses/arns-2.46.18.jar.sha1 delete mode 100644 solr/licenses/auth-2.46.17.jar.sha1 create mode 100644 solr/licenses/auth-2.46.18.jar.sha1 delete mode 100644 solr/licenses/aws-core-2.46.17.jar.sha1 create mode 100644 solr/licenses/aws-core-2.46.18.jar.sha1 delete mode 100644 solr/licenses/aws-query-protocol-2.46.17.jar.sha1 create mode 100644 solr/licenses/aws-query-protocol-2.46.18.jar.sha1 delete mode 100644 solr/licenses/aws-xml-protocol-2.46.17.jar.sha1 create mode 100644 solr/licenses/aws-xml-protocol-2.46.18.jar.sha1 delete mode 100644 solr/licenses/checksums-2.46.17.jar.sha1 create mode 100644 solr/licenses/checksums-2.46.18.jar.sha1 delete mode 100644 solr/licenses/checksums-spi-2.46.17.jar.sha1 create mode 100644 solr/licenses/checksums-spi-2.46.18.jar.sha1 delete mode 100644 solr/licenses/crt-core-2.46.17.jar.sha1 create mode 100644 solr/licenses/crt-core-2.46.18.jar.sha1 delete mode 100644 solr/licenses/endpoints-spi-2.46.17.jar.sha1 create mode 100644 solr/licenses/endpoints-spi-2.46.18.jar.sha1 delete mode 100644 solr/licenses/http-auth-2.46.17.jar.sha1 create mode 100644 solr/licenses/http-auth-2.46.18.jar.sha1 delete mode 100644 solr/licenses/http-auth-aws-2.46.17.jar.sha1 create mode 100644 solr/licenses/http-auth-aws-2.46.18.jar.sha1 delete mode 100644 solr/licenses/http-auth-aws-eventstream-2.46.17.jar.sha1 create mode 100644 solr/licenses/http-auth-aws-eventstream-2.46.18.jar.sha1 delete mode 100644 solr/licenses/http-auth-spi-2.46.17.jar.sha1 create mode 100644 solr/licenses/http-auth-spi-2.46.18.jar.sha1 delete mode 100644 solr/licenses/http-client-spi-2.46.17.jar.sha1 create mode 100644 solr/licenses/http-client-spi-2.46.18.jar.sha1 delete mode 100644 solr/licenses/httpcore5-5.4.2.jar.sha1 create mode 100644 solr/licenses/httpcore5-5.4.3.jar.sha1 delete mode 100644 solr/licenses/identity-spi-2.46.17.jar.sha1 create mode 100644 solr/licenses/identity-spi-2.46.18.jar.sha1 delete mode 100644 solr/licenses/json-utils-2.46.17.jar.sha1 create mode 100644 solr/licenses/json-utils-2.46.18.jar.sha1 delete mode 100644 solr/licenses/metrics-spi-2.46.17.jar.sha1 create mode 100644 solr/licenses/metrics-spi-2.46.18.jar.sha1 delete mode 100644 solr/licenses/mockwebserver-5.3.2.jar.sha1 create mode 100644 solr/licenses/mockwebserver-5.4.0.jar.sha1 delete mode 100644 solr/licenses/mockwebserver3-5.3.2.jar.sha1 create mode 100644 solr/licenses/mockwebserver3-5.4.0.jar.sha1 delete mode 100644 solr/licenses/okhttp-jvm-5.3.2.jar.sha1 create mode 100644 solr/licenses/okhttp-jvm-5.4.0.jar.sha1 delete mode 100644 solr/licenses/okhttp-sse-5.3.2.jar.sha1 create mode 100644 solr/licenses/okhttp-sse-5.4.0.jar.sha1 delete mode 100644 solr/licenses/okio-jvm-3.16.4.jar.sha1 create mode 100644 solr/licenses/okio-jvm-3.17.0.jar.sha1 delete mode 100644 solr/licenses/profiles-2.46.17.jar.sha1 create mode 100644 solr/licenses/profiles-2.46.18.jar.sha1 delete mode 100644 solr/licenses/protocol-core-2.46.17.jar.sha1 create mode 100644 solr/licenses/protocol-core-2.46.18.jar.sha1 delete mode 100644 solr/licenses/regions-2.46.17.jar.sha1 create mode 100644 solr/licenses/regions-2.46.18.jar.sha1 delete mode 100644 solr/licenses/retries-2.46.17.jar.sha1 create mode 100644 solr/licenses/retries-2.46.18.jar.sha1 delete mode 100644 solr/licenses/retries-spi-2.46.17.jar.sha1 create mode 100644 solr/licenses/retries-spi-2.46.18.jar.sha1 delete mode 100644 solr/licenses/s3-2.46.17.jar.sha1 create mode 100644 solr/licenses/s3-2.46.18.jar.sha1 delete mode 100644 solr/licenses/sdk-core-2.46.17.jar.sha1 create mode 100644 solr/licenses/sdk-core-2.46.18.jar.sha1 delete mode 100644 solr/licenses/sts-2.46.17.jar.sha1 create mode 100644 solr/licenses/sts-2.46.18.jar.sha1 delete mode 100644 solr/licenses/third-party-jackson-core-2.46.17.jar.sha1 create mode 100644 solr/licenses/third-party-jackson-core-2.46.18.jar.sha1 delete mode 100644 solr/licenses/url-connection-client-2.46.17.jar.sha1 create mode 100644 solr/licenses/url-connection-client-2.46.18.jar.sha1 delete mode 100644 solr/licenses/utils-2.46.17.jar.sha1 create mode 100644 solr/licenses/utils-2.46.18.jar.sha1 delete mode 100644 solr/licenses/utils-lite-2.46.17.jar.sha1 create mode 100644 solr/licenses/utils-lite-2.46.18.jar.sha1 diff --git a/changelog/unreleased/update-awssdk-2.46.17.yml b/changelog/unreleased/update-awssdk-2.46.18.yml similarity index 65% rename from changelog/unreleased/update-awssdk-2.46.17.yml rename to changelog/unreleased/update-awssdk-2.46.18.yml index 85514229e4db..ddf2a5a292c1 100644 --- a/changelog/unreleased/update-awssdk-2.46.17.yml +++ b/changelog/unreleased/update-awssdk-2.46.18.yml @@ -1,4 +1,4 @@ -title: Update software.amazon.awssdk:* to v2.46.17 (branch_9x) +title: Update software.amazon.awssdk:* to v2.46.18 (branch_9x) type: dependency_update authors: - name: solrbot diff --git a/changelog/unreleased/update-opentelemetry-bom-1.63.0.yml b/changelog/unreleased/update-opentelemetry-bom-1.63.0.yml index 8aec744f08a7..a28d3b5a0e89 100644 --- a/changelog/unreleased/update-opentelemetry-bom-1.63.0.yml +++ b/changelog/unreleased/update-opentelemetry-bom-1.63.0.yml @@ -1,4 +1,4 @@ -title: Update io.opentelemetry:opentelemetry-bom to v1.63.0 (and okhttp to v5.3.2) (branch_9x) +title: Update io.opentelemetry:opentelemetry-bom to v1.63.0 (and okhttp to v5.4.0) (branch_9x) type: dependency_update authors: - name: solrbot diff --git a/solr/licenses/annotations-2.46.17.jar.sha1 b/solr/licenses/annotations-2.46.17.jar.sha1 deleted file mode 100644 index 3cf3b15c1481..000000000000 --- a/solr/licenses/annotations-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -421c380b853f3222bbb0c499191b1efc2b36ba7d diff --git a/solr/licenses/annotations-2.46.18.jar.sha1 b/solr/licenses/annotations-2.46.18.jar.sha1 new file mode 100644 index 000000000000..9e2ee475de32 --- /dev/null +++ b/solr/licenses/annotations-2.46.18.jar.sha1 @@ -0,0 +1 @@ +2ff1a7e280a2a90f9d5971f8d7847c8ddee120f9 diff --git a/solr/licenses/apache-client-2.46.17.jar.sha1 b/solr/licenses/apache-client-2.46.17.jar.sha1 deleted file mode 100644 index 503cb79a1615..000000000000 --- a/solr/licenses/apache-client-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -79e3af1775fed1926f934782d6ac83cfdf7ad154 diff --git a/solr/licenses/apache-client-2.46.18.jar.sha1 b/solr/licenses/apache-client-2.46.18.jar.sha1 new file mode 100644 index 000000000000..9e12a3ddf0f3 --- /dev/null +++ b/solr/licenses/apache-client-2.46.18.jar.sha1 @@ -0,0 +1 @@ +f2dca762b4e51ae8d8c9e90b91e39289980b28a3 diff --git a/solr/licenses/apache5-client-2.46.17.jar.sha1 b/solr/licenses/apache5-client-2.46.17.jar.sha1 deleted file mode 100644 index 1621bb74e4ff..000000000000 --- a/solr/licenses/apache5-client-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6a8582139ffba62f07ee7fdad975f8f0253840f1 diff --git a/solr/licenses/apache5-client-2.46.18.jar.sha1 b/solr/licenses/apache5-client-2.46.18.jar.sha1 new file mode 100644 index 000000000000..ac47008a10c2 --- /dev/null +++ b/solr/licenses/apache5-client-2.46.18.jar.sha1 @@ -0,0 +1 @@ +662303b4b9001c88ad7b3bd31270dcd70489454f diff --git a/solr/licenses/arns-2.46.17.jar.sha1 b/solr/licenses/arns-2.46.17.jar.sha1 deleted file mode 100644 index 2e87ec6d7fa1..000000000000 --- a/solr/licenses/arns-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b39f0fbce96135c9b168cf3d24473a76f38cdbd1 diff --git a/solr/licenses/arns-2.46.18.jar.sha1 b/solr/licenses/arns-2.46.18.jar.sha1 new file mode 100644 index 000000000000..ca10a0243b7b --- /dev/null +++ b/solr/licenses/arns-2.46.18.jar.sha1 @@ -0,0 +1 @@ +1262df8200d86729d50a3b65c0b81b062bb9d7ce diff --git a/solr/licenses/auth-2.46.17.jar.sha1 b/solr/licenses/auth-2.46.17.jar.sha1 deleted file mode 100644 index 501d7affea45..000000000000 --- a/solr/licenses/auth-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0e7b3fe1baf2a4dbf1858ddea045d60950ccb04a diff --git a/solr/licenses/auth-2.46.18.jar.sha1 b/solr/licenses/auth-2.46.18.jar.sha1 new file mode 100644 index 000000000000..a494279ebd7a --- /dev/null +++ b/solr/licenses/auth-2.46.18.jar.sha1 @@ -0,0 +1 @@ +af87e067cd25f473e1b8325b39b9f791e8acf03d diff --git a/solr/licenses/aws-core-2.46.17.jar.sha1 b/solr/licenses/aws-core-2.46.17.jar.sha1 deleted file mode 100644 index c27f859d5fc0..000000000000 --- a/solr/licenses/aws-core-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9dd4ab62a8ec46d8afc23b80a2e6e2472943b5a2 diff --git a/solr/licenses/aws-core-2.46.18.jar.sha1 b/solr/licenses/aws-core-2.46.18.jar.sha1 new file mode 100644 index 000000000000..b16ea7916a1d --- /dev/null +++ b/solr/licenses/aws-core-2.46.18.jar.sha1 @@ -0,0 +1 @@ +14d66c4319732c2c4d7391565fbf4d6396261b07 diff --git a/solr/licenses/aws-query-protocol-2.46.17.jar.sha1 b/solr/licenses/aws-query-protocol-2.46.17.jar.sha1 deleted file mode 100644 index a152d88a0a39..000000000000 --- a/solr/licenses/aws-query-protocol-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b9661443d20f3d5e2a56c03f7952b93cb54c8e57 diff --git a/solr/licenses/aws-query-protocol-2.46.18.jar.sha1 b/solr/licenses/aws-query-protocol-2.46.18.jar.sha1 new file mode 100644 index 000000000000..c8f059d0ddd1 --- /dev/null +++ b/solr/licenses/aws-query-protocol-2.46.18.jar.sha1 @@ -0,0 +1 @@ +bb5484d0772f1ac37909dff57944562c8ade1f22 diff --git a/solr/licenses/aws-xml-protocol-2.46.17.jar.sha1 b/solr/licenses/aws-xml-protocol-2.46.17.jar.sha1 deleted file mode 100644 index 90b4e2ba58a5..000000000000 --- a/solr/licenses/aws-xml-protocol-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1375388137e71d4771a530b17c0776e3ffcb65f0 diff --git a/solr/licenses/aws-xml-protocol-2.46.18.jar.sha1 b/solr/licenses/aws-xml-protocol-2.46.18.jar.sha1 new file mode 100644 index 000000000000..2ceb119a6a3d --- /dev/null +++ b/solr/licenses/aws-xml-protocol-2.46.18.jar.sha1 @@ -0,0 +1 @@ +2644c09265561dbd42ac703ea900c13789a1557d diff --git a/solr/licenses/checksums-2.46.17.jar.sha1 b/solr/licenses/checksums-2.46.17.jar.sha1 deleted file mode 100644 index 87c084ddde2e..000000000000 --- a/solr/licenses/checksums-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -003c13820784f5b2e9806e7ba2cd003bd1c30e91 diff --git a/solr/licenses/checksums-2.46.18.jar.sha1 b/solr/licenses/checksums-2.46.18.jar.sha1 new file mode 100644 index 000000000000..37f3d93efb9c --- /dev/null +++ b/solr/licenses/checksums-2.46.18.jar.sha1 @@ -0,0 +1 @@ +fba721b278827a0fb77997c1a28f4f7c5270f2c6 diff --git a/solr/licenses/checksums-spi-2.46.17.jar.sha1 b/solr/licenses/checksums-spi-2.46.17.jar.sha1 deleted file mode 100644 index 55b16ac59ffd..000000000000 --- a/solr/licenses/checksums-spi-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -65d2b93a2e968bad046d930ad8a704d12d5742c1 diff --git a/solr/licenses/checksums-spi-2.46.18.jar.sha1 b/solr/licenses/checksums-spi-2.46.18.jar.sha1 new file mode 100644 index 000000000000..f6d9bca41679 --- /dev/null +++ b/solr/licenses/checksums-spi-2.46.18.jar.sha1 @@ -0,0 +1 @@ +51e7746369f605e7f1b9e658f4f218511059ad98 diff --git a/solr/licenses/crt-core-2.46.17.jar.sha1 b/solr/licenses/crt-core-2.46.17.jar.sha1 deleted file mode 100644 index ca4f76da8705..000000000000 --- a/solr/licenses/crt-core-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a2b266e984177c7be2975757f50429e44854484a diff --git a/solr/licenses/crt-core-2.46.18.jar.sha1 b/solr/licenses/crt-core-2.46.18.jar.sha1 new file mode 100644 index 000000000000..1423bec34335 --- /dev/null +++ b/solr/licenses/crt-core-2.46.18.jar.sha1 @@ -0,0 +1 @@ +e1812e10c5d0fe5d97c2b42d1c6f904195c94df3 diff --git a/solr/licenses/endpoints-spi-2.46.17.jar.sha1 b/solr/licenses/endpoints-spi-2.46.17.jar.sha1 deleted file mode 100644 index 576fab8fdcde..000000000000 --- a/solr/licenses/endpoints-spi-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6e85196754b8c948742d1716681e482f2b9dd492 diff --git a/solr/licenses/endpoints-spi-2.46.18.jar.sha1 b/solr/licenses/endpoints-spi-2.46.18.jar.sha1 new file mode 100644 index 000000000000..8f725e36793c --- /dev/null +++ b/solr/licenses/endpoints-spi-2.46.18.jar.sha1 @@ -0,0 +1 @@ +7e2ca83e8cb5b8b814e336dadc79ff090f0dde74 diff --git a/solr/licenses/http-auth-2.46.17.jar.sha1 b/solr/licenses/http-auth-2.46.17.jar.sha1 deleted file mode 100644 index b4cf41acb7f3..000000000000 --- a/solr/licenses/http-auth-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6f48708e7f978969ade0115ebb27c9e0d2db7e05 diff --git a/solr/licenses/http-auth-2.46.18.jar.sha1 b/solr/licenses/http-auth-2.46.18.jar.sha1 new file mode 100644 index 000000000000..ea0b396f4eba --- /dev/null +++ b/solr/licenses/http-auth-2.46.18.jar.sha1 @@ -0,0 +1 @@ +b78bac06502d42b8c64d702f5c3cab8f396bc6a7 diff --git a/solr/licenses/http-auth-aws-2.46.17.jar.sha1 b/solr/licenses/http-auth-aws-2.46.17.jar.sha1 deleted file mode 100644 index 066fe1c23eea..000000000000 --- a/solr/licenses/http-auth-aws-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -03cdf15a6cf03428c77247c8564c875a606b2690 diff --git a/solr/licenses/http-auth-aws-2.46.18.jar.sha1 b/solr/licenses/http-auth-aws-2.46.18.jar.sha1 new file mode 100644 index 000000000000..3f0e94c21bdd --- /dev/null +++ b/solr/licenses/http-auth-aws-2.46.18.jar.sha1 @@ -0,0 +1 @@ +fa0c2899775a9c8235f16b529406d237a6110220 diff --git a/solr/licenses/http-auth-aws-eventstream-2.46.17.jar.sha1 b/solr/licenses/http-auth-aws-eventstream-2.46.17.jar.sha1 deleted file mode 100644 index 8c033da9a752..000000000000 --- a/solr/licenses/http-auth-aws-eventstream-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -37b17870c6b9d4ab05eeba668c895717b7b82cd8 diff --git a/solr/licenses/http-auth-aws-eventstream-2.46.18.jar.sha1 b/solr/licenses/http-auth-aws-eventstream-2.46.18.jar.sha1 new file mode 100644 index 000000000000..c4468cd2d133 --- /dev/null +++ b/solr/licenses/http-auth-aws-eventstream-2.46.18.jar.sha1 @@ -0,0 +1 @@ +9313c555424d11e296faa54a9269358a74c293d5 diff --git a/solr/licenses/http-auth-spi-2.46.17.jar.sha1 b/solr/licenses/http-auth-spi-2.46.17.jar.sha1 deleted file mode 100644 index 5a77da086039..000000000000 --- a/solr/licenses/http-auth-spi-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7d9f5207119ac239e43d9e413eb3d45a689f83b1 diff --git a/solr/licenses/http-auth-spi-2.46.18.jar.sha1 b/solr/licenses/http-auth-spi-2.46.18.jar.sha1 new file mode 100644 index 000000000000..2034c30a5fde --- /dev/null +++ b/solr/licenses/http-auth-spi-2.46.18.jar.sha1 @@ -0,0 +1 @@ +b9c662fc14157c9c045fabbd9f91b701791030bd diff --git a/solr/licenses/http-client-spi-2.46.17.jar.sha1 b/solr/licenses/http-client-spi-2.46.17.jar.sha1 deleted file mode 100644 index eecacdca41ae..000000000000 --- a/solr/licenses/http-client-spi-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2ab1a2fce74d4594ac03067da6bac0b3fea23b17 diff --git a/solr/licenses/http-client-spi-2.46.18.jar.sha1 b/solr/licenses/http-client-spi-2.46.18.jar.sha1 new file mode 100644 index 000000000000..0024e5d1924e --- /dev/null +++ b/solr/licenses/http-client-spi-2.46.18.jar.sha1 @@ -0,0 +1 @@ +3ddb986fef3f8c8bc910551f1070e0f483eb1958 diff --git a/solr/licenses/httpcore5-5.4.2.jar.sha1 b/solr/licenses/httpcore5-5.4.2.jar.sha1 deleted file mode 100644 index c9048d8d404d..000000000000 --- a/solr/licenses/httpcore5-5.4.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -346d5f65ff819510666541ba94b3abf747454916 diff --git a/solr/licenses/httpcore5-5.4.3.jar.sha1 b/solr/licenses/httpcore5-5.4.3.jar.sha1 new file mode 100644 index 000000000000..d6780c4d174d --- /dev/null +++ b/solr/licenses/httpcore5-5.4.3.jar.sha1 @@ -0,0 +1 @@ +32a0699fbcb103f5621c00983ee8f5aac080e4a6 diff --git a/solr/licenses/identity-spi-2.46.17.jar.sha1 b/solr/licenses/identity-spi-2.46.17.jar.sha1 deleted file mode 100644 index ca08123ca054..000000000000 --- a/solr/licenses/identity-spi-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -063c6435d7633e01c714ff1e28b7fe13c846a45d diff --git a/solr/licenses/identity-spi-2.46.18.jar.sha1 b/solr/licenses/identity-spi-2.46.18.jar.sha1 new file mode 100644 index 000000000000..02dfa59fdf62 --- /dev/null +++ b/solr/licenses/identity-spi-2.46.18.jar.sha1 @@ -0,0 +1 @@ +e99762270949b9cd05caaa899323de522e4b6659 diff --git a/solr/licenses/json-utils-2.46.17.jar.sha1 b/solr/licenses/json-utils-2.46.17.jar.sha1 deleted file mode 100644 index d7014fee416b..000000000000 --- a/solr/licenses/json-utils-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -24ec06a3d5b9d430e6de1d88cf041be36a7fd560 diff --git a/solr/licenses/json-utils-2.46.18.jar.sha1 b/solr/licenses/json-utils-2.46.18.jar.sha1 new file mode 100644 index 000000000000..2cdadce832a7 --- /dev/null +++ b/solr/licenses/json-utils-2.46.18.jar.sha1 @@ -0,0 +1 @@ +c96b60da16c3dd6a54ee18c6504851ea612eb526 diff --git a/solr/licenses/metrics-spi-2.46.17.jar.sha1 b/solr/licenses/metrics-spi-2.46.17.jar.sha1 deleted file mode 100644 index 8a367fab7bd8..000000000000 --- a/solr/licenses/metrics-spi-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -532e07e3a4236bae07bd63c90d7914f52dd23d5f diff --git a/solr/licenses/metrics-spi-2.46.18.jar.sha1 b/solr/licenses/metrics-spi-2.46.18.jar.sha1 new file mode 100644 index 000000000000..650abce8ecfa --- /dev/null +++ b/solr/licenses/metrics-spi-2.46.18.jar.sha1 @@ -0,0 +1 @@ +7b66d600d308a90e250ed17dcb60ecd7f003fcc7 diff --git a/solr/licenses/mockwebserver-5.3.2.jar.sha1 b/solr/licenses/mockwebserver-5.3.2.jar.sha1 deleted file mode 100644 index c584e1609098..000000000000 --- a/solr/licenses/mockwebserver-5.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -58f89e39ed9f68a9cb12e4da6de64848b177e727 diff --git a/solr/licenses/mockwebserver-5.4.0.jar.sha1 b/solr/licenses/mockwebserver-5.4.0.jar.sha1 new file mode 100644 index 000000000000..32f44b18ba75 --- /dev/null +++ b/solr/licenses/mockwebserver-5.4.0.jar.sha1 @@ -0,0 +1 @@ +a54f047a793c0d613ab89f6463d6c4642a641770 diff --git a/solr/licenses/mockwebserver3-5.3.2.jar.sha1 b/solr/licenses/mockwebserver3-5.3.2.jar.sha1 deleted file mode 100644 index fdd80de865f7..000000000000 --- a/solr/licenses/mockwebserver3-5.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b759ca96141cdd58291dea97211864f621e4c7bd diff --git a/solr/licenses/mockwebserver3-5.4.0.jar.sha1 b/solr/licenses/mockwebserver3-5.4.0.jar.sha1 new file mode 100644 index 000000000000..38cc6701a7b2 --- /dev/null +++ b/solr/licenses/mockwebserver3-5.4.0.jar.sha1 @@ -0,0 +1 @@ +a12e1d58d550f8ecc8edd6709ffb810589acffed diff --git a/solr/licenses/okhttp-jvm-5.3.2.jar.sha1 b/solr/licenses/okhttp-jvm-5.3.2.jar.sha1 deleted file mode 100644 index 2edd40fd7e5f..000000000000 --- a/solr/licenses/okhttp-jvm-5.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f31e8de27feebe1e56d6c9d354a0986b65be0e1d 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 000000000000..4b0e22d054de --- /dev/null +++ b/solr/licenses/okhttp-jvm-5.4.0.jar.sha1 @@ -0,0 +1 @@ +e1fae6fccaae70e60b31153c6a7680306a86ed31 diff --git a/solr/licenses/okhttp-sse-5.3.2.jar.sha1 b/solr/licenses/okhttp-sse-5.3.2.jar.sha1 deleted file mode 100644 index def7c32b7a8a..000000000000 --- a/solr/licenses/okhttp-sse-5.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5e21d25808bc853079b9aabeaca9f998a24cbf6c diff --git a/solr/licenses/okhttp-sse-5.4.0.jar.sha1 b/solr/licenses/okhttp-sse-5.4.0.jar.sha1 new file mode 100644 index 000000000000..e4529c6169b5 --- /dev/null +++ b/solr/licenses/okhttp-sse-5.4.0.jar.sha1 @@ -0,0 +1 @@ +16a9b18cc3683a45d32f082b3df74a92aa3e7748 diff --git a/solr/licenses/okio-jvm-3.16.4.jar.sha1 b/solr/licenses/okio-jvm-3.16.4.jar.sha1 deleted file mode 100644 index 97f8e4eb6242..000000000000 --- a/solr/licenses/okio-jvm-3.16.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ceb794cf0bbf8d0d20f49aa91ce20db7fd77675d 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/licenses/profiles-2.46.17.jar.sha1 b/solr/licenses/profiles-2.46.17.jar.sha1 deleted file mode 100644 index 4d913b17675b..000000000000 --- a/solr/licenses/profiles-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4d7a10d2e471740e1055a1513ed996a762850ccf diff --git a/solr/licenses/profiles-2.46.18.jar.sha1 b/solr/licenses/profiles-2.46.18.jar.sha1 new file mode 100644 index 000000000000..1185a0b45bb1 --- /dev/null +++ b/solr/licenses/profiles-2.46.18.jar.sha1 @@ -0,0 +1 @@ +4be1413b28f772914d5028a03d9696f6396bb4c0 diff --git a/solr/licenses/protocol-core-2.46.17.jar.sha1 b/solr/licenses/protocol-core-2.46.17.jar.sha1 deleted file mode 100644 index e21f46dcdab6..000000000000 --- a/solr/licenses/protocol-core-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -63c63ddd7dbaab91f9406625578fd1969b34108d diff --git a/solr/licenses/protocol-core-2.46.18.jar.sha1 b/solr/licenses/protocol-core-2.46.18.jar.sha1 new file mode 100644 index 000000000000..c0b6adb478a1 --- /dev/null +++ b/solr/licenses/protocol-core-2.46.18.jar.sha1 @@ -0,0 +1 @@ +2bc3989e011e566baf182fefe02f2ce32eb07009 diff --git a/solr/licenses/regions-2.46.17.jar.sha1 b/solr/licenses/regions-2.46.17.jar.sha1 deleted file mode 100644 index 5ad50fc4fb10..000000000000 --- a/solr/licenses/regions-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ec6c415cf5ebbb9ddd72fdadf14aedaf828a3b6b diff --git a/solr/licenses/regions-2.46.18.jar.sha1 b/solr/licenses/regions-2.46.18.jar.sha1 new file mode 100644 index 000000000000..78ff99faa220 --- /dev/null +++ b/solr/licenses/regions-2.46.18.jar.sha1 @@ -0,0 +1 @@ +391e83d33b97b4b16f0c640faa18e21a04cad7d3 diff --git a/solr/licenses/retries-2.46.17.jar.sha1 b/solr/licenses/retries-2.46.17.jar.sha1 deleted file mode 100644 index 468ea2d84a63..000000000000 --- a/solr/licenses/retries-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -33b5700ff1bb58a76e9b67867540aa3a961f03c5 diff --git a/solr/licenses/retries-2.46.18.jar.sha1 b/solr/licenses/retries-2.46.18.jar.sha1 new file mode 100644 index 000000000000..8b64e86597ec --- /dev/null +++ b/solr/licenses/retries-2.46.18.jar.sha1 @@ -0,0 +1 @@ +6b8d1a7e8628c0b8a829956480289c7fba271a31 diff --git a/solr/licenses/retries-spi-2.46.17.jar.sha1 b/solr/licenses/retries-spi-2.46.17.jar.sha1 deleted file mode 100644 index 6129b120878c..000000000000 --- a/solr/licenses/retries-spi-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ffb9e4fc620e9779b53b959125a86921b945cf70 diff --git a/solr/licenses/retries-spi-2.46.18.jar.sha1 b/solr/licenses/retries-spi-2.46.18.jar.sha1 new file mode 100644 index 000000000000..45f992d56582 --- /dev/null +++ b/solr/licenses/retries-spi-2.46.18.jar.sha1 @@ -0,0 +1 @@ +a488d7445b3aad40a4d496d8d3ca078cf719510d diff --git a/solr/licenses/s3-2.46.17.jar.sha1 b/solr/licenses/s3-2.46.17.jar.sha1 deleted file mode 100644 index f2dc072d7380..000000000000 --- a/solr/licenses/s3-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3f3a90c40030235f3f2d754fc5d85703b5b37223 diff --git a/solr/licenses/s3-2.46.18.jar.sha1 b/solr/licenses/s3-2.46.18.jar.sha1 new file mode 100644 index 000000000000..2a19713cad09 --- /dev/null +++ b/solr/licenses/s3-2.46.18.jar.sha1 @@ -0,0 +1 @@ +5f80776e0674eac9592cafb0cf0cff7a783ba4d3 diff --git a/solr/licenses/sdk-core-2.46.17.jar.sha1 b/solr/licenses/sdk-core-2.46.17.jar.sha1 deleted file mode 100644 index 97965e1afa23..000000000000 --- a/solr/licenses/sdk-core-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a5ce78d4f92624100ab39e721929534f93f08df7 diff --git a/solr/licenses/sdk-core-2.46.18.jar.sha1 b/solr/licenses/sdk-core-2.46.18.jar.sha1 new file mode 100644 index 000000000000..e333399457f0 --- /dev/null +++ b/solr/licenses/sdk-core-2.46.18.jar.sha1 @@ -0,0 +1 @@ +e069cf4a817d6f7d74980f3f2842ef4a18619f45 diff --git a/solr/licenses/sts-2.46.17.jar.sha1 b/solr/licenses/sts-2.46.17.jar.sha1 deleted file mode 100644 index 2d61277af183..000000000000 --- a/solr/licenses/sts-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -022d998b64f71e57057bef3580cec6f60a701c82 diff --git a/solr/licenses/sts-2.46.18.jar.sha1 b/solr/licenses/sts-2.46.18.jar.sha1 new file mode 100644 index 000000000000..59d7f597b5f5 --- /dev/null +++ b/solr/licenses/sts-2.46.18.jar.sha1 @@ -0,0 +1 @@ +fbb43c829541cf060e217581c09ff3fc881b1d7a diff --git a/solr/licenses/third-party-jackson-core-2.46.17.jar.sha1 b/solr/licenses/third-party-jackson-core-2.46.17.jar.sha1 deleted file mode 100644 index 8ebf5401c59c..000000000000 --- a/solr/licenses/third-party-jackson-core-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1d6ca0541e795b6386885c7ec88d0139e0a00bed diff --git a/solr/licenses/third-party-jackson-core-2.46.18.jar.sha1 b/solr/licenses/third-party-jackson-core-2.46.18.jar.sha1 new file mode 100644 index 000000000000..f0725756d751 --- /dev/null +++ b/solr/licenses/third-party-jackson-core-2.46.18.jar.sha1 @@ -0,0 +1 @@ +cb5770cdf77c51762cf86c9565c50875a6dff94b diff --git a/solr/licenses/url-connection-client-2.46.17.jar.sha1 b/solr/licenses/url-connection-client-2.46.17.jar.sha1 deleted file mode 100644 index 88eaafae6eb5..000000000000 --- a/solr/licenses/url-connection-client-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -33203e981c224fa4356cf7b8c025c075b327fb21 diff --git a/solr/licenses/url-connection-client-2.46.18.jar.sha1 b/solr/licenses/url-connection-client-2.46.18.jar.sha1 new file mode 100644 index 000000000000..aecb95968c4c --- /dev/null +++ b/solr/licenses/url-connection-client-2.46.18.jar.sha1 @@ -0,0 +1 @@ +ccac491e9fa00ceb83eef1cae6e045c0b522e877 diff --git a/solr/licenses/utils-2.46.17.jar.sha1 b/solr/licenses/utils-2.46.17.jar.sha1 deleted file mode 100644 index 8279faa5d3e5..000000000000 --- a/solr/licenses/utils-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1e40b6fd0e0eaf72e6339f05ce0209da60713d91 diff --git a/solr/licenses/utils-2.46.18.jar.sha1 b/solr/licenses/utils-2.46.18.jar.sha1 new file mode 100644 index 000000000000..17cb3b65587d --- /dev/null +++ b/solr/licenses/utils-2.46.18.jar.sha1 @@ -0,0 +1 @@ +6e7909cc90d44084c4a3a2a6000c562faebb62a8 diff --git a/solr/licenses/utils-lite-2.46.17.jar.sha1 b/solr/licenses/utils-lite-2.46.17.jar.sha1 deleted file mode 100644 index b35707755efe..000000000000 --- a/solr/licenses/utils-lite-2.46.17.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9d7f08d137796e1877694313c59dff8e469a7dfd diff --git a/solr/licenses/utils-lite-2.46.18.jar.sha1 b/solr/licenses/utils-lite-2.46.18.jar.sha1 new file mode 100644 index 000000000000..0fd6644c27c0 --- /dev/null +++ b/solr/licenses/utils-lite-2.46.18.jar.sha1 @@ -0,0 +1 @@ +0d503fa5842a9683fbbfe6d0bd47dd529f795c4b diff --git a/versions.lock b/versions.lock index ad1cdb28579c..bc976414fb93 100644 --- a/versions.lock +++ b/versions.lock @@ -62,11 +62,11 @@ com.j256.simplemagic:simplemagic:1.17 (1 constraints: dd04f830) com.jayway.jsonpath:json-path:2.10.0 (2 constraints: 97122538) com.knuddels:jtokkit:1.1.0 (1 constraints: 9d0e146a) com.lmax:disruptor:3.4.4 (1 constraints: 0d050a36) -com.squareup.okhttp3:okhttp:5.3.2 (11 constraints: a99b5194) -com.squareup.okhttp3:okhttp-jvm:5.3.2 (2 constraints: 5f11e5e8) -com.squareup.okhttp3:okhttp-sse:5.3.2 (2 constraints: 13189cad) -com.squareup.okio:okio:3.16.4 (1 constraints: 020ea946) -com.squareup.okio:okio-jvm:3.16.4 (1 constraints: 850a57c4) +com.squareup.okhttp3:okhttp:5.4.0 (11 constraints: a59b7e8e) +com.squareup.okhttp3:okhttp-jvm:5.4.0 (2 constraints: 5d11c3e8) +com.squareup.okhttp3:okhttp-sse:5.4.0 (2 constraints: 13189cad) +com.squareup.okio:okio:3.17.0 (2 constraints: 681d513b) +com.squareup.okio:okio-jvm:3.17.0 (1 constraints: 820a56c4) com.squareup.retrofit2:converter-jackson:2.9.0 (4 constraints: ce36e7ea) com.squareup.retrofit2:retrofit:2.9.0 (5 constraints: 4a48510b) com.tdunning:t-digest:3.3 (1 constraints: aa04232c) @@ -197,7 +197,7 @@ org.apache.httpcomponents:httpclient:4.5.14 (7 constraints: b7695b2f) org.apache.httpcomponents:httpcore:4.4.16 (6 constraints: ea5cc678) org.apache.httpcomponents:httpmime:4.5.14 (1 constraints: 40054f3b) org.apache.httpcomponents.client5:httpclient5:5.6.1 (2 constraints: 6520b445) -org.apache.httpcomponents.core5:httpcore5:5.4.2 (4 constraints: 3d45d154) +org.apache.httpcomponents.core5:httpcore5:5.4.3 (4 constraints: 3e45d254) org.apache.httpcomponents.core5:httpcore5-h2:5.4 (1 constraints: df12c515) org.apache.kafka:kafka-clients:3.9.2 (13 constraints: 7db456b4) org.apache.kafka:kafka-group-coordinator:3.9.2 (2 constraints: aa1748bd) @@ -315,7 +315,7 @@ org.immutables:value-annotations:2.12.2 (1 constraints: 3905373b) org.javassist:javassist:3.30.2-GA (1 constraints: 2811fff0) org.jctools:jctools-core:4.0.6 (1 constraints: 0c050536) org.jetbrains:annotations:17.0.0 (2 constraints: 371c92e0) -org.jetbrains.kotlin:kotlin-stdlib:2.2.21 (10 constraints: 36996fd4) +org.jetbrains.kotlin:kotlin-stdlib:2.2.21 (10 constraints: 999b6794) org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 (2 constraints: f31f0a21) org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 (6 constraints: 745eefc1) org.jspecify:jspecify:1.0.0 (3 constraints: b1233dfa) @@ -345,38 +345,38 @@ org.slf4j:jul-to-slf4j:2.0.18 (2 constraints: c21b117f) org.slf4j:slf4j-api:2.0.18 (68 constraints: 79d3351e) org.threeten:threetenbp:1.6.9 (4 constraints: 2833ea68) org.xerial.snappy:snappy-java:1.1.10.8 (5 constraints: c146fa38) -software.amazon.awssdk:annotations:2.46.17 (31 constraints: e6db2e80) -software.amazon.awssdk:apache-client:2.46.17 (2 constraints: d3116915) -software.amazon.awssdk:apache5-client:2.46.17 (3 constraints: 9c24d24a) -software.amazon.awssdk:arns:2.46.17 (2 constraints: 231888c1) -software.amazon.awssdk:auth:2.46.17 (5 constraints: 51388841) -software.amazon.awssdk:aws-core:2.46.17 (6 constraints: 044e6321) -software.amazon.awssdk:aws-query-protocol:2.46.17 (3 constraints: 5e2a2fde) -software.amazon.awssdk:aws-xml-protocol:2.46.17 (2 constraints: 231888c1) -software.amazon.awssdk:bom:2.46.17 (1 constraints: 7605c440) -software.amazon.awssdk:checksums:2.46.17 (4 constraints: 903670f6) -software.amazon.awssdk:checksums-spi:2.46.17 (7 constraints: 7d626814) -software.amazon.awssdk:crt-core:2.46.17 (1 constraints: c60ba9f9) -software.amazon.awssdk:endpoints-spi:2.46.17 (5 constraints: 13417a75) -software.amazon.awssdk:http-auth:2.46.17 (5 constraints: ad3f207a) -software.amazon.awssdk:http-auth-aws:2.46.17 (5 constraints: a43f9f5d) -software.amazon.awssdk:http-auth-aws-eventstream:2.46.17 (2 constraints: 2f1971ff) -software.amazon.awssdk:http-auth-spi:2.46.17 (8 constraints: d86c37de) -software.amazon.awssdk:http-client-spi:2.46.17 (16 constraints: e8ea66a9) -software.amazon.awssdk:identity-spi:2.46.17 (9 constraints: 0f7d8bc5) -software.amazon.awssdk:json-utils:2.46.17 (5 constraints: 833fd83f) -software.amazon.awssdk:metrics-spi:2.46.17 (8 constraints: a672306c) -software.amazon.awssdk:profiles:2.46.17 (8 constraints: 6f615a4a) -software.amazon.awssdk:protocol-core:2.46.17 (5 constraints: 8f48705b) -software.amazon.awssdk:regions:2.46.17 (7 constraints: 4c500db2) -software.amazon.awssdk:retries:2.46.17 (3 constraints: d5285828) -software.amazon.awssdk:retries-spi:2.46.17 (7 constraints: a554919f) -software.amazon.awssdk:s3:2.46.17 (4 constraints: e72f26c1) -software.amazon.awssdk:sdk-core:2.46.17 (10 constraints: 92876ded) -software.amazon.awssdk:sts:2.46.17 (2 constraints: d3116915) -software.amazon.awssdk:third-party-jackson-core:2.46.17 (2 constraints: 951b4aa8) -software.amazon.awssdk:utils:2.46.17 (27 constraints: ba943b6d) -software.amazon.awssdk:utils-lite:2.46.17 (2 constraints: 9e1a6f72) +software.amazon.awssdk:annotations:2.46.18 (31 constraints: 05dc83d0) +software.amazon.awssdk:apache-client:2.46.18 (2 constraints: d5119015) +software.amazon.awssdk:apache5-client:2.46.18 (3 constraints: 9f24434b) +software.amazon.awssdk:arns:2.46.18 (2 constraints: 2518aec1) +software.amazon.awssdk:auth:2.46.18 (5 constraints: 56380143) +software.amazon.awssdk:aws-core:2.46.18 (6 constraints: 0a4eb923) +software.amazon.awssdk:aws-query-protocol:2.46.18 (3 constraints: 612aa1de) +software.amazon.awssdk:aws-xml-protocol:2.46.18 (2 constraints: 2518aec1) +software.amazon.awssdk:bom:2.46.18 (1 constraints: 7705c540) +software.amazon.awssdk:checksums:2.46.18 (4 constraints: 943669f7) +software.amazon.awssdk:checksums-spi:2.46.18 (7 constraints: 8462e317) +software.amazon.awssdk:crt-core:2.46.18 (1 constraints: c70baaf9) +software.amazon.awssdk:endpoints-spi:2.46.18 (5 constraints: 1841fe76) +software.amazon.awssdk:http-auth:2.46.18 (5 constraints: b23f997b) +software.amazon.awssdk:http-auth-aws:2.46.18 (5 constraints: a93f235f) +software.amazon.awssdk:http-auth-aws-eventstream:2.46.18 (2 constraints: 311998ff) +software.amazon.awssdk:http-auth-spi:2.46.18 (8 constraints: e06ca3e2) +software.amazon.awssdk:http-client-spi:2.46.18 (16 constraints: f8ea3dbe) +software.amazon.awssdk:identity-spi:2.46.18 (9 constraints: 187d56cb) +software.amazon.awssdk:json-utils:2.46.18 (5 constraints: 883f5441) +software.amazon.awssdk:metrics-spi:2.46.18 (8 constraints: ae72a270) +software.amazon.awssdk:profiles:2.46.18 (8 constraints: 7761a24e) +software.amazon.awssdk:protocol-core:2.46.18 (5 constraints: 9448f15c) +software.amazon.awssdk:regions:2.46.18 (7 constraints: 525068b4) +software.amazon.awssdk:retries:2.46.18 (3 constraints: d828d428) +software.amazon.awssdk:retries-spi:2.46.18 (7 constraints: ac54c7a2) +software.amazon.awssdk:s3:2.46.18 (4 constraints: e92fa6c1) +software.amazon.awssdk:sdk-core:2.46.18 (10 constraints: 9c87b4f4) +software.amazon.awssdk:sts:2.46.18 (2 constraints: d5119015) +software.amazon.awssdk:third-party-jackson-core:2.46.18 (2 constraints: 971b78a8) +software.amazon.awssdk:utils:2.46.18 (27 constraints: d494f9a4) +software.amazon.awssdk:utils-lite:2.46.18 (2 constraints: a01a9672) software.amazon.eventstream:eventstream:1.0.1 (3 constraints: cd2e5385) ua.net.nlp:morfologik-ukrainian-search:4.9.1 (1 constraints: d5126e1e) @@ -400,8 +400,8 @@ com.nimbusds:content-type:2.2 (1 constraints: d80b68eb) com.nimbusds:lang-tag:1.7 (1 constraints: dc0b6aeb) com.nimbusds:nimbus-jose-jwt:9.30.2 (1 constraints: 700c4b10) com.nimbusds:oauth2-oidc-sdk:10.10.1 (1 constraints: 190f9b80) -com.squareup.okhttp3:mockwebserver:5.3.2 (2 constraints: f7139685) -com.squareup.okhttp3:mockwebserver3:5.3.2 (1 constraints: 390f436d) +com.squareup.okhttp3:mockwebserver:5.4.0 (2 constraints: f6136b85) +com.squareup.okhttp3:mockwebserver3:5.4.0 (1 constraints: 380f446d) com.sun.activation:jakarta.activation:1.2.2 (1 constraints: ba0dac35) com.sun.istack:istack-commons-runtime:3.0.12 (1 constraints: eb0d9a43) io.github.microutils:kotlin-logging:3.0.5 (1 constraints: be0ea162) @@ -467,5 +467,5 @@ org.springframework.boot:spring-boot-starter-logging:2.7.13 (1 constraints: 6e13 org.springframework.boot:spring-boot-starter-web:2.7.13 (1 constraints: f30a39d6) org.testcontainers:testcontainers:2.0.5 (1 constraints: 0905fa35) org.yaml:snakeyaml:1.30 (1 constraints: 0713d91f) -software.amazon.awssdk:url-connection-client:2.46.17 (2 constraints: 481f10f7) +software.amazon.awssdk:url-connection-client:2.46.18 (2 constraints: 491f11f7) software.amazon.ion:ion-java:1.0.2 (1 constraints: 720db831) diff --git a/versions.props b/versions.props index 9352bafef459..e39943b1ba3a 100644 --- a/versions.props +++ b/versions.props @@ -18,7 +18,7 @@ com.google.re2j:re2j=1.8 com.j256.simplemagic:simplemagic=1.17 com.jayway.jsonpath:json-path=2.10.0 com.lmax:disruptor=3.4.4 -com.squareup.okhttp3:*=5.3.2 +com.squareup.okhttp3:*=5.4.0 com.tdunning:t-digest=3.3 commons-cli:commons-cli=1.11.0 commons-codec:commons-codec=1.22.0 @@ -86,4 +86,4 @@ org.semver4j:semver4j=5.8.0 org.slf4j:*=2.0.18 org.testcontainers:testcontainers*=2.0.5 org.xerial.snappy:snappy-java=1.1.10.8 -software.amazon.awssdk:*=2.46.17 +software.amazon.awssdk:*=2.46.18 From 5889b905b916c3eaae2e8f366fa0de3257466114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Tue, 30 Jun 2026 14:05:32 +0200 Subject: [PATCH 39/45] Pin net.bytebuddy to the standard 1.18.10 build (drop -jdk5 flavor) Renovate selected the legacy Java-5-compatible -jdk5 artifact because Maven Central tags it as /. Solr targets Java 21 and has no need for the JDK5 build, so pin to the standard 1.18.10 artifacts. --- changelog/unreleased/update-bytebuddy-1.18.10.yml | 2 +- solr/licenses/byte-buddy-1.18.10-jdk5.jar.sha1 | 1 - solr/licenses/byte-buddy-1.18.10.jar.sha1 | 1 + solr/licenses/byte-buddy-agent-1.18.10-jdk5.jar.sha1 | 1 - solr/licenses/byte-buddy-agent-1.18.10.jar.sha1 | 1 + versions.lock | 4 ++-- versions.props | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 solr/licenses/byte-buddy-1.18.10-jdk5.jar.sha1 create mode 100644 solr/licenses/byte-buddy-1.18.10.jar.sha1 delete mode 100644 solr/licenses/byte-buddy-agent-1.18.10-jdk5.jar.sha1 create mode 100644 solr/licenses/byte-buddy-agent-1.18.10.jar.sha1 diff --git a/changelog/unreleased/update-bytebuddy-1.18.10.yml b/changelog/unreleased/update-bytebuddy-1.18.10.yml index 60017917c5ff..9b853abd9aed 100644 --- a/changelog/unreleased/update-bytebuddy-1.18.10.yml +++ b/changelog/unreleased/update-bytebuddy-1.18.10.yml @@ -1,4 +1,4 @@ -title: Update net.bytebuddy:* to v1.18.10-jdk5 (branch_9x) +title: Update net.bytebuddy:* to v1.18.10 type: dependency_update authors: - name: solrbot diff --git a/solr/licenses/byte-buddy-1.18.10-jdk5.jar.sha1 b/solr/licenses/byte-buddy-1.18.10-jdk5.jar.sha1 deleted file mode 100644 index d18172c7ee47..000000000000 --- a/solr/licenses/byte-buddy-1.18.10-jdk5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7f49079987149888863a48740fb905cf37d29157 diff --git a/solr/licenses/byte-buddy-1.18.10.jar.sha1 b/solr/licenses/byte-buddy-1.18.10.jar.sha1 new file mode 100644 index 000000000000..e3dd04d94edc --- /dev/null +++ b/solr/licenses/byte-buddy-1.18.10.jar.sha1 @@ -0,0 +1 @@ +5b34812ced047973a6d42654d50c3b69124ce587 diff --git a/solr/licenses/byte-buddy-agent-1.18.10-jdk5.jar.sha1 b/solr/licenses/byte-buddy-agent-1.18.10-jdk5.jar.sha1 deleted file mode 100644 index a35cd1f9f373..000000000000 --- a/solr/licenses/byte-buddy-agent-1.18.10-jdk5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8fe4b6c25352b52b9558710f094debe2bba827c9 diff --git a/solr/licenses/byte-buddy-agent-1.18.10.jar.sha1 b/solr/licenses/byte-buddy-agent-1.18.10.jar.sha1 new file mode 100644 index 000000000000..677634c38030 --- /dev/null +++ b/solr/licenses/byte-buddy-agent-1.18.10.jar.sha1 @@ -0,0 +1 @@ +9426d28828bdcdf42666bb7a68c468279ea78f59 diff --git a/versions.lock b/versions.lock index bc976414fb93..80375c0fbae7 100644 --- a/versions.lock +++ b/versions.lock @@ -413,8 +413,8 @@ jakarta.websocket:jakarta.websocket-api:1.1.2 (1 constraints: 92155ab9) jakarta.xml.bind:jakarta.xml.bind-api:2.3.3 (1 constraints: bd0db535) javax.inject:javax.inject:1 (1 constraints: 7a0df617) joda-time:joda-time:2.8.1 (1 constraints: 7a0dd431) -net.bytebuddy:byte-buddy:1.18.10-jdk5 (2 constraints: 5112ea2d) -net.bytebuddy:byte-buddy-agent:1.18.10-jdk5 (1 constraints: 08079060) +net.bytebuddy:byte-buddy:1.18.10 (2 constraints: b61064d7) +net.bytebuddy:byte-buddy-agent:1.18.10 (1 constraints: 6d05af40) net.java.dev.jna:jna:5.18.1 (2 constraints: 3d1b1b62) net.minidev:accessors-smart:2.4.9 (1 constraints: 500a92b8) net.minidev:json-smart:2.4.10 (1 constraints: 400e9a7c) diff --git a/versions.props b/versions.props index e39943b1ba3a..5306a71beee0 100644 --- a/versions.props +++ b/versions.props @@ -37,7 +37,7 @@ io.prometheus:simpleclient*=0.16.0 io.swagger.core.v3:*=2.2.22 jakarta.ws.rs:jakarta.ws.rs-api=3.1.0 junit:junit=4.13.2 -net.bytebuddy:*=1.18.10-jdk5 +net.bytebuddy:*=1.18.10 net.java.dev.jna:jna=5.18.1 net.thisptr:jackson-jq=0.0.13 no.nav.security:mock-oauth2-server=0.5.10 From fc8b26b97acf5bf76ceeaf1bbe9dae4fa82619b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Tue, 30 Jun 2026 14:05:32 +0200 Subject: [PATCH 40/45] Remove redundant (branch_9x) suffix from changelog titles edited in this branch --- .../PR#4438-update-org-slf4j-to-v2-0-18-branch-9x.yml | 2 +- .../PR#4470-update-org-apache-tika-to-v3-3-1-branch-9x.yml | 2 +- changelog/unreleased/update-awssdk-2.46.18.yml | 2 +- changelog/unreleased/update-dropwizard-metrics-4.2.39.yml | 2 +- changelog/unreleased/update-grpc-1.82.1.yml | 2 +- changelog/unreleased/update-kerby-2.1.2.yml | 2 +- changelog/unreleased/update-logchange-plugin-1.19.15.yml | 2 +- changelog/unreleased/update-netty-4.2.15.yml | 2 +- changelog/unreleased/update-opentelemetry-bom-1.63.0.yml | 2 +- changelog/unreleased/update-prometheus-1.8.0.yml | 2 +- changelog/unreleased/update-protobuf-4.35.1.yml | 2 +- changelog/unreleased/update-testcontainers-2.0.5.yml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/changelog/unreleased/PR#4438-update-org-slf4j-to-v2-0-18-branch-9x.yml b/changelog/unreleased/PR#4438-update-org-slf4j-to-v2-0-18-branch-9x.yml index 37677b997270..2f8fe50175a1 100644 --- a/changelog/unreleased/PR#4438-update-org-slf4j-to-v2-0-18-branch-9x.yml +++ b/changelog/unreleased/PR#4438-update-org-slf4j-to-v2-0-18-branch-9x.yml @@ -1,4 +1,4 @@ -title: Update org.slf4j:* to v2.0.18 (branch_9x) +title: Update org.slf4j:* to v2.0.18 type: dependency_update authors: - name: solrbot diff --git a/changelog/unreleased/PR#4470-update-org-apache-tika-to-v3-3-1-branch-9x.yml b/changelog/unreleased/PR#4470-update-org-apache-tika-to-v3-3-1-branch-9x.yml index c25964632349..5fb45ab2781b 100644 --- a/changelog/unreleased/PR#4470-update-org-apache-tika-to-v3-3-1-branch-9x.yml +++ b/changelog/unreleased/PR#4470-update-org-apache-tika-to-v3-3-1-branch-9x.yml @@ -1,4 +1,4 @@ -title: Update org.apache.tika:* to v3.3.1 (branch_9x) +title: Update org.apache.tika:* to v3.3.1 type: dependency_update authors: - name: solrbot diff --git a/changelog/unreleased/update-awssdk-2.46.18.yml b/changelog/unreleased/update-awssdk-2.46.18.yml index ddf2a5a292c1..6db400cdf53a 100644 --- a/changelog/unreleased/update-awssdk-2.46.18.yml +++ b/changelog/unreleased/update-awssdk-2.46.18.yml @@ -1,4 +1,4 @@ -title: Update software.amazon.awssdk:* to v2.46.18 (branch_9x) +title: Update software.amazon.awssdk:* to v2.46.18 type: dependency_update authors: - name: solrbot diff --git a/changelog/unreleased/update-dropwizard-metrics-4.2.39.yml b/changelog/unreleased/update-dropwizard-metrics-4.2.39.yml index 7122b9e5f39f..830375810235 100644 --- a/changelog/unreleased/update-dropwizard-metrics-4.2.39.yml +++ b/changelog/unreleased/update-dropwizard-metrics-4.2.39.yml @@ -1,4 +1,4 @@ -title: Update io.dropwizard.metrics:* to v4.2.39 (branch_9x) +title: Update io.dropwizard.metrics:* to v4.2.39 type: dependency_update authors: - name: solrbot diff --git a/changelog/unreleased/update-grpc-1.82.1.yml b/changelog/unreleased/update-grpc-1.82.1.yml index 3afc83523cec..3e10b4b3ffca 100644 --- a/changelog/unreleased/update-grpc-1.82.1.yml +++ b/changelog/unreleased/update-grpc-1.82.1.yml @@ -1,4 +1,4 @@ -title: Update io.grpc:grpc-* to v1.82.1 (branch_9x) +title: Update io.grpc:grpc-* to v1.82.1 type: dependency_update authors: - name: solrbot diff --git a/changelog/unreleased/update-kerby-2.1.2.yml b/changelog/unreleased/update-kerby-2.1.2.yml index afc4bffb7529..d4f1bde087ed 100644 --- a/changelog/unreleased/update-kerby-2.1.2.yml +++ b/changelog/unreleased/update-kerby-2.1.2.yml @@ -1,4 +1,4 @@ -title: Update org.apache.kerby:* to v2.1.2 (branch_9x) +title: Update org.apache.kerby:* to v2.1.2 type: dependency_update authors: - name: solrbot diff --git a/changelog/unreleased/update-logchange-plugin-1.19.15.yml b/changelog/unreleased/update-logchange-plugin-1.19.15.yml index b358a5255728..1d5afc57c1fb 100644 --- a/changelog/unreleased/update-logchange-plugin-1.19.15.yml +++ b/changelog/unreleased/update-logchange-plugin-1.19.15.yml @@ -1,4 +1,4 @@ -title: Update plugin dev.logchange to v1.19.15 (branch_9x) +title: Update plugin dev.logchange to v1.19.15 type: dependency_update authors: - name: solrbot diff --git a/changelog/unreleased/update-netty-4.2.15.yml b/changelog/unreleased/update-netty-4.2.15.yml index c423a1c42408..4b797bdd4eac 100644 --- a/changelog/unreleased/update-netty-4.2.15.yml +++ b/changelog/unreleased/update-netty-4.2.15.yml @@ -1,4 +1,4 @@ -title: Update io.netty:netty* to v4.2.15.Final (branch_9x) +title: Update io.netty:netty* to v4.2.15.Final type: dependency_update authors: - name: solrbot diff --git a/changelog/unreleased/update-opentelemetry-bom-1.63.0.yml b/changelog/unreleased/update-opentelemetry-bom-1.63.0.yml index a28d3b5a0e89..0207b2bc3a70 100644 --- a/changelog/unreleased/update-opentelemetry-bom-1.63.0.yml +++ b/changelog/unreleased/update-opentelemetry-bom-1.63.0.yml @@ -1,4 +1,4 @@ -title: Update io.opentelemetry:opentelemetry-bom to v1.63.0 (and okhttp to v5.4.0) (branch_9x) +title: Update io.opentelemetry:opentelemetry-bom to v1.63.0 (and okhttp to v5.4.0) type: dependency_update authors: - name: solrbot diff --git a/changelog/unreleased/update-prometheus-1.8.0.yml b/changelog/unreleased/update-prometheus-1.8.0.yml index e5afaa17fe44..dff7572af757 100644 --- a/changelog/unreleased/update-prometheus-1.8.0.yml +++ b/changelog/unreleased/update-prometheus-1.8.0.yml @@ -1,4 +1,4 @@ -title: Update io.prometheus:prometheus* to v1.8.0 (branch_9x) +title: Update io.prometheus:prometheus* to v1.8.0 type: dependency_update authors: - name: solrbot diff --git a/changelog/unreleased/update-protobuf-4.35.1.yml b/changelog/unreleased/update-protobuf-4.35.1.yml index f8e9026e4611..238b739e367b 100644 --- a/changelog/unreleased/update-protobuf-4.35.1.yml +++ b/changelog/unreleased/update-protobuf-4.35.1.yml @@ -1,4 +1,4 @@ -title: Update com.google.protobuf:* to v4.35.1 (branch_9x) +title: Update com.google.protobuf:* to v4.35.1 type: dependency_update authors: - name: solrbot diff --git a/changelog/unreleased/update-testcontainers-2.0.5.yml b/changelog/unreleased/update-testcontainers-2.0.5.yml index ac48394f0356..bb581b4c499c 100644 --- a/changelog/unreleased/update-testcontainers-2.0.5.yml +++ b/changelog/unreleased/update-testcontainers-2.0.5.yml @@ -1,4 +1,4 @@ -title: Update org.testcontainers:testcontainers* to v2.0.5 (branch_9x) +title: Update org.testcontainers:testcontainers* to v2.0.5 type: dependency_update authors: - name: solrbot From a3194b9c4c8eec9f5c8e994b8b3444e636cca36f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Tue, 30 Jun 2026 14:23:27 +0200 Subject: [PATCH 41/45] SOLR test-framework: strip randomizedtesting 2.9 seed suffix from getSaferTestName() randomizedtesting 2.9 appends the seed to test names as 'name[seed=[...]]' (no leading space), which leaked into test-derived collection/alias names and produced 'Invalid collection' errors (TestTlogReplica, TestPullReplica, etc.). Harden getSaferTestName() to also cut at the first '[', and switch the two direct getTestName() name builders (ZkStateReaderTest, CreateRoutedAliasTest) to getSaferTestName(). --- .../solr/cloud/CreateRoutedAliasTest.java | 2 +- .../solr/cloud/overseer/ZkStateReaderTest.java | 4 ++-- .../java/org/apache/solr/SolrTestCaseJ4.java | 18 ++++++++++++------ 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/solr/core/src/test/org/apache/solr/cloud/CreateRoutedAliasTest.java b/solr/core/src/test/org/apache/solr/cloud/CreateRoutedAliasTest.java index 69f8f1adc1e6..0680d78612ae 100644 --- a/solr/core/src/test/org/apache/solr/cloud/CreateRoutedAliasTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/CreateRoutedAliasTest.java @@ -352,7 +352,7 @@ public void testCollectionNamesMustBeAbsent() throws Exception { + "/admin/collections?action=CREATEALIAS" + "&wt=json" + "&name=" - + getTestName() + + getSaferTestName() + "&collections=collection1meta,collection2meta" + "&router.field=evt_dt" + "&router.name=time" diff --git a/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java b/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java index cb07e84f5b58..0b87822e2d52 100644 --- a/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java @@ -111,7 +111,7 @@ public void close() throws IOException { @Before public void setUp() throws Exception { super.setUp(); - fixture = setupTestFixture(getTestName(), -1); + fixture = setupTestFixture(getSaferTestName(), -1); } @Override @@ -482,7 +482,7 @@ public void testForciblyRefreshAllClusterState() throws Exception { public void testForciblyRefreshAllClusterStateCompressed() throws Exception { fixture.close(); - fixture = setupTestFixture(getTestName(), 0); + fixture = setupTestFixture(getSaferTestName(), 0); ZkStateWriter writer = fixture.writer; ZkStateReader reader = fixture.reader; diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java index 9841ca270775..76a11aabccb6 100644 --- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java +++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java @@ -2778,14 +2778,20 @@ protected void waitForWarming() throws InterruptedException { } protected String getSaferTestName() { - // test names can hold additional info, like the test seed - // only take to first space + // test names can hold additional info, like the test seed: + // "testFoo {seed=[...]}" (older runners) or "testFoo[seed=[...]]" (randomizedtesting 2.9+) + // keep only the method name, up to the first space or '[' String testName = getTestName(); - int index = testName.indexOf(' '); - if (index > 0) { - testName = testName.substring(0, index); + int index = testName.length(); + int space = testName.indexOf(' '); + if (space > 0) { + index = space; } - return testName; + int bracket = testName.indexOf('['); + if (bracket > 0 && bracket < index) { + index = bracket; + } + return testName.substring(0, index); } @BeforeClass From e6ab9748f90e7d828c52a5259d44af3ef5b678cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Tue, 30 Jun 2026 14:23:27 +0200 Subject: [PATCH 42/45] Add changelog entry for randomizedtesting 2.9.1 --- changelog/unreleased/update-randomizedtesting-2.9.1.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changelog/unreleased/update-randomizedtesting-2.9.1.yml diff --git a/changelog/unreleased/update-randomizedtesting-2.9.1.yml b/changelog/unreleased/update-randomizedtesting-2.9.1.yml new file mode 100644 index 000000000000..a00481c4348e --- /dev/null +++ b/changelog/unreleased/update-randomizedtesting-2.9.1.yml @@ -0,0 +1,7 @@ +title: Update com.carrotsearch.randomizedtesting:* to v2.9.1 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4494 + url: https://github.com/apache/solr/pull/4494 From c89abafe76645208b3561c389a915fdbf347a954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Tue, 30 Jun 2026 14:32:38 +0200 Subject: [PATCH 43/45] Update CBOR size assertions for jackson-dataformat-cbor 2.22 (PR #4016) jackson 2.22's CBOR encoder (STRINGREF) is one byte/document more compact: TestRawResponseWriter (26->25) and TestCborDataFormat (210439->209339). Both tests still verify the encoded bytes round-trip via CborLoader, so the size reduction is benign. Deterministic and locale-independent. --- changelog/unreleased/update-jackson-bom-2.22.0.yml | 7 +++++++ .../org/apache/solr/response/TestRawResponseWriter.java | 2 +- .../src/test/org/apache/solr/util/TestCborDataFormat.java | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 changelog/unreleased/update-jackson-bom-2.22.0.yml diff --git a/changelog/unreleased/update-jackson-bom-2.22.0.yml b/changelog/unreleased/update-jackson-bom-2.22.0.yml new file mode 100644 index 000000000000..0c544b3c439d --- /dev/null +++ b/changelog/unreleased/update-jackson-bom-2.22.0.yml @@ -0,0 +1,7 @@ +title: Update com.fasterxml.jackson:jackson-bom to v2.22.0 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4016 + url: https://github.com/apache/solr/pull/4016 diff --git a/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java b/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java index b6c70509b122..b89ae5d4b53a 100644 --- a/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java +++ b/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java @@ -186,7 +186,7 @@ public void testStructuredDataViaBaseWriters() throws IOException { // cbor byte[] cborBytes = convertJsonToCborFormat(json.getBytes(StandardCharsets.UTF_8)); - assertEquals(26, cborBytes.length); + assertEquals(25, cborBytes.length); LongAdder numberOfObjectsInResponse = new LongAdder(); new CborLoader(null, (document) -> numberOfObjectsInResponse.increment()) .stream(new ByteArrayInputStream(cborBytes)); diff --git a/solr/core/src/test/org/apache/solr/util/TestCborDataFormat.java b/solr/core/src/test/org/apache/solr/util/TestCborDataFormat.java index be423b1a21e0..70fc943c4247 100644 --- a/solr/core/src/test/org/apache/solr/util/TestCborDataFormat.java +++ b/solr/core/src/test/org/apache/solr/util/TestCborDataFormat.java @@ -219,7 +219,7 @@ public void test() throws Exception { byte[] b = Files.readAllBytes(filmsJson); byte[] bytes = serializeToCbor(b); - assertEquals(210439, bytes.length); + assertEquals(209339, bytes.length); LongAdder docsSz = new LongAdder(); new CborLoader(null, (document) -> docsSz.increment()).stream(new ByteArrayInputStream(bytes)); assertEquals(films.size(), docsSz.intValue()); From 1be80e0f569f58fa818a8d531cc650ee2ec491e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Tue, 30 Jun 2026 14:34:49 +0200 Subject: [PATCH 44/45] Merge PR #3589: regen lock+licenses --- solr/licenses/grpc-alts-1.81.0.jar.sha1 | 1 - solr/licenses/grpc-api-1.81.0.jar.sha1 | 1 - solr/licenses/grpc-auth-1.81.0.jar.sha1 | 1 - solr/licenses/grpc-context-1.81.0.jar.sha1 | 1 - solr/licenses/grpc-core-1.81.0.jar.sha1 | 1 - solr/licenses/grpc-googleapis-1.81.0.jar.sha1 | 1 - solr/licenses/grpc-grpclb-1.81.0.jar.sha1 | 1 - solr/licenses/grpc-inprocess-1.81.0.jar.sha1 | 1 - solr/licenses/grpc-netty-1.81.0.jar.sha1 | 1 - .../grpc-netty-shaded-1.81.0.jar.sha1 | 1 - .../grpc-opentelemetry-1.81.0.jar.sha1 | 1 - .../grpc-opentelemetry-1.82.1.jar.sha1 | 1 + solr/licenses/grpc-protobuf-1.81.0.jar.sha1 | 1 - .../grpc-protobuf-lite-1.81.0.jar.sha1 | 1 - solr/licenses/grpc-rls-1.81.0.jar.sha1 | 1 - solr/licenses/grpc-services-1.81.0.jar.sha1 | 1 - solr/licenses/grpc-stub-1.81.0.jar.sha1 | 1 - solr/licenses/grpc-util-1.81.0.jar.sha1 | 1 - solr/licenses/grpc-xds-1.81.0.jar.sha1 | 1 - .../jackson-annotations-2.18.3.jar.sha1 | 1 - solr/licenses/jackson-core-2.18.3.jar.sha1 | 1 - .../licenses/jackson-databind-2.18.3.jar.sha1 | 1 - .../jackson-dataformat-cbor-2.18.3.jar.sha1 | 1 - .../jackson-dataformat-csv-2.18.3.jar.sha1 | 1 - .../jackson-dataformat-smile-2.18.3.jar.sha1 | 1 - .../jackson-dataformat-xml-2.18.3.jar.sha1 | 1 - .../jackson-datatype-jdk8-2.18.3.jar.sha1 | 1 - .../jackson-datatype-jsr310-2.18.3.jar.sha1 | 1 - ...akarta-xmlbind-annotations-2.18.3.jar.sha1 | 1 - .../jackson-module-kotlin-2.18.3.jar.sha1 | 1 - ...son-module-parameter-names-2.18.3.jar.sha1 | 1 - .../jackson-module-scala_2.13-2.18.3.jar.sha1 | 1 - .../opentelemetry-api-1.62.0.jar.sha1 | 1 - .../opentelemetry-common-1.62.0.jar.sha1 | 1 - .../opentelemetry-context-1.62.0.jar.sha1 | 1 - .../opentelemetry-sdk-1.62.0.jar.sha1 | 1 - .../opentelemetry-sdk-common-1.62.0.jar.sha1 | 1 - ...xtension-autoconfigure-spi-1.62.0.jar.sha1 | 1 - .../opentelemetry-sdk-logs-1.62.0.jar.sha1 | 1 - .../opentelemetry-sdk-metrics-1.62.0.jar.sha1 | 1 - .../opentelemetry-sdk-trace-1.62.0.jar.sha1 | 1 - ...proto-google-common-protos-2.64.1.jar.sha1 | 1 - versions.lock | 161 +++++++++--------- 43 files changed, 82 insertions(+), 121 deletions(-) delete mode 100644 solr/licenses/grpc-alts-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-api-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-auth-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-context-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-core-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-googleapis-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-grpclb-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-inprocess-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-netty-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-netty-shaded-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-opentelemetry-1.81.0.jar.sha1 create mode 100644 solr/licenses/grpc-opentelemetry-1.82.1.jar.sha1 delete mode 100644 solr/licenses/grpc-protobuf-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-protobuf-lite-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-rls-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-services-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-stub-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-util-1.81.0.jar.sha1 delete mode 100644 solr/licenses/grpc-xds-1.81.0.jar.sha1 delete mode 100644 solr/licenses/jackson-annotations-2.18.3.jar.sha1 delete mode 100644 solr/licenses/jackson-core-2.18.3.jar.sha1 delete mode 100644 solr/licenses/jackson-databind-2.18.3.jar.sha1 delete mode 100644 solr/licenses/jackson-dataformat-cbor-2.18.3.jar.sha1 delete mode 100644 solr/licenses/jackson-dataformat-csv-2.18.3.jar.sha1 delete mode 100644 solr/licenses/jackson-dataformat-smile-2.18.3.jar.sha1 delete mode 100644 solr/licenses/jackson-dataformat-xml-2.18.3.jar.sha1 delete mode 100644 solr/licenses/jackson-datatype-jdk8-2.18.3.jar.sha1 delete mode 100644 solr/licenses/jackson-datatype-jsr310-2.18.3.jar.sha1 delete mode 100644 solr/licenses/jackson-module-jakarta-xmlbind-annotations-2.18.3.jar.sha1 delete mode 100644 solr/licenses/jackson-module-kotlin-2.18.3.jar.sha1 delete mode 100644 solr/licenses/jackson-module-parameter-names-2.18.3.jar.sha1 delete mode 100644 solr/licenses/jackson-module-scala_2.13-2.18.3.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-api-1.62.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-common-1.62.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-context-1.62.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-sdk-1.62.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-sdk-common-1.62.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.62.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-sdk-logs-1.62.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-sdk-metrics-1.62.0.jar.sha1 delete mode 100644 solr/licenses/opentelemetry-sdk-trace-1.62.0.jar.sha1 delete mode 100644 solr/licenses/proto-google-common-protos-2.64.1.jar.sha1 diff --git a/solr/licenses/grpc-alts-1.81.0.jar.sha1 b/solr/licenses/grpc-alts-1.81.0.jar.sha1 deleted file mode 100644 index 0ded51c551c3..000000000000 --- a/solr/licenses/grpc-alts-1.81.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -def9f992e861fe4b7d913500a4d8b7505637b36c diff --git a/solr/licenses/grpc-api-1.81.0.jar.sha1 b/solr/licenses/grpc-api-1.81.0.jar.sha1 deleted file mode 100644 index e8d3667c491b..000000000000 --- a/solr/licenses/grpc-api-1.81.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7a5827c8180858b12ba3d308c7ce31e95002b6ed diff --git a/solr/licenses/grpc-auth-1.81.0.jar.sha1 b/solr/licenses/grpc-auth-1.81.0.jar.sha1 deleted file mode 100644 index ff1dcfba1234..000000000000 --- a/solr/licenses/grpc-auth-1.81.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1cb1c669861caa4929ee1a9fb78c0d74672702f4 diff --git a/solr/licenses/grpc-context-1.81.0.jar.sha1 b/solr/licenses/grpc-context-1.81.0.jar.sha1 deleted file mode 100644 index 043d3fcbe29e..000000000000 --- a/solr/licenses/grpc-context-1.81.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -132e07350016d36a5c3d94afd89fe699f5eecec6 diff --git a/solr/licenses/grpc-core-1.81.0.jar.sha1 b/solr/licenses/grpc-core-1.81.0.jar.sha1 deleted file mode 100644 index c9a2d10978a3..000000000000 --- a/solr/licenses/grpc-core-1.81.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -095e55b49d51ded7cee191f1db6f32d2c2e934e3 diff --git a/solr/licenses/grpc-googleapis-1.81.0.jar.sha1 b/solr/licenses/grpc-googleapis-1.81.0.jar.sha1 deleted file mode 100644 index 14e33898a475..000000000000 --- a/solr/licenses/grpc-googleapis-1.81.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -83e0e656298700f843883022c7a06c58af4eaee9 diff --git a/solr/licenses/grpc-grpclb-1.81.0.jar.sha1 b/solr/licenses/grpc-grpclb-1.81.0.jar.sha1 deleted file mode 100644 index 4682090f6b10..000000000000 --- a/solr/licenses/grpc-grpclb-1.81.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -065f8ba3ff4a65e4f865073851f913122b858536 diff --git a/solr/licenses/grpc-inprocess-1.81.0.jar.sha1 b/solr/licenses/grpc-inprocess-1.81.0.jar.sha1 deleted file mode 100644 index 163d6ba2050d..000000000000 --- a/solr/licenses/grpc-inprocess-1.81.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -14dbd91b6ffbceb932f3c3f46d236ffb31d66bad diff --git a/solr/licenses/grpc-netty-1.81.0.jar.sha1 b/solr/licenses/grpc-netty-1.81.0.jar.sha1 deleted file mode 100644 index 9e6ef63bed1d..000000000000 --- a/solr/licenses/grpc-netty-1.81.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bca99ad5b88c0ea0752b7d1d548a536dc7c67dcb diff --git a/solr/licenses/grpc-netty-shaded-1.81.0.jar.sha1 b/solr/licenses/grpc-netty-shaded-1.81.0.jar.sha1 deleted file mode 100644 index 2f0559d4c300..000000000000 --- a/solr/licenses/grpc-netty-shaded-1.81.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -134b4014a4140c3ca54fe9d758b160a76210bfb0 diff --git a/solr/licenses/grpc-opentelemetry-1.81.0.jar.sha1 b/solr/licenses/grpc-opentelemetry-1.81.0.jar.sha1 deleted file mode 100644 index 49a68e4b15f7..000000000000 --- a/solr/licenses/grpc-opentelemetry-1.81.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6c6725f2e0c674a1502432204bb9a572e23db3b3 diff --git a/solr/licenses/grpc-opentelemetry-1.82.1.jar.sha1 b/solr/licenses/grpc-opentelemetry-1.82.1.jar.sha1 new file mode 100644 index 000000000000..a6c7cc2665af --- /dev/null +++ b/solr/licenses/grpc-opentelemetry-1.82.1.jar.sha1 @@ -0,0 +1 @@ +336bf1535a3197a895252bc7cf5f8d504f78af5e diff --git a/solr/licenses/grpc-protobuf-1.81.0.jar.sha1 b/solr/licenses/grpc-protobuf-1.81.0.jar.sha1 deleted file mode 100644 index 0e3f029f9f0c..000000000000 --- a/solr/licenses/grpc-protobuf-1.81.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1d51b99a7b9e3f6d52ee4ffb7a689dcb299b0d26 diff --git a/solr/licenses/grpc-protobuf-lite-1.81.0.jar.sha1 b/solr/licenses/grpc-protobuf-lite-1.81.0.jar.sha1 deleted file mode 100644 index 35158336fd65..000000000000 --- a/solr/licenses/grpc-protobuf-lite-1.81.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -525ab86456ede321770d3e799665517ee01645b6 diff --git a/solr/licenses/grpc-rls-1.81.0.jar.sha1 b/solr/licenses/grpc-rls-1.81.0.jar.sha1 deleted file mode 100644 index dce5b68bbae4..000000000000 --- a/solr/licenses/grpc-rls-1.81.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d76dd4ed4cedf057582072f85c130f24048b01c0 diff --git a/solr/licenses/grpc-services-1.81.0.jar.sha1 b/solr/licenses/grpc-services-1.81.0.jar.sha1 deleted file mode 100644 index 621144be697b..000000000000 --- a/solr/licenses/grpc-services-1.81.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -106706f0e1ffa0ccde965e86f6ae588898bdde38 diff --git a/solr/licenses/grpc-stub-1.81.0.jar.sha1 b/solr/licenses/grpc-stub-1.81.0.jar.sha1 deleted file mode 100644 index 2f16d93d86c3..000000000000 --- a/solr/licenses/grpc-stub-1.81.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3d5eac7173895a2fa774ac55f1d654ee91ade2b8 diff --git a/solr/licenses/grpc-util-1.81.0.jar.sha1 b/solr/licenses/grpc-util-1.81.0.jar.sha1 deleted file mode 100644 index 639ea8cce5cb..000000000000 --- a/solr/licenses/grpc-util-1.81.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0c0fff52d9691cc4a9b500509b078a25cf026a29 diff --git a/solr/licenses/grpc-xds-1.81.0.jar.sha1 b/solr/licenses/grpc-xds-1.81.0.jar.sha1 deleted file mode 100644 index 6206099b5e6a..000000000000 --- a/solr/licenses/grpc-xds-1.81.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2253157ac1c6ba69a3aa47388bdaabdda1973b4a diff --git a/solr/licenses/jackson-annotations-2.18.3.jar.sha1 b/solr/licenses/jackson-annotations-2.18.3.jar.sha1 deleted file mode 100644 index aeb54ab81576..000000000000 --- a/solr/licenses/jackson-annotations-2.18.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7fa21cf7da4598f8240e4ebd9779249622af1acd diff --git a/solr/licenses/jackson-core-2.18.3.jar.sha1 b/solr/licenses/jackson-core-2.18.3.jar.sha1 deleted file mode 100644 index 2e73faa33c05..000000000000 --- a/solr/licenses/jackson-core-2.18.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -78f80c259268200e588aa204dd97ecf09b76916e diff --git a/solr/licenses/jackson-databind-2.18.3.jar.sha1 b/solr/licenses/jackson-databind-2.18.3.jar.sha1 deleted file mode 100644 index baff91e6caa9..000000000000 --- a/solr/licenses/jackson-databind-2.18.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -537e3886263e3b3464385040453e92567fd509e2 diff --git a/solr/licenses/jackson-dataformat-cbor-2.18.3.jar.sha1 b/solr/licenses/jackson-dataformat-cbor-2.18.3.jar.sha1 deleted file mode 100644 index e08a01c43e58..000000000000 --- a/solr/licenses/jackson-dataformat-cbor-2.18.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -af8064ba5b2afaf0920943fbfeb6b57f56aad6d8 diff --git a/solr/licenses/jackson-dataformat-csv-2.18.3.jar.sha1 b/solr/licenses/jackson-dataformat-csv-2.18.3.jar.sha1 deleted file mode 100644 index 3d68dca4b0a2..000000000000 --- a/solr/licenses/jackson-dataformat-csv-2.18.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f560c1fca2340a9bdb0d6d5ebd903f9932962613 diff --git a/solr/licenses/jackson-dataformat-smile-2.18.3.jar.sha1 b/solr/licenses/jackson-dataformat-smile-2.18.3.jar.sha1 deleted file mode 100644 index da05ca5563e3..000000000000 --- a/solr/licenses/jackson-dataformat-smile-2.18.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -082239b024b0f030babd2164ea5f830430d09058 diff --git a/solr/licenses/jackson-dataformat-xml-2.18.3.jar.sha1 b/solr/licenses/jackson-dataformat-xml-2.18.3.jar.sha1 deleted file mode 100644 index 546e55c9e415..000000000000 --- a/solr/licenses/jackson-dataformat-xml-2.18.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -665a683773f8a92ea270d87127e198531e39cafa diff --git a/solr/licenses/jackson-datatype-jdk8-2.18.3.jar.sha1 b/solr/licenses/jackson-datatype-jdk8-2.18.3.jar.sha1 deleted file mode 100644 index d95cc2fc5874..000000000000 --- a/solr/licenses/jackson-datatype-jdk8-2.18.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -621558295660935134b171ce2b0d9ad6842ec2ff diff --git a/solr/licenses/jackson-datatype-jsr310-2.18.3.jar.sha1 b/solr/licenses/jackson-datatype-jsr310-2.18.3.jar.sha1 deleted file mode 100644 index 15cc13b8f766..000000000000 --- a/solr/licenses/jackson-datatype-jsr310-2.18.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -cc57924cccf42fc852081c36215272f84ffcd991 diff --git a/solr/licenses/jackson-module-jakarta-xmlbind-annotations-2.18.3.jar.sha1 b/solr/licenses/jackson-module-jakarta-xmlbind-annotations-2.18.3.jar.sha1 deleted file mode 100644 index 5ea974805c0f..000000000000 --- a/solr/licenses/jackson-module-jakarta-xmlbind-annotations-2.18.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -aa8ebfd31dcfa3c5be0ee55962effe2eabb63ead diff --git a/solr/licenses/jackson-module-kotlin-2.18.3.jar.sha1 b/solr/licenses/jackson-module-kotlin-2.18.3.jar.sha1 deleted file mode 100644 index f2438dd58f76..000000000000 --- a/solr/licenses/jackson-module-kotlin-2.18.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d79c117605fc157ec32ec9774690bb3e493938ce diff --git a/solr/licenses/jackson-module-parameter-names-2.18.3.jar.sha1 b/solr/licenses/jackson-module-parameter-names-2.18.3.jar.sha1 deleted file mode 100644 index 70cc1819e161..000000000000 --- a/solr/licenses/jackson-module-parameter-names-2.18.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fa63ae5eb3956b1a6d7a7ead2b513af89dea22e7 diff --git a/solr/licenses/jackson-module-scala_2.13-2.18.3.jar.sha1 b/solr/licenses/jackson-module-scala_2.13-2.18.3.jar.sha1 deleted file mode 100644 index d30f5b37b0f8..000000000000 --- a/solr/licenses/jackson-module-scala_2.13-2.18.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -654e30ed3c2774c41fb285ded3076b9ff139e6fa diff --git a/solr/licenses/opentelemetry-api-1.62.0.jar.sha1 b/solr/licenses/opentelemetry-api-1.62.0.jar.sha1 deleted file mode 100644 index 8afee6408e60..000000000000 --- a/solr/licenses/opentelemetry-api-1.62.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c4ee83d77005567852a72e08b945ebb023be1daa diff --git a/solr/licenses/opentelemetry-common-1.62.0.jar.sha1 b/solr/licenses/opentelemetry-common-1.62.0.jar.sha1 deleted file mode 100644 index a0fd2170a43a..000000000000 --- a/solr/licenses/opentelemetry-common-1.62.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e6468bd64a94429b68761f7c13e143c3fdfaafc7 diff --git a/solr/licenses/opentelemetry-context-1.62.0.jar.sha1 b/solr/licenses/opentelemetry-context-1.62.0.jar.sha1 deleted file mode 100644 index 1672a417585c..000000000000 --- a/solr/licenses/opentelemetry-context-1.62.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -365cee4d1f365e4d4a05654742b50aa436c2dd8e diff --git a/solr/licenses/opentelemetry-sdk-1.62.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-1.62.0.jar.sha1 deleted file mode 100644 index 80ceb4bed094..000000000000 --- a/solr/licenses/opentelemetry-sdk-1.62.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -06fa52c4641322b14b8bd515eb048bb9b1365d0c diff --git a/solr/licenses/opentelemetry-sdk-common-1.62.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-common-1.62.0.jar.sha1 deleted file mode 100644 index d41eff52c06f..000000000000 --- a/solr/licenses/opentelemetry-sdk-common-1.62.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b6742282daab8e13598b78a83ddfa54f10b5752b diff --git a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.62.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.62.0.jar.sha1 deleted file mode 100644 index 459a26137935..000000000000 --- a/solr/licenses/opentelemetry-sdk-extension-autoconfigure-spi-1.62.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -99bbc1bf4cae62c793e6eaa3f41436e29710b876 diff --git a/solr/licenses/opentelemetry-sdk-logs-1.62.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-logs-1.62.0.jar.sha1 deleted file mode 100644 index a4ca902edc18..000000000000 --- a/solr/licenses/opentelemetry-sdk-logs-1.62.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f242422084100da0bd3a5f6f2bcf364aaf4d2c53 diff --git a/solr/licenses/opentelemetry-sdk-metrics-1.62.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-metrics-1.62.0.jar.sha1 deleted file mode 100644 index 28b973b5497a..000000000000 --- a/solr/licenses/opentelemetry-sdk-metrics-1.62.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5838371075930a4a15f7f61240b4b64cb3e924d8 diff --git a/solr/licenses/opentelemetry-sdk-trace-1.62.0.jar.sha1 b/solr/licenses/opentelemetry-sdk-trace-1.62.0.jar.sha1 deleted file mode 100644 index df78423607fc..000000000000 --- a/solr/licenses/opentelemetry-sdk-trace-1.62.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7a337d2f887b151d27e734d1c221eb51b1c5b734 diff --git a/solr/licenses/proto-google-common-protos-2.64.1.jar.sha1 b/solr/licenses/proto-google-common-protos-2.64.1.jar.sha1 deleted file mode 100644 index 371f2bdcaaa5..000000000000 --- a/solr/licenses/proto-google-common-protos-2.64.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a71d9a9867ed792e54e893b8c7864a0ba1b022cf diff --git a/versions.lock b/versions.lock index 8e17c247fb17..6bd23fd13b14 100644 --- a/versions.lock +++ b/versions.lock @@ -5,56 +5,58 @@ com.carrotsearch:hppc:0.10.0 (2 constraints: d40fecb0) com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.9.1 (2 constraints: d01534e2) com.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e) com.fasterxml.jackson:jackson-bom:2.22.0 (12 constraints: daffec4a) -com.fasterxml.jackson.core:jackson-annotations:2.22 (13 constraints: bcfd5b16) -com.fasterxml.jackson.core:jackson-core:2.22.0 (15 constraints: ad362d2d) -com.fasterxml.jackson.core:jackson-databind:2.22.0 (34 constraints: b5645c5c) +com.fasterxml.jackson.core:jackson-annotations:2.22 (15 constraints: 5e1c64f0) +com.fasterxml.jackson.core:jackson-core:2.22.0 (16 constraints: 2245fb97) +com.fasterxml.jackson.core:jackson-databind:2.22.0 (36 constraints: 4883893c) com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.22.0 (2 constraints: 5f1c93f1) com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.22.0 (2 constraints: e719387a) com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.22.0 (1 constraints: b60ea466) +com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.22.0 (4 constraints: 393840c3) com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.22.0 (6 constraints: de587165) +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.22.0 (6 constraints: fc66b22d) com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.22.0 (2 constraints: a624d6df) com.fasterxml.jackson.module:jackson-module-scala_2.13:2.22.0 (2 constraints: e719387a) -com.fasterxml.woodstox:woodstox-core:7.2.0 (1 constraints: 3d174b26) +com.fasterxml.woodstox:woodstox-core:7.2.0 (3 constraints: 6235ec97) com.github.ben-manes.caffeine:caffeine:3.2.4 (2 constraints: 0e123b17) com.github.luben:zstd-jni:1.5.6-4 (1 constraints: 600d6236) com.github.spotbugs:spotbugs-annotations:4.8.6 (1 constraints: 14051d36) com.github.stephenc.jcip:jcip-annotations:1.0-1 (3 constraints: c71d2c87) com.github.virtuald:curvesapi:1.08 (1 constraints: 9f0ac8c0) -com.google.android:annotations:4.1.1.4 (2 constraints: b918820a) -com.google.api:api-common:2.33.0 (5 constraints: 8444f8b5) -com.google.api:gax:2.50.0 (5 constraints: 504a5892) -com.google.api:gax-grpc:2.50.0 (1 constraints: 1b1005a6) -com.google.api:gax-httpjson:2.50.0 (2 constraints: d6201381) -com.google.api-client:google-api-client:2.6.0 (3 constraints: ad32fffc) -com.google.api.grpc:gapic-google-cloud-storage-v2:2.40.1-alpha (2 constraints: e4226438) -com.google.api.grpc:grpc-google-cloud-storage-v2:2.40.1-alpha (2 constraints: e4226438) -com.google.api.grpc:proto-google-cloud-storage-v2:2.40.1-alpha (2 constraints: e4226438) -com.google.api.grpc:proto-google-common-protos:2.64.1 (6 constraints: 184ead81) -com.google.api.grpc:proto-google-iam-v1:1.36.0 (2 constraints: ef1e9acd) -com.google.apis:google-api-services-storage:v1-rev20240621-2.0.0 (2 constraints: da256149) -com.google.auth:google-auth-library-credentials:1.23.0 (7 constraints: cb686112) -com.google.auth:google-auth-library-oauth2-http:1.23.0 (6 constraints: 0f558a85) -com.google.auto.value:auto-value-annotations:1.10.4 (6 constraints: b85aa377) -com.google.cloud:google-cloud-bom:0.224.0 (1 constraints: 6a05a140) -com.google.cloud:google-cloud-core:2.40.0 (3 constraints: 3e2f1a54) -com.google.cloud:google-cloud-core-grpc:2.40.0 (1 constraints: 1a1001a6) -com.google.cloud:google-cloud-core-http:2.40.0 (1 constraints: 1a1001a6) -com.google.cloud:google-cloud-storage:2.40.1 (2 constraints: cf1cc626) -com.google.code.gson:gson:2.13.2 (7 constraints: f8627315) -com.google.errorprone:error_prone_annotations:2.31.0 (16 constraints: 95cfbcda) -com.google.guava:failureaccess:1.0.3 (2 constraints: fc19c037) -com.google.guava:guava:33.6.0-jre (24 constraints: 4d653d82) -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 4b35b0a0) -com.google.http-client:google-http-client:1.44.2 (11 constraints: 45bf29b8) -com.google.http-client:google-http-client-apache-v2:1.44.2 (2 constraints: b9201d76) -com.google.http-client:google-http-client-appengine:1.44.2 (2 constraints: de20d781) -com.google.http-client:google-http-client-gson:1.44.2 (7 constraints: 68702d4e) -com.google.http-client:google-http-client-jackson2:1.44.2 (1 constraints: 1f1009a6) -com.google.j2objc:j2objc-annotations:3.1 (4 constraints: cb35bfba) -com.google.oauth-client:google-oauth-client:1.36.0 (2 constraints: b720ee75) -com.google.protobuf:protobuf-java:4.35.1 (9 constraints: 45834e94) -com.google.protobuf:protobuf-java-util:4.35.1 (4 constraints: 7a30a307) -com.google.re2j:re2j:1.8 (2 constraints: 3a140270) +com.google.android:annotations:4.1.1.4 (4 constraints: a33b86f4) +com.google.api:api-common:2.64.0 (8 constraints: 947a6b89) +com.google.api:gax:2.81.0 (5 constraints: 644acf99) +com.google.api:gax-grpc:2.81.0 (2 constraints: 8e1ee5aa) +com.google.api:gax-httpjson:2.81.0 (3 constraints: 4d2f0057) +com.google.api-client:google-api-client:2.7.2 (3 constraints: bd2e86de) +com.google.api.grpc:gapic-google-cloud-storage-v2:2.69.0 (3 constraints: 072db41c) +com.google.api.grpc:grpc-google-cloud-storage-v2:2.69.0 (3 constraints: 072db41c) +com.google.api.grpc:proto-google-cloud-storage-v2:2.69.0 (3 constraints: 072db41c) +com.google.api.grpc:proto-google-common-protos:2.72.0 (8 constraints: 6470f4cb) +com.google.api.grpc:proto-google-iam-v1:1.67.0 (3 constraints: 692dca51) +com.google.apis:google-api-services-storage:v1-rev20260204-2.0.0 (2 constraints: d8251249) +com.google.auth:google-auth-library-credentials:1.48.0 (9 constraints: 878bc32b) +com.google.auth:google-auth-library-oauth2-http:1.48.0 (8 constraints: c47751ca) +com.google.auto.value:auto-value-annotations:1.11.0 (10 constraints: 5f9fd30d) +com.google.cloud:google-cloud-bom:0.265.0 (1 constraints: 6f05b440) +com.google.cloud:google-cloud-core:2.71.0 (3 constraints: 4a2f6b56) +com.google.cloud:google-cloud-core-grpc:2.71.0 (2 constraints: 8c1eaeaa) +com.google.cloud:google-cloud-core-http:2.71.0 (2 constraints: 8c1eaeaa) +com.google.cloud:google-cloud-storage:2.69.0 (2 constraints: e31cb828) +com.google.code.gson:gson:2.13.2 (11 constraints: e3a1774a) +com.google.errorprone:error_prone_annotations:2.31.0 (22 constraints: 522f405d) +com.google.guava:failureaccess:1.0.3 (6 constraints: cb636b42) +com.google.guava:guava:33.6.0-jre (23 constraints: e85806a5) +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (6 constraints: b5b5e9b2) +com.google.http-client:google-http-client:2.1.0 (13 constraints: 9dd91ca6) +com.google.http-client:google-http-client-apache-v2:2.1.0 (3 constraints: b92edcec) +com.google.http-client:google-http-client-appengine:2.1.0 (3 constraints: a52e1ada) +com.google.http-client:google-http-client-gson:2.1.0 (9 constraints: a08b1639) +com.google.http-client:google-http-client-jackson2:2.1.0 (2 constraints: 1e1ea573) +com.google.j2objc:j2objc-annotations:3.1 (7 constraints: 05738e58) +com.google.oauth-client:google-oauth-client:1.39.0 (3 constraints: 2b2f0445) +com.google.protobuf:protobuf-java:4.35.1 (10 constraints: aa91b1d0) +com.google.protobuf:protobuf-java-util:4.35.1 (7 constraints: a85b007d) +com.google.re2j:re2j:1.8 (4 constraints: ab350084) com.googlecode.json-simple:json-simple:1.1.1 (1 constraints: d90f7798) com.helger:profiler:1.1.1 (1 constraints: e21053b8) com.ibm.icu:icu4j:74.2 (1 constraints: ae0f2484) @@ -76,7 +78,7 @@ com.yammer.metrics:metrics-core:2.2.0 (7 constraints: 8760e867) com.zaxxer:SparseBitSet:1.3 (1 constraints: 0e081f75) commons-beanutils:commons-beanutils:1.11.0 (1 constraints: e30fce93) commons-cli:commons-cli:1.11.0 (2 constraints: d20f5dbe) -commons-codec:commons-codec:1.22.0 (9 constraints: 597deb8b) +commons-codec:commons-codec:1.22.0 (11 constraints: e99f8a2f) commons-collections:commons-collections:3.2.2 (3 constraints: 77242dac) commons-digester:commons-digester:2.1 (1 constraints: 550fb664) commons-io:commons-io:2.22.0 (11 constraints: 85863038) @@ -96,23 +98,24 @@ io.dropwizard.metrics:metrics-jmx:4.2.39 (1 constraints: 44054c3b) io.dropwizard.metrics:metrics-json:4.2.39 (1 constraints: 211188c9) io.dropwizard.metrics:metrics-jvm:4.2.39 (2 constraints: 64168201) io.dropwizard.metrics:metrics-servlets:4.2.39 (1 constraints: 44054c3b) -io.grpc:grpc-alts:1.82.1 (1 constraints: 1f100ba6) -io.grpc:grpc-api:1.82.1 (8 constraints: 62517689) -io.grpc:grpc-auth:1.82.1 (1 constraints: 1f100ba6) -io.grpc:grpc-context:1.82.1 (6 constraints: 8c442987) -io.grpc:grpc-core:1.82.1 (3 constraints: 4121f81e) -io.grpc:grpc-googleapis:1.82.1 (1 constraints: 1f100ba6) -io.grpc:grpc-grpclb:1.82.1 (1 constraints: 1f100ba6) -io.grpc:grpc-inprocess:1.82.1 (1 constraints: 1f100ba6) +io.grpc:grpc-alts:1.82.1 (3 constraints: ac32a94b) +io.grpc:grpc-api:1.82.1 (10 constraints: 6c68feae) +io.grpc:grpc-auth:1.82.1 (3 constraints: ac32a94b) +io.grpc:grpc-context:1.82.1 (7 constraints: cd5ea12f) +io.grpc:grpc-core:1.82.1 (5 constraints: ce434a31) +io.grpc:grpc-googleapis:1.82.1 (3 constraints: ac32a94b) +io.grpc:grpc-grpclb:1.82.1 (2 constraints: 8c1eaaaa) +io.grpc:grpc-inprocess:1.82.1 (3 constraints: ac32a94b) io.grpc:grpc-netty:1.82.1 (1 constraints: 3e054c3b) -io.grpc:grpc-netty-shaded:1.82.1 (1 constraints: 1f100ba6) -io.grpc:grpc-protobuf:1.82.1 (2 constraints: 5c1599d7) -io.grpc:grpc-protobuf-lite:1.82.1 (2 constraints: 281ac94d) -io.grpc:grpc-rls:1.82.1 (1 constraints: 1f100ba6) -io.grpc:grpc-services:1.82.1 (1 constraints: 1f100ba6) -io.grpc:grpc-stub:1.82.1 (2 constraints: 5c1599d7) -io.grpc:grpc-util:1.82.1 (3 constraints: fd21e564) -io.grpc:grpc-xds:1.82.1 (1 constraints: 1f100ba6) +io.grpc:grpc-netty-shaded:1.82.1 (3 constraints: ac32a94b) +io.grpc:grpc-opentelemetry:1.82.1 (2 constraints: 8c1eaaaa) +io.grpc:grpc-protobuf:1.82.1 (3 constraints: c92386bd) +io.grpc:grpc-protobuf-lite:1.82.1 (5 constraints: 7d50a984) +io.grpc:grpc-rls:1.82.1 (2 constraints: 8c1eaaaa) +io.grpc:grpc-services:1.82.1 (3 constraints: ac32a94b) +io.grpc:grpc-stub:1.82.1 (3 constraints: c92386bd) +io.grpc:grpc-util:1.82.1 (4 constraints: 783bbb66) +io.grpc:grpc-xds:1.82.1 (3 constraints: ac32a94b) io.jaegertracing:jaeger-core:1.8.1 (2 constraints: 6f124721) io.jaegertracing:jaeger-thrift:1.8.1 (1 constraints: 0c050936) io.netty:netty-bom:4.2.15.Final (1 constraints: 56074661) @@ -132,29 +135,29 @@ io.netty:netty-transport:4.2.15.Final (11 constraints: 26a95f01) io.netty:netty-transport-classes-epoll:4.2.15.Final (2 constraints: a91dda34) io.netty:netty-transport-native-epoll:4.2.15.Final (2 constraints: ff1af171) io.netty:netty-transport-native-unix-common:4.2.15.Final (5 constraints: 6c484034) -io.opencensus:opencensus-api:0.31.1 (5 constraints: 924d4692) -io.opencensus:opencensus-contrib-http-util:0.31.1 (3 constraints: 7232a9fc) -io.opencensus:opencensus-proto:0.2.0 (1 constraints: e60fd595) -io.opentelemetry:opentelemetry-api:1.63.0 (8 constraints: e8908efd) +io.opencensus:opencensus-api:0.31.1 (7 constraints: 1670542e) +io.opencensus:opencensus-contrib-http-util:0.31.1 (5 constraints: f654c128) +io.opentelemetry:opentelemetry-api:1.63.0 (10 constraints: 71af89bc) io.opentelemetry:opentelemetry-bom:1.63.0 (1 constraints: 3c05463b) -io.opentelemetry:opentelemetry-common:1.63.0 (2 constraints: f4209741) -io.opentelemetry:opentelemetry-context:1.63.0 (2 constraints: 291f06b5) +io.opentelemetry:opentelemetry-common:1.63.0 (4 constraints: 7d3fe9e5) +io.opentelemetry:opentelemetry-context:1.63.0 (4 constraints: b23d34df) io.opentelemetry:opentelemetry-exporter-common:1.63.0 (3 constraints: 503dd5ac) io.opentelemetry:opentelemetry-exporter-otlp:1.63.0 (1 constraints: 970ff783) io.opentelemetry:opentelemetry-exporter-otlp-common:1.63.0 (2 constraints: 54237b1c) io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.63.0 (2 constraints: 54237b1c) io.opentelemetry:opentelemetry-opentracing-shim:1.63.0 (1 constraints: 970ff783) -io.opentelemetry:opentelemetry-sdk:1.63.0 (3 constraints: a843c8e5) -io.opentelemetry:opentelemetry-sdk-common:1.63.0 (6 constraints: 876c4568) +io.opentelemetry:opentelemetry-sdk:1.63.0 (5 constraints: 31620a84) +io.opentelemetry:opentelemetry-sdk-common:1.63.0 (8 constraints: 108b7f1a) io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.63.0 (1 constraints: 970ff783) -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.63.0 (2 constraints: e328cf4e) -io.opentelemetry:opentelemetry-sdk-logs:1.63.0 (3 constraints: ee3253b3) -io.opentelemetry:opentelemetry-sdk-metrics:1.63.0 (3 constraints: ee3253b3) -io.opentelemetry:opentelemetry-sdk-trace:1.63.0 (3 constraints: ee3253b3) +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.63.0 (4 constraints: 6c470256) +io.opentelemetry:opentelemetry-sdk-logs:1.63.0 (5 constraints: 7751d04e) +io.opentelemetry:opentelemetry-sdk-metrics:1.63.0 (5 constraints: 7751d04e) +io.opentelemetry:opentelemetry-sdk-trace:1.63.0 (5 constraints: 7751d04e) +io.opentelemetry.semconv:opentelemetry-semconv:1.29.0-alpha (1 constraints: 5312010e) io.opentracing:opentracing-api:0.33.0 (6 constraints: 195100dd) io.opentracing:opentracing-noop:0.33.0 (4 constraints: 48361e21) io.opentracing:opentracing-util:0.33.0 (3 constraints: f71f843b) -io.perfmark:perfmark-api:0.27.0 (3 constraints: 24218716) +io.perfmark:perfmark-api:0.27.0 (5 constraints: b043fe27) io.prometheus:prometheus-metrics-config:1.8.0 (1 constraints: db1026bb) io.prometheus:prometheus-metrics-exposition-textformats:1.8.0 (1 constraints: 0b050836) io.prometheus:prometheus-metrics-model:1.8.0 (2 constraints: 141d60b8) @@ -193,8 +196,8 @@ org.apache.hadoop:hadoop-client-api:3.4.1 (3 constraints: 1928b25e) org.apache.hadoop:hadoop-client-runtime:3.4.1 (2 constraints: 67170843) org.apache.hadoop:hadoop-common:3.4.1 (1 constraints: 0a050736) org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.5.0 (1 constraints: 0805ff35) -org.apache.httpcomponents:httpclient:4.5.14 (7 constraints: b7695b2f) -org.apache.httpcomponents:httpcore:4.4.16 (6 constraints: ea5cc678) +org.apache.httpcomponents:httpclient:4.5.14 (10 constraints: 6e9cc932) +org.apache.httpcomponents:httpcore:4.4.16 (9 constraints: a48fb4f0) org.apache.httpcomponents:httpmime:4.5.14 (1 constraints: 40054f3b) org.apache.httpcomponents.client5:httpclient5:5.6.1 (2 constraints: 6520b445) org.apache.httpcomponents.core5:httpcore5:5.4.3 (4 constraints: 3e45d254) @@ -269,11 +272,11 @@ org.carrot2:carrot2-core:4.5.1 (1 constraints: 0c050f36) org.carrot2:morfologik-fsa:2.1.9 (1 constraints: db0d9c36) org.carrot2:morfologik-polish:2.1.9 (1 constraints: d312541e) org.carrot2:morfologik-stemming:2.1.9 (2 constraints: d81fb300) -org.checkerframework:checker-qual:3.44.0 (3 constraints: f02b17cc) +org.checkerframework:checker-qual:3.49.0 (4 constraints: 693aef91) org.codehaus.janino:commons-compiler:3.1.11 (2 constraints: 83195319) org.codehaus.janino:janino:3.1.11 (1 constraints: 8e0d433a) -org.codehaus.woodstox:stax2-api:4.3.0 (2 constraints: 361532af) -org.conscrypt:conscrypt-openjdk-uber:2.5.2 (1 constraints: ed0fea95) +org.codehaus.woodstox:stax2-api:4.3.0 (4 constraints: 5d338b6e) +org.conscrypt:conscrypt-openjdk-uber:2.5.2 (3 constraints: 193286c8) org.eclipse.jetty:jetty-alpn-client:10.0.26 (3 constraints: f72e3161) org.eclipse.jetty:jetty-alpn-java-client:10.0.26 (2 constraints: 231b156f) org.eclipse.jetty:jetty-alpn-java-server:10.0.26 (1 constraints: 6b059440) @@ -318,7 +321,7 @@ org.jetbrains:annotations:17.0.0 (2 constraints: 371c92e0) org.jetbrains.kotlin:kotlin-stdlib:2.2.21 (10 constraints: 929b3d90) org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 (2 constraints: f31f0a21) org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 (6 constraints: 745eefc1) -org.jspecify:jspecify:1.0.0 (3 constraints: b1233dfa) +org.jspecify:jspecify:1.0.0 (8 constraints: 577d1349) org.locationtech.jts:jts-core:1.19.0 (2 constraints: a31de760) org.locationtech.jts.io:jts-io-common:1.19.0 (1 constraints: 930d513a) org.locationtech.proj4j:proj4j:1.2.2 (1 constraints: 5d0daf2c) @@ -342,8 +345,8 @@ org.scala-lang.modules:scala-java8-compat_2.13:1.0.2 (1 constraints: fa0af8e7) org.semver4j:semver4j:5.8.0 (1 constraints: 0f051c36) org.slf4j:jcl-over-slf4j:2.0.18 (1 constraints: 3d05333b) org.slf4j:jul-to-slf4j:2.0.18 (2 constraints: c21b117f) -org.slf4j:slf4j-api:2.0.18 (68 constraints: 79d3351e) -org.threeten:threetenbp:1.6.9 (4 constraints: 2833ea68) +org.slf4j:slf4j-api:2.0.18 (70 constraints: 02f2946d) +org.threeten:threetenbp:1.7.0 (6 constraints: 32557c53) org.xerial.snappy:snappy-java:1.1.10.8 (5 constraints: c146fa38) software.amazon.awssdk:annotations:2.46.18 (31 constraints: 05dc83d0) software.amazon.awssdk:apache-client:2.46.18 (2 constraints: d5119015) @@ -388,14 +391,12 @@ com.amazonaws:aws-java-sdk-core:1.12.501 (2 constraints: b01a32b3) com.amazonaws:aws-java-sdk-kms:1.12.501 (1 constraints: 060dbd37) com.amazonaws:aws-java-sdk-s3:1.12.501 (1 constraints: 10136f43) com.amazonaws:jmespath-java:1.12.501 (2 constraints: b01a32b3) -com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.22.0 (2 constraints: a6194d13) -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.22.0 (4 constraints: 69484f33) com.fasterxml.jackson.module:jackson-module-kotlin:2.22.0 (2 constraints: a51d835f) com.fasterxml.jackson.module:jackson-module-parameter-names:2.22.0 (2 constraints: 08244c81) com.github.docker-java:docker-java-api:3.7.1 (1 constraints: 3f0f6a67) com.github.docker-java:docker-java-transport:3.7.1 (1 constraints: c9151dcb) com.github.docker-java:docker-java-transport-zerodep:3.7.1 (1 constraints: 3f0f6a67) -com.google.cloud:google-cloud-nio:0.127.20 (1 constraints: c90e267b) +com.google.cloud:google-cloud-nio:0.133.0 (1 constraints: 940e536c) com.nimbusds:content-type:2.2 (1 constraints: d80b68eb) com.nimbusds:lang-tag:1.7 (1 constraints: dc0b6aeb) com.nimbusds:nimbus-jose-jwt:9.30.2 (1 constraints: 700c4b10) From ac89d3f7f89c8a40a3ae7b42b994c85f7c5d5f5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Tue, 30 Jun 2026 14:36:20 +0200 Subject: [PATCH 45/45] Add changelog entry for google-cloud-bom 0.265.0 (PR #3589) --- changelog/unreleased/update-google-cloud-bom-0.265.0.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changelog/unreleased/update-google-cloud-bom-0.265.0.yml diff --git a/changelog/unreleased/update-google-cloud-bom-0.265.0.yml b/changelog/unreleased/update-google-cloud-bom-0.265.0.yml new file mode 100644 index 000000000000..e7e633f18fb5 --- /dev/null +++ b/changelog/unreleased/update-google-cloud-bom-0.265.0.yml @@ -0,0 +1,7 @@ +title: Update com.google.cloud:google-cloud-bom to v0.265.0 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#3589 + url: https://github.com/apache/solr/pull/3589