From c0d21f000e3061ff43ad65f2ef92dae41b0b9b08 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Wed, 22 Apr 2026 09:41:51 +0000 Subject: [PATCH 1/2] Update org.glassfish.hk2*:* to v4 (branch_9x) --- solr/licenses/aopalliance-repackaged-3.1.1.jar.sha1 | 1 - solr/licenses/aopalliance-repackaged-4.0.0.jar.sha1 | 1 + solr/licenses/hk2-api-3.1.1.jar.sha1 | 1 - solr/licenses/hk2-api-4.0.0.jar.sha1 | 1 + solr/licenses/hk2-locator-3.1.1.jar.sha1 | 1 - solr/licenses/hk2-locator-4.0.0.jar.sha1 | 1 + solr/licenses/hk2-utils-3.1.1.jar.sha1 | 1 - solr/licenses/hk2-utils-4.0.0.jar.sha1 | 1 + solr/licenses/jakarta.annotation-api-2.1.1.jar.sha1 | 1 - solr/licenses/jakarta.annotation-api-3.0.0.jar.sha1 | 1 + versions.lock | 10 +++++----- versions.props | 2 +- 12 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 solr/licenses/aopalliance-repackaged-3.1.1.jar.sha1 create mode 100644 solr/licenses/aopalliance-repackaged-4.0.0.jar.sha1 delete mode 100644 solr/licenses/hk2-api-3.1.1.jar.sha1 create mode 100644 solr/licenses/hk2-api-4.0.0.jar.sha1 delete mode 100644 solr/licenses/hk2-locator-3.1.1.jar.sha1 create mode 100644 solr/licenses/hk2-locator-4.0.0.jar.sha1 delete mode 100644 solr/licenses/hk2-utils-3.1.1.jar.sha1 create mode 100644 solr/licenses/hk2-utils-4.0.0.jar.sha1 delete mode 100644 solr/licenses/jakarta.annotation-api-2.1.1.jar.sha1 create mode 100644 solr/licenses/jakarta.annotation-api-3.0.0.jar.sha1 diff --git a/solr/licenses/aopalliance-repackaged-3.1.1.jar.sha1 b/solr/licenses/aopalliance-repackaged-3.1.1.jar.sha1 deleted file mode 100644 index 9c73a4a5a50e..000000000000 --- a/solr/licenses/aopalliance-repackaged-3.1.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -271bbab4cb1e3e5c556acf2580f75cb184818c1f diff --git a/solr/licenses/aopalliance-repackaged-4.0.0.jar.sha1 b/solr/licenses/aopalliance-repackaged-4.0.0.jar.sha1 new file mode 100644 index 000000000000..74dc5a847595 --- /dev/null +++ b/solr/licenses/aopalliance-repackaged-4.0.0.jar.sha1 @@ -0,0 +1 @@ +dd41cb8276601df780f0621702b2d70f3f5ca64a diff --git a/solr/licenses/hk2-api-3.1.1.jar.sha1 b/solr/licenses/hk2-api-3.1.1.jar.sha1 deleted file mode 100644 index 88c7e86b9768..000000000000 --- a/solr/licenses/hk2-api-3.1.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -18d114e0da203809052f5f000803f2db6c9e9cf5 diff --git a/solr/licenses/hk2-api-4.0.0.jar.sha1 b/solr/licenses/hk2-api-4.0.0.jar.sha1 new file mode 100644 index 000000000000..a1ef9b37a4e5 --- /dev/null +++ b/solr/licenses/hk2-api-4.0.0.jar.sha1 @@ -0,0 +1 @@ +9fe4c23a496155801fb3120653a1539723ea53d6 diff --git a/solr/licenses/hk2-locator-3.1.1.jar.sha1 b/solr/licenses/hk2-locator-3.1.1.jar.sha1 deleted file mode 100644 index 877f8041a96b..000000000000 --- a/solr/licenses/hk2-locator-3.1.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -620df6f26ca3c67984907d9531a2d3f9f831ba08 diff --git a/solr/licenses/hk2-locator-4.0.0.jar.sha1 b/solr/licenses/hk2-locator-4.0.0.jar.sha1 new file mode 100644 index 000000000000..7e143b08a288 --- /dev/null +++ b/solr/licenses/hk2-locator-4.0.0.jar.sha1 @@ -0,0 +1 @@ +cdb680d52ab329206c72e1e55687a8500c1b6921 diff --git a/solr/licenses/hk2-utils-3.1.1.jar.sha1 b/solr/licenses/hk2-utils-3.1.1.jar.sha1 deleted file mode 100644 index 2f421cd17b8e..000000000000 --- a/solr/licenses/hk2-utils-3.1.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d7f6959b2a724d479d8b1420c4aa03751eb4447f diff --git a/solr/licenses/hk2-utils-4.0.0.jar.sha1 b/solr/licenses/hk2-utils-4.0.0.jar.sha1 new file mode 100644 index 000000000000..f8dcc1ed1293 --- /dev/null +++ b/solr/licenses/hk2-utils-4.0.0.jar.sha1 @@ -0,0 +1 @@ +5b7182df0884117826f0ff10a35b3b9a4ea22abc diff --git a/solr/licenses/jakarta.annotation-api-2.1.1.jar.sha1 b/solr/licenses/jakarta.annotation-api-2.1.1.jar.sha1 deleted file mode 100644 index a3e6150253d7..000000000000 --- a/solr/licenses/jakarta.annotation-api-2.1.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -48b9bda22b091b1f48b13af03fe36db3be6e1ae3 diff --git a/solr/licenses/jakarta.annotation-api-3.0.0.jar.sha1 b/solr/licenses/jakarta.annotation-api-3.0.0.jar.sha1 new file mode 100644 index 000000000000..aa4640c323bb --- /dev/null +++ b/solr/licenses/jakarta.annotation-api-3.0.0.jar.sha1 @@ -0,0 +1 @@ +54f928fadec906a99d558536756d171917b9d936 diff --git a/versions.lock b/versions.lock index 1f12007b7434..0382de1fc4e0 100644 --- a/versions.lock +++ b/versions.lock @@ -163,7 +163,7 @@ io.prometheus:simpleclient_common:0.16.0 (1 constraints: 1a1139c0) io.prometheus:simpleclient_httpserver:0.16.0 (1 constraints: 3905353b) io.sgr:s2-geometry-library-java:1.0.0 (1 constraints: b0107fb9) io.swagger.core.v3:swagger-annotations-jakarta:2.2.22 (1 constraints: 3a05373b) -jakarta.annotation:jakarta.annotation-api:2.1.1 (4 constraints: c94095a4) +jakarta.annotation:jakarta.annotation-api:3.0.0 (4 constraints: c84001a4) 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) @@ -297,11 +297,11 @@ org.eclipse.jetty.http2:http2-hpack:10.0.26 (2 constraints: 2615cce0) org.eclipse.jetty.http2:http2-http-client-transport:10.0.26 (1 constraints: 6b059440) org.eclipse.jetty.http2:http2-server:10.0.26 (1 constraints: 6b059440) org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6 (4 constraints: 883053bf) -org.glassfish.hk2:hk2-api:3.1.1 (2 constraints: 70114901) -org.glassfish.hk2:hk2-locator:3.1.1 (1 constraints: 4410d8ad) -org.glassfish.hk2:hk2-utils:3.1.1 (2 constraints: 19178676) +org.glassfish.hk2:hk2-api:4.0.0 (2 constraints: 6e112501) +org.glassfish.hk2:hk2-locator:4.0.0 (1 constraints: 4410d8ad) +org.glassfish.hk2:hk2-utils:4.0.0 (2 constraints: 17176276) org.glassfish.hk2:osgi-resource-locator:1.0.3 (1 constraints: ef10e7c2) -org.glassfish.hk2.external:aopalliance-repackaged:3.1.1 (2 constraints: 19178676) +org.glassfish.hk2.external:aopalliance-repackaged:4.0.0 (2 constraints: 17176276) org.glassfish.jersey.containers:jersey-container-jetty-http:2.39.1 (1 constraints: 4105533b) org.glassfish.jersey.core:jersey-client:3.1.11 (1 constraints: 2f11ecd4) org.glassfish.jersey.core:jersey-common:3.1.11 (6 constraints: 1167455a) diff --git a/versions.props b/versions.props index 32059149d1ba..56e3fbc3b7c8 100644 --- a/versions.props +++ b/versions.props @@ -68,7 +68,7 @@ org.carrot2:carrot2-core=4.5.1 org.codehaus.woodstox:stax2-api=4.2.2 org.eclipse.jetty*:*=10.0.26 org.eclipse.jetty.toolchain:jetty-servlet-api=4.0.6 -org.glassfish.hk2*:*=3.1.1 +org.glassfish.hk2*:*=4.0.0 org.glassfish.hk2.external:jakarta.inject=2.6.1 org.glassfish.hk2:osgi*=1.0.3 org.glassfish.jersey*:*=3.1.11 From 6d40af1ea968d1f3b146c800ab5f647cc3555d62 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Wed, 22 Apr 2026 09:42:13 +0000 Subject: [PATCH 2/2] Update changelog entry --- ...4309-update-org-glassfish-hk2-to-v4-branch-9x-major.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changelog/unreleased/PR#4309-update-org-glassfish-hk2-to-v4-branch-9x-major.yml diff --git a/changelog/unreleased/PR#4309-update-org-glassfish-hk2-to-v4-branch-9x-major.yml b/changelog/unreleased/PR#4309-update-org-glassfish-hk2-to-v4-branch-9x-major.yml new file mode 100644 index 000000000000..0a3faf325a69 --- /dev/null +++ b/changelog/unreleased/PR#4309-update-org-glassfish-hk2-to-v4-branch-9x-major.yml @@ -0,0 +1,7 @@ +title: Update org.glassfish.hk2*:* to v4 (branch_9x) (major) +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4309 + url: https://github.com/apache/solr/pull/4309