Apache Solr open-source search software
SOLR-18297 Upgrade Jetty to 12.1.10 (#4574)
Jan Høydahlbb8c68b67a81
diff --git a/changelog/unreleased/SOLR-18297-update-jetty-12.1.10.yml b/changelog/unreleased/SOLR-18297-update-jetty-12.1.10.ymlnew file mode 100644index 00000000000..4d9a1222176--- /dev/null+++ b/changelog/unreleased/SOLR-18297-update-jetty-12.1.10.yml@@ -0,0 +1,7 @@+title: Upgrade Eclipse Jetty to 12.1.10+type: dependency_update+authors:+ - name: Jan Høydahl+links:+ - name: SOLR-18297+ url: https://issues.apache.org/jira/browse/SOLR-18297diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex e076c950d13..8ee8994a3f6 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -85,7 +85,7 @@ diffplug-spotless = "8.3.0"dockerfile-baseimage-java = "25"dropwizard-metrics = "4.2.39"eclipse-ecj = "3.39.0"-eclipse-jetty = "12.0.34"+eclipse-jetty = "12.1.10"# @keep jgit version used by git-status.gradleeclipse-jgit = "7.7.0.202606012155-r"essenty = "2.5.0"diff --git a/solr/api/gradle.lockfile b/solr/api/gradle.lockfileindex 4ceba558b0a..3fa7237d1be 100644--- a/solr/api/gradle.lockfile+++ b/solr/api/gradle.lockfile@@ -122,24 +122,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.5=jarValidation,testCompileClasspath,tesorg.apache.zookeeper:zookeeper:3.9.5=jarValidation,testCompileClasspath,testRuntimeClasspathorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.0=jarValidation,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.1=jarValidation,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.1=jarValidation,testRuntimeClasspathdiff --git a/solr/benchmark/gradle.lockfile b/solr/benchmark/gradle.lockfileindex cf144c179e0..3764472fe59 100644--- a/solr/benchmark/gradle.lockfile+++ b/solr/benchmark/gradle.lockfile@@ -112,24 +112,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.5=compileClasspath,jarValidation,runtimeorg.apache.zookeeper:zookeeper:3.9.5=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspathorg.apiguardian:apiguardian-api:1.1.2=jarValidation,runtimeClasspath,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.0=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.10=jarValidation,runtimeClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,testRuntimeClasspathdiff --git a/solr/core/gradle.lockfile b/solr/core/gradle.lockfileindex 999d65c40a2..8cb01d0d1b6 100644--- a/solr/core/gradle.lockfile+++ b/solr/core/gradle.lockfile@@ -128,24 +128,26 @@ org.carrot2:morfologik-fsa:2.1.9=jarValidation,testRuntimeClasspath,testRuntimeCorg.carrot2:morfologik-polish:2.1.9=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopyorg.carrot2:morfologik-stemming:2.1.9=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopyorg.codehaus.woodstox:stax2-api:4.3.0=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty.http2:jetty-http2-client:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty.http2:jetty-http2-common:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-alpn-client:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-client:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-http:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-io:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-util:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty.compression:jetty-compression-common:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty.http2:jetty-http2-client:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty.http2:jetty-http2-common:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-alpn-client:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-client:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-http:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-io:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-util:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopyorg.glassfish.hk2.external:aopalliance-repackaged:4.0.1=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopyorg.glassfish.hk2:hk2-api:4.0.1=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopyorg.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeClasspathCopy,runtimeLibs,testRuntimeClasspath,testRuntimeClasspathCopydiff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.javaindex 7e9eaeb01b2..5f7e1f268dc 100644--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java@@ -32,6 +32,7 @@ import java.io.InputStream;import java.io.InputStreamReader;import java.io.OutputStream;import java.io.OutputStreamWriter;+import java.io.UncheckedIOException;import java.io.Writer;import java.lang.invoke.MethodHandles;import java.lang.reflect.Constructor;@@ -170,7 +171,6 @@ import org.apache.solr.util.plugin.SolrCoreAware;import org.apache.solr.util.stats.MetricUtils;import org.apache.zookeeper.KeeperException;import org.apache.zookeeper.data.Stat;-import org.eclipse.jetty.io.RuntimeIOException;import org.glassfish.jersey.server.ApplicationHandler;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -523,7 +523,7 @@ public class SolrCore implements SolrInfoBean, Closeable {return withSearcher(solrIndexSearcher -> solrIndexSearcher.getRawReader().getIndexCommit().getSegmentCount());} catch (IOException e) {- throw new RuntimeIOException(e);+ throw new UncheckedIOException(e);}}diff --git a/solr/core/src/java/org/apache/solr/handler/CatStream.java b/solr/core/src/java/org/apache/solr/handler/CatStream.javaindex fdffe29e6c0..ae72ad32abf 100644--- a/solr/core/src/java/org/apache/solr/handler/CatStream.java+++ b/solr/core/src/java/org/apache/solr/handler/CatStream.java@@ -19,6 +19,7 @@ package org.apache.solr.handler;import java.io.IOException;import java.io.InputStreamReader;+import java.io.UncheckedIOException;import java.lang.invoke.MethodHandles;import java.nio.charset.StandardCharsets;import java.nio.file.Files;@@ -42,7 +43,6 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;import org.apache.solr.common.SolrException;import org.apache.solr.common.util.StrUtils;import org.apache.solr.core.SolrCore;-import org.eclipse.jetty.io.RuntimeIOException;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -249,7 +249,7 @@ public class CatStream extends TupleStream implements Expressible {findReadableFiles(new CrawlFile(itemDisplayPath, iPath), foundFiles);});} catch (IOException e) {- throw new RuntimeIOException(e);+ throw new UncheckedIOException(e);}}}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.javaindex ce9de4560c0..22dcc2f1f1f 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@@ -58,8 +58,9 @@ public class JettyBridgeResponseWriter implements ContainerResponseWriter {final StatusType statusInfo = context.getStatusInfo();httpServletResponse.setStatus(statusInfo.getStatusCode());- if (contentLength != -1 && contentLength < Integer.MAX_VALUE) {- httpServletResponse.setContentLength((int) contentLength);+ // Note: don't propagate if 0 length: V2HttpCall does an empty first pass+ if (contentLength > 0) {+ httpServletResponse.setContentLengthLong(contentLength);}for (final Map.Entry<String, List<String>> e : context.getStringHeaders().entrySet()) {for (final String value : e.getValue()) {diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrProxy.java b/solr/core/src/java/org/apache/solr/servlet/HttpSolrProxy.javaindex 153a97d36ed..3c57062906f 100644--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrProxy.java+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrProxy.java@@ -41,6 +41,10 @@ import org.eclipse.jetty.http.HttpHeader;class HttpSolrProxy {// TODO add X-Forwarded-For and with comma delimited+ // Headers stripped when copying in either direction. Hop-by-hop headers, plus Host (not+ // hop-by-hop, but the client must re-derive it for the upstream, else Jetty 12.1 rejects a+ // mismatched Host with a 400). See Jetty's reference proxy for comparison:+ // https://github.com/jetty/jetty.project/blob/jetty-12.1.x/jetty-ee11/jetty-ee11-proxy/src/main/java/org/eclipse/jetty/ee11/proxy/AbstractProxyServlet.javaprivate static final Set<HttpHeader> HOP_BY_HOP_HEADERS =EnumSet.of(HttpHeader.CONNECTION,@@ -49,7 +53,8 @@ class HttpSolrProxy {HttpHeader.PROXY_AUTHORIZATION,HttpHeader.TE,HttpHeader.TRANSFER_ENCODING,- HttpHeader.UPGRADE);+ HttpHeader.UPGRADE,+ HttpHeader.HOST);// Methods that shouldn't have a body according to HTTP specprivate static final Set<String> NO_BODY_METHODS = Set.of("GET", "HEAD", "DELETE");@@ -71,8 +76,15 @@ class HttpSolrProxy {// https://github.com/open-telemetry/opentelemetry-java-instrumentation/tree/main/instrumentation/jetty-httpclient/jetty-httpclient-12.0if (!NO_BODY_METHODS.contains(servletReq.getMethod())) {+ // Report the known body length so the client sets Content-Length upstream (mirrors Jetty's+ // ProxyInputStreamRequestContent); -1 (chunked request in) stays chunked.proxyReq.body(- new InputStreamRequestContent(servletReq.getContentType(), servletReq.getInputStream()));+ new InputStreamRequestContent(servletReq.getContentType(), servletReq.getInputStream()) {+ @Override+ public long getLength() {+ return servletReq.getContentLengthLong();+ }+ });}CompletableFuture<Result> resultFuture = new CompletableFuture<>();@@ -131,7 +143,9 @@ class HttpSolrProxy {.forEachRemaining(headerName -> {HttpHeader knownHeader = HttpHeader.CACHE.get(headerName); // maybe null- if (!HOP_BY_HOP_HEADERS.contains(knownHeader)) {+ // Strip Content-Length too; it's supplied by the request body's getLength() above.+ if (!HOP_BY_HOP_HEADERS.contains(knownHeader)+ && knownHeader != HttpHeader.CONTENT_LENGTH) {servletReq.getHeaders(headerName).asIterator()diff --git a/solr/core/src/test/org/apache/solr/servlet/HttpSolrProxyTest.java b/solr/core/src/test/org/apache/solr/servlet/HttpSolrProxyTest.javanew file mode 100644index 00000000000..a44bb5f0f31--- /dev/null+++ b/solr/core/src/test/org/apache/solr/servlet/HttpSolrProxyTest.java@@ -0,0 +1,122 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You 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.+ */++package org.apache.solr.servlet;++import static java.nio.charset.StandardCharsets.UTF_8;++import java.net.HttpURLConnection;+import java.net.URI;+import org.apache.solr.SolrTestCaseJ4;+import org.apache.solr.client.solrj.request.CollectionAdminRequest;+import org.apache.solr.cloud.SolrCloudTestCase;+import org.apache.solr.common.cloud.Replica;+import org.apache.solr.embedded.JettySolrRunner;+import org.junit.BeforeClass;+import org.junit.Test;++/**+ * Tests {@link HttpSolrProxy}, the internode proxy used when a request lands on a node that does+ * not host a replica of the target collection. Verifies that a request body with a known length is+ * forwarded successfully and that the origin's {@code Content-Length} is preserved on the response.+ */+public class HttpSolrProxyTest extends SolrCloudTestCase {+ private static final String COLLECTION = "proxycoll";++ private static JettySolrRunner owningNode;+ private static JettySolrRunner proxyingNode;++ @BeforeClass+ public static void setupCluster() throws Exception {+ configureCluster(2).addConfig("conf", configset("cloud-minimal")).configure();++ // Single shard + replica, so exactly one node hosts it; the other must proxy.+ CollectionAdminRequest.createCollection(COLLECTION, "conf", 1, 1)+ .process(cluster.getSolrClient());+ cluster.waitForActiveCollection(COLLECTION, 1, 1);++ Replica replica =+ cluster.getSolrClient().getClusterState().getCollection(COLLECTION).getReplicas().get(0);+ for (JettySolrRunner runner : cluster.getJettySolrRunners()) {+ if (runner.getNodeName().equals(replica.getNodeName())) {+ owningNode = runner;+ } else {+ proxyingNode = runner;+ }+ }+ assertNotNull(owningNode);+ assertNotNull(proxyingNode);+ }++ /**+ * A POST with a body proxied to a node that doesn't host the replica must succeed. Jetty 12.1+ * rejects (400) a forwarded Content-Length that contradicts the client's own framing, so the+ * proxy must convey the known length via the request body content provider instead.+ */+ @Test+ public void testProxiedPostWithBodySucceeds() throws Exception {+ byte[] body = "[{\"id\":\"1\"}]".getBytes(UTF_8);+ HttpURLConnection conn = open(proxyingNode, "/" + COLLECTION + "/update/json?commit=true");+ conn.setRequestMethod("POST");+ conn.setDoOutput(true);+ conn.setFixedLengthStreamingMode(body.length); // send a deterministic Content-Length+ conn.setRequestProperty("Content-Type", "application/json");+ try (var out = conn.getOutputStream()) {+ out.write(body);+ }+ assertEquals(200, conn.getResponseCode());+ conn.getInputStream().readAllBytes();+ conn.disconnect();+ }++ /**+ * The proxied response must preserve the origin's Content-Length (rather than being forced to+ * chunked) and it must exactly match the bytes delivered — otherwise Jetty 12.1 would abort the+ * re-streamed response with "too much content written".+ */+ @Test+ public void testProxiedResponsePreservesContentLength() throws Exception {+ String path = "/" + COLLECTION + "/select?q=*:*&rows=0";++ HttpURLConnection direct = open(owningNode, path);+ assertEquals(200, direct.getResponseCode());+ String originLen = direct.getHeaderField("Content-Length");+ direct.getInputStream().readAllBytes();+ direct.disconnect();+ assertNotNull(+ "Precondition: origin should frame this small response with a Content-Length", originLen);++ HttpURLConnection proxied = open(proxyingNode, path);+ assertEquals(200, proxied.getResponseCode());+ String proxiedLen = proxied.getHeaderField("Content-Length");+ int proxiedBodyLen = proxied.getInputStream().readAllBytes().length;+ proxied.disconnect();++ assertNotNull("Proxy dropped the origin's Content-Length (forced chunked)", proxiedLen);+ assertEquals(+ "Proxied Content-Length must match the bytes delivered",+ proxiedBodyLen,+ Integer.parseInt(proxiedLen));+ }++ private static HttpURLConnection open(JettySolrRunner node, String pathAndQuery)+ throws Exception {+ URI uri = URI.create(node.getBaseUrl().toString() + pathAndQuery);+ return (HttpURLConnection) uri.toURL().openConnection();+ }+}diff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfileindex 332646c7714..18967da6c5e 100644--- a/solr/cross-dc-manager/gradle.lockfile+++ b/solr/cross-dc-manager/gradle.lockfile@@ -175,30 +175,32 @@ org.apache.zookeeper:zookeeper:3.9.5=compileClasspath,jarValidation,runtimeClassorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.bitbucket.b_c:jose4j:0.9.6=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlets:12.0.34=solrPlatformLibs-org.eclipse.jetty.ee10:jetty-ee10-webapp:12.0.34=solrPlatformLibs-org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-deploy:12.0.34=solrPlatformLibs-org.eclipse.jetty:jetty-ee:12.0.34=solrPlatformLibs-org.eclipse.jetty:jetty-http:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-jmx:12.0.34=solrPlatformLibs-org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-xml:12.0.34=solrPlatformLibs+org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlets:12.1.10=solrPlatformLibs+org.eclipse.jetty.ee10:jetty-ee10-webapp:12.1.10=solrPlatformLibs+org.eclipse.jetty.ee:jetty-ee-webapp:12.1.10=solrPlatformLibs+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-deploy:12.1.10=solrPlatformLibs+org.eclipse.jetty:jetty-http:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-jmx:12.1.10=solrPlatformLibs+org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-xml:12.1.10=solrPlatformLibsorg.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/licenses/jetty-alpn-client-12.0.34.jar.sha1 b/solr/licenses/jetty-alpn-client-12.0.34.jar.sha1deleted file mode 100644index 661b0bb61be..00000000000--- a/solr/licenses/jetty-alpn-client-12.0.34.jar.sha1+++ /dev/null@@ -1 +0,0 @@-2a9136aee49af9372006943409410adaa5ec09e5diff --git a/solr/licenses/jetty-alpn-client-12.1.10.jar.sha1 b/solr/licenses/jetty-alpn-client-12.1.10.jar.sha1new file mode 100644index 00000000000..f8082f4312f--- /dev/null+++ b/solr/licenses/jetty-alpn-client-12.1.10.jar.sha1@@ -0,0 +1 @@+94ab4407094de3ce38133d13ab59780498d3c90cdiff --git a/solr/licenses/jetty-alpn-java-client-12.0.34.jar.sha1 b/solr/licenses/jetty-alpn-java-client-12.0.34.jar.sha1deleted file mode 100644index 9405168643d..00000000000--- a/solr/licenses/jetty-alpn-java-client-12.0.34.jar.sha1+++ /dev/null@@ -1 +0,0 @@-d30aa169971cbe2b653ae7dd807020064a364d16diff --git a/solr/licenses/jetty-alpn-java-client-12.1.10.jar.sha1 b/solr/licenses/jetty-alpn-java-client-12.1.10.jar.sha1new file mode 100644index 00000000000..3149bd04958--- /dev/null+++ b/solr/licenses/jetty-alpn-java-client-12.1.10.jar.sha1@@ -0,0 +1 @@+2af3d913959286bfb414162fe7aa0ef0faa72d38diff --git a/solr/licenses/jetty-alpn-java-server-12.0.34.jar.sha1 b/solr/licenses/jetty-alpn-java-server-12.0.34.jar.sha1deleted file mode 100644index 56964c5122e..00000000000--- a/solr/licenses/jetty-alpn-java-server-12.0.34.jar.sha1+++ /dev/null@@ -1 +0,0 @@-5b80c9defcfe4288cffeb38eaff4f23d97dfcd2bdiff --git a/solr/licenses/jetty-alpn-java-server-12.1.10.jar.sha1 b/solr/licenses/jetty-alpn-java-server-12.1.10.jar.sha1new file mode 100644index 00000000000..54f26378b8d--- /dev/null+++ b/solr/licenses/jetty-alpn-java-server-12.1.10.jar.sha1@@ -0,0 +1 @@+4724aedc068a3ac0f465d343d5afea10455a70b1diff --git a/solr/licenses/jetty-alpn-server-12.0.34.jar.sha1 b/solr/licenses/jetty-alpn-server-12.0.34.jar.sha1deleted file mode 100644index 301c68ee95b..00000000000--- a/solr/licenses/jetty-alpn-server-12.0.34.jar.sha1+++ /dev/null@@ -1 +0,0 @@-3e23515e6a82c84551711ca97c70f86dc2ae55fadiff --git a/solr/licenses/jetty-alpn-server-12.1.10.jar.sha1 b/solr/licenses/jetty-alpn-server-12.1.10.jar.sha1new file mode 100644index 00000000000..f8ec9e359d6--- /dev/null+++ b/solr/licenses/jetty-alpn-server-12.1.10.jar.sha1@@ -0,0 +1 @@+69e9e69f93b1807ed6a7e06b500d0ba1fa998124diff --git a/solr/licenses/jetty-client-12.0.34.jar.sha1 b/solr/licenses/jetty-client-12.0.34.jar.sha1deleted file mode 100644index b22a4094660..00000000000--- a/solr/licenses/jetty-client-12.0.34.jar.sha1+++ /dev/null@@ -1 +0,0 @@-ace959f7461ebcff48e72fd86056c587b9bfbb3adiff --git a/solr/licenses/jetty-client-12.1.10.jar.sha1 b/solr/licenses/jetty-client-12.1.10.jar.sha1new file mode 100644index 00000000000..ddfc6823e9d--- /dev/null+++ b/solr/licenses/jetty-client-12.1.10.jar.sha1@@ -0,0 +1 @@+5388ae528eff142598937b3ec2df40942955e8f3diff --git a/solr/licenses/jetty-compression-common-12.1.10.jar.sha1 b/solr/licenses/jetty-compression-common-12.1.10.jar.sha1new file mode 100644index 00000000000..d1cb1a5d311--- /dev/null+++ b/solr/licenses/jetty-compression-common-12.1.10.jar.sha1@@ -0,0 +1 @@+56edb0cb640205312c9939cd485045a09c29ac9fdiff --git a/solr/licenses/jetty-compression-gzip-12.1.10.jar.sha1 b/solr/licenses/jetty-compression-gzip-12.1.10.jar.sha1new file mode 100644index 00000000000..81012b8a9fe--- /dev/null+++ b/solr/licenses/jetty-compression-gzip-12.1.10.jar.sha1@@ -0,0 +1 @@+562e02563cf59cae692ae02d3db93c81205d2030diff --git a/solr/licenses/jetty-deploy-12.0.34.jar.sha1 b/solr/licenses/jetty-deploy-12.0.34.jar.sha1deleted file mode 100644index cc3724737d7..00000000000--- a/solr/licenses/jetty-deploy-12.0.34.jar.sha1+++ /dev/null@@ -1 +0,0 @@-26165f854f34e463e6ea0aac0c8197ba12ffb512diff --git a/solr/licenses/jetty-deploy-12.1.10.jar.sha1 b/solr/licenses/jetty-deploy-12.1.10.jar.sha1new file mode 100644index 00000000000..d94d72d8446--- /dev/null+++ b/solr/licenses/jetty-deploy-12.1.10.jar.sha1@@ -0,0 +1 @@+8dd679513cb5de7285fb28430df2dba90d3f51d3diff --git a/solr/licenses/jetty-ee-12.0.34.jar.sha1 b/solr/licenses/jetty-ee-12.0.34.jar.sha1deleted file mode 100644index 9e6432269c8..00000000000--- a/solr/licenses/jetty-ee-12.0.34.jar.sha1+++ /dev/null@@ -1 +0,0 @@-93f882904e48c7e62a9be4a4ee1afa161fddaa49diff --git a/solr/licenses/jetty-ee-webapp-12.1.10.jar.sha1 b/solr/licenses/jetty-ee-webapp-12.1.10.jar.sha1new file mode 100644index 00000000000..fd678d9b354--- /dev/null+++ b/solr/licenses/jetty-ee-webapp-12.1.10.jar.sha1@@ -0,0 +1 @@+1bf98faf196ca0e81723f3a11668fef1b6f1b146diff --git a/solr/licenses/jetty-ee10-servlet-12.0.34.jar.sha1 b/solr/licenses/jetty-ee10-servlet-12.0.34.jar.sha1deleted file mode 100644index 84c9f192eb3..00000000000--- a/solr/licenses/jetty-ee10-servlet-12.0.34.jar.sha1+++ /dev/null@@ -1 +0,0 @@-84b4654fbf0515069cd045ec0063976c539387b0diff --git a/solr/licenses/jetty-ee10-servlet-12.1.10.jar.sha1 b/solr/licenses/jetty-ee10-servlet-12.1.10.jar.sha1new file mode 100644index 00000000000..4c1898f4907--- /dev/null+++ b/solr/licenses/jetty-ee10-servlet-12.1.10.jar.sha1@@ -0,0 +1 @@+b529bdd980d7aa018ddcaaa8d7d1d4bc96b05950diff --git a/solr/licenses/jetty-ee10-servlets-12.0.34.jar.sha1 b/solr/licenses/jetty-ee10-servlets-12.0.34.jar.sha1deleted file mode 100644index 5d98f4d44a7..00000000000--- a/solr/licenses/jetty-ee10-servlets-12.0.34.jar.sha1+++ /dev/null@@ -1 +0,0 @@-e444a39bfa053206649eae3126e6885616a226a8diff --git a/solr/licenses/jetty-ee10-servlets-12.1.10.jar.sha1 b/solr/licenses/jetty-ee10-servlets-12.1.10.jar.sha1new file mode 100644index 00000000000..11b21939890--- /dev/null+++ b/solr/licenses/jetty-ee10-servlets-12.1.10.jar.sha1@@ -0,0 +1 @@+6d8c356ef7f3ddb8d7dcf11349d83347e482bd1cdiff --git a/solr/licenses/jetty-ee10-webapp-12.0.34.jar.sha1 b/solr/licenses/jetty-ee10-webapp-12.0.34.jar.sha1deleted file mode 100644index e067d665e6e..00000000000--- a/solr/licenses/jetty-ee10-webapp-12.0.34.jar.sha1+++ /dev/null@@ -1 +0,0 @@-4c1c7431bf5907f95e90dee2afdb5a5a54b1787ddiff --git a/solr/licenses/jetty-ee10-webapp-12.1.10.jar.sha1 b/solr/licenses/jetty-ee10-webapp-12.1.10.jar.sha1new file mode 100644index 00000000000..12fff13994d--- /dev/null+++ b/solr/licenses/jetty-ee10-webapp-12.1.10.jar.sha1@@ -0,0 +1 @@+5184fc99a48871ff85b1bf570f22686cdbc5268fdiff --git a/solr/licenses/jetty-http-12.0.34.jar.sha1 b/solr/licenses/jetty-http-12.0.34.jar.sha1deleted file mode 100644index b46d7bf62d8..00000000000--- a/solr/licenses/jetty-http-12.0.34.jar.sha1+++ /dev/null@@ -1 +0,0 @@-5bbaa7aa5307c94b1502a5e379894a4b290a366cdiff --git a/solr/licenses/jetty-http-12.1.10.jar.sha1 b/solr/licenses/jetty-http-12.1.10.jar.sha1new file mode 100644index 00000000000..af2aa2e2a6b--- /dev/null+++ b/solr/licenses/jetty-http-12.1.10.jar.sha1@@ -0,0 +1 @@+3dc2e7c72c0140a9ccdc07b74a3faf47aac87fdfdiff --git a/solr/licenses/jetty-http2-client-12.0.34.jar.sha1 b/solr/licenses/jetty-http2-client-12.0.34.jar.sha1deleted file mode 100644index 40a8c545ca6..00000000000--- a/solr/licenses/jetty-http2-client-12.0.34.jar.sha1+++ /dev/null@@ -1 +0,0 @@-4842d2402fd2f146bbd0bb60fb8fc4f1927de590diff --git a/solr/licenses/jetty-http2-client-12.1.10.jar.sha1 b/solr/licenses/jetty-http2-client-12.1.10.jar.sha1new file mode 100644index 00000000000..a541f578aa7--- /dev/null+++ b/solr/licenses/jetty-http2-client-12.1.10.jar.sha1@@ -0,0 +1 @@+7e346e31c3dd0d71c26215b7c9b5b69b80e08d6adiff --git a/solr/licenses/jetty-http2-client-transport-12.0.34.jar.sha1 b/solr/licenses/jetty-http2-client-transport-12.0.34.jar.sha1deleted file mode 100644index 2f19bd1cc59..00000000000--- a/solr/licenses/jetty-http2-client-transport-12.0.34.jar.sha1+++ /dev/null@@ -1 +0,0 @@-073b31214bef7e7d3d3929c138efc5d89e396092diff --git a/solr/licenses/jetty-http2-client-transport-12.1.10.jar.sha1 b/solr/licenses/jetty-http2-client-transport-12.1.10.jar.sha1new file mode 100644index 00000000000..916317244de--- /dev/null+++ b/solr/licenses/jetty-http2-client-transport-12.1.10.jar.sha1@@ -0,0 +1 @@+ffa333d853c26cab16e61c6269d949e49e5c9d48diff --git a/solr/licenses/jetty-http2-common-12.0.34.jar.sha1 b/solr/licenses/jetty-http2-common-12.0.34.jar.sha1deleted file mode 100644index c5c7e869b70..00000000000--- a/solr/licenses/jetty-http2-common-12.0.34.jar.sha1+++ /dev/null@@ -1 +0,0 @@-3021867a0eba807c920b770542e34a34d8339297diff --git a/solr/licenses/jetty-http2-common-12.1.10.jar.sha1 b/solr/licenses/jetty-http2-common-12.1.10.jar.sha1new file mode 100644index 00000000000..88183d5cf2d--- /dev/null+++ b/solr/licenses/jetty-http2-common-12.1.10.jar.sha1@@ -0,0 +1 @@+7608c782bd3f54c4024c17b4bdf68873fc1bb700diff --git a/solr/licenses/jetty-http2-hpack-12.0.34.jar.sha1 b/solr/licenses/jetty-http2-hpack-12.0.34.jar.sha1deleted file mode 100644index 7db78ce1148..00000000000--- a/solr/licenses/jetty-http2-hpack-12.0.34.jar.sha1+++ /dev/null@@ -1 +0,0 @@-ff8f895c084a5c44ce6f34163043d97ffc7d2896diff --git a/solr/licenses/jetty-http2-hpack-12.1.10.jar.sha1 b/solr/licenses/jetty-http2-hpack-12.1.10.jar.sha1new file mode 100644index 00000000000..76d57ed708f--- /dev/null+++ b/solr/licenses/jetty-http2-hpack-12.1.10.jar.sha1@@ -0,0 +1 @@+cc7b1671436ddbe77264162cefb5ab9f51efc037diff --git a/solr/licenses/jetty-http2-server-12.0.34.jar.sha1 b/solr/licenses/jetty-http2-server-12.0.34.jar.sha1deleted file mode 100644index f1e2e2f3eec..00000000000--- a/solr/licenses/jetty-http2-server-12.0.34.jar.sha1+++ /dev/null@@ -1 +0,0 @@-433734fd8fa63b58ec4e46682e3cba65cf940ecddiff --git a/solr/licenses/jetty-http2-server-12.1.10.jar.sha1 b/solr/licenses/jetty-http2-server-12.1.10.jar.sha1new file mode 100644index 00000000000..09cba07c284--- /dev/null+++ b/solr/licenses/jetty-http2-server-12.1.10.jar.sha1@@ -0,0 +1 @@+04f638c70235a30b791212ad6d8e3ec0b2976938diff --git a/solr/licenses/jetty-io-12.0.34.jar.sha1 b/solr/licenses/jetty-io-12.0.34.jar.sha1deleted file mode 100644index 566d5f32e31..00000000000--- a/solr/licenses/jetty-io-12.0.34.jar.sha1+++ /dev/null@@ -1 +0,0 @@-8b5a9c8a0c7ecfee8006e96dc8c8a5d49532f35fdiff --git a/solr/licenses/jetty-io-12.1.10.jar.sha1 b/solr/licenses/jetty-io-12.1.10.jar.sha1new file mode 100644index 00000000000..38b6cc74d77--- /dev/null+++ b/solr/licenses/jetty-io-12.1.10.jar.sha1@@ -0,0 +1 @@+15d137860b0ff721a9fc31a27d4ae283a8acf96cdiff --git a/solr/licenses/jetty-jmx-12.0.34.jar.sha1 b/solr/licenses/jetty-jmx-12.0.34.jar.sha1deleted file mode 100644index 8acce8577c6..00000000000--- a/solr/licenses/jetty-jmx-12.0.34.jar.sha1+++ /dev/null@@ -1 +0,0 @@-883af008c04cadc199d82cc26cd671dbb0174765diff --git a/solr/licenses/jetty-jmx-12.1.10.jar.sha1 b/solr/licenses/jetty-jmx-12.1.10.jar.sha1new file mode 100644index 00000000000..3abd006c814--- /dev/null+++ b/solr/licenses/jetty-jmx-12.1.10.jar.sha1@@ -0,0 +1 @@+7a9d1b46f18c8864993dfc9c575b660f909e7ec0diff --git a/solr/licenses/jetty-rewrite-12.0.34.jar.sha1 b/solr/licenses/jetty-rewrite-12.0.34.jar.sha1deleted file mode 100644index c6ea629d63d..00000000000--- a/solr/licenses/jetty-rewrite-12.0.34.jar.sha1+++ /dev/null@@ -1 +0,0 @@-8259d9eef9814ded6570b61f3fbebed629a9c517diff --git a/solr/licenses/jetty-rewrite-12.1.10.jar.sha1 b/solr/licenses/jetty-rewrite-12.1.10.jar.sha1new file mode 100644index 00000000000..0c257f8329e--- /dev/null+++ b/solr/licenses/jetty-rewrite-12.1.10.jar.sha1@@ -0,0 +1 @@+a75b776fa76e810c04778b3fdfb6bba62dad46a1diff --git a/solr/licenses/jetty-security-12.0.34.jar.sha1 b/solr/licenses/jetty-security-12.0.34.jar.sha1deleted file mode 100644index 43ce936755f..00000000000--- a/solr/licenses/jetty-security-12.0.34.jar.sha1+++ /dev/null@@ -1 +0,0 @@-45d9e832527e91da7c3ce7c822858297b1cbaa9adiff --git a/solr/licenses/jetty-security-12.1.10.jar.sha1 b/solr/licenses/jetty-security-12.1.10.jar.sha1new file mode 100644index 00000000000..e0f2cea600f--- /dev/null+++ b/solr/licenses/jetty-security-12.1.10.jar.sha1@@ -0,0 +1 @@+5abccd4b0958c9a77c9f9eb5a0266f31f99bb34fdiff --git a/solr/licenses/jetty-server-12.0.34.jar.sha1 b/solr/licenses/jetty-server-12.0.34.jar.sha1deleted file mode 100644index 7ac78611303..00000000000--- a/solr/licenses/jetty-server-12.0.34.jar.sha1+++ /dev/null@@ -1 +0,0 @@-3d8629e472af7c6962d417231c41c291c2e0ed11diff --git a/solr/licenses/jetty-server-12.1.10.jar.sha1 b/solr/licenses/jetty-server-12.1.10.jar.sha1new file mode 100644index 00000000000..3a0ed537978--- /dev/null+++ b/solr/licenses/jetty-server-12.1.10.jar.sha1@@ -0,0 +1 @@+bbe5bc298a649d66cfe966525dce04af71f663ecdiff --git a/solr/licenses/jetty-session-12.0.34.jar.sha1 b/solr/licenses/jetty-session-12.0.34.jar.sha1deleted file mode 100644index f9006b33cc0..00000000000--- a/solr/licenses/jetty-session-12.0.34.jar.sha1+++ /dev/null@@ -1 +0,0 @@-2083b4e2c16f8a25239fea335b3cae7cd4f34800diff --git a/solr/licenses/jetty-session-12.1.10.jar.sha1 b/solr/licenses/jetty-session-12.1.10.jar.sha1new file mode 100644index 00000000000..a1bfe086758--- /dev/null+++ b/solr/licenses/jetty-session-12.1.10.jar.sha1@@ -0,0 +1 @@+2b4df453d0bdb44a2c629ef7e07763f054727944diff --git a/solr/licenses/jetty-start-12.0.34-shaded.jar.sha1 b/solr/licenses/jetty-start-12.0.34-shaded.jar.sha1deleted file mode 100644index 40846f65e35..00000000000--- a/solr/licenses/jetty-start-12.0.34-shaded.jar.sha1+++ /dev/null@@ -1 +0,0 @@-83a127017d50a6e93197a93da2e48761b89f690ddiff --git a/solr/licenses/jetty-start-12.1.10-shaded.jar.sha1 b/solr/licenses/jetty-start-12.1.10-shaded.jar.sha1new file mode 100644index 00000000000..52b8215cd53--- /dev/null+++ b/solr/licenses/jetty-start-12.1.10-shaded.jar.sha1@@ -0,0 +1 @@+d2d1aed98485163fbe79d5e497a5e54f6701fdf3diff --git a/solr/licenses/jetty-util-12.0.34.jar.sha1 b/solr/licenses/jetty-util-12.0.34.jar.sha1deleted file mode 100644index eee40ed7a7e..00000000000--- a/solr/licenses/jetty-util-12.0.34.jar.sha1+++ /dev/null@@ -1 +0,0 @@-b4db54e200023c7bc945150c00fd1ee7ddd82650diff --git a/solr/licenses/jetty-util-12.1.10.jar.sha1 b/solr/licenses/jetty-util-12.1.10.jar.sha1new file mode 100644index 00000000000..cb1ecaaf368--- /dev/null+++ b/solr/licenses/jetty-util-12.1.10.jar.sha1@@ -0,0 +1 @@+dea1bd8e110853f3a0a15e8a8096faa2cf61e278diff --git a/solr/licenses/jetty-xml-12.0.34.jar.sha1 b/solr/licenses/jetty-xml-12.0.34.jar.sha1deleted file mode 100644index 309f078511b..00000000000--- a/solr/licenses/jetty-xml-12.0.34.jar.sha1+++ /dev/null@@ -1 +0,0 @@-5311e749ddc1cd13c194fa1bf68d5b51b2d04ea2diff --git a/solr/licenses/jetty-xml-12.1.10.jar.sha1 b/solr/licenses/jetty-xml-12.1.10.jar.sha1new file mode 100644index 00000000000..06242e6a832--- /dev/null+++ b/solr/licenses/jetty-xml-12.1.10.jar.sha1@@ -0,0 +1 @@+e57126ad4023d4c86b24dffb0dacc9fce622828cdiff --git a/solr/modules/analysis-extras/gradle.lockfile b/solr/modules/analysis-extras/gradle.lockfileindex 37591ad9a80..08c160a276f 100644--- a/solr/modules/analysis-extras/gradle.lockfile+++ b/solr/modules/analysis-extras/gradle.lockfile@@ -127,24 +127,26 @@ org.carrot2:morfologik-fsa:2.1.9=jarValidation,runtimeClasspath,runtimeLibs,testorg.carrot2:morfologik-polish:2.1.9=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspathorg.carrot2:morfologik-stemming:2.1.9=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/clustering/gradle.lockfile b/solr/modules/clustering/gradle.lockfileindex 46d70e5e06b..e71d8590c6e 100644--- a/solr/modules/clustering/gradle.lockfile+++ b/solr/modules/clustering/gradle.lockfile@@ -115,24 +115,26 @@ org.apache.zookeeper:zookeeper:3.9.5=compileClasspath,jarValidation,runtimeClassorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.carrot2:carrot2-core:4.8.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/cross-dc/gradle.lockfile b/solr/modules/cross-dc/gradle.lockfileindex a061223677f..c1ed6d08adc 100644--- a/solr/modules/cross-dc/gradle.lockfile+++ b/solr/modules/cross-dc/gradle.lockfile@@ -119,24 +119,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.5=compileClasspath,jarValidation,runtimeorg.apache.zookeeper:zookeeper:3.9.5=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/cuvs/gradle.lockfile b/solr/modules/cuvs/gradle.lockfileindex 09b15e56719..7565e33e4c2 100644--- a/solr/modules/cuvs/gradle.lockfile+++ b/solr/modules/cuvs/gradle.lockfile@@ -116,24 +116,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.5=compileClasspath,jarValidation,runtimeorg.apache.zookeeper:zookeeper:3.9.5=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/extraction/gradle.lockfile b/solr/modules/extraction/gradle.lockfileindex 48eb7a4218a..ab02adce25c 100644--- a/solr/modules/extraction/gradle.lockfile+++ b/solr/modules/extraction/gradle.lockfile@@ -120,24 +120,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.5=compileClasspath,jarValidation,runtimeorg.apache.zookeeper:zookeeper:3.9.5=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfileindex f45af13e461..7ff22c2bc80 100644--- a/solr/modules/gcs-repository/gradle.lockfile+++ b/solr/modules/gcs-repository/gradle.lockfile@@ -171,24 +171,26 @@ org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.checkerframework:checker-qual:4.2.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.conscrypt:conscrypt-openjdk-uber:2.5.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfileindex 18d9b91213e..79e768286ae 100644--- a/solr/modules/jwt-auth/gradle.lockfile+++ b/solr/modules/jwt-auth/gradle.lockfile@@ -138,24 +138,26 @@ org.bouncycastle:bcpkix-jdk18on:1.84=jarValidation,testCompileClasspath,testRuntorg.bouncycastle:bcprov-jdk18on:1.84=jarValidation,testCompileClasspath,testRuntimeClasspathorg.bouncycastle:bcutil-jdk18on:1.84=jarValidation,testCompileClasspath,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.10=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.freemarker:freemarker:2.3.34=jarValidation,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/langid/gradle.lockfile b/solr/modules/langid/gradle.lockfileindex 358e4f45c14..9a6ede282f4 100644--- a/solr/modules/langid/gradle.lockfile+++ b/solr/modules/langid/gradle.lockfile@@ -116,24 +116,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.5=compileClasspath,jarValidation,runtimeorg.apache.zookeeper:zookeeper:3.9.5=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/language-models/gradle.lockfile b/solr/modules/language-models/gradle.lockfileindex 19c069035e6..7567e7bcebb 100644--- a/solr/modules/language-models/gradle.lockfile+++ b/solr/modules/language-models/gradle.lockfile@@ -130,24 +130,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.5=compileClasspath,jarValidation,runtimeorg.apache.zookeeper:zookeeper:3.9.5=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/ltr/gradle.lockfile b/solr/modules/ltr/gradle.lockfileindex 68df08049e8..de14d2bfa3e 100644--- a/solr/modules/ltr/gradle.lockfile+++ b/solr/modules/ltr/gradle.lockfile@@ -115,24 +115,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.5=compileClasspath,jarValidation,runtimeorg.apache.zookeeper:zookeeper:3.9.5=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/opentelemetry/gradle.lockfile b/solr/modules/opentelemetry/gradle.lockfileindex 9fef410f7fc..53f9528628e 100644--- a/solr/modules/opentelemetry/gradle.lockfile+++ b/solr/modules/opentelemetry/gradle.lockfile@@ -146,24 +146,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.5=compileClasspath,jarValidation,runtimeorg.apache.zookeeper:zookeeper:3.9.5=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/s3-repository/gradle.lockfile b/solr/modules/s3-repository/gradle.lockfileindex 5175a295828..f0763e8625c 100644--- a/solr/modules/s3-repository/gradle.lockfile+++ b/solr/modules/s3-repository/gradle.lockfile@@ -134,27 +134,29 @@ org.apache.zookeeper:zookeeper-jute:3.9.5=compileClasspath,jarValidation,runtimeorg.apache.zookeeper:zookeeper:3.9.5=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-webapp:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-ee:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-xml:12.0.34=jarValidation,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-webapp:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty.ee:jetty-ee-webapp:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-xml:12.1.10=jarValidation,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/scripting/gradle.lockfile b/solr/modules/scripting/gradle.lockfileindex 14f95aff7d7..24f2f16de7e 100644--- a/solr/modules/scripting/gradle.lockfile+++ b/solr/modules/scripting/gradle.lockfile@@ -114,24 +114,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.5=compileClasspath,jarValidation,runtimeorg.apache.zookeeper:zookeeper:3.9.5=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/sql/gradle.lockfile b/solr/modules/sql/gradle.lockfileindex a1c321a48a4..176a40a664d 100644--- a/solr/modules/sql/gradle.lockfile+++ b/solr/modules/sql/gradle.lockfile@@ -138,24 +138,26 @@ org.checkerframework:checker-qual:4.2.0=compileClasspath,jarValidation,runtimeClorg.codehaus.janino:commons-compiler:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspathorg.codehaus.janino:janino:3.1.11=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/packaging/test/test_start_solr.bats b/solr/packaging/test/test_start_solr.batsindex be365e7a65b..806e24c1830 100644--- a/solr/packaging/test/test_start_solr.bats+++ b/solr/packaging/test/test_start_solr.bats@@ -96,6 +96,20 @@ teardown() {solr assert --started http://localhost:${SOLR_PORT} --timeout 5000}+@test "webapp is deployed at the /solr context" {+ # Jetty 12.1 removed the directory-scanning deployer; the Solr webapp is now added+ # directly to the context collection in server/etc/jetty.xml. Verify it deploys at+ # /solr and that the context is bound to that path only (an unmapped path 404s).+ solr start+ solr assert --started http://localhost:${SOLR_PORT} --timeout 5000++ run curl -s -o /dev/null -w "%{http_code}" "http://localhost:${SOLR_PORT}/solr/admin/info/system"+ assert_output "200"++ run curl -s -o /dev/null -w "%{http_code}" "http://localhost:${SOLR_PORT}/not-solr/admin/info/system"+ assert_output "404"+}+@test "-c flag prints no-op warning and still starts in cloud mode" {run solr start -cassert_output --partial 'WARNING: -c/--cloud is a no-op. Solr starts in cloud mode by default.'diff --git a/solr/server/contexts/solr-jetty-context.xml b/solr/server/contexts/solr-jetty-context.xmldeleted file mode 100644index 6e801f77aaf..00000000000--- a/solr/server/contexts/solr-jetty-context.xml+++ /dev/null@@ -1,35 +0,0 @@-<?xml version="1.0"?>-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_10_0.dtd">-<Configure class="org.eclipse.jetty.ee10.webapp.WebAppContext">- <Set name="contextPath">/solr</Set>- <Set name="war"><Property name="jetty.base"/>/solr-webapp/webapp</Set>- <Set name="defaultsDescriptor"><Property name="jetty.base"/>/etc/webdefault.xml</Set>- <Set name="extractWAR">false</Set>-- <!--- The rest of this file is necessary for us to deduplicate jetty server jars in our server build.- Jetty disallows "server" classes that are loaded via the server classloader (live in server/lib/ or server/lib/ext/)- from being used by the Webapp. Solr has a need for many of these classes, especially http and http2 for HTTP Client- libraries.-- By default, Solr would need to duplicate these jars between server/lib/ and WEB-INF/lib/.- Therefore, if we want to deduplicate these Jetty jars, we need to remove the class packages that Solr uses from the- Jetty "server" class matcher, using the "-" prefix in from of the sub-package name.-- Setting parentLoaderPriority=true is also necessary in order to be able to use these classes from the server classloader.-- Documentation for this can be found here: https://jetty.org/docs/jetty/12.1/programming-guide/server/http.html#handler-use-webapp-context-class-loading- -->- <Set name="parentLoaderPriority">true</Set>- <Call name="addHiddenClassMatcher">- <Arg>- <New id="removeServerClasses" class="org.eclipse.jetty.util.ClassMatcher">- <Arg>- <Array type="java.lang.String">- <Item>-org.eclipse.jetty.</Item>- </Array>- </Arg>- </New>- </Arg>- </Call>-</Configure>diff --git a/solr/server/etc/jetty.xml b/solr/server/etc/jetty.xmlindex 2f20e329c93..c6d637b32e8 100644--- a/solr/server/etc/jetty.xml+++ b/solr/server/etc/jetty.xml@@ -62,11 +62,11 @@<Set name="outputAggregationSize"><Property name="solr.jetty.output.aggregation.size" default="8192" /></Set><Set name="requestHeaderSize"><Property name="solr.jetty.request.header.size" default="8192" /></Set><Set name="responseHeaderSize"><Property name="solr.jetty.response.header.size" default="8192" /></Set>+ <Set name="maxResponseHeaderSize"><Property name="solr.jetty.response.header.size.max" default="16384" /></Set><Set name="sendServerVersion"><Property name="solr.jetty.send.server.version" default="false" /></Set><Set name="sendDateHeader"><Property name="solr.jetty.send.date.header" default="false" /></Set><Set name="headerCacheSize"><Property name="solr.jetty.header.cache.size" default="512" /></Set><Set name="delayDispatchUntilContent"><Property name="solr.jetty.delayDispatchUntilContent" default="false"/></Set>- <Set name="relativeRedirectAllowed">true</Set><!-- can remove in Jetty 12, which has this default --><!-- Uncomment to enable handling of X-Forwarded- style headers<Call name="addCustomizer"><Arg><New class="org.eclipse.jetty.server.ForwardedRequestCustomizer"/></Arg>@@ -188,40 +188,47 @@<Set name="dumpAfterStart">false</Set><Set name="dumpBeforeStop">false</Set>- <Call name="addBean">- <Arg>- <New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">- <Set name="contexts">- <Ref refid="Contexts" />- </Set>- <Call name="addAppProvider">- <Arg>- <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>- </Arg>- </Call>-- <!-- Add a customize step to the deployment lifecycle -->- <!-- uncomment and replace DebugBinding with your extended AppLifeCycle.Binding class- <Call name="insertLifeCycleNode">- <Arg>deployed</Arg>- <Arg>starting</Arg>- <Arg>customise</Arg>- </Call>- <Call name="addLifeCycleBinding">- <Arg>- <New class="org.eclipse.jetty.deploy.bindings.DebugBinding">- <Arg>customise</Arg>- </New>- </Arg>- </Call>- -->+ <!-- =========================================================== -->+ <!-- Deploy the Solr webapp. -->+ <!-- Solr serves a single, statically-known webapp, so we add it -->+ <!-- directly to the context collection rather than using Jetty's -->+ <!-- directory-scanning deployer (the DeploymentManager / -->+ <!-- ContextProvider API was removed in Jetty 12.1). -->+ <!-- =========================================================== -->+ <Ref refid="Contexts">+ <Call name="addHandler">+ <Arg>+ <New class="org.eclipse.jetty.ee10.webapp.WebAppContext">+ <Set name="contextPath">/solr</Set>+ <Set name="war"><Property name="jetty.base"/>/solr-webapp/webapp</Set>+ <Set name="defaultsDescriptor"><Property name="jetty.base"/>/etc/webdefault.xml</Set>+ <Set name="extractWAR">false</Set>- </New>- </Arg>- </Call>+ <!--+ The rest of this is necessary to deduplicate jetty server jars in our server build.+ Jetty disallows "server" classes that are loaded via the server classloader (live in+ server/lib/ or server/lib/ext/) from being used by the Webapp. Solr has a need for many+ of these classes, especially http and http2 for its HTTP Client libraries. Setting+ parentLoaderPriority=true and hiding the "-org.eclipse.jetty." server classes lets the+ webapp load them from the server classloader instead of duplicating the jars into+ WEB-INF/lib/.+ Documentation: https://jetty.org/docs/jetty/12.1/programming-guide/server/http.html#handler-use-webapp-context-class-loading+ -->+ <Set name="parentLoaderPriority">true</Set>+ <Call name="addHiddenClassMatcher">+ <Arg>+ <New class="org.eclipse.jetty.util.ClassMatcher">+ <Arg>+ <Array type="java.lang.String">+ <Item>-org.eclipse.jetty.</Item>+ </Array>+ </Arg>+ </New>+ </Arg>+ </Call>+ </New>+ </Arg>+ </Call>+ </Ref></Configure>diff --git a/solr/server/gradle.lockfile b/solr/server/gradle.lockfileindex ff35f05634b..bc6311855a6 100644--- a/solr/server/gradle.lockfile+++ b/solr/server/gradle.lockfile@@ -109,31 +109,33 @@ org.apache.lucene:lucene-suggest:10.4.0=jarValidation,runtimeClasspath,solrCoreorg.apache.zookeeper:zookeeper-jute:3.9.5=jarValidation,runtimeClasspath,solrCoreorg.apache.zookeeper:zookeeper:3.9.5=jarValidation,runtimeClasspath,solrCoreorg.codehaus.woodstox:stax2-api:4.3.0=jarValidation,runtimeClasspath,solrCore-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,runtimeClasspath,serverLib-org.eclipse.jetty.ee10:jetty-ee10-servlets:12.0.34=jarValidation,runtimeClasspath,serverLib-org.eclipse.jetty.ee10:jetty-ee10-webapp:12.0.34=jarValidation,runtimeClasspath,serverLib-org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,solrCore-org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,runtimeClasspath,solrCore-org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,runtimeClasspath,serverLib,solrCore-org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,runtimeClasspath,serverLib,solrCore-org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,runtimeClasspath,serverLib-org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,runtimeClasspath,solrCore-org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,solrCore-org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,runtimeClasspath,serverLib-org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,runtimeClasspath,serverLib-org.eclipse.jetty:jetty-client:12.0.34=jarValidation,runtimeClasspath,solrCore-org.eclipse.jetty:jetty-deploy:12.0.34=jarValidation,runtimeClasspath,serverLib-org.eclipse.jetty:jetty-ee:12.0.34=jarValidation,runtimeClasspath,serverLib-org.eclipse.jetty:jetty-http:12.0.34=jarValidation,runtimeClasspath,serverLib,solrCore-org.eclipse.jetty:jetty-io:12.0.34=jarValidation,runtimeClasspath,serverLib,solrCore-org.eclipse.jetty:jetty-jmx:12.0.34=jarValidation,runtimeClasspath,serverLib-org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,runtimeClasspath,serverLib-org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,serverLib,solrCore-org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,serverLib,solrCore-org.eclipse.jetty:jetty-session:12.0.34=jarValidation,runtimeClasspath,serverLib-org.eclipse.jetty:jetty-start:12.0.34=jarValidation,startJar-org.eclipse.jetty:jetty-util:12.0.34=jarValidation,runtimeClasspath,serverLib,solrCore-org.eclipse.jetty:jetty-xml:12.0.34=jarValidation,runtimeClasspath,serverLib+org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,runtimeClasspath,solrCore+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,runtimeClasspath,solrCore+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,runtimeClasspath,serverLib+org.eclipse.jetty.ee10:jetty-ee10-servlets:12.1.10=jarValidation,runtimeClasspath,serverLib+org.eclipse.jetty.ee10:jetty-ee10-webapp:12.1.10=jarValidation,runtimeClasspath,serverLib+org.eclipse.jetty.ee:jetty-ee-webapp:12.1.10=jarValidation,runtimeClasspath,serverLib+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,solrCore+org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,runtimeClasspath,solrCore+org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,runtimeClasspath,serverLib,solrCore+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,runtimeClasspath,serverLib,solrCore+org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,runtimeClasspath,serverLib+org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,runtimeClasspath,solrCore+org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,solrCore+org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,runtimeClasspath,serverLib+org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,runtimeClasspath,serverLib+org.eclipse.jetty:jetty-client:12.1.10=jarValidation,runtimeClasspath,solrCore+org.eclipse.jetty:jetty-deploy:12.1.10=jarValidation,runtimeClasspath,serverLib+org.eclipse.jetty:jetty-http:12.1.10=jarValidation,runtimeClasspath,serverLib,solrCore+org.eclipse.jetty:jetty-io:12.1.10=jarValidation,runtimeClasspath,serverLib,solrCore+org.eclipse.jetty:jetty-jmx:12.1.10=jarValidation,runtimeClasspath,serverLib+org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,runtimeClasspath,serverLib+org.eclipse.jetty:jetty-security:12.1.10=jarValidation,runtimeClasspath,serverLib,solrCore+org.eclipse.jetty:jetty-server:12.1.10=jarValidation,runtimeClasspath,serverLib,solrCore+org.eclipse.jetty:jetty-session:12.1.10=jarValidation,runtimeClasspath,serverLib+org.eclipse.jetty:jetty-start:12.1.10=jarValidation,startJar+org.eclipse.jetty:jetty-util:12.1.10=jarValidation,runtimeClasspath,serverLib,solrCore+org.eclipse.jetty:jetty-xml:12.1.10=jarValidation,runtimeClasspath,serverLiborg.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,solrCoreorg.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,solrCoreorg.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,solrCorediff --git a/solr/solr-ref-guide/gradle.lockfile b/solr/solr-ref-guide/gradle.lockfileindex 77932f4c236..901ba66e2ae 100644--- a/solr/solr-ref-guide/gradle.lockfile+++ b/solr/solr-ref-guide/gradle.lockfile@@ -123,24 +123,26 @@ org.checkerframework:checker-qual:4.2.0=testRuntimeClasspathorg.codehaus.janino:commons-compiler:3.1.11=testRuntimeClasspathorg.codehaus.janino:janino:3.1.11=testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.0=testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.0.34=testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.0.34=testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.0.34=testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.0.34=testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.0.34=testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.0.34=testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.0.34=testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.0.34=testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.0.34=testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.0.34=testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.0.34=testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.0.34=testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.0.34=testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.0.34=testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.0.34=testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.10=testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.10=testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.10=testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.10=testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.10=testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.10=testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.10=testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.10=testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.10=testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.10=testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.10=testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.10=testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.10=testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.10=testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.10=testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.10=testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.1=testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.1=testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.1=testRuntimeClasspathdiff --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.adocindex b374913e64b..2784cb745a6 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@@ -93,6 +93,14 @@ It is intended as a temporary measure while you migrate the affected accounts toHttpSolrClient returns; this time as a base class for HttpJettySolrClient and HttpJdkSolrClient.Its builder will dynamically detect if solr-jetty is available and use that, otherwise it will use the JDK client.+=== Embedded Jetty Configuration++Solr 10.1 upgrades the embedded server to Eclipse Jetty 12.1, which removed Jetty's directory-scanning deployer (the `DeploymentManager` and `ContextProvider` classes).+Because Solr serves a single, statically-known webapp, that webapp is now deployed directly in `server/etc/jetty.xml`, and the `server/contexts/solr-jetty-context.xml` file has been removed.++Advanced users who relied on Jetty scanning the `server/contexts/` directory to auto-deploy additional context descriptors will find that this no longer happens.+To deploy an extra context, or to customize how the Solr webapp itself is deployed, edit `server/etc/jetty.xml` directly and add the context there.+== Solr 10.0=== Solr Jetty parametersdiff --git a/solr/solrj-jetty/gradle.lockfile b/solr/solrj-jetty/gradle.lockfileindex cba5860e250..8d14c732f65 100644--- a/solr/solrj-jetty/gradle.lockfile+++ b/solr/solrj-jetty/gradle.lockfile@@ -111,24 +111,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.5=jarValidation,testCompileClasspath,tesorg.apache.zookeeper:zookeeper:3.9.5=jarValidation,testCompileClasspath,testRuntimeClasspathorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.0=jarValidation,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.10=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.1=jarValidation,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.1=jarValidation,testRuntimeClasspathdiff --git a/solr/solrj-jetty/src/java/org/apache/solr/client/solrj/jetty/HttpJettySolrClient.java b/solr/solrj-jetty/src/java/org/apache/solr/client/solrj/jetty/HttpJettySolrClient.javaindex fbc276cc992..0e5c885feba 100644--- a/solr/solrj-jetty/src/java/org/apache/solr/client/solrj/jetty/HttpJettySolrClient.java+++ b/solr/solrj-jetty/src/java/org/apache/solr/client/solrj/jetty/HttpJettySolrClient.java@@ -220,7 +220,7 @@ public class HttpJettySolrClient extends HttpSolrClient {private HttpClient createHttpClient(Builder builder) {executor = builder.getExecutor();if (executor == null) {- BlockingArrayQueue<Runnable> queue = new BlockingArrayQueue<>(256, 256);+ BlockingArrayQueue<Runnable> queue = BlockingArrayQueue.newInstance(256, Integer.MAX_VALUE);this.executor =new ExecutorUtil.MDCAwareThreadPoolExecutor(32, 256, 60, TimeUnit.SECONDS, queue, new SolrNamedThreadFactory("h2sc"));diff --git a/solr/solrj-jetty/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientCompatibilityTest.java b/solr/solrj-jetty/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientCompatibilityTest.javaindex af9248be307..5a8ef9230b7 100644--- a/solr/solrj-jetty/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientCompatibilityTest.java+++ b/solr/solrj-jetty/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientCompatibilityTest.java@@ -45,11 +45,13 @@ public class HttpJettySolrClientCompatibilityTest extends SolrTestCaseJ4 {public void testSystemPropertyFlag() {System.setProperty("solr.http1", "true");try (var client = new HttpJettySolrClient.Builder().build()) {- assertTrue(client.getHttpClient().getTransport() instanceof HttpClientTransportOverHTTP);+ assertTrue(+ client.getHttpClient().getHttpClientTransport() instanceof HttpClientTransportOverHTTP);}System.clearProperty("solr.http1");try (var client = new HttpJettySolrClient.Builder().build()) {- assertTrue(client.getHttpClient().getTransport() instanceof HttpClientTransportOverHTTP2);+ assertTrue(+ client.getHttpClient().getHttpClientTransport() instanceof HttpClientTransportOverHTTP2);}}@@ -70,7 +72,8 @@ public class HttpJettySolrClientCompatibilityTest extends SolrTestCaseJ4 {new HttpJettySolrClient.Builder(solrTestRule.getBaseUrl() + "/debug/foo").useHttp1_1(true).build()) {- assertTrue(client.getHttpClient().getTransport() instanceof HttpClientTransportOverHTTP);+ assertTrue(+ client.getHttpClient().getHttpClientTransport() instanceof HttpClientTransportOverHTTP);try {client.query(new SolrQuery("*:*"), SolrRequest.METHOD.GET);} catch (RemoteSolrException ignored) {@@ -94,7 +97,8 @@ public class HttpJettySolrClientCompatibilityTest extends SolrTestCaseJ4 {new HttpJettySolrClient.Builder(solrTestRule.getBaseUrl() + "/debug/foo").useHttp1_1(true).build()) {- assertTrue(client.getHttpClient().getTransport() instanceof HttpClientTransportOverHTTP);+ assertTrue(+ client.getHttpClient().getHttpClientTransport() instanceof HttpClientTransportOverHTTP);try {client.query(new SolrQuery("*:*"), SolrRequest.METHOD.GET);} catch (RemoteSolrException ignored) {@@ -122,7 +126,8 @@ public class HttpJettySolrClientCompatibilityTest extends SolrTestCaseJ4 {System.clearProperty("solr.http1");try (var client =new HttpJettySolrClient.Builder(solrTestRule.getBaseUrl() + "/debug/foo").build()) {- assertTrue(client.getHttpClient().getTransport() instanceof HttpClientTransportOverHTTP2);+ assertTrue(+ client.getHttpClient().getHttpClientTransport() instanceof HttpClientTransportOverHTTP2);try {client.query(new SolrQuery("*:*"), SolrRequest.METHOD.GET);fail("Jetty client with HTTP2 transport should not be able to connect to HTTP1 only nodes");diff --git a/solr/solrj-streaming/gradle.lockfile b/solr/solrj-streaming/gradle.lockfileindex d14d5df3b8f..f3cadba4869 100644--- a/solr/solrj-streaming/gradle.lockfile+++ b/solr/solrj-streaming/gradle.lockfile@@ -122,24 +122,26 @@ org.checkerframework:checker-qual:4.2.0=jarValidation,testRuntimeClasspathorg.codehaus.janino:commons-compiler:3.1.11=jarValidation,testRuntimeClasspathorg.codehaus.janino:janino:3.1.11=jarValidation,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.0=jarValidation,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.1=jarValidation,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.1=jarValidation,testRuntimeClasspathdiff --git a/solr/solrj-zookeeper/gradle.lockfile b/solr/solrj-zookeeper/gradle.lockfileindex b3a2e3cafa0..0832f9278c5 100644--- a/solr/solrj-zookeeper/gradle.lockfile+++ b/solr/solrj-zookeeper/gradle.lockfile@@ -111,24 +111,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.5=compileClasspath,compileClasspathCopy,org.apache.zookeeper:zookeeper:3.9.5=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopyorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopyorg.codehaus.woodstox:stax2-api:4.3.0=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-client:12.0.34=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-http:12.0.34=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-io:12.0.34=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-security:12.0.34=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-server:12.0.34=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-util:12.0.34=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-client:12.1.10=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-http:12.1.10=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-io:12.1.10=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-security:12.1.10=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-server:12.1.10=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-util:12.1.10=jarValidation,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopyorg.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopyorg.glassfish.hk2:hk2-api:4.0.1=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopyorg.glassfish.hk2:hk2-locator:4.0.1=jarValidation,testRuntimeClasspath,testRuntimeClasspathCopydiff --git a/solr/solrj/gradle.lockfile b/solr/solrj/gradle.lockfileindex d6189278eaf..257647aede6 100644--- a/solr/solrj/gradle.lockfile+++ b/solr/solrj/gradle.lockfile@@ -119,27 +119,29 @@ org.apache.zookeeper:zookeeper:3.9.5=jarValidation,testCompileClasspath,testRuntorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.checkerframework:checker-qual:3.33.0=spotless865458226org.codehaus.woodstox:stax2-api:4.3.0=jarValidation,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-webapp:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-ee:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.0.34=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-xml:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-webapp:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.ee:jetty-ee-webapp:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.10=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-xml:12.1.10=jarValidation,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.1=jarValidation,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.1=jarValidation,testRuntimeClasspathdiff --git a/solr/test-framework/gradle.lockfile b/solr/test-framework/gradle.lockfileindex ef8cf04034c..a35f3f59f29 100644--- a/solr/test-framework/gradle.lockfile+++ b/solr/test-framework/gradle.lockfile@@ -112,24 +112,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.5=compileClasspath,compileClasspathCopy,org.apache.zookeeper:zookeeper:3.9.5=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopyorg.apiguardian:apiguardian-api:1.1.2=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopyorg.codehaus.woodstox:stax2-api:4.3.0=jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty.http2:jetty-http2-client:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty.http2:jetty-http2-common:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty.http2:jetty-http2-server:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-alpn-client:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-alpn-java-client:12.0.34=jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-alpn-java-server:12.0.34=jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-alpn-server:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-client:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-http:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-io:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-rewrite:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-security:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-server:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-session:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy-org.eclipse.jetty:jetty-util:12.0.34=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty.compression:jetty-compression-common:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty.http2:jetty-http2-client:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty.http2:jetty-http2-common:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty.http2:jetty-http2-server:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-alpn-client:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-alpn-java-client:12.1.10=jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-alpn-java-server:12.1.10=jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-alpn-server:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-client:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-http:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-io:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-rewrite:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-security:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-server:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-session:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopy+org.eclipse.jetty:jetty-util:12.1.10=compileClasspath,compileClasspathCopy,jarValidation,runtimeClasspath,runtimeClasspathCopy,testCompileClasspath,testCompileClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopyorg.glassfish.hk2.external:aopalliance-repackaged:4.0.1=jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopyorg.glassfish.hk2:hk2-api:4.0.1=jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopyorg.glassfish.hk2:hk2-locator:4.0.1=jarValidation,runtimeClasspath,runtimeClasspathCopy,testRuntimeClasspath,testRuntimeClasspathCopydiff --git a/solr/webapp/gradle.lockfile b/solr/webapp/gradle.lockfileindex fec92697f63..9827cbe5a19 100644--- a/solr/webapp/gradle.lockfile+++ b/solr/webapp/gradle.lockfile@@ -109,30 +109,32 @@ org.apache.lucene:lucene-suggest:10.4.0=solrCoreorg.apache.zookeeper:zookeeper-jute:3.9.5=solrCoreorg.apache.zookeeper:zookeeper:3.9.5=solrCoreorg.codehaus.woodstox:stax2-api:4.3.0=solrCore-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.34=serverLib-org.eclipse.jetty.ee10:jetty-ee10-servlets:12.0.34=serverLib-org.eclipse.jetty.ee10:jetty-ee10-webapp:12.0.34=serverLib-org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.34=solrCore-org.eclipse.jetty.http2:jetty-http2-client:12.0.34=solrCore-org.eclipse.jetty.http2:jetty-http2-common:12.0.34=serverLib,solrCore-org.eclipse.jetty.http2:jetty-http2-hpack:12.0.34=serverLib,solrCore-org.eclipse.jetty.http2:jetty-http2-server:12.0.34=serverLib-org.eclipse.jetty:jetty-alpn-client:12.0.34=solrCore-org.eclipse.jetty:jetty-alpn-java-client:12.0.34=solrCore-org.eclipse.jetty:jetty-alpn-java-server:12.0.34=serverLib-org.eclipse.jetty:jetty-alpn-server:12.0.34=serverLib-org.eclipse.jetty:jetty-client:12.0.34=solrCore-org.eclipse.jetty:jetty-deploy:12.0.34=serverLib-org.eclipse.jetty:jetty-ee:12.0.34=serverLib-org.eclipse.jetty:jetty-http:12.0.34=serverLib,solrCore-org.eclipse.jetty:jetty-io:12.0.34=serverLib,solrCore-org.eclipse.jetty:jetty-jmx:12.0.34=serverLib-org.eclipse.jetty:jetty-rewrite:12.0.34=serverLib-org.eclipse.jetty:jetty-security:12.0.34=serverLib,solrCore-org.eclipse.jetty:jetty-server:12.0.34=serverLib,solrCore-org.eclipse.jetty:jetty-session:12.0.34=serverLib-org.eclipse.jetty:jetty-util:12.0.34=serverLib,solrCore-org.eclipse.jetty:jetty-xml:12.0.34=serverLib+org.eclipse.jetty.compression:jetty-compression-common:12.1.10=solrCore+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.10=solrCore+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10=serverLib+org.eclipse.jetty.ee10:jetty-ee10-servlets:12.1.10=serverLib+org.eclipse.jetty.ee10:jetty-ee10-webapp:12.1.10=serverLib+org.eclipse.jetty.ee:jetty-ee-webapp:12.1.10=serverLib+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.10=solrCore+org.eclipse.jetty.http2:jetty-http2-client:12.1.10=solrCore+org.eclipse.jetty.http2:jetty-http2-common:12.1.10=serverLib,solrCore+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.10=serverLib,solrCore+org.eclipse.jetty.http2:jetty-http2-server:12.1.10=serverLib+org.eclipse.jetty:jetty-alpn-client:12.1.10=solrCore+org.eclipse.jetty:jetty-alpn-java-client:12.1.10=solrCore+org.eclipse.jetty:jetty-alpn-java-server:12.1.10=serverLib+org.eclipse.jetty:jetty-alpn-server:12.1.10=serverLib+org.eclipse.jetty:jetty-client:12.1.10=solrCore+org.eclipse.jetty:jetty-deploy:12.1.10=serverLib+org.eclipse.jetty:jetty-http:12.1.10=serverLib,solrCore+org.eclipse.jetty:jetty-io:12.1.10=serverLib,solrCore+org.eclipse.jetty:jetty-jmx:12.1.10=serverLib+org.eclipse.jetty:jetty-rewrite:12.1.10=serverLib+org.eclipse.jetty:jetty-security:12.1.10=serverLib,solrCore+org.eclipse.jetty:jetty-server:12.1.10=serverLib,solrCore+org.eclipse.jetty:jetty-session:12.1.10=serverLib+org.eclipse.jetty:jetty-util:12.1.10=serverLib,solrCore+org.eclipse.jetty:jetty-xml:12.1.10=serverLiborg.glassfish.hk2.external:aopalliance-repackaged:4.0.1=solrCoreorg.glassfish.hk2:hk2-api:4.0.1=solrCoreorg.glassfish.hk2:hk2-locator:4.0.1=solrCore