Apache Solr open-source search software
SOLR-18297: Upgrade Jetty to 12.1.14 (#5059)
Jan Høydahleaf9c86369da
diff --git a/changelog/unreleased/SOLR-18297-update-jetty-12.1.10.yml b/changelog/unreleased/SOLR-18297-update-jetty-12.1.ymlsimilarity index 78%rename from changelog/unreleased/SOLR-18297-update-jetty-12.1.10.ymlrename to changelog/unreleased/SOLR-18297-update-jetty-12.1.ymlindex 4d9a1222176..7029d619b33 100644--- a/changelog/unreleased/SOLR-18297-update-jetty-12.1.10.yml+++ b/changelog/unreleased/SOLR-18297-update-jetty-12.1.yml@@ -1,4 +1,4 @@-title: Upgrade Eclipse Jetty to 12.1.10+title: Upgrade Eclipse Jetty to 12.1.14type: dependency_updateauthors:- name: Jan Høydahldiff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex 5536f1066ee..0f65cda19dd 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -81,7 +81,7 @@ diffplug-spotless = "8.10.0"dockerfile-baseimage-java = "25"dropwizard-metrics = "4.2.39"eclipse-ecj = "3.46.0"-eclipse-jetty = "12.1.12"+eclipse-jetty = "12.1.14"# @keep jgit version used by git-status.gradleeclipse-jgit = "7.7.1.202607240634-r"fasterxml = "2.22.3"diff --git a/solr/api/gradle.lockfile b/solr/api/gradle.lockfileindex 6ff32e81fa3..4b9b8efecde 100644--- a/solr/api/gradle.lockfile+++ b/solr/api/gradle.lockfile@@ -126,26 +126,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=jarValidation,testCompileClasspath,tesorg.apache.zookeeper:zookeeper:3.9.6=jarValidation,testCompileClasspath,testRuntimeClasspathorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.1=jarValidation,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-common:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-gzip:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.2=jarValidation,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.2=jarValidation,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.2=jarValidation,testRuntimeClasspathdiff --git a/solr/benchmark/gradle.lockfile b/solr/benchmark/gradle.lockfileindex 71839506fb9..f6d258f5537 100644--- a/solr/benchmark/gradle.lockfile+++ b/solr/benchmark/gradle.lockfile@@ -116,26 +116,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=compileClasspath,jarValidation,runtimeorg.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspathorg.apiguardian:apiguardian-api:1.1.2=jarValidation,runtimeClasspath,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-common:12.1.12=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-gzip:12.1.12=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.12=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.12=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.1.12=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.1.12=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.1.12=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.1.12=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.1.12=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.1.12=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.1.12=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.1.12=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.1.12=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.14=jarValidation,runtimeClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.14=jarValidation,runtimeClasspath,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.14=jarValidation,runtimeClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.14=jarValidation,runtimeClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.14=jarValidation,runtimeClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.14=jarValidation,runtimeClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.14=jarValidation,runtimeClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.14=jarValidation,runtimeClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.14=jarValidation,runtimeClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.14=jarValidation,runtimeClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.14=jarValidation,runtimeClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.14=jarValidation,runtimeClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.14=jarValidation,runtimeClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.2=jarValidation,runtimeClasspath,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.2=jarValidation,runtimeClasspath,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.2=jarValidation,runtimeClasspath,testRuntimeClasspathdiff --git a/solr/core/gradle.lockfile b/solr/core/gradle.lockfileindex 171511bb8df..a5053250570 100644--- a/solr/core/gradle.lockfile+++ b/solr/core/gradle.lockfile@@ -133,26 +133,26 @@ org.carrot2:morfologik-fsa:2.1.9=jarValidation,testRuntimeClasspathorg.carrot2:morfologik-polish:2.1.9=jarValidation,testRuntimeClasspathorg.carrot2:morfologik-stemming:2.1.9=jarValidation,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.1=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-common:12.1.12=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-gzip:12.1.12=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.12=cliDocsRuntime,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.1.12=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.1.12=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.1.12=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.1.12=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.1.12=cliDocsRuntime,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.1.12=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.1.12=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.1.12=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.1.12=cliDocsRuntime,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.1.12=cliDocsRuntime,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.1.12=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.14=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.14=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.14=cliDocsRuntime,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.14=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.14=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.14=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.14=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.14=cliDocsRuntime,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.14=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.14=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.14=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.14=cliDocsRuntime,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.14=cliDocsRuntime,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.14=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.2=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.2=cliDocsRuntime,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.2=cliDocsRuntime,jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspathdiff --git a/solr/core/src/test/org/apache/solr/cloud/TestGracefulJettyShutdown.java b/solr/core/src/test/org/apache/solr/cloud/TestGracefulJettyShutdown.javaindex e2397df6058..04a4f98bec3 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestGracefulJettyShutdown.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestGracefulJettyShutdown.java@@ -25,7 +25,8 @@ import java.util.concurrent.ExecutorService;import java.util.concurrent.Future;import java.util.concurrent.Semaphore;import java.util.concurrent.TimeUnit;-import org.apache.solr.SolrTestCaseJ4;+import org.apache.lucene.tests.util.LuceneTestCase.Nightly;+import org.apache.solr.SolrTestCase;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;@@ -33,6 +34,8 @@ import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrException;+import org.apache.solr.common.SolrInputDocument;+import org.apache.solr.common.params.ModifiableSolrParams;import org.apache.solr.common.util.ExecutorUtil;import org.apache.solr.common.util.NamedList;import org.apache.solr.core.SolrCore;@@ -41,16 +44,15 @@ import org.apache.solr.embedded.JettySolrRunner;import org.apache.solr.handler.component.SearchHandler;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.response.SolrQueryResponse;-import org.junit.Ignore;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-@Ignore("Flaky from Jetty 12.1.10 upgrade https://issues.apache.org/jira/browse/SOLR-18297")-public class TestGracefulJettyShutdown extends SolrTestCaseJ4 {+@Nightly+public class TestGracefulJettyShutdown extends SolrTestCase {private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());public void testSingleShardInFlightRequestsDuringShutDown() throws Exception {- final String collection = getSaferTestName();+ final String collection = "graceful";final String handler = "/foo";final Semaphore handlerGate = new Semaphore(0);@@ -80,16 +82,17 @@ public class TestGracefulJettyShutdown extends SolrTestCaseJ4 {final CloudSolrClient cloudClient = cluster.getSolrClient();// add a few docs...- cloudClient.add(collection, sdoc("id", "xxx", "foo_s", "aaa"));- cloudClient.add(collection, sdoc("id", "yyy", "foo_s", "bbb"));- cloudClient.add(collection, sdoc("id", "zzz", "foo_s", "aaa"));+ cloudClient.add(collection, new SolrInputDocument("id", "xxx", "foo_s", "aaa"));+ cloudClient.add(collection, new SolrInputDocument("id", "yyy", "foo_s", "bbb"));+ cloudClient.add(collection, new SolrInputDocument("id", "zzz", "foo_s", "aaa"));cloudClient.commit(collection);final List<Future<QueryResponse>> results = new ArrayList<>(13);try (SolrClient jettyClient =new HttpJettySolrClient.Builder(nodeToStop.getBaseUrl().toString()).build()) {- final QueryRequest req = new QueryRequest(handler, params("q", "foo_s:aaa"));+ final QueryRequest req =+ new QueryRequest(handler, new ModifiableSolrParams().set("q", "foo_s:aaa"));// check inflight requests using both clients...for (SolrClient client : Arrays.asList(cloudClient, jettyClient)) {diff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfileindex 2edb7b74727..f67dfa496fb 100644--- a/solr/cross-dc-manager/gradle.lockfile+++ b/solr/cross-dc-manager/gradle.lockfile@@ -137,32 +137,32 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=compileClasspath,jarValidation,runtimeorg.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-common:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-gzip:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.12=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlets:12.1.12=solrPlatformLibs-org.eclipse.jetty.ee10:jetty-ee10-webapp:12.1.12=solrPlatformLibs-org.eclipse.jetty.ee:jetty-ee-webapp:12.1.12=solrPlatformLibs-org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.1.12=jarValidation,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.1.12=jarValidation,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.1.12=jarValidation,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-deploy:12.1.12=solrPlatformLibs-org.eclipse.jetty:jetty-http:12.1.12=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.1.12=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-jmx:12.1.12=solrPlatformLibs-org.eclipse.jetty:jetty-rewrite:12.1.12=jarValidation,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.1.12=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.1.12=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.1.12=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.1.12=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-xml:12.1.12=solrPlatformLibs+org.eclipse.jetty.compression:jetty-compression-common:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlets:12.1.14=solrPlatformLibs+org.eclipse.jetty.ee10:jetty-ee10-webapp:12.1.14=solrPlatformLibs+org.eclipse.jetty.ee:jetty-ee-webapp:12.1.14=solrPlatformLibs+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.14=jarValidation,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.14=jarValidation,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.14=jarValidation,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-deploy:12.1.14=solrPlatformLibs+org.eclipse.jetty:jetty-http:12.1.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-jmx:12.1.14=solrPlatformLibs+org.eclipse.jetty:jetty-rewrite:12.1.14=jarValidation,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-xml:12.1.14=solrPlatformLibsorg.glassfish.hk2.external:aopalliance-repackaged:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/licenses/jetty-alpn-client-12.1.12.jar.sha1 b/solr/licenses/jetty-alpn-client-12.1.12.jar.sha1deleted file mode 100644index 2e2fbddd8cd..00000000000--- a/solr/licenses/jetty-alpn-client-12.1.12.jar.sha1+++ /dev/null@@ -1 +0,0 @@-29c4f0f60f75fc4454cbe6f039e44ff9402f6e95diff --git a/solr/licenses/jetty-alpn-client-12.1.14.jar.sha1 b/solr/licenses/jetty-alpn-client-12.1.14.jar.sha1new file mode 100644index 00000000000..8a70b27ed5e--- /dev/null+++ b/solr/licenses/jetty-alpn-client-12.1.14.jar.sha1@@ -0,0 +1 @@+5143e09ca956aed07d0cff37238c046fee5cbc01diff --git a/solr/licenses/jetty-alpn-java-client-12.1.12.jar.sha1 b/solr/licenses/jetty-alpn-java-client-12.1.12.jar.sha1deleted file mode 100644index fcc0792b07c..00000000000--- a/solr/licenses/jetty-alpn-java-client-12.1.12.jar.sha1+++ /dev/null@@ -1 +0,0 @@-a83092f7267d5be419518db19eddb187cde63e67diff --git a/solr/licenses/jetty-alpn-java-client-12.1.14.jar.sha1 b/solr/licenses/jetty-alpn-java-client-12.1.14.jar.sha1new file mode 100644index 00000000000..74d755f86f1--- /dev/null+++ b/solr/licenses/jetty-alpn-java-client-12.1.14.jar.sha1@@ -0,0 +1 @@+da3c1f869bc23d1dba446c844e21b132e999750fdiff --git a/solr/licenses/jetty-alpn-java-server-12.1.12.jar.sha1 b/solr/licenses/jetty-alpn-java-server-12.1.12.jar.sha1deleted file mode 100644index 440b8d2130c..00000000000--- a/solr/licenses/jetty-alpn-java-server-12.1.12.jar.sha1+++ /dev/null@@ -1 +0,0 @@-52cc7532d554a57a9a59831a6430624e851818b8diff --git a/solr/licenses/jetty-alpn-java-server-12.1.14.jar.sha1 b/solr/licenses/jetty-alpn-java-server-12.1.14.jar.sha1new file mode 100644index 00000000000..64380d7b319--- /dev/null+++ b/solr/licenses/jetty-alpn-java-server-12.1.14.jar.sha1@@ -0,0 +1 @@+c01bb7513658e0f8921de3dd6b0bccb6fc3ef343diff --git a/solr/licenses/jetty-alpn-server-12.1.12.jar.sha1 b/solr/licenses/jetty-alpn-server-12.1.12.jar.sha1deleted file mode 100644index 82167538335..00000000000--- a/solr/licenses/jetty-alpn-server-12.1.12.jar.sha1+++ /dev/null@@ -1 +0,0 @@-8356e9fa99b733d5522620dbb7063f8fed3f5c27diff --git a/solr/licenses/jetty-alpn-server-12.1.14.jar.sha1 b/solr/licenses/jetty-alpn-server-12.1.14.jar.sha1new file mode 100644index 00000000000..ff96719f186--- /dev/null+++ b/solr/licenses/jetty-alpn-server-12.1.14.jar.sha1@@ -0,0 +1 @@+064aaf44c3ec891b2e9463b0f3a0cf150d0c432ediff --git a/solr/licenses/jetty-client-12.1.12.jar.sha1 b/solr/licenses/jetty-client-12.1.12.jar.sha1deleted file mode 100644index e0c322d8b4b..00000000000--- a/solr/licenses/jetty-client-12.1.12.jar.sha1+++ /dev/null@@ -1 +0,0 @@-c0cfbdc78ef2724233e476e1c0fbc8fcd8ef4a5bdiff --git a/solr/licenses/jetty-client-12.1.14.jar.sha1 b/solr/licenses/jetty-client-12.1.14.jar.sha1new file mode 100644index 00000000000..791e9b8bb55--- /dev/null+++ b/solr/licenses/jetty-client-12.1.14.jar.sha1@@ -0,0 +1 @@+f04937059223f8524ed4f5b860a46f6e34796cdcdiff --git a/solr/licenses/jetty-compression-common-12.1.12.jar.sha1 b/solr/licenses/jetty-compression-common-12.1.12.jar.sha1deleted file mode 100644index 25f9d919380..00000000000--- a/solr/licenses/jetty-compression-common-12.1.12.jar.sha1+++ /dev/null@@ -1 +0,0 @@-5b072d5fb3c68f06dab87bdf6148424fdcfca481diff --git a/solr/licenses/jetty-compression-common-12.1.14.jar.sha1 b/solr/licenses/jetty-compression-common-12.1.14.jar.sha1new file mode 100644index 00000000000..99fb75811ab--- /dev/null+++ b/solr/licenses/jetty-compression-common-12.1.14.jar.sha1@@ -0,0 +1 @@+19e7d0bc261cc061ac2e4a9ad4303cd37b0a6cc2diff --git a/solr/licenses/jetty-compression-gzip-12.1.12.jar.sha1 b/solr/licenses/jetty-compression-gzip-12.1.12.jar.sha1deleted file mode 100644index e416392ceba..00000000000--- a/solr/licenses/jetty-compression-gzip-12.1.12.jar.sha1+++ /dev/null@@ -1 +0,0 @@-f34786b7ea7c8eb6949dd359b973f7644147fbd0diff --git a/solr/licenses/jetty-compression-gzip-12.1.14.jar.sha1 b/solr/licenses/jetty-compression-gzip-12.1.14.jar.sha1new file mode 100644index 00000000000..49f59db98ff--- /dev/null+++ b/solr/licenses/jetty-compression-gzip-12.1.14.jar.sha1@@ -0,0 +1 @@+ab3b06bbd09f34e98bed3dae3136f7225691b893diff --git a/solr/licenses/jetty-deploy-12.1.12.jar.sha1 b/solr/licenses/jetty-deploy-12.1.12.jar.sha1deleted file mode 100644index 1cdf7fe246e..00000000000--- a/solr/licenses/jetty-deploy-12.1.12.jar.sha1+++ /dev/null@@ -1 +0,0 @@-9b7c3a467d6b62aac8d6c187dfd114b22cb166d0diff --git a/solr/licenses/jetty-deploy-12.1.14.jar.sha1 b/solr/licenses/jetty-deploy-12.1.14.jar.sha1new file mode 100644index 00000000000..7fe11ee72e7--- /dev/null+++ b/solr/licenses/jetty-deploy-12.1.14.jar.sha1@@ -0,0 +1 @@+a987f5d66113ac11c1c565cc9c030380e7b2ada7diff --git a/solr/licenses/jetty-ee-webapp-12.1.12.jar.sha1 b/solr/licenses/jetty-ee-webapp-12.1.12.jar.sha1deleted file mode 100644index 9c5aaa05dc0..00000000000--- a/solr/licenses/jetty-ee-webapp-12.1.12.jar.sha1+++ /dev/null@@ -1 +0,0 @@-a8dc02828144d6327090e915a00e11246e3d052fdiff --git a/solr/licenses/jetty-ee-webapp-12.1.14.jar.sha1 b/solr/licenses/jetty-ee-webapp-12.1.14.jar.sha1new file mode 100644index 00000000000..6bb24e0f73e--- /dev/null+++ b/solr/licenses/jetty-ee-webapp-12.1.14.jar.sha1@@ -0,0 +1 @@+6e0be2ac1e0243d2314b5d455f29583b444d6aa4diff --git a/solr/licenses/jetty-ee10-servlet-12.1.12.jar.sha1 b/solr/licenses/jetty-ee10-servlet-12.1.12.jar.sha1deleted file mode 100644index b0e9dacf889..00000000000--- a/solr/licenses/jetty-ee10-servlet-12.1.12.jar.sha1+++ /dev/null@@ -1 +0,0 @@-617e81d9b9112f83057bf3dea5dc7bb8e652e52ddiff --git a/solr/licenses/jetty-ee10-servlet-12.1.14.jar.sha1 b/solr/licenses/jetty-ee10-servlet-12.1.14.jar.sha1new file mode 100644index 00000000000..ddc3f298eaf--- /dev/null+++ b/solr/licenses/jetty-ee10-servlet-12.1.14.jar.sha1@@ -0,0 +1 @@+62e4f613eb60b91515bc5991478eae85b8c38ab8diff --git a/solr/licenses/jetty-ee10-servlets-12.1.12.jar.sha1 b/solr/licenses/jetty-ee10-servlets-12.1.12.jar.sha1deleted file mode 100644index fe07d548c16..00000000000--- a/solr/licenses/jetty-ee10-servlets-12.1.12.jar.sha1+++ /dev/null@@ -1 +0,0 @@-e3bfb6176f7073b2ec35fdd718865649ebf75369diff --git a/solr/licenses/jetty-ee10-servlets-12.1.14.jar.sha1 b/solr/licenses/jetty-ee10-servlets-12.1.14.jar.sha1new file mode 100644index 00000000000..b9762a6f1e8--- /dev/null+++ b/solr/licenses/jetty-ee10-servlets-12.1.14.jar.sha1@@ -0,0 +1 @@+6dcd4c6170c6fc70763e889d6e9752e373fd2c5adiff --git a/solr/licenses/jetty-ee10-webapp-12.1.12.jar.sha1 b/solr/licenses/jetty-ee10-webapp-12.1.12.jar.sha1deleted file mode 100644index 6d68f07c3e2..00000000000--- a/solr/licenses/jetty-ee10-webapp-12.1.12.jar.sha1+++ /dev/null@@ -1 +0,0 @@-13e353e3eb349dae826ddbb66181b03e3ff46c39diff --git a/solr/licenses/jetty-ee10-webapp-12.1.14.jar.sha1 b/solr/licenses/jetty-ee10-webapp-12.1.14.jar.sha1new file mode 100644index 00000000000..b52656c07ad--- /dev/null+++ b/solr/licenses/jetty-ee10-webapp-12.1.14.jar.sha1@@ -0,0 +1 @@+e055d8c22e3d5a24ddddd38c50f44b9452a0e550diff --git a/solr/licenses/jetty-http-12.1.12.jar.sha1 b/solr/licenses/jetty-http-12.1.12.jar.sha1deleted file mode 100644index 4639d58154f..00000000000--- a/solr/licenses/jetty-http-12.1.12.jar.sha1+++ /dev/null@@ -1 +0,0 @@-18e79d9da43b31fe7004621f5dbf4ba92b9edd19diff --git a/solr/licenses/jetty-http-12.1.14.jar.sha1 b/solr/licenses/jetty-http-12.1.14.jar.sha1new file mode 100644index 00000000000..82c43a6f913--- /dev/null+++ b/solr/licenses/jetty-http-12.1.14.jar.sha1@@ -0,0 +1 @@+511ea5749bc221b4b9c6d70978bd377053ba3c44diff --git a/solr/licenses/jetty-http2-client-12.1.12.jar.sha1 b/solr/licenses/jetty-http2-client-12.1.12.jar.sha1deleted file mode 100644index d4635c45e54..00000000000--- a/solr/licenses/jetty-http2-client-12.1.12.jar.sha1+++ /dev/null@@ -1 +0,0 @@-638efec7db9fd861624d6f0101a434999d90dc3adiff --git a/solr/licenses/jetty-http2-client-12.1.14.jar.sha1 b/solr/licenses/jetty-http2-client-12.1.14.jar.sha1new file mode 100644index 00000000000..4f36e67bb3a--- /dev/null+++ b/solr/licenses/jetty-http2-client-12.1.14.jar.sha1@@ -0,0 +1 @@+a3aa9bb4097d04bffeeaa8ae6c662f6a7cf0a99fdiff --git a/solr/licenses/jetty-http2-client-transport-12.1.12.jar.sha1 b/solr/licenses/jetty-http2-client-transport-12.1.12.jar.sha1deleted file mode 100644index f6f4b1064bf..00000000000--- a/solr/licenses/jetty-http2-client-transport-12.1.12.jar.sha1+++ /dev/null@@ -1 +0,0 @@-f0ce2ab38c503b79485b8de53eeac32d5c6b8968diff --git a/solr/licenses/jetty-http2-client-transport-12.1.14.jar.sha1 b/solr/licenses/jetty-http2-client-transport-12.1.14.jar.sha1new file mode 100644index 00000000000..5cafb40a6e5--- /dev/null+++ b/solr/licenses/jetty-http2-client-transport-12.1.14.jar.sha1@@ -0,0 +1 @@+1b9c9763ae01e32eaf4aa8d48799c758fa001ae9diff --git a/solr/licenses/jetty-http2-common-12.1.12.jar.sha1 b/solr/licenses/jetty-http2-common-12.1.12.jar.sha1deleted file mode 100644index 3b85340c9af..00000000000--- a/solr/licenses/jetty-http2-common-12.1.12.jar.sha1+++ /dev/null@@ -1 +0,0 @@-ccd7ab35b0db5d2e64c42c78311179b5ba00e52ediff --git a/solr/licenses/jetty-http2-common-12.1.14.jar.sha1 b/solr/licenses/jetty-http2-common-12.1.14.jar.sha1new file mode 100644index 00000000000..0f10fa4bb17--- /dev/null+++ b/solr/licenses/jetty-http2-common-12.1.14.jar.sha1@@ -0,0 +1 @@+c31e1aa8358bb07d83c4b30a6a742a19a50fbd71diff --git a/solr/licenses/jetty-http2-hpack-12.1.12.jar.sha1 b/solr/licenses/jetty-http2-hpack-12.1.12.jar.sha1deleted file mode 100644index 601c97fd7ab..00000000000--- a/solr/licenses/jetty-http2-hpack-12.1.12.jar.sha1+++ /dev/null@@ -1 +0,0 @@-cb7d1d1785460729d437bf4019e971a7ceec12b2diff --git a/solr/licenses/jetty-http2-hpack-12.1.14.jar.sha1 b/solr/licenses/jetty-http2-hpack-12.1.14.jar.sha1new file mode 100644index 00000000000..3a56c14ee55--- /dev/null+++ b/solr/licenses/jetty-http2-hpack-12.1.14.jar.sha1@@ -0,0 +1 @@+4e05d3365520a870b61d3c02a938d48e491353a2diff --git a/solr/licenses/jetty-http2-server-12.1.12.jar.sha1 b/solr/licenses/jetty-http2-server-12.1.12.jar.sha1deleted file mode 100644index 4569c322036..00000000000--- a/solr/licenses/jetty-http2-server-12.1.12.jar.sha1+++ /dev/null@@ -1 +0,0 @@-b6ccd9a4ff9b49745c62a3dadc4c461f541b3a3ddiff --git a/solr/licenses/jetty-http2-server-12.1.14.jar.sha1 b/solr/licenses/jetty-http2-server-12.1.14.jar.sha1new file mode 100644index 00000000000..fbf2e74f436--- /dev/null+++ b/solr/licenses/jetty-http2-server-12.1.14.jar.sha1@@ -0,0 +1 @@+60b8b869ff20bb1f967cfebb8134f2821afe978cdiff --git a/solr/licenses/jetty-io-12.1.12.jar.sha1 b/solr/licenses/jetty-io-12.1.12.jar.sha1deleted file mode 100644index 304c6f4aa3b..00000000000--- a/solr/licenses/jetty-io-12.1.12.jar.sha1+++ /dev/null@@ -1 +0,0 @@-99703c1359bc6114b30fefdd0fa6db2fa26355f5diff --git a/solr/licenses/jetty-io-12.1.14.jar.sha1 b/solr/licenses/jetty-io-12.1.14.jar.sha1new file mode 100644index 00000000000..8b403b1b55e--- /dev/null+++ b/solr/licenses/jetty-io-12.1.14.jar.sha1@@ -0,0 +1 @@+c933762558ba8b795dc11b11c70f208256d22ea7diff --git a/solr/licenses/jetty-jmx-12.1.12.jar.sha1 b/solr/licenses/jetty-jmx-12.1.12.jar.sha1deleted file mode 100644index 2cf9282a6b9..00000000000--- a/solr/licenses/jetty-jmx-12.1.12.jar.sha1+++ /dev/null@@ -1 +0,0 @@-da63239eacde2c2f4b92aeeac8fd419f5ea9ace4diff --git a/solr/licenses/jetty-jmx-12.1.14.jar.sha1 b/solr/licenses/jetty-jmx-12.1.14.jar.sha1new file mode 100644index 00000000000..4f1a1f76235--- /dev/null+++ b/solr/licenses/jetty-jmx-12.1.14.jar.sha1@@ -0,0 +1 @@+1b945b46ff2d828de25274210cc592810a79bb8ddiff --git a/solr/licenses/jetty-rewrite-12.1.12.jar.sha1 b/solr/licenses/jetty-rewrite-12.1.12.jar.sha1deleted file mode 100644index 7a655a8e42c..00000000000--- a/solr/licenses/jetty-rewrite-12.1.12.jar.sha1+++ /dev/null@@ -1 +0,0 @@-e0ddb31d169f56c3c728ff3d9417634f3c70fb8adiff --git a/solr/licenses/jetty-rewrite-12.1.14.jar.sha1 b/solr/licenses/jetty-rewrite-12.1.14.jar.sha1new file mode 100644index 00000000000..dee3ac64bbd--- /dev/null+++ b/solr/licenses/jetty-rewrite-12.1.14.jar.sha1@@ -0,0 +1 @@+6dee2bc3f4e559974578ffa0d00ebdfa500e1184diff --git a/solr/licenses/jetty-security-12.1.12.jar.sha1 b/solr/licenses/jetty-security-12.1.12.jar.sha1deleted file mode 100644index 3c3ea6037aa..00000000000--- a/solr/licenses/jetty-security-12.1.12.jar.sha1+++ /dev/null@@ -1 +0,0 @@-336bf8d287b649400d9fad16ecf39593b17b23a4diff --git a/solr/licenses/jetty-security-12.1.14.jar.sha1 b/solr/licenses/jetty-security-12.1.14.jar.sha1new file mode 100644index 00000000000..2dca0b8d8bc--- /dev/null+++ b/solr/licenses/jetty-security-12.1.14.jar.sha1@@ -0,0 +1 @@+3c20ea87010a5b0f92fa825a79fa70753fce8979diff --git a/solr/licenses/jetty-server-12.1.12.jar.sha1 b/solr/licenses/jetty-server-12.1.12.jar.sha1deleted file mode 100644index 9578988ecba..00000000000--- a/solr/licenses/jetty-server-12.1.12.jar.sha1+++ /dev/null@@ -1 +0,0 @@-ff303f5274bf4f9ba91588de595ce8689cb1f34cdiff --git a/solr/licenses/jetty-server-12.1.14.jar.sha1 b/solr/licenses/jetty-server-12.1.14.jar.sha1new file mode 100644index 00000000000..bdb9d32bb00--- /dev/null+++ b/solr/licenses/jetty-server-12.1.14.jar.sha1@@ -0,0 +1 @@+d9ee042059cc5252411baa6bd1192bd2840d503ddiff --git a/solr/licenses/jetty-session-12.1.12.jar.sha1 b/solr/licenses/jetty-session-12.1.12.jar.sha1deleted file mode 100644index 269e02c8b31..00000000000--- a/solr/licenses/jetty-session-12.1.12.jar.sha1+++ /dev/null@@ -1 +0,0 @@-df924fc0f60f96b6acd1cd267c24c8679f10ffeadiff --git a/solr/licenses/jetty-session-12.1.14.jar.sha1 b/solr/licenses/jetty-session-12.1.14.jar.sha1new file mode 100644index 00000000000..865ce11d9db--- /dev/null+++ b/solr/licenses/jetty-session-12.1.14.jar.sha1@@ -0,0 +1 @@+387fd27c404b2ba9ebf69688c477a8dbb6604676diff --git a/solr/licenses/jetty-start-12.1.12-shaded.jar.sha1 b/solr/licenses/jetty-start-12.1.12-shaded.jar.sha1deleted file mode 100644index 750be86db46..00000000000--- a/solr/licenses/jetty-start-12.1.12-shaded.jar.sha1+++ /dev/null@@ -1 +0,0 @@-60f1b62c544a4ccee2793a603ddddaadd1bbbd46diff --git a/solr/licenses/jetty-start-12.1.14-shaded.jar.sha1 b/solr/licenses/jetty-start-12.1.14-shaded.jar.sha1new file mode 100644index 00000000000..34fd0008c15--- /dev/null+++ b/solr/licenses/jetty-start-12.1.14-shaded.jar.sha1@@ -0,0 +1 @@+9398fe90129da289c81a2be3915bd4f55475916cdiff --git a/solr/licenses/jetty-util-12.1.12.jar.sha1 b/solr/licenses/jetty-util-12.1.12.jar.sha1deleted file mode 100644index 3547d5c7faf..00000000000--- a/solr/licenses/jetty-util-12.1.12.jar.sha1+++ /dev/null@@ -1 +0,0 @@-1f6c7ee04775b812ebf35cbea57abecbd6c70903diff --git a/solr/licenses/jetty-util-12.1.14.jar.sha1 b/solr/licenses/jetty-util-12.1.14.jar.sha1new file mode 100644index 00000000000..411ea9d883b--- /dev/null+++ b/solr/licenses/jetty-util-12.1.14.jar.sha1@@ -0,0 +1 @@+b89abd671db08f3933bec0834bb6859be6ab957cdiff --git a/solr/licenses/jetty-xml-12.1.12.jar.sha1 b/solr/licenses/jetty-xml-12.1.12.jar.sha1deleted file mode 100644index d194f0a2094..00000000000--- a/solr/licenses/jetty-xml-12.1.12.jar.sha1+++ /dev/null@@ -1 +0,0 @@-93b96de8663bd9065f22e894d5c4929dc900e822diff --git a/solr/licenses/jetty-xml-12.1.14.jar.sha1 b/solr/licenses/jetty-xml-12.1.14.jar.sha1new file mode 100644index 00000000000..4fc362202c2--- /dev/null+++ b/solr/licenses/jetty-xml-12.1.14.jar.sha1@@ -0,0 +1 @@+f198d16b964e15979e64a14c0a298c78e510c535diff --git a/solr/modules/analysis-extras/gradle.lockfile b/solr/modules/analysis-extras/gradle.lockfileindex 1b220f30855..a6b1f7727bb 100644--- a/solr/modules/analysis-extras/gradle.lockfile+++ b/solr/modules/analysis-extras/gradle.lockfile@@ -131,26 +131,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.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-common:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-gzip:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/clustering/gradle.lockfile b/solr/modules/clustering/gradle.lockfileindex 95fc38a9c6f..c1cae51677d 100644--- a/solr/modules/clustering/gradle.lockfile+++ b/solr/modules/clustering/gradle.lockfile@@ -119,26 +119,26 @@ org.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClassorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.carrot2:carrot2-core:4.8.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-common:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-gzip:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/cross-dc/gradle.lockfile b/solr/modules/cross-dc/gradle.lockfileindex ae22bcac415..2d69c58c18f 100644--- a/solr/modules/cross-dc/gradle.lockfile+++ b/solr/modules/cross-dc/gradle.lockfile@@ -123,26 +123,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=compileClasspath,jarValidation,runtimeorg.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-common:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-gzip:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/cuvs/gradle.lockfile b/solr/modules/cuvs/gradle.lockfileindex 9b052ccefde..f132eaa23b9 100644--- a/solr/modules/cuvs/gradle.lockfile+++ b/solr/modules/cuvs/gradle.lockfile@@ -120,26 +120,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=compileClasspath,jarValidation,runtimeorg.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-common:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-gzip:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/extraction/gradle.lockfile b/solr/modules/extraction/gradle.lockfileindex f04441f5432..e2c3b8477fb 100644--- a/solr/modules/extraction/gradle.lockfile+++ b/solr/modules/extraction/gradle.lockfile@@ -123,26 +123,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=compileClasspath,jarValidation,runtimeorg.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-common:12.1.12=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-gzip:12.1.12=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.1.12=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.1.12=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.1.12=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.1.12=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.1.12=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfileindex b4849f74a4c..9bd2a7772d0 100644--- a/solr/modules/gcs-repository/gradle.lockfile+++ b/solr/modules/gcs-repository/gradle.lockfile@@ -177,26 +177,26 @@ org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.checkerframework:checker-qual:4.2.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.conscrypt:conscrypt-openjdk-uber:2.6.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-common:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-gzip:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfileindex 9b23da96176..084a1634601 100644--- a/solr/modules/jwt-auth/gradle.lockfile+++ b/solr/modules/jwt-auth/gradle.lockfile@@ -141,26 +141,26 @@ org.bouncycastle:bcpkix-jdk18on:1.85=jarValidation,testCompileClasspath,testRuntorg.bouncycastle:bcprov-jdk18on:1.85=jarValidation,testCompileClasspath,testRuntimeClasspathorg.bouncycastle:bcutil-jdk18on:1.85=jarValidation,testCompileClasspath,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-common:12.1.12=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-gzip:12.1.12=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.1.12=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.1.12=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.1.12=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.1.12=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.1.12=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.1.12=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.1.12=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.1.12=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.14=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.freemarker:freemarker:2.3.34=jarValidation,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/langid/gradle.lockfile b/solr/modules/langid/gradle.lockfileindex 90b07d30279..163c174375d 100644--- a/solr/modules/langid/gradle.lockfile+++ b/solr/modules/langid/gradle.lockfile@@ -120,26 +120,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=compileClasspath,jarValidation,runtimeorg.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-common:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-gzip:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/language-models/gradle.lockfile b/solr/modules/language-models/gradle.lockfileindex 55cdfd05264..b0079c023c9 100644--- a/solr/modules/language-models/gradle.lockfile+++ b/solr/modules/language-models/gradle.lockfile@@ -131,26 +131,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=compileClasspath,jarValidation,runtimeorg.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-common:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-gzip:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/ltr/gradle.lockfile b/solr/modules/ltr/gradle.lockfileindex 63ce6d89151..f09a1c13ffe 100644--- a/solr/modules/ltr/gradle.lockfile+++ b/solr/modules/ltr/gradle.lockfile@@ -119,26 +119,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=compileClasspath,jarValidation,runtimeorg.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-common:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-gzip:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/opentelemetry/gradle.lockfile b/solr/modules/opentelemetry/gradle.lockfileindex 776757e3420..5309047fa5e 100644--- a/solr/modules/opentelemetry/gradle.lockfile+++ b/solr/modules/opentelemetry/gradle.lockfile@@ -128,26 +128,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=compileClasspath,jarValidation,runtimeorg.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-common:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-gzip:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/s3-repository/gradle.lockfile b/solr/modules/s3-repository/gradle.lockfileindex 9faece987e3..cdc167ade64 100644--- a/solr/modules/s3-repository/gradle.lockfile+++ b/solr/modules/s3-repository/gradle.lockfile@@ -129,26 +129,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=compileClasspath,jarValidation,runtimeorg.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-common:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-gzip:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/scripting/gradle.lockfile b/solr/modules/scripting/gradle.lockfileindex 49a89b70764..8b0f6d351c8 100644--- a/solr/modules/scripting/gradle.lockfile+++ b/solr/modules/scripting/gradle.lockfile@@ -118,26 +118,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=compileClasspath,jarValidation,runtimeorg.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-common:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-gzip:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/sql/gradle.lockfile b/solr/modules/sql/gradle.lockfileindex c55e83c1cb2..77e41c4305b 100644--- a/solr/modules/sql/gradle.lockfile+++ b/solr/modules/sql/gradle.lockfile@@ -142,26 +142,26 @@ org.checkerframework:checker-qual:4.2.2=compileClasspath,jarValidation,runtimeClorg.codehaus.janino:commons-compiler:3.1.12=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspathorg.codehaus.janino:janino:3.1.12=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-common:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-gzip:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.1.12=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.14=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/server/gradle.lockfile b/solr/server/gradle.lockfileindex 82fa16ba5ac..715d32d966a 100644--- a/solr/server/gradle.lockfile+++ b/solr/server/gradle.lockfile@@ -113,33 +113,33 @@ org.apache.lucene:lucene-suggest:10.4.0=jarValidation,runtimeClasspath,solrCoreorg.apache.zookeeper:zookeeper-jute:3.9.6=jarValidation,runtimeClasspath,solrCoreorg.apache.zookeeper:zookeeper:3.9.6=jarValidation,runtimeClasspath,solrCoreorg.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,solrCore-org.eclipse.jetty.compression:jetty-compression-common:12.1.12=jarValidation,runtimeClasspath,solrCore-org.eclipse.jetty.compression:jetty-compression-gzip:12.1.12=jarValidation,runtimeClasspath,solrCore-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.12=jarValidation,runtimeClasspath,serverLib-org.eclipse.jetty.ee10:jetty-ee10-servlets:12.1.12=jarValidation,runtimeClasspath,serverLib-org.eclipse.jetty.ee10:jetty-ee10-webapp:12.1.12=jarValidation,runtimeClasspath,serverLib-org.eclipse.jetty.ee:jetty-ee-webapp:12.1.12=jarValidation,runtimeClasspath,serverLib-org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.12=jarValidation,runtimeClasspath,solrCore-org.eclipse.jetty.http2:jetty-http2-client:12.1.12=jarValidation,runtimeClasspath,solrCore-org.eclipse.jetty.http2:jetty-http2-common:12.1.12=jarValidation,runtimeClasspath,serverLib,solrCore-org.eclipse.jetty.http2:jetty-http2-hpack:12.1.12=jarValidation,runtimeClasspath,serverLib,solrCore-org.eclipse.jetty.http2:jetty-http2-server:12.1.12=jarValidation,runtimeClasspath,serverLib-org.eclipse.jetty:jetty-alpn-client:12.1.12=jarValidation,runtimeClasspath,solrCore-org.eclipse.jetty:jetty-alpn-java-client:12.1.12=jarValidation,runtimeClasspath,solrCore-org.eclipse.jetty:jetty-alpn-java-server:12.1.12=jarValidation,runtimeClasspath,serverLib-org.eclipse.jetty:jetty-alpn-server:12.1.12=jarValidation,runtimeClasspath,serverLib-org.eclipse.jetty:jetty-client:12.1.12=jarValidation,runtimeClasspath,solrCore-org.eclipse.jetty:jetty-deploy:12.1.12=jarValidation,runtimeClasspath,serverLib-org.eclipse.jetty:jetty-http:12.1.12=jarValidation,runtimeClasspath,serverLib,solrCore-org.eclipse.jetty:jetty-io:12.1.12=jarValidation,runtimeClasspath,serverLib,solrCore-org.eclipse.jetty:jetty-jmx:12.1.12=jarValidation,runtimeClasspath,serverLib-org.eclipse.jetty:jetty-rewrite:12.1.12=jarValidation,runtimeClasspath,serverLib-org.eclipse.jetty:jetty-security:12.1.12=jarValidation,runtimeClasspath,serverLib,solrCore-org.eclipse.jetty:jetty-server:12.1.12=jarValidation,runtimeClasspath,serverLib,solrCore-org.eclipse.jetty:jetty-session:12.1.12=jarValidation,runtimeClasspath,serverLib-org.eclipse.jetty:jetty-start:12.1.12=jarValidation,startJar-org.eclipse.jetty:jetty-util:12.1.12=jarValidation,runtimeClasspath,serverLib,solrCore-org.eclipse.jetty:jetty-xml:12.1.12=jarValidation,runtimeClasspath,serverLib+org.eclipse.jetty.compression:jetty-compression-common:12.1.14=jarValidation,runtimeClasspath,solrCore+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.14=jarValidation,runtimeClasspath,solrCore+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.14=jarValidation,runtimeClasspath,serverLib+org.eclipse.jetty.ee10:jetty-ee10-servlets:12.1.14=jarValidation,runtimeClasspath,serverLib+org.eclipse.jetty.ee10:jetty-ee10-webapp:12.1.14=jarValidation,runtimeClasspath,serverLib+org.eclipse.jetty.ee:jetty-ee-webapp:12.1.14=jarValidation,runtimeClasspath,serverLib+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.14=jarValidation,runtimeClasspath,solrCore+org.eclipse.jetty.http2:jetty-http2-client:12.1.14=jarValidation,runtimeClasspath,solrCore+org.eclipse.jetty.http2:jetty-http2-common:12.1.14=jarValidation,runtimeClasspath,serverLib,solrCore+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.14=jarValidation,runtimeClasspath,serverLib,solrCore+org.eclipse.jetty.http2:jetty-http2-server:12.1.14=jarValidation,runtimeClasspath,serverLib+org.eclipse.jetty:jetty-alpn-client:12.1.14=jarValidation,runtimeClasspath,solrCore+org.eclipse.jetty:jetty-alpn-java-client:12.1.14=jarValidation,runtimeClasspath,solrCore+org.eclipse.jetty:jetty-alpn-java-server:12.1.14=jarValidation,runtimeClasspath,serverLib+org.eclipse.jetty:jetty-alpn-server:12.1.14=jarValidation,runtimeClasspath,serverLib+org.eclipse.jetty:jetty-client:12.1.14=jarValidation,runtimeClasspath,solrCore+org.eclipse.jetty:jetty-deploy:12.1.14=jarValidation,runtimeClasspath,serverLib+org.eclipse.jetty:jetty-http:12.1.14=jarValidation,runtimeClasspath,serverLib,solrCore+org.eclipse.jetty:jetty-io:12.1.14=jarValidation,runtimeClasspath,serverLib,solrCore+org.eclipse.jetty:jetty-jmx:12.1.14=jarValidation,runtimeClasspath,serverLib+org.eclipse.jetty:jetty-rewrite:12.1.14=jarValidation,runtimeClasspath,serverLib+org.eclipse.jetty:jetty-security:12.1.14=jarValidation,runtimeClasspath,serverLib,solrCore+org.eclipse.jetty:jetty-server:12.1.14=jarValidation,runtimeClasspath,serverLib,solrCore+org.eclipse.jetty:jetty-session:12.1.14=jarValidation,runtimeClasspath,serverLib+org.eclipse.jetty:jetty-start:12.1.14=jarValidation,startJar+org.eclipse.jetty:jetty-util:12.1.14=jarValidation,runtimeClasspath,serverLib,solrCore+org.eclipse.jetty:jetty-xml:12.1.14=jarValidation,runtimeClasspath,serverLiborg.glassfish.hk2.external:aopalliance-repackaged:4.0.2=jarValidation,runtimeClasspath,solrCoreorg.glassfish.hk2:hk2-api:4.0.2=jarValidation,runtimeClasspath,solrCoreorg.glassfish.hk2:hk2-locator:4.0.2=jarValidation,runtimeClasspath,solrCorediff --git a/solr/solr-ref-guide/gradle.lockfile b/solr/solr-ref-guide/gradle.lockfileindex 99b9b73ebfb..a3212513777 100644--- a/solr/solr-ref-guide/gradle.lockfile+++ b/solr/solr-ref-guide/gradle.lockfile@@ -128,26 +128,26 @@ org.checkerframework:checker-qual:4.2.2=testRuntimeClasspathorg.codehaus.janino:commons-compiler:3.1.12=testRuntimeClasspathorg.codehaus.janino:janino:3.1.12=testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.1=cliClasspath,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-common:12.1.12=cliClasspath,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-gzip:12.1.12=cliClasspath,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.12=testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.12=cliClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.1.12=cliClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.1.12=cliClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.1.12=cliClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.1.12=testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.1.12=cliClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.1.12=cliClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.1.12=testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.1.12=testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.1.12=cliClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.1.12=cliClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.1.12=cliClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.1.12=testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.1.12=cliClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.1.12=cliClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.1.12=testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.1.12=cliClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.14=cliClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.14=cliClasspath,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.14=testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.14=cliClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.14=cliClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.14=cliClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.14=cliClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.14=testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.14=cliClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.14=cliClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.14=testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.14=testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.14=cliClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.14=cliClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.14=cliClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.14=testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.14=cliClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.14=cliClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.14=testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.14=cliClasspath,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.2=cliClasspath,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.2=cliClasspath,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.2=cliClasspath,testRuntimeClasspathdiff --git a/solr/solrj-jetty/gradle.lockfile b/solr/solrj-jetty/gradle.lockfileindex 3392569923b..d666063463d 100644--- a/solr/solrj-jetty/gradle.lockfile+++ b/solr/solrj-jetty/gradle.lockfile@@ -115,26 +115,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=jarValidation,testCompileClasspath,tesorg.apache.zookeeper:zookeeper:3.9.6=jarValidation,testCompileClasspath,testRuntimeClasspathorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.1=jarValidation,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-common:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-gzip:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.2=jarValidation,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.2=jarValidation,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.2=jarValidation,testRuntimeClasspathdiff --git a/solr/solrj-streaming/gradle.lockfile b/solr/solrj-streaming/gradle.lockfileindex 27965afb9cd..5397526b65c 100644--- a/solr/solrj-streaming/gradle.lockfile+++ b/solr/solrj-streaming/gradle.lockfile@@ -126,26 +126,26 @@ org.checkerframework:checker-qual:4.2.2=jarValidation,testRuntimeClasspathorg.codehaus.janino:commons-compiler:3.1.12=jarValidation,testRuntimeClasspathorg.codehaus.janino:janino:3.1.12=jarValidation,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.1=jarValidation,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-common:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-gzip:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.2=jarValidation,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.2=jarValidation,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.2=jarValidation,testRuntimeClasspathdiff --git a/solr/solrj-zookeeper/gradle.lockfile b/solr/solrj-zookeeper/gradle.lockfileindex 229e38dfccd..557b3f66eff 100644--- a/solr/solrj-zookeeper/gradle.lockfile+++ b/solr/solrj-zookeeper/gradle.lockfile@@ -115,26 +115,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=compileClasspath,jarValidation,runtimeorg.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspathorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.1=jarValidation,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-common:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-gzip:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.2=jarValidation,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.2=jarValidation,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.2=jarValidation,testRuntimeClasspathdiff --git a/solr/solrj/gradle.lockfile b/solr/solrj/gradle.lockfileindex 505248db4da..b636fccd771 100644--- a/solr/solrj/gradle.lockfile+++ b/solr/solrj/gradle.lockfile@@ -116,29 +116,29 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=jarValidation,testCompileClasspath,tesorg.apache.zookeeper:zookeeper:3.9.6=jarValidation,testCompileClasspath,testRuntimeClasspathorg.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.1=jarValidation,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-common:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-gzip:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-webapp:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.ee:jetty-ee-webapp:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.1.12=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-xml:12.1.12=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-webapp:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.ee:jetty-ee-webapp:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.14=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-xml:12.1.14=jarValidation,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.2=jarValidation,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.2=jarValidation,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.2=jarValidation,testRuntimeClasspathdiff --git a/solr/test-framework/gradle.lockfile b/solr/test-framework/gradle.lockfileindex 8802fb667e4..5dcac49a69d 100644--- a/solr/test-framework/gradle.lockfile+++ b/solr/test-framework/gradle.lockfile@@ -116,26 +116,26 @@ org.apache.zookeeper:zookeeper-jute:3.9.6=compileClasspath,jarValidation,runtimeorg.apache.zookeeper:zookeeper:3.9.6=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspathorg.apiguardian:apiguardian-api:1.1.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.1=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-common:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-gzip:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.12=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.1.12=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.1.12=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-rewrite:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.1.12=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-common:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.14=jarValidation,runtimeClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.14=jarValidation,runtimeClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.14=jarValidation,runtimeClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-rewrite:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.14=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:4.0.2=jarValidation,runtimeClasspath,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.2=jarValidation,runtimeClasspath,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.2=jarValidation,runtimeClasspath,testRuntimeClasspathdiff --git a/solr/webapp/gradle.lockfile b/solr/webapp/gradle.lockfileindex 39a9333e15d..35ce63b79e0 100644--- a/solr/webapp/gradle.lockfile+++ b/solr/webapp/gradle.lockfile@@ -131,32 +131,32 @@ org.checkerframework:checker-qual:4.2.2=jarValidation,testRuntimeClasspathorg.codehaus.janino:commons-compiler:3.1.12=jarValidation,testRuntimeClasspathorg.codehaus.janino:janino:3.1.12=jarValidation,testRuntimeClasspathorg.codehaus.woodstox:stax2-api:4.3.1=jarValidation,solrCore,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-common:12.1.12=jarValidation,solrCore,testRuntimeClasspath-org.eclipse.jetty.compression:jetty-compression-gzip:12.1.12=jarValidation,solrCore,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.12=jarValidation,serverLib,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.ee10:jetty-ee10-servlets:12.1.12=serverLib-org.eclipse.jetty.ee10:jetty-ee10-webapp:12.1.12=serverLib-org.eclipse.jetty.ee:jetty-ee-webapp:12.1.12=serverLib-org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.12=jarValidation,solrCore,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.1.12=jarValidation,solrCore,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.1.12=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.1.12=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-server:12.1.12=jarValidation,serverLib,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.1.12=jarValidation,solrCore,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.1.12=jarValidation,solrCore,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-server:12.1.12=jarValidation,serverLib,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-server:12.1.12=jarValidation,serverLib,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.1.12=jarValidation,solrCore,testRuntimeClasspath-org.eclipse.jetty:jetty-deploy:12.1.12=serverLib-org.eclipse.jetty:jetty-http:12.1.12=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.1.12=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-jmx:12.1.12=serverLib-org.eclipse.jetty:jetty-rewrite:12.1.12=jarValidation,serverLib,testRuntimeClasspath-org.eclipse.jetty:jetty-security:12.1.12=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-server:12.1.12=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-session:12.1.12=jarValidation,serverLib,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.1.12=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-xml:12.1.12=serverLib+org.eclipse.jetty.compression:jetty-compression-common:12.1.14=jarValidation,solrCore,testRuntimeClasspath+org.eclipse.jetty.compression:jetty-compression-gzip:12.1.14=jarValidation,solrCore,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.14=jarValidation,serverLib,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.ee10:jetty-ee10-servlets:12.1.14=serverLib+org.eclipse.jetty.ee10:jetty-ee10-webapp:12.1.14=serverLib+org.eclipse.jetty.ee:jetty-ee-webapp:12.1.14=serverLib+org.eclipse.jetty.http2:jetty-http2-client-transport:12.1.14=jarValidation,solrCore,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.1.14=jarValidation,solrCore,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.1.14=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.1.14=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-server:12.1.14=jarValidation,serverLib,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.1.14=jarValidation,solrCore,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.1.14=jarValidation,solrCore,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-server:12.1.14=jarValidation,serverLib,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-server:12.1.14=jarValidation,serverLib,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.1.14=jarValidation,solrCore,testRuntimeClasspath+org.eclipse.jetty:jetty-deploy:12.1.14=serverLib+org.eclipse.jetty:jetty-http:12.1.14=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.1.14=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-jmx:12.1.14=serverLib+org.eclipse.jetty:jetty-rewrite:12.1.14=jarValidation,serverLib,testRuntimeClasspath+org.eclipse.jetty:jetty-security:12.1.14=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-server:12.1.14=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-session:12.1.14=jarValidation,serverLib,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.1.14=jarValidation,serverLib,solrCore,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-xml:12.1.14=serverLiborg.glassfish.hk2.external:aopalliance-repackaged:4.0.2=jarValidation,solrCore,testRuntimeClasspathorg.glassfish.hk2:hk2-api:4.0.2=jarValidation,solrCore,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:4.0.2=jarValidation,solrCore,testRuntimeClasspath