Skip to content

SOLR-18297 Upgrade Jetty to 12.1.10 #4574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
janhoy wants to merge 18 commits into
base: main
Choose a base branch
from
+814 −611
Open

SOLR-18297 Upgrade Jetty to 12.1.10 #4574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a9aca3c
Update eclipse.jetty to v12.1.10
solrbot Jun 30, 2026
e034da9
Add changelog entry for PR#3633
solrbot Jun 30, 2026
c89c737
Adapt to Jetty 12.1 API changes and regenerate locks/licenses
janhoy Jun 30, 2026
49098ac
Migrate server config for Jetty 12.1 deployer removal + config cleanups
janhoy Jun 30, 2026
f774248
Changelog: track Jetty 12.1.10 upgrade under SOLR-18297
janhoy Jun 30, 2026
9935cee
Ref guide: note Jetty webapp context scanning removed in 10.1 (SOLR-1…
janhoy Jun 30, 2026
afe07cd
Add BATS test verifying the webapp deploys at /solr after Jetty 12.1 …
janhoy Jun 30, 2026
cfd94aa
Edit upgrade note
janhoy Jun 30, 2026
1daa4d1
TEMPORARY: pull in #4572 to fix solr:ui webpack build (revert once #4…
janhoy Jul 1, 2026
bcdd8bc
Fix Jetty 12.1 strict Content-Length handling in v2 responses and int…
janhoy Jul 1, 2026
14923f3
Keep changelog short and sweet
janhoy Jul 1, 2026
57124b4
Merge branch 'main' into SOLR-18297-update-jetty-12.1.10
janhoy Jul 1, 2026
c28dc00
Merge in main (S3Mock upgr)
janhoy Jul 1, 2026
9b6d7ff
Proxy REQUEST will skip both "Host" and "Content-Length" request head…
janhoy Jul 2, 2026
853a45e
Tighter implementation
janhoy Jul 2, 2026
22d944b
Conditionally copy content-length header only when >0
janhoy Jul 2, 2026
a951bfb
Address dsmiley review: setContentLengthLong, simpler comment, determ…
janhoy Jul 2, 2026
9788587
Address Copilot review: close request stream with fixed-length mode i…
janhoy Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions changelog/unreleased/SOLR-18297-update-jetty-12.1.10.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
title: Upgrade Eclipse Jetty to 12.1.10
type: dependency_update
authors:
- name: Jan Høydahl
links:
- name: SOLR-18297
url: https://issues.apache.org/jira/browse/SOLR-18297
3 changes: 2 additions & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ diffplug-spotless = "8.3.0"
dockerfile-baseimage-java = "25"
dropwizard-metrics = "4.2.39"
eclipse-ecj = "3.39.0"
eclipse-jetty = "12.0.34"
eclipse-jetty = "12.1.10"
# @keep jgit version used by git-status.gradle
eclipse-jgit = "7.7.0.202606012155-r"
essenty = "2.5.0"
Expand Down Expand Up @@ -445,6 +445,7 @@ ktor-client-auth = { module = "io.ktor:ktor-client-auth" }
ktor-client-cio = { module = "io.ktor:ktor-client-cio" }
ktor-client-contentNegotiation = { module = "io.ktor:ktor-client-content-negotiation" }
ktor-client-core = { module = "io.ktor:ktor-client-core" }
ktor-client-js = { module = "io.ktor:ktor-client-js" }
ktor-client-mock = { module = "io.ktor:ktor-client-mock" }
ktor-client-serialization-json = { module = "io.ktor:ktor-serialization-kotlinx-json" }
ktor-server-cio = { module = "io.ktor:ktor-server-cio" }
Expand Down
38 changes: 20 additions & 18 deletions solr/api/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,24 +122,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.5=jarValidation,testCompileClasspath,tes
org.apache.zookeeper:zookeeper:3.9.5=jarValidation,testCompileClasspath,testRuntimeClasspath
org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.3.0=jarValidation,testRuntimeClasspath
org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath
org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,testRuntimeClasspath
org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath
org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,testRuntimeClasspath
org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath
org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath
org.eclipse.jetty:jetty-client:12.0.34=jarValidation,testRuntimeClasspath
org.eclipse.jetty:jetty-http:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-io:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath
org.eclipse.jetty:jetty-security:12.0.34=jarValidation,testRuntimeClasspath
org.eclipse.jetty:jetty-server:12.0.34=jarValidation,testRuntimeClasspath
org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath
org.eclipse.jetty:jetty-util:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,testRuntimeClasspath
org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,testRuntimeClasspath
org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath
org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,testRuntimeClasspath
org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath
org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,testRuntimeClasspath
org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath
org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath
org.eclipse.jetty:jetty-client:12.1.10=jarValidation,testRuntimeClasspath
org.eclipse.jetty:jetty-http:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-io:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath
org.eclipse.jetty:jetty-security:12.1.10=jarValidation,testRuntimeClasspath
org.eclipse.jetty:jetty-server:12.1.10=jarValidation,testRuntimeClasspath
org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath
org.eclipse.jetty:jetty-util:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath
org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,testRuntimeClasspath
org.glassfish.hk2:hk2-api:4.0.1=jarValidation,testRuntimeClasspath
org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,testRuntimeClasspath
Expand Down
38 changes: 20 additions & 18 deletions solr/benchmark/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,24 +112,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.5=compileClasspath,jarValidation,runtime
org.apache.zookeeper:zookeeper:3.9.5=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.apiguardian:apiguardian-api:1.1.2=jarValidation,runtimeClasspath,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.3.0=jarValidation,runtimeClasspath,testRuntimeClasspath
org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath
org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath
org.eclipse.jetty.http2:jetty-http2-client:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty.http2:jetty-http2-common:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-alpn-client:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-http:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-io:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-session:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-util:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath
org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath
org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath
org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath
org.eclipse.jetty.http2:jetty-http2-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty.http2:jetty-http2-common:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-alpn-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-http:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-io:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-session:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-util:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,testRuntimeClasspath
org.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,testRuntimeClasspath
org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,testRuntimeClasspath
Expand Down
38 changes: 20 additions & 18 deletions solr/core/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,24 +128,26 @@ org.carrot2:morfologik-fsa:2.1.9=jarValidation,testRuntimeClasspath,testRuntimeC
org.carrot2:morfologik-polish:2.1.9=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy
org.carrot2:morfologik-stemming:2.1.9=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy
org.codehaus.woodstox:stax2-api:4.3.0=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty.http2:jetty-http2-client:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty.http2:jetty-http2-common:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty:jetty-alpn-client:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty:jetty-client:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty:jetty-http:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty:jetty-io:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty:jetty-util:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty.compression:jetty-compression-common:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty.http2:jetty-http2-client:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty.http2:jetty-http2-common:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty:jetty-alpn-client:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty:jetty-client:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty:jetty-http:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty:jetty-io:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy
org.eclipse.jetty:jetty-util:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy
org.glassfish.hk2.external:aopalliance-repackaged:4.0.1=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy
org.glassfish.hk2:hk2-api:4.0.1=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy
org.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testRuntimeClasspath,testRuntimeClasspathCopy
Expand Down
4 changes: 2 additions & 2 deletions solr/core/src/java/org/apache/solr/core/SolrCore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.UncheckedIOException;
import java.io.Writer;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Constructor;
Expand Down Expand Up @@ -170,7 +171,6 @@
import org.apache.solr.util.stats.MetricUtils;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.data.Stat;
import org.eclipse.jetty.io.RuntimeIOException;
import org.glassfish.jersey.server.ApplicationHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -523,7 +523,7 @@ public int getSegmentCount() {
return withSearcher(
solrIndexSearcher -> solrIndexSearcher.getRawReader().getIndexCommit().getSegmentCount());
} catch (IOException e) {
throw new RuntimeIOException(e);
throw new UncheckedIOException(e);
}
}

Expand Down
4 changes: 2 additions & 2 deletions solr/core/src/java/org/apache/solr/handler/CatStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import java.io.IOException;
import java.io.InputStreamReader;
import java.io.UncheckedIOException;
import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
Expand All @@ -42,7 +43,6 @@
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.StrUtils;
import org.apache.solr.core.SolrCore;
import org.eclipse.jetty.io.RuntimeIOException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -249,7 +249,7 @@ private void findReadableFiles(CrawlFile seed, List<CrawlFile> foundFiles) {
findReadableFiles(new CrawlFile(itemDisplayPath, iPath), foundFiles);
});
} catch (IOException e) {
throw new RuntimeIOException(e);
throw new UncheckedIOException(e);
}
}
}
Expand Down
Loading
Loading