Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-17069: Jetty12 + EE10 (#2876)

Sanjay Dutt7279b808628a
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6dfd83a0d32..5c0d4cb7239 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
[versions]
-adobe-testing-s3mock = "2.17.0"
-amazon-awssdk = "2.26.19"
+adobe-testing-s3mock = "3.9.1"
+amazon-awssdk = "2.28.11"
# @keep Antora version used in ref-guide
antora = "3.1.4"
# @keep Most recent commit as of 2022-06-24, this repo does not have tags
@@ -80,8 +80,8 @@ decompose = "3.2.2"
diffplug-spotless = "6.5.2"
dropwizard-metrics = "4.2.26"
eclipse-ecj = "3.39.0"
-eclipse-jetty = "10.0.22"
-eclipse-jettytoolchain = "4.0.6"
+eclipse-jetty = "12.0.19"
+eclipse-jettytoolchain = "5.0.2"
# @keep jgit version used by git-status.gradle
eclipse-jgit = "6.7.0.202309050840-r"
essenty = "2.4.0"
@@ -122,6 +122,7 @@ immutables-valueannotations = "2.10.1"
j256-simplemagic = "1.17"
jakarta-annotation = "2.1.1"
jakarta-inject = "2.0.1"
+jakarta-servlet = "6.0.0"
jakarta-ws = "3.1.0"
# @keep This is the minimum required Java version for the project.
java-min = "21"
@@ -311,33 +312,38 @@ decompose-decompose = { module = "com.arkivanov.decompose:decompose", version.re
decompose-extensions-compose = { module = "com.arkivanov.decompose:extensions-compose", version.ref = "decompose" }
dropwizard-metrics-core = { module = "io.dropwizard.metrics:metrics-core", version.ref = "dropwizard-metrics" }
dropwizard-metrics-graphite = { module = "io.dropwizard.metrics:metrics-graphite", version.ref = "dropwizard-metrics" }
-dropwizard-metrics-jetty10 = { module = "io.dropwizard.metrics:metrics-jetty10", version.ref = "dropwizard-metrics" }
+dropwizard-metrics-jetty12 = { module = "io.dropwizard.metrics:metrics-jetty12", version.ref = "dropwizard-metrics" }
+dropwizard-metrics-jetty12-ee10 = { module = "io.dropwizard.metrics:metrics-jetty12-ee10", version.ref = "dropwizard-metrics" }
dropwizard-metrics-jmx = { module = "io.dropwizard.metrics:metrics-jmx", version.ref = "dropwizard-metrics" }
dropwizard-metrics-jvm = { module = "io.dropwizard.metrics:metrics-jvm", version.ref = "dropwizard-metrics" }
-dropwizard-metrics-servlets = { module = "io.dropwizard.metrics:metrics-servlets", version.ref = "dropwizard-metrics" }
+dropwizard-metrics-servlets = { module = "io.dropwizard.metrics:metrics-jakarta-servlets", version.ref = "dropwizard-metrics" }
eclipse-jdt-ecj = { module = "org.eclipse.jdt:ecj", version.ref = "eclipse-ecj" }
eclipse-jetty-alpnjavaclient = { module = "org.eclipse.jetty:jetty-alpn-java-client", version.ref = "eclipse-jetty" }
eclipse-jetty-alpnjavaserver = { module = "org.eclipse.jetty:jetty-alpn-java-server", version.ref = "eclipse-jetty" }
eclipse-jetty-alpnserver = { module = "org.eclipse.jetty:jetty-alpn-server", version.ref = "eclipse-jetty" }
eclipse-jetty-client = { module = "org.eclipse.jetty:jetty-client", version.ref = "eclipse-jetty" }
eclipse-jetty-deploy = { module = "org.eclipse.jetty:jetty-deploy", version.ref = "eclipse-jetty" }
+eclipse-jetty-ee = { module = "org.eclipse.jetty:jetty-ee", version.ref = "eclipse-jetty" }
+eclipse-jetty-ee10-servlet = { module = "org.eclipse.jetty.ee10:jetty-ee10-servlet", version.ref = "eclipse-jetty" }
+eclipse-jetty-ee10-servlets = { module = "org.eclipse.jetty.ee10:jetty-ee10-servlets", version.ref = "eclipse-jetty" }
+eclipse-jetty-ee10-webapp = { module = "org.eclipse.jetty.ee10:jetty-ee10-webapp", version.ref = "eclipse-jetty" }
eclipse-jetty-http = { module = "org.eclipse.jetty:jetty-http", version.ref = "eclipse-jetty" }
-eclipse-jetty-http2-client = { module = "org.eclipse.jetty.http2:http2-client", version.ref = "eclipse-jetty" }
-eclipse-jetty-http2-common = { module = "org.eclipse.jetty.http2:http2-common", version.ref = "eclipse-jetty" }
-eclipse-jetty-http2-hpack = { module = "org.eclipse.jetty.http2:http2-hpack", version.ref = "eclipse-jetty" }
-eclipse-jetty-http2-httpclienttransport = { module = "org.eclipse.jetty.http2:http2-http-client-transport", version.ref = "eclipse-jetty" }
-eclipse-jetty-http2-server = { module = "org.eclipse.jetty.http2:http2-server", version.ref = "eclipse-jetty" }
+eclipse-jetty-http2-client = { module = "org.eclipse.jetty.http2:jetty-http2-client", version.ref = "eclipse-jetty" }
+eclipse-jetty-http2-common = { module = "org.eclipse.jetty.http2:jetty-http2-common", version.ref = "eclipse-jetty" }
+eclipse-jetty-http2-hpack = { module = "org.eclipse.jetty.http2:jetty-http2-hpack", version.ref = "eclipse-jetty" }
+eclipse-jetty-http2-httpclienttransport = { module = "org.eclipse.jetty.http2:jetty-http2-client-transport", version.ref = "eclipse-jetty" }
+eclipse-jetty-http2-server = { module = "org.eclipse.jetty.http2:jetty-http2-server", version.ref = "eclipse-jetty" }
eclipse-jetty-io = { module = "org.eclipse.jetty:jetty-io", version.ref = "eclipse-jetty" }
eclipse-jetty-jmx = { module = "org.eclipse.jetty:jetty-jmx", version.ref = "eclipse-jetty" }
+eclipse-jetty-jndi = { module = "org.eclipse.jetty:jetty-jndi", version.ref = "eclipse-jetty" }
+eclipse-jetty-plus = { module = "org.eclipse.jetty:jetty-plus", version.ref = "eclipse-jetty" }
eclipse-jetty-rewrite = { module = "org.eclipse.jetty:jetty-rewrite", version.ref = "eclipse-jetty" }
eclipse-jetty-security = { module = "org.eclipse.jetty:jetty-security", version.ref = "eclipse-jetty" }
eclipse-jetty-server = { module = "org.eclipse.jetty:jetty-server", version.ref = "eclipse-jetty" }
-eclipse-jetty-servlet = { module = "org.eclipse.jetty:jetty-servlet", version.ref = "eclipse-jetty" }
-eclipse-jetty-servlets = { module = "org.eclipse.jetty:jetty-servlets", version.ref = "eclipse-jetty" }
+eclipse-jetty-session = { module = "org.eclipse.jetty:jetty-session", version.ref = "eclipse-jetty" }
eclipse-jetty-start = { module = "org.eclipse.jetty:jetty-start", version.ref = "eclipse-jetty" }
-eclipse-jetty-toolchain-servletapi = { module = "org.eclipse.jetty.toolchain:jetty-servlet-api", version.ref = "eclipse-jettytoolchain" }
+eclipse-jetty-toolchain-servletapi = { module = "org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api", version.ref = "eclipse-jettytoolchain" }
eclipse-jetty-util = { module = "org.eclipse.jetty:jetty-util", version.ref = "eclipse-jetty" }
-eclipse-jetty-webapp = { module = "org.eclipse.jetty:jetty-webapp", version.ref = "eclipse-jetty" }
eclipse-jetty-xml = { module = "org.eclipse.jetty:jetty-xml", version.ref = "eclipse-jetty" }
eclipse-jgit-jgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version.ref = "eclipse-jgit" }
essenty-lifecycle = { module = "com.arkivanov.essenty:lifecycle", version.ref = "essenty" }
@@ -399,6 +405,7 @@ immutables-valueannotations = { module = "org.immutables:value-annotations", ver
j256-simplemagic = { module = "com.j256.simplemagic:simplemagic", version.ref = "j256-simplemagic" }
jakarta-annotation-api = { module = "jakarta.annotation:jakarta.annotation-api", version.ref = "jakarta-annotation" }
jakarta-inject-api = { module = "jakarta.inject:jakarta.inject-api", version.ref = "jakarta-inject" }
+jakarta-servlet-api = { module = "jakarta.servlet:jakarta.servlet-api", version.ref = "jakarta-servlet" }
jakarta-ws-rsapi = { module = "jakarta.ws.rs:jakarta.ws.rs-api", version.ref = "jakarta-ws" }
javacc-javacc = { module = "net.java.dev.javacc:javacc", version.ref = "javacc" }
# @keep transitive dependency for version alignment
diff --git a/gradle/testing/randomization/policies/solr-tests.policy b/gradle/testing/randomization/policies/solr-tests.policy
index c869aa9af80..eaeb777ba4e 100644
--- a/gradle/testing/randomization/policies/solr-tests.policy
+++ b/gradle/testing/randomization/policies/solr-tests.policy
@@ -146,6 +146,7 @@ grant {
// needed by s3mock
permission java.lang.RuntimePermission "accessClassInPackage.sun.nio.fs";
+ permission java.lang.RuntimePermission "accessSystemModules";
// needed for kafka mockito
permission java.lang.RuntimePermission "manageProcess";
@@ -240,8 +241,15 @@ grant {
permission java.io.FilePermission "${aws.configFile}", "read,readlink";
permission java.io.FilePermission "${user.home}${/}.aws${/}-", "read,readlink";
+ // GCS
+ permission java.io.FilePermission "${user.home}${/}.config${/}gcloud${/}properties", "read,readlink";
+ permission java.io.FilePermission "${user.home}${/}.config${/}gcloud${/}active_config", "read,readlink";
+ permission java.io.FilePermission "${user.home}${/}.config${/}gcloud${/}configurations${/}config_default", "read,readlink";
+
+
// expanded to a wildcard if set, allows all networking everywhere
permission java.net.SocketPermission "${solr.internal.network.permission}", "accept,listen,connect,resolve";
+ permission java.net.SocketPermission "metadata.google.internal:80", "connect,resolve";
// Run java
permission java.io.FilePermission "${java.home}${/}-", "execute";
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 7b969f90990..a88fa2c22b5 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -130,7 +130,8 @@ Deprecation Removals
Dependency Upgrades
---------------------
-(No changes)
+
+* SOLR-16984: Upgraded Jetty to 12 (Jakarta EE 10 namespace). Updated related dependencies including amazon-awssdk to 2.28.11. (Sanjay Dutt, David Smiley, Kevin Risden)
Other Changes
---------------------
diff --git a/solr/api/gradle.lockfile b/solr/api/gradle.lockfile
index 45cf5e95f35..f6def777ba9 100644
--- a/solr/api/gradle.lockfile
+++ b/solr/api/gradle.lockfile
@@ -51,7 +51,8 @@ commons-io:commons-io:2.15.1=jarValidation,testCompileClasspath,testRuntimeClass
io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath
io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,testRuntimeClasspath
-io.dropwizard.metrics:metrics-jetty10:4.2.26=jarValidation,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,testRuntimeClasspath
io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,testRuntimeClasspath
io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,testRuntimeClasspath
io.github.classgraph:classgraph:4.8.165=swaggerBuild,swaggerDeps
@@ -86,6 +87,7 @@ io.swagger.core.v3:swagger-models:2.2.22=swaggerDeps
jakarta.activation:jakarta.activation-api:1.2.2=swaggerDeps
jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,testRuntimeClasspath
jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,testRuntimeClasspath
+jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,testCompileClasspath,testRuntimeClasspath
jakarta.validation:jakarta.validation-api:2.0.2=swaggerDeps
jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,swaggerBuild,testRuntimeClasspath
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=compileClasspath,jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspath
@@ -136,24 +138,25 @@ org.apache.zookeeper:zookeeper:3.9.2=jarValidation,testCompileClasspath,testRunt
org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath
org.checkerframework:checker-qual:3.44.0=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-client:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-common:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-hpack:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-http-client-transport:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-client:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-client:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-client:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-rewrite:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-servlet:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-common:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-hpack:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-client:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-client:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-client:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-rewrite:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-session:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,testRuntimeClasspath
org.glassfish.hk2:hk2-api:3.1.1=jarValidation,testRuntimeClasspath
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,testRuntimeClasspath
diff --git a/solr/benchmark/gradle.lockfile b/solr/benchmark/gradle.lockfile
index 65c008902d6..9d2ee9ecd3f 100644
--- a/solr/benchmark/gradle.lockfile
+++ b/solr/benchmark/gradle.lockfile
@@ -38,7 +38,8 @@ commons-io:commons-io:2.15.1=compileClasspath,jarValidation,runtimeClasspath,tes
io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,runtimeClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,testRuntimeClasspath
-io.dropwizard.metrics:metrics-jetty10:4.2.26=jarValidation,runtimeClasspath,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,runtimeClasspath,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,runtimeClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,runtimeClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,runtimeClasspath,testRuntimeClasspath
io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -62,6 +63,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,testRuntime
io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,testRuntimeClasspath
jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,testRuntimeClasspath
+jakarta.servlet:jakarta.servlet-api:6.0.0=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,testRuntimeClasspath
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -107,24 +109,25 @@ org.apache.zookeeper:zookeeper:3.9.2=compileClasspath,jarValidation,runtimeClass
org.apiguardian:apiguardian-api:1.1.2=jarValidation,runtimeClasspath,testRuntimeClasspath
org.checkerframework:checker-qual:3.44.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-common:10.0.22=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-hpack:10.0.22=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-http-client-transport:10.0.22=jarValidation,runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-server:10.0.22=jarValidation,runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-client:10.0.22=jarValidation,runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-server:10.0.22=jarValidation,runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-server:10.0.22=jarValidation,runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-client:10.0.22=jarValidation,runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:10.0.22=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:10.0.22=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-rewrite:10.0.22=jarValidation,runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:10.0.22=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:10.0.22=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-servlet:10.0.22=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:10.0.22=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.19=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.19=jarValidation,runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client:12.0.19=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-common:12.0.19=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-hpack:12.0.19=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-server:12.0.19=jarValidation,runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=jarValidation,runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-client:12.0.19=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-client:12.0.19=jarValidation,runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-server:12.0.19=jarValidation,runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-server:12.0.19=jarValidation,runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-client:12.0.19=jarValidation,runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:12.0.19=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:12.0.19=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-rewrite:12.0.19=jarValidation,runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:12.0.19=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:12.0.19=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-session:12.0.19=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:12.0.19=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,runtimeClasspath,testRuntimeClasspath
org.glassfish.hk2:hk2-api:3.1.1=jarValidation,runtimeClasspath,testRuntimeClasspath
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,runtimeClasspath,testRuntimeClasspath
diff --git a/solr/core/build.gradle b/solr/core/build.gradle
index 42c3ed03889..f6e3c3114a5 100644
--- a/solr/core/build.gradle
+++ b/solr/core/build.gradle
@@ -195,8 +195,9 @@ dependencies {
testImplementation libs.apache.lucene.testframework
testImplementation libs.eclipse.jetty.server
- testImplementation libs.eclipse.jetty.servlet
-
+ testImplementation libs.eclipse.jetty.ee10.servlet
+ testImplementation libs.eclipse.jetty.util
+ testImplementation libs.jakarta.servlet.api
testImplementation libs.carrotsearch.randomizedtesting.runner
testImplementation libs.junit.junit
testImplementation libs.hamcrest.hamcrest
diff --git a/solr/core/gradle.lockfile b/solr/core/gradle.lockfile
index fb3d9bb7740..ebf566d7c7f 100644
--- a/solr/core/gradle.lockfile
+++ b/solr/core/gradle.lockfile
@@ -46,7 +46,8 @@ commons-io:commons-io:2.15.1=apiHelper,compileClasspath,jarValidation,runtimeCla
io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath
io.dropwizard.metrics:metrics-core:4.2.26=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-graphite:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-io.dropwizard.metrics:metrics-jetty10:4.2.26=jarValidation,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,testRuntimeClasspath
io.dropwizard.metrics:metrics-jmx:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-jvm:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -71,6 +72,7 @@ io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=apiHelper,compileClasspath
jakarta.activation:jakarta.activation-api:2.1.3=permitUnusedDeclared
jakarta.annotation:jakarta.annotation-api:2.1.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,testCompileClasspath,testRuntimeClasspath
jakarta.validation:jakarta.validation-api:2.0.2=permitUnusedDeclared
jakarta.validation:jakarta.validation-api:3.0.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,compileClasspath,jarValidation,permitUnusedDeclared,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
@@ -128,28 +130,29 @@ org.carrot2:morfologik-polish:2.1.9=jarValidation,testRuntimeClasspath
org.carrot2:morfologik-stemming:2.1.9=jarValidation,testRuntimeClasspath
org.checkerframework:checker-qual:3.44.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-client:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-common:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-hpack:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-http-client-transport:10.0.22=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-client:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-client:10.0.22=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-client:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.19=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-common:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-hpack:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-client:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-client:12.0.19=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-client:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-continuation:9.4.49.v20220914=permitUnusedDeclared
-org.eclipse.jetty:jetty-http:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-http:9.4.49.v20220914=permitUnusedDeclared
-org.eclipse.jetty:jetty-io:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-io:9.4.49.v20220914=permitUnusedDeclared
-org.eclipse.jetty:jetty-rewrite:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-rewrite:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-server:9.4.49.v20220914=permitUnusedDeclared
-org.eclipse.jetty:jetty-servlet:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-session:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-util:9.4.49.v20220914=permitUnusedDeclared
org.glassfish.hk2.external:aopalliance-repackaged:3.0.6=permitUnusedDeclared
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
diff --git a/solr/core/src/java/org/apache/solr/api/CoordinatorV2HttpSolrCall.java b/solr/core/src/java/org/apache/solr/api/CoordinatorV2HttpSolrCall.java
index f29d2407022..4fb2e888d50 100644
--- a/solr/core/src/java/org/apache/solr/api/CoordinatorV2HttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/api/CoordinatorV2HttpSolrCall.java
@@ -17,8 +17,8 @@
package org.apache.solr.api;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.SolrCore;
import org.apache.solr.servlet.CoordinatorHttpSolrCall;
diff --git a/solr/core/src/java/org/apache/solr/api/V2HttpCall.java b/solr/core/src/java/org/apache/solr/api/V2HttpCall.java
index d14cd59e2ce..6ea70a65ea3 100644
--- a/solr/core/src/java/org/apache/solr/api/V2HttpCall.java
+++ b/solr/core/src/java/org/apache/solr/api/V2HttpCall.java
@@ -24,6 +24,8 @@ import static org.apache.solr.servlet.SolrDispatchFilter.Action.PROCESS;
import static org.apache.solr.servlet.SolrDispatchFilter.Action.REMOTEQUERY;
import io.opentelemetry.api.trace.Span;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
@@ -35,8 +37,6 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import net.jcip.annotations.ThreadSafe;
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.common.SolrException;
@@ -437,7 +437,12 @@ public class V2HttpCall extends HttpSolrCall {
// SolrCore counter
core.close();
core = null;
- response.getHeaderNames().stream().forEach(name -> response.setHeader(name, null));
+ // Skip specific headers
+ // workaround for response.setHeader(name, null)
+ response.getHeaderNames().stream()
+ .filter(name -> !name.equalsIgnoreCase("Content-Length"))
+ .forEach(name -> response.setHeader(name, ""));
+ response.setContentLength(-1);
invokeJerseyRequest(
cores, null, cores.getJerseyApplicationHandler(), cores.getRequestHandlers(), rsp);
}
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
index 340107e762f..5c773811537 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
@@ -100,7 +100,8 @@ public class ShowFileRequestHandler extends RequestHandlerBase implements Permis
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
static {
- KNOWN_MIME_TYPES = new HashSet<>(MimeTypes.getKnownMimeTypes());
+ MimeTypes mimeTypes = new MimeTypes();
+ KNOWN_MIME_TYPES = new HashSet<>(mimeTypes.getMimeMap().values());
KNOWN_MIME_TYPES.add("text/xml");
KNOWN_MIME_TYPES.add("text/javascript");
}
diff --git a/solr/core/src/java/org/apache/solr/jersey/RequestContextKeys.java b/solr/core/src/java/org/apache/solr/jersey/RequestContextKeys.java
index 23defb0db0e..273b191b50c 100644
--- a/solr/core/src/java/org/apache/solr/jersey/RequestContextKeys.java
+++ b/solr/core/src/java/org/apache/solr/jersey/RequestContextKeys.java
@@ -18,9 +18,9 @@
package org.apache.solr.jersey;
import com.codahale.metrics.Timer;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import jakarta.ws.rs.container.ContainerRequestContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.solr.client.api.model.SolrJerseyResponse;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.core.CoreContainer;
diff --git a/solr/core/src/java/org/apache/solr/jersey/SolrRequestAuthorizer.java b/solr/core/src/java/org/apache/solr/jersey/SolrRequestAuthorizer.java
index 3ff3baf5f70..7fa7a05f2a9 100644
--- a/solr/core/src/java/org/apache/solr/jersey/SolrRequestAuthorizer.java
+++ b/solr/core/src/java/org/apache/solr/jersey/SolrRequestAuthorizer.java
@@ -17,6 +17,8 @@
package org.apache.solr.jersey;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import jakarta.ws.rs.container.ContainerRequestContext;
import jakarta.ws.rs.container.ContainerRequestFilter;
import jakarta.ws.rs.container.ResourceInfo;
@@ -26,8 +28,6 @@ import jakarta.ws.rs.ext.Provider;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.security.AuthorizationContext;
diff --git a/solr/core/src/java/org/apache/solr/jersey/container/ContainerRequestUtils.java b/solr/core/src/java/org/apache/solr/jersey/container/ContainerRequestUtils.java
index a58795ed5ea..f3371c8f0e6 100644
--- a/solr/core/src/java/org/apache/solr/jersey/container/ContainerRequestUtils.java
+++ b/solr/core/src/java/org/apache/solr/jersey/container/ContainerRequestUtils.java
@@ -17,14 +17,14 @@
package org.apache.solr.jersey.container;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import jakarta.ws.rs.core.Configuration;
import jakarta.ws.rs.core.SecurityContext;
import java.net.URI;
import java.net.URISyntaxException;
import java.security.Principal;
import java.util.Enumeration;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.glassfish.jersey.internal.MapPropertiesDelegate;
import org.glassfish.jersey.server.ContainerRequest;
import org.glassfish.jersey.server.internal.ContainerUtils;
diff --git a/solr/core/src/java/org/apache/solr/jersey/container/JettyBridgeResponseWriter.java b/solr/core/src/java/org/apache/solr/jersey/container/JettyBridgeResponseWriter.java
index a93a2104dce..2a69acfafed 100644
--- a/solr/core/src/java/org/apache/solr/jersey/container/JettyBridgeResponseWriter.java
+++ b/solr/core/src/java/org/apache/solr/jersey/container/JettyBridgeResponseWriter.java
@@ -17,13 +17,13 @@
package org.apache.solr.jersey.container;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.lang.invoke.MethodHandles;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
-import javax.servlet.http.HttpServletResponse;
import org.glassfish.jersey.server.ContainerException;
import org.glassfish.jersey.server.ContainerResponse;
import org.glassfish.jersey.server.spi.ContainerResponseWriter;
diff --git a/solr/core/src/java/org/apache/solr/request/SolrRequestInfo.java b/solr/core/src/java/org/apache/solr/request/SolrRequestInfo.java
index ce0d8c139e2..a7d92859d26 100644
--- a/solr/core/src/java/org/apache/solr/request/SolrRequestInfo.java
+++ b/solr/core/src/java/org/apache/solr/request/SolrRequestInfo.java
@@ -16,6 +16,7 @@
*/
package org.apache.solr.request;
+import jakarta.servlet.http.HttpServletRequest;
import java.lang.invoke.MethodHandles;
import java.security.Principal;
import java.util.ArrayDeque;
@@ -26,7 +27,6 @@ import java.util.List;
import java.util.Optional;
import java.util.TimeZone;
import java.util.concurrent.atomic.AtomicReference;
-import javax.servlet.http.HttpServletRequest;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.util.ExecutorUtil;
import org.apache.solr.handler.component.ResponseBuilder;
diff --git a/solr/core/src/java/org/apache/solr/response/SolrQueryResponse.java b/solr/core/src/java/org/apache/solr/response/SolrQueryResponse.java
index dfa41c906a4..f799859a263 100644
--- a/solr/core/src/java/org/apache/solr/response/SolrQueryResponse.java
+++ b/solr/core/src/java/org/apache/solr/response/SolrQueryResponse.java
@@ -18,12 +18,12 @@ package org.apache.solr.response;
import static org.apache.solr.request.SolrQueryRequest.disallowPartialResults;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.Collection;
import java.util.Date;
import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
-import javax.servlet.http.HttpServletResponse;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
diff --git a/solr/core/src/java/org/apache/solr/security/AuditEvent.java b/solr/core/src/java/org/apache/solr/security/AuditEvent.java
index 316e83556f0..dc7de8b572b 100644
--- a/solr/core/src/java/org/apache/solr/security/AuditEvent.java
+++ b/solr/core/src/java/org/apache/solr/security/AuditEvent.java
@@ -20,6 +20,7 @@ import static org.apache.solr.security.AuditEvent.EventType.ANONYMOUS;
import static org.apache.solr.security.AuditEvent.EventType.ERROR;
import com.fasterxml.jackson.annotation.JsonIgnore;
+import jakarta.servlet.http.HttpServletRequest;
import java.lang.invoke.MethodHandles;
import java.security.Principal;
import java.util.Arrays;
@@ -31,7 +32,6 @@ import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.servlet.ServletUtils;
diff --git a/solr/core/src/java/org/apache/solr/security/AuthenticationPlugin.java b/solr/core/src/java/org/apache/solr/security/AuthenticationPlugin.java
index 1bd637bb13f..7c576020446 100644
--- a/solr/core/src/java/org/apache/solr/security/AuthenticationPlugin.java
+++ b/solr/core/src/java/org/apache/solr/security/AuthenticationPlugin.java
@@ -19,19 +19,19 @@ package org.apache.solr.security;
import com.codahale.metrics.Counter;
import com.codahale.metrics.Meter;
import com.codahale.metrics.Timer;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletResponse;
import java.security.Principal;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import javax.servlet.FilterChain;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
import org.apache.http.HttpRequest;
import org.apache.http.protocol.HttpContext;
import org.apache.solr.core.SolrInfoBean;
import org.apache.solr.metrics.SolrMetricsContext;
-import org.eclipse.jetty.client.api.Request;
+import org.eclipse.jetty.client.Request;
/**
* @lucene.experimental
diff --git a/solr/core/src/java/org/apache/solr/security/AuthorizationUtils.java b/solr/core/src/java/org/apache/solr/security/AuthorizationUtils.java
index 6ea768aa69b..d5489843f7b 100644
--- a/solr/core/src/java/org/apache/solr/security/AuthorizationUtils.java
+++ b/solr/core/src/java/org/apache/solr/security/AuthorizationUtils.java
@@ -23,13 +23,13 @@ import static org.apache.solr.common.params.CollectionParams.CollectionAction.DE
import static org.apache.solr.common.params.CollectionParams.CollectionAction.RELOAD;
import static org.apache.solr.servlet.HttpSolrCall.shouldAudit;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.http.HttpStatus;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.core.CoreContainer;
diff --git a/solr/core/src/java/org/apache/solr/security/BasicAuthPlugin.java b/solr/core/src/java/org/apache/solr/security/BasicAuthPlugin.java
index 07663c92f42..1d656d34b93 100644
--- a/solr/core/src/java/org/apache/solr/security/BasicAuthPlugin.java
+++ b/solr/core/src/java/org/apache/solr/security/BasicAuthPlugin.java
@@ -16,6 +16,9 @@
*/
package org.apache.solr.security;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
@@ -30,9 +33,6 @@ import java.util.Objects;
import java.util.Set;
import java.util.StringTokenizer;
import javax.security.auth.Subject;
-import javax.servlet.FilterChain;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.http.Header;
import org.apache.http.HttpHeaders;
import org.apache.http.HttpRequest;
@@ -47,7 +47,7 @@ import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.SpecProvider;
import org.apache.solr.common.util.CommandOperation;
import org.apache.solr.common.util.ValidatingJsonMap;
-import org.eclipse.jetty.client.api.Request;
+import org.eclipse.jetty.client.Request;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -247,7 +247,8 @@ public class BasicAuthPlugin extends AuthenticationPlugin
.encodeToString(
(principal.getName() + ":" + principal.getPassword())
.getBytes(StandardCharsets.UTF_8));
- request.header(HttpHeaders.AUTHORIZATION, "Basic " + userPassBase64);
+ request.headers(
+ httpFields -> httpFields.add(HttpHeaders.AUTHORIZATION, "Basic " + userPassBase64));
return true;
}
}
diff --git a/solr/core/src/java/org/apache/solr/security/CertAuthPlugin.java b/solr/core/src/java/org/apache/solr/security/CertAuthPlugin.java
index fa8d08f70fa..e8ce28c14a2 100644
--- a/solr/core/src/java/org/apache/solr/security/CertAuthPlugin.java
+++ b/solr/core/src/java/org/apache/solr/security/CertAuthPlugin.java
@@ -16,13 +16,13 @@
*/
package org.apache.solr.security;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.security.cert.X509Certificate;
import java.util.Map;
-import javax.servlet.FilterChain;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.http.HttpHeaders;
import org.apache.solr.common.util.StrUtils;
import org.apache.solr.core.CoreContainer;
diff --git a/solr/core/src/java/org/apache/solr/security/HttpServletAuthorizationContext.java b/solr/core/src/java/org/apache/solr/security/HttpServletAuthorizationContext.java
index 1f34807667f..54d913af9cb 100644
--- a/solr/core/src/java/org/apache/solr/security/HttpServletAuthorizationContext.java
+++ b/solr/core/src/java/org/apache/solr/security/HttpServletAuthorizationContext.java
@@ -17,10 +17,10 @@
package org.apache.solr.security;
+import jakarta.servlet.http.HttpServletRequest;
import java.security.Principal;
import java.util.Enumeration;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.servlet.ServletUtils;
diff --git a/solr/core/src/java/org/apache/solr/security/MultiAuthPlugin.java b/solr/core/src/java/org/apache/solr/security/MultiAuthPlugin.java
index 5027cec6377..be9bf3e21e7 100644
--- a/solr/core/src/java/org/apache/solr/security/MultiAuthPlugin.java
+++ b/solr/core/src/java/org/apache/solr/security/MultiAuthPlugin.java
@@ -16,6 +16,9 @@
*/
package org.apache.solr.security;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
@@ -24,9 +27,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.servlet.FilterChain;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.http.HttpHeaders;
import org.apache.http.HttpRequest;
import org.apache.http.protocol.HttpContext;
@@ -42,7 +42,7 @@ import org.apache.solr.common.util.ValidatingJsonMap;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.handler.admin.api.ModifyMultiPluginAuthConfigAPI;
import org.apache.solr.metrics.SolrMetricsContext;
-import org.eclipse.jetty.client.api.Request;
+import org.eclipse.jetty.client.Request;
/**
* Authentication plugin that supports multiple Authorization schemes, such as Bearer and Basic. The
diff --git a/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java b/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java
index e23c90e9b23..0dc91efc347 100644
--- a/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java
+++ b/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java
@@ -20,6 +20,9 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.solr.client.solrj.SolrRequest.METHOD.GET;
import com.google.common.annotations.VisibleForTesting;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.nio.ByteBuffer;
@@ -34,9 +37,6 @@ import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import javax.servlet.FilterChain;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.http.HttpEntity;
import org.apache.http.HttpException;
import org.apache.http.HttpHeaders;
@@ -58,7 +58,7 @@ import org.apache.solr.common.util.Utils;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.request.SolrRequestInfo;
import org.apache.solr.util.CryptoKeys;
-import org.eclipse.jetty.client.api.Request;
+import org.eclipse.jetty.client.Request;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -415,11 +415,12 @@ public class PKIAuthenticationPlugin extends AuthenticationPlugin
if ("v1".equals(System.getProperty(SEND_VERSION))) {
preFetchedUser
.map(PKIAuthenticationPlugin.this::generateToken)
- .ifPresent(token -> request.header(HEADER, token));
+ .ifPresent(token -> request.headers(httpFields -> httpFields.add(HEADER, token)));
} else {
preFetchedUser
.map(PKIAuthenticationPlugin.this::generateTokenV2)
- .ifPresent(token -> request.header(HEADER_V2, token));
+ .ifPresent(
+ token -> request.headers(httpFields -> httpFields.add(HEADER_V2, token)));
}
}
diff --git a/solr/core/src/java/org/apache/solr/servlet/CoordinatorHttpSolrCall.java b/solr/core/src/java/org/apache/solr/servlet/CoordinatorHttpSolrCall.java
index da8ca523fce..f28ffdafaaf 100644
--- a/solr/core/src/java/org/apache/solr/servlet/CoordinatorHttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/CoordinatorHttpSolrCall.java
@@ -17,12 +17,12 @@
package org.apache.solr.servlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.lang.invoke.MethodHandles;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.solr.api.CoordinatorV2HttpSolrCall;
import org.apache.solr.cloud.CloudDescriptor;
import org.apache.solr.cloud.api.collections.Assign;
diff --git a/solr/core/src/java/org/apache/solr/servlet/CoreContainerProvider.java b/solr/core/src/java/org/apache/solr/servlet/CoreContainerProvider.java
index a35dfc4d73f..8168a4791b2 100644
--- a/solr/core/src/java/org/apache/solr/servlet/CoreContainerProvider.java
+++ b/solr/core/src/java/org/apache/solr/servlet/CoreContainerProvider.java
@@ -29,6 +29,10 @@ import com.codahale.metrics.jvm.GarbageCollectorMetricSet;
import com.codahale.metrics.jvm.MemoryUsageGaugeSet;
import com.codahale.metrics.jvm.ThreadStatesGaugeSet;
import com.google.common.annotations.VisibleForTesting;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.UnavailableException;
import java.lang.invoke.MethodHandles;
import java.lang.management.ManagementFactory;
import java.lang.management.RuntimeMXBean;
@@ -44,10 +48,6 @@ import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.naming.NoInitialContextException;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.UnavailableException;
import org.apache.http.client.HttpClient;
import org.apache.lucene.store.MMapDirectory;
import org.apache.lucene.util.VectorUtil;
diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
index 7334a5bc47d..fee0c3d0c21 100644
--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
@@ -33,6 +33,8 @@ import static org.apache.solr.servlet.SolrDispatchFilter.Action.RETRY;
import static org.apache.solr.servlet.SolrDispatchFilter.Action.RETURN;
import io.opentelemetry.api.trace.Span;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
@@ -56,8 +58,6 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.function.Supplier;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import net.jcip.annotations.ThreadSafe;
import org.apache.http.Header;
import org.apache.http.HeaderIterator;
diff --git a/solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java b/solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java
index 436906d3a69..5ea82e46b9d 100644
--- a/solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java
+++ b/solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java
@@ -17,6 +17,9 @@
package org.apache.solr.servlet;
import com.google.common.net.HttpHeaders;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStreamWriter;
@@ -25,9 +28,6 @@ import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.commons.io.output.CloseShieldOutputStream;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.SolrCore;
diff --git a/solr/core/src/java/org/apache/solr/servlet/RateLimitManager.java b/solr/core/src/java/org/apache/solr/servlet/RateLimitManager.java
index 21aa0430254..3a5da1f39e9 100644
--- a/solr/core/src/java/org/apache/solr/servlet/RateLimitManager.java
+++ b/solr/core/src/java/org/apache/solr/servlet/RateLimitManager.java
@@ -20,12 +20,12 @@ package org.apache.solr.servlet;
import static org.apache.solr.common.params.CommonParams.SOLR_REQUEST_CONTEXT_PARAM;
import static org.apache.solr.common.params.CommonParams.SOLR_REQUEST_TYPE_PARAM;
+import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.lang.invoke.MethodHandles;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import javax.servlet.http.HttpServletRequest;
import net.jcip.annotations.ThreadSafe;
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.common.cloud.ClusterPropertiesListener;
diff --git a/solr/core/src/java/org/apache/solr/servlet/RedirectServlet.java b/solr/core/src/java/org/apache/solr/servlet/RedirectServlet.java
index a0c11b15a04..17610ffc431 100644
--- a/solr/core/src/java/org/apache/solr/servlet/RedirectServlet.java
+++ b/solr/core/src/java/org/apache/solr/servlet/RedirectServlet.java
@@ -16,12 +16,12 @@
*/
package org.apache.solr.servlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
/** A Simple redirection servlet to help us deprecate old UI elements */
public class RedirectServlet extends HttpServlet {
diff --git a/solr/core/src/java/org/apache/solr/servlet/ServletInputStreamWrapper.java b/solr/core/src/java/org/apache/solr/servlet/ServletInputStreamWrapper.java
index e1719a7404a..a220aa7d193 100644
--- a/solr/core/src/java/org/apache/solr/servlet/ServletInputStreamWrapper.java
+++ b/solr/core/src/java/org/apache/solr/servlet/ServletInputStreamWrapper.java
@@ -16,9 +16,9 @@
*/
package org.apache.solr.servlet;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletInputStream;
import java.io.IOException;
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
import org.apache.solr.common.util.SuppressForbidden;
/**
diff --git a/solr/core/src/java/org/apache/solr/servlet/ServletOutputStreamWrapper.java b/solr/core/src/java/org/apache/solr/servlet/ServletOutputStreamWrapper.java
index b8794066f8c..444dea9c0c4 100644
--- a/solr/core/src/java/org/apache/solr/servlet/ServletOutputStreamWrapper.java
+++ b/solr/core/src/java/org/apache/solr/servlet/ServletOutputStreamWrapper.java
@@ -16,9 +16,9 @@
*/
package org.apache.solr.servlet;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
import java.io.IOException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
import org.apache.solr.common.util.SuppressForbidden;
/**
diff --git a/solr/core/src/java/org/apache/solr/servlet/ServletUtils.java b/solr/core/src/java/org/apache/solr/servlet/ServletUtils.java
index e46771f8952..b1d6d7bbac2 100644
--- a/solr/core/src/java/org/apache/solr/servlet/ServletUtils.java
+++ b/solr/core/src/java/org/apache/solr/servlet/ServletUtils.java
@@ -19,6 +19,16 @@ package org.apache.solr.servlet;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.context.Context;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -27,16 +37,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.servlet.FilterChain;
-import javax.servlet.ReadListener;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
import org.apache.http.HttpHeaders;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
index 392fe02ab13..36e86a2c235 100644
--- a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
@@ -23,6 +23,13 @@ import static org.apache.solr.util.tracing.TraceUtils.getSpan;
import static org.apache.solr.util.tracing.TraceUtils.setTracer;
import com.google.common.annotations.VisibleForTesting;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.UnavailableException;
+import jakarta.servlet.http.HttpFilter;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.List;
@@ -30,13 +37,6 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import java.util.regex.Pattern;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.UnavailableException;
-import javax.servlet.http.HttpFilter;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.http.client.HttpClient;
import org.apache.solr.api.V2HttpCall;
import org.apache.solr.common.SolrException;
@@ -321,7 +321,7 @@ public class SolrDispatchFilter extends HttpFilter implements PathExcluder {
}
// For legacy reasons, upon successful authentication this wants to call the chain's next
// filter, which obfuscates the layout of the code since one usually expects to be able to
- // find the call to doFilter() in the implementation of javax.servlet.Filter. Supplying a
+ // find the call to doFilter() in the implementation of jakarta.servlet.Filter. Supplying a
// trivial impl here to keep existing code happy while making the flow clearer. Chain will
// be called after this method completes. Eventually auth all moves to its own filter
// (hopefully). Most auth plugins simply return true after calling this anyway, so they
diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
index 44db73a92e1..9c32b96135b 100644
--- a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
@@ -18,6 +18,9 @@ package org.apache.solr.servlet;
import static org.apache.solr.common.params.CommonParams.PATH;
+import jakarta.servlet.MultipartConfigElement;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Part;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -39,9 +42,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.servlet.MultipartConfigElement;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.Part;
import org.apache.commons.io.input.CloseShieldInputStream;
import org.apache.lucene.util.IOUtils;
import org.apache.solr.api.V2HttpCall;
diff --git a/solr/core/src/java/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java b/solr/core/src/java/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java
index f661a7d156e..c94b555aedd 100644
--- a/solr/core/src/java/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java
+++ b/solr/core/src/java/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java
@@ -16,14 +16,14 @@
*/
package org.apache.solr.servlet.cache;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.Base64;
import java.util.Collections;
import java.util.List;
import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.lucene.util.WeakIdentityMap;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
diff --git a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
index a8c3f7ffe6f..0c02662299b 100644
--- a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
+++ b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
@@ -431,7 +431,7 @@ public class SolrCmdDistributor implements Closeable {
// care when assembling the final response to check both the rollup and leader trackers on the
// aggregator node.
public void trackRequestResult(
- org.eclipse.jetty.client.api.Response resp, InputStream respBody, boolean success) {
+ org.eclipse.jetty.client.Response resp, InputStream respBody, boolean success) {
// Returning Integer.MAX_VALUE here means there was no "rf" on the response, therefore we just
// need to increment our achieved rf if we are a leader, i.e. have a leaderTracker.
diff --git a/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java b/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java
index 51381f4a582..5790fcf9aea 100644
--- a/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java
+++ b/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java
@@ -32,7 +32,7 @@ import org.apache.solr.client.solrj.impl.Http2SolrClient;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.StrUtils;
import org.apache.solr.update.SolrCmdDistributor.SolrError;
-import org.eclipse.jetty.client.api.Response;
+import org.eclipse.jetty.client.Response;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/solr/core/src/java/org/apache/solr/util/stats/InstrumentedHttpListenerFactory.java b/solr/core/src/java/org/apache/solr/util/stats/InstrumentedHttpListenerFactory.java
index d91d1f83b68..6af4bccaad3 100644
--- a/solr/core/src/java/org/apache/solr/util/stats/InstrumentedHttpListenerFactory.java
+++ b/solr/core/src/java/org/apache/solr/util/stats/InstrumentedHttpListenerFactory.java
@@ -29,8 +29,8 @@ import org.apache.solr.common.util.CollectionUtil;
import org.apache.solr.metrics.SolrMetricProducer;
import org.apache.solr.metrics.SolrMetricsContext;
import org.apache.solr.util.tracing.TraceUtils;
-import org.eclipse.jetty.client.api.Request;
-import org.eclipse.jetty.client.api.Result;
+import org.eclipse.jetty.client.Request;
+import org.eclipse.jetty.client.Result;
/**
* A HttpListenerFactory tracking metrics and distributed tracing. The Metrics are inspired and
diff --git a/solr/core/src/java/org/apache/solr/util/tracing/HttpServletRequestGetter.java b/solr/core/src/java/org/apache/solr/util/tracing/HttpServletRequestGetter.java
index f2756566ed9..c07c70c604a 100644
--- a/solr/core/src/java/org/apache/solr/util/tracing/HttpServletRequestGetter.java
+++ b/solr/core/src/java/org/apache/solr/util/tracing/HttpServletRequestGetter.java
@@ -17,8 +17,8 @@
package org.apache.solr.util.tracing;
import io.opentelemetry.context.propagation.TextMapGetter;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.Iterator;
-import javax.servlet.http.HttpServletRequest;
/**
* {@code HttpServletRequest} aware {@code TextMapGetter} that allows header data to be extracted
diff --git a/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java b/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java
index 63f8cd0d04c..e77b0e4f7e3 100644
--- a/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java
+++ b/solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java
@@ -26,13 +26,13 @@ import io.opentelemetry.api.trace.Tracer;
import io.opentelemetry.context.Context;
import io.opentelemetry.context.propagation.TextMapPropagator;
import io.opentelemetry.context.propagation.TextMapSetter;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.function.Consumer;
import java.util.function.Predicate;
-import javax.servlet.http.HttpServletRequest;
import org.apache.http.HttpRequest;
import org.apache.solr.request.SolrQueryRequest;
-import org.eclipse.jetty.client.api.Request;
+import org.eclipse.jetty.client.Request;
/** Utilities for distributed tracing. */
public class TraceUtils {
diff --git a/solr/core/src/test/org/apache/solr/cli/PackageToolTest.java b/solr/core/src/test/org/apache/solr/cli/PackageToolTest.java
index e7a59053a81..47f3f345f73 100644
--- a/solr/core/src/test/org/apache/solr/cli/PackageToolTest.java
+++ b/solr/core/src/test/org/apache/solr/cli/PackageToolTest.java
@@ -35,8 +35,8 @@ import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.handler.DefaultHandler;
-import org.eclipse.jetty.server.handler.HandlerList;
import org.eclipse.jetty.server.handler.ResourceHandler;
+import org.eclipse.jetty.util.resource.PathResourceFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -404,13 +404,13 @@ public class PackageToolTest extends SolrCloudTestCase {
server.setStopAtShutdown(true);
ResourceHandler resourceHandler = new ResourceHandler();
- resourceHandler.setResourceBase(resourceDir);
- resourceHandler.setDirectoriesListed(true);
+ resourceHandler.setBaseResource(new PathResourceFactory().newResource(resourceDir));
- HandlerList handlers = new HandlerList();
- handlers.setHandlers(new Handler[] {resourceHandler, new DefaultHandler()});
- server.setHandler(handlers);
+ Handler.Sequence sequence = new Handler.Sequence();
+ sequence.addHandler(resourceHandler);
+ sequence.addHandler(new DefaultHandler());
+ server.setHandler(sequence);
server.start();
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/CloudExitableDirectoryReaderTest.java b/solr/core/src/test/org/apache/solr/cloud/CloudExitableDirectoryReaderTest.java
index a83a6e7fec6..6ccce2788c9 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CloudExitableDirectoryReaderTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CloudExitableDirectoryReaderTest.java
@@ -106,7 +106,7 @@ public class CloudExitableDirectoryReaderTest extends SolrCloudTestCase {
((Metered)
metricRegistry
.getMetrics()
- .get("org.eclipse.jetty.servlet.ServletContextHandler.2xx-responses"))
+ .get("org.eclipse.jetty.ee10.servlet.ServletContextHandler.2xx-responses"))
.getCount();
Metered old =
@@ -115,7 +115,7 @@ public class CloudExitableDirectoryReaderTest extends SolrCloudTestCase {
(Metered)
metricRegistry
.getMetrics()
- .get("org.eclipse.jetty.servlet.ServletContextHandler.5xx-responses"));
+ .get("org.eclipse.jetty.ee10.servlet.ServletContextHandler.5xx-responses"));
assertNull("expecting uniq nodenames", old);
}
assertTrue("expecting some http activity during collection creation", httpOk > 0);
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java b/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java
index c8577302c8d..33db91dd0aa 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java
@@ -16,11 +16,11 @@
*/
package org.apache.solr.cloud;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.lang.invoke.MethodHandles;
import java.util.Map;
-import javax.servlet.FilterChain;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.http.HttpRequestInterceptor;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrQuery;
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java
index 1ed5c1568bb..cc0644364bf 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java
@@ -21,6 +21,10 @@ import static org.apache.solr.common.params.CommonParams.NAME;
import static org.apache.solr.core.ConfigSetProperties.DEFAULT_FILENAME;
import static org.hamcrest.CoreMatchers.containsString;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.ByteArrayInputStream;
import java.io.FileInputStream;
import java.io.IOException;
@@ -51,10 +55,6 @@ import java.util.stream.Stream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
import javax.script.ScriptEngineManager;
-import javax.servlet.FilterChain;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
import org.apache.commons.io.file.PathUtils;
import org.apache.http.HttpEntity;
import org.apache.http.auth.BasicUserPrincipal;
diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
index c9a16e26d5a..84f6fc51778 100644
--- a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
+++ b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
@@ -54,7 +54,7 @@ import org.apache.solr.util.RESTfulServerProvider;
import org.apache.solr.util.RestTestBase;
import org.apache.solr.util.RestTestHarness;
import org.apache.solr.util.TimeOut;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
import org.junit.After;
import org.junit.Before;
import org.noggit.JSONParser;
diff --git a/solr/core/src/test/org/apache/solr/request/TestStreamBody.java b/solr/core/src/test/org/apache/solr/request/TestStreamBody.java
index 4fb530d2594..13c793913c7 100644
--- a/solr/core/src/test/org/apache/solr/request/TestStreamBody.java
+++ b/solr/core/src/test/org/apache/solr/request/TestStreamBody.java
@@ -26,7 +26,7 @@ import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.util.RestTestBase;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
import org.junit.After;
import org.junit.Test;
import org.slf4j.Logger;
diff --git a/solr/core/src/test/org/apache/solr/rest/SolrRestletTestBase.java b/solr/core/src/test/org/apache/solr/rest/SolrRestletTestBase.java
index 90fc33ab952..9289b33447e 100644
--- a/solr/core/src/test/org/apache/solr/rest/SolrRestletTestBase.java
+++ b/solr/core/src/test/org/apache/solr/rest/SolrRestletTestBase.java
@@ -21,7 +21,7 @@ import java.util.Properties;
import java.util.SortedMap;
import java.util.TreeMap;
import org.apache.solr.util.RestTestBase;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
import org.junit.BeforeClass;
/**
diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestSerializedLuceneMatchVersion.java b/solr/core/src/test/org/apache/solr/rest/schema/TestSerializedLuceneMatchVersion.java
index 463861f517e..3f8c6f8f505 100644
--- a/solr/core/src/test/org/apache/solr/rest/schema/TestSerializedLuceneMatchVersion.java
+++ b/solr/core/src/test/org/apache/solr/rest/schema/TestSerializedLuceneMatchVersion.java
@@ -19,7 +19,7 @@ package org.apache.solr.rest.schema;
import java.util.SortedMap;
import java.util.TreeMap;
import org.apache.solr.util.RestTestBase;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java
index 676736db094..5d5293b62f9 100644
--- a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java
+++ b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java
@@ -23,7 +23,7 @@ import java.util.TreeMap;
import org.apache.commons.io.file.PathUtils;
import org.apache.solr.common.util.Utils;
import org.apache.solr.util.RestTestBase;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java
index 9767d8173e0..0609dc7749c 100644
--- a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java
+++ b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java
@@ -29,7 +29,7 @@ import java.util.SortedMap;
import java.util.TreeMap;
import org.apache.commons.io.file.PathUtils;
import org.apache.solr.util.RestTestBase;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymGraphFilterFactory.java b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymGraphFilterFactory.java
index 9bcb3745359..249b62e86e8 100644
--- a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymGraphFilterFactory.java
+++ b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymGraphFilterFactory.java
@@ -30,7 +30,7 @@ import java.util.SortedMap;
import java.util.TreeMap;
import org.apache.commons.io.file.PathUtils;
import org.apache.solr.util.RestTestBase;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/solr/core/src/test/org/apache/solr/schema/TestCloudSchemaless.java b/solr/core/src/test/org/apache/solr/schema/TestCloudSchemaless.java
index 0bb42c3afd8..3528d548e8f 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestCloudSchemaless.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestCloudSchemaless.java
@@ -30,7 +30,7 @@ import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.util.BaseTestHarness;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
import org.junit.After;
import org.junit.Test;
import org.slf4j.Logger;
diff --git a/solr/core/src/test/org/apache/solr/security/CertAuthPluginTest.java b/solr/core/src/test/org/apache/solr/security/CertAuthPluginTest.java
index b42ce94dcd1..e724ad7ab6e 100644
--- a/solr/core/src/test/org/apache/solr/security/CertAuthPluginTest.java
+++ b/solr/core/src/test/org/apache/solr/security/CertAuthPluginTest.java
@@ -23,12 +23,12 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.security.cert.X509Certificate;
import java.util.Collections;
import javax.security.auth.x500.X500Principal;
-import javax.servlet.FilterChain;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.solr.SolrTestCaseJ4;
import org.junit.Before;
import org.junit.BeforeClass;
diff --git a/solr/core/src/test/org/apache/solr/security/MockAuthenticationPlugin.java b/solr/core/src/test/org/apache/solr/security/MockAuthenticationPlugin.java
index ef54822a162..475ca3d79e1 100644
--- a/solr/core/src/test/org/apache/solr/security/MockAuthenticationPlugin.java
+++ b/solr/core/src/test/org/apache/solr/security/MockAuthenticationPlugin.java
@@ -16,17 +16,17 @@
*/
package org.apache.solr.security;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.security.Principal;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Predicate;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.http.auth.BasicUserPrincipal;
public class MockAuthenticationPlugin extends AuthenticationPlugin {
diff --git a/solr/core/src/test/org/apache/solr/security/MultiAuthPluginTest.java b/solr/core/src/test/org/apache/solr/security/MultiAuthPluginTest.java
index 4f5810744eb..9376be86397 100644
--- a/solr/core/src/test/org/apache/solr/security/MultiAuthPluginTest.java
+++ b/solr/core/src/test/org/apache/solr/security/MultiAuthPluginTest.java
@@ -23,6 +23,9 @@ import static org.apache.solr.security.BasicAuthStandaloneTest.createAndStartJet
import static org.apache.solr.security.BasicAuthStandaloneTest.doHttpPost;
import static org.apache.solr.security.BasicAuthStandaloneTest.doHttpPostWithHeader;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.Serializable;
import java.nio.charset.StandardCharsets;
@@ -35,9 +38,6 @@ import java.util.Map;
import java.util.Objects;
import java.util.function.Predicate;
import java.util.stream.Collectors;
-import javax.servlet.FilterChain;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.http.Header;
import org.apache.http.HttpHeaders;
import org.apache.http.HttpResponse;
diff --git a/solr/core/src/test/org/apache/solr/security/PKIAuthenticationIntegrationTest.java b/solr/core/src/test/org/apache/solr/security/PKIAuthenticationIntegrationTest.java
index ec07f7365b0..9f016ab2647 100644
--- a/solr/core/src/test/org/apache/solr/security/PKIAuthenticationIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/security/PKIAuthenticationIntegrationTest.java
@@ -18,11 +18,11 @@ package org.apache.solr.security;
import static java.util.Collections.singletonMap;
+import jakarta.servlet.http.HttpServletRequest;
import java.lang.invoke.MethodHandles;
import java.security.Principal;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.servlet.http.HttpServletRequest;
import org.apache.http.client.HttpClient;
import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
diff --git a/solr/core/src/test/org/apache/solr/security/TestPKIAuthenticationPlugin.java b/solr/core/src/test/org/apache/solr/security/TestPKIAuthenticationPlugin.java
index 5c2cdd39c92..86c4d788478 100644
--- a/solr/core/src/test/org/apache/solr/security/TestPKIAuthenticationPlugin.java
+++ b/solr/core/src/test/org/apache/solr/security/TestPKIAuthenticationPlugin.java
@@ -23,16 +23,16 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.nio.ByteBuffer;
import java.security.Principal;
import java.security.PublicKey;
import java.time.Instant;
import java.util.Base64;
import java.util.concurrent.atomic.AtomicReference;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.http.Header;
import org.apache.http.HttpHeaders;
import org.apache.http.auth.BasicUserPrincipal;
diff --git a/solr/core/src/test/org/apache/solr/servlet/HttpSolrCallCloudTest.java b/solr/core/src/test/org/apache/solr/servlet/HttpSolrCallCloudTest.java
index 7fff377d3a3..7e6fbf8bd07 100644
--- a/solr/core/src/test/org/apache/solr/servlet/HttpSolrCallCloudTest.java
+++ b/solr/core/src/test/org/apache/solr/servlet/HttpSolrCallCloudTest.java
@@ -17,22 +17,43 @@
package org.apache.solr.servlet;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.UnavailableException;
+import jakarta.servlet.WriteListener;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpUpgradeHandler;
+import jakarta.servlet.http.Part;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
import java.net.HttpURLConnection;
import java.net.URI;
+import java.security.Principal;
+import java.util.Collection;
+import java.util.Enumeration;
import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
import java.util.Set;
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.UnavailableException;
-import javax.servlet.WriteListener;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.cloud.AbstractDistribZkTestBase;
import org.apache.solr.cloud.SolrCloudTestCase;
import org.apache.solr.embedded.JettySolrRunner;
-import org.eclipse.jetty.server.Request;
-import org.eclipse.jetty.server.Response;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -93,40 +114,66 @@ public class HttpSolrCallCloudTest extends SolrCloudTestCase {
assertEquals(numCores, coreNames.size());
}
- private static class TestResponse extends Response {
+ public static class TestRequest implements HttpServletRequest {
+ private final String path;
- public TestResponse() {
- super(null, null);
+ public TestRequest(String path) {
+ this.path = path;
}
@Override
- public ServletOutputStream getOutputStream() {
- return new ServletOutputStream() {
- @Override
- public boolean isReady() {
- return true;
- }
+ public String getAuthType() {
+ return "";
+ }
- @Override
- public void setWriteListener(WriteListener writeListener) {}
+ @Override
+ public Cookie[] getCookies() {
+ return new Cookie[0];
+ }
- @Override
- public void write(int b) {}
- };
+ @Override
+ public long getDateHeader(String name) {
+ return 0;
}
@Override
- public boolean isCommitted() {
- return true;
+ public String getHeader(String name) {
+ return "";
}
- }
- private static class TestRequest extends Request {
- private String path;
+ @Override
+ public Enumeration<String> getHeaders(String name) {
+ return null;
+ }
- public TestRequest(String path) {
- super(null, null);
- this.path = path;
+ @Override
+ public Enumeration<String> getHeaderNames() {
+ return null;
+ }
+
+ @Override
+ public int getIntHeader(String name) {
+ return 0;
+ }
+
+ @Override
+ public String getMethod() {
+ return "";
+ }
+
+ @Override
+ public String getPathInfo() {
+ return "";
+ }
+
+ @Override
+ public String getPathTranslated() {
+ return "";
+ }
+
+ @Override
+ public String getContextPath() {
+ return "";
}
@Override
@@ -135,13 +182,23 @@ public class HttpSolrCallCloudTest extends SolrCloudTestCase {
}
@Override
- public String getContentType() {
- return "application/json";
+ public String getRemoteUser() {
+ return "";
}
@Override
- public String getServletPath() {
- return path;
+ public boolean isUserInRole(String role) {
+ return false;
+ }
+
+ @Override
+ public Principal getUserPrincipal() {
+ return null;
+ }
+
+ @Override
+ public String getRequestedSessionId() {
+ return "";
}
@Override
@@ -150,7 +207,112 @@ public class HttpSolrCallCloudTest extends SolrCloudTestCase {
}
@Override
- public ServletInputStream getInputStream() {
+ public StringBuffer getRequestURL() {
+ return null;
+ }
+
+ @Override
+ public String getServletPath() {
+ return path;
+ }
+
+ @Override
+ public HttpSession getSession(boolean create) {
+ return null;
+ }
+
+ @Override
+ public HttpSession getSession() {
+ return null;
+ }
+
+ @Override
+ public String changeSessionId() {
+ return "";
+ }
+
+ @Override
+ public boolean isRequestedSessionIdValid() {
+ return false;
+ }
+
+ @Override
+ public boolean isRequestedSessionIdFromCookie() {
+ return false;
+ }
+
+ @Override
+ public boolean isRequestedSessionIdFromURL() {
+ return false;
+ }
+
+ @Override
+ public boolean isRequestedSessionIdFromUrl() {
+ return false;
+ }
+
+ @Override
+ public boolean authenticate(HttpServletResponse response) throws IOException, ServletException {
+ return false;
+ }
+
+ @Override
+ public void login(String username, String password) throws ServletException {}
+
+ @Override
+ public void logout() throws ServletException {}
+
+ @Override
+ public Collection<Part> getParts() throws IOException, ServletException {
+ return List.of();
+ }
+
+ @Override
+ public Part getPart(String name) throws IOException, ServletException {
+ return null;
+ }
+
+ @Override
+ public <T extends HttpUpgradeHandler> T upgrade(Class<T> handlerClass)
+ throws IOException, ServletException {
+ return null;
+ }
+
+ @Override
+ public Object getAttribute(String name) {
+ return null;
+ }
+
+ @Override
+ public Enumeration<String> getAttributeNames() {
+ return null;
+ }
+
+ @Override
+ public String getCharacterEncoding() {
+ return "";
+ }
+
+ @Override
+ public void setCharacterEncoding(String env) throws UnsupportedEncodingException {}
+
+ @Override
+ public int getContentLength() {
+ return 0;
+ }
+
+ @Override
+ public long getContentLengthLong() {
+ return 0;
+ }
+
+ @Override
+ public String getContentType() {
+ return "application/json";
+ }
+
+ @Override
+ public ServletInputStream getInputStream() throws IOException {
return new ServletInputStream() {
@Override
public boolean isFinished() {
@@ -171,5 +333,304 @@ public class HttpSolrCallCloudTest extends SolrCloudTestCase {
}
};
}
+
+ @Override
+ public String getParameter(String name) {
+ return "";
+ }
+
+ @Override
+ public Enumeration<String> getParameterNames() {
+ return null;
+ }
+
+ @Override
+ public String[] getParameterValues(String name) {
+ return new String[0];
+ }
+
+ @Override
+ public Map<String, String[]> getParameterMap() {
+ return Map.of();
+ }
+
+ @Override
+ public String getProtocol() {
+ return "";
+ }
+
+ @Override
+ public String getScheme() {
+ return "";
+ }
+
+ @Override
+ public String getServerName() {
+ return "";
+ }
+
+ @Override
+ public int getServerPort() {
+ return 0;
+ }
+
+ @Override
+ public BufferedReader getReader() throws IOException {
+ return null;
+ }
+
+ @Override
+ public String getRemoteAddr() {
+ return "";
+ }
+
+ @Override
+ public String getRemoteHost() {
+ return "";
+ }
+
+ @Override
+ public void setAttribute(String name, Object o) {}
+
+ @Override
+ public void removeAttribute(String name) {}
+
+ @Override
+ public Locale getLocale() {
+ return null;
+ }
+
+ @Override
+ public Enumeration<Locale> getLocales() {
+ return null;
+ }
+
+ @Override
+ public boolean isSecure() {
+ return false;
+ }
+
+ @Override
+ public RequestDispatcher getRequestDispatcher(String path) {
+ return null;
+ }
+
+ @Override
+ public String getRealPath(String path) {
+ return "";
+ }
+
+ @Override
+ public int getRemotePort() {
+ return 0;
+ }
+
+ @Override
+ public String getLocalName() {
+ return "";
+ }
+
+ @Override
+ public String getLocalAddr() {
+ return "";
+ }
+
+ @Override
+ public int getLocalPort() {
+ return 0;
+ }
+
+ @Override
+ public ServletContext getServletContext() {
+ return null;
+ }
+
+ @Override
+ public AsyncContext startAsync() throws IllegalStateException {
+ return null;
+ }
+
+ @Override
+ public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse)
+ throws IllegalStateException {
+ return null;
+ }
+
+ @Override
+ public boolean isAsyncStarted() {
+ return false;
+ }
+
+ @Override
+ public boolean isAsyncSupported() {
+ return false;
+ }
+
+ @Override
+ public AsyncContext getAsyncContext() {
+ return null;
+ }
+
+ @Override
+ public DispatcherType getDispatcherType() {
+ return null;
+ }
+ }
+
+ public static class TestResponse implements HttpServletResponse {
+
+ @Override
+ public void addCookie(Cookie cookie) {}
+
+ @Override
+ public boolean containsHeader(String name) {
+ return false;
+ }
+
+ @Override
+ public String encodeURL(String url) {
+ return "";
+ }
+
+ @Override
+ public String encodeRedirectURL(String url) {
+ return "";
+ }
+
+ @Override
+ public String encodeUrl(String url) {
+ return "";
+ }
+
+ @Override
+ public String encodeRedirectUrl(String url) {
+ return "";
+ }
+
+ @Override
+ public void sendError(int sc, String msg) throws IOException {}
+
+ @Override
+ public void sendError(int sc) throws IOException {}
+
+ @Override
+ public void sendRedirect(String location) throws IOException {}
+
+ @Override
+ public void setDateHeader(String name, long date) {}
+
+ @Override
+ public void addDateHeader(String name, long date) {}
+
+ @Override
+ public void setHeader(String name, String value) {}
+
+ @Override
+ public void addHeader(String name, String value) {}
+
+ @Override
+ public void setIntHeader(String name, int value) {}
+
+ @Override
+ public void addIntHeader(String name, int value) {}
+
+ @Override
+ public void setStatus(int sc) {}
+
+ @Override
+ public void setStatus(int sc, String sm) {}
+
+ @Override
+ public int getStatus() {
+ return 0;
+ }
+
+ @Override
+ public String getHeader(String name) {
+ return "";
+ }
+
+ @Override
+ public Collection<String> getHeaders(String name) {
+ return List.of();
+ }
+
+ @Override
+ public Collection<String> getHeaderNames() {
+ return List.of();
+ }
+
+ @Override
+ public String getCharacterEncoding() {
+ return "";
+ }
+
+ @Override
+ public String getContentType() {
+ return "";
+ }
+
+ @Override
+ public ServletOutputStream getOutputStream() throws IOException {
+ return new ServletOutputStream() {
+ @Override
+ public boolean isReady() {
+ return true;
+ }
+
+ @Override
+ public void setWriteListener(WriteListener writeListener) {}
+
+ @Override
+ public void write(int b) {}
+ };
+ }
+
+ @Override
+ public PrintWriter getWriter() throws IOException {
+ return null;
+ }
+
+ @Override
+ public void setCharacterEncoding(String charset) {}
+
+ @Override
+ public void setContentLength(int len) {}
+
+ @Override
+ public void setContentLengthLong(long len) {}
+
+ @Override
+ public void setContentType(String type) {}
+
+ @Override
+ public void setBufferSize(int size) {}
+
+ @Override
+ public int getBufferSize() {
+ return 0;
+ }
+
+ @Override
+ public void flushBuffer() throws IOException {}
+
+ @Override
+ public void resetBuffer() {}
+
+ @Override
+ public boolean isCommitted() {
+ return true;
+ }
+
+ @Override
+ public void reset() {}
+
+ @Override
+ public void setLocale(Locale loc) {}
+
+ @Override
+ public Locale getLocale() {
+ return null;
+ }
}
}
diff --git a/solr/core/src/test/org/apache/solr/servlet/LoadAdminUiServletTest.java b/solr/core/src/test/org/apache/solr/servlet/LoadAdminUiServletTest.java
index 299029f86f7..f22292e6474 100644
--- a/solr/core/src/test/org/apache/solr/servlet/LoadAdminUiServletTest.java
+++ b/solr/core/src/test/org/apache/solr/servlet/LoadAdminUiServletTest.java
@@ -22,16 +22,16 @@ import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.Set;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.core.CoreContainer;
import org.junit.After;
diff --git a/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java b/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java
index 0937a432efd..fe56c82a7f8 100644
--- a/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java
+++ b/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java
@@ -20,6 +20,9 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -34,9 +37,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.CommonParams;
diff --git a/solr/core/src/test/org/apache/solr/servlet/TestRequestRateLimiter.java b/solr/core/src/test/org/apache/solr/servlet/TestRequestRateLimiter.java
index cbe18c8431c..53a65ad7f40 100644
--- a/solr/core/src/test/org/apache/solr/servlet/TestRequestRateLimiter.java
+++ b/solr/core/src/test/org/apache/solr/servlet/TestRequestRateLimiter.java
@@ -23,10 +23,31 @@ import static org.apache.solr.servlet.RateLimitManager.DEFAULT_SLOT_ACQUISITION_
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.instanceOf;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpUpgradeHandler;
+import jakarta.servlet.http.Part;
+import java.io.BufferedReader;
import java.io.Closeable;
import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.security.Principal;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
import java.util.List;
+import java.util.Locale;
+import java.util.Map;
import java.util.Random;
import java.util.concurrent.Callable;
import java.util.concurrent.CountDownLatch;
@@ -37,7 +58,6 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.LongAdder;
-import javax.servlet.http.HttpServletRequest;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrRequest;
@@ -50,7 +70,6 @@ import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.util.ExecutorUtil;
import org.apache.solr.core.RateLimiterConfig;
-import org.eclipse.jetty.server.Request;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -277,17 +296,30 @@ public class TestRequestRateLimiter extends SolrCloudTestCase {
private static final HttpServletRequest QUERY_REQ = new DummyRequest(null, "QUERY");
private static final HttpServletRequest UPDATE_REQ = new DummyRequest(null, "UPDATE");
- private static class DummyRequest extends Request {
-
+ private static class DummyRequest implements HttpServletRequest {
private final String ctx;
private final String type;
public DummyRequest(String ctx, String type) {
- super(null, null);
this.ctx = ctx;
this.type = type;
}
+ @Override
+ public String getAuthType() {
+ return "";
+ }
+
+ @Override
+ public Cookie[] getCookies() {
+ return new Cookie[0];
+ }
+
+ @Override
+ public long getDateHeader(String name) {
+ return 0;
+ }
+
@Override
public String getHeader(String name) {
switch (name) {
@@ -299,6 +331,323 @@ public class TestRequestRateLimiter extends SolrCloudTestCase {
throw new IllegalArgumentException();
}
}
+
+ @Override
+ public Enumeration<String> getHeaders(String name) {
+ return null;
+ }
+
+ @Override
+ public Enumeration<String> getHeaderNames() {
+ return null;
+ }
+
+ @Override
+ public int getIntHeader(String name) {
+ return 0;
+ }
+
+ @Override
+ public String getMethod() {
+ return "";
+ }
+
+ @Override
+ public String getPathInfo() {
+ return "";
+ }
+
+ @Override
+ public String getPathTranslated() {
+ return "";
+ }
+
+ @Override
+ public String getContextPath() {
+ return "";
+ }
+
+ @Override
+ public String getQueryString() {
+ return "";
+ }
+
+ @Override
+ public String getRemoteUser() {
+ return "";
+ }
+
+ @Override
+ public boolean isUserInRole(String role) {
+ return false;
+ }
+
+ @Override
+ public Principal getUserPrincipal() {
+ return null;
+ }
+
+ @Override
+ public String getRequestedSessionId() {
+ return "";
+ }
+
+ @Override
+ public String getRequestURI() {
+ return "";
+ }
+
+ @Override
+ public StringBuffer getRequestURL() {
+ return null;
+ }
+
+ @Override
+ public String getServletPath() {
+ return "";
+ }
+
+ @Override
+ public HttpSession getSession(boolean create) {
+ return null;
+ }
+
+ @Override
+ public HttpSession getSession() {
+ return null;
+ }
+
+ @Override
+ public String changeSessionId() {
+ return "";
+ }
+
+ @Override
+ public boolean isRequestedSessionIdValid() {
+ return false;
+ }
+
+ @Override
+ public boolean isRequestedSessionIdFromCookie() {
+ return false;
+ }
+
+ @Override
+ public boolean isRequestedSessionIdFromURL() {
+ return false;
+ }
+
+ @Override
+ public boolean isRequestedSessionIdFromUrl() {
+ return false;
+ }
+
+ @Override
+ public boolean authenticate(HttpServletResponse response) throws IOException, ServletException {
+ return false;
+ }
+
+ @Override
+ public void login(String username, String password) throws ServletException {}
+
+ @Override
+ public void logout() throws ServletException {}
+
+ @Override
+ public Collection<Part> getParts() throws IOException, ServletException {
+ return List.of();
+ }
+
+ @Override
+ public Part getPart(String name) throws IOException, ServletException {
+ return null;
+ }
+
+ @Override
+ public <T extends HttpUpgradeHandler> T upgrade(Class<T> handlerClass)
+ throws IOException, ServletException {
+ return null;
+ }
+
+ @Override
+ public Object getAttribute(String name) {
+ return null;
+ }
+
+ @Override
+ public Enumeration<String> getAttributeNames() {
+ return null;
+ }
+
+ @Override
+ public String getCharacterEncoding() {
+ return "";
+ }
+
+ @Override
+ public void setCharacterEncoding(String env) throws UnsupportedEncodingException {}
+
+ @Override
+ public int getContentLength() {
+ return 0;
+ }
+
+ @Override
+ public long getContentLengthLong() {
+ return 0;
+ }
+
+ @Override
+ public String getContentType() {
+ return "";
+ }
+
+ @Override
+ public ServletInputStream getInputStream() throws IOException {
+ return null;
+ }
+
+ @Override
+ public String getParameter(String name) {
+ return "";
+ }
+
+ @Override
+ public Enumeration<String> getParameterNames() {
+ return null;
+ }
+
+ @Override
+ public String[] getParameterValues(String name) {
+ return new String[0];
+ }
+
+ @Override
+ public Map<String, String[]> getParameterMap() {
+ return Map.of();
+ }
+
+ @Override
+ public String getProtocol() {
+ return "";
+ }
+
+ @Override
+ public String getScheme() {
+ return "";
+ }
+
+ @Override
+ public String getServerName() {
+ return "";
+ }
+
+ @Override
+ public int getServerPort() {
+ return 0;
+ }
+
+ @Override
+ public BufferedReader getReader() throws IOException {
+ return null;
+ }
+
+ @Override
+ public String getRemoteAddr() {
+ return "";
+ }
+
+ @Override
+ public String getRemoteHost() {
+ return "";
+ }
+
+ @Override
+ public void setAttribute(String name, Object o) {}
+
+ @Override
+ public void removeAttribute(String name) {}
+
+ @Override
+ public Locale getLocale() {
+ return null;
+ }
+
+ @Override
+ public Enumeration<Locale> getLocales() {
+ return null;
+ }
+
+ @Override
+ public boolean isSecure() {
+ return false;
+ }
+
+ @Override
+ public RequestDispatcher getRequestDispatcher(String path) {
+ return null;
+ }
+
+ @Override
+ public String getRealPath(String path) {
+ return "";
+ }
+
+ @Override
+ public int getRemotePort() {
+ return 0;
+ }
+
+ @Override
+ public String getLocalName() {
+ return "";
+ }
+
+ @Override
+ public String getLocalAddr() {
+ return "";
+ }
+
+ @Override
+ public int getLocalPort() {
+ return 0;
+ }
+
+ @Override
+ public ServletContext getServletContext() {
+ return null;
+ }
+
+ @Override
+ public AsyncContext startAsync() throws IllegalStateException {
+ return null;
+ }
+
+ @Override
+ public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse)
+ throws IllegalStateException {
+ return null;
+ }
+
+ @Override
+ public boolean isAsyncStarted() {
+ return false;
+ }
+
+ @Override
+ public boolean isAsyncSupported() {
+ return false;
+ }
+
+ @Override
+ public AsyncContext getAsyncContext() {
+ return null;
+ }
+
+ @Override
+ public DispatcherType getDispatcherType() {
+ return null;
+ }
}
@Nightly
diff --git a/solr/core/src/test/org/apache/solr/util/tracing/TestHttpServletRequestGetter.java b/solr/core/src/test/org/apache/solr/util/tracing/TestHttpServletRequestGetter.java
index d2b5fdf9bbb..38417d81369 100644
--- a/solr/core/src/test/org/apache/solr/util/tracing/TestHttpServletRequestGetter.java
+++ b/solr/core/src/test/org/apache/solr/util/tracing/TestHttpServletRequestGetter.java
@@ -17,6 +17,10 @@
package org.apache.solr.util.tracing;
+import static org.mockito.Mockito.mock;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
@@ -24,13 +28,18 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import org.apache.solr.SolrTestCase;
-import org.eclipse.jetty.server.Request;
+import org.apache.solr.SolrTestCaseJ4;
+import org.junit.Before;
import org.junit.Test;
-public class TestHttpServletRequestGetter extends SolrTestCase {
+public class TestHttpServletRequestGetter extends SolrTestCaseJ4 {
+
+ @Override
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ assumeWorkingMockito();
+ }
@Test
public void test() {
@@ -40,8 +49,9 @@ public class TestHttpServletRequestGetter extends SolrTestCase {
"b", Set.of("1"),
"c", Set.of("2"));
+ HttpServletRequest httpServletRequestMock = mock(HttpServletRequest.class);
HttpServletRequest req =
- new HttpServletRequestWrapper(new Request(null, null)) {
+ new HttpServletRequestWrapper(httpServletRequestMock) {
@Override
public String getHeader(String name) {
diff --git a/solr/cross-dc-manager/build.gradle b/solr/cross-dc-manager/build.gradle
index 5083a06c589..f037f8b85f9 100644
--- a/solr/cross-dc-manager/build.gradle
+++ b/solr/cross-dc-manager/build.gradle
@@ -31,7 +31,7 @@ dependencies {
implementation libs.dropwizard.metrics.core
implementation libs.dropwizard.metrics.servlets
implementation libs.eclipse.jetty.server
- implementation libs.eclipse.jetty.servlet
+ implementation libs.eclipse.jetty.ee10.servlet
implementation libs.slf4j.api
runtimeOnly libs.google.protobuf.javautils
runtimeOnly libs.commonscodec.commonscodec
diff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfile
index 07efb3712e3..a3924b7db3e 100644
--- a/solr/cross-dc-manager/gradle.lockfile
+++ b/solr/cross-dc-manager/gradle.lockfile
@@ -53,11 +53,12 @@ io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,t
io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-healthchecks:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-io.dropwizard.metrics:metrics-jetty10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jakarta-servlets:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-json:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-jvm:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-io.dropwizard.metrics:metrics-servlets:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
io.netty:netty-buffer:4.1.114.Final=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
@@ -79,6 +80,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs
io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+jakarta.servlet:jakarta.servlet-api:6.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -144,29 +146,31 @@ org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath
org.bitbucket.b_c:jose4j:0.9.6=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
org.checkerframework:checker-qual:3.44.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-common:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-hpack:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-http-client-transport:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-server:10.0.22=jarValidation,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-client:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-server:10.0.22=jarValidation,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-server:10.0.22=jarValidation,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-client:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-deploy:10.0.22=solrPlatformLibs
-org.eclipse.jetty:jetty-http:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-jmx:10.0.22=solrPlatformLibs
-org.eclipse.jetty:jetty-rewrite:10.0.22=jarValidation,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-servlet:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-servlets:10.0.22=solrPlatformLibs
-org.eclipse.jetty:jetty-util:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-webapp:10.0.22=solrPlatformLibs
-org.eclipse.jetty:jetty-xml:10.0.22=solrPlatformLibs
+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10:jetty-ee10-servlets:12.0.19=solrPlatformLibs
+org.eclipse.jetty.ee10:jetty-ee10-webapp:12.0.19=solrPlatformLibs
+org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-common:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-hpack:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-server:12.0.19=jarValidation,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-client:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-client:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-server:12.0.19=jarValidation,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-server:12.0.19=jarValidation,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-client:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-deploy:12.0.19=solrPlatformLibs
+org.eclipse.jetty:jetty-ee:12.0.19=solrPlatformLibs
+org.eclipse.jetty:jetty-http:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-jmx:12.0.19=solrPlatformLibs
+org.eclipse.jetty:jetty-rewrite:12.0.19=jarValidation,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-session:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-xml:12.0.19=solrPlatformLibs
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-api:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/cross-dc-manager/src/java/org/apache/solr/crossdc/manager/consumer/Consumer.java b/solr/cross-dc-manager/src/java/org/apache/solr/crossdc/manager/consumer/Consumer.java
index b602152e05f..7e4219f4922 100644
--- a/solr/cross-dc-manager/src/java/org/apache/solr/crossdc/manager/consumer/Consumer.java
+++ b/solr/cross-dc-manager/src/java/org/apache/solr/crossdc/manager/consumer/Consumer.java
@@ -21,8 +21,8 @@ import static org.apache.solr.crossdc.common.KafkaCrossDcConf.TOPIC_NAME;
import static org.apache.solr.crossdc.common.KafkaCrossDcConf.ZK_CONNECT_STRING;
import com.codahale.metrics.SharedMetricRegistries;
-import com.codahale.metrics.servlets.MetricsServlet;
-import com.codahale.metrics.servlets.ThreadDumpServlet;
+import io.dropwizard.metrics.servlets.MetricsServlet;
+import io.dropwizard.metrics.servlets.ThreadDumpServlet;
import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import java.util.Map;
@@ -36,9 +36,9 @@ import org.apache.solr.common.util.SolrNamedThreadFactory;
import org.apache.solr.crossdc.common.ConfUtil;
import org.apache.solr.crossdc.common.KafkaCrossDcConf;
import org.apache.solr.crossdc.common.SensitivePropRedactionUtils;
+import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee10.servlet.ServletMapping;
import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletMapping;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/solr/licenses/HdrHistogram-2.1.12.jar.sha1 b/solr/licenses/HdrHistogram-2.1.12.jar.sha1
deleted file mode 100644
index 203aa0280e0..00000000000
--- a/solr/licenses/HdrHistogram-2.1.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6eb7552156e0d517ae80cc2247be1427c8d90452
diff --git a/solr/licenses/HdrHistogram-2.2.1.jar.sha1 b/solr/licenses/HdrHistogram-2.2.1.jar.sha1
new file mode 100644
index 00000000000..70b238a3e34
--- /dev/null
+++ b/solr/licenses/HdrHistogram-2.2.1.jar.sha1
@@ -0,0 +1 @@
+0eb1feb351f64176c377772a30174e582c0274d5
diff --git a/solr/licenses/angus-LICENSE-BSD.txt b/solr/licenses/angus-LICENSE-BSD.txt
new file mode 100644
index 00000000000..da1c1cea702
--- /dev/null
+++ b/solr/licenses/angus-LICENSE-BSD.txt
@@ -0,0 +1,28 @@
+Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ - Neither the name of the Eclipse Foundation, Inc. nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/solr/licenses/angus-NOTICE.txt b/solr/licenses/angus-NOTICE.txt
new file mode 100644
index 00000000000..81a6d339037
--- /dev/null
+++ b/solr/licenses/angus-NOTICE.txt
@@ -0,0 +1,45 @@
+# Notices for Eclipse Angus
+
+This content is produced and maintained by the Eclipse Angus project.
+
+* Project home: https://projects.eclipse.org/projects/ee4j.angus
+
+## Trademarks
+
+Eclipse Angus is a trademark of the Eclipse Foundation.
+
+## Copyright
+
+All content is the property of the respective authors or their employers. For
+more information regarding authorship of content, please consult the listed
+source code repository logs.
+
+## Declared Project Licenses
+
+This program and the accompanying materials are made available under the terms
+of the Eclipse Distribution License v1.0 which is available at
+https://www.eclipse.org/org/documents/edl-v10.php.
+
+SPDX-License-Identifier: BSD-3-Clause
+
+## Source Code
+
+The project maintains the following source code repositories:
+
+* https://github.com/eclipse-ee4j/angus-activation
+* https://github.com/eclipse-ee4j/angus-mail
+
+## Third-party Content
+
+This project leverages the following third party content.
+
+None
+
+## Cryptography
+
+Content may contain encryption software. The country in which you are currently
+may have restrictions on the import, possession, and use, and/or re-export to
+another country, of encryption software. BEFORE using any encryption software,
+please check the country's laws, regulations and policies concerning the import,
+possession, or use, and re-export of encryption software, to see if this is
+permitted.
\ No newline at end of file
diff --git a/solr/licenses/angus-activation-2.0.2.jar.sha1 b/solr/licenses/angus-activation-2.0.2.jar.sha1
new file mode 100644
index 00000000000..d2e47dc7ce3
--- /dev/null
+++ b/solr/licenses/angus-activation-2.0.2.jar.sha1
@@ -0,0 +1 @@
+41f1e0ddd157c856926ed149ab837d110955a9fc
diff --git a/solr/licenses/annotations-2.26.19.jar.sha1 b/solr/licenses/annotations-2.26.19.jar.sha1
deleted file mode 100644
index a58ed3755e3..00000000000
--- a/solr/licenses/annotations-2.26.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-47834df51d057a0ff7f0eb3ded64f3086927acd1
diff --git a/solr/licenses/annotations-2.28.11.jar.sha1 b/solr/licenses/annotations-2.28.11.jar.sha1
new file mode 100644
index 00000000000..799168800ee
--- /dev/null
+++ b/solr/licenses/annotations-2.28.11.jar.sha1
@@ -0,0 +1 @@
+02c5f2908b483add008f4d3872312e11edbe1547
diff --git a/solr/licenses/apache-client-2.26.19.jar.sha1 b/solr/licenses/apache-client-2.26.19.jar.sha1
deleted file mode 100644
index f9fab3b7548..00000000000
--- a/solr/licenses/apache-client-2.26.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-54058c3751d1d86a3c28ecd412aa58b9ec9bc0eb
diff --git a/solr/licenses/apache-client-2.28.11.jar.sha1 b/solr/licenses/apache-client-2.28.11.jar.sha1
new file mode 100644
index 00000000000..bcf9f4cf86d
--- /dev/null
+++ b/solr/licenses/apache-client-2.28.11.jar.sha1
@@ -0,0 +1 @@
+5f0b00415673f785df413c5c21cba7ed295d0048
diff --git a/solr/licenses/arns-2.26.19.jar.sha1 b/solr/licenses/arns-2.26.19.jar.sha1
deleted file mode 100644
index aff791de6d7..00000000000
--- a/solr/licenses/arns-2.26.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b7c9f6144aca608be62e8052989e38ed97fe23f8
diff --git a/solr/licenses/arns-2.28.11.jar.sha1 b/solr/licenses/arns-2.28.11.jar.sha1
new file mode 100644
index 00000000000..6c340c94a69
--- /dev/null
+++ b/solr/licenses/arns-2.28.11.jar.sha1
@@ -0,0 +1 @@
+add9c5344182449b40b2986d897561ae9b1de5a8
diff --git a/solr/licenses/auth-2.26.19.jar.sha1 b/solr/licenses/auth-2.26.19.jar.sha1
deleted file mode 100644
index 336ff4d51d7..00000000000
--- a/solr/licenses/auth-2.26.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dbb408986124b246d98a235bdcb5a77ddd2b6dac
diff --git a/solr/licenses/auth-2.28.11.jar.sha1 b/solr/licenses/auth-2.28.11.jar.sha1
new file mode 100644
index 00000000000..314a2eec17c
--- /dev/null
+++ b/solr/licenses/auth-2.28.11.jar.sha1
@@ -0,0 +1 @@
+7c00d77f8b2b99b2ecc29e14adbbe01433f75301
diff --git a/solr/licenses/aws-core-2.26.19.jar.sha1 b/solr/licenses/aws-core-2.26.19.jar.sha1
deleted file mode 100644
index 6b722c65000..00000000000
--- a/solr/licenses/aws-core-2.26.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fd6dd9df23690f4dee72f59c4466dd3384866780
diff --git a/solr/licenses/aws-core-2.28.11.jar.sha1 b/solr/licenses/aws-core-2.28.11.jar.sha1
new file mode 100644
index 00000000000..3a1fefc93e2
--- /dev/null
+++ b/solr/licenses/aws-core-2.28.11.jar.sha1
@@ -0,0 +1 @@
+1f3c28035af91e353951e3777058467b85728022
diff --git a/solr/licenses/aws-java-sdk-core-1.12.501.jar.sha1 b/solr/licenses/aws-java-sdk-core-1.12.501.jar.sha1
deleted file mode 100644
index af7f788dfc0..00000000000
--- a/solr/licenses/aws-java-sdk-core-1.12.501.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-96e3be3b38003a161ee52393974a507797a50d16
diff --git a/solr/licenses/aws-java-sdk-core-1.12.729.jar.sha1 b/solr/licenses/aws-java-sdk-core-1.12.729.jar.sha1
new file mode 100644
index 00000000000..1def3c6e5ac
--- /dev/null
+++ b/solr/licenses/aws-java-sdk-core-1.12.729.jar.sha1
@@ -0,0 +1 @@
+f1a4e78f2a40e9c1f3c80c07238599b5ad0241ca
diff --git a/solr/licenses/aws-java-sdk-kms-1.12.501.jar.sha1 b/solr/licenses/aws-java-sdk-kms-1.12.501.jar.sha1
deleted file mode 100644
index 69086477449..00000000000
--- a/solr/licenses/aws-java-sdk-kms-1.12.501.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ad3cef50677ecead50802b0dc5830c6e2034166f
diff --git a/solr/licenses/aws-java-sdk-kms-1.12.729.jar.sha1 b/solr/licenses/aws-java-sdk-kms-1.12.729.jar.sha1
new file mode 100644
index 00000000000..647ea31ecca
--- /dev/null
+++ b/solr/licenses/aws-java-sdk-kms-1.12.729.jar.sha1
@@ -0,0 +1 @@
+2124bd0745607506c94f842f2a93a2bb0eec3f34
diff --git a/solr/licenses/aws-java-sdk-s3-1.12.501.jar.sha1 b/solr/licenses/aws-java-sdk-s3-1.12.501.jar.sha1
deleted file mode 100644
index 5a18ae623b1..00000000000
--- a/solr/licenses/aws-java-sdk-s3-1.12.501.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e085a735bc14c56899f2fdd1beb051505351aa25
diff --git a/solr/licenses/aws-java-sdk-s3-1.12.729.jar.sha1 b/solr/licenses/aws-java-sdk-s3-1.12.729.jar.sha1
new file mode 100644
index 00000000000..45ecfe0f051
--- /dev/null
+++ b/solr/licenses/aws-java-sdk-s3-1.12.729.jar.sha1
@@ -0,0 +1 @@
+1a2aec49a0ddb5f7a47022e6779fa5f19516f085
diff --git a/solr/licenses/aws-query-protocol-2.26.19.jar.sha1 b/solr/licenses/aws-query-protocol-2.26.19.jar.sha1
deleted file mode 100644
index 9c5920c3670..00000000000
--- a/solr/licenses/aws-query-protocol-2.26.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1ccc7fad24a7f590218a5b92d21619dab561a9e0
diff --git a/solr/licenses/aws-query-protocol-2.28.11.jar.sha1 b/solr/licenses/aws-query-protocol-2.28.11.jar.sha1
new file mode 100644
index 00000000000..f5e2a3a53a0
--- /dev/null
+++ b/solr/licenses/aws-query-protocol-2.28.11.jar.sha1
@@ -0,0 +1 @@
+de24225dc148b83b5649433897c5c036158ca13e
diff --git a/solr/licenses/aws-xml-protocol-2.26.19.jar.sha1 b/solr/licenses/aws-xml-protocol-2.26.19.jar.sha1
deleted file mode 100644
index b1f9e39bf86..00000000000
--- a/solr/licenses/aws-xml-protocol-2.26.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cdccf27268dfa99c209de8c2fe62a1b9e2e6b1e9
diff --git a/solr/licenses/aws-xml-protocol-2.28.11.jar.sha1 b/solr/licenses/aws-xml-protocol-2.28.11.jar.sha1
new file mode 100644
index 00000000000..aca7ad0c080
--- /dev/null
+++ b/solr/licenses/aws-xml-protocol-2.28.11.jar.sha1
@@ -0,0 +1 @@
+735dab9ebaffe4306fbb6c42beacbba0591f9c09
diff --git a/solr/licenses/checksums-2.26.19.jar.sha1 b/solr/licenses/checksums-2.26.19.jar.sha1
deleted file mode 100644
index 4a5c54bb987..00000000000
--- a/solr/licenses/checksums-2.26.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0e17cfbc8b85ddaa1218ff4d1d45636a4a8b70bb
diff --git a/solr/licenses/checksums-2.28.11.jar.sha1 b/solr/licenses/checksums-2.28.11.jar.sha1
new file mode 100644
index 00000000000..85c29fc823a
--- /dev/null
+++ b/solr/licenses/checksums-2.28.11.jar.sha1
@@ -0,0 +1 @@
+0441d04c94f8787606b9eaeeb4b825fde229e8cc
diff --git a/solr/licenses/checksums-spi-2.26.19.jar.sha1 b/solr/licenses/checksums-spi-2.26.19.jar.sha1
deleted file mode 100644
index d2cd2248656..00000000000
--- a/solr/licenses/checksums-spi-2.26.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a834f1332f0901c0225a202e6dc5078a74c2549f
diff --git a/solr/licenses/checksums-spi-2.28.11.jar.sha1 b/solr/licenses/checksums-spi-2.28.11.jar.sha1
new file mode 100644
index 00000000000..de183064453
--- /dev/null
+++ b/solr/licenses/checksums-spi-2.28.11.jar.sha1
@@ -0,0 +1 @@
+852d58804c21125d4e306e821086932d72b687e2
diff --git a/solr/licenses/crt-core-2.26.19.jar.sha1 b/solr/licenses/crt-core-2.26.19.jar.sha1
deleted file mode 100644
index ed8573d988f..00000000000
--- a/solr/licenses/crt-core-2.26.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d45abf24cbe0d1109ee46d7a420a07b8ed4358b5
diff --git a/solr/licenses/crt-core-2.28.11.jar.sha1 b/solr/licenses/crt-core-2.28.11.jar.sha1
new file mode 100644
index 00000000000..dabb7b2afee
--- /dev/null
+++ b/solr/licenses/crt-core-2.28.11.jar.sha1
@@ -0,0 +1 @@
+cc2bb5792b12ab530ffc6c2d163faa0a8075a33b
diff --git a/solr/licenses/endpoints-spi-2.26.19.jar.sha1 b/solr/licenses/endpoints-spi-2.26.19.jar.sha1
deleted file mode 100644
index 89faef7415e..00000000000
--- a/solr/licenses/endpoints-spi-2.26.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dddc85578a7e0780c3b8d6b167487c665cc466cf
diff --git a/solr/licenses/endpoints-spi-2.28.11.jar.sha1 b/solr/licenses/endpoints-spi-2.28.11.jar.sha1
new file mode 100644
index 00000000000..05fa59c5f05
--- /dev/null
+++ b/solr/licenses/endpoints-spi-2.28.11.jar.sha1
@@ -0,0 +1 @@
+5438bfe4a4c112b65a4dc983dbd74196936a2404
diff --git a/solr/licenses/http-auth-2.26.19.jar.sha1 b/solr/licenses/http-auth-2.26.19.jar.sha1
deleted file mode 100644
index 188f29c99b8..00000000000
--- a/solr/licenses/http-auth-2.26.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-00a5edbeae2e1eb33e6a892aebcbe656e5383b85
diff --git a/solr/licenses/http-auth-2.28.11.jar.sha1 b/solr/licenses/http-auth-2.28.11.jar.sha1
new file mode 100644
index 00000000000..535d7df7bd4
--- /dev/null
+++ b/solr/licenses/http-auth-2.28.11.jar.sha1
@@ -0,0 +1 @@
+546f4cc761be44bc6d60373c83d11eb320596c40
diff --git a/solr/licenses/http-auth-aws-2.26.19.jar.sha1 b/solr/licenses/http-auth-aws-2.26.19.jar.sha1
deleted file mode 100644
index c71df0e972a..00000000000
--- a/solr/licenses/http-auth-aws-2.26.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3719977d245d077745351322859a87329c574d12
diff --git a/solr/licenses/http-auth-aws-2.28.11.jar.sha1 b/solr/licenses/http-auth-aws-2.28.11.jar.sha1
new file mode 100644
index 00000000000..5e41889ca3c
--- /dev/null
+++ b/solr/licenses/http-auth-aws-2.28.11.jar.sha1
@@ -0,0 +1 @@
+5754a1803ba62de29f9fefc99a7fdb40980b8a25
diff --git a/solr/licenses/http-auth-aws-eventstream-2.28.11.jar.sha1 b/solr/licenses/http-auth-aws-eventstream-2.28.11.jar.sha1
new file mode 100644
index 00000000000..5117313e2f4
--- /dev/null
+++ b/solr/licenses/http-auth-aws-eventstream-2.28.11.jar.sha1
@@ -0,0 +1 @@
+1f1d9026881fc9427499b3135b4eb3b91a7c666d
diff --git a/solr/licenses/http-auth-spi-2.28.11.jar.sha1 b/solr/licenses/http-auth-spi-2.28.11.jar.sha1
new file mode 100644
index 00000000000..788fa601a2e
--- /dev/null
+++ b/solr/licenses/http-auth-spi-2.28.11.jar.sha1
@@ -0,0 +1 @@
+948de74944a06f2e25a105bf1cd84635e327865c
diff --git a/solr/licenses/http-client-spi-2.26.19.jar.sha1 b/solr/licenses/http-client-spi-2.26.19.jar.sha1
deleted file mode 100644
index 0b6f0836437..00000000000
--- a/solr/licenses/http-client-spi-2.26.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-55521082ba7db12101a0f631de46b281f8e08d26
diff --git a/solr/licenses/http-client-spi-2.28.11.jar.sha1 b/solr/licenses/http-client-spi-2.28.11.jar.sha1
new file mode 100644
index 00000000000..8c550a5023e
--- /dev/null
+++ b/solr/licenses/http-client-spi-2.28.11.jar.sha1
@@ -0,0 +1 @@
+4800dcec303519b3c7583c4d3e813548165660cc
diff --git a/solr/licenses/http2-client-10.0.22.jar.sha1 b/solr/licenses/http2-client-10.0.22.jar.sha1
deleted file mode 100644
index 0625bf893c0..00000000000
--- a/solr/licenses/http2-client-10.0.22.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ab56d4454a9724e62b2588164c884a6940c0e62a
diff --git a/solr/licenses/http2-common-10.0.22.jar.sha1 b/solr/licenses/http2-common-10.0.22.jar.sha1
deleted file mode 100644
index ae830c8b491..00000000000
--- a/solr/licenses/http2-common-10.0.22.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-06437d043c3e6265cf57ff287fc4877c4e8e3507
diff --git a/solr/licenses/http2-hpack-10.0.22.jar.sha1 b/solr/licenses/http2-hpack-10.0.22.jar.sha1
deleted file mode 100644
index 224ebb16783..00000000000
--- a/solr/licenses/http2-hpack-10.0.22.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c05f5b48ae78a829e623ba87cf2f067ce1225fcc
diff --git a/solr/licenses/http2-http-client-transport-10.0.22.jar.sha1 b/solr/licenses/http2-http-client-transport-10.0.22.jar.sha1
deleted file mode 100644
index 34157c529cb..00000000000
--- a/solr/licenses/http2-http-client-transport-10.0.22.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8b5d6aab1bc2d9c19d070cd21885a6a2841698ec
diff --git a/solr/licenses/http2-server-10.0.22.jar.sha1 b/solr/licenses/http2-server-10.0.22.jar.sha1
deleted file mode 100644
index 0bd57199207..00000000000
--- a/solr/licenses/http2-server-10.0.22.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4898419e9832dc6ccffc1fd44bfaaa239f2a8ed7
diff --git a/solr/licenses/identity-spi-2.26.19.jar.sha1 b/solr/licenses/identity-spi-2.26.19.jar.sha1
deleted file mode 100644
index a9d6e53608d..00000000000
--- a/solr/licenses/identity-spi-2.26.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a46f1e3ec3ce5f37c36e9a67ff497a999b99953c
diff --git a/solr/licenses/identity-spi-2.28.11.jar.sha1 b/solr/licenses/identity-spi-2.28.11.jar.sha1
new file mode 100644
index 00000000000..af9f9dea651
--- /dev/null
+++ b/solr/licenses/identity-spi-2.28.11.jar.sha1
@@ -0,0 +1 @@
+94c677422dd17a2343b01b4d4c8173022da51dad
diff --git a/solr/licenses/ion-java-1.0.2.jar.sha1 b/solr/licenses/ion-java-1.0.2.jar.sha1
deleted file mode 100644
index e7881f46181..00000000000
--- a/solr/licenses/ion-java-1.0.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ee9dacea7726e495f8352b81c12c23834ffbc564
diff --git a/solr/licenses/istack-commons-runtime-4.1.2.jar.sha1 b/solr/licenses/istack-commons-runtime-4.1.2.jar.sha1
new file mode 100644
index 00000000000..4596f427101
--- /dev/null
+++ b/solr/licenses/istack-commons-runtime-4.1.2.jar.sha1
@@ -0,0 +1 @@
+18ec117c85f3ba0ac65409136afa8e42bc74e739
diff --git a/solr/licenses/jakarta.activation-api-2.1.3.jar.sha1 b/solr/licenses/jakarta.activation-api-2.1.3.jar.sha1
new file mode 100644
index 00000000000..5032acdf671
--- /dev/null
+++ b/solr/licenses/jakarta.activation-api-2.1.3.jar.sha1
@@ -0,0 +1 @@
+fa165bd70cda600368eee31555222776a46b881f
diff --git a/solr/licenses/http2-client-LICENSE-ASL.txt b/solr/licenses/jakarta.enterprise.cdi-LICENSE-ASL.txt
similarity index 99%
rename from solr/licenses/http2-client-LICENSE-ASL.txt
rename to solr/licenses/jakarta.enterprise.cdi-LICENSE-ASL.txt
index d6456956733..7a4a3ea2424 100644
--- a/solr/licenses/http2-client-LICENSE-ASL.txt
+++ b/solr/licenses/jakarta.enterprise.cdi-LICENSE-ASL.txt
@@ -199,4 +199,4 @@
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.
+ limitations under the License.
\ No newline at end of file
diff --git a/solr/licenses/jakarta.enterprise.cdi-NOTICE.txt b/solr/licenses/jakarta.enterprise.cdi-NOTICE.txt
new file mode 100644
index 00000000000..b5da129a089
--- /dev/null
+++ b/solr/licenses/jakarta.enterprise.cdi-NOTICE.txt
@@ -0,0 +1,50 @@
+# Notices for Jakarta Contexts and Dependency Injection
+
+This content is produced and maintained by the Jakarta Contexts and Dependency Injection
+project.
+
+* Project home: https://projects.eclipse.org/projects/ee4j.cdi
+
+## Trademarks
+
+Jakarta Contexts and Dependency Injection is a trademark of the Eclipse Foundation.
+
+## Copyright
+
+All content is the property of the respective authors or their employers. For
+more information regarding authorship of content, please consult the listed
+source code repository logs.
+
+## Declared Project Licenses
+
+This program and the accompanying materials are made available under the terms
+of the Apache License v. 2.0 which is available at
+http://www.apache.org/licenses/LICENSE-2.0
+
+SPDX-License-Identifier: Apache-2.0
+
+## Source Code
+
+The project maintains the following source code repositories:
+
+* https://github.com/jakartaee/cdi
+* https://github.com/jakartaee/cdi-tck
+* https://github.com/jakartaee/inject
+* https://github.com/jakartaee/inject-spec
+* https://github.com/jakartaee/inject-tck
+
+The project also maintains the following legacy CPL licensed source code repositories:
+
+* https://github.com/eclipse-ee4j/cdi-cpl
+* https://github.com/eclipse-ee4j/cdi-tck-cpl
+
+## Third-party Content
+
+## Cryptography
+
+Content may contain encryption software. The country in which you are currently
+may have restrictions on the import, possession, and use, and/or re-export to
+another country, of encryption software. BEFORE using any encryption software,
+please check the country's laws, regulations and policies concerning the import,
+possession, or use, and re-export of encryption software, to see if this is
+permitted.
\ No newline at end of file
diff --git a/solr/licenses/jakarta.enterprise.cdi-api-4.0.1.jar.sha1 b/solr/licenses/jakarta.enterprise.cdi-api-4.0.1.jar.sha1
new file mode 100644
index 00000000000..a9e42995668
--- /dev/null
+++ b/solr/licenses/jakarta.enterprise.cdi-api-4.0.1.jar.sha1
@@ -0,0 +1 @@
+2012f388c6de83e29101cbf82c3ed2bd37931c64
diff --git a/solr/licenses/jakarta.enterprise.lang-LICENSE-ASL.txt b/solr/licenses/jakarta.enterprise.lang-LICENSE-ASL.txt
new file mode 100644
index 00000000000..7a4a3ea2424
--- /dev/null
+++ b/solr/licenses/jakarta.enterprise.lang-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.
\ No newline at end of file
diff --git a/solr/licenses/jakarta.enterprise.lang-NOTICE.txt b/solr/licenses/jakarta.enterprise.lang-NOTICE.txt
new file mode 100644
index 00000000000..b5da129a089
--- /dev/null
+++ b/solr/licenses/jakarta.enterprise.lang-NOTICE.txt
@@ -0,0 +1,50 @@
+# Notices for Jakarta Contexts and Dependency Injection
+
+This content is produced and maintained by the Jakarta Contexts and Dependency Injection
+project.
+
+* Project home: https://projects.eclipse.org/projects/ee4j.cdi
+
+## Trademarks
+
+Jakarta Contexts and Dependency Injection is a trademark of the Eclipse Foundation.
+
+## Copyright
+
+All content is the property of the respective authors or their employers. For
+more information regarding authorship of content, please consult the listed
+source code repository logs.
+
+## Declared Project Licenses
+
+This program and the accompanying materials are made available under the terms
+of the Apache License v. 2.0 which is available at
+http://www.apache.org/licenses/LICENSE-2.0
+
+SPDX-License-Identifier: Apache-2.0
+
+## Source Code
+
+The project maintains the following source code repositories:
+
+* https://github.com/jakartaee/cdi
+* https://github.com/jakartaee/cdi-tck
+* https://github.com/jakartaee/inject
+* https://github.com/jakartaee/inject-spec
+* https://github.com/jakartaee/inject-tck
+
+The project also maintains the following legacy CPL licensed source code repositories:
+
+* https://github.com/eclipse-ee4j/cdi-cpl
+* https://github.com/eclipse-ee4j/cdi-tck-cpl
+
+## Third-party Content
+
+## Cryptography
+
+Content may contain encryption software. The country in which you are currently
+may have restrictions on the import, possession, and use, and/or re-export to
+another country, of encryption software. BEFORE using any encryption software,
+please check the country's laws, regulations and policies concerning the import,
+possession, or use, and re-export of encryption software, to see if this is
+permitted.
\ No newline at end of file
diff --git a/solr/licenses/jakarta.enterprise.lang-model-4.0.1.jar.sha1 b/solr/licenses/jakarta.enterprise.lang-model-4.0.1.jar.sha1
new file mode 100644
index 00000000000..5e180b7d3fc
--- /dev/null
+++ b/solr/licenses/jakarta.enterprise.lang-model-4.0.1.jar.sha1
@@ -0,0 +1 @@
+2b195781faad31c1724d8122136909c34c3ae79e
diff --git a/solr/licenses/jakarta.interceptor-LICENSE-EPL.txt b/solr/licenses/jakarta.interceptor-LICENSE-EPL.txt
new file mode 100644
index 00000000000..b0f7f72fb4b
--- /dev/null
+++ b/solr/licenses/jakarta.interceptor-LICENSE-EPL.txt
@@ -0,0 +1,275 @@
+ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+ PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
+ OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+ a) in the case of the initial Contributor, the initial content
+ Distributed under this Agreement, and
+
+ b) in the case of each subsequent Contributor:
+ i) changes to the Program, and
+ ii) additions to the Program;
+ where such changes and/or additions to the Program originate from
+ and are Distributed by that particular Contributor. A Contribution
+ "originates" from a Contributor if it was added to the Program by
+ such Contributor itself or anyone acting on such Contributor's behalf.
+ Contributions do not include changes or additions to the Program that
+ are not Modified Works.
+
+"Contributor" means any person or entity that Distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which
+are necessarily infringed by the use or sale of its Contribution alone
+or when combined with the Program.
+
+"Program" means the Contributions Distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement
+or any Secondary License (as applicable), including Contributors.
+
+"Derivative Works" shall mean any work, whether in Source Code or other
+form, that is based on (or derived from) the Program and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship.
+
+"Modified Works" shall mean any work in Source Code or other form that
+results from an addition to, deletion from, or modification of the
+contents of the Program, including, for purposes of clarity any new file
+in Source Code form that contains any contents of the Program. Modified
+Works shall not include works that contain only declarations,
+interfaces, types, classes, structures, or files of the Program solely
+in each case in order to link to, bind by name, or subclass the Program
+or Modified Works thereof.
+
+"Distribute" means the acts of a) distributing or b) making available
+in any manner that enables the transfer of a copy.
+
+"Source Code" means the form of a Program preferred for making
+modifications, including but not limited to software source code,
+documentation source, and configuration files.
+
+"Secondary License" means either the GNU General Public License,
+Version 2.0, or any later versions of that license, including any
+exceptions or additional permissions as identified by the initial
+Contributor.
+
+2. GRANT OF RIGHTS
+
+ a) Subject to the terms of this Agreement, each Contributor hereby
+ grants Recipient a non-exclusive, worldwide, royalty-free copyright
+ license to reproduce, prepare Derivative Works of, publicly display,
+ publicly perform, Distribute and sublicense the Contribution of such
+ Contributor, if any, and such Derivative Works.
+
+ b) Subject to the terms of this Agreement, each Contributor hereby
+ grants Recipient a non-exclusive, worldwide, royalty-free patent
+ license under Licensed Patents to make, use, sell, offer to sell,
+ import and otherwise transfer the Contribution of such Contributor,
+ if any, in Source Code or other form. This patent license shall
+ apply to the combination of the Contribution and the Program if, at
+ the time the Contribution is added by the Contributor, such addition
+ of the Contribution causes such combination to be covered by the
+ Licensed Patents. The patent license shall not apply to any other
+ combinations which include the Contribution. No hardware per se is
+ licensed hereunder.
+
+ c) Recipient understands that although each Contributor grants the
+ licenses to its Contributions set forth herein, no assurances are
+ provided by any Contributor that the Program does not infringe the
+ patent or other intellectual property rights of any other entity.
+ Each Contributor disclaims any liability to Recipient for claims
+ brought by any other entity based on infringement of intellectual
+ property rights or otherwise. As a condition to exercising the
+ rights and licenses granted hereunder, each Recipient hereby
+ assumes sole responsibility to secure any other intellectual
+ property rights needed, if any. For example, if a third party
+ patent license is required to allow Recipient to Distribute the
+ Program, it is Recipient's responsibility to acquire that license
+ before distributing the Program.
+
+ d) Each Contributor represents that to its knowledge it has
+ sufficient copyright rights in its Contribution, if any, to grant
+ the copyright license set forth in this Agreement.
+
+ e) Notwithstanding the terms of any Secondary License, no
+ Contributor makes additional grants to any Recipient (other than
+ those set forth in this Agreement) as a result of such Recipient's
+ receipt of the Program under the terms of a Secondary License
+ (if permitted under the terms of Section 3).
+
+3. REQUIREMENTS
+
+3.1 If a Contributor Distributes the Program in any form, then:
+
+ a) the Program must also be made available as Source Code, in
+ accordance with section 3.2, and the Contributor must accompany
+ the Program with a statement that the Source Code for the Program
+ is available under this Agreement, and informs Recipients how to
+ obtain it in a reasonable manner on or through a medium customarily
+ used for software exchange; and
+
+ b) the Contributor may Distribute the Program under a license
+ different than this Agreement, provided that such license:
+ i) effectively disclaims on behalf of all other Contributors all
+ warranties and conditions, express and implied, including
+ warranties or conditions of title and non-infringement, and
+ implied warranties or conditions of merchantability and fitness
+ for a particular purpose;
+
+ ii) effectively excludes on behalf of all other Contributors all
+ liability for damages, including direct, indirect, special,
+ incidental and consequential damages, such as lost profits;
+
+ iii) does not attempt to limit or alter the recipients' rights
+ in the Source Code under section 3.2; and
+
+ iv) requires any subsequent distribution of the Program by any
+ party to be under a license that satisfies the requirements
+ of this section 3.
+
+3.2 When the Program is Distributed as Source Code:
+
+ a) it must be made available under this Agreement, or if the
+ Program (i) is combined with other material in a separate file or
+ files made available under a Secondary License, and (ii) the initial
+ Contributor attached to the Source Code the notice described in
+ Exhibit A of this Agreement, then the Program may be made available
+ under the terms of such Secondary Licenses, and
+
+ b) a copy of this Agreement must be included with each copy of
+ the Program.
+
+3.3 Contributors may not remove or alter any copyright, patent,
+trademark, attribution notices, disclaimers of warranty, or limitations
+of liability ("notices") contained within the Program from any copy of
+the Program which they Distribute, provided that Contributors may add
+their own appropriate notices.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities
+with respect to end users, business partners and the like. While this
+license is intended to facilitate the commercial use of the Program,
+the Contributor who includes the Program in a commercial product
+offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes
+the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and indemnify every
+other Contributor ("Indemnified Contributor") against any losses,
+damages and costs (collectively "Losses") arising from claims, lawsuits
+and other legal actions brought by a third party against the Indemnified
+Contributor to the extent caused by the acts or omissions of such
+Commercial Contributor in connection with its distribution of the Program
+in a commercial product offering. The obligations in this section do not
+apply to any claims or Losses relating to any actual or alleged
+intellectual property infringement. In order to qualify, an Indemnified
+Contributor must: a) promptly notify the Commercial Contributor in
+writing of such claim, and b) allow the Commercial Contributor to control,
+and cooperate with the Commercial Contributor in, the defense and any
+related settlement negotiations. The Indemnified Contributor may
+participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those performance
+claims and warranties, and if a court requires any other Contributor to
+pay any damages as a result, the Commercial Contributor must pay
+those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED 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. Each Recipient is solely responsible for determining the
+appropriateness of using and distributing the Program and assumes all
+risks associated with its exercise of rights under this Agreement,
+including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs
+or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
+SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further
+action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other software
+or hardware) infringes such Recipient's patent(s), then such Recipient's
+rights granted under Section 2(b) shall terminate as of the date such
+litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of
+time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use
+and distribution of the Program as soon as reasonably practicable.
+However, Recipient's obligations under this Agreement and any licenses
+granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement,
+but in order to avoid inconsistency the Agreement is copyrighted and
+may only be modified in the following manner. The Agreement Steward
+reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement
+Steward has the right to modify this Agreement. The Eclipse Foundation
+is the initial Agreement Steward. The Eclipse Foundation may assign the
+responsibility to serve as the Agreement Steward to a suitable separate
+entity. Each new version of the Agreement will be given a distinguishing
+version number. The Program (including Contributions) may always be
+Distributed subject to the version of the Agreement under which it was
+received. In addition, after a new version of the Agreement is published,
+Contributor may elect to Distribute the Program (including its
+Contributions) under the new version.
+
+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+receives no rights or licenses to the intellectual property of any
+Contributor under this Agreement, whether expressly, by implication,
+estoppel or otherwise. All rights in the Program not expressly granted
+under this Agreement are reserved. Nothing in this Agreement is intended
+to be enforceable by any entity that is not a Contributor or Recipient.
+No third-party beneficiary rights are created under this Agreement.
+
+Exhibit A - Form of Secondary Licenses Notice
+
+"This Source Code may also be made available under the following
+Secondary Licenses when the conditions for such availability set forth
+in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+version(s), and exceptions or additional permissions here}."
+
+ Simply including a copy of this Agreement, including this Exhibit A
+ is not sufficient to license the Source Code under Secondary Licenses.
+
+ If it is not possible or desirable to put the notice in a particular
+ file, then You may include the notice in a location (such as a LICENSE
+ file in a relevant directory) where a recipient would be likely to
+ look for such a notice.
+
+ You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/solr/licenses/jakarta.interceptor-api-2.1.0.jar.sha1 b/solr/licenses/jakarta.interceptor-api-2.1.0.jar.sha1
new file mode 100644
index 00000000000..2a278cc89a4
--- /dev/null
+++ b/solr/licenses/jakarta.interceptor-api-2.1.0.jar.sha1
@@ -0,0 +1 @@
+1d06a662708601400af4556577ee514c4ad01549
diff --git a/solr/licenses/jakarta.servlet-api-4.0.4.jar.sha1 b/solr/licenses/jakarta.servlet-api-4.0.4.jar.sha1
deleted file mode 100644
index 560414cce55..00000000000
--- a/solr/licenses/jakarta.servlet-api-4.0.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b8a1142e04838fe54194049c6e7a18dae8f9b960
diff --git a/solr/licenses/jakarta.servlet-api-6.0.0.jar.sha1 b/solr/licenses/jakarta.servlet-api-6.0.0.jar.sha1
new file mode 100644
index 00000000000..2cecca548df
--- /dev/null
+++ b/solr/licenses/jakarta.servlet-api-6.0.0.jar.sha1
@@ -0,0 +1 @@
+abecc699286e65035ebba9844c03931357a6a963
diff --git a/solr/licenses/jakarta.transaction-LICENSE-EPL.txt b/solr/licenses/jakarta.transaction-LICENSE-EPL.txt
new file mode 100644
index 00000000000..b0f7f72fb4b
--- /dev/null
+++ b/solr/licenses/jakarta.transaction-LICENSE-EPL.txt
@@ -0,0 +1,275 @@
+ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+ PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
+ OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+ a) in the case of the initial Contributor, the initial content
+ Distributed under this Agreement, and
+
+ b) in the case of each subsequent Contributor:
+ i) changes to the Program, and
+ ii) additions to the Program;
+ where such changes and/or additions to the Program originate from
+ and are Distributed by that particular Contributor. A Contribution
+ "originates" from a Contributor if it was added to the Program by
+ such Contributor itself or anyone acting on such Contributor's behalf.
+ Contributions do not include changes or additions to the Program that
+ are not Modified Works.
+
+"Contributor" means any person or entity that Distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which
+are necessarily infringed by the use or sale of its Contribution alone
+or when combined with the Program.
+
+"Program" means the Contributions Distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement
+or any Secondary License (as applicable), including Contributors.
+
+"Derivative Works" shall mean any work, whether in Source Code or other
+form, that is based on (or derived from) the Program and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship.
+
+"Modified Works" shall mean any work in Source Code or other form that
+results from an addition to, deletion from, or modification of the
+contents of the Program, including, for purposes of clarity any new file
+in Source Code form that contains any contents of the Program. Modified
+Works shall not include works that contain only declarations,
+interfaces, types, classes, structures, or files of the Program solely
+in each case in order to link to, bind by name, or subclass the Program
+or Modified Works thereof.
+
+"Distribute" means the acts of a) distributing or b) making available
+in any manner that enables the transfer of a copy.
+
+"Source Code" means the form of a Program preferred for making
+modifications, including but not limited to software source code,
+documentation source, and configuration files.
+
+"Secondary License" means either the GNU General Public License,
+Version 2.0, or any later versions of that license, including any
+exceptions or additional permissions as identified by the initial
+Contributor.
+
+2. GRANT OF RIGHTS
+
+ a) Subject to the terms of this Agreement, each Contributor hereby
+ grants Recipient a non-exclusive, worldwide, royalty-free copyright
+ license to reproduce, prepare Derivative Works of, publicly display,
+ publicly perform, Distribute and sublicense the Contribution of such
+ Contributor, if any, and such Derivative Works.
+
+ b) Subject to the terms of this Agreement, each Contributor hereby
+ grants Recipient a non-exclusive, worldwide, royalty-free patent
+ license under Licensed Patents to make, use, sell, offer to sell,
+ import and otherwise transfer the Contribution of such Contributor,
+ if any, in Source Code or other form. This patent license shall
+ apply to the combination of the Contribution and the Program if, at
+ the time the Contribution is added by the Contributor, such addition
+ of the Contribution causes such combination to be covered by the
+ Licensed Patents. The patent license shall not apply to any other
+ combinations which include the Contribution. No hardware per se is
+ licensed hereunder.
+
+ c) Recipient understands that although each Contributor grants the
+ licenses to its Contributions set forth herein, no assurances are
+ provided by any Contributor that the Program does not infringe the
+ patent or other intellectual property rights of any other entity.
+ Each Contributor disclaims any liability to Recipient for claims
+ brought by any other entity based on infringement of intellectual
+ property rights or otherwise. As a condition to exercising the
+ rights and licenses granted hereunder, each Recipient hereby
+ assumes sole responsibility to secure any other intellectual
+ property rights needed, if any. For example, if a third party
+ patent license is required to allow Recipient to Distribute the
+ Program, it is Recipient's responsibility to acquire that license
+ before distributing the Program.
+
+ d) Each Contributor represents that to its knowledge it has
+ sufficient copyright rights in its Contribution, if any, to grant
+ the copyright license set forth in this Agreement.
+
+ e) Notwithstanding the terms of any Secondary License, no
+ Contributor makes additional grants to any Recipient (other than
+ those set forth in this Agreement) as a result of such Recipient's
+ receipt of the Program under the terms of a Secondary License
+ (if permitted under the terms of Section 3).
+
+3. REQUIREMENTS
+
+3.1 If a Contributor Distributes the Program in any form, then:
+
+ a) the Program must also be made available as Source Code, in
+ accordance with section 3.2, and the Contributor must accompany
+ the Program with a statement that the Source Code for the Program
+ is available under this Agreement, and informs Recipients how to
+ obtain it in a reasonable manner on or through a medium customarily
+ used for software exchange; and
+
+ b) the Contributor may Distribute the Program under a license
+ different than this Agreement, provided that such license:
+ i) effectively disclaims on behalf of all other Contributors all
+ warranties and conditions, express and implied, including
+ warranties or conditions of title and non-infringement, and
+ implied warranties or conditions of merchantability and fitness
+ for a particular purpose;
+
+ ii) effectively excludes on behalf of all other Contributors all
+ liability for damages, including direct, indirect, special,
+ incidental and consequential damages, such as lost profits;
+
+ iii) does not attempt to limit or alter the recipients' rights
+ in the Source Code under section 3.2; and
+
+ iv) requires any subsequent distribution of the Program by any
+ party to be under a license that satisfies the requirements
+ of this section 3.
+
+3.2 When the Program is Distributed as Source Code:
+
+ a) it must be made available under this Agreement, or if the
+ Program (i) is combined with other material in a separate file or
+ files made available under a Secondary License, and (ii) the initial
+ Contributor attached to the Source Code the notice described in
+ Exhibit A of this Agreement, then the Program may be made available
+ under the terms of such Secondary Licenses, and
+
+ b) a copy of this Agreement must be included with each copy of
+ the Program.
+
+3.3 Contributors may not remove or alter any copyright, patent,
+trademark, attribution notices, disclaimers of warranty, or limitations
+of liability ("notices") contained within the Program from any copy of
+the Program which they Distribute, provided that Contributors may add
+their own appropriate notices.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities
+with respect to end users, business partners and the like. While this
+license is intended to facilitate the commercial use of the Program,
+the Contributor who includes the Program in a commercial product
+offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes
+the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and indemnify every
+other Contributor ("Indemnified Contributor") against any losses,
+damages and costs (collectively "Losses") arising from claims, lawsuits
+and other legal actions brought by a third party against the Indemnified
+Contributor to the extent caused by the acts or omissions of such
+Commercial Contributor in connection with its distribution of the Program
+in a commercial product offering. The obligations in this section do not
+apply to any claims or Losses relating to any actual or alleged
+intellectual property infringement. In order to qualify, an Indemnified
+Contributor must: a) promptly notify the Commercial Contributor in
+writing of such claim, and b) allow the Commercial Contributor to control,
+and cooperate with the Commercial Contributor in, the defense and any
+related settlement negotiations. The Indemnified Contributor may
+participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those performance
+claims and warranties, and if a court requires any other Contributor to
+pay any damages as a result, the Commercial Contributor must pay
+those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED 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. Each Recipient is solely responsible for determining the
+appropriateness of using and distributing the Program and assumes all
+risks associated with its exercise of rights under this Agreement,
+including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs
+or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
+SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further
+action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other software
+or hardware) infringes such Recipient's patent(s), then such Recipient's
+rights granted under Section 2(b) shall terminate as of the date such
+litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of
+time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use
+and distribution of the Program as soon as reasonably practicable.
+However, Recipient's obligations under this Agreement and any licenses
+granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement,
+but in order to avoid inconsistency the Agreement is copyrighted and
+may only be modified in the following manner. The Agreement Steward
+reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement
+Steward has the right to modify this Agreement. The Eclipse Foundation
+is the initial Agreement Steward. The Eclipse Foundation may assign the
+responsibility to serve as the Agreement Steward to a suitable separate
+entity. Each new version of the Agreement will be given a distinguishing
+version number. The Program (including Contributions) may always be
+Distributed subject to the version of the Agreement under which it was
+received. In addition, after a new version of the Agreement is published,
+Contributor may elect to Distribute the Program (including its
+Contributions) under the new version.
+
+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+receives no rights or licenses to the intellectual property of any
+Contributor under this Agreement, whether expressly, by implication,
+estoppel or otherwise. All rights in the Program not expressly granted
+under this Agreement are reserved. Nothing in this Agreement is intended
+to be enforceable by any entity that is not a Contributor or Recipient.
+No third-party beneficiary rights are created under this Agreement.
+
+Exhibit A - Form of Secondary Licenses Notice
+
+"This Source Code may also be made available under the following
+Secondary Licenses when the conditions for such availability set forth
+in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+version(s), and exceptions or additional permissions here}."
+
+ Simply including a copy of this Agreement, including this Exhibit A
+ is not sufficient to license the Source Code under Secondary Licenses.
+
+ If it is not possible or desirable to put the notice in a particular
+ file, then You may include the notice in a location (such as a LICENSE
+ file in a relevant directory) where a recipient would be likely to
+ look for such a notice.
+
+ You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/solr/licenses/http-auth-spi-2.26.19.jar.sha1 b/solr/licenses/jakarta.transaction-api-2.0.1.jar.sha1
similarity index 100%
rename from solr/licenses/http-auth-spi-2.26.19.jar.sha1
rename to solr/licenses/jakarta.transaction-api-2.0.1.jar.sha1
index 54ceb69be72..2ce39ee0ca2 100644
--- a/solr/licenses/http-auth-spi-2.26.19.jar.sha1
+++ b/solr/licenses/jakarta.transaction-api-2.0.1.jar.sha1
@@ -1 +1 @@
-2e467bd25665e7df9e355fc935dd43730ce3c798
+51a520e3fae406abb84e2e1148e6746ce3f80a1a
diff --git a/solr/licenses/jakarta.websocket-api-1.1.2.jar.sha1 b/solr/licenses/jakarta.websocket-api-1.1.2.jar.sha1
deleted file mode 100644
index 5fa444de926..00000000000
--- a/solr/licenses/jakarta.websocket-api-1.1.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-69c2fdfb75081cc935bc9d6c5616d12b0b73815f
diff --git a/solr/licenses/jakarta.websocket-api-2.1.1.jar.sha1 b/solr/licenses/jakarta.websocket-api-2.1.1.jar.sha1
new file mode 100644
index 00000000000..2d2ed3df09a
--- /dev/null
+++ b/solr/licenses/jakarta.websocket-api-2.1.1.jar.sha1
@@ -0,0 +1 @@
+d3614cd4fe86803efe3f94d57f17925d3edff712
diff --git a/solr/licenses/jakarta.websocket-client-LICENSE-ASL.txt b/solr/licenses/jakarta.websocket-client-LICENSE-ASL.txt
new file mode 100644
index 00000000000..5de3d1b40c1
--- /dev/null
+++ b/solr/licenses/jakarta.websocket-client-LICENSE-ASL.txt
@@ -0,0 +1,637 @@
+# Eclipse Public License - v 2.0
+
+ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+ PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
+ OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+ 1. DEFINITIONS
+
+ "Contribution" means:
+
+ a) in the case of the initial Contributor, the initial content
+ Distributed under this Agreement, and
+
+ b) in the case of each subsequent Contributor:
+ i) changes to the Program, and
+ ii) additions to the Program;
+ where such changes and/or additions to the Program originate from
+ and are Distributed by that particular Contributor. A Contribution
+ "originates" from a Contributor if it was added to the Program by
+ such Contributor itself or anyone acting on such Contributor's behalf.
+ Contributions do not include changes or additions to the Program that
+ are not Modified Works.
+
+ "Contributor" means any person or entity that Distributes the Program.
+
+ "Licensed Patents" mean patent claims licensable by a Contributor which
+ are necessarily infringed by the use or sale of its Contribution alone
+ or when combined with the Program.
+
+ "Program" means the Contributions Distributed in accordance with this
+ Agreement.
+
+ "Recipient" means anyone who receives the Program under this Agreement
+ or any Secondary License (as applicable), including Contributors.
+
+ "Derivative Works" shall mean any work, whether in Source Code or other
+ form, that is based on (or derived from) the Program and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship.
+
+ "Modified Works" shall mean any work in Source Code or other form that
+ results from an addition to, deletion from, or modification of the
+ contents of the Program, including, for purposes of clarity any new file
+ in Source Code form that contains any contents of the Program. Modified
+ Works shall not include works that contain only declarations,
+ interfaces, types, classes, structures, or files of the Program solely
+ in each case in order to link to, bind by name, or subclass the Program
+ or Modified Works thereof.
+
+ "Distribute" means the acts of a) distributing or b) making available
+ in any manner that enables the transfer of a copy.
+
+ "Source Code" means the form of a Program preferred for making
+ modifications, including but not limited to software source code,
+ documentation source, and configuration files.
+
+ "Secondary License" means either the GNU General Public License,
+ Version 2.0, or any later versions of that license, including any
+ exceptions or additional permissions as identified by the initial
+ Contributor.
+
+ 2. GRANT OF RIGHTS
+
+ a) Subject to the terms of this Agreement, each Contributor hereby
+ grants Recipient a non-exclusive, worldwide, royalty-free copyright
+ license to reproduce, prepare Derivative Works of, publicly display,
+ publicly perform, Distribute and sublicense the Contribution of such
+ Contributor, if any, and such Derivative Works.
+
+ b) Subject to the terms of this Agreement, each Contributor hereby
+ grants Recipient a non-exclusive, worldwide, royalty-free patent
+ license under Licensed Patents to make, use, sell, offer to sell,
+ import and otherwise transfer the Contribution of such Contributor,
+ if any, in Source Code or other form. This patent license shall
+ apply to the combination of the Contribution and the Program if, at
+ the time the Contribution is added by the Contributor, such addition
+ of the Contribution causes such combination to be covered by the
+ Licensed Patents. The patent license shall not apply to any other
+ combinations which include the Contribution. No hardware per se is
+ licensed hereunder.
+
+ c) Recipient understands that although each Contributor grants the
+ licenses to its Contributions set forth herein, no assurances are
+ provided by any Contributor that the Program does not infringe the
+ patent or other intellectual property rights of any other entity.
+ Each Contributor disclaims any liability to Recipient for claims
+ brought by any other entity based on infringement of intellectual
+ property rights or otherwise. As a condition to exercising the
+ rights and licenses granted hereunder, each Recipient hereby
+ assumes sole responsibility to secure any other intellectual
+ property rights needed, if any. For example, if a third party
+ patent license is required to allow Recipient to Distribute the
+ Program, it is Recipient's responsibility to acquire that license
+ before distributing the Program.
+
+ d) Each Contributor represents that to its knowledge it has
+ sufficient copyright rights in its Contribution, if any, to grant
+ the copyright license set forth in this Agreement.
+
+ e) Notwithstanding the terms of any Secondary License, no
+ Contributor makes additional grants to any Recipient (other than
+ those set forth in this Agreement) as a result of such Recipient's
+ receipt of the Program under the terms of a Secondary License
+ (if permitted under the terms of Section 3).
+
+ 3. REQUIREMENTS
+
+ 3.1 If a Contributor Distributes the Program in any form, then:
+
+ a) the Program must also be made available as Source Code, in
+ accordance with section 3.2, and the Contributor must accompany
+ the Program with a statement that the Source Code for the Program
+ is available under this Agreement, and informs Recipients how to
+ obtain it in a reasonable manner on or through a medium customarily
+ used for software exchange; and
+
+ b) the Contributor may Distribute the Program under a license
+ different than this Agreement, provided that such license:
+ i) effectively disclaims on behalf of all other Contributors all
+ warranties and conditions, express and implied, including
+ warranties or conditions of title and non-infringement, and
+ implied warranties or conditions of merchantability and fitness
+ for a particular purpose;
+
+ ii) effectively excludes on behalf of all other Contributors all
+ liability for damages, including direct, indirect, special,
+ incidental and consequential damages, such as lost profits;
+
+ iii) does not attempt to limit or alter the recipients' rights
+ in the Source Code under section 3.2; and
+
+ iv) requires any subsequent distribution of the Program by any
+ party to be under a license that satisfies the requirements
+ of this section 3.
+
+ 3.2 When the Program is Distributed as Source Code:
+
+ a) it must be made available under this Agreement, or if the
+ Program (i) is combined with other material in a separate file or
+ files made available under a Secondary License, and (ii) the initial
+ Contributor attached to the Source Code the notice described in
+ Exhibit A of this Agreement, then the Program may be made available
+ under the terms of such Secondary Licenses, and
+
+ b) a copy of this Agreement must be included with each copy of
+ the Program.
+
+ 3.3 Contributors may not remove or alter any copyright, patent,
+ trademark, attribution notices, disclaimers of warranty, or limitations
+ of liability ("notices") contained within the Program from any copy of
+ the Program which they Distribute, provided that Contributors may add
+ their own appropriate notices.
+
+ 4. COMMERCIAL DISTRIBUTION
+
+ Commercial distributors of software may accept certain responsibilities
+ with respect to end users, business partners and the like. While this
+ license is intended to facilitate the commercial use of the Program,
+ the Contributor who includes the Program in a commercial product
+ offering should do so in a manner which does not create potential
+ liability for other Contributors. Therefore, if a Contributor includes
+ the Program in a commercial product offering, such Contributor
+ ("Commercial Contributor") hereby agrees to defend and indemnify every
+ other Contributor ("Indemnified Contributor") against any losses,
+ damages and costs (collectively "Losses") arising from claims, lawsuits
+ and other legal actions brought by a third party against the Indemnified
+ Contributor to the extent caused by the acts or omissions of such
+ Commercial Contributor in connection with its distribution of the Program
+ in a commercial product offering. The obligations in this section do not
+ apply to any claims or Losses relating to any actual or alleged
+ intellectual property infringement. In order to qualify, an Indemnified
+ Contributor must: a) promptly notify the Commercial Contributor in
+ writing of such claim, and b) allow the Commercial Contributor to control,
+ and cooperate with the Commercial Contributor in, the defense and any
+ related settlement negotiations. The Indemnified Contributor may
+ participate in any such claim at its own expense.
+
+ For example, a Contributor might include the Program in a commercial
+ product offering, Product X. That Contributor is then a Commercial
+ Contributor. If that Commercial Contributor then makes performance
+ claims, or offers warranties related to Product X, those performance
+ claims and warranties are such Commercial Contributor's responsibility
+ alone. Under this section, the Commercial Contributor would have to
+ defend claims against the other Contributors related to those performance
+ claims and warranties, and if a court requires any other Contributor to
+ pay any damages as a result, the Commercial Contributor must pay
+ those damages.
+
+ 5. NO WARRANTY
+
+ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+ PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED 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. Each Recipient is solely responsible for determining the
+ appropriateness of using and distributing the Program and assumes all
+ risks associated with its exercise of rights under this Agreement,
+ including but not limited to the risks and costs of program errors,
+ compliance with applicable laws, damage to or loss of data, programs
+ or equipment, and unavailability or interruption of operations.
+
+ 6. DISCLAIMER OF LIABILITY
+
+ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+ PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
+ SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+ PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+ EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGES.
+
+ 7. GENERAL
+
+ If any provision of this Agreement is invalid or unenforceable under
+ applicable law, it shall not affect the validity or enforceability of
+ the remainder of the terms of this Agreement, and without further
+ action by the parties hereto, such provision shall be reformed to the
+ minimum extent necessary to make such provision valid and enforceable.
+
+ If Recipient institutes patent litigation against any entity
+ (including a cross-claim or counterclaim in a lawsuit) alleging that the
+ Program itself (excluding combinations of the Program with other software
+ or hardware) infringes such Recipient's patent(s), then such Recipient's
+ rights granted under Section 2(b) shall terminate as of the date such
+ litigation is filed.
+
+ All Recipient's rights under this Agreement shall terminate if it
+ fails to comply with any of the material terms or conditions of this
+ Agreement and does not cure such failure in a reasonable period of
+ time after becoming aware of such noncompliance. If all Recipient's
+ rights under this Agreement terminate, Recipient agrees to cease use
+ and distribution of the Program as soon as reasonably practicable.
+ However, Recipient's obligations under this Agreement and any licenses
+ granted by Recipient relating to the Program shall continue and survive.
+
+ Everyone is permitted to copy and distribute copies of this Agreement,
+ but in order to avoid inconsistency the Agreement is copyrighted and
+ may only be modified in the following manner. The Agreement Steward
+ reserves the right to publish new versions (including revisions) of
+ this Agreement from time to time. No one other than the Agreement
+ Steward has the right to modify this Agreement. The Eclipse Foundation
+ is the initial Agreement Steward. The Eclipse Foundation may assign the
+ responsibility to serve as the Agreement Steward to a suitable separate
+ entity. Each new version of the Agreement will be given a distinguishing
+ version number. The Program (including Contributions) may always be
+ Distributed subject to the version of the Agreement under which it was
+ received. In addition, after a new version of the Agreement is published,
+ Contributor may elect to Distribute the Program (including its
+ Contributions) under the new version.
+
+ Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+ receives no rights or licenses to the intellectual property of any
+ Contributor under this Agreement, whether expressly, by implication,
+ estoppel or otherwise. All rights in the Program not expressly granted
+ under this Agreement are reserved. Nothing in this Agreement is intended
+ to be enforceable by any entity that is not a Contributor or Recipient.
+ No third-party beneficiary rights are created under this Agreement.
+
+ Exhibit A - Form of Secondary Licenses Notice
+
+ "This Source Code may also be made available under the following
+ Secondary Licenses when the conditions for such availability set forth
+ in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+ version(s), and exceptions or additional permissions here}."
+
+ Simply including a copy of this Agreement, including this Exhibit A
+ is not sufficient to license the Source Code under Secondary Licenses.
+
+ If it is not possible or desirable to put the notice in a particular
+ file, then You may include the notice in a location (such as a LICENSE
+ file in a relevant directory) where a recipient would be likely to
+ look for such a notice.
+
+ You may add additional accurate notices of copyright ownership.
+
+---
+
+## The GNU General Public License (GPL) Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor
+ Boston, MA 02110-1335
+ USA
+
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your freedom to
+ share and change it. By contrast, the GNU General Public License is
+ intended to guarantee your freedom to share and change free software--to
+ make sure the software is free for all its users. This General Public
+ License applies to most of the Free Software Foundation's software and
+ to any other program whose authors commit to using it. (Some other Free
+ Software Foundation software is covered by the GNU Library General
+ Public License instead.) You can apply it to your programs, too.
+
+ When we speak of free software, we are referring to freedom, not price.
+ Our General Public Licenses are designed to make sure that you have the
+ freedom to distribute copies of free software (and charge for this
+ service if you wish), that you receive source code or can get it if you
+ want it, that you can change the software or use pieces of it in new
+ free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid anyone
+ to deny you these rights or to ask you to surrender the rights. These
+ restrictions translate to certain responsibilities for you if you
+ distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether gratis
+ or for a fee, you must give the recipients all the rights that you have.
+ You must make sure that they, too, receive or can get the source code.
+ And you must show them these terms so they know their rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+ (2) offer you this license which gives you legal permission to copy,
+ distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+ that everyone understands that there is no warranty for this free
+ software. If the software is modified by someone else and passed on, we
+ want its recipients to know that what they have is not the original, so
+ that any problems introduced by others will not reflect on the original
+ authors' reputations.
+
+ Finally, any free program is threatened constantly by software patents.
+ We wish to avoid the danger that redistributors of a free program will
+ individually obtain patent licenses, in effect making the program
+ proprietary. To prevent this, we have made it clear that any patent must
+ be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+ modification follow.
+
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains a
+ notice placed by the copyright holder saying it may be distributed under
+ the terms of this General Public License. The "Program", below, refers
+ to any such program or work, and a "work based on the Program" means
+ either the Program or any derivative work under copyright law: that is
+ to say, a work containing the Program or a portion of it, either
+ verbatim or with modifications and/or translated into another language.
+ (Hereinafter, translation is included without limitation in the term
+ "modification".) Each licensee is addressed as "you".
+
+ Activities other than copying, distribution and modification are not
+ covered by this License; they are outside its scope. The act of running
+ the Program is not restricted, and the output from the Program is
+ covered only if its contents constitute a work based on the Program
+ (independent of having been made by running the Program). Whether that
+ is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's source
+ code as you receive it, in any medium, provided that you conspicuously
+ and appropriately publish on each copy an appropriate copyright notice
+ and disclaimer of warranty; keep intact all the notices that refer to
+ this License and to the absence of any warranty; and give any other
+ recipients of the Program a copy of this License along with the Program.
+
+ You may charge a fee for the physical act of transferring a copy, and
+ you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion of
+ it, thus forming a work based on the Program, and copy and distribute
+ such modifications or work under the terms of Section 1 above, provided
+ that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any part
+ thereof, to be licensed as a whole at no charge to all third parties
+ under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a notice
+ that there is no warranty (or else, saying that you provide a
+ warranty) and that users may redistribute the program under these
+ conditions, and telling the user how to view a copy of this License.
+ (Exception: if the Program itself is interactive but does not
+ normally print such an announcement, your work based on the Program
+ is not required to print an announcement.)
+
+ These requirements apply to the modified work as a whole. If
+ identifiable sections of that work are not derived from the Program, and
+ can be reasonably considered independent and separate works in
+ themselves, then this License, and its terms, do not apply to those
+ sections when you distribute them as separate works. But when you
+ distribute the same sections as part of a whole which is a work based on
+ the Program, the distribution of the whole must be on the terms of this
+ License, whose permissions for other licensees extend to the entire
+ whole, and thus to each and every part regardless of who wrote it.
+
+ Thus, it is not the intent of this section to claim rights or contest
+ your rights to work written entirely by you; rather, the intent is to
+ exercise the right to control the distribution of derivative or
+ collective works based on the Program.
+
+ In addition, mere aggregation of another work not based on the Program
+ with the Program (or with a work based on the Program) on a volume of a
+ storage or distribution medium does not bring the other work under the
+ scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+ under Section 2) in object code or executable form under the terms of
+ Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections 1
+ and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your cost
+ of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer to
+ distribute corresponding source code. (This alternative is allowed
+ only for noncommercial distribution and only if you received the
+ program in object code or executable form with such an offer, in
+ accord with Subsection b above.)
+
+ The source code for a work means the preferred form of the work for
+ making modifications to it. For an executable work, complete source code
+ means all the source code for all modules it contains, plus any
+ associated interface definition files, plus the scripts used to control
+ compilation and installation of the executable. However, as a special
+ exception, the source code distributed need not include anything that is
+ normally distributed (in either source or binary form) with the major
+ components (compiler, kernel, and so on) of the operating system on
+ which the executable runs, unless that component itself accompanies the
+ executable.
+
+ If distribution of executable or object code is made by offering access
+ to copy from a designated place, then offering equivalent access to copy
+ the source code from the same place counts as distribution of the source
+ code, even though third parties are not compelled to copy the source
+ along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+ except as expressly provided under this License. Any attempt otherwise
+ to copy, modify, sublicense or distribute the Program is void, and will
+ automatically terminate your rights under this License. However, parties
+ who have received copies, or rights, from you under this License will
+ not have their licenses terminated so long as such parties remain in
+ full compliance.
+
+ 5. You are not required to accept this License, since you have not
+ signed it. However, nothing else grants you permission to modify or
+ distribute the Program or its derivative works. These actions are
+ prohibited by law if you do not accept this License. Therefore, by
+ modifying or distributing the Program (or any work based on the
+ Program), you indicate your acceptance of this License to do so, and all
+ its terms and conditions for copying, distributing or modifying the
+ Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+ Program), the recipient automatically receives a license from the
+ original licensor to copy, distribute or modify the Program subject to
+ these terms and conditions. You may not impose any further restrictions
+ on the recipients' exercise of the rights granted herein. You are not
+ responsible for enforcing compliance by third parties to this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+ infringement or for any other reason (not limited to patent issues),
+ conditions are imposed on you (whether by court order, agreement or
+ otherwise) that contradict the conditions of this License, they do not
+ excuse you from the conditions of this License. If you cannot distribute
+ so as to satisfy simultaneously your obligations under this License and
+ any other pertinent obligations, then as a consequence you may not
+ distribute the Program at all. For example, if a patent license would
+ not permit royalty-free redistribution of the Program by all those who
+ receive copies directly or indirectly through you, then the only way you
+ could satisfy both it and this License would be to refrain entirely from
+ distribution of the Program.
+
+ If any portion of this section is held invalid or unenforceable under
+ any particular circumstance, the balance of the section is intended to
+ apply and the section as a whole is intended to apply in other
+ circumstances.
+
+ It is not the purpose of this section to induce you to infringe any
+ patents or other property right claims or to contest validity of any
+ such claims; this section has the sole purpose of protecting the
+ integrity of the free software distribution system, which is implemented
+ by public license practices. Many people have made generous
+ contributions to the wide range of software distributed through that
+ system in reliance on consistent application of that system; it is up to
+ the author/donor to decide if he or she is willing to distribute
+ software through any other system and a licensee cannot impose that choice.
+
+ This section is intended to make thoroughly clear what is believed to be
+ a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+ certain countries either by patents or by copyrighted interfaces, the
+ original copyright holder who places the Program under this License may
+ add an explicit geographical distribution limitation excluding those
+ countries, so that distribution is permitted only in or among countries
+ not thus excluded. In such case, this License incorporates the
+ limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new
+ versions of the General Public License from time to time. Such new
+ versions will be similar in spirit to the present version, but may
+ differ in detail to address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the Program
+ specifies a version number of this License which applies to it and "any
+ later version", you have the option of following the terms and
+ conditions either of that version or of any later version published by
+ the Free Software Foundation. If the Program does not specify a version
+ number of this License, you may choose any version ever published by the
+ Free Software Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+ programs whose distribution conditions are different, write to the
+ author to ask for permission. For software which is copyrighted by the
+ Free Software Foundation, write to the Free Software Foundation; we
+ sometimes make exceptions for this. Our decision will be guided by the
+ two goals of preserving the free status of all derivatives of our free
+ software and of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
+ WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+ EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+ OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND,
+ EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE
+ ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH
+ YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
+ NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+ WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+ AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
+ DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL
+ DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM
+ (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
+ INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF
+ THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR
+ OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+ possible use to the public, the best way to achieve this is to make it
+ free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest to
+ attach them to the start of each source file to most effectively convey
+ the exclusion of warranty; and each file should have at least the
+ "copyright" line and a pointer to where the full notice is found.
+
+ One line to give the program's name and a brief idea of what it does.
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
+
+ Also add information on how to contact you by electronic and paper mail.
+
+ If the program is interactive, make it output a short notice like this
+ when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type
+ `show w'. This is free software, and you are welcome to redistribute
+ it under certain conditions; type `show c' for details.
+
+ The hypothetical commands `show w' and `show c' should show the
+ appropriate parts of the General Public License. Of course, the commands
+ you use may be called something other than `show w' and `show c'; they
+ could even be mouse-clicks or menu items--whatever suits your program.
+
+ You should also get your employer (if you work as a programmer) or your
+ school, if any, to sign a "copyright disclaimer" for the program, if
+ necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ program `Gnomovision' (which makes passes at compilers) written by
+ James Hacker.
+
+ signature of Ty Coon, 1 April 1989
+ Ty Coon, President of Vice
+
+ This General Public License does not permit incorporating your program
+ into proprietary programs. If your program is a subroutine library, you
+ may consider it more useful to permit linking proprietary applications
+ with the library. If this is what you want to do, use the GNU Library
+ General Public License instead of this License.
+
+---
+
+## CLASSPATH EXCEPTION
+
+ Linking this library statically or dynamically with other modules is
+ making a combined work based on this library. Thus, the terms and
+ conditions of the GNU General Public License version 2 cover the whole
+ combination.
+
+ As a special exception, the copyright holders of this library give you
+ permission to link this library with independent modules to produce an
+ executable, regardless of the license terms of these independent
+ modules, and to copy and distribute the resulting executable under
+ terms of your choice, provided that you also meet, for each linked
+ independent module, the terms and conditions of the license of that
+ module. An independent module is a module which is not derived from or
+ based on this library. If you modify this library, you may extend this
+ exception to your version of the library, but you are not obligated to
+ do so. If you do not wish to do so, delete this exception statement
+ from your version.
diff --git a/solr/licenses/jakarta.websocket-client-NOTICE.txt b/solr/licenses/jakarta.websocket-client-NOTICE.txt
new file mode 100644
index 00000000000..076c3641fa4
--- /dev/null
+++ b/solr/licenses/jakarta.websocket-client-NOTICE.txt
@@ -0,0 +1,45 @@
+Micrometer
+
+Copyright (c) 2017-Present VMware, Inc. All Rights Reserved.
+
+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
+
+ https://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.
+
+-------------------------------------------------------------------------------
+
+This product contains a modified portion of 'io.netty.util.internal.logging',
+in the Netty/Common library distributed by The Netty Project:
+
+ * Copyright 2013 The Netty Project
+ * License: Apache License v2.0
+ * Homepage: https://netty.io
+
+This product contains a modified portion of 'StringUtils.isBlank()',
+in the Commons Lang library distributed by The Apache Software Foundation:
+
+ * Copyright 2001-2019 The Apache Software Foundation
+ * License: Apache License v2.0
+ * Homepage: https://commons.apache.org/proper/commons-lang/
+
+This product contains a modified portion of 'JsonUtf8Writer',
+in the Moshi library distributed by Square, Inc:
+
+ * Copyright 2010 Google Inc.
+ * License: Apache License v2.0
+ * Homepage: https://github.com/square/moshi
+
+This product contains a modified portion of the 'org.springframework.lang'
+package in the Spring Framework library, distributed by VMware, Inc:
+
+ * Copyright 2002-2019 the original author or authors.
+ * License: Apache License v2.0
+ * Homepage: https://spring.io/projects/spring-framework
diff --git a/solr/licenses/jakarta.websocket-client-api-2.1.1.jar.sha1 b/solr/licenses/jakarta.websocket-client-api-2.1.1.jar.sha1
new file mode 100644
index 00000000000..e01953c02e9
--- /dev/null
+++ b/solr/licenses/jakarta.websocket-client-api-2.1.1.jar.sha1
@@ -0,0 +1 @@
+bc149b7e22d6b2372835a3124cbcf24924982874
diff --git a/solr/licenses/jakarta.xml.bind-api-4.0.2.jar.sha1 b/solr/licenses/jakarta.xml.bind-api-4.0.2.jar.sha1
new file mode 100644
index 00000000000..61f85242f25
--- /dev/null
+++ b/solr/licenses/jakarta.xml.bind-api-4.0.2.jar.sha1
@@ -0,0 +1 @@
+6cd5a999b834b63238005b7144136379dc36cad2
diff --git a/solr/licenses/jaxb-LICENSE-BSD.txt b/solr/licenses/jaxb-LICENSE-BSD.txt
new file mode 100644
index 00000000000..da1c1cea702
--- /dev/null
+++ b/solr/licenses/jaxb-LICENSE-BSD.txt
@@ -0,0 +1,28 @@
+Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ - Neither the name of the Eclipse Foundation, Inc. nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/solr/licenses/jaxb-NOTICE.txt b/solr/licenses/jaxb-NOTICE.txt
new file mode 100644
index 00000000000..85121e7dd8a
--- /dev/null
+++ b/solr/licenses/jaxb-NOTICE.txt
@@ -0,0 +1,190 @@
+# Notices for Eclipse Implementation of JAXB
+
+This content is produced and maintained by the Eclipse Implementation of JAXB
+project.
+
+* Project home: https://projects.eclipse.org/projects/ee4j.jaxb-impl
+
+## Trademarks
+
+Eclipse Implementation of JAXB is a trademark of the Eclipse Foundation.
+
+## Copyright
+
+All content is the property of the respective authors or their employers. For
+more information regarding authorship of content, please consult the listed
+source code repository logs.
+
+## Declared Project Licenses
+
+This program and the accompanying materials are made available under the terms
+of the Eclipse Distribution License v. 1.0 which is available at
+http://www.eclipse.org/org/documents/edl-v10.php.
+
+SPDX-License-Identifier: BSD-3-Clause
+
+## Source Code
+
+The project maintains the following source code repositories:
+
+* https://github.com/eclipse-ee4j/jaxb-ri
+* https://github.com/eclipse-ee4j/jaxb-istack-commons
+* https://github.com/eclipse-ee4j/jaxb-dtd-parser
+* https://github.com/eclipse-ee4j/jaxb-fi
+* https://github.com/eclipse-ee4j/jaxb-stax-ex
+* https://github.com/eclipse-ee4j/jax-rpc-ri
+
+## Third-party Content
+
+This project leverages the following third party content.
+
+Apache Ant (1.10.2)
+
+* License: Apache-2.0 AND W3C AND LicenseRef-Public-Domain
+
+Apache Ant (1.10.2)
+
+* License: Apache-2.0 AND W3C AND LicenseRef-Public-Domain
+
+Apache Felix (1.2.0)
+
+* License: Apache License, 2.0
+
+args4j (2.33)
+
+* License: MIT License
+
+dom4j (1.6.1)
+
+* License: Custom license based on Apache 1.1
+
+file-management (3.0.0)
+
+* License: Apache-2.0
+* Project: https://maven.apache.org/shared/file-management/
+* Source:
+ https://svn.apache.org/viewvc/maven/shared/tags/file-management-3.0.0/
+
+JUnit (4.12)
+
+* License: Eclipse Public License
+
+JUnit (4.12)
+
+* License: Eclipse Public License
+
+maven-compat (3.5.2)
+
+* License: Apache-2.0
+* Project: https://maven.apache.org/ref/3.5.2/maven-compat/
+* Source:
+ https://mvnrepository.com/artifact/org.apache.maven/maven-compat/3.5.2
+
+maven-core (3.5.2)
+
+* License: Apache-2.0
+* Project: https://maven.apache.org/ref/3.5.2/maven-core/index.html
+* Source: https://mvnrepository.com/artifact/org.apache.maven/maven-core/3.5.2
+
+maven-plugin-annotations (3.5)
+
+* License: Apache-2.0
+* Project: https://maven.apache.org/plugin-tools/maven-plugin-annotations/
+* Source:
+ https://github.com/apache/maven-plugin-tools/tree/master/maven-plugin-annotations
+
+maven-plugin-api (3.5.2)
+
+* License: Apache-2.0
+
+maven-resolver-api (1.1.1)
+
+* License: Apache-2.0
+
+maven-resolver-api (1.1.1)
+
+* License: Apache-2.0
+
+maven-resolver-connector-basic (1.1.1)
+
+* License: Apache-2.0
+
+maven-resolver-impl (1.1.1)
+
+* License: Apache-2.0
+
+maven-resolver-spi (1.1.1)
+
+* License: Apache-2.0
+
+maven-resolver-transport-file (1.1.1)
+
+* License: Apache-2.0
+* Project: https://maven.apache.org/resolver/maven-resolver-transport-file/
+* Source:
+ https://github.com/apache/maven-resolver/tree/master/maven-resolver-transport-file
+
+maven-resolver-util (1.1.1)
+
+* License: Apache-2.0
+
+maven-settings (3.5.2)
+
+* License: Apache-2.0
+* Source:
+ https://mvnrepository.com/artifact/org.apache.maven/maven-settings/3.5.2
+
+OSGi Service Platform Core Companion Code (6.0)
+
+* License: Apache License, 2.0
+
+plexus-archiver (3.5)
+
+* License: Apache-2.0
+* Project: https://codehaus-plexus.github.io/plexus-archiver/
+* Source: https://github.com/codehaus-plexus/plexus-archiver
+
+plexus-io (3.0.0)
+
+* License: Apache-2.0
+
+plexus-utils (3.1.0)
+
+* License: Apache- 2.0 or Apache- 1.1 or BSD or Public Domain or Indiana
+ University Extreme! Lab Software License V1.1.1 (Apache 1.1 style)
+
+relaxng-datatype (1.0)
+
+* License: New BSD license
+
+Sax (0.2)
+
+* License: SAX-PD
+* Project: http://www.megginson.com/downloads/SAX/
+* Source: http://sourceforge.net/project/showfiles.php?group_id=29449
+
+testng (6.14.2)
+
+* License: Apache-2.0 AND (MIT OR GPL-1.0+)
+* Project: https://testng.org/doc/index.html
+* Source: https://github.com/cbeust/testng
+
+wagon-http-lightweight (3.0.0)
+
+* License: Pending
+* Project: https://maven.apache.org/wagon/
+* Source:
+ https://mvnrepository.com/artifact/org.apache.maven.wagon/wagon-http-lightweight/3.0.0
+
+xz for java (1.8)
+
+* License: LicenseRef-Public-Domain
+
+## Cryptography
+
+Content may contain encryption software. The country in which you are currently
+may have restrictions on the import, possession, and use, and/or re-export to
+another country, of encryption software. BEFORE using any encryption software,
+please check the country's laws, regulations and policies concerning the import,
+possession, or use, and re-export of encryption software, to see if this is
+permitted.
diff --git a/solr/licenses/jaxb-core-4.0.5.jar.sha1 b/solr/licenses/jaxb-core-4.0.5.jar.sha1
new file mode 100644
index 00000000000..b5f9133ca54
--- /dev/null
+++ b/solr/licenses/jaxb-core-4.0.5.jar.sha1
@@ -0,0 +1 @@
+007b4b11ea5542eea4ad55e1080b23be436795b3
diff --git a/solr/licenses/jaxb-runtime-4.0.5.jar.sha1 b/solr/licenses/jaxb-runtime-4.0.5.jar.sha1
new file mode 100644
index 00000000000..92f90301861
--- /dev/null
+++ b/solr/licenses/jaxb-runtime-4.0.5.jar.sha1
@@ -0,0 +1 @@
+ca84c2a7169b5293e232b9d00d1e4e36d4c3914a
diff --git a/solr/licenses/jetty-alpn-client-10.0.22.jar.sha1 b/solr/licenses/jetty-alpn-client-10.0.22.jar.sha1
deleted file mode 100644
index 2c1cc2437fa..00000000000
--- a/solr/licenses/jetty-alpn-client-10.0.22.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-406aa96e86dc71ab62176ec1ed5212cd1898e38a
diff --git a/solr/licenses/jetty-alpn-client-12.0.19.jar.sha1 b/solr/licenses/jetty-alpn-client-12.0.19.jar.sha1
new file mode 100644
index 00000000000..78dc440c6a5
--- /dev/null
+++ b/solr/licenses/jetty-alpn-client-12.0.19.jar.sha1
@@ -0,0 +1 @@
+a5a1c0e89ca562be481e5146c7fbe30692b91a95
diff --git a/solr/licenses/jetty-alpn-java-client-10.0.22.jar.sha1 b/solr/licenses/jetty-alpn-java-client-10.0.22.jar.sha1
deleted file mode 100644
index 95552987baf..00000000000
--- a/solr/licenses/jetty-alpn-java-client-10.0.22.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4b3abc80849dde116c20d84c834f0289bc61fc35
diff --git a/solr/licenses/jetty-alpn-java-client-12.0.19.jar.sha1 b/solr/licenses/jetty-alpn-java-client-12.0.19.jar.sha1
new file mode 100644
index 00000000000..effe6a3a40b
--- /dev/null
+++ b/solr/licenses/jetty-alpn-java-client-12.0.19.jar.sha1
@@ -0,0 +1 @@
+daad6c49e5c40f994959a85109a5f448494e5487
diff --git a/solr/licenses/jetty-alpn-java-server-10.0.22.jar.sha1 b/solr/licenses/jetty-alpn-java-server-10.0.22.jar.sha1
deleted file mode 100644
index d60ca0fe045..00000000000
--- a/solr/licenses/jetty-alpn-java-server-10.0.22.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2b5bbaae622721f78930009990c3d5a9118e6c3b
diff --git a/solr/licenses/jetty-alpn-java-server-12.0.19.jar.sha1 b/solr/licenses/jetty-alpn-java-server-12.0.19.jar.sha1
new file mode 100644
index 00000000000..869ed43a9af
--- /dev/null
+++ b/solr/licenses/jetty-alpn-java-server-12.0.19.jar.sha1
@@ -0,0 +1 @@
+cd51c9facf309ea7f950cb32f0374dcd2ce9b619
diff --git a/solr/licenses/jetty-alpn-server-10.0.22.jar.sha1 b/solr/licenses/jetty-alpn-server-10.0.22.jar.sha1
deleted file mode 100644
index a2f2f494568..00000000000
--- a/solr/licenses/jetty-alpn-server-10.0.22.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-533246e6f8ab50186c52b1a9eee75f5259d05c06
diff --git a/solr/licenses/jetty-alpn-server-12.0.19.jar.sha1 b/solr/licenses/jetty-alpn-server-12.0.19.jar.sha1
new file mode 100644
index 00000000000..f33cc754c8d
--- /dev/null
+++ b/solr/licenses/jetty-alpn-server-12.0.19.jar.sha1
@@ -0,0 +1 @@
+03f398119d1be19cf42e35dc47f97e0c49b82b97
diff --git a/solr/licenses/jetty-client-10.0.22.jar.sha1 b/solr/licenses/jetty-client-10.0.22.jar.sha1
deleted file mode 100644
index 54c4ee02d3f..00000000000
--- a/solr/licenses/jetty-client-10.0.22.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7946f242dab0d3e6bd699acb91a3c30bed6cf217
diff --git a/solr/licenses/jetty-client-12.0.19.jar.sha1 b/solr/licenses/jetty-client-12.0.19.jar.sha1
new file mode 100644
index 00000000000..87bc693afa4
--- /dev/null
+++ b/solr/licenses/jetty-client-12.0.19.jar.sha1
@@ -0,0 +1 @@
+adf415162720619f0e022e055cc2972d913457f1
diff --git a/solr/licenses/jetty-deploy-10.0.22.jar.sha1 b/solr/licenses/jetty-deploy-10.0.22.jar.sha1
deleted file mode 100644
index b9f52818703..00000000000
--- a/solr/licenses/jetty-deploy-10.0.22.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e761608322a70bd80238572e7f16623e436f73bb
diff --git a/solr/licenses/jetty-deploy-12.0.19.jar.sha1 b/solr/licenses/jetty-deploy-12.0.19.jar.sha1
new file mode 100644
index 00000000000..4a0aaf65858
--- /dev/null
+++ b/solr/licenses/jetty-deploy-12.0.19.jar.sha1
@@ -0,0 +1 @@
+4212352fdb204267c1aa4016cd7177d0c2f3d550
diff --git a/solr/licenses/jetty-ee-12.0.19.jar.sha1 b/solr/licenses/jetty-ee-12.0.19.jar.sha1
new file mode 100644
index 00000000000..681133525d4
--- /dev/null
+++ b/solr/licenses/jetty-ee-12.0.19.jar.sha1
@@ -0,0 +1 @@
+d5f9758628897272237fb8e3bb02dc2c1636690c
diff --git a/solr/licenses/jetty-ee10-annotations-12.0.9.jar.sha1 b/solr/licenses/jetty-ee10-annotations-12.0.9.jar.sha1
new file mode 100644
index 00000000000..3c6c0c56a81
--- /dev/null
+++ b/solr/licenses/jetty-ee10-annotations-12.0.9.jar.sha1
@@ -0,0 +1 @@
+f07a694a2b38ce03fe3dd266795aad92773e70b8
diff --git a/solr/licenses/jetty-ee10-plus-12.0.9.jar.sha1 b/solr/licenses/jetty-ee10-plus-12.0.9.jar.sha1
new file mode 100644
index 00000000000..cecdbe92a25
--- /dev/null
+++ b/solr/licenses/jetty-ee10-plus-12.0.9.jar.sha1
@@ -0,0 +1 @@
+b8d2e6571061aa7b7fcc190976a198bbccce034e
diff --git a/solr/licenses/jetty-ee10-servlet-12.0.19.jar.sha1 b/solr/licenses/jetty-ee10-servlet-12.0.19.jar.sha1
new file mode 100644
index 00000000000..b123af21497
--- /dev/null
+++ b/solr/licenses/jetty-ee10-servlet-12.0.19.jar.sha1
@@ -0,0 +1 @@
+e0b5fa5b9f30a707282fde836ee50e51b662085a
diff --git a/solr/licenses/jetty-ee10-servlets-12.0.19.jar.sha1 b/solr/licenses/jetty-ee10-servlets-12.0.19.jar.sha1
new file mode 100644
index 00000000000..7ef9191d28d
--- /dev/null
+++ b/solr/licenses/jetty-ee10-servlets-12.0.19.jar.sha1
@@ -0,0 +1 @@
+087a35d3b8bbeb2802fd23b391b97bc743277712
diff --git a/solr/licenses/jetty-ee10-webapp-12.0.19.jar.sha1 b/solr/licenses/jetty-ee10-webapp-12.0.19.jar.sha1
new file mode 100644
index 00000000000..8a4729558a5
--- /dev/null
+++ b/solr/licenses/jetty-ee10-webapp-12.0.19.jar.sha1
@@ -0,0 +1 @@
+99b8f3273b41d7862f1c4f54f48df03cf85a43b7
diff --git a/solr/licenses/jetty-ee10-websocket-jakarta-client-12.0.9.jar.sha1 b/solr/licenses/jetty-ee10-websocket-jakarta-client-12.0.9.jar.sha1
new file mode 100644
index 00000000000..00f91fba573
--- /dev/null
+++ b/solr/licenses/jetty-ee10-websocket-jakarta-client-12.0.9.jar.sha1
@@ -0,0 +1 @@
+7857f53162fa1a682839cff0e452da31f2320d80
diff --git a/solr/licenses/jetty-ee10-websocket-jakarta-common-12.0.9.jar.sha1 b/solr/licenses/jetty-ee10-websocket-jakarta-common-12.0.9.jar.sha1
new file mode 100644
index 00000000000..e839e03e147
--- /dev/null
+++ b/solr/licenses/jetty-ee10-websocket-jakarta-common-12.0.9.jar.sha1
@@ -0,0 +1 @@
+af53d13b7bc504169a54a562ea625c2043956a9b
diff --git a/solr/licenses/jetty-ee10-websocket-jakarta-server-12.0.9.jar.sha1 b/solr/licenses/jetty-ee10-websocket-jakarta-server-12.0.9.jar.sha1
new file mode 100644
index 00000000000..4039dc662e6
--- /dev/null
+++ b/solr/licenses/jetty-ee10-websocket-jakarta-server-12.0.9.jar.sha1
@@ -0,0 +1 @@
+3661146be381bda70fb82453fd622f2a0dd6a6bf
diff --git a/solr/licenses/jetty-ee10-websocket-jetty-server-12.0.9.jar.sha1 b/solr/licenses/jetty-ee10-websocket-jetty-server-12.0.9.jar.sha1
new file mode 100644
index 00000000000..241212a35fa
--- /dev/null
+++ b/solr/licenses/jetty-ee10-websocket-jetty-server-12.0.9.jar.sha1
@@ -0,0 +1 @@
+a16083bac70c75249f7b556c3e2ca363ee2c4b9f
diff --git a/solr/licenses/jetty-ee10-websocket-servlet-12.0.9.jar.sha1 b/solr/licenses/jetty-ee10-websocket-servlet-12.0.9.jar.sha1
new file mode 100644
index 00000000000..e4ce8a9c501
--- /dev/null
+++ b/solr/licenses/jetty-ee10-websocket-servlet-12.0.9.jar.sha1
@@ -0,0 +1 @@
+52baab96dec6fb138418563c41b83f53ce92a7c5
diff --git a/solr/licenses/jetty-http-10.0.22.jar.sha1 b/solr/licenses/jetty-http-10.0.22.jar.sha1
deleted file mode 100644
index 892a6f5aa8c..00000000000
--- a/solr/licenses/jetty-http-10.0.22.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5a82b1f99820e14bc31368e8a1d49ee018193e29
diff --git a/solr/licenses/jetty-http-12.0.19.jar.sha1 b/solr/licenses/jetty-http-12.0.19.jar.sha1
new file mode 100644
index 00000000000..01aea3d448d
--- /dev/null
+++ b/solr/licenses/jetty-http-12.0.19.jar.sha1
@@ -0,0 +1 @@
+f992617613998fb592dfd267446c2182376ca029
diff --git a/solr/licenses/jetty-http2-client-12.0.19.jar.sha1 b/solr/licenses/jetty-http2-client-12.0.19.jar.sha1
new file mode 100644
index 00000000000..6ed6dd4d8dc
--- /dev/null
+++ b/solr/licenses/jetty-http2-client-12.0.19.jar.sha1
@@ -0,0 +1 @@
+ffcc0955ff43570f40e0c8eaf33d34c8cafb1d6c
diff --git a/solr/licenses/jetty-http2-client-transport-12.0.19.jar.sha1 b/solr/licenses/jetty-http2-client-transport-12.0.19.jar.sha1
new file mode 100644
index 00000000000..faf9288b29f
--- /dev/null
+++ b/solr/licenses/jetty-http2-client-transport-12.0.19.jar.sha1
@@ -0,0 +1 @@
+68d8b0f099070a5827d9e9fb54acc9421bcfbc80
diff --git a/solr/licenses/jetty-http2-common-12.0.19.jar.sha1 b/solr/licenses/jetty-http2-common-12.0.19.jar.sha1
new file mode 100644
index 00000000000..e98afd1f48a
--- /dev/null
+++ b/solr/licenses/jetty-http2-common-12.0.19.jar.sha1
@@ -0,0 +1 @@
+509cab703028dbdea742832c3d4103e17d377db1
diff --git a/solr/licenses/jetty-http2-hpack-12.0.19.jar.sha1 b/solr/licenses/jetty-http2-hpack-12.0.19.jar.sha1
new file mode 100644
index 00000000000..83a88ebcf67
--- /dev/null
+++ b/solr/licenses/jetty-http2-hpack-12.0.19.jar.sha1
@@ -0,0 +1 @@
+b8e1620f022665ad2e357acec5568867aea64253
diff --git a/solr/licenses/jetty-http2-server-12.0.19.jar.sha1 b/solr/licenses/jetty-http2-server-12.0.19.jar.sha1
new file mode 100644
index 00000000000..007b9b72c9b
--- /dev/null
+++ b/solr/licenses/jetty-http2-server-12.0.19.jar.sha1
@@ -0,0 +1 @@
+e9da998f4e24188efd9b75e14a91dd3ae89760e4
diff --git a/solr/licenses/jetty-io-10.0.22.jar.sha1 b/solr/licenses/jetty-io-10.0.22.jar.sha1
deleted file mode 100644
index e4a790b9e8b..00000000000
--- a/solr/licenses/jetty-io-10.0.22.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-706353f75c6a97ae4bd90946bb594c7c56908213
diff --git a/solr/licenses/jetty-io-12.0.19.jar.sha1 b/solr/licenses/jetty-io-12.0.19.jar.sha1
new file mode 100644
index 00000000000..025d1e53c4f
--- /dev/null
+++ b/solr/licenses/jetty-io-12.0.19.jar.sha1
@@ -0,0 +1 @@
+b949237228faf1407eea07352103e46279cb8fff
diff --git a/solr/licenses/jetty-jakarta-servlet-api-5.0.2.jar.sha1 b/solr/licenses/jetty-jakarta-servlet-api-5.0.2.jar.sha1
new file mode 100644
index 00000000000..24ce91c7556
--- /dev/null
+++ b/solr/licenses/jetty-jakarta-servlet-api-5.0.2.jar.sha1
@@ -0,0 +1 @@
+027fce6d666a203526236d33d00e202a4136230f
diff --git a/solr/licenses/jetty-jmx-10.0.22.jar.sha1 b/solr/licenses/jetty-jmx-10.0.22.jar.sha1
deleted file mode 100644
index fa80fb655fa..00000000000
--- a/solr/licenses/jetty-jmx-10.0.22.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-726cb6525c0f46a13c2caac31004fe44df25fc86
diff --git a/solr/licenses/jetty-jmx-12.0.19.jar.sha1 b/solr/licenses/jetty-jmx-12.0.19.jar.sha1
new file mode 100644
index 00000000000..6d1a9d15b08
--- /dev/null
+++ b/solr/licenses/jetty-jmx-12.0.19.jar.sha1
@@ -0,0 +1 @@
+0a27d57e6b19a94153ec1ee5e2cc243b065c7e72
diff --git a/solr/licenses/jetty-rewrite-10.0.22.jar.sha1 b/solr/licenses/jetty-rewrite-10.0.22.jar.sha1
deleted file mode 100644
index 18e392f49d6..00000000000
--- a/solr/licenses/jetty-rewrite-10.0.22.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1910256ece821336b18ffbca47b2fc37042065e2
diff --git a/solr/licenses/jetty-rewrite-12.0.19.jar.sha1 b/solr/licenses/jetty-rewrite-12.0.19.jar.sha1
new file mode 100644
index 00000000000..96ae6c45169
--- /dev/null
+++ b/solr/licenses/jetty-rewrite-12.0.19.jar.sha1
@@ -0,0 +1 @@
+0e10584ce02de3743b1086a04a1df8047437a2f8
diff --git a/solr/licenses/jetty-security-10.0.22.jar.sha1 b/solr/licenses/jetty-security-10.0.22.jar.sha1
deleted file mode 100644
index d55aeacb25e..00000000000
--- a/solr/licenses/jetty-security-10.0.22.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6987e8708990efdfe1878f6427fdd293fc0a8e9f
diff --git a/solr/licenses/jetty-security-12.0.19.jar.sha1 b/solr/licenses/jetty-security-12.0.19.jar.sha1
new file mode 100644
index 00000000000..c01ba5d190f
--- /dev/null
+++ b/solr/licenses/jetty-security-12.0.19.jar.sha1
@@ -0,0 +1 @@
+9c9e3bb94722579e37cd3f0f3356bcc238082628
diff --git a/solr/licenses/jetty-server-10.0.22.jar.sha1 b/solr/licenses/jetty-server-10.0.22.jar.sha1
deleted file mode 100644
index 7da9c89cba5..00000000000
--- a/solr/licenses/jetty-server-10.0.22.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b4447ea127dff476960ab28c8f15aad2f70defee
diff --git a/solr/licenses/jetty-server-12.0.19.jar.sha1 b/solr/licenses/jetty-server-12.0.19.jar.sha1
new file mode 100644
index 00000000000..fc84657695e
--- /dev/null
+++ b/solr/licenses/jetty-server-12.0.19.jar.sha1
@@ -0,0 +1 @@
+9688d92d1b9809c8fc523f0cd2ff95d1d926aab9
diff --git a/solr/licenses/jetty-servlet-10.0.22.jar.sha1 b/solr/licenses/jetty-servlet-10.0.22.jar.sha1
deleted file mode 100644
index f5058977c0a..00000000000
--- a/solr/licenses/jetty-servlet-10.0.22.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c794f52275e85432baf148b9c59bf3fa2c1f1043
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 5293c068a34..00000000000
--- a/solr/licenses/jetty-servlet-api-4.0.6.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-959c5d83d08f5cddf56caff749e48b735193191b
diff --git a/solr/licenses/jetty-servlets-10.0.22.jar.sha1 b/solr/licenses/jetty-servlets-10.0.22.jar.sha1
deleted file mode 100644
index 89e7b1ee5b5..00000000000
--- a/solr/licenses/jetty-servlets-10.0.22.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b90ba6757c3c56d3988b5c8d45087d181c1c5be0
diff --git a/solr/licenses/jetty-session-12.0.19.jar.sha1 b/solr/licenses/jetty-session-12.0.19.jar.sha1
new file mode 100644
index 00000000000..ff665596b2c
--- /dev/null
+++ b/solr/licenses/jetty-session-12.0.19.jar.sha1
@@ -0,0 +1 @@
+7a8cab3e28b28ff8e6c3fda9311f8b72b9b05945
diff --git a/solr/licenses/jetty-start-10.0.22-shaded.jar.sha1 b/solr/licenses/jetty-start-10.0.22-shaded.jar.sha1
deleted file mode 100644
index 6a2d564048d..00000000000
--- a/solr/licenses/jetty-start-10.0.22-shaded.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6389146cd3e762d33a567fb721bf7060a07f03d8
diff --git a/solr/licenses/jetty-start-12.0.19-shaded.jar.sha1 b/solr/licenses/jetty-start-12.0.19-shaded.jar.sha1
new file mode 100644
index 00000000000..ee6dcab2463
--- /dev/null
+++ b/solr/licenses/jetty-start-12.0.19-shaded.jar.sha1
@@ -0,0 +1 @@
+99e818c28f41be45cd5ad32294ba13bbb84a4d58
diff --git a/solr/licenses/jetty-util-10.0.22.jar.sha1 b/solr/licenses/jetty-util-10.0.22.jar.sha1
deleted file mode 100644
index 5b5d826e6db..00000000000
--- a/solr/licenses/jetty-util-10.0.22.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9add990f8bfe742ff807944113beb5990f14c1f0
diff --git a/solr/licenses/jetty-util-12.0.19.jar.sha1 b/solr/licenses/jetty-util-12.0.19.jar.sha1
new file mode 100644
index 00000000000..e9dcaa806fe
--- /dev/null
+++ b/solr/licenses/jetty-util-12.0.19.jar.sha1
@@ -0,0 +1 @@
+5dd72392608420f6828c9a3b4bec4f37f83dfcd8
diff --git a/solr/licenses/jetty-webapp-10.0.22.jar.sha1 b/solr/licenses/jetty-webapp-10.0.22.jar.sha1
deleted file mode 100644
index 6e035721282..00000000000
--- a/solr/licenses/jetty-webapp-10.0.22.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a2517ec8dd2d0c623192094c379d20e5443b80b2
diff --git a/solr/licenses/jetty-websocket-core-client-12.0.9.jar.sha1 b/solr/licenses/jetty-websocket-core-client-12.0.9.jar.sha1
new file mode 100644
index 00000000000..b5a1305f157
--- /dev/null
+++ b/solr/licenses/jetty-websocket-core-client-12.0.9.jar.sha1
@@ -0,0 +1 @@
+23952a10dd9af3d6eb2e3c5805880a8e988f2da6
diff --git a/solr/licenses/jetty-websocket-core-common-12.0.9.jar.sha1 b/solr/licenses/jetty-websocket-core-common-12.0.9.jar.sha1
new file mode 100644
index 00000000000..9bd6747bba4
--- /dev/null
+++ b/solr/licenses/jetty-websocket-core-common-12.0.9.jar.sha1
@@ -0,0 +1 @@
+3c8c060afe4fbd4c35b2b661c5dd6edf4f50f720
diff --git a/solr/licenses/jetty-websocket-core-server-12.0.9.jar.sha1 b/solr/licenses/jetty-websocket-core-server-12.0.9.jar.sha1
new file mode 100644
index 00000000000..d10b81d40da
--- /dev/null
+++ b/solr/licenses/jetty-websocket-core-server-12.0.9.jar.sha1
@@ -0,0 +1 @@
+4e23d72fc838bc818945a2bf59ba4f8b92a589ab
diff --git a/solr/licenses/jetty-websocket-jetty-api-12.0.9.jar.sha1 b/solr/licenses/jetty-websocket-jetty-api-12.0.9.jar.sha1
new file mode 100644
index 00000000000..c0c73d2be82
--- /dev/null
+++ b/solr/licenses/jetty-websocket-jetty-api-12.0.9.jar.sha1
@@ -0,0 +1 @@
+2e627889a98a7107862037ae161862a3b07c0c39
diff --git a/solr/licenses/jetty-websocket-jetty-common-12.0.9.jar.sha1 b/solr/licenses/jetty-websocket-jetty-common-12.0.9.jar.sha1
new file mode 100644
index 00000000000..cfa785439b6
--- /dev/null
+++ b/solr/licenses/jetty-websocket-jetty-common-12.0.9.jar.sha1
@@ -0,0 +1 @@
+33cedefd3dbc970a17ab9a26091988b6989ff0d2
diff --git a/solr/licenses/jetty-xml-10.0.22.jar.sha1 b/solr/licenses/jetty-xml-10.0.22.jar.sha1
deleted file mode 100644
index 813eb0bf0f9..00000000000
--- a/solr/licenses/jetty-xml-10.0.22.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-68d31a946fc73f8320766629f3a52cceb4d88ceb
diff --git a/solr/licenses/jetty-xml-12.0.19.jar.sha1 b/solr/licenses/jetty-xml-12.0.19.jar.sha1
new file mode 100644
index 00000000000..79805845a47
--- /dev/null
+++ b/solr/licenses/jetty-xml-12.0.19.jar.sha1
@@ -0,0 +1 @@
+c19a05516530b9f19a620d80c5a40d4708b2da40
diff --git a/solr/licenses/jmespath-java-1.12.501.jar.sha1 b/solr/licenses/jmespath-java-1.12.501.jar.sha1
deleted file mode 100644
index baf747d0cf3..00000000000
--- a/solr/licenses/jmespath-java-1.12.501.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-941d0bade80af32bb3ac0fc77ae3691ef6515af8
diff --git a/solr/licenses/jmespath-java-1.12.729.jar.sha1 b/solr/licenses/jmespath-java-1.12.729.jar.sha1
new file mode 100644
index 00000000000..d1583e6b5b2
--- /dev/null
+++ b/solr/licenses/jmespath-java-1.12.729.jar.sha1
@@ -0,0 +1 @@
+9e8c90c3cc0855a82a12b604fac27fb9b6b91a72
diff --git a/solr/licenses/json-utils-2.26.19.jar.sha1 b/solr/licenses/json-utils-2.26.19.jar.sha1
deleted file mode 100644
index 93123703512..00000000000
--- a/solr/licenses/json-utils-2.26.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e866ad2846e382bce87587c974774ff5e8f8b7ae
diff --git a/solr/licenses/json-utils-2.28.11.jar.sha1 b/solr/licenses/json-utils-2.28.11.jar.sha1
new file mode 100644
index 00000000000..aabbde82b19
--- /dev/null
+++ b/solr/licenses/json-utils-2.28.11.jar.sha1
@@ -0,0 +1 @@
+6682ce958e76a2225e0b72aea77d766b93df405f
diff --git a/solr/licenses/metrics-jakarta-servlets-4.2.26.jar.sha1 b/solr/licenses/metrics-jakarta-servlets-4.2.26.jar.sha1
new file mode 100644
index 00000000000..023b4931bb1
--- /dev/null
+++ b/solr/licenses/metrics-jakarta-servlets-4.2.26.jar.sha1
@@ -0,0 +1 @@
+da590186279c40e3187b50ca05ad9a6c4503db33
diff --git a/solr/licenses/metrics-jetty10-4.2.26.jar.sha1 b/solr/licenses/metrics-jetty10-4.2.26.jar.sha1
deleted file mode 100644
index 1f10290709f..00000000000
--- a/solr/licenses/metrics-jetty10-4.2.26.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e98955ccd143d9000a4796ea9f1cfb996ef730f3
diff --git a/solr/licenses/metrics-jetty12-4.2.26.jar.sha1 b/solr/licenses/metrics-jetty12-4.2.26.jar.sha1
new file mode 100644
index 00000000000..69874b4fe3b
--- /dev/null
+++ b/solr/licenses/metrics-jetty12-4.2.26.jar.sha1
@@ -0,0 +1 @@
+7d4bdf5d9915b45c8202aac4861956932956ce26
diff --git a/solr/licenses/metrics-jetty12-ee10-4.2.26.jar.sha1 b/solr/licenses/metrics-jetty12-ee10-4.2.26.jar.sha1
new file mode 100644
index 00000000000..58855d2494a
--- /dev/null
+++ b/solr/licenses/metrics-jetty12-ee10-4.2.26.jar.sha1
@@ -0,0 +1 @@
+ac14c220fd14d23b6041b66c82fedb35b923506e
diff --git a/solr/licenses/metrics-servlets-4.2.26.jar.sha1 b/solr/licenses/metrics-servlets-4.2.26.jar.sha1
deleted file mode 100644
index cbfbcfa4b53..00000000000
--- a/solr/licenses/metrics-servlets-4.2.26.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3a8a4b91fef491b5a8b8e3b7ef4f5b2541f4689b
diff --git a/solr/licenses/metrics-spi-2.26.19.jar.sha1 b/solr/licenses/metrics-spi-2.26.19.jar.sha1
deleted file mode 100644
index c6803188462..00000000000
--- a/solr/licenses/metrics-spi-2.26.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2360eb26fd8766632819efef6aa31d9d6f490776
diff --git a/solr/licenses/metrics-spi-2.28.11.jar.sha1 b/solr/licenses/metrics-spi-2.28.11.jar.sha1
new file mode 100644
index 00000000000..74c84799404
--- /dev/null
+++ b/solr/licenses/metrics-spi-2.28.11.jar.sha1
@@ -0,0 +1 @@
+5191ee9d98a0d92ac4dba454ff21941f2d308cf5
diff --git a/solr/licenses/micrometer-LICENSE-ASL.txt b/solr/licenses/micrometer-LICENSE-ASL.txt
new file mode 100644
index 00000000000..9b259bdfcf9
--- /dev/null
+++ b/solr/licenses/micrometer-LICENSE-ASL.txt
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ https://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
+
+ https://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/micrometer-NOTICE.txt b/solr/licenses/micrometer-NOTICE.txt
new file mode 100644
index 00000000000..076c3641fa4
--- /dev/null
+++ b/solr/licenses/micrometer-NOTICE.txt
@@ -0,0 +1,45 @@
+Micrometer
+
+Copyright (c) 2017-Present VMware, Inc. All Rights Reserved.
+
+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
+
+ https://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.
+
+-------------------------------------------------------------------------------
+
+This product contains a modified portion of 'io.netty.util.internal.logging',
+in the Netty/Common library distributed by The Netty Project:
+
+ * Copyright 2013 The Netty Project
+ * License: Apache License v2.0
+ * Homepage: https://netty.io
+
+This product contains a modified portion of 'StringUtils.isBlank()',
+in the Commons Lang library distributed by The Apache Software Foundation:
+
+ * Copyright 2001-2019 The Apache Software Foundation
+ * License: Apache License v2.0
+ * Homepage: https://commons.apache.org/proper/commons-lang/
+
+This product contains a modified portion of 'JsonUtf8Writer',
+in the Moshi library distributed by Square, Inc:
+
+ * Copyright 2010 Google Inc.
+ * License: Apache License v2.0
+ * Homepage: https://github.com/square/moshi
+
+This product contains a modified portion of the 'org.springframework.lang'
+package in the Spring Framework library, distributed by VMware, Inc:
+
+ * Copyright 2002-2019 the original author or authors.
+ * License: Apache License v2.0
+ * Homepage: https://spring.io/projects/spring-framework
diff --git a/solr/licenses/micrometer-commons-1.13.0.jar.sha1 b/solr/licenses/micrometer-commons-1.13.0.jar.sha1
new file mode 100644
index 00000000000..4f1a88eab78
--- /dev/null
+++ b/solr/licenses/micrometer-commons-1.13.0.jar.sha1
@@ -0,0 +1 @@
+156a59aff8d72c5e631eb4a2d739373ed5881609
diff --git a/solr/licenses/micrometer-core-1.13.0.jar.sha1 b/solr/licenses/micrometer-core-1.13.0.jar.sha1
new file mode 100644
index 00000000000..a746a15c08a
--- /dev/null
+++ b/solr/licenses/micrometer-core-1.13.0.jar.sha1
@@ -0,0 +1 @@
+d7ed656fbc54fde5a03d978fc0d66f270cc4a997
diff --git a/solr/licenses/micrometer-core-1.9.12.jar.sha1 b/solr/licenses/micrometer-core-1.9.12.jar.sha1
deleted file mode 100644
index 9f3ee82e101..00000000000
--- a/solr/licenses/micrometer-core-1.9.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1077e4cce74894bbe96c79d380781820ba3dfd44
diff --git a/solr/licenses/micrometer-jakarta9-1.13.0.jar.sha1 b/solr/licenses/micrometer-jakarta9-1.13.0.jar.sha1
new file mode 100644
index 00000000000..25066ab1dbd
--- /dev/null
+++ b/solr/licenses/micrometer-jakarta9-1.13.0.jar.sha1
@@ -0,0 +1 @@
+5d6820df50cba9ef893bf026eacf5a6093945ac7
diff --git a/solr/licenses/micrometer-observation-1.13.0.jar.sha1 b/solr/licenses/micrometer-observation-1.13.0.jar.sha1
new file mode 100644
index 00000000000..0be5fc77b26
--- /dev/null
+++ b/solr/licenses/micrometer-observation-1.13.0.jar.sha1
@@ -0,0 +1 @@
+5aa75fbb4367dc3b28e557d14535d21335dc8985
diff --git a/solr/licenses/profiles-2.26.19.jar.sha1 b/solr/licenses/profiles-2.26.19.jar.sha1
deleted file mode 100644
index 2f8dd920e43..00000000000
--- a/solr/licenses/profiles-2.26.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c87029de02f4916fd11a9b6ff17e7b9de67d7e1b
diff --git a/solr/licenses/profiles-2.28.11.jar.sha1 b/solr/licenses/profiles-2.28.11.jar.sha1
new file mode 100644
index 00000000000..d1704f80925
--- /dev/null
+++ b/solr/licenses/profiles-2.28.11.jar.sha1
@@ -0,0 +1 @@
+b304d71730de3a2fd28ae9b8bbed9db7a987948f
diff --git a/solr/licenses/protocol-core-2.26.19.jar.sha1 b/solr/licenses/protocol-core-2.26.19.jar.sha1
deleted file mode 100644
index 7ae31d9206b..00000000000
--- a/solr/licenses/protocol-core-2.26.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-89a592ca1463b57f68c56c991d364db902250c88
diff --git a/solr/licenses/protocol-core-2.28.11.jar.sha1 b/solr/licenses/protocol-core-2.28.11.jar.sha1
new file mode 100644
index 00000000000..7489eec61ce
--- /dev/null
+++ b/solr/licenses/protocol-core-2.28.11.jar.sha1
@@ -0,0 +1 @@
+01b9ab7d647399d0e285857bfa31a449def879f5
diff --git a/solr/licenses/regions-2.26.19.jar.sha1 b/solr/licenses/regions-2.26.19.jar.sha1
deleted file mode 100644
index 5baf3283341..00000000000
--- a/solr/licenses/regions-2.26.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c5b14483c17d2627f9cab1a2e9d06cfd422aa0b0
diff --git a/solr/licenses/regions-2.28.11.jar.sha1 b/solr/licenses/regions-2.28.11.jar.sha1
new file mode 100644
index 00000000000..439e1ec7016
--- /dev/null
+++ b/solr/licenses/regions-2.28.11.jar.sha1
@@ -0,0 +1 @@
+f2bbe35d666beb19d7f25bf82db76cff96351ec6
diff --git a/solr/licenses/retries-2.26.19.jar.sha1 b/solr/licenses/retries-2.26.19.jar.sha1
deleted file mode 100644
index 2cdea5c8297..00000000000
--- a/solr/licenses/retries-2.26.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fbc3800df38512d13b8e661af7197ae8b93713ea
diff --git a/solr/licenses/retries-2.28.11.jar.sha1 b/solr/licenses/retries-2.28.11.jar.sha1
new file mode 100644
index 00000000000..e5d49886c60
--- /dev/null
+++ b/solr/licenses/retries-2.28.11.jar.sha1
@@ -0,0 +1 @@
+dd24a56039450b88479b3ad1948f5e4e0f8aeda7
diff --git a/solr/licenses/retries-spi-2.26.19.jar.sha1 b/solr/licenses/retries-spi-2.26.19.jar.sha1
deleted file mode 100644
index 02774e82373..00000000000
--- a/solr/licenses/retries-spi-2.26.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e3e97bb57fea9a82925d2669af723689667bb219
diff --git a/solr/licenses/retries-spi-2.28.11.jar.sha1 b/solr/licenses/retries-spi-2.28.11.jar.sha1
new file mode 100644
index 00000000000..362a5e32b44
--- /dev/null
+++ b/solr/licenses/retries-spi-2.28.11.jar.sha1
@@ -0,0 +1 @@
+90ab28b9fda62e803267790f44d27b0d470bf390
diff --git a/solr/licenses/s3-2.26.19.jar.sha1 b/solr/licenses/s3-2.26.19.jar.sha1
deleted file mode 100644
index 84387d9d42d..00000000000
--- a/solr/licenses/s3-2.26.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d0d08f386ee8a6d8a6b31f360da5d4ba387c9acf
diff --git a/solr/licenses/s3-2.28.11.jar.sha1 b/solr/licenses/s3-2.28.11.jar.sha1
new file mode 100644
index 00000000000..bcc5dde6302
--- /dev/null
+++ b/solr/licenses/s3-2.28.11.jar.sha1
@@ -0,0 +1 @@
+50bcd5df8d7c698bacefd54429b1feb29c00534f
diff --git a/solr/licenses/s3mock-2.17.0.jar.sha1 b/solr/licenses/s3mock-2.17.0.jar.sha1
deleted file mode 100644
index 878d6fb5886..00000000000
--- a/solr/licenses/s3mock-2.17.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e5857753b28d06f6728f6200f94e5be299c8631c
diff --git a/solr/licenses/s3mock-3.9.1.jar.sha1 b/solr/licenses/s3mock-3.9.1.jar.sha1
new file mode 100644
index 00000000000..fdaa243be10
--- /dev/null
+++ b/solr/licenses/s3mock-3.9.1.jar.sha1
@@ -0,0 +1 @@
+0409bf53faf473eb889904df726fc6e9b5ba0b46
diff --git a/solr/licenses/s3mock-junit4-2.17.0.jar.sha1 b/solr/licenses/s3mock-junit4-2.17.0.jar.sha1
deleted file mode 100644
index 7533e674ae3..00000000000
--- a/solr/licenses/s3mock-junit4-2.17.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e9601a823ef3648544d0c1d0ff14517c1feb0969
diff --git a/solr/licenses/s3mock-junit4-3.9.1.jar.sha1 b/solr/licenses/s3mock-junit4-3.9.1.jar.sha1
new file mode 100644
index 00000000000..a28f2ea2aa3
--- /dev/null
+++ b/solr/licenses/s3mock-junit4-3.9.1.jar.sha1
@@ -0,0 +1 @@
+4f647dd83023d1cb81c9857ecd57920d7aa5fa1b
diff --git a/solr/licenses/s3mock-testsupport-common-2.17.0.jar.sha1 b/solr/licenses/s3mock-testsupport-common-2.17.0.jar.sha1
deleted file mode 100644
index 792568cba32..00000000000
--- a/solr/licenses/s3mock-testsupport-common-2.17.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a3af9b0bf0bdb001463356c8ebc2569b9ba478f1
diff --git a/solr/licenses/s3mock-testsupport-common-3.9.1.jar.sha1 b/solr/licenses/s3mock-testsupport-common-3.9.1.jar.sha1
new file mode 100644
index 00000000000..d3ce2fefefe
--- /dev/null
+++ b/solr/licenses/s3mock-testsupport-common-3.9.1.jar.sha1
@@ -0,0 +1 @@
+aceb1843815fea460803cbfcb0e9515061dd3e3a
diff --git a/solr/licenses/sdk-core-2.26.19.jar.sha1 b/solr/licenses/sdk-core-2.26.19.jar.sha1
deleted file mode 100644
index 881fecc560b..00000000000
--- a/solr/licenses/sdk-core-2.26.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1930ef13ad9bc6e8d4d04e7015512a761a7d5232
diff --git a/solr/licenses/sdk-core-2.28.11.jar.sha1 b/solr/licenses/sdk-core-2.28.11.jar.sha1
new file mode 100644
index 00000000000..53e31f16489
--- /dev/null
+++ b/solr/licenses/sdk-core-2.28.11.jar.sha1
@@ -0,0 +1 @@
+fe45c9bc71b45842143f0f929a4d90eb79d527fa
diff --git a/solr/licenses/snakeyaml-1.30.jar.sha1 b/solr/licenses/snakeyaml-1.30.jar.sha1
deleted file mode 100644
index 365daa0aef7..00000000000
--- a/solr/licenses/snakeyaml-1.30.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8fde7fe2586328ac3c68db92045e1c8759125000
diff --git a/solr/licenses/snakeyaml-2.2.jar.sha1 b/solr/licenses/snakeyaml-2.2.jar.sha1
new file mode 100644
index 00000000000..7d95bec69db
--- /dev/null
+++ b/solr/licenses/snakeyaml-2.2.jar.sha1
@@ -0,0 +1 @@
+3af797a25458550a16bf89acc8e4ab2b7f2bfce0
diff --git a/solr/licenses/spring-aop-5.3.28.jar.sha1 b/solr/licenses/spring-aop-5.3.28.jar.sha1
deleted file mode 100644
index 5ce207bde99..00000000000
--- a/solr/licenses/spring-aop-5.3.28.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-aada0ea72a3efee5f02f264f90329f7eddedf321
diff --git a/solr/licenses/spring-aop-6.1.8.jar.sha1 b/solr/licenses/spring-aop-6.1.8.jar.sha1
new file mode 100644
index 00000000000..bf70b2a81fe
--- /dev/null
+++ b/solr/licenses/spring-aop-6.1.8.jar.sha1
@@ -0,0 +1 @@
+ef793a21e405a88d9d32b92cb459c845ee12b271
diff --git a/solr/licenses/spring-beans-5.3.28.jar.sha1 b/solr/licenses/spring-beans-5.3.28.jar.sha1
deleted file mode 100644
index 0391b770009..00000000000
--- a/solr/licenses/spring-beans-5.3.28.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4d232acbb7031963688cf28b1b34134937892c4f
diff --git a/solr/licenses/spring-beans-6.1.8.jar.sha1 b/solr/licenses/spring-beans-6.1.8.jar.sha1
new file mode 100644
index 00000000000..b2b12ee3e86
--- /dev/null
+++ b/solr/licenses/spring-beans-6.1.8.jar.sha1
@@ -0,0 +1 @@
+79a5e45383542ff514b5328fe277410cf4054f3b
diff --git a/solr/licenses/spring-boot-2.7.13.jar.sha1 b/solr/licenses/spring-boot-2.7.13.jar.sha1
deleted file mode 100644
index 9868e93593d..00000000000
--- a/solr/licenses/spring-boot-2.7.13.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d009fa51c7792c9e510da7e69329baf39591707d
diff --git a/solr/licenses/spring-boot-3.3.0.jar.sha1 b/solr/licenses/spring-boot-3.3.0.jar.sha1
new file mode 100644
index 00000000000..7b1361a26a9
--- /dev/null
+++ b/solr/licenses/spring-boot-3.3.0.jar.sha1
@@ -0,0 +1 @@
+83d42f81f312d71b9425f58d1d3f9e8970e51b22
diff --git a/solr/licenses/spring-boot-actuator-2.7.13.jar.sha1 b/solr/licenses/spring-boot-actuator-2.7.13.jar.sha1
deleted file mode 100644
index e21fd0ffce2..00000000000
--- a/solr/licenses/spring-boot-actuator-2.7.13.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fff492093093c580ed528e115a01ae3158f4b674
diff --git a/solr/licenses/spring-boot-actuator-3.3.0.jar.sha1 b/solr/licenses/spring-boot-actuator-3.3.0.jar.sha1
new file mode 100644
index 00000000000..8e3afaf495c
--- /dev/null
+++ b/solr/licenses/spring-boot-actuator-3.3.0.jar.sha1
@@ -0,0 +1 @@
+14696a25a7c6adc23836a6a1315f90bbafd23cd4
diff --git a/solr/licenses/spring-boot-actuator-autoconfigure-2.7.13.jar.sha1 b/solr/licenses/spring-boot-actuator-autoconfigure-2.7.13.jar.sha1
deleted file mode 100644
index 41e04eafd02..00000000000
--- a/solr/licenses/spring-boot-actuator-autoconfigure-2.7.13.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d6d16648726ee7dafcd5435f4f66d02ff3338f5f
diff --git a/solr/licenses/spring-boot-actuator-autoconfigure-3.3.0.jar.sha1 b/solr/licenses/spring-boot-actuator-autoconfigure-3.3.0.jar.sha1
new file mode 100644
index 00000000000..bc070bced50
--- /dev/null
+++ b/solr/licenses/spring-boot-actuator-autoconfigure-3.3.0.jar.sha1
@@ -0,0 +1 @@
+993952c505a09c13a7fd996def6dbaf3bc6b06d9
diff --git a/solr/licenses/spring-boot-autoconfigure-2.7.13.jar.sha1 b/solr/licenses/spring-boot-autoconfigure-2.7.13.jar.sha1
deleted file mode 100644
index 63a1f63afbf..00000000000
--- a/solr/licenses/spring-boot-autoconfigure-2.7.13.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1b6b9605b1b116e32c372f3b9e15abf7bb17038c
diff --git a/solr/licenses/spring-boot-autoconfigure-3.3.0.jar.sha1 b/solr/licenses/spring-boot-autoconfigure-3.3.0.jar.sha1
new file mode 100644
index 00000000000..337f0b12888
--- /dev/null
+++ b/solr/licenses/spring-boot-autoconfigure-3.3.0.jar.sha1
@@ -0,0 +1 @@
+1d98cfa94223e6a3a0e0ad301822cef90cc04fbc
diff --git a/solr/licenses/spring-boot-starter-2.7.13.jar.sha1 b/solr/licenses/spring-boot-starter-2.7.13.jar.sha1
deleted file mode 100644
index 77381975a2e..00000000000
--- a/solr/licenses/spring-boot-starter-2.7.13.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5617ca04b06778877fb80d146dd2d0dd6adb23a8
diff --git a/solr/licenses/spring-boot-starter-3.3.0.jar.sha1 b/solr/licenses/spring-boot-starter-3.3.0.jar.sha1
new file mode 100644
index 00000000000..1e6e8dd29f7
--- /dev/null
+++ b/solr/licenses/spring-boot-starter-3.3.0.jar.sha1
@@ -0,0 +1 @@
+001af929e0fcb10c2bfc3f3619f4ca9049bd927b
diff --git a/solr/licenses/spring-boot-starter-actuator-2.7.13.jar.sha1 b/solr/licenses/spring-boot-starter-actuator-2.7.13.jar.sha1
deleted file mode 100644
index 00cd8b33892..00000000000
--- a/solr/licenses/spring-boot-starter-actuator-2.7.13.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9e21e7d8fe52e5a2c58adf631a14b21ea6b08cbf
diff --git a/solr/licenses/spring-boot-starter-actuator-3.3.0.jar.sha1 b/solr/licenses/spring-boot-starter-actuator-3.3.0.jar.sha1
new file mode 100644
index 00000000000..51a69a27c9d
--- /dev/null
+++ b/solr/licenses/spring-boot-starter-actuator-3.3.0.jar.sha1
@@ -0,0 +1 @@
+0768a4f4e20c529f08e241b3ab5b316ab0567c30
diff --git a/solr/licenses/spring-boot-starter-jetty-2.7.13.jar.sha1 b/solr/licenses/spring-boot-starter-jetty-2.7.13.jar.sha1
deleted file mode 100644
index c6d33b2af97..00000000000
--- a/solr/licenses/spring-boot-starter-jetty-2.7.13.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1bf057f189e6b511428857c853f7faf6f0591299
diff --git a/solr/licenses/spring-boot-starter-jetty-3.3.0.jar.sha1 b/solr/licenses/spring-boot-starter-jetty-3.3.0.jar.sha1
new file mode 100644
index 00000000000..c4b4d5c7c18
--- /dev/null
+++ b/solr/licenses/spring-boot-starter-jetty-3.3.0.jar.sha1
@@ -0,0 +1 @@
+af812b85ea131849172a0fa2d19cf80906b780b8
diff --git a/solr/licenses/spring-boot-starter-json-2.7.13.jar.sha1 b/solr/licenses/spring-boot-starter-json-2.7.13.jar.sha1
deleted file mode 100644
index 51408cd2fa1..00000000000
--- a/solr/licenses/spring-boot-starter-json-2.7.13.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2fc4c73e9b8602e57d2ffc37545cc2822e948322
diff --git a/solr/licenses/spring-boot-starter-json-3.3.0.jar.sha1 b/solr/licenses/spring-boot-starter-json-3.3.0.jar.sha1
new file mode 100644
index 00000000000..49094060f66
--- /dev/null
+++ b/solr/licenses/spring-boot-starter-json-3.3.0.jar.sha1
@@ -0,0 +1 @@
+1c9938093b372602f121e2b073f490897388cc71
diff --git a/solr/licenses/spring-boot-starter-logging-2.7.13.jar.sha1 b/solr/licenses/spring-boot-starter-logging-2.7.13.jar.sha1
deleted file mode 100644
index 7de4ef8057a..00000000000
--- a/solr/licenses/spring-boot-starter-logging-2.7.13.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8a5e9bd6fa8341193a977d408b9a44faaa684c8d
diff --git a/solr/licenses/spring-boot-starter-logging-3.3.0.jar.sha1 b/solr/licenses/spring-boot-starter-logging-3.3.0.jar.sha1
new file mode 100644
index 00000000000..a2fcd4144ec
--- /dev/null
+++ b/solr/licenses/spring-boot-starter-logging-3.3.0.jar.sha1
@@ -0,0 +1 @@
+79a400c9d7ce3a7cecf296fda402e3100a099bce
diff --git a/solr/licenses/spring-boot-starter-web-2.7.13.jar.sha1 b/solr/licenses/spring-boot-starter-web-2.7.13.jar.sha1
deleted file mode 100644
index 7f8538e5c66..00000000000
--- a/solr/licenses/spring-boot-starter-web-2.7.13.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-707bd743fa544ca06a78a657465c1ca0f5084ea4
diff --git a/solr/licenses/spring-boot-starter-web-3.3.0.jar.sha1 b/solr/licenses/spring-boot-starter-web-3.3.0.jar.sha1
new file mode 100644
index 00000000000..f9e1219de96
--- /dev/null
+++ b/solr/licenses/spring-boot-starter-web-3.3.0.jar.sha1
@@ -0,0 +1 @@
+d8f587bc52e6c31dc4f161a49ce8f5e19f8853a9
diff --git a/solr/licenses/spring-context-5.3.28.jar.sha1 b/solr/licenses/spring-context-5.3.28.jar.sha1
deleted file mode 100644
index 7edc60f960b..00000000000
--- a/solr/licenses/spring-context-5.3.28.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-edf8ebfd637e3e10ec7fed697eb69f2a5229748a
diff --git a/solr/licenses/spring-context-6.1.8.jar.sha1 b/solr/licenses/spring-context-6.1.8.jar.sha1
new file mode 100644
index 00000000000..c5b302d7033
--- /dev/null
+++ b/solr/licenses/spring-context-6.1.8.jar.sha1
@@ -0,0 +1 @@
+21219a0df58e5b96ef489a172b449232573352e8
diff --git a/solr/licenses/spring-core-5.3.28.jar.sha1 b/solr/licenses/spring-core-5.3.28.jar.sha1
deleted file mode 100644
index b2b8b266a61..00000000000
--- a/solr/licenses/spring-core-5.3.28.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5b7ec246fef72fdfbb0b4123956715ca89cc6ddf
diff --git a/solr/licenses/spring-core-6.1.8.jar.sha1 b/solr/licenses/spring-core-6.1.8.jar.sha1
new file mode 100644
index 00000000000..3e025f4336d
--- /dev/null
+++ b/solr/licenses/spring-core-6.1.8.jar.sha1
@@ -0,0 +1 @@
+141fc11a5dbaa503fe361150312ad0fa9d9c03da
diff --git a/solr/licenses/spring-expression-5.3.28.jar.sha1 b/solr/licenses/spring-expression-5.3.28.jar.sha1
deleted file mode 100644
index 1f8325901d5..00000000000
--- a/solr/licenses/spring-expression-5.3.28.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d049216b1a73b939b36bbf5cc7ce734cace7b245
diff --git a/solr/licenses/spring-expression-6.1.8.jar.sha1 b/solr/licenses/spring-expression-6.1.8.jar.sha1
new file mode 100644
index 00000000000..71982e5c450
--- /dev/null
+++ b/solr/licenses/spring-expression-6.1.8.jar.sha1
@@ -0,0 +1 @@
+dcf78ef442c24f32ff8c6a9746e7f5209b330111
diff --git a/solr/licenses/spring-jcl-5.3.28.jar.sha1 b/solr/licenses/spring-jcl-5.3.28.jar.sha1
deleted file mode 100644
index 88be4456192..00000000000
--- a/solr/licenses/spring-jcl-5.3.28.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d67e8b213aa08a0f3d71e547fb4345372d819d36
diff --git a/solr/licenses/spring-jcl-6.1.8.jar.sha1 b/solr/licenses/spring-jcl-6.1.8.jar.sha1
new file mode 100644
index 00000000000..57cc84a7d68
--- /dev/null
+++ b/solr/licenses/spring-jcl-6.1.8.jar.sha1
@@ -0,0 +1 @@
+0a545266a6efac9283353a922783a0a06f197ec0
diff --git a/solr/licenses/spring-web-5.3.28.jar.sha1 b/solr/licenses/spring-web-5.3.28.jar.sha1
deleted file mode 100644
index 5a49ed29aa1..00000000000
--- a/solr/licenses/spring-web-5.3.28.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e15c861a248f5ba41dd1ebc691e582bb5f3a2813
diff --git a/solr/licenses/spring-web-6.1.8.jar.sha1 b/solr/licenses/spring-web-6.1.8.jar.sha1
new file mode 100644
index 00000000000..e73e6d37049
--- /dev/null
+++ b/solr/licenses/spring-web-6.1.8.jar.sha1
@@ -0,0 +1 @@
+1461405dc325c82a0a058df033bee3d8c6dd6e41
diff --git a/solr/licenses/spring-webmvc-5.3.28.jar.sha1 b/solr/licenses/spring-webmvc-5.3.28.jar.sha1
deleted file mode 100644
index 2d4af9abee1..00000000000
--- a/solr/licenses/spring-webmvc-5.3.28.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-688bde13678e86028062f01dbcdf301308c449e7
diff --git a/solr/licenses/spring-webmvc-6.1.8.jar.sha1 b/solr/licenses/spring-webmvc-6.1.8.jar.sha1
new file mode 100644
index 00000000000..4d39ce16b54
--- /dev/null
+++ b/solr/licenses/spring-webmvc-6.1.8.jar.sha1
@@ -0,0 +1 @@
+8496f8c010625bc0b857d19d2e93a9bdd691c1af
diff --git a/solr/licenses/sts-2.26.19.jar.sha1 b/solr/licenses/sts-2.26.19.jar.sha1
deleted file mode 100644
index 44a737d3e9e..00000000000
--- a/solr/licenses/sts-2.26.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-01ab21034412aa239b92dc9e0962473f818e34b8
diff --git a/solr/licenses/sts-2.28.11.jar.sha1 b/solr/licenses/sts-2.28.11.jar.sha1
new file mode 100644
index 00000000000..1a7702ae97d
--- /dev/null
+++ b/solr/licenses/sts-2.28.11.jar.sha1
@@ -0,0 +1 @@
+1978ba2a204fbe5caa7167f4fdce6ec6be426882
diff --git a/solr/licenses/third-party-jackson-core-2.26.19.jar.sha1 b/solr/licenses/third-party-jackson-core-2.26.19.jar.sha1
deleted file mode 100644
index b3a2f1c0304..00000000000
--- a/solr/licenses/third-party-jackson-core-2.26.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dff07c47bfe117b0da48651cbe035ab1fc140b0e
diff --git a/solr/licenses/third-party-jackson-core-2.28.11.jar.sha1 b/solr/licenses/third-party-jackson-core-2.28.11.jar.sha1
new file mode 100644
index 00000000000..b0fbdc08902
--- /dev/null
+++ b/solr/licenses/third-party-jackson-core-2.28.11.jar.sha1
@@ -0,0 +1 @@
+b2197b0713e758ffb0e0812943b585c664adfceb
diff --git a/solr/licenses/tomcat-embed-el-10.1.24.jar.sha1 b/solr/licenses/tomcat-embed-el-10.1.24.jar.sha1
new file mode 100644
index 00000000000..57fddb64012
--- /dev/null
+++ b/solr/licenses/tomcat-embed-el-10.1.24.jar.sha1
@@ -0,0 +1 @@
+6e9c9dce63c10f903cb0aaaeff45f5f7092f5527
diff --git a/solr/licenses/tomcat-embed-el-9.0.76.jar.sha1 b/solr/licenses/tomcat-embed-el-9.0.76.jar.sha1
deleted file mode 100644
index 9b324f897ba..00000000000
--- a/solr/licenses/tomcat-embed-el-9.0.76.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-74bf8925f713a52c2af19fff6df55d80ef87166c
diff --git a/solr/licenses/txw2-4.0.5.jar.sha1 b/solr/licenses/txw2-4.0.5.jar.sha1
new file mode 100644
index 00000000000..8855e1d4b21
--- /dev/null
+++ b/solr/licenses/txw2-4.0.5.jar.sha1
@@ -0,0 +1 @@
+f36a4ef12120a9bb06d766d6a0e54b144fd7ed98
diff --git a/solr/licenses/url-connection-client-2.26.19.jar.sha1 b/solr/licenses/url-connection-client-2.26.19.jar.sha1
deleted file mode 100644
index e8d254b091f..00000000000
--- a/solr/licenses/url-connection-client-2.26.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cbfdc3bb78c52cd164029ee186e6ed654eb2c423
diff --git a/solr/licenses/url-connection-client-2.28.11.jar.sha1 b/solr/licenses/url-connection-client-2.28.11.jar.sha1
new file mode 100644
index 00000000000..8207992c12a
--- /dev/null
+++ b/solr/licenses/url-connection-client-2.28.11.jar.sha1
@@ -0,0 +1 @@
+f9c2513e2d091ba9df7091b98028cb0371e15020
diff --git a/solr/licenses/utils-2.26.19.jar.sha1 b/solr/licenses/utils-2.26.19.jar.sha1
deleted file mode 100644
index 9edd808d3db..00000000000
--- a/solr/licenses/utils-2.26.19.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-aa3cebed414e9509eb0f481213037d53557cd37d
diff --git a/solr/licenses/utils-2.28.11.jar.sha1 b/solr/licenses/utils-2.28.11.jar.sha1
new file mode 100644
index 00000000000..f57a1403275
--- /dev/null
+++ b/solr/licenses/utils-2.28.11.jar.sha1
@@ -0,0 +1 @@
+467c8ff613540be4eeaebb55b6aac2b01b2461be
diff --git a/solr/modules/analysis-extras/gradle.lockfile b/solr/modules/analysis-extras/gradle.lockfile
index a294ed4d924..ccf64762b5a 100644
--- a/solr/modules/analysis-extras/gradle.lockfile
+++ b/solr/modules/analysis-extras/gradle.lockfile
@@ -39,7 +39,8 @@ commons-io:commons-io:2.15.1=apiHelper,compileClasspath,jarValidation,runtimeCla
io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-core:4.2.26=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-graphite:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.dropwizard.metrics:metrics-jetty10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-jmx:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-jvm:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -63,6 +64,7 @@ io.sgr:s2-geometry-library-java:1.0.0=apiHelper,jarValidation,runtimeClasspath,r
io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
jakarta.annotation:jakarta.annotation-api:2.1.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
jakarta.inject:jakarta.inject-api:2.0.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,testCompileClasspath,testRuntimeClasspath
jakarta.validation:jakarta.validation-api:3.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -120,24 +122,25 @@ org.carrot2:morfologik-polish:2.1.9=jarValidation,runtimeClasspath,runtimeLibs,t
org.carrot2:morfologik-stemming:2.1.9=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
org.checkerframework:checker-qual:3.44.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-client:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-common:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-hpack:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-http-client-transport:10.0.22=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-client:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-client:10.0.22=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-client:10.0.22=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-rewrite:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:10.0.22=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-servlet:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.19=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-common:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-hpack:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-client:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-client:12.0.19=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-client:12.0.19=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-rewrite:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:12.0.19=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-session:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-api:3.1.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-locator:3.1.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/clustering/gradle.lockfile b/solr/modules/clustering/gradle.lockfile
index f8c25513ec1..64038232abf 100644
--- a/solr/modules/clustering/gradle.lockfile
+++ b/solr/modules/clustering/gradle.lockfile
@@ -38,7 +38,8 @@ commons-io:commons-io:2.15.1=compileClasspath,jarValidation,runtimeClasspath,run
io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.dropwizard.metrics:metrics-jetty10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -62,6 +63,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs
io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,testCompileClasspath,testRuntimeClasspath
jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -110,24 +112,25 @@ org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath
org.carrot2:carrot2-core:4.5.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.checkerframework:checker-qual:3.44.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-common:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-hpack:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-http-client-transport:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-client:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-client:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-rewrite:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-servlet:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-common:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-hpack:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-client:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-client:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-client:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-rewrite:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-session:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-api:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/cross-dc/gradle.lockfile b/solr/modules/cross-dc/gradle.lockfile
index e148bf92bad..52bb300918c 100644
--- a/solr/modules/cross-dc/gradle.lockfile
+++ b/solr/modules/cross-dc/gradle.lockfile
@@ -39,7 +39,8 @@ commons-io:commons-io:2.15.1=apiHelper,compileClasspath,jarValidation,runtimeCla
io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-core:4.2.26=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-graphite:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.dropwizard.metrics:metrics-jetty10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-jmx:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-jvm:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -63,6 +64,7 @@ io.sgr:s2-geometry-library-java:1.0.0=apiHelper,jarValidation,runtimeClasspath,r
io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
jakarta.annotation:jakarta.annotation-api:2.1.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
jakarta.inject:jakarta.inject-api:2.0.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,testCompileClasspath,testRuntimeClasspath
jakarta.validation:jakarta.validation-api:3.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -113,24 +115,25 @@ org.apache.zookeeper:zookeeper:3.9.2=apiHelper,compileClasspath,jarValidation,ru
org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath
org.checkerframework:checker-qual:3.44.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-client:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-common:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-hpack:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-http-client-transport:10.0.22=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-client:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-client:10.0.22=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-client:10.0.22=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-rewrite:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:10.0.22=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-servlet:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.19=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-common:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-hpack:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-client:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-client:12.0.19=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-client:12.0.19=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-rewrite:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:12.0.19=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-session:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-api:3.1.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-locator:3.1.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/extraction/gradle.lockfile b/solr/modules/extraction/gradle.lockfile
index 948adb8a28d..4d39678198f 100644
--- a/solr/modules/extraction/gradle.lockfile
+++ b/solr/modules/extraction/gradle.lockfile
@@ -66,7 +66,8 @@ edu.usc.ir:sentiment-analysis-parser:0.1=compileClasspath,jarValidation,runtimeC
io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.dropwizard.metrics:metrics-jetty10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -91,6 +92,7 @@ io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValida
jakarta.activation:jakarta.activation-api:1.2.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,testCompileClasspath,testRuntimeClasspath
jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
@@ -176,24 +178,25 @@ org.ccil.cowan.tagsoup:tagsoup:1.2.1=compileClasspath,jarValidation,runtimeClass
org.checkerframework:checker-qual:3.44.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.codelibs:jhighlight:1.1.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-common:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-hpack:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-http-client-transport:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-client:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-client:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-rewrite:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-servlet:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-common:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-hpack:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-client:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-client:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-client:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-rewrite:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-session:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.gagravarr:vorbis-java-core:0.8=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.gagravarr:vorbis-java-tika:0.8=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfile
index 394f8226a0c..aaab5418abc 100644
--- a/solr/modules/gcs-repository/gradle.lockfile
+++ b/solr/modules/gcs-repository/gradle.lockfile
@@ -67,7 +67,8 @@ commons-io:commons-io:2.15.1=apiHelper,compileClasspath,jarValidation,runtimeCla
io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-core:4.2.26=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-graphite:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.dropwizard.metrics:metrics-jetty10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-jmx:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-jvm:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -112,6 +113,7 @@ io.sgr:s2-geometry-library-java:1.0.0=apiHelper,jarValidation,runtimeClasspath,r
io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
jakarta.annotation:jakarta.annotation-api:2.1.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
jakarta.inject:jakarta.inject-api:2.0.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,testCompileClasspath,testRuntimeClasspath
jakarta.validation:jakarta.validation-api:3.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
@@ -160,24 +162,25 @@ org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath
org.checkerframework:checker-qual:3.44.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.conscrypt:conscrypt-openjdk-uber:2.5.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-client:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-common:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-hpack:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-http-client-transport:10.0.22=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-client:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-client:10.0.22=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-client:10.0.22=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-rewrite:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:10.0.22=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-servlet:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.19=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-common:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-hpack:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-client:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-client:12.0.19=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-client:12.0.19=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-rewrite:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:12.0.19=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-session:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-api:3.1.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-locator:3.1.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfile
index b8ff16b1669..66418fb565b 100644
--- a/solr/modules/jwt-auth/gradle.lockfile
+++ b/solr/modules/jwt-auth/gradle.lockfile
@@ -48,7 +48,8 @@ commons-io:commons-io:2.15.1=compileClasspath,jarValidation,runtimeClasspath,run
io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.dropwizard.metrics:metrics-jetty10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -75,6 +76,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs
io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,testCompileClasspath,testRuntimeClasspath
jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -133,24 +135,25 @@ org.bouncycastle:bcutil-jdk15on:1.70=jarValidation,testRuntimeClasspath
org.bouncycastle:bcutil-jdk18on:1.78.1=jarValidation,testCompileClasspath,testRuntimeClasspath
org.checkerframework:checker-qual:3.44.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-common:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-hpack:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-http-client-transport:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-client:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-rewrite:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-servlet:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-common:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-hpack:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-client:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-client:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-client:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-rewrite:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-session:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.freemarker:freemarker:2.3.32=jarValidation,testRuntimeClasspath
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-api:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTAuthPlugin.java b/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTAuthPlugin.java
index 544540bf85e..92e63f14c6b 100644
--- a/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTAuthPlugin.java
+++ b/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTAuthPlugin.java
@@ -16,6 +16,9 @@
*/
package org.apache.solr.security.jwt;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
@@ -41,9 +44,6 @@ import java.util.Set;
import java.util.StringTokenizer;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
-import javax.servlet.FilterChain;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.http.HttpHeaders;
import org.apache.http.HttpRequest;
import org.apache.http.client.protocol.HttpClientContext;
@@ -64,7 +64,7 @@ import org.apache.solr.security.jwt.JWTAuthPlugin.JWTAuthenticationResponse.Auth
import org.apache.solr.security.jwt.api.ModifyJWTAuthPluginConfigAPI;
import org.apache.solr.servlet.LoadAdminUiServlet;
import org.apache.solr.util.CryptoKeys;
-import org.eclipse.jetty.client.api.Request;
+import org.eclipse.jetty.client.Request;
import org.jose4j.jwa.AlgorithmConstraints;
import org.jose4j.jwk.HttpsJwks;
import org.jose4j.jwt.JwtClaims;
diff --git a/solr/modules/langid/gradle.lockfile b/solr/modules/langid/gradle.lockfile
index f5e9cd3932f..a13233c6da5 100644
--- a/solr/modules/langid/gradle.lockfile
+++ b/solr/modules/langid/gradle.lockfile
@@ -39,7 +39,8 @@ commons-io:commons-io:2.15.1=compileClasspath,jarValidation,runtimeClasspath,run
io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.dropwizard.metrics:metrics-jetty10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -63,6 +64,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs
io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,testCompileClasspath,testRuntimeClasspath
jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -113,24 +115,25 @@ org.apache.zookeeper:zookeeper:3.9.2=compileClasspath,jarValidation,runtimeClass
org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath
org.checkerframework:checker-qual:3.44.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-common:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-hpack:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-http-client-transport:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-client:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-client:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-rewrite:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-servlet:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-common:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-hpack:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-client:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-client:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-client:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-rewrite:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-session:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-api:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/llm/gradle.lockfile b/solr/modules/llm/gradle.lockfile
index 55a18e992de..97c64b4174e 100644
--- a/solr/modules/llm/gradle.lockfile
+++ b/solr/modules/llm/gradle.lockfile
@@ -53,7 +53,8 @@ dev.langchain4j:langchain4j-open-ai:0.35.0=jarValidation,runtimeClasspath,runtim
io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.dropwizard.metrics:metrics-jetty10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -77,6 +78,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs
io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,testCompileClasspath,testRuntimeClasspath
jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -124,24 +126,25 @@ org.apache.zookeeper:zookeeper:3.9.2=compileClasspath,jarValidation,runtimeClass
org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath
org.checkerframework:checker-qual:3.44.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-common:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-hpack:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-http-client-transport:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-client:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-client:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-rewrite:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-servlet:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-common:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-hpack:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-client:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-client:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-client:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-rewrite:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-session:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-api:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/ltr/gradle.lockfile b/solr/modules/ltr/gradle.lockfile
index ed50fdc04e4..82beea7fa92 100644
--- a/solr/modules/ltr/gradle.lockfile
+++ b/solr/modules/ltr/gradle.lockfile
@@ -38,7 +38,8 @@ commons-io:commons-io:2.15.1=compileClasspath,jarValidation,runtimeClasspath,run
io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.dropwizard.metrics:metrics-jetty10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -62,6 +63,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs
io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,testCompileClasspath,testRuntimeClasspath
jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -110,24 +112,25 @@ org.apache.zookeeper:zookeeper:3.9.2=compileClasspath,jarValidation,runtimeClass
org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath
org.checkerframework:checker-qual:3.44.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-common:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-hpack:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-http-client-transport:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-client:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-client:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-rewrite:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-servlet:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-common:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-hpack:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-client:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-client:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-client:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-rewrite:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-session:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-api:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/opentelemetry/gradle.lockfile b/solr/modules/opentelemetry/gradle.lockfile
index 1f5ae899ade..c987846ebcc 100644
--- a/solr/modules/opentelemetry/gradle.lockfile
+++ b/solr/modules/opentelemetry/gradle.lockfile
@@ -44,7 +44,8 @@ commons-io:commons-io:2.15.1=compileClasspath,jarValidation,runtimeClasspath,run
io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.dropwizard.metrics:metrics-jetty10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -96,6 +97,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs
io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,testCompileClasspath,testRuntimeClasspath
jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -144,24 +146,25 @@ org.apache.zookeeper:zookeeper:3.9.2=compileClasspath,jarValidation,runtimeClass
org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath
org.checkerframework:checker-qual:3.44.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-common:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-hpack:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-http-client-transport:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-client:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-client:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-rewrite:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-servlet:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-common:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-hpack:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-client:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-client:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-client:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-rewrite:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-session:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-api:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/s3-repository/build.gradle b/solr/modules/s3-repository/build.gradle
index 1ddb147b34e..66124511b4f 100644
--- a/solr/modules/s3-repository/build.gradle
+++ b/solr/modules/s3-repository/build.gradle
@@ -21,7 +21,7 @@ description = 'S3 Repository'
dependencies {
implementation platform(project(':platform'))
- api project(':solr:core')
+ api(project(':solr:core'))
implementation project(':solr:solrj')
implementation libs.apache.lucene.core
@@ -36,6 +36,7 @@ dependencies {
exclude group: 'software.amazon.awssdk', module: 'netty-nio-client'
}
implementation libs.amazon.awssdk.sdkcore
+
runtimeOnly(libs.amazon.awssdk.sts) {
exclude group: 'software.amazon.awssdk', module: 'netty-nio-client'
}
@@ -81,7 +82,7 @@ dependencies {
testImplementation libs.commonsio.commonsio
- testRuntimeOnly libs.eclipse.jetty.webapp
+ testRuntimeOnly libs.eclipse.jetty.ee10.webapp
testImplementation(libs.mockito.core, {
exclude group: "net.bytebuddy", module: "byte-buddy-agent"
diff --git a/solr/modules/s3-repository/gradle.lockfile b/solr/modules/s3-repository/gradle.lockfile
index c3367b9a64a..acfa83c78ef 100644
--- a/solr/modules/s3-repository/gradle.lockfile
+++ b/solr/modules/s3-repository/gradle.lockfile
@@ -1,13 +1,13 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
-com.adobe.testing:s3mock-junit4:2.17.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-com.adobe.testing:s3mock-testsupport-common:2.17.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-com.adobe.testing:s3mock:2.17.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-com.amazonaws:aws-java-sdk-core:1.12.501=jarValidation,testCompileClasspath,testRuntimeClasspath
-com.amazonaws:aws-java-sdk-kms:1.12.501=jarValidation,testCompileClasspath,testRuntimeClasspath
-com.amazonaws:aws-java-sdk-s3:1.12.501=jarValidation,testCompileClasspath,testRuntimeClasspath
-com.amazonaws:jmespath-java:1.12.501=jarValidation,testCompileClasspath,testRuntimeClasspath
+com.adobe.testing:s3mock-junit4:3.9.1=jarValidation,testCompileClasspath,testRuntimeClasspath
+com.adobe.testing:s3mock-testsupport-common:3.9.1=jarValidation,testCompileClasspath,testRuntimeClasspath
+com.adobe.testing:s3mock:3.9.1=jarValidation,testCompileClasspath,testRuntimeClasspath
+com.amazonaws:aws-java-sdk-core:1.12.729=jarValidation,testCompileClasspath,testRuntimeClasspath
+com.amazonaws:aws-java-sdk-kms:1.12.729=jarValidation,testCompileClasspath,testRuntimeClasspath
+com.amazonaws:aws-java-sdk-s3:1.12.729=jarValidation,testCompileClasspath,testRuntimeClasspath
+com.amazonaws:jmespath-java:1.12.729=jarValidation,testCompileClasspath,testRuntimeClasspath
com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1=jarValidation,testCompileClasspath,testRuntimeClasspath
com.carrotsearch:hppc:0.10.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
com.fasterxml.jackson.core:jackson-annotations:2.18.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
@@ -42,8 +42,7 @@ com.google.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnno
com.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
com.jayway.jsonpath:json-path:2.9.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
com.lmax:disruptor:3.4.4=solrPlatformLibs
-com.sun.activation:jakarta.activation:1.2.2=jarValidation,testRuntimeClasspath
-com.sun.istack:istack-commons-runtime:3.0.12=jarValidation,testCompileClasspath,testRuntimeClasspath
+com.sun.istack:istack-commons-runtime:4.1.2=jarValidation,testCompileClasspath,testRuntimeClasspath
com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
commons-cli:commons-cli:1.9.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
commons-codec:commons-codec:1.17.1=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
@@ -51,12 +50,16 @@ commons-io:commons-io:2.15.1=apiHelper,compileClasspath,jarValidation,runtimeCla
io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-core:4.2.26=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-graphite:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.dropwizard.metrics:metrics-jetty10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-jmx:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-jvm:4.2.26=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
-io.micrometer:micrometer-core:1.9.12=jarValidation,testCompileClasspath,testRuntimeClasspath
+io.micrometer:micrometer-commons:1.13.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+io.micrometer:micrometer-core:1.13.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+io.micrometer:micrometer-jakarta9:1.13.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+io.micrometer:micrometer-observation:1.13.0=jarValidation,testCompileClasspath,testRuntimeClasspath
io.netty:netty-buffer:4.1.114.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-codec:4.1.114.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.netty:netty-common:4.1.114.Final=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
@@ -74,13 +77,19 @@ io.prometheus:prometheus-metrics-exposition-formats:1.1.0=apiHelper,jarValidatio
io.prometheus:prometheus-metrics-model:1.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.sgr:s2-geometry-library-java:1.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+jakarta.activation:jakarta.activation-api:2.1.3=jarValidation,testCompileClasspath,testRuntimeClasspath
jakarta.annotation:jakarta.annotation-api:2.1.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-jakarta.inject:jakarta.inject-api:2.0.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-jakarta.servlet:jakarta.servlet-api:4.0.4=jarValidation,testCompileClasspath,testRuntimeClasspath
+jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1=jarValidation,testCompileClasspath,testRuntimeClasspath
+jakarta.enterprise:jakarta.enterprise.lang-model:4.0.1=jarValidation,testCompileClasspath,testRuntimeClasspath
+jakarta.inject:jakarta.inject-api:2.0.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+jakarta.interceptor:jakarta.interceptor-api:2.1.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+jakarta.transaction:jakarta.transaction-api:2.0.1=jarValidation,testCompileClasspath,testRuntimeClasspath
jakarta.validation:jakarta.validation-api:3.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-jakarta.websocket:jakarta.websocket-api:1.1.2=jarValidation,testCompileClasspath,testRuntimeClasspath
+jakarta.websocket:jakarta.websocket-api:2.1.1=jarValidation,testCompileClasspath,testRuntimeClasspath
+jakarta.websocket:jakarta.websocket-client-api:2.1.1=jarValidation,testCompileClasspath,testRuntimeClasspath
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=jarValidation,testCompileClasspath,testRuntimeClasspath
+jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,testCompileClasspath,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
joda-time:joda-time:2.13.0=jarValidation,testCompileClasspath,testRuntimeClasspath
junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath
@@ -123,39 +132,56 @@ org.apache.lucene:lucene-spatial-extras:9.12.1=apiHelper,jarValidation,runtimeCl
org.apache.lucene:lucene-spatial3d:9.12.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.lucene:lucene-suggest:9.12.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.apache.lucene:lucene-test-framework:9.12.1=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.apache.tomcat.embed:tomcat-embed-el:9.0.76=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.apache.tomcat.embed:tomcat-embed-el:10.1.24=jarValidation,testCompileClasspath,testRuntimeClasspath
org.apache.zookeeper:zookeeper-jute:3.9.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.apache.zookeeper:zookeeper:3.9.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath
org.checkerframework:checker-qual:3.44.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-client:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-common:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-hpack:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-http-client-transport:10.0.22=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-client:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-client:10.0.22=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-client:10.0.22=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-rewrite:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:10.0.22=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-servlet:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-webapp:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-xml:10.0.22=jarValidation,testRuntimeClasspath
+org.eclipse.angus:angus-activation:2.0.2=jarValidation,testRuntimeClasspath
+org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-client:12.0.9=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-common:12.0.9=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server:12.0.9=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server:12.0.9=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-servlet:12.0.9=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10:jetty-ee10-annotations:12.0.9=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10:jetty-ee10-plus:12.0.9=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10:jetty-ee10-servlets:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10:jetty-ee10-webapp:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.19=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-common:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-hpack:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty.websocket:jetty-websocket-core-client:12.0.9=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.websocket:jetty-websocket-core-common:12.0.9=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.websocket:jetty-websocket-core-server:12.0.9=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.websocket:jetty-websocket-jetty-api:12.0.9=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.websocket:jetty-websocket-jetty-common:12.0.9=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-client:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-client:12.0.19=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-client:12.0.19=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-ee:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-rewrite:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:12.0.19=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-session:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-xml:12.0.19=jarValidation,testRuntimeClasspath
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-api:3.1.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-locator:3.1.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-utils:3.1.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:osgi-resource-locator:1.0.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.glassfish.jaxb:jaxb-runtime:2.3.8=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.glassfish.jaxb:txw2:2.3.8=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.glassfish.jaxb:jaxb-core:4.0.5=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.glassfish.jaxb:jaxb-runtime:4.0.5=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.glassfish.jaxb:txw2:4.0.5=jarValidation,testCompileClasspath,testRuntimeClasspath
org.glassfish.jersey.containers:jersey-container-jetty-http:2.39.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.jersey.core:jersey-client:3.1.9=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.jersey.core:jersey-common:3.1.9=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
@@ -164,7 +190,7 @@ org.glassfish.jersey.ext:jersey-entity-filtering:3.1.9=apiHelper,jarValidation,r
org.glassfish.jersey.inject:jersey-hk2:3.1.9=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.hdrhistogram:HdrHistogram:2.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.hdrhistogram:HdrHistogram:2.2.1=jarValidation,testRuntimeClasspath
org.javassist:javassist:3.30.2-GA=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.jspecify:jspecify:1.0.0=annotationProcessor,errorprone,testAnnotationProcessor
org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath
@@ -176,65 +202,65 @@ org.mockito:mockito-core:5.16.1=jarValidation,testCompileClasspath,testRuntimeCl
org.mockito:mockito-subclass:5.16.1=jarValidation,testRuntimeClasspath
org.objenesis:objenesis:3.3=jarValidation,testRuntimeClasspath
org.opentest4j:opentest4j:1.2.0=jarValidation,testRuntimeClasspath
-org.ow2.asm:asm-commons:9.7.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.ow2.asm:asm-tree:9.7.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.ow2.asm:asm:9.7.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.ow2.asm:asm-commons:9.7.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.ow2.asm:asm-tree:9.7.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.ow2.asm:asm:9.7.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.pcollections:pcollections:4.0.1=annotationProcessor,errorprone,testAnnotationProcessor
org.reactivestreams:reactive-streams:1.0.4=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
org.semver4j:semver4j:5.3.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.slf4j:jcl-over-slf4j:2.0.16=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.slf4j:jul-to-slf4j:2.0.16=jarValidation,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.slf4j:slf4j-api:2.0.16=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.springframework.boot:spring-boot-actuator-autoconfigure:2.7.13=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.springframework.boot:spring-boot-actuator:2.7.13=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.springframework.boot:spring-boot-autoconfigure:2.7.13=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.springframework.boot:spring-boot-starter-actuator:2.7.13=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.springframework.boot:spring-boot-starter-jetty:2.7.13=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.springframework.boot:spring-boot-starter-json:2.7.13=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.springframework.boot:spring-boot-starter-logging:2.7.13=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.springframework.boot:spring-boot-starter-web:2.7.13=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.springframework.boot:spring-boot-starter:2.7.13=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.springframework.boot:spring-boot:2.7.13=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.springframework:spring-aop:5.3.28=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.springframework:spring-beans:5.3.28=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.springframework:spring-context:5.3.28=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.springframework:spring-core:5.3.28=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.springframework:spring-expression:5.3.28=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.springframework:spring-jcl:5.3.28=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.springframework:spring-web:5.3.28=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.springframework:spring-webmvc:5.3.28=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.springframework.boot:spring-boot-actuator-autoconfigure:3.3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.springframework.boot:spring-boot-actuator:3.3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.springframework.boot:spring-boot-autoconfigure:3.3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.springframework.boot:spring-boot-starter-actuator:3.3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.springframework.boot:spring-boot-starter-jetty:3.3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.springframework.boot:spring-boot-starter-json:3.3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.springframework.boot:spring-boot-starter-logging:3.3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.springframework.boot:spring-boot-starter-web:3.3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.springframework.boot:spring-boot-starter:3.3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.springframework.boot:spring-boot:3.3.0=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.springframework:spring-aop:6.1.8=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.springframework:spring-beans:6.1.8=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.springframework:spring-context:6.1.8=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.springframework:spring-core:6.1.8=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.springframework:spring-expression:6.1.8=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.springframework:spring-jcl:6.1.8=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.springframework:spring-web:6.1.8=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.springframework:spring-webmvc:6.1.8=jarValidation,testCompileClasspath,testRuntimeClasspath
org.xerial.snappy:snappy-java:1.1.10.5=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.yaml:snakeyaml:1.30=jarValidation,testCompileClasspath,testRuntimeClasspath
-software.amazon.awssdk:annotations:2.26.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-software.amazon.awssdk:apache-client:2.26.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-software.amazon.awssdk:arns:2.26.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-software.amazon.awssdk:auth:2.26.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-software.amazon.awssdk:aws-core:2.26.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-software.amazon.awssdk:aws-query-protocol:2.26.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-software.amazon.awssdk:aws-xml-protocol:2.26.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-software.amazon.awssdk:bom:2.26.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-software.amazon.awssdk:checksums-spi:2.26.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-software.amazon.awssdk:checksums:2.26.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-software.amazon.awssdk:crt-core:2.26.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-software.amazon.awssdk:endpoints-spi:2.26.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-software.amazon.awssdk:http-auth-aws:2.26.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-software.amazon.awssdk:http-auth-spi:2.26.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-software.amazon.awssdk:http-auth:2.26.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-software.amazon.awssdk:http-client-spi:2.26.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-software.amazon.awssdk:identity-spi:2.26.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-software.amazon.awssdk:json-utils:2.26.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-software.amazon.awssdk:metrics-spi:2.26.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-software.amazon.awssdk:profiles:2.26.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-software.amazon.awssdk:protocol-core:2.26.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-software.amazon.awssdk:regions:2.26.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-software.amazon.awssdk:retries-spi:2.26.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-software.amazon.awssdk:retries:2.26.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-software.amazon.awssdk:s3:2.26.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-software.amazon.awssdk:sdk-core:2.26.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-software.amazon.awssdk:sts:2.26.19=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
-software.amazon.awssdk:third-party-jackson-core:2.26.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-software.amazon.awssdk:url-connection-client:2.26.19=jarValidation,testCompileClasspath,testRuntimeClasspath
-software.amazon.awssdk:utils:2.26.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+org.yaml:snakeyaml:2.2=jarValidation,testCompileClasspath,testRuntimeClasspath
+software.amazon.awssdk:annotations:2.28.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+software.amazon.awssdk:apache-client:2.28.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+software.amazon.awssdk:arns:2.28.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+software.amazon.awssdk:auth:2.28.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+software.amazon.awssdk:aws-core:2.28.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+software.amazon.awssdk:aws-query-protocol:2.28.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+software.amazon.awssdk:aws-xml-protocol:2.28.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+software.amazon.awssdk:bom:2.28.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+software.amazon.awssdk:checksums-spi:2.28.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+software.amazon.awssdk:checksums:2.28.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+software.amazon.awssdk:crt-core:2.28.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+software.amazon.awssdk:endpoints-spi:2.28.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+software.amazon.awssdk:http-auth-aws-eventstream:2.28.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+software.amazon.awssdk:http-auth-aws:2.28.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+software.amazon.awssdk:http-auth-spi:2.28.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+software.amazon.awssdk:http-auth:2.28.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+software.amazon.awssdk:http-client-spi:2.28.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+software.amazon.awssdk:identity-spi:2.28.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+software.amazon.awssdk:json-utils:2.28.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+software.amazon.awssdk:metrics-spi:2.28.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+software.amazon.awssdk:profiles:2.28.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+software.amazon.awssdk:protocol-core:2.28.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+software.amazon.awssdk:regions:2.28.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+software.amazon.awssdk:retries-spi:2.28.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+software.amazon.awssdk:retries:2.28.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+software.amazon.awssdk:s3:2.28.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+software.amazon.awssdk:sdk-core:2.28.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+software.amazon.awssdk:sts:2.28.11=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
+software.amazon.awssdk:third-party-jackson-core:2.28.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
+software.amazon.awssdk:url-connection-client:2.28.11=jarValidation,testCompileClasspath,testRuntimeClasspath
+software.amazon.awssdk:utils:2.28.11=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
software.amazon.eventstream:eventstream:1.0.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
-software.amazon.ion:ion-java:1.0.2=jarValidation,testCompileClasspath,testRuntimeClasspath
empty=apiHelperTest,compileOnlyHelper,compileOnlyHelperTest,missingdoclet,packaging,permitAggregatorUse,permitTestAggregatorUse,permitTestUnusedDeclared,permitTestUsedUndeclared,permitUnusedDeclared,permitUsedUndeclared,signatures
diff --git a/solr/modules/s3-repository/src/test/org/apache/solr/s3/AbstractS3ClientTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/AbstractS3ClientTest.java
index 7fb19079939..4e97358756b 100644
--- a/solr/modules/s3-repository/src/test/org/apache/solr/s3/AbstractS3ClientTest.java
+++ b/solr/modules/s3-repository/src/test/org/apache/solr/s3/AbstractS3ClientTest.java
@@ -35,6 +35,7 @@ public class AbstractS3ClientTest extends SolrTestCaseJ4 {
private static final String BUCKET_NAME = "test-bucket";
@ClassRule
+ @SuppressWarnings("removal")
public static final S3MockRule S3_MOCK_RULE =
S3MockRule.builder().withInitialBuckets(BUCKET_NAME).build();
diff --git a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.java
index 54fddfae4d6..44ce79e6844 100644
--- a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.java
+++ b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.java
@@ -53,6 +53,7 @@ public class S3BackupRepositoryTest extends AbstractBackupRepositoryTest {
@Rule public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @SuppressWarnings("removal")
@ClassRule
public static final S3MockRule S3_MOCK_RULE =
S3MockRule.builder().withInitialBuckets(BUCKET_NAME).withSecureConnection(false).build();
diff --git a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.java
index 70266290a94..572e8a1274f 100644
--- a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.java
+++ b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.java
@@ -37,6 +37,7 @@ public class S3IncrementalBackupTest extends AbstractIncrementalBackupTest {
private static final String BUCKET_NAME = S3IncrementalBackupTest.class.getSimpleName();
@ClassRule
+ @SuppressWarnings("removal")
public static final S3MockRule S3_MOCK_RULE =
S3MockRule.builder().withInitialBuckets(BUCKET_NAME).withSecureConnection(false).build();
diff --git a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3InstallShardTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3InstallShardTest.java
index f97cc083d27..194b2ffddc6 100644
--- a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3InstallShardTest.java
+++ b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3InstallShardTest.java
@@ -54,6 +54,7 @@ public class S3InstallShardTest extends AbstractInstallShardTest {
AbstractInstallShardTest.defaultSolrXmlTextWithBackupRepository(BACKUP_REPOSITORY_XML);
@ClassRule
+ @SuppressWarnings("removal")
public static final S3MockRule S3_MOCK_RULE =
S3MockRule.builder().withInitialBuckets(BUCKET_NAME).withSecureConnection(false).build();
diff --git a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3OutputStreamTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3OutputStreamTest.java
index c74cf6ddb3e..ca98c62c94c 100644
--- a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3OutputStreamTest.java
+++ b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3OutputStreamTest.java
@@ -33,6 +33,7 @@ public class S3OutputStreamTest extends SolrTestCaseJ4 {
private static final String BUCKET = S3OutputStreamTest.class.getSimpleName();
@ClassRule
+ @SuppressWarnings("removal")
public static final S3MockRule S3_MOCK_RULE =
S3MockRule.builder().withInitialBuckets(BUCKET).withSecureConnection(false).build();
diff --git a/solr/modules/scripting/gradle.lockfile b/solr/modules/scripting/gradle.lockfile
index d8ef284bf03..58646b28e5a 100644
--- a/solr/modules/scripting/gradle.lockfile
+++ b/solr/modules/scripting/gradle.lockfile
@@ -38,7 +38,8 @@ commons-io:commons-io:2.15.1=compileClasspath,jarValidation,runtimeClasspath,run
io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.dropwizard.metrics:metrics-jetty10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -62,6 +63,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs
io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,testCompileClasspath,testRuntimeClasspath
jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -109,24 +111,25 @@ org.apache.zookeeper:zookeeper:3.9.2=compileClasspath,jarValidation,runtimeClass
org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath
org.checkerframework:checker-qual:3.44.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-common:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-hpack:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-http-client-transport:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-client:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-client:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-rewrite:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-servlet:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-common:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-hpack:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-client:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-client:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-client:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-rewrite:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-session:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-api:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/modules/sql/gradle.lockfile b/solr/modules/sql/gradle.lockfile
index 8ea90b98f78..a16b3b4041f 100644
--- a/solr/modules/sql/gradle.lockfile
+++ b/solr/modules/sql/gradle.lockfile
@@ -45,7 +45,8 @@ commons-io:commons-io:2.15.1=compileClasspath,jarValidation,runtimeClasspath,run
io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-core:4.2.26=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-io.dropwizard.metrics:metrics-jetty10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -69,6 +70,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs
io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,testCompileClasspath,testRuntimeClasspath
jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -135,24 +137,25 @@ org.checkerframework:checker-qual:3.44.0=annotationProcessor,compileClasspath,er
org.codehaus.janino:commons-compiler:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
org.codehaus.janino:janino:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-common:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-hpack:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-http-client-transport:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-client:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-client:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-rewrite:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-servlet:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-common:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-hpack:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-client:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-client:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-client:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-rewrite:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-session:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-api:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/prometheus-exporter/gradle.lockfile b/solr/prometheus-exporter/gradle.lockfile
index 7bd4e1fdd30..819991354c3 100644
--- a/solr/prometheus-exporter/gradle.lockfile
+++ b/solr/prometheus-exporter/gradle.lockfile
@@ -38,7 +38,8 @@ commons-io:commons-io:2.15.1=compileClasspath,jarValidation,runtimeClasspath,run
io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
-io.dropwizard.metrics:metrics-jetty10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,solrPlatformLibs,testRuntimeClasspath
io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -65,6 +66,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,solrPlatformLibs,testRuntime
io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,solrPlatformLibs,testRuntimeClasspath
jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,solrPlatformLibs,testRuntimeClasspath
+jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,testCompileClasspath,testRuntimeClasspath
jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,solrPlatformLibs,testRuntimeClasspath
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -113,24 +115,25 @@ org.apache.zookeeper:zookeeper:3.9.2=compileClasspath,jarValidation,runtimeClass
org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath
org.checkerframework:checker-qual:3.44.0=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-common:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-hpack:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-http-client-transport:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=jarValidation,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-client:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-client:10.0.22=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-rewrite:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:10.0.22=jarValidation,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-servlet:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-common:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-hpack:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=jarValidation,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-client:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-client:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-client:12.0.19=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-rewrite:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:12.0.19=jarValidation,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-session:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:12.0.19=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-api:3.1.1=jarValidation,solrPlatformLibs,testRuntimeClasspath
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,solrPlatformLibs,testRuntimeClasspath
diff --git a/solr/server/build.gradle b/solr/server/build.gradle
index 6e2d28484e5..8a0823f81d2 100644
--- a/solr/server/build.gradle
+++ b/solr/server/build.gradle
@@ -47,10 +47,10 @@ dependencies {
serverLib libs.eclipse.jetty.rewrite
serverLib libs.eclipse.jetty.security
serverLib libs.eclipse.jetty.server
- serverLib libs.eclipse.jetty.servlet
- serverLib libs.eclipse.jetty.servlets
+ serverLib libs.eclipse.jetty.ee10.servlet
+ serverLib libs.eclipse.jetty.ee10.servlets
serverLib libs.eclipse.jetty.util
- serverLib libs.eclipse.jetty.webapp
+ serverLib libs.eclipse.jetty.ee10.webapp
serverLib libs.eclipse.jetty.xml
serverLib libs.eclipse.jetty.alpnserver
serverLib(libs.eclipse.jetty.alpnjavaserver, {
@@ -76,15 +76,20 @@ dependencies {
libExt(libs.dropwizard.metrics.core, {
exclude group: "com.rabbitmq", module: "amqp-client"
+
})
libExt(libs.dropwizard.metrics.graphite, {
exclude group: "com.rabbitmq", module: "amqp-client"
})
- libExt(libs.dropwizard.metrics.jetty10, {
+ def excludeTransitiveJetty = {
exclude group: "org.eclipse.jetty", module: "*"
exclude group: "org.eclipse.jetty.http2", module: "*"
exclude group: "org.eclipse.jetty.toolchain", module: "*"
- })
+ exclude group: "org.eclipse.jetty.ee10", module: "*"
+ exclude group: "jakarta.servlet", module: "jakarta.servlet-api"
+ }
+ libExt(libs.dropwizard.metrics.jetty12, excludeTransitiveJetty)
+ libExt(libs.dropwizard.metrics.jetty12.ee10, excludeTransitiveJetty)
libExt libs.dropwizard.metrics.jvm
libExt libs.dropwizard.metrics.jmx
diff --git a/solr/server/contexts/solr-jetty-context.xml b/solr/server/contexts/solr-jetty-context.xml
index ec646738c3b..a2656f87284 100644
--- a/solr/server/contexts/solr-jetty-context.xml
+++ b/solr/server/contexts/solr-jetty-context.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_10_0.dtd">
-<Configure class="org.eclipse.jetty.webapp.WebAppContext">
+<Configure class="org.eclipse.jetty.ee10.webapp.WebAppContext">
<Set name="contextPath"><Property name="hostContext" default="/solr"/></Set>
<Set name="war"><Property name="jetty.base"/>/solr-webapp/webapp</Set>
<Set name="defaultsDescriptor"><Property name="jetty.base"/>/etc/webdefault.xml</Set>
@@ -26,7 +26,7 @@
<Set name="parentLoaderPriority">true</Set>
<Call name="addServerClassMatcher">
<Arg>
- <New id="removeServerClasses" class="org.eclipse.jetty.webapp.ClassMatcher">
+ <New id="removeServerClasses" class="org.eclipse.jetty.ee10.webapp.ClassMatcher">
<Arg>
<Array type="java.lang.String">
<Item>-org.eclipse.jetty.</Item>
diff --git a/solr/server/etc/jetty-graceful.xml b/solr/server/etc/jetty-graceful.xml
index 34ec9316445..e6eac3cffdd 100644
--- a/solr/server/etc/jetty-graceful.xml
+++ b/solr/server/etc/jetty-graceful.xml
@@ -1,22 +1,15 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<!-- =============================================================== -->
-<!-- Configure Jetty to finish existing requests on STOP. -->
-<!-- -->
-<!-- This is inspired by the "official" Jetty 12 graceful module, -->
-<!-- adapted to use StatisticsHandler for Jetty 10 and 11. -->
-<!-- -->
-<!-- IF THIS IS MODIFIED, JettySolrRunner MUST BE MODIFIED! -->
+<!-- Mixin the Graceful Handler -->
<!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server">
<Call name="insertHandler">
<Arg>
- <New id="GracefulHandler" class="org.eclipse.jetty.server.handler.StatisticsHandler">
- <Set name="gracefulShutdownWaitsForRequests">true</Set>
- </New>
+ <New id="GracefulHandler" class="org.eclipse.jetty.server.handler.GracefulHandler" />
</Arg>
</Call>
- <Set name="stopTimeout"><Property name="solr.jetty.stop.timeout" default="15000"/></Set>
-</Configure>
+ <Set name="stopTimeout"><Property name="jetty.server.stopTimeout" default="5000"/></Set>
+</Configure>
\ No newline at end of file
diff --git a/solr/server/etc/jetty-new-ui-dev.xml b/solr/server/etc/jetty-new-ui-dev.xml
index e3e74434ccf..28501dab377 100644
--- a/solr/server/etc/jetty-new-ui-dev.xml
+++ b/solr/server/etc/jetty-new-ui-dev.xml
@@ -31,8 +31,8 @@
<Arg>
<New class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule">
<Set name="pattern">/solr/ui/*</Set>
- <Set name="name">Content-Security-Policy</Set>
- <Set name="value">default-src 'none'; base-uri 'none'; connect-src 'self'; form-action 'self'; font-src 'self'; frame-ancestors 'none'; img-src 'self' data:; media-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-eval'; worker-src 'self';</Set>
+ <Set name="headerName">Content-Security-Policy</Set>
+ <Set name="headerValue">default-src 'none'; base-uri 'none'; connect-src 'self'; form-action 'self'; font-src 'self'; frame-ancestors 'none'; img-src 'self' data:; media-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-eval'; worker-src 'self';</Set>
</New>
</Arg>
</Call>
diff --git a/solr/server/etc/jetty-new-ui-prod.xml b/solr/server/etc/jetty-new-ui-prod.xml
index c73b1e43133..d158245dd08 100644
--- a/solr/server/etc/jetty-new-ui-prod.xml
+++ b/solr/server/etc/jetty-new-ui-prod.xml
@@ -18,8 +18,8 @@
<Arg>
<New class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule">
<Set name="pattern">/solr/ui/*</Set>
- <Set name="name">Content-Security-Policy</Set>
- <Set name="value">default-src 'none'; base-uri 'none'; connect-src 'self'; form-action 'self'; font-src 'self'; frame-ancestors 'none'; img-src 'self' data:; media-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' 'wasm-unsafe-eval'; worker-src 'self';</Set>
+ <Set name="headerName">Content-Security-Policy</Set>
+ <Set name="headerValue">default-src 'none'; base-uri 'none'; connect-src 'self'; form-action 'self'; font-src 'self'; frame-ancestors 'none'; img-src 'self' data:; media-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' 'wasm-unsafe-eval'; worker-src 'self';</Set>
</New>
</Arg>
</Call>
diff --git a/solr/server/etc/jetty.xml b/solr/server/etc/jetty.xml
index 282de87536f..374cf4924fe 100644
--- a/solr/server/etc/jetty.xml
+++ b/solr/server/etc/jetty.xml
@@ -29,8 +29,8 @@
<!-- Consult the javadoc of o.e.j.util.thread.QueuedThreadPool -->
<!-- for all configuration that may be set here. -->
<!-- =========================================================== -->
- <Arg name="threadpool">
- <New id="threadpool" class="io.dropwizard.metrics.jetty10.InstrumentedQueuedThreadPool">
+ <Arg name="threadPool">
+ <New id="threadPool" class="io.dropwizard.metrics.jetty12.InstrumentedQueuedThreadPool">
<Arg name="registry">
<Call id="solrJettyMetricRegistry" name="getOrCreate" class="com.codahale.metrics.SharedMetricRegistries">
<Arg>solr.jetty</Arg>
@@ -88,8 +88,6 @@
<!-- RewriteHandle to set headers, redirect root to Solr -->
<!-- =========================================================== -->
<New id="RewriteHandler" class="org.eclipse.jetty.rewrite.handler.RewriteHandler">
- <Set name="rewriteRequestURI">true</Set>
- <Set name="rewritePathInfo">false</Set>
<Set name="originalPathAttribute">requestedPath</Set>
<!-- security-related headers -->
@@ -97,8 +95,8 @@
<Arg>
<New class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule">
<Set name="pattern">/solr/*</Set>
- <Set name="name">Content-Security-Policy</Set>
- <Set name="value">default-src 'none'; base-uri 'none'; connect-src 'self'; form-action 'self'; font-src 'self'; frame-ancestors 'none'; img-src 'self' data:; media-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self'; worker-src 'self';</Set>
+ <Set name="headerName">Content-Security-Policy</Set>
+ <Set name="headerValue">default-src 'none'; base-uri 'none'; connect-src 'self'; form-action 'self'; font-src 'self'; frame-ancestors 'none'; img-src 'self' data:; media-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self'; worker-src 'self';</Set>
</New>
</Arg>
</Call>
@@ -106,8 +104,8 @@
<Arg>
<New class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule">
<Set name="pattern">/solr/*</Set>
- <Set name="name">X-Content-Type-Options</Set>
- <Set name="value">nosniff</Set>
+ <Set name="headerName">X-Content-Type-Options</Set>
+ <Set name="headerValue">nosniff</Set>
</New>
</Arg>
</Call>
@@ -115,8 +113,8 @@
<Arg>
<New class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule">
<Set name="pattern">/solr/*</Set>
- <Set name="name">X-Frame-Options</Set>
- <Set name="value">SAMEORIGIN</Set>
+ <Set name="headerName">X-Frame-Options</Set>
+ <Set name="headerValue">SAMEORIGIN</Set>
</New>
</Arg>
</Call>
@@ -124,8 +122,8 @@
<Arg>
<New class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule">
<Set name="pattern">/solr/*</Set>
- <Set name="name">X-XSS-Protection</Set>
- <Set name="value">1; mode=block</Set>
+ <Set name="headerName">X-XSS-Protection</Set>
+ <Set name="headerValue">1; mode=block</Set>
</New>
</Arg>
</Call>
@@ -156,7 +154,7 @@
</Arg>
</Call>
<Set name="handler">
- <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
+ <New id="Handlers" class="org.eclipse.jetty.server.Handler$Sequence">
<Set name="handlers">
<Array type="org.eclipse.jetty.server.Handler">
<Item>
@@ -181,7 +179,7 @@
</New>
</Item>
<Item>
- <New id="InstrumentedHandler" class="io.dropwizard.metrics.jetty10.InstrumentedHandler">
+ <New id="InstrumentedHandler" class="io.dropwizard.metrics.jetty12.ee10.InstrumentedEE10Handler">
<Arg><Ref refid="solrJettyMetricRegistry"/></Arg>
<Set name="handler">
<New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/>
@@ -214,14 +212,10 @@
<Set name="contexts">
<Ref refid="Contexts" />
</Set>
- <Call name="setContextAttribute">
- <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
- <Arg>.*/servlet-api-[^/]*\.jar$</Arg>
- </Call>
-
<Call name="addAppProvider">
<Arg>
- <New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
+ <New class="org.eclipse.jetty.deploy.providers.ContextProvider">
+ <Set name="EnvironmentName">core</Set>
<Set name="monitoredDirName"><Property name="jetty.base" default="."/>/contexts</Set>
<Set name="scanInterval">0</Set>
</New>
diff --git a/solr/server/etc/security.policy b/solr/server/etc/security.policy
index aec689deae6..0750285410e 100644
--- a/solr/server/etc/security.policy
+++ b/solr/server/etc/security.policy
@@ -108,6 +108,8 @@ grant {
permission java.lang.RuntimePermission "getProtectionDomain";
// needed by aws s3 sdk (Apache HTTP Client)
permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.reflect";
+ permission java.lang.RuntimePermission "accessSystemModules";
+
// These two *have* to be spelled out a separate
permission java.lang.management.ManagementPermission "control";
permission java.lang.management.ManagementPermission "monitor";
diff --git a/solr/server/etc/webdefault.xml b/solr/server/etc/webdefault.xml
index f0882926a90..b1f7095966d 100644
--- a/solr/server/etc/webdefault.xml
+++ b/solr/server/etc/webdefault.xml
@@ -29,21 +29,13 @@
Default web.xml file.
This file is applied to a Web application before its own WEB_INF/web.xml file
</description>
-
- <!-- ==================================================================== -->
- <!-- Removes static references to beans from javax.el.BeanELResolver to -->
- <!-- ensure webapp classloader can be released on undeploy -->
- <!-- ==================================================================== -->
- <listener>
- <listener-class>org.eclipse.jetty.servlet.listener.ELContextCleaner</listener-class>
- </listener>
<!-- ==================================================================== -->
<!-- Removes static cache of Methods from java.beans.Introspector to -->
<!-- ensure webapp classloader can be released on undeploy -->
<!-- ==================================================================== -->
<listener>
- <listener-class>org.eclipse.jetty.servlet.listener.IntrospectorCleaner</listener-class>
+ <listener-class>org.eclipse.jetty.ee10.servlet.listener.IntrospectorCleaner</listener-class>
</listener>
@@ -116,7 +108,7 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<servlet>
<servlet-name>default</servlet-name>
- <servlet-class>org.eclipse.jetty.servlet.DefaultServlet</servlet-class>
+ <servlet-class>org.eclipse.jetty.ee10.servlet.DefaultServlet</servlet-class>
<init-param>
<param-name>aliases</param-name>
<param-value>false</param-value>
diff --git a/solr/server/gradle.lockfile b/solr/server/gradle.lockfile
index a24e4c05af4..65162f0f938 100644
--- a/solr/server/gradle.lockfile
+++ b/solr/server/gradle.lockfile
@@ -21,7 +21,6 @@ com.google.errorprone:error_prone_annotations:2.31.0=annotationProcessor,errorpr
com.google.errorprone:error_prone_check_api:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor
com.google.errorprone:error_prone_core:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor
com.google.errorprone:error_prone_type_annotations:2.31.0=annotationProcessor,errorprone,testAnnotationProcessor
-com.google.errorprone:javac:9+181-r4173-1=errorproneJavac
com.google.guava:failureaccess:1.0.2=annotationProcessor,errorprone,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor
com.google.guava:guava:33.1.0-jre=annotationProcessor,errorprone,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor
@@ -36,7 +35,8 @@ commons-io:commons-io:2.15.1=jarValidation,runtimeClasspath,solrCore
io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,libExt,runtimeClasspath
io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,libExt,runtimeClasspath,solrCore
io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,libExt,runtimeClasspath,solrCore
-io.dropwizard.metrics:metrics-jetty10:4.2.26=jarValidation,libExt,runtimeClasspath
+io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,libExt,runtimeClasspath
+io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,libExt,runtimeClasspath
io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,libExt,runtimeClasspath,solrCore
io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,libExt,runtimeClasspath,solrCore
io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -60,6 +60,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,solrCore
io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=jarValidation,runtimeClasspath,solrCore
jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,solrCore
jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,solrCore
+jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,runtimeClasspath,serverLib
jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,solrCore
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,solrCore
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -103,30 +104,32 @@ org.apache.zookeeper:zookeeper-jute:3.9.2=jarValidation,runtimeClasspath,solrCor
org.apache.zookeeper:zookeeper:3.9.2=jarValidation,runtimeClasspath,solrCore
org.checkerframework:checker-qual:3.44.0=annotationProcessor,errorprone,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor
org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,runtimeClasspath,solrCore
-org.eclipse.jetty.http2:http2-client:10.0.22=jarValidation,runtimeClasspath,solrCore
-org.eclipse.jetty.http2:http2-common:10.0.22=jarValidation,runtimeClasspath,serverLib,solrCore
-org.eclipse.jetty.http2:http2-hpack:10.0.22=jarValidation,runtimeClasspath,serverLib,solrCore
-org.eclipse.jetty.http2:http2-http-client-transport:10.0.22=jarValidation,runtimeClasspath,solrCore
-org.eclipse.jetty.http2:http2-server:10.0.22=jarValidation,runtimeClasspath,serverLib
-org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=jarValidation,runtimeClasspath,serverLib,solrCore
-org.eclipse.jetty:jetty-alpn-client:10.0.22=jarValidation,runtimeClasspath,solrCore
-org.eclipse.jetty:jetty-alpn-java-client:10.0.22=jarValidation,runtimeClasspath,solrCore
-org.eclipse.jetty:jetty-alpn-java-server:10.0.22=jarValidation,runtimeClasspath,serverLib
-org.eclipse.jetty:jetty-alpn-server:10.0.22=jarValidation,runtimeClasspath,serverLib
-org.eclipse.jetty:jetty-client:10.0.22=jarValidation,runtimeClasspath,solrCore
-org.eclipse.jetty:jetty-deploy:10.0.22=jarValidation,runtimeClasspath,serverLib
-org.eclipse.jetty:jetty-http:10.0.22=jarValidation,runtimeClasspath,serverLib,solrCore
-org.eclipse.jetty:jetty-io:10.0.22=jarValidation,runtimeClasspath,serverLib,solrCore
-org.eclipse.jetty:jetty-jmx:10.0.22=jarValidation,runtimeClasspath,serverLib
-org.eclipse.jetty:jetty-rewrite:10.0.22=jarValidation,runtimeClasspath,serverLib
-org.eclipse.jetty:jetty-security:10.0.22=jarValidation,runtimeClasspath,serverLib
-org.eclipse.jetty:jetty-server:10.0.22=jarValidation,runtimeClasspath,serverLib,solrCore
-org.eclipse.jetty:jetty-servlet:10.0.22=jarValidation,runtimeClasspath,serverLib
-org.eclipse.jetty:jetty-servlets:10.0.22=jarValidation,runtimeClasspath,serverLib
-org.eclipse.jetty:jetty-start:10.0.22=jarValidation,startJar
-org.eclipse.jetty:jetty-util:10.0.22=jarValidation,runtimeClasspath,serverLib,solrCore
-org.eclipse.jetty:jetty-webapp:10.0.22=jarValidation,runtimeClasspath,serverLib
-org.eclipse.jetty:jetty-xml:10.0.22=jarValidation,runtimeClasspath,serverLib
+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.19=jarValidation,runtimeClasspath,serverLib
+org.eclipse.jetty.ee10:jetty-ee10-servlets:12.0.19=jarValidation,runtimeClasspath,serverLib
+org.eclipse.jetty.ee10:jetty-ee10-webapp:12.0.19=jarValidation,runtimeClasspath,serverLib
+org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.19=jarValidation,runtimeClasspath,solrCore
+org.eclipse.jetty.http2:jetty-http2-client:12.0.19=jarValidation,runtimeClasspath,solrCore
+org.eclipse.jetty.http2:jetty-http2-common:12.0.19=jarValidation,runtimeClasspath,serverLib,solrCore
+org.eclipse.jetty.http2:jetty-http2-hpack:12.0.19=jarValidation,runtimeClasspath,serverLib,solrCore
+org.eclipse.jetty.http2:jetty-http2-server:12.0.19=jarValidation,runtimeClasspath,serverLib
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=jarValidation,runtimeClasspath,serverLib,solrCore
+org.eclipse.jetty:jetty-alpn-client:12.0.19=jarValidation,runtimeClasspath,solrCore
+org.eclipse.jetty:jetty-alpn-java-client:12.0.19=jarValidation,runtimeClasspath,solrCore
+org.eclipse.jetty:jetty-alpn-java-server:12.0.19=jarValidation,runtimeClasspath,serverLib
+org.eclipse.jetty:jetty-alpn-server:12.0.19=jarValidation,runtimeClasspath,serverLib
+org.eclipse.jetty:jetty-client:12.0.19=jarValidation,runtimeClasspath,solrCore
+org.eclipse.jetty:jetty-deploy:12.0.19=jarValidation,runtimeClasspath,serverLib
+org.eclipse.jetty:jetty-ee:12.0.19=jarValidation,runtimeClasspath,serverLib
+org.eclipse.jetty:jetty-http:12.0.19=jarValidation,runtimeClasspath,serverLib,solrCore
+org.eclipse.jetty:jetty-io:12.0.19=jarValidation,runtimeClasspath,serverLib,solrCore
+org.eclipse.jetty:jetty-jmx:12.0.19=jarValidation,runtimeClasspath,serverLib
+org.eclipse.jetty:jetty-rewrite:12.0.19=jarValidation,runtimeClasspath,serverLib
+org.eclipse.jetty:jetty-security:12.0.19=jarValidation,runtimeClasspath,serverLib
+org.eclipse.jetty:jetty-server:12.0.19=jarValidation,runtimeClasspath,serverLib,solrCore
+org.eclipse.jetty:jetty-session:12.0.19=jarValidation,runtimeClasspath,serverLib
+org.eclipse.jetty:jetty-start:12.0.19=jarValidation,startJar
+org.eclipse.jetty:jetty-util:12.0.19=jarValidation,runtimeClasspath,serverLib,solrCore
+org.eclipse.jetty:jetty-xml:12.0.19=jarValidation,runtimeClasspath,serverLib
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,runtimeClasspath,solrCore
org.glassfish.hk2:hk2-api:3.1.1=jarValidation,runtimeClasspath,solrCore
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,runtimeClasspath,solrCore
diff --git a/solr/solr-ref-guide/gradle.lockfile b/solr/solr-ref-guide/gradle.lockfile
index ce63c7564aa..fd26f6593cb 100644
--- a/solr/solr-ref-guide/gradle.lockfile
+++ b/solr/solr-ref-guide/gradle.lockfile
@@ -37,7 +37,8 @@ commons-io:commons-io:2.15.1=testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-annotation:4.2.26=testRuntimeClasspath
io.dropwizard.metrics:metrics-core:4.2.26=testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-graphite:4.2.26=testRuntimeClasspath
-io.dropwizard.metrics:metrics-jetty10:4.2.26=testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12:4.2.26=testRuntimeClasspath
io.dropwizard.metrics:metrics-jmx:4.2.26=testRuntimeClasspath
io.dropwizard.metrics:metrics-jvm:4.2.26=testRuntimeClasspath
io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -61,6 +62,7 @@ io.sgr:s2-geometry-library-java:1.0.0=testRuntimeClasspath
io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=testCompileClasspath,testRuntimeClasspath
jakarta.annotation:jakarta.annotation-api:2.1.1=testRuntimeClasspath
jakarta.inject:jakarta.inject-api:2.0.1=testRuntimeClasspath
+jakarta.servlet:jakarta.servlet-api:6.0.0=testCompileClasspath,testRuntimeClasspath
jakarta.validation:jakarta.validation-api:3.0.2=testRuntimeClasspath
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -106,24 +108,25 @@ org.apache.zookeeper:zookeeper:3.9.2=testCompileClasspath,testRuntimeClasspath
org.apiguardian:apiguardian-api:1.1.2=testRuntimeClasspath
org.checkerframework:checker-qual:3.44.0=annotationProcessor,errorprone,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=testRuntimeClasspath
-org.eclipse.jetty.http2:http2-client:10.0.22=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-common:10.0.22=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-hpack:10.0.22=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-http-client-transport:10.0.22=testRuntimeClasspath
-org.eclipse.jetty.http2:http2-server:10.0.22=testRuntimeClasspath
-org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-client:10.0.22=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-client:10.0.22=testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-server:10.0.22=testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-server:10.0.22=testRuntimeClasspath
-org.eclipse.jetty:jetty-client:10.0.22=testRuntimeClasspath
-org.eclipse.jetty:jetty-http:10.0.22=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:10.0.22=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-rewrite:10.0.22=testRuntimeClasspath
-org.eclipse.jetty:jetty-security:10.0.22=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:10.0.22=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-servlet:10.0.22=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:10.0.22=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.19=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.19=testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client:12.0.19=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-common:12.0.19=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-hpack:12.0.19=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-server:12.0.19=testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-client:12.0.19=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-client:12.0.19=testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-server:12.0.19=testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-server:12.0.19=testRuntimeClasspath
+org.eclipse.jetty:jetty-client:12.0.19=testRuntimeClasspath
+org.eclipse.jetty:jetty-http:12.0.19=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:12.0.19=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-rewrite:12.0.19=testRuntimeClasspath
+org.eclipse.jetty:jetty-security:12.0.19=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:12.0.19=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-session:12.0.19=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:12.0.19=testCompileClasspath,testRuntimeClasspath
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=testRuntimeClasspath
org.glassfish.hk2:hk2-api:3.1.1=testRuntimeClasspath
org.glassfish.hk2:hk2-locator:3.1.1=testRuntimeClasspath
diff --git a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc
index 365bef4558d..3c69e27773c 100644
--- a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc
+++ b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc
@@ -117,3 +117,6 @@ Nowadays, the HTTP request is available via internal APIs: `SolrQueryRequest.get
=== Security
* There is no longer a distinction between trusted and untrusted configSets; all configSets are now considered trusted. To ensure security, Solr should be properly protected using authentication and authorization mechanisms, allowing only authorized users with administrative privileges to publish them.
+
+=== Upgrade to Jetty 12.x
+Solr upgraded to Jetty 12.x from 10.x as Jetty 10 and 11 have reached end-of-life support. Jetty 12.x requires Java 17 or newer and is fully compatible with Solr's new minimum requirement of Java 21. This upgrade brings support for modern HTTP protocols and adopts the Jakarta EE 10 namespace. For more details, see https://webtide.com/jetty-12-has-arrived/.
\ No newline at end of file
diff --git a/solr/solrj-streaming/gradle.lockfile b/solr/solrj-streaming/gradle.lockfile
index 1902382f55b..5ad3ba653d0 100644
--- a/solr/solrj-streaming/gradle.lockfile
+++ b/solr/solrj-streaming/gradle.lockfile
@@ -41,7 +41,8 @@ commons-io:commons-io:2.15.1=jarValidation,testCompileClasspath,testRuntimeClass
io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath
io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,testRuntimeClasspath
-io.dropwizard.metrics:metrics-jetty10:4.2.26=jarValidation,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,testRuntimeClasspath
io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,testRuntimeClasspath
io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,testRuntimeClasspath
io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -76,6 +77,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,testRuntimeClasspath
io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,testRuntimeClasspath
jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,testRuntimeClasspath
+jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,testCompileClasspath,testRuntimeClasspath
jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,testRuntimeClasspath
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -131,24 +133,25 @@ org.checkerframework:checker-qual:3.44.0=annotationProcessor,errorprone,jarValid
org.codehaus.janino:commons-compiler:3.1.11=jarValidation,testRuntimeClasspath
org.codehaus.janino:janino:3.1.11=jarValidation,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-client:10.0.22=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-common:10.0.22=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-hpack:10.0.22=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-http-client-transport:10.0.22=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-client:10.0.22=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-client:10.0.22=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-client:10.0.22=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:10.0.22=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:10.0.22=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-rewrite:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-servlet:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:10.0.22=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.19=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client:12.0.19=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-common:12.0.19=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-hpack:12.0.19=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-client:12.0.19=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-client:12.0.19=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-client:12.0.19=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:12.0.19=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:12.0.19=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-rewrite:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-session:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:12.0.19=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,testRuntimeClasspath
org.glassfish.hk2:hk2-api:3.1.1=jarValidation,testRuntimeClasspath
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,testRuntimeClasspath
diff --git a/solr/solrj-zookeeper/gradle.lockfile b/solr/solrj-zookeeper/gradle.lockfile
index 5b66c971cce..68c127c061f 100644
--- a/solr/solrj-zookeeper/gradle.lockfile
+++ b/solr/solrj-zookeeper/gradle.lockfile
@@ -43,7 +43,8 @@ commons-io:commons-io:2.15.1=compileClasspath,jarValidation,permitTestUsedUndecl
io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath
io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,testRuntimeClasspath
-io.dropwizard.metrics:metrics-jetty10:4.2.26=jarValidation,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,testRuntimeClasspath
io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,testRuntimeClasspath
io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,testRuntimeClasspath
io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -78,6 +79,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,testRuntimeClasspath
io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,testRuntimeClasspath
jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,testRuntimeClasspath
+jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,testCompileClasspath,testRuntimeClasspath
jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,testRuntimeClasspath
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -123,24 +125,25 @@ org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath
org.checkerframework:checker-qual:3.33.0=apiHelper
org.checkerframework:checker-qual:3.44.0=annotationProcessor,compileClasspath,errorprone,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-client:10.0.22=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-common:10.0.22=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-hpack:10.0.22=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-http-client-transport:10.0.22=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-client:10.0.22=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-client:10.0.22=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-client:10.0.22=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:10.0.22=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:10.0.22=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-rewrite:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-servlet:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:10.0.22=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.19=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client:12.0.19=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-common:12.0.19=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-hpack:12.0.19=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-client:12.0.19=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-client:12.0.19=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-client:12.0.19=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:12.0.19=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:12.0.19=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-rewrite:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-session:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:12.0.19=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,testRuntimeClasspath
org.glassfish.hk2:hk2-api:3.1.1=jarValidation,testRuntimeClasspath
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,testRuntimeClasspath
diff --git a/solr/solrj/build.gradle b/solr/solrj/build.gradle
index ed75ecceace..c3c948b1917 100644
--- a/solr/solrj/build.gradle
+++ b/solr/solrj/build.gradle
@@ -74,14 +74,15 @@ dependencies {
testImplementation libs.commonsio.commonsio
testImplementation libs.fasterxml.jackson.dataformat.cbor
- testImplementation libs.eclipse.jetty.toolchain.servletapi
+ testImplementation libs.jakarta.servlet.api
testImplementation libs.eclipse.jetty.server
- testImplementation libs.eclipse.jetty.servlet
- testImplementation libs.eclipse.jetty.webapp
+ testImplementation libs.eclipse.jetty.ee10.servlet
+ testImplementation libs.eclipse.jetty.ee10.webapp
testRuntimeOnly(libs.eclipse.jetty.alpnjavaserver, {
exclude group: "org.eclipse.jetty.alpn", module: "alpn-api"
})
+ testImplementation libs.eclipse.jetty.session
testImplementation(libs.mockito.core, {
exclude group: "net.bytebuddy", module: "byte-buddy-agent"
})
diff --git a/solr/solrj/gradle.lockfile b/solr/solrj/gradle.lockfile
index 84741aa1b0e..9e6881fd028 100644
--- a/solr/solrj/gradle.lockfile
+++ b/solr/solrj/gradle.lockfile
@@ -41,7 +41,8 @@ commons-io:commons-io:2.15.1=jarValidation,testCompileClasspath,testRuntimeClass
io.dropwizard.metrics:metrics-annotation:4.2.26=jarValidation,testRuntimeClasspath
io.dropwizard.metrics:metrics-core:4.2.26=jarValidation,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-graphite:4.2.26=jarValidation,testRuntimeClasspath
-io.dropwizard.metrics:metrics-jetty10:4.2.26=jarValidation,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=jarValidation,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12:4.2.26=jarValidation,testRuntimeClasspath
io.dropwizard.metrics:metrics-jmx:4.2.26=jarValidation,testRuntimeClasspath
io.dropwizard.metrics:metrics-jvm:4.2.26=jarValidation,testRuntimeClasspath
io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -76,6 +77,7 @@ io.sgr:s2-geometry-library-java:1.0.0=jarValidation,testRuntimeClasspath
io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,testRuntimeClasspath
jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,testRuntimeClasspath
+jakarta.servlet:jakarta.servlet-api:6.0.0=jarValidation,testCompileClasspath,testRuntimeClasspath
jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,testRuntimeClasspath
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -122,26 +124,28 @@ org.apache.zookeeper:zookeeper:3.9.2=jarValidation,permitTestUnusedDeclared,test
org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath
org.checkerframework:checker-qual:3.44.0=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=jarValidation,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-client:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-common:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-hpack:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-http-client-transport:10.0.22=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-client:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-server:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-rewrite:10.0.22=jarValidation,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-servlet:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-webapp:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-xml:10.0.22=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10:jetty-ee10-webapp:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.19=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-common:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-hpack:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-client:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-client:12.0.19=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-server:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-client:12.0.19=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-ee:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-rewrite:12.0.19=jarValidation,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-session:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-xml:12.0.19=jarValidation,testCompileClasspath,testRuntimeClasspath
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,testRuntimeClasspath
org.glassfish.hk2:hk2-api:3.1.1=jarValidation,testRuntimeClasspath
org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,testRuntimeClasspath
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/AuthenticationStoreHolder.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/AuthenticationStoreHolder.java
index 1d9452f9e85..85b62ab64a4 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/AuthenticationStoreHolder.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/AuthenticationStoreHolder.java
@@ -18,9 +18,9 @@
package org.apache.solr.client.solrj.impl;
import java.net.URI;
-import org.eclipse.jetty.client.HttpAuthenticationStore;
-import org.eclipse.jetty.client.api.Authentication;
-import org.eclipse.jetty.client.api.AuthenticationStore;
+import org.eclipse.jetty.client.Authentication;
+import org.eclipse.jetty.client.AuthenticationStore;
+import org.eclipse.jetty.client.internal.HttpAuthenticationStore;
public class AuthenticationStoreHolder implements AuthenticationStore {
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.java
index 5603fac07e9..4c24aa03cc0 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.java
@@ -41,8 +41,8 @@ import org.apache.solr.common.params.UpdateParams;
import org.apache.solr.common.util.ExecutorUtil;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SolrNamedThreadFactory;
-import org.eclipse.jetty.client.api.Response;
-import org.eclipse.jetty.client.util.InputStreamResponseListener;
+import org.eclipse.jetty.client.InputStreamResponseListener;
+import org.eclipse.jetty.client.Response;
import org.eclipse.jetty.http.HttpStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
index 3f154cfdc01..14dc22fae42 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
@@ -23,7 +23,6 @@ import java.io.InputStream;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.InvocationTargetException;
import java.net.ConnectException;
-import java.net.CookieStore;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
@@ -59,34 +58,35 @@ import org.apache.solr.common.util.ExecutorUtil;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.ObjectReleaseTracker;
import org.apache.solr.common.util.SolrNamedThreadFactory;
+import org.eclipse.jetty.client.AuthenticationStore;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.HttpClientTransport;
import org.eclipse.jetty.client.HttpProxy;
+import org.eclipse.jetty.client.InputStreamRequestContent;
+import org.eclipse.jetty.client.InputStreamResponseListener;
+import org.eclipse.jetty.client.MultiPartRequestContent;
import org.eclipse.jetty.client.Origin.Address;
import org.eclipse.jetty.client.Origin.Protocol;
+import org.eclipse.jetty.client.OutputStreamRequestContent;
import org.eclipse.jetty.client.ProtocolHandlers;
import org.eclipse.jetty.client.ProxyConfiguration;
+import org.eclipse.jetty.client.Request;
+import org.eclipse.jetty.client.Response;
+import org.eclipse.jetty.client.Result;
import org.eclipse.jetty.client.Socks4Proxy;
-import org.eclipse.jetty.client.api.AuthenticationStore;
-import org.eclipse.jetty.client.api.Request;
-import org.eclipse.jetty.client.api.Response;
-import org.eclipse.jetty.client.api.Result;
-import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP;
-import org.eclipse.jetty.client.util.InputStreamRequestContent;
-import org.eclipse.jetty.client.util.InputStreamResponseListener;
-import org.eclipse.jetty.client.util.MultiPartRequestContent;
-import org.eclipse.jetty.client.util.OutputStreamRequestContent;
-import org.eclipse.jetty.client.util.StringRequestContent;
+import org.eclipse.jetty.client.StringRequestContent;
+import org.eclipse.jetty.client.transport.HttpClientTransportOverHTTP;
+import org.eclipse.jetty.http.HttpCookieStore;
import org.eclipse.jetty.http.HttpField;
import org.eclipse.jetty.http.HttpFields;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.http.HttpMethod;
import org.eclipse.jetty.http.MimeTypes;
+import org.eclipse.jetty.http.MultiPart;
import org.eclipse.jetty.http2.client.HTTP2Client;
-import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2;
+import org.eclipse.jetty.http2.client.transport.HttpClientTransportOverHTTP2;
import org.eclipse.jetty.io.ClientConnector;
import org.eclipse.jetty.util.BlockingArrayQueue;
-import org.eclipse.jetty.util.HttpCookieStore;
import org.eclipse.jetty.util.ssl.KeyStoreScanner;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.slf4j.Logger;
@@ -255,7 +255,7 @@ public class Http2SolrClient extends HttpSolrClientBase {
httpClient.setIdleTimeout(idleTimeoutMillis);
if (builder.cookieStore != null) {
- httpClient.setCookieStore(builder.cookieStore);
+ httpClient.setHttpCookieStore(builder.cookieStore);
}
this.authenticationStore = new AuthenticationStoreHolder();
@@ -757,7 +757,8 @@ public class Http2SolrClient extends HttpSolrClientBase {
String[] vals = wparams.getParams(key);
if (vals != null) {
for (String val : vals) {
- content.addFieldPart(key, new StringRequestContent(val), null);
+ content.addPart(
+ new MultiPart.ContentSourcePart(key, null, null, new StringRequestContent(val)));
}
}
}
@@ -773,11 +774,12 @@ public class Http2SolrClient extends HttpSolrClientBase {
}
HttpFields.Mutable fields = HttpFields.build(1);
fields.add(HttpHeader.CONTENT_TYPE, contentType);
- content.addFilePart(
- name,
- contentStream.getName(),
- new InputStreamRequestContent(contentStream.getStream()),
- fields);
+ content.addPart(
+ new MultiPart.ContentSourcePart(
+ name,
+ contentStream.getName(),
+ fields,
+ new InputStreamRequestContent(contentStream.getStream())));
}
}
req.body(content);
@@ -894,7 +896,7 @@ public class Http2SolrClient extends HttpSolrClientBase {
private HttpClient httpClient;
- protected CookieStore cookieStore;
+ protected HttpCookieStore cookieStore;
private SSLConfig sslConfig;
@@ -997,7 +999,7 @@ public class Http2SolrClient extends HttpSolrClientBase {
return this;
}
- private CookieStore getDefaultCookieStore() {
+ private HttpCookieStore getDefaultCookieStore() {
if (Boolean.getBoolean("solr.http.disableCookies")) {
return new HttpCookieStore.Empty();
}
@@ -1119,7 +1121,7 @@ public class Http2SolrClient extends HttpSolrClientBase {
* @param cookieStore The CookieStore to set. {@code null} will set the default.
* @return this Builder
*/
- public Builder withCookieStore(CookieStore cookieStore) {
+ public Builder withCookieStore(HttpCookieStore cookieStore) {
this.cookieStore = cookieStore;
return this;
}
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpListenerFactory.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpListenerFactory.java
index e4f47fd9dbf..cf42a0107f0 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpListenerFactory.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpListenerFactory.java
@@ -17,9 +17,9 @@
package org.apache.solr.client.solrj.impl;
-import org.eclipse.jetty.client.api.Request;
-import org.eclipse.jetty.client.api.Response;
-import org.eclipse.jetty.client.api.Result;
+import org.eclipse.jetty.client.Request;
+import org.eclipse.jetty.client.Response;
+import org.eclipse.jetty.client.Result;
public interface HttpListenerFactory {
abstract class RequestResponseListener
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/PreemptiveBasicAuthClientBuilderFactory.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/PreemptiveBasicAuthClientBuilderFactory.java
index 0d1231baa74..1ba61fa9137 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/PreemptiveBasicAuthClientBuilderFactory.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/PreemptiveBasicAuthClientBuilderFactory.java
@@ -35,9 +35,9 @@ import org.apache.solr.client.solrj.util.SolrBasicAuthentication;
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.StrUtils;
-import org.eclipse.jetty.client.HttpAuthenticationStore;
import org.eclipse.jetty.client.ProxyAuthenticationProtocolHandler;
import org.eclipse.jetty.client.WWWAuthenticationProtocolHandler;
+import org.eclipse.jetty.client.internal.HttpAuthenticationStore;
/**
* HttpClientConfigurer implementation providing support for preemptive Http Basic authentication
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/util/SolrBasicAuthentication.java b/solr/solrj/src/java/org/apache/solr/client/solrj/util/SolrBasicAuthentication.java
index 3b15b841818..002a34e53ee 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/util/SolrBasicAuthentication.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/util/SolrBasicAuthentication.java
@@ -21,9 +21,9 @@ import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.util.Base64;
import java.util.Locale;
-import org.eclipse.jetty.client.api.Authentication;
-import org.eclipse.jetty.client.api.ContentResponse;
-import org.eclipse.jetty.client.api.Request;
+import org.eclipse.jetty.client.Authentication;
+import org.eclipse.jetty.client.ContentResponse;
+import org.eclipse.jetty.client.Request;
import org.eclipse.jetty.util.Attributes;
/** BasicAuthentication that does not care about uri and realm */
@@ -61,7 +61,7 @@ public class SolrBasicAuthentication implements Authentication {
@Override
public void apply(Request request) {
- request.header(headerInfo.getHeader(), value);
+ request.headers(httpFields -> httpFields.add(headerInfo.getHeader(), value));
}
};
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/StartSolrJetty.java b/solr/solrj/src/test/org/apache/solr/client/solrj/StartSolrJetty.java
index 8f02c40abd7..4282f399129 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/StartSolrJetty.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/StartSolrJetty.java
@@ -18,11 +18,11 @@ package org.apache.solr.client.solrj;
import java.lang.invoke.MethodHandles;
import org.apache.solr.common.util.SuppressForbidden;
+import org.eclipse.jetty.ee10.webapp.WebAppContext;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.webapp.WebAppContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
index edcb3584111..e08500af688 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
@@ -31,12 +31,12 @@ import org.apache.http.impl.client.HttpClients;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.impl.HttpClientUtil;
import org.apache.solr.util.ExternalPaths;
+import org.eclipse.jetty.ee10.webapp.WebAppContext;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.server.session.DefaultSessionIdManager;
-import org.eclipse.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.session.DefaultSessionIdManager;
/**
* @since solr 1.3
@@ -61,9 +61,8 @@ public class JettyWebappTest extends SolrTestCaseJ4 {
server = new Server(port);
// insecure: only use for tests!!!!
- server.setSessionIdManager(
- new DefaultSessionIdManager(server, new Random(random().nextLong())));
- new WebAppContext(server, path, "/solr");
+ server.addBean(new DefaultSessionIdManager(server, new Random(random().nextLong())));
+ server.setHandler(new WebAppContext(path, "/solr"));
ServerConnector connector = new ServerConnector(server, new HttpConnectionFactory());
connector.setIdleTimeout(1000 * 60 * 60);
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java
index 2dd1466c882..b9625ad5132 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.solr.client.solrj.impl;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.lang.invoke.MethodHandles;
@@ -30,10 +34,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.HttpException;
@@ -70,7 +70,7 @@ import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SuppressForbidden;
import org.apache.solr.embedded.JettyConfig;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
import org.junit.BeforeClass;
import org.junit.Test;
import org.slf4j.Logger;
@@ -115,7 +115,7 @@ public class BasicHttpSolrClientTest extends SolrJettyTestBase {
public static HashMap<String, String> headers = null;
public static Map<String, String[]> parameters = null;
public static String queryString = null;
- public static javax.servlet.http.Cookie[] cookies = null;
+ public static jakarta.servlet.http.Cookie[] cookies = null;
public static void setErrorCode(Integer code) {
errorCode = code;
@@ -161,7 +161,7 @@ public class BasicHttpSolrClientTest extends SolrJettyTestBase {
}
private void setCookies(HttpServletRequest req) {
- javax.servlet.http.Cookie[] ck = req.getCookies();
+ jakarta.servlet.http.Cookie[] ck = req.getCookies();
cookies = req.getCookies();
}
@@ -734,7 +734,7 @@ public class BasicHttpSolrClientTest extends SolrJettyTestBase {
// Assert cookies from UseContextCallback
assertNotNull(DebugServlet.cookies);
boolean foundCookie = false;
- for (javax.servlet.http.Cookie cookie : DebugServlet.cookies) {
+ for (jakarta.servlet.http.Cookie cookie : DebugServlet.cookies) {
if (cookieName.equals(cookie.getName()) && cookieValue.equals(cookie.getValue())) {
foundCookie = true;
break;
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java
index 6d745a6058f..470aa838a4f 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java
@@ -29,8 +29,8 @@ import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.util.ExecutorUtil;
import org.apache.solr.common.util.SolrNamedThreadFactory;
import org.apache.solr.embedded.JettyConfig;
-import org.eclipse.jetty.client.api.Response;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.client.Response;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java
index cc49c05994e..4e23bdb1d41 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.solr.client.solrj.impl;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
@@ -26,10 +30,6 @@ import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.http.HttpResponse;
import org.apache.solr.SolrJettyTestBase;
import org.apache.solr.client.solrj.SolrClient;
@@ -41,7 +41,7 @@ import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.util.ExecutorUtil;
import org.apache.solr.common.util.SolrNamedThreadFactory;
import org.apache.solr.embedded.JettyConfig;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
import org.junit.BeforeClass;
import org.junit.Test;
import org.slf4j.Logger;
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/DebugServlet.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/DebugServlet.java
index a37d64476d5..3555ba2cd9f 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/DebugServlet.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/DebugServlet.java
@@ -17,6 +17,11 @@
package org.apache.solr.client.solrj.impl;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Enumeration;
@@ -25,10 +30,6 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.solr.common.util.SuppressForbidden;
public class DebugServlet extends HttpServlet {
@@ -50,7 +51,7 @@ public class DebugServlet extends HttpServlet {
public static HashMap<String, String> headers = null;
public static Map<String, String[]> parameters = null;
public static String queryString = null;
- public static javax.servlet.http.Cookie[] cookies = null;
+ public static Cookie[] cookies = null;
public static List<String[]> responseHeaders = null;
public static Map<String, Object> responseBodyByQueryFragment = new ConcurrentHashMap<>();
public static byte[] requestBody = null;
@@ -106,7 +107,7 @@ public class DebugServlet extends HttpServlet {
}
private void setCookies(HttpServletRequest req) {
- javax.servlet.http.Cookie[] ck = req.getCookies();
+ Cookie[] ck = req.getCookies();
cookies = req.getCookies();
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientCompatibilityTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientCompatibilityTest.java
index d1074b99531..3763e251da6 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientCompatibilityTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientCompatibilityTest.java
@@ -25,9 +25,9 @@ import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.embedded.JettyConfig;
import org.apache.solr.util.LogLevel;
-import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP;
-import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.client.transport.HttpClientTransportOverHTTP;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
+import org.eclipse.jetty.http2.client.transport.HttpClientTransportOverHTTP2;
@LogLevel("org.eclipse.jetty.client=DEBUG;org.eclipse.jetty.util=DEBUG")
@SolrTestCaseJ4.SuppressSSL
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientTestBase.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientTestBase.java
index f15521eb992..ce6c407269d 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientTestBase.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientTestBase.java
@@ -51,7 +51,7 @@ import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.embedded.JettyConfig;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
import org.junit.BeforeClass;
public abstract class HttpSolrClientTestBase extends SolrJettyTestBase {
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java
index e1f34d2c934..c5e1b53a533 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java
@@ -42,7 +42,7 @@ import org.apache.solr.client.solrj.response.schema.SchemaRepresentation;
import org.apache.solr.client.solrj.response.schema.SchemaResponse;
import org.apache.solr.common.SolrException;
import org.apache.solr.util.RestTestBase;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/solr/test-framework/build.gradle b/solr/test-framework/build.gradle
index c9f1be0450c..c7b5002cd1d 100644
--- a/solr/test-framework/build.gradle
+++ b/solr/test-framework/build.gradle
@@ -66,16 +66,17 @@ dependencies {
implementation libs.apache.log4j.api
implementation libs.apache.log4j.core
implementation libs.dropwizard.metrics.core
- implementation libs.dropwizard.metrics.jetty10
+ implementation libs.dropwizard.metrics.jetty12.ee10
implementation libs.commonscli.commonscli
permitUnusedDeclared libs.commonscli.commonscli
implementation libs.apache.httpcomponents.httpclient
implementation libs.apache.httpcomponents.httpcore
implementation libs.opentelemetry.api
- implementation libs.eclipse.jetty.toolchain.servletapi
+ implementation libs.jakarta.servlet.api
implementation libs.eclipse.jetty.server
- api libs.eclipse.jetty.servlet
+ implementation libs.eclipse.jetty.session
+ api libs.eclipse.jetty.ee10.servlet
implementation libs.eclipse.jetty.util
implementation libs.eclipse.jetty.alpnserver
runtimeOnly(libs.eclipse.jetty.alpnjavaserver, {
diff --git a/solr/test-framework/gradle.lockfile b/solr/test-framework/gradle.lockfile
index b4eb3018413..053b7399a39 100644
--- a/solr/test-framework/gradle.lockfile
+++ b/solr/test-framework/gradle.lockfile
@@ -38,7 +38,8 @@ commons-io:commons-io:2.15.1=apiHelper,compileClasspath,jarValidation,runtimeCla
io.dropwizard.metrics:metrics-annotation:4.2.26=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-core:4.2.26=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-graphite:4.2.26=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
-io.dropwizard.metrics:metrics-jetty10:4.2.26=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.dropwizard.metrics:metrics-jetty12:4.2.26=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-jmx:4.2.26=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
io.dropwizard.metrics:metrics-jvm:4.2.26=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -62,6 +63,7 @@ io.sgr:s2-geometry-library-java:1.0.0=apiHelper,jarValidation,runtimeClasspath,t
io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
jakarta.annotation:jakarta.annotation-api:2.1.1=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
jakarta.inject:jakarta.inject-api:2.0.1=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
+jakarta.servlet:jakarta.servlet-api:6.0.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
jakarta.validation:jakarta.validation-api:3.0.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -106,24 +108,25 @@ org.apache.zookeeper:zookeeper:3.9.2=apiHelper,compileClasspath,jarValidation,ru
org.apiguardian:apiguardian-api:1.1.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.checkerframework:checker-qual:3.44.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.codehaus.woodstox:stax2-api:4.2.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-client:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-common:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-hpack:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-http-client-transport:10.0.22=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-server:10.0.22=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-client:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-client:10.0.22=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-server:10.0.22=jarValidation,runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-server:10.0.22=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-client:10.0.22=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-rewrite:10.0.22=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-servlet:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.19=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-client:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-common:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-hpack:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:jetty-http2-server:12.0.19=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-client:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-client:12.0.19=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-server:12.0.19=jarValidation,runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-server:12.0.19=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-client:12.0.19=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-rewrite:12.0.19=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-session:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:12.0.19=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
org.glassfish.hk2:hk2-api:3.1.1=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
org.glassfish.hk2:hk2-locator:3.1.1=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath
diff --git a/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
index 991cd178f89..fb24cfa30f0 100644
--- a/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
@@ -16,6 +16,7 @@
*/
package org.apache.solr;
+import jakarta.servlet.Filter;
import java.io.IOException;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -43,7 +44,6 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.servlet.Filter;
import org.apache.commons.io.file.PathUtils;
import org.apache.lucene.util.Constants;
import org.apache.solr.client.solrj.SolrClient;
@@ -64,7 +64,7 @@ import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SolrNamedThreadFactory;
import org.apache.solr.embedded.JettyConfig;
import org.apache.solr.embedded.JettySolrRunner;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Rule;
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java b/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
index 52cba9be94d..b1bcc99482f 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
@@ -27,7 +27,7 @@ import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.embedded.JettyConfig;
import org.apache.solr.embedded.JettySolrRunner;
import org.apache.solr.util.SolrJettyTestRule;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
import org.junit.ClassRule;
@Deprecated // just use SolrJettyTestRule
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
index 8049fc59d70..c7d8af3053f 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
@@ -19,6 +19,8 @@ package org.apache.solr.cloud;
import static org.apache.solr.core.ConfigSetProperties.DEFAULT_FILENAME;
import com.codahale.metrics.MetricRegistry;
+import io.dropwizard.metrics.jetty12.ee10.InstrumentedEE10Handler;
+import jakarta.servlet.Filter;
import java.io.IOException;
import java.io.PrintStream;
import java.lang.invoke.MethodHandles;
@@ -52,7 +54,6 @@ import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
-import javax.servlet.Filter;
import org.apache.lucene.tests.util.LuceneTestCase;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.embedded.SSLConfig;
@@ -83,8 +84,8 @@ import org.apache.solr.util.TimeOut;
import org.apache.solr.util.tracing.SimplePropagator;
import org.apache.solr.util.tracing.TraceUtils;
import org.apache.zookeeper.KeeperException;
-import org.eclipse.jetty.server.handler.HandlerWrapper;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
+import org.eclipse.jetty.server.Handler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -992,10 +993,9 @@ public class MiniSolrCloudCluster {
private volatile MetricRegistry metricRegistry;
@Override
- protected HandlerWrapper injectJettyHandlers(HandlerWrapper chain) {
+ protected Handler.Wrapper injectJettyHandlers(Handler.Wrapper chain) {
metricRegistry = new MetricRegistry();
- io.dropwizard.metrics.jetty10.InstrumentedHandler metrics =
- new io.dropwizard.metrics.jetty10.InstrumentedHandler(metricRegistry);
+ InstrumentedEE10Handler metrics = new InstrumentedEE10Handler(metricRegistry);
metrics.setHandler(chain);
return metrics;
}
diff --git a/solr/test-framework/src/java/org/apache/solr/embedded/JettyConfig.java b/solr/test-framework/src/java/org/apache/solr/embedded/JettyConfig.java
index 190a0d38d83..6ec7e5d1ca7 100644
--- a/solr/test-framework/src/java/org/apache/solr/embedded/JettyConfig.java
+++ b/solr/test-framework/src/java/org/apache/solr/embedded/JettyConfig.java
@@ -16,13 +16,13 @@
*/
package org.apache.solr.embedded;
+import jakarta.servlet.Filter;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.TreeMap;
-import javax.servlet.Filter;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.embedded.SSLConfig;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
public class JettyConfig {
diff --git a/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java b/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java
index 93bf50e7471..91b0e98c769 100644
--- a/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java
+++ b/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java
@@ -19,6 +19,18 @@ package org.apache.solr.embedded;
import com.codahale.metrics.ConsoleReporter;
import com.codahale.metrics.MetricFilter;
import com.codahale.metrics.MetricRegistry;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.UnavailableException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintStream;
@@ -42,18 +54,6 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
-import javax.servlet.DispatcherType;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.UnavailableException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.lucene.util.Constants;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrServerException;
@@ -70,26 +70,27 @@ import org.apache.solr.servlet.SolrDispatchFilter;
import org.apache.solr.util.TimeOut;
import org.apache.solr.util.configuration.SSLConfigurationsFactory;
import org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory;
+import org.eclipse.jetty.ee10.servlet.FilterHolder;
+import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
+import org.eclipse.jetty.ee10.servlet.Source;
import org.eclipse.jetty.http2.HTTP2Cipher;
import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory;
import org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory;
import org.eclipse.jetty.rewrite.handler.RewriteHandler;
import org.eclipse.jetty.rewrite.handler.RewritePatternRule;
import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.SecureRequestCustomizer;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.SslConnectionFactory;
-import org.eclipse.jetty.server.handler.HandlerWrapper;
-import org.eclipse.jetty.server.handler.StatisticsHandler;
+import org.eclipse.jetty.server.handler.GracefulHandler;
import org.eclipse.jetty.server.handler.gzip.GzipHandler;
-import org.eclipse.jetty.server.session.DefaultSessionIdManager;
-import org.eclipse.jetty.servlet.FilterHolder;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.eclipse.jetty.servlet.Source;
+import org.eclipse.jetty.session.DefaultSessionIdManager;
+import org.eclipse.jetty.util.resource.ResourceFactory;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.util.thread.ReservedThreadExecutor;
@@ -346,7 +347,7 @@ public class JettySolrRunner {
connector.setIdleTimeout(THREAD_POOL_MAX_IDLE_TIME_MS);
server.setConnectors(new Connector[] {connector});
- server.setSessionIdManager(new DefaultSessionIdManager(server, new Random()));
+ server.addBean(new DefaultSessionIdManager(server, new Random()), true);
} else {
HttpConfiguration configuration = new HttpConfiguration();
ServerConnector connector =
@@ -361,13 +362,13 @@ public class JettySolrRunner {
server.setConnectors(new Connector[] {connector});
}
- HandlerWrapper chain;
+ Handler.Wrapper chain;
{
// Initialize the servlets
final ServletContextHandler root =
- new ServletContextHandler(server, "/solr", ServletContextHandler.SESSIONS);
- root.setResourceBase(".");
-
+ new ServletContextHandler("/solr", ServletContextHandler.SESSIONS);
+ root.setServer(server);
+ root.setBaseResource(ResourceFactory.of(server).newResource("."));
root.addEventListener(
// Install CCP first. Subclass CCP to do some pre-initialization
new CoreContainerProvider() {
@@ -418,8 +419,6 @@ public class JettySolrRunner {
if (config.enableV2) {
RewriteHandler rwh = new RewriteHandler();
rwh.setHandler(chain);
- rwh.setRewriteRequestURI(true);
- rwh.setRewritePathInfo(false);
rwh.setOriginalPathAttribute("requestedPath");
rwh.addRule(new RewritePatternRule("/api/*", "/solr/____v2"));
chain = rwh;
@@ -434,8 +433,7 @@ public class JettySolrRunner {
server.setHandler(gzipHandler);
// Mimic "graceful.mod"
- final StatisticsHandler graceful = new StatisticsHandler();
- graceful.setGracefulShutdownWaitsForRequests(true);
+ GracefulHandler graceful = new GracefulHandler();
server.insertHandler(graceful);
server.setStopTimeout(15 * 1000);
}
@@ -444,7 +442,7 @@ public class JettySolrRunner {
* descendants may inject own handler chaining it to the given root and then returning that own
* one
*/
- protected HandlerWrapper injectJettyHandlers(HandlerWrapper chain) {
+ protected Handler.Wrapper injectJettyHandlers(Handler.Wrapper chain) {
return chain;
}
diff --git a/solr/test-framework/src/java/org/apache/solr/util/RestTestBase.java b/solr/test-framework/src/java/org/apache/solr/util/RestTestBase.java
index d65086e5a72..8856625d331 100644
--- a/solr/test-framework/src/java/org/apache/solr/util/RestTestBase.java
+++ b/solr/test-framework/src/java/org/apache/solr/util/RestTestBase.java
@@ -27,7 +27,7 @@ import org.apache.solr.SolrJettyTestBase;
import org.apache.solr.common.params.MultiMapSolrParams;
import org.apache.solr.common.util.StrUtils;
import org.apache.solr.servlet.SolrRequestParsers;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
import org.junit.AfterClass;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java b/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java
index 5a830e35aa8..ce3cf4c0315 100644
--- a/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java
+++ b/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java
@@ -40,6 +40,7 @@ import org.apache.solr.client.solrj.embedded.SSLConfig;
import org.apache.solr.client.solrj.impl.HttpClientUtil;
import org.apache.solr.client.solrj.impl.HttpClientUtil.SocketFactoryRegistryProvider;
import org.eclipse.jetty.util.resource.Resource;
+import org.eclipse.jetty.util.resource.ResourceFactory;
import org.eclipse.jetty.util.security.CertificateUtils;
import org.eclipse.jetty.util.ssl.SslContextFactory;
@@ -100,6 +101,7 @@ public class SSLTestConfig {
* Certificate (and which testing Cert should be used)
* @see HttpClientUtil#SYS_PROP_CHECK_PEER_NAME
*/
+ @SuppressWarnings("removal")
public SSLTestConfig(boolean useSsl, boolean clientAuth, boolean checkPeerName) {
this.useSsl = useSsl;
this.clientAuth = clientAuth;
@@ -107,7 +109,7 @@ public class SSLTestConfig {
final String resourceName =
checkPeerName ? TEST_KEYSTORE_LOCALHOST_RESOURCE : TEST_KEYSTORE_BOGUSHOST_RESOURCE;
- trustStore = keyStore = Resource.newClassPathResource(resourceName);
+ trustStore = keyStore = ResourceFactory.root().newClassLoaderResource(resourceName, true);
if (null == keyStore || !keyStore.exists()) {
throw new IllegalStateException(
"Unable to locate keystore resource file in classpath: " + resourceName);
diff --git a/solr/webapp/gradle.lockfile b/solr/webapp/gradle.lockfile
index c06ef7b3cda..5caff1c65d9 100644
--- a/solr/webapp/gradle.lockfile
+++ b/solr/webapp/gradle.lockfile
@@ -36,7 +36,8 @@ commons-io:commons-io:2.15.1=permitUnusedDeclared,solrCore
io.dropwizard.metrics:metrics-annotation:4.2.26=serverLib
io.dropwizard.metrics:metrics-core:4.2.26=permitUnusedDeclared,serverLib,solrCore
io.dropwizard.metrics:metrics-graphite:4.2.26=permitUnusedDeclared,serverLib,solrCore
-io.dropwizard.metrics:metrics-jetty10:4.2.26=serverLib
+io.dropwizard.metrics:metrics-jetty12-ee10:4.2.26=serverLib
+io.dropwizard.metrics:metrics-jetty12:4.2.26=serverLib
io.dropwizard.metrics:metrics-jmx:4.2.26=permitUnusedDeclared,serverLib,solrCore
io.dropwizard.metrics:metrics-jvm:4.2.26=permitUnusedDeclared,serverLib,solrCore
io.github.eisop:dataflow-errorprone:3.41.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -60,6 +61,7 @@ io.sgr:s2-geometry-library-java:1.0.0=permitUnusedDeclared,solrCore
io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=permitUnusedDeclared,solrCore
jakarta.annotation:jakarta.annotation-api:2.1.1=permitUnusedDeclared,solrCore
jakarta.inject:jakarta.inject-api:2.0.1=permitUnusedDeclared,solrCore
+jakarta.servlet:jakarta.servlet-api:6.0.0=serverLib
jakarta.validation:jakarta.validation-api:3.0.2=permitUnusedDeclared,solrCore
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=permitUnusedDeclared,solrCore
javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor
@@ -103,29 +105,31 @@ org.apache.zookeeper:zookeeper-jute:3.9.2=permitUnusedDeclared,solrCore
org.apache.zookeeper:zookeeper:3.9.2=permitUnusedDeclared,solrCore
org.checkerframework:checker-qual:3.44.0=annotationProcessor,errorprone,permitUnusedDeclared,solrCore,testAnnotationProcessor
org.codehaus.woodstox:stax2-api:4.2.2=permitUnusedDeclared,solrCore
-org.eclipse.jetty.http2:http2-client:10.0.22=permitUnusedDeclared,solrCore
-org.eclipse.jetty.http2:http2-common:10.0.22=permitUnusedDeclared,serverLib,solrCore
-org.eclipse.jetty.http2:http2-hpack:10.0.22=permitUnusedDeclared,serverLib,solrCore
-org.eclipse.jetty.http2:http2-http-client-transport:10.0.22=permitUnusedDeclared,solrCore
-org.eclipse.jetty.http2:http2-server:10.0.22=serverLib
-org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=permitUnusedDeclared,serverLib,solrCore
-org.eclipse.jetty:jetty-alpn-client:10.0.22=permitUnusedDeclared,solrCore
-org.eclipse.jetty:jetty-alpn-java-client:10.0.22=permitUnusedDeclared,solrCore
-org.eclipse.jetty:jetty-alpn-java-server:10.0.22=serverLib
-org.eclipse.jetty:jetty-alpn-server:10.0.22=serverLib
-org.eclipse.jetty:jetty-client:10.0.22=permitUnusedDeclared,solrCore
-org.eclipse.jetty:jetty-deploy:10.0.22=serverLib
-org.eclipse.jetty:jetty-http:10.0.22=permitUnusedDeclared,serverLib,solrCore
-org.eclipse.jetty:jetty-io:10.0.22=permitUnusedDeclared,serverLib,solrCore
-org.eclipse.jetty:jetty-jmx:10.0.22=serverLib
-org.eclipse.jetty:jetty-rewrite:10.0.22=serverLib
-org.eclipse.jetty:jetty-security:10.0.22=serverLib
-org.eclipse.jetty:jetty-server:10.0.22=permitUnusedDeclared,serverLib,solrCore
-org.eclipse.jetty:jetty-servlet:10.0.22=serverLib
-org.eclipse.jetty:jetty-servlets:10.0.22=serverLib
-org.eclipse.jetty:jetty-util:10.0.22=permitUnusedDeclared,serverLib,solrCore
-org.eclipse.jetty:jetty-webapp:10.0.22=serverLib
-org.eclipse.jetty:jetty-xml:10.0.22=serverLib
+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.19=serverLib
+org.eclipse.jetty.ee10:jetty-ee10-servlets:12.0.19=serverLib
+org.eclipse.jetty.ee10:jetty-ee10-webapp:12.0.19=serverLib
+org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.19=permitUnusedDeclared,solrCore
+org.eclipse.jetty.http2:jetty-http2-client:12.0.19=permitUnusedDeclared,solrCore
+org.eclipse.jetty.http2:jetty-http2-common:12.0.19=permitUnusedDeclared,serverLib,solrCore
+org.eclipse.jetty.http2:jetty-http2-hpack:12.0.19=permitUnusedDeclared,serverLib,solrCore
+org.eclipse.jetty.http2:jetty-http2-server:12.0.19=serverLib
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=permitUnusedDeclared,serverLib,solrCore
+org.eclipse.jetty:jetty-alpn-client:12.0.19=permitUnusedDeclared,solrCore
+org.eclipse.jetty:jetty-alpn-java-client:12.0.19=permitUnusedDeclared,solrCore
+org.eclipse.jetty:jetty-alpn-java-server:12.0.19=serverLib
+org.eclipse.jetty:jetty-alpn-server:12.0.19=serverLib
+org.eclipse.jetty:jetty-client:12.0.19=permitUnusedDeclared,solrCore
+org.eclipse.jetty:jetty-deploy:12.0.19=serverLib
+org.eclipse.jetty:jetty-ee:12.0.19=serverLib
+org.eclipse.jetty:jetty-http:12.0.19=permitUnusedDeclared,serverLib,solrCore
+org.eclipse.jetty:jetty-io:12.0.19=permitUnusedDeclared,serverLib,solrCore
+org.eclipse.jetty:jetty-jmx:12.0.19=serverLib
+org.eclipse.jetty:jetty-rewrite:12.0.19=serverLib
+org.eclipse.jetty:jetty-security:12.0.19=serverLib
+org.eclipse.jetty:jetty-server:12.0.19=permitUnusedDeclared,serverLib,solrCore
+org.eclipse.jetty:jetty-session:12.0.19=serverLib
+org.eclipse.jetty:jetty-util:12.0.19=permitUnusedDeclared,serverLib,solrCore
+org.eclipse.jetty:jetty-xml:12.0.19=serverLib
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=permitUnusedDeclared,solrCore
org.glassfish.hk2:hk2-api:3.1.1=permitUnusedDeclared,solrCore
org.glassfish.hk2:hk2-locator:3.1.1=permitUnusedDeclared,solrCore