From 70a80f1e7f4e0ea76cc1bf6303245541358c9f10 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Mon, 20 Apr 2026 22:38:39 +0000 Subject: [PATCH 1/2] Update dependency org.eclipse.jetty.toolchain:jetty-servlet-api to v4.0.9 (branch_9x) --- solr/licenses/jetty-servlet-api-4.0.6.jar.sha1 | 1 - solr/licenses/jetty-servlet-api-4.0.9.jar.sha1 | 1 + versions.lock | 2 +- versions.props | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 solr/licenses/jetty-servlet-api-4.0.6.jar.sha1 create mode 100644 solr/licenses/jetty-servlet-api-4.0.9.jar.sha1 diff --git a/solr/licenses/jetty-servlet-api-4.0.6.jar.sha1 b/solr/licenses/jetty-servlet-api-4.0.6.jar.sha1 deleted file mode 100644 index 5293c068a346..000000000000 --- a/solr/licenses/jetty-servlet-api-4.0.6.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -959c5d83d08f5cddf56caff749e48b735193191b diff --git a/solr/licenses/jetty-servlet-api-4.0.9.jar.sha1 b/solr/licenses/jetty-servlet-api-4.0.9.jar.sha1 new file mode 100644 index 000000000000..696ad0a9aaf1 --- /dev/null +++ b/solr/licenses/jetty-servlet-api-4.0.9.jar.sha1 @@ -0,0 +1 @@ +e420683c1c3eae740461eb45cfea6ae7b3149511 diff --git a/versions.lock b/versions.lock index b99b5dd0c59d..94adb68af0f6 100644 --- a/versions.lock +++ b/versions.lock @@ -294,7 +294,7 @@ org.eclipse.jetty.http2:http2-common:10.0.26 (3 constraints: e5240563) 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.eclipse.jetty.toolchain:jetty-servlet-api:4.0.9 (4 constraints: 8b30cdc0) 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) diff --git a/versions.props b/versions.props index b95645350ce2..1867c8e25407 100644 --- a/versions.props +++ b/versions.props @@ -67,7 +67,7 @@ org.bouncycastle:bcpkix-jdk18on=1.82 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.eclipse.jetty.toolchain:jetty-servlet-api=4.0.9 org.glassfish.hk2*:*=3.1.1 org.glassfish.hk2.external:jakarta.inject=2.6.1 org.glassfish.hk2:osgi*=1.0.3 From 35d75f0ac303d75193814fe14a921c49879e6cf6 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Mon, 20 Apr 2026 22:38:57 +0000 Subject: [PATCH 2/2] Update changelog entry --- ...96-update-org-eclipse-jetty-toolchain-jetty-servlet.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changelog/unreleased/PR#4296-update-org-eclipse-jetty-toolchain-jetty-servlet.yml diff --git a/changelog/unreleased/PR#4296-update-org-eclipse-jetty-toolchain-jetty-servlet.yml b/changelog/unreleased/PR#4296-update-org-eclipse-jetty-toolchain-jetty-servlet.yml new file mode 100644 index 000000000000..006ac9ccb0c3 --- /dev/null +++ b/changelog/unreleased/PR#4296-update-org-eclipse-jetty-toolchain-jetty-servlet.yml @@ -0,0 +1,7 @@ +title: Update org.eclipse.jetty.toolchain:jetty-servlet-api to v4.0.9 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4296 + url: https://github.com/apache/solr/pull/4296